diff options
| author | TizenOpenSource <tizenopensrc@samsung.com> | 2023-12-22 13:08:12 +0900 |
|---|---|---|
| committer | TizenOpenSource <tizenopensrc@samsung.com> | 2023-12-22 13:08:12 +0900 |
| commit | 62ec3ef109a98426137e54901e161fe5f6f98431 (patch) | |
| tree | 272fc7ab226258d7ceddee12c8c682c8e711c2b0 | |
| parent | 69a6f41346c4b1458c79bfe6abf7b7dd16126214 (diff) | |
| download | parted-upstream/3.6.tar.gz parted-upstream/3.6.tar.bz2 parted-upstream/3.6.zip | |
Imported Upstream version 3.6upstream/3.6upstream
771 files changed, 26041 insertions, 13290 deletions
diff --git a/.prev-version b/.prev-version index e917998..3f3ae45 100644 --- a/.prev-version +++ b/.prev-version @@ -1 +1 @@ -3.4.64.2 +3.5.28 diff --git a/.tarball-version b/.tarball-version index 5a95802..d70c8f8 100644 --- a/.tarball-version +++ b/.tarball-version @@ -1 +1 @@ -3.5 +3.6 @@ -1 +1 @@ -3.5 +3.6 @@ -1,5 +1,230 @@ +2023-04-10 Brian C. Lane <bcl@redhat.com> + + version 3.6 + * NEWS: Record release date. + + NEWS: Releasing stable version 3.6 + +2023-03-24 Brian C. Lane <bcl@redhat.com> + + maint: post-release administrivia + * NEWS: Add header line for next release. + * .prev-version: Record previous version. + * cfg.mk (old_NEWS_hash): Auto-update. + + version 3.5.28 + * NEWS: Record release date. + + NEWS: Update news + + tests: Fix syntax-check warning about grep -q + + maint: Update copyright statements to 2022 + By running make update-copyright + + maint: Bump library REVISION number for release + + maint: Update README-release + + maint: Update to latest gnulib and bootstrap script + +2023-03-17 Brian C. Lane <bcl@redhat.com> + + parted: Fix ending sector location when using kibi IEC suffix + This fixes a bug when using KiB to specify the ending location of a + partition. It was not subtracting 1s like it does with the other units + because it was looking for a 'k' not a 'K'. + + This also fixes a quirk of the suffix checking code, it would check for + matching case, but converting to the actual IEC value was case + insensitive. This now uses common functions for the matching so that + case doesn't matter. + + It also adds tests to check for the fix. + + The only change in behavior is that using KiB to specify the ending + location of a partition will now correctly create the end 1s lower than + the specified location like it does for MiB, GiB, etc. + +2023-02-15 Brian C. Lane <bcl@redhat.com> + + tests: Fix formatting and snprintf warnings in tests. + The assert message includes sector values, which are long long int, so + use the proper formatting of %lld. + + The snprintf warning complained about trying to write 258 bytes so I + bumped the buffer size up to 259. The return value is already being + checked for truncation so this is just to keep the compiler happy + without having to suppress the warning. + +2023-02-15 Brian C. Lane <bcl@redhat.com> + + ui: Add checks for prompt being NULL + Also removes a cast from const char* to char* when passing to readline + that doesn't appear to be necessary any longer. + + Added asserts to make sure prompt isn't NULL after strdup and realloc + calls. + +2023-02-15 Brian C. Lane <bcl@redhat.com> + + strlist: Handle realloc error in wchar_to_str + It could return a NULL if the realloc fails. This handles the failure in + the same way as other failures in wchar_to_str, it exits immediately + with an error message. + + libparted: Fix potential NULL dereference in ped_disk_next_partition + + filesys: Check for null from close_fn + If the filesystem type name isn't known it can return a NULL. + +2023-02-07 Brian C. Lane <bcl@redhat.com> + + tests: Fixing libparted test framework usage + The fail and fail_if functions from libcheck are deprecated, replace + them with ck_abort_msg and ck_assert_msg. Note that the logic of assert + is the opposite of fail_if. + +2023-02-06 Brian C. Lane <bcl@redhat.com> + + libparted: Fix problem with creating 1s partitions + There was a 1-off error in _partition_get_overlap_constraint that + prevented partitions from being created in 1s free space. You could + create 1s partitions as long they were done in order, but not after + leaving 'holes'. + + This fixes this and adds tests for it on msdos and gpt disklabels. + +2022-12-13 Brian C. Lane <bcl@redhat.com> + + tests: XFS requires a minimum size of 300M + +2022-12-13 Mike Fleetwood <mike.fleetwood@googlemail.com> + + gpt: Add no_automount partition flag + Add user requested support for GPT partition type attribute bit 63 [1] + so the no-auto flag in the systemd originated Discoverable Partitions + Specification [2] can be manipulated. The UEFI specification [3] says + partition attribute bits 48 to 63 are partition type specific, however + the DPS [2] and Microsoft [4] use the bit 63 to mean no automounting / + assign no drive letter and apply it to multiple partition types so don't + restrict its application. + + [1] Request for GPT partition attribute bit 63 "no automount" editing + support + https://gitlab.gnome.org/GNOME/gparted/-/issues/214 + [2] The Discoverable Partitions Specification (DPS), + Partition Attribute Flags + https://uapi-group.org/specifications/specs/discoverable_partitions_specification/ + [3] UEFI Specification, version 2.8, + Table 24. Defined GPT Partition Entry - Attributes + https://uefi.org/sites/default/files/resources/UEFI_Spec_2_8_final.pdf + [4] CREATE_PARTITION_PARAMETERS structure (vds.h) + https://learn.microsoft.com/en-gb/windows/win32/api/vds/ns-vds-create_partition_parameters + +2022-09-30 Arvin Schnell <aschnell@suse.com> + + parted: Add display of GPT UUIDs in JSON output + This adds 2 new disk type features, one for the whole disk UUID and + another for the per-partition UUID. It adds ped_disk_get_uuid and + ped_partition_get_uuid functions to retrieve them. + + It adds them to the JSON output on GPT disklabeled disks as "uuid" in + the disk and partitions sections of the JSON output. + +2022-08-15 Brian C. Lane <bcl@redhat.com> + + tests: Add a libparted test for ped_partition_set_system on msdos + Test the libparted API to make sure the flag is not cleared by calling + ped_partition_set_system. + +2022-08-15 Brian C. Lane <bcl@redhat.com> + + libparted: Fix handling of msdos partition types + This restores the previous behavior by testing the partition type + against the list of known types and skipping the filesystem type reset. + Now the sequence of: + + ped_partition_new(...) + ped_partition_set_flag(part, PED_PARTITION_BLS_BOOT, 1); + ped_partition_set_system(part, ped_file_system_type_get("ext4")); + + Will keep the type set to PED_PARTITION_BLS_BOOT, which is how it used + to behave. + +2022-08-15 Brian C. Lane <bcl@redhat.com> + + tests: Add a libparted test for ped_partition_set_system on gpt + Test the libparted API to make sure the flag is not cleared by calling + ped_partition_set_system. + +2022-08-15 Brian C. Lane <bcl@redhat.com> + + libparted: Fix handling of gpt partition types + This restores the previous behavior by testing the GUID against the list + of known types and skipping the filesystem GUID reset. Now the sequence + of: + + ped_partition_new(...) + ped_partition_set_flag(part, PED_PARTITION_BIOS_GRUB, 1); + ped_partition_set_system(part, ped_file_system_type_get("ext4")); + + Will keep the GUID set to PED_PARTITION_BIOS_GRUB, which is how it used + to behave. + +2022-08-04 Brian C. Lane <bcl@redhat.com> + + disk.in.h: Remove use of enums with #define + The preprocessor doesn't evaluate the enum, so it ends up being 0, which + causes problems for library users like pyparted which try to use the _LAST + value to conditionally include support for newer flags. + + Instead just define the int that is the first and last entry in each enum. + + Thanks to adamw and dcantrell for help arriving at a solution. + +2022-07-27 Arvin Schnell <aschnell@suse.com> + + parted: Simplify code for json output + _PedDiskOps::get_max_primary_partition_count is always available, the + macro PT_op_function_initializers ensures it. So use + ped_disk_get_max_primary_partition_count instead of + _PedDiskOps::get_max_primary_partition_count directly. + + libparted: Fix check for availability of _type_id functions + Fix a copy/paste error. In practice this didn't cause any problems + because the *_set_type_id and *_get_type_id are either both NULL or both + set to the function. + +2022-05-13 Brian C. Lane <bcl@redhat.com> + + tests: t3200-type-change now passes + + parted: Reset the filesystem type when changing the id/uuid + Without this the print command keeps showing the type selected with + mkpart, which doesn't match the id/uuid set by the user. So rescan the + partition for a filesystem. + +2022-05-13 Arvin Schnell <aschnell@suse.com> + + libparted: add swap flag for DASD label + Support the swap flag and fix reading flags from disk. Also + cleanup code by dropping the 2 flags "raid" and "lvm" from + DasdPartitionData and instead use "system" directly. + + parted: add type command + Include the partition type-id and type-uuid in the JSON + output. Also add the the command 'type' to set them. Remove + redundant flags from DosPartitionData and use only the system + variable. + 2022-04-18 Brian C. Lane <bcl@redhat.com> + maint: post-release administrivia + * NEWS: Add header line for next release. + * .prev-version: Record previous version. + * cfg.mk (old_NEWS_hash): Auto-update. + version 3.5 * NEWS: Record release date. @@ -2254,12 +2479,10 @@ * tests/t1700-probe-fs.sh: Add new filesystems to test -2014-05-26 Jim Meyering <meyering@fb.com> +2014-05-25 Jim Meyering <meyering@fb.com> maint: run "make update-copyright" -2014-05-25 Jim Meyering <meyering@fb.com> - maint: remove doubled word: s/on on/on/ * NEWS: Remove doubled-word detected by "make syntax-check". @@ -3006,7 +3229,7 @@ caused the t6000-dm root-only test to fail on Fedora 17. Also, redirect less to /dev/null: that helps diagnose failure. -2012-10-04 Bob Beers <bob.beers.gmail.com> (tiny change) +2012-10-03 Bob Beers <bob.beers.gmail.com> (tiny change) doc: libparted/disk.c: correct doxygen comment typo * libparted/disk.c: s/PedPartition/PedDisk/ @@ -3901,7 +4124,7 @@ maint: update all copyright year number ranges Run "make update-copyright". -2011-12-15 Phillip Susi <psusi@cfl.rr.com> +2011-12-14 Phillip Susi <psusi@cfl.rr.com> doc: add NEWS entry for "Add partition separator only when required" @@ -4483,7 +4706,7 @@ * libparted/arch/linux.c: (_get_linux_version): Simplify and add an assertion. -2011-06-07 Jim Meyering <meyering@redhat.com> +2011-06-06 Jim Meyering <meyering@redhat.com> libparted: accommodate two-component linux version number like 3.0 * libparted/arch/linux.c (_get_linux_version): Also accept 2-component @@ -4619,6 +4842,8 @@ * tests/t1100-busy-label.sh: Remove one last use of mkpartfs. Use scsi_debug rather than requiring an explicitly-provided device. +2011-05-26 Jim Meyering <meyering@redhat.com> + maint: correct coverity-reported "suspicious sizeof" * parted/table.c (table_add_row): Use sizeof(*VAR), rather than erroneous sizeof(explicit_type) that just happened to be ok. @@ -4691,14 +4916,12 @@ tests: adapt t1101-busy-partition not to use mkpartfs * tests/t1101-busy-partition.sh: Use mkfs.vfat instead. -2011-05-11 Jim Meyering <meyering@redhat.com> +2011-05-10 Jim Meyering <meyering@redhat.com> tests: write all pairs of partition table types * tests/t9050-partition-table-types.sh: New file. * tests/Makefile.am (TESTS): Add it. -2011-05-10 Jim Meyering <meyering@redhat.com> - tests: add a NEWS entry and a test to exercise today's bug fix * tests/t9041-undetected-in-use-16th-partition: New file. * tests/Makefile.am (TESTS): Add it. @@ -4951,7 +5174,7 @@ tests: add a minimal nilfs2 test * tests/t1700-probe-fs.sh: Adapt to also test nilfs2. -2011-03-04 Jim Meyering <meyering@redhat.com> +2011-03-03 Jim Meyering <meyering@redhat.com> tests: rename a test script, before extending it to handle nilfs * tests/t1700-probe-fs.sh: Rename from ... @@ -4977,7 +5200,7 @@ The is_valid_nilfs_sb function came from the grub nilfs2 module, which is written by me and assigned to FSF. -2011-02-26 Jim Meyering <meyering@redhat.com> +2011-02-25 Jim Meyering <meyering@redhat.com> maint: two files lacked a newline at EOF: add one to each * include/Makefile.am: Add newline at end of file. @@ -4998,7 +5221,7 @@ tests: remove useless commands * tests/t3310-flags.sh: Remove useless exp-manipulating commands. -2011-02-26 Brian C. Lane <bcl@redhat.com> +2011-02-25 Brian C. Lane <bcl@redhat.com> gpt: add legacy_boot partition flag Add support for the Legacy BIOS Bootable flag in the GPT @@ -5016,13 +5239,13 @@ (gpt_partition_set_flag, gpt_partition_get_flag): (gpt_partition_is_flag_available): Add legacy_boot flag support. -2011-02-26 Brian C. Lane <bcl@redhat.com> +2011-02-25 Brian C. Lane <bcl@redhat.com> gpt: add partition attribute bits: NoBlockIOProtocol, LegacyBIOSBootable Add NoBlockIOProtocol and LegacyBIOSBootable flags to the GPT partition Attributes entry. -2011-02-26 Jim Meyering <meyering@redhat.com> +2011-02-25 Jim Meyering <meyering@redhat.com> doc: regenerate partprobe .pot and .po files * doc/C/po/partprobe.8.pot: Slight syntax update induced by newer tool. @@ -5352,7 +5575,7 @@ doc: also mention KiB, MiB, GiB and TiB suffixes * doc/parted.texi (unit): Also mention KiB, MiB, GiB and TiB. -2010-11-18 Colin Watson <cjwatson@ubuntu.com> +2010-11-17 Colin Watson <cjwatson@ubuntu.com> libparted: ignore zero-length devices * bootstrap.conf (gnulib_modules): Add xstrtoll. @@ -6161,7 +6384,7 @@ * tests/t-lib.sh (require_hfs_): New function. * tests/t3000-resize-fs.sh: Use require_hfs_. -2010-03-01 Jim Meyering <meyering@redhat.com> +2010-02-28 Jim Meyering <meyering@redhat.com> tests: convert more tests to the newer infrastructure * tests/t1700-ext-probe.sh: Convert from test-lib.sh to t-lib.sh. @@ -6688,12 +6911,12 @@ failure. Set part_name to NULL after the first free, to make the second a no-op after the first. +2009-12-11 Jim Meyering <meyering@redhat.com> + build: update spec: gperf is a new build-requirement * parted.spec.in (BuildRequires): Add gperf. Reported by Jeff Darcy. -2009-12-11 Jim Meyering <meyering@redhat.com> - build: update gnulib submodule to latest tests: ensure that parted can partition a loop device @@ -10047,7 +10270,7 @@ Fix a typo: s/to defragmenting/to defragment/, Remove trailing blanks. -2008-02-04 Jim Meyering <meyering@redhat.com> +2008-02-03 Jim Meyering <meyering@redhat.com> Don't write into line[-1] when line starts with a NUL byte. * parted/ui.c (_readline): Check strlen first. @@ -10655,7 +10878,7 @@ Some of this duplication should be factored out, eventually... -2007-05-26 Jim Meyering <jim@meyering.net> +2007-05-25 Jim Meyering <jim@meyering.net> Diagnose invalid command arguments. This started because I objected to parted failing with no diagnostic @@ -10760,10 +10983,10 @@ Make all tests get their initialization from the same place. * tests/t2000-mkfs.sh: Get initialization via ". ./init.sh", not via ". ./test-lib.sh". * Makefile.maint (sc_test_init): New test, to ensure we stay consistent. - * tests/Makefile.am (init.sh): Make this generated file read-only. - 2007-05-18 Jim Meyering <jim@meyering.net> + * tests/Makefile.am (init.sh): Make this generated file read-only. + mkpartfs ext2 2 10 would erroneously report "file system too small" for some small (single-group) partitions. It would also fail to report "file system too small" in some cases, and instead continue on to into inode-allocation code where it'd report "File system full!" * libparted/fs/ext2/ext2_mkfs.c (compute_block_counts): New function, factored out of... (ext2_mkfs): ...here. Call compute_block_counts rather than open-coded it. When decrementing numblocks, call compute_block_counts again, to recompute all of the derived values. Require at least 14 free blocks in a 16-inode-per-group partition. * tests/t1500-small-ext2.sh: New file. Test for the above. * tests/Makefile.am (TESTS): Add t1500-small-ext2.sh. 2007-05-17 Jim Meyering <jim@meyering.net> @@ -10889,7 +11112,7 @@ Set version to 1.8.3 for upcoming release. -2007-05-01 Debarshi Ray <rishi@gnu.org> +2007-04-30 Debarshi Ray <rishi@gnu.org> [tests] Separate and improved test for reading of disk labels. @@ -10920,13 +11143,13 @@ [libparted] dvh label fixes +2007-04-19 Otavio Salvador <otavio@ossystems.com.br> + [tests] Simplify test_clone_label removing the label reading test Since the test_create_label already tests the label reading we shouldn't redo it. It's always better to have simple tests so is much easier to find the bugs. -2007-04-19 Otavio Salvador <otavio@ossystems.com.br> - [tests] Trivial coding style fixes around the tests code 2007-04-19 Otavio Salvador <otavio@ossystems.com.br> @@ -11044,7 +11267,7 @@ po/POTFILES.in: Add lib/getopt.c -2007-03-16 Debarshi Ray <rishi@gnu.org> +2007-03-15 Debarshi Ray <rishi@gnu.org> Prevented DASD specific headers and sources from being compiled/installed on non-s390 systems; and conditionally included fdasd.h in linux.h for s390 systems. @@ -11289,12 +11512,10 @@ Fix memleaks. Patch thanks to Mike Hommey -2007-02-19 Debarshi Ray <rishi@gnu.org> +2007-02-18 Debarshi Ray <rishi@gnu.org> Introduced MAINTAINERCLEANFILES in Makefile.am for carrying out 'make maintainer-clean'. -2007-02-18 Debarshi Ray <rishi@gnu.org> - Cleaning up nested structs & unions. 2007-02-16 Jim Meyering <jim@meyering.net> diff --git a/GNUmakefile b/GNUmakefile index 7a08c9d..07b331f 100644 --- a/GNUmakefile +++ b/GNUmakefile @@ -5,7 +5,7 @@ # It is necessary if you want to build targets usually of interest # only to the maintainer. -# Copyright (C) 2001, 2003, 2006-2022 Free Software Foundation, Inc. +# Copyright (C) 2001, 2003, 2006-2023 Free Software Foundation, Inc. # This program is free software: you can redistribute it and/or modify # it under the terms of the GNU General Public License as published by @@ -26,7 +26,7 @@ _gl-Makefile := $(wildcard [M]akefile) ifneq ($(_gl-Makefile),) # Make tar archive easier to reproduce. -export TAR_OPTIONS = --owner=0 --group=0 --numeric-owner +export TAR_OPTIONS = --owner=0 --group=0 --numeric-owner --sort=name # Allow the user to add to this in the Makefile. ALL_RECURSIVE_TARGETS = @@ -1,8 +1,8 @@ Installation Instructions ************************* - Copyright (C) 1994-1996, 1999-2002, 2004-2017, 2020-2021 Free -Software Foundation, Inc. + Copyright © 1994–1996, 1999–2002, 2004–2017, 2020–2023 Free Software +Foundation, Inc. Copying and distribution of this file, with or without modification, are permitted in any medium without royalty provided the copyright @@ -12,94 +12,94 @@ without warranty of any kind. Basic Installation ================== - Briefly, the shell command './configure && make && make install' + Briefly, the shell command ‘./configure && make && make install’ should configure, build, and install this package. The following -more-detailed instructions are generic; see the 'README' file for +more-detailed instructions are generic; see the ‘README’ file for instructions specific to this package. Some packages provide this -'INSTALL' file but do not implement all of the features documented +‘INSTALL’ file but do not implement all of the features documented below. The lack of an optional feature in a given package is not necessarily a bug. More recommendations for GNU packages can be found in *note Makefile Conventions: (standards)Makefile Conventions. - The 'configure' shell script attempts to guess correct values for + The ‘configure’ shell script attempts to guess correct values for various system-dependent variables used during compilation. It uses -those values to create a 'Makefile' in each directory of the package. -It may also create one or more '.h' files containing system-dependent -definitions. Finally, it creates a shell script 'config.status' that +those values to create a ‘Makefile’ in each directory of the package. +It may also create one or more ‘.h’ files containing system-dependent +definitions. Finally, it creates a shell script ‘config.status’ that you can run in the future to recreate the current configuration, and a -file 'config.log' containing compiler output (useful mainly for -debugging 'configure'). +file ‘config.log’ containing compiler output (useful mainly for +debugging ‘configure’). - It can also use an optional file (typically called 'config.cache' and -enabled with '--cache-file=config.cache' or simply '-C') that saves the + It can also use an optional file (typically called ‘config.cache’ and +enabled with ‘--cache-file=config.cache’ or simply ‘-C’) that saves the results of its tests to speed up reconfiguring. Caching is disabled by default to prevent problems with accidental use of stale cache files. If you need to do unusual things to compile the package, please try -to figure out how 'configure' could check whether to do them, and mail -diffs or instructions to the address given in the 'README' so they can +to figure out how ‘configure’ could check whether to do them, and mail +diffs or instructions to the address given in the ‘README’ so they can be considered for the next release. If you are using the cache, and at -some point 'config.cache' contains results you don't want to keep, you +some point ‘config.cache’ contains results you don’t want to keep, you may remove or edit it. - The file 'configure.ac' (or 'configure.in') is used to create -'configure' by a program called 'autoconf'. You need 'configure.ac' if -you want to change it or regenerate 'configure' using a newer version of -'autoconf'. + The file ‘configure.ac’ (or ‘configure.in’) is used to create +‘configure’ by a program called ‘autoconf’. You need ‘configure.ac’ if +you want to change it or regenerate ‘configure’ using a newer version of +‘autoconf’. The simplest way to compile this package is: - 1. 'cd' to the directory containing the package's source code and type - './configure' to configure the package for your system. + 1. ‘cd’ to the directory containing the package’s source code and type + ‘./configure’ to configure the package for your system. - Running 'configure' might take a while. While running, it prints + Running ‘configure’ might take a while. While running, it prints some messages telling which features it is checking for. - 2. Type 'make' to compile the package. + 2. Type ‘make’ to compile the package. - 3. Optionally, type 'make check' to run any self-tests that come with + 3. Optionally, type ‘make check’ to run any self-tests that come with the package, generally using the just-built uninstalled binaries. - 4. Type 'make install' to install the programs and any data files and + 4. Type ‘make install’ to install the programs and any data files and documentation. When installing into a prefix owned by root, it is recommended that the package be configured and built as a regular - user, and only the 'make install' phase executed with root + user, and only the ‘make install’ phase executed with root privileges. - 5. Optionally, type 'make installcheck' to repeat any self-tests, but + 5. Optionally, type ‘make installcheck’ to repeat any self-tests, but this time using the binaries in their final installed location. This target does not install anything. Running this target as a - regular user, particularly if the prior 'make install' required + regular user, particularly if the prior ‘make install’ required root privileges, verifies that the installation completed correctly. 6. You can remove the program binaries and object files from the - source code directory by typing 'make clean'. To also remove the - files that 'configure' created (so you can compile the package for - a different kind of computer), type 'make distclean'. There is - also a 'make maintainer-clean' target, but that is intended mainly - for the package's developers. If you use it, you may have to get + source code directory by typing ‘make clean’. To also remove the + files that ‘configure’ created (so you can compile the package for + a different kind of computer), type ‘make distclean’. There is + also a ‘make maintainer-clean’ target, but that is intended mainly + for the package’s developers. If you use it, you may have to get all sorts of other programs in order to regenerate files that came with the distribution. - 7. Often, you can also type 'make uninstall' to remove the installed + 7. Often, you can also type ‘make uninstall’ to remove the installed files again. In practice, not all packages have tested that uninstallation works correctly, even though it is required by the GNU Coding Standards. - 8. Some packages, particularly those that use Automake, provide 'make - distcheck', which can by used by developers to test that all other - targets like 'make install' and 'make uninstall' work correctly. + 8. Some packages, particularly those that use Automake, provide ‘make + distcheck’, which can by used by developers to test that all other + targets like ‘make install’ and ‘make uninstall’ work correctly. This target is generally not run by end users. Compilers and Options ===================== Some systems require unusual options for compilation or linking that -the 'configure' script does not know about. Run './configure --help' +the ‘configure’ script does not know about. Run ‘./configure --help’ for details on some of the pertinent environment variables. - You can give 'configure' initial values for configuration parameters + You can give ‘configure’ initial values for configuration parameters by setting variables in the command line or in the environment. Here is an example: @@ -112,21 +112,21 @@ Compiling For Multiple Architectures You can compile the package for more than one kind of computer at the same time, by placing the object files for each architecture in their -own directory. To do this, you can use GNU 'make'. 'cd' to the +own directory. To do this, you can use GNU ‘make’. ‘cd’ to the directory where you want the object files and executables to go and run -the 'configure' script. 'configure' automatically checks for the source -code in the directory that 'configure' is in and in '..'. This is known -as a "VPATH" build. +the ‘configure’ script. ‘configure’ automatically checks for the source +code in the directory that ‘configure’ is in and in ‘..’. This is known +as a “VPATH†build. - With a non-GNU 'make', it is safer to compile the package for one + With a non-GNU ‘make’, it is safer to compile the package for one architecture at a time in the source code directory. After you have -installed the package for one architecture, use 'make distclean' before +installed the package for one architecture, use ‘make distclean’ before reconfiguring for another architecture. On MacOS X 10.5 and later systems, you can create libraries and -executables that work on multiple system types--known as "fat" or -"universal" binaries--by specifying multiple '-arch' options to the -compiler but only a single '-arch' option to the preprocessor. Like +executables that work on multiple system types—known as “fat†or +“universal†binaries—by specifying multiple ‘-arch’ options to the +compiler but only a single ‘-arch’ option to the preprocessor. Like this: ./configure CC="gcc -arch i386 -arch x86_64 -arch ppc -arch ppc64" \ @@ -135,43 +135,43 @@ this: This is not guaranteed to produce working output in all cases, you may have to build one architecture at a time and combine the results -using the 'lipo' tool if you have problems. +using the ‘lipo’ tool if you have problems. Installation Names ================== - By default, 'make install' installs the package's commands under -'/usr/local/bin', include files under '/usr/local/include', etc. You -can specify an installation prefix other than '/usr/local' by giving -'configure' the option '--prefix=PREFIX', where PREFIX must be an + By default, ‘make install’ installs the package’s commands under +‘/usr/local/bin’, include files under ‘/usr/local/include’, etc. You +can specify an installation prefix other than ‘/usr/local’ by giving +‘configure’ the option ‘--prefix=PREFIX’, where PREFIX must be an absolute file name. You can specify separate installation prefixes for architecture-specific files and architecture-independent files. If you -pass the option '--exec-prefix=PREFIX' to 'configure', the package uses +pass the option ‘--exec-prefix=PREFIX’ to ‘configure’, the package uses PREFIX as the prefix for installing programs and libraries. Documentation and other data files still use the regular prefix. In addition, if you use an unusual directory layout you can give -options like '--bindir=DIR' to specify different values for particular -kinds of files. Run 'configure --help' for a list of the directories +options like ‘--bindir=DIR’ to specify different values for particular +kinds of files. Run ‘configure --help’ for a list of the directories you can set and what kinds of files go in them. In general, the default -for these options is expressed in terms of '${prefix}', so that -specifying just '--prefix' will affect all of the other directory +for these options is expressed in terms of ‘${prefix}’, so that +specifying just ‘--prefix’ will affect all of the other directory specifications that were not explicitly provided. The most portable way to affect installation locations is to pass the -correct locations to 'configure'; however, many packages provide one or +correct locations to ‘configure’; however, many packages provide one or both of the following shortcuts of passing variable assignments to the -'make install' command line to change installation locations without +‘make install’ command line to change installation locations without having to reconfigure or recompile. The first method involves providing an override variable for each -affected directory. For example, 'make install -prefix=/alternate/directory' will choose an alternate location for all +affected directory. For example, ‘make install +prefix=/alternate/directory’ will choose an alternate location for all directory configuration variables that were expressed in terms of -'${prefix}'. Any directories that were specified during 'configure', -but not in terms of '${prefix}', must each be overridden at install time +‘${prefix}’. Any directories that were specified during ‘configure’, +but not in terms of ‘${prefix}’, must each be overridden at install time for the entire installation to be relocated. The approach of makefile variable overrides for each directory variable is required by the GNU Coding Standards, and ideally causes no recompilation. However, some @@ -179,40 +179,40 @@ platforms have known limitations with the semantics of shared libraries that end up requiring recompilation when using this method, particularly noticeable in packages that use GNU Libtool. - The second method involves providing the 'DESTDIR' variable. For -example, 'make install DESTDIR=/alternate/directory' will prepend -'/alternate/directory' before all installation names. The approach of -'DESTDIR' overrides is not required by the GNU Coding Standards, and + The second method involves providing the ‘DESTDIR’ variable. For +example, ‘make install DESTDIR=/alternate/directory’ will prepend +‘/alternate/directory’ before all installation names. The approach of +‘DESTDIR’ overrides is not required by the GNU Coding Standards, and does not work on platforms that have drive letters. On the other hand, it does better at avoiding recompilation issues, and works well even -when some directory options were not specified in terms of '${prefix}' -at 'configure' time. +when some directory options were not specified in terms of ‘${prefix}’ +at ‘configure’ time. Optional Features ================= If the package supports it, you can cause programs to be installed -with an extra prefix or suffix on their names by giving 'configure' the -option '--program-prefix=PREFIX' or '--program-suffix=SUFFIX'. - - Some packages pay attention to '--enable-FEATURE' options to -'configure', where FEATURE indicates an optional part of the package. -They may also pay attention to '--with-PACKAGE' options, where PACKAGE -is something like 'gnu-as' or 'x' (for the X Window System). The -'README' should mention any '--enable-' and '--with-' options that the +with an extra prefix or suffix on their names by giving ‘configure’ the +option ‘--program-prefix=PREFIX’ or ‘--program-suffix=SUFFIX’. + + Some packages pay attention to ‘--enable-FEATURE’ options to +‘configure’, where FEATURE indicates an optional part of the package. +They may also pay attention to ‘--with-PACKAGE’ options, where PACKAGE +is something like ‘gnu-as’ or ‘x’ (for the X Window System). The +‘README’ should mention any ‘--enable-’ and ‘--with-’ options that the package recognizes. - For packages that use the X Window System, 'configure' can usually -find the X include and library files automatically, but if it doesn't, -you can use the 'configure' options '--x-includes=DIR' and -'--x-libraries=DIR' to specify their locations. + For packages that use the X Window System, ‘configure’ can usually +find the X include and library files automatically, but if it doesn’t, +you can use the ‘configure’ options ‘--x-includes=DIR’ and +‘--x-libraries=DIR’ to specify their locations. Some packages offer the ability to configure how verbose the -execution of 'make' will be. For these packages, running './configure ---enable-silent-rules' sets the default to minimal output, which can be -overridden with 'make V=1'; while running './configure ---disable-silent-rules' sets the default to verbose, which can be -overridden with 'make V=0'. +execution of ‘make’ will be. For these packages, running ‘./configure +--enable-silent-rules’ sets the default to minimal output, which can be +overridden with ‘make V=1’; while running ‘./configure +--disable-silent-rules’ sets the default to verbose, which can be +overridden with ‘make V=0’. Particular systems ================== @@ -223,43 +223,43 @@ order to use an ANSI C compiler: ./configure CC="cc -Ae -D_XOPEN_SOURCE=500" -and if that doesn't work, install pre-built binaries of GCC for HP-UX. +and if that doesn’t work, install pre-built binaries of GCC for HP-UX. - HP-UX 'make' updates targets which have the same timestamps as their + HP-UX ‘make’ updates targets which have the same timestamps as their prerequisites, which makes it generally unusable when shipped generated -files such as 'configure' are involved. Use GNU 'make' instead. +files such as ‘configure’ are involved. Use GNU ‘make’ instead. On OSF/1 a.k.a. Tru64, some versions of the default C compiler cannot -parse its '<wchar.h>' header file. The option '-nodtk' can be used as a +parse its ‘<wchar.h>’ header file. The option ‘-nodtk’ can be used as a workaround. If GNU CC is not installed, it is therefore recommended to try ./configure CC="cc" -and if that doesn't work, try +and if that doesn’t work, try ./configure CC="cc -nodtk" - On Solaris, don't put '/usr/ucb' early in your 'PATH'. This + On Solaris, don’t put ‘/usr/ucb’ early in your ‘PATH’. This directory contains several dysfunctional programs; working variants of -these programs are available in '/usr/bin'. So, if you need '/usr/ucb' -in your 'PATH', put it _after_ '/usr/bin'. +these programs are available in ‘/usr/bin’. So, if you need ‘/usr/ucb’ +in your ‘PATH’, put it _after_ ‘/usr/bin’. - On Haiku, software installed for all users goes in '/boot/common', -not '/usr/local'. It is recommended to use the following options: + On Haiku, software installed for all users goes in ‘/boot/common’, +not ‘/usr/local’. It is recommended to use the following options: ./configure --prefix=/boot/common Specifying the System Type ========================== - There may be some features 'configure' cannot figure out + There may be some features ‘configure’ cannot figure out automatically, but needs to determine by the type of machine the package will run on. Usually, assuming the package is built to be run on the -_same_ architectures, 'configure' can figure that out, but if it prints +_same_ architectures, ‘configure’ can figure that out, but if it prints a message saying it cannot guess the machine type, give it the -'--build=TYPE' option. TYPE can either be a short name for the system -type, such as 'sun4', or a canonical name which has the form: +‘--build=TYPE’ option. TYPE can either be a short name for the system +type, such as ‘sun4’, or a canonical name which has the form: CPU-COMPANY-SYSTEM @@ -268,101 +268,101 @@ where SYSTEM can have one of these forms: OS KERNEL-OS - See the file 'config.sub' for the possible values of each field. If -'config.sub' isn't included in this package, then this package doesn't + See the file ‘config.sub’ for the possible values of each field. If +‘config.sub’ isn’t included in this package, then this package doesn’t need to know the machine type. If you are _building_ compiler tools for cross-compiling, you should -use the option '--target=TYPE' to select the type of system they will +use the option ‘--target=TYPE’ to select the type of system they will produce code for. If you want to _use_ a cross compiler, that generates code for a platform different from the build platform, you should specify the -"host" platform (i.e., that on which the generated programs will -eventually be run) with '--host=TYPE'. +“host†platform (i.e., that on which the generated programs will +eventually be run) with ‘--host=TYPE’. Sharing Defaults ================ - If you want to set default values for 'configure' scripts to share, -you can create a site shell script called 'config.site' that gives -default values for variables like 'CC', 'cache_file', and 'prefix'. -'configure' looks for 'PREFIX/share/config.site' if it exists, then -'PREFIX/etc/config.site' if it exists. Or, you can set the -'CONFIG_SITE' environment variable to the location of the site script. -A warning: not all 'configure' scripts look for a site script. + If you want to set default values for ‘configure’ scripts to share, +you can create a site shell script called ‘config.site’ that gives +default values for variables like ‘CC’, ‘cache_file’, and ‘prefix’. +‘configure’ looks for ‘PREFIX/share/config.site’ if it exists, then +‘PREFIX/etc/config.site’ if it exists. Or, you can set the +‘CONFIG_SITE’ environment variable to the location of the site script. +A warning: not all ‘configure’ scripts look for a site script. Defining Variables ================== Variables not defined in a site shell script can be set in the -environment passed to 'configure'. However, some packages may run +environment passed to ‘configure’. However, some packages may run configure again during the build, and the customized values of these variables may be lost. In order to avoid this problem, you should set -them in the 'configure' command line, using 'VAR=value'. For example: +them in the ‘configure’ command line, using ‘VAR=value’. For example: ./configure CC=/usr/local2/bin/gcc -causes the specified 'gcc' to be used as the C compiler (unless it is +causes the specified ‘gcc’ to be used as the C compiler (unless it is overridden in the site shell script). -Unfortunately, this technique does not work for 'CONFIG_SHELL' due to an +Unfortunately, this technique does not work for ‘CONFIG_SHELL’ due to an Autoconf limitation. Until the limitation is lifted, you can use this workaround: CONFIG_SHELL=/bin/bash ./configure CONFIG_SHELL=/bin/bash -'configure' Invocation +‘configure’ Invocation ====================== - 'configure' recognizes the following options to control how it + ‘configure’ recognizes the following options to control how it operates. -'--help' -'-h' - Print a summary of all of the options to 'configure', and exit. +‘--help’ +‘-h’ + Print a summary of all of the options to ‘configure’, and exit. -'--help=short' -'--help=recursive' - Print a summary of the options unique to this package's - 'configure', and exit. The 'short' variant lists options used only - in the top level, while the 'recursive' variant lists options also +‘--help=short’ +‘--help=recursive’ + Print a summary of the options unique to this package’s + ‘configure’, and exit. The ‘short’ variant lists options used only + in the top level, while the ‘recursive’ variant lists options also present in any nested packages. -'--version' -'-V' - Print the version of Autoconf used to generate the 'configure' +‘--version’ +‘-V’ + Print the version of Autoconf used to generate the ‘configure’ script, and exit. -'--cache-file=FILE' +‘--cache-file=FILE’ Enable the cache: use and save the results of the tests in FILE, - traditionally 'config.cache'. FILE defaults to '/dev/null' to + traditionally ‘config.cache’. FILE defaults to ‘/dev/null’ to disable caching. -'--config-cache' -'-C' - Alias for '--cache-file=config.cache'. +‘--config-cache’ +‘-C’ + Alias for ‘--cache-file=config.cache’. -'--quiet' -'--silent' -'-q' +‘--quiet’ +‘--silent’ +‘-q’ Do not print messages saying which checks are being made. To - suppress all normal output, redirect it to '/dev/null' (any error + suppress all normal output, redirect it to ‘/dev/null’ (any error messages will still be shown). -'--srcdir=DIR' - Look for the package's source code in directory DIR. Usually - 'configure' can determine that directory automatically. +‘--srcdir=DIR’ + Look for the package’s source code in directory DIR. Usually + ‘configure’ can determine that directory automatically. -'--prefix=DIR' +‘--prefix=DIR’ Use DIR as the installation prefix. *note Installation Names:: for more details, including other options available for fine-tuning the installation locations. -'--no-create' -'-n' +‘--no-create’ +‘-n’ Run the configure checks, but stop before creating any output files. -'configure' also accepts some other, not widely useful, options. Run -'configure --help' for more details. +‘configure’ also accepts some other, not widely useful, options. Run +‘configure --help’ for more details. diff --git a/Makefile.in b/Makefile.in index 3d4fcff..fc6b600 100644 --- a/Makefile.in +++ b/Makefile.in @@ -70,9 +70,6 @@ am__make_running_with_option = \ test $$has_opt = yes am__make_dryrun = (target_option=n; $(am__make_running_with_option)) am__make_keepgoing = (target_option=k; $(am__make_running_with_option)) -pkgdatadir = $(datadir)/@PACKAGE@ -pkgincludedir = $(includedir)/@PACKAGE@ -pkglibdir = $(libdir)/@PACKAGE@ am__cd = CDPATH="$${ZSH_VERSION+.}$(PATH_SEPARATOR)" && cd install_sh_DATA = $(install_sh) -c -m 644 install_sh_PROGRAM = $(install_sh) -c @@ -93,7 +90,9 @@ am__aclocal_m4_deps = $(top_srcdir)/m4/00gnulib.m4 \ $(top_srcdir)/m4/__inline.m4 \ $(top_srcdir)/m4/absolute-header.m4 $(top_srcdir)/m4/alloca.m4 \ $(top_srcdir)/m4/arpa_inet_h.m4 $(top_srcdir)/m4/assert.m4 \ - $(top_srcdir)/m4/btowc.m4 $(top_srcdir)/m4/builtin-expect.m4 \ + $(top_srcdir)/m4/assert_h.m4 $(top_srcdir)/m4/btowc.m4 \ + $(top_srcdir)/m4/build-to-host.m4 \ + $(top_srcdir)/m4/builtin-expect.m4 $(top_srcdir)/m4/c-bool.m4 \ $(top_srcdir)/m4/calloc.m4 $(top_srcdir)/m4/canonicalize.m4 \ $(top_srcdir)/m4/clock_time.m4 $(top_srcdir)/m4/close.m4 \ $(top_srcdir)/m4/codeset.m4 $(top_srcdir)/m4/config-h.m4 \ @@ -101,7 +100,7 @@ am__aclocal_m4_deps = $(top_srcdir)/m4/00gnulib.m4 \ $(top_srcdir)/m4/double-slash-root.m4 $(top_srcdir)/m4/dup2.m4 \ $(top_srcdir)/m4/eealloc.m4 $(top_srcdir)/m4/environ.m4 \ $(top_srcdir)/m4/errno_h.m4 $(top_srcdir)/m4/error.m4 \ - $(top_srcdir)/m4/extensions.m4 \ + $(top_srcdir)/m4/error_h.m4 $(top_srcdir)/m4/extensions.m4 \ $(top_srcdir)/m4/extern-inline.m4 $(top_srcdir)/m4/fcntl-o.m4 \ $(top_srcdir)/m4/fcntl.m4 $(top_srcdir)/m4/fcntl_h.m4 \ $(top_srcdir)/m4/fdopen.m4 $(top_srcdir)/m4/flexmember.m4 \ @@ -133,10 +132,11 @@ am__aclocal_m4_deps = $(top_srcdir)/m4/00gnulib.m4 \ $(top_srcdir)/m4/malloc.m4 $(top_srcdir)/m4/malloca.m4 \ $(top_srcdir)/m4/manywarnings.m4 $(top_srcdir)/m4/mbrtowc.m4 \ $(top_srcdir)/m4/mbsinit.m4 $(top_srcdir)/m4/mbstate_t.m4 \ - $(top_srcdir)/m4/mbtowc.m4 $(top_srcdir)/m4/mempcpy.m4 \ - $(top_srcdir)/m4/minmax.m4 $(top_srcdir)/m4/mkdir.m4 \ - $(top_srcdir)/m4/mkstemp.m4 $(top_srcdir)/m4/mmap-anon.m4 \ - $(top_srcdir)/m4/mode_t.m4 $(top_srcdir)/m4/msvc-inval.m4 \ + $(top_srcdir)/m4/mbtowc.m4 $(top_srcdir)/m4/memchr.m4 \ + $(top_srcdir)/m4/mempcpy.m4 $(top_srcdir)/m4/minmax.m4 \ + $(top_srcdir)/m4/mkdir.m4 $(top_srcdir)/m4/mkstemp.m4 \ + $(top_srcdir)/m4/mmap-anon.m4 $(top_srcdir)/m4/mode_t.m4 \ + $(top_srcdir)/m4/msvc-inval.m4 \ $(top_srcdir)/m4/msvc-nothrow.m4 $(top_srcdir)/m4/multiarch.m4 \ $(top_srcdir)/m4/musl.m4 $(top_srcdir)/m4/nanosleep.m4 \ $(top_srcdir)/m4/netinet_in_h.m4 \ @@ -167,29 +167,29 @@ am__aclocal_m4_deps = $(top_srcdir)/m4/00gnulib.m4 \ $(top_srcdir)/m4/socklen.m4 $(top_srcdir)/m4/sockpfaf.m4 \ $(top_srcdir)/m4/ssize_t.m4 $(top_srcdir)/m4/stat-time.m4 \ $(top_srcdir)/m4/stat.m4 $(top_srcdir)/m4/stdalign.m4 \ - $(top_srcdir)/m4/stdarg.m4 $(top_srcdir)/m4/stdbool.m4 \ - $(top_srcdir)/m4/stddef_h.m4 $(top_srcdir)/m4/stdint.m4 \ - $(top_srcdir)/m4/stdio_h.m4 $(top_srcdir)/m4/stdlib_h.m4 \ - $(top_srcdir)/m4/strdup.m4 $(top_srcdir)/m4/strerror.m4 \ - $(top_srcdir)/m4/strerror_r.m4 $(top_srcdir)/m4/string_h.m4 \ - $(top_srcdir)/m4/strtoll.m4 $(top_srcdir)/m4/strtoull.m4 \ - $(top_srcdir)/m4/symlink.m4 $(top_srcdir)/m4/sys_ioctl_h.m4 \ + $(top_srcdir)/m4/stdarg.m4 $(top_srcdir)/m4/stddef_h.m4 \ + $(top_srcdir)/m4/stdint.m4 $(top_srcdir)/m4/stdio_h.m4 \ + $(top_srcdir)/m4/stdlib_h.m4 $(top_srcdir)/m4/strdup.m4 \ + $(top_srcdir)/m4/strerror.m4 $(top_srcdir)/m4/strerror_r.m4 \ + $(top_srcdir)/m4/string_h.m4 $(top_srcdir)/m4/strtoll.m4 \ + $(top_srcdir)/m4/strtoull.m4 $(top_srcdir)/m4/symlink.m4 \ + $(top_srcdir)/m4/sys_ioctl_h.m4 \ $(top_srcdir)/m4/sys_random_h.m4 \ $(top_srcdir)/m4/sys_select_h.m4 \ $(top_srcdir)/m4/sys_socket_h.m4 \ $(top_srcdir)/m4/sys_stat_h.m4 $(top_srcdir)/m4/sys_time_h.m4 \ $(top_srcdir)/m4/sys_types_h.m4 $(top_srcdir)/m4/sys_uio_h.m4 \ $(top_srcdir)/m4/tempname.m4 $(top_srcdir)/m4/thread.m4 \ - $(top_srcdir)/m4/threadlib.m4 $(top_srcdir)/m4/time_h.m4 \ - $(top_srcdir)/m4/unistd_h.m4 $(top_srcdir)/m4/unlink.m4 \ - $(top_srcdir)/m4/unlinkdir.m4 $(top_srcdir)/m4/usleep.m4 \ - $(top_srcdir)/m4/version-etc.m4 $(top_srcdir)/m4/visibility.m4 \ - $(top_srcdir)/m4/warn-on-use.m4 $(top_srcdir)/m4/warnings.m4 \ - $(top_srcdir)/m4/wchar_h.m4 $(top_srcdir)/m4/wchar_t.m4 \ - $(top_srcdir)/m4/wcrtomb.m4 $(top_srcdir)/m4/wctob.m4 \ - $(top_srcdir)/m4/wctomb.m4 $(top_srcdir)/m4/wctype_h.m4 \ - $(top_srcdir)/m4/wint_t.m4 $(top_srcdir)/m4/xalloc.m4 \ - $(top_srcdir)/m4/xstrtol.m4 $(top_srcdir)/m4/year2038.m4 \ + $(top_srcdir)/m4/threadlib.m4 $(top_srcdir)/m4/time.m4 \ + $(top_srcdir)/m4/time_h.m4 $(top_srcdir)/m4/unistd_h.m4 \ + $(top_srcdir)/m4/unlink.m4 $(top_srcdir)/m4/unlinkdir.m4 \ + $(top_srcdir)/m4/usleep.m4 $(top_srcdir)/m4/version-etc.m4 \ + $(top_srcdir)/m4/visibility.m4 $(top_srcdir)/m4/warn-on-use.m4 \ + $(top_srcdir)/m4/warnings.m4 $(top_srcdir)/m4/wchar_h.m4 \ + $(top_srcdir)/m4/wchar_t.m4 $(top_srcdir)/m4/wcrtomb.m4 \ + $(top_srcdir)/m4/wctob.m4 $(top_srcdir)/m4/wctomb.m4 \ + $(top_srcdir)/m4/wctype_h.m4 $(top_srcdir)/m4/wint_t.m4 \ + $(top_srcdir)/m4/xalloc.m4 $(top_srcdir)/m4/xstrtol.m4 \ $(top_srcdir)/m4/yield.m4 $(top_srcdir)/m4/zzgnulib.m4 \ $(top_srcdir)/configure.ac am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \ @@ -342,6 +342,9 @@ distuninstallcheck_listfiles = find . -type f -print am__distuninstallcheck_listfiles = $(distuninstallcheck_listfiles) \ | sed 's|^\./|$(prefix)/|' | grep -v '$(infodir)/dir$$' distcleancheck_listfiles = find . -type f -print +pkgdatadir = @pkgdatadir@ +pkgincludedir = @pkgincludedir@ +pkglibdir = @pkglibdir@ pkglibexecdir = @pkglibexecdir@ ACLOCAL = @ACLOCAL@ ALLOCA = @ALLOCA@ @@ -351,6 +354,7 @@ AM_DEFAULT_VERBOSITY = @AM_DEFAULT_VERBOSITY@ APPLE_UNIVERSAL_BUILD = @APPLE_UNIVERSAL_BUILD@ AR = @AR@ ARFLAGS = @ARFLAGS@ +ASSERT_H = @ASSERT_H@ AUTOCONF = @AUTOCONF@ AUTOHEADER = @AUTOHEADER@ AUTOMAKE = @AUTOMAKE@ @@ -367,6 +371,7 @@ CFLAGS = @CFLAGS@ CFLAG_VISIBILITY = @CFLAG_VISIBILITY@ CHECK_CFLAGS = @CHECK_CFLAGS@ CHECK_LIBS = @CHECK_LIBS@ +CLOCK_TIME_LIB = @CLOCK_TIME_LIB@ CONFIG_INCLUDE = @CONFIG_INCLUDE@ CPP = @CPP@ CPPFLAGS = @CPPFLAGS@ @@ -391,12 +396,14 @@ ENOLINK_VALUE = @ENOLINK_VALUE@ EOVERFLOW_HIDDEN = @EOVERFLOW_HIDDEN@ EOVERFLOW_VALUE = @EOVERFLOW_VALUE@ ERRNO_H = @ERRNO_H@ +ERROR_H = @ERROR_H@ ETAGS = @ETAGS@ EXEEXT = @EXEEXT@ FGREP = @FGREP@ FILECMD = @FILECMD@ GETOPT_CDEFS_H = @GETOPT_CDEFS_H@ GETOPT_H = @GETOPT_H@ +GETRANDOM_LIB = @GETRANDOM_LIB@ GETTEXT_MACRO_VERSION = @GETTEXT_MACRO_VERSION@ GL_CFLAG_ALLOW_WARNINGS = @GL_CFLAG_ALLOW_WARNINGS@ GL_CFLAG_GNULIB_WARNINGS = @GL_CFLAG_GNULIB_WARNINGS@ @@ -412,6 +419,7 @@ GL_GNULIB_CALLOC_GNU = @GL_GNULIB_CALLOC_GNU@ GL_GNULIB_CALLOC_POSIX = @GL_GNULIB_CALLOC_POSIX@ GL_GNULIB_CANONICALIZE_FILE_NAME = @GL_GNULIB_CANONICALIZE_FILE_NAME@ GL_GNULIB_CHDIR = @GL_GNULIB_CHDIR@ +GL_GNULIB_CHMOD = @GL_GNULIB_CHMOD@ GL_GNULIB_CHOWN = @GL_GNULIB_CHOWN@ GL_GNULIB_CLOSE = @GL_GNULIB_CLOSE@ GL_GNULIB_CONNECT = @GL_GNULIB_CONNECT@ @@ -485,6 +493,7 @@ GL_GNULIB_GETPAGESIZE = @GL_GNULIB_GETPAGESIZE@ GL_GNULIB_GETPASS = @GL_GNULIB_GETPASS@ GL_GNULIB_GETPASS_GNU = @GL_GNULIB_GETPASS_GNU@ GL_GNULIB_GETPEERNAME = @GL_GNULIB_GETPEERNAME@ +GL_GNULIB_GETPROGNAME = @GL_GNULIB_GETPROGNAME@ GL_GNULIB_GETRANDOM = @GL_GNULIB_GETRANDOM@ GL_GNULIB_GETSOCKNAME = @GL_GNULIB_GETSOCKNAME@ GL_GNULIB_GETSOCKOPT = @GL_GNULIB_GETSOCKOPT@ @@ -582,6 +591,7 @@ GL_GNULIB_MEMCHR = @GL_GNULIB_MEMCHR@ GL_GNULIB_MEMMEM = @GL_GNULIB_MEMMEM@ GL_GNULIB_MEMPCPY = @GL_GNULIB_MEMPCPY@ GL_GNULIB_MEMRCHR = @GL_GNULIB_MEMRCHR@ +GL_GNULIB_MEMSET_EXPLICIT = @GL_GNULIB_MEMSET_EXPLICIT@ GL_GNULIB_MKDIR = @GL_GNULIB_MKDIR@ GL_GNULIB_MKDIRAT = @GL_GNULIB_MKDIRAT@ GL_GNULIB_MKDTEMP = @GL_GNULIB_MKDTEMP@ @@ -702,6 +712,7 @@ GL_GNULIB_STRVERSCMP = @GL_GNULIB_STRVERSCMP@ GL_GNULIB_SYMLINK = @GL_GNULIB_SYMLINK@ GL_GNULIB_SYMLINKAT = @GL_GNULIB_SYMLINKAT@ GL_GNULIB_SYSTEM_POSIX = @GL_GNULIB_SYSTEM_POSIX@ +GL_GNULIB_TIME = @GL_GNULIB_TIME@ GL_GNULIB_TIMEGM = @GL_GNULIB_TIMEGM@ GL_GNULIB_TIMESPEC_GET = @GL_GNULIB_TIMESPEC_GET@ GL_GNULIB_TIMESPEC_GETRES = @GL_GNULIB_TIMESPEC_GETRES@ @@ -776,6 +787,7 @@ GMSGFMT_015 = @GMSGFMT_015@ GNULIBHEADERS_OVERRIDE_WINT_T = @GNULIBHEADERS_OVERRIDE_WINT_T@ GNULIB_GETTIMEOFDAY = @GNULIB_GETTIMEOFDAY@ GREP = @GREP@ +HARD_LOCALE_LIB = @HARD_LOCALE_LIB@ HAVE_ACCEPT4 = @HAVE_ACCEPT4@ HAVE_ALIGNED_ALLOC = @HAVE_ALIGNED_ALLOC@ HAVE_ALLOCA_H = @HAVE_ALLOCA_H@ @@ -806,6 +818,7 @@ HAVE_DECL_GETLOGIN = @HAVE_DECL_GETLOGIN@ HAVE_DECL_GETLOGIN_R = @HAVE_DECL_GETLOGIN_R@ HAVE_DECL_GETPAGESIZE = @HAVE_DECL_GETPAGESIZE@ HAVE_DECL_GETUSERSHELL = @HAVE_DECL_GETUSERSHELL@ +HAVE_DECL_GETW = @HAVE_DECL_GETW@ HAVE_DECL_IMAXABS = @HAVE_DECL_IMAXABS@ HAVE_DECL_IMAXDIV = @HAVE_DECL_IMAXDIV@ HAVE_DECL_INET_NTOP = @HAVE_DECL_INET_NTOP@ @@ -815,6 +828,7 @@ HAVE_DECL_LOCALTIME_R = @HAVE_DECL_LOCALTIME_R@ HAVE_DECL_MEMMEM = @HAVE_DECL_MEMMEM@ HAVE_DECL_MEMRCHR = @HAVE_DECL_MEMRCHR@ HAVE_DECL_OBSTACK_PRINTF = @HAVE_DECL_OBSTACK_PRINTF@ +HAVE_DECL_PUTW = @HAVE_DECL_PUTW@ HAVE_DECL_SETENV = @HAVE_DECL_SETENV@ HAVE_DECL_SETHOSTNAME = @HAVE_DECL_SETHOSTNAME@ HAVE_DECL_SETSTATE = @HAVE_DECL_SETSTATE@ @@ -837,6 +851,9 @@ HAVE_DECL_WCWIDTH = @HAVE_DECL_WCWIDTH@ HAVE_DPRINTF = @HAVE_DPRINTF@ HAVE_DUP3 = @HAVE_DUP3@ HAVE_DUPLOCALE = @HAVE_DUPLOCALE@ +HAVE_ERROR = @HAVE_ERROR@ +HAVE_ERROR_AT_LINE = @HAVE_ERROR_AT_LINE@ +HAVE_ERROR_H = @HAVE_ERROR_H@ HAVE_EUIDACCESS = @HAVE_EUIDACCESS@ HAVE_EXECVPE = @HAVE_EXECVPE@ HAVE_EXPLICIT_BZERO = @HAVE_EXPLICIT_BZERO@ @@ -864,12 +881,15 @@ HAVE_GETLOGIN = @HAVE_GETLOGIN@ HAVE_GETOPT_H = @HAVE_GETOPT_H@ HAVE_GETPAGESIZE = @HAVE_GETPAGESIZE@ HAVE_GETPASS = @HAVE_GETPASS@ +HAVE_GETPROGNAME = @HAVE_GETPROGNAME@ HAVE_GETRANDOM = @HAVE_GETRANDOM@ HAVE_GETSUBOPT = @HAVE_GETSUBOPT@ HAVE_GETTIMEOFDAY = @HAVE_GETTIMEOFDAY@ HAVE_GETUMASK = @HAVE_GETUMASK@ HAVE_GRANTPT = @HAVE_GRANTPT@ HAVE_GROUP_MEMBER = @HAVE_GROUP_MEMBER@ +HAVE_IMAXABS = @HAVE_IMAXABS@ +HAVE_IMAXDIV = @HAVE_IMAXDIV@ HAVE_IMAXDIV_T = @HAVE_IMAXDIV_T@ HAVE_INITSTATE = @HAVE_INITSTATE@ HAVE_INTTYPES_H = @HAVE_INTTYPES_H@ @@ -896,6 +916,7 @@ HAVE_MBSNRTOWCS = @HAVE_MBSNRTOWCS@ HAVE_MBSRTOWCS = @HAVE_MBSRTOWCS@ HAVE_MBTOWC = @HAVE_MBTOWC@ HAVE_MEMPCPY = @HAVE_MEMPCPY@ +HAVE_MEMSET_EXPLICIT = @HAVE_MEMSET_EXPLICIT@ HAVE_MKDIRAT = @HAVE_MKDIRAT@ HAVE_MKDTEMP = @HAVE_MKDTEMP@ HAVE_MKFIFO = @HAVE_MKFIFO@ @@ -1104,7 +1125,6 @@ HAVE_WMEMPCPY = @HAVE_WMEMPCPY@ HAVE_WMEMSET = @HAVE_WMEMSET@ HAVE_WS2TCPIP_H = @HAVE_WS2TCPIP_H@ HAVE_XLOCALE_H = @HAVE_XLOCALE_H@ -HAVE__BOOL = @HAVE__BOOL@ HAVE__EXIT = @HAVE__EXIT@ IGNORE_UNUSED_LIBRARIES_CFLAGS = @IGNORE_UNUSED_LIBRARIES_CFLAGS@ INCLUDE_NEXT = @INCLUDE_NEXT@ @@ -1171,15 +1191,20 @@ LT_REVISION = @LT_REVISION@ LT_SYS_LIBRARY_PATH = @LT_SYS_LIBRARY_PATH@ MAKEINFO = @MAKEINFO@ MANIFEST_TOOL = @MANIFEST_TOOL@ +MBRTOWC_LIB = @MBRTOWC_LIB@ MKDIR_P = @MKDIR_P@ MSGFMT = @MSGFMT@ MSGFMT_015 = @MSGFMT_015@ MSGMERGE = @MSGMERGE@ +NANOSLEEP_LIB = @NANOSLEEP_LIB@ NETINET_IN_H = @NETINET_IN_H@ NEXT_ARPA_INET_H = @NEXT_ARPA_INET_H@ +NEXT_ASSERT_H = @NEXT_ASSERT_H@ NEXT_AS_FIRST_DIRECTIVE_ARPA_INET_H = @NEXT_AS_FIRST_DIRECTIVE_ARPA_INET_H@ +NEXT_AS_FIRST_DIRECTIVE_ASSERT_H = @NEXT_AS_FIRST_DIRECTIVE_ASSERT_H@ NEXT_AS_FIRST_DIRECTIVE_CTYPE_H = @NEXT_AS_FIRST_DIRECTIVE_CTYPE_H@ NEXT_AS_FIRST_DIRECTIVE_ERRNO_H = @NEXT_AS_FIRST_DIRECTIVE_ERRNO_H@ +NEXT_AS_FIRST_DIRECTIVE_ERROR_H = @NEXT_AS_FIRST_DIRECTIVE_ERROR_H@ NEXT_AS_FIRST_DIRECTIVE_FCNTL_H = @NEXT_AS_FIRST_DIRECTIVE_FCNTL_H@ NEXT_AS_FIRST_DIRECTIVE_GETOPT_H = @NEXT_AS_FIRST_DIRECTIVE_GETOPT_H@ NEXT_AS_FIRST_DIRECTIVE_INTTYPES_H = @NEXT_AS_FIRST_DIRECTIVE_INTTYPES_H@ @@ -1210,6 +1235,7 @@ NEXT_AS_FIRST_DIRECTIVE_WCHAR_H = @NEXT_AS_FIRST_DIRECTIVE_WCHAR_H@ NEXT_AS_FIRST_DIRECTIVE_WCTYPE_H = @NEXT_AS_FIRST_DIRECTIVE_WCTYPE_H@ NEXT_CTYPE_H = @NEXT_CTYPE_H@ NEXT_ERRNO_H = @NEXT_ERRNO_H@ +NEXT_ERROR_H = @NEXT_ERROR_H@ NEXT_FCNTL_H = @NEXT_FCNTL_H@ NEXT_GETOPT_H = @NEXT_GETOPT_H@ NEXT_INTTYPES_H = @NEXT_INTTYPES_H@ @@ -1265,6 +1291,7 @@ PRAGMA_COLUMNS = @PRAGMA_COLUMNS@ PRAGMA_SYSTEM_HEADER = @PRAGMA_SYSTEM_HEADER@ PRIPTR_PREFIX = @PRIPTR_PREFIX@ PTHREAD_H_DEFINES_STRUCT_TIMESPEC = @PTHREAD_H_DEFINES_STRUCT_TIMESPEC@ +PTHREAD_SIGMASK_LIB = @PTHREAD_SIGMASK_LIB@ PTRDIFF_T_SUFFIX = @PTRDIFF_T_SUFFIX@ RANLIB = @RANLIB@ REPLACE_ACCESS = @REPLACE_ACCESS@ @@ -1273,6 +1300,7 @@ REPLACE_BTOWC = @REPLACE_BTOWC@ REPLACE_CALLOC_FOR_CALLOC_GNU = @REPLACE_CALLOC_FOR_CALLOC_GNU@ REPLACE_CALLOC_FOR_CALLOC_POSIX = @REPLACE_CALLOC_FOR_CALLOC_POSIX@ REPLACE_CANONICALIZE_FILE_NAME = @REPLACE_CANONICALIZE_FILE_NAME@ +REPLACE_CHMOD = @REPLACE_CHMOD@ REPLACE_CHOWN = @REPLACE_CHOWN@ REPLACE_CLOSE = @REPLACE_CLOSE@ REPLACE_COPY_FILE_RANGE = @REPLACE_COPY_FILE_RANGE@ @@ -1281,7 +1309,10 @@ REPLACE_CTIME = @REPLACE_CTIME@ REPLACE_DPRINTF = @REPLACE_DPRINTF@ REPLACE_DUP = @REPLACE_DUP@ REPLACE_DUP2 = @REPLACE_DUP2@ +REPLACE_DUP3 = @REPLACE_DUP3@ REPLACE_DUPLOCALE = @REPLACE_DUPLOCALE@ +REPLACE_ERROR = @REPLACE_ERROR@ +REPLACE_ERROR_AT_LINE = @REPLACE_ERROR_AT_LINE@ REPLACE_EXECL = @REPLACE_EXECL@ REPLACE_EXECLE = @REPLACE_EXECLE@ REPLACE_EXECLP = @REPLACE_EXECLP@ @@ -1294,6 +1325,7 @@ REPLACE_FCHMODAT = @REPLACE_FCHMODAT@ REPLACE_FCHOWNAT = @REPLACE_FCHOWNAT@ REPLACE_FCLOSE = @REPLACE_FCLOSE@ REPLACE_FCNTL = @REPLACE_FCNTL@ +REPLACE_FDATASYNC = @REPLACE_FDATASYNC@ REPLACE_FDOPEN = @REPLACE_FDOPEN@ REPLACE_FFLUSH = @REPLACE_FFLUSH@ REPLACE_FFSLL = @REPLACE_FFSLL@ @@ -1316,15 +1348,21 @@ REPLACE_GETCWD = @REPLACE_GETCWD@ REPLACE_GETDELIM = @REPLACE_GETDELIM@ REPLACE_GETDOMAINNAME = @REPLACE_GETDOMAINNAME@ REPLACE_GETDTABLESIZE = @REPLACE_GETDTABLESIZE@ +REPLACE_GETENTROPY = @REPLACE_GETENTROPY@ REPLACE_GETGROUPS = @REPLACE_GETGROUPS@ REPLACE_GETLINE = @REPLACE_GETLINE@ +REPLACE_GETLOADAVG = @REPLACE_GETLOADAVG@ REPLACE_GETLOGIN_R = @REPLACE_GETLOGIN_R@ REPLACE_GETPAGESIZE = @REPLACE_GETPAGESIZE@ REPLACE_GETPASS = @REPLACE_GETPASS@ REPLACE_GETPASS_FOR_GETPASS_GNU = @REPLACE_GETPASS_FOR_GETPASS_GNU@ +REPLACE_GETPROGNAME = @REPLACE_GETPROGNAME@ REPLACE_GETRANDOM = @REPLACE_GETRANDOM@ +REPLACE_GETSUBOPT = @REPLACE_GETSUBOPT@ REPLACE_GETTIMEOFDAY = @REPLACE_GETTIMEOFDAY@ REPLACE_GMTIME = @REPLACE_GMTIME@ +REPLACE_IMAXABS = @REPLACE_IMAXABS@ +REPLACE_IMAXDIV = @REPLACE_IMAXDIV@ REPLACE_INET_NTOP = @REPLACE_INET_NTOP@ REPLACE_INET_PTON = @REPLACE_INET_PTON@ REPLACE_INITSTATE = @REPLACE_INITSTATE@ @@ -1353,11 +1391,14 @@ REPLACE_MBSTATE_T = @REPLACE_MBSTATE_T@ REPLACE_MBTOWC = @REPLACE_MBTOWC@ REPLACE_MEMCHR = @REPLACE_MEMCHR@ REPLACE_MEMMEM = @REPLACE_MEMMEM@ +REPLACE_MEMPCPY = @REPLACE_MEMPCPY@ REPLACE_MKDIR = @REPLACE_MKDIR@ REPLACE_MKFIFO = @REPLACE_MKFIFO@ REPLACE_MKFIFOAT = @REPLACE_MKFIFOAT@ REPLACE_MKNOD = @REPLACE_MKNOD@ REPLACE_MKNODAT = @REPLACE_MKNODAT@ +REPLACE_MKOSTEMP = @REPLACE_MKOSTEMP@ +REPLACE_MKOSTEMPS = @REPLACE_MKOSTEMPS@ REPLACE_MKSTEMP = @REPLACE_MKSTEMP@ REPLACE_MKTIME = @REPLACE_MKTIME@ REPLACE_NANOSLEEP = @REPLACE_NANOSLEEP@ @@ -1368,8 +1409,10 @@ REPLACE_OBSTACK_PRINTF = @REPLACE_OBSTACK_PRINTF@ REPLACE_OPEN = @REPLACE_OPEN@ REPLACE_OPENAT = @REPLACE_OPENAT@ REPLACE_PERROR = @REPLACE_PERROR@ +REPLACE_PIPE2 = @REPLACE_PIPE2@ REPLACE_POPEN = @REPLACE_POPEN@ REPLACE_POSIX_MEMALIGN = @REPLACE_POSIX_MEMALIGN@ +REPLACE_POSIX_OPENPT = @REPLACE_POSIX_OPENPT@ REPLACE_PREAD = @REPLACE_PREAD@ REPLACE_PRINTF = @REPLACE_PRINTF@ REPLACE_PSELECT = @REPLACE_PSELECT@ @@ -1447,6 +1490,7 @@ REPLACE_RMDIR = @REPLACE_RMDIR@ REPLACE_SCHED_YIELD = @REPLACE_SCHED_YIELD@ REPLACE_SELECT = @REPLACE_SELECT@ REPLACE_SETENV = @REPLACE_SETENV@ +REPLACE_SETHOSTNAME = @REPLACE_SETHOSTNAME@ REPLACE_SETLOCALE = @REPLACE_SETLOCALE@ REPLACE_SETSTATE = @REPLACE_SETSTATE@ REPLACE_SLEEP = @REPLACE_SLEEP@ @@ -1455,6 +1499,7 @@ REPLACE_SPRINTF = @REPLACE_SPRINTF@ REPLACE_STAT = @REPLACE_STAT@ REPLACE_STDIO_READ_FUNCS = @REPLACE_STDIO_READ_FUNCS@ REPLACE_STDIO_WRITE_FUNCS = @REPLACE_STDIO_WRITE_FUNCS@ +REPLACE_STPCPY = @REPLACE_STPCPY@ REPLACE_STPNCPY = @REPLACE_STPNCPY@ REPLACE_STRCASESTR = @REPLACE_STRCASESTR@ REPLACE_STRCHRNUL = @REPLACE_STRCHRNUL@ @@ -1481,7 +1526,9 @@ REPLACE_STRUCT_LCONV = @REPLACE_STRUCT_LCONV@ REPLACE_STRUCT_TIMEVAL = @REPLACE_STRUCT_TIMEVAL@ REPLACE_SYMLINK = @REPLACE_SYMLINK@ REPLACE_SYMLINKAT = @REPLACE_SYMLINKAT@ +REPLACE_TIME = @REPLACE_TIME@ REPLACE_TIMEGM = @REPLACE_TIMEGM@ +REPLACE_TIMESPEC_GET = @REPLACE_TIMESPEC_GET@ REPLACE_TMPFILE = @REPLACE_TMPFILE@ REPLACE_TOWLOWER = @REPLACE_TOWLOWER@ REPLACE_TRUNCATE = @REPLACE_TRUNCATE@ @@ -1507,15 +1554,20 @@ REPLACE_WCSWIDTH = @REPLACE_WCSWIDTH@ REPLACE_WCTOB = @REPLACE_WCTOB@ REPLACE_WCTOMB = @REPLACE_WCTOMB@ REPLACE_WCWIDTH = @REPLACE_WCWIDTH@ +REPLACE_WMEMPCPY = @REPLACE_WMEMPCPY@ REPLACE_WRITE = @REPLACE_WRITE@ +REPLACE__EXIT = @REPLACE__EXIT@ +SCHED_YIELD_LIB = @SCHED_YIELD_LIB@ SED = @SED@ +SELECT_LIB = @SELECT_LIB@ +SETLOCALE_LIB = @SETLOCALE_LIB@ +SETLOCALE_NULL_LIB = @SETLOCALE_NULL_LIB@ SET_MAKE = @SET_MAKE@ SHELL = @SHELL@ SIG_ATOMIC_T_SUFFIX = @SIG_ATOMIC_T_SUFFIX@ SIZE_T_SUFFIX = @SIZE_T_SUFFIX@ -STDALIGN_H = @STDALIGN_H@ STDARG_H = @STDARG_H@ -STDBOOL_H = @STDBOOL_H@ +STDCKDINT_H = @STDCKDINT_H@ STDDEF_H = @STDDEF_H@ STDINT_H = @STDINT_H@ STRIP = @STRIP@ @@ -1559,6 +1611,8 @@ am__quote = @am__quote@ am__tar = @am__tar@ am__untar = @am__untar@ bindir = @bindir@ +bindir_c = @bindir_c@ +bindir_c_make = @bindir_c_make@ build = @build@ build_alias = @build_alias@ build_cpu = @build_cpu@ @@ -1566,10 +1620,20 @@ build_os = @build_os@ build_vendor = @build_vendor@ builddir = @builddir@ datadir = @datadir@ +datadir_c = @datadir_c@ +datadir_c_make = @datadir_c_make@ datarootdir = @datarootdir@ +datarootdir_c = @datarootdir_c@ +datarootdir_c_make = @datarootdir_c_make@ docdir = @docdir@ +docdir_c = @docdir_c@ +docdir_c_make = @docdir_c_make@ dvidir = @dvidir@ +dvidir_c = @dvidir_c@ +dvidir_c_make = @dvidir_c_make@ exec_prefix = @exec_prefix@ +exec_prefix_c = @exec_prefix_c@ +exec_prefix_c_make = @exec_prefix_c_make@ gl_LIBOBJDEPS = @gl_LIBOBJDEPS@ gl_LIBOBJS = @gl_LIBOBJS@ gl_LTLIBOBJS = @gl_LTLIBOBJS@ @@ -1583,26 +1647,68 @@ host_cpu = @host_cpu@ host_os = @host_os@ host_vendor = @host_vendor@ htmldir = @htmldir@ +htmldir_c = @htmldir_c@ +htmldir_c_make = @htmldir_c_make@ includedir = @includedir@ +includedir_c = @includedir_c@ +includedir_c_make = @includedir_c_make@ infodir = @infodir@ +infodir_c = @infodir_c@ +infodir_c_make = @infodir_c_make@ install_sh = @install_sh@ libdir = @libdir@ +libdir_c = @libdir_c@ +libdir_c_make = @libdir_c_make@ libexecdir = @libexecdir@ +libexecdir_c = @libexecdir_c@ +libexecdir_c_make = @libexecdir_c_make@ lispdir = @lispdir@ +lispdir_c = @lispdir_c@ +lispdir_c_make = @lispdir_c_make@ localedir = @localedir@ +localedir_c = @localedir_c@ +localedir_c_make = @localedir_c_make@ localstatedir = @localstatedir@ +localstatedir_c = @localstatedir_c@ +localstatedir_c_make = @localstatedir_c_make@ mandir = @mandir@ +mandir_c = @mandir_c@ +mandir_c_make = @mandir_c_make@ mkdir_p = @mkdir_p@ oldincludedir = @oldincludedir@ +oldincludedir_c = @oldincludedir_c@ +oldincludedir_c_make = @oldincludedir_c_make@ pdfdir = @pdfdir@ +pdfdir_c = @pdfdir_c@ +pdfdir_c_make = @pdfdir_c_make@ +pkgdatadir_c = @pkgdatadir_c@ +pkgdatadir_c_make = @pkgdatadir_c_make@ +pkgincludedir_c = @pkgincludedir_c@ +pkgincludedir_c_make = @pkgincludedir_c_make@ +pkglibdir_c = @pkglibdir_c@ +pkglibdir_c_make = @pkglibdir_c_make@ +pkglibexecdir_c = @pkglibexecdir_c@ +pkglibexecdir_c_make = @pkglibexecdir_c_make@ prefix = @prefix@ +prefix_c = @prefix_c@ +prefix_c_make = @prefix_c_make@ program_transform_name = @program_transform_name@ psdir = @psdir@ +psdir_c = @psdir_c@ +psdir_c_make = @psdir_c_make@ runstatedir = @runstatedir@ +runstatedir_c = @runstatedir_c@ +runstatedir_c_make = @runstatedir_c_make@ sbindir = @sbindir@ +sbindir_c = @sbindir_c@ +sbindir_c_make = @sbindir_c_make@ sharedstatedir = @sharedstatedir@ +sharedstatedir_c = @sharedstatedir_c@ +sharedstatedir_c_make = @sharedstatedir_c_make@ srcdir = @srcdir@ sysconfdir = @sysconfdir@ +sysconfdir_c = @sysconfdir_c@ +sysconfdir_c_make = @sysconfdir_c_make@ target_alias = @target_alias@ top_build_prefix = @top_build_prefix@ top_builddir = @top_builddir@ @@ -1,5 +1,28 @@ GNU parted NEWS -*- outline -*- +* Noteworthy changes in release 3.6 (2023-04-10) [stable] + + Promoting alpha release to stable release 3.6 + +* Noteworthy changes in release 3.5.28 (2023-03-24) [alpha] + +** New Features + + Support GPT partition attribute bit 63 as no_automount flag. + + Add type commands to set type-id on MS-DOS and type-uuid on GPT. + + Add swap flag support to the dasd disklabel + + Add display of GPT disk and partition UUIDs in JSON output + + +** Bug Fixes + + Fix use of enums in flag limits by switching to using #define + + Fix ending sector location when using kibi IEC suffix + * Noteworthy changes in release 3.5 (2022-04-18) [stable] ** New Features @@ -978,7 +1001,7 @@ GNU parted NEWS -*- outline -*- ======================================================================== -Copyright (C) 2001-2014, 2019-2022 Free Software Foundation, Inc. +Copyright (C) 2001-2014, 2019-2023 Free Software Foundation, Inc. Permission is granted to copy, distribute and/or modify this document under the terms of the GNU Free Documentation License, Version 1.3 or @@ -1567,8 +1567,11 @@ m4_include([m4/absolute-header.m4]) m4_include([m4/alloca.m4]) m4_include([m4/arpa_inet_h.m4]) m4_include([m4/assert.m4]) +m4_include([m4/assert_h.m4]) m4_include([m4/btowc.m4]) +m4_include([m4/build-to-host.m4]) m4_include([m4/builtin-expect.m4]) +m4_include([m4/c-bool.m4]) m4_include([m4/calloc.m4]) m4_include([m4/canonicalize.m4]) m4_include([m4/clock_time.m4]) @@ -1583,6 +1586,7 @@ m4_include([m4/eealloc.m4]) m4_include([m4/environ.m4]) m4_include([m4/errno_h.m4]) m4_include([m4/error.m4]) +m4_include([m4/error_h.m4]) m4_include([m4/extensions.m4]) m4_include([m4/extern-inline.m4]) m4_include([m4/fcntl-o.m4]) @@ -1644,6 +1648,7 @@ m4_include([m4/mbrtowc.m4]) m4_include([m4/mbsinit.m4]) m4_include([m4/mbstate_t.m4]) m4_include([m4/mbtowc.m4]) +m4_include([m4/memchr.m4]) m4_include([m4/mempcpy.m4]) m4_include([m4/minmax.m4]) m4_include([m4/mkdir.m4]) @@ -1706,7 +1711,6 @@ m4_include([m4/stat-time.m4]) m4_include([m4/stat.m4]) m4_include([m4/stdalign.m4]) m4_include([m4/stdarg.m4]) -m4_include([m4/stdbool.m4]) m4_include([m4/stddef_h.m4]) m4_include([m4/stdint.m4]) m4_include([m4/stdio_h.m4]) @@ -1729,6 +1733,7 @@ m4_include([m4/sys_uio_h.m4]) m4_include([m4/tempname.m4]) m4_include([m4/thread.m4]) m4_include([m4/threadlib.m4]) +m4_include([m4/time.m4]) m4_include([m4/time_h.m4]) m4_include([m4/unistd_h.m4]) m4_include([m4/unlink.m4]) @@ -1747,6 +1752,5 @@ m4_include([m4/wctype_h.m4]) m4_include([m4/wint_t.m4]) m4_include([m4/xalloc.m4]) m4_include([m4/xstrtol.m4]) -m4_include([m4/year2038.m4]) m4_include([m4/yield.m4]) m4_include([m4/zzgnulib.m4]) diff --git a/build-aux/announce-gen b/build-aux/announce-gen index d88dda9..850619a 100755 --- a/build-aux/announce-gen +++ b/build-aux/announce-gen @@ -3,7 +3,7 @@ # Generate a release announcement message. -# Copyright (C) 2002-2022 Free Software Foundation, Inc. +# Copyright (C) 2002-2023 Free Software Foundation, Inc. # # This program is free software: you can redistribute it and/or modify # it under the terms of the GNU General Public License as published by @@ -35,7 +35,7 @@ eval 'exec perl -wSx "$0" "$@"' if 0; -my $VERSION = '2022-03-14 10:08'; # UTC +my $VERSION = '2023-02-26 17:15'; # UTC # The definition above must lie within the first 8 lines in order # for the Emacs time-stamp write hook (at end) to update it. # If you change this file with Emacs, please let the write hook @@ -165,6 +165,17 @@ Print the SHA1 and SHA256 signature section for each C<@file>. =cut +# This digest function omits the "=" padding that is required by cksum, +# so add the 0..2 bytes of padding required for each of Digest's algorithms. +sub digest_file_base64_wrap ($$) +{ + my ($file, $alg) = @_; + my $h = digest_file_base64($file, $alg); + $alg =~ tr{-}{}d; + my %pad = (MD5 => 2, SHA1 => 1, SHA256 => 1, SHA384 => 0, SHA512 => 2); + return $h . '=' x $pad{$alg}; +} + sub print_checksums (@) { my (@file) = @_; @@ -176,11 +187,11 @@ sub print_checksums (@) foreach my $f (@file) { - print digest_file_hex($f, "SHA-1"), " $f\n"; - print digest_file_base64($f, "SHA-256"), " $f\n"; + print ' ', digest_file_hex ($f, "SHA-1"), " $f\n"; + print ' ', digest_file_base64_wrap ($f, "SHA-256"), " $f\n"; } - print "\nThe SHA256 checksum is base64 encoded, instead of the\n"; - print "hexadecimal encoding that most checksum tools default to.\n\n"; + print "\nVerify the base64 SHA256 checksum with cksum -a sha256 --check\n"; + print "from coreutils-9.2 or OpenBSD's cksum since 2007.\n\n"; } =item C<print_news_deltas ($news_file, $prev_version, $curr_version) @@ -365,6 +376,38 @@ sub get_tool_versions ($$) return @tool_version_pair; } +# Print a more human-friendly representation of $SEC seconds. +sub readable_interval0($) +{ + my $sec = shift; + $sec < 60 and return "$sec seconds"; + + my $min = int($sec / 60); $sec %= 60; + 30 < $sec and $min++; + $min < 60 and return "$min minutes"; + + my $hr = int($min / 60); $min %= 60; + 30 < $min and $hr++; + $hr < 24 and return "$hr hours"; + + my $day = int($hr / 24); $hr %= 24; + 12 < $hr and $day++; + $day < 50 and return "$day days"; + + my $wk = int($day / 7); $day %= 7; + 4 < $day and $wk++; + return "$wk weeks"; +} + +# Convert e.g., "1 weeks", to "1 week". +sub readable_interval($) +{ + my $interval_str = shift; + my $i = readable_interval0 $interval_str; + $i =~ m{^1 \w+s$} and chop $i; + return $i; +} + { # Use the C locale so that, for instance, "du" does not # print "1,2" instead of "1.2", which would confuse our regexps. @@ -445,11 +488,15 @@ sub get_tool_versions ($$) my @tool_list = split ',', $bootstrap_tools if $bootstrap_tools; - grep (/^gnulib$/, @tool_list) ^ defined $gnulib_version + grep (/^gnulib$/, @tool_list) && ! defined $gnulib_version and (warn "when specifying gnulib as a tool, you must also specify\n" . "--gnulib-version=V, where V is the result of running git describe\n" . "in the gnulib source directory.\n"), $fail = 1; + ! grep (/^gnulib$/, @tool_list) && defined $gnulib_version + and (warn "with --gnulib-version=V you must use --bootstrap-tools=...\n" + . "including gnulib in that list"), $fail = 1; + !$release_type || exists $valid_release_types{$release_type} or (warn "'$release_type': invalid release type\n"), $fail = 1; @@ -489,16 +536,54 @@ sub get_tool_versions ($$) ${headers}Subject: $my_distdir released [$release_type] <\#secure method=pgpmime mode=sign> +This is to announce $package_name-$curr_version, a $release_type release. FIXME: put comments here EOF + my $v0 = $prev_version; + my $v1 = $curr_version; + + (my $first_name = `git config --global user.name|cut -d' ' -f1`) + =~ m{\S} or die "no name? set user.name in ~/.gitconfig\n"; + + chomp (my $n_ci = `git rev-list "v$v0..v$v1" | wc -l`); + chomp (my $n_p = `git shortlog "v$v0..v$v1" | grep -c '^[^ ]'`); + + my $prev_release_date = `git log --pretty=%ct -1 "v$v0"`; + my $this_release_date = `git log --pretty=%ct -1 "v$v1"`; + my $n_seconds = $this_release_date - $prev_release_date; + my $time_since_prev = readable_interval $n_seconds; + my $names = `git shortlog "v$v0..v$v1"|perl -lne '/^(\\w.*):/ and print " ".\$1'`; + + print <<EOF; +There have been $n_ci commits by $n_p people in the $time_since_prev since $v0. + +See the NEWS below for a brief summary. + +Thanks to everyone who has contributed! +The following people contributed changes to this release: + +$names +$first_name [on behalf of the $package_name maintainers] +================================================================== + +Here is the GNU $package_name home page: + http://gnu.org/s/$package_name/ + +For a summary of changes and contributors, see: + http://git.sv.gnu.org/gitweb/?p=$package_name.git;a=shortlog;h=v$v1 +or run this command from a git-cloned $package_name directory: + git shortlog v$v0..v$v1 + +EOF + if (@url_dir_list == 1 && @tarballs == 1) { # When there's only one tarball and one URL, use a more concise form. my $m = "$url_dir_list[0]/$tarballs[0]"; - print "Here are the compressed sources and a GPG detached signature[*]:\n" + print "Here are the compressed sources and a GPG detached signature:\n" . " $m\n" . " $m.sig\n\n"; } @@ -510,7 +595,7 @@ EOF . "please tell bug-gnulib\@gnu.org)", @url_dir_list, %size, $xd); my @sig_files = map { "$_.sig" } @tarballs; - print_locations ("GPG detached signatures[*]", @url_dir_list, %size, + print_locations ("GPG detached signatures", @url_dir_list, %size, @sig_files); } @@ -535,14 +620,29 @@ EOF and print_checksums (@sizable); print <<EOF; -[*] Use a .sig file to verify that the corresponding file (without the +Use a .sig file to verify that the corresponding file (without the .sig suffix) is intact. First, be sure to download both the .sig file and the corresponding tarball. Then, run a command like this: gpg --verify $tarballs[0].sig +EOF + my $gpg_fingerprint = `LC_ALL=C gpg --fingerprint $gpg_key_id | grep -v ^sub`; + if ($gpg_fingerprint =~ /^pub/) + { + chop $gpg_fingerprint; + $gpg_fingerprint =~ s/ \[expires:.*//mg; + $gpg_fingerprint =~ s/^uid \[ultimate\]/uid /mg; + $gpg_fingerprint =~ s/^/ /mg; + print<<EOF +The signature should match the fingerprint of the following key: + +$gpg_fingerprint +EOF + } + print <<EOF; If that command fails because you don't have the required public key, -or that public key has expired, try the following commands to update +or that public key has expired, try the following commands to retrieve or refresh it, and then rerun the 'gpg --verify' command. EOF if ($gpg_key_email) { @@ -560,7 +660,15 @@ EOF wget -q -O- '$gpg_keyring_url' | gpg --import - EOF - } + } + print <<EOF; + +As a last resort to find the key, you can try the official GNU +keyring: + + wget -q https://ftp.gnu.org/gnu/gnu-keyring.gpg + gpg --keyring gnu-keyring.gpg --verify $tarballs[0].sig +EOF my @tool_versions = get_tool_versions (\@tool_list, $gnulib_version); @tool_versions diff --git a/build-aux/config.guess b/build-aux/config.guess index 7f76b62..69188da 100755 --- a/build-aux/config.guess +++ b/build-aux/config.guess @@ -1,10 +1,10 @@ #! /bin/sh # Attempt to guess a canonical system name. -# Copyright 1992-2022 Free Software Foundation, Inc. +# Copyright 1992-2023 Free Software Foundation, Inc. # shellcheck disable=SC2006,SC2268 # see below for rationale -timestamp='2022-01-09' +timestamp='2023-01-01' # This file is free software; you can redistribute it and/or modify it # under the terms of the GNU General Public License as published by @@ -60,7 +60,7 @@ version="\ GNU config.guess ($timestamp) Originally written by Per Bothner. -Copyright 1992-2022 Free Software Foundation, Inc. +Copyright 1992-2023 Free Software Foundation, Inc. This is free software; see the source for copying conditions. There is NO warranty; not even for MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE." @@ -966,6 +966,12 @@ EOF GNU_REL=`echo "$UNAME_RELEASE" | sed -e 's/[-(].*//'` GUESS=$UNAME_MACHINE-unknown-$GNU_SYS$GNU_REL-$LIBC ;; + x86_64:[Mm]anagarm:*:*|i?86:[Mm]anagarm:*:*) + GUESS="$UNAME_MACHINE-pc-managarm-mlibc" + ;; + *:[Mm]anagarm:*:*) + GUESS="$UNAME_MACHINE-unknown-managarm-mlibc" + ;; *:Minix:*:*) GUESS=$UNAME_MACHINE-unknown-minix ;; @@ -1036,7 +1042,7 @@ EOF k1om:Linux:*:*) GUESS=$UNAME_MACHINE-unknown-linux-$LIBC ;; - loongarch32:Linux:*:* | loongarch64:Linux:*:* | loongarchx32:Linux:*:*) + loongarch32:Linux:*:* | loongarch64:Linux:*:*) GUESS=$UNAME_MACHINE-unknown-linux-$LIBC ;; m32r*:Linux:*:*) @@ -1151,16 +1157,27 @@ EOF ;; x86_64:Linux:*:*) set_cc_for_build + CPU=$UNAME_MACHINE LIBCABI=$LIBC if test "$CC_FOR_BUILD" != no_compiler_found; then - if (echo '#ifdef __ILP32__'; echo IS_X32; echo '#endif') | \ - (CCOPTS="" $CC_FOR_BUILD -E - 2>/dev/null) | \ - grep IS_X32 >/dev/null - then - LIBCABI=${LIBC}x32 - fi + ABI=64 + sed 's/^ //' << EOF > "$dummy.c" + #ifdef __i386__ + ABI=x86 + #else + #ifdef __ILP32__ + ABI=x32 + #endif + #endif +EOF + cc_set_abi=`$CC_FOR_BUILD -E "$dummy.c" 2>/dev/null | grep '^ABI' | sed 's, ,,g'` + eval "$cc_set_abi" + case $ABI in + x86) CPU=i686 ;; + x32) LIBCABI=${LIBC}x32 ;; + esac fi - GUESS=$UNAME_MACHINE-pc-linux-$LIBCABI + GUESS=$CPU-pc-linux-$LIBCABI ;; xtensa*:Linux:*:*) GUESS=$UNAME_MACHINE-unknown-linux-$LIBC @@ -1367,8 +1384,11 @@ EOF BePC:Haiku:*:*) # Haiku running on Intel PC compatible. GUESS=i586-pc-haiku ;; - x86_64:Haiku:*:*) - GUESS=x86_64-unknown-haiku + ppc:Haiku:*:*) # Haiku running on Apple PowerPC + GUESS=powerpc-apple-haiku + ;; + *:Haiku:*:*) # Haiku modern gcc (not bound by BeOS compat) + GUESS=$UNAME_MACHINE-unknown-haiku ;; SX-4:SUPER-UX:*:*) GUESS=sx4-nec-superux$UNAME_RELEASE diff --git a/build-aux/config.sub b/build-aux/config.sub index 9b62e37..de4259e 100755 --- a/build-aux/config.sub +++ b/build-aux/config.sub @@ -1,10 +1,10 @@ #! /bin/sh # Configuration validation subroutine script. -# Copyright 1992-2021 Free Software Foundation, Inc. +# Copyright 1992-2023 Free Software Foundation, Inc. # shellcheck disable=SC2006,SC2268 # see below for rationale -timestamp='2021-12-25' +timestamp='2023-01-21' # This file is free software; you can redistribute it and/or modify it # under the terms of the GNU General Public License as published by @@ -76,7 +76,7 @@ Report bugs and patches to <config-patches@gnu.org>." version="\ GNU config.sub ($timestamp) -Copyright 1992-2021 Free Software Foundation, Inc. +Copyright 1992-2023 Free Software Foundation, Inc. This is free software; see the source for copying conditions. There is NO warranty; not even for MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE." @@ -145,7 +145,7 @@ case $1 in nto-qnx* | linux-* | uclinux-uclibc* \ | uclinux-gnu* | kfreebsd*-gnu* | knetbsd*-gnu* | netbsd*-gnu* \ | netbsd*-eabi* | kopensolaris*-gnu* | cloudabi*-eabi* \ - | storm-chaos* | os2-emx* | rtmk-nova*) + | storm-chaos* | os2-emx* | rtmk-nova* | managarm-*) basic_machine=$field1 basic_os=$maybe_os ;; @@ -1075,7 +1075,7 @@ case $cpu-$vendor in pentium-* | p5-* | k5-* | k6-* | nexgen-* | viac3-*) cpu=i586 ;; - pentiumpro-* | p6-* | 6x86-* | athlon-* | athalon_*-*) + pentiumpro-* | p6-* | 6x86-* | athlon-* | athlon_*-*) cpu=i686 ;; pentiumii-* | pentium2-* | pentiumiii-* | pentium3-*) @@ -1207,7 +1207,7 @@ case $cpu-$vendor in | k1om \ | le32 | le64 \ | lm32 \ - | loongarch32 | loongarch64 | loongarchx32 \ + | loongarch32 | loongarch64 \ | m32c | m32r | m32rle \ | m5200 | m68000 | m680[012346]0 | m68360 | m683?2 | m68k \ | m6811 | m68hc11 | m6812 | m68hc12 | m68hcs12x \ @@ -1341,6 +1341,10 @@ EOF kernel=linux os=`echo "$basic_os" | sed -e 's|linux|gnu|'` ;; + managarm*) + kernel=managarm + os=`echo "$basic_os" | sed -e 's|managarm|mlibc|'` + ;; *) kernel= os=$basic_os @@ -1754,7 +1758,7 @@ case $os in | onefs* | tirtos* | phoenix* | fuchsia* | redox* | bme* \ | midnightbsd* | amdhsa* | unleashed* | emscripten* | wasi* \ | nsk* | powerunix* | genode* | zvmoe* | qnx* | emx* | zephyr* \ - | fiwix* ) + | fiwix* | mlibc* ) ;; # This one is extra strict with allowed versions sco3.2v2 | sco3.2v[4-9]* | sco5v6*) @@ -1762,6 +1766,9 @@ case $os in ;; none) ;; + kernel* ) + # Restricted further below + ;; *) echo Invalid configuration \`"$1"\': OS \`"$os"\' not recognized 1>&2 exit 1 @@ -1772,16 +1779,26 @@ esac # (given a valid OS), if there is a kernel. case $kernel-$os in linux-gnu* | linux-dietlibc* | linux-android* | linux-newlib* \ - | linux-musl* | linux-relibc* | linux-uclibc* ) + | linux-musl* | linux-relibc* | linux-uclibc* | linux-mlibc* ) ;; uclinux-uclibc* ) ;; - -dietlibc* | -newlib* | -musl* | -relibc* | -uclibc* ) + managarm-mlibc* | managarm-kernel* ) + ;; + -dietlibc* | -newlib* | -musl* | -relibc* | -uclibc* | -mlibc* ) # These are just libc implementations, not actual OSes, and thus # require a kernel. echo "Invalid configuration \`$1': libc \`$os' needs explicit kernel." 1>&2 exit 1 ;; + -kernel* ) + echo "Invalid configuration \`$1': \`$os' needs explicit kernel." 1>&2 + exit 1 + ;; + *-kernel* ) + echo "Invalid configuration \`$1': \`$kernel' does not support \`$os'." 1>&2 + exit 1 + ;; kfreebsd*-gnu* | kopensolaris*-gnu*) ;; vxworks-simlinux | vxworks-simwindows | vxworks-spe) diff --git a/build-aux/depcomp b/build-aux/depcomp index 75323b7..ce5c2f7 100755 --- a/build-aux/depcomp +++ b/build-aux/depcomp @@ -1,9 +1,9 @@ #! /bin/sh # depcomp - compile a program generating dependencies as side-effects -scriptversion=2018-03-07.03; # UTC +scriptversion=2022-09-18.14; # UTC -# Copyright (C) 1999-2022 Free Software Foundation, Inc. +# Copyright (C) 1999-2023 Free Software Foundation, Inc. # This program is free software; you can redistribute it and/or modify # it under the terms of the GNU General Public License as published by @@ -197,7 +197,7 @@ gcc3) ;; gcc) -## Note that this doesn't just cater to obsosete pre-3.x GCC compilers. +## Note that this doesn't just cater to obsolete pre-3.x GCC compilers. ## but also to in-use compilers like IMB xlc/xlC and the HP C compiler. ## (see the conditional assignment to $gccflag above). ## There are various ways to get dependency output from gcc. Here's diff --git a/build-aux/do-release-commit-and-tag b/build-aux/do-release-commit-and-tag index 493821a..3402bae 100755 --- a/build-aux/do-release-commit-and-tag +++ b/build-aux/do-release-commit-and-tag @@ -7,7 +7,7 @@ VERSION=2018-03-07.03 # UTC # Note: this is a bash script (could be zsh or dash) -# Copyright (C) 2009-2022 Free Software Foundation, Inc. +# Copyright (C) 2009-2023 Free Software Foundation, Inc. # This program is free software: you can redistribute it and/or modify # it under the terms of the GNU General Public License as published by @@ -125,7 +125,7 @@ prev_ver=$(cat .prev-version) \ || die 'failed to determine previous version number from .prev-version' # Verify that $ver is sensible (> .prev-version). -case $(printf "$prev_ver\n$ver\n"|sort -V -u|tr '\n' ':') in +case $(printf "%s\n%s\n" "$prev_ver" "$ver"|sort -V -u|tr '\n' ':') in "$prev_ver:$ver:") ;; *) die "invalid version: $ver (<= $prev_ver)";; esac @@ -165,7 +165,7 @@ perl -MPOSIX -ni -e 'my $today = strftime "%F", localtime time;' \ -e 'print $.==3 ? "$pfx $ver ($today) [$type]\n" : $_' \ NEWS || die 'failed to update NEWS' -printf "version $ver\n\n* NEWS: Record release date.\n" \ +printf "version %s\n\n* NEWS: Record release date.\n" "$ver" \ | git commit -F - -a || die 'git commit failed' git tag -s -m "$pkg $ver" v$ver HEAD || die 'git tag failed' diff --git a/build-aux/gendocs.sh b/build-aux/gendocs.sh index 8dbac30..1ad5cf4 100755 --- a/build-aux/gendocs.sh +++ b/build-aux/gendocs.sh @@ -2,9 +2,9 @@ # gendocs.sh -- generate a GNU manual in many formats. This script is # mentioned in maintain.texi. See the help message below for usage details. -scriptversion=2022-01-01.00 +scriptversion=2023-01-21.00 -# Copyright 2003-2022 Free Software Foundation, Inc. +# Copyright 2003-2023 Free Software Foundation, Inc. # # This program is free software: you can redistribute it and/or modify # it under the terms of the GNU General Public License as published by @@ -40,22 +40,22 @@ srcdir=`pwd` scripturl="https://git.savannah.gnu.org/cgit/gnulib.git/plain/build-aux/gendocs.sh" templateurl="https://git.savannah.gnu.org/cgit/gnulib.git/plain/doc/gendocs_template" -: ${SETLANG="env LANG= LC_MESSAGES= LC_ALL= LANGUAGE="} -: ${MAKEINFO="makeinfo"} -: ${TEXI2DVI="texi2dvi"} -: ${DOCBOOK2HTML="docbook2html"} -: ${DOCBOOK2PDF="docbook2pdf"} -: ${DOCBOOK2TXT="docbook2txt"} -: ${GENDOCS_TEMPLATE_DIR="."} -: ${PERL='perl'} -: ${TEXI2HTML="texi2html"} +: "${SETLANG="env LANG= LC_TIME= LC_MESSAGES= LC_ALL= LANGUAGE="}" +: "${MAKEINFO="makeinfo"}" +: "${TEXI2DVI="texi2dvi"}" +: "${DOCBOOK2HTML="docbook2html"}" +: "${DOCBOOK2PDF="docbook2pdf"}" +: "${DOCBOOK2TXT="docbook2txt"}" +: "${GENDOCS_TEMPLATE_DIR="."}" +: "${PERL="perl"}" +: "${TEXI2HTML="texi2html"}" unset CDPATH unset use_texi2html MANUAL_TITLE= PACKAGE= EMAIL=webmasters@gnu.org # please override with --email -commonarg= # passed to all makeinfo/texi2html invcations. +commonarg= # passed to all makeinfo/texi2html invocations. dirargs= # passed to all tools (-I dir). dirs= # -I directories. htmlarg="--css-ref=https://www.gnu.org/software/gnulib/manual.css -c TOP_NODE_UP_URL=/manual" @@ -73,7 +73,7 @@ texarg="-t @finalout" version="gendocs.sh $scriptversion -Copyright 2022 Free Software Foundation, Inc. +Copyright 2023 Free Software Foundation, Inc. There is NO warranty. You may redistribute this software under the terms of the GNU General Public License. For more information about these matters, see the files named COPYING." @@ -304,7 +304,7 @@ fi # end info # if $generate_tex; then cmd="$SETLANG $TEXI2DVI $dirargs $texarg \"$srcfile\"" - printf "\nGenerating dvi... ($cmd)\n" + printf "\nGenerating dvi... (%s)\n" "$cmd" eval "$cmd" # compress/finish dvi: gzip -f -9 $PACKAGE.dvi @@ -313,7 +313,7 @@ if $generate_tex; then ls -l "$outdir/$PACKAGE.dvi.gz" cmd="$SETLANG $TEXI2DVI --pdf $dirargs $texarg \"$srcfile\"" - printf "\nGenerating pdf... ($cmd)\n" + printf "\nGenerating pdf... (%s)\n" "$cmd" eval "$cmd" pdf_size=`calcsize $PACKAGE.pdf` mv $PACKAGE.pdf "$outdir/" @@ -324,7 +324,7 @@ fi # end tex (dvi + pdf) if $generate_ascii; then opt="-o $PACKAGE.txt --no-split --no-headers $commonarg" cmd="$SETLANG $MAKEINFO $opt \"$srcfile\"" - printf "\nGenerating ascii... ($cmd)\n" + printf "\nGenerating ascii... (%s)\n" "$cmd" eval "$cmd" ascii_size=`calcsize $PACKAGE.txt` gzip -f -9 -c $PACKAGE.txt >"$outdir/$PACKAGE.txt.gz" @@ -341,7 +341,7 @@ html_split() { opt="--split=$1 --node-files $commonarg $htmlarg" cmd="$SETLANG $TEXI2HTML --output $PACKAGE.html $opt \"$srcfile\"" - printf "\nGenerating html by $1... ($cmd)\n" + printf "\nGenerating html by %s... (%s)\n" "$1" "$cmd" eval "$cmd" split_html_dir=$PACKAGE.html ( @@ -359,7 +359,7 @@ html_split() if test -z "$use_texi2html"; then opt="--no-split --html -o $PACKAGE.html $commonarg $htmlarg" cmd="$SETLANG $MAKEINFO $opt \"$srcfile\"" - printf "\nGenerating monolithic html... ($cmd)\n" + printf "\nGenerating monolithic html... (%s)\n" "$cmd" rm -rf $PACKAGE.html # in case a directory is left over eval "$cmd" html_mono_size=`calcsize $PACKAGE.html` @@ -380,7 +380,7 @@ if test -z "$use_texi2html"; then # opt="--html -o $PACKAGE.html $split_arg $commonarg $htmlarg" cmd="$SETLANG $MAKEINFO $opt \"$srcfile\"" - printf "\nGenerating html by $split... ($cmd)\n" + printf "\nGenerating html by %s... (%s)\n" "$split" "$cmd" eval "$cmd" split_html_dir=$PACKAGE.html copy_images $split_html_dir/ $split_html_dir/*.html @@ -398,7 +398,7 @@ if test -z "$use_texi2html"; then else # use texi2html: opt="--output $PACKAGE.html $commonarg $htmlarg" cmd="$SETLANG $TEXI2HTML $opt \"$srcfile\"" - printf "\nGenerating monolithic html with texi2html... ($cmd)\n" + printf "\nGenerating monolithic html with texi2html... (%s)\n" "$cmd" rm -rf $PACKAGE.html # in case a directory is left over eval "$cmd" html_mono_size=`calcsize $PACKAGE.html` @@ -428,7 +428,7 @@ texi_tgz_size=`calcsize "$outdir/$PACKAGE.texi.tar.gz"` if test -n "$docbook"; then opt="-o - --docbook $commonarg" cmd="$SETLANG $MAKEINFO $opt \"$srcfile\" >${srcdir}/$PACKAGE-db.xml" - printf "\nGenerating docbook XML... ($cmd)\n" + printf "\nGenerating docbook XML... (%s)\n" "$cmd" eval "$cmd" docbook_xml_size=`calcsize $PACKAGE-db.xml` gzip -f -9 -c $PACKAGE-db.xml >"$outdir/$PACKAGE-db.xml.gz" @@ -438,7 +438,7 @@ if test -n "$docbook"; then split_html_db_dir=html_node_db opt="$commonarg -o $split_html_db_dir" cmd="$DOCBOOK2HTML $opt \"${outdir}/$PACKAGE-db.xml\"" - printf "\nGenerating docbook HTML... ($cmd)\n" + printf "\nGenerating docbook HTML... (%s)\n" "$cmd" eval "$cmd" ( cd ${split_html_db_dir} || exit 1 @@ -451,20 +451,20 @@ if test -n "$docbook"; then rmdir ${split_html_db_dir} cmd="$DOCBOOK2TXT \"${outdir}/$PACKAGE-db.xml\"" - printf "\nGenerating docbook ASCII... ($cmd)\n" + printf "\nGenerating docbook ASCII... (%s)\n" "$cmd" eval "$cmd" docbook_ascii_size=`calcsize $PACKAGE-db.txt` mv $PACKAGE-db.txt "$outdir/" cmd="$DOCBOOK2PDF \"${outdir}/$PACKAGE-db.xml\"" - printf "\nGenerating docbook PDF... ($cmd)\n" + printf "\nGenerating docbook PDF... (%s)\n" "$cmd" eval "$cmd" docbook_pdf_size=`calcsize $PACKAGE-db.pdf` mv $PACKAGE-db.pdf "$outdir/" fi # -printf "\nMaking index.html for $PACKAGE...\n" +printf "\nMaking index.html for %s...\n" "$PACKAGE" if test -z "$use_texi2html"; then CONDS="/%%IF *HTML_SECTION%%/,/%%ENDIF *HTML_SECTION%%/d;\ /%%IF *HTML_CHAPTER%%/,/%%ENDIF *HTML_CHAPTER%%/d" diff --git a/build-aux/git-version-gen b/build-aux/git-version-gen index a44f5d5..a72057b 100755 --- a/build-aux/git-version-gen +++ b/build-aux/git-version-gen @@ -1,8 +1,8 @@ #!/bin/sh # Print a version string. -scriptversion=2022-01-27.18; # UTC +scriptversion=2022-07-09.08; # UTC -# Copyright (C) 2007-2022 Free Software Foundation, Inc. +# Copyright (C) 2007-2023 Free Software Foundation, Inc. # # This program is free software: you can redistribute it and/or modify # it under the terms of the GNU General Public License as published by @@ -94,7 +94,7 @@ Options: --help display this help and exit --version output version information and exit -Running without arguments will suffice in most cases." +Send patches and bug reports to <bug-gnulib@gnu.org>." prefix=v fallback= diff --git a/build-aux/gitlog-to-changelog b/build-aux/gitlog-to-changelog index 82d9f97..4678bad 100755 --- a/build-aux/gitlog-to-changelog +++ b/build-aux/gitlog-to-changelog @@ -3,7 +3,7 @@ # Convert git log output to ChangeLog format. -# Copyright (C) 2008-2022 Free Software Foundation, Inc. +# Copyright (C) 2008-2023 Free Software Foundation, Inc. # # This program is free software: you can redistribute it and/or modify # it under the terms of the GNU General Public License as published by diff --git a/build-aux/gnu-web-doc-update b/build-aux/gnu-web-doc-update index c041364..a804031 100755 --- a/build-aux/gnu-web-doc-update +++ b/build-aux/gnu-web-doc-update @@ -2,9 +2,9 @@ # Run this after each non-alpha release, to update the web documentation at # https://www.gnu.org/software/$pkg/manual/ -VERSION=2022-01-27.18; # UTC +VERSION=2023-03-23.02; # UTC -# Copyright (C) 2009-2022 Free Software Foundation, Inc. +# Copyright (C) 2009-2023 Free Software Foundation, Inc. # This program is free software: you can redistribute it and/or modify # it under the terms of the GNU General Public License as published by @@ -153,8 +153,8 @@ cleanup() $GIT branch -d $tmp_branch exit $__st } -trap cleanup 0 -trap 'exit $?' 1 2 13 15 +trap cleanup EXIT +trap 'exit $?' HUP INT PIPE TERM # We must build using sources for which --version reports the # just-released version number, not some string like 7.6.18-20761. @@ -175,10 +175,13 @@ set +e tmp=$(mktemp -d web-doc-update.XXXXXX) || exit 1 ( cd $tmp \ - && $CVS -d $cvs_user@cvs.sv.gnu.org:/webcvs/$pkg co $pkg ) + && $CVS -d $cvs_user@cvs.savannah.gnu.org:/webcvs/$pkg co $pkg ) $RSYNC -avP "$builddir"/doc/manual/ $tmp/$pkg/manual ( + cd $tmp/$pkg + test -d manual/CVS || $dryrun $CVS add -ko manual + cd $tmp/$pkg/manual # Add all the files. This is simpler than trying to add only the diff --git a/build-aux/gnupload b/build-aux/gnupload index b97e566..3e8f102 100755 --- a/build-aux/gnupload +++ b/build-aux/gnupload @@ -3,7 +3,7 @@ scriptversion=2022-01-27.18; # UTC -# Copyright (C) 2004-2022 Free Software Foundation, Inc. +# Copyright (C) 2004-2023 Free Software Foundation, Inc. # # This program is free software; you can redistribute it and/or modify # it under the terms of the GNU General Public License as published by @@ -398,7 +398,7 @@ upload () for f in $files $base.directive.asc do echo put $f - done | $dbg sftp -b - puszcza.gnu.org.ua:/incoming/$destdir_topdir + done | $dbg sftp -b - download.gnu.org.ua:/incoming/$destdir_topdir ;; /*) dest_host=`echo "$dest" | sed 's,:.*,,'` diff --git a/build-aux/mdate-sh b/build-aux/mdate-sh index 8d8bb37..6947add 100755 --- a/build-aux/mdate-sh +++ b/build-aux/mdate-sh @@ -3,7 +3,7 @@ scriptversion=2018-03-07.03; # UTC -# Copyright (C) 1995-2022 Free Software Foundation, Inc. +# Copyright (C) 1995-2023 Free Software Foundation, Inc. # written by Ulrich Drepper <drepper@gnu.ai.mit.edu>, June 1995 # # This program is free software; you can redistribute it and/or modify diff --git a/build-aux/mktempd b/build-aux/mktempd index b747bd7..e18cf76 100755 --- a/build-aux/mktempd +++ b/build-aux/mktempd @@ -1,7 +1,7 @@ #!/bin/sh # Create a temporary directory, much like mktemp -d does. -# Copyright (C) 2007-2022 Free Software Foundation, Inc. +# Copyright (C) 2007-2023 Free Software Foundation, Inc. # This program is free software: you can redistribute it and/or modify # it under the terms of the GNU General Public License as published by diff --git a/build-aux/texinfo.tex b/build-aux/texinfo.tex index 8872e5e..204caf7 100644 --- a/build-aux/texinfo.tex +++ b/build-aux/texinfo.tex @@ -3,9 +3,9 @@ % Load plain if necessary, i.e., if running under initex. \expandafter\ifx\csname fmtname\endcsname\relax\input plain\fi % -\def\texinfoversion{2022-04-09.08} +\def\texinfoversion{2023-03-21.06} % -% Copyright 1985, 1986, 1988, 1990-2022 Free Software Foundation, Inc. +% Copyright 1985, 1986, 1988, 1990-2023 Free Software Foundation, Inc. % % This texinfo.tex file is free software: you can redistribute it and/or % modify it under the terms of the GNU General Public License as @@ -58,12 +58,6 @@ \message{Loading texinfo [version \texinfoversion]:} -% If in a .fmt file, print the version number -% and turn on active characters that we couldn't do earlier because -% they might have appeared in the input file name. -\everyjob{\message{[Texinfo version \texinfoversion]}% - \catcode`+=\active \catcode`\_=\active} - % LaTeX's \typeout. This ensures that the messages it is used for % are identical in format to the corresponding ones from latex/pdflatex. \def\typeout{\immediate\write17}% @@ -241,9 +235,6 @@ % \def\finalout{\overfullrule=0pt } -\newdimen\outerhsize \newdimen\outervsize % set by the paper size routines -\newdimen\topandbottommargin \topandbottommargin=.75in - % Output a mark which sets \thischapter, \thissection and \thiscolor. % We dump everything together because we only have one kind of mark. % This works because we only use \botmark / \topmark, not \firstmark. @@ -317,16 +308,8 @@ \newbox\footlinebox % When outputting the double column layout for indices, an output routine -% is run several times, which hides the original value of \topmark. This -% can lead to a page heading being output and duplicating the chapter heading -% of the index. Hence, save the contents of \topmark at the beginning of -% the output routine. The saved contents are valid until we actually -% \shipout a page. -% -% (We used to run a short output routine to actually set \topmark and -% \firstmark to the right values, but if this was called with an empty page -% containing whatsits for writing index entries, the whatsits would be thrown -% away and the index auxiliary file would remain empty.) +% is run several times, hiding the original value of \topmark. Hence, save +% \topmark at the beginning. % \newtoks\savedtopmark \newif\iftopmarksaved @@ -351,15 +334,9 @@ % \checkchapterpage % - % Retrieve the information for the headings from the marks in the page, - % and call Plain TeX's \makeheadline and \makefootline, which use the - % values in \headline and \footline. - % - % Common context changes for both heading and footing. - % Do this outside of the \shipout so @code etc. will be expanded in - % the headline as they should be, not taken literally (outputting ''code). + % Make the heading and footing. \makeheadline and \makefootline + % use the contents of \headline and \footline. \def\commonheadfootline{\let\hsize=\txipagewidth \texinfochars} - % \ifodd\pageno \getoddheadingmarks \else \getevenheadingmarks \fi \global\setbox\headlinebox = \vbox{\commonheadfootline \makeheadline}% \ifodd\pageno \getoddfootingmarks \else \getevenfootingmarks \fi @@ -547,7 +524,7 @@ % ... but they get defined via ``\envdef\foo{...}'': \long\def\envdef#1#2{\def#1{\startenvironment#1#2}} -\def\envparseargdef#1#2{\parseargdef#1{\startenvironment#1#2}} +\long\def\envparseargdef#1#2{\parseargdef#1{\startenvironment#1#2}} % Check whether we're in the right environment: \def\checkenv#1{% @@ -608,6 +585,9 @@ % @/ allows a line break. \let\/=\allowbreak +% @- allows explicit insertion of hyphenation points +\def\-{\discretionary{\normaldash}{}{}}% + % @. is an end-of-sentence period. \def\.{.\spacefactor=\endofsentencespacefactor\space} @@ -617,21 +597,6 @@ % @? is an end-of-sentence query. \def\?{?\spacefactor=\endofsentencespacefactor\space} -% @frenchspacing on|off says whether to put extra space after punctuation. -% -\def\onword{on} -\def\offword{off} -% -\parseargdef\frenchspacing{% - \def\temp{#1}% - \ifx\temp\onword \plainfrenchspacing - \else\ifx\temp\offword \plainnonfrenchspacing - \else - \errhelp = \EMsimple - \errmessage{Unknown @frenchspacing option `\temp', must be on|off}% - \fi\fi -} - % @w prevents a word break. Without the \leavevmode, @w at the % beginning of a paragraph, when TeX is still in vertical mode, would % produce a whole line of output instead of starting the paragraph. @@ -725,32 +690,22 @@ where each line of input produces a line of output.} \dimen2 = \ht\strutbox \advance\dimen2 by \dp\strutbox \ifdim\dimen0 > \dimen2 + % This is similar to the 'needspace' module in LaTeX. + % The first penalty allows a break if the end of the page is + % not too far away. Following penalties and skips are discarded. + % Otherwise, require at least \dimen0 of vertical space. % - % Do a \strut just to make the height of this box be normal, so the - % normal leading is inserted relative to the preceding line. - % And a page break here is fine. - \vtop to #1\mil{\strut\vfil}% - % - % TeX does not even consider page breaks if a penalty added to the - % main vertical list is 10000 or more. But in order to see if the - % empty box we just added fits on the page, we must make it consider - % page breaks. On the other hand, we don't want to actually break the - % page after the empty box. So we use a penalty of 9999. - % - % There is an extremely small chance that TeX will actually break the - % page at this \penalty, if there are no other feasible breakpoints in - % sight. (If the user is using lots of big @group commands, which - % almost-but-not-quite fill up a page, TeX will have a hard time doing - % good page breaking, for example.) However, I could not construct an - % example where a page broke at this \penalty; if it happens in a real - % document, then we can reconsider our strategy. + % (We used to use a \vtop to reserve space, but this had spacing issues + % when followed by a section heading, as it was not a "discardable item". + % This also has the benefit of providing glue before the page break if + % there isn't enough space.) + \vskip0pt plus \dimen0 + \penalty-100 + \vskip0pt plus -\dimen0 + \vskip \dimen0 \penalty9999 - % - % Back up by the size of the box, whether we did a page break or not. - \kern -#1\mil - % - % Do not allow a page break right after this kern. - \nobreak + \vskip -\dimen0 + \penalty0\relax % this hides the above glue from \safewhatsit and \dobreak \fi } @@ -1239,13 +1194,17 @@ output) for that.)} % % Set color, and create a mark which defines \thiscolor accordingly, % so that \makeheadline knows which color to restore. + \def\curcolor{0 0 0}% \def\setcolor#1{% - \xdef\currentcolordefs{\gdef\noexpand\thiscolor{#1}}% - \domark - \pdfsetcolor{#1}% + \ifx#1\curcolor\else + \xdef\currentcolordefs{\gdef\noexpand\thiscolor{#1}}% + \domark + \pdfsetcolor{#1}% + \xdef\curcolor{#1}% + \fi } % - \def\maincolor{\rgbBlack} + \let\maincolor\rgbBlack \pdfsetcolor{\maincolor} \edef\thiscolor{\maincolor} \def\currentcolordefs{} @@ -1401,7 +1360,7 @@ output) for that.)} % % by default, use black for everything. \def\urlcolor{\rgbBlack} - \def\linkcolor{\rgbBlack} + \let\linkcolor\rgbBlack \def\endlink{\setcolor{\maincolor}\pdfendlink} % % Adding outlines to PDF; macros for calculating structure of outlines @@ -1579,9 +1538,10 @@ output) for that.)} \next} \def\makelink{\addtokens{\toksB}% {\noexpand\pdflink{\the\toksC}}\toksC={}\global\countA=0} - \def\pdflink#1{% + \def\pdflink#1{\pdflinkpage{#1}{#1}}% + \def\pdflinkpage#1#2{% \startlink attr{/Border [0 0 0]} goto name{\pdfmkpgn{#1}} - \setcolor{\linkcolor}#1\endlink} + \setcolor{\linkcolor}#2\endlink} \def\done{\edef\st{\global\noexpand\toksA={\the\toksB}}\st} \else % non-pdf mode @@ -1828,10 +1788,11 @@ output) for that.)} \next} \def\makelink{\addtokens{\toksB}% {\noexpand\pdflink{\the\toksC}}\toksC={}\global\countA=0} - \def\pdflink#1{% + \def\pdflink#1{\pdflinkpage{#1}{#1}}% + \def\pdflinkpage#1#2{% \special{pdf:bann << /Border [0 0 0] /Type /Annot /Subtype /Link /A << /S /GoTo /D (#1) >> >>}% - \setcolor{\linkcolor}#1\endlink} + \setcolor{\linkcolor}#2\endlink} \def\done{\edef\st{\global\noexpand\toksA={\the\toksB}}\st} % % @@ -2176,6 +2137,11 @@ end \pdffontattr#1{/ToUnicode \the\pdflastobj\space 0 R}% }% \fi\fi +% +% This is what gets called when #5 of \setfont is empty. +\let\cmap\gobble +% +% (end of cmaps) % Set the font macro #1 to the font named \fontprefix#2. @@ -2191,11 +2157,10 @@ end \def\setfont#1#2#3#4#5{% \font#1=\fontprefix#2#3 scaled #4 \csname cmap#5\endcsname#1% + \ifx#2\ttshape\hyphenchar#1=-1 \fi + \ifx#2\ttbshape\hyphenchar#1=-1 \fi + \ifx#2\ttslshape\hyphenchar#1=-1 \fi } -% This is what gets called when #5 of \setfont is empty. -\let\cmap\gobble -% -% (end of cmaps) % Use cm as the default font prefix. % To specify the font prefix, you must define \fontprefix @@ -2558,7 +2523,7 @@ end \def\it{\fam=\itfam \setfontstyle{it}} \def\sl{\fam=\slfam \setfontstyle{sl}} \def\bf{\fam=\bffam \setfontstyle{bf}}\def\bfstylename{bf} -\def\tt{\fam=\ttfam \setfontstyle{tt}}\def\ttstylename{tt} +\def\tt{\fam=\ttfam \setfontstyle{tt}} % Texinfo sort of supports the sans serif font style, which plain TeX does not. % So we set up a \sf. @@ -2586,34 +2551,30 @@ end \scriptfont\sffam=\sevensf } -% -% The font-changing commands (all called \...fonts) redefine the meanings -% of \STYLEfont, instead of just \STYLE. We do this because \STYLE needs -% to also set the current \fam for math mode. Our \STYLE (e.g., \rm) -% commands hardwire \STYLEfont to set the current font. -% -% The fonts used for \ifont are for "math italics" (\itfont is for italics -% in regular text). \syfont is also used in math mode only. -% -% Each font-changing command also sets the names \lsize (one size lower) -% and \lllsize (three sizes lower). These relative commands are used -% in, e.g., the LaTeX logo and acronyms. -% -% This all needs generalizing, badly. + +% \defineassignfonts{SIZE} - +% Define sequence \assignfontsSIZE, which switches between font sizes +% by redefining the meanings of \STYLEfont. (Just \STYLE additionally sets +% the current \fam for math mode.) % +\def\defineassignfonts#1{% + \expandafter\edef\csname assignfonts#1\endcsname{% + \let\noexpand\rmfont\csname #1rm\endcsname + \let\noexpand\itfont\csname #1it\endcsname + \let\noexpand\slfont\csname #1sl\endcsname + \let\noexpand\bffont\csname #1bf\endcsname + \let\noexpand\ttfont\csname #1tt\endcsname + \let\noexpand\smallcaps\csname #1sc\endcsname + \let\noexpand\sffont \csname #1sf\endcsname + \let\noexpand\ifont \csname #1i\endcsname + \let\noexpand\syfont \csname #1sy\endcsname + \let\noexpand\ttslfont\csname #1ttsl\endcsname + } +} \def\assignfonts#1{% - \expandafter\let\expandafter\rmfont\csname #1rm\endcsname - \expandafter\let\expandafter\itfont\csname #1it\endcsname - \expandafter\let\expandafter\slfont\csname #1sl\endcsname - \expandafter\let\expandafter\bffont\csname #1bf\endcsname - \expandafter\let\expandafter\ttfont\csname #1tt\endcsname - \expandafter\let\expandafter\smallcaps\csname #1sc\endcsname - \expandafter\let\expandafter\sffont \csname #1sf\endcsname - \expandafter\let\expandafter\ifont \csname #1i\endcsname - \expandafter\let\expandafter\syfont \csname #1sy\endcsname - \expandafter\let\expandafter\ttslfont\csname #1ttsl\endcsname + \csname assignfonts#1\endcsname } \newif\ifrmisbold @@ -2637,12 +2598,21 @@ end \csname\curfontstyle\endcsname }% +% Define the font-changing commands (all called \...fonts). +% Each font-changing command also sets the names \lsize (one size lower) +% and \lllsize (three sizes lower). These relative commands are used +% in, e.g., the LaTeX logo and acronyms. +% +% Note: The fonts used for \ifont are for "math italics" (\itfont is for +% italics in regular text). \syfont is also used in math mode only. +% \def\definefontsetatsize#1#2#3#4#5{% + \defineassignfonts{#1}% \expandafter\def\csname #1fonts\endcsname{% \def\curfontsize{#1}% \def\lsize{#2}\def\lllsize{#3}% \csname rmisbold#5\endcsname - \assignfonts{#1}% + \csname assignfonts#1\endcsname \resetmathfonts \setleading{#4}% }} @@ -2687,9 +2657,22 @@ end % Check if we are currently using a typewriter font. Since all the % Computer Modern typewriter fonts have zero interword stretch (and % shrink), and it is reasonable to expect all typewriter fonts to have -% this property, we can check that font parameter. -% -\def\ifmonospace{\ifdim\fontdimen3\font=0pt } +% this property, we can check that font parameter. #1 is what to +% print if we are indeed using \tt; #2 is what to print otherwise. +\def\ifusingtt#1#2{\ifdim \fontdimen3\font=0pt #1\else #2\fi} + +% Same as above, but check for italic font. Actually this also catches +% non-italic slanted fonts since it is impossible to distinguish them from +% italic fonts. But since this is only used by $ and it uses \sl anyway +% this is not a problem. +\def\ifusingit#1#2{\ifdim \fontdimen1\font>0pt #1\else #2\fi} + + +% Check if internal flag is clear, i.e. has not been @set. +\def\ifflagclear#1#2#3{% + \expandafter\ifx\csname SET#1\endcsname\relax + #2\else#3\fi +} { \catcode`\'=\active @@ -2698,41 +2681,33 @@ end \gdef\setcodequotes{\let`\codequoteleft \let'\codequoteright} \gdef\setregularquotes{\let`\lq \let'\rq} } +\setregularquotes -% Allow an option to not use regular directed right quote/apostrophe -% (char 0x27), but instead the undirected quote from cmtt (char 0x0d). -% The undirected quote is ugly, so don't make it the default, but it -% works for pasting with more pdf viewers (at least evince), the -% lilypond developers report. xpdf does work with the regular 0x27. +% output for ' in @code +% in tt font hex 0D (undirected) or 27 (curly right quote) % \def\codequoteright{% - \ifmonospace - \expandafter\ifx\csname SETtxicodequoteundirected\endcsname\relax - \expandafter\ifx\csname SETcodequoteundirected\endcsname\relax - '% - \else \char'15 \fi - \else \char'15 \fi - \else - '% - \fi + \ifusingtt + {\ifflagclear{txicodequoteundirected}% + {\ifflagclear{codequoteundirected}% + {'}% + {\char"0D }}% + {\char"0D }}% + {'}% } -% -% and a similar option for the left quote char vs. a grave accent. -% Modern fonts display ASCII 0x60 as a grave accent, so some people like -% the code environments to do likewise. + +% output for ` in @code +% in tt font hex 12 (grave accent) or 60 (curly left quote) +% \relax disables Spanish ligatures ?` and !` of \tt font. % \def\codequoteleft{% - \ifmonospace - \expandafter\ifx\csname SETtxicodequotebacktick\endcsname\relax - \expandafter\ifx\csname SETcodequotebacktick\endcsname\relax - % [Knuth] pp. 380,381,391 - % \relax disables Spanish ligatures ?` and !` of \tt font. - \relax`% - \else \char'22 \fi - \else \char'22 \fi - \else - \relax`% - \fi + \ifusingtt + {\ifflagclear{txicodequotebacktick}% + {\ifflagclear{codequotebacktick}% + {\relax`}% + {\char"12 }}% + {\char"12 }}% + {\relax`}% } % Commands to set the quote options. @@ -2750,7 +2725,7 @@ end \errmessage{Unknown @codequoteundirected value `\temp', must be on|off}% \fi\fi } -% + \parseargdef\codequotebacktick{% \def\temp{#1}% \ifx\temp\onword @@ -2765,6 +2740,11 @@ end \fi\fi } +% Turn them on by default +\let\SETtxicodequoteundirected = t +\let\SETtxicodequotebacktick = t + + % [Knuth] pp. 380,381,391, disable Spanish ligatures ?` and !` of \tt font. \def\noligaturesquoteleft{\relax\lq} @@ -2779,15 +2759,16 @@ end \def\dosmartslant#1#2{% \ifusingtt {{\ttsl #2}\let\next=\relax}% - {\def\next{{#1#2}\futurelet\next\smartitaliccorrection}}% + {\def\next{{#1#2}\smartitaliccorrection}}% \next } \def\smartslanted{\dosmartslant\sl} \def\smartitalic{\dosmartslant\it} -% Output an italic correction unless \next (presumed to be the following -% character) is such as not to need one. -\def\smartitaliccorrection{% +% Output an italic correction unless the following character is such as +% not to need one. +\def\smartitaliccorrection{\futurelet\next\smartitaliccorrectionx} +\def\smartitaliccorrectionx{% \ifx\next,% \else\ifx\next-% \else\ifx\next.% @@ -2798,27 +2779,41 @@ end \aftersmartic } -% Unconditional use \ttsl, and no ic. @var is set to this for defuns. -\def\ttslanted#1{{\ttsl #1}} - -% @cite is like \smartslanted except unconditionally use \sl. We never want -% ttsl for book titles, do we? -\def\cite#1{{\sl #1}\futurelet\next\smartitaliccorrection} +% @cite unconditionally uses \sl with \smartitaliccorrection. +\def\cite#1{{\sl #1}\smartitaliccorrection} +% @var unconditionally uses \sl. This gives consistency for +% parameter names whether they are in @def, @table @code or a +% regular paragraph. +% To get ttsl font for @var when used in code context, @set txicodevaristt. +% The \null is to reset \spacefactor. \def\aftersmartic{} \def\var#1{% \let\saveaftersmartic = \aftersmartic \def\aftersmartic{\null\let\aftersmartic=\saveaftersmartic}% - \smartslanted{#1}% + % + \ifflagclear{txicodevaristt}% + {\def\varnext{{{\sl #1}}\smartitaliccorrection}}% + {\def\varnext{\smartslanted{#1}}}% + \varnext } +% To be removed after next release +\def\SETtxicodevaristt{}% @set txicodevaristt + \let\i=\smartitalic \let\slanted=\smartslanted \let\dfn=\smartslanted \let\emph=\smartitalic -% Explicit font changes: @r, @sc, undocumented @ii. -\def\r#1{{\rm #1}} % roman font +% @r for roman font, used for code comment +\def\r#1{{% + \usenormaldash % get --, --- ligatures even if in @code + \defcharsdefault % in case on def line + \rm #1}} +{\catcode`-=\active \gdef\usenormaldash{\let-\normaldash}} + +% @sc, undocumented @ii. \def\sc#1{{\smallcaps#1}} % smallcaps font \def\ii#1{{\it #1}} % italic font @@ -2829,12 +2824,8 @@ end % @sansserif, explicit sans. \def\sansserif#1{{\sf #1}} -% We can't just use \exhyphenpenalty, because that only has effect at -% the end of a paragraph. Restore normal hyphenation at the end of the -% group within which \nohyphenation is presumably called. -% -\def\nohyphenation{\hyphenchar\font = -1 \aftergroup\restorehyphenation} -\def\restorehyphenation{\hyphenchar\font = `- } +\newif\iffrenchspacing +\frenchspacingfalse % Set sfcode to normal for the chars that usually have another value. % Can't use plain's \frenchspacing because it uses the `\x notation, and @@ -2842,21 +2833,45 @@ end % \catcode`@=11 \def\plainfrenchspacing{% - \sfcode`\.=\@m \sfcode`\?=\@m \sfcode`\!=\@m - \sfcode`\:=\@m \sfcode`\;=\@m \sfcode`\,=\@m - \def\endofsentencespacefactor{1000}% for @. and friends + \iffrenchspacing\else + \frenchspacingtrue + \sfcode`\.=\@m \sfcode`\?=\@m \sfcode`\!=\@m + \sfcode`\:=\@m \sfcode`\;=\@m \sfcode`\,=\@m + \def\endofsentencespacefactor{1000}% for @. and friends + \fi } \def\plainnonfrenchspacing{% - \sfcode`\.3000\sfcode`\?3000\sfcode`\!3000 - \sfcode`\:2000\sfcode`\;1500\sfcode`\,1250 - \def\endofsentencespacefactor{3000}% for @. and friends + \iffrenchspacing + \frenchspacingfalse + \sfcode`\.3000\sfcode`\?3000\sfcode`\!3000 + \sfcode`\:2000\sfcode`\;1500\sfcode`\,1250 + \def\endofsentencespacefactor{3000}% for @. and friends + \fi } \catcode`@=\other \def\endofsentencespacefactor{3000}% default +% @frenchspacing on|off says whether to put extra space after punctuation. +% +\def\onword{on} +\def\offword{off} +% +\let\frenchspacingsetting\plainnonfrenchspacing % used in output routine +\parseargdef\frenchspacing{% + \def\temp{#1}% + \ifx\temp\onword \let\frenchspacingsetting\plainfrenchspacing + \else\ifx\temp\offword \let\frenchspacingsetting\plainnonfrenchspacing + \else + \errhelp = \EMsimple + \errmessage{Unknown @frenchspacing option `\temp', must be on|off}% + \fi\fi + \frenchspacingsetting +} + + % @t, explicit typewriter. \def\t#1{% - {\tt \plainfrenchspacing #1}% + {\tt \defcharsdefault \plainfrenchspacing #1}% \null } @@ -2877,27 +2892,29 @@ end % Switch to typewriter. \tt % - % But `\ ' produces the large typewriter interword space. + % `\ ' produces the large typewriter interword space. \def\ {{\spaceskip = 0pt{} }}% % - % Turn off hyphenation. - \nohyphenation - % \plainfrenchspacing #1% }% \null % reset spacefactor to 1000 } -% We *must* turn on hyphenation at `-' and `_' in @code. -% (But see \codedashfinish below.) +% This is for LuaTeX: It is not sufficient to disable hyphenation at +% explicit dashes by setting `\hyphenchar` to -1. +\def\dashnobreak{% + \normaldash + \penalty 10000 } + +% We must turn on hyphenation at `-' and `_' in @code. % Otherwise, it is too hard to avoid overfull hboxes % in the Emacs manual, the Library manual, etc. +% We explicitly allow hyphenation at these characters +% using \discretionary. % -% Unfortunately, TeX uses one parameter (\hyphenchar) to control -% both hyphenation at - and hyphenation within words. -% We must therefore turn them both off (\tclose does that) -% and arrange explicitly to hyphenate at a dash. -- rms. +% Hyphenation at - and hyphenation within words was turned off +% by default for the tt fonts using the \hyphenchar parameter of TeX. { \catcode`\-=\active \catcode`\_=\active \catcode`\'=\active \catcode`\`=\active @@ -2910,13 +2927,9 @@ end \let-\codedash \let_\codeunder \else - \let-\normaldash + \let-\dashnobreak \let_\realunder \fi - % Given -foo (with a single dash), we do not want to allow a break - % after the hyphen. - \global\let\codedashprev=\codedash - % \codex } % @@ -2926,21 +2939,30 @@ end % % Now, output a discretionary to allow a line break, unless % (a) the next character is a -, or - % (b) the preceding character is a -. + % (b) the preceding character is a -, or + % (c) we are at the start of the string. + % In both cases (b) and (c), \codedashnobreak should be set to \codedash. + % % E.g., given --posix, we do not want to allow a break after either -. % Given --foo-bar, we do want to allow a break between the - and the b. \ifx\next\codedash \else - \ifx\codedashprev\codedash + \ifx\codedashnobreak\codedash \else \discretionary{}{}{}\fi \fi % we need the space after the = for the case when \next itself is a % space token; it would get swallowed otherwise. As in @code{- a}. - \global\let\codedashprev= \next + \global\let\codedashnobreak= \next } } \def\normaldash{-} % -\def\codex #1{\tclose{#1}\endgroup} +\def\codex #1{\tclose{% + % Given -foo (with a single dash), we do not want to allow a break + % after the -. \codedashnobreak is set to the first character in + % @code. + \futurelet\codedashnobreak\relax + #1% +}\endgroup} \def\codeunder{% % this is all so @math{@code{var_name}+1} can work. In math mode, _ @@ -3187,7 +3209,7 @@ end % definition of @key with no lozenge. % -\def\key#1{{\setregularquotes \nohyphenation \tt #1}\null} +\def\key#1{{\setregularquotes \tt #1}\null} % @clicksequence{File @click{} Open ...} \def\clicksequence#1{\begingroup #1\endgroup} @@ -3390,8 +3412,8 @@ $$% \let\atchar=\@ % @{ @} @lbracechar{} @rbracechar{} all generate brace characters. -\def\lbracechar{{\ifmonospace\char123\else\ensuremath\lbrace\fi}} -\def\rbracechar{{\ifmonospace\char125\else\ensuremath\rbrace\fi}} +\def\lbracechar{{\ifusingtt{\char123}{\ensuremath\lbrace}}} +\def\rbracechar{{\ifusingtt{\char125}{\ensuremath\rbrace}}} \let\{=\lbracechar \let\}=\rbracechar @@ -3445,8 +3467,13 @@ $$% % Revert to plain's \scriptsize, which is 7pt. \count255=\the\fam $\fam\count255 \scriptstyle A$% \else - % For 11pt, we can use our lllsize. - \switchtolllsize A% + \ifx\curfontsize\smallword + % For footnotes and indices + \count255=\the\fam $\fam\count255 \scriptstyle A$% + \else + % For 11pt, we can use our lllsize. + \switchtolllsize A% + \fi \fi }% \vss @@ -3454,6 +3481,7 @@ $$% \kern-.15em \TeX } +\def\smallword{small} % Some math mode symbols. Define \ensuremath to switch into math mode % unless we are already there. Expansion tricks may not be needed here, @@ -3532,7 +3560,7 @@ $$% % @pounds{} is a sterling sign, which Knuth put in the CM italic font. % -\def\pounds{\ifmonospace{\ecfont\char"BF}\else{\it\$}\fi} +\def\pounds{{\ifusingtt{\ecfont\char"BF}{\it\$}}} % @euro{} comes from a separate font, depending on the current style. % We use the free feym* fonts from the eurosym package by Henrik @@ -3646,18 +3674,17 @@ $$% % hopefully nobody will notice/care. \edef\ecsize{\csname\curfontsize ecsize\endcsname}% \edef\nominalsize{\csname\curfontsize nominalsize\endcsname}% - \ifmonospace - % typewriter: - \font\thisecfont = #1ctt\ecsize \space at \nominalsize - \else - \ifx\curfontstyle\bfstylename - % bold: - \font\thisecfont = #1cb\ifusingit{i}{x}\ecsize \space at \nominalsize - \else - % regular: - \font\thisecfont = #1c\ifusingit{ti}{rm}\ecsize \space at \nominalsize - \fi - \fi + \ifusingtt + % typewriter: + {\font\thisecfont = #1ctt\ecsize \space at \nominalsize}% + % else + {\ifx\curfontstyle\bfstylename + % bold: + \font\thisecfont = #1cb\ifusingit{i}{x}\ecsize \space at \nominalsize + \else + % regular: + \font\thisecfont = #1c\ifusingit{ti}{rm}\ecsize \space at \nominalsize + \fi}% \thisecfont } @@ -3673,7 +3700,10 @@ $$% % @textdegree - the normal degrees sign. % -\def\textdegree{$^\circ$} +\def\textdegree{% + \ifmmode ^\circ + \else {\tcfont \char 176}% + \fi} % Laurent Siebenmann reports \Orb undefined with: % Textures 1.7.7 (preloaded format=plain 93.10.14) (68K) 16 APR 2004 02:38 @@ -3690,11 +3720,11 @@ $$% % only change font for tt for correct kerning and to avoid using % \ecfont unless necessary. \def\quotedblleft{% - \ifmonospace{\ecfont\char"10}\else{\char"5C}\fi + \ifusingtt{{\ecfont\char"10}}{{\char"5C}}% } \def\quotedblright{% - \ifmonospace{\ecfont\char"11}\else{\char`\"}\fi + \ifusingtt{{\ecfont\char"11}}{{\char`\"}}% } @@ -3719,13 +3749,14 @@ $$% want the contents after the title page.}}% \parseargdef\shorttitlepage{% - \begingroup \hbox{}\vskip 1.5in \chaprm \centerline{#1}% - \endgroup\page\hbox{}\page} + {\headingsoff \begingroup \hbox{}\vskip 1.5in \chaprm \centerline{#1}% + \endgroup\page\hbox{}\page}\pageone} \envdef\titlepage{% % Open one extra group, as we want to close it in the middle of \Etitlepage. \begingroup \parindent=0pt \textfonts + \headingsoff % Leave some space at the very top of the page. \vglue\titlepagetopglue % No rule at page bottom unless we print one at the top with @title. @@ -3753,11 +3784,9 @@ $$% % If we use the new definition of \page, we always get a blank page % after the title page, which we certainly don't want. \oldpage + \pageone \endgroup % - % Need this before the \...aftertitlepage checks so that if they are - % in effect the toc pages will come out with page numbers. - \HEADINGSon } \def\finishtitlepage{% @@ -3824,15 +3853,16 @@ $$% \newtoks\oddfootline % footline on odd pages % Now make \makeheadline and \makefootline in Plain TeX use those variables -\headline={{\textfonts\rm +\headline={{\textfonts\rm\frenchspacingsetting \ifchapterpage \ifodd\pageno\the\oddchapheadline\else\the\evenchapheadline\fi \else \ifodd\pageno\the\oddheadline\else\the\evenheadline\fi \fi}} -\footline={{\textfonts\rm \ifodd\pageno \the\oddfootline - \else \the\evenfootline \fi}\HEADINGShook} +\footline={{\textfonts\rm\frenchspacingsetting + \ifodd\pageno \the\oddfootline \else \the\evenfootline \fi}% + \HEADINGShook} \let\HEADINGShook=\relax % Commands to set those variables. @@ -3925,46 +3955,37 @@ $$% } \def\HEADINGSoff{{\globaldefs=1 \headingsoff}} % global setting -\HEADINGSoff % it's the default -% When we turn headings on, set the page number to 1. +% Set the page number to 1. \def\pageone{ \global\pageno=1 \global\arabiccount = \pagecount } +\let\contentsalignmacro = \chappager + +% \def\HEADINGSon{\HEADINGSdouble} % defined by \CHAPPAGon + % For double-sided printing, put current file name in lower left corner, % chapter name on inside top of right hand pages, document % title on inside top of left hand pages, and page numbers on outside top % edge of all pages. -\def\HEADINGSdouble{% -\pageone -\HEADINGSdoublex -} -\let\contentsalignmacro = \chappager - -% For single-sided printing, chapter title goes across top left of page, -% page number on top right. -\def\HEADINGSsingle{% -\pageone -\HEADINGSsinglex -} -\def\HEADINGSon{\HEADINGSdouble} - -\def\HEADINGSafter{\let\HEADINGShook=\HEADINGSdoublex} +\def\HEADINGSafter{\let\HEADINGShook=\HEADINGSdouble} \let\HEADINGSdoubleafter=\HEADINGSafter -\def\HEADINGSdoublex{% +\def\HEADINGSdouble{% \global\evenfootline={\hfil} \global\oddfootline={\hfil} \global\evenheadline={\line{\folio\hfil\thistitle}} \global\oddheadline={\line{\thischapter\hfil\folio}} -\global\evenchapheadline={\line{\folio\hfil}} +\global\evenchapheadline={\line{\folio\hfil\thistitle}} \global\oddchapheadline={\line{\hfil\folio}} \global\let\contentsalignmacro = \chapoddpage } -\def\HEADINGSsingleafter{\let\HEADINGShook=\HEADINGSsinglex} -\def\HEADINGSsinglex{% +% For single-sided printing, chapter title goes across top left of page, +% page number on top right. +\def\HEADINGSsingleafter{\let\HEADINGShook=\HEADINGSsingle} +\def\HEADINGSsingle{% \global\evenfootline={\hfil} \global\oddfootline={\hfil} \global\evenheadline={\line{\thischapter\hfil\folio}} @@ -3976,7 +3997,6 @@ $$% % for @setchapternewpage off \def\HEADINGSsinglechapoff{% -\pageone \global\evenfootline={\hfil} \global\oddfootline={\hfil} \global\evenheadline={\line{\thischapter\hfil\folio}} @@ -4346,8 +4366,7 @@ $$% % undo it ourselves. \def\headitemfont{\b}% for people to use in the template row; not changeable \def\headitem{% - \checkenv\multitable - \crcr + \crcr % must appear first \gdef\headitemcrhook{\nobreak}% attempt to avoid page break after headings \global\everytab={\bf}% can't use \headitemfont since the parsing differs \the\everytab % for the first item @@ -4432,7 +4451,7 @@ $$% \message{conditionals,} -% @iftex, @ifnotdocbook, @ifnothtml, @ifnotinfo, @ifnotplaintext, +% @iftex, @ifnotdocbook, @ifnothtml, @ifnotinfo, @ifnotlatex, @ifnotplaintext, % @ifnotxml always succeed. They currently do nothing; we don't % attempt to check whether the conditionals are properly nested. But we % have to remember that they are conditionals, so that @end doesn't @@ -4446,6 +4465,7 @@ $$% \makecond{ifnotdocbook} \makecond{ifnothtml} \makecond{ifnotinfo} +\makecond{ifnotlatex} \makecond{ifnotplaintext} \makecond{ifnotxml} @@ -4458,10 +4478,12 @@ $$% \def\ifdocbook{\doignore{ifdocbook}} \def\ifhtml{\doignore{ifhtml}} \def\ifinfo{\doignore{ifinfo}} +\def\iflatex{\doignore{iflatex}} \def\ifnottex{\doignore{ifnottex}} \def\ifplaintext{\doignore{ifplaintext}} \def\ifxml{\doignore{ifxml}} \def\ignore{\doignore{ignore}} +\def\latex{\doignore{latex}} \def\menu{\doignore{menu}} \def\xml{\doignore{xml}} @@ -4700,13 +4722,11 @@ $$% % except not \outer, so it can be used within macros and \if's. \edef\newwrite{\makecsname{ptexnewwrite}} -% \newindex {foo} defines an index named IX. +% \newindex {IX} defines an index named IX. % It automatically defines \IXindex such that % \IXindex ...rest of line... puts an entry in the index IX. % It also defines \IXindfile to be the number of the output channel for % the file that accumulates this index. The file's extension is IX. -% The name of an index should be no more than 2 characters long -% for the sake of vms. % \def\newindex#1{% \expandafter\chardef\csname#1indfile\endcsname=0 @@ -4769,21 +4789,6 @@ $$% \def\docodeindexxxx #1{\docind{\indexname}{#1}} -% Used for the aux, toc and index files to prevent expansion of Texinfo -% commands. -% -\def\atdummies{% - \definedummyletter\@% - \definedummyletter\ % - \definedummyletter\{% - \definedummyletter\}% - \definedummyletter\&% - % - % Do the redefinitions. - \definedummies - \otherbackslash -} - % \definedummyword defines \#1 as \string\#1\space, thus effectively % preventing its expansion. This is used only for control words, % not control letters, because the \space would be incorrect for @@ -4799,110 +4804,91 @@ $$% % \def\definedummyword #1{\def#1{\string#1\space}}% \def\definedummyletter#1{\def#1{\string#1}}% -\let\definedummyaccent\definedummyletter -% Called from \atdummies to prevent the expansion of commands. +% Used for the aux, toc and index files to prevent expansion of Texinfo +% commands. Most of the commands are controlled through the +% \ifdummies conditional. % -\def\definedummies{% +\def\atdummies{% + \dummiestrue % - \let\commondummyword\definedummyword - \let\commondummyletter\definedummyletter - \let\commondummyaccent\definedummyaccent - \commondummiesnofonts + \definedummyletter\@% + \definedummyletter\ % + \definedummyletter\{% + \definedummyletter\}% + \definedummyletter\&% % \definedummyletter\_% \definedummyletter\-% % - % Non-English letters. - \definedummyword\AA - \definedummyword\AE - \definedummyword\DH - \definedummyword\L - \definedummyword\O - \definedummyword\OE - \definedummyword\TH - \definedummyword\aa - \definedummyword\ae - \definedummyword\dh - \definedummyword\exclamdown - \definedummyword\l - \definedummyword\o - \definedummyword\oe - \definedummyword\ordf - \definedummyword\ordm - \definedummyword\questiondown - \definedummyword\ss - \definedummyword\th - % - % Although these internal commands shouldn't show up, sometimes they do. - \definedummyword\bf - \definedummyword\gtr - \definedummyword\hat - \definedummyword\less - \definedummyword\sf - \definedummyword\sl - \definedummyword\tclose - \definedummyword\tt - % - \definedummyword\LaTeX - \definedummyword\TeX - % - % Assorted special characters. - \definedummyword\ampchar - \definedummyword\atchar - \definedummyword\arrow - \definedummyword\backslashchar - \definedummyword\bullet - \definedummyword\comma - \definedummyword\copyright - \definedummyword\registeredsymbol - \definedummyword\dots - \definedummyword\enddots - \definedummyword\entrybreak - \definedummyword\equiv - \definedummyword\error - \definedummyword\euro - \definedummyword\expansion - \definedummyword\geq - \definedummyword\guillemetleft - \definedummyword\guillemetright - \definedummyword\guilsinglleft - \definedummyword\guilsinglright - \definedummyword\lbracechar - \definedummyword\leq - \definedummyword\mathopsup - \definedummyword\minus - \definedummyword\ogonek - \definedummyword\pounds - \definedummyword\point - \definedummyword\print - \definedummyword\quotedblbase - \definedummyword\quotedblleft - \definedummyword\quotedblright - \definedummyword\quoteleft - \definedummyword\quoteright - \definedummyword\quotesinglbase - \definedummyword\rbracechar - \definedummyword\result - \definedummyword\sub - \definedummyword\sup - \definedummyword\textdegree - % \definedummyword\subentry % % We want to disable all macros so that they are not expanded by \write. + \let\commondummyword\definedummyword \macrolist \let\value\dummyvalue % - \normalturnoffactive -} - -% \commondummiesnofonts: common to \definedummies and \indexnofonts. -% Define \commondummyletter, \commondummyaccent and \commondummyword before -% using. Used for accents, font commands, and various control letters. -% -\def\commondummiesnofonts{% - % Control letters and accents. + \turnoffactive +} + +\newif\ifdummies +\newif\ifindexnofonts + +\def\commondummyletter#1{% + \expandafter\let\csname\string#1:impl\endcsname#1% + \edef#1{% + \noexpand\ifindexnofonts + % empty expansion + \noexpand\else + \noexpand\ifdummies\string#1% + \noexpand\else + \noexpand\jumptwofi % dispose of the \fi + \expandafter\noexpand\csname\string#1:impl\endcsname + \noexpand\fi + \noexpand\fi}% +} + +\def\commondummyaccent#1{% + \expandafter\let\csname\string#1:impl\endcsname#1% + \edef#1{% + \noexpand\ifindexnofonts + \noexpand\expandafter % dispose of \else ... \fi + \noexpand\asis + \noexpand\else + \noexpand\ifdummies\string#1% + \noexpand\else + \noexpand\jumptwofi % dispose of the \fi + \expandafter\noexpand\csname\string#1:impl\endcsname + \noexpand\fi + \noexpand\fi}% +} + +% Like \commondummyaccent but add a \space at the end of the dummy expansion +% #2 is the expansion used for \indexnofonts. #2 is always followed by +% \asis to remove a pair of following braces. +\def\commondummyword#1#2{% + \expandafter\let\csname\string#1:impl\endcsname#1% + \expandafter\def\csname\string#1:ixnf\endcsname{#2\asis}% + \edef#1{% + \noexpand\ifindexnofonts + \noexpand\expandafter % dispose of \else ... \fi + \expandafter\noexpand\csname\string#1:ixnf\endcsname + \noexpand\else + \noexpand\ifdummies\string#1\space + \noexpand\else + \noexpand\jumptwofi % dispose of the \fi \fi + \expandafter\noexpand\csname\string#1:impl\endcsname + \noexpand\fi + \noexpand\fi}% +} +\def\jumptwofi#1\fi\fi{\fi\fi#1} + +% For \atdummies and \indexnofonts. \atdummies sets +% \dummiestrue and \indexnofonts sets \indexnofontstrue. +\def\definedummies{ + % @-sign is always an escape character when reading auxiliary files + \escapechar = `\@ + % \commondummyletter\!% \commondummyaccent\"% \commondummyaccent\'% @@ -4916,58 +4902,123 @@ $$% \commondummyaccent\^% \commondummyaccent\`% \commondummyaccent\~% - \commondummyword\u - \commondummyword\v - \commondummyword\H - \commondummyword\dotaccent - \commondummyword\ogonek - \commondummyword\ringaccent - \commondummyword\tieaccent - \commondummyword\ubaraccent - \commondummyword\udotaccent - \commondummyword\dotless + % + % Control letters and accents. + \commondummyword\u {}% + \commondummyword\v {}% + \commondummyword\H {}% + \commondummyword\dotaccent {}% + \commondummyword\ogonek {}% + \commondummyword\ringaccent {}% + \commondummyword\tieaccent {}% + \commondummyword\ubaraccent {}% + \commondummyword\udotaccent {}% + \commondummyword\dotless {}% % % Texinfo font commands. - \commondummyword\b - \commondummyword\i - \commondummyword\r - \commondummyword\sansserif - \commondummyword\sc - \commondummyword\slanted - \commondummyword\t + \commondummyword\b {}% + \commondummyword\i {}% + \commondummyword\r {}% + \commondummyword\sansserif {}% + \commondummyword\sc {}% + \commondummyword\slanted {}% + \commondummyword\t {}% % % Commands that take arguments. - \commondummyword\abbr - \commondummyword\acronym - \commondummyword\anchor - \commondummyword\cite - \commondummyword\code - \commondummyword\command - \commondummyword\dfn - \commondummyword\dmn - \commondummyword\email - \commondummyword\emph - \commondummyword\env - \commondummyword\file - \commondummyword\image - \commondummyword\indicateurl - \commondummyword\inforef - \commondummyword\kbd - \commondummyword\key - \commondummyword\math - \commondummyword\option - \commondummyword\pxref - \commondummyword\ref - \commondummyword\samp - \commondummyword\strong - \commondummyword\tie - \commondummyword\U - \commondummyword\uref - \commondummyword\url - \commondummyword\var - \commondummyword\verb - \commondummyword\w - \commondummyword\xref + \commondummyword\abbr {}% + \commondummyword\acronym {}% + \commondummyword\anchor {}% + \commondummyword\cite {}% + \commondummyword\code {}% + \commondummyword\command {}% + \commondummyword\dfn {}% + \commondummyword\dmn {}% + \commondummyword\email {}% + \commondummyword\emph {}% + \commondummyword\env {}% + \commondummyword\file {}% + \commondummyword\image {}% + \commondummyword\indicateurl{}% + \commondummyword\inforef {}% + \commondummyword\kbd {}% + \commondummyword\key {}% + \commondummyword\math {}% + \commondummyword\option {}% + \commondummyword\pxref {}% + \commondummyword\ref {}% + \commondummyword\samp {}% + \commondummyword\strong {}% + \commondummyword\tie {}% + \commondummyword\U {}% + \commondummyword\uref {}% + \commondummyword\url {}% + \commondummyword\var {}% + \commondummyword\verb {}% + \commondummyword\w {}% + \commondummyword\xref {}% + % + \commondummyword\AA {AA}% + \commondummyword\AE {AE}% + \commondummyword\DH {DZZ}% + \commondummyword\L {L}% + \commondummyword\O {O}% + \commondummyword\OE {OE}% + \commondummyword\TH {TH}% + \commondummyword\aa {aa}% + \commondummyword\ae {ae}% + \commondummyword\dh {dzz}% + \commondummyword\exclamdown {!}% + \commondummyword\l {l}% + \commondummyword\o {o}% + \commondummyword\oe {oe}% + \commondummyword\ordf {a}% + \commondummyword\ordm {o}% + \commondummyword\questiondown {?}% + \commondummyword\ss {ss}% + \commondummyword\th {th}% + % + \commondummyword\LaTeX {LaTeX}% + \commondummyword\TeX {TeX}% + % + % Assorted special characters. + \commondummyword\ampchar {\normalamp}% + \commondummyword\atchar {\@}% + \commondummyword\arrow {->}% + \commondummyword\backslashchar {\realbackslash}% + \commondummyword\bullet {bullet}% + \commondummyword\comma {,}% + \commondummyword\copyright {copyright}% + \commondummyword\dots {...}% + \commondummyword\enddots {...}% + \commondummyword\entrybreak {}% + \commondummyword\equiv {===}% + \commondummyword\error {error}% + \commondummyword\euro {euro}% + \commondummyword\expansion {==>}% + \commondummyword\geq {>=}% + \commondummyword\guillemetleft {<<}% + \commondummyword\guillemetright {>>}% + \commondummyword\guilsinglleft {<}% + \commondummyword\guilsinglright {>}% + \commondummyword\lbracechar {\{}% + \commondummyword\leq {<=}% + \commondummyword\mathopsup {sup}% + \commondummyword\minus {-}% + \commondummyword\pounds {pounds}% + \commondummyword\point {.}% + \commondummyword\print {-|}% + \commondummyword\quotedblbase {"}% + \commondummyword\quotedblleft {"}% + \commondummyword\quotedblright {"}% + \commondummyword\quoteleft {`}% + \commondummyword\quoteright {'}% + \commondummyword\quotesinglbase {,}% + \commondummyword\rbracechar {\}}% + \commondummyword\registeredsymbol {R}% + \commondummyword\result {=>}% + \commondummyword\sub {}% + \commondummyword\sup {}% + \commondummyword\textdegree {o}% } \let\indexlbrace\relax @@ -4985,25 +5036,24 @@ $$% \catcode`\-=13 \catcode`\`=13 \gdef\indexnonalnumdisappear{% - \expandafter\ifx\csname SETtxiindexlquoteignore\endcsname\relax\else + \ifflagclear{txiindexlquoteignore}{}{% % @set txiindexlquoteignore makes us ignore left quotes in the sort term. % (Introduced for FSFS 2nd ed.) \let`=\empty - \fi + }% % - \expandafter\ifx\csname SETtxiindexbackslashignore\endcsname\relax\else + \ifflagclear{txiindexbackslashignore}{}{% \backslashdisappear - \fi - % - \expandafter\ifx\csname SETtxiindexhyphenignore\endcsname\relax\else + }% + \ifflagclear{txiindexhyphenignore}{}{% \def-{}% - \fi - \expandafter\ifx\csname SETtxiindexlessthanignore\endcsname\relax\else + }% + \ifflagclear{txiindexlessthanignore}{}{% \def<{}% - \fi - \expandafter\ifx\csname SETtxiindexatsignignore\endcsname\relax\else + }% + \ifflagclear{txiindexatsignignore}{}{% \def\@{}% - \fi + }% } \gdef\indexnonalnumreappear{% @@ -5019,18 +5069,7 @@ $$% % would be for a given command (usually its argument). % \def\indexnofonts{% - % Accent commands should become @asis. - \def\commondummyaccent##1{\let##1\asis}% - % We can just ignore other control letters. - \def\commondummyletter##1{\let##1\empty}% - % All control words become @asis by default; overrides below. - \let\commondummyword\commondummyaccent - \commondummiesnofonts - % - % Don't no-op \tt, since it isn't a user-level command - % and is used in the definitions of the active chars like <, >, |, etc. - % Likewise with the other plain tex font commands. - %\let\tt=\asis + \indexnofontstrue % \def\ { }% \def\@{@}% @@ -5042,84 +5081,19 @@ $$% \let\lbracechar\{% \let\rbracechar\}% % - % Non-English letters. - \def\AA{AA}% - \def\AE{AE}% - \def\DH{DZZ}% - \def\L{L}% - \def\OE{OE}% - \def\O{O}% - \def\TH{TH}% - \def\aa{aa}% - \def\ae{ae}% - \def\dh{dzz}% - \def\exclamdown{!}% - \def\l{l}% - \def\oe{oe}% - \def\ordf{a}% - \def\ordm{o}% - \def\o{o}% - \def\questiondown{?}% - \def\ss{ss}% - \def\th{th}% - % - \let\do\indexnofontsdef - % - \do\LaTeX{LaTeX}% - \do\TeX{TeX}% - % - % Assorted special characters. - \do\atchar{@}% - \do\arrow{->}% - \do\bullet{bullet}% - \do\comma{,}% - \do\copyright{copyright}% - \do\dots{...}% - \do\enddots{...}% - \do\equiv{==}% - \do\error{error}% - \do\euro{euro}% - \do\expansion{==>}% - \do\geq{>=}% - \do\guillemetleft{<<}% - \do\guillemetright{>>}% - \do\guilsinglleft{<}% - \do\guilsinglright{>}% - \do\leq{<=}% - \do\lbracechar{\{}% - \do\minus{-}% - \do\point{.}% - \do\pounds{pounds}% - \do\print{-|}% - \do\quotedblbase{"}% - \do\quotedblleft{"}% - \do\quotedblright{"}% - \do\quoteleft{`}% - \do\quoteright{'}% - \do\quotesinglbase{,}% - \do\rbracechar{\}}% - \do\registeredsymbol{R}% - \do\result{=>}% - \do\textdegree{o}% % % We need to get rid of all macros, leaving only the arguments (if present). % Of course this is not nearly correct, but it is the best we can do for now. - % makeinfo does not expand macros in the argument to @deffn, which ends up - % writing an index entry, and texindex isn't prepared for an index sort entry - % that starts with \. % % Since macro invocations are followed by braces, we can just redefine them % to take a single TeX argument. The case of a macro invocation that % goes to end-of-line is not handled. % + \def\commondummyword##1{\let##1\asis}% \macrolist \let\value\indexnofontsvalue } -% Give the control sequence a definition that removes the {} that follows -% its use, e.g. @AA{} -> AA -\def\indexnofontsdef#1#2{\def#1##1{#2}}% - @@ -5250,7 +5224,10 @@ $$% \xdef\trimmed{\segment}% \xdef\trimmed{\expandafter\eatspaces\expandafter{\trimmed}}% \xdef\indexsortkey{\trimmed}% - \ifx\indexsortkey\empty\xdef\indexsortkey{ }\fi + \ifx\indexsortkey\empty + \message{Empty index sort key near line \the\inputlineno}% + \xdef\indexsortkey{ }% + \fi }\fi % % Append to \fullindexsortkey. @@ -5295,9 +5272,7 @@ $$% % \atdummies % - \expandafter\ifx\csname SETtxiindexescapeisbackslash\endcsname\relax\else - \escapeisbackslash - \fi + \ifflagclear{txiindexescapeisbackslash}{}{\escapeisbackslash}% % % For texindex which always views { and } as separators. \def\{{\lbracechar{}}% @@ -5481,9 +5456,9 @@ $$% % old index files using \ as the escape character. Reading this would % at best lead to typesetting garbage, at worst a TeX syntax error. \def\printindexzz#1#2\finish{% - \expandafter\ifx\csname SETtxiindexescapeisbackslash\endcsname\relax + \ifflagclear{txiindexescapeisbackslash}{% \uccode`\~=`\\ \uppercase{\if\noexpand~}\noexpand#1 - \expandafter\ifx\csname SETtxiskipindexfileswithbackslash\endcsname\relax + \ifflagclear{txiskipindexfileswithbackslash}{% \errmessage{% ERROR: A sorted index file in an obsolete format was skipped. To fix this problem, please upgrade your version of 'texi2dvi' @@ -5499,15 +5474,15 @@ this, Texinfo will try to use index files in the old format. If you continue to have problems, deleting the index files and starting again might help (with 'rm \jobname.?? \jobname.??s')% }% - \else + }{% (Skipped sorted index file in obsolete format) - \fi + }% \else \begindoublecolumns \input \jobname.\indexname s \enddoublecolumns \fi - \else + }{% \begindoublecolumns \catcode`\\=0\relax % @@ -5517,7 +5492,7 @@ might help (with 'rm \jobname.?? \jobname.??s')% \catcode`\@=0\relax \input \jobname.\indexname s \enddoublecolumns - \fi + }% } % These macros are used by the sorted index file itself. @@ -5592,6 +5567,11 @@ might help (with 'rm \jobname.?? \jobname.??s')% \newdimen\entryrightmargin \entryrightmargin=0pt +% for PDF output, whether to make the text of the entry a link to the page +% number. set for @contents and @shortcontents where there is only one +% page number. +\newif\iflinkentrytext + % \entry typesets a paragraph consisting of the text (#1), dot leaders, and % then page number (#2) flushed to the right margin. It is used for index % and table of contents entries. The paragraph is indented by \leftskip. @@ -5618,7 +5598,7 @@ might help (with 'rm \jobname.?? \jobname.??s')% } \def\entrybreak{\unskip\space\ignorespaces}% \def\doentry{% - % Save the text of the entry + % Save the text of the entry in \boxA \global\setbox\boxA=\hbox\bgroup \bgroup % Instead of the swallowed brace. \noindent @@ -5628,12 +5608,21 @@ might help (with 'rm \jobname.?? \jobname.??s')% % with catcodes occurring. } {\catcode`\@=11 +% #1 is the page number \gdef\finishentry#1{% - \egroup % end box A + \egroup % end \boxA \dimen@ = \wd\boxA % Length of text of entry + % add any leaders and page number to \boxA. \global\setbox\boxA=\hbox\bgroup - \unhbox\boxA - % #1 is the page number. + \ifpdforxetex + \iflinkentrytext + \pdflinkpage{#1}{\unhbox\boxA}% + \else + \unhbox\boxA + \fi + \else + \unhbox\boxA + \fi % % Get the width of the page numbers, and only use % leaders if they are present. @@ -5652,6 +5641,8 @@ might help (with 'rm \jobname.?? \jobname.??s')% \fi \fi \egroup % end \boxA + % + % now output \ifdim\wd\boxB = 0pt \noindent\unhbox\boxA\par \nobreak @@ -6351,7 +6342,7 @@ might help (with 'rm \jobname.?? \jobname.??s')% \fi } -\parseargdef\setchapternewpage{\csname CHAPPAG#1\endcsname} +\parseargdef\setchapternewpage{\csname CHAPPAG#1\endcsname\HEADINGSon} \def\CHAPPAGoff{% \global\let\contentsalignmacro = \chappager @@ -6368,7 +6359,7 @@ might help (with 'rm \jobname.?? \jobname.??s')% \global\let\pchapsepmacro=\chapoddpage \global\def\HEADINGSon{\HEADINGSdouble}} -\CHAPPAGon +\setchapternewpage on % \chapmacro - Chapter opening. % @@ -6381,6 +6372,16 @@ might help (with 'rm \jobname.?? \jobname.??s')% \def\Yappendixkeyword{Yappendix} \def\Yomitfromtockeyword{Yomitfromtoc} % +% +% Definitions for @thischapter. These can be overridden in translation +% files. +\def\thischapterAppendix{% + \putwordAppendix{} \thischapternum: \thischaptername} + +\def\thischapterChapter{% + \putwordChapter{} \thischapternum: \thischaptername} +% +% \def\chapmacro#1#2#3{% \expandafter\ifx\thisenv\titlepage\else \checkenv{}% chapters, etc., should not start inside an environment. @@ -6403,22 +6404,14 @@ might help (with 'rm \jobname.?? \jobname.??s')% \xdef\currentchapterdefs{% \gdef\noexpand\thischaptername{\the\toks0}% \gdef\noexpand\thischapternum{\appendixletter}% - % \noexpand\putwordAppendix avoids expanding indigestible - % commands in some of the translations. - \gdef\noexpand\thischapter{\noexpand\putwordAppendix{} - \noexpand\thischapternum: - \noexpand\thischaptername}% + \let\noexpand\thischapter\noexpand\thischapterAppendix }% \else \toks0={#1}% \xdef\currentchapterdefs{% \gdef\noexpand\thischaptername{\the\toks0}% \gdef\noexpand\thischapternum{\the\chapno}% - % \noexpand\putwordChapter avoids expanding indigestible - % commands in some of the translations. - \gdef\noexpand\thischapter{\noexpand\putwordChapter{} - \noexpand\thischapternum: - \noexpand\thischaptername}% + \let\noexpand\thischapter\noexpand\thischapterChapter }% \fi\fi\fi % @@ -6504,6 +6497,12 @@ might help (with 'rm \jobname.?? \jobname.??s')% \def\subsubsecheadingskip{\subsecheadingskip} \def\subsubsecheadingbreak{\subsecheadingbreak} +% Definition for @thissection. This can be overridden in translation +% files. +\def\thissectionDef{% + \putwordSection{} \thissectionnum: \thissectionname} +% + % Print any size, any type, section title. % @@ -6545,11 +6544,7 @@ might help (with 'rm \jobname.?? \jobname.??s')% \xdef\currentsectiondefs{% \gdef\noexpand\thissectionname{\the\toks0}% \gdef\noexpand\thissectionnum{#4}% - % \noexpand\putwordSection avoids expanding indigestible - % commands in some of the translations. - \gdef\noexpand\thissection{\noexpand\putwordSection{} - \noexpand\thissectionnum: - \noexpand\thissectionname}% + \let\noexpand\thissection\noexpand\thissectionDef }% \fi \else @@ -6558,11 +6553,7 @@ might help (with 'rm \jobname.?? \jobname.??s')% \xdef\currentsectiondefs{% \gdef\noexpand\thissectionname{\the\toks0}% \gdef\noexpand\thissectionnum{#4}% - % \noexpand\putwordSection avoids expanding indigestible - % commands in some of the translations. - \gdef\noexpand\thissection{\noexpand\putwordSection{} - \noexpand\thissectionnum: - \noexpand\thissectionname}% + \let\noexpand\thissection\noexpand\thissectionDef }% \fi \fi\fi\fi @@ -6748,8 +6739,14 @@ might help (with 'rm \jobname.?? \jobname.??s')% \def\thistitle{}% no title in double-sided headings % Record where the Roman numerals started. \ifnum\romancount=0 \global\romancount=\pagecount \fi + \linkentrytexttrue } +% \raggedbottom in plain.tex hardcodes \topskip so override it +\catcode`\@=11 +\def\raggedbottom{\advance\topskip by 0pt plus60pt \r@ggedbottomtrue} +\catcode`\@=\other + % redefined for the two-volume lispref. We always output on % \jobname.toc even if this is redefined. % @@ -6870,7 +6867,7 @@ might help (with 'rm \jobname.?? \jobname.??s')% % Chapters, in the short toc. % See comments in \dochapentry re vbox and related settings. \def\shortchapentry#1#2#3#4{% - \tocentry{\shortchaplabel{#2}\labelspace #1}{\doshortpageno\bgroup#4\egroup}% + \tocentry{\shortchaplabel{#2}\labelspace #1}{#4}% } % Appendices, in the main contents. @@ -6885,7 +6882,7 @@ might help (with 'rm \jobname.?? \jobname.??s')% % Unnumbered chapters. \def\unnchapentry#1#2#3#4{\dochapentry{#1}{#4}} -\def\shortunnchapentry#1#2#3#4{\tocentry{#1}{\doshortpageno\bgroup#4\egroup}} +\def\shortunnchapentry#1#2#3#4{\tocentry{#1}{#4}} % Sections. \def\numsecentry#1#2#3#4{\dosecentry{#2\labelspace#1}{#4}} @@ -6917,24 +6914,24 @@ might help (with 'rm \jobname.?? \jobname.??s')% % Move the page numbers slightly to the right \advance\entryrightmargin by -0.05em \chapentryfonts - \tocentry{#1}{\dopageno\bgroup#2\egroup}% + \tocentry{#1}{#2}% \endgroup \nobreak\vskip .25\baselineskip plus.1\baselineskip } \def\dosecentry#1#2{\begingroup \secentryfonts \leftskip=\tocindent - \tocentry{#1}{\dopageno\bgroup#2\egroup}% + \tocentry{#1}{#2}% \endgroup} \def\dosubsecentry#1#2{\begingroup \subsecentryfonts \leftskip=2\tocindent - \tocentry{#1}{\dopageno\bgroup#2\egroup}% + \tocentry{#1}{#2}% \endgroup} \def\dosubsubsecentry#1#2{\begingroup \subsubsecentryfonts \leftskip=3\tocindent - \tocentry{#1}{\dopageno\bgroup#2\egroup}% + \tocentry{#1}{#2}% \endgroup} % We use the same \entry macro as for the index entries. @@ -6943,9 +6940,6 @@ might help (with 'rm \jobname.?? \jobname.??s')% % Space between chapter (or whatever) number and the title. \def\labelspace{\hskip1em \relax} -\def\dopageno#1{{\rm #1}} -\def\doshortpageno#1{{\rm #1}} - \def\chapentryfonts{\secfonts \rm} \def\secentryfonts{\textfonts} \def\subsecentryfonts{\textfonts} @@ -7090,19 +7084,25 @@ might help (with 'rm \jobname.?? \jobname.??s')% \newdimen\cartouter\newdimen\cartinner \newskip\normbskip\newskip\normpskip\newskip\normlskip - -\envdef\cartouche{% +\envparseargdef\cartouche{% \cartouchefontdefs \ifhmode\par\fi % can't be in the midst of a paragraph. \startsavinginserts \lskip=\leftskip \rskip=\rightskip \leftskip=0pt\rightskip=0pt % we want these *outside*. + % + % Set paragraph width for text inside cartouche. There are + % left and right margins of 3pt each plus two vrules 0.4pt each. \cartinner=\hsize \advance\cartinner by-\lskip \advance\cartinner by-\rskip + \advance\cartinner by -6.8pt + % + % For drawing top and bottom of cartouche. Each corner char + % adds 6pt and we take off the width of a rule to line up with the + % right boundary perfectly. \cartouter=\hsize - \advance\cartouter by 18.4pt % allow for 3pt kerns on either - % side, and for 6pt waste from - % each corner char, and rule thickness + \advance\cartouter by 11.6pt + % \normbskip=\baselineskip \normpskip=\parskip \normlskip=\lineskip % % If this cartouche directly follows a sectioning command, we need the @@ -7110,20 +7110,23 @@ might help (with 'rm \jobname.?? \jobname.??s')% % collide with the section heading. \ifnum\lastpenalty>10000 \vskip\parskip \penalty\lastpenalty \fi % - \setbox\groupbox=\vbox\bgroup + \setbox\groupbox=\vtop\bgroup \baselineskip=0pt\parskip=0pt\lineskip=0pt \carttop \hbox\bgroup - \hskip\lskip - \vrule\kern3pt - \vbox\bgroup - \kern3pt - \hsize=\cartinner - \baselineskip=\normbskip - \lineskip=\normlskip - \parskip=\normpskip - \vskip -\parskip - \comment % For explanation, see the end of def\group. + \hskip\lskip + \vrule\kern3pt + \vbox\bgroup + \hsize=\cartinner + \baselineskip=\normbskip + \lineskip=\normlskip + \parskip=\normpskip + \def\arg{#1}% + \ifx\arg\empty\else + \centerV{\hfil \bf #1 \hfil}% + \fi + \kern3pt + \vskip -\parskip } \def\Ecartouche{% \ifhmode\par\fi @@ -7277,22 +7280,6 @@ might help (with 'rm \jobname.?? \jobname.??s')% } \let\Eraggedright\par -\envdef\raggedleft{% - \parindent=0pt \leftskip0pt plus2em - \spaceskip.3333em \xspaceskip.5em \parfillskip=0pt - \hbadness=10000 % Last line will usually be underfull, so turn off - % badness reporting. -} -\let\Eraggedleft\par - -\envdef\raggedcenter{% - \parindent=0pt \rightskip0pt plus1em \leftskip0pt plus1em - \spaceskip.3333em \xspaceskip.5em \parfillskip=0pt - \hbadness=10000 % Last line will usually be underfull, so turn off - % badness reporting. -} -\let\Eraggedcenter\par - % @quotation does normal linebreaking (hence we can't use \nonfillstart) % and narrows the margins. We keep \parskip nonzero in general, since @@ -7390,8 +7377,9 @@ might help (with 'rm \jobname.?? \jobname.??s')% \endgroup % \def\setupverb{% - \tt % easiest (and conventionally used) font for verbatim + \tt \def\par{\leavevmode\endgraf}% + \parindent = 0pt \setcodequotes \tabeightspaces % Respect line breaks, @@ -7515,9 +7503,11 @@ might help (with 'rm \jobname.?? \jobname.??s')% % file; b) letting users define the frontmatter in as flexible order as % possible is desirable. % -\def\copying{\checkenv{}\begingroup\scanargctxt\docopying} -\def\docopying#1@end copying{\endgroup\def\copyingtext{#1}} -% +\def\copying{\checkenv{}\begingroup\macrobodyctxt\docopying} +{\catcode`\ =\other +\gdef\docopying#1@end copying{\endgroup\def\copyingtext{#1}} +} + \def\insertcopying{% \begingroup \parindent = 0pt % paragraph indentation looks wrong on title page @@ -7565,32 +7555,19 @@ might help (with 'rm \jobname.?? \jobname.??s')% \exdentamount=\defbodyindent } -\def\dodefunx#1{% - % First, check whether we are in the right environment: - \checkenv#1% - % - % As above, allow line break if we have multiple x headers in a row. - % It's not a great place, though. - \ifnum\lastpenalty=10002 \penalty3000 \else \defunpenalty=10002 \fi - % - % And now, it's time to reuse the body of the original defun: - \expandafter\gobbledefun#1% -} -\def\gobbledefun#1\startdefun{} - -% \printdefunline \deffnheader{text} +% Called as \printdefunline \deffooheader{text} % \def\printdefunline#1#2{% \begingroup \plainfrenchspacing - % call \deffnheader: + % call \deffooheader: #1#2 \endheader % common ending: \interlinepenalty = 10000 \advance\rightskip by 0pt plus 1fil\relax \endgraf \nobreak\vskip -\parskip - \penalty\defunpenalty % signal to \startdefun and \dodefunx + \penalty\defunpenalty % signal to \startdefun and \deffoox % Some of the @defun-type tags do not enable magic parentheses, % rendering the following check redundant. But we don't optimize. \checkparencounts @@ -7599,29 +7576,51 @@ might help (with 'rm \jobname.?? \jobname.??s')% \def\Edefun{\endgraf\medbreak} -% \makedefun{deffn} creates \deffn, \deffnx and \Edeffn; -% the only thing remaining is to define \deffnheader. +% @defblock, @defline do not automatically create index entries +\envdef\defblock{% + \startdefun +} +\let\Edefblock\Edefun + +\def\defline{% + \doingtypefnfalse + \parseargusing\activeparens{\printdefunline\deflineheader}% +} +\def\deflineheader#1 #2 #3\endheader{% + \printdefname{#1}{}{#2}\magicamp\defunargs{#3\unskip}% +} +\def\deftypeline{% + \doingtypefntrue + \parseargusing\activeparens{\printdefunline\deflineheader}% +} + +% \makedefun{deffoo} (\deffooheader parameters) { (\deffooheader expansion) } % +% Define \deffoo, \deffoox \Edeffoo and \deffooheader. \def\makedefun#1{% \expandafter\let\csname E#1\endcsname = \Edefun \edef\temp{\noexpand\domakedefun \makecsname{#1}\makecsname{#1x}\makecsname{#1header}}% \temp } - -% \domakedefun \deffn \deffnx \deffnheader { (defn. of \deffnheader) } -% -% Define \deffn and \deffnx, without parameters. -% \deffnheader has to be defined explicitly. -% \def\domakedefun#1#2#3{% \envdef#1{% \startdefun \doingtypefnfalse % distinguish typed functions from all else \parseargusing\activeparens{\printdefunline#3}% }% - \def#2{\dodefunx#1}% - \def#3% + \def#2{% + % First, check whether we are in the right environment: + \checkenv#1% + % + % As in \startdefun, allow line break if we have multiple x headers + % in a row. It's not a great place, though. + \ifnum\lastpenalty=10002 \penalty3000 \else \defunpenalty=10002 \fi + % + \doingtypefnfalse % distinguish typed functions from all else + \parseargusing\activeparens{\printdefunline#3}% + }% + \def#3% definition of \deffooheader follows } \newif\ifdoingtypefn % doing typed function? @@ -7646,74 +7645,51 @@ might help (with 'rm \jobname.?? \jobname.??s')% \fi\fi } -% \dosubind {index}{topic}{subtopic} -% -% If SUBTOPIC is present, precede it with a space, and call \doind. -% (At some time during the 20th century, this made a two-level entry in an -% index such as the operation index. Nobody seemed to notice the change in -% behaviour though.) -\def\dosubind#1#2#3{% - \def\thirdarg{#3}% - \ifx\thirdarg\empty - \doind{#1}{#2}% - \else - \doind{#1}{#2\space#3}% - \fi -} - % Untyped functions: % @deffn category name args -\makedefun{deffn}{\deffngeneral{}} - -% @deffn category class name args -\makedefun{defop}#1 {\defopon{#1\ \putwordon}} - -% \defopon {category on}class name args -\def\defopon#1#2 {\deffngeneral{\putwordon\ \code{#2}}{#1\ \code{#2}} } +\makedefun{deffn}#1 #2 #3\endheader{% + \doind{fn}{\code{#2}}% + \printdefname{#1}{}{#2}\magicamp\defunargs{#3\unskip}% +} -% \deffngeneral {subind}category name args -% -\def\deffngeneral#1#2 #3 #4\endheader{% - \dosubind{fn}{\code{#3}}{#1}% - \defname{#2}{}{#3}\magicamp\defunargs{#4\unskip}% +% @defop category class name args +\makedefun{defop}#1 {\defopheaderx{#1\ \putwordon}} +\def\defopheaderx#1#2 #3 #4\endheader{% + \doind{fn}{\code{#3}\space\putwordon\ \code{#2}}% + \printdefname{#1\ \code{#2}}{}{#3}\magicamp\defunargs{#4\unskip}% } % Typed functions: % @deftypefn category type name args -\makedefun{deftypefn}{\deftypefngeneral{}} +\makedefun{deftypefn}#1 #2 #3 #4\endheader{% + \doind{fn}{\code{#3}}% + \doingtypefntrue + \printdefname{#1}{#2}{#3}\defunargs{#4\unskip}% +} % @deftypeop category class type name args -\makedefun{deftypeop}#1 {\deftypeopon{#1\ \putwordon}} - -% \deftypeopon {category on}class type name args -\def\deftypeopon#1#2 {\deftypefngeneral{\putwordon\ \code{#2}}{#1\ \code{#2}} } - -% \deftypefngeneral {subind}category type name args -% -\def\deftypefngeneral#1#2 #3 #4 #5\endheader{% - \dosubind{fn}{\code{#4}}{#1}% +\makedefun{deftypeop}#1 {\deftypeopheaderx{#1\ \putwordon}} +\def\deftypeopheaderx#1#2 #3 #4 #5\endheader{% + \doind{fn}{\code{#4}\space\putwordon\ \code{#1\ \code{#2}}}% \doingtypefntrue - \defname{#2}{#3}{#4}\defunargs{#5\unskip}% + \printdefname{#1\ \code{#2}}{#3}{#4}\defunargs{#5\unskip}% } % Typed variables: % @deftypevr category type var args -\makedefun{deftypevr}{\deftypecvgeneral{}} +\makedefun{deftypevr}#1 #2 #3 #4\endheader{% + \doind{vr}{\code{#3}}% + \printdefname{#1}{#2}{#3}\defunargs{#4\unskip}% +} % @deftypecv category class type var args -\makedefun{deftypecv}#1 {\deftypecvof{#1\ \putwordof}} - -% \deftypecvof {category of}class type var args -\def\deftypecvof#1#2 {\deftypecvgeneral{\putwordof\ \code{#2}}{#1\ \code{#2}} } - -% \deftypecvgeneral {subind}category type var args -% -\def\deftypecvgeneral#1#2 #3 #4 #5\endheader{% - \dosubind{vr}{\code{#4}}{#1}% - \defname{#2}{#3}{#4}\defunargs{#5\unskip}% +\makedefun{deftypecv}#1 {\deftypecvheaderx{#1\ \putwordof}} +\def\deftypecvheaderx#1#2 #3 #4 #5\endheader{% + \doind{vr}{\code{#4}\space\putwordof\ \code{#2}}% + \printdefname{#1\ \code{#2}}{#3}{#4}\defunargs{#5\unskip}% } % Untyped variables: @@ -7722,17 +7698,15 @@ might help (with 'rm \jobname.?? \jobname.??s')% \makedefun{defvr}#1 {\deftypevrheader{#1} {} } % @defcv category class var args -\makedefun{defcv}#1 {\defcvof{#1\ \putwordof}} - -% \defcvof {category of}class var args -\def\defcvof#1#2 {\deftypecvof{#1}#2 {} } +\makedefun{defcv}#1 {\defcvheaderx{#1\ \putwordof}} +\def\defcvheaderx#1#2 {\deftypecvheaderx{#1}#2 {} } % Types: % @deftp category name args \makedefun{deftp}#1 #2 #3\endheader{% \doind{tp}{\code{#2}}% - \defname{#1}{}{#2}\defunargs{#3\unskip}% + \printdefname{#1}{}{#2}\defunargs{#3\unskip}% } % Remaining @defun-like shortcuts: @@ -7743,19 +7717,19 @@ might help (with 'rm \jobname.?? \jobname.??s')% \makedefun{defvar}{\defvrheader{\putwordDefvar} } \makedefun{defopt}{\defvrheader{\putwordDefopt} } \makedefun{deftypevar}{\deftypevrheader{\putwordDefvar} } -\makedefun{defmethod}{\defopon\putwordMethodon} -\makedefun{deftypemethod}{\deftypeopon\putwordMethodon} -\makedefun{defivar}{\defcvof\putwordInstanceVariableof} -\makedefun{deftypeivar}{\deftypecvof\putwordInstanceVariableof} +\makedefun{defmethod}{\defopheaderx\putwordMethodon} +\makedefun{deftypemethod}{\deftypeopheaderx\putwordMethodon} +\makedefun{defivar}{\defcvheaderx\putwordInstanceVariableof} +\makedefun{deftypeivar}{\deftypecvheaderx\putwordInstanceVariableof} -% \defname, which formats the name of the @def (not the args). +% \printdefname, which formats the name of the @def (not the args). % #1 is the category, such as "Function". % #2 is the return type, if any. % #3 is the function name. % % We are followed by (but not passed) the arguments, if any. % -\def\defname#1#2#3{% +\def\printdefname#1#2#3{% \par % Get the values of \leftskip and \rightskip as they were outside the @def... \advance\leftskip by -\defbodyindent @@ -7765,9 +7739,7 @@ might help (with 'rm \jobname.?? \jobname.??s')% \rettypeownlinefalse \ifdoingtypefn % doing a typed function specifically? % then check user option for putting return type on its own line: - \expandafter\ifx\csname SETtxideftypefnnl\endcsname\relax \else - \rettypeownlinetrue - \fi + \ifflagclear{txideftypefnnl}{}{\rettypeownlinetrue}% \fi % % How we'll format the category name. Putting it in brackets helps @@ -7832,30 +7804,22 @@ might help (with 'rm \jobname.?? \jobname.??s')% \fi % no return type #3% output function name }% - {\rm\enskip}% hskip 0.5 em of \rmfont + \ifflagclear{txidefnamenospace}{% + {\rm\enskip}% hskip 0.5 em of \rmfont + }{}% % \boldbrax % arguments will be output next, if any. } -% Print arguments in slanted roman (not ttsl), inconsistently with using -% tt for the name. This is because literal text is sometimes needed in -% the argument list (groff manual), and ttsl and tt are not very -% distinguishable. Prevent hyphenation at `-' chars. -% +% Print arguments. Use slanted for @def*, typewriter for @deftype*. \def\defunargs#1{% - % use sl by default (not ttsl), - % tt for the names. - \df \sl \hyphenchar\font=0 - % - % On the other hand, if an argument has two dashes (for instance), we - % want a way to get ttsl. We used to recommend @var for that, so - % leave the code in, but it's strange for @var to lead to typewriter. - % Nowadays we recommend @code, since the difference between a ttsl hyphen - % and a tt hyphen is pretty tiny. @code also disables ?` !`. - \def\var##1{{\setregularquotes\ttslanted{##1}}}% - #1% - \sl\hyphenchar\font=45 + \bgroup + \df \ifdoingtypefn \tt \else \sl \fi + \ifflagclear{txicodevaristt}{}% + {\def\var##1{{\setregularquotes \ttsl ##1}}}% + #1% + \egroup } % We want ()&[] to print specially on the defun line. @@ -7874,9 +7838,12 @@ might help (with 'rm \jobname.?? \jobname.??s')% % so TeX would otherwise complain about undefined control sequence. { \activeparens - \global\let(=\lparen \global\let)=\rparen - \global\let[=\lbrack \global\let]=\rbrack - \global\let& = \& + \gdef\defcharsdefault{% + \let(=\lparen \let)=\rparen + \let[=\lbrack \let]=\rbrack + \let& = \&% + } + \globaldefs=1 \defcharsdefault \gdef\boldbrax{\let(=\opnr\let)=\clnr\let[=\lbrb\let]=\rbrb} \gdef\magicamp{\let&=\amprm} @@ -7887,7 +7854,7 @@ might help (with 'rm \jobname.?? \jobname.??s')% % If we encounter &foo, then turn on ()-hacking afterwards \newif\ifampseen -\def\amprm#1 {\ampseentrue{\bf\ }} +\def\amprm#1 {\ampseentrue{\rm\ }} \def\parenfont{% \ifampseen @@ -8060,24 +8027,17 @@ might help (with 'rm \jobname.?? \jobname.??s')% \catcode`\_=\other \catcode`\|=\other \catcode`\~=\other - \passthroughcharstrue -} - -\def\scanargctxt{% used for copying and captions, not macros. - \scanctxt \catcode`\@=\other - \catcode`\\=\other \catcode`\^^M=\other + \catcode`\\=\active + \passthroughcharstrue } -\def\macrobodyctxt{% used for @macro definitions +\def\macrobodyctxt{% used for @macro definitions and @copying \scanctxt \catcode`\ =\other - \catcode`\@=\other \catcode`\{=\other \catcode`\}=\other - \catcode`\^^M=\other - \usembodybackslash } % Used when scanning braced macro arguments. Note, however, that catcode @@ -8086,14 +8046,10 @@ might help (with 'rm \jobname.?? \jobname.??s')% \def\macroargctxt{% \scanctxt \catcode`\ =\active - \catcode`\@=\other - \catcode`\^^M=\other - \catcode`\\=\active } \def\macrolineargctxt{% used for whole-line arguments without braces \scanctxt - \catcode`\@=\other \catcode`\{=\other \catcode`\}=\other } @@ -8137,7 +8093,7 @@ might help (with 'rm \jobname.?? \jobname.??s')% \global\expandafter\let\csname ismacro.\the\macname\endcsname=1% \addtomacrolist{\the\macname}% \fi - \begingroup \macrobodyctxt + \begingroup \macrobodyctxt \usembodybackslash \ifrecursive \expandafter\parsermacbody \else \expandafter\parsemacbody \fi} @@ -8222,12 +8178,12 @@ might help (with 'rm \jobname.?? \jobname.??s')% % % We are in \macrobodyctxt, and the \xdef causes backslashshes in the macro % body to be transformed. -% Set \macrobody to the body of the macro, and call \defmacro. +% Set \macrobody to the body of the macro, and call \macrodef. % {\catcode`\ =\other\long\gdef\parsemacbody#1@end macro{% -\xdef\macrobody{\eatcr{#1}}\endgroup\defmacro}}% +\xdef\macrobody{\eatcr{#1}}\endgroup\macrodef}}% {\catcode`\ =\other\long\gdef\parsermacbody#1@end rmacro{% -\xdef\macrobody{\eatcr{#1}}\endgroup\defmacro}}% +\xdef\macrobody{\eatcr{#1}}\endgroup\macrodef}}% % Make @ a letter, so that we can make private-to-Texinfo macro names. \edef\texiatcatcode{\the\catcode`\@} @@ -8446,35 +8402,36 @@ might help (with 'rm \jobname.?? \jobname.??s')% % \xdef is used so that macro definitions will survive the file % they're defined in: @include reads the file inside a group. % -\def\defmacro{% +\def\macrodef{% \let\hash=##% convert placeholders to macro parameter chars \ifnum\paramno=1 - \def\xeatspaces##1{##1}% - % This removes the pair of braces around the argument. We don't - % use \eatspaces, because this can cause ends of lines to be lost - % when the argument to \eatspaces is read, leading to line-based - % commands like "@itemize" not being read correctly. + \long\def\xeatspaces##1{##1}% + % We don't use \xeatspaces for single-argument macros, because we + % want to keep ends of lines. This definition removes \xeatspaces + % when \macrobody is expanded below. \else - \let\xeatspaces\relax % suppress expansion + \def\xeatspaces{\string\xeatspaces}% + % This expands \xeatspaces as a sequence of character tokens, which + % stops \scantokens inserting an extra space after the control sequence. \fi \ifcase\paramno % 0 \expandafter\xdef\csname\the\macname\endcsname{% - \bgroup + \begingroup \noexpand\spaceisspace \noexpand\endlineisspace \noexpand\expandafter % skip any whitespace after the macro name. \expandafter\noexpand\csname\the\macname @@@\endcsname}% \expandafter\xdef\csname\the\macname @@@\endcsname{% - \egroup + \endgroup \noexpand\scanmacro{\macrobody}}% \or % 1 \expandafter\xdef\csname\the\macname\endcsname{% - \bgroup + \begingroup \noexpand\braceorline \expandafter\noexpand\csname\the\macname @@@\endcsname}% \expandafter\xdef\csname\the\macname @@@\endcsname##1{% - \egroup + \endgroup \noexpand\scanmacro{\macrobody}% }% \else % at most 9 @@ -8485,7 +8442,7 @@ might help (with 'rm \jobname.?? \jobname.??s')% % @MACNAME@@@ removes braces surrounding the argument list. % @MACNAME@@@@ scans the macro body with arguments substituted. \expandafter\xdef\csname\the\macname\endcsname{% - \bgroup + \begingroup \noexpand\expandafter % This \expandafter skip any spaces after the \noexpand\macroargctxt % macro before we change the catcode of space. \noexpand\expandafter @@ -8499,7 +8456,7 @@ might help (with 'rm \jobname.?? \jobname.??s')% \expandafter\xdef \expandafter\expandafter \csname\the\macname @@@@\endcsname\paramlist{% - \egroup\noexpand\scanmacro{\macrobody}}% + \endgroup\noexpand\scanmacro{\macrobody}}% \else % 10 or more: \expandafter\xdef\csname\the\macname\endcsname{% \noexpand\getargvals@{\the\macname}{\argl}% @@ -8621,6 +8578,75 @@ might help (with 'rm \jobname.?? \jobname.??s')% \fi \macnamexxx} +% @linemacro + +\parseargdef\linemacro{% + \getargs{#1}% now \macname is the macname and \argl the arglist + \ifx\argl\empty + \paramno=0 + \let\hash\relax + \def\paramlist{\hash 1\endlinemacro}% + \else + \expandafter\linegetparamlist\argl;% + \fi + \begingroup \macrobodyctxt \usembodybackslash + \parselinemacrobody +} + +% Build up \paramlist which will be used as the parameter text for the macro. +% At the end it will be like "#1 #2 #3\endlinemacro". +\def\linegetparamlist#1;{% + \paramno=0\def\paramlist{}% + \let\hash\relax + \linegetparamlistxxx#1,;,% +} +\def\linegetparamlistxxx#1,{% + \if#1;\let\next=\linegetparamlistxxxx + \else \let\next=\linegetparamlistxxx + \advance\paramno by 1 + \expandafter\edef\csname macarg.\eatspaces{#1}\endcsname + {\hash\the\paramno}% + \edef\paramlist{\paramlist\hash\the\paramno\space}% + \fi\next} +\def\linegetparamlistxxxx{% + \expandafter\fixparamlist\paramlist\fixparamlist +} +% Replace final space token +\def\fixparamlist#1 \fixparamlist{% + \def\paramlist{#1\endlinemacro}% +} + +% Read the body of the macro, replacing backslash-surrounded variables +% +{\catcode`\ =\other\long\gdef\parselinemacrobody#1@end linemacro{% +\xdef\macrobody{#1}% +\endgroup +\linemacrodef +}} + +% Make the definition +\def\linemacrodef{% + \let\hash=##% + \expandafter\xdef\csname\the\macname\endcsname{% + \bgroup + \noexpand\parsearg + \expandafter\noexpand\csname\the\macname @@\endcsname + } + \expandafter\xdef\csname\the\macname @@\endcsname##1{% + \egroup + \expandafter\noexpand + \csname\the\macname @@@\endcsname##1\noexpand\endlinemacro + } + \expandafter\expandafter + \expandafter\xdef + \expandafter\expandafter\csname\the\macname @@@\endcsname\paramlist{% + \newlinechar=13 % split \macrobody into lines + \noexpand\scantokens{\macrobody}% + } +} + + + % @alias. % We need some trickery to remove the optional spaces around the equal % sign. Make them active and then expand them all to nothing. @@ -8941,12 +8967,11 @@ might help (with 'rm \jobname.?? \jobname.??s')% % output the `[mynode]' via the macro below so it can be overridden. \xrefprintnodename\printedrefname % - \expandafter\ifx\csname SETtxiomitxrefpg\endcsname\relax - % But we always want a comma and a space: - ,\space - % + \ifflagclear{txiomitxrefpg}{% + % We always want a comma + ,% % output the `page 3'. - \turnoffactive \putwordpage\tie\refx{#1-pg}% + \turnoffactive \putpageref{#1}% % Add a , if xref followed by a space \if\space\noexpand\tokenafterxref ,% \else\ifx\ \tokenafterxref ,% @TAB @@ -8956,12 +8981,16 @@ might help (with 'rm \jobname.?? \jobname.??s')% \tokenafterxref ,% @NL \else\ifx\tie\tokenafterxref ,% @tie \fi\fi\fi\fi\fi\fi - \fi + }{}% \fi\fi \fi \endlink \endgroup} +% can be overridden in translation files +\def\putpageref#1{% + \space\putwordpage\tie\refx{#1-pg}} + % Output a cross-manual xref to #1. Used just above (twice). % % Only include the text "Section ``foo'' in" if the foo is neither @@ -9373,6 +9402,12 @@ might help (with 'rm \jobname.?? \jobname.??s')% \imagexxx #1,,,,,\finish \fi } + +% Approximate height of a line in the standard text font. +\newdimen\capheight +\setbox0=\vbox{\tenrm H} +\capheight=\ht0 + % % Arguments to @image: % #1 is (mandatory) image filename; we tack on .eps extension. @@ -9387,13 +9422,6 @@ might help (with 'rm \jobname.?? \jobname.??s')% \makevalueexpandable \ifvmode \imagevmodetrue - \else \ifx\centersub\centerV - % for @center @image, we need a vbox so we can have our vertical space - \imagevmodetrue - \vbox\bgroup % vbox has better behavior than vtop here - \fi\fi - % - \ifimagevmode \medskip % Usually we'll have text after the image which will insert % \parskip glue, so insert it here too to equalize the space @@ -9402,17 +9430,20 @@ might help (with 'rm \jobname.?? \jobname.??s')% % % Place image in a \vtop for a top page margin that is (close to) correct, % as \topskip glue is relative to the first baseline. - \vtop\bgroup\hrule height 0pt\vskip-\parskip + \vtop\bgroup \kern -\capheight \vskip-\parskip \fi % - % Enter horizontal mode so that indentation from an enclosing - % environment such as @quotation is respected. - % However, if we're at the top level, we don't want the - % normal paragraph indentation. - % On the other hand, if we are in the case of @center @image, we don't - % want to start a paragraph, which will create a hsize-width box and - % eradicate the centering. - \ifx\centersub\centerV \else \imageindent \fi + \ifx\centersub\centerV + % For @center @image, enter vertical mode and add vertical space + % Enter an extra \parskip because @center doesn't add space itself. + \vbox\bgroup\vskip\parskip\medskip\vskip\parskip + \else + % Enter horizontal mode so that indentation from an enclosing + % environment such as @quotation is respected. + % However, if we're at the top level, we don't want the + % normal paragraph indentation. + \imageindent + \fi % % Output the image. \ifpdf @@ -9437,7 +9468,10 @@ might help (with 'rm \jobname.?? \jobname.??s')% \egroup \medskip % space after a standalone image \fi - \ifx\centersub\centerV \egroup \fi + \ifx\centersub\centerV % @center @image + \medskip + \egroup % close \vbox + \fi \endgroup} @@ -9604,8 +9638,8 @@ might help (with 'rm \jobname.?? \jobname.??s')% % \def\caption{\docaption\thiscaption} \def\shortcaption{\docaption\thisshortcaption} -\def\docaption{\checkenv\float \bgroup\scanargctxt\defcaption} -\def\defcaption#1#2{\egroup \def#1{#2}} +\def\docaption{\checkenv\float \bgroup\scanctxt\docaptionz} +\def\docaptionz#1#2{\egroup \def#1{#2}} % The parameter is the control sequence identifying the counter we are % going to use. Create it if it doesn't exist and assign it to \floatno. @@ -9894,12 +9928,10 @@ directory should work if nowhere else does.} % For native Unicode handling (XeTeX and LuaTeX) \nativeunicodechardefs \else - % For treating UTF-8 as byte sequences (TeX, eTeX and pdfTeX) + % For treating UTF-8 as byte sequences (TeX, eTeX and pdfTeX). + % Since we already invoke \utfeightchardefs at the top level, + % making non-ascii chars active is sufficient. \setnonasciicharscatcode\active - % since we already invoked \utfeightchardefs at the top level - % (below), do not re-invoke it, otherwise our check for duplicated - % definitions gets triggered. Making non-ascii chars active is - % sufficient. \fi % \else @@ -9924,7 +9956,6 @@ directory should work if nowhere else does.} \fi } -% emacs-page % A message to be logged when using a character that isn't available % the default font encoding (OT1). % @@ -9933,12 +9964,6 @@ directory should work if nowhere else does.} % Take account of \c (plain) vs. \, (Texinfo) difference. \def\cedilla#1{\ifx\c\ptexc\c{#1}\else\,{#1}\fi} -% First, make active non-ASCII characters in order for them to be -% correctly categorized when TeX reads the replacement text of -% macros containing the character definitions. -\setnonasciicharscatcode\active -% - \def\gdefchar#1#2{% \gdef#1{% \ifpassthroughchars @@ -9948,8 +9973,14 @@ directory should work if nowhere else does.} \fi }} +\begingroup + +% Make non-ASCII characters active for defining the character definition +% macros. +\setnonasciicharscatcode\active + % Latin1 (ISO-8859-1) character definitions. -\def\latonechardefs{% +\gdef\latonechardefs{% \gdefchar^^a0{\tie} \gdefchar^^a1{\exclamdown} \gdefchar^^a2{{\tcfont \char162}} % cent @@ -10054,7 +10085,7 @@ directory should work if nowhere else does.} } % Latin9 (ISO-8859-15) encoding character definitions. -\def\latninechardefs{% +\gdef\latninechardefs{% % Encoding is almost identical to Latin1. \latonechardefs % @@ -10069,7 +10100,7 @@ directory should work if nowhere else does.} } % Latin2 (ISO-8859-2) character definitions. -\def\lattwochardefs{% +\gdef\lattwochardefs{% \gdefchar^^a0{\tie} \gdefchar^^a1{\ogonek{A}} \gdefchar^^a2{\u{}} @@ -10087,7 +10118,7 @@ directory should work if nowhere else does.} \gdefchar^^ae{\v Z} \gdefchar^^af{\dotaccent Z} % - \gdefchar^^b0{\textdegree{}} + \gdefchar^^b0{\textdegree} \gdefchar^^b1{\ogonek{a}} \gdefchar^^b2{\ogonek{ }} \gdefchar^^b3{\l} @@ -10173,6 +10204,8 @@ directory should work if nowhere else does.} \gdefchar^^ff{\dotaccent{}} } +\endgroup % active chars + % UTF-8 character definitions. % % This code to support UTF-8 is based on LaTeX's utf8.def, with some @@ -10324,9 +10357,9 @@ directory should work if nowhere else does.} % Given the value in \countUTFz as a Unicode code point, set \UTFviiiTmp % to the corresponding UTF-8 sequence. \gdef\parseXMLCharref{% - \ifnum\countUTFz < "A0\relax + \ifnum\countUTFz < "20\relax \errhelp = \EMsimple - \errmessage{Cannot define Unicode char value < 00A0}% + \errmessage{Cannot define Unicode char value < 0020}% \else\ifnum\countUTFz < "800\relax \parseUTFviiiA,% \parseUTFviiiB C\UTFviiiTwoOctetsName.,% @@ -10396,6 +10429,103 @@ directory should work if nowhere else does.} % least make most of the characters not bomb out. % \def\unicodechardefs{% + \DeclareUnicodeCharacter{0020}{ } % space + \DeclareUnicodeCharacter{0021}{\char"21 }% % space to terminate number + \DeclareUnicodeCharacter{0022}{\char"22 }% + \DeclareUnicodeCharacter{0023}{\char"23 }% + \DeclareUnicodeCharacter{0024}{\char"24 }% + \DeclareUnicodeCharacter{0025}{\char"25 }% + \DeclareUnicodeCharacter{0026}{\char"26 }% + \DeclareUnicodeCharacter{0027}{\char"27 }% + \DeclareUnicodeCharacter{0028}{\char"28 }% + \DeclareUnicodeCharacter{0029}{\char"29 }% + \DeclareUnicodeCharacter{002A}{\char"2A }% + \DeclareUnicodeCharacter{002B}{\char"2B }% + \DeclareUnicodeCharacter{002C}{\char"2C }% + \DeclareUnicodeCharacter{002D}{\char"2D }% + \DeclareUnicodeCharacter{002E}{\char"2E }% + \DeclareUnicodeCharacter{002F}{\char"2F }% + \DeclareUnicodeCharacter{0030}{0}% + \DeclareUnicodeCharacter{0031}{1}% + \DeclareUnicodeCharacter{0032}{2}% + \DeclareUnicodeCharacter{0033}{3}% + \DeclareUnicodeCharacter{0034}{4}% + \DeclareUnicodeCharacter{0035}{5}% + \DeclareUnicodeCharacter{0036}{6}% + \DeclareUnicodeCharacter{0037}{7}% + \DeclareUnicodeCharacter{0038}{8}% + \DeclareUnicodeCharacter{0039}{9}% + \DeclareUnicodeCharacter{003A}{\char"3A }% + \DeclareUnicodeCharacter{003B}{\char"3B }% + \DeclareUnicodeCharacter{003C}{\char"3C }% + \DeclareUnicodeCharacter{003D}{\char"3D }% + \DeclareUnicodeCharacter{003E}{\char"3E }% + \DeclareUnicodeCharacter{003F}{\char"3F }% + \DeclareUnicodeCharacter{0040}{\char"40 }% + \DeclareUnicodeCharacter{0041}{A}% + \DeclareUnicodeCharacter{0042}{B}% + \DeclareUnicodeCharacter{0043}{C}% + \DeclareUnicodeCharacter{0044}{D}% + \DeclareUnicodeCharacter{0045}{E}% + \DeclareUnicodeCharacter{0046}{F}% + \DeclareUnicodeCharacter{0047}{G}% + \DeclareUnicodeCharacter{0048}{H}% + \DeclareUnicodeCharacter{0049}{I}% + \DeclareUnicodeCharacter{004A}{J}% + \DeclareUnicodeCharacter{004B}{K}% + \DeclareUnicodeCharacter{004C}{L}% + \DeclareUnicodeCharacter{004D}{M}% + \DeclareUnicodeCharacter{004E}{N}% + \DeclareUnicodeCharacter{004F}{O}% + \DeclareUnicodeCharacter{0050}{P}% + \DeclareUnicodeCharacter{0051}{Q}% + \DeclareUnicodeCharacter{0052}{R}% + \DeclareUnicodeCharacter{0053}{S}% + \DeclareUnicodeCharacter{0054}{T}% + \DeclareUnicodeCharacter{0055}{U}% + \DeclareUnicodeCharacter{0056}{V}% + \DeclareUnicodeCharacter{0057}{W}% + \DeclareUnicodeCharacter{0058}{X}% + \DeclareUnicodeCharacter{0059}{Y}% + \DeclareUnicodeCharacter{005A}{Z}% + \DeclareUnicodeCharacter{005B}{\char"5B }% + \DeclareUnicodeCharacter{005C}{\char"5C }% + \DeclareUnicodeCharacter{005D}{\char"5D }% + \DeclareUnicodeCharacter{005E}{\char"5E }% + \DeclareUnicodeCharacter{005F}{\char"5F }% + \DeclareUnicodeCharacter{0060}{\char"60 }% + \DeclareUnicodeCharacter{0061}{a}% + \DeclareUnicodeCharacter{0062}{b}% + \DeclareUnicodeCharacter{0063}{c}% + \DeclareUnicodeCharacter{0064}{d}% + \DeclareUnicodeCharacter{0065}{e}% + \DeclareUnicodeCharacter{0066}{f}% + \DeclareUnicodeCharacter{0067}{g}% + \DeclareUnicodeCharacter{0068}{h}% + \DeclareUnicodeCharacter{0069}{i}% + \DeclareUnicodeCharacter{006A}{j}% + \DeclareUnicodeCharacter{006B}{k}% + \DeclareUnicodeCharacter{006C}{l}% + \DeclareUnicodeCharacter{006D}{m}% + \DeclareUnicodeCharacter{006E}{n}% + \DeclareUnicodeCharacter{006F}{o}% + \DeclareUnicodeCharacter{0070}{p}% + \DeclareUnicodeCharacter{0071}{q}% + \DeclareUnicodeCharacter{0072}{r}% + \DeclareUnicodeCharacter{0073}{s}% + \DeclareUnicodeCharacter{0074}{t}% + \DeclareUnicodeCharacter{0075}{u}% + \DeclareUnicodeCharacter{0076}{v}% + \DeclareUnicodeCharacter{0077}{w}% + \DeclareUnicodeCharacter{0078}{x}% + \DeclareUnicodeCharacter{0079}{y}% + \DeclareUnicodeCharacter{007A}{z}% + \DeclareUnicodeCharacter{007B}{\char"7B }% + \DeclareUnicodeCharacter{007C}{\char"7C }% + \DeclareUnicodeCharacter{007D}{\char"7D }% + \DeclareUnicodeCharacter{007E}{\char"7E }% + % \DeclareUnicodeCharacter{007F}{} % DEL + % \DeclareUnicodeCharacter{00A0}{\tie}% \DeclareUnicodeCharacter{00A1}{\exclamdown}% \DeclareUnicodeCharacter{00A2}{{\tcfont \char162}}% 0242=cent @@ -10413,7 +10543,7 @@ directory should work if nowhere else does.} \DeclareUnicodeCharacter{00AE}{\registeredsymbol{}}% \DeclareUnicodeCharacter{00AF}{\={ }}% % - \DeclareUnicodeCharacter{00B0}{\ringaccent{ }}% + \DeclareUnicodeCharacter{00B0}{\textdegree}% \DeclareUnicodeCharacter{00B1}{\ensuremath\pm}% \DeclareUnicodeCharacter{00B2}{$^2$}% \DeclareUnicodeCharacter{00B3}{$^3$}% @@ -10917,7 +11047,7 @@ directory should work if nowhere else does.} % \DeclareUnicodeCharacter{20AC}{\euro{}}% % - \DeclareUnicodeCharacter{2192}{\expansion{}}% + \DeclareUnicodeCharacter{2192}{\arrow}% \DeclareUnicodeCharacter{21D2}{\result{}}% % % Mathematical symbols @@ -11080,24 +11210,26 @@ directory should work if nowhere else does.} % provide a definition macro to replace/pass-through a Unicode character % \def\DeclareUnicodeCharacterNative#1#2{% - \catcode"#1=\active - \def\dodeclareunicodecharacternative##1##2##3{% + \ifnum"#1>"7F % only make non-ASCII chars active + \catcode"#1=\active + \def\dodeclareunicodecharacternative##1##2##3{% + \begingroup + \uccode`\~="##2\relax + \uppercase{\gdef~}{% + \ifpassthroughchars + ##1% + \else + ##3% + \fi + } + \endgroup + } \begingroup - \uccode`\~="##2\relax - \uppercase{\gdef~}{% - \ifpassthroughchars - ##1% - \else - ##3% - \fi - } + \uccode`\.="#1\relax + \uppercase{\def\UTFNativeTmp{.}}% + \expandafter\dodeclareunicodecharacternative\UTFNativeTmp{#1}{#2}% \endgroup - } - \begingroup - \uccode`\.="#1\relax - \uppercase{\def\UTFNativeTmp{.}}% - \expandafter\dodeclareunicodecharacternative\UTFNativeTmp{#1}{#2}% - \endgroup + \fi } % Native Unicode handling (XeTeX and LuaTeX) character replacing definition. @@ -11126,14 +11258,14 @@ directory should work if nowhere else does.} \relax } -% Define all Unicode characters we know about. This makes UTF-8 the default -% input encoding and allows @U to work. +% Define all Unicode characters we know about \iftxinativeunicodecapable \nativeunicodechardefsatu \else \utfeightchardefs \fi + \message{formatting,} \newdimen\defaultparindent \defaultparindent = 15pt @@ -11180,13 +11312,9 @@ directory should work if nowhere else does.} % \vsize = #1\relax \advance\vsize by \topskip - \outervsize = \vsize - \advance\outervsize by 2\topandbottommargin \txipageheight = \vsize % \hsize = #2\relax - \outerhsize = \hsize - \advance\outerhsize by 0.5in \txipagewidth = \hsize % \normaloffset = #4\relax @@ -11276,7 +11404,7 @@ directory should work if nowhere else does.} \textleading = 12.5pt % \internalpagesizes{160mm}{120mm}% - {\voffset}{\hoffset}% + {\voffset}{-11.4mm}% {\bindingoffset}{8pt}% {210mm}{148mm}% % @@ -11355,9 +11483,138 @@ directory should work if nowhere else does.} \hfuzz = 1pt +\message{microtype,} + +% protrusion, from Thanh's protcode.tex. +\def\mtsetprotcode#1{% + \rpcode#1`\!=200 \rpcode#1`\,=700 \rpcode#1`\-=700 \rpcode#1`\.=700 + \rpcode#1`\;=500 \rpcode#1`\:=500 \rpcode#1`\?=200 + \rpcode#1`\'=700 + \rpcode#1 34=500 % '' + \rpcode#1 123=300 % -- + \rpcode#1 124=200 % --- + \rpcode#1`\)=50 \rpcode#1`\A=50 \rpcode#1`\F=50 \rpcode#1`\K=50 + \rpcode#1`\L=50 \rpcode#1`\T=50 \rpcode#1`\V=50 \rpcode#1`\W=50 + \rpcode#1`\X=50 \rpcode#1`\Y=50 \rpcode#1`\k=50 \rpcode#1`\r=50 + \rpcode#1`\t=50 \rpcode#1`\v=50 \rpcode#1`\w=50 \rpcode#1`\x=50 + \rpcode#1`\y=50 + % + \lpcode#1`\`=700 + \lpcode#1 92=500 % `` + \lpcode#1`\(=50 \lpcode#1`\A=50 \lpcode#1`\J=50 \lpcode#1`\T=50 + \lpcode#1`\V=50 \lpcode#1`\W=50 \lpcode#1`\X=50 \lpcode#1`\Y=50 + \lpcode#1`\v=50 \lpcode#1`\w=50 \lpcode#1`\x=50 \lpcode#1`\y=0 + % + \mtadjustprotcode#1\relax +} + +\newcount\countC +\def\mtadjustprotcode#1{% + \countC=0 + \loop + \ifcase\lpcode#1\countC\else + \mtadjustcp\lpcode#1\countC + \fi + \ifcase\rpcode#1\countC\else + \mtadjustcp\rpcode#1\countC + \fi + \advance\countC 1 + \ifnum\countC < 256 \repeat +} + +\newcount\countB +\def\mtadjustcp#1#2#3{% + \setbox\boxA=\hbox{% + \ifx#2\font\else#2\fi + \char#3}% + \countB=\wd\boxA + \multiply\countB #1#2#3\relax + \divide\countB \fontdimen6 #2\relax + #1#2#3=\countB\relax +} + +\ifx\XeTeXrevision\thisisundefined + \ifx\luatexversion\thisisundefined + \ifpdf % pdfTeX + \mtsetprotcode\textrm + \def\mtfontexpand#1{\pdffontexpand#1 20 20 1 autoexpand\relax} + \else % TeX + \def\mtfontexpand#1{} + \fi + \else % LuaTeX + \mtsetprotcode\textrm + \def\mtfontexpand#1{\expandglyphsinfont#1 20 20 1\relax} + \fi +\else % XeTeX + \mtsetprotcode\textrm + \def\mtfontexpand#1{} +\fi + + +\newif\ifmicrotype + +\def\microtypeON{% + \microtypetrue + % + \ifx\XeTeXrevision\thisisundefined + \ifx\luatexversion\thisisundefined + \ifpdf % pdfTeX + \pdfadjustspacing=2 + \pdfprotrudechars=2 + \fi + \else % LuaTeX + \adjustspacing=2 + \protrudechars=2 + \fi + \else % XeTeX + \XeTeXprotrudechars=2 + \fi + % + \mtfontexpand\textrm + \mtfontexpand\textsl + \mtfontexpand\textbf +} + +\def\microtypeOFF{% + \microtypefalse + % + \ifx\XeTeXrevision\thisisundefined + \ifx\luatexversion\thisisundefined + \ifpdf % pdfTeX + \pdfadjustspacing=0 + \pdfprotrudechars=0 + \fi + \else % LuaTeX + \adjustspacing=0 + \protrudechars=0 + \fi + \else % XeTeX + \XeTeXprotrudechars=0 + \fi +} + +\microtypeOFF + +\parseargdef\microtype{% + \def\txiarg{#1}% + \ifx\txiarg\onword + \microtypeON + \else\ifx\txiarg\offword + \microtypeOFF + \else + \errhelp = \EMsimple + \errmessage{Unknown @microtype option `\txiarg', must be on|off}% + \fi\fi +} + + \message{and turning on texinfo input format.} +% Make UTF-8 the default encoding. +\documentencodingzzz{UTF-8} + \def^^L{\par} % remove \outer, so ^L can appear in an @comment +\catcode`\^^K = 10 % treat vertical tab as whitespace % DEL is a comment character, in case @c does not suffice. \catcode`\^^? = 14 @@ -11373,23 +11630,6 @@ directory should work if nowhere else does.} \catcode`\|=\other \def\normalverticalbar{|} \catcode`\~=\other \def\normaltilde{~} -% This macro is used to make a character print one way in \tt -% (where it can probably be output as-is), and another way in other fonts, -% where something hairier probably needs to be done. -% -% #1 is what to print if we are indeed using \tt; #2 is what to print -% otherwise. Since all the Computer Modern typewriter fonts have zero -% interword stretch (and shrink), and it is reasonable to expect all -% typewriter fonts to have this, we can check that font parameter. -% -\def\ifusingtt#1#2{\ifdim \fontdimen3\font=0pt #1\else #2\fi} - -% Same as above, but check for italic font. Actually this also catches -% non-italic slanted fonts since it is impossible to distinguish them from -% italic fonts. But since this is only used by $ and it uses \sl anyway -% this is not a problem. -\def\ifusingit#1#2{\ifdim \fontdimen1\font>0pt #1\else #2\fi} - % Set catcodes for Texinfo file % Active characters for printing the wanted glyph. @@ -11435,23 +11675,32 @@ directory should work if nowhere else does.} % Used sometimes to turn off (effectively) the active characters even after % parsing them. \def\turnoffactive{% - \normalturnoffactive + \passthroughcharstrue + \let-=\normaldash + \let"=\normaldoublequote + \let$=\normaldollar %$ font-lock fix + \let+=\normalplus + \let<=\normalless + \let>=\normalgreater + \let^=\normalcaret + \let_=\normalunderscore + \let|=\normalverticalbar + \let~=\normaltilde \otherbackslash + \setregularquotes + \unsepspaces } -\catcode`\@=0 +% If a .fmt file is being used, characters that might appear in a file +% name cannot be active until we have parsed the command line. +% So turn them off again, and have \loadconf turn them back on. +\catcode`+=\other \catcode`\_=\other + % \backslashcurfont outputs one backslash character in current font, % as in \char`\\. \global\chardef\backslashcurfont=`\\ -% \realbackslash is an actual character `\' with catcode other. -{\catcode`\\=\other @gdef@realbackslash{\}} - -% In Texinfo, backslash is an active character; it prints the backslash -% in fixed width font. -\catcode`\\=\active % @ for escape char from now on. - % Print a typewriter backslash. For math mode, we can't simply use % \backslashcurfont: the story here is that in math mode, the \char % of \backslashcurfont ends up printing the roman \ from the math symbol @@ -11461,109 +11710,120 @@ directory should work if nowhere else does.} % ignored family value; char position "5C). We can't use " for the % usual hex value because it has already been made active. -@def@ttbackslash{{@tt @ifmmode @mathchar29020 @else @backslashcurfont @fi}} -@let@backslashchar = @ttbackslash % @backslashchar{} is for user documents. - -% \otherbackslash defines an active \ to be a literal `\' character with -% catcode other. -@gdef@otherbackslash{@let\=@realbackslash} - -% Same as @turnoffactive except outputs \ as {\tt\char`\\} instead of -% the literal character `\'. -% -{@catcode`- = @active - @gdef@normalturnoffactive{% - @passthroughcharstrue - @let-=@normaldash - @let"=@normaldoublequote - @let$=@normaldollar %$ font-lock fix - @let+=@normalplus - @let<=@normalless - @let>=@normalgreater - @let^=@normalcaret - @let_=@normalunderscore - @let|=@normalverticalbar - @let~=@normaltilde - @let\=@ttbackslash - @setregularquotes - @unsepspaces - } -} +\def\ttbackslash{{\tt \ifmmode \mathchar29020 \else \backslashcurfont \fi}} +\let\backslashchar = \ttbackslash % \backslashchar{} is for user documents. -% If a .fmt file is being used, characters that might appear in a file -% name cannot be active until we have parsed the command line. -% So turn them off again, and have @fixbackslash turn them back on. -@catcode`+=@other @catcode`@_=@other - -% \enablebackslashhack - allow file to begin `\input texinfo' -% -% If a .fmt file is being used, we don't want the `\input texinfo' to show up. -% That is what \eatinput is for; after that, the `\' should revert to printing -% a backslash. -% If the file did not have a `\input texinfo', then it is turned off after -% the first line; otherwise the first `\' in the file would cause an error. -% This is used on the very last line of this file, texinfo.tex. -% We also use @c to call @fixbackslash, in case ends of lines are hidden. -{ -@catcode`@^=7 -@catcode`@^^M=13@gdef@enablebackslashhack{% - @global@let\ = @eatinput% - @catcode`@^^M=13% - @def@c{@fixbackslash@c}% - % Definition for the newline at the end of this file. - @def ^^M{@let^^M@secondlinenl}% - % Definition for a newline in the main Texinfo file. - @gdef @secondlinenl{@fixbackslash}% +% These are made active for url-breaking, so need +% active definitions as the normal characters. +\def\normaldot{.} +\def\normalquest{?} +\def\normalslash{/} + +% \newlinesloadsconf - call \loadconf as soon as possible in the +% file, e.g. at the first newline. +% +{\catcode`\^=7 +\catcode`\^^M=13 +\gdef\newlineloadsconf{% + \catcode`\^^M=13 % + \newlineloadsconfzz% +} +\gdef\newlineloadsconfzz#1^^M{% + \def\c{\loadconf\c}% + % Definition for the first newline read in the file + \def ^^M{\loadconf}% % In case the first line has a whole-line command on it - @let@originalparsearg@parsearg - @def@parsearg{@fixbackslash@originalparsearg} + \let\originalparsearg\parsearg% + \def\parsearg{\loadconf\originalparsearg}% }} -{@catcode`@^=7 @catcode`@^^M=13% -@gdef@eatinput input texinfo#1^^M{@fixbackslash}} % Emergency active definition of newline, in case an active newline token % appears by mistake. -{@catcode`@^=7 @catcode13=13% -@gdef@enableemergencynewline{% - @gdef^^M{% - @par% - %<warning: active newline>@par% +{\catcode`\^=7 \catcode13=13% +\gdef\enableemergencynewline{% + \gdef^^M{% + \par% + %<warning: active newline>\par% }}} -@gdef@fixbackslash{% - @ifx\@eatinput @let\ = @ttbackslash @fi - @catcode13=5 % regular end of line - @enableemergencynewline - @let@c=@comment - @let@parsearg@originalparsearg +% \loadconf gets called at the beginning of every Texinfo file. +% If texinfo.cnf is present on the system, read it. Useful for site-wide +% @afourpaper, etc. Not opening texinfo.cnf directly in texinfo.tex +% makes it possible to make a format file for Texinfo. +% +\gdef\loadconf{% + \relax % Terminate the filename if running as "tex '&texinfo' FILE.texi". + % + % Turn off the definitions that trigger \loadconf + \everyjobreset + \catcode13=5 % regular end of line + \enableemergencynewline + \let\c=\comment + \let\parsearg\originalparsearg + % % Also turn back on active characters that might appear in the input % file name, in case not using a pre-dumped format. - @catcode`+=@active - @catcode`@_=@active - % - % If texinfo.cnf is present on the system, read it. - % Useful for site-wide @afourpaper, etc. This macro, @fixbackslash, gets - % called at the beginning of every Texinfo file. Not opening texinfo.cnf - % directly in this file, texinfo.tex, makes it possible to make a format - % file for Texinfo. + \catcode`+=\active + \catcode`\_=\active % - @openin 1 texinfo.cnf - @ifeof 1 @else @input texinfo.cnf @fi - @closein 1 + \openin 1 texinfo.cnf + \ifeof 1 \else \input texinfo.cnf \fi + \closein 1 } +% Redefine some control sequences to be controlled by the \ifdummies +% and \ifindexnofonts switches. Do this at the end so that the control +% sequences are all defined. +\definedummies + + + + +\catcode`\@=0 + +% \realbackslash is an actual character `\' with catcode other. +{\catcode`\\=\other @gdef@realbackslash{\}} + +% In Texinfo, backslash is an active character; it prints the backslash +% in fixed width font. +\catcode`\\=\active % @ for escape char from now on. + +@let\ = @ttbackslash + +% If in a .fmt file, print the version number. +% \eatinput stops the `\input texinfo' from showing up. +% After that, `\' should revert to printing a backslash. +% Turn on active characters that we couldn't do earlier because +% they might have appeared in the input file name. +% +@everyjob{@message{[Texinfo version @texinfoversion]}% + @global@let\ = @eatinput + @catcode`+=@active @catcode`@_=@active} + +{@catcode`@^=7 @catcode`@^^M=13% +@gdef@eatinput input texinfo#1^^M{@loadconf}} + +@def@everyjobreset{@ifx\@eatinput @let\ = @ttbackslash @fi} + +% \otherbackslash defines an active \ to be a literal `\' character with +% catcode other. +@gdef@otherbackslash{@let\=@realbackslash} + +% Same as @turnoffactive except outputs \ as {\tt\char`\\} instead of +% the literal character `\'. +% +{@catcode`- = @active + @gdef@normalturnoffactive{% + @turnoffactive + @let\=@ttbackslash + } +} % Say @foo, not \foo, in error messages. @escapechar = `@@ -% These (along with & and #) are made active for url-breaking, so need -% active definitions as the normal characters. -@def@normaldot{.} -@def@normalquest{?} -@def@normalslash{/} - % These look ok in all fonts, so just make them not special. % @hashchar{} gets its own user-level command, because of #line. @catcode`@& = @other @def@normalamp{&} @@ -11578,15 +11838,11 @@ directory should work if nowhere else does.} @c Do this last of all since we use ` in the previous @catcode assignments. @catcode`@'=@active @catcode`@`=@active -@setregularquotes @c Local variables: @c eval: (add-hook 'before-save-hook 'time-stamp nil t) @c time-stamp-pattern: "texinfoversion{%Y-%02m-%02d.%02H}" -@c page-delimiter: "^\\\\message\\|emacs-page" +@c page-delimiter: "^\\\\message" @c End: -@c vim:sw=2: - -@enablebackslashhack - +@newlineloadsconf diff --git a/build-aux/update-copyright b/build-aux/update-copyright index 81b691e..99196fc 100755 --- a/build-aux/update-copyright +++ b/build-aux/update-copyright @@ -3,7 +3,7 @@ # Update an FSF copyright year list to include the current year. -# Copyright (C) 2009-2022 Free Software Foundation, Inc. +# Copyright (C) 2009-2023 Free Software Foundation, Inc. # # This program is free software: you can redistribute it and/or modify # it under the terms of the GNU General Public License as published by @@ -137,7 +137,7 @@ eval 'exec perl -wSx -0777 -pi "$0" "$@"' if 0; -my $VERSION = '2020-04-04.15:07'; # UTC +my $VERSION = '2023-01-11.04:24'; # UTC # The definition above must lie within the first 8 lines in order # for the Emacs time-stamp write hook (at end) to update it. # If you change this file with Emacs, please let the write hook @@ -280,7 +280,7 @@ if (defined $stmt_re) } # Replace the old copyright statement. - s/$stmt_re/$stmt_wrapped/; + s/$stmt_re/$stmt_wrapped/g; } } else diff --git a/build-aux/useless-if-before-free b/build-aux/useless-if-before-free index 1a027a5..f4908ba 100755 --- a/build-aux/useless-if-before-free +++ b/build-aux/useless-if-before-free @@ -4,7 +4,7 @@ # Detect instances of "if (p) free (p);". # Likewise "if (p != 0)", "if (0 != p)", or with NULL; and with braces. -# Copyright (C) 2008-2022 Free Software Foundation, Inc. +# Copyright (C) 2008-2023 Free Software Foundation, Inc. # # This program is free software: you can redistribute it and/or modify # it under the terms of the GNU General Public License as published by diff --git a/build-aux/vc-list-files b/build-aux/vc-list-files index 77750b9..5ed2b14 100755 --- a/build-aux/vc-list-files +++ b/build-aux/vc-list-files @@ -4,7 +4,7 @@ # Print a version string. scriptversion=2018-03-07.03; # UTC -# Copyright (C) 2006-2022 Free Software Foundation, Inc. +# Copyright (C) 2006-2023 Free Software Foundation, Inc. # This program is free software: you can redistribute it and/or modify # it under the terms of the GNU General Public License as published by @@ -1,5 +1,5 @@ # Customize maint.mk -*- makefile -*- -# Copyright (C) 2003-2014, 2019-2022 Free Software Foundation, Inc. +# Copyright (C) 2003-2014, 2019-2023 Free Software Foundation, Inc. # This program is free software: you can redistribute it and/or modify # it under the terms of the GNU General Public License as published by @@ -45,7 +45,7 @@ local-checks-to-skip = \ export VERBOSE = yes # Hash of lines 42-208 for release 3.2 -old_NEWS_hash = 64a8f4d9ec1a5c256f3cc792450dc257 +old_NEWS_hash = 1d4e1fd474f9d7f11fb5b218d15da7d3 include $(srcdir)/dist-check.mk @@ -1,6 +1,6 @@ #! /bin/sh # Guess values for system-dependent variables and create Makefiles. -# Generated by GNU Autoconf 2.71 for GNU parted 3.5. +# Generated by GNU Autoconf 2.71 for GNU parted 3.6. # # Report bugs to <bug-parted@gnu.org>. # @@ -621,8 +621,8 @@ MAKEFLAGS= # Identity of this package. PACKAGE_NAME='GNU parted' PACKAGE_TARNAME='parted' -PACKAGE_VERSION='3.5' -PACKAGE_STRING='GNU parted 3.5' +PACKAGE_VERSION='3.6' +PACKAGE_STRING='GNU parted 3.6' PACKAGE_BUGREPORT='bug-parted@gnu.org' PACKAGE_URL='https://www.gnu.org/software/parted/' @@ -665,6 +665,8 @@ ac_config_libobj_dir=lib ac_func_c_list= gl_getopt_required=POSIX gt_needs= +enable_year2038=no +enable_largefile=yes ac_subst_vars='gltests_LIBOBJDEPS gltests_LTLIBOBJS gltests_LIBOBJS @@ -739,6 +741,8 @@ GL_COND_OBJ_WCTOB_TRUE abs_aux_dir GL_COND_OBJ_UNSETENV_FALSE GL_COND_OBJ_UNSETENV_TRUE +GL_COND_OBJ_TIME_FALSE +GL_COND_OBJ_TIME_TRUE HAVE_SYS_UIO_H NEXT_AS_FIRST_DIRECTIVE_SYS_UIO_H NEXT_SYS_UIO_H @@ -758,11 +762,13 @@ GL_COND_OBJ_SETSOCKOPT_TRUE GL_COND_OBJ_SETLOCALE_FALSE GL_COND_OBJ_SETLOCALE_TRUE LIB_SETLOCALE +SETLOCALE_LIB GL_COND_OBJ_SETENV_FALSE GL_COND_OBJ_SETENV_TRUE GL_COND_OBJ_SELECT_FALSE GL_COND_OBJ_SELECT_TRUE LIB_SELECT +SELECT_LIB LIBSOCKET GL_COND_OBJ_SCHED_YIELD_FALSE GL_COND_OBJ_SCHED_YIELD_TRUE @@ -785,6 +791,7 @@ GL_GNULIB_PTHREAD_SIGMASK GL_COND_OBJ_PTHREAD_SIGMASK_FALSE GL_COND_OBJ_PTHREAD_SIGMASK_TRUE LIB_PTHREAD_SIGMASK +PTHREAD_SIGMASK_LIB REPLACE_RAISE REPLACE_PTHREAD_SIGMASK HAVE_SIGHANDLER_T @@ -941,6 +948,9 @@ NEXT_NETINET_IN_H GL_COND_OBJ_NANOSLEEP_FALSE GL_COND_OBJ_NANOSLEEP_TRUE LIB_NANOSLEEP +NANOSLEEP_LIB +GL_COND_OBJ_MEMCHR_FALSE +GL_COND_OBJ_MEMCHR_TRUE LIB_SEMAPHORE INTL_MACOSX_LIBS GL_COND_OBJ_LISTEN_FALSE @@ -1065,6 +1075,7 @@ GL_GNULIB_TIME_R GL_GNULIB_TIMESPEC_GETRES GL_GNULIB_TIMESPEC_GET GL_GNULIB_TIMEGM +GL_GNULIB_TIME GL_GNULIB_STRPTIME GL_GNULIB_STRFTIME GL_GNULIB_NANOSLEEP @@ -1082,7 +1093,9 @@ REPLACE_LOCALTIME REPLACE_GMTIME GNULIB_GETTIMEOFDAY REPLACE_TZSET +REPLACE_TIMESPEC_GET REPLACE_TIMEGM +REPLACE_TIME REPLACE_STRFTIME REPLACE_NANOSLEEP REPLACE_MKTIME @@ -1221,7 +1234,9 @@ HAVE_FSEEKO HAVE_DPRINTF HAVE_DECL_VSNPRINTF HAVE_DECL_SNPRINTF +HAVE_DECL_PUTW HAVE_DECL_OBSTACK_PRINTF +HAVE_DECL_GETW HAVE_DECL_GETLINE HAVE_DECL_GETDELIM HAVE_DECL_FTELLO @@ -1234,18 +1249,14 @@ STDINT_H GL_GENERATE_STDDEF_H_FALSE GL_GENERATE_STDDEF_H_TRUE STDDEF_H -GL_GENERATE_STDBOOL_H_FALSE -GL_GENERATE_STDBOOL_H_TRUE -STDBOOL_H -HAVE__BOOL +GL_GENERATE_STDCKDINT_H_FALSE +GL_GENERATE_STDCKDINT_H_TRUE +STDCKDINT_H GL_GENERATE_STDARG_H_FALSE GL_GENERATE_STDARG_H_TRUE STDARG_H NEXT_AS_FIRST_DIRECTIVE_STDARG_H NEXT_STDARG_H -GL_GENERATE_STDALIGN_H_FALSE -GL_GENERATE_STDALIGN_H_TRUE -STDALIGN_H GL_COND_OBJ_STAT_FALSE GL_COND_OBJ_STAT_TRUE GL_COND_OBJ_SLEEP_FALSE @@ -1315,6 +1326,7 @@ GL_GNULIB_STRCHRNUL GL_GNULIB_STPNCPY GL_GNULIB_STPCPY GL_GNULIB_RAWMEMCHR +GL_GNULIB_MEMSET_EXPLICIT GL_GNULIB_MEMRCHR GL_GNULIB_MEMPCPY GL_GNULIB_MEMMEM @@ -1338,6 +1350,8 @@ REPLACE_STRNCAT REPLACE_STRDUP REPLACE_STRCHRNUL REPLACE_STPNCPY +REPLACE_STPCPY +REPLACE_MEMPCPY REPLACE_MEMMEM REPLACE_MEMCHR REPLACE_FFSLL @@ -1359,6 +1373,7 @@ HAVE_STPNCPY HAVE_STPCPY HAVE_RAWMEMCHR HAVE_DECL_MEMRCHR +HAVE_MEMSET_EXPLICIT HAVE_MEMPCPY HAVE_DECL_MEMMEM HAVE_FFSLL @@ -1374,6 +1389,7 @@ CFLAG_VISIBILITY GL_COND_OBJ_MBRTOWC_FALSE GL_COND_OBJ_MBRTOWC_TRUE LIB_MBRTOWC +MBRTOWC_LIB LOCALE_ZH_CN LOCALE_FR_UTF8 LOCALE_JA @@ -1445,6 +1461,10 @@ INT64_MAX_EQ_LONG_MAX INT32_MAX_LT_INTMAX_MAX REPLACE_STRTOUMAX REPLACE_STRTOIMAX +REPLACE_IMAXDIV +REPLACE_IMAXABS +HAVE_IMAXDIV +HAVE_IMAXABS HAVE_IMAXDIV_T HAVE_DECL_STRTOUMAX HAVE_DECL_STRTOIMAX @@ -1477,8 +1497,11 @@ GNULIBHEADERS_OVERRIDE_WINT_T NEXT_AS_FIRST_DIRECTIVE_LIMITS_H NEXT_LIMITS_H LIB_HARD_LOCALE +HARD_LOCALE_LIB LIB_SETLOCALE_NULL +SETLOCALE_NULL_LIB LIB_SCHED_YIELD +SCHED_YIELD_LIB LIBPMULTITHREAD LIBPTHREAD LTLIBINTL @@ -1487,8 +1510,11 @@ GL_GNULIB_GETRANDOM GL_COND_OBJ_GETRANDOM_FALSE GL_COND_OBJ_GETRANDOM_TRUE LIB_GETRANDOM +GETRANDOM_LIB REPLACE_GETRANDOM HAVE_GETRANDOM +GL_COND_OBJ_GETPROGNAME_FALSE +GL_COND_OBJ_GETPROGNAME_TRUE GL_COND_OBJ_GETOPT_FALSE GL_COND_OBJ_GETOPT_TRUE GL_GENERATE_GETOPT_CDEFS_H_FALSE @@ -1524,6 +1550,7 @@ GL_GNULIB_FUTIMENS GL_GNULIB_FSTATAT GL_GNULIB_FSTAT GL_GNULIB_FCHMODAT +GL_GNULIB_CHMOD WINDOWS_64_BIT_ST_SIZE WINDOWS_STAT_TIMESPEC NEXT_AS_FIRST_DIRECTIVE_SYS_STAT_H @@ -1542,6 +1569,7 @@ REPLACE_FUTIMENS REPLACE_FSTATAT REPLACE_FSTAT REPLACE_FCHMODAT +REPLACE_CHMOD HAVE_UTIMENSAT HAVE_MKNODAT HAVE_MKNOD @@ -1575,8 +1603,18 @@ REPLACE_FCNTL REPLACE_CREAT HAVE_OPENAT HAVE_FCNTL +GL_GENERATE_ERROR_H_FALSE +GL_GENERATE_ERROR_H_TRUE +ERROR_H GL_COND_OBJ_ERROR_FALSE GL_COND_OBJ_ERROR_TRUE +REPLACE_ERROR_AT_LINE +REPLACE_ERROR +HAVE_ERROR_AT_LINE +HAVE_ERROR +HAVE_ERROR_H +NEXT_AS_FIRST_DIRECTIVE_ERROR_H +NEXT_ERROR_H GL_GENERATE_ERRNO_H_FALSE GL_GENERATE_ERRNO_H_TRUE ERRNO_H @@ -1588,13 +1626,66 @@ EMULTIHOP_VALUE EMULTIHOP_HIDDEN NEXT_AS_FIRST_DIRECTIVE_ERRNO_H NEXT_ERRNO_H -PRAGMA_COLUMNS -PRAGMA_SYSTEM_HEADER -INCLUDE_NEXT_AS_FIRST_DIRECTIVE -INCLUDE_NEXT GL_COND_OBJ_DUP2_FALSE GL_COND_OBJ_DUP2_TRUE +pkglibexecdir_c_make +pkglibexecdir_c +pkglibdir_c_make +pkglibdir_c +pkgincludedir_c_make +pkgincludedir_c +pkgdatadir_c_make +pkgdatadir_c +mandir_c_make +mandir_c +localedir_c_make +localedir_c +lispdir_c_make +lispdir_c +libdir_c_make +libdir_c +psdir_c_make +psdir_c +pdfdir_c_make +pdfdir_c +dvidir_c_make +dvidir_c +htmldir_c_make +htmldir_c +infodir_c_make +infodir_c +docdir_c_make +docdir_c +oldincludedir_c_make +oldincludedir_c +includedir_c_make +includedir_c +runstatedir_c_make +runstatedir_c +localstatedir_c_make +localstatedir_c +sharedstatedir_c_make +sharedstatedir_c +sysconfdir_c_make +sysconfdir_c +datadir_c_make +datadir_c +datarootdir_c_make +datarootdir_c +libexecdir_c_make +libexecdir_c +sbindir_c_make +sbindir_c +bindir_c_make +bindir_c +exec_prefix_c_make +exec_prefix_c +prefix_c_make +prefix_c pkglibexecdir +pkglibdir +pkgincludedir +pkgdatadir lispdir GL_GNULIB_MDA_WRITE GL_GNULIB_MDA_UNLINK @@ -1699,12 +1790,14 @@ REPLACE_TRUNCATE REPLACE_SYMLINKAT REPLACE_SYMLINK REPLACE_SLEEP +REPLACE_SETHOSTNAME REPLACE_RMDIR REPLACE_READLINKAT REPLACE_READLINK REPLACE_READ REPLACE_PWRITE REPLACE_PREAD +REPLACE_PIPE2 REPLACE_LSEEK REPLACE_LINKAT REPLACE_LINK @@ -1715,10 +1808,12 @@ REPLACE_GETPASS REPLACE_GETPAGESIZE REPLACE_GETGROUPS REPLACE_GETLOGIN_R +REPLACE_GETENTROPY REPLACE_GETDTABLESIZE REPLACE_GETDOMAINNAME REPLACE_GETCWD REPLACE_FTRUNCATE +REPLACE_FDATASYNC REPLACE_FCHOWNAT REPLACE_FACCESSAT REPLACE_EXECVPE @@ -1728,6 +1823,7 @@ REPLACE_EXECV REPLACE_EXECLP REPLACE_EXECLE REPLACE_EXECL +REPLACE_DUP3 REPLACE_DUP2 REPLACE_DUP REPLACE_COPY_FILE_RANGE @@ -1783,6 +1879,7 @@ HAVE_DUP3 HAVE_COPY_FILE_RANGE HAVE_CHOWN LIB_CLOCK_GETTIME +CLOCK_TIME_LIB GL_COND_OBJ_CANONICALIZE_LGPL_FALSE GL_COND_OBJ_CANONICALIZE_LGPL_TRUE REPLACE_WCTOMB @@ -1805,17 +1902,24 @@ REPLACE_QSORT_R REPLACE_PUTENV REPLACE_PTSNAME_R REPLACE_PTSNAME +REPLACE_POSIX_OPENPT REPLACE_POSIX_MEMALIGN REPLACE_MKSTEMP +REPLACE_MKOSTEMPS +REPLACE_MKOSTEMP REPLACE_MBTOWC REPLACE_MALLOC_FOR_MALLOC_POSIX REPLACE_MALLOC_FOR_MALLOC_GNU REPLACE_INITSTATE +REPLACE_GETSUBOPT +REPLACE_GETPROGNAME +REPLACE_GETLOADAVG REPLACE_FREE REPLACE_CANONICALIZE_FILE_NAME REPLACE_CALLOC_FOR_CALLOC_POSIX REPLACE_CALLOC_FOR_CALLOC_GNU REPLACE_ALIGNED_ALLOC +REPLACE__EXIT HAVE_DECL_UNSETENV HAVE_UNLOCKPT HAVE_SYS_LOADAVG_H @@ -1852,6 +1956,7 @@ HAVE_DECL_INITSTATE HAVE_INITSTATE HAVE_GRANTPT HAVE_GETSUBOPT +HAVE_GETPROGNAME HAVE_DECL_GETLOADAVG HAVE_DECL_GCVT HAVE_DECL_FCVT @@ -1900,6 +2005,7 @@ GL_GNULIB_MALLOC_POSIX GL_GNULIB_MALLOC_GNU GL_GNULIB_GRANTPT GL_GNULIB_GETSUBOPT +GL_GNULIB_GETPROGNAME GL_GNULIB_GETLOADAVG GL_GNULIB_FREE_POSIX GL_GNULIB_CANONICALIZE_FILE_NAME @@ -1953,6 +2059,7 @@ GL_GNULIB_BTOWC GL_COND_OBJ_BTOWC_FALSE GL_COND_OBJ_BTOWC_TRUE LOCALE_FR +REPLACE_WMEMPCPY REPLACE_WCSTOK REPLACE_WCSFTIME REPLACE_WCSWIDTH @@ -2010,6 +2117,15 @@ HAVE_MBRLEN HAVE_MBRTOWC HAVE_MBSINIT HAVE_BTOWC +GL_GENERATE_ASSERT_H_FALSE +GL_GENERATE_ASSERT_H_TRUE +ASSERT_H +NEXT_AS_FIRST_DIRECTIVE_ASSERT_H +NEXT_ASSERT_H +PRAGMA_COLUMNS +PRAGMA_SYSTEM_HEADER +INCLUDE_NEXT_AS_FIRST_DIRECTIVE +INCLUDE_NEXT GL_GENERATE_ALLOCA_H_FALSE GL_GENERATE_ALLOCA_H_TRUE ALLOCA_H @@ -2139,8 +2255,6 @@ enable_read_only enable_pc98 enable_hfs_extract_fs enable_dependency_tracking -enable_largefile -enable_year2038 enable_threads enable_cross_guesses enable_assert @@ -2161,6 +2275,8 @@ enable_rpath with_libiconv_prefix enable_nls with_libintl_prefix +enable_year2038 +enable_largefile ' ac_precious_vars='build_alias host_alias @@ -2725,7 +2841,7 @@ if test "$ac_init_help" = "long"; then # Omit some internal or obsolete options to make the list less imposing. # This message is too long to be a string in the A/UX 3.1 sh. cat <<_ACEOF -\`configure' configures GNU parted 3.5 to adapt to many kinds of systems. +\`configure' configures GNU parted 3.6 to adapt to many kinds of systems. Usage: $0 [OPTION]... [VAR=VALUE]... @@ -2796,7 +2912,7 @@ fi if test -n "$ac_init_help"; then case $ac_init_help in - short | recursive ) echo "Configuration of GNU parted 3.5:";; + short | recursive ) echo "Configuration of GNU parted 3.6:";; esac cat <<\_ACEOF @@ -2818,8 +2934,6 @@ Optional Features: do not reject slow dependency extractors --disable-dependency-tracking speeds up one-time build - --disable-largefile omit support for large files - --disable-year2038 omit support for timestamps past the year 2038 --enable-threads={isoc|posix|isoc+posix|windows} specify multithreading API --disable-threads build without multithread safety @@ -2834,6 +2948,8 @@ Optional Features: --disable-libtool-lock avoid locking (might break parallel builds) --disable-rpath do not hardcode runtime library paths --disable-nls do not use Native Language Support + --enable-year2038 support timestamps after 2038 + --disable-largefile omit support for large files Optional Packages: --with-PACKAGE[=ARG] use PACKAGE [ARG=yes] @@ -2950,7 +3066,7 @@ fi test -n "$ac_init_help" && exit $ac_status if $ac_init_version; then cat <<\_ACEOF -GNU parted configure 3.5 +GNU parted configure 3.6 generated by GNU Autoconf 2.71 Copyright (C) 2021 Free Software Foundation, Inc. @@ -3283,6 +3399,63 @@ printf "%s\n" "$ac_res" >&6; } } # 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 () +{ + ac_save_ac_compile="$ac_compile" + if test -n "$ac_compile_for_check_decl"; then + ac_compile="$ac_compile_for_check_decl" + fi + 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_compile="$ac_save_ac_compile" + +} # ac_fn_check_decl + # ac_fn_c_compute_int LINENO EXPR VAR INCLUDES # -------------------------------------------- # Tries to find the compile-time value of EXPR in a program that includes @@ -3472,63 +3645,6 @@ rm -f conftest.val } # ac_fn_c_compute_int -# 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 () -{ - ac_save_ac_compile="$ac_compile" - if test -n "$ac_compile_for_check_decl"; then - ac_compile="$ac_compile_for_check_decl" - fi - 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_compile="$ac_save_ac_compile" - -} # ac_fn_check_decl - # ac_fn_c_check_member LINENO AGGR MEMBER VAR INCLUDES # ---------------------------------------------------- # Tries to find if the field MEMBER exists in type AGGR, after including @@ -3612,7 +3728,7 @@ cat >config.log <<_ACEOF This file contains any messages produced by compilers while running configure, to aid debugging if configure makes a mistake. -It was created by GNU parted $as_me 3.5, which was +It was created by GNU parted $as_me 3.6, which was generated by GNU Autoconf 2.71. Invocation command line was $ $0$ac_configure_args_raw @@ -4204,12 +4320,12 @@ 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" as_fn_append ac_func_c_list " btowc HAVE_BTOWC" as_fn_append ac_func_c_list " canonicalize_file_name HAVE_CANONICALIZE_FILE_NAME" -as_fn_append ac_func_c_list " faccessat HAVE_FACCESSAT" as_fn_append ac_func_c_list " realpath HAVE_REALPATH" as_fn_append ac_func_c_list " lstat HAVE_LSTAT" as_fn_append ac_header_c_list " sys/param.h sys_param_h HAVE_SYS_PARAM_H" as_fn_append ac_func_c_list " _set_invalid_parameter_handler HAVE__SET_INVALID_PARAMETER_HANDLER" as_fn_append ac_header_c_list " sys/socket.h sys_socket_h HAVE_SYS_SOCKET_H" +as_fn_append ac_header_c_list " error.h error_h HAVE_ERROR_H" as_fn_append ac_func_c_list " fcntl HAVE_FCNTL" as_fn_append ac_func_c_list " symlink HAVE_SYMLINK" as_fn_append ac_header_c_list " stdio_ext.h stdio_ext_h HAVE_STDIO_EXT_H" @@ -4218,9 +4334,7 @@ as_fn_append ac_func_c_list " getdtablesize HAVE_GETDTABLESIZE" gl_getopt_required=GNU as_fn_append ac_header_c_list " getopt.h getopt_h HAVE_GETOPT_H" as_fn_append ac_header_c_list " sys/cdefs.h sys_cdefs_h HAVE_SYS_CDEFS_H" -as_fn_append ac_func_c_list " getprogname HAVE_GETPROGNAME" as_fn_append ac_func_c_list " getexecname HAVE_GETEXECNAME" -as_fn_append ac_func_c_list " getrandom HAVE_GETRANDOM" as_fn_append ac_header_c_list " threads.h threads_h HAVE_THREADS_H" as_fn_append ac_header_c_list " limits.h limits_h HAVE_LIMITS_H" as_fn_append ac_header_c_list " langinfo.h langinfo_h HAVE_LANGINFO_H" @@ -4228,14 +4342,14 @@ as_fn_append ac_header_c_list " xlocale.h xlocale_h HAVE_XLOCALE_H" as_fn_append ac_func_c_list " mbsinit HAVE_MBSINIT" as_fn_append ac_func_c_list " mbrtowc HAVE_MBRTOWC" as_fn_append ac_func_c_list " mkstemp HAVE_MKSTEMP" -as_fn_append ac_func_c_list " nl_langinfo HAVE_NL_LANGINFO" as_fn_append ac_func_c_list " readlink HAVE_READLINK" as_fn_append ac_header_c_list " malloc.h malloc_h HAVE_MALLOC_H" as_fn_append ac_func_c_list " isblank HAVE_ISBLANK" as_fn_append ac_func_c_list " iswctype HAVE_ISWCTYPE" as_fn_append ac_func_c_list " sleep HAVE_SLEEP" as_fn_append ac_header_c_list " sys/time.h sys_time_h HAVE_SYS_TIME_H" -as_fn_append ac_func_c_list " strerror_r HAVE_STRERROR_R" +as_fn_append ac_header_c_list " stdbool.h stdbool_h HAVE_STDBOOL_H" +as_fn_append ac_header_c_list " stdckdint.h stdckdint_h HAVE_STDCKDINT_H" as_fn_append ac_func_c_list " __xpg_strerror_r HAVE___XPG_STRERROR_R" as_fn_append ac_header_c_list " sys/random.h sys_random_h HAVE_SYS_RANDOM_H" as_fn_append ac_func_c_list " usleep HAVE_USLEEP" @@ -4245,15 +4359,12 @@ as_fn_append ac_func_c_list " wcrtomb HAVE_WCRTOMB" as_fn_append ac_func_c_list " iswcntrl HAVE_ISWCNTRL" as_fn_append ac_header_c_list " wctype.h wctype_h HAVE_WCTYPE_H" as_fn_append ac_header_c_list " arpa/inet.h arpa_inet_h HAVE_ARPA_INET_H" -as_fn_append ac_func_c_list " ftruncate HAVE_FTRUNCATE" as_fn_append ac_func_c_list " gettimeofday HAVE_GETTIMEOFDAY" -as_fn_append ac_func_c_list " duplocale HAVE_DUPLOCALE" as_fn_append ac_header_c_list " netdb.h netdb_h HAVE_NETDB_H" as_fn_append ac_header_c_list " netinet/in.h netinet_in_h HAVE_NETINET_IN_H" -as_fn_append ac_func_c_list " newlocale HAVE_NEWLOCALE" -as_fn_append ac_func_c_list " uselocale HAVE_USELOCALE" -as_fn_append ac_func_c_list " freelocale HAVE_FREELOCALE" as_fn_append ac_header_c_list " semaphore.h semaphore_h HAVE_SEMAPHORE_H" +as_fn_append ac_header_c_list " sys/mman.h sys_mman_h HAVE_SYS_MMAN_H" +as_fn_append ac_func_c_list " mprotect HAVE_MPROTECT" as_fn_append ac_func_c_list " pipe HAVE_PIPE" as_fn_append ac_header_c_list " priv.h priv_h HAVE_PRIV_H" as_fn_append ac_header_c_list " sys/select.h sys_select_h HAVE_SYS_SELECT_H" @@ -4261,10 +4372,7 @@ as_fn_append ac_func_c_list " pselect HAVE_PSELECT" as_fn_append ac_header_c_list " sys/wait.h sys_wait_h HAVE_SYS_WAIT_H" as_fn_append ac_header_c_list " pthread.h pthread_h HAVE_PTHREAD_H" as_fn_append ac_func_c_list " pthread_sigmask HAVE_PTHREAD_SIGMASK" -as_fn_append ac_header_c_list " sys/mman.h sys_mman_h HAVE_SYS_MMAN_H" -as_fn_append ac_func_c_list " mprotect HAVE_MPROTECT" as_fn_append ac_func_c_list " setenv HAVE_SETENV" -as_fn_append ac_func_c_list " catgets HAVE_CATGETS" as_fn_append ac_func_c_list " snprintf HAVE_SNPRINTF" as_fn_append ac_header_c_list " sys/ioctl.h sys_ioctl_h HAVE_SYS_IOCTL_H" as_fn_append ac_func_c_list " shutdown HAVE_SHUTDOWN" @@ -4991,7 +5099,7 @@ fi # Define the identity of the package. PACKAGE='parted' - VERSION='3.5' + VERSION='3.6' printf "%s\n" "#define PACKAGE \"$PACKAGE\"" >>confdefs.h @@ -8187,6 +8295,8 @@ printf "%s\n" "$ac_cv_should_define__xopen_source" >&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 @@ -8493,103 +8603,23 @@ fi fi -# Check whether --enable-largefile was given. -if test ${enable_largefile+y} + if test "$enable_largefile" != no then : - enableval=$enable_largefile; -fi - -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} + { 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} then : printf %s "(cached) " >&6 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 <sys/types.h> - /* 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" + 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 : - break + CC="$ac_save_CC $ac_opt" fi -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 -{ 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 <sys/types.h> - /* 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 - cat confdefs.h - <<_ACEOF >conftest.$ac_ext + cat confdefs.h - <<_ACEOF >conftest.$ac_ext /* end confdefs.h. */ -#undef _FILE_OFFSET_BITS -#define _FILE_OFFSET_BITS 64 #include <sys/types.h> /* Check that off_t can represent 2**63 - 1 correctly. We can't simply define LARGE_OFF_T to be 9223372036854775807, @@ -8609,145 +8639,55 @@ main (void) _ACEOF if ac_fn_c_try_compile "$LINENO" then : - ac_cv_sys_file_offset_bits=64; break + ac_cv_sys_largefile_opts="$ac_opt" + ac_opt_found=yes fi rm -f core conftest.err conftest.$ac_objext conftest.beam conftest.$ac_ext - ac_cv_sys_file_offset_bits=unknown - break -done + test $ac_opt_found = no || break + done + CC="$ac_save_CC" + test $ac_opt_found = yes || ac_cv_sys_largefile_opts="support not detected" 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 -rm -rf conftest* - case $ac_cv_sys_file_offset_bits in #( - unknown) : - { 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 $as_nop - while :; do - cat confdefs.h - <<_ACEOF >conftest.$ac_ext -/* end confdefs.h. */ -#include <sys/types.h> - /* 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) -{ +{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ac_cv_sys_largefile_opts" >&5 +printf "%s\n" "$ac_cv_sys_largefile_opts" >&6; } - ; - return 0; -} -_ACEOF -if ac_fn_c_try_compile "$LINENO" -then : - ac_cv_sys_large_files=no; break -fi -rm -f core conftest.err conftest.$ac_objext conftest.beam conftest.$ac_ext - cat confdefs.h - <<_ACEOF >conftest.$ac_ext -/* end confdefs.h. */ -#undef _LARGE_FILES -#define _LARGE_FILES 1 -#include <sys/types.h> - /* 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) -{ +ac_have_largefile=yes +case $ac_cv_sys_largefile_opts in #( + "none needed") : + ;; #( + "support not detected") : + ac_have_largefile=no ;; #( + "-D_FILE_OFFSET_BITS=64") : - ; - return 0; -} -_ACEOF -if ac_fn_c_try_compile "$LINENO" -then : - ac_cv_sys_large_files=1; break -fi -rm -f core conftest.err conftest.$ac_objext conftest.beam conftest.$ac_ext - ac_cv_sys_large_files=unknown - break -done -fi -{ 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* ;; #( - 64) : +printf "%s\n" "#define _FILE_OFFSET_BITS 64" >>confdefs.h + ;; #( + "-D_LARGE_FILES=1") : - # Check whether --enable-year2038 was given. -if test ${enable_year2038+y} -then : - enableval=$enable_year2038; -fi +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 ;; +esac - if test "$enable_year2038" != no + if test "$enable_year2038" != no then : - - { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for time_t past the year 2038" >&5 -printf %s "checking for time_t past the year 2038... " >&6; } -if test ${gl_cv_type_time_t_y2038+y} + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for $CC option to enable timestamps after Jan 2038" >&5 +printf %s "checking for $CC option to enable timestamps after Jan 2038... " >&6; } +if test ${ac_cv_sys_year2038_opts+y} then : printf %s "(cached) " >&6 else $as_nop - cat confdefs.h - <<_ACEOF >conftest.$ac_ext -/* end confdefs.h. */ - - #include <time.h> - /* 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]; - -_ACEOF -if ac_fn_c_try_compile "$LINENO" + 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" then : - gl_cv_type_time_t_y2038=yes -else $as_nop - gl_cv_type_time_t_y2038=no + CPPFLAGS="$ac_save_CPPFLAGS $ac_opt" fi -rm -f core conftest.err conftest.$ac_objext conftest.beam conftest.$ac_ext - -fi -{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $gl_cv_type_time_t_y2038" >&5 -printf "%s\n" "$gl_cv_type_time_t_y2038" >&6; } - if test "$gl_cv_type_time_t_y2038" = no; then - { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for 64-bit time_t with _TIME_BITS=64" >&5 -printf %s "checking for 64-bit time_t with _TIME_BITS=64... " >&6; } -if test ${gl_cv_type_time_t_bits_macro+y} -then : - printf %s "(cached) " >&6 -else $as_nop - cat confdefs.h - <<_ACEOF >conftest.$ac_ext + cat confdefs.h - <<_ACEOF >conftest.$ac_ext /* end confdefs.h. */ -#define _TIME_BITS 64 - #define _FILE_OFFSET_BITS 64 #include <time.h> /* Check that time_t can represent 2**32 - 1 correctly. */ @@ -8757,82 +8697,91 @@ else $as_nop && LARGE_TIME_T % 65537 == 0) ? 1 : -1]; +int +main (void) +{ + + ; + return 0; +} _ACEOF if ac_fn_c_try_compile "$LINENO" then : - gl_cv_type_time_t_bits_macro=yes -else $as_nop - gl_cv_type_time_t_bits_macro=no + ac_cv_sys_year2038_opts="$ac_opt" + ac_opt_found=yes 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" +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 + case $enable_year2038 in #( + yes) : + # If we're not cross compiling and 'touch' works with a large + # timestamp, then we can presume the system supports wider time_t + # *somehow* and we just weren't able to detect it. One common + # case that we deliberately *don't* probe for is a system that + # supports both 32- and 64-bit ABIs but only the 64-bit ABI offers + # wide time_t. (It would be inappropriate for us to override an + # intentional use of -m32.) Error out, demanding use of + # --disable-year2038 if this is intentional. + if test $cross_compiling = no +then : + if TZ=UTC0 touch -t 210602070628.15 conftest.time 2>/dev/null +then : + case `TZ=UTC0 LC_ALL=C ls -l conftest.time 2>/dev/null` in #( + *'Feb 7 2106'* | *'Feb 7 17:10'*) : + { { 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 $? "this system appears to support timestamps after +January 2038, but no mechanism for enabling wide +'time_t' was detected. Did you mean to build a 64-bit +binary? (e.g. 'CC=\"${CC} -m64\"'.) To proceed with +32-bit time_t, configure with '--disable-year2038'. +See \`config.log' for more details" "$LINENO" 5; } ;; #( + *) : + ;; +esac fi -{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $gl_cv_type_time_t_bits_macro" >&5 -printf "%s\n" "$gl_cv_type_time_t_bits_macro" >&6; } - if test "$gl_cv_type_time_t_bits_macro" = yes; then +fi ;; #( + *) : + ;; +esac ;; #( + "-D_TIME_BITS=64") : printf "%s\n" "#define _TIME_BITS 64" >>confdefs.h + ;; #( + "-D__MINGW_USE_VC2005_COMPAT=1") : - -printf "%s\n" "#define _FILE_OFFSET_BITS 64" >>confdefs.h - - gl_cv_type_time_t_y2038=yes - fi - fi - if test $gl_cv_type_time_t_y2038 = no; then - cat confdefs.h - <<_ACEOF >conftest.$ac_ext -/* end confdefs.h. */ -#ifdef _USE_32BIT_TIME_T - int ok; - #else - error fail - #endif - -_ACEOF -if ac_fn_c_try_compile "$LINENO" -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 $? "The 'time_t' type stops working after January 2038. - Remove _USE_32BIT_TIME_T from the compiler flags. -See \`config.log' for more details" "$LINENO" 5; } -else $as_nop - # If not cross-compiling and says we should check, - # and 'touch' works with a large timestamp, then evidently wider time_t - # is desired and supported, so fail and ask the builder to fix the - # problem. Otherwise, just warn the builder. - - if test "$gl_warned_about_y2038" != yes; then - { printf "%s\n" "$as_me:${as_lineno-$LINENO}: WARNING: The 'time_t' type stops working after January 2038, - and this package needs a wider 'time_t' type - if there is any way to access timestamps after that. - Configure with 'CC=\"${CC} -m64\"' perhaps?" >&5 -printf "%s\n" "$as_me: WARNING: The 'time_t' type stops working after January 2038, - and this package needs a wider 'time_t' type - if there is any way to access timestamps after that. - Configure with 'CC=\"${CC} -m64\"' perhaps?" >&2;} - gl_warned_about_y2038=yes - fi - -fi -rm -f core conftest.err conftest.$ac_objext conftest.beam conftest.$ac_ext - fi -fi +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 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 ;; esac -fi +fi - case "$host_os" in - mingw*) -printf "%s\n" "#define __MINGW_USE_VC2005_COMPAT 1" >>confdefs.h +fi - ;; - esac @@ -8909,6 +8858,8 @@ fi # Code from module absolute-header: # Code from module accept: # Code from module accept-tests: + # Code from module alignasof: + # Code from module alignasof-tests: # Code from module alloca: # Code from module alloca-opt: # Code from module alloca-opt-tests: @@ -8918,6 +8869,8 @@ fi # Code from module arpa_inet: # Code from module arpa_inet-tests: # Code from module assert: + # Code from module assert-h: + # Code from module assert-h-tests: # Code from module assure: # Code from module attribute: # Code from module basename-lgpl: @@ -8933,6 +8886,8 @@ fi # Code from module c-strcase: # Code from module c-strcase-tests: # Code from module c-strcaseeq: + # Code from module c-strcasestr: + # Code from module c-strcasestr-tests: # Code from module c99: # Code from module calloc-gnu: # Code from module calloc-gnu-tests: @@ -8959,14 +8914,14 @@ fi # Code from module double-slash-root: # Code from module dup2: # Code from module dup2-tests: - # Code from module dynarray: - # Code from module dynarray-tests: # Code from module eloop-threshold: # Code from module environ: # Code from module environ-tests: # Code from module errno: # Code from module errno-tests: # Code from module error: + # Code from module error-h: + # Code from module error-tests: # Code from module exitfail: # Code from module extensions: # Code from module extern-inline: @@ -9014,6 +8969,10 @@ fi # Code from module gettimeofday-tests: # Code from module git-version-gen: # Code from module gitlog-to-changelog: + # Code from module glibc-internal/dynarray: + # Code from module glibc-internal/dynarray-tests: + # Code from module glibc-internal/scratch_buffer: + # Code from module glibc-internal/scratch_buffer-tests: # Code from module gnu-web-doc-update: # Code from module gnumakefile: # Code from module gnupload: @@ -9039,7 +8998,6 @@ fi # Code from module langinfo-tests: # Code from module largefile: - # Code from module lib-ignore: # Code from module libc-config: # Code from module limits-h: @@ -9073,6 +9031,8 @@ fi # Code from module mbsinit: # Code from module mbsinit-tests: # Code from module mbtowc: + # Code from module memchr: + # Code from module memchr-tests: # Code from module mempcpy: # Code from module minmax: # Code from module mkdir: @@ -9159,8 +9119,6 @@ fi # Code from module sched: # Code from module sched-tests: # Code from module sched_yield: - # Code from module scratch_buffer: - # Code from module scratch_buffer-tests: # Code from module select: # Code from module select-tests: # Code from module setenv: @@ -9192,8 +9150,6 @@ fi # Code from module stat-time: # Code from module stat-time-tests: # Code from module std-gnu11: - # Code from module stdalign: - # Code from module stdalign-tests: # Code from module stdarg: @@ -9201,6 +9157,8 @@ fi # Code from module stdarg-tests: # Code from module stdbool: # Code from module stdbool-tests: + # Code from module stdckdint: + # Code from module stdckdint-tests: # Code from module stddef: # Code from module stddef-tests: # Code from module stdint: @@ -9251,6 +9209,8 @@ fi # Code from module time: + # Code from module time-h: + # Code from module time-h-tests: # Code from module time-tests: # Code from module unistd: # Code from module unistd-tests: @@ -9552,336 +9512,6 @@ printf "%s\n" "$parted_cv_func_open_O_DIRECT_temp_dir" >&6; } fi -# Check whether --enable-largefile was given. -if test ${enable_largefile+y} -then : - enableval=$enable_largefile; -fi - -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 $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 <sys/types.h> - /* 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 : - break -fi -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 -{ 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 <sys/types.h> - /* 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 - cat confdefs.h - <<_ACEOF >conftest.$ac_ext -/* end confdefs.h. */ -#undef _FILE_OFFSET_BITS -#define _FILE_OFFSET_BITS 64 -#include <sys/types.h> - /* 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=64; break -fi -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 -rm -rf conftest* - case $ac_cv_sys_file_offset_bits in #( - unknown) : - { 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 $as_nop - while :; do - cat confdefs.h - <<_ACEOF >conftest.$ac_ext -/* end confdefs.h. */ -#include <sys/types.h> - /* 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_large_files=no; break -fi -rm -f core conftest.err conftest.$ac_objext conftest.beam conftest.$ac_ext - cat confdefs.h - <<_ACEOF >conftest.$ac_ext -/* end confdefs.h. */ -#undef _LARGE_FILES -#define _LARGE_FILES 1 -#include <sys/types.h> - /* 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_large_files=1; break -fi -rm -f core conftest.err conftest.$ac_objext conftest.beam conftest.$ac_ext - ac_cv_sys_large_files=unknown - break -done -fi -{ 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* ;; #( - 64) : - - # Check whether --enable-year2038 was given. -if test ${enable_year2038+y} -then : - enableval=$enable_year2038; -fi - - if test "$enable_year2038" != no -then : - - { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for time_t past the year 2038" >&5 -printf %s "checking for time_t past the year 2038... " >&6; } -if test ${gl_cv_type_time_t_y2038+y} -then : - printf %s "(cached) " >&6 -else $as_nop - cat confdefs.h - <<_ACEOF >conftest.$ac_ext -/* end confdefs.h. */ - - #include <time.h> - /* 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]; - -_ACEOF -if ac_fn_c_try_compile "$LINENO" -then : - gl_cv_type_time_t_y2038=yes -else $as_nop - gl_cv_type_time_t_y2038=no -fi -rm -f core conftest.err conftest.$ac_objext conftest.beam conftest.$ac_ext - -fi -{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $gl_cv_type_time_t_y2038" >&5 -printf "%s\n" "$gl_cv_type_time_t_y2038" >&6; } - if test "$gl_cv_type_time_t_y2038" = no; then - { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for 64-bit time_t with _TIME_BITS=64" >&5 -printf %s "checking for 64-bit time_t with _TIME_BITS=64... " >&6; } -if test ${gl_cv_type_time_t_bits_macro+y} -then : - printf %s "(cached) " >&6 -else $as_nop - cat confdefs.h - <<_ACEOF >conftest.$ac_ext -/* end confdefs.h. */ -#define _TIME_BITS 64 - #define _FILE_OFFSET_BITS 64 - - #include <time.h> - /* 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]; - -_ACEOF -if ac_fn_c_try_compile "$LINENO" -then : - gl_cv_type_time_t_bits_macro=yes -else $as_nop - gl_cv_type_time_t_bits_macro=no -fi -rm -f core conftest.err conftest.$ac_objext conftest.beam conftest.$ac_ext - -fi -{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $gl_cv_type_time_t_bits_macro" >&5 -printf "%s\n" "$gl_cv_type_time_t_bits_macro" >&6; } - if test "$gl_cv_type_time_t_bits_macro" = yes; then - -printf "%s\n" "#define _TIME_BITS 64" >>confdefs.h - - -printf "%s\n" "#define _FILE_OFFSET_BITS 64" >>confdefs.h - - gl_cv_type_time_t_y2038=yes - fi - fi - if test $gl_cv_type_time_t_y2038 = no; then - cat confdefs.h - <<_ACEOF >conftest.$ac_ext -/* end confdefs.h. */ -#ifdef _USE_32BIT_TIME_T - int ok; - #else - error fail - #endif - -_ACEOF -if ac_fn_c_try_compile "$LINENO" -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 $? "The 'time_t' type stops working after January 2038. - Remove _USE_32BIT_TIME_T from the compiler flags. -See \`config.log' for more details" "$LINENO" 5; } -else $as_nop - # If not cross-compiling and says we should check, - # and 'touch' works with a large timestamp, then evidently wider time_t - # is desired and supported, so fail and ask the builder to fix the - # problem. Otherwise, just warn the builder. - - if test "$gl_warned_about_y2038" != yes; then - { printf "%s\n" "$as_me:${as_lineno-$LINENO}: WARNING: The 'time_t' type stops working after January 2038, - and this package needs a wider 'time_t' type - if there is any way to access timestamps after that. - Configure with 'CC=\"${CC} -m64\"' perhaps?" >&5 -printf "%s\n" "$as_me: WARNING: The 'time_t' type stops working after January 2038, - and this package needs a wider 'time_t' type - if there is any way to access timestamps after that. - Configure with 'CC=\"${CC} -m64\"' perhaps?" >&2;} - gl_warned_about_y2038=yes - fi - -fi -rm -f core conftest.err conftest.$ac_objext conftest.beam conftest.$ac_ext - fi -fi - ;; #( - *) : - ;; -esac -fi @@ -10081,6 +9711,126 @@ printf "%s\n" "#define STACK_DIRECTION $ac_cv_c_stack_direction" >>confdefs.h fi + + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking whether the preprocessor supports include_next" >&5 +printf %s "checking whether the preprocessor supports include_next... " >&6; } +if test ${gl_cv_have_include_next+y} +then : + printf %s "(cached) " >&6 +else $as_nop + rm -rf conftestd1a conftestd1b conftestd2 + mkdir conftestd1a conftestd1b conftestd2 + cat <<EOF > conftestd1a/conftest.h +#define DEFINED_IN_CONFTESTD1 +#include_next <conftest.h> +#ifdef DEFINED_IN_CONFTESTD2 +int foo; +#else +#error "include_next doesn't work" +#endif +EOF + cat <<EOF > conftestd1b/conftest.h +#define DEFINED_IN_CONFTESTD1 +#include <stdio.h> +#include_next <conftest.h> +#ifdef DEFINED_IN_CONFTESTD2 +int foo; +#else +#error "include_next doesn't work" +#endif +EOF + cat <<EOF > conftestd2/conftest.h +#ifndef DEFINED_IN_CONFTESTD1 +#error "include_next test doesn't work" +#endif +#define DEFINED_IN_CONFTESTD2 +EOF + gl_save_CPPFLAGS="$CPPFLAGS" + CPPFLAGS="$gl_save_CPPFLAGS -Iconftestd1b -Iconftestd2" + cat confdefs.h - <<_ACEOF >conftest.$ac_ext +/* end confdefs.h. */ +#include <conftest.h> +_ACEOF +if ac_fn_c_try_compile "$LINENO" +then : + gl_cv_have_include_next=yes +else $as_nop + CPPFLAGS="$gl_save_CPPFLAGS -Iconftestd1a -Iconftestd2" + cat confdefs.h - <<_ACEOF >conftest.$ac_ext +/* end confdefs.h. */ +#include <conftest.h> +_ACEOF +if ac_fn_c_try_compile "$LINENO" +then : + gl_cv_have_include_next=buggy +else $as_nop + gl_cv_have_include_next=no +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 + CPPFLAGS="$gl_save_CPPFLAGS" + rm -rf conftestd1a conftestd1b conftestd2 + +fi +{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $gl_cv_have_include_next" >&5 +printf "%s\n" "$gl_cv_have_include_next" >&6; } + PRAGMA_SYSTEM_HEADER= + if test $gl_cv_have_include_next = yes; then + INCLUDE_NEXT=include_next + INCLUDE_NEXT_AS_FIRST_DIRECTIVE=include_next + if test -n "$GCC"; then + PRAGMA_SYSTEM_HEADER='#pragma GCC system_header' + fi + else + if test $gl_cv_have_include_next = buggy; then + INCLUDE_NEXT=include + INCLUDE_NEXT_AS_FIRST_DIRECTIVE=include_next + else + INCLUDE_NEXT=include + INCLUDE_NEXT_AS_FIRST_DIRECTIVE=include + fi + fi + + + + + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking whether source code line length is unlimited" >&5 +printf %s "checking whether source code line length is unlimited... " >&6; } +if test ${gl_cv_source_line_length_unlimited+y} +then : + printf %s "(cached) " >&6 +else $as_nop + cat confdefs.h - <<_ACEOF >conftest.$ac_ext +/* end confdefs.h. */ + +#ifdef __TANDEM +choke me +#endif + +_ACEOF +if (eval "$ac_cpp conftest.$ac_ext") 2>&5 | + $EGREP "choke me" >/dev/null 2>&1 +then : + gl_cv_source_line_length_unlimited=no +else $as_nop + gl_cv_source_line_length_unlimited=yes +fi +rm -rf conftest* + + +fi +{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $gl_cv_source_line_length_unlimited" >&5 +printf "%s\n" "$gl_cv_source_line_length_unlimited" >&6; } + if test $gl_cv_source_line_length_unlimited = no; then + PRAGMA_COLUMNS="#pragma COLUMNS 10000" + else + PRAGMA_COLUMNS= + fi + + + HAVE_BTOWC=1; HAVE_MBSINIT=1; HAVE_MBRTOWC=1; @@ -10138,6 +9888,7 @@ fi REPLACE_WCSWIDTH=0; REPLACE_WCSFTIME=0; REPLACE_WCSTOK=0; + REPLACE_WMEMPCPY=0; @@ -10607,6 +10358,10 @@ printf "%s\n" "$gt_cv_locale_fr" >&6; } + GL_GNULIB_GETPROGNAME=0 + + + GL_GNULIB_GETSUBOPT=0 @@ -10776,6 +10531,7 @@ printf "%s\n" "$gt_cv_locale_fr" >&6; } HAVE_DECL_FCVT=1; HAVE_DECL_GCVT=1; HAVE_DECL_GETLOADAVG=1; + HAVE_GETPROGNAME=1; HAVE_GETSUBOPT=1; HAVE_GRANTPT=1; HAVE_INITSTATE=1; @@ -10812,17 +10568,24 @@ printf "%s\n" "$gt_cv_locale_fr" >&6; } HAVE_SYS_LOADAVG_H=0; HAVE_UNLOCKPT=1; HAVE_DECL_UNSETENV=1; + REPLACE__EXIT=0; REPLACE_ALIGNED_ALLOC=0; REPLACE_CALLOC_FOR_CALLOC_GNU=0; REPLACE_CALLOC_FOR_CALLOC_POSIX=0; REPLACE_CANONICALIZE_FILE_NAME=0; REPLACE_FREE=0; + REPLACE_GETLOADAVG=0; + REPLACE_GETPROGNAME=0; + REPLACE_GETSUBOPT=0; REPLACE_INITSTATE=0; REPLACE_MALLOC_FOR_MALLOC_GNU=0; REPLACE_MALLOC_FOR_MALLOC_POSIX=0; REPLACE_MBTOWC=0; + REPLACE_MKOSTEMP=0; + REPLACE_MKOSTEMPS=0; REPLACE_MKSTEMP=0; REPLACE_POSIX_MEMALIGN=0; + REPLACE_POSIX_OPENPT=0; REPLACE_PTSNAME=0; REPLACE_PTSNAME_R=0; REPLACE_PUTENV=0; @@ -10956,6 +10719,9 @@ then : linux-* | linux) # Guess yes on Linux systems. gl_cv_func_lstat_dereferences_slashed_symlink="guessing yes" ;; + midipix*) + # Guess yes on systems that emulate the Linux system calls. + gl_cv_func_lstat_dereferences_slashed_symlink="guessing yes" ;; *-gnu* | gnu*) # Guess yes on glibc systems. gl_cv_func_lstat_dereferences_slashed_symlink="guessing yes" ;; @@ -11010,6 +10776,85 @@ printf "%s\n" "#define LSTAT_FOLLOWS_SLASHED_SYMLINK 1" >>confdefs.h esac +{ 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 <float.h> +#include <limits.h> +#include <stdarg.h> +#include <stddef.h> +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 @@ -11308,6 +11153,74 @@ printf "%s\n" "#define FUNC_REALPATH_NEARLY_WORKS 1" >>confdefs.h + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for faccessat" >&5 +printf %s "checking for faccessat... " >&6; } +if test ${gl_cv_onwards_func_faccessat+y} +then : + printf %s "(cached) " >&6 +else $as_nop + + exec 9>&6 6>/dev/null + + case "$host_os" in + + linux*-android*) + ac_fn_check_decl "$LINENO" "faccessat" "ac_cv_have_decl_faccessat" "#include <unistd.h> +" "$ac_c_undeclared_builtin_options" "CFLAGS" +if test "x$ac_cv_have_decl_faccessat" = xyes +then : + +fi + if test $ac_cv_have_decl_faccessat = yes; then + ac_fn_c_check_func "$LINENO" "faccessat" "ac_cv_func_faccessat" +if test "x$ac_cv_func_faccessat" = xyes +then : + +fi + + if test $ac_cv_func_faccessat = yes; then + gl_cv_onwards_func_faccessat=yes + else + gl_cv_onwards_func_faccessat='future OS version' + fi + else + gl_cv_onwards_func_faccessat='future OS version' + fi + ;; + + + *) + ac_fn_c_check_func "$LINENO" "faccessat" "ac_cv_func_faccessat" +if test "x$ac_cv_func_faccessat" = xyes +then : + +fi + + gl_cv_onwards_func_faccessat=$ac_cv_func_faccessat + ;; + + esac + + exec 6>&9 9>&- + + +fi +{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $gl_cv_onwards_func_faccessat" >&5 +printf "%s\n" "$gl_cv_onwards_func_faccessat" >&6; } + + case "$gl_cv_onwards_func_faccessat" in + future*) ac_cv_func_faccessat=no ;; + *) ac_cv_func_faccessat=$gl_cv_onwards_func_faccessat ;; + esac + if test $ac_cv_func_faccessat = yes; then + +printf "%s\n" "#define HAVE_FACCESSAT 1" >>confdefs.h + + fi + + + + case "$host_os" in mingw*) ;; *) ac_fn_c_check_func "$LINENO" "getcwd" "ac_cv_func_getcwd" @@ -11378,6 +11291,7 @@ fi REPLACE_COPY_FILE_RANGE=0; REPLACE_DUP=0; REPLACE_DUP2=0; + REPLACE_DUP3=0; REPLACE_EXECL=0; REPLACE_EXECLE=0; REPLACE_EXECLP=0; @@ -11387,10 +11301,12 @@ fi REPLACE_EXECVPE=0; REPLACE_FACCESSAT=0; REPLACE_FCHOWNAT=0; + REPLACE_FDATASYNC=0; REPLACE_FTRUNCATE=0; REPLACE_GETCWD=0; REPLACE_GETDOMAINNAME=0; REPLACE_GETDTABLESIZE=0; + REPLACE_GETENTROPY=0; REPLACE_GETLOGIN_R=0; REPLACE_GETGROUPS=0; REPLACE_GETPAGESIZE=0; @@ -11401,12 +11317,14 @@ fi REPLACE_LINK=0; REPLACE_LINKAT=0; REPLACE_LSEEK=0; + REPLACE_PIPE2=0; REPLACE_PREAD=0; REPLACE_PWRITE=0; REPLACE_READ=0; REPLACE_READLINK=0; REPLACE_READLINKAT=0; REPLACE_RMDIR=0; + REPLACE_SETHOSTNAME=0; REPLACE_SLEEP=0; REPLACE_SYMLINK=0; REPLACE_SYMLINKAT=0; @@ -11779,6 +11697,31 @@ printf "%s\n" "#define HAVE_MSVC_INVALID_PARAMETER_HANDLER 1" >>confdefs.h + + if test "x$lispdir" = x; then + lispdir='${datarootdir}/emacs/site-lisp' + + fi + if test "x$runstatedir" = x; then + runstatedir='${localstatedir}/run' + + fi + + pkgdatadir='${datadir}/${PACKAGE}' + + pkgincludedir='${includedir}/${PACKAGE}' + + pkglibdir='${libdir}/${PACKAGE}' + + pkglibexecdir='${libexecdir}/${PACKAGE}' + + + + gl_sed_double_backslashes='s/\\/\\\\/g' + gl_sed_escape_doublequotes='s/"/\\"/g' + gl_sed_escape_for_make_1="s,\\([ \"&'();<>\\\\\`|]\\),\\\\\\1,g" + gl_sed_escape_for_make_2='s,\$,\\$$,g' + gl_mda_defines=' #if defined _WIN32 && !defined __CYGWIN__ #define access _access @@ -11836,126 +11779,6 @@ gl_mda_defines=' - { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking whether the preprocessor supports include_next" >&5 -printf %s "checking whether the preprocessor supports include_next... " >&6; } -if test ${gl_cv_have_include_next+y} -then : - printf %s "(cached) " >&6 -else $as_nop - rm -rf conftestd1a conftestd1b conftestd2 - mkdir conftestd1a conftestd1b conftestd2 - cat <<EOF > conftestd1a/conftest.h -#define DEFINED_IN_CONFTESTD1 -#include_next <conftest.h> -#ifdef DEFINED_IN_CONFTESTD2 -int foo; -#else -#error "include_next doesn't work" -#endif -EOF - cat <<EOF > conftestd1b/conftest.h -#define DEFINED_IN_CONFTESTD1 -#include <stdio.h> -#include_next <conftest.h> -#ifdef DEFINED_IN_CONFTESTD2 -int foo; -#else -#error "include_next doesn't work" -#endif -EOF - cat <<EOF > conftestd2/conftest.h -#ifndef DEFINED_IN_CONFTESTD1 -#error "include_next test doesn't work" -#endif -#define DEFINED_IN_CONFTESTD2 -EOF - gl_save_CPPFLAGS="$CPPFLAGS" - CPPFLAGS="$gl_save_CPPFLAGS -Iconftestd1b -Iconftestd2" - cat confdefs.h - <<_ACEOF >conftest.$ac_ext -/* end confdefs.h. */ -#include <conftest.h> -_ACEOF -if ac_fn_c_try_compile "$LINENO" -then : - gl_cv_have_include_next=yes -else $as_nop - CPPFLAGS="$gl_save_CPPFLAGS -Iconftestd1a -Iconftestd2" - cat confdefs.h - <<_ACEOF >conftest.$ac_ext -/* end confdefs.h. */ -#include <conftest.h> -_ACEOF -if ac_fn_c_try_compile "$LINENO" -then : - gl_cv_have_include_next=buggy -else $as_nop - gl_cv_have_include_next=no -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 - CPPFLAGS="$gl_save_CPPFLAGS" - rm -rf conftestd1a conftestd1b conftestd2 - -fi -{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $gl_cv_have_include_next" >&5 -printf "%s\n" "$gl_cv_have_include_next" >&6; } - PRAGMA_SYSTEM_HEADER= - if test $gl_cv_have_include_next = yes; then - INCLUDE_NEXT=include_next - INCLUDE_NEXT_AS_FIRST_DIRECTIVE=include_next - if test -n "$GCC"; then - PRAGMA_SYSTEM_HEADER='#pragma GCC system_header' - fi - else - if test $gl_cv_have_include_next = buggy; then - INCLUDE_NEXT=include - INCLUDE_NEXT_AS_FIRST_DIRECTIVE=include_next - else - INCLUDE_NEXT=include - INCLUDE_NEXT_AS_FIRST_DIRECTIVE=include - fi - fi - - - - - { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking whether source code line length is unlimited" >&5 -printf %s "checking whether source code line length is unlimited... " >&6; } -if test ${gl_cv_source_line_length_unlimited+y} -then : - printf %s "(cached) " >&6 -else $as_nop - cat confdefs.h - <<_ACEOF >conftest.$ac_ext -/* end confdefs.h. */ - -#ifdef __TANDEM -choke me -#endif - -_ACEOF -if (eval "$ac_cpp conftest.$ac_ext") 2>&5 | - $EGREP "choke me" >/dev/null 2>&1 -then : - gl_cv_source_line_length_unlimited=no -else $as_nop - gl_cv_source_line_length_unlimited=yes -fi -rm -rf conftest* - - -fi -{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $gl_cv_source_line_length_unlimited" >&5 -printf "%s\n" "$gl_cv_source_line_length_unlimited" >&6; } - if test $gl_cv_source_line_length_unlimited = no; then - PRAGMA_COLUMNS="#pragma COLUMNS 10000" - else - PRAGMA_COLUMNS= - fi - - - - { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for complete errno.h" >&5 printf %s "checking for complete errno.h... " >&6; } if test ${gl_cv_header_errno_h_complete+y} @@ -12336,85 +12159,321 @@ printf "%s\n" "$gl_cv_header_errno_h_EOVERFLOW" >&6; } fi -{ 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} + + + + + + + + + + + + + if test $gl_cv_have_include_next = yes; then + gl_cv_next_error_h='<'error.h'>' + else + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking absolute name of <error.h>" >&5 +printf %s "checking absolute name of <error.h>... " >&6; } +if test ${gl_cv_next_error_h+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 + + if test $ac_cv_header_error_h = yes; then + + + + + cat confdefs.h - <<_ACEOF >conftest.$ac_ext +/* end confdefs.h. */ +#include <error.h> +_ACEOF + case "$host_os" in + aix*) gl_absname_cpp="$ac_cpp -C" ;; + *) gl_absname_cpp="$ac_cpp" ;; + esac + + case "$host_os" in + mingw*) + gl_dirsep_regex='[/\\]' + ;; + *) + gl_dirsep_regex='\/' + ;; + esac + gl_make_literal_regex_sed='s,[]$^\\.*/[],\\&,g' + gl_header_literal_regex=`echo 'error.h' \ + | sed -e "$gl_make_literal_regex_sed"` + gl_absolute_header_sed="/${gl_dirsep_regex}${gl_header_literal_regex}/"'{ + s/.*"\(.*'"${gl_dirsep_regex}${gl_header_literal_regex}"'\)".*/\1/ + s|^/[^/]|//&| + p + q + }' + + gl_cv_absolute_error_h=`(eval "$gl_absname_cpp conftest.$ac_ext") 2>&5 | + sed -n "$gl_absolute_header_sed"` + + gl_header=$gl_cv_absolute_error_h + gl_cv_next_error_h='"'$gl_header'"' + else + gl_cv_next_error_h='<'error.h'>' + fi + + +fi +{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $gl_cv_next_error_h" >&5 +printf "%s\n" "$gl_cv_next_error_h" >&6; } + fi + NEXT_ERROR_H=$gl_cv_next_error_h + + if test $gl_cv_have_include_next = yes || test $gl_cv_have_include_next = buggy; then + # INCLUDE_NEXT_AS_FIRST_DIRECTIVE='include_next' + gl_next_as_first_directive='<'error.h'>' + else + # INCLUDE_NEXT_AS_FIRST_DIRECTIVE='include' + gl_next_as_first_directive=$gl_cv_next_error_h + fi + NEXT_AS_FIRST_DIRECTIVE_ERROR_H=$gl_next_as_first_directive + + + + + if test $ac_cv_header_error_h = yes; then + HAVE_ERROR_H=1 + else + HAVE_ERROR_H=0 + fi + + + REPLACE_ERROR=0 + + + + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for error" >&5 +printf %s "checking for error... " >&6; } +if test ${gl_cv_onwards_func_error+y} +then : + printf %s "(cached) " >&6 +else $as_nop + + exec 9>&6 6>/dev/null + + case "$host_os" in + + linux*-android*) + ac_fn_check_decl "$LINENO" "error" "ac_cv_have_decl_error" "#include <error.h> +" "$ac_c_undeclared_builtin_options" "CFLAGS" +if test "x$ac_cv_have_decl_error" = xyes +then : + +fi + if test $ac_cv_have_decl_error = yes; then + ac_fn_c_check_func "$LINENO" "error" "ac_cv_func_error" +if test "x$ac_cv_func_error" = xyes +then : + +fi + + if test $ac_cv_func_error = yes; then + gl_cv_onwards_func_error=yes + else + gl_cv_onwards_func_error='future OS version' + fi + else + gl_cv_onwards_func_error='future OS version' + fi + ;; + + + *) + ac_fn_c_check_func "$LINENO" "error" "ac_cv_func_error" +if test "x$ac_cv_func_error" = xyes +then : + +fi + + gl_cv_onwards_func_error=$ac_cv_func_error + ;; + + esac + + exec 6>&9 9>&- + + +fi +{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $gl_cv_onwards_func_error" >&5 +printf "%s\n" "$gl_cv_onwards_func_error" >&6; } + + case "$gl_cv_onwards_func_error" in + future*) ac_cv_func_error=no ;; + *) ac_cv_func_error=$gl_cv_onwards_func_error ;; + esac + if test $ac_cv_func_error = yes; then + +printf "%s\n" "#define HAVE_ERROR 1" >>confdefs.h + + fi + + + if test $ac_cv_func_error = yes; then + HAVE_ERROR=1 + else + HAVE_ERROR=0 + case "$gl_cv_onwards_func_error" in + future*) REPLACE_ERROR=1 ;; + esac + fi + + ac_fn_check_decl "$LINENO" "error_at_line" "ac_cv_have_decl_error_at_line" "#include <error.h> +" "$ac_c_undeclared_builtin_options" "CFLAGS" +if test "x$ac_cv_have_decl_error_at_line" = xyes +then : + +fi + if test $ac_cv_have_decl_error_at_line = yes; then + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for error_at_line" >&5 +printf %s "checking for error_at_line... " >&6; } +if test ${ac_cv_lib_error_at_line+y} +then : + printf %s "(cached) " >&6 +else $as_nop + cat confdefs.h - <<_ACEOF >conftest.$ac_ext /* end confdefs.h. */ +#include <error.h> +int +main (void) +{ +error_at_line (0, 0, "", 0, "an error occurred"); + ; + return 0; +} +_ACEOF +if ac_fn_c_try_link "$LINENO" +then : + ac_cv_lib_error_at_line=yes +else $as_nop + ac_cv_lib_error_at_line=no +fi +rm -f core conftest.err conftest.$ac_objext conftest.beam \ + conftest$ac_exeext conftest.$ac_ext +fi +{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_error_at_line" >&5 +printf "%s\n" "$ac_cv_lib_error_at_line" >&6; } + else + ac_cv_lib_error_at_line=no + fi + if test $ac_cv_lib_error_at_line = yes; then + HAVE_ERROR_AT_LINE=1 + else + HAVE_ERROR_AT_LINE=0 + fi + REPLACE_ERROR_AT_LINE=0 + + if test $ac_cv_func_error = yes && test $ac_cv_lib_error_at_line = yes; then + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for working error function" >&5 +printf %s "checking for working error function... " >&6; } +if test ${gl_cv_func_working_error+y} +then : + printf %s "(cached) " >&6 +else $as_nop + if test $cross_compiling != yes; then + cat confdefs.h - <<_ACEOF >conftest.$ac_ext +/* end confdefs.h. */ + + #include <error.h> + static void print_no_progname (void) {} int main (void) { -(void) strchr; + + error_print_progname = print_no_progname; + error (0, 0, "foo"); + ; return 0; } + _ACEOF -if ac_fn_c_try_compile "$LINENO" +if ac_fn_c_try_link "$LINENO" then : + rm -f conftest.out + if test -s conftest$ac_exeext \ + && ./conftest$ac_exeext 2> conftest.out; then + if grep ' ' conftest.out >/dev/null; then + gl_cv_func_working_error=no + else + gl_cv_func_working_error=yes + fi + else + gl_cv_func_working_error=no + fi + rm -f conftest.out 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 + gl_cv_func_working_error=no +fi +rm -f core conftest.err conftest.$ac_objext conftest.beam \ + conftest$ac_exeext conftest.$ac_ext + else + cat confdefs.h - <<_ACEOF >conftest.$ac_ext /* end confdefs.h. */ -#include <float.h> -#include <limits.h> -#include <stdarg.h> -#include <stddef.h> -extern void ac_decl (int, char *); + + #include <error.h> int main (void) { -(void) ac_decl (0, (char *) 0); - (void) ac_decl; + + error (0, 0, "foo"); ; 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' + case "$host_os" in + # Guess yes on glibc systems. + *-gnu* | gnu*) gl_cv_func_working_error="guessing yes" ;; + # Guess no on Android. + linux*-android*) gl_cv_func_working_error="guessing no" ;; + # If we don't know, obey --enable-cross-guesses. + *) gl_cv_func_working_error="$gl_cross_guess_normal" ;; + esac + 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 + gl_cv_func_working_error=no fi rm -f core conftest.err conftest.$ac_objext conftest.beam conftest.$ac_ext - done - CFLAGS=$ac_save_CFLAGS + fi 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 +{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $gl_cv_func_working_error" >&5 +printf "%s\n" "$gl_cv_func_working_error" >&6; } + case "$gl_cv_func_working_error" in + *no) + REPLACE_ERROR=1 + REPLACE_ERROR_AT_LINE=1 + ;; + esac + fi + + if test $HAVE_ERROR = 0 || test $REPLACE_ERROR = 1 \ + || test $HAVE_ERROR_AT_LINE = 0 || test $REPLACE_ERROR_AT_LINE = 1; then + GL_GENERATE_ERROR_H=true + else + GL_GENERATE_ERROR_H=false + fi + + + + + ac_fn_check_decl "$LINENO" "strerror_r" "ac_cv_have_decl_strerror_r" "$ac_includes_default" "$ac_c_undeclared_builtin_options" "CFLAGS" if test "x$ac_cv_have_decl_strerror_r" = xyes @@ -12853,6 +12912,7 @@ printf "%s\n" "$gl_cv_next_fcntl_h" >&6; } HAVE_MKNOD=1; HAVE_MKNODAT=1; HAVE_UTIMENSAT=1; + REPLACE_CHMOD=0; REPLACE_FCHMODAT=0; REPLACE_FSTAT=0; REPLACE_FSTATAT=0; @@ -13178,6 +13238,10 @@ fi + GL_GNULIB_CHMOD=0 + + + GL_GNULIB_FCHMODAT=0 @@ -13883,13 +13947,11 @@ printf "%s\n" "$gl_cv_func_getopt_long_gnu" >&6; } - HAVE_GETRANDOM=1; REPLACE_GETRANDOM=0; - GL_GNULIB_GETRANDOM=0 @@ -13952,8 +14014,8 @@ rm -f core conftest.err conftest.$ac_objext conftest.beam \ LIBS=$save_LIBS test $gl_pthread_api = yes && break done - echo "$as_me:13955: gl_pthread_api=$gl_pthread_api" >&5 - echo "$as_me:13956: LIBPTHREAD=$LIBPTHREAD" >&5 + echo "$as_me:14017: gl_pthread_api=$gl_pthread_api" >&5 + echo "$as_me:14018: LIBPTHREAD=$LIBPTHREAD" >&5 gl_pthread_in_glibc=no # On Linux with glibc >= 2.34, libc contains the fully functional @@ -13979,7 +14041,7 @@ rm -rf conftest* ;; esac - echo "$as_me:13982: gl_pthread_in_glibc=$gl_pthread_in_glibc" >&5 + echo "$as_me:14044: gl_pthread_in_glibc=$gl_pthread_in_glibc" >&5 # Test for libpthread by looking for pthread_kill. (Not pthread_self, # since it is defined as a macro on OSF/1.) @@ -14034,7 +14096,7 @@ then : # On Solaris 10 or newer, this test is no longer needed, because # libc contains the fully functional pthread functions. case "$host_os" in - solaris | solaris2.1-9 | solaris2.1-9.* | hpux*) + solaris | solaris2.[1-9] | solaris2.[1-9].* | hpux*) printf "%s\n" "#define PTHREAD_IN_USE_DETECTION_HARD 1" >>confdefs.h @@ -14133,7 +14195,7 @@ fi fi fi - echo "$as_me:14136: LIBPMULTITHREAD=$LIBPMULTITHREAD" >&5 + echo "$as_me:14198: LIBPMULTITHREAD=$LIBPMULTITHREAD" >&5 fi { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking whether POSIX threads API is available" >&5 printf %s "checking whether POSIX threads API is available... " >&6; } @@ -14160,7 +14222,7 @@ sched_yield (); _ACEOF if ac_fn_c_try_link "$LINENO" then : - LIB_SCHED_YIELD= + SCHED_YIELD_LIB= else $as_nop { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for sched_yield in -lrt" >&5 @@ -14200,7 +14262,7 @@ fi printf "%s\n" "$ac_cv_lib_rt_sched_yield" >&6; } if test "x$ac_cv_lib_rt_sched_yield" = xyes then : - LIB_SCHED_YIELD=-lrt + SCHED_YIELD_LIB=-lrt else $as_nop { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for sched_yield in -lposix4" >&5 printf %s "checking for sched_yield in -lposix4... " >&6; } @@ -14239,7 +14301,7 @@ fi printf "%s\n" "$ac_cv_lib_posix4_sched_yield" >&6; } if test "x$ac_cv_lib_posix4_sched_yield" = xyes then : - LIB_SCHED_YIELD=-lposix4 + SCHED_YIELD_LIB=-lposix4 fi fi @@ -14249,6 +14311,8 @@ fi rm -f core conftest.err conftest.$ac_objext conftest.beam \ conftest$ac_exeext conftest.$ac_ext + LIB_SCHED_YIELD="$SCHED_YIELD_LIB" + gl_pthreadlib_body_done=done fi @@ -14267,9 +14331,32 @@ then : printf %s "(cached) " >&6 else $as_nop case "$host_os" in - # Guess no on musl libc, macOS, FreeBSD, NetBSD, OpenBSD, AIX, Haiku, Cygwin. - *-musl* | darwin* | freebsd* | midnightbsd* | netbsd* | openbsd* | aix* | haiku* | cygwin*) + # Guess no on musl libc, macOS, FreeBSD, NetBSD, OpenBSD, AIX, Haiku. + *-musl* | midipix* | darwin* | freebsd* | midnightbsd* | netbsd* | openbsd* | aix* | haiku*) gl_cv_func_setlocale_null_all_mtsafe=no ;; + # Guess no on Cygwin < 3.4.6. + cygwin*) + cat confdefs.h - <<_ACEOF >conftest.$ac_ext +/* end confdefs.h. */ + +#if defined __CYGWIN__ + #include <cygwin/version.h> + #if CYGWIN_VERSION_DLL_COMBINED >= CYGWIN_VERSION_DLL_MAKE_COMBINED (3004, 6) + Lucky user + #endif +#endif + +_ACEOF +if (eval "$ac_cpp conftest.$ac_ext") 2>&5 | + $EGREP "Lucky user" >/dev/null 2>&1 +then : + gl_cv_func_setlocale_null_all_mtsafe=yes +else $as_nop + gl_cv_func_setlocale_null_all_mtsafe=no +fi +rm -rf conftest* + + ;; # Guess yes on glibc, HP-UX, IRIX, Solaris, native Windows. *-gnu* | gnu* | hpux* | irix* | solaris* | mingw*) gl_cv_func_setlocale_null_all_mtsafe=yes ;; @@ -14308,7 +14395,7 @@ else $as_nop openbsd* | aix*) gl_cv_func_setlocale_null_one_mtsafe=no ;; # Guess yes on glibc, musl libc, macOS, FreeBSD, NetBSD, HP-UX, IRIX, Solaris, Haiku, Cygwin, native Windows. - *-gnu* | gnu* | *-musl* | darwin* | freebsd* | midnightbsd* | netbsd* | hpux* | irix* | solaris* | haiku* | cygwin* | mingw*) + *-gnu* | gnu* | *-musl* | midipix* | darwin* | freebsd* | midnightbsd* | netbsd* | hpux* | irix* | solaris* | haiku* | cygwin* | mingw*) gl_cv_func_setlocale_null_one_mtsafe=yes ;; # If we don't know, obey --enable-cross-guesses. *) @@ -14336,7 +14423,7 @@ printf "%s\n" "#define SETLOCALE_NULL_ONE_MTSAFE $SETLOCALE_NULL_ONE_MTSAFE" >>c if test $SETLOCALE_NULL_ALL_MTSAFE = 0 || test $SETLOCALE_NULL_ONE_MTSAFE = 0; then case "$host_os" in - mingw*) LIB_SETLOCALE_NULL= ;; + mingw*) SETLOCALE_NULL_LIB= ;; *) @@ -14451,15 +14538,17 @@ printf "%s\n" "#define HAVE_WEAK_SYMBOLS 1" >>confdefs.h esac case "$gl_cv_have_weak" in - *yes) LIB_SETLOCALE_NULL= ;; - *) LIB_SETLOCALE_NULL="$LIBPTHREAD" ;; + *yes) SETLOCALE_NULL_LIB= ;; + *) SETLOCALE_NULL_LIB="$LIBPTHREAD" ;; esac ;; esac else - LIB_SETLOCALE_NULL= + SETLOCALE_NULL_LIB= fi + LIB_SETLOCALE_NULL="$SETLOCALE_NULL_LIB" + @@ -14559,6 +14648,7 @@ else $as_nop int wb = WORD_BIT; int ullw = ULLONG_WIDTH; int bw = BOOL_WIDTH; + int bm = BOOL_MAX; int main (void) @@ -15532,6 +15622,10 @@ printf "%s\n" "$ac_res" >&6; } HAVE_DECL_STRTOIMAX=1; HAVE_DECL_STRTOUMAX=1; HAVE_IMAXDIV_T=1; + HAVE_IMAXABS=1; + HAVE_IMAXDIV=1; + REPLACE_IMAXABS=0; + REPLACE_IMAXDIV=0; REPLACE_STRTOIMAX=0; REPLACE_STRTOUMAX=0; INT32_MAX_LT_INTMAX_MAX=1; @@ -16275,7 +16369,14 @@ then : else $as_nop cat confdefs.h - <<_ACEOF >conftest.$ac_ext /* end confdefs.h. */ -#include <stddef.h> +/* On FreeBSD 12.0/x86, max_align_t defined by <stddef.h> has + the correct alignment with the default (wrong) definition of + _Alignof, but a wrong alignment as soon as we activate an + ISO C compliant _Alignof definition. */ + #if ((defined __GNUC__ && 4 <= __GNUC__) || defined __clang__) && !defined __cplusplus + #define _Alignof(type) __builtin_offsetof (struct { char __a; type __b; }, __b) + #endif + #include <stddef.h> unsigned int s = sizeof (max_align_t); #if defined __GNUC__ || defined __clang__ || defined __IBM__ALIGNOF__ int check1[2 * (__alignof__ (double) <= __alignof__ (max_align_t)) - 1]; @@ -16352,6 +16453,41 @@ printf "%s\n" "$gl_cv_decl_null_works" >&6; } GL_GENERATE_STDDEF_H=true fi + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for unreachable" >&5 +printf %s "checking for unreachable... " >&6; } +if test ${gl_cv_func_unreachable+y} +then : + printf %s "(cached) " >&6 +else $as_nop + cat confdefs.h - <<_ACEOF >conftest.$ac_ext +/* end confdefs.h. */ +#include <stddef.h> + +int +main (void) +{ +unreachable (); + + ; + return 0; +} +_ACEOF +if ac_fn_c_try_link "$LINENO" +then : + gl_cv_func_unreachable=yes +else $as_nop + gl_cv_func_unreachable=no +fi +rm -f core conftest.err conftest.$ac_objext conftest.beam \ + conftest$ac_exeext conftest.$ac_ext + +fi +{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $gl_cv_func_unreachable" >&5 +printf "%s\n" "$gl_cv_func_unreachable" >&6; } + if test $gl_cv_func_unreachable = no; then + GL_GENERATE_STDDEF_H=true + fi + if $GL_GENERATE_STDDEF_H; then @@ -16871,8 +17007,8 @@ rm -f core conftest.err conftest.$ac_objext conftest.beam \ LIBS=$save_LIBS test $gl_pthread_api = yes && break done - echo "$as_me:16874: gl_pthread_api=$gl_pthread_api" >&5 - echo "$as_me:16875: LIBPTHREAD=$LIBPTHREAD" >&5 + echo "$as_me:17010: gl_pthread_api=$gl_pthread_api" >&5 + echo "$as_me:17011: LIBPTHREAD=$LIBPTHREAD" >&5 gl_pthread_in_glibc=no # On Linux with glibc >= 2.34, libc contains the fully functional @@ -16898,7 +17034,7 @@ rm -rf conftest* ;; esac - echo "$as_me:16901: gl_pthread_in_glibc=$gl_pthread_in_glibc" >&5 + echo "$as_me:17037: gl_pthread_in_glibc=$gl_pthread_in_glibc" >&5 # Test for libpthread by looking for pthread_kill. (Not pthread_self, # since it is defined as a macro on OSF/1.) @@ -16953,7 +17089,7 @@ then : # On Solaris 10 or newer, this test is no longer needed, because # libc contains the fully functional pthread functions. case "$host_os" in - solaris | solaris2.1-9 | solaris2.1-9.* | hpux*) + solaris | solaris2.[1-9] | solaris2.[1-9].* | hpux*) printf "%s\n" "#define PTHREAD_IN_USE_DETECTION_HARD 1" >>confdefs.h @@ -17052,7 +17188,7 @@ fi fi fi - echo "$as_me:17055: LIBPMULTITHREAD=$LIBPMULTITHREAD" >&5 + echo "$as_me:17191: LIBPMULTITHREAD=$LIBPMULTITHREAD" >&5 fi { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking whether POSIX threads API is available" >&5 printf %s "checking whether POSIX threads API is available... " >&6; } @@ -17079,7 +17215,7 @@ sched_yield (); _ACEOF if ac_fn_c_try_link "$LINENO" then : - LIB_SCHED_YIELD= + SCHED_YIELD_LIB= else $as_nop { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for sched_yield in -lrt" >&5 @@ -17119,7 +17255,7 @@ fi printf "%s\n" "$ac_cv_lib_rt_sched_yield" >&6; } if test "x$ac_cv_lib_rt_sched_yield" = xyes then : - LIB_SCHED_YIELD=-lrt + SCHED_YIELD_LIB=-lrt else $as_nop { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for sched_yield in -lposix4" >&5 printf %s "checking for sched_yield in -lposix4... " >&6; } @@ -17158,7 +17294,7 @@ fi printf "%s\n" "$ac_cv_lib_posix4_sched_yield" >&6; } if test "x$ac_cv_lib_posix4_sched_yield" = xyes then : - LIB_SCHED_YIELD=-lposix4 + SCHED_YIELD_LIB=-lposix4 fi fi @@ -17168,6 +17304,8 @@ fi rm -f core conftest.err conftest.$ac_objext conftest.beam \ conftest$ac_exeext conftest.$ac_ext + LIB_SCHED_YIELD="$SCHED_YIELD_LIB" + gl_pthreadlib_body_done=done fi @@ -17280,8 +17418,8 @@ rm -f core conftest.err conftest.$ac_objext conftest.beam \ LIBS=$save_LIBS test $gl_pthread_api = yes && break done - echo "$as_me:17283: gl_pthread_api=$gl_pthread_api" >&5 - echo "$as_me:17284: LIBPTHREAD=$LIBPTHREAD" >&5 + echo "$as_me:17421: gl_pthread_api=$gl_pthread_api" >&5 + echo "$as_me:17422: LIBPTHREAD=$LIBPTHREAD" >&5 gl_pthread_in_glibc=no # On Linux with glibc >= 2.34, libc contains the fully functional @@ -17307,7 +17445,7 @@ rm -rf conftest* ;; esac - echo "$as_me:17310: gl_pthread_in_glibc=$gl_pthread_in_glibc" >&5 + echo "$as_me:17448: gl_pthread_in_glibc=$gl_pthread_in_glibc" >&5 # Test for libpthread by looking for pthread_kill. (Not pthread_self, # since it is defined as a macro on OSF/1.) @@ -17362,7 +17500,7 @@ then : # On Solaris 10 or newer, this test is no longer needed, because # libc contains the fully functional pthread functions. case "$host_os" in - solaris | solaris2.1-9 | solaris2.1-9.* | hpux*) + solaris | solaris2.[1-9] | solaris2.[1-9].* | hpux*) printf "%s\n" "#define PTHREAD_IN_USE_DETECTION_HARD 1" >>confdefs.h @@ -17461,7 +17599,7 @@ fi fi fi - echo "$as_me:17464: LIBPMULTITHREAD=$LIBPMULTITHREAD" >&5 + echo "$as_me:17602: LIBPMULTITHREAD=$LIBPMULTITHREAD" >&5 fi { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking whether POSIX threads API is available" >&5 printf %s "checking whether POSIX threads API is available... " >&6; } @@ -17488,7 +17626,7 @@ sched_yield (); _ACEOF if ac_fn_c_try_link "$LINENO" then : - LIB_SCHED_YIELD= + SCHED_YIELD_LIB= else $as_nop { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for sched_yield in -lrt" >&5 @@ -17528,7 +17666,7 @@ fi printf "%s\n" "$ac_cv_lib_rt_sched_yield" >&6; } if test "x$ac_cv_lib_rt_sched_yield" = xyes then : - LIB_SCHED_YIELD=-lrt + SCHED_YIELD_LIB=-lrt else $as_nop { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for sched_yield in -lposix4" >&5 printf %s "checking for sched_yield in -lposix4... " >&6; } @@ -17567,7 +17705,7 @@ fi printf "%s\n" "$ac_cv_lib_posix4_sched_yield" >&6; } if test "x$ac_cv_lib_posix4_sched_yield" = xyes then : - LIB_SCHED_YIELD=-lposix4 + SCHED_YIELD_LIB=-lposix4 fi fi @@ -17577,18 +17715,81 @@ fi rm -f core conftest.err conftest.$ac_objext conftest.beam \ conftest$ac_exeext conftest.$ac_ext + LIB_SCHED_YIELD="$SCHED_YIELD_LIB" + gl_pthreadlib_body_done=done fi if test $ac_cv_header_threads_h = yes; then - ac_fn_c_check_func "$LINENO" "thrd_create" "ac_cv_func_thrd_create" + + + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for thrd_create" >&5 +printf %s "checking for thrd_create... " >&6; } +if test ${gl_cv_onwards_func_thrd_create+y} +then : + printf %s "(cached) " >&6 +else $as_nop + + exec 9>&6 6>/dev/null + + case "$host_os" in + + linux*-android*) + ac_fn_check_decl "$LINENO" "thrd_create" "ac_cv_have_decl_thrd_create" "#include <threads.h> +" "$ac_c_undeclared_builtin_options" "CFLAGS" +if test "x$ac_cv_have_decl_thrd_create" = xyes +then : + +fi + if test $ac_cv_have_decl_thrd_create = yes; then + ac_fn_c_check_func "$LINENO" "thrd_create" "ac_cv_func_thrd_create" +if test "x$ac_cv_func_thrd_create" = xyes +then : + +fi + + if test $ac_cv_func_thrd_create = yes; then + gl_cv_onwards_func_thrd_create=yes + else + gl_cv_onwards_func_thrd_create='future OS version' + fi + else + gl_cv_onwards_func_thrd_create='future OS version' + fi + ;; + + + *) + ac_fn_c_check_func "$LINENO" "thrd_create" "ac_cv_func_thrd_create" if test "x$ac_cv_func_thrd_create" = xyes then : - printf "%s\n" "#define HAVE_THRD_CREATE 1" >>confdefs.h fi + gl_cv_onwards_func_thrd_create=$ac_cv_func_thrd_create + ;; + + esac + + exec 6>&9 9>&- + + +fi +{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $gl_cv_onwards_func_thrd_create" >&5 +printf "%s\n" "$gl_cv_onwards_func_thrd_create" >&6; } + + case "$gl_cv_onwards_func_thrd_create" in + future*) ac_cv_func_thrd_create=no ;; + *) ac_cv_func_thrd_create=$gl_cv_onwards_func_thrd_create ;; + esac + if test $ac_cv_func_thrd_create = yes; then + +printf "%s\n" "#define HAVE_THRD_CREATE 1" >>confdefs.h + + fi + + if test $ac_cv_func_thrd_create = yes; then LIBSTDTHREAD= else @@ -17640,7 +17841,7 @@ fi fi else - LIBSTDTHREAD="$LIBPMULTITHREAD $LIB_SCHED_YIELD" + LIBSTDTHREAD="$LIBPMULTITHREAD $SCHED_YIELD_LIB" fi ;; esac @@ -17878,7 +18079,7 @@ then : case "$host_os" in # Guess yes on platforms where we know the result. *-gnu* | freebsd* | netbsd* | openbsd* | bitrig* \ - | gnu* | *-musl* | midnightbsd* \ + | gnu* | *-musl* | midipix* | midnightbsd* \ | hpux* | solaris* | cygwin* | mingw* | msys* ) ac_cv_func_malloc_0_nonnull="guessing yes" ;; # If we don't know, obey --enable-cross-guesses. @@ -18441,6 +18642,7 @@ esac HAVE_FFSLL=1; HAVE_DECL_MEMMEM=1; HAVE_MEMPCPY=1; + HAVE_MEMSET_EXPLICIT=1; HAVE_DECL_MEMRCHR=1; HAVE_RAWMEMCHR=1; HAVE_STPCPY=1; @@ -18462,6 +18664,8 @@ esac REPLACE_FFSLL=0; REPLACE_MEMCHR=0; REPLACE_MEMMEM=0; + REPLACE_MEMPCPY=0; + REPLACE_STPCPY=0; REPLACE_STPNCPY=0; REPLACE_STRCHRNUL=0; REPLACE_STRDUP=0; @@ -18507,6 +18711,10 @@ esac + GL_GNULIB_MEMSET_EXPLICIT=0 + + + GL_GNULIB_RAWMEMCHR=0 @@ -18736,7 +18944,6 @@ printf "%s\n" "#define HAVE_MINMAX_IN_SYS_PARAM_H 1" >>confdefs.h - { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for O_CLOEXEC" >&5 printf %s "checking for O_CLOEXEC... " >&6; } if test ${gl_cv_macro_O_CLOEXEC+y} @@ -18861,100 +19068,6 @@ printf "%s\n" "#define ssize_t int" >>confdefs.h -{ 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 $as_nop - cat confdefs.h - <<_ACEOF >conftest.$ac_ext -/* end confdefs.h. */ - - #include <stdbool.h> - - #ifdef __cplusplus - typedef bool Bool; - #else - typedef _Bool Bool; - #ifndef bool - "error: bool is not defined" - #endif - #ifndef false - "error: false is not defined" - #endif - #if false - "error: false is not 0" - #endif - #ifndef true - "error: true is not defined" - #endif - #if true != 1 - "error: true is not 1" - #endif - #endif - - #ifndef __bool_true_false_are_defined - "error: __bool_true_false_are_defined is not defined" - #endif - - struct s { Bool s: 1; Bool t; bool u: 1; bool v; } s; - - char a[true == 1 ? 1 : -1]; - char b[false == 0 ? 1 : -1]; - char c[__bool_true_false_are_defined == 1 ? 1 : -1]; - char d[(bool) 0.5 == true ? 1 : -1]; - /* See body of main program for 'e'. */ - char f[(Bool) 0.0 == false ? 1 : -1]; - char g[true]; - char h[sizeof (Bool)]; - char i[sizeof s.t]; - enum { j = false, k = true, l = false * true, m = true * 256 }; - /* The following fails for - HP aC++/ANSI C B3910B A.05.55 [Dec 04 2003]. */ - Bool n[m]; - char o[sizeof n == m * sizeof n[0] ? 1 : -1]; - char p[-1 - (Bool) 0 < 0 && -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 - */ - Bool q = true; - Bool *pq = &q; - bool *qq = &q; - -int -main (void) -{ - - bool e = &s; - *pq |= q; *pq |= ! q; - *qq |= q; *qq |= ! q; - /* Refer to every declared value, to avoid compiler optimizations. */ - return (!a + !b + !c + !d + !e + !f + !g + !h + !i + !!j + !k + !!l - + !m + !n + !o + !p + !q + !pq + !qq); - - ; - return 0; -} -_ACEOF -if ac_fn_c_try_compile "$LINENO" -then : - ac_cv_header_stdbool_h=yes -else $as_nop - ac_cv_header_stdbool_h=no -fi -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; } - ac_fn_c_check_type "$LINENO" "_Bool" "ac_cv_type__Bool" "$ac_includes_default" -if test "x$ac_cv_type__Bool" = xyes -then : - -printf "%s\n" "#define HAVE__BOOL 1" >>confdefs.h - - -fi @@ -18966,7 +19079,9 @@ fi HAVE_DECL_FTELLO=1; HAVE_DECL_GETDELIM=1; HAVE_DECL_GETLINE=1; + HAVE_DECL_GETW=1; HAVE_DECL_OBSTACK_PRINTF=1; + HAVE_DECL_PUTW=1; HAVE_DECL_SNPRINTF=1; HAVE_DECL_VSNPRINTF=1; HAVE_DPRINTF=1; @@ -19020,6 +19135,24 @@ else $as_nop fi printf "%s\n" "#define HAVE_DECL_FCLOSEALL $ac_have_decl" >>confdefs.h +ac_fn_check_decl "$LINENO" "getw" "ac_cv_have_decl_getw" "$ac_includes_default" "$ac_c_undeclared_builtin_options" "CFLAGS" +if test "x$ac_cv_have_decl_getw" = xyes +then : + ac_have_decl=1 +else $as_nop + ac_have_decl=0 +fi +printf "%s\n" "#define HAVE_DECL_GETW $ac_have_decl" >>confdefs.h + +ac_fn_check_decl "$LINENO" "putw" "ac_cv_have_decl_putw" "$ac_includes_default" "$ac_c_undeclared_builtin_options" "CFLAGS" +if test "x$ac_cv_have_decl_putw" = xyes +then : + ac_have_decl=1 +else $as_nop + ac_have_decl=0 +fi +printf "%s\n" "#define HAVE_DECL_PUTW $ac_have_decl" >>confdefs.h + @@ -19159,6 +19292,16 @@ printf "%s\n" "#define GNULIB_PRINTF_ATTRIBUTE_FLAVOR_GNU 1" >>confdefs.h fi + if test $ac_cv_have_decl_getw = no; then + HAVE_DECL_GETW=0 + fi + + + if test $ac_cv_have_decl_putw = no; then + HAVE_DECL_PUTW=0 + fi + + GL_GNULIB_DPRINTF=0 @@ -19541,14 +19684,14 @@ else $as_nop if test "$cross_compiling" = yes then : case "$host_os" in - # Guess yes on glibc systems. - *-gnu* | gnu*) gl_cv_func_strerror_0_works="guessing yes" ;; - # Guess yes on musl systems. - *-musl*) gl_cv_func_strerror_0_works="guessing yes" ;; - # Guess yes on native Windows. - mingw*) gl_cv_func_strerror_0_works="guessing yes" ;; - # If we don't know, obey --enable-cross-guesses. - *) gl_cv_func_strerror_0_works="$gl_cross_guess_normal" ;; + # Guess yes on glibc systems. + *-gnu* | gnu*) gl_cv_func_strerror_0_works="guessing yes" ;; + # Guess yes on musl systems. + *-musl* | midipix*) gl_cv_func_strerror_0_works="guessing yes" ;; + # Guess yes on native Windows. + mingw*) gl_cv_func_strerror_0_works="guessing yes" ;; + # If we don't know, obey --enable-cross-guesses. + *) gl_cv_func_strerror_0_works="$gl_cross_guess_normal" ;; esac else $as_nop @@ -19607,6 +19750,72 @@ printf "%s\n" "#define REPLACE_STRERROR_0 1" >>confdefs.h + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for strerror_r" >&5 +printf %s "checking for strerror_r... " >&6; } +if test ${gl_cv_onwards_func_strerror_r+y} +then : + printf %s "(cached) " >&6 +else $as_nop + + exec 9>&6 6>/dev/null + + case "$host_os" in + + linux*-android*) + ac_fn_check_decl "$LINENO" "strerror_r" "ac_cv_have_decl_strerror_r" "#include <string.h> +" "$ac_c_undeclared_builtin_options" "CFLAGS" +if test "x$ac_cv_have_decl_strerror_r" = xyes +then : + +fi + if test $ac_cv_have_decl_strerror_r = yes; then + ac_fn_c_check_func "$LINENO" "strerror_r" "ac_cv_func_strerror_r" +if test "x$ac_cv_func_strerror_r" = xyes +then : + +fi + + if test $ac_cv_func_strerror_r = yes; then + gl_cv_onwards_func_strerror_r=yes + else + gl_cv_onwards_func_strerror_r='future OS version' + fi + else + gl_cv_onwards_func_strerror_r='future OS version' + fi + ;; + + + *) + ac_fn_c_check_func "$LINENO" "strerror_r" "ac_cv_func_strerror_r" +if test "x$ac_cv_func_strerror_r" = xyes +then : + +fi + + gl_cv_onwards_func_strerror_r=$ac_cv_func_strerror_r + ;; + + esac + + exec 6>&9 9>&- + + +fi +{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $gl_cv_onwards_func_strerror_r" >&5 +printf "%s\n" "$gl_cv_onwards_func_strerror_r" >&6; } + + case "$gl_cv_onwards_func_strerror_r" in + future*) ac_cv_func_strerror_r=no ;; + *) ac_cv_func_strerror_r=$gl_cv_onwards_func_strerror_r ;; + esac + if test $ac_cv_func_strerror_r = yes; then + +printf "%s\n" "#define HAVE_STRERROR_R 1" >>confdefs.h + + fi + + if test $ac_cv_func_strerror_r = yes; then if test "$GL_GENERATE_ERRNO_H:$REPLACE_STRERROR_0" = false:0; then { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for strerror_r with POSIX signature" >&5 @@ -19773,6 +19982,10 @@ printf "%s\n" "$gl_cv_func_strerror_r_works" >&6; } fi fi fi + else + case "$gl_cv_onwards_func_strerror_r" in + future*) REPLACE_STRERROR_R=1 ;; + esac fi @@ -19969,7 +20182,9 @@ printf "%s\n" "$gl_cv_next_sys_random_h" >&6; } REPLACE_MKTIME=GNULIB_PORTCHECK; REPLACE_NANOSLEEP=GNULIB_PORTCHECK; REPLACE_STRFTIME=GNULIB_PORTCHECK; + REPLACE_TIME=0; REPLACE_TIMEGM=GNULIB_PORTCHECK; + REPLACE_TIMESPEC_GET=GNULIB_PORTCHECK; REPLACE_TZSET=GNULIB_PORTCHECK; : ${GNULIB_GETTIMEOFDAY=0}; @@ -20194,6 +20409,10 @@ printf "%s\n" "$gl_cv_next_time_h" >&6; } + + + + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for TIME_UTC in <time.h>" >&5 printf %s "checking for TIME_UTC in <time.h>... " >&6; } if test ${gl_cv_time_h_has_TIME_UTC+y} @@ -20255,6 +20474,10 @@ printf "%s\n" "$gl_cv_time_h_has_TIME_UTC" >&6; } + GL_GNULIB_TIME=0 + + + GL_GNULIB_TIMEGM=0 @@ -21592,7 +21815,6 @@ printf "%s\n" "#define HAVE_ENVIRON_DECL 1" >>confdefs.h - { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking whether getcwd (NULL, 0) allocates memory for result" >&5 printf %s "checking whether getcwd (NULL, 0) allocates memory for result... " >&6; } if test ${gl_cv_func_getcwd_null+y} @@ -21606,6 +21828,8 @@ then : *-gnu* | gnu*) gl_cv_func_getcwd_null="guessing yes";; # Guess yes on musl systems. *-musl*) gl_cv_func_getcwd_null="guessing yes";; + # Guess yes on systems that emulate the Linux system calls. + midipix*) gl_cv_func_getcwd_null="guessing yes";; # Guess yes on Cygwin. cygwin*) gl_cv_func_getcwd_null="guessing yes";; # If we don't know, obey --enable-cross-guesses. @@ -21925,11 +22149,12 @@ printf "%s\n" "$gl_cv_sys_struct_timeval_tv_sec" >&6; } case "$host_os" in - *-musl*) + *-musl* | midipix*) + printf "%s\n" "#define MUSL_LIBC 1" >>confdefs.h - ;; - esac + ;; + esac @@ -22033,7 +22258,6 @@ printf "%s\n" "#define HAVE_IPV6 1" >>confdefs.h - { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for LC_MESSAGES" >&5 printf %s "checking for LC_MESSAGES... " >&6; } if test ${gt_cv_val_LC_MESSAGES+y} @@ -22079,6 +22303,72 @@ printf "%s\n" "#define HAVE_LC_MESSAGES 1" >>confdefs.h + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for uselocale" >&5 +printf %s "checking for uselocale... " >&6; } +if test ${gl_cv_onwards_func_uselocale+y} +then : + printf %s "(cached) " >&6 +else $as_nop + + exec 9>&6 6>/dev/null + + case "$host_os" in + + linux*-android*) + ac_fn_check_decl "$LINENO" "uselocale" "ac_cv_have_decl_uselocale" "#include <locale.h> +" "$ac_c_undeclared_builtin_options" "CFLAGS" +if test "x$ac_cv_have_decl_uselocale" = xyes +then : + +fi + if test $ac_cv_have_decl_uselocale = yes; then + ac_fn_c_check_func "$LINENO" "uselocale" "ac_cv_func_uselocale" +if test "x$ac_cv_func_uselocale" = xyes +then : + +fi + + if test $ac_cv_func_uselocale = yes; then + gl_cv_onwards_func_uselocale=yes + else + gl_cv_onwards_func_uselocale='future OS version' + fi + else + gl_cv_onwards_func_uselocale='future OS version' + fi + ;; + + + *) + ac_fn_c_check_func "$LINENO" "uselocale" "ac_cv_func_uselocale" +if test "x$ac_cv_func_uselocale" = xyes +then : + +fi + + gl_cv_onwards_func_uselocale=$ac_cv_func_uselocale + ;; + + esac + + exec 6>&9 9>&- + + +fi +{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $gl_cv_onwards_func_uselocale" >&5 +printf "%s\n" "$gl_cv_onwards_func_uselocale" >&6; } + + case "$gl_cv_onwards_func_uselocale" in + future*) ac_cv_func_uselocale=no ;; + *) ac_cv_func_uselocale=$gl_cv_onwards_func_uselocale ;; + esac + if test $ac_cv_func_uselocale = yes; then + +printf "%s\n" "#define HAVE_USELOCALE 1" >>confdefs.h + + fi + + if test $ac_cv_func_uselocale = yes; then @@ -22377,7 +22667,6 @@ printf "%s\n" "#define HAVE_CFLOCALECOPYPREFERREDLANGUAGES 1" >>confdefs.h - { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for library needed for semaphore functions" >&5 printf %s "checking for library needed for semaphore functions... " >&6; } if test ${gl_cv_semaphore_lib+y} @@ -22440,6 +22729,195 @@ printf "%s\n" "$gl_cv_semaphore_lib" >&6; } + # Check for mmap(). Don't use AC_FUNC_MMAP, because it checks too much: it + # fails on HP-UX 11, because MAP_FIXED mappings do not work. But this is + # irrelevant for anonymous mappings. + ac_fn_c_check_func "$LINENO" "mmap" "ac_cv_func_mmap" +if test "x$ac_cv_func_mmap" = xyes +then : + gl_have_mmap=yes +else $as_nop + gl_have_mmap=no +fi + + + # Try to allow MAP_ANONYMOUS. + gl_have_mmap_anonymous=no + if test $gl_have_mmap = yes; then + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for MAP_ANONYMOUS" >&5 +printf %s "checking for MAP_ANONYMOUS... " >&6; } + cat confdefs.h - <<_ACEOF >conftest.$ac_ext +/* end confdefs.h. */ + +#include <sys/mman.h> +#ifdef MAP_ANONYMOUS + I cannot identify this map +#endif + +_ACEOF +if (eval "$ac_cpp conftest.$ac_ext") 2>&5 | + $EGREP "I cannot identify this map" >/dev/null 2>&1 +then : + gl_have_mmap_anonymous=yes +fi +rm -rf conftest* + + if test $gl_have_mmap_anonymous != yes; then + cat confdefs.h - <<_ACEOF >conftest.$ac_ext +/* end confdefs.h. */ + +#include <sys/mman.h> +#ifdef MAP_ANON + I cannot identify this map +#endif + +_ACEOF +if (eval "$ac_cpp conftest.$ac_ext") 2>&5 | + $EGREP "I cannot identify this map" >/dev/null 2>&1 +then : + +printf "%s\n" "#define MAP_ANONYMOUS MAP_ANON" >>confdefs.h + + gl_have_mmap_anonymous=yes +fi +rm -rf conftest* + + fi + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $gl_have_mmap_anonymous" >&5 +printf "%s\n" "$gl_have_mmap_anonymous" >&6; } + if test $gl_have_mmap_anonymous = yes; then + +printf "%s\n" "#define HAVE_MAP_ANONYMOUS 1" >>confdefs.h + + fi + fi + + + + + + + + + + + # Detect platform-specific bugs in some versions of glibc: + # memchr should not dereference anything with length 0 + # https://bugzilla.redhat.com/show_bug.cgi?id=499689 + # memchr should not dereference overestimated length after a match + # https://bugs.debian.org/cgi-bin/bugreport.cgi?bug=521737 + # https://sourceware.org/bugzilla/show_bug.cgi?id=10162 + # memchr should cast the second argument to 'unsigned char'. + # This bug exists in Android 4.3. + # Assume that memchr works on platforms that lack mprotect. + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking whether memchr works" >&5 +printf %s "checking whether memchr works... " >&6; } +if test ${gl_cv_func_memchr_works+y} +then : + printf %s "(cached) " >&6 +else $as_nop + if test "$cross_compiling" = yes +then : + case "$host_os" in + # Guess no on Android. + linux*-android*) gl_cv_func_memchr_works="guessing no" ;; + # Guess yes on native Windows. + mingw*) gl_cv_func_memchr_works="guessing yes" ;; + # If we don't know, obey --enable-cross-guesses. + *) gl_cv_func_memchr_works="$gl_cross_guess_normal" ;; + esac + +else $as_nop + cat confdefs.h - <<_ACEOF >conftest.$ac_ext +/* end confdefs.h. */ + +#include <string.h> +#if HAVE_SYS_MMAN_H +# include <fcntl.h> +# include <unistd.h> +# include <sys/types.h> +# include <sys/mman.h> +# ifndef MAP_FILE +# define MAP_FILE 0 +# endif +#endif + +int +main (void) +{ + + int result = 0; + char *fence = NULL; +#if HAVE_SYS_MMAN_H && HAVE_MPROTECT +# if HAVE_MAP_ANONYMOUS + const int flags = MAP_ANONYMOUS | MAP_PRIVATE; + const int fd = -1; +# else /* !HAVE_MAP_ANONYMOUS */ + const int flags = MAP_FILE | MAP_PRIVATE; + int fd = open ("/dev/zero", O_RDONLY, 0666); + if (fd >= 0) +# endif + { + int pagesize = getpagesize (); + char *two_pages = + (char *) mmap (NULL, 2 * pagesize, PROT_READ | PROT_WRITE, + flags, fd, 0); + if (two_pages != (char *)(-1) + && mprotect (two_pages + pagesize, pagesize, PROT_NONE) == 0) + fence = two_pages + pagesize; + } +#endif + if (fence) + { + /* Test against bugs on glibc systems. */ + if (memchr (fence, 0, 0)) + result |= 1; + strcpy (fence - 9, "12345678"); + if (memchr (fence - 9, 0, 79) != fence - 1) + result |= 2; + if (memchr (fence - 1, 0, 3) != fence - 1) + result |= 4; + /* Test against bug on AIX 7.2. */ + if (memchr (fence - 4, '6', 16) != fence - 4) + result |= 8; + } + /* Test against bug on Android 4.3. */ + { + char input[3]; + input[0] = 'a'; + input[1] = 'b'; + input[2] = 'c'; + if (memchr (input, 0x789abc00 | 'b', 3) != input + 1) + result |= 16; + } + return result; + + ; + return 0; +} +_ACEOF +if ac_fn_c_try_run "$LINENO" +then : + gl_cv_func_memchr_works=yes +else $as_nop + gl_cv_func_memchr_works=no +fi +rm -f core *.core core.conftest.* gmon.out bb.out conftest$ac_exeext \ + conftest.$ac_objext conftest.beam conftest.$ac_ext +fi + + +fi +{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $gl_cv_func_memchr_works" >&5 +printf "%s\n" "$gl_cv_func_memchr_works" >&6; } + case "$gl_cv_func_memchr_works" in + *yes) ;; + *) REPLACE_MEMCHR=1 ;; + esac + + + + if test $ac_cv_have_decl_strerror_r = no; then @@ -23141,74 +23619,6 @@ printf "%s\n" "$gl_cv_const_PTHREAD_PROCESS_SHARED" >&6; } - - - # Check for mmap(). Don't use AC_FUNC_MMAP, because it checks too much: it - # fails on HP-UX 11, because MAP_FIXED mappings do not work. But this is - # irrelevant for anonymous mappings. - ac_fn_c_check_func "$LINENO" "mmap" "ac_cv_func_mmap" -if test "x$ac_cv_func_mmap" = xyes -then : - gl_have_mmap=yes -else $as_nop - gl_have_mmap=no -fi - - - # Try to allow MAP_ANONYMOUS. - gl_have_mmap_anonymous=no - if test $gl_have_mmap = yes; then - { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for MAP_ANONYMOUS" >&5 -printf %s "checking for MAP_ANONYMOUS... " >&6; } - cat confdefs.h - <<_ACEOF >conftest.$ac_ext -/* end confdefs.h. */ - -#include <sys/mman.h> -#ifdef MAP_ANONYMOUS - I cannot identify this map -#endif - -_ACEOF -if (eval "$ac_cpp conftest.$ac_ext") 2>&5 | - $EGREP "I cannot identify this map" >/dev/null 2>&1 -then : - gl_have_mmap_anonymous=yes -fi -rm -rf conftest* - - if test $gl_have_mmap_anonymous != yes; then - cat confdefs.h - <<_ACEOF >conftest.$ac_ext -/* end confdefs.h. */ - -#include <sys/mman.h> -#ifdef MAP_ANON - I cannot identify this map -#endif - -_ACEOF -if (eval "$ac_cpp conftest.$ac_ext") 2>&5 | - $EGREP "I cannot identify this map" >/dev/null 2>&1 -then : - -printf "%s\n" "#define MAP_ANONYMOUS MAP_ANON" >>confdefs.h - - gl_have_mmap_anonymous=yes -fi -rm -rf conftest* - - fi - { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $gl_have_mmap_anonymous" >&5 -printf "%s\n" "$gl_have_mmap_anonymous" >&6; } - if test $gl_have_mmap_anonymous = yes; then - -printf "%s\n" "#define HAVE_MAP_ANONYMOUS 1" >>confdefs.h - - fi - fi - - - - ac_fn_c_check_type "$LINENO" "sigset_t" "ac_cv_type_sigset_t" " #include <signal.h> /* Mingw defines sigset_t not in <signal.h>, but in <sys/types.h>. */ @@ -23612,13 +24022,74 @@ then : fi - ac_fn_c_check_func "$LINENO" "tsearch" "ac_cv_func_tsearch" + + + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for tsearch" >&5 +printf %s "checking for tsearch... " >&6; } +if test ${gl_cv_onwards_func_tsearch+y} +then : + printf %s "(cached) " >&6 +else $as_nop + + exec 9>&6 6>/dev/null + + case "$host_os" in + + linux*-android*) + ac_fn_check_decl "$LINENO" "tsearch" "ac_cv_have_decl_tsearch" "#include <search.h> +" "$ac_c_undeclared_builtin_options" "CFLAGS" +if test "x$ac_cv_have_decl_tsearch" = xyes +then : + +fi + if test $ac_cv_have_decl_tsearch = yes; then + ac_fn_c_check_func "$LINENO" "tsearch" "ac_cv_func_tsearch" if test "x$ac_cv_func_tsearch" = xyes then : - printf "%s\n" "#define HAVE_TSEARCH 1" >>confdefs.h fi + if test $ac_cv_func_tsearch = yes; then + gl_cv_onwards_func_tsearch=yes + else + gl_cv_onwards_func_tsearch='future OS version' + fi + else + gl_cv_onwards_func_tsearch='future OS version' + fi + ;; + + + *) + ac_fn_c_check_func "$LINENO" "tsearch" "ac_cv_func_tsearch" +if test "x$ac_cv_func_tsearch" = xyes +then : + +fi + + gl_cv_onwards_func_tsearch=$ac_cv_func_tsearch + ;; + + esac + + exec 6>&9 9>&- + + +fi +{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $gl_cv_onwards_func_tsearch" >&5 +printf "%s\n" "$gl_cv_onwards_func_tsearch" >&6; } + + case "$gl_cv_onwards_func_tsearch" in + future*) ac_cv_func_tsearch=no ;; + *) ac_cv_func_tsearch=$gl_cv_onwards_func_tsearch ;; + esac + if test $ac_cv_func_tsearch = yes; then + +printf "%s\n" "#define HAVE_TSEARCH 1" >>confdefs.h + + fi + + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for uid_t in sys/types.h" >&5 @@ -23772,7 +24243,6 @@ fi - if test $ac_cv_header_sys_ioctl_h = yes; then HAVE_SYS_IOCTL_H=1 { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking whether <sys/ioctl.h> declares ioctl" >&5 @@ -24000,7 +24470,7 @@ printf "%s\n" "#define HAVE_DECL_UNSETENV $ac_have_decl" >>confdefs.h if test $gl_threads_api = posix; then - YIELD_LIB="$LIB_SCHED_YIELD" + YIELD_LIB="$SCHED_YIELD_LIB" else YIELD_LIB= fi @@ -24078,6 +24548,91 @@ fi gl_source_base='lib' gl_source_base_prefix= + + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for alignas and alignof" >&5 +printf %s "checking for alignas and alignof... " >&6; } +if test ${gl_cv_header_working_stdalign_h+y} +then : + printf %s "(cached) " >&6 +else $as_nop + gl_save_CFLAGS=$CFLAGS + for gl_working in "yes, keywords" "yes, <stdalign.h> macros"; do + case $gl_working in #( + *stdalign.h*) : + CFLAGS="$gl_save_CFLAGS -DINCLUDE_STDALIGN_H" ;; #( + *) : + ;; +esac + cat confdefs.h - <<_ACEOF >conftest.$ac_ext +/* end confdefs.h. */ +#include <stdint.h> + #ifdef INCLUDE_STDALIGN_H + #include <stdalign.h> + #endif + #include <stddef.h> + + /* Test that alignof yields a result consistent with offsetof. + This catches GCC bug 52023 + <https://gcc.gnu.org/bugzilla/show_bug.cgi?id=52023>. */ + #ifdef __cplusplus + template <class t> struct alignof_helper { char a; t b; }; + # define ao(type) offsetof (alignof_helper<type>, b) + #else + # define ao(type) offsetof (struct { char a; type b; }, b) + #endif + char test_double[ao (double) % _Alignof (double) == 0 ? 1 : -1]; + char test_long[ao (long int) % _Alignof (long int) == 0 ? 1 : -1]; + char test_alignof[alignof (double) == _Alignof (double) ? 1 : -1]; + + /* Test alignas only on platforms where gnulib can help. */ + #if \ + ((defined __cplusplus && 201103 <= __cplusplus) \ + || (__TINYC__ && defined __attribute__) \ + || (defined __APPLE__ && defined __MACH__ \ + ? 4 < __GNUC__ + (1 <= __GNUC_MINOR__) \ + : __GNUC__) \ + || (__ia64 && (61200 <= __HP_cc || 61200 <= __HP_aCC)) \ + || __ICC || 0x590 <= __SUNPRO_C || 0x0600 <= __xlC__ \ + || 1300 <= _MSC_VER) + struct alignas_test { char c; char alignas (8) alignas_8; }; + char test_alignas[offsetof (struct alignas_test, alignas_8) == 8 + ? 1 : -1]; + #endif + +int +main (void) +{ + + ; + return 0; +} +_ACEOF +if ac_fn_c_try_compile "$LINENO" +then : + gl_cv_header_working_stdalign_h=$gl_working +else $as_nop + gl_cv_header_working_stdalign_h=no +fi +rm -f core conftest.err conftest.$ac_objext conftest.beam conftest.$ac_ext + + CFLAGS=$gl_save_CFLAGS + test "$gl_cv_header_working_stdalign_h" != no && break + done +fi +{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $gl_cv_header_working_stdalign_h" >&5 +printf "%s\n" "$gl_cv_header_working_stdalign_h" >&6; } + + case $gl_cv_header_working_stdalign_h in #( + yes*keyword*) : + +printf "%s\n" "#define HAVE_C_ALIGNASOF 1" >>confdefs.h + ;; #( + *) : + ;; +esac + + + LTALLOCA=`echo "$ALLOCA" | sed -e 's/\.[^.]* /.lo /g;s/\.[^.]*$/.lo/'` @@ -24193,6 +24748,178 @@ fi printf "%s\n" "$enable_assert" >&6; } + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for static_assert" >&5 +printf %s "checking for static_assert... " >&6; } +if test ${gl_cv_static_assert+y} +then : + printf %s "(cached) " >&6 +else $as_nop + gl_save_CFLAGS=$CFLAGS + for gl_working in "yes, a keyword" "yes, an <assert.h> macro"; do + case $gl_working in #( + *assert.h*) : + CFLAGS="$gl_save_CFLAGS -DINCLUDE_ASSERT_H" ;; #( + *) : + ;; +esac + + cat confdefs.h - <<_ACEOF >conftest.$ac_ext +/* end confdefs.h. */ +#if defined __clang__ && __STDC_VERSION__ < 202311 + #pragma clang diagnostic error "-Wc2x-extensions" + #pragma clang diagnostic error "-Wc++1z-extensions" + #endif + #ifdef INCLUDE_ASSERT_H + #include <assert.h> + #endif + static_assert (2 + 2 == 4, "arithmetic does not work"); + static_assert (2 + 2 == 4); + +int +main (void) +{ + + static_assert (sizeof (char) == 1, "sizeof does not work"); + static_assert (sizeof (char) == 1); + + ; + return 0; +} +_ACEOF +if ac_fn_c_try_compile "$LINENO" +then : + gl_cv_static_assert=$gl_working +else $as_nop + gl_cv_static_assert=no +fi +rm -f core conftest.err conftest.$ac_objext conftest.beam conftest.$ac_ext + CFLAGS=$gl_save_CFLAGS + test "$gl_cv_static_assert" != no && break + done +fi +{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $gl_cv_static_assert" >&5 +printf "%s\n" "$gl_cv_static_assert" >&6; } + + GL_GENERATE_ASSERT_H=false + case $gl_cv_static_assert in #( + yes*keyword*) : + +printf "%s\n" "#define HAVE_C_STATIC_ASSERT 1" >>confdefs.h + ;; #( + no) : + GL_GENERATE_ASSERT_H=true + + + + + + + + + if test $gl_cv_have_include_next = yes; then + gl_cv_next_assert_h='<'assert.h'>' + else + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking absolute name of <assert.h>" >&5 +printf %s "checking absolute name of <assert.h>... " >&6; } +if test ${gl_cv_next_assert_h+y} +then : + printf %s "(cached) " >&6 +else $as_nop + + + + cat confdefs.h - <<_ACEOF >conftest.$ac_ext +/* end confdefs.h. */ +#include <assert.h> +_ACEOF + case "$host_os" in + aix*) gl_absname_cpp="$ac_cpp -C" ;; + *) gl_absname_cpp="$ac_cpp" ;; + esac + + case "$host_os" in + mingw*) + gl_dirsep_regex='[/\\]' + ;; + *) + gl_dirsep_regex='\/' + ;; + esac + gl_make_literal_regex_sed='s,[]$^\\.*/[],\\&,g' + gl_header_literal_regex=`echo 'assert.h' \ + | sed -e "$gl_make_literal_regex_sed"` + gl_absolute_header_sed="/${gl_dirsep_regex}${gl_header_literal_regex}/"'{ + s/.*"\(.*'"${gl_dirsep_regex}${gl_header_literal_regex}"'\)".*/\1/ + s|^/[^/]|//&| + p + q + }' + + gl_cv_absolute_assert_h=`(eval "$gl_absname_cpp conftest.$ac_ext") 2>&5 | + sed -n "$gl_absolute_header_sed"` + + gl_header=$gl_cv_absolute_assert_h + gl_cv_next_assert_h='"'$gl_header'"' + + +fi +{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $gl_cv_next_assert_h" >&5 +printf "%s\n" "$gl_cv_next_assert_h" >&6; } + fi + NEXT_ASSERT_H=$gl_cv_next_assert_h + + if test $gl_cv_have_include_next = yes || test $gl_cv_have_include_next = buggy; then + # INCLUDE_NEXT_AS_FIRST_DIRECTIVE='include_next' + gl_next_as_first_directive='<'assert.h'>' + else + # INCLUDE_NEXT_AS_FIRST_DIRECTIVE='include' + gl_next_as_first_directive=$gl_cv_next_assert_h + fi + NEXT_AS_FIRST_DIRECTIVE_ASSERT_H=$gl_next_as_first_directive + + + + ;; #( + *) : + ;; +esac + + + + + + + + case "$GL_GENERATE_ASSERT_H" in + false) ASSERT_H='' ;; + true) + if test -z "$ASSERT_H"; then + ASSERT_H="${gl_source_base_prefix}assert.h" + fi + ;; + *) echo "*** GL_GENERATE_ASSERT_H is not set correctly" 1>&2; exit 1 ;; + esac + + + if $GL_GENERATE_ASSERT_H; then + GL_GENERATE_ASSERT_H_TRUE= + GL_GENERATE_ASSERT_H_FALSE='#' +else + GL_GENERATE_ASSERT_H_TRUE='#' + GL_GENERATE_ASSERT_H_FALSE= +fi +: + if test -z "${GL_GENERATE_ASSERT_H_TRUE}" && test -z "${GL_GENERATE_ASSERT_H_FALSE}"; then + GL_GENERATE_ASSERT_H_TRUE='#' + GL_GENERATE_ASSERT_H_FALSE='#' + fi + + + + + + + @@ -24463,14 +25190,14 @@ fi else case "$host_os" in - # Guess yes on glibc systems. - *-gnu* | gnu*) ac_cv_func_calloc_0_nonnull="guessing yes" ;; - # Guess yes on musl systems. - *-musl*) ac_cv_func_calloc_0_nonnull="guessing yes" ;; - # Guess yes on native Windows. - mingw*) ac_cv_func_calloc_0_nonnull="guessing yes" ;; - # If we don't know, obey --enable-cross-guesses. - *) ac_cv_func_calloc_0_nonnull="$gl_cross_guess_normal" ;; + # Guess yes on glibc systems. + *-gnu* | gnu*) ac_cv_func_calloc_0_nonnull="guessing yes" ;; + # Guess yes on musl systems. + *-musl* | midipix*) ac_cv_func_calloc_0_nonnull="guessing yes" ;; + # Guess yes on native Windows. + mingw*) ac_cv_func_calloc_0_nonnull="guessing yes" ;; + # If we don't know, obey --enable-cross-guesses. + *) ac_cv_func_calloc_0_nonnull="$gl_cross_guess_normal" ;; esac fi @@ -24645,7 +25372,7 @@ printf "%s\n" "#define GNULIB_TEST_REALPATH 1" >>confdefs.h # Save and restore LIBS so e.g., -lrt, isn't added to it. Otherwise, *all* # programs in the package would end up linked with that potentially-shared # library, inducing unnecessary run-time overhead. - LIB_CLOCK_GETTIME= + CLOCK_TIME_LIB= gl_saved_libs=$LIBS { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for library containing clock_gettime" >&5 @@ -24705,7 +25432,7 @@ if test "$ac_res" != no then : test "$ac_res" = "none required" || LIBS="$ac_res $LIBS" test "$ac_cv_search_clock_gettime" = "none required" || - LIB_CLOCK_GETTIME=$ac_cv_search_clock_gettime + CLOCK_TIME_LIB=$ac_cv_search_clock_gettime fi ac_fn_c_check_func "$LINENO" "clock_getres" "ac_cv_func_clock_getres" @@ -24728,6 +25455,9 @@ then : fi LIBS=$gl_saved_libs + # For backward compatibility. + LIB_CLOCK_GETTIME="$CLOCK_TIME_LIB" + @@ -24811,21 +25541,749 @@ printf "%s\n" "#define GNULIB_CLOSE_STREAM 1" >>confdefs.h - if test "x$lispdir" = x; then - lispdir='${datarootdir}/emacs/site-lisp' + + gl_save_prefix="${prefix}" + gl_save_exec_prefix="${exec_prefix}" + gl_save_bindir="${bindir}" + gl_save_sbindir="${sbindir}" + gl_save_libexecdir="${libexecdir}" + gl_save_datarootdir="${datarootdir}" + gl_save_datadir="${datadir}" + gl_save_sysconfdir="${sysconfdir}" + gl_save_sharedstatedir="${sharedstatedir}" + gl_save_localstatedir="${localstatedir}" + gl_save_runstatedir="${runstatedir}" + gl_save_includedir="${includedir}" + gl_save_oldincludedir="${oldincludedir}" + gl_save_docdir="${docdir}" + gl_save_infodir="${infodir}" + gl_save_htmldir="${htmldir}" + gl_save_dvidir="${dvidir}" + gl_save_pdfdir="${pdfdir}" + gl_save_psdir="${psdir}" + gl_save_libdir="${libdir}" + gl_save_lispdir="${lispdir}" + gl_save_localedir="${localedir}" + gl_save_mandir="${mandir}" + gl_save_pkgdatadir="${pkgdatadir}" + gl_save_pkgincludedir="${pkgincludedir}" + gl_save_pkglibdir="${pkglibdir}" + gl_save_pkglibexecdir="${pkglibexecdir}" + + if test "X$prefix" = "XNONE"; then + prefix="$ac_default_prefix" + fi + if test "X$exec_prefix" = "XNONE"; then + exec_prefix='${prefix}' + fi + eval exec_prefix="$exec_prefix" + eval bindir="$bindir" + eval sbindir="$sbindir" + eval libexecdir="$libexecdir" + eval datarootdir="$datarootdir" + eval datadir="$datadir" + eval sysconfdir="$sysconfdir" + eval sharedstatedir="$sharedstatedir" + eval localstatedir="$localstatedir" + eval runstatedir="$runstatedir" + eval includedir="$includedir" + eval oldincludedir="$oldincludedir" + eval docdir="$docdir" + eval infodir="$infodir" + eval htmldir="$htmldir" + eval dvidir="$dvidir" + eval pdfdir="$pdfdir" + eval psdir="$psdir" + eval libdir="$libdir" + eval lispdir="$lispdir" + eval localedir="$localedir" + eval mandir="$mandir" + eval pkgdatadir="$pkgdatadir" + eval pkgincludedir="$pkgincludedir" + eval pkglibdir="$pkglibdir" + eval pkglibexecdir="$pkglibexecdir" + + + + + + + gl_final_prefix="$prefix" + case "$build_os" in + cygwin*) + case "$host_os" in + mingw*) + gl_final_prefix=`cygpath -w "$gl_final_prefix"` ;; + esac + ;; + esac + prefix_c=`echo "$gl_final_prefix" | sed -e "$gl_sed_double_backslashes" -e "$gl_sed_escape_doublequotes"` + prefix_c='"'"$prefix_c"'"' + + + prefix_c_make=`echo "$prefix_c" | sed -e "$gl_sed_escape_for_make_1" -e "$gl_sed_escape_for_make_2"` + if test "$prefix_c_make" = '\"'"${gl_final_prefix}"'\"'; then + prefix_c_make='\"$(prefix)\"' fi - if test "x$runstatedir" = x; then - runstatedir='${localstatedir}/run' + + + + + + + gl_final_exec_prefix="$exec_prefix" + case "$build_os" in + cygwin*) + case "$host_os" in + mingw*) + gl_final_exec_prefix=`cygpath -w "$gl_final_exec_prefix"` ;; + esac + ;; + esac + exec_prefix_c=`echo "$gl_final_exec_prefix" | sed -e "$gl_sed_double_backslashes" -e "$gl_sed_escape_doublequotes"` + exec_prefix_c='"'"$exec_prefix_c"'"' + + + exec_prefix_c_make=`echo "$exec_prefix_c" | sed -e "$gl_sed_escape_for_make_1" -e "$gl_sed_escape_for_make_2"` + if test "$exec_prefix_c_make" = '\"'"${gl_final_exec_prefix}"'\"'; then + exec_prefix_c_make='\"$(exec_prefix)\"' + fi + + + + + + + + gl_final_bindir="$bindir" + case "$build_os" in + cygwin*) + case "$host_os" in + mingw*) + gl_final_bindir=`cygpath -w "$gl_final_bindir"` ;; + esac + ;; + esac + bindir_c=`echo "$gl_final_bindir" | sed -e "$gl_sed_double_backslashes" -e "$gl_sed_escape_doublequotes"` + bindir_c='"'"$bindir_c"'"' + + + bindir_c_make=`echo "$bindir_c" | sed -e "$gl_sed_escape_for_make_1" -e "$gl_sed_escape_for_make_2"` + if test "$bindir_c_make" = '\"'"${gl_final_bindir}"'\"'; then + bindir_c_make='\"$(bindir)\"' fi - pkglibexecdir='${libexecdir}/${PACKAGE}' + + gl_final_sbindir="$sbindir" + case "$build_os" in + cygwin*) + case "$host_os" in + mingw*) + gl_final_sbindir=`cygpath -w "$gl_final_sbindir"` ;; + esac + ;; + esac + sbindir_c=`echo "$gl_final_sbindir" | sed -e "$gl_sed_double_backslashes" -e "$gl_sed_escape_doublequotes"` + sbindir_c='"'"$sbindir_c"'"' + + + sbindir_c_make=`echo "$sbindir_c" | sed -e "$gl_sed_escape_for_make_1" -e "$gl_sed_escape_for_make_2"` + if test "$sbindir_c_make" = '\"'"${gl_final_sbindir}"'\"'; then + sbindir_c_make='\"$(sbindir)\"' + fi + + + + + + + + gl_final_libexecdir="$libexecdir" + case "$build_os" in + cygwin*) + case "$host_os" in + mingw*) + gl_final_libexecdir=`cygpath -w "$gl_final_libexecdir"` ;; + esac + ;; + esac + libexecdir_c=`echo "$gl_final_libexecdir" | sed -e "$gl_sed_double_backslashes" -e "$gl_sed_escape_doublequotes"` + libexecdir_c='"'"$libexecdir_c"'"' + + + libexecdir_c_make=`echo "$libexecdir_c" | sed -e "$gl_sed_escape_for_make_1" -e "$gl_sed_escape_for_make_2"` + if test "$libexecdir_c_make" = '\"'"${gl_final_libexecdir}"'\"'; then + libexecdir_c_make='\"$(libexecdir)\"' + fi + + + + + + + + gl_final_datarootdir="$datarootdir" + case "$build_os" in + cygwin*) + case "$host_os" in + mingw*) + gl_final_datarootdir=`cygpath -w "$gl_final_datarootdir"` ;; + esac + ;; + esac + datarootdir_c=`echo "$gl_final_datarootdir" | sed -e "$gl_sed_double_backslashes" -e "$gl_sed_escape_doublequotes"` + datarootdir_c='"'"$datarootdir_c"'"' + + + datarootdir_c_make=`echo "$datarootdir_c" | sed -e "$gl_sed_escape_for_make_1" -e "$gl_sed_escape_for_make_2"` + if test "$datarootdir_c_make" = '\"'"${gl_final_datarootdir}"'\"'; then + datarootdir_c_make='\"$(datarootdir)\"' + fi + + + + + + + + gl_final_datadir="$datadir" + case "$build_os" in + cygwin*) + case "$host_os" in + mingw*) + gl_final_datadir=`cygpath -w "$gl_final_datadir"` ;; + esac + ;; + esac + datadir_c=`echo "$gl_final_datadir" | sed -e "$gl_sed_double_backslashes" -e "$gl_sed_escape_doublequotes"` + datadir_c='"'"$datadir_c"'"' + + + datadir_c_make=`echo "$datadir_c" | sed -e "$gl_sed_escape_for_make_1" -e "$gl_sed_escape_for_make_2"` + if test "$datadir_c_make" = '\"'"${gl_final_datadir}"'\"'; then + datadir_c_make='\"$(datadir)\"' + fi + + + + + + + + gl_final_sysconfdir="$sysconfdir" + case "$build_os" in + cygwin*) + case "$host_os" in + mingw*) + gl_final_sysconfdir=`cygpath -w "$gl_final_sysconfdir"` ;; + esac + ;; + esac + sysconfdir_c=`echo "$gl_final_sysconfdir" | sed -e "$gl_sed_double_backslashes" -e "$gl_sed_escape_doublequotes"` + sysconfdir_c='"'"$sysconfdir_c"'"' + + + sysconfdir_c_make=`echo "$sysconfdir_c" | sed -e "$gl_sed_escape_for_make_1" -e "$gl_sed_escape_for_make_2"` + if test "$sysconfdir_c_make" = '\"'"${gl_final_sysconfdir}"'\"'; then + sysconfdir_c_make='\"$(sysconfdir)\"' + fi + + + + + + + + gl_final_sharedstatedir="$sharedstatedir" + case "$build_os" in + cygwin*) + case "$host_os" in + mingw*) + gl_final_sharedstatedir=`cygpath -w "$gl_final_sharedstatedir"` ;; + esac + ;; + esac + sharedstatedir_c=`echo "$gl_final_sharedstatedir" | sed -e "$gl_sed_double_backslashes" -e "$gl_sed_escape_doublequotes"` + sharedstatedir_c='"'"$sharedstatedir_c"'"' + + + sharedstatedir_c_make=`echo "$sharedstatedir_c" | sed -e "$gl_sed_escape_for_make_1" -e "$gl_sed_escape_for_make_2"` + if test "$sharedstatedir_c_make" = '\"'"${gl_final_sharedstatedir}"'\"'; then + sharedstatedir_c_make='\"$(sharedstatedir)\"' + fi + + + + + + + + gl_final_localstatedir="$localstatedir" + case "$build_os" in + cygwin*) + case "$host_os" in + mingw*) + gl_final_localstatedir=`cygpath -w "$gl_final_localstatedir"` ;; + esac + ;; + esac + localstatedir_c=`echo "$gl_final_localstatedir" | sed -e "$gl_sed_double_backslashes" -e "$gl_sed_escape_doublequotes"` + localstatedir_c='"'"$localstatedir_c"'"' + + + localstatedir_c_make=`echo "$localstatedir_c" | sed -e "$gl_sed_escape_for_make_1" -e "$gl_sed_escape_for_make_2"` + if test "$localstatedir_c_make" = '\"'"${gl_final_localstatedir}"'\"'; then + localstatedir_c_make='\"$(localstatedir)\"' + fi + + + + + + + + gl_final_runstatedir="$runstatedir" + case "$build_os" in + cygwin*) + case "$host_os" in + mingw*) + gl_final_runstatedir=`cygpath -w "$gl_final_runstatedir"` ;; + esac + ;; + esac + runstatedir_c=`echo "$gl_final_runstatedir" | sed -e "$gl_sed_double_backslashes" -e "$gl_sed_escape_doublequotes"` + runstatedir_c='"'"$runstatedir_c"'"' + + + runstatedir_c_make=`echo "$runstatedir_c" | sed -e "$gl_sed_escape_for_make_1" -e "$gl_sed_escape_for_make_2"` + if test "$runstatedir_c_make" = '\"'"${gl_final_runstatedir}"'\"'; then + runstatedir_c_make='\"$(runstatedir)\"' + fi + + + + + + + + gl_final_includedir="$includedir" + case "$build_os" in + cygwin*) + case "$host_os" in + mingw*) + gl_final_includedir=`cygpath -w "$gl_final_includedir"` ;; + esac + ;; + esac + includedir_c=`echo "$gl_final_includedir" | sed -e "$gl_sed_double_backslashes" -e "$gl_sed_escape_doublequotes"` + includedir_c='"'"$includedir_c"'"' + + + includedir_c_make=`echo "$includedir_c" | sed -e "$gl_sed_escape_for_make_1" -e "$gl_sed_escape_for_make_2"` + if test "$includedir_c_make" = '\"'"${gl_final_includedir}"'\"'; then + includedir_c_make='\"$(includedir)\"' + fi + + + + + + + + gl_final_oldincludedir="$oldincludedir" + case "$build_os" in + cygwin*) + case "$host_os" in + mingw*) + gl_final_oldincludedir=`cygpath -w "$gl_final_oldincludedir"` ;; + esac + ;; + esac + oldincludedir_c=`echo "$gl_final_oldincludedir" | sed -e "$gl_sed_double_backslashes" -e "$gl_sed_escape_doublequotes"` + oldincludedir_c='"'"$oldincludedir_c"'"' + + + oldincludedir_c_make=`echo "$oldincludedir_c" | sed -e "$gl_sed_escape_for_make_1" -e "$gl_sed_escape_for_make_2"` + if test "$oldincludedir_c_make" = '\"'"${gl_final_oldincludedir}"'\"'; then + oldincludedir_c_make='\"$(oldincludedir)\"' + fi + + + + + + + + gl_final_docdir="$docdir" + case "$build_os" in + cygwin*) + case "$host_os" in + mingw*) + gl_final_docdir=`cygpath -w "$gl_final_docdir"` ;; + esac + ;; + esac + docdir_c=`echo "$gl_final_docdir" | sed -e "$gl_sed_double_backslashes" -e "$gl_sed_escape_doublequotes"` + docdir_c='"'"$docdir_c"'"' + + + docdir_c_make=`echo "$docdir_c" | sed -e "$gl_sed_escape_for_make_1" -e "$gl_sed_escape_for_make_2"` + if test "$docdir_c_make" = '\"'"${gl_final_docdir}"'\"'; then + docdir_c_make='\"$(docdir)\"' + fi + + + + + + + + gl_final_infodir="$infodir" + case "$build_os" in + cygwin*) + case "$host_os" in + mingw*) + gl_final_infodir=`cygpath -w "$gl_final_infodir"` ;; + esac + ;; + esac + infodir_c=`echo "$gl_final_infodir" | sed -e "$gl_sed_double_backslashes" -e "$gl_sed_escape_doublequotes"` + infodir_c='"'"$infodir_c"'"' + + + infodir_c_make=`echo "$infodir_c" | sed -e "$gl_sed_escape_for_make_1" -e "$gl_sed_escape_for_make_2"` + if test "$infodir_c_make" = '\"'"${gl_final_infodir}"'\"'; then + infodir_c_make='\"$(infodir)\"' + fi + + + + + + + + gl_final_htmldir="$htmldir" + case "$build_os" in + cygwin*) + case "$host_os" in + mingw*) + gl_final_htmldir=`cygpath -w "$gl_final_htmldir"` ;; + esac + ;; + esac + htmldir_c=`echo "$gl_final_htmldir" | sed -e "$gl_sed_double_backslashes" -e "$gl_sed_escape_doublequotes"` + htmldir_c='"'"$htmldir_c"'"' + + + htmldir_c_make=`echo "$htmldir_c" | sed -e "$gl_sed_escape_for_make_1" -e "$gl_sed_escape_for_make_2"` + if test "$htmldir_c_make" = '\"'"${gl_final_htmldir}"'\"'; then + htmldir_c_make='\"$(htmldir)\"' + fi + + + + + + + + gl_final_dvidir="$dvidir" + case "$build_os" in + cygwin*) + case "$host_os" in + mingw*) + gl_final_dvidir=`cygpath -w "$gl_final_dvidir"` ;; + esac + ;; + esac + dvidir_c=`echo "$gl_final_dvidir" | sed -e "$gl_sed_double_backslashes" -e "$gl_sed_escape_doublequotes"` + dvidir_c='"'"$dvidir_c"'"' + + + dvidir_c_make=`echo "$dvidir_c" | sed -e "$gl_sed_escape_for_make_1" -e "$gl_sed_escape_for_make_2"` + if test "$dvidir_c_make" = '\"'"${gl_final_dvidir}"'\"'; then + dvidir_c_make='\"$(dvidir)\"' + fi + + + + + + + + gl_final_pdfdir="$pdfdir" + case "$build_os" in + cygwin*) + case "$host_os" in + mingw*) + gl_final_pdfdir=`cygpath -w "$gl_final_pdfdir"` ;; + esac + ;; + esac + pdfdir_c=`echo "$gl_final_pdfdir" | sed -e "$gl_sed_double_backslashes" -e "$gl_sed_escape_doublequotes"` + pdfdir_c='"'"$pdfdir_c"'"' + + + pdfdir_c_make=`echo "$pdfdir_c" | sed -e "$gl_sed_escape_for_make_1" -e "$gl_sed_escape_for_make_2"` + if test "$pdfdir_c_make" = '\"'"${gl_final_pdfdir}"'\"'; then + pdfdir_c_make='\"$(pdfdir)\"' + fi + + + + + + + + gl_final_psdir="$psdir" + case "$build_os" in + cygwin*) + case "$host_os" in + mingw*) + gl_final_psdir=`cygpath -w "$gl_final_psdir"` ;; + esac + ;; + esac + psdir_c=`echo "$gl_final_psdir" | sed -e "$gl_sed_double_backslashes" -e "$gl_sed_escape_doublequotes"` + psdir_c='"'"$psdir_c"'"' + + + psdir_c_make=`echo "$psdir_c" | sed -e "$gl_sed_escape_for_make_1" -e "$gl_sed_escape_for_make_2"` + if test "$psdir_c_make" = '\"'"${gl_final_psdir}"'\"'; then + psdir_c_make='\"$(psdir)\"' + fi + + + + + + + + gl_final_libdir="$libdir" + case "$build_os" in + cygwin*) + case "$host_os" in + mingw*) + gl_final_libdir=`cygpath -w "$gl_final_libdir"` ;; + esac + ;; + esac + libdir_c=`echo "$gl_final_libdir" | sed -e "$gl_sed_double_backslashes" -e "$gl_sed_escape_doublequotes"` + libdir_c='"'"$libdir_c"'"' + + + libdir_c_make=`echo "$libdir_c" | sed -e "$gl_sed_escape_for_make_1" -e "$gl_sed_escape_for_make_2"` + if test "$libdir_c_make" = '\"'"${gl_final_libdir}"'\"'; then + libdir_c_make='\"$(libdir)\"' + fi + + + + + + + + gl_final_lispdir="$lispdir" + case "$build_os" in + cygwin*) + case "$host_os" in + mingw*) + gl_final_lispdir=`cygpath -w "$gl_final_lispdir"` ;; + esac + ;; + esac + lispdir_c=`echo "$gl_final_lispdir" | sed -e "$gl_sed_double_backslashes" -e "$gl_sed_escape_doublequotes"` + lispdir_c='"'"$lispdir_c"'"' + + + lispdir_c_make=`echo "$lispdir_c" | sed -e "$gl_sed_escape_for_make_1" -e "$gl_sed_escape_for_make_2"` + if test "$lispdir_c_make" = '\"'"${gl_final_lispdir}"'\"'; then + lispdir_c_make='\"$(lispdir)\"' + fi + + + + + + + + gl_final_localedir="$localedir" + case "$build_os" in + cygwin*) + case "$host_os" in + mingw*) + gl_final_localedir=`cygpath -w "$gl_final_localedir"` ;; + esac + ;; + esac + localedir_c=`echo "$gl_final_localedir" | sed -e "$gl_sed_double_backslashes" -e "$gl_sed_escape_doublequotes"` + localedir_c='"'"$localedir_c"'"' + + + localedir_c_make=`echo "$localedir_c" | sed -e "$gl_sed_escape_for_make_1" -e "$gl_sed_escape_for_make_2"` + if test "$localedir_c_make" = '\"'"${gl_final_localedir}"'\"'; then + localedir_c_make='\"$(localedir)\"' + fi + + + + + + + + gl_final_mandir="$mandir" + case "$build_os" in + cygwin*) + case "$host_os" in + mingw*) + gl_final_mandir=`cygpath -w "$gl_final_mandir"` ;; + esac + ;; + esac + mandir_c=`echo "$gl_final_mandir" | sed -e "$gl_sed_double_backslashes" -e "$gl_sed_escape_doublequotes"` + mandir_c='"'"$mandir_c"'"' + + + mandir_c_make=`echo "$mandir_c" | sed -e "$gl_sed_escape_for_make_1" -e "$gl_sed_escape_for_make_2"` + if test "$mandir_c_make" = '\"'"${gl_final_mandir}"'\"'; then + mandir_c_make='\"$(mandir)\"' + fi + + + + + + + + gl_final_pkgdatadir="$pkgdatadir" + case "$build_os" in + cygwin*) + case "$host_os" in + mingw*) + gl_final_pkgdatadir=`cygpath -w "$gl_final_pkgdatadir"` ;; + esac + ;; + esac + pkgdatadir_c=`echo "$gl_final_pkgdatadir" | sed -e "$gl_sed_double_backslashes" -e "$gl_sed_escape_doublequotes"` + pkgdatadir_c='"'"$pkgdatadir_c"'"' + + + pkgdatadir_c_make=`echo "$pkgdatadir_c" | sed -e "$gl_sed_escape_for_make_1" -e "$gl_sed_escape_for_make_2"` + if test "$pkgdatadir_c_make" = '\"'"${gl_final_pkgdatadir}"'\"'; then + pkgdatadir_c_make='\"$(pkgdatadir)\"' + fi + + + + + + + + gl_final_pkgincludedir="$pkgincludedir" + case "$build_os" in + cygwin*) + case "$host_os" in + mingw*) + gl_final_pkgincludedir=`cygpath -w "$gl_final_pkgincludedir"` ;; + esac + ;; + esac + pkgincludedir_c=`echo "$gl_final_pkgincludedir" | sed -e "$gl_sed_double_backslashes" -e "$gl_sed_escape_doublequotes"` + pkgincludedir_c='"'"$pkgincludedir_c"'"' + + + pkgincludedir_c_make=`echo "$pkgincludedir_c" | sed -e "$gl_sed_escape_for_make_1" -e "$gl_sed_escape_for_make_2"` + if test "$pkgincludedir_c_make" = '\"'"${gl_final_pkgincludedir}"'\"'; then + pkgincludedir_c_make='\"$(pkgincludedir)\"' + fi + + + + + + + + gl_final_pkglibdir="$pkglibdir" + case "$build_os" in + cygwin*) + case "$host_os" in + mingw*) + gl_final_pkglibdir=`cygpath -w "$gl_final_pkglibdir"` ;; + esac + ;; + esac + pkglibdir_c=`echo "$gl_final_pkglibdir" | sed -e "$gl_sed_double_backslashes" -e "$gl_sed_escape_doublequotes"` + pkglibdir_c='"'"$pkglibdir_c"'"' + + + pkglibdir_c_make=`echo "$pkglibdir_c" | sed -e "$gl_sed_escape_for_make_1" -e "$gl_sed_escape_for_make_2"` + if test "$pkglibdir_c_make" = '\"'"${gl_final_pkglibdir}"'\"'; then + pkglibdir_c_make='\"$(pkglibdir)\"' + fi + + + + + + + + gl_final_pkglibexecdir="$pkglibexecdir" + case "$build_os" in + cygwin*) + case "$host_os" in + mingw*) + gl_final_pkglibexecdir=`cygpath -w "$gl_final_pkglibexecdir"` ;; + esac + ;; + esac + pkglibexecdir_c=`echo "$gl_final_pkglibexecdir" | sed -e "$gl_sed_double_backslashes" -e "$gl_sed_escape_doublequotes"` + pkglibexecdir_c='"'"$pkglibexecdir_c"'"' + + + pkglibexecdir_c_make=`echo "$pkglibexecdir_c" | sed -e "$gl_sed_escape_for_make_1" -e "$gl_sed_escape_for_make_2"` + if test "$pkglibexecdir_c_make" = '\"'"${gl_final_pkglibexecdir}"'\"'; then + pkglibexecdir_c_make='\"$(pkglibexecdir)\"' + fi + + + + pkglibexecdir="${gl_save_pkglibexecdir}" + pkglibdir="${gl_save_pkglibdir}" + pkgincludedir="${gl_save_pkgincludedir}" + pkgdatadir="${gl_save_pkgdatadir}" + mandir="${gl_save_mandir}" + localedir="${gl_save_localedir}" + lispdir="${gl_save_lispdir}" + libdir="${gl_save_libdir}" + psdir="${gl_save_psdir}" + pdfdir="${gl_save_pdfdir}" + dvidir="${gl_save_dvidir}" + htmldir="${gl_save_htmldir}" + infodir="${gl_save_infodir}" + docdir="${gl_save_docdir}" + oldincludedir="${gl_save_oldincludedir}" + includedir="${gl_save_includedir}" + runstatedir="${gl_save_runstatedir}" + localstatedir="${gl_save_localstatedir}" + sharedstatedir="${gl_save_sharedstatedir}" + sysconfdir="${gl_save_sysconfdir}" + datadir="${gl_save_datadir}" + datarootdir="${gl_save_datarootdir}" + libexecdir="${gl_save_libexecdir}" + sbindir="${gl_save_sbindir}" + bindir="${gl_save_bindir}" + exec_prefix="${gl_save_exec_prefix}" + prefix="${gl_save_prefix}" + + + + printf "%s\n" "#define GNULIB_DIRNAME 1" >>confdefs.h @@ -25037,7 +26495,6 @@ printf "%s\n" "#define GNULIB_TEST_DUP2 1" >>confdefs.h - case "$GL_GENERATE_ERRNO_H" in false) ERRNO_H='' ;; true) @@ -25068,37 +26525,10 @@ fi - { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for error_at_line" >&5 -printf %s "checking for error_at_line... " >&6; } -if test ${ac_cv_lib_error_at_line+y} -then : - printf %s "(cached) " >&6 -else $as_nop - cat confdefs.h - <<_ACEOF >conftest.$ac_ext -/* end confdefs.h. */ -#include <error.h> -int -main (void) -{ -error_at_line (0, 0, "", 0, "an error occurred"); - ; - return 0; -} -_ACEOF -if ac_fn_c_try_link "$LINENO" -then : - ac_cv_lib_error_at_line=yes -else $as_nop - ac_cv_lib_error_at_line=no -fi -rm -f core conftest.err conftest.$ac_objext conftest.beam \ - conftest$ac_exeext conftest.$ac_ext -fi -{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_error_at_line" >&5 -printf "%s\n" "$ac_cv_lib_error_at_line" >&6; } - if test "$ac_cv_lib_error_at_line" = no; then + + if test $GL_GENERATE_ERROR_H = true; then GL_COND_OBJ_ERROR_TRUE= GL_COND_OBJ_ERROR_FALSE='#' else @@ -25134,6 +26564,40 @@ fi + case "$GL_GENERATE_ERROR_H" in + false) ERROR_H='' ;; + true) + if test -z "$ERROR_H"; then + ERROR_H="${gl_source_base_prefix}error.h" + fi + ;; + *) echo "*** GL_GENERATE_ERROR_H is not set correctly" 1>&2; exit 1 ;; + esac + + + if $GL_GENERATE_ERROR_H; then + GL_GENERATE_ERROR_H_TRUE= + GL_GENERATE_ERROR_H_FALSE='#' +else + GL_GENERATE_ERROR_H_TRUE='#' + GL_GENERATE_ERROR_H_FALSE= +fi +: + if test -z "${GL_GENERATE_ERROR_H_TRUE}" && test -z "${GL_GENERATE_ERROR_H_FALSE}"; then + GL_GENERATE_ERROR_H_TRUE='#' + GL_GENERATE_ERROR_H_FALSE='#' + fi + + + + + + + + + + + if test $ac_cv_func_fcntl = no; then @@ -25889,6 +27353,98 @@ printf "%s\n" "#define GNULIB_TEST_GETOPT_POSIX 1" >>confdefs.h + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for getprogname" >&5 +printf %s "checking for getprogname... " >&6; } +if test ${gl_cv_onwards_func_getprogname+y} +then : + printf %s "(cached) " >&6 +else $as_nop + + exec 9>&6 6>/dev/null + + case "$host_os" in + + linux*-android*) + ac_fn_check_decl "$LINENO" "getprogname" "ac_cv_have_decl_getprogname" "#include <stdlib.h> +" "$ac_c_undeclared_builtin_options" "CFLAGS" +if test "x$ac_cv_have_decl_getprogname" = xyes +then : + +fi + if test $ac_cv_have_decl_getprogname = yes; then + ac_fn_c_check_func "$LINENO" "getprogname" "ac_cv_func_getprogname" +if test "x$ac_cv_func_getprogname" = xyes +then : + +fi + + if test $ac_cv_func_getprogname = yes; then + gl_cv_onwards_func_getprogname=yes + else + gl_cv_onwards_func_getprogname='future OS version' + fi + else + gl_cv_onwards_func_getprogname='future OS version' + fi + ;; + + + *) + ac_fn_c_check_func "$LINENO" "getprogname" "ac_cv_func_getprogname" +if test "x$ac_cv_func_getprogname" = xyes +then : + +fi + + gl_cv_onwards_func_getprogname=$ac_cv_func_getprogname + ;; + + esac + + exec 6>&9 9>&- + + +fi +{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $gl_cv_onwards_func_getprogname" >&5 +printf "%s\n" "$gl_cv_onwards_func_getprogname" >&6; } + + case "$gl_cv_onwards_func_getprogname" in + future*) ac_cv_func_getprogname=no ;; + *) ac_cv_func_getprogname=$gl_cv_onwards_func_getprogname ;; + esac + if test $ac_cv_func_getprogname = yes; then + +printf "%s\n" "#define HAVE_GETPROGNAME 1" >>confdefs.h + + fi + + + if test $ac_cv_func_getprogname = no; then + HAVE_GETPROGNAME=0 + case "$gl_cv_onwards_func_getprogname" in + future*) REPLACE_GETPROGNAME=1 ;; + esac + fi + + + if test $HAVE_GETPROGNAME = 0 || test $REPLACE_GETPROGNAME = 1; then + GL_COND_OBJ_GETPROGNAME_TRUE= + GL_COND_OBJ_GETPROGNAME_FALSE='#' +else + GL_COND_OBJ_GETPROGNAME_TRUE='#' + GL_COND_OBJ_GETPROGNAME_FALSE= +fi +: + if test -z "${GL_COND_OBJ_GETPROGNAME_TRUE}" && test -z "${GL_COND_OBJ_GETPROGNAME_FALSE}"; then + GL_COND_OBJ_GETPROGNAME_TRUE='#' + GL_COND_OBJ_GETPROGNAME_FALSE='#' + fi + + if test -z "$GL_COND_OBJ_GETPROGNAME_TRUE"; then : + + + + ac_found=0 ac_fn_check_decl "$LINENO" "program_invocation_name" "ac_cv_have_decl_program_invocation_name" "#include <errno.h> " "$ac_c_undeclared_builtin_options" "CFLAGS" @@ -25977,11 +27533,107 @@ printf "%s\n" "#define HAVE_VAR___PROGNAME 1" >>confdefs.h fi +fi + + + + + + + + + + GL_GNULIB_GETPROGNAME=1 + + +printf "%s\n" "#define GNULIB_TEST_GETPROGNAME 1" >>confdefs.h + + + + + + + + + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for getrandom" >&5 +printf %s "checking for getrandom... " >&6; } +if test ${gl_cv_onwards_func_getrandom+y} +then : + printf %s "(cached) " >&6 +else $as_nop + + exec 9>&6 6>/dev/null + + case "$host_os" in + + linux*-android*) + ac_fn_check_decl "$LINENO" "getrandom" "ac_cv_have_decl_getrandom" "/* Additional includes are needed before <sys/random.h> on uClibc + and Mac OS X. */ + #include <sys/types.h> + #include <stdlib.h> + #include <sys/random.h> + +" "$ac_c_undeclared_builtin_options" "CFLAGS" +if test "x$ac_cv_have_decl_getrandom" = xyes +then : + +fi + if test $ac_cv_have_decl_getrandom = yes; then + ac_fn_c_check_func "$LINENO" "getrandom" "ac_cv_func_getrandom" +if test "x$ac_cv_func_getrandom" = xyes +then : + +fi + + if test $ac_cv_func_getrandom = yes; then + gl_cv_onwards_func_getrandom=yes + else + gl_cv_onwards_func_getrandom='future OS version' + fi + else + gl_cv_onwards_func_getrandom='future OS version' + fi + ;; + + + *) + ac_fn_c_check_func "$LINENO" "getrandom" "ac_cv_func_getrandom" +if test "x$ac_cv_func_getrandom" = xyes +then : + +fi + + gl_cv_onwards_func_getrandom=$ac_cv_func_getrandom + ;; + + esac + + exec 6>&9 9>&- + + +fi +{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $gl_cv_onwards_func_getrandom" >&5 +printf "%s\n" "$gl_cv_onwards_func_getrandom" >&6; } + + case "$gl_cv_onwards_func_getrandom" in + future*) ac_cv_func_getrandom=no ;; + *) ac_cv_func_getrandom=$gl_cv_onwards_func_getrandom ;; + esac + if test $ac_cv_func_getrandom = yes; then + +printf "%s\n" "#define HAVE_GETRANDOM 1" >>confdefs.h + + fi + + if test "$ac_cv_func_getrandom" != yes; then HAVE_GETRANDOM=0 + case "$gl_cv_onwards_func_getrandom" in + future*) REPLACE_GETRANDOM=1 ;; + esac else { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking whether getrandom is compatible with its GNU+BSD signature" >&5 printf %s "checking whether getrandom is compatible with its GNU+BSD signature... " >&6; } @@ -26070,15 +27722,17 @@ printf "%s\n" "$gl_cv_lib_assume_bcrypt" >&6; } printf "%s\n" "#define HAVE_LIB_BCRYPT 1" >>confdefs.h - LIB_GETRANDOM='-lbcrypt' + GETRANDOM_LIB='-lbcrypt' else - LIB_GETRANDOM='-ladvapi32' + GETRANDOM_LIB='-ladvapi32' fi ;; *) - LIB_GETRANDOM= ;; + GETRANDOM_LIB= ;; esac + LIB_GETRANDOM="$GETRANDOM_LIB" + if test $HAVE_GETRANDOM = 0 || test $REPLACE_GETRANDOM = 1; then @@ -26115,6 +27769,8 @@ printf "%s\n" "#define GNULIB_TEST_GETRANDOM 1" >>confdefs.h + + # Autoconf 2.61a.99 and earlier don't support linking a file only # in VPATH builds. But since GNUmakefile is for maintainer use # only, it does not matter if we skip the link with older autoconf. @@ -26124,7 +27780,9 @@ printf "%s\n" "#define GNULIB_TEST_GETRANDOM 1" >>confdefs.h ac_config_links="$ac_config_links $GNUmakefile:$GNUmakefile" - LIB_HARD_LOCALE="$LIB_SETLOCALE_NULL" + HARD_LOCALE_LIB="$SETLOCALE_NULL_LIB" + + LIB_HARD_LOCALE="$HARD_LOCALE_LIB" @@ -26369,22 +28027,22 @@ else $as_nop if test "$cross_compiling" = yes then : case "$host_os" in - # Guess no on glibc systems. - *-gnu* | gnu*) gl_cv_pthread_rwlock_rdlock_prefer_writer="guessing no" ;; - # Guess no on musl systems. - *-musl*) gl_cv_pthread_rwlock_rdlock_prefer_writer="guessing no" ;; - # Guess no on bionic systems. - *-android*) gl_cv_pthread_rwlock_rdlock_prefer_writer="guessing no" ;; - # Guess yes on native Windows with the mingw-w64 winpthreads library. - # Guess no on native Windows with the gnulib windows-rwlock module. - mingw*) if test "$gl_use_threads" = yes || test "$gl_use_threads" = posix; then - gl_cv_pthread_rwlock_rdlock_prefer_writer="guessing yes" - else - gl_cv_pthread_rwlock_rdlock_prefer_writer="guessing no" - fi - ;; - # If we don't know, obey --enable-cross-guesses. - *) gl_cv_pthread_rwlock_rdlock_prefer_writer="$gl_cross_guess_normal" ;; + # Guess no on glibc systems. + *-gnu* | gnu*) gl_cv_pthread_rwlock_rdlock_prefer_writer="guessing no" ;; + # Guess no on musl systems. + *-musl* | midipix*) gl_cv_pthread_rwlock_rdlock_prefer_writer="guessing no" ;; + # Guess no on bionic systems. + *-android*) gl_cv_pthread_rwlock_rdlock_prefer_writer="guessing no" ;; + # Guess yes on native Windows with the mingw-w64 winpthreads library. + # Guess no on native Windows with the gnulib windows-rwlock module. + mingw*) if test "$gl_use_threads" = yes || test "$gl_use_threads" = posix; then + gl_cv_pthread_rwlock_rdlock_prefer_writer="guessing yes" + else + gl_cv_pthread_rwlock_rdlock_prefer_writer="guessing no" + fi + ;; + # If we don't know, obey --enable-cross-guesses. + *) gl_cv_pthread_rwlock_rdlock_prefer_writer="$gl_cross_guess_normal" ;; esac else $as_nop @@ -26659,10 +28317,44 @@ printf "%s\n" "#define LSEEK_PIPE_BROKEN 1" >>confdefs.h REPLACE_LSEEK=1 fi - case $host_os in - darwin*) - REPLACE_LSEEK=1;; - esac + if test $REPLACE_LSEEK = 0 +then : + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking whether SEEK_DATA works but is incompatible with GNU" >&5 +printf %s "checking whether SEEK_DATA works but is incompatible with GNU... " >&6; } +if test ${gl_cv_func_lseek_works_but_incompatible+y} +then : + printf %s "(cached) " >&6 +else $as_nop + cat confdefs.h - <<_ACEOF >conftest.$ac_ext +/* end confdefs.h. */ + #include <unistd.h> + #if defined __APPLE__ && defined __MACH__ && defined SEEK_DATA + # ifdef __ENVIRONMENT_MAC_OS_X_VERSION_MIN_REQUIRED__ + # include <AvailabilityMacros.h> + # endif + # if 99990000 <= MAC_OS_X_VERSION_MIN_REQUIRED + # define LSEEK_WORKS_BUT_IS_INCOMPATIBLE_WITH_GNU + # endif + #endif + #ifndef LSEEK_WORKS_BUT_IS_INCOMPATIBLE_WITH_GNU + #error "No need to work around the bug" + #endif + +_ACEOF +if ac_fn_c_try_cpp "$LINENO" +then : + gl_cv_func_lseek_works_but_incompatible=yes +else $as_nop + gl_cv_func_lseek_works_but_incompatible=no +fi +rm -f conftest.err conftest.i conftest.$ac_ext +fi +{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $gl_cv_func_lseek_works_but_incompatible" >&5 +printf "%s\n" "$gl_cv_func_lseek_works_but_incompatible" >&6; } + if test "$gl_cv_func_lseek_works_but_incompatible" = yes; then + REPLACE_LSEEK=1 + fi +fi if test $REPLACE_LSEEK = 1; then @@ -26770,7 +28462,7 @@ then : case "$host_os" in # Guess yes on platforms where we know the result. *-gnu* | freebsd* | netbsd* | openbsd* | bitrig* \ - | gnu* | *-musl* | midnightbsd* \ + | gnu* | *-musl* | midipix* | midnightbsd* \ | hpux* | solaris* | cygwin* | mingw* | msys* ) ac_cv_func_malloc_0_nonnull="guessing yes" ;; # If we don't know, obey --enable-cross-guesses. @@ -27723,7 +29415,7 @@ printf "%s\n" "#define MBRTOWC_IN_C_LOCALE_MAYBE_EILSEQ 1" >>confdefs.h fi if test $REPLACE_MBSTATE_T = 1; then case "$host_os" in - mingw*) LIB_MBRTOWC= ;; + mingw*) MBRTOWC_LIB= ;; *) @@ -27838,15 +29530,17 @@ printf "%s\n" "#define HAVE_WEAK_SYMBOLS 1" >>confdefs.h esac case "$gl_cv_have_weak" in - *yes) LIB_MBRTOWC= ;; - *) LIB_MBRTOWC="$LIBPTHREAD" ;; + *yes) MBRTOWC_LIB= ;; + *) MBRTOWC_LIB="$LIBPTHREAD" ;; esac ;; esac else - LIB_MBRTOWC= + MBRTOWC_LIB= fi + LIB_MBRTOWC="$MBRTOWC_LIB" + if test $HAVE_MBRTOWC = 0 || test $REPLACE_MBRTOWC = 1; then @@ -28278,15 +29972,79 @@ printf "%s\n" "#define GNULIB_TEST_MBSINIT 1" >>confdefs.h - ac_fn_c_check_func "$LINENO" "mbtowc" "ac_cv_func_mbtowc" + + + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for mbtowc" >&5 +printf %s "checking for mbtowc... " >&6; } +if test ${gl_cv_onwards_func_mbtowc+y} +then : + printf %s "(cached) " >&6 +else $as_nop + + exec 9>&6 6>/dev/null + + case "$host_os" in + + linux*-android*) + ac_fn_check_decl "$LINENO" "mbtowc" "ac_cv_have_decl_mbtowc" "#include <stdlib.h> +" "$ac_c_undeclared_builtin_options" "CFLAGS" +if test "x$ac_cv_have_decl_mbtowc" = xyes +then : + +fi + if test $ac_cv_have_decl_mbtowc = yes; then + ac_fn_c_check_func "$LINENO" "mbtowc" "ac_cv_func_mbtowc" if test "x$ac_cv_func_mbtowc" = xyes then : - printf "%s\n" "#define HAVE_MBTOWC 1" >>confdefs.h fi + if test $ac_cv_func_mbtowc = yes; then + gl_cv_onwards_func_mbtowc=yes + else + gl_cv_onwards_func_mbtowc='future OS version' + fi + else + gl_cv_onwards_func_mbtowc='future OS version' + fi + ;; + + + *) + ac_fn_c_check_func "$LINENO" "mbtowc" "ac_cv_func_mbtowc" +if test "x$ac_cv_func_mbtowc" = xyes +then : + +fi + + gl_cv_onwards_func_mbtowc=$ac_cv_func_mbtowc + ;; + + esac + + exec 6>&9 9>&- + + +fi +{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $gl_cv_onwards_func_mbtowc" >&5 +printf "%s\n" "$gl_cv_onwards_func_mbtowc" >&6; } + + case "$gl_cv_onwards_func_mbtowc" in + future*) ac_cv_func_mbtowc=no ;; + *) ac_cv_func_mbtowc=$gl_cv_onwards_func_mbtowc ;; + esac + if test $ac_cv_func_mbtowc = yes; then + +printf "%s\n" "#define HAVE_MBTOWC 1" >>confdefs.h + + fi + + if test $ac_cv_func_mbtowc = no; then HAVE_MBTOWC=0 + case "$gl_cv_onwards_func_mbtowc" in + future*) REPLACE_MBTOWC=1 ;; + esac else if false; then REPLACE_MBTOWC=1 @@ -28339,19 +30097,83 @@ printf "%s\n" "#define GNULIB_TEST_MBTOWC 1" >>confdefs.h - ac_fn_c_check_func "$LINENO" "mempcpy" "ac_cv_func_mempcpy" + + + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for mempcpy" >&5 +printf %s "checking for mempcpy... " >&6; } +if test ${gl_cv_onwards_func_mempcpy+y} +then : + printf %s "(cached) " >&6 +else $as_nop + + exec 9>&6 6>/dev/null + + case "$host_os" in + + linux*-android*) + ac_fn_check_decl "$LINENO" "mempcpy" "ac_cv_have_decl_mempcpy" "#include <string.h> +" "$ac_c_undeclared_builtin_options" "CFLAGS" +if test "x$ac_cv_have_decl_mempcpy" = xyes +then : + +fi + if test $ac_cv_have_decl_mempcpy = yes; then + ac_fn_c_check_func "$LINENO" "mempcpy" "ac_cv_func_mempcpy" +if test "x$ac_cv_func_mempcpy" = xyes +then : + +fi + + if test $ac_cv_func_mempcpy = yes; then + gl_cv_onwards_func_mempcpy=yes + else + gl_cv_onwards_func_mempcpy='future OS version' + fi + else + gl_cv_onwards_func_mempcpy='future OS version' + fi + ;; + + + *) + ac_fn_c_check_func "$LINENO" "mempcpy" "ac_cv_func_mempcpy" if test "x$ac_cv_func_mempcpy" = xyes then : - printf "%s\n" "#define HAVE_MEMPCPY 1" >>confdefs.h fi + gl_cv_onwards_func_mempcpy=$ac_cv_func_mempcpy + ;; + + esac + + exec 6>&9 9>&- + + +fi +{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $gl_cv_onwards_func_mempcpy" >&5 +printf "%s\n" "$gl_cv_onwards_func_mempcpy" >&6; } + + case "$gl_cv_onwards_func_mempcpy" in + future*) ac_cv_func_mempcpy=no ;; + *) ac_cv_func_mempcpy=$gl_cv_onwards_func_mempcpy ;; + esac + if test $ac_cv_func_mempcpy = yes; then + +printf "%s\n" "#define HAVE_MEMPCPY 1" >>confdefs.h + + fi + + if test $ac_cv_func_mempcpy = no; then HAVE_MEMPCPY=0 + case "$gl_cv_onwards_func_mempcpy" in + future*) REPLACE_MEMPCPY=1 ;; + esac fi - if test $HAVE_MEMPCPY = 0; then + if test $HAVE_MEMPCPY = 0 || test $REPLACE_MEMPCPY = 1; then GL_COND_OBJ_MEMPCPY_TRUE= GL_COND_OBJ_MEMPCPY_FALSE='#' else @@ -28412,6 +30234,8 @@ then : case "$host_os" in # Guess yes on Linux systems. linux-* | linux) gl_cv_func_mkdir_trailing_slash_works="guessing yes" ;; + # Guess yes on systems that emulate the Linux system calls. + midipix*) gl_cv_func_mkdir_trailing_slash_works="guessing yes" ;; # Guess yes on glibc systems. *-gnu* | gnu*) gl_cv_func_mkdir_trailing_slash_works="guessing yes" ;; # Guess yes on MSVC, no on mingw. @@ -28491,6 +30315,8 @@ then : *-gnu* | gnu*) gl_cv_func_mkdir_trailing_dot_works="guessing yes" ;; # Guess yes on musl systems. *-musl*) gl_cv_func_mkdir_trailing_dot_works="guessing yes" ;; + # Guess yes on systems that emulate the Linux system calls. + midipix*) gl_cv_func_mkdir_trailing_dot_works="guessing yes" ;; # Guess no on native Windows. mingw*) gl_cv_func_mkdir_trailing_dot_works="guessing no" ;; # If we don't know, obey --enable-cross-guesses. @@ -28590,14 +30416,14 @@ else $as_nop if test "$cross_compiling" = yes then : case "$host_os" in - # Guess yes on glibc systems. - *-gnu* | gnu*) gl_cv_func_working_mkstemp="guessing yes" ;; - # Guess yes on musl systems. - *-musl*) gl_cv_func_working_mkstemp="guessing yes" ;; - # Guess no on native Windows. - mingw*) gl_cv_func_working_mkstemp="guessing no" ;; - # If we don't know, obey --enable-cross-guesses. - *) gl_cv_func_working_mkstemp="$gl_cross_guess_normal" ;; + # Guess yes on glibc systems. + *-gnu* | gnu*) gl_cv_func_working_mkstemp="guessing yes" ;; + # Guess yes on musl systems. + *-musl* | midipix*) gl_cv_func_working_mkstemp="guessing yes" ;; + # Guess no on native Windows. + mingw*) gl_cv_func_working_mkstemp="guessing no" ;; + # If we don't know, obey --enable-cross-guesses. + *) gl_cv_func_working_mkstemp="$gl_cross_guess_normal" ;; esac else $as_nop @@ -28747,6 +30573,73 @@ printf "%s\n" "#define GNULIB_MSVC_NOTHROW 1" >>confdefs.h + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for nl_langinfo" >&5 +printf %s "checking for nl_langinfo... " >&6; } +if test ${gl_cv_onwards_func_nl_langinfo+y} +then : + printf %s "(cached) " >&6 +else $as_nop + + exec 9>&6 6>/dev/null + + case "$host_os" in + + linux*-android*) + ac_fn_check_decl "$LINENO" "nl_langinfo" "ac_cv_have_decl_nl_langinfo" "#include <langinfo.h> +" "$ac_c_undeclared_builtin_options" "CFLAGS" +if test "x$ac_cv_have_decl_nl_langinfo" = xyes +then : + +fi + if test $ac_cv_have_decl_nl_langinfo = yes; then + ac_fn_c_check_func "$LINENO" "nl_langinfo" "ac_cv_func_nl_langinfo" +if test "x$ac_cv_func_nl_langinfo" = xyes +then : + +fi + + if test $ac_cv_func_nl_langinfo = yes; then + gl_cv_onwards_func_nl_langinfo=yes + else + gl_cv_onwards_func_nl_langinfo='future OS version' + fi + else + gl_cv_onwards_func_nl_langinfo='future OS version' + fi + ;; + + + *) + ac_fn_c_check_func "$LINENO" "nl_langinfo" "ac_cv_func_nl_langinfo" +if test "x$ac_cv_func_nl_langinfo" = xyes +then : + +fi + + gl_cv_onwards_func_nl_langinfo=$ac_cv_func_nl_langinfo + ;; + + esac + + exec 6>&9 9>&- + + +fi +{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $gl_cv_onwards_func_nl_langinfo" >&5 +printf "%s\n" "$gl_cv_onwards_func_nl_langinfo" >&6; } + + case "$gl_cv_onwards_func_nl_langinfo" in + future*) ac_cv_func_nl_langinfo=no ;; + *) ac_cv_func_nl_langinfo=$gl_cv_onwards_func_nl_langinfo ;; + esac + if test $ac_cv_func_nl_langinfo = yes; then + +printf "%s\n" "#define HAVE_NL_LANGINFO 1" >>confdefs.h + + fi + + + @@ -28826,9 +30719,12 @@ printf "%s\n" "#define REPLACE_NL_LANGINFO 1" >>confdefs.h fi else HAVE_NL_LANGINFO=0 + case "$gl_cv_onwards_func_nl_langinfo" in + future*) REPLACE_NL_LANGINFO=1 ;; + esac fi if test $HAVE_NL_LANGINFO = 0 || test $HAVE_LANGINFO_CODESET = 0; then - LIB_NL_LANGINFO="$LIB_SETLOCALE_NULL" + LIB_NL_LANGINFO="$SETLOCALE_NULL_LIB" else LIB_NL_LANGINFO= fi @@ -29295,6 +31191,9 @@ then : # Guess yes on Linux or glibc systems. linux-* | linux | *-gnu* | gnu*) gl_cv_func_readlink_trailing_slash="guessing yes" ;; + # Guess yes on systems that emulate the Linux system calls. + midipix*) + gl_cv_func_readlink_trailing_slash="guessing yes" ;; # Guess no on AIX or HP-UX. aix* | hpux*) gl_cv_func_readlink_trailing_slash="guessing no" ;; @@ -29359,6 +31258,9 @@ then : # Guess yes on Linux or glibc systems. linux-* | linux | *-gnu* | gnu*) gl_cv_func_readlink_truncate="guessing yes" ;; + # Guess yes on systems that emulate the Linux system calls. + midipix*) + gl_cv_func_readlink_truncate="guessing yes" ;; # Guess no on AIX or HP-UX. aix* | hpux*) gl_cv_func_readlink_truncate="guessing no" ;; @@ -29466,7 +31368,7 @@ then : case "$host_os" in # Guess yes on platforms where we know the result. *-gnu* | freebsd* | netbsd* | openbsd* | bitrig* \ - | gnu* | *-musl* | midnightbsd* \ + | gnu* | *-musl* | midipix* | midnightbsd* \ | hpux* | solaris* | cygwin* | mingw* | msys* ) ac_cv_func_realloc_0_nonnull="guessing yes" ;; # If we don't know, obey --enable-cross-guesses. @@ -29587,15 +31489,79 @@ printf "%s\n" "#define GNULIB_TEST_REALLOC_POSIX 1" >>confdefs.h - ac_fn_c_check_func "$LINENO" "reallocarray" "ac_cv_func_reallocarray" + + + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for reallocarray" >&5 +printf %s "checking for reallocarray... " >&6; } +if test ${gl_cv_onwards_func_reallocarray+y} +then : + printf %s "(cached) " >&6 +else $as_nop + + exec 9>&6 6>/dev/null + + case "$host_os" in + + linux*-android*) + ac_fn_check_decl "$LINENO" "reallocarray" "ac_cv_have_decl_reallocarray" "#include <stdlib.h> +" "$ac_c_undeclared_builtin_options" "CFLAGS" +if test "x$ac_cv_have_decl_reallocarray" = xyes +then : + +fi + if test $ac_cv_have_decl_reallocarray = yes; then + ac_fn_c_check_func "$LINENO" "reallocarray" "ac_cv_func_reallocarray" if test "x$ac_cv_func_reallocarray" = xyes then : - printf "%s\n" "#define HAVE_REALLOCARRAY 1" >>confdefs.h fi + if test $ac_cv_func_reallocarray = yes; then + gl_cv_onwards_func_reallocarray=yes + else + gl_cv_onwards_func_reallocarray='future OS version' + fi + else + gl_cv_onwards_func_reallocarray='future OS version' + fi + ;; + + + *) + ac_fn_c_check_func "$LINENO" "reallocarray" "ac_cv_func_reallocarray" +if test "x$ac_cv_func_reallocarray" = xyes +then : + +fi + + gl_cv_onwards_func_reallocarray=$ac_cv_func_reallocarray + ;; + + esac + + exec 6>&9 9>&- + + +fi +{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $gl_cv_onwards_func_reallocarray" >&5 +printf "%s\n" "$gl_cv_onwards_func_reallocarray" >&6; } + + case "$gl_cv_onwards_func_reallocarray" in + future*) ac_cv_func_reallocarray=no ;; + *) ac_cv_func_reallocarray=$gl_cv_onwards_func_reallocarray ;; + esac + if test $ac_cv_func_reallocarray = yes; then + +printf "%s\n" "#define HAVE_REALLOCARRAY 1" >>confdefs.h + + fi + + if test "$ac_cv_func_reallocarray" = no; then HAVE_REALLOCARRAY=0 + case "$gl_cv_onwards_func_reallocarray" in + future*) REPLACE_REALLOCARRAY=1 ;; + esac elif test "$gl_cv_malloc_ptrdiff" = no; then REPLACE_REALLOCARRAY=1 fi @@ -30193,7 +32159,6 @@ printf "%s\n" "#define GNULIB_TEST_RPMATCH 1" >>confdefs.h - { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking whether setlocale (LC_ALL, NULL) is multithread-safe" >&5 printf %s "checking whether setlocale (LC_ALL, NULL) is multithread-safe... " >&6; } if test ${gl_cv_func_setlocale_null_all_mtsafe+y} @@ -30201,9 +32166,32 @@ then : printf %s "(cached) " >&6 else $as_nop case "$host_os" in - # Guess no on musl libc, macOS, FreeBSD, NetBSD, OpenBSD, AIX, Haiku, Cygwin. - *-musl* | darwin* | freebsd* | midnightbsd* | netbsd* | openbsd* | aix* | haiku* | cygwin*) + # Guess no on musl libc, macOS, FreeBSD, NetBSD, OpenBSD, AIX, Haiku. + *-musl* | midipix* | darwin* | freebsd* | midnightbsd* | netbsd* | openbsd* | aix* | haiku*) gl_cv_func_setlocale_null_all_mtsafe=no ;; + # Guess no on Cygwin < 3.4.6. + cygwin*) + cat confdefs.h - <<_ACEOF >conftest.$ac_ext +/* end confdefs.h. */ + +#if defined __CYGWIN__ + #include <cygwin/version.h> + #if CYGWIN_VERSION_DLL_COMBINED >= CYGWIN_VERSION_DLL_MAKE_COMBINED (3004, 6) + Lucky user + #endif +#endif + +_ACEOF +if (eval "$ac_cpp conftest.$ac_ext") 2>&5 | + $EGREP "Lucky user" >/dev/null 2>&1 +then : + gl_cv_func_setlocale_null_all_mtsafe=yes +else $as_nop + gl_cv_func_setlocale_null_all_mtsafe=no +fi +rm -rf conftest* + + ;; # Guess yes on glibc, HP-UX, IRIX, Solaris, native Windows. *-gnu* | gnu* | hpux* | irix* | solaris* | mingw*) gl_cv_func_setlocale_null_all_mtsafe=yes ;; @@ -30242,7 +32230,7 @@ else $as_nop openbsd* | aix*) gl_cv_func_setlocale_null_one_mtsafe=no ;; # Guess yes on glibc, musl libc, macOS, FreeBSD, NetBSD, HP-UX, IRIX, Solaris, Haiku, Cygwin, native Windows. - *-gnu* | gnu* | *-musl* | darwin* | freebsd* | midnightbsd* | netbsd* | hpux* | irix* | solaris* | haiku* | cygwin* | mingw*) + *-gnu* | gnu* | *-musl* | midipix* | darwin* | freebsd* | midnightbsd* | netbsd* | hpux* | irix* | solaris* | haiku* | cygwin* | mingw*) gl_cv_func_setlocale_null_one_mtsafe=yes ;; # If we don't know, obey --enable-cross-guesses. *) @@ -30270,7 +32258,7 @@ printf "%s\n" "#define SETLOCALE_NULL_ONE_MTSAFE $SETLOCALE_NULL_ONE_MTSAFE" >>c if test $SETLOCALE_NULL_ALL_MTSAFE = 0 || test $SETLOCALE_NULL_ONE_MTSAFE = 0; then case "$host_os" in - mingw*) LIB_SETLOCALE_NULL= ;; + mingw*) SETLOCALE_NULL_LIB= ;; *) @@ -30385,15 +32373,17 @@ printf "%s\n" "#define HAVE_WEAK_SYMBOLS 1" >>confdefs.h esac case "$gl_cv_have_weak" in - *yes) LIB_SETLOCALE_NULL= ;; - *) LIB_SETLOCALE_NULL="$LIBPTHREAD" ;; + *yes) SETLOCALE_NULL_LIB= ;; + *) SETLOCALE_NULL_LIB="$LIBPTHREAD" ;; esac ;; esac else - LIB_SETLOCALE_NULL= + SETLOCALE_NULL_LIB= fi + LIB_SETLOCALE_NULL="$SETLOCALE_NULL_LIB" + if test $SETLOCALE_NULL_ALL_MTSAFE = 0 || test $SETLOCALE_NULL_ONE_MTSAFE = 0; then @@ -30554,6 +32544,8 @@ then : *-gnu* | gnu*) gl_cv_func_sleep_works="guessing yes" ;; # Guess yes on musl systems. *-musl*) gl_cv_func_sleep_works="guessing yes" ;; + # Guess yes on systems that emulate the Linux system calls. + midipix*) gl_cv_func_sleep_works="guessing yes" ;; # Guess no on native Windows. mingw*) gl_cv_func_sleep_works="guessing no" ;; # If we don't know, obey --enable-cross-guesses. @@ -30709,6 +32701,8 @@ then : case "$host_os" in # Guess yes on Linux systems. linux-* | linux) gl_cv_func_stat_file_slash="guessing yes" ;; + # Guess yes on systems that emulate the Linux system calls. + midipix*) gl_cv_func_stat_file_slash="guessing yes" ;; # Guess yes on glibc systems. *-gnu* | gnu*) gl_cv_func_stat_file_slash="guessing yes" ;; # If we don't know, obey --enable-cross-guesses. @@ -30955,105 +32949,6 @@ fi - { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for working stdalign.h" >&5 -printf %s "checking for working stdalign.h... " >&6; } -if test ${gl_cv_header_working_stdalign_h+y} -then : - printf %s "(cached) " >&6 -else $as_nop - cat confdefs.h - <<_ACEOF >conftest.$ac_ext -/* end confdefs.h. */ -#include <stdint.h> - #include <stdalign.h> - #include <stddef.h> - - /* Test that alignof yields a result consistent with offsetof. - This catches GCC bug 52023 - <https://gcc.gnu.org/bugzilla/show_bug.cgi?id=52023>. */ - #ifdef __cplusplus - template <class t> struct alignof_helper { char a; t b; }; - # define ao(type) offsetof (alignof_helper<type>, b) - #else - # define ao(type) offsetof (struct { char a; type b; }, b) - #endif - char test_double[ao (double) % _Alignof (double) == 0 ? 1 : -1]; - char test_long[ao (long int) % _Alignof (long int) == 0 ? 1 : -1]; - char test_alignof[alignof (double) == _Alignof (double) ? 1 : -1]; - - /* Test _Alignas only on platforms where gnulib can help. */ - #if \ - ((defined __cplusplus && 201103 <= __cplusplus) \ - || (__TINYC__ && defined __attribute__) \ - || (defined __APPLE__ && defined __MACH__ \ - ? 4 < __GNUC__ + (1 <= __GNUC_MINOR__) \ - : __GNUC__) \ - || (__ia64 && (61200 <= __HP_cc || 61200 <= __HP_aCC)) \ - || __ICC || 0x590 <= __SUNPRO_C || 0x0600 <= __xlC__ \ - || 1300 <= _MSC_VER) - struct alignas_test { char c; char alignas (8) alignas_8; }; - char test_alignas[offsetof (struct alignas_test, alignas_8) == 8 - ? 1 : -1]; - #endif - -int -main (void) -{ - - ; - return 0; -} -_ACEOF -if ac_fn_c_try_compile "$LINENO" -then : - gl_cv_header_working_stdalign_h=yes -else $as_nop - gl_cv_header_working_stdalign_h=no -fi -rm -f core conftest.err conftest.$ac_objext conftest.beam conftest.$ac_ext -fi -{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $gl_cv_header_working_stdalign_h" >&5 -printf "%s\n" "$gl_cv_header_working_stdalign_h" >&6; } - - if test $gl_cv_header_working_stdalign_h = yes; then - GL_GENERATE_STDALIGN_H=false - else - GL_GENERATE_STDALIGN_H=true - fi - - - - - - case "$GL_GENERATE_STDALIGN_H" in - false) STDALIGN_H='' ;; - true) - if test -z "$STDALIGN_H"; then - STDALIGN_H="${gl_source_base_prefix}stdalign.h" - fi - ;; - *) echo "*** GL_GENERATE_STDALIGN_H is not set correctly" 1>&2; exit 1 ;; - esac - - - if $GL_GENERATE_STDALIGN_H; then - GL_GENERATE_STDALIGN_H_TRUE= - GL_GENERATE_STDALIGN_H_FALSE='#' -else - GL_GENERATE_STDALIGN_H_TRUE='#' - GL_GENERATE_STDALIGN_H_FALSE= -fi -: - if test -z "${GL_GENERATE_STDALIGN_H_TRUE}" && test -z "${GL_GENERATE_STDALIGN_H_FALSE}"; then - GL_GENERATE_STDALIGN_H_TRUE='#' - GL_GENERATE_STDALIGN_H_FALSE='#' - fi - - - - - - - GL_GENERATE_STDARG_H=false NEXT_STDARG_H='<stdarg.h>' { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for va_copy" >&5 @@ -31269,59 +33164,73 @@ fi + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for bool, true, false" >&5 +printf %s "checking for bool, true, false... " >&6; } +if test ${gl_cv_c_bool+y} +then : + printf %s "(cached) " >&6 +else $as_nop + cat confdefs.h - <<_ACEOF >conftest.$ac_ext +/* end confdefs.h. */ + #if true == false + #error "true == false" + #endif + extern bool b; + bool b = true == false; +_ACEOF +if ac_fn_c_try_compile "$LINENO" +then : + gl_cv_c_bool=yes +else $as_nop + gl_cv_c_bool=no +fi +rm -f core conftest.err conftest.$ac_objext conftest.beam conftest.$ac_ext +fi +{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $gl_cv_c_bool" >&5 +printf "%s\n" "$gl_cv_c_bool" >&6; } + if test "$gl_cv_c_bool" = yes; then +printf "%s\n" "#define HAVE_C_BOOL 1" >>confdefs.h - if test "$ac_cv_header_stdbool_h" = yes; then - case "$host_os" in - solaris*) - if test -z "$GCC"; then - GL_GENERATE_STDBOOL_H=true - else - GL_GENERATE_STDBOOL_H=false - fi - ;; - *) - GL_GENERATE_STDBOOL_H=false - ;; - esac - else - GL_GENERATE_STDBOOL_H=true fi - if test "$ac_cv_type__Bool" = yes; then - HAVE__BOOL=1 - else - HAVE__BOOL=0 - fi + if test $ac_cv_header_stdckdint_h = yes; then + GL_GENERATE_STDCKDINT_H=false + else + GL_GENERATE_STDCKDINT_H=true + fi + - case "$GL_GENERATE_STDBOOL_H" in - false) STDBOOL_H='' ;; + + + case "$GL_GENERATE_STDCKDINT_H" in + false) STDCKDINT_H='' ;; true) - if test -z "$STDBOOL_H"; then - STDBOOL_H="${gl_source_base_prefix}stdbool.h" + if test -z "$STDCKDINT_H"; then + STDCKDINT_H="${gl_source_base_prefix}stdckdint.h" fi ;; - *) echo "*** GL_GENERATE_STDBOOL_H is not set correctly" 1>&2; exit 1 ;; + *) echo "*** GL_GENERATE_STDCKDINT_H is not set correctly" 1>&2; exit 1 ;; esac - if $GL_GENERATE_STDBOOL_H; then - GL_GENERATE_STDBOOL_H_TRUE= - GL_GENERATE_STDBOOL_H_FALSE='#' + if $GL_GENERATE_STDCKDINT_H; then + GL_GENERATE_STDCKDINT_H_TRUE= + GL_GENERATE_STDCKDINT_H_FALSE='#' else - GL_GENERATE_STDBOOL_H_TRUE='#' - GL_GENERATE_STDBOOL_H_FALSE= + GL_GENERATE_STDCKDINT_H_TRUE='#' + GL_GENERATE_STDCKDINT_H_FALSE= fi : - if test -z "${GL_GENERATE_STDBOOL_H_TRUE}" && test -z "${GL_GENERATE_STDBOOL_H_FALSE}"; then - GL_GENERATE_STDBOOL_H_TRUE='#' - GL_GENERATE_STDBOOL_H_FALSE='#' + if test -z "${GL_GENERATE_STDCKDINT_H_TRUE}" && test -z "${GL_GENERATE_STDCKDINT_H_FALSE}"; then + GL_GENERATE_STDCKDINT_H_TRUE='#' + GL_GENERATE_STDCKDINT_H_FALSE='#' fi @@ -31880,12 +33789,12 @@ else $as_nop if test "$cross_compiling" = yes then : case "$host_os" in - # Guess yes on glibc systems. - *-gnu* | gnu*) gl_cv_func_working_strerror="guessing yes" ;; - # Guess yes on musl systems. - *-musl*) gl_cv_func_working_strerror="guessing yes" ;; - # If we don't know, obey --enable-cross-guesses. - *) gl_cv_func_working_strerror="$gl_cross_guess_normal" ;; + # Guess yes on glibc systems. + *-gnu* | gnu*) gl_cv_func_working_strerror="guessing yes" ;; + # Guess yes on musl systems. + *-musl* | midipix*) gl_cv_func_working_strerror="guessing yes" ;; + # If we don't know, obey --enable-cross-guesses. + *) gl_cv_func_working_strerror="$gl_cross_guess_normal" ;; esac else $as_nop @@ -32047,9 +33956,13 @@ else $as_nop if test "$cross_compiling" = yes then : case "$host_os" in - # Guess no on native Windows. - mingw*) gl_cv_func_strtoll_works="guessing no" ;; - *) gl_cv_func_strtoll_works="$gl_cross_guess_normal" ;; + # Guess no on native Windows. + mingw*) gl_cv_func_strtoll_works="guessing no" ;; + # Guess no on glibc systems. + *-gnu* | gnu*) gl_cv_func_strtoll_works="guessing no" ;; + # Guess no on musl systems. + *-musl* | midipix*) gl_cv_func_strtoll_works="guessing no" ;; + *) gl_cv_func_strtoll_works="$gl_cross_guess_normal" ;; esac else $as_nop @@ -32068,6 +33981,13 @@ int result = 0; if (term != input + 1) result |= 1; } + /* This test fails on pre-C23 platforms. */ + { + const char input[] = "0b1"; + (void) strtoll (input, &term, 2); + if (term != input + 3) + result |= 2; + } return result; ; @@ -32157,9 +34077,13 @@ else $as_nop if test "$cross_compiling" = yes then : case "$host_os" in - # Guess no on native Windows. - mingw*) gl_cv_func_strtoull_works="guessing no" ;; - *) gl_cv_func_strtoull_works="$gl_cross_guess_normal" ;; + # Guess no on native Windows. + mingw*) gl_cv_func_strtoull_works="guessing no" ;; + # Guess no on glibc systems. + *-gnu* | gnu*) gl_cv_func_strtoull_works="guessing no" ;; + # Guess no on musl systems. + *-musl* | midipix*) gl_cv_func_strtoull_works="guessing no" ;; + *) gl_cv_func_strtoull_works="$gl_cross_guess_normal" ;; esac else $as_nop @@ -32178,6 +34102,13 @@ int result = 0; if (term != input + 1) result |= 1; } + /* This test fails on pre-C23 platforms. */ + { + const char input[] = "0b1"; + (void) strtoull (input, &term, 2); + if (term != input + 3) + result |= 2; + } return result; ; @@ -32314,6 +34245,8 @@ then : case "$host_os" in # Guess yes on Linux systems. linux-* | linux) gl_cv_func_unlink_honors_slashes="guessing yes" ;; + # Guess yes on systems that emulate the Linux system calls. + midipix*) gl_cv_func_unlink_honors_slashes="guessing yes" ;; # Guess yes on glibc systems. *-gnu*) gl_cv_func_unlink_honors_slashes="guessing yes" ;; # Guess no on native Windows. @@ -32528,6 +34461,8 @@ then : *-gnu* | gnu*) gl_cv_func_usleep_works="guessing yes" ;; # Guess yes on musl systems. *-musl*) gl_cv_func_usleep_works="guessing yes" ;; + # Guess yes on systems that emulate the Linux system calls. + midipix*) gl_cv_func_usleep_works="guessing yes" ;; # Guess no on native Windows. mingw*) gl_cv_func_usleep_works="guessing no" ;; # If we don't know, obey --enable-cross-guesses. @@ -34125,6 +36060,73 @@ printf "%s\n" "#define FLEXIBLE_ARRAY_MEMBER /**/" >>confdefs.h + + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for ftruncate" >&5 +printf %s "checking for ftruncate... " >&6; } +if test ${gl_cv_onwards_func_ftruncate+y} +then : + printf %s "(cached) " >&6 +else $as_nop + + exec 9>&6 6>/dev/null + + case "$host_os" in + + linux*-android*) + ac_fn_check_decl "$LINENO" "ftruncate" "ac_cv_have_decl_ftruncate" "#include <unistd.h> +" "$ac_c_undeclared_builtin_options" "CFLAGS" +if test "x$ac_cv_have_decl_ftruncate" = xyes +then : + +fi + if test $ac_cv_have_decl_ftruncate = yes; then + ac_fn_c_check_func "$LINENO" "ftruncate" "ac_cv_func_ftruncate" +if test "x$ac_cv_func_ftruncate" = xyes +then : + +fi + + if test $ac_cv_func_ftruncate = yes; then + gl_cv_onwards_func_ftruncate=yes + else + gl_cv_onwards_func_ftruncate='future OS version' + fi + else + gl_cv_onwards_func_ftruncate='future OS version' + fi + ;; + + + *) + ac_fn_c_check_func "$LINENO" "ftruncate" "ac_cv_func_ftruncate" +if test "x$ac_cv_func_ftruncate" = xyes +then : + +fi + + gl_cv_onwards_func_ftruncate=$ac_cv_func_ftruncate + ;; + + esac + + exec 6>&9 9>&- + + +fi +{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $gl_cv_onwards_func_ftruncate" >&5 +printf "%s\n" "$gl_cv_onwards_func_ftruncate" >&6; } + + case "$gl_cv_onwards_func_ftruncate" in + future*) ac_cv_func_ftruncate=no ;; + *) ac_cv_func_ftruncate=$gl_cv_onwards_func_ftruncate ;; + esac + if test $ac_cv_func_ftruncate = yes; then + +printf "%s\n" "#define HAVE_FTRUNCATE 1" >>confdefs.h + + fi + + if test $ac_cv_func_ftruncate = yes; then @@ -34136,6 +36138,9 @@ printf "%s\n" "#define FLEXIBLE_ARRAY_MEMBER /**/" >>confdefs.h else HAVE_FTRUNCATE=0 + case "$gl_cv_onwards_func_ftruncate" in + future*) REPLACE_FTRUNCATE=1 ;; + esac fi @@ -34483,6 +36488,73 @@ printf "%s\n" "#define GNULIB_TEST_GETTIMEOFDAY 1" >>confdefs.h + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for duplocale" >&5 +printf %s "checking for duplocale... " >&6; } +if test ${gl_cv_onwards_func_duplocale+y} +then : + printf %s "(cached) " >&6 +else $as_nop + + exec 9>&6 6>/dev/null + + case "$host_os" in + + linux*-android*) + ac_fn_check_decl "$LINENO" "duplocale" "ac_cv_have_decl_duplocale" "#include <locale.h> +" "$ac_c_undeclared_builtin_options" "CFLAGS" +if test "x$ac_cv_have_decl_duplocale" = xyes +then : + +fi + if test $ac_cv_have_decl_duplocale = yes; then + ac_fn_c_check_func "$LINENO" "duplocale" "ac_cv_func_duplocale" +if test "x$ac_cv_func_duplocale" = xyes +then : + +fi + + if test $ac_cv_func_duplocale = yes; then + gl_cv_onwards_func_duplocale=yes + else + gl_cv_onwards_func_duplocale='future OS version' + fi + else + gl_cv_onwards_func_duplocale='future OS version' + fi + ;; + + + *) + ac_fn_c_check_func "$LINENO" "duplocale" "ac_cv_func_duplocale" +if test "x$ac_cv_func_duplocale" = xyes +then : + +fi + + gl_cv_onwards_func_duplocale=$ac_cv_func_duplocale + ;; + + esac + + exec 6>&9 9>&- + + +fi +{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $gl_cv_onwards_func_duplocale" >&5 +printf "%s\n" "$gl_cv_onwards_func_duplocale" >&6; } + + case "$gl_cv_onwards_func_duplocale" in + future*) ac_cv_func_duplocale=no ;; + *) ac_cv_func_duplocale=$gl_cv_onwards_func_duplocale ;; + esac + if test $ac_cv_func_duplocale = yes; then + +printf "%s\n" "#define HAVE_DUPLOCALE 1" >>confdefs.h + + fi + + + @@ -35090,6 +37162,73 @@ printf "%s\n" "#define GNULIB_TEST_LISTEN 1" >>confdefs.h + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for newlocale" >&5 +printf %s "checking for newlocale... " >&6; } +if test ${gl_cv_onwards_func_newlocale+y} +then : + printf %s "(cached) " >&6 +else $as_nop + + exec 9>&6 6>/dev/null + + case "$host_os" in + + linux*-android*) + ac_fn_check_decl "$LINENO" "newlocale" "ac_cv_have_decl_newlocale" "#include <locale.h> +" "$ac_c_undeclared_builtin_options" "CFLAGS" +if test "x$ac_cv_have_decl_newlocale" = xyes +then : + +fi + if test $ac_cv_have_decl_newlocale = yes; then + ac_fn_c_check_func "$LINENO" "newlocale" "ac_cv_func_newlocale" +if test "x$ac_cv_func_newlocale" = xyes +then : + +fi + + if test $ac_cv_func_newlocale = yes; then + gl_cv_onwards_func_newlocale=yes + else + gl_cv_onwards_func_newlocale='future OS version' + fi + else + gl_cv_onwards_func_newlocale='future OS version' + fi + ;; + + + *) + ac_fn_c_check_func "$LINENO" "newlocale" "ac_cv_func_newlocale" +if test "x$ac_cv_func_newlocale" = xyes +then : + +fi + + gl_cv_onwards_func_newlocale=$ac_cv_func_newlocale + ;; + + esac + + exec 6>&9 9>&- + + +fi +{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $gl_cv_onwards_func_newlocale" >&5 +printf "%s\n" "$gl_cv_onwards_func_newlocale" >&6; } + + case "$gl_cv_onwards_func_newlocale" in + future*) ac_cv_func_newlocale=no ;; + *) ac_cv_func_newlocale=$gl_cv_onwards_func_newlocale ;; + esac + if test $ac_cv_func_newlocale = yes; then + +printf "%s\n" "#define HAVE_NEWLOCALE 1" >>confdefs.h + + fi + + + @@ -35098,22 +37237,237 @@ printf "%s\n" "#define GNULIB_TEST_LISTEN 1" >>confdefs.h if test $HAVE_LOCALE_T = 1; then + + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for newlocale" >&5 +printf %s "checking for newlocale... " >&6; } +if test ${gl_cv_onwards_func_newlocale+y} +then : + printf %s "(cached) " >&6 +else $as_nop + + exec 9>&6 6>/dev/null + + case "$host_os" in + + linux*-android*) + ac_fn_check_decl "$LINENO" "newlocale" "ac_cv_have_decl_newlocale" "#include <locale.h> +" "$ac_c_undeclared_builtin_options" "CFLAGS" +if test "x$ac_cv_have_decl_newlocale" = xyes +then : + +fi + if test $ac_cv_have_decl_newlocale = yes; then + ac_fn_c_check_func "$LINENO" "newlocale" "ac_cv_func_newlocale" +if test "x$ac_cv_func_newlocale" = xyes +then : + +fi + + if test $ac_cv_func_newlocale = yes; then + gl_cv_onwards_func_newlocale=yes + else + gl_cv_onwards_func_newlocale='future OS version' + fi + else + gl_cv_onwards_func_newlocale='future OS version' + fi + ;; + + + *) + ac_fn_c_check_func "$LINENO" "newlocale" "ac_cv_func_newlocale" +if test "x$ac_cv_func_newlocale" = xyes +then : + +fi + + gl_cv_onwards_func_newlocale=$ac_cv_func_newlocale + ;; + + esac + + exec 6>&9 9>&- + + +fi +{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $gl_cv_onwards_func_newlocale" >&5 +printf "%s\n" "$gl_cv_onwards_func_newlocale" >&6; } + + case "$gl_cv_onwards_func_newlocale" in + future*) ac_cv_func_newlocale=no ;; + *) ac_cv_func_newlocale=$gl_cv_onwards_func_newlocale ;; + esac + if test $ac_cv_func_newlocale = yes; then + +printf "%s\n" "#define HAVE_NEWLOCALE 1" >>confdefs.h + + fi + + + + + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for duplocale" >&5 +printf %s "checking for duplocale... " >&6; } +if test ${gl_cv_onwards_func_duplocale+y} +then : + printf %s "(cached) " >&6 +else $as_nop + + exec 9>&6 6>/dev/null + + case "$host_os" in + + linux*-android*) + ac_fn_check_decl "$LINENO" "duplocale" "ac_cv_have_decl_duplocale" "#include <locale.h> +" "$ac_c_undeclared_builtin_options" "CFLAGS" +if test "x$ac_cv_have_decl_duplocale" = xyes +then : + +fi + if test $ac_cv_have_decl_duplocale = yes; then + ac_fn_c_check_func "$LINENO" "duplocale" "ac_cv_func_duplocale" +if test "x$ac_cv_func_duplocale" = xyes +then : + +fi + + if test $ac_cv_func_duplocale = yes; then + gl_cv_onwards_func_duplocale=yes + else + gl_cv_onwards_func_duplocale='future OS version' + fi + else + gl_cv_onwards_func_duplocale='future OS version' + fi + ;; + + + *) + ac_fn_c_check_func "$LINENO" "duplocale" "ac_cv_func_duplocale" +if test "x$ac_cv_func_duplocale" = xyes +then : + +fi + + gl_cv_onwards_func_duplocale=$ac_cv_func_duplocale + ;; + + esac + + exec 6>&9 9>&- + + +fi +{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $gl_cv_onwards_func_duplocale" >&5 +printf "%s\n" "$gl_cv_onwards_func_duplocale" >&6; } + + case "$gl_cv_onwards_func_duplocale" in + future*) ac_cv_func_duplocale=no ;; + *) ac_cv_func_duplocale=$gl_cv_onwards_func_duplocale ;; + esac + if test $ac_cv_func_duplocale = yes; then + +printf "%s\n" "#define HAVE_DUPLOCALE 1" >>confdefs.h + + fi + + + + + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for freelocale" >&5 +printf %s "checking for freelocale... " >&6; } +if test ${gl_cv_onwards_func_freelocale+y} +then : + printf %s "(cached) " >&6 +else $as_nop + + exec 9>&6 6>/dev/null + + case "$host_os" in + + linux*-android*) + ac_fn_check_decl "$LINENO" "freelocale" "ac_cv_have_decl_freelocale" "#include <locale.h> +" "$ac_c_undeclared_builtin_options" "CFLAGS" +if test "x$ac_cv_have_decl_freelocale" = xyes +then : + +fi + if test $ac_cv_have_decl_freelocale = yes; then + ac_fn_c_check_func "$LINENO" "freelocale" "ac_cv_func_freelocale" +if test "x$ac_cv_func_freelocale" = xyes +then : + +fi + + if test $ac_cv_func_freelocale = yes; then + gl_cv_onwards_func_freelocale=yes + else + gl_cv_onwards_func_freelocale='future OS version' + fi + else + gl_cv_onwards_func_freelocale='future OS version' + fi + ;; + + + *) + ac_fn_c_check_func "$LINENO" "freelocale" "ac_cv_func_freelocale" +if test "x$ac_cv_func_freelocale" = xyes +then : + +fi + + gl_cv_onwards_func_freelocale=$ac_cv_func_freelocale + ;; + + esac + + exec 6>&9 9>&- + + +fi +{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $gl_cv_onwards_func_freelocale" >&5 +printf "%s\n" "$gl_cv_onwards_func_freelocale" >&6; } + + case "$gl_cv_onwards_func_freelocale" in + future*) ac_cv_func_freelocale=no ;; + *) ac_cv_func_freelocale=$gl_cv_onwards_func_freelocale ;; + esac + if test $ac_cv_func_freelocale = yes; then + +printf "%s\n" "#define HAVE_FREELOCALE 1" >>confdefs.h + + fi + + gl_func_newlocale="$ac_cv_func_newlocale" gl_func_duplocale="$ac_cv_func_duplocale" gl_func_freelocale="$ac_cv_func_freelocale" else - gl_func_newlocale=no + gl_cv_onwards_func_newlocale='future OS version' + gl_cv_onwards_func_duplocale='future OS version' + gl_cv_onwards_func_freelocale='future OS version' + gl_func_newlocale=no gl_func_duplocale=no gl_func_freelocale=no fi if test $gl_func_newlocale != yes; then HAVE_NEWLOCALE=0 + case "$gl_cv_onwards_func_newlocale" in + future*) REPLACE_NEWLOCALE=1 ;; + esac fi if test $gl_func_duplocale != yes; then HAVE_DUPLOCALE=0 + case "$gl_cv_onwards_func_duplocale" in + future*) REPLACE_DUPLOCALE=1 ;; + esac fi if test $gl_func_freelocale != yes; then HAVE_FREELOCALE=0 + case "$gl_cv_onwards_func_freelocale" in + future*) REPLACE_FREELOCALE=1 ;; + esac fi if test $gt_localename_enhances_locale_funcs = yes; then REPLACE_NEWLOCALE=1 @@ -35148,6 +37502,73 @@ printf "%s\n" "#define GNULIB_TEST_LOCALENAME 1" >>confdefs.h + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for newlocale" >&5 +printf %s "checking for newlocale... " >&6; } +if test ${gl_cv_onwards_func_newlocale+y} +then : + printf %s "(cached) " >&6 +else $as_nop + + exec 9>&6 6>/dev/null + + case "$host_os" in + + linux*-android*) + ac_fn_check_decl "$LINENO" "newlocale" "ac_cv_have_decl_newlocale" "#include <locale.h> +" "$ac_c_undeclared_builtin_options" "CFLAGS" +if test "x$ac_cv_have_decl_newlocale" = xyes +then : + +fi + if test $ac_cv_have_decl_newlocale = yes; then + ac_fn_c_check_func "$LINENO" "newlocale" "ac_cv_func_newlocale" +if test "x$ac_cv_func_newlocale" = xyes +then : + +fi + + if test $ac_cv_func_newlocale = yes; then + gl_cv_onwards_func_newlocale=yes + else + gl_cv_onwards_func_newlocale='future OS version' + fi + else + gl_cv_onwards_func_newlocale='future OS version' + fi + ;; + + + *) + ac_fn_c_check_func "$LINENO" "newlocale" "ac_cv_func_newlocale" +if test "x$ac_cv_func_newlocale" = xyes +then : + +fi + + gl_cv_onwards_func_newlocale=$ac_cv_func_newlocale + ;; + + esac + + exec 6>&9 9>&- + + +fi +{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $gl_cv_onwards_func_newlocale" >&5 +printf "%s\n" "$gl_cv_onwards_func_newlocale" >&6; } + + case "$gl_cv_onwards_func_newlocale" in + future*) ac_cv_func_newlocale=no ;; + *) ac_cv_func_newlocale=$gl_cv_onwards_func_newlocale ;; + esac + if test $ac_cv_func_newlocale = yes; then + +printf "%s\n" "#define HAVE_NEWLOCALE 1" >>confdefs.h + + fi + + + @@ -35845,6 +38266,67 @@ printf "%s\n" "$gt_cv_locale_fr_utf8" >&6; } + if test $REPLACE_MEMCHR = 1; then + GL_COND_OBJ_MEMCHR_TRUE= + GL_COND_OBJ_MEMCHR_FALSE='#' +else + GL_COND_OBJ_MEMCHR_TRUE='#' + GL_COND_OBJ_MEMCHR_FALSE= +fi +: + if test -z "${GL_COND_OBJ_MEMCHR_TRUE}" && test -z "${GL_COND_OBJ_MEMCHR_FALSE}"; then + GL_COND_OBJ_MEMCHR_TRUE='#' + GL_COND_OBJ_MEMCHR_FALSE='#' + fi + + if test -z "$GL_COND_OBJ_MEMCHR_TRUE"; then : + + + ac_fn_c_check_header_compile "$LINENO" "bp-sym.h" "ac_cv_header_bp_sym_h" "$ac_includes_default" +if test "x$ac_cv_header_bp_sym_h" = xyes +then : + printf "%s\n" "#define HAVE_BP_SYM_H 1" >>confdefs.h + +fi + + + +fi + + + + + + + + + + + + + + + if test "$GL_GNULIB_MEMCHR" != 1; then + if test "$GL_GNULIB_MEMCHR" = 0; then + GL_GNULIB_MEMCHR=$gl_module_indicator_condition + else + GL_GNULIB_MEMCHR="($GL_GNULIB_MEMCHR || $gl_module_indicator_condition)" + fi + fi + + + + + +printf "%s\n" "#define GNULIB_TEST_MEMCHR 1" >>confdefs.h + + + + + + + + @@ -35854,7 +38336,7 @@ printf "%s\n" "$gt_cv_locale_fr_utf8" >&6; } # Solaris 2.5.1 needs -lposix4 to get the nanosleep function. # Solaris 7 prefers the library name -lrt to the obsolescent name -lposix4. - LIB_NANOSLEEP= + NANOSLEEP_LIB= { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for library containing nanosleep" >&5 printf %s "checking for library containing nanosleep... " >&6; } @@ -35913,7 +38395,7 @@ if test "$ac_res" != no then : test "$ac_res" = "none required" || LIBS="$ac_res $LIBS" test "$ac_cv_search_nanosleep" = "none required" || - LIB_NANOSLEEP=$ac_cv_search_nanosleep + NANOSLEEP_LIB=$ac_cv_search_nanosleep fi if test "x$ac_cv_search_nanosleep" != xno; then @@ -35936,7 +38418,8 @@ else $as_nop if test "$cross_compiling" = yes then : - case "$host_os" in linux*) # Guess it halfway works when the kernel is Linux. + case "$host_os" in + linux*) # Guess it halfway works when the kernel is Linux. gl_cv_func_nanosleep='guessing no (mishandles large arguments)' ;; mingw*) # Guess no on native Windows. gl_cv_func_nanosleep='guessing no' ;; @@ -36001,6 +38484,12 @@ else $as_nop #else /* A simpler test for native Windows. */ if (nanosleep (&ts_sleep, &ts_remaining) < 0) return 3; + /* Test for 32-bit mingw bug: negative nanosecond values do not + cause failure. */ + ts_sleep.tv_sec = 1; + ts_sleep.tv_nsec = -1; + if (nanosleep (&ts_sleep, &ts_remaining) != -1) + return 7; #endif return 0; } @@ -36009,7 +38498,10 @@ if ac_fn_c_try_run "$LINENO" then : gl_cv_func_nanosleep=yes else $as_nop - case $? in 4|5|6) gl_cv_func_nanosleep='no (mishandles large arguments)';; *) gl_cv_func_nanosleep=no;; + case $? in + 4|5|6) gl_cv_func_nanosleep='no (mishandles large arguments)' ;; + 7) gl_cv_func_nanosleep='no (mishandles negative tv_nsec)' ;; + *) gl_cv_func_nanosleep=no ;; esac fi rm -f core *.core core.conftest.* gmon.out bb.out conftest$ac_exeext \ @@ -36040,6 +38532,10 @@ printf "%s\n" "#define HAVE_BUG_BIG_NANOSLEEP 1" >>confdefs.h fi LIBS=$nanosleep_save_libs + # For backward compatibility. + LIB_NANOSLEEP="$NANOSLEEP_LIB" + + if test $HAVE_NANOSLEEP = 0 || test $REPLACE_NANOSLEEP = 1; then GL_COND_OBJ_NANOSLEEP_TRUE= @@ -36518,7 +39014,142 @@ printf "%s\n" "$gt_cv_locale_fr_utf8" >&6; } - if test "$GL_GENERATE_ERRNO_H:$REPLACE_STRERROR_0" != false:0; then + + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for uselocale" >&5 +printf %s "checking for uselocale... " >&6; } +if test ${gl_cv_onwards_func_uselocale+y} +then : + printf %s "(cached) " >&6 +else $as_nop + + exec 9>&6 6>/dev/null + + case "$host_os" in + + linux*-android*) + ac_fn_check_decl "$LINENO" "uselocale" "ac_cv_have_decl_uselocale" "#include <locale.h> +" "$ac_c_undeclared_builtin_options" "CFLAGS" +if test "x$ac_cv_have_decl_uselocale" = xyes +then : + +fi + if test $ac_cv_have_decl_uselocale = yes; then + ac_fn_c_check_func "$LINENO" "uselocale" "ac_cv_func_uselocale" +if test "x$ac_cv_func_uselocale" = xyes +then : + +fi + + if test $ac_cv_func_uselocale = yes; then + gl_cv_onwards_func_uselocale=yes + else + gl_cv_onwards_func_uselocale='future OS version' + fi + else + gl_cv_onwards_func_uselocale='future OS version' + fi + ;; + + + *) + ac_fn_c_check_func "$LINENO" "uselocale" "ac_cv_func_uselocale" +if test "x$ac_cv_func_uselocale" = xyes +then : + +fi + + gl_cv_onwards_func_uselocale=$ac_cv_func_uselocale + ;; + + esac + + exec 6>&9 9>&- + + +fi +{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $gl_cv_onwards_func_uselocale" >&5 +printf "%s\n" "$gl_cv_onwards_func_uselocale" >&6; } + + case "$gl_cv_onwards_func_uselocale" in + future*) ac_cv_func_uselocale=no ;; + *) ac_cv_func_uselocale=$gl_cv_onwards_func_uselocale ;; + esac + if test $ac_cv_func_uselocale = yes; then + +printf "%s\n" "#define HAVE_USELOCALE 1" >>confdefs.h + + fi + + + + if test $ac_cv_func_uselocale = yes; then + + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking whether uselocale works" >&5 +printf %s "checking whether uselocale works... " >&6; } +if test ${gt_cv_func_uselocale_works+y} +then : + printf %s "(cached) " >&6 +else $as_nop + if test "$cross_compiling" = yes +then : + # Guess no on AIX and z/OS, yes otherwise. + case "$host_os" in + aix* | openedition*) gt_cv_func_uselocale_works="guessing no" ;; + *) gt_cv_func_uselocale_works="guessing yes" ;; + esac + +else $as_nop + cat confdefs.h - <<_ACEOF >conftest.$ac_ext +/* end confdefs.h. */ + +#include <locale.h> +#if HAVE_XLOCALE_H +# include <xlocale.h> +#endif +locale_t loc1; +int main () +{ + uselocale (NULL); + setlocale (LC_ALL, "en_US.UTF-8"); + return 0; +} +_ACEOF +if ac_fn_c_try_run "$LINENO" +then : + gt_cv_func_uselocale_works=yes +else $as_nop + gt_cv_func_uselocale_works=no +fi +rm -f core *.core core.conftest.* gmon.out bb.out conftest$ac_exeext \ + conftest.$ac_objext conftest.beam conftest.$ac_ext +fi + + +fi +{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $gt_cv_func_uselocale_works" >&5 +printf "%s\n" "$gt_cv_func_uselocale_works" >&6; } + else + gt_cv_func_uselocale_works=no + fi + case "$gt_cv_func_uselocale_works" in + *yes) + gt_working_uselocale=yes + +printf "%s\n" "#define HAVE_WORKING_USELOCALE 1" >>confdefs.h + + ;; + *) + gt_working_uselocale=no + ;; + esac + + + + + + + + if test "$GL_GENERATE_ERRNO_H:$REPLACE_STRERROR_0" != false:0; then REPLACE_PERROR=1 fi case ${gl_cv_func_strerror_r_works-unset} in @@ -36532,12 +39163,12 @@ else $as_nop if test "$cross_compiling" = yes then : case "$host_os" in - # Guess yes on musl systems. - *-musl*) gl_cv_func_perror_works="guessing yes" ;; - # Guess yes on native Windows. - mingw*) gl_cv_func_perror_works="guessing yes" ;; - # Otherwise obey --enable-cross-guesses. - *) gl_cv_func_perror_works="$gl_cross_guess_normal" ;; + # Guess yes on musl systems. + *-musl* | midipix*) gl_cv_func_perror_works="guessing yes" ;; + # Guess yes on native Windows. + mingw*) gl_cv_func_perror_works="guessing yes" ;; + # Otherwise obey --enable-cross-guesses. + *) gl_cv_func_perror_works="$gl_cross_guess_normal" ;; esac else $as_nop @@ -36592,6 +39223,10 @@ printf "%s\n" "$gl_cv_func_perror_works" >&6; } REPLACE_PERROR=1 ;; esac + case "$host_os" in + # Yes on Android 11. + linux*-android*) REPLACE_PERROR=1 ;; + esac if test $REPLACE_PERROR = 1; then @@ -36746,6 +39381,8 @@ then : case "$host_os" in # Guess yes on Linux systems. linux-* | linux) gl_cv_func_pselect_detects_ebadf="guessing yes" ;; + # Guess yes on systems that emulate the Linux system calls. + midipix*) gl_cv_func_pselect_detects_ebadf="guessing yes" ;; # Guess yes on glibc systems. *-gnu* | gnu*) gl_cv_func_pselect_detects_ebadf="guessing yes" ;; # If we don't know, obey --enable-cross-guesses. @@ -37002,7 +39639,7 @@ fi { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $gl_cv_func_pthread_sigmask_macro" >&5 printf "%s\n" "$gl_cv_func_pthread_sigmask_macro" >&6; } - LIB_PTHREAD_SIGMASK= + PTHREAD_SIGMASK_LIB= if test $gl_cv_func_pthread_sigmask_macro = yes; then HAVE_PTHREAD_SIGMASK=0 @@ -37052,7 +39689,7 @@ fi { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $gl_cv_func_pthread_sigmask_in_LIBMULTITHREAD" >&5 printf "%s\n" "$gl_cv_func_pthread_sigmask_in_LIBMULTITHREAD" >&6; } if test $gl_cv_func_pthread_sigmask_in_LIBMULTITHREAD = yes; then - LIB_PTHREAD_SIGMASK="$LIBMULTITHREAD" + PTHREAD_SIGMASK_LIB="$LIBMULTITHREAD" else HAVE_PTHREAD_SIGMASK=0 fi @@ -37071,11 +39708,13 @@ printf "%s\n" "$gl_cv_func_pthread_sigmask_in_LIBMULTITHREAD" >&6; } fi + LIB_PTHREAD_SIGMASK="$PTHREAD_SIGMASK_LIB" + if test $HAVE_PTHREAD_SIGMASK = 1; then - if test -z "$LIB_PTHREAD_SIGMASK"; then + if test -z "$PTHREAD_SIGMASK_LIB"; then case " $LIBS " in *' -pthread '*) ;; *' -lpthread '*) ;; @@ -37144,7 +39783,7 @@ then : else $as_nop gl_save_LIBS="$LIBS" - LIBS="$LIBS $LIB_PTHREAD_SIGMASK" + LIBS="$LIBS $PTHREAD_SIGMASK_LIB" if test "$cross_compiling" = yes then : case "$host_os" in @@ -37216,6 +39855,7 @@ else $as_nop cat confdefs.h - <<_ACEOF >conftest.$ac_ext /* end confdefs.h. */ +#include <limits.h> #include <pthread.h> #include <signal.h> #include <stdio.h> @@ -37234,14 +39874,16 @@ sigint_handler (int sig) int main () { sigset_t set; - int pid = getpid (); + pid_t pid = getpid (); char command[80]; + if (LONG_MAX < pid) + return 6; signal (SIGINT, sigint_handler); sigemptyset (&set); sigaddset (&set, SIGINT); if (!(pthread_sigmask (SIG_BLOCK, &set, NULL) == 0)) return 1; - sprintf (command, "sh -c 'sleep 1; kill -%d %d' &", SIGINT, pid); + sprintf (command, "sh -c 'sleep 1; kill -INT %ld' &", (long) pid); if (!(system (command) == 0)) return 2; sleep (2); @@ -37340,14 +39982,14 @@ else $as_nop if test "$cross_compiling" = yes then : case "$host_os" in - # Guess yes on glibc systems. - *-gnu* | gnu*) gl_cv_func_svid_putenv="guessing yes" ;; - # Guess yes on musl systems. - *-musl*) gl_cv_func_svid_putenv="guessing yes" ;; - # Guess no on native Windows. - mingw*) gl_cv_func_svid_putenv="guessing no" ;; - # If we don't know, obey --enable-cross-guesses. - *) gl_cv_func_svid_putenv="$gl_cross_guess_normal" ;; + # Guess yes on glibc systems. + *-gnu* | gnu*) gl_cv_func_svid_putenv="guessing yes" ;; + # Guess yes on musl systems. + *-musl* | midipix*) gl_cv_func_svid_putenv="guessing yes" ;; + # Guess no on native Windows. + mingw*) gl_cv_func_svid_putenv="guessing no" ;; + # If we don't know, obey --enable-cross-guesses. + *) gl_cv_func_svid_putenv="$gl_cross_guess_normal" ;; esac else $as_nop @@ -37683,6 +40325,8 @@ then : case "$host_os" in # Guess yes on Linux systems. linux-* | linux) gl_cv_func_select_detects_ebadf="guessing yes" ;; + # Guess yes on systems that emulate the Linux system calls. + midipix*) gl_cv_func_select_detects_ebadf="guessing yes" ;; # Guess yes on glibc systems. *-gnu* | gnu*) gl_cv_func_select_detects_ebadf="guessing yes" ;; # If we don't know, obey --enable-cross-guesses. @@ -37742,7 +40386,7 @@ printf "%s\n" "$gl_cv_func_select_detects_ebadf" >&6; } esac fi - LIB_SELECT="$LIBSOCKET" + SELECT_LIB="$LIBSOCKET" if test $REPLACE_SELECT = 1; then case "$host_os" in mingw*) @@ -37762,7 +40406,7 @@ if ac_fn_c_try_link "$LINENO" then : else $as_nop - LIB_SELECT="$LIB_SELECT -luser32" + SELECT_LIB="$SELECT_LIB -luser32" fi rm -f core conftest.err conftest.$ac_objext conftest.beam \ conftest$ac_exeext conftest.$ac_ext @@ -37770,6 +40414,8 @@ rm -f core conftest.err conftest.$ac_objext conftest.beam \ esac fi + LIB_SELECT="$LIB_SELECT" + if test $REPLACE_SELECT = 1; then @@ -37825,12 +40471,12 @@ else $as_nop if test "$cross_compiling" = yes then : case "$host_os" in - # Guess yes on glibc systems. - *-gnu* | gnu*) gl_cv_func_setenv_works="guessing yes" ;; - # Guess yes on musl systems. - *-musl*) gl_cv_func_setenv_works="guessing yes" ;; - # If we don't know, obey --enable-cross-guesses. - *) gl_cv_func_setenv_works="$gl_cross_guess_normal" ;; + # Guess yes on glibc systems. + *-gnu* | gnu*) gl_cv_func_setenv_works="guessing yes" ;; + # Guess yes on musl systems. + *-musl* | midipix*) gl_cv_func_setenv_works="guessing yes" ;; + # If we don't know, obey --enable-cross-guesses. + *) gl_cv_func_setenv_works="$gl_cross_guess_normal" ;; esac else $as_nop @@ -38000,11 +40646,13 @@ printf "%s\n" "#define NEED_SETLOCALE_MTSAFE $NEED_SETLOCALE_MTSAFE" >>confdefs. fi if test $NEED_SETLOCALE_MTSAFE = 1; then - LIB_SETLOCALE="$LIB_SETLOCALE_NULL" + SETLOCALE_LIB="$SETLOCALE_NULL_LIB" else - LIB_SETLOCALE= + SETLOCALE_LIB= fi + LIB_SETLOCALE="$SETLOCALE_LIB" + if test $REPLACE_SETLOCALE = 1; then @@ -38886,6 +41534,73 @@ then : + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for catgets" >&5 +printf %s "checking for catgets... " >&6; } +if test ${gl_cv_onwards_func_catgets+y} +then : + printf %s "(cached) " >&6 +else $as_nop + + exec 9>&6 6>/dev/null + + case "$host_os" in + + linux*-android*) + ac_fn_check_decl "$LINENO" "catgets" "ac_cv_have_decl_catgets" "#include <nl_types.h> +" "$ac_c_undeclared_builtin_options" "CFLAGS" +if test "x$ac_cv_have_decl_catgets" = xyes +then : + +fi + if test $ac_cv_have_decl_catgets = yes; then + ac_fn_c_check_func "$LINENO" "catgets" "ac_cv_func_catgets" +if test "x$ac_cv_func_catgets" = xyes +then : + +fi + + if test $ac_cv_func_catgets = yes; then + gl_cv_onwards_func_catgets=yes + else + gl_cv_onwards_func_catgets='future OS version' + fi + else + gl_cv_onwards_func_catgets='future OS version' + fi + ;; + + + *) + ac_fn_c_check_func "$LINENO" "catgets" "ac_cv_func_catgets" +if test "x$ac_cv_func_catgets" = xyes +then : + +fi + + gl_cv_onwards_func_catgets=$ac_cv_func_catgets + ;; + + esac + + exec 6>&9 9>&- + + +fi +{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $gl_cv_onwards_func_catgets" >&5 +printf "%s\n" "$gl_cv_onwards_func_catgets" >&6; } + + case "$gl_cv_onwards_func_catgets" in + future*) ac_cv_func_catgets=no ;; + *) ac_cv_func_catgets=$gl_cv_onwards_func_catgets ;; + esac + if test $ac_cv_func_catgets = yes; then + +printf "%s\n" "#define HAVE_CATGETS 1" >>confdefs.h + + fi + + + fi @@ -38941,6 +41656,8 @@ then : case "$host_os" in # Guess yes on Linux systems. linux-* | linux) gl_cv_func_symlink_works="guessing yes" ;; + # Guess yes on systems that emulate the Linux system calls. + midipix*) gl_cv_func_symlink_works="guessing yes" ;; # Guess yes on glibc systems. *-gnu* | gnu*) gl_cv_func_symlink_works="guessing yes" ;; # If we don't know, obey --enable-cross-guesses. @@ -39071,13 +41788,74 @@ printf "%s\n" "#define GNULIB_TEST_SYMLINK 1" >>confdefs.h if test $gl_threads_api = posix; then gl_save_LIBS="$LIBS" LIBS="$LIBS $LIBMULTITHREAD" - ac_fn_c_check_func "$LINENO" "pthread_atfork" "ac_cv_func_pthread_atfork" + + + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for pthread_atfork" >&5 +printf %s "checking for pthread_atfork... " >&6; } +if test ${gl_cv_onwards_func_pthread_atfork+y} +then : + printf %s "(cached) " >&6 +else $as_nop + + exec 9>&6 6>/dev/null + + case "$host_os" in + + linux*-android*) + ac_fn_check_decl "$LINENO" "pthread_atfork" "ac_cv_have_decl_pthread_atfork" "#include <pthread.h> +" "$ac_c_undeclared_builtin_options" "CFLAGS" +if test "x$ac_cv_have_decl_pthread_atfork" = xyes +then : + +fi + if test $ac_cv_have_decl_pthread_atfork = yes; then + ac_fn_c_check_func "$LINENO" "pthread_atfork" "ac_cv_func_pthread_atfork" if test "x$ac_cv_func_pthread_atfork" = xyes then : - printf "%s\n" "#define HAVE_PTHREAD_ATFORK 1" >>confdefs.h fi + if test $ac_cv_func_pthread_atfork = yes; then + gl_cv_onwards_func_pthread_atfork=yes + else + gl_cv_onwards_func_pthread_atfork='future OS version' + fi + else + gl_cv_onwards_func_pthread_atfork='future OS version' + fi + ;; + + + *) + ac_fn_c_check_func "$LINENO" "pthread_atfork" "ac_cv_func_pthread_atfork" +if test "x$ac_cv_func_pthread_atfork" = xyes +then : + +fi + + gl_cv_onwards_func_pthread_atfork=$ac_cv_func_pthread_atfork + ;; + + esac + + exec 6>&9 9>&- + + +fi +{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $gl_cv_onwards_func_pthread_atfork" >&5 +printf "%s\n" "$gl_cv_onwards_func_pthread_atfork" >&6; } + + case "$gl_cv_onwards_func_pthread_atfork" in + future*) ac_cv_func_pthread_atfork=no ;; + *) ac_cv_func_pthread_atfork=$gl_cv_onwards_func_pthread_atfork ;; + esac + if test $ac_cv_func_pthread_atfork = yes; then + +printf "%s\n" "#define HAVE_PTHREAD_ATFORK 1" >>confdefs.h + + fi + + LIBS="$gl_save_LIBS" fi @@ -39090,6 +41868,95 @@ fi + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking whether time() works" >&5 +printf %s "checking whether time() works... " >&6; } +if test ${gl_cv_func_time_works+y} +then : + printf %s "(cached) " >&6 +else $as_nop + case "$host_os" in + linux*-gnu*) + cat confdefs.h - <<_ACEOF >conftest.$ac_ext +/* end confdefs.h. */ + + #include <features.h> + #ifdef __GNU_LIBRARY__ + #if __GLIBC__ == 2 + Unlucky GNU user + #endif + #endif + +_ACEOF +if (eval "$ac_cpp conftest.$ac_ext") 2>&5 | + $EGREP "Unlucky" >/dev/null 2>&1 +then : + gl_cv_func_time_works="guessing no" +else $as_nop + gl_cv_func_time_works="guessing yes" +fi +rm -rf conftest* + + ;; + aix*) gl_cv_func_time_works="guessing no";; + mingw*) gl_cv_func_time_works="guessing no";; + *) gl_cv_func_time_works="guessing yes";; + esac + +fi +{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $gl_cv_func_time_works" >&5 +printf "%s\n" "$gl_cv_func_time_works" >&6; } + case "$gl_cv_func_time_works" in + *no) REPLACE_TIME=1 ;; + esac + + + if test $REPLACE_TIME = 1; then + GL_COND_OBJ_TIME_TRUE= + GL_COND_OBJ_TIME_FALSE='#' +else + GL_COND_OBJ_TIME_TRUE='#' + GL_COND_OBJ_TIME_FALSE= +fi +: + if test -z "${GL_COND_OBJ_TIME_TRUE}" && test -z "${GL_COND_OBJ_TIME_FALSE}"; then + GL_COND_OBJ_TIME_TRUE='#' + GL_COND_OBJ_TIME_FALSE='#' + fi + + if test -z "$GL_COND_OBJ_TIME_TRUE"; then : + + + : + + +fi + + + + + + + + + + if test "$GL_GNULIB_TIME" != 1; then + if test "$GL_GNULIB_TIME" = 0; then + GL_GNULIB_TIME=$gl_module_indicator_condition + else + GL_GNULIB_TIME="($GL_GNULIB_TIME || $gl_module_indicator_condition)" + fi + fi + + + + + +printf "%s\n" "#define GNULIB_TEST_TIME 1" >>confdefs.h + + + + + # The Hurd, the Linux kernel, the FreeBSD kernel version 2.2 and later, @@ -40381,11 +43248,13 @@ printf "%s\n" "$gl_cv_cc_uninitialized_supported" >&6; } # them here so that the above 'comm' command doesn't report a false match. as_fn_append ws ' -Warray-bounds=2' as_fn_append ws ' -Wattribute-alias=2' + as_fn_append ws ' -Wbidi-chars=any,ucn' as_fn_append ws ' -Wformat-overflow=2' as_fn_append ws ' -Wformat=2' as_fn_append ws ' -Wformat-truncation=2' as_fn_append ws ' -Wimplicit-fallthrough=5' as_fn_append ws ' -Wshift-overflow=2' + as_fn_append ws ' -Wuse-after-free=3' as_fn_append ws ' -Wunused-const-variable=2' as_fn_append ws ' -Wvla-larger-than=4031' @@ -52981,6 +55850,18 @@ if test -z "${am__fastdepCC_TRUE}" && test -z "${am__fastdepCC_FALSE}"; then as_fn_error $? "conditional \"am__fastdepCC\" 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 + +# Check whether --enable-largefile was given. +if test ${enable_largefile+y} +then : + enableval=$enable_largefile; +fi + if test -z "${GL_COND_LIBTOOL_TRUE}" && test -z "${GL_COND_LIBTOOL_FALSE}"; then as_fn_error $? "conditional \"GL_COND_LIBTOOL\" was never defined. Usually this means the macro was only invoked conditionally." "$LINENO" 5 @@ -53442,7 +56323,7 @@ cat >>$CONFIG_STATUS <<\_ACEOF || ac_write_fail=1 # report actual input values of CONFIG_FILES etc. instead of their # values after options handling. ac_log=" -This file was extended by GNU parted $as_me 3.5, which was +This file was extended by GNU parted $as_me 3.6, which was generated by GNU Autoconf 2.71. Invocation command line was CONFIG_FILES = $CONFIG_FILES @@ -53516,7 +56397,7 @@ ac_cs_config_escaped=`printf "%s\n" "$ac_cs_config" | sed "s/^ //; s/'/'\\\\\\\\ cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1 ac_cs_config='$ac_cs_config_escaped' ac_cs_version="\\ -GNU parted config.status 3.5 +GNU parted config.status 3.6 configured by $0, generated by GNU Autoconf 2.71, with options \\"\$ac_cs_config\\" diff --git a/configure.ac b/configure.ac index ee6d1cf..cf9fb8a 100644 --- a/configure.ac +++ b/configure.ac @@ -1,5 +1,5 @@ dnl GNU Parted - a library and front end for manipulation hard disk partitions -dnl Copyright (C) 1998-2002, 2005-2014, 2019-2022 Free Software Foundation, +dnl Copyright (C) 1998-2002, 2005-2014, 2019-2023 Free Software Foundation, dnl Inc. dnl dnl This file may be modified and/or distributed without restriction. diff --git a/debug/Makefile.in b/debug/Makefile.in index 938f808..5031d31 100644 --- a/debug/Makefile.in +++ b/debug/Makefile.in @@ -69,9 +69,6 @@ am__make_running_with_option = \ test $$has_opt = yes am__make_dryrun = (target_option=n; $(am__make_running_with_option)) am__make_keepgoing = (target_option=k; $(am__make_running_with_option)) -pkgdatadir = $(datadir)/@PACKAGE@ -pkgincludedir = $(includedir)/@PACKAGE@ -pkglibdir = $(libdir)/@PACKAGE@ am__cd = CDPATH="$${ZSH_VERSION+.}$(PATH_SEPARATOR)" && cd install_sh_DATA = $(install_sh) -c -m 644 install_sh_PROGRAM = $(install_sh) -c @@ -92,7 +89,9 @@ am__aclocal_m4_deps = $(top_srcdir)/m4/00gnulib.m4 \ $(top_srcdir)/m4/__inline.m4 \ $(top_srcdir)/m4/absolute-header.m4 $(top_srcdir)/m4/alloca.m4 \ $(top_srcdir)/m4/arpa_inet_h.m4 $(top_srcdir)/m4/assert.m4 \ - $(top_srcdir)/m4/btowc.m4 $(top_srcdir)/m4/builtin-expect.m4 \ + $(top_srcdir)/m4/assert_h.m4 $(top_srcdir)/m4/btowc.m4 \ + $(top_srcdir)/m4/build-to-host.m4 \ + $(top_srcdir)/m4/builtin-expect.m4 $(top_srcdir)/m4/c-bool.m4 \ $(top_srcdir)/m4/calloc.m4 $(top_srcdir)/m4/canonicalize.m4 \ $(top_srcdir)/m4/clock_time.m4 $(top_srcdir)/m4/close.m4 \ $(top_srcdir)/m4/codeset.m4 $(top_srcdir)/m4/config-h.m4 \ @@ -100,7 +99,7 @@ am__aclocal_m4_deps = $(top_srcdir)/m4/00gnulib.m4 \ $(top_srcdir)/m4/double-slash-root.m4 $(top_srcdir)/m4/dup2.m4 \ $(top_srcdir)/m4/eealloc.m4 $(top_srcdir)/m4/environ.m4 \ $(top_srcdir)/m4/errno_h.m4 $(top_srcdir)/m4/error.m4 \ - $(top_srcdir)/m4/extensions.m4 \ + $(top_srcdir)/m4/error_h.m4 $(top_srcdir)/m4/extensions.m4 \ $(top_srcdir)/m4/extern-inline.m4 $(top_srcdir)/m4/fcntl-o.m4 \ $(top_srcdir)/m4/fcntl.m4 $(top_srcdir)/m4/fcntl_h.m4 \ $(top_srcdir)/m4/fdopen.m4 $(top_srcdir)/m4/flexmember.m4 \ @@ -132,10 +131,11 @@ am__aclocal_m4_deps = $(top_srcdir)/m4/00gnulib.m4 \ $(top_srcdir)/m4/malloc.m4 $(top_srcdir)/m4/malloca.m4 \ $(top_srcdir)/m4/manywarnings.m4 $(top_srcdir)/m4/mbrtowc.m4 \ $(top_srcdir)/m4/mbsinit.m4 $(top_srcdir)/m4/mbstate_t.m4 \ - $(top_srcdir)/m4/mbtowc.m4 $(top_srcdir)/m4/mempcpy.m4 \ - $(top_srcdir)/m4/minmax.m4 $(top_srcdir)/m4/mkdir.m4 \ - $(top_srcdir)/m4/mkstemp.m4 $(top_srcdir)/m4/mmap-anon.m4 \ - $(top_srcdir)/m4/mode_t.m4 $(top_srcdir)/m4/msvc-inval.m4 \ + $(top_srcdir)/m4/mbtowc.m4 $(top_srcdir)/m4/memchr.m4 \ + $(top_srcdir)/m4/mempcpy.m4 $(top_srcdir)/m4/minmax.m4 \ + $(top_srcdir)/m4/mkdir.m4 $(top_srcdir)/m4/mkstemp.m4 \ + $(top_srcdir)/m4/mmap-anon.m4 $(top_srcdir)/m4/mode_t.m4 \ + $(top_srcdir)/m4/msvc-inval.m4 \ $(top_srcdir)/m4/msvc-nothrow.m4 $(top_srcdir)/m4/multiarch.m4 \ $(top_srcdir)/m4/musl.m4 $(top_srcdir)/m4/nanosleep.m4 \ $(top_srcdir)/m4/netinet_in_h.m4 \ @@ -166,29 +166,29 @@ am__aclocal_m4_deps = $(top_srcdir)/m4/00gnulib.m4 \ $(top_srcdir)/m4/socklen.m4 $(top_srcdir)/m4/sockpfaf.m4 \ $(top_srcdir)/m4/ssize_t.m4 $(top_srcdir)/m4/stat-time.m4 \ $(top_srcdir)/m4/stat.m4 $(top_srcdir)/m4/stdalign.m4 \ - $(top_srcdir)/m4/stdarg.m4 $(top_srcdir)/m4/stdbool.m4 \ - $(top_srcdir)/m4/stddef_h.m4 $(top_srcdir)/m4/stdint.m4 \ - $(top_srcdir)/m4/stdio_h.m4 $(top_srcdir)/m4/stdlib_h.m4 \ - $(top_srcdir)/m4/strdup.m4 $(top_srcdir)/m4/strerror.m4 \ - $(top_srcdir)/m4/strerror_r.m4 $(top_srcdir)/m4/string_h.m4 \ - $(top_srcdir)/m4/strtoll.m4 $(top_srcdir)/m4/strtoull.m4 \ - $(top_srcdir)/m4/symlink.m4 $(top_srcdir)/m4/sys_ioctl_h.m4 \ + $(top_srcdir)/m4/stdarg.m4 $(top_srcdir)/m4/stddef_h.m4 \ + $(top_srcdir)/m4/stdint.m4 $(top_srcdir)/m4/stdio_h.m4 \ + $(top_srcdir)/m4/stdlib_h.m4 $(top_srcdir)/m4/strdup.m4 \ + $(top_srcdir)/m4/strerror.m4 $(top_srcdir)/m4/strerror_r.m4 \ + $(top_srcdir)/m4/string_h.m4 $(top_srcdir)/m4/strtoll.m4 \ + $(top_srcdir)/m4/strtoull.m4 $(top_srcdir)/m4/symlink.m4 \ + $(top_srcdir)/m4/sys_ioctl_h.m4 \ $(top_srcdir)/m4/sys_random_h.m4 \ $(top_srcdir)/m4/sys_select_h.m4 \ $(top_srcdir)/m4/sys_socket_h.m4 \ $(top_srcdir)/m4/sys_stat_h.m4 $(top_srcdir)/m4/sys_time_h.m4 \ $(top_srcdir)/m4/sys_types_h.m4 $(top_srcdir)/m4/sys_uio_h.m4 \ $(top_srcdir)/m4/tempname.m4 $(top_srcdir)/m4/thread.m4 \ - $(top_srcdir)/m4/threadlib.m4 $(top_srcdir)/m4/time_h.m4 \ - $(top_srcdir)/m4/unistd_h.m4 $(top_srcdir)/m4/unlink.m4 \ - $(top_srcdir)/m4/unlinkdir.m4 $(top_srcdir)/m4/usleep.m4 \ - $(top_srcdir)/m4/version-etc.m4 $(top_srcdir)/m4/visibility.m4 \ - $(top_srcdir)/m4/warn-on-use.m4 $(top_srcdir)/m4/warnings.m4 \ - $(top_srcdir)/m4/wchar_h.m4 $(top_srcdir)/m4/wchar_t.m4 \ - $(top_srcdir)/m4/wcrtomb.m4 $(top_srcdir)/m4/wctob.m4 \ - $(top_srcdir)/m4/wctomb.m4 $(top_srcdir)/m4/wctype_h.m4 \ - $(top_srcdir)/m4/wint_t.m4 $(top_srcdir)/m4/xalloc.m4 \ - $(top_srcdir)/m4/xstrtol.m4 $(top_srcdir)/m4/year2038.m4 \ + $(top_srcdir)/m4/threadlib.m4 $(top_srcdir)/m4/time.m4 \ + $(top_srcdir)/m4/time_h.m4 $(top_srcdir)/m4/unistd_h.m4 \ + $(top_srcdir)/m4/unlink.m4 $(top_srcdir)/m4/unlinkdir.m4 \ + $(top_srcdir)/m4/usleep.m4 $(top_srcdir)/m4/version-etc.m4 \ + $(top_srcdir)/m4/visibility.m4 $(top_srcdir)/m4/warn-on-use.m4 \ + $(top_srcdir)/m4/warnings.m4 $(top_srcdir)/m4/wchar_h.m4 \ + $(top_srcdir)/m4/wchar_t.m4 $(top_srcdir)/m4/wcrtomb.m4 \ + $(top_srcdir)/m4/wctob.m4 $(top_srcdir)/m4/wctomb.m4 \ + $(top_srcdir)/m4/wctype_h.m4 $(top_srcdir)/m4/wint_t.m4 \ + $(top_srcdir)/m4/xalloc.m4 $(top_srcdir)/m4/xstrtol.m4 \ $(top_srcdir)/m4/yield.m4 $(top_srcdir)/m4/zzgnulib.m4 \ $(top_srcdir)/configure.ac am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \ @@ -278,6 +278,9 @@ am__relativize = \ dir1=`echo "$$dir1" | sed -e "$$sed_rest"`; \ done; \ reldir="$$dir2" +pkgdatadir = @pkgdatadir@ +pkgincludedir = @pkgincludedir@ +pkglibdir = @pkglibdir@ pkglibexecdir = @pkglibexecdir@ ACLOCAL = @ACLOCAL@ ALLOCA = @ALLOCA@ @@ -287,6 +290,7 @@ AM_DEFAULT_VERBOSITY = @AM_DEFAULT_VERBOSITY@ APPLE_UNIVERSAL_BUILD = @APPLE_UNIVERSAL_BUILD@ AR = @AR@ ARFLAGS = @ARFLAGS@ +ASSERT_H = @ASSERT_H@ AUTOCONF = @AUTOCONF@ AUTOHEADER = @AUTOHEADER@ AUTOMAKE = @AUTOMAKE@ @@ -303,6 +307,7 @@ CFLAGS = @CFLAGS@ CFLAG_VISIBILITY = @CFLAG_VISIBILITY@ CHECK_CFLAGS = @CHECK_CFLAGS@ CHECK_LIBS = @CHECK_LIBS@ +CLOCK_TIME_LIB = @CLOCK_TIME_LIB@ CONFIG_INCLUDE = @CONFIG_INCLUDE@ CPP = @CPP@ CPPFLAGS = @CPPFLAGS@ @@ -327,12 +332,14 @@ ENOLINK_VALUE = @ENOLINK_VALUE@ EOVERFLOW_HIDDEN = @EOVERFLOW_HIDDEN@ EOVERFLOW_VALUE = @EOVERFLOW_VALUE@ ERRNO_H = @ERRNO_H@ +ERROR_H = @ERROR_H@ ETAGS = @ETAGS@ EXEEXT = @EXEEXT@ FGREP = @FGREP@ FILECMD = @FILECMD@ GETOPT_CDEFS_H = @GETOPT_CDEFS_H@ GETOPT_H = @GETOPT_H@ +GETRANDOM_LIB = @GETRANDOM_LIB@ GETTEXT_MACRO_VERSION = @GETTEXT_MACRO_VERSION@ GL_CFLAG_ALLOW_WARNINGS = @GL_CFLAG_ALLOW_WARNINGS@ GL_CFLAG_GNULIB_WARNINGS = @GL_CFLAG_GNULIB_WARNINGS@ @@ -348,6 +355,7 @@ GL_GNULIB_CALLOC_GNU = @GL_GNULIB_CALLOC_GNU@ GL_GNULIB_CALLOC_POSIX = @GL_GNULIB_CALLOC_POSIX@ GL_GNULIB_CANONICALIZE_FILE_NAME = @GL_GNULIB_CANONICALIZE_FILE_NAME@ GL_GNULIB_CHDIR = @GL_GNULIB_CHDIR@ +GL_GNULIB_CHMOD = @GL_GNULIB_CHMOD@ GL_GNULIB_CHOWN = @GL_GNULIB_CHOWN@ GL_GNULIB_CLOSE = @GL_GNULIB_CLOSE@ GL_GNULIB_CONNECT = @GL_GNULIB_CONNECT@ @@ -421,6 +429,7 @@ GL_GNULIB_GETPAGESIZE = @GL_GNULIB_GETPAGESIZE@ GL_GNULIB_GETPASS = @GL_GNULIB_GETPASS@ GL_GNULIB_GETPASS_GNU = @GL_GNULIB_GETPASS_GNU@ GL_GNULIB_GETPEERNAME = @GL_GNULIB_GETPEERNAME@ +GL_GNULIB_GETPROGNAME = @GL_GNULIB_GETPROGNAME@ GL_GNULIB_GETRANDOM = @GL_GNULIB_GETRANDOM@ GL_GNULIB_GETSOCKNAME = @GL_GNULIB_GETSOCKNAME@ GL_GNULIB_GETSOCKOPT = @GL_GNULIB_GETSOCKOPT@ @@ -518,6 +527,7 @@ GL_GNULIB_MEMCHR = @GL_GNULIB_MEMCHR@ GL_GNULIB_MEMMEM = @GL_GNULIB_MEMMEM@ GL_GNULIB_MEMPCPY = @GL_GNULIB_MEMPCPY@ GL_GNULIB_MEMRCHR = @GL_GNULIB_MEMRCHR@ +GL_GNULIB_MEMSET_EXPLICIT = @GL_GNULIB_MEMSET_EXPLICIT@ GL_GNULIB_MKDIR = @GL_GNULIB_MKDIR@ GL_GNULIB_MKDIRAT = @GL_GNULIB_MKDIRAT@ GL_GNULIB_MKDTEMP = @GL_GNULIB_MKDTEMP@ @@ -638,6 +648,7 @@ GL_GNULIB_STRVERSCMP = @GL_GNULIB_STRVERSCMP@ GL_GNULIB_SYMLINK = @GL_GNULIB_SYMLINK@ GL_GNULIB_SYMLINKAT = @GL_GNULIB_SYMLINKAT@ GL_GNULIB_SYSTEM_POSIX = @GL_GNULIB_SYSTEM_POSIX@ +GL_GNULIB_TIME = @GL_GNULIB_TIME@ GL_GNULIB_TIMEGM = @GL_GNULIB_TIMEGM@ GL_GNULIB_TIMESPEC_GET = @GL_GNULIB_TIMESPEC_GET@ GL_GNULIB_TIMESPEC_GETRES = @GL_GNULIB_TIMESPEC_GETRES@ @@ -712,6 +723,7 @@ GMSGFMT_015 = @GMSGFMT_015@ GNULIBHEADERS_OVERRIDE_WINT_T = @GNULIBHEADERS_OVERRIDE_WINT_T@ GNULIB_GETTIMEOFDAY = @GNULIB_GETTIMEOFDAY@ GREP = @GREP@ +HARD_LOCALE_LIB = @HARD_LOCALE_LIB@ HAVE_ACCEPT4 = @HAVE_ACCEPT4@ HAVE_ALIGNED_ALLOC = @HAVE_ALIGNED_ALLOC@ HAVE_ALLOCA_H = @HAVE_ALLOCA_H@ @@ -742,6 +754,7 @@ HAVE_DECL_GETLOGIN = @HAVE_DECL_GETLOGIN@ HAVE_DECL_GETLOGIN_R = @HAVE_DECL_GETLOGIN_R@ HAVE_DECL_GETPAGESIZE = @HAVE_DECL_GETPAGESIZE@ HAVE_DECL_GETUSERSHELL = @HAVE_DECL_GETUSERSHELL@ +HAVE_DECL_GETW = @HAVE_DECL_GETW@ HAVE_DECL_IMAXABS = @HAVE_DECL_IMAXABS@ HAVE_DECL_IMAXDIV = @HAVE_DECL_IMAXDIV@ HAVE_DECL_INET_NTOP = @HAVE_DECL_INET_NTOP@ @@ -751,6 +764,7 @@ HAVE_DECL_LOCALTIME_R = @HAVE_DECL_LOCALTIME_R@ HAVE_DECL_MEMMEM = @HAVE_DECL_MEMMEM@ HAVE_DECL_MEMRCHR = @HAVE_DECL_MEMRCHR@ HAVE_DECL_OBSTACK_PRINTF = @HAVE_DECL_OBSTACK_PRINTF@ +HAVE_DECL_PUTW = @HAVE_DECL_PUTW@ HAVE_DECL_SETENV = @HAVE_DECL_SETENV@ HAVE_DECL_SETHOSTNAME = @HAVE_DECL_SETHOSTNAME@ HAVE_DECL_SETSTATE = @HAVE_DECL_SETSTATE@ @@ -773,6 +787,9 @@ HAVE_DECL_WCWIDTH = @HAVE_DECL_WCWIDTH@ HAVE_DPRINTF = @HAVE_DPRINTF@ HAVE_DUP3 = @HAVE_DUP3@ HAVE_DUPLOCALE = @HAVE_DUPLOCALE@ +HAVE_ERROR = @HAVE_ERROR@ +HAVE_ERROR_AT_LINE = @HAVE_ERROR_AT_LINE@ +HAVE_ERROR_H = @HAVE_ERROR_H@ HAVE_EUIDACCESS = @HAVE_EUIDACCESS@ HAVE_EXECVPE = @HAVE_EXECVPE@ HAVE_EXPLICIT_BZERO = @HAVE_EXPLICIT_BZERO@ @@ -800,12 +817,15 @@ HAVE_GETLOGIN = @HAVE_GETLOGIN@ HAVE_GETOPT_H = @HAVE_GETOPT_H@ HAVE_GETPAGESIZE = @HAVE_GETPAGESIZE@ HAVE_GETPASS = @HAVE_GETPASS@ +HAVE_GETPROGNAME = @HAVE_GETPROGNAME@ HAVE_GETRANDOM = @HAVE_GETRANDOM@ HAVE_GETSUBOPT = @HAVE_GETSUBOPT@ HAVE_GETTIMEOFDAY = @HAVE_GETTIMEOFDAY@ HAVE_GETUMASK = @HAVE_GETUMASK@ HAVE_GRANTPT = @HAVE_GRANTPT@ HAVE_GROUP_MEMBER = @HAVE_GROUP_MEMBER@ +HAVE_IMAXABS = @HAVE_IMAXABS@ +HAVE_IMAXDIV = @HAVE_IMAXDIV@ HAVE_IMAXDIV_T = @HAVE_IMAXDIV_T@ HAVE_INITSTATE = @HAVE_INITSTATE@ HAVE_INTTYPES_H = @HAVE_INTTYPES_H@ @@ -832,6 +852,7 @@ HAVE_MBSNRTOWCS = @HAVE_MBSNRTOWCS@ HAVE_MBSRTOWCS = @HAVE_MBSRTOWCS@ HAVE_MBTOWC = @HAVE_MBTOWC@ HAVE_MEMPCPY = @HAVE_MEMPCPY@ +HAVE_MEMSET_EXPLICIT = @HAVE_MEMSET_EXPLICIT@ HAVE_MKDIRAT = @HAVE_MKDIRAT@ HAVE_MKDTEMP = @HAVE_MKDTEMP@ HAVE_MKFIFO = @HAVE_MKFIFO@ @@ -1040,7 +1061,6 @@ HAVE_WMEMPCPY = @HAVE_WMEMPCPY@ HAVE_WMEMSET = @HAVE_WMEMSET@ HAVE_WS2TCPIP_H = @HAVE_WS2TCPIP_H@ HAVE_XLOCALE_H = @HAVE_XLOCALE_H@ -HAVE__BOOL = @HAVE__BOOL@ HAVE__EXIT = @HAVE__EXIT@ IGNORE_UNUSED_LIBRARIES_CFLAGS = @IGNORE_UNUSED_LIBRARIES_CFLAGS@ INCLUDE_NEXT = @INCLUDE_NEXT@ @@ -1107,15 +1127,20 @@ LT_REVISION = @LT_REVISION@ LT_SYS_LIBRARY_PATH = @LT_SYS_LIBRARY_PATH@ MAKEINFO = @MAKEINFO@ MANIFEST_TOOL = @MANIFEST_TOOL@ +MBRTOWC_LIB = @MBRTOWC_LIB@ MKDIR_P = @MKDIR_P@ MSGFMT = @MSGFMT@ MSGFMT_015 = @MSGFMT_015@ MSGMERGE = @MSGMERGE@ +NANOSLEEP_LIB = @NANOSLEEP_LIB@ NETINET_IN_H = @NETINET_IN_H@ NEXT_ARPA_INET_H = @NEXT_ARPA_INET_H@ +NEXT_ASSERT_H = @NEXT_ASSERT_H@ NEXT_AS_FIRST_DIRECTIVE_ARPA_INET_H = @NEXT_AS_FIRST_DIRECTIVE_ARPA_INET_H@ +NEXT_AS_FIRST_DIRECTIVE_ASSERT_H = @NEXT_AS_FIRST_DIRECTIVE_ASSERT_H@ NEXT_AS_FIRST_DIRECTIVE_CTYPE_H = @NEXT_AS_FIRST_DIRECTIVE_CTYPE_H@ NEXT_AS_FIRST_DIRECTIVE_ERRNO_H = @NEXT_AS_FIRST_DIRECTIVE_ERRNO_H@ +NEXT_AS_FIRST_DIRECTIVE_ERROR_H = @NEXT_AS_FIRST_DIRECTIVE_ERROR_H@ NEXT_AS_FIRST_DIRECTIVE_FCNTL_H = @NEXT_AS_FIRST_DIRECTIVE_FCNTL_H@ NEXT_AS_FIRST_DIRECTIVE_GETOPT_H = @NEXT_AS_FIRST_DIRECTIVE_GETOPT_H@ NEXT_AS_FIRST_DIRECTIVE_INTTYPES_H = @NEXT_AS_FIRST_DIRECTIVE_INTTYPES_H@ @@ -1146,6 +1171,7 @@ NEXT_AS_FIRST_DIRECTIVE_WCHAR_H = @NEXT_AS_FIRST_DIRECTIVE_WCHAR_H@ NEXT_AS_FIRST_DIRECTIVE_WCTYPE_H = @NEXT_AS_FIRST_DIRECTIVE_WCTYPE_H@ NEXT_CTYPE_H = @NEXT_CTYPE_H@ NEXT_ERRNO_H = @NEXT_ERRNO_H@ +NEXT_ERROR_H = @NEXT_ERROR_H@ NEXT_FCNTL_H = @NEXT_FCNTL_H@ NEXT_GETOPT_H = @NEXT_GETOPT_H@ NEXT_INTTYPES_H = @NEXT_INTTYPES_H@ @@ -1201,6 +1227,7 @@ PRAGMA_COLUMNS = @PRAGMA_COLUMNS@ PRAGMA_SYSTEM_HEADER = @PRAGMA_SYSTEM_HEADER@ PRIPTR_PREFIX = @PRIPTR_PREFIX@ PTHREAD_H_DEFINES_STRUCT_TIMESPEC = @PTHREAD_H_DEFINES_STRUCT_TIMESPEC@ +PTHREAD_SIGMASK_LIB = @PTHREAD_SIGMASK_LIB@ PTRDIFF_T_SUFFIX = @PTRDIFF_T_SUFFIX@ RANLIB = @RANLIB@ REPLACE_ACCESS = @REPLACE_ACCESS@ @@ -1209,6 +1236,7 @@ REPLACE_BTOWC = @REPLACE_BTOWC@ REPLACE_CALLOC_FOR_CALLOC_GNU = @REPLACE_CALLOC_FOR_CALLOC_GNU@ REPLACE_CALLOC_FOR_CALLOC_POSIX = @REPLACE_CALLOC_FOR_CALLOC_POSIX@ REPLACE_CANONICALIZE_FILE_NAME = @REPLACE_CANONICALIZE_FILE_NAME@ +REPLACE_CHMOD = @REPLACE_CHMOD@ REPLACE_CHOWN = @REPLACE_CHOWN@ REPLACE_CLOSE = @REPLACE_CLOSE@ REPLACE_COPY_FILE_RANGE = @REPLACE_COPY_FILE_RANGE@ @@ -1217,7 +1245,10 @@ REPLACE_CTIME = @REPLACE_CTIME@ REPLACE_DPRINTF = @REPLACE_DPRINTF@ REPLACE_DUP = @REPLACE_DUP@ REPLACE_DUP2 = @REPLACE_DUP2@ +REPLACE_DUP3 = @REPLACE_DUP3@ REPLACE_DUPLOCALE = @REPLACE_DUPLOCALE@ +REPLACE_ERROR = @REPLACE_ERROR@ +REPLACE_ERROR_AT_LINE = @REPLACE_ERROR_AT_LINE@ REPLACE_EXECL = @REPLACE_EXECL@ REPLACE_EXECLE = @REPLACE_EXECLE@ REPLACE_EXECLP = @REPLACE_EXECLP@ @@ -1230,6 +1261,7 @@ REPLACE_FCHMODAT = @REPLACE_FCHMODAT@ REPLACE_FCHOWNAT = @REPLACE_FCHOWNAT@ REPLACE_FCLOSE = @REPLACE_FCLOSE@ REPLACE_FCNTL = @REPLACE_FCNTL@ +REPLACE_FDATASYNC = @REPLACE_FDATASYNC@ REPLACE_FDOPEN = @REPLACE_FDOPEN@ REPLACE_FFLUSH = @REPLACE_FFLUSH@ REPLACE_FFSLL = @REPLACE_FFSLL@ @@ -1252,15 +1284,21 @@ REPLACE_GETCWD = @REPLACE_GETCWD@ REPLACE_GETDELIM = @REPLACE_GETDELIM@ REPLACE_GETDOMAINNAME = @REPLACE_GETDOMAINNAME@ REPLACE_GETDTABLESIZE = @REPLACE_GETDTABLESIZE@ +REPLACE_GETENTROPY = @REPLACE_GETENTROPY@ REPLACE_GETGROUPS = @REPLACE_GETGROUPS@ REPLACE_GETLINE = @REPLACE_GETLINE@ +REPLACE_GETLOADAVG = @REPLACE_GETLOADAVG@ REPLACE_GETLOGIN_R = @REPLACE_GETLOGIN_R@ REPLACE_GETPAGESIZE = @REPLACE_GETPAGESIZE@ REPLACE_GETPASS = @REPLACE_GETPASS@ REPLACE_GETPASS_FOR_GETPASS_GNU = @REPLACE_GETPASS_FOR_GETPASS_GNU@ +REPLACE_GETPROGNAME = @REPLACE_GETPROGNAME@ REPLACE_GETRANDOM = @REPLACE_GETRANDOM@ +REPLACE_GETSUBOPT = @REPLACE_GETSUBOPT@ REPLACE_GETTIMEOFDAY = @REPLACE_GETTIMEOFDAY@ REPLACE_GMTIME = @REPLACE_GMTIME@ +REPLACE_IMAXABS = @REPLACE_IMAXABS@ +REPLACE_IMAXDIV = @REPLACE_IMAXDIV@ REPLACE_INET_NTOP = @REPLACE_INET_NTOP@ REPLACE_INET_PTON = @REPLACE_INET_PTON@ REPLACE_INITSTATE = @REPLACE_INITSTATE@ @@ -1289,11 +1327,14 @@ REPLACE_MBSTATE_T = @REPLACE_MBSTATE_T@ REPLACE_MBTOWC = @REPLACE_MBTOWC@ REPLACE_MEMCHR = @REPLACE_MEMCHR@ REPLACE_MEMMEM = @REPLACE_MEMMEM@ +REPLACE_MEMPCPY = @REPLACE_MEMPCPY@ REPLACE_MKDIR = @REPLACE_MKDIR@ REPLACE_MKFIFO = @REPLACE_MKFIFO@ REPLACE_MKFIFOAT = @REPLACE_MKFIFOAT@ REPLACE_MKNOD = @REPLACE_MKNOD@ REPLACE_MKNODAT = @REPLACE_MKNODAT@ +REPLACE_MKOSTEMP = @REPLACE_MKOSTEMP@ +REPLACE_MKOSTEMPS = @REPLACE_MKOSTEMPS@ REPLACE_MKSTEMP = @REPLACE_MKSTEMP@ REPLACE_MKTIME = @REPLACE_MKTIME@ REPLACE_NANOSLEEP = @REPLACE_NANOSLEEP@ @@ -1304,8 +1345,10 @@ REPLACE_OBSTACK_PRINTF = @REPLACE_OBSTACK_PRINTF@ REPLACE_OPEN = @REPLACE_OPEN@ REPLACE_OPENAT = @REPLACE_OPENAT@ REPLACE_PERROR = @REPLACE_PERROR@ +REPLACE_PIPE2 = @REPLACE_PIPE2@ REPLACE_POPEN = @REPLACE_POPEN@ REPLACE_POSIX_MEMALIGN = @REPLACE_POSIX_MEMALIGN@ +REPLACE_POSIX_OPENPT = @REPLACE_POSIX_OPENPT@ REPLACE_PREAD = @REPLACE_PREAD@ REPLACE_PRINTF = @REPLACE_PRINTF@ REPLACE_PSELECT = @REPLACE_PSELECT@ @@ -1383,6 +1426,7 @@ REPLACE_RMDIR = @REPLACE_RMDIR@ REPLACE_SCHED_YIELD = @REPLACE_SCHED_YIELD@ REPLACE_SELECT = @REPLACE_SELECT@ REPLACE_SETENV = @REPLACE_SETENV@ +REPLACE_SETHOSTNAME = @REPLACE_SETHOSTNAME@ REPLACE_SETLOCALE = @REPLACE_SETLOCALE@ REPLACE_SETSTATE = @REPLACE_SETSTATE@ REPLACE_SLEEP = @REPLACE_SLEEP@ @@ -1391,6 +1435,7 @@ REPLACE_SPRINTF = @REPLACE_SPRINTF@ REPLACE_STAT = @REPLACE_STAT@ REPLACE_STDIO_READ_FUNCS = @REPLACE_STDIO_READ_FUNCS@ REPLACE_STDIO_WRITE_FUNCS = @REPLACE_STDIO_WRITE_FUNCS@ +REPLACE_STPCPY = @REPLACE_STPCPY@ REPLACE_STPNCPY = @REPLACE_STPNCPY@ REPLACE_STRCASESTR = @REPLACE_STRCASESTR@ REPLACE_STRCHRNUL = @REPLACE_STRCHRNUL@ @@ -1417,7 +1462,9 @@ REPLACE_STRUCT_LCONV = @REPLACE_STRUCT_LCONV@ REPLACE_STRUCT_TIMEVAL = @REPLACE_STRUCT_TIMEVAL@ REPLACE_SYMLINK = @REPLACE_SYMLINK@ REPLACE_SYMLINKAT = @REPLACE_SYMLINKAT@ +REPLACE_TIME = @REPLACE_TIME@ REPLACE_TIMEGM = @REPLACE_TIMEGM@ +REPLACE_TIMESPEC_GET = @REPLACE_TIMESPEC_GET@ REPLACE_TMPFILE = @REPLACE_TMPFILE@ REPLACE_TOWLOWER = @REPLACE_TOWLOWER@ REPLACE_TRUNCATE = @REPLACE_TRUNCATE@ @@ -1443,15 +1490,20 @@ REPLACE_WCSWIDTH = @REPLACE_WCSWIDTH@ REPLACE_WCTOB = @REPLACE_WCTOB@ REPLACE_WCTOMB = @REPLACE_WCTOMB@ REPLACE_WCWIDTH = @REPLACE_WCWIDTH@ +REPLACE_WMEMPCPY = @REPLACE_WMEMPCPY@ REPLACE_WRITE = @REPLACE_WRITE@ +REPLACE__EXIT = @REPLACE__EXIT@ +SCHED_YIELD_LIB = @SCHED_YIELD_LIB@ SED = @SED@ +SELECT_LIB = @SELECT_LIB@ +SETLOCALE_LIB = @SETLOCALE_LIB@ +SETLOCALE_NULL_LIB = @SETLOCALE_NULL_LIB@ SET_MAKE = @SET_MAKE@ SHELL = @SHELL@ SIG_ATOMIC_T_SUFFIX = @SIG_ATOMIC_T_SUFFIX@ SIZE_T_SUFFIX = @SIZE_T_SUFFIX@ -STDALIGN_H = @STDALIGN_H@ STDARG_H = @STDARG_H@ -STDBOOL_H = @STDBOOL_H@ +STDCKDINT_H = @STDCKDINT_H@ STDDEF_H = @STDDEF_H@ STDINT_H = @STDINT_H@ STRIP = @STRIP@ @@ -1495,6 +1547,8 @@ am__quote = @am__quote@ am__tar = @am__tar@ am__untar = @am__untar@ bindir = @bindir@ +bindir_c = @bindir_c@ +bindir_c_make = @bindir_c_make@ build = @build@ build_alias = @build_alias@ build_cpu = @build_cpu@ @@ -1502,10 +1556,20 @@ build_os = @build_os@ build_vendor = @build_vendor@ builddir = @builddir@ datadir = @datadir@ +datadir_c = @datadir_c@ +datadir_c_make = @datadir_c_make@ datarootdir = @datarootdir@ +datarootdir_c = @datarootdir_c@ +datarootdir_c_make = @datarootdir_c_make@ docdir = @docdir@ +docdir_c = @docdir_c@ +docdir_c_make = @docdir_c_make@ dvidir = @dvidir@ +dvidir_c = @dvidir_c@ +dvidir_c_make = @dvidir_c_make@ exec_prefix = @exec_prefix@ +exec_prefix_c = @exec_prefix_c@ +exec_prefix_c_make = @exec_prefix_c_make@ gl_LIBOBJDEPS = @gl_LIBOBJDEPS@ gl_LIBOBJS = @gl_LIBOBJS@ gl_LTLIBOBJS = @gl_LTLIBOBJS@ @@ -1519,26 +1583,68 @@ host_cpu = @host_cpu@ host_os = @host_os@ host_vendor = @host_vendor@ htmldir = @htmldir@ +htmldir_c = @htmldir_c@ +htmldir_c_make = @htmldir_c_make@ includedir = @includedir@ +includedir_c = @includedir_c@ +includedir_c_make = @includedir_c_make@ infodir = @infodir@ +infodir_c = @infodir_c@ +infodir_c_make = @infodir_c_make@ install_sh = @install_sh@ libdir = @libdir@ +libdir_c = @libdir_c@ +libdir_c_make = @libdir_c_make@ libexecdir = @libexecdir@ +libexecdir_c = @libexecdir_c@ +libexecdir_c_make = @libexecdir_c_make@ lispdir = @lispdir@ +lispdir_c = @lispdir_c@ +lispdir_c_make = @lispdir_c_make@ localedir = @localedir@ +localedir_c = @localedir_c@ +localedir_c_make = @localedir_c_make@ localstatedir = @localstatedir@ +localstatedir_c = @localstatedir_c@ +localstatedir_c_make = @localstatedir_c_make@ mandir = @mandir@ +mandir_c = @mandir_c@ +mandir_c_make = @mandir_c_make@ mkdir_p = @mkdir_p@ oldincludedir = @oldincludedir@ +oldincludedir_c = @oldincludedir_c@ +oldincludedir_c_make = @oldincludedir_c_make@ pdfdir = @pdfdir@ +pdfdir_c = @pdfdir_c@ +pdfdir_c_make = @pdfdir_c_make@ +pkgdatadir_c = @pkgdatadir_c@ +pkgdatadir_c_make = @pkgdatadir_c_make@ +pkgincludedir_c = @pkgincludedir_c@ +pkgincludedir_c_make = @pkgincludedir_c_make@ +pkglibdir_c = @pkglibdir_c@ +pkglibdir_c_make = @pkglibdir_c_make@ +pkglibexecdir_c = @pkglibexecdir_c@ +pkglibexecdir_c_make = @pkglibexecdir_c_make@ prefix = @prefix@ +prefix_c = @prefix_c@ +prefix_c_make = @prefix_c_make@ program_transform_name = @program_transform_name@ psdir = @psdir@ +psdir_c = @psdir_c@ +psdir_c_make = @psdir_c_make@ runstatedir = @runstatedir@ +runstatedir_c = @runstatedir_c@ +runstatedir_c_make = @runstatedir_c_make@ sbindir = @sbindir@ +sbindir_c = @sbindir_c@ +sbindir_c_make = @sbindir_c_make@ sharedstatedir = @sharedstatedir@ +sharedstatedir_c = @sharedstatedir_c@ +sharedstatedir_c_make = @sharedstatedir_c_make@ srcdir = @srcdir@ sysconfdir = @sysconfdir@ +sysconfdir_c = @sysconfdir_c@ +sysconfdir_c_make = @sysconfdir_c_make@ target_alias = @target_alias@ top_build_prefix = @top_build_prefix@ top_builddir = @top_builddir@ diff --git a/debug/test/HOWTO b/debug/test/HOWTO index bebfece..0c9e346 100644 --- a/debug/test/HOWTO +++ b/debug/test/HOWTO @@ -4,7 +4,7 @@ by Andrew Clausen - Copyright (C) 2002, 2009-2014, 2019-2022 Free Software Foundation, Inc. + Copyright (C) 2002, 2009-2014, 2019-2023 Free Software Foundation, Inc. This document may be distributed and/or modified without restriction diff --git a/debug/test/Makefile.in b/debug/test/Makefile.in index d5aef15..d47fc98 100644 --- a/debug/test/Makefile.in +++ b/debug/test/Makefile.in @@ -70,9 +70,6 @@ am__make_running_with_option = \ test $$has_opt = yes am__make_dryrun = (target_option=n; $(am__make_running_with_option)) am__make_keepgoing = (target_option=k; $(am__make_running_with_option)) -pkgdatadir = $(datadir)/@PACKAGE@ -pkgincludedir = $(includedir)/@PACKAGE@ -pkglibdir = $(libdir)/@PACKAGE@ am__cd = CDPATH="$${ZSH_VERSION+.}$(PATH_SEPARATOR)" && cd install_sh_DATA = $(install_sh) -c -m 644 install_sh_PROGRAM = $(install_sh) -c @@ -93,7 +90,9 @@ am__aclocal_m4_deps = $(top_srcdir)/m4/00gnulib.m4 \ $(top_srcdir)/m4/__inline.m4 \ $(top_srcdir)/m4/absolute-header.m4 $(top_srcdir)/m4/alloca.m4 \ $(top_srcdir)/m4/arpa_inet_h.m4 $(top_srcdir)/m4/assert.m4 \ - $(top_srcdir)/m4/btowc.m4 $(top_srcdir)/m4/builtin-expect.m4 \ + $(top_srcdir)/m4/assert_h.m4 $(top_srcdir)/m4/btowc.m4 \ + $(top_srcdir)/m4/build-to-host.m4 \ + $(top_srcdir)/m4/builtin-expect.m4 $(top_srcdir)/m4/c-bool.m4 \ $(top_srcdir)/m4/calloc.m4 $(top_srcdir)/m4/canonicalize.m4 \ $(top_srcdir)/m4/clock_time.m4 $(top_srcdir)/m4/close.m4 \ $(top_srcdir)/m4/codeset.m4 $(top_srcdir)/m4/config-h.m4 \ @@ -101,7 +100,7 @@ am__aclocal_m4_deps = $(top_srcdir)/m4/00gnulib.m4 \ $(top_srcdir)/m4/double-slash-root.m4 $(top_srcdir)/m4/dup2.m4 \ $(top_srcdir)/m4/eealloc.m4 $(top_srcdir)/m4/environ.m4 \ $(top_srcdir)/m4/errno_h.m4 $(top_srcdir)/m4/error.m4 \ - $(top_srcdir)/m4/extensions.m4 \ + $(top_srcdir)/m4/error_h.m4 $(top_srcdir)/m4/extensions.m4 \ $(top_srcdir)/m4/extern-inline.m4 $(top_srcdir)/m4/fcntl-o.m4 \ $(top_srcdir)/m4/fcntl.m4 $(top_srcdir)/m4/fcntl_h.m4 \ $(top_srcdir)/m4/fdopen.m4 $(top_srcdir)/m4/flexmember.m4 \ @@ -133,10 +132,11 @@ am__aclocal_m4_deps = $(top_srcdir)/m4/00gnulib.m4 \ $(top_srcdir)/m4/malloc.m4 $(top_srcdir)/m4/malloca.m4 \ $(top_srcdir)/m4/manywarnings.m4 $(top_srcdir)/m4/mbrtowc.m4 \ $(top_srcdir)/m4/mbsinit.m4 $(top_srcdir)/m4/mbstate_t.m4 \ - $(top_srcdir)/m4/mbtowc.m4 $(top_srcdir)/m4/mempcpy.m4 \ - $(top_srcdir)/m4/minmax.m4 $(top_srcdir)/m4/mkdir.m4 \ - $(top_srcdir)/m4/mkstemp.m4 $(top_srcdir)/m4/mmap-anon.m4 \ - $(top_srcdir)/m4/mode_t.m4 $(top_srcdir)/m4/msvc-inval.m4 \ + $(top_srcdir)/m4/mbtowc.m4 $(top_srcdir)/m4/memchr.m4 \ + $(top_srcdir)/m4/mempcpy.m4 $(top_srcdir)/m4/minmax.m4 \ + $(top_srcdir)/m4/mkdir.m4 $(top_srcdir)/m4/mkstemp.m4 \ + $(top_srcdir)/m4/mmap-anon.m4 $(top_srcdir)/m4/mode_t.m4 \ + $(top_srcdir)/m4/msvc-inval.m4 \ $(top_srcdir)/m4/msvc-nothrow.m4 $(top_srcdir)/m4/multiarch.m4 \ $(top_srcdir)/m4/musl.m4 $(top_srcdir)/m4/nanosleep.m4 \ $(top_srcdir)/m4/netinet_in_h.m4 \ @@ -167,29 +167,29 @@ am__aclocal_m4_deps = $(top_srcdir)/m4/00gnulib.m4 \ $(top_srcdir)/m4/socklen.m4 $(top_srcdir)/m4/sockpfaf.m4 \ $(top_srcdir)/m4/ssize_t.m4 $(top_srcdir)/m4/stat-time.m4 \ $(top_srcdir)/m4/stat.m4 $(top_srcdir)/m4/stdalign.m4 \ - $(top_srcdir)/m4/stdarg.m4 $(top_srcdir)/m4/stdbool.m4 \ - $(top_srcdir)/m4/stddef_h.m4 $(top_srcdir)/m4/stdint.m4 \ - $(top_srcdir)/m4/stdio_h.m4 $(top_srcdir)/m4/stdlib_h.m4 \ - $(top_srcdir)/m4/strdup.m4 $(top_srcdir)/m4/strerror.m4 \ - $(top_srcdir)/m4/strerror_r.m4 $(top_srcdir)/m4/string_h.m4 \ - $(top_srcdir)/m4/strtoll.m4 $(top_srcdir)/m4/strtoull.m4 \ - $(top_srcdir)/m4/symlink.m4 $(top_srcdir)/m4/sys_ioctl_h.m4 \ + $(top_srcdir)/m4/stdarg.m4 $(top_srcdir)/m4/stddef_h.m4 \ + $(top_srcdir)/m4/stdint.m4 $(top_srcdir)/m4/stdio_h.m4 \ + $(top_srcdir)/m4/stdlib_h.m4 $(top_srcdir)/m4/strdup.m4 \ + $(top_srcdir)/m4/strerror.m4 $(top_srcdir)/m4/strerror_r.m4 \ + $(top_srcdir)/m4/string_h.m4 $(top_srcdir)/m4/strtoll.m4 \ + $(top_srcdir)/m4/strtoull.m4 $(top_srcdir)/m4/symlink.m4 \ + $(top_srcdir)/m4/sys_ioctl_h.m4 \ $(top_srcdir)/m4/sys_random_h.m4 \ $(top_srcdir)/m4/sys_select_h.m4 \ $(top_srcdir)/m4/sys_socket_h.m4 \ $(top_srcdir)/m4/sys_stat_h.m4 $(top_srcdir)/m4/sys_time_h.m4 \ $(top_srcdir)/m4/sys_types_h.m4 $(top_srcdir)/m4/sys_uio_h.m4 \ $(top_srcdir)/m4/tempname.m4 $(top_srcdir)/m4/thread.m4 \ - $(top_srcdir)/m4/threadlib.m4 $(top_srcdir)/m4/time_h.m4 \ - $(top_srcdir)/m4/unistd_h.m4 $(top_srcdir)/m4/unlink.m4 \ - $(top_srcdir)/m4/unlinkdir.m4 $(top_srcdir)/m4/usleep.m4 \ - $(top_srcdir)/m4/version-etc.m4 $(top_srcdir)/m4/visibility.m4 \ - $(top_srcdir)/m4/warn-on-use.m4 $(top_srcdir)/m4/warnings.m4 \ - $(top_srcdir)/m4/wchar_h.m4 $(top_srcdir)/m4/wchar_t.m4 \ - $(top_srcdir)/m4/wcrtomb.m4 $(top_srcdir)/m4/wctob.m4 \ - $(top_srcdir)/m4/wctomb.m4 $(top_srcdir)/m4/wctype_h.m4 \ - $(top_srcdir)/m4/wint_t.m4 $(top_srcdir)/m4/xalloc.m4 \ - $(top_srcdir)/m4/xstrtol.m4 $(top_srcdir)/m4/year2038.m4 \ + $(top_srcdir)/m4/threadlib.m4 $(top_srcdir)/m4/time.m4 \ + $(top_srcdir)/m4/time_h.m4 $(top_srcdir)/m4/unistd_h.m4 \ + $(top_srcdir)/m4/unlink.m4 $(top_srcdir)/m4/unlinkdir.m4 \ + $(top_srcdir)/m4/usleep.m4 $(top_srcdir)/m4/version-etc.m4 \ + $(top_srcdir)/m4/visibility.m4 $(top_srcdir)/m4/warn-on-use.m4 \ + $(top_srcdir)/m4/warnings.m4 $(top_srcdir)/m4/wchar_h.m4 \ + $(top_srcdir)/m4/wchar_t.m4 $(top_srcdir)/m4/wcrtomb.m4 \ + $(top_srcdir)/m4/wctob.m4 $(top_srcdir)/m4/wctomb.m4 \ + $(top_srcdir)/m4/wctype_h.m4 $(top_srcdir)/m4/wint_t.m4 \ + $(top_srcdir)/m4/xalloc.m4 $(top_srcdir)/m4/xstrtol.m4 \ $(top_srcdir)/m4/yield.m4 $(top_srcdir)/m4/zzgnulib.m4 \ $(top_srcdir)/configure.ac am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \ @@ -222,6 +222,9 @@ am__can_run_installinfo = \ am__tagged_files = $(HEADERS) $(SOURCES) $(TAGS_FILES) $(LISP) am__DIST_COMMON = $(srcdir)/Makefile.in DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST) +pkgdatadir = @pkgdatadir@ +pkgincludedir = @pkgincludedir@ +pkglibdir = @pkglibdir@ pkglibexecdir = @pkglibexecdir@ ACLOCAL = @ACLOCAL@ ALLOCA = @ALLOCA@ @@ -231,6 +234,7 @@ AM_DEFAULT_VERBOSITY = @AM_DEFAULT_VERBOSITY@ APPLE_UNIVERSAL_BUILD = @APPLE_UNIVERSAL_BUILD@ AR = @AR@ ARFLAGS = @ARFLAGS@ +ASSERT_H = @ASSERT_H@ AUTOCONF = @AUTOCONF@ AUTOHEADER = @AUTOHEADER@ AUTOMAKE = @AUTOMAKE@ @@ -247,6 +251,7 @@ CFLAGS = @CFLAGS@ CFLAG_VISIBILITY = @CFLAG_VISIBILITY@ CHECK_CFLAGS = @CHECK_CFLAGS@ CHECK_LIBS = @CHECK_LIBS@ +CLOCK_TIME_LIB = @CLOCK_TIME_LIB@ CONFIG_INCLUDE = @CONFIG_INCLUDE@ CPP = @CPP@ CPPFLAGS = @CPPFLAGS@ @@ -271,12 +276,14 @@ ENOLINK_VALUE = @ENOLINK_VALUE@ EOVERFLOW_HIDDEN = @EOVERFLOW_HIDDEN@ EOVERFLOW_VALUE = @EOVERFLOW_VALUE@ ERRNO_H = @ERRNO_H@ +ERROR_H = @ERROR_H@ ETAGS = @ETAGS@ EXEEXT = @EXEEXT@ FGREP = @FGREP@ FILECMD = @FILECMD@ GETOPT_CDEFS_H = @GETOPT_CDEFS_H@ GETOPT_H = @GETOPT_H@ +GETRANDOM_LIB = @GETRANDOM_LIB@ GETTEXT_MACRO_VERSION = @GETTEXT_MACRO_VERSION@ GL_CFLAG_ALLOW_WARNINGS = @GL_CFLAG_ALLOW_WARNINGS@ GL_CFLAG_GNULIB_WARNINGS = @GL_CFLAG_GNULIB_WARNINGS@ @@ -292,6 +299,7 @@ GL_GNULIB_CALLOC_GNU = @GL_GNULIB_CALLOC_GNU@ GL_GNULIB_CALLOC_POSIX = @GL_GNULIB_CALLOC_POSIX@ GL_GNULIB_CANONICALIZE_FILE_NAME = @GL_GNULIB_CANONICALIZE_FILE_NAME@ GL_GNULIB_CHDIR = @GL_GNULIB_CHDIR@ +GL_GNULIB_CHMOD = @GL_GNULIB_CHMOD@ GL_GNULIB_CHOWN = @GL_GNULIB_CHOWN@ GL_GNULIB_CLOSE = @GL_GNULIB_CLOSE@ GL_GNULIB_CONNECT = @GL_GNULIB_CONNECT@ @@ -365,6 +373,7 @@ GL_GNULIB_GETPAGESIZE = @GL_GNULIB_GETPAGESIZE@ GL_GNULIB_GETPASS = @GL_GNULIB_GETPASS@ GL_GNULIB_GETPASS_GNU = @GL_GNULIB_GETPASS_GNU@ GL_GNULIB_GETPEERNAME = @GL_GNULIB_GETPEERNAME@ +GL_GNULIB_GETPROGNAME = @GL_GNULIB_GETPROGNAME@ GL_GNULIB_GETRANDOM = @GL_GNULIB_GETRANDOM@ GL_GNULIB_GETSOCKNAME = @GL_GNULIB_GETSOCKNAME@ GL_GNULIB_GETSOCKOPT = @GL_GNULIB_GETSOCKOPT@ @@ -462,6 +471,7 @@ GL_GNULIB_MEMCHR = @GL_GNULIB_MEMCHR@ GL_GNULIB_MEMMEM = @GL_GNULIB_MEMMEM@ GL_GNULIB_MEMPCPY = @GL_GNULIB_MEMPCPY@ GL_GNULIB_MEMRCHR = @GL_GNULIB_MEMRCHR@ +GL_GNULIB_MEMSET_EXPLICIT = @GL_GNULIB_MEMSET_EXPLICIT@ GL_GNULIB_MKDIR = @GL_GNULIB_MKDIR@ GL_GNULIB_MKDIRAT = @GL_GNULIB_MKDIRAT@ GL_GNULIB_MKDTEMP = @GL_GNULIB_MKDTEMP@ @@ -582,6 +592,7 @@ GL_GNULIB_STRVERSCMP = @GL_GNULIB_STRVERSCMP@ GL_GNULIB_SYMLINK = @GL_GNULIB_SYMLINK@ GL_GNULIB_SYMLINKAT = @GL_GNULIB_SYMLINKAT@ GL_GNULIB_SYSTEM_POSIX = @GL_GNULIB_SYSTEM_POSIX@ +GL_GNULIB_TIME = @GL_GNULIB_TIME@ GL_GNULIB_TIMEGM = @GL_GNULIB_TIMEGM@ GL_GNULIB_TIMESPEC_GET = @GL_GNULIB_TIMESPEC_GET@ GL_GNULIB_TIMESPEC_GETRES = @GL_GNULIB_TIMESPEC_GETRES@ @@ -656,6 +667,7 @@ GMSGFMT_015 = @GMSGFMT_015@ GNULIBHEADERS_OVERRIDE_WINT_T = @GNULIBHEADERS_OVERRIDE_WINT_T@ GNULIB_GETTIMEOFDAY = @GNULIB_GETTIMEOFDAY@ GREP = @GREP@ +HARD_LOCALE_LIB = @HARD_LOCALE_LIB@ HAVE_ACCEPT4 = @HAVE_ACCEPT4@ HAVE_ALIGNED_ALLOC = @HAVE_ALIGNED_ALLOC@ HAVE_ALLOCA_H = @HAVE_ALLOCA_H@ @@ -686,6 +698,7 @@ HAVE_DECL_GETLOGIN = @HAVE_DECL_GETLOGIN@ HAVE_DECL_GETLOGIN_R = @HAVE_DECL_GETLOGIN_R@ HAVE_DECL_GETPAGESIZE = @HAVE_DECL_GETPAGESIZE@ HAVE_DECL_GETUSERSHELL = @HAVE_DECL_GETUSERSHELL@ +HAVE_DECL_GETW = @HAVE_DECL_GETW@ HAVE_DECL_IMAXABS = @HAVE_DECL_IMAXABS@ HAVE_DECL_IMAXDIV = @HAVE_DECL_IMAXDIV@ HAVE_DECL_INET_NTOP = @HAVE_DECL_INET_NTOP@ @@ -695,6 +708,7 @@ HAVE_DECL_LOCALTIME_R = @HAVE_DECL_LOCALTIME_R@ HAVE_DECL_MEMMEM = @HAVE_DECL_MEMMEM@ HAVE_DECL_MEMRCHR = @HAVE_DECL_MEMRCHR@ HAVE_DECL_OBSTACK_PRINTF = @HAVE_DECL_OBSTACK_PRINTF@ +HAVE_DECL_PUTW = @HAVE_DECL_PUTW@ HAVE_DECL_SETENV = @HAVE_DECL_SETENV@ HAVE_DECL_SETHOSTNAME = @HAVE_DECL_SETHOSTNAME@ HAVE_DECL_SETSTATE = @HAVE_DECL_SETSTATE@ @@ -717,6 +731,9 @@ HAVE_DECL_WCWIDTH = @HAVE_DECL_WCWIDTH@ HAVE_DPRINTF = @HAVE_DPRINTF@ HAVE_DUP3 = @HAVE_DUP3@ HAVE_DUPLOCALE = @HAVE_DUPLOCALE@ +HAVE_ERROR = @HAVE_ERROR@ +HAVE_ERROR_AT_LINE = @HAVE_ERROR_AT_LINE@ +HAVE_ERROR_H = @HAVE_ERROR_H@ HAVE_EUIDACCESS = @HAVE_EUIDACCESS@ HAVE_EXECVPE = @HAVE_EXECVPE@ HAVE_EXPLICIT_BZERO = @HAVE_EXPLICIT_BZERO@ @@ -744,12 +761,15 @@ HAVE_GETLOGIN = @HAVE_GETLOGIN@ HAVE_GETOPT_H = @HAVE_GETOPT_H@ HAVE_GETPAGESIZE = @HAVE_GETPAGESIZE@ HAVE_GETPASS = @HAVE_GETPASS@ +HAVE_GETPROGNAME = @HAVE_GETPROGNAME@ HAVE_GETRANDOM = @HAVE_GETRANDOM@ HAVE_GETSUBOPT = @HAVE_GETSUBOPT@ HAVE_GETTIMEOFDAY = @HAVE_GETTIMEOFDAY@ HAVE_GETUMASK = @HAVE_GETUMASK@ HAVE_GRANTPT = @HAVE_GRANTPT@ HAVE_GROUP_MEMBER = @HAVE_GROUP_MEMBER@ +HAVE_IMAXABS = @HAVE_IMAXABS@ +HAVE_IMAXDIV = @HAVE_IMAXDIV@ HAVE_IMAXDIV_T = @HAVE_IMAXDIV_T@ HAVE_INITSTATE = @HAVE_INITSTATE@ HAVE_INTTYPES_H = @HAVE_INTTYPES_H@ @@ -776,6 +796,7 @@ HAVE_MBSNRTOWCS = @HAVE_MBSNRTOWCS@ HAVE_MBSRTOWCS = @HAVE_MBSRTOWCS@ HAVE_MBTOWC = @HAVE_MBTOWC@ HAVE_MEMPCPY = @HAVE_MEMPCPY@ +HAVE_MEMSET_EXPLICIT = @HAVE_MEMSET_EXPLICIT@ HAVE_MKDIRAT = @HAVE_MKDIRAT@ HAVE_MKDTEMP = @HAVE_MKDTEMP@ HAVE_MKFIFO = @HAVE_MKFIFO@ @@ -984,7 +1005,6 @@ HAVE_WMEMPCPY = @HAVE_WMEMPCPY@ HAVE_WMEMSET = @HAVE_WMEMSET@ HAVE_WS2TCPIP_H = @HAVE_WS2TCPIP_H@ HAVE_XLOCALE_H = @HAVE_XLOCALE_H@ -HAVE__BOOL = @HAVE__BOOL@ HAVE__EXIT = @HAVE__EXIT@ IGNORE_UNUSED_LIBRARIES_CFLAGS = @IGNORE_UNUSED_LIBRARIES_CFLAGS@ INCLUDE_NEXT = @INCLUDE_NEXT@ @@ -1051,15 +1071,20 @@ LT_REVISION = @LT_REVISION@ LT_SYS_LIBRARY_PATH = @LT_SYS_LIBRARY_PATH@ MAKEINFO = @MAKEINFO@ MANIFEST_TOOL = @MANIFEST_TOOL@ +MBRTOWC_LIB = @MBRTOWC_LIB@ MKDIR_P = @MKDIR_P@ MSGFMT = @MSGFMT@ MSGFMT_015 = @MSGFMT_015@ MSGMERGE = @MSGMERGE@ +NANOSLEEP_LIB = @NANOSLEEP_LIB@ NETINET_IN_H = @NETINET_IN_H@ NEXT_ARPA_INET_H = @NEXT_ARPA_INET_H@ +NEXT_ASSERT_H = @NEXT_ASSERT_H@ NEXT_AS_FIRST_DIRECTIVE_ARPA_INET_H = @NEXT_AS_FIRST_DIRECTIVE_ARPA_INET_H@ +NEXT_AS_FIRST_DIRECTIVE_ASSERT_H = @NEXT_AS_FIRST_DIRECTIVE_ASSERT_H@ NEXT_AS_FIRST_DIRECTIVE_CTYPE_H = @NEXT_AS_FIRST_DIRECTIVE_CTYPE_H@ NEXT_AS_FIRST_DIRECTIVE_ERRNO_H = @NEXT_AS_FIRST_DIRECTIVE_ERRNO_H@ +NEXT_AS_FIRST_DIRECTIVE_ERROR_H = @NEXT_AS_FIRST_DIRECTIVE_ERROR_H@ NEXT_AS_FIRST_DIRECTIVE_FCNTL_H = @NEXT_AS_FIRST_DIRECTIVE_FCNTL_H@ NEXT_AS_FIRST_DIRECTIVE_GETOPT_H = @NEXT_AS_FIRST_DIRECTIVE_GETOPT_H@ NEXT_AS_FIRST_DIRECTIVE_INTTYPES_H = @NEXT_AS_FIRST_DIRECTIVE_INTTYPES_H@ @@ -1090,6 +1115,7 @@ NEXT_AS_FIRST_DIRECTIVE_WCHAR_H = @NEXT_AS_FIRST_DIRECTIVE_WCHAR_H@ NEXT_AS_FIRST_DIRECTIVE_WCTYPE_H = @NEXT_AS_FIRST_DIRECTIVE_WCTYPE_H@ NEXT_CTYPE_H = @NEXT_CTYPE_H@ NEXT_ERRNO_H = @NEXT_ERRNO_H@ +NEXT_ERROR_H = @NEXT_ERROR_H@ NEXT_FCNTL_H = @NEXT_FCNTL_H@ NEXT_GETOPT_H = @NEXT_GETOPT_H@ NEXT_INTTYPES_H = @NEXT_INTTYPES_H@ @@ -1145,6 +1171,7 @@ PRAGMA_COLUMNS = @PRAGMA_COLUMNS@ PRAGMA_SYSTEM_HEADER = @PRAGMA_SYSTEM_HEADER@ PRIPTR_PREFIX = @PRIPTR_PREFIX@ PTHREAD_H_DEFINES_STRUCT_TIMESPEC = @PTHREAD_H_DEFINES_STRUCT_TIMESPEC@ +PTHREAD_SIGMASK_LIB = @PTHREAD_SIGMASK_LIB@ PTRDIFF_T_SUFFIX = @PTRDIFF_T_SUFFIX@ RANLIB = @RANLIB@ REPLACE_ACCESS = @REPLACE_ACCESS@ @@ -1153,6 +1180,7 @@ REPLACE_BTOWC = @REPLACE_BTOWC@ REPLACE_CALLOC_FOR_CALLOC_GNU = @REPLACE_CALLOC_FOR_CALLOC_GNU@ REPLACE_CALLOC_FOR_CALLOC_POSIX = @REPLACE_CALLOC_FOR_CALLOC_POSIX@ REPLACE_CANONICALIZE_FILE_NAME = @REPLACE_CANONICALIZE_FILE_NAME@ +REPLACE_CHMOD = @REPLACE_CHMOD@ REPLACE_CHOWN = @REPLACE_CHOWN@ REPLACE_CLOSE = @REPLACE_CLOSE@ REPLACE_COPY_FILE_RANGE = @REPLACE_COPY_FILE_RANGE@ @@ -1161,7 +1189,10 @@ REPLACE_CTIME = @REPLACE_CTIME@ REPLACE_DPRINTF = @REPLACE_DPRINTF@ REPLACE_DUP = @REPLACE_DUP@ REPLACE_DUP2 = @REPLACE_DUP2@ +REPLACE_DUP3 = @REPLACE_DUP3@ REPLACE_DUPLOCALE = @REPLACE_DUPLOCALE@ +REPLACE_ERROR = @REPLACE_ERROR@ +REPLACE_ERROR_AT_LINE = @REPLACE_ERROR_AT_LINE@ REPLACE_EXECL = @REPLACE_EXECL@ REPLACE_EXECLE = @REPLACE_EXECLE@ REPLACE_EXECLP = @REPLACE_EXECLP@ @@ -1174,6 +1205,7 @@ REPLACE_FCHMODAT = @REPLACE_FCHMODAT@ REPLACE_FCHOWNAT = @REPLACE_FCHOWNAT@ REPLACE_FCLOSE = @REPLACE_FCLOSE@ REPLACE_FCNTL = @REPLACE_FCNTL@ +REPLACE_FDATASYNC = @REPLACE_FDATASYNC@ REPLACE_FDOPEN = @REPLACE_FDOPEN@ REPLACE_FFLUSH = @REPLACE_FFLUSH@ REPLACE_FFSLL = @REPLACE_FFSLL@ @@ -1196,15 +1228,21 @@ REPLACE_GETCWD = @REPLACE_GETCWD@ REPLACE_GETDELIM = @REPLACE_GETDELIM@ REPLACE_GETDOMAINNAME = @REPLACE_GETDOMAINNAME@ REPLACE_GETDTABLESIZE = @REPLACE_GETDTABLESIZE@ +REPLACE_GETENTROPY = @REPLACE_GETENTROPY@ REPLACE_GETGROUPS = @REPLACE_GETGROUPS@ REPLACE_GETLINE = @REPLACE_GETLINE@ +REPLACE_GETLOADAVG = @REPLACE_GETLOADAVG@ REPLACE_GETLOGIN_R = @REPLACE_GETLOGIN_R@ REPLACE_GETPAGESIZE = @REPLACE_GETPAGESIZE@ REPLACE_GETPASS = @REPLACE_GETPASS@ REPLACE_GETPASS_FOR_GETPASS_GNU = @REPLACE_GETPASS_FOR_GETPASS_GNU@ +REPLACE_GETPROGNAME = @REPLACE_GETPROGNAME@ REPLACE_GETRANDOM = @REPLACE_GETRANDOM@ +REPLACE_GETSUBOPT = @REPLACE_GETSUBOPT@ REPLACE_GETTIMEOFDAY = @REPLACE_GETTIMEOFDAY@ REPLACE_GMTIME = @REPLACE_GMTIME@ +REPLACE_IMAXABS = @REPLACE_IMAXABS@ +REPLACE_IMAXDIV = @REPLACE_IMAXDIV@ REPLACE_INET_NTOP = @REPLACE_INET_NTOP@ REPLACE_INET_PTON = @REPLACE_INET_PTON@ REPLACE_INITSTATE = @REPLACE_INITSTATE@ @@ -1233,11 +1271,14 @@ REPLACE_MBSTATE_T = @REPLACE_MBSTATE_T@ REPLACE_MBTOWC = @REPLACE_MBTOWC@ REPLACE_MEMCHR = @REPLACE_MEMCHR@ REPLACE_MEMMEM = @REPLACE_MEMMEM@ +REPLACE_MEMPCPY = @REPLACE_MEMPCPY@ REPLACE_MKDIR = @REPLACE_MKDIR@ REPLACE_MKFIFO = @REPLACE_MKFIFO@ REPLACE_MKFIFOAT = @REPLACE_MKFIFOAT@ REPLACE_MKNOD = @REPLACE_MKNOD@ REPLACE_MKNODAT = @REPLACE_MKNODAT@ +REPLACE_MKOSTEMP = @REPLACE_MKOSTEMP@ +REPLACE_MKOSTEMPS = @REPLACE_MKOSTEMPS@ REPLACE_MKSTEMP = @REPLACE_MKSTEMP@ REPLACE_MKTIME = @REPLACE_MKTIME@ REPLACE_NANOSLEEP = @REPLACE_NANOSLEEP@ @@ -1248,8 +1289,10 @@ REPLACE_OBSTACK_PRINTF = @REPLACE_OBSTACK_PRINTF@ REPLACE_OPEN = @REPLACE_OPEN@ REPLACE_OPENAT = @REPLACE_OPENAT@ REPLACE_PERROR = @REPLACE_PERROR@ +REPLACE_PIPE2 = @REPLACE_PIPE2@ REPLACE_POPEN = @REPLACE_POPEN@ REPLACE_POSIX_MEMALIGN = @REPLACE_POSIX_MEMALIGN@ +REPLACE_POSIX_OPENPT = @REPLACE_POSIX_OPENPT@ REPLACE_PREAD = @REPLACE_PREAD@ REPLACE_PRINTF = @REPLACE_PRINTF@ REPLACE_PSELECT = @REPLACE_PSELECT@ @@ -1327,6 +1370,7 @@ REPLACE_RMDIR = @REPLACE_RMDIR@ REPLACE_SCHED_YIELD = @REPLACE_SCHED_YIELD@ REPLACE_SELECT = @REPLACE_SELECT@ REPLACE_SETENV = @REPLACE_SETENV@ +REPLACE_SETHOSTNAME = @REPLACE_SETHOSTNAME@ REPLACE_SETLOCALE = @REPLACE_SETLOCALE@ REPLACE_SETSTATE = @REPLACE_SETSTATE@ REPLACE_SLEEP = @REPLACE_SLEEP@ @@ -1335,6 +1379,7 @@ REPLACE_SPRINTF = @REPLACE_SPRINTF@ REPLACE_STAT = @REPLACE_STAT@ REPLACE_STDIO_READ_FUNCS = @REPLACE_STDIO_READ_FUNCS@ REPLACE_STDIO_WRITE_FUNCS = @REPLACE_STDIO_WRITE_FUNCS@ +REPLACE_STPCPY = @REPLACE_STPCPY@ REPLACE_STPNCPY = @REPLACE_STPNCPY@ REPLACE_STRCASESTR = @REPLACE_STRCASESTR@ REPLACE_STRCHRNUL = @REPLACE_STRCHRNUL@ @@ -1361,7 +1406,9 @@ REPLACE_STRUCT_LCONV = @REPLACE_STRUCT_LCONV@ REPLACE_STRUCT_TIMEVAL = @REPLACE_STRUCT_TIMEVAL@ REPLACE_SYMLINK = @REPLACE_SYMLINK@ REPLACE_SYMLINKAT = @REPLACE_SYMLINKAT@ +REPLACE_TIME = @REPLACE_TIME@ REPLACE_TIMEGM = @REPLACE_TIMEGM@ +REPLACE_TIMESPEC_GET = @REPLACE_TIMESPEC_GET@ REPLACE_TMPFILE = @REPLACE_TMPFILE@ REPLACE_TOWLOWER = @REPLACE_TOWLOWER@ REPLACE_TRUNCATE = @REPLACE_TRUNCATE@ @@ -1387,15 +1434,20 @@ REPLACE_WCSWIDTH = @REPLACE_WCSWIDTH@ REPLACE_WCTOB = @REPLACE_WCTOB@ REPLACE_WCTOMB = @REPLACE_WCTOMB@ REPLACE_WCWIDTH = @REPLACE_WCWIDTH@ +REPLACE_WMEMPCPY = @REPLACE_WMEMPCPY@ REPLACE_WRITE = @REPLACE_WRITE@ +REPLACE__EXIT = @REPLACE__EXIT@ +SCHED_YIELD_LIB = @SCHED_YIELD_LIB@ SED = @SED@ +SELECT_LIB = @SELECT_LIB@ +SETLOCALE_LIB = @SETLOCALE_LIB@ +SETLOCALE_NULL_LIB = @SETLOCALE_NULL_LIB@ SET_MAKE = @SET_MAKE@ SHELL = @SHELL@ SIG_ATOMIC_T_SUFFIX = @SIG_ATOMIC_T_SUFFIX@ SIZE_T_SUFFIX = @SIZE_T_SUFFIX@ -STDALIGN_H = @STDALIGN_H@ STDARG_H = @STDARG_H@ -STDBOOL_H = @STDBOOL_H@ +STDCKDINT_H = @STDCKDINT_H@ STDDEF_H = @STDDEF_H@ STDINT_H = @STDINT_H@ STRIP = @STRIP@ @@ -1439,6 +1491,8 @@ am__quote = @am__quote@ am__tar = @am__tar@ am__untar = @am__untar@ bindir = @bindir@ +bindir_c = @bindir_c@ +bindir_c_make = @bindir_c_make@ build = @build@ build_alias = @build_alias@ build_cpu = @build_cpu@ @@ -1446,10 +1500,20 @@ build_os = @build_os@ build_vendor = @build_vendor@ builddir = @builddir@ datadir = @datadir@ +datadir_c = @datadir_c@ +datadir_c_make = @datadir_c_make@ datarootdir = @datarootdir@ +datarootdir_c = @datarootdir_c@ +datarootdir_c_make = @datarootdir_c_make@ docdir = @docdir@ +docdir_c = @docdir_c@ +docdir_c_make = @docdir_c_make@ dvidir = @dvidir@ +dvidir_c = @dvidir_c@ +dvidir_c_make = @dvidir_c_make@ exec_prefix = @exec_prefix@ +exec_prefix_c = @exec_prefix_c@ +exec_prefix_c_make = @exec_prefix_c_make@ gl_LIBOBJDEPS = @gl_LIBOBJDEPS@ gl_LIBOBJS = @gl_LIBOBJS@ gl_LTLIBOBJS = @gl_LTLIBOBJS@ @@ -1463,26 +1527,68 @@ host_cpu = @host_cpu@ host_os = @host_os@ host_vendor = @host_vendor@ htmldir = @htmldir@ +htmldir_c = @htmldir_c@ +htmldir_c_make = @htmldir_c_make@ includedir = @includedir@ +includedir_c = @includedir_c@ +includedir_c_make = @includedir_c_make@ infodir = @infodir@ +infodir_c = @infodir_c@ +infodir_c_make = @infodir_c_make@ install_sh = @install_sh@ libdir = @libdir@ +libdir_c = @libdir_c@ +libdir_c_make = @libdir_c_make@ libexecdir = @libexecdir@ +libexecdir_c = @libexecdir_c@ +libexecdir_c_make = @libexecdir_c_make@ lispdir = @lispdir@ +lispdir_c = @lispdir_c@ +lispdir_c_make = @lispdir_c_make@ localedir = @localedir@ +localedir_c = @localedir_c@ +localedir_c_make = @localedir_c_make@ localstatedir = @localstatedir@ +localstatedir_c = @localstatedir_c@ +localstatedir_c_make = @localstatedir_c_make@ mandir = @mandir@ +mandir_c = @mandir_c@ +mandir_c_make = @mandir_c_make@ mkdir_p = @mkdir_p@ oldincludedir = @oldincludedir@ +oldincludedir_c = @oldincludedir_c@ +oldincludedir_c_make = @oldincludedir_c_make@ pdfdir = @pdfdir@ +pdfdir_c = @pdfdir_c@ +pdfdir_c_make = @pdfdir_c_make@ +pkgdatadir_c = @pkgdatadir_c@ +pkgdatadir_c_make = @pkgdatadir_c_make@ +pkgincludedir_c = @pkgincludedir_c@ +pkgincludedir_c_make = @pkgincludedir_c_make@ +pkglibdir_c = @pkglibdir_c@ +pkglibdir_c_make = @pkglibdir_c_make@ +pkglibexecdir_c = @pkglibexecdir_c@ +pkglibexecdir_c_make = @pkglibexecdir_c_make@ prefix = @prefix@ +prefix_c = @prefix_c@ +prefix_c_make = @prefix_c_make@ program_transform_name = @program_transform_name@ psdir = @psdir@ +psdir_c = @psdir_c@ +psdir_c_make = @psdir_c_make@ runstatedir = @runstatedir@ +runstatedir_c = @runstatedir_c@ +runstatedir_c_make = @runstatedir_c_make@ sbindir = @sbindir@ +sbindir_c = @sbindir_c@ +sbindir_c_make = @sbindir_c_make@ sharedstatedir = @sharedstatedir@ +sharedstatedir_c = @sharedstatedir_c@ +sharedstatedir_c_make = @sharedstatedir_c_make@ srcdir = @srcdir@ sysconfdir = @sysconfdir@ +sysconfdir_c = @sysconfdir_c@ +sysconfdir_c_make = @sysconfdir_c_make@ target_alias = @target_alias@ top_build_prefix = @top_build_prefix@ top_builddir = @top_builddir@ diff --git a/doc/C/Makefile.in b/doc/C/Makefile.in index f1c9a5c..5e88523 100644 --- a/doc/C/Makefile.in +++ b/doc/C/Makefile.in @@ -69,9 +69,6 @@ am__make_running_with_option = \ test $$has_opt = yes am__make_dryrun = (target_option=n; $(am__make_running_with_option)) am__make_keepgoing = (target_option=k; $(am__make_running_with_option)) -pkgdatadir = $(datadir)/@PACKAGE@ -pkgincludedir = $(includedir)/@PACKAGE@ -pkglibdir = $(libdir)/@PACKAGE@ am__cd = CDPATH="$${ZSH_VERSION+.}$(PATH_SEPARATOR)" && cd install_sh_DATA = $(install_sh) -c -m 644 install_sh_PROGRAM = $(install_sh) -c @@ -92,7 +89,9 @@ am__aclocal_m4_deps = $(top_srcdir)/m4/00gnulib.m4 \ $(top_srcdir)/m4/__inline.m4 \ $(top_srcdir)/m4/absolute-header.m4 $(top_srcdir)/m4/alloca.m4 \ $(top_srcdir)/m4/arpa_inet_h.m4 $(top_srcdir)/m4/assert.m4 \ - $(top_srcdir)/m4/btowc.m4 $(top_srcdir)/m4/builtin-expect.m4 \ + $(top_srcdir)/m4/assert_h.m4 $(top_srcdir)/m4/btowc.m4 \ + $(top_srcdir)/m4/build-to-host.m4 \ + $(top_srcdir)/m4/builtin-expect.m4 $(top_srcdir)/m4/c-bool.m4 \ $(top_srcdir)/m4/calloc.m4 $(top_srcdir)/m4/canonicalize.m4 \ $(top_srcdir)/m4/clock_time.m4 $(top_srcdir)/m4/close.m4 \ $(top_srcdir)/m4/codeset.m4 $(top_srcdir)/m4/config-h.m4 \ @@ -100,7 +99,7 @@ am__aclocal_m4_deps = $(top_srcdir)/m4/00gnulib.m4 \ $(top_srcdir)/m4/double-slash-root.m4 $(top_srcdir)/m4/dup2.m4 \ $(top_srcdir)/m4/eealloc.m4 $(top_srcdir)/m4/environ.m4 \ $(top_srcdir)/m4/errno_h.m4 $(top_srcdir)/m4/error.m4 \ - $(top_srcdir)/m4/extensions.m4 \ + $(top_srcdir)/m4/error_h.m4 $(top_srcdir)/m4/extensions.m4 \ $(top_srcdir)/m4/extern-inline.m4 $(top_srcdir)/m4/fcntl-o.m4 \ $(top_srcdir)/m4/fcntl.m4 $(top_srcdir)/m4/fcntl_h.m4 \ $(top_srcdir)/m4/fdopen.m4 $(top_srcdir)/m4/flexmember.m4 \ @@ -132,10 +131,11 @@ am__aclocal_m4_deps = $(top_srcdir)/m4/00gnulib.m4 \ $(top_srcdir)/m4/malloc.m4 $(top_srcdir)/m4/malloca.m4 \ $(top_srcdir)/m4/manywarnings.m4 $(top_srcdir)/m4/mbrtowc.m4 \ $(top_srcdir)/m4/mbsinit.m4 $(top_srcdir)/m4/mbstate_t.m4 \ - $(top_srcdir)/m4/mbtowc.m4 $(top_srcdir)/m4/mempcpy.m4 \ - $(top_srcdir)/m4/minmax.m4 $(top_srcdir)/m4/mkdir.m4 \ - $(top_srcdir)/m4/mkstemp.m4 $(top_srcdir)/m4/mmap-anon.m4 \ - $(top_srcdir)/m4/mode_t.m4 $(top_srcdir)/m4/msvc-inval.m4 \ + $(top_srcdir)/m4/mbtowc.m4 $(top_srcdir)/m4/memchr.m4 \ + $(top_srcdir)/m4/mempcpy.m4 $(top_srcdir)/m4/minmax.m4 \ + $(top_srcdir)/m4/mkdir.m4 $(top_srcdir)/m4/mkstemp.m4 \ + $(top_srcdir)/m4/mmap-anon.m4 $(top_srcdir)/m4/mode_t.m4 \ + $(top_srcdir)/m4/msvc-inval.m4 \ $(top_srcdir)/m4/msvc-nothrow.m4 $(top_srcdir)/m4/multiarch.m4 \ $(top_srcdir)/m4/musl.m4 $(top_srcdir)/m4/nanosleep.m4 \ $(top_srcdir)/m4/netinet_in_h.m4 \ @@ -166,29 +166,29 @@ am__aclocal_m4_deps = $(top_srcdir)/m4/00gnulib.m4 \ $(top_srcdir)/m4/socklen.m4 $(top_srcdir)/m4/sockpfaf.m4 \ $(top_srcdir)/m4/ssize_t.m4 $(top_srcdir)/m4/stat-time.m4 \ $(top_srcdir)/m4/stat.m4 $(top_srcdir)/m4/stdalign.m4 \ - $(top_srcdir)/m4/stdarg.m4 $(top_srcdir)/m4/stdbool.m4 \ - $(top_srcdir)/m4/stddef_h.m4 $(top_srcdir)/m4/stdint.m4 \ - $(top_srcdir)/m4/stdio_h.m4 $(top_srcdir)/m4/stdlib_h.m4 \ - $(top_srcdir)/m4/strdup.m4 $(top_srcdir)/m4/strerror.m4 \ - $(top_srcdir)/m4/strerror_r.m4 $(top_srcdir)/m4/string_h.m4 \ - $(top_srcdir)/m4/strtoll.m4 $(top_srcdir)/m4/strtoull.m4 \ - $(top_srcdir)/m4/symlink.m4 $(top_srcdir)/m4/sys_ioctl_h.m4 \ + $(top_srcdir)/m4/stdarg.m4 $(top_srcdir)/m4/stddef_h.m4 \ + $(top_srcdir)/m4/stdint.m4 $(top_srcdir)/m4/stdio_h.m4 \ + $(top_srcdir)/m4/stdlib_h.m4 $(top_srcdir)/m4/strdup.m4 \ + $(top_srcdir)/m4/strerror.m4 $(top_srcdir)/m4/strerror_r.m4 \ + $(top_srcdir)/m4/string_h.m4 $(top_srcdir)/m4/strtoll.m4 \ + $(top_srcdir)/m4/strtoull.m4 $(top_srcdir)/m4/symlink.m4 \ + $(top_srcdir)/m4/sys_ioctl_h.m4 \ $(top_srcdir)/m4/sys_random_h.m4 \ $(top_srcdir)/m4/sys_select_h.m4 \ $(top_srcdir)/m4/sys_socket_h.m4 \ $(top_srcdir)/m4/sys_stat_h.m4 $(top_srcdir)/m4/sys_time_h.m4 \ $(top_srcdir)/m4/sys_types_h.m4 $(top_srcdir)/m4/sys_uio_h.m4 \ $(top_srcdir)/m4/tempname.m4 $(top_srcdir)/m4/thread.m4 \ - $(top_srcdir)/m4/threadlib.m4 $(top_srcdir)/m4/time_h.m4 \ - $(top_srcdir)/m4/unistd_h.m4 $(top_srcdir)/m4/unlink.m4 \ - $(top_srcdir)/m4/unlinkdir.m4 $(top_srcdir)/m4/usleep.m4 \ - $(top_srcdir)/m4/version-etc.m4 $(top_srcdir)/m4/visibility.m4 \ - $(top_srcdir)/m4/warn-on-use.m4 $(top_srcdir)/m4/warnings.m4 \ - $(top_srcdir)/m4/wchar_h.m4 $(top_srcdir)/m4/wchar_t.m4 \ - $(top_srcdir)/m4/wcrtomb.m4 $(top_srcdir)/m4/wctob.m4 \ - $(top_srcdir)/m4/wctomb.m4 $(top_srcdir)/m4/wctype_h.m4 \ - $(top_srcdir)/m4/wint_t.m4 $(top_srcdir)/m4/xalloc.m4 \ - $(top_srcdir)/m4/xstrtol.m4 $(top_srcdir)/m4/year2038.m4 \ + $(top_srcdir)/m4/threadlib.m4 $(top_srcdir)/m4/time.m4 \ + $(top_srcdir)/m4/time_h.m4 $(top_srcdir)/m4/unistd_h.m4 \ + $(top_srcdir)/m4/unlink.m4 $(top_srcdir)/m4/unlinkdir.m4 \ + $(top_srcdir)/m4/usleep.m4 $(top_srcdir)/m4/version-etc.m4 \ + $(top_srcdir)/m4/visibility.m4 $(top_srcdir)/m4/warn-on-use.m4 \ + $(top_srcdir)/m4/warnings.m4 $(top_srcdir)/m4/wchar_h.m4 \ + $(top_srcdir)/m4/wchar_t.m4 $(top_srcdir)/m4/wcrtomb.m4 \ + $(top_srcdir)/m4/wctob.m4 $(top_srcdir)/m4/wctomb.m4 \ + $(top_srcdir)/m4/wctype_h.m4 $(top_srcdir)/m4/wint_t.m4 \ + $(top_srcdir)/m4/xalloc.m4 $(top_srcdir)/m4/xstrtol.m4 \ $(top_srcdir)/m4/yield.m4 $(top_srcdir)/m4/zzgnulib.m4 \ $(top_srcdir)/configure.ac am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \ @@ -251,6 +251,9 @@ MANS = $(dist_man8_MANS) am__tagged_files = $(HEADERS) $(SOURCES) $(TAGS_FILES) $(LISP) am__DIST_COMMON = $(dist_man8_MANS) $(srcdir)/Makefile.in DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST) +pkgdatadir = @pkgdatadir@ +pkgincludedir = @pkgincludedir@ +pkglibdir = @pkglibdir@ pkglibexecdir = @pkglibexecdir@ ACLOCAL = @ACLOCAL@ ALLOCA = @ALLOCA@ @@ -260,6 +263,7 @@ AM_DEFAULT_VERBOSITY = @AM_DEFAULT_VERBOSITY@ APPLE_UNIVERSAL_BUILD = @APPLE_UNIVERSAL_BUILD@ AR = @AR@ ARFLAGS = @ARFLAGS@ +ASSERT_H = @ASSERT_H@ AUTOCONF = @AUTOCONF@ AUTOHEADER = @AUTOHEADER@ AUTOMAKE = @AUTOMAKE@ @@ -276,6 +280,7 @@ CFLAGS = @CFLAGS@ CFLAG_VISIBILITY = @CFLAG_VISIBILITY@ CHECK_CFLAGS = @CHECK_CFLAGS@ CHECK_LIBS = @CHECK_LIBS@ +CLOCK_TIME_LIB = @CLOCK_TIME_LIB@ CONFIG_INCLUDE = @CONFIG_INCLUDE@ CPP = @CPP@ CPPFLAGS = @CPPFLAGS@ @@ -300,12 +305,14 @@ ENOLINK_VALUE = @ENOLINK_VALUE@ EOVERFLOW_HIDDEN = @EOVERFLOW_HIDDEN@ EOVERFLOW_VALUE = @EOVERFLOW_VALUE@ ERRNO_H = @ERRNO_H@ +ERROR_H = @ERROR_H@ ETAGS = @ETAGS@ EXEEXT = @EXEEXT@ FGREP = @FGREP@ FILECMD = @FILECMD@ GETOPT_CDEFS_H = @GETOPT_CDEFS_H@ GETOPT_H = @GETOPT_H@ +GETRANDOM_LIB = @GETRANDOM_LIB@ GETTEXT_MACRO_VERSION = @GETTEXT_MACRO_VERSION@ GL_CFLAG_ALLOW_WARNINGS = @GL_CFLAG_ALLOW_WARNINGS@ GL_CFLAG_GNULIB_WARNINGS = @GL_CFLAG_GNULIB_WARNINGS@ @@ -321,6 +328,7 @@ GL_GNULIB_CALLOC_GNU = @GL_GNULIB_CALLOC_GNU@ GL_GNULIB_CALLOC_POSIX = @GL_GNULIB_CALLOC_POSIX@ GL_GNULIB_CANONICALIZE_FILE_NAME = @GL_GNULIB_CANONICALIZE_FILE_NAME@ GL_GNULIB_CHDIR = @GL_GNULIB_CHDIR@ +GL_GNULIB_CHMOD = @GL_GNULIB_CHMOD@ GL_GNULIB_CHOWN = @GL_GNULIB_CHOWN@ GL_GNULIB_CLOSE = @GL_GNULIB_CLOSE@ GL_GNULIB_CONNECT = @GL_GNULIB_CONNECT@ @@ -394,6 +402,7 @@ GL_GNULIB_GETPAGESIZE = @GL_GNULIB_GETPAGESIZE@ GL_GNULIB_GETPASS = @GL_GNULIB_GETPASS@ GL_GNULIB_GETPASS_GNU = @GL_GNULIB_GETPASS_GNU@ GL_GNULIB_GETPEERNAME = @GL_GNULIB_GETPEERNAME@ +GL_GNULIB_GETPROGNAME = @GL_GNULIB_GETPROGNAME@ GL_GNULIB_GETRANDOM = @GL_GNULIB_GETRANDOM@ GL_GNULIB_GETSOCKNAME = @GL_GNULIB_GETSOCKNAME@ GL_GNULIB_GETSOCKOPT = @GL_GNULIB_GETSOCKOPT@ @@ -491,6 +500,7 @@ GL_GNULIB_MEMCHR = @GL_GNULIB_MEMCHR@ GL_GNULIB_MEMMEM = @GL_GNULIB_MEMMEM@ GL_GNULIB_MEMPCPY = @GL_GNULIB_MEMPCPY@ GL_GNULIB_MEMRCHR = @GL_GNULIB_MEMRCHR@ +GL_GNULIB_MEMSET_EXPLICIT = @GL_GNULIB_MEMSET_EXPLICIT@ GL_GNULIB_MKDIR = @GL_GNULIB_MKDIR@ GL_GNULIB_MKDIRAT = @GL_GNULIB_MKDIRAT@ GL_GNULIB_MKDTEMP = @GL_GNULIB_MKDTEMP@ @@ -611,6 +621,7 @@ GL_GNULIB_STRVERSCMP = @GL_GNULIB_STRVERSCMP@ GL_GNULIB_SYMLINK = @GL_GNULIB_SYMLINK@ GL_GNULIB_SYMLINKAT = @GL_GNULIB_SYMLINKAT@ GL_GNULIB_SYSTEM_POSIX = @GL_GNULIB_SYSTEM_POSIX@ +GL_GNULIB_TIME = @GL_GNULIB_TIME@ GL_GNULIB_TIMEGM = @GL_GNULIB_TIMEGM@ GL_GNULIB_TIMESPEC_GET = @GL_GNULIB_TIMESPEC_GET@ GL_GNULIB_TIMESPEC_GETRES = @GL_GNULIB_TIMESPEC_GETRES@ @@ -685,6 +696,7 @@ GMSGFMT_015 = @GMSGFMT_015@ GNULIBHEADERS_OVERRIDE_WINT_T = @GNULIBHEADERS_OVERRIDE_WINT_T@ GNULIB_GETTIMEOFDAY = @GNULIB_GETTIMEOFDAY@ GREP = @GREP@ +HARD_LOCALE_LIB = @HARD_LOCALE_LIB@ HAVE_ACCEPT4 = @HAVE_ACCEPT4@ HAVE_ALIGNED_ALLOC = @HAVE_ALIGNED_ALLOC@ HAVE_ALLOCA_H = @HAVE_ALLOCA_H@ @@ -715,6 +727,7 @@ HAVE_DECL_GETLOGIN = @HAVE_DECL_GETLOGIN@ HAVE_DECL_GETLOGIN_R = @HAVE_DECL_GETLOGIN_R@ HAVE_DECL_GETPAGESIZE = @HAVE_DECL_GETPAGESIZE@ HAVE_DECL_GETUSERSHELL = @HAVE_DECL_GETUSERSHELL@ +HAVE_DECL_GETW = @HAVE_DECL_GETW@ HAVE_DECL_IMAXABS = @HAVE_DECL_IMAXABS@ HAVE_DECL_IMAXDIV = @HAVE_DECL_IMAXDIV@ HAVE_DECL_INET_NTOP = @HAVE_DECL_INET_NTOP@ @@ -724,6 +737,7 @@ HAVE_DECL_LOCALTIME_R = @HAVE_DECL_LOCALTIME_R@ HAVE_DECL_MEMMEM = @HAVE_DECL_MEMMEM@ HAVE_DECL_MEMRCHR = @HAVE_DECL_MEMRCHR@ HAVE_DECL_OBSTACK_PRINTF = @HAVE_DECL_OBSTACK_PRINTF@ +HAVE_DECL_PUTW = @HAVE_DECL_PUTW@ HAVE_DECL_SETENV = @HAVE_DECL_SETENV@ HAVE_DECL_SETHOSTNAME = @HAVE_DECL_SETHOSTNAME@ HAVE_DECL_SETSTATE = @HAVE_DECL_SETSTATE@ @@ -746,6 +760,9 @@ HAVE_DECL_WCWIDTH = @HAVE_DECL_WCWIDTH@ HAVE_DPRINTF = @HAVE_DPRINTF@ HAVE_DUP3 = @HAVE_DUP3@ HAVE_DUPLOCALE = @HAVE_DUPLOCALE@ +HAVE_ERROR = @HAVE_ERROR@ +HAVE_ERROR_AT_LINE = @HAVE_ERROR_AT_LINE@ +HAVE_ERROR_H = @HAVE_ERROR_H@ HAVE_EUIDACCESS = @HAVE_EUIDACCESS@ HAVE_EXECVPE = @HAVE_EXECVPE@ HAVE_EXPLICIT_BZERO = @HAVE_EXPLICIT_BZERO@ @@ -773,12 +790,15 @@ HAVE_GETLOGIN = @HAVE_GETLOGIN@ HAVE_GETOPT_H = @HAVE_GETOPT_H@ HAVE_GETPAGESIZE = @HAVE_GETPAGESIZE@ HAVE_GETPASS = @HAVE_GETPASS@ +HAVE_GETPROGNAME = @HAVE_GETPROGNAME@ HAVE_GETRANDOM = @HAVE_GETRANDOM@ HAVE_GETSUBOPT = @HAVE_GETSUBOPT@ HAVE_GETTIMEOFDAY = @HAVE_GETTIMEOFDAY@ HAVE_GETUMASK = @HAVE_GETUMASK@ HAVE_GRANTPT = @HAVE_GRANTPT@ HAVE_GROUP_MEMBER = @HAVE_GROUP_MEMBER@ +HAVE_IMAXABS = @HAVE_IMAXABS@ +HAVE_IMAXDIV = @HAVE_IMAXDIV@ HAVE_IMAXDIV_T = @HAVE_IMAXDIV_T@ HAVE_INITSTATE = @HAVE_INITSTATE@ HAVE_INTTYPES_H = @HAVE_INTTYPES_H@ @@ -805,6 +825,7 @@ HAVE_MBSNRTOWCS = @HAVE_MBSNRTOWCS@ HAVE_MBSRTOWCS = @HAVE_MBSRTOWCS@ HAVE_MBTOWC = @HAVE_MBTOWC@ HAVE_MEMPCPY = @HAVE_MEMPCPY@ +HAVE_MEMSET_EXPLICIT = @HAVE_MEMSET_EXPLICIT@ HAVE_MKDIRAT = @HAVE_MKDIRAT@ HAVE_MKDTEMP = @HAVE_MKDTEMP@ HAVE_MKFIFO = @HAVE_MKFIFO@ @@ -1013,7 +1034,6 @@ HAVE_WMEMPCPY = @HAVE_WMEMPCPY@ HAVE_WMEMSET = @HAVE_WMEMSET@ HAVE_WS2TCPIP_H = @HAVE_WS2TCPIP_H@ HAVE_XLOCALE_H = @HAVE_XLOCALE_H@ -HAVE__BOOL = @HAVE__BOOL@ HAVE__EXIT = @HAVE__EXIT@ IGNORE_UNUSED_LIBRARIES_CFLAGS = @IGNORE_UNUSED_LIBRARIES_CFLAGS@ INCLUDE_NEXT = @INCLUDE_NEXT@ @@ -1080,15 +1100,20 @@ LT_REVISION = @LT_REVISION@ LT_SYS_LIBRARY_PATH = @LT_SYS_LIBRARY_PATH@ MAKEINFO = @MAKEINFO@ MANIFEST_TOOL = @MANIFEST_TOOL@ +MBRTOWC_LIB = @MBRTOWC_LIB@ MKDIR_P = @MKDIR_P@ MSGFMT = @MSGFMT@ MSGFMT_015 = @MSGFMT_015@ MSGMERGE = @MSGMERGE@ +NANOSLEEP_LIB = @NANOSLEEP_LIB@ NETINET_IN_H = @NETINET_IN_H@ NEXT_ARPA_INET_H = @NEXT_ARPA_INET_H@ +NEXT_ASSERT_H = @NEXT_ASSERT_H@ NEXT_AS_FIRST_DIRECTIVE_ARPA_INET_H = @NEXT_AS_FIRST_DIRECTIVE_ARPA_INET_H@ +NEXT_AS_FIRST_DIRECTIVE_ASSERT_H = @NEXT_AS_FIRST_DIRECTIVE_ASSERT_H@ NEXT_AS_FIRST_DIRECTIVE_CTYPE_H = @NEXT_AS_FIRST_DIRECTIVE_CTYPE_H@ NEXT_AS_FIRST_DIRECTIVE_ERRNO_H = @NEXT_AS_FIRST_DIRECTIVE_ERRNO_H@ +NEXT_AS_FIRST_DIRECTIVE_ERROR_H = @NEXT_AS_FIRST_DIRECTIVE_ERROR_H@ NEXT_AS_FIRST_DIRECTIVE_FCNTL_H = @NEXT_AS_FIRST_DIRECTIVE_FCNTL_H@ NEXT_AS_FIRST_DIRECTIVE_GETOPT_H = @NEXT_AS_FIRST_DIRECTIVE_GETOPT_H@ NEXT_AS_FIRST_DIRECTIVE_INTTYPES_H = @NEXT_AS_FIRST_DIRECTIVE_INTTYPES_H@ @@ -1119,6 +1144,7 @@ NEXT_AS_FIRST_DIRECTIVE_WCHAR_H = @NEXT_AS_FIRST_DIRECTIVE_WCHAR_H@ NEXT_AS_FIRST_DIRECTIVE_WCTYPE_H = @NEXT_AS_FIRST_DIRECTIVE_WCTYPE_H@ NEXT_CTYPE_H = @NEXT_CTYPE_H@ NEXT_ERRNO_H = @NEXT_ERRNO_H@ +NEXT_ERROR_H = @NEXT_ERROR_H@ NEXT_FCNTL_H = @NEXT_FCNTL_H@ NEXT_GETOPT_H = @NEXT_GETOPT_H@ NEXT_INTTYPES_H = @NEXT_INTTYPES_H@ @@ -1174,6 +1200,7 @@ PRAGMA_COLUMNS = @PRAGMA_COLUMNS@ PRAGMA_SYSTEM_HEADER = @PRAGMA_SYSTEM_HEADER@ PRIPTR_PREFIX = @PRIPTR_PREFIX@ PTHREAD_H_DEFINES_STRUCT_TIMESPEC = @PTHREAD_H_DEFINES_STRUCT_TIMESPEC@ +PTHREAD_SIGMASK_LIB = @PTHREAD_SIGMASK_LIB@ PTRDIFF_T_SUFFIX = @PTRDIFF_T_SUFFIX@ RANLIB = @RANLIB@ REPLACE_ACCESS = @REPLACE_ACCESS@ @@ -1182,6 +1209,7 @@ REPLACE_BTOWC = @REPLACE_BTOWC@ REPLACE_CALLOC_FOR_CALLOC_GNU = @REPLACE_CALLOC_FOR_CALLOC_GNU@ REPLACE_CALLOC_FOR_CALLOC_POSIX = @REPLACE_CALLOC_FOR_CALLOC_POSIX@ REPLACE_CANONICALIZE_FILE_NAME = @REPLACE_CANONICALIZE_FILE_NAME@ +REPLACE_CHMOD = @REPLACE_CHMOD@ REPLACE_CHOWN = @REPLACE_CHOWN@ REPLACE_CLOSE = @REPLACE_CLOSE@ REPLACE_COPY_FILE_RANGE = @REPLACE_COPY_FILE_RANGE@ @@ -1190,7 +1218,10 @@ REPLACE_CTIME = @REPLACE_CTIME@ REPLACE_DPRINTF = @REPLACE_DPRINTF@ REPLACE_DUP = @REPLACE_DUP@ REPLACE_DUP2 = @REPLACE_DUP2@ +REPLACE_DUP3 = @REPLACE_DUP3@ REPLACE_DUPLOCALE = @REPLACE_DUPLOCALE@ +REPLACE_ERROR = @REPLACE_ERROR@ +REPLACE_ERROR_AT_LINE = @REPLACE_ERROR_AT_LINE@ REPLACE_EXECL = @REPLACE_EXECL@ REPLACE_EXECLE = @REPLACE_EXECLE@ REPLACE_EXECLP = @REPLACE_EXECLP@ @@ -1203,6 +1234,7 @@ REPLACE_FCHMODAT = @REPLACE_FCHMODAT@ REPLACE_FCHOWNAT = @REPLACE_FCHOWNAT@ REPLACE_FCLOSE = @REPLACE_FCLOSE@ REPLACE_FCNTL = @REPLACE_FCNTL@ +REPLACE_FDATASYNC = @REPLACE_FDATASYNC@ REPLACE_FDOPEN = @REPLACE_FDOPEN@ REPLACE_FFLUSH = @REPLACE_FFLUSH@ REPLACE_FFSLL = @REPLACE_FFSLL@ @@ -1225,15 +1257,21 @@ REPLACE_GETCWD = @REPLACE_GETCWD@ REPLACE_GETDELIM = @REPLACE_GETDELIM@ REPLACE_GETDOMAINNAME = @REPLACE_GETDOMAINNAME@ REPLACE_GETDTABLESIZE = @REPLACE_GETDTABLESIZE@ +REPLACE_GETENTROPY = @REPLACE_GETENTROPY@ REPLACE_GETGROUPS = @REPLACE_GETGROUPS@ REPLACE_GETLINE = @REPLACE_GETLINE@ +REPLACE_GETLOADAVG = @REPLACE_GETLOADAVG@ REPLACE_GETLOGIN_R = @REPLACE_GETLOGIN_R@ REPLACE_GETPAGESIZE = @REPLACE_GETPAGESIZE@ REPLACE_GETPASS = @REPLACE_GETPASS@ REPLACE_GETPASS_FOR_GETPASS_GNU = @REPLACE_GETPASS_FOR_GETPASS_GNU@ +REPLACE_GETPROGNAME = @REPLACE_GETPROGNAME@ REPLACE_GETRANDOM = @REPLACE_GETRANDOM@ +REPLACE_GETSUBOPT = @REPLACE_GETSUBOPT@ REPLACE_GETTIMEOFDAY = @REPLACE_GETTIMEOFDAY@ REPLACE_GMTIME = @REPLACE_GMTIME@ +REPLACE_IMAXABS = @REPLACE_IMAXABS@ +REPLACE_IMAXDIV = @REPLACE_IMAXDIV@ REPLACE_INET_NTOP = @REPLACE_INET_NTOP@ REPLACE_INET_PTON = @REPLACE_INET_PTON@ REPLACE_INITSTATE = @REPLACE_INITSTATE@ @@ -1262,11 +1300,14 @@ REPLACE_MBSTATE_T = @REPLACE_MBSTATE_T@ REPLACE_MBTOWC = @REPLACE_MBTOWC@ REPLACE_MEMCHR = @REPLACE_MEMCHR@ REPLACE_MEMMEM = @REPLACE_MEMMEM@ +REPLACE_MEMPCPY = @REPLACE_MEMPCPY@ REPLACE_MKDIR = @REPLACE_MKDIR@ REPLACE_MKFIFO = @REPLACE_MKFIFO@ REPLACE_MKFIFOAT = @REPLACE_MKFIFOAT@ REPLACE_MKNOD = @REPLACE_MKNOD@ REPLACE_MKNODAT = @REPLACE_MKNODAT@ +REPLACE_MKOSTEMP = @REPLACE_MKOSTEMP@ +REPLACE_MKOSTEMPS = @REPLACE_MKOSTEMPS@ REPLACE_MKSTEMP = @REPLACE_MKSTEMP@ REPLACE_MKTIME = @REPLACE_MKTIME@ REPLACE_NANOSLEEP = @REPLACE_NANOSLEEP@ @@ -1277,8 +1318,10 @@ REPLACE_OBSTACK_PRINTF = @REPLACE_OBSTACK_PRINTF@ REPLACE_OPEN = @REPLACE_OPEN@ REPLACE_OPENAT = @REPLACE_OPENAT@ REPLACE_PERROR = @REPLACE_PERROR@ +REPLACE_PIPE2 = @REPLACE_PIPE2@ REPLACE_POPEN = @REPLACE_POPEN@ REPLACE_POSIX_MEMALIGN = @REPLACE_POSIX_MEMALIGN@ +REPLACE_POSIX_OPENPT = @REPLACE_POSIX_OPENPT@ REPLACE_PREAD = @REPLACE_PREAD@ REPLACE_PRINTF = @REPLACE_PRINTF@ REPLACE_PSELECT = @REPLACE_PSELECT@ @@ -1356,6 +1399,7 @@ REPLACE_RMDIR = @REPLACE_RMDIR@ REPLACE_SCHED_YIELD = @REPLACE_SCHED_YIELD@ REPLACE_SELECT = @REPLACE_SELECT@ REPLACE_SETENV = @REPLACE_SETENV@ +REPLACE_SETHOSTNAME = @REPLACE_SETHOSTNAME@ REPLACE_SETLOCALE = @REPLACE_SETLOCALE@ REPLACE_SETSTATE = @REPLACE_SETSTATE@ REPLACE_SLEEP = @REPLACE_SLEEP@ @@ -1364,6 +1408,7 @@ REPLACE_SPRINTF = @REPLACE_SPRINTF@ REPLACE_STAT = @REPLACE_STAT@ REPLACE_STDIO_READ_FUNCS = @REPLACE_STDIO_READ_FUNCS@ REPLACE_STDIO_WRITE_FUNCS = @REPLACE_STDIO_WRITE_FUNCS@ +REPLACE_STPCPY = @REPLACE_STPCPY@ REPLACE_STPNCPY = @REPLACE_STPNCPY@ REPLACE_STRCASESTR = @REPLACE_STRCASESTR@ REPLACE_STRCHRNUL = @REPLACE_STRCHRNUL@ @@ -1390,7 +1435,9 @@ REPLACE_STRUCT_LCONV = @REPLACE_STRUCT_LCONV@ REPLACE_STRUCT_TIMEVAL = @REPLACE_STRUCT_TIMEVAL@ REPLACE_SYMLINK = @REPLACE_SYMLINK@ REPLACE_SYMLINKAT = @REPLACE_SYMLINKAT@ +REPLACE_TIME = @REPLACE_TIME@ REPLACE_TIMEGM = @REPLACE_TIMEGM@ +REPLACE_TIMESPEC_GET = @REPLACE_TIMESPEC_GET@ REPLACE_TMPFILE = @REPLACE_TMPFILE@ REPLACE_TOWLOWER = @REPLACE_TOWLOWER@ REPLACE_TRUNCATE = @REPLACE_TRUNCATE@ @@ -1416,15 +1463,20 @@ REPLACE_WCSWIDTH = @REPLACE_WCSWIDTH@ REPLACE_WCTOB = @REPLACE_WCTOB@ REPLACE_WCTOMB = @REPLACE_WCTOMB@ REPLACE_WCWIDTH = @REPLACE_WCWIDTH@ +REPLACE_WMEMPCPY = @REPLACE_WMEMPCPY@ REPLACE_WRITE = @REPLACE_WRITE@ +REPLACE__EXIT = @REPLACE__EXIT@ +SCHED_YIELD_LIB = @SCHED_YIELD_LIB@ SED = @SED@ +SELECT_LIB = @SELECT_LIB@ +SETLOCALE_LIB = @SETLOCALE_LIB@ +SETLOCALE_NULL_LIB = @SETLOCALE_NULL_LIB@ SET_MAKE = @SET_MAKE@ SHELL = @SHELL@ SIG_ATOMIC_T_SUFFIX = @SIG_ATOMIC_T_SUFFIX@ SIZE_T_SUFFIX = @SIZE_T_SUFFIX@ -STDALIGN_H = @STDALIGN_H@ STDARG_H = @STDARG_H@ -STDBOOL_H = @STDBOOL_H@ +STDCKDINT_H = @STDCKDINT_H@ STDDEF_H = @STDDEF_H@ STDINT_H = @STDINT_H@ STRIP = @STRIP@ @@ -1468,6 +1520,8 @@ am__quote = @am__quote@ am__tar = @am__tar@ am__untar = @am__untar@ bindir = @bindir@ +bindir_c = @bindir_c@ +bindir_c_make = @bindir_c_make@ build = @build@ build_alias = @build_alias@ build_cpu = @build_cpu@ @@ -1475,10 +1529,20 @@ build_os = @build_os@ build_vendor = @build_vendor@ builddir = @builddir@ datadir = @datadir@ +datadir_c = @datadir_c@ +datadir_c_make = @datadir_c_make@ datarootdir = @datarootdir@ +datarootdir_c = @datarootdir_c@ +datarootdir_c_make = @datarootdir_c_make@ docdir = @docdir@ +docdir_c = @docdir_c@ +docdir_c_make = @docdir_c_make@ dvidir = @dvidir@ +dvidir_c = @dvidir_c@ +dvidir_c_make = @dvidir_c_make@ exec_prefix = @exec_prefix@ +exec_prefix_c = @exec_prefix_c@ +exec_prefix_c_make = @exec_prefix_c_make@ gl_LIBOBJDEPS = @gl_LIBOBJDEPS@ gl_LIBOBJS = @gl_LIBOBJS@ gl_LTLIBOBJS = @gl_LTLIBOBJS@ @@ -1492,26 +1556,68 @@ host_cpu = @host_cpu@ host_os = @host_os@ host_vendor = @host_vendor@ htmldir = @htmldir@ +htmldir_c = @htmldir_c@ +htmldir_c_make = @htmldir_c_make@ includedir = @includedir@ +includedir_c = @includedir_c@ +includedir_c_make = @includedir_c_make@ infodir = @infodir@ +infodir_c = @infodir_c@ +infodir_c_make = @infodir_c_make@ install_sh = @install_sh@ libdir = @libdir@ +libdir_c = @libdir_c@ +libdir_c_make = @libdir_c_make@ libexecdir = @libexecdir@ +libexecdir_c = @libexecdir_c@ +libexecdir_c_make = @libexecdir_c_make@ lispdir = @lispdir@ +lispdir_c = @lispdir_c@ +lispdir_c_make = @lispdir_c_make@ localedir = @localedir@ +localedir_c = @localedir_c@ +localedir_c_make = @localedir_c_make@ localstatedir = @localstatedir@ +localstatedir_c = @localstatedir_c@ +localstatedir_c_make = @localstatedir_c_make@ mandir = @mandir@ +mandir_c = @mandir_c@ +mandir_c_make = @mandir_c_make@ mkdir_p = @mkdir_p@ oldincludedir = @oldincludedir@ +oldincludedir_c = @oldincludedir_c@ +oldincludedir_c_make = @oldincludedir_c_make@ pdfdir = @pdfdir@ +pdfdir_c = @pdfdir_c@ +pdfdir_c_make = @pdfdir_c_make@ +pkgdatadir_c = @pkgdatadir_c@ +pkgdatadir_c_make = @pkgdatadir_c_make@ +pkgincludedir_c = @pkgincludedir_c@ +pkgincludedir_c_make = @pkgincludedir_c_make@ +pkglibdir_c = @pkglibdir_c@ +pkglibdir_c_make = @pkglibdir_c_make@ +pkglibexecdir_c = @pkglibexecdir_c@ +pkglibexecdir_c_make = @pkglibexecdir_c_make@ prefix = @prefix@ +prefix_c = @prefix_c@ +prefix_c_make = @prefix_c_make@ program_transform_name = @program_transform_name@ psdir = @psdir@ +psdir_c = @psdir_c@ +psdir_c_make = @psdir_c_make@ runstatedir = @runstatedir@ +runstatedir_c = @runstatedir_c@ +runstatedir_c_make = @runstatedir_c_make@ sbindir = @sbindir@ +sbindir_c = @sbindir_c@ +sbindir_c_make = @sbindir_c_make@ sharedstatedir = @sharedstatedir@ +sharedstatedir_c = @sharedstatedir_c@ +sharedstatedir_c_make = @sharedstatedir_c_make@ srcdir = @srcdir@ sysconfdir = @sysconfdir@ +sysconfdir_c = @sysconfdir_c@ +sysconfdir_c_make = @sysconfdir_c_make@ target_alias = @target_alias@ top_build_prefix = @top_build_prefix@ top_builddir = @top_builddir@ diff --git a/doc/C/parted.8 b/doc/C/parted.8 index 7895440..3069c33 100644 --- a/doc/C/parted.8 +++ b/doc/C/parted.8 @@ -120,7 +120,7 @@ or an LVM logical volume if necessary. Change the state of the \fIflag\fP on \fIpartition\fP to \fIstate\fP. Supported flags are: "boot", "root", "swap", "hidden", "raid", "lvm", "lba", "legacy_boot", "irst", "msftres", "esp", "chromeos_kernel", "bls_boot", "linux-home", -"bios_grub", and "palo". +"no_automount", "bios_grub", and "palo". \fIstate\fP should be either "on" or "off". .TP .B unit \fIunit\fP @@ -134,6 +134,11 @@ human-friendly form for output). .B toggle \fIpartition\fP \fIflag\fP Toggle the state of \fIflag\fP on \fIpartition\fP. .TP +.B type \fIpartition\fP \fIid\fP or \fIuuid\fP +On MS-DOS set the type aka. partition id of \fIpartition\fP to +\fIid\fP. The \fIid\fP is a value between "0x01" and "0xff". On GPT +the type-uuid of \fIpartition\fP to \fIuuid\fP. +.TP .B disk_set \fIflag\fP \fIstate\fP Change a \fIflag\fP on the disk to \fIstate\fP. A flag can be either "on" or "off". Some or all of these flags will be available, depending on what disk label you diff --git a/doc/Makefile.in b/doc/Makefile.in index e56ada4..a5b404e 100644 --- a/doc/Makefile.in +++ b/doc/Makefile.in @@ -69,9 +69,6 @@ am__make_running_with_option = \ test $$has_opt = yes am__make_dryrun = (target_option=n; $(am__make_running_with_option)) am__make_keepgoing = (target_option=k; $(am__make_running_with_option)) -pkgdatadir = $(datadir)/@PACKAGE@ -pkgincludedir = $(includedir)/@PACKAGE@ -pkglibdir = $(libdir)/@PACKAGE@ am__cd = CDPATH="$${ZSH_VERSION+.}$(PATH_SEPARATOR)" && cd install_sh_DATA = $(install_sh) -c -m 644 install_sh_PROGRAM = $(install_sh) -c @@ -92,7 +89,9 @@ am__aclocal_m4_deps = $(top_srcdir)/m4/00gnulib.m4 \ $(top_srcdir)/m4/__inline.m4 \ $(top_srcdir)/m4/absolute-header.m4 $(top_srcdir)/m4/alloca.m4 \ $(top_srcdir)/m4/arpa_inet_h.m4 $(top_srcdir)/m4/assert.m4 \ - $(top_srcdir)/m4/btowc.m4 $(top_srcdir)/m4/builtin-expect.m4 \ + $(top_srcdir)/m4/assert_h.m4 $(top_srcdir)/m4/btowc.m4 \ + $(top_srcdir)/m4/build-to-host.m4 \ + $(top_srcdir)/m4/builtin-expect.m4 $(top_srcdir)/m4/c-bool.m4 \ $(top_srcdir)/m4/calloc.m4 $(top_srcdir)/m4/canonicalize.m4 \ $(top_srcdir)/m4/clock_time.m4 $(top_srcdir)/m4/close.m4 \ $(top_srcdir)/m4/codeset.m4 $(top_srcdir)/m4/config-h.m4 \ @@ -100,7 +99,7 @@ am__aclocal_m4_deps = $(top_srcdir)/m4/00gnulib.m4 \ $(top_srcdir)/m4/double-slash-root.m4 $(top_srcdir)/m4/dup2.m4 \ $(top_srcdir)/m4/eealloc.m4 $(top_srcdir)/m4/environ.m4 \ $(top_srcdir)/m4/errno_h.m4 $(top_srcdir)/m4/error.m4 \ - $(top_srcdir)/m4/extensions.m4 \ + $(top_srcdir)/m4/error_h.m4 $(top_srcdir)/m4/extensions.m4 \ $(top_srcdir)/m4/extern-inline.m4 $(top_srcdir)/m4/fcntl-o.m4 \ $(top_srcdir)/m4/fcntl.m4 $(top_srcdir)/m4/fcntl_h.m4 \ $(top_srcdir)/m4/fdopen.m4 $(top_srcdir)/m4/flexmember.m4 \ @@ -132,10 +131,11 @@ am__aclocal_m4_deps = $(top_srcdir)/m4/00gnulib.m4 \ $(top_srcdir)/m4/malloc.m4 $(top_srcdir)/m4/malloca.m4 \ $(top_srcdir)/m4/manywarnings.m4 $(top_srcdir)/m4/mbrtowc.m4 \ $(top_srcdir)/m4/mbsinit.m4 $(top_srcdir)/m4/mbstate_t.m4 \ - $(top_srcdir)/m4/mbtowc.m4 $(top_srcdir)/m4/mempcpy.m4 \ - $(top_srcdir)/m4/minmax.m4 $(top_srcdir)/m4/mkdir.m4 \ - $(top_srcdir)/m4/mkstemp.m4 $(top_srcdir)/m4/mmap-anon.m4 \ - $(top_srcdir)/m4/mode_t.m4 $(top_srcdir)/m4/msvc-inval.m4 \ + $(top_srcdir)/m4/mbtowc.m4 $(top_srcdir)/m4/memchr.m4 \ + $(top_srcdir)/m4/mempcpy.m4 $(top_srcdir)/m4/minmax.m4 \ + $(top_srcdir)/m4/mkdir.m4 $(top_srcdir)/m4/mkstemp.m4 \ + $(top_srcdir)/m4/mmap-anon.m4 $(top_srcdir)/m4/mode_t.m4 \ + $(top_srcdir)/m4/msvc-inval.m4 \ $(top_srcdir)/m4/msvc-nothrow.m4 $(top_srcdir)/m4/multiarch.m4 \ $(top_srcdir)/m4/musl.m4 $(top_srcdir)/m4/nanosleep.m4 \ $(top_srcdir)/m4/netinet_in_h.m4 \ @@ -166,29 +166,29 @@ am__aclocal_m4_deps = $(top_srcdir)/m4/00gnulib.m4 \ $(top_srcdir)/m4/socklen.m4 $(top_srcdir)/m4/sockpfaf.m4 \ $(top_srcdir)/m4/ssize_t.m4 $(top_srcdir)/m4/stat-time.m4 \ $(top_srcdir)/m4/stat.m4 $(top_srcdir)/m4/stdalign.m4 \ - $(top_srcdir)/m4/stdarg.m4 $(top_srcdir)/m4/stdbool.m4 \ - $(top_srcdir)/m4/stddef_h.m4 $(top_srcdir)/m4/stdint.m4 \ - $(top_srcdir)/m4/stdio_h.m4 $(top_srcdir)/m4/stdlib_h.m4 \ - $(top_srcdir)/m4/strdup.m4 $(top_srcdir)/m4/strerror.m4 \ - $(top_srcdir)/m4/strerror_r.m4 $(top_srcdir)/m4/string_h.m4 \ - $(top_srcdir)/m4/strtoll.m4 $(top_srcdir)/m4/strtoull.m4 \ - $(top_srcdir)/m4/symlink.m4 $(top_srcdir)/m4/sys_ioctl_h.m4 \ + $(top_srcdir)/m4/stdarg.m4 $(top_srcdir)/m4/stddef_h.m4 \ + $(top_srcdir)/m4/stdint.m4 $(top_srcdir)/m4/stdio_h.m4 \ + $(top_srcdir)/m4/stdlib_h.m4 $(top_srcdir)/m4/strdup.m4 \ + $(top_srcdir)/m4/strerror.m4 $(top_srcdir)/m4/strerror_r.m4 \ + $(top_srcdir)/m4/string_h.m4 $(top_srcdir)/m4/strtoll.m4 \ + $(top_srcdir)/m4/strtoull.m4 $(top_srcdir)/m4/symlink.m4 \ + $(top_srcdir)/m4/sys_ioctl_h.m4 \ $(top_srcdir)/m4/sys_random_h.m4 \ $(top_srcdir)/m4/sys_select_h.m4 \ $(top_srcdir)/m4/sys_socket_h.m4 \ $(top_srcdir)/m4/sys_stat_h.m4 $(top_srcdir)/m4/sys_time_h.m4 \ $(top_srcdir)/m4/sys_types_h.m4 $(top_srcdir)/m4/sys_uio_h.m4 \ $(top_srcdir)/m4/tempname.m4 $(top_srcdir)/m4/thread.m4 \ - $(top_srcdir)/m4/threadlib.m4 $(top_srcdir)/m4/time_h.m4 \ - $(top_srcdir)/m4/unistd_h.m4 $(top_srcdir)/m4/unlink.m4 \ - $(top_srcdir)/m4/unlinkdir.m4 $(top_srcdir)/m4/usleep.m4 \ - $(top_srcdir)/m4/version-etc.m4 $(top_srcdir)/m4/visibility.m4 \ - $(top_srcdir)/m4/warn-on-use.m4 $(top_srcdir)/m4/warnings.m4 \ - $(top_srcdir)/m4/wchar_h.m4 $(top_srcdir)/m4/wchar_t.m4 \ - $(top_srcdir)/m4/wcrtomb.m4 $(top_srcdir)/m4/wctob.m4 \ - $(top_srcdir)/m4/wctomb.m4 $(top_srcdir)/m4/wctype_h.m4 \ - $(top_srcdir)/m4/wint_t.m4 $(top_srcdir)/m4/xalloc.m4 \ - $(top_srcdir)/m4/xstrtol.m4 $(top_srcdir)/m4/year2038.m4 \ + $(top_srcdir)/m4/threadlib.m4 $(top_srcdir)/m4/time.m4 \ + $(top_srcdir)/m4/time_h.m4 $(top_srcdir)/m4/unistd_h.m4 \ + $(top_srcdir)/m4/unlink.m4 $(top_srcdir)/m4/unlinkdir.m4 \ + $(top_srcdir)/m4/usleep.m4 $(top_srcdir)/m4/version-etc.m4 \ + $(top_srcdir)/m4/visibility.m4 $(top_srcdir)/m4/warn-on-use.m4 \ + $(top_srcdir)/m4/warnings.m4 $(top_srcdir)/m4/wchar_h.m4 \ + $(top_srcdir)/m4/wchar_t.m4 $(top_srcdir)/m4/wcrtomb.m4 \ + $(top_srcdir)/m4/wctob.m4 $(top_srcdir)/m4/wctomb.m4 \ + $(top_srcdir)/m4/wctype_h.m4 $(top_srcdir)/m4/wint_t.m4 \ + $(top_srcdir)/m4/xalloc.m4 $(top_srcdir)/m4/xstrtol.m4 \ $(top_srcdir)/m4/yield.m4 $(top_srcdir)/m4/zzgnulib.m4 \ $(top_srcdir)/configure.ac am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \ @@ -350,6 +350,9 @@ am__relativize = \ dir1=`echo "$$dir1" | sed -e "$$sed_rest"`; \ done; \ reldir="$$dir2" +pkgdatadir = @pkgdatadir@ +pkgincludedir = @pkgincludedir@ +pkglibdir = @pkglibdir@ pkglibexecdir = @pkglibexecdir@ ACLOCAL = @ACLOCAL@ ALLOCA = @ALLOCA@ @@ -359,6 +362,7 @@ AM_DEFAULT_VERBOSITY = @AM_DEFAULT_VERBOSITY@ APPLE_UNIVERSAL_BUILD = @APPLE_UNIVERSAL_BUILD@ AR = @AR@ ARFLAGS = @ARFLAGS@ +ASSERT_H = @ASSERT_H@ AUTOCONF = @AUTOCONF@ AUTOHEADER = @AUTOHEADER@ AUTOMAKE = @AUTOMAKE@ @@ -375,6 +379,7 @@ CFLAGS = @CFLAGS@ CFLAG_VISIBILITY = @CFLAG_VISIBILITY@ CHECK_CFLAGS = @CHECK_CFLAGS@ CHECK_LIBS = @CHECK_LIBS@ +CLOCK_TIME_LIB = @CLOCK_TIME_LIB@ CONFIG_INCLUDE = @CONFIG_INCLUDE@ CPP = @CPP@ CPPFLAGS = @CPPFLAGS@ @@ -399,12 +404,14 @@ ENOLINK_VALUE = @ENOLINK_VALUE@ EOVERFLOW_HIDDEN = @EOVERFLOW_HIDDEN@ EOVERFLOW_VALUE = @EOVERFLOW_VALUE@ ERRNO_H = @ERRNO_H@ +ERROR_H = @ERROR_H@ ETAGS = @ETAGS@ EXEEXT = @EXEEXT@ FGREP = @FGREP@ FILECMD = @FILECMD@ GETOPT_CDEFS_H = @GETOPT_CDEFS_H@ GETOPT_H = @GETOPT_H@ +GETRANDOM_LIB = @GETRANDOM_LIB@ GETTEXT_MACRO_VERSION = @GETTEXT_MACRO_VERSION@ GL_CFLAG_ALLOW_WARNINGS = @GL_CFLAG_ALLOW_WARNINGS@ GL_CFLAG_GNULIB_WARNINGS = @GL_CFLAG_GNULIB_WARNINGS@ @@ -420,6 +427,7 @@ GL_GNULIB_CALLOC_GNU = @GL_GNULIB_CALLOC_GNU@ GL_GNULIB_CALLOC_POSIX = @GL_GNULIB_CALLOC_POSIX@ GL_GNULIB_CANONICALIZE_FILE_NAME = @GL_GNULIB_CANONICALIZE_FILE_NAME@ GL_GNULIB_CHDIR = @GL_GNULIB_CHDIR@ +GL_GNULIB_CHMOD = @GL_GNULIB_CHMOD@ GL_GNULIB_CHOWN = @GL_GNULIB_CHOWN@ GL_GNULIB_CLOSE = @GL_GNULIB_CLOSE@ GL_GNULIB_CONNECT = @GL_GNULIB_CONNECT@ @@ -493,6 +501,7 @@ GL_GNULIB_GETPAGESIZE = @GL_GNULIB_GETPAGESIZE@ GL_GNULIB_GETPASS = @GL_GNULIB_GETPASS@ GL_GNULIB_GETPASS_GNU = @GL_GNULIB_GETPASS_GNU@ GL_GNULIB_GETPEERNAME = @GL_GNULIB_GETPEERNAME@ +GL_GNULIB_GETPROGNAME = @GL_GNULIB_GETPROGNAME@ GL_GNULIB_GETRANDOM = @GL_GNULIB_GETRANDOM@ GL_GNULIB_GETSOCKNAME = @GL_GNULIB_GETSOCKNAME@ GL_GNULIB_GETSOCKOPT = @GL_GNULIB_GETSOCKOPT@ @@ -590,6 +599,7 @@ GL_GNULIB_MEMCHR = @GL_GNULIB_MEMCHR@ GL_GNULIB_MEMMEM = @GL_GNULIB_MEMMEM@ GL_GNULIB_MEMPCPY = @GL_GNULIB_MEMPCPY@ GL_GNULIB_MEMRCHR = @GL_GNULIB_MEMRCHR@ +GL_GNULIB_MEMSET_EXPLICIT = @GL_GNULIB_MEMSET_EXPLICIT@ GL_GNULIB_MKDIR = @GL_GNULIB_MKDIR@ GL_GNULIB_MKDIRAT = @GL_GNULIB_MKDIRAT@ GL_GNULIB_MKDTEMP = @GL_GNULIB_MKDTEMP@ @@ -710,6 +720,7 @@ GL_GNULIB_STRVERSCMP = @GL_GNULIB_STRVERSCMP@ GL_GNULIB_SYMLINK = @GL_GNULIB_SYMLINK@ GL_GNULIB_SYMLINKAT = @GL_GNULIB_SYMLINKAT@ GL_GNULIB_SYSTEM_POSIX = @GL_GNULIB_SYSTEM_POSIX@ +GL_GNULIB_TIME = @GL_GNULIB_TIME@ GL_GNULIB_TIMEGM = @GL_GNULIB_TIMEGM@ GL_GNULIB_TIMESPEC_GET = @GL_GNULIB_TIMESPEC_GET@ GL_GNULIB_TIMESPEC_GETRES = @GL_GNULIB_TIMESPEC_GETRES@ @@ -784,6 +795,7 @@ GMSGFMT_015 = @GMSGFMT_015@ GNULIBHEADERS_OVERRIDE_WINT_T = @GNULIBHEADERS_OVERRIDE_WINT_T@ GNULIB_GETTIMEOFDAY = @GNULIB_GETTIMEOFDAY@ GREP = @GREP@ +HARD_LOCALE_LIB = @HARD_LOCALE_LIB@ HAVE_ACCEPT4 = @HAVE_ACCEPT4@ HAVE_ALIGNED_ALLOC = @HAVE_ALIGNED_ALLOC@ HAVE_ALLOCA_H = @HAVE_ALLOCA_H@ @@ -814,6 +826,7 @@ HAVE_DECL_GETLOGIN = @HAVE_DECL_GETLOGIN@ HAVE_DECL_GETLOGIN_R = @HAVE_DECL_GETLOGIN_R@ HAVE_DECL_GETPAGESIZE = @HAVE_DECL_GETPAGESIZE@ HAVE_DECL_GETUSERSHELL = @HAVE_DECL_GETUSERSHELL@ +HAVE_DECL_GETW = @HAVE_DECL_GETW@ HAVE_DECL_IMAXABS = @HAVE_DECL_IMAXABS@ HAVE_DECL_IMAXDIV = @HAVE_DECL_IMAXDIV@ HAVE_DECL_INET_NTOP = @HAVE_DECL_INET_NTOP@ @@ -823,6 +836,7 @@ HAVE_DECL_LOCALTIME_R = @HAVE_DECL_LOCALTIME_R@ HAVE_DECL_MEMMEM = @HAVE_DECL_MEMMEM@ HAVE_DECL_MEMRCHR = @HAVE_DECL_MEMRCHR@ HAVE_DECL_OBSTACK_PRINTF = @HAVE_DECL_OBSTACK_PRINTF@ +HAVE_DECL_PUTW = @HAVE_DECL_PUTW@ HAVE_DECL_SETENV = @HAVE_DECL_SETENV@ HAVE_DECL_SETHOSTNAME = @HAVE_DECL_SETHOSTNAME@ HAVE_DECL_SETSTATE = @HAVE_DECL_SETSTATE@ @@ -845,6 +859,9 @@ HAVE_DECL_WCWIDTH = @HAVE_DECL_WCWIDTH@ HAVE_DPRINTF = @HAVE_DPRINTF@ HAVE_DUP3 = @HAVE_DUP3@ HAVE_DUPLOCALE = @HAVE_DUPLOCALE@ +HAVE_ERROR = @HAVE_ERROR@ +HAVE_ERROR_AT_LINE = @HAVE_ERROR_AT_LINE@ +HAVE_ERROR_H = @HAVE_ERROR_H@ HAVE_EUIDACCESS = @HAVE_EUIDACCESS@ HAVE_EXECVPE = @HAVE_EXECVPE@ HAVE_EXPLICIT_BZERO = @HAVE_EXPLICIT_BZERO@ @@ -872,12 +889,15 @@ HAVE_GETLOGIN = @HAVE_GETLOGIN@ HAVE_GETOPT_H = @HAVE_GETOPT_H@ HAVE_GETPAGESIZE = @HAVE_GETPAGESIZE@ HAVE_GETPASS = @HAVE_GETPASS@ +HAVE_GETPROGNAME = @HAVE_GETPROGNAME@ HAVE_GETRANDOM = @HAVE_GETRANDOM@ HAVE_GETSUBOPT = @HAVE_GETSUBOPT@ HAVE_GETTIMEOFDAY = @HAVE_GETTIMEOFDAY@ HAVE_GETUMASK = @HAVE_GETUMASK@ HAVE_GRANTPT = @HAVE_GRANTPT@ HAVE_GROUP_MEMBER = @HAVE_GROUP_MEMBER@ +HAVE_IMAXABS = @HAVE_IMAXABS@ +HAVE_IMAXDIV = @HAVE_IMAXDIV@ HAVE_IMAXDIV_T = @HAVE_IMAXDIV_T@ HAVE_INITSTATE = @HAVE_INITSTATE@ HAVE_INTTYPES_H = @HAVE_INTTYPES_H@ @@ -904,6 +924,7 @@ HAVE_MBSNRTOWCS = @HAVE_MBSNRTOWCS@ HAVE_MBSRTOWCS = @HAVE_MBSRTOWCS@ HAVE_MBTOWC = @HAVE_MBTOWC@ HAVE_MEMPCPY = @HAVE_MEMPCPY@ +HAVE_MEMSET_EXPLICIT = @HAVE_MEMSET_EXPLICIT@ HAVE_MKDIRAT = @HAVE_MKDIRAT@ HAVE_MKDTEMP = @HAVE_MKDTEMP@ HAVE_MKFIFO = @HAVE_MKFIFO@ @@ -1112,7 +1133,6 @@ HAVE_WMEMPCPY = @HAVE_WMEMPCPY@ HAVE_WMEMSET = @HAVE_WMEMSET@ HAVE_WS2TCPIP_H = @HAVE_WS2TCPIP_H@ HAVE_XLOCALE_H = @HAVE_XLOCALE_H@ -HAVE__BOOL = @HAVE__BOOL@ HAVE__EXIT = @HAVE__EXIT@ IGNORE_UNUSED_LIBRARIES_CFLAGS = @IGNORE_UNUSED_LIBRARIES_CFLAGS@ INCLUDE_NEXT = @INCLUDE_NEXT@ @@ -1179,15 +1199,20 @@ LT_REVISION = @LT_REVISION@ LT_SYS_LIBRARY_PATH = @LT_SYS_LIBRARY_PATH@ MAKEINFO = makeinfo --no-split MANIFEST_TOOL = @MANIFEST_TOOL@ +MBRTOWC_LIB = @MBRTOWC_LIB@ MKDIR_P = @MKDIR_P@ MSGFMT = @MSGFMT@ MSGFMT_015 = @MSGFMT_015@ MSGMERGE = @MSGMERGE@ +NANOSLEEP_LIB = @NANOSLEEP_LIB@ NETINET_IN_H = @NETINET_IN_H@ NEXT_ARPA_INET_H = @NEXT_ARPA_INET_H@ +NEXT_ASSERT_H = @NEXT_ASSERT_H@ NEXT_AS_FIRST_DIRECTIVE_ARPA_INET_H = @NEXT_AS_FIRST_DIRECTIVE_ARPA_INET_H@ +NEXT_AS_FIRST_DIRECTIVE_ASSERT_H = @NEXT_AS_FIRST_DIRECTIVE_ASSERT_H@ NEXT_AS_FIRST_DIRECTIVE_CTYPE_H = @NEXT_AS_FIRST_DIRECTIVE_CTYPE_H@ NEXT_AS_FIRST_DIRECTIVE_ERRNO_H = @NEXT_AS_FIRST_DIRECTIVE_ERRNO_H@ +NEXT_AS_FIRST_DIRECTIVE_ERROR_H = @NEXT_AS_FIRST_DIRECTIVE_ERROR_H@ NEXT_AS_FIRST_DIRECTIVE_FCNTL_H = @NEXT_AS_FIRST_DIRECTIVE_FCNTL_H@ NEXT_AS_FIRST_DIRECTIVE_GETOPT_H = @NEXT_AS_FIRST_DIRECTIVE_GETOPT_H@ NEXT_AS_FIRST_DIRECTIVE_INTTYPES_H = @NEXT_AS_FIRST_DIRECTIVE_INTTYPES_H@ @@ -1218,6 +1243,7 @@ NEXT_AS_FIRST_DIRECTIVE_WCHAR_H = @NEXT_AS_FIRST_DIRECTIVE_WCHAR_H@ NEXT_AS_FIRST_DIRECTIVE_WCTYPE_H = @NEXT_AS_FIRST_DIRECTIVE_WCTYPE_H@ NEXT_CTYPE_H = @NEXT_CTYPE_H@ NEXT_ERRNO_H = @NEXT_ERRNO_H@ +NEXT_ERROR_H = @NEXT_ERROR_H@ NEXT_FCNTL_H = @NEXT_FCNTL_H@ NEXT_GETOPT_H = @NEXT_GETOPT_H@ NEXT_INTTYPES_H = @NEXT_INTTYPES_H@ @@ -1273,6 +1299,7 @@ PRAGMA_COLUMNS = @PRAGMA_COLUMNS@ PRAGMA_SYSTEM_HEADER = @PRAGMA_SYSTEM_HEADER@ PRIPTR_PREFIX = @PRIPTR_PREFIX@ PTHREAD_H_DEFINES_STRUCT_TIMESPEC = @PTHREAD_H_DEFINES_STRUCT_TIMESPEC@ +PTHREAD_SIGMASK_LIB = @PTHREAD_SIGMASK_LIB@ PTRDIFF_T_SUFFIX = @PTRDIFF_T_SUFFIX@ RANLIB = @RANLIB@ REPLACE_ACCESS = @REPLACE_ACCESS@ @@ -1281,6 +1308,7 @@ REPLACE_BTOWC = @REPLACE_BTOWC@ REPLACE_CALLOC_FOR_CALLOC_GNU = @REPLACE_CALLOC_FOR_CALLOC_GNU@ REPLACE_CALLOC_FOR_CALLOC_POSIX = @REPLACE_CALLOC_FOR_CALLOC_POSIX@ REPLACE_CANONICALIZE_FILE_NAME = @REPLACE_CANONICALIZE_FILE_NAME@ +REPLACE_CHMOD = @REPLACE_CHMOD@ REPLACE_CHOWN = @REPLACE_CHOWN@ REPLACE_CLOSE = @REPLACE_CLOSE@ REPLACE_COPY_FILE_RANGE = @REPLACE_COPY_FILE_RANGE@ @@ -1289,7 +1317,10 @@ REPLACE_CTIME = @REPLACE_CTIME@ REPLACE_DPRINTF = @REPLACE_DPRINTF@ REPLACE_DUP = @REPLACE_DUP@ REPLACE_DUP2 = @REPLACE_DUP2@ +REPLACE_DUP3 = @REPLACE_DUP3@ REPLACE_DUPLOCALE = @REPLACE_DUPLOCALE@ +REPLACE_ERROR = @REPLACE_ERROR@ +REPLACE_ERROR_AT_LINE = @REPLACE_ERROR_AT_LINE@ REPLACE_EXECL = @REPLACE_EXECL@ REPLACE_EXECLE = @REPLACE_EXECLE@ REPLACE_EXECLP = @REPLACE_EXECLP@ @@ -1302,6 +1333,7 @@ REPLACE_FCHMODAT = @REPLACE_FCHMODAT@ REPLACE_FCHOWNAT = @REPLACE_FCHOWNAT@ REPLACE_FCLOSE = @REPLACE_FCLOSE@ REPLACE_FCNTL = @REPLACE_FCNTL@ +REPLACE_FDATASYNC = @REPLACE_FDATASYNC@ REPLACE_FDOPEN = @REPLACE_FDOPEN@ REPLACE_FFLUSH = @REPLACE_FFLUSH@ REPLACE_FFSLL = @REPLACE_FFSLL@ @@ -1324,15 +1356,21 @@ REPLACE_GETCWD = @REPLACE_GETCWD@ REPLACE_GETDELIM = @REPLACE_GETDELIM@ REPLACE_GETDOMAINNAME = @REPLACE_GETDOMAINNAME@ REPLACE_GETDTABLESIZE = @REPLACE_GETDTABLESIZE@ +REPLACE_GETENTROPY = @REPLACE_GETENTROPY@ REPLACE_GETGROUPS = @REPLACE_GETGROUPS@ REPLACE_GETLINE = @REPLACE_GETLINE@ +REPLACE_GETLOADAVG = @REPLACE_GETLOADAVG@ REPLACE_GETLOGIN_R = @REPLACE_GETLOGIN_R@ REPLACE_GETPAGESIZE = @REPLACE_GETPAGESIZE@ REPLACE_GETPASS = @REPLACE_GETPASS@ REPLACE_GETPASS_FOR_GETPASS_GNU = @REPLACE_GETPASS_FOR_GETPASS_GNU@ +REPLACE_GETPROGNAME = @REPLACE_GETPROGNAME@ REPLACE_GETRANDOM = @REPLACE_GETRANDOM@ +REPLACE_GETSUBOPT = @REPLACE_GETSUBOPT@ REPLACE_GETTIMEOFDAY = @REPLACE_GETTIMEOFDAY@ REPLACE_GMTIME = @REPLACE_GMTIME@ +REPLACE_IMAXABS = @REPLACE_IMAXABS@ +REPLACE_IMAXDIV = @REPLACE_IMAXDIV@ REPLACE_INET_NTOP = @REPLACE_INET_NTOP@ REPLACE_INET_PTON = @REPLACE_INET_PTON@ REPLACE_INITSTATE = @REPLACE_INITSTATE@ @@ -1361,11 +1399,14 @@ REPLACE_MBSTATE_T = @REPLACE_MBSTATE_T@ REPLACE_MBTOWC = @REPLACE_MBTOWC@ REPLACE_MEMCHR = @REPLACE_MEMCHR@ REPLACE_MEMMEM = @REPLACE_MEMMEM@ +REPLACE_MEMPCPY = @REPLACE_MEMPCPY@ REPLACE_MKDIR = @REPLACE_MKDIR@ REPLACE_MKFIFO = @REPLACE_MKFIFO@ REPLACE_MKFIFOAT = @REPLACE_MKFIFOAT@ REPLACE_MKNOD = @REPLACE_MKNOD@ REPLACE_MKNODAT = @REPLACE_MKNODAT@ +REPLACE_MKOSTEMP = @REPLACE_MKOSTEMP@ +REPLACE_MKOSTEMPS = @REPLACE_MKOSTEMPS@ REPLACE_MKSTEMP = @REPLACE_MKSTEMP@ REPLACE_MKTIME = @REPLACE_MKTIME@ REPLACE_NANOSLEEP = @REPLACE_NANOSLEEP@ @@ -1376,8 +1417,10 @@ REPLACE_OBSTACK_PRINTF = @REPLACE_OBSTACK_PRINTF@ REPLACE_OPEN = @REPLACE_OPEN@ REPLACE_OPENAT = @REPLACE_OPENAT@ REPLACE_PERROR = @REPLACE_PERROR@ +REPLACE_PIPE2 = @REPLACE_PIPE2@ REPLACE_POPEN = @REPLACE_POPEN@ REPLACE_POSIX_MEMALIGN = @REPLACE_POSIX_MEMALIGN@ +REPLACE_POSIX_OPENPT = @REPLACE_POSIX_OPENPT@ REPLACE_PREAD = @REPLACE_PREAD@ REPLACE_PRINTF = @REPLACE_PRINTF@ REPLACE_PSELECT = @REPLACE_PSELECT@ @@ -1455,6 +1498,7 @@ REPLACE_RMDIR = @REPLACE_RMDIR@ REPLACE_SCHED_YIELD = @REPLACE_SCHED_YIELD@ REPLACE_SELECT = @REPLACE_SELECT@ REPLACE_SETENV = @REPLACE_SETENV@ +REPLACE_SETHOSTNAME = @REPLACE_SETHOSTNAME@ REPLACE_SETLOCALE = @REPLACE_SETLOCALE@ REPLACE_SETSTATE = @REPLACE_SETSTATE@ REPLACE_SLEEP = @REPLACE_SLEEP@ @@ -1463,6 +1507,7 @@ REPLACE_SPRINTF = @REPLACE_SPRINTF@ REPLACE_STAT = @REPLACE_STAT@ REPLACE_STDIO_READ_FUNCS = @REPLACE_STDIO_READ_FUNCS@ REPLACE_STDIO_WRITE_FUNCS = @REPLACE_STDIO_WRITE_FUNCS@ +REPLACE_STPCPY = @REPLACE_STPCPY@ REPLACE_STPNCPY = @REPLACE_STPNCPY@ REPLACE_STRCASESTR = @REPLACE_STRCASESTR@ REPLACE_STRCHRNUL = @REPLACE_STRCHRNUL@ @@ -1489,7 +1534,9 @@ REPLACE_STRUCT_LCONV = @REPLACE_STRUCT_LCONV@ REPLACE_STRUCT_TIMEVAL = @REPLACE_STRUCT_TIMEVAL@ REPLACE_SYMLINK = @REPLACE_SYMLINK@ REPLACE_SYMLINKAT = @REPLACE_SYMLINKAT@ +REPLACE_TIME = @REPLACE_TIME@ REPLACE_TIMEGM = @REPLACE_TIMEGM@ +REPLACE_TIMESPEC_GET = @REPLACE_TIMESPEC_GET@ REPLACE_TMPFILE = @REPLACE_TMPFILE@ REPLACE_TOWLOWER = @REPLACE_TOWLOWER@ REPLACE_TRUNCATE = @REPLACE_TRUNCATE@ @@ -1515,15 +1562,20 @@ REPLACE_WCSWIDTH = @REPLACE_WCSWIDTH@ REPLACE_WCTOB = @REPLACE_WCTOB@ REPLACE_WCTOMB = @REPLACE_WCTOMB@ REPLACE_WCWIDTH = @REPLACE_WCWIDTH@ +REPLACE_WMEMPCPY = @REPLACE_WMEMPCPY@ REPLACE_WRITE = @REPLACE_WRITE@ +REPLACE__EXIT = @REPLACE__EXIT@ +SCHED_YIELD_LIB = @SCHED_YIELD_LIB@ SED = @SED@ +SELECT_LIB = @SELECT_LIB@ +SETLOCALE_LIB = @SETLOCALE_LIB@ +SETLOCALE_NULL_LIB = @SETLOCALE_NULL_LIB@ SET_MAKE = @SET_MAKE@ SHELL = @SHELL@ SIG_ATOMIC_T_SUFFIX = @SIG_ATOMIC_T_SUFFIX@ SIZE_T_SUFFIX = @SIZE_T_SUFFIX@ -STDALIGN_H = @STDALIGN_H@ STDARG_H = @STDARG_H@ -STDBOOL_H = @STDBOOL_H@ +STDCKDINT_H = @STDCKDINT_H@ STDDEF_H = @STDDEF_H@ STDINT_H = @STDINT_H@ STRIP = @STRIP@ @@ -1567,6 +1619,8 @@ am__quote = @am__quote@ am__tar = @am__tar@ am__untar = @am__untar@ bindir = @bindir@ +bindir_c = @bindir_c@ +bindir_c_make = @bindir_c_make@ build = @build@ build_alias = @build_alias@ build_cpu = @build_cpu@ @@ -1574,10 +1628,20 @@ build_os = @build_os@ build_vendor = @build_vendor@ builddir = @builddir@ datadir = @datadir@ +datadir_c = @datadir_c@ +datadir_c_make = @datadir_c_make@ datarootdir = @datarootdir@ +datarootdir_c = @datarootdir_c@ +datarootdir_c_make = @datarootdir_c_make@ docdir = @docdir@ +docdir_c = @docdir_c@ +docdir_c_make = @docdir_c_make@ dvidir = @dvidir@ +dvidir_c = @dvidir_c@ +dvidir_c_make = @dvidir_c_make@ exec_prefix = @exec_prefix@ +exec_prefix_c = @exec_prefix_c@ +exec_prefix_c_make = @exec_prefix_c_make@ gl_LIBOBJDEPS = @gl_LIBOBJDEPS@ gl_LIBOBJS = @gl_LIBOBJS@ gl_LTLIBOBJS = @gl_LTLIBOBJS@ @@ -1591,26 +1655,68 @@ host_cpu = @host_cpu@ host_os = @host_os@ host_vendor = @host_vendor@ htmldir = @htmldir@ +htmldir_c = @htmldir_c@ +htmldir_c_make = @htmldir_c_make@ includedir = @includedir@ +includedir_c = @includedir_c@ +includedir_c_make = @includedir_c_make@ infodir = @infodir@ +infodir_c = @infodir_c@ +infodir_c_make = @infodir_c_make@ install_sh = @install_sh@ libdir = @libdir@ +libdir_c = @libdir_c@ +libdir_c_make = @libdir_c_make@ libexecdir = @libexecdir@ +libexecdir_c = @libexecdir_c@ +libexecdir_c_make = @libexecdir_c_make@ lispdir = @lispdir@ +lispdir_c = @lispdir_c@ +lispdir_c_make = @lispdir_c_make@ localedir = @localedir@ +localedir_c = @localedir_c@ +localedir_c_make = @localedir_c_make@ localstatedir = @localstatedir@ +localstatedir_c = @localstatedir_c@ +localstatedir_c_make = @localstatedir_c_make@ mandir = @mandir@ +mandir_c = @mandir_c@ +mandir_c_make = @mandir_c_make@ mkdir_p = @mkdir_p@ oldincludedir = @oldincludedir@ +oldincludedir_c = @oldincludedir_c@ +oldincludedir_c_make = @oldincludedir_c_make@ pdfdir = @pdfdir@ +pdfdir_c = @pdfdir_c@ +pdfdir_c_make = @pdfdir_c_make@ +pkgdatadir_c = @pkgdatadir_c@ +pkgdatadir_c_make = @pkgdatadir_c_make@ +pkgincludedir_c = @pkgincludedir_c@ +pkgincludedir_c_make = @pkgincludedir_c_make@ +pkglibdir_c = @pkglibdir_c@ +pkglibdir_c_make = @pkglibdir_c_make@ +pkglibexecdir_c = @pkglibexecdir_c@ +pkglibexecdir_c_make = @pkglibexecdir_c_make@ prefix = @prefix@ +prefix_c = @prefix_c@ +prefix_c_make = @prefix_c_make@ program_transform_name = @program_transform_name@ psdir = @psdir@ +psdir_c = @psdir_c@ +psdir_c_make = @psdir_c_make@ runstatedir = @runstatedir@ +runstatedir_c = @runstatedir_c@ +runstatedir_c_make = @runstatedir_c_make@ sbindir = @sbindir@ +sbindir_c = @sbindir_c@ +sbindir_c_make = @sbindir_c_make@ sharedstatedir = @sharedstatedir@ +sharedstatedir_c = @sharedstatedir_c@ +sharedstatedir_c_make = @sharedstatedir_c_make@ srcdir = @srcdir@ sysconfdir = @sysconfdir@ +sysconfdir_c = @sysconfdir_c@ +sysconfdir_c_make = @sysconfdir_c_make@ target_alias = @target_alias@ top_build_prefix = @top_build_prefix@ top_builddir = @top_builddir@ diff --git a/doc/parted-pt_BR.texi b/doc/parted-pt_BR.texi index 5e77069..2fdeb55 100644 --- a/doc/parted-pt_BR.texi +++ b/doc/parted-pt_BR.texi @@ -22,7 +22,7 @@ This file documents the use of GNU Parted, a program for creating, resising, checking and copy partitions, and file systems on them. -Copyright 1999--2002, 2009--2014, 2019--2022 Free Software Foundation, Inc. +Copyright 1999--2002, 2009--2014, 2019--2023 Free Software Foundation, Inc. Permission is granted to copy, distribute and/or modify this document under the terms of the GNU Free Documentation License, Version 1.3 or @@ -46,7 +46,7 @@ entitled ``GNU Free Documentation License''. @page @vskip 0pt plus 1filll -Copyright @copyright{} 1999, 2000, 2001, 2002 Free Software Foundation, Inc. +Copyright 1999--2002, 2009--2014, 2019--2023 Free Software Foundation, Inc. Permission is granted to copy, distribute and/or modify this document under the terms of the GNU Free Documentation License, Version 1.3 or diff --git a/doc/parted.info b/doc/parted.info index ac2a15f..99376fd 100644 --- a/doc/parted.info +++ b/doc/parted.info @@ -1,6 +1,6 @@ This is parted.info, produced by makeinfo version 6.8 from parted.texi. -Copyright (C) 1999-2022 Free Software Foundation, Inc. +Copyright (C) 1999-2023 Free Software Foundation, Inc. Permission is granted to copy, distribute and/or modify this document under the terms of the GNU Free Documentation License, Version 1.3 or @@ -25,7 +25,7 @@ GNU Parted User Manual This file documents the use of GNU Parted, a program for creating and manipulating partition tables. - This document applies roughly to version *3.5* of GNU Parted. + This document applies roughly to version *3.6* of GNU Parted. The original version was written by Andrew Clausen in text format. Richard M. Kreuter translated it into Texinfo format in 2002, to be @@ -391,6 +391,7 @@ GNU Parted provides the following commands: * select:: * set:: * toggle:: +* type:: * unit:: Note that after version 2.4, the following commands were removed: @@ -896,7 +897,7 @@ File: parted.info, Node: set, Next: toggle, Prev: select, Up: Command explan Set the 'boot' flag on partition 1. -File: parted.info, Node: toggle, Next: unit, Prev: set, Up: Command explanations +File: parted.info, Node: toggle, Next: type, Prev: set, Up: Command explanations 2.4.15 toggle ------------- @@ -906,9 +907,27 @@ File: parted.info, Node: toggle, Next: unit, Prev: set, Up: Command explanat Toggle the state of FLAG on partition NUMBER. -File: parted.info, Node: unit, Prev: toggle, Up: Command explanations +File: parted.info, Node: type, Next: unit, Prev: toggle, Up: Command explanations -2.4.16 unit +2.4.16 type +----------- + + -- Command: type NUMBER ID or UUID + + On MS-DOS set the type-id aka partition id to ID on partition + NUMBER. The id is a value between 0x01 and 0xff, e.g. the ID for + Linux is 0x83. A list with some IDs is available at + <https://en.wikipedia.org/wiki/Partition_type>. + + On GPT set the type-uuid to UUID on partition NUMBER. E.g. the + UUID for Linux is 0fc63daf-8483-4772-8e79-3d69d8477de4. A list + with some UUIDs is availabe at + <https://en.wikipedia.org/wiki/GUID_Partition_Table>. + + +File: parted.info, Node: unit, Prev: type, Up: Command explanations + +2.4.17 unit ----------- -- Command: unit UNIT @@ -1589,6 +1608,7 @@ Index * command description, select: select. (line 6) * command description, set: set. (line 6) * command description, toggle: toggle. (line 6) +* command description, type: type. (line 6) * command description, unit: unit. (line 6) * command syntax: Command explanations. (line 6) * commands: Using Parted. (line 6) @@ -1636,6 +1656,7 @@ Index * supported platforms: Supported Platforms. (line 6) * terms of distribution: License. (line 6) * toggle, command description: toggle. (line 6) +* type, command description: type. (line 6) * unit, command description: unit. (line 6) @@ -1653,30 +1674,31 @@ Node: Partitioning7627 Node: Running Parted9265 Node: Invoking Parted11644 Node: Command explanations12854 -Node: align-check13346 -Node: disk_set14071 -Node: disk_toggle14779 -Node: help14986 -Node: mklabel15272 -Ref: mklabel-Footnote-116195 -Node: mkpart16325 -Ref: mkpart-Footnote-118854 -Node: name19105 -Node: print19622 -Node: quit21389 -Node: rescue21883 -Node: resizepart23957 -Node: rm24505 -Node: select25400 -Node: set25888 -Node: toggle29826 -Node: unit30028 -Ref: IEC binary units32414 -Node: Related information34507 -Node: Copying This Manual35329 -Node: GNU Free Documentation License35573 -Node: History60685 -Node: Concept index61498 +Node: align-check13355 +Node: disk_set14080 +Node: disk_toggle14788 +Node: help14995 +Node: mklabel15281 +Ref: mklabel-Footnote-116204 +Node: mkpart16334 +Ref: mkpart-Footnote-118863 +Node: name19114 +Node: print19631 +Node: quit21398 +Node: rescue21892 +Node: resizepart23966 +Node: rm24514 +Node: select25409 +Node: set25897 +Node: toggle29835 +Node: type30037 +Node: unit30674 +Ref: IEC binary units33058 +Node: Related information35151 +Node: Copying This Manual35973 +Node: GNU Free Documentation License36217 +Node: History61329 +Node: Concept index62142 End Tag Table diff --git a/doc/parted.texi b/doc/parted.texi index 8a3978a..5d4074d 100644 --- a/doc/parted.texi +++ b/doc/parted.texi @@ -14,7 +14,7 @@ and manipulating partition tables. @ifnottex @c texi2pdf don't understand copying and insertcopying ??? @c modifications must also be done in the titlepage @copying -Copyright @copyright{} 1999--2022 Free Software Foundation, Inc. +Copyright @copyright{} 1999--2023 Free Software Foundation, Inc. Permission is granted to copy, distribute and/or modify this document under the terms of the GNU Free Documentation License, Version 1.3 or @@ -46,7 +46,7 @@ Free Documentation License''. @c @vskip 0pt plus 1filll @c modifications must also be done in the copying block -Copyright @copyright{} 1999-2021 Free Software Foundation, Inc. +Copyright @copyright{} 1999--2023 Free Software Foundation, Inc. Permission is granted to copy, distribute and/or modify this document under the terms of the GNU Free Documentation License, Version 1.3 or @@ -466,6 +466,7 @@ GNU Parted provides the following commands: * select:: * set:: * toggle:: +* type:: * unit:: @end menu @@ -1034,6 +1035,25 @@ Toggle the state of @var{flag} on partition @var{number}. @end deffn +@node type +@subsection type +@cindex type, command description +@cindex command description, type + +@deffn Command type @var{number} @var{id} or @var{uuid} + +On MS-DOS set the type-id aka partition id to @var{id} on partition +@var{number}. The id is a value between 0x01 and 0xff, e.g. the ID for +Linux is 0x83. A list with some IDs is available at +@uref{https://en.wikipedia.org/wiki/Partition_type}. + +On GPT set the type-uuid to @var{uuid} on partition +@var{number}. E.g. the UUID for Linux is +0fc63daf-8483-4772-8e79-3d69d8477de4. A list with some UUIDs is availabe +at @uref{https://en.wikipedia.org/wiki/GUID_Partition_Table}. + +@end deffn + @node unit @subsection unit @cindex unit, command description diff --git a/doc/pt_BR/Makefile.in b/doc/pt_BR/Makefile.in index 502de69..d0e6c11 100644 --- a/doc/pt_BR/Makefile.in +++ b/doc/pt_BR/Makefile.in @@ -94,9 +94,6 @@ am__make_running_with_option = \ test $$has_opt = yes am__make_dryrun = (target_option=n; $(am__make_running_with_option)) am__make_keepgoing = (target_option=k; $(am__make_running_with_option)) -pkgdatadir = $(datadir)/@PACKAGE@ -pkgincludedir = $(includedir)/@PACKAGE@ -pkglibdir = $(libdir)/@PACKAGE@ am__cd = CDPATH="$${ZSH_VERSION+.}$(PATH_SEPARATOR)" && cd install_sh_DATA = $(install_sh) -c -m 644 install_sh_PROGRAM = $(install_sh) -c @@ -117,7 +114,9 @@ am__aclocal_m4_deps = $(top_srcdir)/m4/00gnulib.m4 \ $(top_srcdir)/m4/__inline.m4 \ $(top_srcdir)/m4/absolute-header.m4 $(top_srcdir)/m4/alloca.m4 \ $(top_srcdir)/m4/arpa_inet_h.m4 $(top_srcdir)/m4/assert.m4 \ - $(top_srcdir)/m4/btowc.m4 $(top_srcdir)/m4/builtin-expect.m4 \ + $(top_srcdir)/m4/assert_h.m4 $(top_srcdir)/m4/btowc.m4 \ + $(top_srcdir)/m4/build-to-host.m4 \ + $(top_srcdir)/m4/builtin-expect.m4 $(top_srcdir)/m4/c-bool.m4 \ $(top_srcdir)/m4/calloc.m4 $(top_srcdir)/m4/canonicalize.m4 \ $(top_srcdir)/m4/clock_time.m4 $(top_srcdir)/m4/close.m4 \ $(top_srcdir)/m4/codeset.m4 $(top_srcdir)/m4/config-h.m4 \ @@ -125,7 +124,7 @@ am__aclocal_m4_deps = $(top_srcdir)/m4/00gnulib.m4 \ $(top_srcdir)/m4/double-slash-root.m4 $(top_srcdir)/m4/dup2.m4 \ $(top_srcdir)/m4/eealloc.m4 $(top_srcdir)/m4/environ.m4 \ $(top_srcdir)/m4/errno_h.m4 $(top_srcdir)/m4/error.m4 \ - $(top_srcdir)/m4/extensions.m4 \ + $(top_srcdir)/m4/error_h.m4 $(top_srcdir)/m4/extensions.m4 \ $(top_srcdir)/m4/extern-inline.m4 $(top_srcdir)/m4/fcntl-o.m4 \ $(top_srcdir)/m4/fcntl.m4 $(top_srcdir)/m4/fcntl_h.m4 \ $(top_srcdir)/m4/fdopen.m4 $(top_srcdir)/m4/flexmember.m4 \ @@ -157,10 +156,11 @@ am__aclocal_m4_deps = $(top_srcdir)/m4/00gnulib.m4 \ $(top_srcdir)/m4/malloc.m4 $(top_srcdir)/m4/malloca.m4 \ $(top_srcdir)/m4/manywarnings.m4 $(top_srcdir)/m4/mbrtowc.m4 \ $(top_srcdir)/m4/mbsinit.m4 $(top_srcdir)/m4/mbstate_t.m4 \ - $(top_srcdir)/m4/mbtowc.m4 $(top_srcdir)/m4/mempcpy.m4 \ - $(top_srcdir)/m4/minmax.m4 $(top_srcdir)/m4/mkdir.m4 \ - $(top_srcdir)/m4/mkstemp.m4 $(top_srcdir)/m4/mmap-anon.m4 \ - $(top_srcdir)/m4/mode_t.m4 $(top_srcdir)/m4/msvc-inval.m4 \ + $(top_srcdir)/m4/mbtowc.m4 $(top_srcdir)/m4/memchr.m4 \ + $(top_srcdir)/m4/mempcpy.m4 $(top_srcdir)/m4/minmax.m4 \ + $(top_srcdir)/m4/mkdir.m4 $(top_srcdir)/m4/mkstemp.m4 \ + $(top_srcdir)/m4/mmap-anon.m4 $(top_srcdir)/m4/mode_t.m4 \ + $(top_srcdir)/m4/msvc-inval.m4 \ $(top_srcdir)/m4/msvc-nothrow.m4 $(top_srcdir)/m4/multiarch.m4 \ $(top_srcdir)/m4/musl.m4 $(top_srcdir)/m4/nanosleep.m4 \ $(top_srcdir)/m4/netinet_in_h.m4 \ @@ -191,29 +191,29 @@ am__aclocal_m4_deps = $(top_srcdir)/m4/00gnulib.m4 \ $(top_srcdir)/m4/socklen.m4 $(top_srcdir)/m4/sockpfaf.m4 \ $(top_srcdir)/m4/ssize_t.m4 $(top_srcdir)/m4/stat-time.m4 \ $(top_srcdir)/m4/stat.m4 $(top_srcdir)/m4/stdalign.m4 \ - $(top_srcdir)/m4/stdarg.m4 $(top_srcdir)/m4/stdbool.m4 \ - $(top_srcdir)/m4/stddef_h.m4 $(top_srcdir)/m4/stdint.m4 \ - $(top_srcdir)/m4/stdio_h.m4 $(top_srcdir)/m4/stdlib_h.m4 \ - $(top_srcdir)/m4/strdup.m4 $(top_srcdir)/m4/strerror.m4 \ - $(top_srcdir)/m4/strerror_r.m4 $(top_srcdir)/m4/string_h.m4 \ - $(top_srcdir)/m4/strtoll.m4 $(top_srcdir)/m4/strtoull.m4 \ - $(top_srcdir)/m4/symlink.m4 $(top_srcdir)/m4/sys_ioctl_h.m4 \ + $(top_srcdir)/m4/stdarg.m4 $(top_srcdir)/m4/stddef_h.m4 \ + $(top_srcdir)/m4/stdint.m4 $(top_srcdir)/m4/stdio_h.m4 \ + $(top_srcdir)/m4/stdlib_h.m4 $(top_srcdir)/m4/strdup.m4 \ + $(top_srcdir)/m4/strerror.m4 $(top_srcdir)/m4/strerror_r.m4 \ + $(top_srcdir)/m4/string_h.m4 $(top_srcdir)/m4/strtoll.m4 \ + $(top_srcdir)/m4/strtoull.m4 $(top_srcdir)/m4/symlink.m4 \ + $(top_srcdir)/m4/sys_ioctl_h.m4 \ $(top_srcdir)/m4/sys_random_h.m4 \ $(top_srcdir)/m4/sys_select_h.m4 \ $(top_srcdir)/m4/sys_socket_h.m4 \ $(top_srcdir)/m4/sys_stat_h.m4 $(top_srcdir)/m4/sys_time_h.m4 \ $(top_srcdir)/m4/sys_types_h.m4 $(top_srcdir)/m4/sys_uio_h.m4 \ $(top_srcdir)/m4/tempname.m4 $(top_srcdir)/m4/thread.m4 \ - $(top_srcdir)/m4/threadlib.m4 $(top_srcdir)/m4/time_h.m4 \ - $(top_srcdir)/m4/unistd_h.m4 $(top_srcdir)/m4/unlink.m4 \ - $(top_srcdir)/m4/unlinkdir.m4 $(top_srcdir)/m4/usleep.m4 \ - $(top_srcdir)/m4/version-etc.m4 $(top_srcdir)/m4/visibility.m4 \ - $(top_srcdir)/m4/warn-on-use.m4 $(top_srcdir)/m4/warnings.m4 \ - $(top_srcdir)/m4/wchar_h.m4 $(top_srcdir)/m4/wchar_t.m4 \ - $(top_srcdir)/m4/wcrtomb.m4 $(top_srcdir)/m4/wctob.m4 \ - $(top_srcdir)/m4/wctomb.m4 $(top_srcdir)/m4/wctype_h.m4 \ - $(top_srcdir)/m4/wint_t.m4 $(top_srcdir)/m4/xalloc.m4 \ - $(top_srcdir)/m4/xstrtol.m4 $(top_srcdir)/m4/year2038.m4 \ + $(top_srcdir)/m4/threadlib.m4 $(top_srcdir)/m4/time.m4 \ + $(top_srcdir)/m4/time_h.m4 $(top_srcdir)/m4/unistd_h.m4 \ + $(top_srcdir)/m4/unlink.m4 $(top_srcdir)/m4/unlinkdir.m4 \ + $(top_srcdir)/m4/usleep.m4 $(top_srcdir)/m4/version-etc.m4 \ + $(top_srcdir)/m4/visibility.m4 $(top_srcdir)/m4/warn-on-use.m4 \ + $(top_srcdir)/m4/warnings.m4 $(top_srcdir)/m4/wchar_h.m4 \ + $(top_srcdir)/m4/wchar_t.m4 $(top_srcdir)/m4/wcrtomb.m4 \ + $(top_srcdir)/m4/wctob.m4 $(top_srcdir)/m4/wctomb.m4 \ + $(top_srcdir)/m4/wctype_h.m4 $(top_srcdir)/m4/wint_t.m4 \ + $(top_srcdir)/m4/xalloc.m4 $(top_srcdir)/m4/xstrtol.m4 \ $(top_srcdir)/m4/yield.m4 $(top_srcdir)/m4/zzgnulib.m4 \ $(top_srcdir)/configure.ac am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \ @@ -246,6 +246,9 @@ am__tagged_files = $(HEADERS) $(SOURCES) $(TAGS_FILES) $(LISP) am__DIST_COMMON = $(dist_man_MANS) $(srcdir)/../po4a.mk \ $(srcdir)/Makefile.in DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST) +pkgdatadir = @pkgdatadir@ +pkgincludedir = @pkgincludedir@ +pkglibdir = @pkglibdir@ pkglibexecdir = @pkglibexecdir@ ACLOCAL = @ACLOCAL@ ALLOCA = @ALLOCA@ @@ -255,6 +258,7 @@ AM_DEFAULT_VERBOSITY = @AM_DEFAULT_VERBOSITY@ APPLE_UNIVERSAL_BUILD = @APPLE_UNIVERSAL_BUILD@ AR = @AR@ ARFLAGS = @ARFLAGS@ +ASSERT_H = @ASSERT_H@ AUTOCONF = @AUTOCONF@ AUTOHEADER = @AUTOHEADER@ AUTOMAKE = @AUTOMAKE@ @@ -271,6 +275,7 @@ CFLAGS = @CFLAGS@ CFLAG_VISIBILITY = @CFLAG_VISIBILITY@ CHECK_CFLAGS = @CHECK_CFLAGS@ CHECK_LIBS = @CHECK_LIBS@ +CLOCK_TIME_LIB = @CLOCK_TIME_LIB@ CONFIG_INCLUDE = @CONFIG_INCLUDE@ CPP = @CPP@ CPPFLAGS = @CPPFLAGS@ @@ -295,12 +300,14 @@ ENOLINK_VALUE = @ENOLINK_VALUE@ EOVERFLOW_HIDDEN = @EOVERFLOW_HIDDEN@ EOVERFLOW_VALUE = @EOVERFLOW_VALUE@ ERRNO_H = @ERRNO_H@ +ERROR_H = @ERROR_H@ ETAGS = @ETAGS@ EXEEXT = @EXEEXT@ FGREP = @FGREP@ FILECMD = @FILECMD@ GETOPT_CDEFS_H = @GETOPT_CDEFS_H@ GETOPT_H = @GETOPT_H@ +GETRANDOM_LIB = @GETRANDOM_LIB@ GETTEXT_MACRO_VERSION = @GETTEXT_MACRO_VERSION@ GL_CFLAG_ALLOW_WARNINGS = @GL_CFLAG_ALLOW_WARNINGS@ GL_CFLAG_GNULIB_WARNINGS = @GL_CFLAG_GNULIB_WARNINGS@ @@ -316,6 +323,7 @@ GL_GNULIB_CALLOC_GNU = @GL_GNULIB_CALLOC_GNU@ GL_GNULIB_CALLOC_POSIX = @GL_GNULIB_CALLOC_POSIX@ GL_GNULIB_CANONICALIZE_FILE_NAME = @GL_GNULIB_CANONICALIZE_FILE_NAME@ GL_GNULIB_CHDIR = @GL_GNULIB_CHDIR@ +GL_GNULIB_CHMOD = @GL_GNULIB_CHMOD@ GL_GNULIB_CHOWN = @GL_GNULIB_CHOWN@ GL_GNULIB_CLOSE = @GL_GNULIB_CLOSE@ GL_GNULIB_CONNECT = @GL_GNULIB_CONNECT@ @@ -389,6 +397,7 @@ GL_GNULIB_GETPAGESIZE = @GL_GNULIB_GETPAGESIZE@ GL_GNULIB_GETPASS = @GL_GNULIB_GETPASS@ GL_GNULIB_GETPASS_GNU = @GL_GNULIB_GETPASS_GNU@ GL_GNULIB_GETPEERNAME = @GL_GNULIB_GETPEERNAME@ +GL_GNULIB_GETPROGNAME = @GL_GNULIB_GETPROGNAME@ GL_GNULIB_GETRANDOM = @GL_GNULIB_GETRANDOM@ GL_GNULIB_GETSOCKNAME = @GL_GNULIB_GETSOCKNAME@ GL_GNULIB_GETSOCKOPT = @GL_GNULIB_GETSOCKOPT@ @@ -486,6 +495,7 @@ GL_GNULIB_MEMCHR = @GL_GNULIB_MEMCHR@ GL_GNULIB_MEMMEM = @GL_GNULIB_MEMMEM@ GL_GNULIB_MEMPCPY = @GL_GNULIB_MEMPCPY@ GL_GNULIB_MEMRCHR = @GL_GNULIB_MEMRCHR@ +GL_GNULIB_MEMSET_EXPLICIT = @GL_GNULIB_MEMSET_EXPLICIT@ GL_GNULIB_MKDIR = @GL_GNULIB_MKDIR@ GL_GNULIB_MKDIRAT = @GL_GNULIB_MKDIRAT@ GL_GNULIB_MKDTEMP = @GL_GNULIB_MKDTEMP@ @@ -606,6 +616,7 @@ GL_GNULIB_STRVERSCMP = @GL_GNULIB_STRVERSCMP@ GL_GNULIB_SYMLINK = @GL_GNULIB_SYMLINK@ GL_GNULIB_SYMLINKAT = @GL_GNULIB_SYMLINKAT@ GL_GNULIB_SYSTEM_POSIX = @GL_GNULIB_SYSTEM_POSIX@ +GL_GNULIB_TIME = @GL_GNULIB_TIME@ GL_GNULIB_TIMEGM = @GL_GNULIB_TIMEGM@ GL_GNULIB_TIMESPEC_GET = @GL_GNULIB_TIMESPEC_GET@ GL_GNULIB_TIMESPEC_GETRES = @GL_GNULIB_TIMESPEC_GETRES@ @@ -680,6 +691,7 @@ GMSGFMT_015 = @GMSGFMT_015@ GNULIBHEADERS_OVERRIDE_WINT_T = @GNULIBHEADERS_OVERRIDE_WINT_T@ GNULIB_GETTIMEOFDAY = @GNULIB_GETTIMEOFDAY@ GREP = @GREP@ +HARD_LOCALE_LIB = @HARD_LOCALE_LIB@ HAVE_ACCEPT4 = @HAVE_ACCEPT4@ HAVE_ALIGNED_ALLOC = @HAVE_ALIGNED_ALLOC@ HAVE_ALLOCA_H = @HAVE_ALLOCA_H@ @@ -710,6 +722,7 @@ HAVE_DECL_GETLOGIN = @HAVE_DECL_GETLOGIN@ HAVE_DECL_GETLOGIN_R = @HAVE_DECL_GETLOGIN_R@ HAVE_DECL_GETPAGESIZE = @HAVE_DECL_GETPAGESIZE@ HAVE_DECL_GETUSERSHELL = @HAVE_DECL_GETUSERSHELL@ +HAVE_DECL_GETW = @HAVE_DECL_GETW@ HAVE_DECL_IMAXABS = @HAVE_DECL_IMAXABS@ HAVE_DECL_IMAXDIV = @HAVE_DECL_IMAXDIV@ HAVE_DECL_INET_NTOP = @HAVE_DECL_INET_NTOP@ @@ -719,6 +732,7 @@ HAVE_DECL_LOCALTIME_R = @HAVE_DECL_LOCALTIME_R@ HAVE_DECL_MEMMEM = @HAVE_DECL_MEMMEM@ HAVE_DECL_MEMRCHR = @HAVE_DECL_MEMRCHR@ HAVE_DECL_OBSTACK_PRINTF = @HAVE_DECL_OBSTACK_PRINTF@ +HAVE_DECL_PUTW = @HAVE_DECL_PUTW@ HAVE_DECL_SETENV = @HAVE_DECL_SETENV@ HAVE_DECL_SETHOSTNAME = @HAVE_DECL_SETHOSTNAME@ HAVE_DECL_SETSTATE = @HAVE_DECL_SETSTATE@ @@ -741,6 +755,9 @@ HAVE_DECL_WCWIDTH = @HAVE_DECL_WCWIDTH@ HAVE_DPRINTF = @HAVE_DPRINTF@ HAVE_DUP3 = @HAVE_DUP3@ HAVE_DUPLOCALE = @HAVE_DUPLOCALE@ +HAVE_ERROR = @HAVE_ERROR@ +HAVE_ERROR_AT_LINE = @HAVE_ERROR_AT_LINE@ +HAVE_ERROR_H = @HAVE_ERROR_H@ HAVE_EUIDACCESS = @HAVE_EUIDACCESS@ HAVE_EXECVPE = @HAVE_EXECVPE@ HAVE_EXPLICIT_BZERO = @HAVE_EXPLICIT_BZERO@ @@ -768,12 +785,15 @@ HAVE_GETLOGIN = @HAVE_GETLOGIN@ HAVE_GETOPT_H = @HAVE_GETOPT_H@ HAVE_GETPAGESIZE = @HAVE_GETPAGESIZE@ HAVE_GETPASS = @HAVE_GETPASS@ +HAVE_GETPROGNAME = @HAVE_GETPROGNAME@ HAVE_GETRANDOM = @HAVE_GETRANDOM@ HAVE_GETSUBOPT = @HAVE_GETSUBOPT@ HAVE_GETTIMEOFDAY = @HAVE_GETTIMEOFDAY@ HAVE_GETUMASK = @HAVE_GETUMASK@ HAVE_GRANTPT = @HAVE_GRANTPT@ HAVE_GROUP_MEMBER = @HAVE_GROUP_MEMBER@ +HAVE_IMAXABS = @HAVE_IMAXABS@ +HAVE_IMAXDIV = @HAVE_IMAXDIV@ HAVE_IMAXDIV_T = @HAVE_IMAXDIV_T@ HAVE_INITSTATE = @HAVE_INITSTATE@ HAVE_INTTYPES_H = @HAVE_INTTYPES_H@ @@ -800,6 +820,7 @@ HAVE_MBSNRTOWCS = @HAVE_MBSNRTOWCS@ HAVE_MBSRTOWCS = @HAVE_MBSRTOWCS@ HAVE_MBTOWC = @HAVE_MBTOWC@ HAVE_MEMPCPY = @HAVE_MEMPCPY@ +HAVE_MEMSET_EXPLICIT = @HAVE_MEMSET_EXPLICIT@ HAVE_MKDIRAT = @HAVE_MKDIRAT@ HAVE_MKDTEMP = @HAVE_MKDTEMP@ HAVE_MKFIFO = @HAVE_MKFIFO@ @@ -1008,7 +1029,6 @@ HAVE_WMEMPCPY = @HAVE_WMEMPCPY@ HAVE_WMEMSET = @HAVE_WMEMSET@ HAVE_WS2TCPIP_H = @HAVE_WS2TCPIP_H@ HAVE_XLOCALE_H = @HAVE_XLOCALE_H@ -HAVE__BOOL = @HAVE__BOOL@ HAVE__EXIT = @HAVE__EXIT@ IGNORE_UNUSED_LIBRARIES_CFLAGS = @IGNORE_UNUSED_LIBRARIES_CFLAGS@ INCLUDE_NEXT = @INCLUDE_NEXT@ @@ -1075,15 +1095,20 @@ LT_REVISION = @LT_REVISION@ LT_SYS_LIBRARY_PATH = @LT_SYS_LIBRARY_PATH@ MAKEINFO = @MAKEINFO@ MANIFEST_TOOL = @MANIFEST_TOOL@ +MBRTOWC_LIB = @MBRTOWC_LIB@ MKDIR_P = @MKDIR_P@ MSGFMT = @MSGFMT@ MSGFMT_015 = @MSGFMT_015@ MSGMERGE = @MSGMERGE@ +NANOSLEEP_LIB = @NANOSLEEP_LIB@ NETINET_IN_H = @NETINET_IN_H@ NEXT_ARPA_INET_H = @NEXT_ARPA_INET_H@ +NEXT_ASSERT_H = @NEXT_ASSERT_H@ NEXT_AS_FIRST_DIRECTIVE_ARPA_INET_H = @NEXT_AS_FIRST_DIRECTIVE_ARPA_INET_H@ +NEXT_AS_FIRST_DIRECTIVE_ASSERT_H = @NEXT_AS_FIRST_DIRECTIVE_ASSERT_H@ NEXT_AS_FIRST_DIRECTIVE_CTYPE_H = @NEXT_AS_FIRST_DIRECTIVE_CTYPE_H@ NEXT_AS_FIRST_DIRECTIVE_ERRNO_H = @NEXT_AS_FIRST_DIRECTIVE_ERRNO_H@ +NEXT_AS_FIRST_DIRECTIVE_ERROR_H = @NEXT_AS_FIRST_DIRECTIVE_ERROR_H@ NEXT_AS_FIRST_DIRECTIVE_FCNTL_H = @NEXT_AS_FIRST_DIRECTIVE_FCNTL_H@ NEXT_AS_FIRST_DIRECTIVE_GETOPT_H = @NEXT_AS_FIRST_DIRECTIVE_GETOPT_H@ NEXT_AS_FIRST_DIRECTIVE_INTTYPES_H = @NEXT_AS_FIRST_DIRECTIVE_INTTYPES_H@ @@ -1114,6 +1139,7 @@ NEXT_AS_FIRST_DIRECTIVE_WCHAR_H = @NEXT_AS_FIRST_DIRECTIVE_WCHAR_H@ NEXT_AS_FIRST_DIRECTIVE_WCTYPE_H = @NEXT_AS_FIRST_DIRECTIVE_WCTYPE_H@ NEXT_CTYPE_H = @NEXT_CTYPE_H@ NEXT_ERRNO_H = @NEXT_ERRNO_H@ +NEXT_ERROR_H = @NEXT_ERROR_H@ NEXT_FCNTL_H = @NEXT_FCNTL_H@ NEXT_GETOPT_H = @NEXT_GETOPT_H@ NEXT_INTTYPES_H = @NEXT_INTTYPES_H@ @@ -1169,6 +1195,7 @@ PRAGMA_COLUMNS = @PRAGMA_COLUMNS@ PRAGMA_SYSTEM_HEADER = @PRAGMA_SYSTEM_HEADER@ PRIPTR_PREFIX = @PRIPTR_PREFIX@ PTHREAD_H_DEFINES_STRUCT_TIMESPEC = @PTHREAD_H_DEFINES_STRUCT_TIMESPEC@ +PTHREAD_SIGMASK_LIB = @PTHREAD_SIGMASK_LIB@ PTRDIFF_T_SUFFIX = @PTRDIFF_T_SUFFIX@ RANLIB = @RANLIB@ REPLACE_ACCESS = @REPLACE_ACCESS@ @@ -1177,6 +1204,7 @@ REPLACE_BTOWC = @REPLACE_BTOWC@ REPLACE_CALLOC_FOR_CALLOC_GNU = @REPLACE_CALLOC_FOR_CALLOC_GNU@ REPLACE_CALLOC_FOR_CALLOC_POSIX = @REPLACE_CALLOC_FOR_CALLOC_POSIX@ REPLACE_CANONICALIZE_FILE_NAME = @REPLACE_CANONICALIZE_FILE_NAME@ +REPLACE_CHMOD = @REPLACE_CHMOD@ REPLACE_CHOWN = @REPLACE_CHOWN@ REPLACE_CLOSE = @REPLACE_CLOSE@ REPLACE_COPY_FILE_RANGE = @REPLACE_COPY_FILE_RANGE@ @@ -1185,7 +1213,10 @@ REPLACE_CTIME = @REPLACE_CTIME@ REPLACE_DPRINTF = @REPLACE_DPRINTF@ REPLACE_DUP = @REPLACE_DUP@ REPLACE_DUP2 = @REPLACE_DUP2@ +REPLACE_DUP3 = @REPLACE_DUP3@ REPLACE_DUPLOCALE = @REPLACE_DUPLOCALE@ +REPLACE_ERROR = @REPLACE_ERROR@ +REPLACE_ERROR_AT_LINE = @REPLACE_ERROR_AT_LINE@ REPLACE_EXECL = @REPLACE_EXECL@ REPLACE_EXECLE = @REPLACE_EXECLE@ REPLACE_EXECLP = @REPLACE_EXECLP@ @@ -1198,6 +1229,7 @@ REPLACE_FCHMODAT = @REPLACE_FCHMODAT@ REPLACE_FCHOWNAT = @REPLACE_FCHOWNAT@ REPLACE_FCLOSE = @REPLACE_FCLOSE@ REPLACE_FCNTL = @REPLACE_FCNTL@ +REPLACE_FDATASYNC = @REPLACE_FDATASYNC@ REPLACE_FDOPEN = @REPLACE_FDOPEN@ REPLACE_FFLUSH = @REPLACE_FFLUSH@ REPLACE_FFSLL = @REPLACE_FFSLL@ @@ -1220,15 +1252,21 @@ REPLACE_GETCWD = @REPLACE_GETCWD@ REPLACE_GETDELIM = @REPLACE_GETDELIM@ REPLACE_GETDOMAINNAME = @REPLACE_GETDOMAINNAME@ REPLACE_GETDTABLESIZE = @REPLACE_GETDTABLESIZE@ +REPLACE_GETENTROPY = @REPLACE_GETENTROPY@ REPLACE_GETGROUPS = @REPLACE_GETGROUPS@ REPLACE_GETLINE = @REPLACE_GETLINE@ +REPLACE_GETLOADAVG = @REPLACE_GETLOADAVG@ REPLACE_GETLOGIN_R = @REPLACE_GETLOGIN_R@ REPLACE_GETPAGESIZE = @REPLACE_GETPAGESIZE@ REPLACE_GETPASS = @REPLACE_GETPASS@ REPLACE_GETPASS_FOR_GETPASS_GNU = @REPLACE_GETPASS_FOR_GETPASS_GNU@ +REPLACE_GETPROGNAME = @REPLACE_GETPROGNAME@ REPLACE_GETRANDOM = @REPLACE_GETRANDOM@ +REPLACE_GETSUBOPT = @REPLACE_GETSUBOPT@ REPLACE_GETTIMEOFDAY = @REPLACE_GETTIMEOFDAY@ REPLACE_GMTIME = @REPLACE_GMTIME@ +REPLACE_IMAXABS = @REPLACE_IMAXABS@ +REPLACE_IMAXDIV = @REPLACE_IMAXDIV@ REPLACE_INET_NTOP = @REPLACE_INET_NTOP@ REPLACE_INET_PTON = @REPLACE_INET_PTON@ REPLACE_INITSTATE = @REPLACE_INITSTATE@ @@ -1257,11 +1295,14 @@ REPLACE_MBSTATE_T = @REPLACE_MBSTATE_T@ REPLACE_MBTOWC = @REPLACE_MBTOWC@ REPLACE_MEMCHR = @REPLACE_MEMCHR@ REPLACE_MEMMEM = @REPLACE_MEMMEM@ +REPLACE_MEMPCPY = @REPLACE_MEMPCPY@ REPLACE_MKDIR = @REPLACE_MKDIR@ REPLACE_MKFIFO = @REPLACE_MKFIFO@ REPLACE_MKFIFOAT = @REPLACE_MKFIFOAT@ REPLACE_MKNOD = @REPLACE_MKNOD@ REPLACE_MKNODAT = @REPLACE_MKNODAT@ +REPLACE_MKOSTEMP = @REPLACE_MKOSTEMP@ +REPLACE_MKOSTEMPS = @REPLACE_MKOSTEMPS@ REPLACE_MKSTEMP = @REPLACE_MKSTEMP@ REPLACE_MKTIME = @REPLACE_MKTIME@ REPLACE_NANOSLEEP = @REPLACE_NANOSLEEP@ @@ -1272,8 +1313,10 @@ REPLACE_OBSTACK_PRINTF = @REPLACE_OBSTACK_PRINTF@ REPLACE_OPEN = @REPLACE_OPEN@ REPLACE_OPENAT = @REPLACE_OPENAT@ REPLACE_PERROR = @REPLACE_PERROR@ +REPLACE_PIPE2 = @REPLACE_PIPE2@ REPLACE_POPEN = @REPLACE_POPEN@ REPLACE_POSIX_MEMALIGN = @REPLACE_POSIX_MEMALIGN@ +REPLACE_POSIX_OPENPT = @REPLACE_POSIX_OPENPT@ REPLACE_PREAD = @REPLACE_PREAD@ REPLACE_PRINTF = @REPLACE_PRINTF@ REPLACE_PSELECT = @REPLACE_PSELECT@ @@ -1351,6 +1394,7 @@ REPLACE_RMDIR = @REPLACE_RMDIR@ REPLACE_SCHED_YIELD = @REPLACE_SCHED_YIELD@ REPLACE_SELECT = @REPLACE_SELECT@ REPLACE_SETENV = @REPLACE_SETENV@ +REPLACE_SETHOSTNAME = @REPLACE_SETHOSTNAME@ REPLACE_SETLOCALE = @REPLACE_SETLOCALE@ REPLACE_SETSTATE = @REPLACE_SETSTATE@ REPLACE_SLEEP = @REPLACE_SLEEP@ @@ -1359,6 +1403,7 @@ REPLACE_SPRINTF = @REPLACE_SPRINTF@ REPLACE_STAT = @REPLACE_STAT@ REPLACE_STDIO_READ_FUNCS = @REPLACE_STDIO_READ_FUNCS@ REPLACE_STDIO_WRITE_FUNCS = @REPLACE_STDIO_WRITE_FUNCS@ +REPLACE_STPCPY = @REPLACE_STPCPY@ REPLACE_STPNCPY = @REPLACE_STPNCPY@ REPLACE_STRCASESTR = @REPLACE_STRCASESTR@ REPLACE_STRCHRNUL = @REPLACE_STRCHRNUL@ @@ -1385,7 +1430,9 @@ REPLACE_STRUCT_LCONV = @REPLACE_STRUCT_LCONV@ REPLACE_STRUCT_TIMEVAL = @REPLACE_STRUCT_TIMEVAL@ REPLACE_SYMLINK = @REPLACE_SYMLINK@ REPLACE_SYMLINKAT = @REPLACE_SYMLINKAT@ +REPLACE_TIME = @REPLACE_TIME@ REPLACE_TIMEGM = @REPLACE_TIMEGM@ +REPLACE_TIMESPEC_GET = @REPLACE_TIMESPEC_GET@ REPLACE_TMPFILE = @REPLACE_TMPFILE@ REPLACE_TOWLOWER = @REPLACE_TOWLOWER@ REPLACE_TRUNCATE = @REPLACE_TRUNCATE@ @@ -1411,15 +1458,20 @@ REPLACE_WCSWIDTH = @REPLACE_WCSWIDTH@ REPLACE_WCTOB = @REPLACE_WCTOB@ REPLACE_WCTOMB = @REPLACE_WCTOMB@ REPLACE_WCWIDTH = @REPLACE_WCWIDTH@ +REPLACE_WMEMPCPY = @REPLACE_WMEMPCPY@ REPLACE_WRITE = @REPLACE_WRITE@ +REPLACE__EXIT = @REPLACE__EXIT@ +SCHED_YIELD_LIB = @SCHED_YIELD_LIB@ SED = @SED@ +SELECT_LIB = @SELECT_LIB@ +SETLOCALE_LIB = @SETLOCALE_LIB@ +SETLOCALE_NULL_LIB = @SETLOCALE_NULL_LIB@ SET_MAKE = @SET_MAKE@ SHELL = @SHELL@ SIG_ATOMIC_T_SUFFIX = @SIG_ATOMIC_T_SUFFIX@ SIZE_T_SUFFIX = @SIZE_T_SUFFIX@ -STDALIGN_H = @STDALIGN_H@ STDARG_H = @STDARG_H@ -STDBOOL_H = @STDBOOL_H@ +STDCKDINT_H = @STDCKDINT_H@ STDDEF_H = @STDDEF_H@ STDINT_H = @STDINT_H@ STRIP = @STRIP@ @@ -1463,6 +1515,8 @@ am__quote = @am__quote@ am__tar = @am__tar@ am__untar = @am__untar@ bindir = @bindir@ +bindir_c = @bindir_c@ +bindir_c_make = @bindir_c_make@ build = @build@ build_alias = @build_alias@ build_cpu = @build_cpu@ @@ -1470,10 +1524,20 @@ build_os = @build_os@ build_vendor = @build_vendor@ builddir = @builddir@ datadir = @datadir@ +datadir_c = @datadir_c@ +datadir_c_make = @datadir_c_make@ datarootdir = @datarootdir@ +datarootdir_c = @datarootdir_c@ +datarootdir_c_make = @datarootdir_c_make@ docdir = @docdir@ +docdir_c = @docdir_c@ +docdir_c_make = @docdir_c_make@ dvidir = @dvidir@ +dvidir_c = @dvidir_c@ +dvidir_c_make = @dvidir_c_make@ exec_prefix = @exec_prefix@ +exec_prefix_c = @exec_prefix_c@ +exec_prefix_c_make = @exec_prefix_c_make@ gl_LIBOBJDEPS = @gl_LIBOBJDEPS@ gl_LIBOBJS = @gl_LIBOBJS@ gl_LTLIBOBJS = @gl_LTLIBOBJS@ @@ -1487,26 +1551,68 @@ host_cpu = @host_cpu@ host_os = @host_os@ host_vendor = @host_vendor@ htmldir = @htmldir@ +htmldir_c = @htmldir_c@ +htmldir_c_make = @htmldir_c_make@ includedir = @includedir@ +includedir_c = @includedir_c@ +includedir_c_make = @includedir_c_make@ infodir = @infodir@ +infodir_c = @infodir_c@ +infodir_c_make = @infodir_c_make@ install_sh = @install_sh@ libdir = @libdir@ +libdir_c = @libdir_c@ +libdir_c_make = @libdir_c_make@ libexecdir = @libexecdir@ +libexecdir_c = @libexecdir_c@ +libexecdir_c_make = @libexecdir_c_make@ lispdir = @lispdir@ +lispdir_c = @lispdir_c@ +lispdir_c_make = @lispdir_c_make@ localedir = @localedir@ +localedir_c = @localedir_c@ +localedir_c_make = @localedir_c_make@ localstatedir = @localstatedir@ +localstatedir_c = @localstatedir_c@ +localstatedir_c_make = @localstatedir_c_make@ mandir = $(mandir)/$(lang) +mandir_c = @mandir_c@ +mandir_c_make = @mandir_c_make@ mkdir_p = @mkdir_p@ oldincludedir = @oldincludedir@ +oldincludedir_c = @oldincludedir_c@ +oldincludedir_c_make = @oldincludedir_c_make@ pdfdir = @pdfdir@ +pdfdir_c = @pdfdir_c@ +pdfdir_c_make = @pdfdir_c_make@ +pkgdatadir_c = @pkgdatadir_c@ +pkgdatadir_c_make = @pkgdatadir_c_make@ +pkgincludedir_c = @pkgincludedir_c@ +pkgincludedir_c_make = @pkgincludedir_c_make@ +pkglibdir_c = @pkglibdir_c@ +pkglibdir_c_make = @pkglibdir_c_make@ +pkglibexecdir_c = @pkglibexecdir_c@ +pkglibexecdir_c_make = @pkglibexecdir_c_make@ prefix = @prefix@ +prefix_c = @prefix_c@ +prefix_c_make = @prefix_c_make@ program_transform_name = @program_transform_name@ psdir = @psdir@ +psdir_c = @psdir_c@ +psdir_c_make = @psdir_c_make@ runstatedir = @runstatedir@ +runstatedir_c = @runstatedir_c@ +runstatedir_c_make = @runstatedir_c_make@ sbindir = @sbindir@ +sbindir_c = @sbindir_c@ +sbindir_c_make = @sbindir_c_make@ sharedstatedir = @sharedstatedir@ +sharedstatedir_c = @sharedstatedir_c@ +sharedstatedir_c_make = @sharedstatedir_c_make@ srcdir = @srcdir@ sysconfdir = @sysconfdir@ +sysconfdir_c = @sysconfdir_c@ +sysconfdir_c_make = @sysconfdir_c_make@ target_alias = @target_alias@ top_build_prefix = @top_build_prefix@ top_builddir = @top_builddir@ diff --git a/doc/stamp-vti b/doc/stamp-vti index 8648c0c..a554ff1 100644 --- a/doc/stamp-vti +++ b/doc/stamp-vti @@ -1,4 +1,4 @@ -@set UPDATED 18 April 2022 -@set UPDATED-MONTH April 2022 -@set EDITION 3.5 -@set VERSION 3.5 +@set UPDATED 25 March 2023 +@set UPDATED-MONTH March 2023 +@set EDITION 3.6 +@set VERSION 3.6 diff --git a/doc/version.texi b/doc/version.texi index 8648c0c..a554ff1 100644 --- a/doc/version.texi +++ b/doc/version.texi @@ -1,4 +1,4 @@ -@set UPDATED 18 April 2022 -@set UPDATED-MONTH April 2022 -@set EDITION 3.5 -@set VERSION 3.5 +@set UPDATED 25 March 2023 +@set UPDATED-MONTH March 2023 +@set EDITION 3.6 +@set VERSION 3.6 diff --git a/include/Makefile.in b/include/Makefile.in index e6009a8..6c80906 100644 --- a/include/Makefile.in +++ b/include/Makefile.in @@ -69,9 +69,6 @@ am__make_running_with_option = \ test $$has_opt = yes am__make_dryrun = (target_option=n; $(am__make_running_with_option)) am__make_keepgoing = (target_option=k; $(am__make_running_with_option)) -pkgdatadir = $(datadir)/@PACKAGE@ -pkgincludedir = $(includedir)/@PACKAGE@ -pkglibdir = $(libdir)/@PACKAGE@ am__cd = CDPATH="$${ZSH_VERSION+.}$(PATH_SEPARATOR)" && cd install_sh_DATA = $(install_sh) -c -m 644 install_sh_PROGRAM = $(install_sh) -c @@ -92,7 +89,9 @@ am__aclocal_m4_deps = $(top_srcdir)/m4/00gnulib.m4 \ $(top_srcdir)/m4/__inline.m4 \ $(top_srcdir)/m4/absolute-header.m4 $(top_srcdir)/m4/alloca.m4 \ $(top_srcdir)/m4/arpa_inet_h.m4 $(top_srcdir)/m4/assert.m4 \ - $(top_srcdir)/m4/btowc.m4 $(top_srcdir)/m4/builtin-expect.m4 \ + $(top_srcdir)/m4/assert_h.m4 $(top_srcdir)/m4/btowc.m4 \ + $(top_srcdir)/m4/build-to-host.m4 \ + $(top_srcdir)/m4/builtin-expect.m4 $(top_srcdir)/m4/c-bool.m4 \ $(top_srcdir)/m4/calloc.m4 $(top_srcdir)/m4/canonicalize.m4 \ $(top_srcdir)/m4/clock_time.m4 $(top_srcdir)/m4/close.m4 \ $(top_srcdir)/m4/codeset.m4 $(top_srcdir)/m4/config-h.m4 \ @@ -100,7 +99,7 @@ am__aclocal_m4_deps = $(top_srcdir)/m4/00gnulib.m4 \ $(top_srcdir)/m4/double-slash-root.m4 $(top_srcdir)/m4/dup2.m4 \ $(top_srcdir)/m4/eealloc.m4 $(top_srcdir)/m4/environ.m4 \ $(top_srcdir)/m4/errno_h.m4 $(top_srcdir)/m4/error.m4 \ - $(top_srcdir)/m4/extensions.m4 \ + $(top_srcdir)/m4/error_h.m4 $(top_srcdir)/m4/extensions.m4 \ $(top_srcdir)/m4/extern-inline.m4 $(top_srcdir)/m4/fcntl-o.m4 \ $(top_srcdir)/m4/fcntl.m4 $(top_srcdir)/m4/fcntl_h.m4 \ $(top_srcdir)/m4/fdopen.m4 $(top_srcdir)/m4/flexmember.m4 \ @@ -132,10 +131,11 @@ am__aclocal_m4_deps = $(top_srcdir)/m4/00gnulib.m4 \ $(top_srcdir)/m4/malloc.m4 $(top_srcdir)/m4/malloca.m4 \ $(top_srcdir)/m4/manywarnings.m4 $(top_srcdir)/m4/mbrtowc.m4 \ $(top_srcdir)/m4/mbsinit.m4 $(top_srcdir)/m4/mbstate_t.m4 \ - $(top_srcdir)/m4/mbtowc.m4 $(top_srcdir)/m4/mempcpy.m4 \ - $(top_srcdir)/m4/minmax.m4 $(top_srcdir)/m4/mkdir.m4 \ - $(top_srcdir)/m4/mkstemp.m4 $(top_srcdir)/m4/mmap-anon.m4 \ - $(top_srcdir)/m4/mode_t.m4 $(top_srcdir)/m4/msvc-inval.m4 \ + $(top_srcdir)/m4/mbtowc.m4 $(top_srcdir)/m4/memchr.m4 \ + $(top_srcdir)/m4/mempcpy.m4 $(top_srcdir)/m4/minmax.m4 \ + $(top_srcdir)/m4/mkdir.m4 $(top_srcdir)/m4/mkstemp.m4 \ + $(top_srcdir)/m4/mmap-anon.m4 $(top_srcdir)/m4/mode_t.m4 \ + $(top_srcdir)/m4/msvc-inval.m4 \ $(top_srcdir)/m4/msvc-nothrow.m4 $(top_srcdir)/m4/multiarch.m4 \ $(top_srcdir)/m4/musl.m4 $(top_srcdir)/m4/nanosleep.m4 \ $(top_srcdir)/m4/netinet_in_h.m4 \ @@ -166,29 +166,29 @@ am__aclocal_m4_deps = $(top_srcdir)/m4/00gnulib.m4 \ $(top_srcdir)/m4/socklen.m4 $(top_srcdir)/m4/sockpfaf.m4 \ $(top_srcdir)/m4/ssize_t.m4 $(top_srcdir)/m4/stat-time.m4 \ $(top_srcdir)/m4/stat.m4 $(top_srcdir)/m4/stdalign.m4 \ - $(top_srcdir)/m4/stdarg.m4 $(top_srcdir)/m4/stdbool.m4 \ - $(top_srcdir)/m4/stddef_h.m4 $(top_srcdir)/m4/stdint.m4 \ - $(top_srcdir)/m4/stdio_h.m4 $(top_srcdir)/m4/stdlib_h.m4 \ - $(top_srcdir)/m4/strdup.m4 $(top_srcdir)/m4/strerror.m4 \ - $(top_srcdir)/m4/strerror_r.m4 $(top_srcdir)/m4/string_h.m4 \ - $(top_srcdir)/m4/strtoll.m4 $(top_srcdir)/m4/strtoull.m4 \ - $(top_srcdir)/m4/symlink.m4 $(top_srcdir)/m4/sys_ioctl_h.m4 \ + $(top_srcdir)/m4/stdarg.m4 $(top_srcdir)/m4/stddef_h.m4 \ + $(top_srcdir)/m4/stdint.m4 $(top_srcdir)/m4/stdio_h.m4 \ + $(top_srcdir)/m4/stdlib_h.m4 $(top_srcdir)/m4/strdup.m4 \ + $(top_srcdir)/m4/strerror.m4 $(top_srcdir)/m4/strerror_r.m4 \ + $(top_srcdir)/m4/string_h.m4 $(top_srcdir)/m4/strtoll.m4 \ + $(top_srcdir)/m4/strtoull.m4 $(top_srcdir)/m4/symlink.m4 \ + $(top_srcdir)/m4/sys_ioctl_h.m4 \ $(top_srcdir)/m4/sys_random_h.m4 \ $(top_srcdir)/m4/sys_select_h.m4 \ $(top_srcdir)/m4/sys_socket_h.m4 \ $(top_srcdir)/m4/sys_stat_h.m4 $(top_srcdir)/m4/sys_time_h.m4 \ $(top_srcdir)/m4/sys_types_h.m4 $(top_srcdir)/m4/sys_uio_h.m4 \ $(top_srcdir)/m4/tempname.m4 $(top_srcdir)/m4/thread.m4 \ - $(top_srcdir)/m4/threadlib.m4 $(top_srcdir)/m4/time_h.m4 \ - $(top_srcdir)/m4/unistd_h.m4 $(top_srcdir)/m4/unlink.m4 \ - $(top_srcdir)/m4/unlinkdir.m4 $(top_srcdir)/m4/usleep.m4 \ - $(top_srcdir)/m4/version-etc.m4 $(top_srcdir)/m4/visibility.m4 \ - $(top_srcdir)/m4/warn-on-use.m4 $(top_srcdir)/m4/warnings.m4 \ - $(top_srcdir)/m4/wchar_h.m4 $(top_srcdir)/m4/wchar_t.m4 \ - $(top_srcdir)/m4/wcrtomb.m4 $(top_srcdir)/m4/wctob.m4 \ - $(top_srcdir)/m4/wctomb.m4 $(top_srcdir)/m4/wctype_h.m4 \ - $(top_srcdir)/m4/wint_t.m4 $(top_srcdir)/m4/xalloc.m4 \ - $(top_srcdir)/m4/xstrtol.m4 $(top_srcdir)/m4/year2038.m4 \ + $(top_srcdir)/m4/threadlib.m4 $(top_srcdir)/m4/time.m4 \ + $(top_srcdir)/m4/time_h.m4 $(top_srcdir)/m4/unistd_h.m4 \ + $(top_srcdir)/m4/unlink.m4 $(top_srcdir)/m4/unlinkdir.m4 \ + $(top_srcdir)/m4/usleep.m4 $(top_srcdir)/m4/version-etc.m4 \ + $(top_srcdir)/m4/visibility.m4 $(top_srcdir)/m4/warn-on-use.m4 \ + $(top_srcdir)/m4/warnings.m4 $(top_srcdir)/m4/wchar_h.m4 \ + $(top_srcdir)/m4/wchar_t.m4 $(top_srcdir)/m4/wcrtomb.m4 \ + $(top_srcdir)/m4/wctob.m4 $(top_srcdir)/m4/wctomb.m4 \ + $(top_srcdir)/m4/wctype_h.m4 $(top_srcdir)/m4/wint_t.m4 \ + $(top_srcdir)/m4/xalloc.m4 $(top_srcdir)/m4/xstrtol.m4 \ $(top_srcdir)/m4/yield.m4 $(top_srcdir)/m4/zzgnulib.m4 \ $(top_srcdir)/configure.ac am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \ @@ -278,6 +278,9 @@ am__relativize = \ dir1=`echo "$$dir1" | sed -e "$$sed_rest"`; \ done; \ reldir="$$dir2" +pkgdatadir = @pkgdatadir@ +pkgincludedir = @pkgincludedir@ +pkglibdir = @pkglibdir@ pkglibexecdir = @pkglibexecdir@ ACLOCAL = @ACLOCAL@ ALLOCA = @ALLOCA@ @@ -287,6 +290,7 @@ AM_DEFAULT_VERBOSITY = @AM_DEFAULT_VERBOSITY@ APPLE_UNIVERSAL_BUILD = @APPLE_UNIVERSAL_BUILD@ AR = @AR@ ARFLAGS = @ARFLAGS@ +ASSERT_H = @ASSERT_H@ AUTOCONF = @AUTOCONF@ AUTOHEADER = @AUTOHEADER@ AUTOMAKE = @AUTOMAKE@ @@ -303,6 +307,7 @@ CFLAGS = @CFLAGS@ CFLAG_VISIBILITY = @CFLAG_VISIBILITY@ CHECK_CFLAGS = @CHECK_CFLAGS@ CHECK_LIBS = @CHECK_LIBS@ +CLOCK_TIME_LIB = @CLOCK_TIME_LIB@ CONFIG_INCLUDE = @CONFIG_INCLUDE@ CPP = @CPP@ CPPFLAGS = @CPPFLAGS@ @@ -327,12 +332,14 @@ ENOLINK_VALUE = @ENOLINK_VALUE@ EOVERFLOW_HIDDEN = @EOVERFLOW_HIDDEN@ EOVERFLOW_VALUE = @EOVERFLOW_VALUE@ ERRNO_H = @ERRNO_H@ +ERROR_H = @ERROR_H@ ETAGS = @ETAGS@ EXEEXT = @EXEEXT@ FGREP = @FGREP@ FILECMD = @FILECMD@ GETOPT_CDEFS_H = @GETOPT_CDEFS_H@ GETOPT_H = @GETOPT_H@ +GETRANDOM_LIB = @GETRANDOM_LIB@ GETTEXT_MACRO_VERSION = @GETTEXT_MACRO_VERSION@ GL_CFLAG_ALLOW_WARNINGS = @GL_CFLAG_ALLOW_WARNINGS@ GL_CFLAG_GNULIB_WARNINGS = @GL_CFLAG_GNULIB_WARNINGS@ @@ -348,6 +355,7 @@ GL_GNULIB_CALLOC_GNU = @GL_GNULIB_CALLOC_GNU@ GL_GNULIB_CALLOC_POSIX = @GL_GNULIB_CALLOC_POSIX@ GL_GNULIB_CANONICALIZE_FILE_NAME = @GL_GNULIB_CANONICALIZE_FILE_NAME@ GL_GNULIB_CHDIR = @GL_GNULIB_CHDIR@ +GL_GNULIB_CHMOD = @GL_GNULIB_CHMOD@ GL_GNULIB_CHOWN = @GL_GNULIB_CHOWN@ GL_GNULIB_CLOSE = @GL_GNULIB_CLOSE@ GL_GNULIB_CONNECT = @GL_GNULIB_CONNECT@ @@ -421,6 +429,7 @@ GL_GNULIB_GETPAGESIZE = @GL_GNULIB_GETPAGESIZE@ GL_GNULIB_GETPASS = @GL_GNULIB_GETPASS@ GL_GNULIB_GETPASS_GNU = @GL_GNULIB_GETPASS_GNU@ GL_GNULIB_GETPEERNAME = @GL_GNULIB_GETPEERNAME@ +GL_GNULIB_GETPROGNAME = @GL_GNULIB_GETPROGNAME@ GL_GNULIB_GETRANDOM = @GL_GNULIB_GETRANDOM@ GL_GNULIB_GETSOCKNAME = @GL_GNULIB_GETSOCKNAME@ GL_GNULIB_GETSOCKOPT = @GL_GNULIB_GETSOCKOPT@ @@ -518,6 +527,7 @@ GL_GNULIB_MEMCHR = @GL_GNULIB_MEMCHR@ GL_GNULIB_MEMMEM = @GL_GNULIB_MEMMEM@ GL_GNULIB_MEMPCPY = @GL_GNULIB_MEMPCPY@ GL_GNULIB_MEMRCHR = @GL_GNULIB_MEMRCHR@ +GL_GNULIB_MEMSET_EXPLICIT = @GL_GNULIB_MEMSET_EXPLICIT@ GL_GNULIB_MKDIR = @GL_GNULIB_MKDIR@ GL_GNULIB_MKDIRAT = @GL_GNULIB_MKDIRAT@ GL_GNULIB_MKDTEMP = @GL_GNULIB_MKDTEMP@ @@ -638,6 +648,7 @@ GL_GNULIB_STRVERSCMP = @GL_GNULIB_STRVERSCMP@ GL_GNULIB_SYMLINK = @GL_GNULIB_SYMLINK@ GL_GNULIB_SYMLINKAT = @GL_GNULIB_SYMLINKAT@ GL_GNULIB_SYSTEM_POSIX = @GL_GNULIB_SYSTEM_POSIX@ +GL_GNULIB_TIME = @GL_GNULIB_TIME@ GL_GNULIB_TIMEGM = @GL_GNULIB_TIMEGM@ GL_GNULIB_TIMESPEC_GET = @GL_GNULIB_TIMESPEC_GET@ GL_GNULIB_TIMESPEC_GETRES = @GL_GNULIB_TIMESPEC_GETRES@ @@ -712,6 +723,7 @@ GMSGFMT_015 = @GMSGFMT_015@ GNULIBHEADERS_OVERRIDE_WINT_T = @GNULIBHEADERS_OVERRIDE_WINT_T@ GNULIB_GETTIMEOFDAY = @GNULIB_GETTIMEOFDAY@ GREP = @GREP@ +HARD_LOCALE_LIB = @HARD_LOCALE_LIB@ HAVE_ACCEPT4 = @HAVE_ACCEPT4@ HAVE_ALIGNED_ALLOC = @HAVE_ALIGNED_ALLOC@ HAVE_ALLOCA_H = @HAVE_ALLOCA_H@ @@ -742,6 +754,7 @@ HAVE_DECL_GETLOGIN = @HAVE_DECL_GETLOGIN@ HAVE_DECL_GETLOGIN_R = @HAVE_DECL_GETLOGIN_R@ HAVE_DECL_GETPAGESIZE = @HAVE_DECL_GETPAGESIZE@ HAVE_DECL_GETUSERSHELL = @HAVE_DECL_GETUSERSHELL@ +HAVE_DECL_GETW = @HAVE_DECL_GETW@ HAVE_DECL_IMAXABS = @HAVE_DECL_IMAXABS@ HAVE_DECL_IMAXDIV = @HAVE_DECL_IMAXDIV@ HAVE_DECL_INET_NTOP = @HAVE_DECL_INET_NTOP@ @@ -751,6 +764,7 @@ HAVE_DECL_LOCALTIME_R = @HAVE_DECL_LOCALTIME_R@ HAVE_DECL_MEMMEM = @HAVE_DECL_MEMMEM@ HAVE_DECL_MEMRCHR = @HAVE_DECL_MEMRCHR@ HAVE_DECL_OBSTACK_PRINTF = @HAVE_DECL_OBSTACK_PRINTF@ +HAVE_DECL_PUTW = @HAVE_DECL_PUTW@ HAVE_DECL_SETENV = @HAVE_DECL_SETENV@ HAVE_DECL_SETHOSTNAME = @HAVE_DECL_SETHOSTNAME@ HAVE_DECL_SETSTATE = @HAVE_DECL_SETSTATE@ @@ -773,6 +787,9 @@ HAVE_DECL_WCWIDTH = @HAVE_DECL_WCWIDTH@ HAVE_DPRINTF = @HAVE_DPRINTF@ HAVE_DUP3 = @HAVE_DUP3@ HAVE_DUPLOCALE = @HAVE_DUPLOCALE@ +HAVE_ERROR = @HAVE_ERROR@ +HAVE_ERROR_AT_LINE = @HAVE_ERROR_AT_LINE@ +HAVE_ERROR_H = @HAVE_ERROR_H@ HAVE_EUIDACCESS = @HAVE_EUIDACCESS@ HAVE_EXECVPE = @HAVE_EXECVPE@ HAVE_EXPLICIT_BZERO = @HAVE_EXPLICIT_BZERO@ @@ -800,12 +817,15 @@ HAVE_GETLOGIN = @HAVE_GETLOGIN@ HAVE_GETOPT_H = @HAVE_GETOPT_H@ HAVE_GETPAGESIZE = @HAVE_GETPAGESIZE@ HAVE_GETPASS = @HAVE_GETPASS@ +HAVE_GETPROGNAME = @HAVE_GETPROGNAME@ HAVE_GETRANDOM = @HAVE_GETRANDOM@ HAVE_GETSUBOPT = @HAVE_GETSUBOPT@ HAVE_GETTIMEOFDAY = @HAVE_GETTIMEOFDAY@ HAVE_GETUMASK = @HAVE_GETUMASK@ HAVE_GRANTPT = @HAVE_GRANTPT@ HAVE_GROUP_MEMBER = @HAVE_GROUP_MEMBER@ +HAVE_IMAXABS = @HAVE_IMAXABS@ +HAVE_IMAXDIV = @HAVE_IMAXDIV@ HAVE_IMAXDIV_T = @HAVE_IMAXDIV_T@ HAVE_INITSTATE = @HAVE_INITSTATE@ HAVE_INTTYPES_H = @HAVE_INTTYPES_H@ @@ -832,6 +852,7 @@ HAVE_MBSNRTOWCS = @HAVE_MBSNRTOWCS@ HAVE_MBSRTOWCS = @HAVE_MBSRTOWCS@ HAVE_MBTOWC = @HAVE_MBTOWC@ HAVE_MEMPCPY = @HAVE_MEMPCPY@ +HAVE_MEMSET_EXPLICIT = @HAVE_MEMSET_EXPLICIT@ HAVE_MKDIRAT = @HAVE_MKDIRAT@ HAVE_MKDTEMP = @HAVE_MKDTEMP@ HAVE_MKFIFO = @HAVE_MKFIFO@ @@ -1040,7 +1061,6 @@ HAVE_WMEMPCPY = @HAVE_WMEMPCPY@ HAVE_WMEMSET = @HAVE_WMEMSET@ HAVE_WS2TCPIP_H = @HAVE_WS2TCPIP_H@ HAVE_XLOCALE_H = @HAVE_XLOCALE_H@ -HAVE__BOOL = @HAVE__BOOL@ HAVE__EXIT = @HAVE__EXIT@ IGNORE_UNUSED_LIBRARIES_CFLAGS = @IGNORE_UNUSED_LIBRARIES_CFLAGS@ INCLUDE_NEXT = @INCLUDE_NEXT@ @@ -1107,15 +1127,20 @@ LT_REVISION = @LT_REVISION@ LT_SYS_LIBRARY_PATH = @LT_SYS_LIBRARY_PATH@ MAKEINFO = @MAKEINFO@ MANIFEST_TOOL = @MANIFEST_TOOL@ +MBRTOWC_LIB = @MBRTOWC_LIB@ MKDIR_P = @MKDIR_P@ MSGFMT = @MSGFMT@ MSGFMT_015 = @MSGFMT_015@ MSGMERGE = @MSGMERGE@ +NANOSLEEP_LIB = @NANOSLEEP_LIB@ NETINET_IN_H = @NETINET_IN_H@ NEXT_ARPA_INET_H = @NEXT_ARPA_INET_H@ +NEXT_ASSERT_H = @NEXT_ASSERT_H@ NEXT_AS_FIRST_DIRECTIVE_ARPA_INET_H = @NEXT_AS_FIRST_DIRECTIVE_ARPA_INET_H@ +NEXT_AS_FIRST_DIRECTIVE_ASSERT_H = @NEXT_AS_FIRST_DIRECTIVE_ASSERT_H@ NEXT_AS_FIRST_DIRECTIVE_CTYPE_H = @NEXT_AS_FIRST_DIRECTIVE_CTYPE_H@ NEXT_AS_FIRST_DIRECTIVE_ERRNO_H = @NEXT_AS_FIRST_DIRECTIVE_ERRNO_H@ +NEXT_AS_FIRST_DIRECTIVE_ERROR_H = @NEXT_AS_FIRST_DIRECTIVE_ERROR_H@ NEXT_AS_FIRST_DIRECTIVE_FCNTL_H = @NEXT_AS_FIRST_DIRECTIVE_FCNTL_H@ NEXT_AS_FIRST_DIRECTIVE_GETOPT_H = @NEXT_AS_FIRST_DIRECTIVE_GETOPT_H@ NEXT_AS_FIRST_DIRECTIVE_INTTYPES_H = @NEXT_AS_FIRST_DIRECTIVE_INTTYPES_H@ @@ -1146,6 +1171,7 @@ NEXT_AS_FIRST_DIRECTIVE_WCHAR_H = @NEXT_AS_FIRST_DIRECTIVE_WCHAR_H@ NEXT_AS_FIRST_DIRECTIVE_WCTYPE_H = @NEXT_AS_FIRST_DIRECTIVE_WCTYPE_H@ NEXT_CTYPE_H = @NEXT_CTYPE_H@ NEXT_ERRNO_H = @NEXT_ERRNO_H@ +NEXT_ERROR_H = @NEXT_ERROR_H@ NEXT_FCNTL_H = @NEXT_FCNTL_H@ NEXT_GETOPT_H = @NEXT_GETOPT_H@ NEXT_INTTYPES_H = @NEXT_INTTYPES_H@ @@ -1201,6 +1227,7 @@ PRAGMA_COLUMNS = @PRAGMA_COLUMNS@ PRAGMA_SYSTEM_HEADER = @PRAGMA_SYSTEM_HEADER@ PRIPTR_PREFIX = @PRIPTR_PREFIX@ PTHREAD_H_DEFINES_STRUCT_TIMESPEC = @PTHREAD_H_DEFINES_STRUCT_TIMESPEC@ +PTHREAD_SIGMASK_LIB = @PTHREAD_SIGMASK_LIB@ PTRDIFF_T_SUFFIX = @PTRDIFF_T_SUFFIX@ RANLIB = @RANLIB@ REPLACE_ACCESS = @REPLACE_ACCESS@ @@ -1209,6 +1236,7 @@ REPLACE_BTOWC = @REPLACE_BTOWC@ REPLACE_CALLOC_FOR_CALLOC_GNU = @REPLACE_CALLOC_FOR_CALLOC_GNU@ REPLACE_CALLOC_FOR_CALLOC_POSIX = @REPLACE_CALLOC_FOR_CALLOC_POSIX@ REPLACE_CANONICALIZE_FILE_NAME = @REPLACE_CANONICALIZE_FILE_NAME@ +REPLACE_CHMOD = @REPLACE_CHMOD@ REPLACE_CHOWN = @REPLACE_CHOWN@ REPLACE_CLOSE = @REPLACE_CLOSE@ REPLACE_COPY_FILE_RANGE = @REPLACE_COPY_FILE_RANGE@ @@ -1217,7 +1245,10 @@ REPLACE_CTIME = @REPLACE_CTIME@ REPLACE_DPRINTF = @REPLACE_DPRINTF@ REPLACE_DUP = @REPLACE_DUP@ REPLACE_DUP2 = @REPLACE_DUP2@ +REPLACE_DUP3 = @REPLACE_DUP3@ REPLACE_DUPLOCALE = @REPLACE_DUPLOCALE@ +REPLACE_ERROR = @REPLACE_ERROR@ +REPLACE_ERROR_AT_LINE = @REPLACE_ERROR_AT_LINE@ REPLACE_EXECL = @REPLACE_EXECL@ REPLACE_EXECLE = @REPLACE_EXECLE@ REPLACE_EXECLP = @REPLACE_EXECLP@ @@ -1230,6 +1261,7 @@ REPLACE_FCHMODAT = @REPLACE_FCHMODAT@ REPLACE_FCHOWNAT = @REPLACE_FCHOWNAT@ REPLACE_FCLOSE = @REPLACE_FCLOSE@ REPLACE_FCNTL = @REPLACE_FCNTL@ +REPLACE_FDATASYNC = @REPLACE_FDATASYNC@ REPLACE_FDOPEN = @REPLACE_FDOPEN@ REPLACE_FFLUSH = @REPLACE_FFLUSH@ REPLACE_FFSLL = @REPLACE_FFSLL@ @@ -1252,15 +1284,21 @@ REPLACE_GETCWD = @REPLACE_GETCWD@ REPLACE_GETDELIM = @REPLACE_GETDELIM@ REPLACE_GETDOMAINNAME = @REPLACE_GETDOMAINNAME@ REPLACE_GETDTABLESIZE = @REPLACE_GETDTABLESIZE@ +REPLACE_GETENTROPY = @REPLACE_GETENTROPY@ REPLACE_GETGROUPS = @REPLACE_GETGROUPS@ REPLACE_GETLINE = @REPLACE_GETLINE@ +REPLACE_GETLOADAVG = @REPLACE_GETLOADAVG@ REPLACE_GETLOGIN_R = @REPLACE_GETLOGIN_R@ REPLACE_GETPAGESIZE = @REPLACE_GETPAGESIZE@ REPLACE_GETPASS = @REPLACE_GETPASS@ REPLACE_GETPASS_FOR_GETPASS_GNU = @REPLACE_GETPASS_FOR_GETPASS_GNU@ +REPLACE_GETPROGNAME = @REPLACE_GETPROGNAME@ REPLACE_GETRANDOM = @REPLACE_GETRANDOM@ +REPLACE_GETSUBOPT = @REPLACE_GETSUBOPT@ REPLACE_GETTIMEOFDAY = @REPLACE_GETTIMEOFDAY@ REPLACE_GMTIME = @REPLACE_GMTIME@ +REPLACE_IMAXABS = @REPLACE_IMAXABS@ +REPLACE_IMAXDIV = @REPLACE_IMAXDIV@ REPLACE_INET_NTOP = @REPLACE_INET_NTOP@ REPLACE_INET_PTON = @REPLACE_INET_PTON@ REPLACE_INITSTATE = @REPLACE_INITSTATE@ @@ -1289,11 +1327,14 @@ REPLACE_MBSTATE_T = @REPLACE_MBSTATE_T@ REPLACE_MBTOWC = @REPLACE_MBTOWC@ REPLACE_MEMCHR = @REPLACE_MEMCHR@ REPLACE_MEMMEM = @REPLACE_MEMMEM@ +REPLACE_MEMPCPY = @REPLACE_MEMPCPY@ REPLACE_MKDIR = @REPLACE_MKDIR@ REPLACE_MKFIFO = @REPLACE_MKFIFO@ REPLACE_MKFIFOAT = @REPLACE_MKFIFOAT@ REPLACE_MKNOD = @REPLACE_MKNOD@ REPLACE_MKNODAT = @REPLACE_MKNODAT@ +REPLACE_MKOSTEMP = @REPLACE_MKOSTEMP@ +REPLACE_MKOSTEMPS = @REPLACE_MKOSTEMPS@ REPLACE_MKSTEMP = @REPLACE_MKSTEMP@ REPLACE_MKTIME = @REPLACE_MKTIME@ REPLACE_NANOSLEEP = @REPLACE_NANOSLEEP@ @@ -1304,8 +1345,10 @@ REPLACE_OBSTACK_PRINTF = @REPLACE_OBSTACK_PRINTF@ REPLACE_OPEN = @REPLACE_OPEN@ REPLACE_OPENAT = @REPLACE_OPENAT@ REPLACE_PERROR = @REPLACE_PERROR@ +REPLACE_PIPE2 = @REPLACE_PIPE2@ REPLACE_POPEN = @REPLACE_POPEN@ REPLACE_POSIX_MEMALIGN = @REPLACE_POSIX_MEMALIGN@ +REPLACE_POSIX_OPENPT = @REPLACE_POSIX_OPENPT@ REPLACE_PREAD = @REPLACE_PREAD@ REPLACE_PRINTF = @REPLACE_PRINTF@ REPLACE_PSELECT = @REPLACE_PSELECT@ @@ -1383,6 +1426,7 @@ REPLACE_RMDIR = @REPLACE_RMDIR@ REPLACE_SCHED_YIELD = @REPLACE_SCHED_YIELD@ REPLACE_SELECT = @REPLACE_SELECT@ REPLACE_SETENV = @REPLACE_SETENV@ +REPLACE_SETHOSTNAME = @REPLACE_SETHOSTNAME@ REPLACE_SETLOCALE = @REPLACE_SETLOCALE@ REPLACE_SETSTATE = @REPLACE_SETSTATE@ REPLACE_SLEEP = @REPLACE_SLEEP@ @@ -1391,6 +1435,7 @@ REPLACE_SPRINTF = @REPLACE_SPRINTF@ REPLACE_STAT = @REPLACE_STAT@ REPLACE_STDIO_READ_FUNCS = @REPLACE_STDIO_READ_FUNCS@ REPLACE_STDIO_WRITE_FUNCS = @REPLACE_STDIO_WRITE_FUNCS@ +REPLACE_STPCPY = @REPLACE_STPCPY@ REPLACE_STPNCPY = @REPLACE_STPNCPY@ REPLACE_STRCASESTR = @REPLACE_STRCASESTR@ REPLACE_STRCHRNUL = @REPLACE_STRCHRNUL@ @@ -1417,7 +1462,9 @@ REPLACE_STRUCT_LCONV = @REPLACE_STRUCT_LCONV@ REPLACE_STRUCT_TIMEVAL = @REPLACE_STRUCT_TIMEVAL@ REPLACE_SYMLINK = @REPLACE_SYMLINK@ REPLACE_SYMLINKAT = @REPLACE_SYMLINKAT@ +REPLACE_TIME = @REPLACE_TIME@ REPLACE_TIMEGM = @REPLACE_TIMEGM@ +REPLACE_TIMESPEC_GET = @REPLACE_TIMESPEC_GET@ REPLACE_TMPFILE = @REPLACE_TMPFILE@ REPLACE_TOWLOWER = @REPLACE_TOWLOWER@ REPLACE_TRUNCATE = @REPLACE_TRUNCATE@ @@ -1443,15 +1490,20 @@ REPLACE_WCSWIDTH = @REPLACE_WCSWIDTH@ REPLACE_WCTOB = @REPLACE_WCTOB@ REPLACE_WCTOMB = @REPLACE_WCTOMB@ REPLACE_WCWIDTH = @REPLACE_WCWIDTH@ +REPLACE_WMEMPCPY = @REPLACE_WMEMPCPY@ REPLACE_WRITE = @REPLACE_WRITE@ +REPLACE__EXIT = @REPLACE__EXIT@ +SCHED_YIELD_LIB = @SCHED_YIELD_LIB@ SED = @SED@ +SELECT_LIB = @SELECT_LIB@ +SETLOCALE_LIB = @SETLOCALE_LIB@ +SETLOCALE_NULL_LIB = @SETLOCALE_NULL_LIB@ SET_MAKE = @SET_MAKE@ SHELL = @SHELL@ SIG_ATOMIC_T_SUFFIX = @SIG_ATOMIC_T_SUFFIX@ SIZE_T_SUFFIX = @SIZE_T_SUFFIX@ -STDALIGN_H = @STDALIGN_H@ STDARG_H = @STDARG_H@ -STDBOOL_H = @STDBOOL_H@ +STDCKDINT_H = @STDCKDINT_H@ STDDEF_H = @STDDEF_H@ STDINT_H = @STDINT_H@ STRIP = @STRIP@ @@ -1495,6 +1547,8 @@ am__quote = @am__quote@ am__tar = @am__tar@ am__untar = @am__untar@ bindir = @bindir@ +bindir_c = @bindir_c@ +bindir_c_make = @bindir_c_make@ build = @build@ build_alias = @build_alias@ build_cpu = @build_cpu@ @@ -1502,10 +1556,20 @@ build_os = @build_os@ build_vendor = @build_vendor@ builddir = @builddir@ datadir = @datadir@ +datadir_c = @datadir_c@ +datadir_c_make = @datadir_c_make@ datarootdir = @datarootdir@ +datarootdir_c = @datarootdir_c@ +datarootdir_c_make = @datarootdir_c_make@ docdir = @docdir@ +docdir_c = @docdir_c@ +docdir_c_make = @docdir_c_make@ dvidir = @dvidir@ +dvidir_c = @dvidir_c@ +dvidir_c_make = @dvidir_c_make@ exec_prefix = @exec_prefix@ +exec_prefix_c = @exec_prefix_c@ +exec_prefix_c_make = @exec_prefix_c_make@ gl_LIBOBJDEPS = @gl_LIBOBJDEPS@ gl_LIBOBJS = @gl_LIBOBJS@ gl_LTLIBOBJS = @gl_LTLIBOBJS@ @@ -1519,26 +1583,68 @@ host_cpu = @host_cpu@ host_os = @host_os@ host_vendor = @host_vendor@ htmldir = @htmldir@ +htmldir_c = @htmldir_c@ +htmldir_c_make = @htmldir_c_make@ includedir = @includedir@ +includedir_c = @includedir_c@ +includedir_c_make = @includedir_c_make@ infodir = @infodir@ +infodir_c = @infodir_c@ +infodir_c_make = @infodir_c_make@ install_sh = @install_sh@ libdir = @libdir@ +libdir_c = @libdir_c@ +libdir_c_make = @libdir_c_make@ libexecdir = @libexecdir@ +libexecdir_c = @libexecdir_c@ +libexecdir_c_make = @libexecdir_c_make@ lispdir = @lispdir@ +lispdir_c = @lispdir_c@ +lispdir_c_make = @lispdir_c_make@ localedir = @localedir@ +localedir_c = @localedir_c@ +localedir_c_make = @localedir_c_make@ localstatedir = @localstatedir@ +localstatedir_c = @localstatedir_c@ +localstatedir_c_make = @localstatedir_c_make@ mandir = @mandir@ +mandir_c = @mandir_c@ +mandir_c_make = @mandir_c_make@ mkdir_p = @mkdir_p@ oldincludedir = @oldincludedir@ +oldincludedir_c = @oldincludedir_c@ +oldincludedir_c_make = @oldincludedir_c_make@ pdfdir = @pdfdir@ +pdfdir_c = @pdfdir_c@ +pdfdir_c_make = @pdfdir_c_make@ +pkgdatadir_c = @pkgdatadir_c@ +pkgdatadir_c_make = @pkgdatadir_c_make@ +pkgincludedir_c = @pkgincludedir_c@ +pkgincludedir_c_make = @pkgincludedir_c_make@ +pkglibdir_c = @pkglibdir_c@ +pkglibdir_c_make = @pkglibdir_c_make@ +pkglibexecdir_c = @pkglibexecdir_c@ +pkglibexecdir_c_make = @pkglibexecdir_c_make@ prefix = @prefix@ +prefix_c = @prefix_c@ +prefix_c_make = @prefix_c_make@ program_transform_name = @program_transform_name@ psdir = @psdir@ +psdir_c = @psdir_c@ +psdir_c_make = @psdir_c_make@ runstatedir = @runstatedir@ +runstatedir_c = @runstatedir_c@ +runstatedir_c_make = @runstatedir_c_make@ sbindir = @sbindir@ +sbindir_c = @sbindir_c@ +sbindir_c_make = @sbindir_c_make@ sharedstatedir = @sharedstatedir@ +sharedstatedir_c = @sharedstatedir_c@ +sharedstatedir_c_make = @sharedstatedir_c_make@ srcdir = @srcdir@ sysconfdir = @sysconfdir@ +sysconfdir_c = @sysconfdir_c@ +sysconfdir_c_make = @sysconfdir_c_make@ target_alias = @target_alias@ top_build_prefix = @top_build_prefix@ top_builddir = @top_builddir@ diff --git a/include/parted/Makefile.in b/include/parted/Makefile.in index 84928d0..16a4a7f 100644 --- a/include/parted/Makefile.in +++ b/include/parted/Makefile.in @@ -70,9 +70,6 @@ am__make_running_with_option = \ test $$has_opt = yes am__make_dryrun = (target_option=n; $(am__make_running_with_option)) am__make_keepgoing = (target_option=k; $(am__make_running_with_option)) -pkgdatadir = $(datadir)/@PACKAGE@ -pkgincludedir = $(includedir)/@PACKAGE@ -pkglibdir = $(libdir)/@PACKAGE@ am__cd = CDPATH="$${ZSH_VERSION+.}$(PATH_SEPARATOR)" && cd install_sh_DATA = $(install_sh) -c -m 644 install_sh_PROGRAM = $(install_sh) -c @@ -93,7 +90,9 @@ am__aclocal_m4_deps = $(top_srcdir)/m4/00gnulib.m4 \ $(top_srcdir)/m4/__inline.m4 \ $(top_srcdir)/m4/absolute-header.m4 $(top_srcdir)/m4/alloca.m4 \ $(top_srcdir)/m4/arpa_inet_h.m4 $(top_srcdir)/m4/assert.m4 \ - $(top_srcdir)/m4/btowc.m4 $(top_srcdir)/m4/builtin-expect.m4 \ + $(top_srcdir)/m4/assert_h.m4 $(top_srcdir)/m4/btowc.m4 \ + $(top_srcdir)/m4/build-to-host.m4 \ + $(top_srcdir)/m4/builtin-expect.m4 $(top_srcdir)/m4/c-bool.m4 \ $(top_srcdir)/m4/calloc.m4 $(top_srcdir)/m4/canonicalize.m4 \ $(top_srcdir)/m4/clock_time.m4 $(top_srcdir)/m4/close.m4 \ $(top_srcdir)/m4/codeset.m4 $(top_srcdir)/m4/config-h.m4 \ @@ -101,7 +100,7 @@ am__aclocal_m4_deps = $(top_srcdir)/m4/00gnulib.m4 \ $(top_srcdir)/m4/double-slash-root.m4 $(top_srcdir)/m4/dup2.m4 \ $(top_srcdir)/m4/eealloc.m4 $(top_srcdir)/m4/environ.m4 \ $(top_srcdir)/m4/errno_h.m4 $(top_srcdir)/m4/error.m4 \ - $(top_srcdir)/m4/extensions.m4 \ + $(top_srcdir)/m4/error_h.m4 $(top_srcdir)/m4/extensions.m4 \ $(top_srcdir)/m4/extern-inline.m4 $(top_srcdir)/m4/fcntl-o.m4 \ $(top_srcdir)/m4/fcntl.m4 $(top_srcdir)/m4/fcntl_h.m4 \ $(top_srcdir)/m4/fdopen.m4 $(top_srcdir)/m4/flexmember.m4 \ @@ -133,10 +132,11 @@ am__aclocal_m4_deps = $(top_srcdir)/m4/00gnulib.m4 \ $(top_srcdir)/m4/malloc.m4 $(top_srcdir)/m4/malloca.m4 \ $(top_srcdir)/m4/manywarnings.m4 $(top_srcdir)/m4/mbrtowc.m4 \ $(top_srcdir)/m4/mbsinit.m4 $(top_srcdir)/m4/mbstate_t.m4 \ - $(top_srcdir)/m4/mbtowc.m4 $(top_srcdir)/m4/mempcpy.m4 \ - $(top_srcdir)/m4/minmax.m4 $(top_srcdir)/m4/mkdir.m4 \ - $(top_srcdir)/m4/mkstemp.m4 $(top_srcdir)/m4/mmap-anon.m4 \ - $(top_srcdir)/m4/mode_t.m4 $(top_srcdir)/m4/msvc-inval.m4 \ + $(top_srcdir)/m4/mbtowc.m4 $(top_srcdir)/m4/memchr.m4 \ + $(top_srcdir)/m4/mempcpy.m4 $(top_srcdir)/m4/minmax.m4 \ + $(top_srcdir)/m4/mkdir.m4 $(top_srcdir)/m4/mkstemp.m4 \ + $(top_srcdir)/m4/mmap-anon.m4 $(top_srcdir)/m4/mode_t.m4 \ + $(top_srcdir)/m4/msvc-inval.m4 \ $(top_srcdir)/m4/msvc-nothrow.m4 $(top_srcdir)/m4/multiarch.m4 \ $(top_srcdir)/m4/musl.m4 $(top_srcdir)/m4/nanosleep.m4 \ $(top_srcdir)/m4/netinet_in_h.m4 \ @@ -167,29 +167,29 @@ am__aclocal_m4_deps = $(top_srcdir)/m4/00gnulib.m4 \ $(top_srcdir)/m4/socklen.m4 $(top_srcdir)/m4/sockpfaf.m4 \ $(top_srcdir)/m4/ssize_t.m4 $(top_srcdir)/m4/stat-time.m4 \ $(top_srcdir)/m4/stat.m4 $(top_srcdir)/m4/stdalign.m4 \ - $(top_srcdir)/m4/stdarg.m4 $(top_srcdir)/m4/stdbool.m4 \ - $(top_srcdir)/m4/stddef_h.m4 $(top_srcdir)/m4/stdint.m4 \ - $(top_srcdir)/m4/stdio_h.m4 $(top_srcdir)/m4/stdlib_h.m4 \ - $(top_srcdir)/m4/strdup.m4 $(top_srcdir)/m4/strerror.m4 \ - $(top_srcdir)/m4/strerror_r.m4 $(top_srcdir)/m4/string_h.m4 \ - $(top_srcdir)/m4/strtoll.m4 $(top_srcdir)/m4/strtoull.m4 \ - $(top_srcdir)/m4/symlink.m4 $(top_srcdir)/m4/sys_ioctl_h.m4 \ + $(top_srcdir)/m4/stdarg.m4 $(top_srcdir)/m4/stddef_h.m4 \ + $(top_srcdir)/m4/stdint.m4 $(top_srcdir)/m4/stdio_h.m4 \ + $(top_srcdir)/m4/stdlib_h.m4 $(top_srcdir)/m4/strdup.m4 \ + $(top_srcdir)/m4/strerror.m4 $(top_srcdir)/m4/strerror_r.m4 \ + $(top_srcdir)/m4/string_h.m4 $(top_srcdir)/m4/strtoll.m4 \ + $(top_srcdir)/m4/strtoull.m4 $(top_srcdir)/m4/symlink.m4 \ + $(top_srcdir)/m4/sys_ioctl_h.m4 \ $(top_srcdir)/m4/sys_random_h.m4 \ $(top_srcdir)/m4/sys_select_h.m4 \ $(top_srcdir)/m4/sys_socket_h.m4 \ $(top_srcdir)/m4/sys_stat_h.m4 $(top_srcdir)/m4/sys_time_h.m4 \ $(top_srcdir)/m4/sys_types_h.m4 $(top_srcdir)/m4/sys_uio_h.m4 \ $(top_srcdir)/m4/tempname.m4 $(top_srcdir)/m4/thread.m4 \ - $(top_srcdir)/m4/threadlib.m4 $(top_srcdir)/m4/time_h.m4 \ - $(top_srcdir)/m4/unistd_h.m4 $(top_srcdir)/m4/unlink.m4 \ - $(top_srcdir)/m4/unlinkdir.m4 $(top_srcdir)/m4/usleep.m4 \ - $(top_srcdir)/m4/version-etc.m4 $(top_srcdir)/m4/visibility.m4 \ - $(top_srcdir)/m4/warn-on-use.m4 $(top_srcdir)/m4/warnings.m4 \ - $(top_srcdir)/m4/wchar_h.m4 $(top_srcdir)/m4/wchar_t.m4 \ - $(top_srcdir)/m4/wcrtomb.m4 $(top_srcdir)/m4/wctob.m4 \ - $(top_srcdir)/m4/wctomb.m4 $(top_srcdir)/m4/wctype_h.m4 \ - $(top_srcdir)/m4/wint_t.m4 $(top_srcdir)/m4/xalloc.m4 \ - $(top_srcdir)/m4/xstrtol.m4 $(top_srcdir)/m4/year2038.m4 \ + $(top_srcdir)/m4/threadlib.m4 $(top_srcdir)/m4/time.m4 \ + $(top_srcdir)/m4/time_h.m4 $(top_srcdir)/m4/unistd_h.m4 \ + $(top_srcdir)/m4/unlink.m4 $(top_srcdir)/m4/unlinkdir.m4 \ + $(top_srcdir)/m4/usleep.m4 $(top_srcdir)/m4/version-etc.m4 \ + $(top_srcdir)/m4/visibility.m4 $(top_srcdir)/m4/warn-on-use.m4 \ + $(top_srcdir)/m4/warnings.m4 $(top_srcdir)/m4/wchar_h.m4 \ + $(top_srcdir)/m4/wchar_t.m4 $(top_srcdir)/m4/wcrtomb.m4 \ + $(top_srcdir)/m4/wctob.m4 $(top_srcdir)/m4/wctomb.m4 \ + $(top_srcdir)/m4/wctype_h.m4 $(top_srcdir)/m4/wint_t.m4 \ + $(top_srcdir)/m4/xalloc.m4 $(top_srcdir)/m4/xstrtol.m4 \ $(top_srcdir)/m4/yield.m4 $(top_srcdir)/m4/zzgnulib.m4 \ $(top_srcdir)/configure.ac am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \ @@ -268,6 +268,9 @@ am__define_uniq_tagged_files = \ done | $(am__uniquify_input)` am__DIST_COMMON = $(srcdir)/Makefile.in DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST) +pkgdatadir = @pkgdatadir@ +pkgincludedir = @pkgincludedir@ +pkglibdir = @pkglibdir@ pkglibexecdir = @pkglibexecdir@ ACLOCAL = @ACLOCAL@ ALLOCA = @ALLOCA@ @@ -277,6 +280,7 @@ AM_DEFAULT_VERBOSITY = @AM_DEFAULT_VERBOSITY@ APPLE_UNIVERSAL_BUILD = @APPLE_UNIVERSAL_BUILD@ AR = @AR@ ARFLAGS = @ARFLAGS@ +ASSERT_H = @ASSERT_H@ AUTOCONF = @AUTOCONF@ AUTOHEADER = @AUTOHEADER@ AUTOMAKE = @AUTOMAKE@ @@ -293,6 +297,7 @@ CFLAGS = @CFLAGS@ CFLAG_VISIBILITY = @CFLAG_VISIBILITY@ CHECK_CFLAGS = @CHECK_CFLAGS@ CHECK_LIBS = @CHECK_LIBS@ +CLOCK_TIME_LIB = @CLOCK_TIME_LIB@ CONFIG_INCLUDE = @CONFIG_INCLUDE@ CPP = @CPP@ CPPFLAGS = @CPPFLAGS@ @@ -317,12 +322,14 @@ ENOLINK_VALUE = @ENOLINK_VALUE@ EOVERFLOW_HIDDEN = @EOVERFLOW_HIDDEN@ EOVERFLOW_VALUE = @EOVERFLOW_VALUE@ ERRNO_H = @ERRNO_H@ +ERROR_H = @ERROR_H@ ETAGS = @ETAGS@ EXEEXT = @EXEEXT@ FGREP = @FGREP@ FILECMD = @FILECMD@ GETOPT_CDEFS_H = @GETOPT_CDEFS_H@ GETOPT_H = @GETOPT_H@ +GETRANDOM_LIB = @GETRANDOM_LIB@ GETTEXT_MACRO_VERSION = @GETTEXT_MACRO_VERSION@ GL_CFLAG_ALLOW_WARNINGS = @GL_CFLAG_ALLOW_WARNINGS@ GL_CFLAG_GNULIB_WARNINGS = @GL_CFLAG_GNULIB_WARNINGS@ @@ -338,6 +345,7 @@ GL_GNULIB_CALLOC_GNU = @GL_GNULIB_CALLOC_GNU@ GL_GNULIB_CALLOC_POSIX = @GL_GNULIB_CALLOC_POSIX@ GL_GNULIB_CANONICALIZE_FILE_NAME = @GL_GNULIB_CANONICALIZE_FILE_NAME@ GL_GNULIB_CHDIR = @GL_GNULIB_CHDIR@ +GL_GNULIB_CHMOD = @GL_GNULIB_CHMOD@ GL_GNULIB_CHOWN = @GL_GNULIB_CHOWN@ GL_GNULIB_CLOSE = @GL_GNULIB_CLOSE@ GL_GNULIB_CONNECT = @GL_GNULIB_CONNECT@ @@ -411,6 +419,7 @@ GL_GNULIB_GETPAGESIZE = @GL_GNULIB_GETPAGESIZE@ GL_GNULIB_GETPASS = @GL_GNULIB_GETPASS@ GL_GNULIB_GETPASS_GNU = @GL_GNULIB_GETPASS_GNU@ GL_GNULIB_GETPEERNAME = @GL_GNULIB_GETPEERNAME@ +GL_GNULIB_GETPROGNAME = @GL_GNULIB_GETPROGNAME@ GL_GNULIB_GETRANDOM = @GL_GNULIB_GETRANDOM@ GL_GNULIB_GETSOCKNAME = @GL_GNULIB_GETSOCKNAME@ GL_GNULIB_GETSOCKOPT = @GL_GNULIB_GETSOCKOPT@ @@ -508,6 +517,7 @@ GL_GNULIB_MEMCHR = @GL_GNULIB_MEMCHR@ GL_GNULIB_MEMMEM = @GL_GNULIB_MEMMEM@ GL_GNULIB_MEMPCPY = @GL_GNULIB_MEMPCPY@ GL_GNULIB_MEMRCHR = @GL_GNULIB_MEMRCHR@ +GL_GNULIB_MEMSET_EXPLICIT = @GL_GNULIB_MEMSET_EXPLICIT@ GL_GNULIB_MKDIR = @GL_GNULIB_MKDIR@ GL_GNULIB_MKDIRAT = @GL_GNULIB_MKDIRAT@ GL_GNULIB_MKDTEMP = @GL_GNULIB_MKDTEMP@ @@ -628,6 +638,7 @@ GL_GNULIB_STRVERSCMP = @GL_GNULIB_STRVERSCMP@ GL_GNULIB_SYMLINK = @GL_GNULIB_SYMLINK@ GL_GNULIB_SYMLINKAT = @GL_GNULIB_SYMLINKAT@ GL_GNULIB_SYSTEM_POSIX = @GL_GNULIB_SYSTEM_POSIX@ +GL_GNULIB_TIME = @GL_GNULIB_TIME@ GL_GNULIB_TIMEGM = @GL_GNULIB_TIMEGM@ GL_GNULIB_TIMESPEC_GET = @GL_GNULIB_TIMESPEC_GET@ GL_GNULIB_TIMESPEC_GETRES = @GL_GNULIB_TIMESPEC_GETRES@ @@ -702,6 +713,7 @@ GMSGFMT_015 = @GMSGFMT_015@ GNULIBHEADERS_OVERRIDE_WINT_T = @GNULIBHEADERS_OVERRIDE_WINT_T@ GNULIB_GETTIMEOFDAY = @GNULIB_GETTIMEOFDAY@ GREP = @GREP@ +HARD_LOCALE_LIB = @HARD_LOCALE_LIB@ HAVE_ACCEPT4 = @HAVE_ACCEPT4@ HAVE_ALIGNED_ALLOC = @HAVE_ALIGNED_ALLOC@ HAVE_ALLOCA_H = @HAVE_ALLOCA_H@ @@ -732,6 +744,7 @@ HAVE_DECL_GETLOGIN = @HAVE_DECL_GETLOGIN@ HAVE_DECL_GETLOGIN_R = @HAVE_DECL_GETLOGIN_R@ HAVE_DECL_GETPAGESIZE = @HAVE_DECL_GETPAGESIZE@ HAVE_DECL_GETUSERSHELL = @HAVE_DECL_GETUSERSHELL@ +HAVE_DECL_GETW = @HAVE_DECL_GETW@ HAVE_DECL_IMAXABS = @HAVE_DECL_IMAXABS@ HAVE_DECL_IMAXDIV = @HAVE_DECL_IMAXDIV@ HAVE_DECL_INET_NTOP = @HAVE_DECL_INET_NTOP@ @@ -741,6 +754,7 @@ HAVE_DECL_LOCALTIME_R = @HAVE_DECL_LOCALTIME_R@ HAVE_DECL_MEMMEM = @HAVE_DECL_MEMMEM@ HAVE_DECL_MEMRCHR = @HAVE_DECL_MEMRCHR@ HAVE_DECL_OBSTACK_PRINTF = @HAVE_DECL_OBSTACK_PRINTF@ +HAVE_DECL_PUTW = @HAVE_DECL_PUTW@ HAVE_DECL_SETENV = @HAVE_DECL_SETENV@ HAVE_DECL_SETHOSTNAME = @HAVE_DECL_SETHOSTNAME@ HAVE_DECL_SETSTATE = @HAVE_DECL_SETSTATE@ @@ -763,6 +777,9 @@ HAVE_DECL_WCWIDTH = @HAVE_DECL_WCWIDTH@ HAVE_DPRINTF = @HAVE_DPRINTF@ HAVE_DUP3 = @HAVE_DUP3@ HAVE_DUPLOCALE = @HAVE_DUPLOCALE@ +HAVE_ERROR = @HAVE_ERROR@ +HAVE_ERROR_AT_LINE = @HAVE_ERROR_AT_LINE@ +HAVE_ERROR_H = @HAVE_ERROR_H@ HAVE_EUIDACCESS = @HAVE_EUIDACCESS@ HAVE_EXECVPE = @HAVE_EXECVPE@ HAVE_EXPLICIT_BZERO = @HAVE_EXPLICIT_BZERO@ @@ -790,12 +807,15 @@ HAVE_GETLOGIN = @HAVE_GETLOGIN@ HAVE_GETOPT_H = @HAVE_GETOPT_H@ HAVE_GETPAGESIZE = @HAVE_GETPAGESIZE@ HAVE_GETPASS = @HAVE_GETPASS@ +HAVE_GETPROGNAME = @HAVE_GETPROGNAME@ HAVE_GETRANDOM = @HAVE_GETRANDOM@ HAVE_GETSUBOPT = @HAVE_GETSUBOPT@ HAVE_GETTIMEOFDAY = @HAVE_GETTIMEOFDAY@ HAVE_GETUMASK = @HAVE_GETUMASK@ HAVE_GRANTPT = @HAVE_GRANTPT@ HAVE_GROUP_MEMBER = @HAVE_GROUP_MEMBER@ +HAVE_IMAXABS = @HAVE_IMAXABS@ +HAVE_IMAXDIV = @HAVE_IMAXDIV@ HAVE_IMAXDIV_T = @HAVE_IMAXDIV_T@ HAVE_INITSTATE = @HAVE_INITSTATE@ HAVE_INTTYPES_H = @HAVE_INTTYPES_H@ @@ -822,6 +842,7 @@ HAVE_MBSNRTOWCS = @HAVE_MBSNRTOWCS@ HAVE_MBSRTOWCS = @HAVE_MBSRTOWCS@ HAVE_MBTOWC = @HAVE_MBTOWC@ HAVE_MEMPCPY = @HAVE_MEMPCPY@ +HAVE_MEMSET_EXPLICIT = @HAVE_MEMSET_EXPLICIT@ HAVE_MKDIRAT = @HAVE_MKDIRAT@ HAVE_MKDTEMP = @HAVE_MKDTEMP@ HAVE_MKFIFO = @HAVE_MKFIFO@ @@ -1030,7 +1051,6 @@ HAVE_WMEMPCPY = @HAVE_WMEMPCPY@ HAVE_WMEMSET = @HAVE_WMEMSET@ HAVE_WS2TCPIP_H = @HAVE_WS2TCPIP_H@ HAVE_XLOCALE_H = @HAVE_XLOCALE_H@ -HAVE__BOOL = @HAVE__BOOL@ HAVE__EXIT = @HAVE__EXIT@ IGNORE_UNUSED_LIBRARIES_CFLAGS = @IGNORE_UNUSED_LIBRARIES_CFLAGS@ INCLUDE_NEXT = @INCLUDE_NEXT@ @@ -1097,15 +1117,20 @@ LT_REVISION = @LT_REVISION@ LT_SYS_LIBRARY_PATH = @LT_SYS_LIBRARY_PATH@ MAKEINFO = @MAKEINFO@ MANIFEST_TOOL = @MANIFEST_TOOL@ +MBRTOWC_LIB = @MBRTOWC_LIB@ MKDIR_P = @MKDIR_P@ MSGFMT = @MSGFMT@ MSGFMT_015 = @MSGFMT_015@ MSGMERGE = @MSGMERGE@ +NANOSLEEP_LIB = @NANOSLEEP_LIB@ NETINET_IN_H = @NETINET_IN_H@ NEXT_ARPA_INET_H = @NEXT_ARPA_INET_H@ +NEXT_ASSERT_H = @NEXT_ASSERT_H@ NEXT_AS_FIRST_DIRECTIVE_ARPA_INET_H = @NEXT_AS_FIRST_DIRECTIVE_ARPA_INET_H@ +NEXT_AS_FIRST_DIRECTIVE_ASSERT_H = @NEXT_AS_FIRST_DIRECTIVE_ASSERT_H@ NEXT_AS_FIRST_DIRECTIVE_CTYPE_H = @NEXT_AS_FIRST_DIRECTIVE_CTYPE_H@ NEXT_AS_FIRST_DIRECTIVE_ERRNO_H = @NEXT_AS_FIRST_DIRECTIVE_ERRNO_H@ +NEXT_AS_FIRST_DIRECTIVE_ERROR_H = @NEXT_AS_FIRST_DIRECTIVE_ERROR_H@ NEXT_AS_FIRST_DIRECTIVE_FCNTL_H = @NEXT_AS_FIRST_DIRECTIVE_FCNTL_H@ NEXT_AS_FIRST_DIRECTIVE_GETOPT_H = @NEXT_AS_FIRST_DIRECTIVE_GETOPT_H@ NEXT_AS_FIRST_DIRECTIVE_INTTYPES_H = @NEXT_AS_FIRST_DIRECTIVE_INTTYPES_H@ @@ -1136,6 +1161,7 @@ NEXT_AS_FIRST_DIRECTIVE_WCHAR_H = @NEXT_AS_FIRST_DIRECTIVE_WCHAR_H@ NEXT_AS_FIRST_DIRECTIVE_WCTYPE_H = @NEXT_AS_FIRST_DIRECTIVE_WCTYPE_H@ NEXT_CTYPE_H = @NEXT_CTYPE_H@ NEXT_ERRNO_H = @NEXT_ERRNO_H@ +NEXT_ERROR_H = @NEXT_ERROR_H@ NEXT_FCNTL_H = @NEXT_FCNTL_H@ NEXT_GETOPT_H = @NEXT_GETOPT_H@ NEXT_INTTYPES_H = @NEXT_INTTYPES_H@ @@ -1191,6 +1217,7 @@ PRAGMA_COLUMNS = @PRAGMA_COLUMNS@ PRAGMA_SYSTEM_HEADER = @PRAGMA_SYSTEM_HEADER@ PRIPTR_PREFIX = @PRIPTR_PREFIX@ PTHREAD_H_DEFINES_STRUCT_TIMESPEC = @PTHREAD_H_DEFINES_STRUCT_TIMESPEC@ +PTHREAD_SIGMASK_LIB = @PTHREAD_SIGMASK_LIB@ PTRDIFF_T_SUFFIX = @PTRDIFF_T_SUFFIX@ RANLIB = @RANLIB@ REPLACE_ACCESS = @REPLACE_ACCESS@ @@ -1199,6 +1226,7 @@ REPLACE_BTOWC = @REPLACE_BTOWC@ REPLACE_CALLOC_FOR_CALLOC_GNU = @REPLACE_CALLOC_FOR_CALLOC_GNU@ REPLACE_CALLOC_FOR_CALLOC_POSIX = @REPLACE_CALLOC_FOR_CALLOC_POSIX@ REPLACE_CANONICALIZE_FILE_NAME = @REPLACE_CANONICALIZE_FILE_NAME@ +REPLACE_CHMOD = @REPLACE_CHMOD@ REPLACE_CHOWN = @REPLACE_CHOWN@ REPLACE_CLOSE = @REPLACE_CLOSE@ REPLACE_COPY_FILE_RANGE = @REPLACE_COPY_FILE_RANGE@ @@ -1207,7 +1235,10 @@ REPLACE_CTIME = @REPLACE_CTIME@ REPLACE_DPRINTF = @REPLACE_DPRINTF@ REPLACE_DUP = @REPLACE_DUP@ REPLACE_DUP2 = @REPLACE_DUP2@ +REPLACE_DUP3 = @REPLACE_DUP3@ REPLACE_DUPLOCALE = @REPLACE_DUPLOCALE@ +REPLACE_ERROR = @REPLACE_ERROR@ +REPLACE_ERROR_AT_LINE = @REPLACE_ERROR_AT_LINE@ REPLACE_EXECL = @REPLACE_EXECL@ REPLACE_EXECLE = @REPLACE_EXECLE@ REPLACE_EXECLP = @REPLACE_EXECLP@ @@ -1220,6 +1251,7 @@ REPLACE_FCHMODAT = @REPLACE_FCHMODAT@ REPLACE_FCHOWNAT = @REPLACE_FCHOWNAT@ REPLACE_FCLOSE = @REPLACE_FCLOSE@ REPLACE_FCNTL = @REPLACE_FCNTL@ +REPLACE_FDATASYNC = @REPLACE_FDATASYNC@ REPLACE_FDOPEN = @REPLACE_FDOPEN@ REPLACE_FFLUSH = @REPLACE_FFLUSH@ REPLACE_FFSLL = @REPLACE_FFSLL@ @@ -1242,15 +1274,21 @@ REPLACE_GETCWD = @REPLACE_GETCWD@ REPLACE_GETDELIM = @REPLACE_GETDELIM@ REPLACE_GETDOMAINNAME = @REPLACE_GETDOMAINNAME@ REPLACE_GETDTABLESIZE = @REPLACE_GETDTABLESIZE@ +REPLACE_GETENTROPY = @REPLACE_GETENTROPY@ REPLACE_GETGROUPS = @REPLACE_GETGROUPS@ REPLACE_GETLINE = @REPLACE_GETLINE@ +REPLACE_GETLOADAVG = @REPLACE_GETLOADAVG@ REPLACE_GETLOGIN_R = @REPLACE_GETLOGIN_R@ REPLACE_GETPAGESIZE = @REPLACE_GETPAGESIZE@ REPLACE_GETPASS = @REPLACE_GETPASS@ REPLACE_GETPASS_FOR_GETPASS_GNU = @REPLACE_GETPASS_FOR_GETPASS_GNU@ +REPLACE_GETPROGNAME = @REPLACE_GETPROGNAME@ REPLACE_GETRANDOM = @REPLACE_GETRANDOM@ +REPLACE_GETSUBOPT = @REPLACE_GETSUBOPT@ REPLACE_GETTIMEOFDAY = @REPLACE_GETTIMEOFDAY@ REPLACE_GMTIME = @REPLACE_GMTIME@ +REPLACE_IMAXABS = @REPLACE_IMAXABS@ +REPLACE_IMAXDIV = @REPLACE_IMAXDIV@ REPLACE_INET_NTOP = @REPLACE_INET_NTOP@ REPLACE_INET_PTON = @REPLACE_INET_PTON@ REPLACE_INITSTATE = @REPLACE_INITSTATE@ @@ -1279,11 +1317,14 @@ REPLACE_MBSTATE_T = @REPLACE_MBSTATE_T@ REPLACE_MBTOWC = @REPLACE_MBTOWC@ REPLACE_MEMCHR = @REPLACE_MEMCHR@ REPLACE_MEMMEM = @REPLACE_MEMMEM@ +REPLACE_MEMPCPY = @REPLACE_MEMPCPY@ REPLACE_MKDIR = @REPLACE_MKDIR@ REPLACE_MKFIFO = @REPLACE_MKFIFO@ REPLACE_MKFIFOAT = @REPLACE_MKFIFOAT@ REPLACE_MKNOD = @REPLACE_MKNOD@ REPLACE_MKNODAT = @REPLACE_MKNODAT@ +REPLACE_MKOSTEMP = @REPLACE_MKOSTEMP@ +REPLACE_MKOSTEMPS = @REPLACE_MKOSTEMPS@ REPLACE_MKSTEMP = @REPLACE_MKSTEMP@ REPLACE_MKTIME = @REPLACE_MKTIME@ REPLACE_NANOSLEEP = @REPLACE_NANOSLEEP@ @@ -1294,8 +1335,10 @@ REPLACE_OBSTACK_PRINTF = @REPLACE_OBSTACK_PRINTF@ REPLACE_OPEN = @REPLACE_OPEN@ REPLACE_OPENAT = @REPLACE_OPENAT@ REPLACE_PERROR = @REPLACE_PERROR@ +REPLACE_PIPE2 = @REPLACE_PIPE2@ REPLACE_POPEN = @REPLACE_POPEN@ REPLACE_POSIX_MEMALIGN = @REPLACE_POSIX_MEMALIGN@ +REPLACE_POSIX_OPENPT = @REPLACE_POSIX_OPENPT@ REPLACE_PREAD = @REPLACE_PREAD@ REPLACE_PRINTF = @REPLACE_PRINTF@ REPLACE_PSELECT = @REPLACE_PSELECT@ @@ -1373,6 +1416,7 @@ REPLACE_RMDIR = @REPLACE_RMDIR@ REPLACE_SCHED_YIELD = @REPLACE_SCHED_YIELD@ REPLACE_SELECT = @REPLACE_SELECT@ REPLACE_SETENV = @REPLACE_SETENV@ +REPLACE_SETHOSTNAME = @REPLACE_SETHOSTNAME@ REPLACE_SETLOCALE = @REPLACE_SETLOCALE@ REPLACE_SETSTATE = @REPLACE_SETSTATE@ REPLACE_SLEEP = @REPLACE_SLEEP@ @@ -1381,6 +1425,7 @@ REPLACE_SPRINTF = @REPLACE_SPRINTF@ REPLACE_STAT = @REPLACE_STAT@ REPLACE_STDIO_READ_FUNCS = @REPLACE_STDIO_READ_FUNCS@ REPLACE_STDIO_WRITE_FUNCS = @REPLACE_STDIO_WRITE_FUNCS@ +REPLACE_STPCPY = @REPLACE_STPCPY@ REPLACE_STPNCPY = @REPLACE_STPNCPY@ REPLACE_STRCASESTR = @REPLACE_STRCASESTR@ REPLACE_STRCHRNUL = @REPLACE_STRCHRNUL@ @@ -1407,7 +1452,9 @@ REPLACE_STRUCT_LCONV = @REPLACE_STRUCT_LCONV@ REPLACE_STRUCT_TIMEVAL = @REPLACE_STRUCT_TIMEVAL@ REPLACE_SYMLINK = @REPLACE_SYMLINK@ REPLACE_SYMLINKAT = @REPLACE_SYMLINKAT@ +REPLACE_TIME = @REPLACE_TIME@ REPLACE_TIMEGM = @REPLACE_TIMEGM@ +REPLACE_TIMESPEC_GET = @REPLACE_TIMESPEC_GET@ REPLACE_TMPFILE = @REPLACE_TMPFILE@ REPLACE_TOWLOWER = @REPLACE_TOWLOWER@ REPLACE_TRUNCATE = @REPLACE_TRUNCATE@ @@ -1433,15 +1480,20 @@ REPLACE_WCSWIDTH = @REPLACE_WCSWIDTH@ REPLACE_WCTOB = @REPLACE_WCTOB@ REPLACE_WCTOMB = @REPLACE_WCTOMB@ REPLACE_WCWIDTH = @REPLACE_WCWIDTH@ +REPLACE_WMEMPCPY = @REPLACE_WMEMPCPY@ REPLACE_WRITE = @REPLACE_WRITE@ +REPLACE__EXIT = @REPLACE__EXIT@ +SCHED_YIELD_LIB = @SCHED_YIELD_LIB@ SED = @SED@ +SELECT_LIB = @SELECT_LIB@ +SETLOCALE_LIB = @SETLOCALE_LIB@ +SETLOCALE_NULL_LIB = @SETLOCALE_NULL_LIB@ SET_MAKE = @SET_MAKE@ SHELL = @SHELL@ SIG_ATOMIC_T_SUFFIX = @SIG_ATOMIC_T_SUFFIX@ SIZE_T_SUFFIX = @SIZE_T_SUFFIX@ -STDALIGN_H = @STDALIGN_H@ STDARG_H = @STDARG_H@ -STDBOOL_H = @STDBOOL_H@ +STDCKDINT_H = @STDCKDINT_H@ STDDEF_H = @STDDEF_H@ STDINT_H = @STDINT_H@ STRIP = @STRIP@ @@ -1485,6 +1537,8 @@ am__quote = @am__quote@ am__tar = @am__tar@ am__untar = @am__untar@ bindir = @bindir@ +bindir_c = @bindir_c@ +bindir_c_make = @bindir_c_make@ build = @build@ build_alias = @build_alias@ build_cpu = @build_cpu@ @@ -1492,10 +1546,20 @@ build_os = @build_os@ build_vendor = @build_vendor@ builddir = @builddir@ datadir = @datadir@ +datadir_c = @datadir_c@ +datadir_c_make = @datadir_c_make@ datarootdir = @datarootdir@ +datarootdir_c = @datarootdir_c@ +datarootdir_c_make = @datarootdir_c_make@ docdir = @docdir@ +docdir_c = @docdir_c@ +docdir_c_make = @docdir_c_make@ dvidir = @dvidir@ +dvidir_c = @dvidir_c@ +dvidir_c_make = @dvidir_c_make@ exec_prefix = @exec_prefix@ +exec_prefix_c = @exec_prefix_c@ +exec_prefix_c_make = @exec_prefix_c_make@ gl_LIBOBJDEPS = @gl_LIBOBJDEPS@ gl_LIBOBJS = @gl_LIBOBJS@ gl_LTLIBOBJS = @gl_LTLIBOBJS@ @@ -1509,26 +1573,68 @@ host_cpu = @host_cpu@ host_os = @host_os@ host_vendor = @host_vendor@ htmldir = @htmldir@ +htmldir_c = @htmldir_c@ +htmldir_c_make = @htmldir_c_make@ includedir = @includedir@ +includedir_c = @includedir_c@ +includedir_c_make = @includedir_c_make@ infodir = @infodir@ +infodir_c = @infodir_c@ +infodir_c_make = @infodir_c_make@ install_sh = @install_sh@ libdir = @libdir@ +libdir_c = @libdir_c@ +libdir_c_make = @libdir_c_make@ libexecdir = @libexecdir@ +libexecdir_c = @libexecdir_c@ +libexecdir_c_make = @libexecdir_c_make@ lispdir = @lispdir@ +lispdir_c = @lispdir_c@ +lispdir_c_make = @lispdir_c_make@ localedir = @localedir@ +localedir_c = @localedir_c@ +localedir_c_make = @localedir_c_make@ localstatedir = @localstatedir@ +localstatedir_c = @localstatedir_c@ +localstatedir_c_make = @localstatedir_c_make@ mandir = @mandir@ +mandir_c = @mandir_c@ +mandir_c_make = @mandir_c_make@ mkdir_p = @mkdir_p@ oldincludedir = @oldincludedir@ +oldincludedir_c = @oldincludedir_c@ +oldincludedir_c_make = @oldincludedir_c_make@ pdfdir = @pdfdir@ +pdfdir_c = @pdfdir_c@ +pdfdir_c_make = @pdfdir_c_make@ +pkgdatadir_c = @pkgdatadir_c@ +pkgdatadir_c_make = @pkgdatadir_c_make@ +pkgincludedir_c = @pkgincludedir_c@ +pkgincludedir_c_make = @pkgincludedir_c_make@ +pkglibdir_c = @pkglibdir_c@ +pkglibdir_c_make = @pkglibdir_c_make@ +pkglibexecdir_c = @pkglibexecdir_c@ +pkglibexecdir_c_make = @pkglibexecdir_c_make@ prefix = @prefix@ +prefix_c = @prefix_c@ +prefix_c_make = @prefix_c_make@ program_transform_name = @program_transform_name@ psdir = @psdir@ +psdir_c = @psdir_c@ +psdir_c_make = @psdir_c_make@ runstatedir = @runstatedir@ +runstatedir_c = @runstatedir_c@ +runstatedir_c_make = @runstatedir_c_make@ sbindir = @sbindir@ +sbindir_c = @sbindir_c@ +sbindir_c_make = @sbindir_c_make@ sharedstatedir = @sharedstatedir@ +sharedstatedir_c = @sharedstatedir_c@ +sharedstatedir_c_make = @sharedstatedir_c_make@ srcdir = @srcdir@ sysconfdir = @sysconfdir@ +sysconfdir_c = @sysconfdir_c@ +sysconfdir_c_make = @sysconfdir_c_make@ target_alias = @target_alias@ top_build_prefix = @top_build_prefix@ top_builddir = @top_builddir@ diff --git a/include/parted/constraint.h b/include/parted/constraint.h index f2a9d78..cfb411c 100644 --- a/include/parted/constraint.h +++ b/include/parted/constraint.h @@ -1,6 +1,6 @@ /* libparted - a library for manipulating disk partitions - Copyright (C) 1998-2000, 2007, 2009-2014, 2019-2022 Free Software + Copyright (C) 1998-2000, 2007, 2009-2014, 2019-2023 Free Software Foundation, Inc. This program is free software; you can redistribute it and/or modify diff --git a/include/parted/constraint.in.h b/include/parted/constraint.in.h index fad3112..1fb0079 100644 --- a/include/parted/constraint.in.h +++ b/include/parted/constraint.in.h @@ -1,6 +1,6 @@ /* libparted - a library for manipulating disk partitions - Copyright (C) 1998-2000, 2007, 2009-2014, 2019-2022 Free Software + Copyright (C) 1998-2000, 2007, 2009-2014, 2019-2023 Free Software Foundation, Inc. This program is free software; you can redistribute it and/or modify diff --git a/include/parted/crc32.h b/include/parted/crc32.h index f7898b9..8c06b25 100644 --- a/include/parted/crc32.h +++ b/include/parted/crc32.h @@ -1,6 +1,6 @@ /* libparted - a library for manipulating disk partitions - Copyright (C) 1998-2000, 2007, 2009-2014, 2019-2022 Free Software + Copyright (C) 1998-2000, 2007, 2009-2014, 2019-2023 Free Software Foundation, Inc. crc32.h diff --git a/include/parted/crc32.in.h b/include/parted/crc32.in.h index 65f97aa..459db5d 100644 --- a/include/parted/crc32.in.h +++ b/include/parted/crc32.in.h @@ -1,6 +1,6 @@ /* libparted - a library for manipulating disk partitions - Copyright (C) 1998-2000, 2007, 2009-2014, 2019-2022 Free Software + Copyright (C) 1998-2000, 2007, 2009-2014, 2019-2023 Free Software Foundation, Inc. crc32.h diff --git a/include/parted/debug.h b/include/parted/debug.h index d5ec369..97cd000 100644 --- a/include/parted/debug.h +++ b/include/parted/debug.h @@ -1,6 +1,6 @@ /* libparted - a library for manipulating disk partitions - Copyright (C) 1998-2000, 2002, 2007, 2009-2014, 2019-2022 Free Software + Copyright (C) 1998-2000, 2002, 2007, 2009-2014, 2019-2023 Free Software Foundation, Inc. This program is free software; you can redistribute it and/or modify diff --git a/include/parted/debug.in.h b/include/parted/debug.in.h index d5ec369..97cd000 100644 --- a/include/parted/debug.in.h +++ b/include/parted/debug.in.h @@ -1,6 +1,6 @@ /* libparted - a library for manipulating disk partitions - Copyright (C) 1998-2000, 2002, 2007, 2009-2014, 2019-2022 Free Software + Copyright (C) 1998-2000, 2002, 2007, 2009-2014, 2019-2023 Free Software Foundation, Inc. This program is free software; you can redistribute it and/or modify diff --git a/include/parted/device.h b/include/parted/device.h index 360f3e4..49a4fd2 100644 --- a/include/parted/device.h +++ b/include/parted/device.h @@ -1,6 +1,6 @@ /* libparted - a library for manipulating disk partitions - Copyright (C) 1998-2001, 2005, 2007-2008, 2011-2014, 2019-2022 Free + Copyright (C) 1998-2001, 2005, 2007-2008, 2011-2014, 2019-2023 Free Software Foundation, Inc. This program is free software; you can redistribute it and/or modify diff --git a/include/parted/device.in.h b/include/parted/device.in.h index 41eda1b..bcee2dd 100644 --- a/include/parted/device.in.h +++ b/include/parted/device.in.h @@ -1,6 +1,6 @@ /* libparted - a library for manipulating disk partitions - Copyright (C) 1998-2001, 2005, 2007-2008, 2011-2014, 2019-2022 Free + Copyright (C) 1998-2001, 2005, 2007-2008, 2011-2014, 2019-2023 Free Software Foundation, Inc. This program is free software; you can redistribute it and/or modify diff --git a/include/parted/disk.h b/include/parted/disk.h index afcc5f6..0b1d4b9 100644 --- a/include/parted/disk.h +++ b/include/parted/disk.h @@ -1,6 +1,6 @@ /* libparted - a library for manipulating disk partitions - Copyright (C) 1999-2002, 2007-2014, 2019-2022 Free Software Foundation, + Copyright (C) 1999-2002, 2007-2014, 2019-2023 Free Software Foundation, Inc. This program is free software; you can redistribute it and/or modify @@ -32,6 +32,7 @@ */ #include <stdlib.h> #include <unistd.h> +#include <stdint.h> /** * Disk flags @@ -46,8 +47,9 @@ enum _PedDiskFlag { /* This flag controls whether the boot flag of a GPT PMBR is set */ PED_DISK_GPT_PMBR_BOOT=2, }; -#define PED_DISK_FIRST_FLAG PED_DISK_CYLINDER_ALIGNMENT -#define PED_DISK_LAST_FLAG PED_DISK_GPT_PMBR_BOOT +// NOTE: DO NOT define using enums +#define PED_DISK_FIRST_FLAG 1 // PED_DISK_CYLINDER_ALIGNMENT +#define PED_DISK_LAST_FLAG 2 // PED_DISK_GPT_PMBR_BOOT /** * Partition types @@ -86,16 +88,23 @@ enum _PedPartitionFlag { PED_PARTITION_CHROMEOS_KERNEL=19, PED_PARTITION_BLS_BOOT=20, PED_PARTITION_LINUX_HOME=21, + PED_PARTITION_NO_AUTOMOUNT=22, }; -#define PED_PARTITION_FIRST_FLAG PED_PARTITION_BOOT -#define PED_PARTITION_LAST_FLAG PED_PARTITION_LINUX_HOME +// NOTE: DO NOT define using enums +#define PED_PARTITION_FIRST_FLAG 1 // PED_PARTITION_BOOT +#define PED_PARTITION_LAST_FLAG 22 // PED_PARTITION_NO_AUTOMOUNT enum _PedDiskTypeFeature { - PED_DISK_TYPE_EXTENDED=1, /**< supports extended partitions */ - PED_DISK_TYPE_PARTITION_NAME=2 /**< supports partition names */ + PED_DISK_TYPE_EXTENDED=1, /**< supports extended partitions */ + PED_DISK_TYPE_PARTITION_NAME=2, /**< supports partition names */ + PED_DISK_TYPE_PARTITION_TYPE_ID=4, /**< supports partition type-ids */ + PED_DISK_TYPE_PARTITION_TYPE_UUID=8, /**< supports partition type-uuids */ + PED_DISK_TYPE_DISK_UUID=16, /**< supports disk uuids */ + PED_DISK_TYPE_PARTITION_UUID=32, /**< supports partition uuids */ }; -#define PED_DISK_TYPE_FIRST_FEATURE PED_DISK_TYPE_EXTENDED -#define PED_DISK_TYPE_LAST_FEATURE PED_DISK_TYPE_PARTITION_NAME +// NOTE: DO NOT define using enums +#define PED_DISK_TYPE_FIRST_FEATURE 1 // PED_DISK_TYPE_EXTENDED +#define PED_DISK_TYPE_LAST_FEATURE 32 // PED_DISK_TYPE_PARTITION_UUID struct _PedDisk; struct _PedPartition; @@ -222,6 +231,7 @@ struct _PedDiskOps { int (*disk_is_flag_available) ( const PedDisk *disk, PedDiskFlag flag); + uint8_t* (*disk_get_uuid) (const PedDisk* disk); /** \todo add label guessing op here */ /* partition operations */ @@ -247,6 +257,15 @@ struct _PedDiskOps { PedPartitionFlag flag); void (*partition_set_name) (PedPartition* part, const char* name); const char* (*partition_get_name) (const PedPartition* part); + + int (*partition_set_type_id) (PedPartition* part, uint8_t id); + uint8_t (*partition_get_type_id) (const PedPartition* part); + + int (*partition_set_type_uuid) (PedPartition* part, const uint8_t* uuid); + uint8_t* (*partition_get_type_uuid) (const PedPartition* part); + + uint8_t* (*partition_get_uuid) (const PedPartition* part); + int (*partition_align) (PedPartition* part, const PedConstraint* constraint); int (*partition_enumerate) (PedPartition* part); @@ -338,6 +357,8 @@ extern int ped_disk_set_flag(PedDisk *disk, PedDiskFlag flag, int state); extern int ped_disk_get_flag(const PedDisk *disk, PedDiskFlag flag); extern int ped_disk_is_flag_available(const PedDisk *disk, PedDiskFlag flag); +extern uint8_t* ped_disk_get_uuid (const PedDisk* disk); + extern const char *ped_disk_flag_get_name(PedDiskFlag flag); extern PedDiskFlag ped_disk_flag_get_by_name(const char *name); extern PedDiskFlag ped_disk_flag_next(PedDiskFlag flag) @@ -375,6 +396,15 @@ extern int ped_partition_set_system (PedPartition* part, const PedFileSystemType* fs_type); extern int ped_partition_set_name (PedPartition* part, const char* name); extern const char* ped_partition_get_name (const PedPartition* part); + +extern int ped_partition_set_type_id (PedPartition* part, uint8_t id); +extern uint8_t ped_partition_get_type_id (const PedPartition* part); + +extern int ped_partition_set_type_uuid (PedPartition* part, const uint8_t* uuid); +extern uint8_t* ped_partition_get_type_uuid (const PedPartition* part); + +extern uint8_t* ped_partition_get_uuid (const PedPartition* part); + extern int ped_partition_is_busy (const PedPartition* part); extern char* ped_partition_get_path (const PedPartition* part); diff --git a/include/parted/disk.in.h b/include/parted/disk.in.h index 38e869d..8f6a5c3 100644 --- a/include/parted/disk.in.h +++ b/include/parted/disk.in.h @@ -1,6 +1,6 @@ /* libparted - a library for manipulating disk partitions - Copyright (C) 1999-2002, 2007-2014, 2019-2022 Free Software Foundation, + Copyright (C) 1999-2002, 2007-2014, 2019-2023 Free Software Foundation, Inc. This program is free software; you can redistribute it and/or modify @@ -32,6 +32,7 @@ */ #include <stdlib.h> #include <unistd.h> +#include <stdint.h> /** * Disk flags @@ -46,8 +47,9 @@ enum _PedDiskFlag { /* This flag controls whether the boot flag of a GPT PMBR is set */ PED_DISK_GPT_PMBR_BOOT=2, }; -#define PED_DISK_FIRST_FLAG PED_DISK_CYLINDER_ALIGNMENT -#define PED_DISK_LAST_FLAG PED_DISK_GPT_PMBR_BOOT +// NOTE: DO NOT define using enums +#define PED_DISK_FIRST_FLAG 1 // PED_DISK_CYLINDER_ALIGNMENT +#define PED_DISK_LAST_FLAG 2 // PED_DISK_GPT_PMBR_BOOT /** * Partition types @@ -86,16 +88,23 @@ enum _PedPartitionFlag { PED_PARTITION_CHROMEOS_KERNEL=19, PED_PARTITION_BLS_BOOT=20, PED_PARTITION_LINUX_HOME=21, + PED_PARTITION_NO_AUTOMOUNT=22, }; -#define PED_PARTITION_FIRST_FLAG PED_PARTITION_BOOT -#define PED_PARTITION_LAST_FLAG PED_PARTITION_LINUX_HOME +// NOTE: DO NOT define using enums +#define PED_PARTITION_FIRST_FLAG 1 // PED_PARTITION_BOOT +#define PED_PARTITION_LAST_FLAG 22 // PED_PARTITION_NO_AUTOMOUNT enum _PedDiskTypeFeature { - PED_DISK_TYPE_EXTENDED=1, /**< supports extended partitions */ - PED_DISK_TYPE_PARTITION_NAME=2 /**< supports partition names */ + PED_DISK_TYPE_EXTENDED=1, /**< supports extended partitions */ + PED_DISK_TYPE_PARTITION_NAME=2, /**< supports partition names */ + PED_DISK_TYPE_PARTITION_TYPE_ID=4, /**< supports partition type-ids */ + PED_DISK_TYPE_PARTITION_TYPE_UUID=8, /**< supports partition type-uuids */ + PED_DISK_TYPE_DISK_UUID=16, /**< supports disk uuids */ + PED_DISK_TYPE_PARTITION_UUID=32, /**< supports partition uuids */ }; -#define PED_DISK_TYPE_FIRST_FEATURE PED_DISK_TYPE_EXTENDED -#define PED_DISK_TYPE_LAST_FEATURE PED_DISK_TYPE_PARTITION_NAME +// NOTE: DO NOT define using enums +#define PED_DISK_TYPE_FIRST_FEATURE 1 // PED_DISK_TYPE_EXTENDED +#define PED_DISK_TYPE_LAST_FEATURE 32 // PED_DISK_TYPE_PARTITION_UUID struct _PedDisk; struct _PedPartition; @@ -222,6 +231,7 @@ struct _PedDiskOps { int (*disk_is_flag_available) ( const PedDisk *disk, PedDiskFlag flag); + uint8_t* (*disk_get_uuid) (const PedDisk* disk); /** \todo add label guessing op here */ /* partition operations */ @@ -247,6 +257,15 @@ struct _PedDiskOps { PedPartitionFlag flag); void (*partition_set_name) (PedPartition* part, const char* name); const char* (*partition_get_name) (const PedPartition* part); + + int (*partition_set_type_id) (PedPartition* part, uint8_t id); + uint8_t (*partition_get_type_id) (const PedPartition* part); + + int (*partition_set_type_uuid) (PedPartition* part, const uint8_t* uuid); + uint8_t* (*partition_get_type_uuid) (const PedPartition* part); + + uint8_t* (*partition_get_uuid) (const PedPartition* part); + int (*partition_align) (PedPartition* part, const PedConstraint* constraint); int (*partition_enumerate) (PedPartition* part); @@ -318,6 +337,8 @@ extern int ped_disk_set_flag(PedDisk *disk, PedDiskFlag flag, int state); extern int ped_disk_get_flag(const PedDisk *disk, PedDiskFlag flag); extern int ped_disk_is_flag_available(const PedDisk *disk, PedDiskFlag flag); +extern uint8_t* ped_disk_get_uuid (const PedDisk* disk); + extern const char *ped_disk_flag_get_name(PedDiskFlag flag); extern PedDiskFlag ped_disk_flag_get_by_name(const char *name); extern PedDiskFlag ped_disk_flag_next(PedDiskFlag flag) _GL_ATTRIBUTE_CONST; @@ -347,6 +368,15 @@ extern int ped_partition_set_system (PedPartition* part, const PedFileSystemType* fs_type); extern int ped_partition_set_name (PedPartition* part, const char* name); extern const char* ped_partition_get_name (const PedPartition* part); + +extern int ped_partition_set_type_id (PedPartition* part, uint8_t id); +extern uint8_t ped_partition_get_type_id (const PedPartition* part); + +extern int ped_partition_set_type_uuid (PedPartition* part, const uint8_t* uuid); +extern uint8_t* ped_partition_get_type_uuid (const PedPartition* part); + +extern uint8_t* ped_partition_get_uuid (const PedPartition* part); + extern int ped_partition_is_busy (const PedPartition* part); extern char* ped_partition_get_path (const PedPartition* part); diff --git a/include/parted/endian.h b/include/parted/endian.h index 097d6bc..f9f473c 100644 --- a/include/parted/endian.h +++ b/include/parted/endian.h @@ -1,6 +1,6 @@ /* libparted - a library for manipulating disk partitions - Copyright (C) 1998-2002, 2007, 2009-2014, 2019-2022 Free Software + Copyright (C) 1998-2002, 2007, 2009-2014, 2019-2023 Free Software Foundation, Inc. This program is free software; you can redistribute it and/or modify diff --git a/include/parted/endian.in.h b/include/parted/endian.in.h index 097d6bc..f9f473c 100644 --- a/include/parted/endian.in.h +++ b/include/parted/endian.in.h @@ -1,6 +1,6 @@ /* libparted - a library for manipulating disk partitions - Copyright (C) 1998-2002, 2007, 2009-2014, 2019-2022 Free Software + Copyright (C) 1998-2002, 2007, 2009-2014, 2019-2023 Free Software Foundation, Inc. This program is free software; you can redistribute it and/or modify diff --git a/include/parted/exception.h b/include/parted/exception.h index e13ffc7..527cc73 100644 --- a/include/parted/exception.h +++ b/include/parted/exception.h @@ -1,6 +1,6 @@ /* libparted - a library for manipulating disk partitions - Copyright (C) 1999-2000, 2007, 2009-2014, 2019-2022 Free Software + Copyright (C) 1999-2000, 2007, 2009-2014, 2019-2023 Free Software Foundation, Inc. This program is free software; you can redistribute it and/or modify diff --git a/include/parted/exception.in.h b/include/parted/exception.in.h index 6b6f3c6..97b8c5b 100644 --- a/include/parted/exception.in.h +++ b/include/parted/exception.in.h @@ -1,6 +1,6 @@ /* libparted - a library for manipulating disk partitions - Copyright (C) 1999-2000, 2007, 2009-2014, 2019-2022 Free Software + Copyright (C) 1999-2000, 2007, 2009-2014, 2019-2023 Free Software Foundation, Inc. This program is free software; you can redistribute it and/or modify diff --git a/include/parted/fdasd.h b/include/parted/fdasd.h index 9e5d7d1..e3ba183 100644 --- a/include/parted/fdasd.h +++ b/include/parted/fdasd.h @@ -28,10 +28,8 @@ #define PARTITION_LINUX_SWAP 0x82 #define PARTITION_LINUX 0x83 -#define PARTITION_LINUX_EXT 0x85 #define PARTITION_LINUX_LVM 0x8e #define PARTITION_LINUX_RAID 0xfd -#define PARTITION_LINUX_LVM_OLD 0xfe #define PART_TYPE_NATIVE "NATIVE" #define PART_TYPE_SWAP "SWAP " diff --git a/include/parted/fdasd.in.h b/include/parted/fdasd.in.h index 9e5d7d1..e3ba183 100644 --- a/include/parted/fdasd.in.h +++ b/include/parted/fdasd.in.h @@ -28,10 +28,8 @@ #define PARTITION_LINUX_SWAP 0x82 #define PARTITION_LINUX 0x83 -#define PARTITION_LINUX_EXT 0x85 #define PARTITION_LINUX_LVM 0x8e #define PARTITION_LINUX_RAID 0xfd -#define PARTITION_LINUX_LVM_OLD 0xfe #define PART_TYPE_NATIVE "NATIVE" #define PART_TYPE_SWAP "SWAP " diff --git a/include/parted/filesys.h b/include/parted/filesys.h index 5d20216..9fe6b6c 100644 --- a/include/parted/filesys.h +++ b/include/parted/filesys.h @@ -1,6 +1,6 @@ /* libparted - a library for manipulating disk partitions - Copyright (C) 1999-2001, 2006-2007, 2009-2014, 2019-2022 Free Software + Copyright (C) 1999-2001, 2006-2007, 2009-2014, 2019-2023 Free Software Foundation, Inc. This program is free software; you can redistribute it and/or modify diff --git a/include/parted/filesys.in.h b/include/parted/filesys.in.h index b69d035..93079b0 100644 --- a/include/parted/filesys.in.h +++ b/include/parted/filesys.in.h @@ -1,6 +1,6 @@ /* libparted - a library for manipulating disk partitions - Copyright (C) 1999-2001, 2006-2007, 2009-2014, 2019-2022 Free Software + Copyright (C) 1999-2001, 2006-2007, 2009-2014, 2019-2023 Free Software Foundation, Inc. This program is free software; you can redistribute it and/or modify diff --git a/include/parted/geom.h b/include/parted/geom.h index 0fd4c79..387b779 100644 --- a/include/parted/geom.h +++ b/include/parted/geom.h @@ -1,6 +1,6 @@ /* libparted - a library for manipulating disk partitions - Copyright (C) 1998-2001, 2005, 2007, 2009-2014, 2019-2022 Free Software + Copyright (C) 1998-2001, 2005, 2007, 2009-2014, 2019-2023 Free Software Foundation, Inc. This program is free software; you can redistribute it and/or modify diff --git a/include/parted/geom.in.h b/include/parted/geom.in.h index be28aad..54c731c 100644 --- a/include/parted/geom.in.h +++ b/include/parted/geom.in.h @@ -1,6 +1,6 @@ /* libparted - a library for manipulating disk partitions - Copyright (C) 1998-2001, 2005, 2007, 2009-2014, 2019-2022 Free Software + Copyright (C) 1998-2001, 2005, 2007, 2009-2014, 2019-2023 Free Software Foundation, Inc. This program is free software; you can redistribute it and/or modify diff --git a/include/parted/natmath.h b/include/parted/natmath.h index 9c58dc3..e88c821 100644 --- a/include/parted/natmath.h +++ b/include/parted/natmath.h @@ -1,6 +1,6 @@ /* libparted - a library for manipulating disk partitions - Copyright (C) 2000, 2007-2014, 2019-2022 Free Software Foundation, Inc. + Copyright (C) 2000, 2007-2014, 2019-2023 Free Software Foundation, Inc. This program is free software; you can redistribute it and/or modify it under the terms of the GNU General Public License as published by diff --git a/include/parted/natmath.in.h b/include/parted/natmath.in.h index 0ede6de..e4c04e4 100644 --- a/include/parted/natmath.in.h +++ b/include/parted/natmath.in.h @@ -1,6 +1,6 @@ /* libparted - a library for manipulating disk partitions - Copyright (C) 2000, 2007-2014, 2019-2022 Free Software Foundation, Inc. + Copyright (C) 2000, 2007-2014, 2019-2023 Free Software Foundation, Inc. This program is free software; you can redistribute it and/or modify it under the terms of the GNU General Public License as published by diff --git a/include/parted/parted.h b/include/parted/parted.h index 53a2ae0..e53655c 100644 --- a/include/parted/parted.h +++ b/include/parted/parted.h @@ -1,6 +1,6 @@ /* libparted - a library for manipulating disk partitions - Copyright (C) 1999-2001, 2007, 2009-2014, 2019-2022 Free Software + Copyright (C) 1999-2001, 2007, 2009-2014, 2019-2023 Free Software Foundation, Inc. This program is free software; you can redistribute it and/or modify diff --git a/include/parted/parted.in.h b/include/parted/parted.in.h index 117be62..9546127 100644 --- a/include/parted/parted.in.h +++ b/include/parted/parted.in.h @@ -1,6 +1,6 @@ /* libparted - a library for manipulating disk partitions - Copyright (C) 1999-2001, 2007, 2009-2014, 2019-2022 Free Software + Copyright (C) 1999-2001, 2007, 2009-2014, 2019-2023 Free Software Foundation, Inc. This program is free software; you can redistribute it and/or modify diff --git a/include/parted/timer.h b/include/parted/timer.h index 8691181..f3aef74 100644 --- a/include/parted/timer.h +++ b/include/parted/timer.h @@ -1,6 +1,6 @@ /* libparted - a library for manipulating disk partitions - Copyright (C) 2001-2002, 2007, 2009-2014, 2019-2022 Free Software + Copyright (C) 2001-2002, 2007, 2009-2014, 2019-2023 Free Software Foundation, Inc. This program is free software; you can redistribute it and/or modify diff --git a/include/parted/timer.in.h b/include/parted/timer.in.h index 8691181..f3aef74 100644 --- a/include/parted/timer.in.h +++ b/include/parted/timer.in.h @@ -1,6 +1,6 @@ /* libparted - a library for manipulating disk partitions - Copyright (C) 2001-2002, 2007, 2009-2014, 2019-2022 Free Software + Copyright (C) 2001-2002, 2007, 2009-2014, 2019-2023 Free Software Foundation, Inc. This program is free software; you can redistribute it and/or modify diff --git a/include/parted/unit.h b/include/parted/unit.h index b55bc4e..bb8459b 100644 --- a/include/parted/unit.h +++ b/include/parted/unit.h @@ -1,6 +1,6 @@ /* libparted - a library for manipulating disk partitions - Copyright (C) 2005, 2007, 2009-2014, 2019-2022 Free Software Foundation, + Copyright (C) 2005, 2007, 2009-2014, 2019-2023 Free Software Foundation, Inc. This program is free software; you can redistribute it and/or modify diff --git a/include/parted/unit.in.h b/include/parted/unit.in.h index f7a2373..82f4c5c 100644 --- a/include/parted/unit.in.h +++ b/include/parted/unit.in.h @@ -1,6 +1,6 @@ /* libparted - a library for manipulating disk partitions - Copyright (C) 2005, 2007, 2009-2014, 2019-2022 Free Software Foundation, + Copyright (C) 2005, 2007, 2009-2014, 2019-2023 Free Software Foundation, Inc. This program is free software; you can redistribute it and/or modify diff --git a/lib/Makefile.in b/lib/Makefile.in index 5ef60b6..edfa863 100644 --- a/lib/Makefile.in +++ b/lib/Makefile.in @@ -14,7 +14,7 @@ @SET_MAKE@ -# Copyright (C) 2002-2022 Free Software Foundation, Inc. +# Copyright (C) 2002-2023 Free Software Foundation, Inc. # # This file is free software; you can redistribute it and/or modify # it under the terms of the GNU General Public License as published by @@ -152,9 +152,6 @@ am__make_running_with_option = \ test $$has_opt = yes am__make_dryrun = (target_option=n; $(am__make_running_with_option)) am__make_keepgoing = (target_option=k; $(am__make_running_with_option)) -pkgdatadir = $(datadir)/@PACKAGE@ -pkgincludedir = $(includedir)/@PACKAGE@ -pkglibdir = $(libdir)/@PACKAGE@ am__cd = CDPATH="$${ZSH_VERSION+.}$(PATH_SEPARATOR)" && cd install_sh_DATA = $(install_sh) -c -m 644 install_sh_PROGRAM = $(install_sh) -c @@ -181,51 +178,54 @@ host_triplet = @host@ @GL_COND_OBJ_FSYNC_TRUE@am__append_10 = fsync.c @GL_COND_OBJ_GETDTABLESIZE_TRUE@am__append_11 = getdtablesize.c @GL_COND_OBJ_GETOPT_TRUE@am__append_12 = getopt.c getopt1.c -@GL_COND_OBJ_GETRANDOM_TRUE@am__append_13 = getrandom.c -@GL_COND_OBJ_LOCALECONV_TRUE@am__append_14 = localeconv.c -@GL_COND_OBJ_LSEEK_TRUE@am__append_15 = lseek.c -@GL_COND_OBJ_LSTAT_TRUE@am__append_16 = lstat.c -@GL_COND_OBJ_MBRTOWC_TRUE@am__append_17 = mbrtowc.c -@GL_COND_OBJ_MBSINIT_TRUE@am__append_18 = mbsinit.c -@GL_COND_OBJ_MBTOWC_TRUE@am__append_19 = mbtowc.c -@GL_COND_OBJ_MEMPCPY_TRUE@am__append_20 = mempcpy.c -@GL_COND_OBJ_MKDIR_TRUE@am__append_21 = mkdir.c -@GL_COND_OBJ_MKSTEMP_TRUE@am__append_22 = mkstemp.c -@GL_COND_OBJ_MSVC_INVAL_TRUE@am__append_23 = msvc-inval.c -@GL_COND_OBJ_MSVC_NOTHROW_TRUE@am__append_24 = msvc-nothrow.c -@GL_COND_OBJ_NL_LANGINFO_TRUE@am__append_25 = nl_langinfo.c -@GL_COND_OBJ_NL_LANGINFO_LOCK_TRUE@am__append_26 = nl_langinfo-lock.c -@GL_COND_OBJ_OPEN_TRUE@am__append_27 = open.c -@GL_COND_OBJ_RAWMEMCHR_TRUE@am__append_28 = rawmemchr.c -@GL_COND_OBJ_READ_TRUE@am__append_29 = read.c -@GL_COND_OBJ_READLINK_TRUE@am__append_30 = readlink.c -@GL_COND_OBJ_REALLOCARRAY_TRUE@am__append_31 = reallocarray.c -@GL_COND_OBJ_REGEX_TRUE@am__append_32 = regex.c -@GL_COND_OBJ_RPMATCH_TRUE@am__append_33 = rpmatch.c -@GL_COND_OBJ_SETLOCALE_LOCK_TRUE@am__append_34 = setlocale-lock.c -@GL_COND_OBJ_SLEEP_TRUE@am__append_35 = sleep.c -@GL_COND_OBJ_STAT_TRUE@am__append_36 = stat.c -@GL_COND_OBJ_STDIO_READ_TRUE@am__append_37 = stdio-read.c -@GL_COND_OBJ_STDIO_WRITE_TRUE@am__append_38 = stdio-write.c -@GL_COND_OBJ_STRDUP_TRUE@am__append_39 = strdup.c -@GL_COND_OBJ_STRERROR_TRUE@am__append_40 = strerror.c -@GL_COND_OBJ_STRERROR_OVERRIDE_TRUE@am__append_41 = strerror-override.c -@GL_COND_OBJ_STRTOLL_TRUE@am__append_42 = strtoll.c -@GL_COND_OBJ_STRTOULL_TRUE@am__append_43 = strtoull.c -@GL_COND_OBJ_UNLINK_TRUE@am__append_44 = unlink.c -@GL_COND_OBJ_USLEEP_TRUE@am__append_45 = usleep.c -@GL_COND_OBJ_WCRTOMB_TRUE@am__append_46 = wcrtomb.c -@GL_COND_OBJ_WINDOWS_MUTEX_TRUE@am__append_47 = windows-mutex.c -@GL_COND_OBJ_WINDOWS_ONCE_TRUE@am__append_48 = windows-once.c -@GL_COND_OBJ_WINDOWS_RECMUTEX_TRUE@am__append_49 = windows-recmutex.c -@GL_COND_OBJ_WINDOWS_RWLOCK_TRUE@am__append_50 = windows-rwlock.c +@GL_COND_OBJ_GETPROGNAME_TRUE@am__append_13 = getprogname.c +@GL_COND_OBJ_GETRANDOM_TRUE@am__append_14 = getrandom.c +@GL_COND_OBJ_LOCALECONV_TRUE@am__append_15 = localeconv.c +@GL_COND_OBJ_LSEEK_TRUE@am__append_16 = lseek.c +@GL_COND_OBJ_LSTAT_TRUE@am__append_17 = lstat.c +@GL_COND_OBJ_MBRTOWC_TRUE@am__append_18 = mbrtowc.c +@GL_COND_OBJ_MBSINIT_TRUE@am__append_19 = mbsinit.c +@GL_COND_OBJ_MBTOWC_TRUE@am__append_20 = mbtowc.c +@GL_COND_OBJ_MEMPCPY_TRUE@am__append_21 = mempcpy.c +@GL_COND_OBJ_MKDIR_TRUE@am__append_22 = mkdir.c +@GL_COND_OBJ_MKSTEMP_TRUE@am__append_23 = mkstemp.c +@GL_COND_OBJ_MSVC_INVAL_TRUE@am__append_24 = msvc-inval.c +@GL_COND_OBJ_MSVC_NOTHROW_TRUE@am__append_25 = msvc-nothrow.c +@GL_COND_OBJ_NL_LANGINFO_TRUE@am__append_26 = nl_langinfo.c +@GL_COND_OBJ_NL_LANGINFO_LOCK_TRUE@am__append_27 = nl_langinfo-lock.c +@GL_COND_OBJ_OPEN_TRUE@am__append_28 = open.c +@GL_COND_OBJ_RAWMEMCHR_TRUE@am__append_29 = rawmemchr.c +@GL_COND_OBJ_READ_TRUE@am__append_30 = read.c +@GL_COND_OBJ_READLINK_TRUE@am__append_31 = readlink.c +@GL_COND_OBJ_REALLOCARRAY_TRUE@am__append_32 = reallocarray.c +@GL_COND_OBJ_REGEX_TRUE@am__append_33 = regex.c +@GL_COND_OBJ_RPMATCH_TRUE@am__append_34 = rpmatch.c +@GL_COND_OBJ_SETLOCALE_LOCK_TRUE@am__append_35 = setlocale-lock.c +@GL_COND_OBJ_SLEEP_TRUE@am__append_36 = sleep.c +@GL_COND_OBJ_STAT_TRUE@am__append_37 = stat.c +@GL_COND_OBJ_STDIO_READ_TRUE@am__append_38 = stdio-read.c +@GL_COND_OBJ_STDIO_WRITE_TRUE@am__append_39 = stdio-write.c +@GL_COND_OBJ_STRDUP_TRUE@am__append_40 = strdup.c +@GL_COND_OBJ_STRERROR_TRUE@am__append_41 = strerror.c +@GL_COND_OBJ_STRERROR_OVERRIDE_TRUE@am__append_42 = strerror-override.c +@GL_COND_OBJ_STRTOLL_TRUE@am__append_43 = strtoll.c +@GL_COND_OBJ_STRTOULL_TRUE@am__append_44 = strtoull.c +@GL_COND_OBJ_UNLINK_TRUE@am__append_45 = unlink.c +@GL_COND_OBJ_USLEEP_TRUE@am__append_46 = usleep.c +@GL_COND_OBJ_WCRTOMB_TRUE@am__append_47 = wcrtomb.c +@GL_COND_OBJ_WINDOWS_MUTEX_TRUE@am__append_48 = windows-mutex.c +@GL_COND_OBJ_WINDOWS_ONCE_TRUE@am__append_49 = windows-once.c +@GL_COND_OBJ_WINDOWS_RECMUTEX_TRUE@am__append_50 = windows-recmutex.c +@GL_COND_OBJ_WINDOWS_RWLOCK_TRUE@am__append_51 = windows-rwlock.c subdir = lib ACLOCAL_M4 = $(top_srcdir)/aclocal.m4 am__aclocal_m4_deps = $(top_srcdir)/m4/00gnulib.m4 \ $(top_srcdir)/m4/__inline.m4 \ $(top_srcdir)/m4/absolute-header.m4 $(top_srcdir)/m4/alloca.m4 \ $(top_srcdir)/m4/arpa_inet_h.m4 $(top_srcdir)/m4/assert.m4 \ - $(top_srcdir)/m4/btowc.m4 $(top_srcdir)/m4/builtin-expect.m4 \ + $(top_srcdir)/m4/assert_h.m4 $(top_srcdir)/m4/btowc.m4 \ + $(top_srcdir)/m4/build-to-host.m4 \ + $(top_srcdir)/m4/builtin-expect.m4 $(top_srcdir)/m4/c-bool.m4 \ $(top_srcdir)/m4/calloc.m4 $(top_srcdir)/m4/canonicalize.m4 \ $(top_srcdir)/m4/clock_time.m4 $(top_srcdir)/m4/close.m4 \ $(top_srcdir)/m4/codeset.m4 $(top_srcdir)/m4/config-h.m4 \ @@ -233,7 +233,7 @@ am__aclocal_m4_deps = $(top_srcdir)/m4/00gnulib.m4 \ $(top_srcdir)/m4/double-slash-root.m4 $(top_srcdir)/m4/dup2.m4 \ $(top_srcdir)/m4/eealloc.m4 $(top_srcdir)/m4/environ.m4 \ $(top_srcdir)/m4/errno_h.m4 $(top_srcdir)/m4/error.m4 \ - $(top_srcdir)/m4/extensions.m4 \ + $(top_srcdir)/m4/error_h.m4 $(top_srcdir)/m4/extensions.m4 \ $(top_srcdir)/m4/extern-inline.m4 $(top_srcdir)/m4/fcntl-o.m4 \ $(top_srcdir)/m4/fcntl.m4 $(top_srcdir)/m4/fcntl_h.m4 \ $(top_srcdir)/m4/fdopen.m4 $(top_srcdir)/m4/flexmember.m4 \ @@ -265,10 +265,11 @@ am__aclocal_m4_deps = $(top_srcdir)/m4/00gnulib.m4 \ $(top_srcdir)/m4/malloc.m4 $(top_srcdir)/m4/malloca.m4 \ $(top_srcdir)/m4/manywarnings.m4 $(top_srcdir)/m4/mbrtowc.m4 \ $(top_srcdir)/m4/mbsinit.m4 $(top_srcdir)/m4/mbstate_t.m4 \ - $(top_srcdir)/m4/mbtowc.m4 $(top_srcdir)/m4/mempcpy.m4 \ - $(top_srcdir)/m4/minmax.m4 $(top_srcdir)/m4/mkdir.m4 \ - $(top_srcdir)/m4/mkstemp.m4 $(top_srcdir)/m4/mmap-anon.m4 \ - $(top_srcdir)/m4/mode_t.m4 $(top_srcdir)/m4/msvc-inval.m4 \ + $(top_srcdir)/m4/mbtowc.m4 $(top_srcdir)/m4/memchr.m4 \ + $(top_srcdir)/m4/mempcpy.m4 $(top_srcdir)/m4/minmax.m4 \ + $(top_srcdir)/m4/mkdir.m4 $(top_srcdir)/m4/mkstemp.m4 \ + $(top_srcdir)/m4/mmap-anon.m4 $(top_srcdir)/m4/mode_t.m4 \ + $(top_srcdir)/m4/msvc-inval.m4 \ $(top_srcdir)/m4/msvc-nothrow.m4 $(top_srcdir)/m4/multiarch.m4 \ $(top_srcdir)/m4/musl.m4 $(top_srcdir)/m4/nanosleep.m4 \ $(top_srcdir)/m4/netinet_in_h.m4 \ @@ -299,29 +300,29 @@ am__aclocal_m4_deps = $(top_srcdir)/m4/00gnulib.m4 \ $(top_srcdir)/m4/socklen.m4 $(top_srcdir)/m4/sockpfaf.m4 \ $(top_srcdir)/m4/ssize_t.m4 $(top_srcdir)/m4/stat-time.m4 \ $(top_srcdir)/m4/stat.m4 $(top_srcdir)/m4/stdalign.m4 \ - $(top_srcdir)/m4/stdarg.m4 $(top_srcdir)/m4/stdbool.m4 \ - $(top_srcdir)/m4/stddef_h.m4 $(top_srcdir)/m4/stdint.m4 \ - $(top_srcdir)/m4/stdio_h.m4 $(top_srcdir)/m4/stdlib_h.m4 \ - $(top_srcdir)/m4/strdup.m4 $(top_srcdir)/m4/strerror.m4 \ - $(top_srcdir)/m4/strerror_r.m4 $(top_srcdir)/m4/string_h.m4 \ - $(top_srcdir)/m4/strtoll.m4 $(top_srcdir)/m4/strtoull.m4 \ - $(top_srcdir)/m4/symlink.m4 $(top_srcdir)/m4/sys_ioctl_h.m4 \ + $(top_srcdir)/m4/stdarg.m4 $(top_srcdir)/m4/stddef_h.m4 \ + $(top_srcdir)/m4/stdint.m4 $(top_srcdir)/m4/stdio_h.m4 \ + $(top_srcdir)/m4/stdlib_h.m4 $(top_srcdir)/m4/strdup.m4 \ + $(top_srcdir)/m4/strerror.m4 $(top_srcdir)/m4/strerror_r.m4 \ + $(top_srcdir)/m4/string_h.m4 $(top_srcdir)/m4/strtoll.m4 \ + $(top_srcdir)/m4/strtoull.m4 $(top_srcdir)/m4/symlink.m4 \ + $(top_srcdir)/m4/sys_ioctl_h.m4 \ $(top_srcdir)/m4/sys_random_h.m4 \ $(top_srcdir)/m4/sys_select_h.m4 \ $(top_srcdir)/m4/sys_socket_h.m4 \ $(top_srcdir)/m4/sys_stat_h.m4 $(top_srcdir)/m4/sys_time_h.m4 \ $(top_srcdir)/m4/sys_types_h.m4 $(top_srcdir)/m4/sys_uio_h.m4 \ $(top_srcdir)/m4/tempname.m4 $(top_srcdir)/m4/thread.m4 \ - $(top_srcdir)/m4/threadlib.m4 $(top_srcdir)/m4/time_h.m4 \ - $(top_srcdir)/m4/unistd_h.m4 $(top_srcdir)/m4/unlink.m4 \ - $(top_srcdir)/m4/unlinkdir.m4 $(top_srcdir)/m4/usleep.m4 \ - $(top_srcdir)/m4/version-etc.m4 $(top_srcdir)/m4/visibility.m4 \ - $(top_srcdir)/m4/warn-on-use.m4 $(top_srcdir)/m4/warnings.m4 \ - $(top_srcdir)/m4/wchar_h.m4 $(top_srcdir)/m4/wchar_t.m4 \ - $(top_srcdir)/m4/wcrtomb.m4 $(top_srcdir)/m4/wctob.m4 \ - $(top_srcdir)/m4/wctomb.m4 $(top_srcdir)/m4/wctype_h.m4 \ - $(top_srcdir)/m4/wint_t.m4 $(top_srcdir)/m4/xalloc.m4 \ - $(top_srcdir)/m4/xstrtol.m4 $(top_srcdir)/m4/year2038.m4 \ + $(top_srcdir)/m4/threadlib.m4 $(top_srcdir)/m4/time.m4 \ + $(top_srcdir)/m4/time_h.m4 $(top_srcdir)/m4/unistd_h.m4 \ + $(top_srcdir)/m4/unlink.m4 $(top_srcdir)/m4/unlinkdir.m4 \ + $(top_srcdir)/m4/usleep.m4 $(top_srcdir)/m4/version-etc.m4 \ + $(top_srcdir)/m4/visibility.m4 $(top_srcdir)/m4/warn-on-use.m4 \ + $(top_srcdir)/m4/warnings.m4 $(top_srcdir)/m4/wchar_h.m4 \ + $(top_srcdir)/m4/wchar_t.m4 $(top_srcdir)/m4/wcrtomb.m4 \ + $(top_srcdir)/m4/wctob.m4 $(top_srcdir)/m4/wctomb.m4 \ + $(top_srcdir)/m4/wctype_h.m4 $(top_srcdir)/m4/wint_t.m4 \ + $(top_srcdir)/m4/xalloc.m4 $(top_srcdir)/m4/xstrtol.m4 \ $(top_srcdir)/m4/yield.m4 $(top_srcdir)/m4/zzgnulib.m4 \ $(top_srcdir)/configure.ac am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \ @@ -337,34 +338,32 @@ am__libgnulib_la_SOURCES_DIST = argmatch.c basename-lgpl.c btowc.c \ c-ctype.h c-ctype.c c-strcase.h c-strcasecmp.c c-strncasecmp.c \ canonicalize-lgpl.c cloexec.c close.c close-stream.c \ closeout.c dirname.c basename.c dirname-lgpl.c stripslash.c \ - dup2.c malloc/dynarray_at_failure.c \ - malloc/dynarray_emplace_enlarge.c malloc/dynarray_finalize.c \ - malloc/dynarray_resize.c malloc/dynarray_resize_clear.c \ - error.c exitfail.c fcntl.c fd-hook.c fpending.c free.c fstat.c \ - fsync.c getdtablesize.c getopt.c getopt1.c getprogname.h \ - getprogname.c getrandom.c gettext.h hard-locale.c ialloc.c \ + dup2.c error.c exitfail.c fcntl.c fd-hook.c fpending.c free.c \ + fstat.c fsync.c getdtablesize.c getopt.c getopt1.c \ + getprogname.c getrandom.c gettext.h \ + malloc/dynarray_at_failure.c malloc/dynarray_emplace_enlarge.c \ + malloc/dynarray_finalize.c malloc/dynarray_resize.c \ + malloc/dynarray_resize_clear.c malloc/scratch_buffer_grow.c \ + malloc/scratch_buffer_grow_preserve.c \ + malloc/scratch_buffer_set_array_size.c hard-locale.c ialloc.c \ idx.h localcharset.c localeconv.c glthread/lock.h \ glthread/lock.c long-options.c lseek.c lstat.c malloca.c \ mbrtowc.c mbsinit.c mbtowc.c mempcpy.c minmax.h mkdir.c \ mkstemp.c msvc-inval.c msvc-nothrow.c nl_langinfo.c \ nl_langinfo-lock.c open.c progname.h progname.c quotearg.c \ rawmemchr.c read.c readlink.c reallocarray.c regex.c rpmatch.c \ - safe-read.c malloc/scratch_buffer_dupfree.c \ - malloc/scratch_buffer_grow.c \ - malloc/scratch_buffer_grow_preserve.c \ - malloc/scratch_buffer_set_array_size.c setlocale_null.c \ - setlocale-lock.c sleep.c stat.c stat-time.c stdio-read.c \ - stdio-write.c strdup.c strerror.c strerror-override.c \ - strtoll.c strtoull.c tempname.c glthread/threadlib.c unistd.c \ - unlink.c usleep.c version-etc.h version-etc.c \ - version-etc-fsf.c wcrtomb.c wctype-h.c windows-mutex.c \ - windows-once.c windows-recmutex.c windows-rwlock.c xmalloc.c \ - xalloc-die.c xstrtol.c xstrtoul.c xstrtoll.c xstrtoull.c + safe-read.c setlocale_null.c setlocale-lock.c sleep.c stat.c \ + stat-time.c stdio-read.c stdio-write.c strdup.c strerror.c \ + strerror-override.c strtoll.c strtoull.c tempname.c \ + glthread/threadlib.c unistd.c unlink.c usleep.c version-etc.h \ + version-etc.c version-etc-fsf.c wcrtomb.c wctype-h.c \ + windows-mutex.c windows-once.c windows-recmutex.c \ + windows-rwlock.c xmalloc.c xalloc-die.c xstrtol.c xstrtoul.c \ + xstrtoll.c xstrtoull.c @GL_COND_OBJ_BTOWC_TRUE@am__objects_1 = libgnulib_la-btowc.lo @GL_COND_OBJ_CANONICALIZE_LGPL_TRUE@am__objects_2 = libgnulib_la-canonicalize-lgpl.lo @GL_COND_OBJ_CLOSE_TRUE@am__objects_3 = libgnulib_la-close.lo @GL_COND_OBJ_DUP2_TRUE@am__objects_4 = libgnulib_la-dup2.lo -am__dirstamp = $(am__leading_dot)dirstamp @GL_COND_OBJ_ERROR_TRUE@am__objects_5 = libgnulib_la-error.lo @GL_COND_OBJ_FCNTL_TRUE@am__objects_6 = libgnulib_la-fcntl.lo @GL_COND_OBJ_FPENDING_TRUE@am__objects_7 = libgnulib_la-fpending.lo @@ -375,55 +374,58 @@ am__dirstamp = $(am__leading_dot)dirstamp @GL_COND_OBJ_GETDTABLESIZE_TRUE@ libgnulib_la-getdtablesize.lo @GL_COND_OBJ_GETOPT_TRUE@am__objects_12 = libgnulib_la-getopt.lo \ @GL_COND_OBJ_GETOPT_TRUE@ libgnulib_la-getopt1.lo -@GL_COND_OBJ_GETRANDOM_TRUE@am__objects_13 = \ +@GL_COND_OBJ_GETPROGNAME_TRUE@am__objects_13 = \ +@GL_COND_OBJ_GETPROGNAME_TRUE@ libgnulib_la-getprogname.lo +@GL_COND_OBJ_GETRANDOM_TRUE@am__objects_14 = \ @GL_COND_OBJ_GETRANDOM_TRUE@ libgnulib_la-getrandom.lo -@GL_COND_OBJ_LOCALECONV_TRUE@am__objects_14 = \ +am__dirstamp = $(am__leading_dot)dirstamp +@GL_COND_OBJ_LOCALECONV_TRUE@am__objects_15 = \ @GL_COND_OBJ_LOCALECONV_TRUE@ libgnulib_la-localeconv.lo -@GL_COND_OBJ_LSEEK_TRUE@am__objects_15 = libgnulib_la-lseek.lo -@GL_COND_OBJ_LSTAT_TRUE@am__objects_16 = libgnulib_la-lstat.lo -@GL_COND_OBJ_MBRTOWC_TRUE@am__objects_17 = libgnulib_la-mbrtowc.lo -@GL_COND_OBJ_MBSINIT_TRUE@am__objects_18 = libgnulib_la-mbsinit.lo -@GL_COND_OBJ_MBTOWC_TRUE@am__objects_19 = libgnulib_la-mbtowc.lo -@GL_COND_OBJ_MEMPCPY_TRUE@am__objects_20 = libgnulib_la-mempcpy.lo -@GL_COND_OBJ_MKDIR_TRUE@am__objects_21 = libgnulib_la-mkdir.lo -@GL_COND_OBJ_MKSTEMP_TRUE@am__objects_22 = libgnulib_la-mkstemp.lo -@GL_COND_OBJ_MSVC_INVAL_TRUE@am__objects_23 = \ +@GL_COND_OBJ_LSEEK_TRUE@am__objects_16 = libgnulib_la-lseek.lo +@GL_COND_OBJ_LSTAT_TRUE@am__objects_17 = libgnulib_la-lstat.lo +@GL_COND_OBJ_MBRTOWC_TRUE@am__objects_18 = libgnulib_la-mbrtowc.lo +@GL_COND_OBJ_MBSINIT_TRUE@am__objects_19 = libgnulib_la-mbsinit.lo +@GL_COND_OBJ_MBTOWC_TRUE@am__objects_20 = libgnulib_la-mbtowc.lo +@GL_COND_OBJ_MEMPCPY_TRUE@am__objects_21 = libgnulib_la-mempcpy.lo +@GL_COND_OBJ_MKDIR_TRUE@am__objects_22 = libgnulib_la-mkdir.lo +@GL_COND_OBJ_MKSTEMP_TRUE@am__objects_23 = libgnulib_la-mkstemp.lo +@GL_COND_OBJ_MSVC_INVAL_TRUE@am__objects_24 = \ @GL_COND_OBJ_MSVC_INVAL_TRUE@ libgnulib_la-msvc-inval.lo -@GL_COND_OBJ_MSVC_NOTHROW_TRUE@am__objects_24 = \ +@GL_COND_OBJ_MSVC_NOTHROW_TRUE@am__objects_25 = \ @GL_COND_OBJ_MSVC_NOTHROW_TRUE@ libgnulib_la-msvc-nothrow.lo -@GL_COND_OBJ_NL_LANGINFO_TRUE@am__objects_25 = \ +@GL_COND_OBJ_NL_LANGINFO_TRUE@am__objects_26 = \ @GL_COND_OBJ_NL_LANGINFO_TRUE@ libgnulib_la-nl_langinfo.lo -@GL_COND_OBJ_NL_LANGINFO_LOCK_TRUE@am__objects_26 = libgnulib_la-nl_langinfo-lock.lo -@GL_COND_OBJ_OPEN_TRUE@am__objects_27 = libgnulib_la-open.lo -@GL_COND_OBJ_RAWMEMCHR_TRUE@am__objects_28 = \ +@GL_COND_OBJ_NL_LANGINFO_LOCK_TRUE@am__objects_27 = libgnulib_la-nl_langinfo-lock.lo +@GL_COND_OBJ_OPEN_TRUE@am__objects_28 = libgnulib_la-open.lo +@GL_COND_OBJ_RAWMEMCHR_TRUE@am__objects_29 = \ @GL_COND_OBJ_RAWMEMCHR_TRUE@ libgnulib_la-rawmemchr.lo -@GL_COND_OBJ_READ_TRUE@am__objects_29 = libgnulib_la-read.lo -@GL_COND_OBJ_READLINK_TRUE@am__objects_30 = libgnulib_la-readlink.lo -@GL_COND_OBJ_REALLOCARRAY_TRUE@am__objects_31 = \ +@GL_COND_OBJ_READ_TRUE@am__objects_30 = libgnulib_la-read.lo +@GL_COND_OBJ_READLINK_TRUE@am__objects_31 = libgnulib_la-readlink.lo +@GL_COND_OBJ_REALLOCARRAY_TRUE@am__objects_32 = \ @GL_COND_OBJ_REALLOCARRAY_TRUE@ libgnulib_la-reallocarray.lo -@GL_COND_OBJ_REGEX_TRUE@am__objects_32 = libgnulib_la-regex.lo -@GL_COND_OBJ_RPMATCH_TRUE@am__objects_33 = libgnulib_la-rpmatch.lo -@GL_COND_OBJ_SETLOCALE_LOCK_TRUE@am__objects_34 = libgnulib_la-setlocale-lock.lo -@GL_COND_OBJ_SLEEP_TRUE@am__objects_35 = libgnulib_la-sleep.lo -@GL_COND_OBJ_STAT_TRUE@am__objects_36 = libgnulib_la-stat.lo -@GL_COND_OBJ_STDIO_READ_TRUE@am__objects_37 = \ +@GL_COND_OBJ_REGEX_TRUE@am__objects_33 = libgnulib_la-regex.lo +@GL_COND_OBJ_RPMATCH_TRUE@am__objects_34 = libgnulib_la-rpmatch.lo +@GL_COND_OBJ_SETLOCALE_LOCK_TRUE@am__objects_35 = libgnulib_la-setlocale-lock.lo +@GL_COND_OBJ_SLEEP_TRUE@am__objects_36 = libgnulib_la-sleep.lo +@GL_COND_OBJ_STAT_TRUE@am__objects_37 = libgnulib_la-stat.lo +@GL_COND_OBJ_STDIO_READ_TRUE@am__objects_38 = \ @GL_COND_OBJ_STDIO_READ_TRUE@ libgnulib_la-stdio-read.lo -@GL_COND_OBJ_STDIO_WRITE_TRUE@am__objects_38 = \ +@GL_COND_OBJ_STDIO_WRITE_TRUE@am__objects_39 = \ @GL_COND_OBJ_STDIO_WRITE_TRUE@ libgnulib_la-stdio-write.lo -@GL_COND_OBJ_STRDUP_TRUE@am__objects_39 = libgnulib_la-strdup.lo -@GL_COND_OBJ_STRERROR_TRUE@am__objects_40 = libgnulib_la-strerror.lo -@GL_COND_OBJ_STRERROR_OVERRIDE_TRUE@am__objects_41 = libgnulib_la-strerror-override.lo -@GL_COND_OBJ_STRTOLL_TRUE@am__objects_42 = libgnulib_la-strtoll.lo -@GL_COND_OBJ_STRTOULL_TRUE@am__objects_43 = libgnulib_la-strtoull.lo -@GL_COND_OBJ_UNLINK_TRUE@am__objects_44 = libgnulib_la-unlink.lo -@GL_COND_OBJ_USLEEP_TRUE@am__objects_45 = libgnulib_la-usleep.lo -@GL_COND_OBJ_WCRTOMB_TRUE@am__objects_46 = libgnulib_la-wcrtomb.lo -@GL_COND_OBJ_WINDOWS_MUTEX_TRUE@am__objects_47 = \ +@GL_COND_OBJ_STRDUP_TRUE@am__objects_40 = libgnulib_la-strdup.lo +@GL_COND_OBJ_STRERROR_TRUE@am__objects_41 = libgnulib_la-strerror.lo +@GL_COND_OBJ_STRERROR_OVERRIDE_TRUE@am__objects_42 = libgnulib_la-strerror-override.lo +@GL_COND_OBJ_STRTOLL_TRUE@am__objects_43 = libgnulib_la-strtoll.lo +@GL_COND_OBJ_STRTOULL_TRUE@am__objects_44 = libgnulib_la-strtoull.lo +@GL_COND_OBJ_UNLINK_TRUE@am__objects_45 = libgnulib_la-unlink.lo +@GL_COND_OBJ_USLEEP_TRUE@am__objects_46 = libgnulib_la-usleep.lo +@GL_COND_OBJ_WCRTOMB_TRUE@am__objects_47 = libgnulib_la-wcrtomb.lo +@GL_COND_OBJ_WINDOWS_MUTEX_TRUE@am__objects_48 = \ @GL_COND_OBJ_WINDOWS_MUTEX_TRUE@ libgnulib_la-windows-mutex.lo -@GL_COND_OBJ_WINDOWS_ONCE_TRUE@am__objects_48 = \ +@GL_COND_OBJ_WINDOWS_ONCE_TRUE@am__objects_49 = \ @GL_COND_OBJ_WINDOWS_ONCE_TRUE@ libgnulib_la-windows-once.lo -@GL_COND_OBJ_WINDOWS_RECMUTEX_TRUE@am__objects_49 = libgnulib_la-windows-recmutex.lo -@GL_COND_OBJ_WINDOWS_RWLOCK_TRUE@am__objects_50 = libgnulib_la-windows-rwlock.lo +@GL_COND_OBJ_WINDOWS_RECMUTEX_TRUE@am__objects_50 = libgnulib_la-windows-recmutex.lo +@GL_COND_OBJ_WINDOWS_RWLOCK_TRUE@am__objects_51 = libgnulib_la-windows-rwlock.lo am_libgnulib_la_OBJECTS = libgnulib_la-argmatch.lo \ libgnulib_la-basename-lgpl.lo $(am__objects_1) \ libgnulib_la-c-ctype.lo libgnulib_la-c-strcasecmp.lo \ @@ -432,41 +434,39 @@ am_libgnulib_la_OBJECTS = libgnulib_la-argmatch.lo \ libgnulib_la-close-stream.lo libgnulib_la-closeout.lo \ libgnulib_la-dirname.lo libgnulib_la-basename.lo \ libgnulib_la-dirname-lgpl.lo libgnulib_la-stripslash.lo \ - $(am__objects_4) malloc/libgnulib_la-dynarray_at_failure.lo \ + $(am__objects_4) $(am__objects_5) libgnulib_la-exitfail.lo \ + $(am__objects_6) libgnulib_la-fd-hook.lo $(am__objects_7) \ + $(am__objects_8) $(am__objects_9) $(am__objects_10) \ + $(am__objects_11) $(am__objects_12) $(am__objects_13) \ + $(am__objects_14) malloc/libgnulib_la-dynarray_at_failure.lo \ malloc/libgnulib_la-dynarray_emplace_enlarge.lo \ malloc/libgnulib_la-dynarray_finalize.lo \ malloc/libgnulib_la-dynarray_resize.lo \ - malloc/libgnulib_la-dynarray_resize_clear.lo $(am__objects_5) \ - libgnulib_la-exitfail.lo $(am__objects_6) \ - libgnulib_la-fd-hook.lo $(am__objects_7) $(am__objects_8) \ - $(am__objects_9) $(am__objects_10) $(am__objects_11) \ - $(am__objects_12) libgnulib_la-getprogname.lo \ - $(am__objects_13) libgnulib_la-hard-locale.lo \ - libgnulib_la-ialloc.lo libgnulib_la-localcharset.lo \ - $(am__objects_14) glthread/libgnulib_la-lock.lo \ - libgnulib_la-long-options.lo $(am__objects_15) \ - $(am__objects_16) libgnulib_la-malloca.lo $(am__objects_17) \ - $(am__objects_18) $(am__objects_19) $(am__objects_20) \ - $(am__objects_21) $(am__objects_22) $(am__objects_23) \ - $(am__objects_24) $(am__objects_25) $(am__objects_26) \ - $(am__objects_27) libgnulib_la-progname.lo \ - libgnulib_la-quotearg.lo $(am__objects_28) $(am__objects_29) \ - $(am__objects_30) $(am__objects_31) $(am__objects_32) \ - $(am__objects_33) libgnulib_la-safe-read.lo \ - malloc/libgnulib_la-scratch_buffer_dupfree.lo \ + malloc/libgnulib_la-dynarray_resize_clear.lo \ malloc/libgnulib_la-scratch_buffer_grow.lo \ malloc/libgnulib_la-scratch_buffer_grow_preserve.lo \ malloc/libgnulib_la-scratch_buffer_set_array_size.lo \ - libgnulib_la-setlocale_null.lo $(am__objects_34) \ - $(am__objects_35) $(am__objects_36) libgnulib_la-stat-time.lo \ - $(am__objects_37) $(am__objects_38) $(am__objects_39) \ - $(am__objects_40) $(am__objects_41) $(am__objects_42) \ - $(am__objects_43) libgnulib_la-tempname.lo \ + libgnulib_la-hard-locale.lo libgnulib_la-ialloc.lo \ + libgnulib_la-localcharset.lo $(am__objects_15) \ + glthread/libgnulib_la-lock.lo libgnulib_la-long-options.lo \ + $(am__objects_16) $(am__objects_17) libgnulib_la-malloca.lo \ + $(am__objects_18) $(am__objects_19) $(am__objects_20) \ + $(am__objects_21) $(am__objects_22) $(am__objects_23) \ + $(am__objects_24) $(am__objects_25) $(am__objects_26) \ + $(am__objects_27) $(am__objects_28) libgnulib_la-progname.lo \ + libgnulib_la-quotearg.lo $(am__objects_29) $(am__objects_30) \ + $(am__objects_31) $(am__objects_32) $(am__objects_33) \ + $(am__objects_34) libgnulib_la-safe-read.lo \ + libgnulib_la-setlocale_null.lo $(am__objects_35) \ + $(am__objects_36) $(am__objects_37) libgnulib_la-stat-time.lo \ + $(am__objects_38) $(am__objects_39) $(am__objects_40) \ + $(am__objects_41) $(am__objects_42) $(am__objects_43) \ + $(am__objects_44) libgnulib_la-tempname.lo \ glthread/libgnulib_la-threadlib.lo libgnulib_la-unistd.lo \ - $(am__objects_44) $(am__objects_45) \ + $(am__objects_45) $(am__objects_46) \ libgnulib_la-version-etc.lo libgnulib_la-version-etc-fsf.lo \ - $(am__objects_46) libgnulib_la-wctype-h.lo $(am__objects_47) \ - $(am__objects_48) $(am__objects_49) $(am__objects_50) \ + $(am__objects_47) libgnulib_la-wctype-h.lo $(am__objects_48) \ + $(am__objects_49) $(am__objects_50) $(am__objects_51) \ libgnulib_la-xmalloc.lo libgnulib_la-xalloc-die.lo \ libgnulib_la-xstrtol.lo libgnulib_la-xstrtoul.lo \ libgnulib_la-xstrtoll.lo libgnulib_la-xstrtoull.lo @@ -601,7 +601,6 @@ am__depfiles_remade = ./$(DEPDIR)/alloca.Plo \ malloc/$(DEPDIR)/libgnulib_la-dynarray_finalize.Plo \ malloc/$(DEPDIR)/libgnulib_la-dynarray_resize.Plo \ malloc/$(DEPDIR)/libgnulib_la-dynarray_resize_clear.Plo \ - malloc/$(DEPDIR)/libgnulib_la-scratch_buffer_dupfree.Plo \ malloc/$(DEPDIR)/libgnulib_la-scratch_buffer_grow.Plo \ malloc/$(DEPDIR)/libgnulib_la-scratch_buffer_grow_preserve.Plo \ malloc/$(DEPDIR)/libgnulib_la-scratch_buffer_set_array_size.Plo @@ -653,6 +652,9 @@ am__define_uniq_tagged_files = \ am__DIST_COMMON = $(srcdir)/Makefile.in $(srcdir)/config.h.in \ $(srcdir)/gnulib.mk $(top_srcdir)/build-aux/depcomp alloca.c DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST) +pkgdatadir = @pkgdatadir@ +pkgincludedir = @pkgincludedir@ +pkglibdir = @pkglibdir@ pkglibexecdir = @pkglibexecdir@ ACLOCAL = @ACLOCAL@ ALLOCA = @ALLOCA@ @@ -662,6 +664,7 @@ AM_DEFAULT_VERBOSITY = @AM_DEFAULT_VERBOSITY@ APPLE_UNIVERSAL_BUILD = @APPLE_UNIVERSAL_BUILD@ AR = @AR@ ARFLAGS = @ARFLAGS@ +ASSERT_H = @ASSERT_H@ AUTOCONF = @AUTOCONF@ AUTOHEADER = @AUTOHEADER@ AUTOMAKE = @AUTOMAKE@ @@ -678,6 +681,7 @@ CFLAGS = @CFLAGS@ CFLAG_VISIBILITY = @CFLAG_VISIBILITY@ CHECK_CFLAGS = @CHECK_CFLAGS@ CHECK_LIBS = @CHECK_LIBS@ +CLOCK_TIME_LIB = @CLOCK_TIME_LIB@ CONFIG_INCLUDE = @CONFIG_INCLUDE@ CPP = @CPP@ CPPFLAGS = @CPPFLAGS@ @@ -702,12 +706,14 @@ ENOLINK_VALUE = @ENOLINK_VALUE@ EOVERFLOW_HIDDEN = @EOVERFLOW_HIDDEN@ EOVERFLOW_VALUE = @EOVERFLOW_VALUE@ ERRNO_H = @ERRNO_H@ +ERROR_H = @ERROR_H@ ETAGS = @ETAGS@ EXEEXT = @EXEEXT@ FGREP = @FGREP@ FILECMD = @FILECMD@ GETOPT_CDEFS_H = @GETOPT_CDEFS_H@ GETOPT_H = @GETOPT_H@ +GETRANDOM_LIB = @GETRANDOM_LIB@ GETTEXT_MACRO_VERSION = @GETTEXT_MACRO_VERSION@ GL_CFLAG_ALLOW_WARNINGS = @GL_CFLAG_ALLOW_WARNINGS@ GL_CFLAG_GNULIB_WARNINGS = @GL_CFLAG_GNULIB_WARNINGS@ @@ -723,6 +729,7 @@ GL_GNULIB_CALLOC_GNU = @GL_GNULIB_CALLOC_GNU@ GL_GNULIB_CALLOC_POSIX = @GL_GNULIB_CALLOC_POSIX@ GL_GNULIB_CANONICALIZE_FILE_NAME = @GL_GNULIB_CANONICALIZE_FILE_NAME@ GL_GNULIB_CHDIR = @GL_GNULIB_CHDIR@ +GL_GNULIB_CHMOD = @GL_GNULIB_CHMOD@ GL_GNULIB_CHOWN = @GL_GNULIB_CHOWN@ GL_GNULIB_CLOSE = @GL_GNULIB_CLOSE@ GL_GNULIB_CONNECT = @GL_GNULIB_CONNECT@ @@ -796,6 +803,7 @@ GL_GNULIB_GETPAGESIZE = @GL_GNULIB_GETPAGESIZE@ GL_GNULIB_GETPASS = @GL_GNULIB_GETPASS@ GL_GNULIB_GETPASS_GNU = @GL_GNULIB_GETPASS_GNU@ GL_GNULIB_GETPEERNAME = @GL_GNULIB_GETPEERNAME@ +GL_GNULIB_GETPROGNAME = @GL_GNULIB_GETPROGNAME@ GL_GNULIB_GETRANDOM = @GL_GNULIB_GETRANDOM@ GL_GNULIB_GETSOCKNAME = @GL_GNULIB_GETSOCKNAME@ GL_GNULIB_GETSOCKOPT = @GL_GNULIB_GETSOCKOPT@ @@ -893,6 +901,7 @@ GL_GNULIB_MEMCHR = @GL_GNULIB_MEMCHR@ GL_GNULIB_MEMMEM = @GL_GNULIB_MEMMEM@ GL_GNULIB_MEMPCPY = @GL_GNULIB_MEMPCPY@ GL_GNULIB_MEMRCHR = @GL_GNULIB_MEMRCHR@ +GL_GNULIB_MEMSET_EXPLICIT = @GL_GNULIB_MEMSET_EXPLICIT@ GL_GNULIB_MKDIR = @GL_GNULIB_MKDIR@ GL_GNULIB_MKDIRAT = @GL_GNULIB_MKDIRAT@ GL_GNULIB_MKDTEMP = @GL_GNULIB_MKDTEMP@ @@ -1013,6 +1022,7 @@ GL_GNULIB_STRVERSCMP = @GL_GNULIB_STRVERSCMP@ GL_GNULIB_SYMLINK = @GL_GNULIB_SYMLINK@ GL_GNULIB_SYMLINKAT = @GL_GNULIB_SYMLINKAT@ GL_GNULIB_SYSTEM_POSIX = @GL_GNULIB_SYSTEM_POSIX@ +GL_GNULIB_TIME = @GL_GNULIB_TIME@ GL_GNULIB_TIMEGM = @GL_GNULIB_TIMEGM@ GL_GNULIB_TIMESPEC_GET = @GL_GNULIB_TIMESPEC_GET@ GL_GNULIB_TIMESPEC_GETRES = @GL_GNULIB_TIMESPEC_GETRES@ @@ -1087,6 +1097,7 @@ GMSGFMT_015 = @GMSGFMT_015@ GNULIBHEADERS_OVERRIDE_WINT_T = @GNULIBHEADERS_OVERRIDE_WINT_T@ GNULIB_GETTIMEOFDAY = @GNULIB_GETTIMEOFDAY@ GREP = @GREP@ +HARD_LOCALE_LIB = @HARD_LOCALE_LIB@ HAVE_ACCEPT4 = @HAVE_ACCEPT4@ HAVE_ALIGNED_ALLOC = @HAVE_ALIGNED_ALLOC@ HAVE_ALLOCA_H = @HAVE_ALLOCA_H@ @@ -1117,6 +1128,7 @@ HAVE_DECL_GETLOGIN = @HAVE_DECL_GETLOGIN@ HAVE_DECL_GETLOGIN_R = @HAVE_DECL_GETLOGIN_R@ HAVE_DECL_GETPAGESIZE = @HAVE_DECL_GETPAGESIZE@ HAVE_DECL_GETUSERSHELL = @HAVE_DECL_GETUSERSHELL@ +HAVE_DECL_GETW = @HAVE_DECL_GETW@ HAVE_DECL_IMAXABS = @HAVE_DECL_IMAXABS@ HAVE_DECL_IMAXDIV = @HAVE_DECL_IMAXDIV@ HAVE_DECL_INET_NTOP = @HAVE_DECL_INET_NTOP@ @@ -1126,6 +1138,7 @@ HAVE_DECL_LOCALTIME_R = @HAVE_DECL_LOCALTIME_R@ HAVE_DECL_MEMMEM = @HAVE_DECL_MEMMEM@ HAVE_DECL_MEMRCHR = @HAVE_DECL_MEMRCHR@ HAVE_DECL_OBSTACK_PRINTF = @HAVE_DECL_OBSTACK_PRINTF@ +HAVE_DECL_PUTW = @HAVE_DECL_PUTW@ HAVE_DECL_SETENV = @HAVE_DECL_SETENV@ HAVE_DECL_SETHOSTNAME = @HAVE_DECL_SETHOSTNAME@ HAVE_DECL_SETSTATE = @HAVE_DECL_SETSTATE@ @@ -1148,6 +1161,9 @@ HAVE_DECL_WCWIDTH = @HAVE_DECL_WCWIDTH@ HAVE_DPRINTF = @HAVE_DPRINTF@ HAVE_DUP3 = @HAVE_DUP3@ HAVE_DUPLOCALE = @HAVE_DUPLOCALE@ +HAVE_ERROR = @HAVE_ERROR@ +HAVE_ERROR_AT_LINE = @HAVE_ERROR_AT_LINE@ +HAVE_ERROR_H = @HAVE_ERROR_H@ HAVE_EUIDACCESS = @HAVE_EUIDACCESS@ HAVE_EXECVPE = @HAVE_EXECVPE@ HAVE_EXPLICIT_BZERO = @HAVE_EXPLICIT_BZERO@ @@ -1175,12 +1191,15 @@ HAVE_GETLOGIN = @HAVE_GETLOGIN@ HAVE_GETOPT_H = @HAVE_GETOPT_H@ HAVE_GETPAGESIZE = @HAVE_GETPAGESIZE@ HAVE_GETPASS = @HAVE_GETPASS@ +HAVE_GETPROGNAME = @HAVE_GETPROGNAME@ HAVE_GETRANDOM = @HAVE_GETRANDOM@ HAVE_GETSUBOPT = @HAVE_GETSUBOPT@ HAVE_GETTIMEOFDAY = @HAVE_GETTIMEOFDAY@ HAVE_GETUMASK = @HAVE_GETUMASK@ HAVE_GRANTPT = @HAVE_GRANTPT@ HAVE_GROUP_MEMBER = @HAVE_GROUP_MEMBER@ +HAVE_IMAXABS = @HAVE_IMAXABS@ +HAVE_IMAXDIV = @HAVE_IMAXDIV@ HAVE_IMAXDIV_T = @HAVE_IMAXDIV_T@ HAVE_INITSTATE = @HAVE_INITSTATE@ HAVE_INTTYPES_H = @HAVE_INTTYPES_H@ @@ -1207,6 +1226,7 @@ HAVE_MBSNRTOWCS = @HAVE_MBSNRTOWCS@ HAVE_MBSRTOWCS = @HAVE_MBSRTOWCS@ HAVE_MBTOWC = @HAVE_MBTOWC@ HAVE_MEMPCPY = @HAVE_MEMPCPY@ +HAVE_MEMSET_EXPLICIT = @HAVE_MEMSET_EXPLICIT@ HAVE_MKDIRAT = @HAVE_MKDIRAT@ HAVE_MKDTEMP = @HAVE_MKDTEMP@ HAVE_MKFIFO = @HAVE_MKFIFO@ @@ -1415,7 +1435,6 @@ HAVE_WMEMPCPY = @HAVE_WMEMPCPY@ HAVE_WMEMSET = @HAVE_WMEMSET@ HAVE_WS2TCPIP_H = @HAVE_WS2TCPIP_H@ HAVE_XLOCALE_H = @HAVE_XLOCALE_H@ -HAVE__BOOL = @HAVE__BOOL@ HAVE__EXIT = @HAVE__EXIT@ IGNORE_UNUSED_LIBRARIES_CFLAGS = @IGNORE_UNUSED_LIBRARIES_CFLAGS@ INCLUDE_NEXT = @INCLUDE_NEXT@ @@ -1482,15 +1501,20 @@ LT_REVISION = @LT_REVISION@ LT_SYS_LIBRARY_PATH = @LT_SYS_LIBRARY_PATH@ MAKEINFO = @MAKEINFO@ MANIFEST_TOOL = @MANIFEST_TOOL@ +MBRTOWC_LIB = @MBRTOWC_LIB@ MKDIR_P = @MKDIR_P@ MSGFMT = @MSGFMT@ MSGFMT_015 = @MSGFMT_015@ MSGMERGE = @MSGMERGE@ +NANOSLEEP_LIB = @NANOSLEEP_LIB@ NETINET_IN_H = @NETINET_IN_H@ NEXT_ARPA_INET_H = @NEXT_ARPA_INET_H@ +NEXT_ASSERT_H = @NEXT_ASSERT_H@ NEXT_AS_FIRST_DIRECTIVE_ARPA_INET_H = @NEXT_AS_FIRST_DIRECTIVE_ARPA_INET_H@ +NEXT_AS_FIRST_DIRECTIVE_ASSERT_H = @NEXT_AS_FIRST_DIRECTIVE_ASSERT_H@ NEXT_AS_FIRST_DIRECTIVE_CTYPE_H = @NEXT_AS_FIRST_DIRECTIVE_CTYPE_H@ NEXT_AS_FIRST_DIRECTIVE_ERRNO_H = @NEXT_AS_FIRST_DIRECTIVE_ERRNO_H@ +NEXT_AS_FIRST_DIRECTIVE_ERROR_H = @NEXT_AS_FIRST_DIRECTIVE_ERROR_H@ NEXT_AS_FIRST_DIRECTIVE_FCNTL_H = @NEXT_AS_FIRST_DIRECTIVE_FCNTL_H@ NEXT_AS_FIRST_DIRECTIVE_GETOPT_H = @NEXT_AS_FIRST_DIRECTIVE_GETOPT_H@ NEXT_AS_FIRST_DIRECTIVE_INTTYPES_H = @NEXT_AS_FIRST_DIRECTIVE_INTTYPES_H@ @@ -1521,6 +1545,7 @@ NEXT_AS_FIRST_DIRECTIVE_WCHAR_H = @NEXT_AS_FIRST_DIRECTIVE_WCHAR_H@ NEXT_AS_FIRST_DIRECTIVE_WCTYPE_H = @NEXT_AS_FIRST_DIRECTIVE_WCTYPE_H@ NEXT_CTYPE_H = @NEXT_CTYPE_H@ NEXT_ERRNO_H = @NEXT_ERRNO_H@ +NEXT_ERROR_H = @NEXT_ERROR_H@ NEXT_FCNTL_H = @NEXT_FCNTL_H@ NEXT_GETOPT_H = @NEXT_GETOPT_H@ NEXT_INTTYPES_H = @NEXT_INTTYPES_H@ @@ -1576,6 +1601,7 @@ PRAGMA_COLUMNS = @PRAGMA_COLUMNS@ PRAGMA_SYSTEM_HEADER = @PRAGMA_SYSTEM_HEADER@ PRIPTR_PREFIX = @PRIPTR_PREFIX@ PTHREAD_H_DEFINES_STRUCT_TIMESPEC = @PTHREAD_H_DEFINES_STRUCT_TIMESPEC@ +PTHREAD_SIGMASK_LIB = @PTHREAD_SIGMASK_LIB@ PTRDIFF_T_SUFFIX = @PTRDIFF_T_SUFFIX@ RANLIB = @RANLIB@ REPLACE_ACCESS = @REPLACE_ACCESS@ @@ -1584,6 +1610,7 @@ REPLACE_BTOWC = @REPLACE_BTOWC@ REPLACE_CALLOC_FOR_CALLOC_GNU = @REPLACE_CALLOC_FOR_CALLOC_GNU@ REPLACE_CALLOC_FOR_CALLOC_POSIX = @REPLACE_CALLOC_FOR_CALLOC_POSIX@ REPLACE_CANONICALIZE_FILE_NAME = @REPLACE_CANONICALIZE_FILE_NAME@ +REPLACE_CHMOD = @REPLACE_CHMOD@ REPLACE_CHOWN = @REPLACE_CHOWN@ REPLACE_CLOSE = @REPLACE_CLOSE@ REPLACE_COPY_FILE_RANGE = @REPLACE_COPY_FILE_RANGE@ @@ -1592,7 +1619,10 @@ REPLACE_CTIME = @REPLACE_CTIME@ REPLACE_DPRINTF = @REPLACE_DPRINTF@ REPLACE_DUP = @REPLACE_DUP@ REPLACE_DUP2 = @REPLACE_DUP2@ +REPLACE_DUP3 = @REPLACE_DUP3@ REPLACE_DUPLOCALE = @REPLACE_DUPLOCALE@ +REPLACE_ERROR = @REPLACE_ERROR@ +REPLACE_ERROR_AT_LINE = @REPLACE_ERROR_AT_LINE@ REPLACE_EXECL = @REPLACE_EXECL@ REPLACE_EXECLE = @REPLACE_EXECLE@ REPLACE_EXECLP = @REPLACE_EXECLP@ @@ -1605,6 +1635,7 @@ REPLACE_FCHMODAT = @REPLACE_FCHMODAT@ REPLACE_FCHOWNAT = @REPLACE_FCHOWNAT@ REPLACE_FCLOSE = @REPLACE_FCLOSE@ REPLACE_FCNTL = @REPLACE_FCNTL@ +REPLACE_FDATASYNC = @REPLACE_FDATASYNC@ REPLACE_FDOPEN = @REPLACE_FDOPEN@ REPLACE_FFLUSH = @REPLACE_FFLUSH@ REPLACE_FFSLL = @REPLACE_FFSLL@ @@ -1627,15 +1658,21 @@ REPLACE_GETCWD = @REPLACE_GETCWD@ REPLACE_GETDELIM = @REPLACE_GETDELIM@ REPLACE_GETDOMAINNAME = @REPLACE_GETDOMAINNAME@ REPLACE_GETDTABLESIZE = @REPLACE_GETDTABLESIZE@ +REPLACE_GETENTROPY = @REPLACE_GETENTROPY@ REPLACE_GETGROUPS = @REPLACE_GETGROUPS@ REPLACE_GETLINE = @REPLACE_GETLINE@ +REPLACE_GETLOADAVG = @REPLACE_GETLOADAVG@ REPLACE_GETLOGIN_R = @REPLACE_GETLOGIN_R@ REPLACE_GETPAGESIZE = @REPLACE_GETPAGESIZE@ REPLACE_GETPASS = @REPLACE_GETPASS@ REPLACE_GETPASS_FOR_GETPASS_GNU = @REPLACE_GETPASS_FOR_GETPASS_GNU@ +REPLACE_GETPROGNAME = @REPLACE_GETPROGNAME@ REPLACE_GETRANDOM = @REPLACE_GETRANDOM@ +REPLACE_GETSUBOPT = @REPLACE_GETSUBOPT@ REPLACE_GETTIMEOFDAY = @REPLACE_GETTIMEOFDAY@ REPLACE_GMTIME = @REPLACE_GMTIME@ +REPLACE_IMAXABS = @REPLACE_IMAXABS@ +REPLACE_IMAXDIV = @REPLACE_IMAXDIV@ REPLACE_INET_NTOP = @REPLACE_INET_NTOP@ REPLACE_INET_PTON = @REPLACE_INET_PTON@ REPLACE_INITSTATE = @REPLACE_INITSTATE@ @@ -1664,11 +1701,14 @@ REPLACE_MBSTATE_T = @REPLACE_MBSTATE_T@ REPLACE_MBTOWC = @REPLACE_MBTOWC@ REPLACE_MEMCHR = @REPLACE_MEMCHR@ REPLACE_MEMMEM = @REPLACE_MEMMEM@ +REPLACE_MEMPCPY = @REPLACE_MEMPCPY@ REPLACE_MKDIR = @REPLACE_MKDIR@ REPLACE_MKFIFO = @REPLACE_MKFIFO@ REPLACE_MKFIFOAT = @REPLACE_MKFIFOAT@ REPLACE_MKNOD = @REPLACE_MKNOD@ REPLACE_MKNODAT = @REPLACE_MKNODAT@ +REPLACE_MKOSTEMP = @REPLACE_MKOSTEMP@ +REPLACE_MKOSTEMPS = @REPLACE_MKOSTEMPS@ REPLACE_MKSTEMP = @REPLACE_MKSTEMP@ REPLACE_MKTIME = @REPLACE_MKTIME@ REPLACE_NANOSLEEP = @REPLACE_NANOSLEEP@ @@ -1679,8 +1719,10 @@ REPLACE_OBSTACK_PRINTF = @REPLACE_OBSTACK_PRINTF@ REPLACE_OPEN = @REPLACE_OPEN@ REPLACE_OPENAT = @REPLACE_OPENAT@ REPLACE_PERROR = @REPLACE_PERROR@ +REPLACE_PIPE2 = @REPLACE_PIPE2@ REPLACE_POPEN = @REPLACE_POPEN@ REPLACE_POSIX_MEMALIGN = @REPLACE_POSIX_MEMALIGN@ +REPLACE_POSIX_OPENPT = @REPLACE_POSIX_OPENPT@ REPLACE_PREAD = @REPLACE_PREAD@ REPLACE_PRINTF = @REPLACE_PRINTF@ REPLACE_PSELECT = @REPLACE_PSELECT@ @@ -1758,6 +1800,7 @@ REPLACE_RMDIR = @REPLACE_RMDIR@ REPLACE_SCHED_YIELD = @REPLACE_SCHED_YIELD@ REPLACE_SELECT = @REPLACE_SELECT@ REPLACE_SETENV = @REPLACE_SETENV@ +REPLACE_SETHOSTNAME = @REPLACE_SETHOSTNAME@ REPLACE_SETLOCALE = @REPLACE_SETLOCALE@ REPLACE_SETSTATE = @REPLACE_SETSTATE@ REPLACE_SLEEP = @REPLACE_SLEEP@ @@ -1766,6 +1809,7 @@ REPLACE_SPRINTF = @REPLACE_SPRINTF@ REPLACE_STAT = @REPLACE_STAT@ REPLACE_STDIO_READ_FUNCS = @REPLACE_STDIO_READ_FUNCS@ REPLACE_STDIO_WRITE_FUNCS = @REPLACE_STDIO_WRITE_FUNCS@ +REPLACE_STPCPY = @REPLACE_STPCPY@ REPLACE_STPNCPY = @REPLACE_STPNCPY@ REPLACE_STRCASESTR = @REPLACE_STRCASESTR@ REPLACE_STRCHRNUL = @REPLACE_STRCHRNUL@ @@ -1792,7 +1836,9 @@ REPLACE_STRUCT_LCONV = @REPLACE_STRUCT_LCONV@ REPLACE_STRUCT_TIMEVAL = @REPLACE_STRUCT_TIMEVAL@ REPLACE_SYMLINK = @REPLACE_SYMLINK@ REPLACE_SYMLINKAT = @REPLACE_SYMLINKAT@ +REPLACE_TIME = @REPLACE_TIME@ REPLACE_TIMEGM = @REPLACE_TIMEGM@ +REPLACE_TIMESPEC_GET = @REPLACE_TIMESPEC_GET@ REPLACE_TMPFILE = @REPLACE_TMPFILE@ REPLACE_TOWLOWER = @REPLACE_TOWLOWER@ REPLACE_TRUNCATE = @REPLACE_TRUNCATE@ @@ -1818,15 +1864,20 @@ REPLACE_WCSWIDTH = @REPLACE_WCSWIDTH@ REPLACE_WCTOB = @REPLACE_WCTOB@ REPLACE_WCTOMB = @REPLACE_WCTOMB@ REPLACE_WCWIDTH = @REPLACE_WCWIDTH@ +REPLACE_WMEMPCPY = @REPLACE_WMEMPCPY@ REPLACE_WRITE = @REPLACE_WRITE@ +REPLACE__EXIT = @REPLACE__EXIT@ +SCHED_YIELD_LIB = @SCHED_YIELD_LIB@ SED = @SED@ +SELECT_LIB = @SELECT_LIB@ +SETLOCALE_LIB = @SETLOCALE_LIB@ +SETLOCALE_NULL_LIB = @SETLOCALE_NULL_LIB@ SET_MAKE = @SET_MAKE@ SHELL = @SHELL@ SIG_ATOMIC_T_SUFFIX = @SIG_ATOMIC_T_SUFFIX@ SIZE_T_SUFFIX = @SIZE_T_SUFFIX@ -STDALIGN_H = @STDALIGN_H@ STDARG_H = @STDARG_H@ -STDBOOL_H = @STDBOOL_H@ +STDCKDINT_H = @STDCKDINT_H@ STDDEF_H = @STDDEF_H@ STDINT_H = @STDINT_H@ STRIP = @STRIP@ @@ -1870,6 +1921,8 @@ am__quote = @am__quote@ am__tar = @am__tar@ am__untar = @am__untar@ bindir = @bindir@ +bindir_c = @bindir_c@ +bindir_c_make = @bindir_c_make@ build = @build@ build_alias = @build_alias@ build_cpu = @build_cpu@ @@ -1877,10 +1930,20 @@ build_os = @build_os@ build_vendor = @build_vendor@ builddir = @builddir@ datadir = @datadir@ +datadir_c = @datadir_c@ +datadir_c_make = @datadir_c_make@ datarootdir = @datarootdir@ +datarootdir_c = @datarootdir_c@ +datarootdir_c_make = @datarootdir_c_make@ docdir = @docdir@ +docdir_c = @docdir_c@ +docdir_c_make = @docdir_c_make@ dvidir = @dvidir@ +dvidir_c = @dvidir_c@ +dvidir_c_make = @dvidir_c_make@ exec_prefix = @exec_prefix@ +exec_prefix_c = @exec_prefix_c@ +exec_prefix_c_make = @exec_prefix_c_make@ gl_LIBOBJDEPS = @gl_LIBOBJDEPS@ gl_LIBOBJS = @gl_LIBOBJS@ gl_LTLIBOBJS = @gl_LTLIBOBJS@ @@ -1894,73 +1957,116 @@ host_cpu = @host_cpu@ host_os = @host_os@ host_vendor = @host_vendor@ htmldir = @htmldir@ +htmldir_c = @htmldir_c@ +htmldir_c_make = @htmldir_c_make@ includedir = @includedir@ +includedir_c = @includedir_c@ +includedir_c_make = @includedir_c_make@ infodir = @infodir@ +infodir_c = @infodir_c@ +infodir_c_make = @infodir_c_make@ install_sh = @install_sh@ libdir = @libdir@ +libdir_c = @libdir_c@ +libdir_c_make = @libdir_c_make@ libexecdir = @libexecdir@ +libexecdir_c = @libexecdir_c@ +libexecdir_c_make = @libexecdir_c_make@ lispdir = @lispdir@ +lispdir_c = @lispdir_c@ +lispdir_c_make = @lispdir_c_make@ localedir = @localedir@ +localedir_c = @localedir_c@ +localedir_c_make = @localedir_c_make@ localstatedir = @localstatedir@ +localstatedir_c = @localstatedir_c@ +localstatedir_c_make = @localstatedir_c_make@ mandir = @mandir@ +mandir_c = @mandir_c@ +mandir_c_make = @mandir_c_make@ mkdir_p = @mkdir_p@ oldincludedir = @oldincludedir@ +oldincludedir_c = @oldincludedir_c@ +oldincludedir_c_make = @oldincludedir_c_make@ pdfdir = @pdfdir@ +pdfdir_c = @pdfdir_c@ +pdfdir_c_make = @pdfdir_c_make@ +pkgdatadir_c = @pkgdatadir_c@ +pkgdatadir_c_make = @pkgdatadir_c_make@ +pkgincludedir_c = @pkgincludedir_c@ +pkgincludedir_c_make = @pkgincludedir_c_make@ +pkglibdir_c = @pkglibdir_c@ +pkglibdir_c_make = @pkglibdir_c_make@ +pkglibexecdir_c = @pkglibexecdir_c@ +pkglibexecdir_c_make = @pkglibexecdir_c_make@ prefix = @prefix@ +prefix_c = @prefix_c@ +prefix_c_make = @prefix_c_make@ program_transform_name = @program_transform_name@ psdir = @psdir@ +psdir_c = @psdir_c@ +psdir_c_make = @psdir_c_make@ runstatedir = @runstatedir@ +runstatedir_c = @runstatedir_c@ +runstatedir_c_make = @runstatedir_c_make@ sbindir = @sbindir@ +sbindir_c = @sbindir_c@ +sbindir_c_make = @sbindir_c_make@ sharedstatedir = @sharedstatedir@ +sharedstatedir_c = @sharedstatedir_c@ +sharedstatedir_c_make = @sharedstatedir_c_make@ srcdir = @srcdir@ sysconfdir = @sysconfdir@ +sysconfdir_c = @sysconfdir_c@ +sysconfdir_c_make = @sysconfdir_c_make@ target_alias = @target_alias@ top_build_prefix = @top_build_prefix@ top_builddir = @top_builddir@ top_srcdir = @top_srcdir@ AM_CFLAGS = $(GNULIB_WARN_CFLAGS) $(WERROR_CFLAGS) AM_CPPFLAGS = -BUILT_SOURCES = $(ALLOCA_H) configmake.h malloc/dynarray.gl.h \ - malloc/dynarray-skeleton.gl.h $(ERRNO_H) fcntl.h $(GETOPT_H) \ - $(GETOPT_CDEFS_H) inttypes.h langinfo.h $(LIMITS_H) locale.h \ - malloc/scratch_buffer.gl.h $(STDALIGN_H) $(STDARG_H) \ - $(STDBOOL_H) $(STDDEF_H) $(STDINT_H) stdio.h stdlib.h string.h \ - sys/random.h sys/stat.h sys/types.h time.h unistd.h wchar.h \ - wctype.h +BUILT_SOURCES = $(ALLOCA_H) $(ASSERT_H) configmake.h $(ERRNO_H) \ + $(ERROR_H) fcntl.h $(GETOPT_H) $(GETOPT_CDEFS_H) \ + malloc/dynarray.gl.h malloc/dynarray-skeleton.gl.h \ + malloc/scratch_buffer.gl.h inttypes.h langinfo.h $(LIMITS_H) \ + locale.h $(STDARG_H) $(STDCKDINT_H) $(STDDEF_H) $(STDINT_H) \ + stdio.h stdlib.h string.h sys/random.h sys/stat.h sys/types.h \ + time.h unistd.h wchar.h wctype.h CLEANFILES = configmake.h configmake.h-t EXTRA_DIST = alloca.c alloca.in.h $(top_srcdir)/build-aux/announce-gen \ - argmatch.h assure.h attribute.h basename-lgpl.h c-strcaseeq.h \ - calloc.c calloc.c cloexec.h close-stream.h closeout.h \ - stripslash.c dirname.h \ - $(top_srcdir)/build-aux/do-release-commit-and-tag dynarray.h \ - malloc/dynarray-skeleton.c malloc/dynarray.h eloop-threshold.h \ - errno.in.h error.h exitfail.h fcntl.in.h fd-hook.h filename.h \ - fpending.h stdio-impl.h stat-w32.c stat-w32.h \ - $(top_srcdir)/build-aux/gendocs.sh getopt-cdefs.in.h \ - getopt-core.h getopt-ext.h getopt-pfx-core.h getopt-pfx-ext.h \ - getopt.in.h getopt_int.h \ + argmatch.h assert.in.h verify.h assure.h attribute.h \ + basename-lgpl.h c-strcaseeq.h calloc.c calloc.c cloexec.h \ + close-stream.h closeout.h stripslash.c dirname.h \ + $(top_srcdir)/build-aux/do-release-commit-and-tag \ + eloop-threshold.h errno.in.h error.in.h exitfail.h fcntl.in.h \ + fd-hook.h filename.h fpending.h stdio-impl.h stat-w32.c \ + stat-w32.h $(top_srcdir)/build-aux/gendocs.sh \ + getopt-cdefs.in.h getopt-core.h getopt-ext.h getopt-pfx-core.h \ + getopt-pfx-ext.h getopt.in.h getopt_int.h getprogname.h \ $(top_srcdir)/build-aux/git-version-gen \ - $(top_srcdir)/build-aux/gitlog-to-changelog \ + $(top_srcdir)/build-aux/gitlog-to-changelog dynarray.h \ + malloc/dynarray-skeleton.c malloc/dynarray.h \ + malloc/scratch_buffer.h scratch_buffer.h \ $(top_srcdir)/build-aux/gnu-web-doc-update \ $(top_srcdir)/GNUmakefile $(top_srcdir)/build-aux/gnupload \ - hard-locale.h ialloc.h intprops.h inttypes.in.h langinfo.in.h \ - cdefs.h libc-config.h limits.in.h localcharset.h locale.in.h \ - long-options.h $(top_srcdir)/maint.mk malloc.c malloc.c \ - malloca.h lc-charset-dispatch.c lc-charset-dispatch.h \ + hard-locale.h ialloc.h intprops-internal.h intprops.h \ + inttypes.in.h langinfo.in.h cdefs.h libc-config.h limits.in.h \ + localcharset.h locale.in.h long-options.h \ + $(top_srcdir)/maint.mk malloc.c malloc.c malloca.h \ + lc-charset-dispatch.c lc-charset-dispatch.h \ mbrtowc-impl-utf8.h mbrtowc-impl.h mbtowc-lock.c mbtowc-lock.h \ windows-initguard.h mbtowc-impl.h \ $(top_srcdir)/build-aux/mktempd msvc-inval.h msvc-nothrow.h \ windows-initguard.h pathmax.h quote.h quote.h quotearg.h \ rawmemchr.valgrind realloc.c realloc.c regcomp.c regex.h \ regex_internal.c regex_internal.h regexec.c safe-read.h \ - sys-limits.h malloc/scratch_buffer.h scratch_buffer.h \ - setlocale_null.h windows-initguard.h _Noreturn.h arg-nonnull.h \ - c++defs.h warn-on-use.h stat-w32.c stat-w32.h stat-time.h \ - stdalign.in.h stdarg.in.h stdbool.in.h stddef.in.h stdint.in.h \ - stdio.in.h stdlib.in.h streq.h strerror-override.h string.in.h \ - strtol.c strtol.c strtoul.c sys_random.in.h sys_stat.in.h \ - sys_types.in.h tempname.h time.in.h unistd.in.h \ - $(top_srcdir)/build-aux/update-copyright \ + sys-limits.h setlocale_null.h windows-initguard.h _Noreturn.h \ + arg-nonnull.h c++defs.h warn-on-use.h stat-w32.c stat-w32.h \ + stat-time.h stdarg.in.h intprops-internal.h stdckdint.in.h \ + stddef.in.h stdint.in.h stdio.in.h stdlib.in.h streq.h \ + strerror-override.h string.in.h strtol.c strtol.c strtoul.c \ + sys_random.in.h sys_stat.in.h sys_types.in.h tempname.h \ + time.in.h unistd.in.h $(top_srcdir)/build-aux/update-copyright \ $(top_srcdir)/build-aux/useless-if-before-free \ $(top_srcdir)/build-aux/vc-list-files verify.h wchar.in.h \ wctype.in.h windows-initguard.h windows-mutex.h windows-once.h \ @@ -1969,19 +2075,19 @@ EXTRA_DIST = alloca.c alloca.in.h $(top_srcdir)/build-aux/announce-gen \ xstrtol.h MAINTAINERCLEANFILES = MOSTLYCLEANDIRS = sys sys -MOSTLYCLEANFILES = core *.stackdump alloca.h alloca.h-t \ +MOSTLYCLEANFILES = core *.stackdump alloca.h alloca.h-t assert.h \ + assert.h-t errno.h errno.h-t error.h error.h-t fcntl.h \ + fcntl.h-t getopt.h getopt.h-t getopt-cdefs.h getopt-cdefs.h-t \ malloc/dynarray.gl.h malloc/dynarray.gl.h-t \ malloc/dynarray-skeleton.gl.h malloc/dynarray-skeleton.gl.h-t \ - errno.h errno.h-t fcntl.h fcntl.h-t getopt.h getopt.h-t \ - getopt-cdefs.h getopt-cdefs.h-t inttypes.h inttypes.h-t \ - langinfo.h langinfo.h-t limits.h limits.h-t locale.h \ - locale.h-t malloc/scratch_buffer.gl.h \ - malloc/scratch_buffer.gl.h-t stdalign.h stdalign.h-t stdarg.h \ - stdarg.h-t stdbool.h stdbool.h-t stddef.h stddef.h-t stdint.h \ - stdint.h-t stdio.h stdio.h-t stdlib.h stdlib.h-t string.h \ - string.h-t sys/random.h sys/random.h-t sys/stat.h sys/stat.h-t \ - sys/types.h sys/types.h-t time.h time.h-t unistd.h unistd.h-t \ - wchar.h wchar.h-t wctype.h wctype.h-t + malloc/scratch_buffer.gl.h malloc/scratch_buffer.gl.h-t \ + inttypes.h inttypes.h-t langinfo.h langinfo.h-t limits.h \ + limits.h-t locale.h locale.h-t stdarg.h stdarg.h-t stdckdint.h \ + stdckdint.h-t stddef.h stddef.h-t stdint.h stdint.h-t stdio.h \ + stdio.h-t stdlib.h stdlib.h-t string.h string.h-t sys/random.h \ + sys/random.h-t sys/stat.h sys/stat.h-t sys/types.h \ + sys/types.h-t time.h time.h-t unistd.h unistd.h-t wchar.h \ + wchar.h-t wctype.h wctype.h-t SUFFIXES = # No GNU Make output. noinst_LTLIBRARIES = libgnulib.la @@ -1989,44 +2095,43 @@ libgnulib_la_SOURCES = argmatch.c basename-lgpl.c $(am__append_1) \ c-ctype.h c-ctype.c c-strcase.h c-strcasecmp.c c-strncasecmp.c \ $(am__append_2) cloexec.c $(am__append_3) close-stream.c \ closeout.c dirname.c basename.c dirname-lgpl.c stripslash.c \ - $(am__append_4) malloc/dynarray_at_failure.c \ - malloc/dynarray_emplace_enlarge.c malloc/dynarray_finalize.c \ - malloc/dynarray_resize.c malloc/dynarray_resize_clear.c \ - $(am__append_5) exitfail.c $(am__append_6) fd-hook.c \ - $(am__append_7) $(am__append_8) $(am__append_9) \ + $(am__append_4) $(am__append_5) exitfail.c $(am__append_6) \ + fd-hook.c $(am__append_7) $(am__append_8) $(am__append_9) \ $(am__append_10) $(am__append_11) $(am__append_12) \ - getprogname.h getprogname.c $(am__append_13) gettext.h \ - hard-locale.c ialloc.c idx.h localcharset.c $(am__append_14) \ - glthread/lock.h glthread/lock.c long-options.c \ - $(am__append_15) $(am__append_16) malloca.c $(am__append_17) \ - $(am__append_18) $(am__append_19) $(am__append_20) minmax.h \ - $(am__append_21) $(am__append_22) $(am__append_23) \ - $(am__append_24) $(am__append_25) $(am__append_26) \ - $(am__append_27) progname.h progname.c quotearg.c \ - $(am__append_28) $(am__append_29) $(am__append_30) \ - $(am__append_31) $(am__append_32) $(am__append_33) safe-read.c \ - malloc/scratch_buffer_dupfree.c malloc/scratch_buffer_grow.c \ + $(am__append_13) $(am__append_14) gettext.h \ + malloc/dynarray_at_failure.c malloc/dynarray_emplace_enlarge.c \ + malloc/dynarray_finalize.c malloc/dynarray_resize.c \ + malloc/dynarray_resize_clear.c malloc/scratch_buffer_grow.c \ malloc/scratch_buffer_grow_preserve.c \ - malloc/scratch_buffer_set_array_size.c setlocale_null.c \ - $(am__append_34) $(am__append_35) $(am__append_36) stat-time.c \ - $(am__append_37) $(am__append_38) $(am__append_39) \ - $(am__append_40) $(am__append_41) $(am__append_42) \ - $(am__append_43) tempname.c glthread/threadlib.c unistd.c \ - $(am__append_44) $(am__append_45) version-etc.h version-etc.c \ - version-etc-fsf.c $(am__append_46) wctype-h.c $(am__append_47) \ - $(am__append_48) $(am__append_49) $(am__append_50) xmalloc.c \ - xalloc-die.c xstrtol.c xstrtoul.c xstrtoll.c xstrtoull.c + malloc/scratch_buffer_set_array_size.c hard-locale.c ialloc.c \ + idx.h localcharset.c $(am__append_15) glthread/lock.h \ + glthread/lock.c long-options.c $(am__append_16) \ + $(am__append_17) malloca.c $(am__append_18) $(am__append_19) \ + $(am__append_20) $(am__append_21) minmax.h $(am__append_22) \ + $(am__append_23) $(am__append_24) $(am__append_25) \ + $(am__append_26) $(am__append_27) $(am__append_28) progname.h \ + progname.c quotearg.c $(am__append_29) $(am__append_30) \ + $(am__append_31) $(am__append_32) $(am__append_33) \ + $(am__append_34) safe-read.c setlocale_null.c $(am__append_35) \ + $(am__append_36) $(am__append_37) stat-time.c $(am__append_38) \ + $(am__append_39) $(am__append_40) $(am__append_41) \ + $(am__append_42) $(am__append_43) $(am__append_44) tempname.c \ + glthread/threadlib.c unistd.c $(am__append_45) \ + $(am__append_46) version-etc.h version-etc.c version-etc-fsf.c \ + $(am__append_47) wctype-h.c $(am__append_48) $(am__append_49) \ + $(am__append_50) $(am__append_51) xmalloc.c xalloc-die.c \ + xstrtol.c xstrtoul.c xstrtoll.c xstrtoull.c libgnulib_la_CFLAGS = $(AM_CFLAGS) $(GL_CFLAG_GNULIB_WARNINGS) libgnulib_la_LIBADD = $(gl_LTLIBOBJS) @LTALLOCA@ libgnulib_la_DEPENDENCIES = $(gl_LTLIBOBJS) @LTALLOCA@ EXTRA_libgnulib_la_SOURCES = alloca.c calloc.c calloc.c stripslash.c \ - malloc/dynarray-skeleton.c stat-w32.c malloc.c malloc.c \ + stat-w32.c malloc/dynarray-skeleton.c malloc.c malloc.c \ lc-charset-dispatch.c mbtowc-lock.c realloc.c realloc.c \ regcomp.c regex_internal.c regexec.c stat-w32.c strtol.c \ strtol.c strtoul.c -libgnulib_la_LDFLAGS = $(AM_LDFLAGS) -no-undefined $(LIBTHREAD) \ - $(LIB_CLOCK_GETTIME) $(LIB_GETRANDOM) $(LIB_HARD_LOCALE) \ - $(LIB_MBRTOWC) $(LIB_SETLOCALE_NULL) $(LTLIBINTL) +libgnulib_la_LDFLAGS = $(AM_LDFLAGS) -no-undefined $(CLOCK_TIME_LIB) \ + $(GETRANDOM_LIB) $(HARD_LOCALE_LIB) $(LIBTHREAD) $(LTLIBINTL) \ + $(MBRTOWC_LIB) $(SETLOCALE_NULL_LIB) # Use this preprocessor expression to decide whether #include_next works. # Do not rely on a 'configure'-time test for this, since the expression @@ -2144,6 +2249,12 @@ malloc/libgnulib_la-dynarray_resize.lo: malloc/$(am__dirstamp) \ malloc/$(DEPDIR)/$(am__dirstamp) malloc/libgnulib_la-dynarray_resize_clear.lo: malloc/$(am__dirstamp) \ malloc/$(DEPDIR)/$(am__dirstamp) +malloc/libgnulib_la-scratch_buffer_grow.lo: malloc/$(am__dirstamp) \ + malloc/$(DEPDIR)/$(am__dirstamp) +malloc/libgnulib_la-scratch_buffer_grow_preserve.lo: \ + malloc/$(am__dirstamp) malloc/$(DEPDIR)/$(am__dirstamp) +malloc/libgnulib_la-scratch_buffer_set_array_size.lo: \ + malloc/$(am__dirstamp) malloc/$(DEPDIR)/$(am__dirstamp) glthread/$(am__dirstamp): @$(MKDIR_P) glthread @: > glthread/$(am__dirstamp) @@ -2152,14 +2263,6 @@ glthread/$(DEPDIR)/$(am__dirstamp): @: > glthread/$(DEPDIR)/$(am__dirstamp) glthread/libgnulib_la-lock.lo: glthread/$(am__dirstamp) \ glthread/$(DEPDIR)/$(am__dirstamp) -malloc/libgnulib_la-scratch_buffer_dupfree.lo: malloc/$(am__dirstamp) \ - malloc/$(DEPDIR)/$(am__dirstamp) -malloc/libgnulib_la-scratch_buffer_grow.lo: malloc/$(am__dirstamp) \ - malloc/$(DEPDIR)/$(am__dirstamp) -malloc/libgnulib_la-scratch_buffer_grow_preserve.lo: \ - malloc/$(am__dirstamp) malloc/$(DEPDIR)/$(am__dirstamp) -malloc/libgnulib_la-scratch_buffer_set_array_size.lo: \ - malloc/$(am__dirstamp) malloc/$(DEPDIR)/$(am__dirstamp) glthread/libgnulib_la-threadlib.lo: glthread/$(am__dirstamp) \ glthread/$(DEPDIR)/$(am__dirstamp) malloc/libgnulib_la-dynarray-skeleton.lo: malloc/$(am__dirstamp) \ @@ -2286,7 +2389,6 @@ distclean-compile: @AMDEP_TRUE@@am__include@ @am__quote@malloc/$(DEPDIR)/libgnulib_la-dynarray_finalize.Plo@am__quote@ # am--include-marker @AMDEP_TRUE@@am__include@ @am__quote@malloc/$(DEPDIR)/libgnulib_la-dynarray_resize.Plo@am__quote@ # am--include-marker @AMDEP_TRUE@@am__include@ @am__quote@malloc/$(DEPDIR)/libgnulib_la-dynarray_resize_clear.Plo@am__quote@ # am--include-marker -@AMDEP_TRUE@@am__include@ @am__quote@malloc/$(DEPDIR)/libgnulib_la-scratch_buffer_dupfree.Plo@am__quote@ # am--include-marker @AMDEP_TRUE@@am__include@ @am__quote@malloc/$(DEPDIR)/libgnulib_la-scratch_buffer_grow.Plo@am__quote@ # am--include-marker @AMDEP_TRUE@@am__include@ @am__quote@malloc/$(DEPDIR)/libgnulib_la-scratch_buffer_grow_preserve.Plo@am__quote@ # am--include-marker @AMDEP_TRUE@@am__include@ @am__quote@malloc/$(DEPDIR)/libgnulib_la-scratch_buffer_set_array_size.Plo@am__quote@ # am--include-marker @@ -2433,41 +2535,6 @@ libgnulib_la-dup2.lo: dup2.c @AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ @am__fastdepCC_FALSE@ $(AM_V_CC@am__nodep@)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libgnulib_la_CFLAGS) $(CFLAGS) -c -o libgnulib_la-dup2.lo `test -f 'dup2.c' || echo '$(srcdir)/'`dup2.c -malloc/libgnulib_la-dynarray_at_failure.lo: malloc/dynarray_at_failure.c -@am__fastdepCC_TRUE@ $(AM_V_CC)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libgnulib_la_CFLAGS) $(CFLAGS) -MT malloc/libgnulib_la-dynarray_at_failure.lo -MD -MP -MF malloc/$(DEPDIR)/libgnulib_la-dynarray_at_failure.Tpo -c -o malloc/libgnulib_la-dynarray_at_failure.lo `test -f 'malloc/dynarray_at_failure.c' || echo '$(srcdir)/'`malloc/dynarray_at_failure.c -@am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) malloc/$(DEPDIR)/libgnulib_la-dynarray_at_failure.Tpo malloc/$(DEPDIR)/libgnulib_la-dynarray_at_failure.Plo -@AMDEP_TRUE@@am__fastdepCC_FALSE@ $(AM_V_CC)source='malloc/dynarray_at_failure.c' object='malloc/libgnulib_la-dynarray_at_failure.lo' libtool=yes @AMDEPBACKSLASH@ -@AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ -@am__fastdepCC_FALSE@ $(AM_V_CC@am__nodep@)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libgnulib_la_CFLAGS) $(CFLAGS) -c -o malloc/libgnulib_la-dynarray_at_failure.lo `test -f 'malloc/dynarray_at_failure.c' || echo '$(srcdir)/'`malloc/dynarray_at_failure.c - -malloc/libgnulib_la-dynarray_emplace_enlarge.lo: malloc/dynarray_emplace_enlarge.c -@am__fastdepCC_TRUE@ $(AM_V_CC)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libgnulib_la_CFLAGS) $(CFLAGS) -MT malloc/libgnulib_la-dynarray_emplace_enlarge.lo -MD -MP -MF malloc/$(DEPDIR)/libgnulib_la-dynarray_emplace_enlarge.Tpo -c -o malloc/libgnulib_la-dynarray_emplace_enlarge.lo `test -f 'malloc/dynarray_emplace_enlarge.c' || echo '$(srcdir)/'`malloc/dynarray_emplace_enlarge.c -@am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) malloc/$(DEPDIR)/libgnulib_la-dynarray_emplace_enlarge.Tpo malloc/$(DEPDIR)/libgnulib_la-dynarray_emplace_enlarge.Plo -@AMDEP_TRUE@@am__fastdepCC_FALSE@ $(AM_V_CC)source='malloc/dynarray_emplace_enlarge.c' object='malloc/libgnulib_la-dynarray_emplace_enlarge.lo' libtool=yes @AMDEPBACKSLASH@ -@AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ -@am__fastdepCC_FALSE@ $(AM_V_CC@am__nodep@)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libgnulib_la_CFLAGS) $(CFLAGS) -c -o malloc/libgnulib_la-dynarray_emplace_enlarge.lo `test -f 'malloc/dynarray_emplace_enlarge.c' || echo '$(srcdir)/'`malloc/dynarray_emplace_enlarge.c - -malloc/libgnulib_la-dynarray_finalize.lo: malloc/dynarray_finalize.c -@am__fastdepCC_TRUE@ $(AM_V_CC)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libgnulib_la_CFLAGS) $(CFLAGS) -MT malloc/libgnulib_la-dynarray_finalize.lo -MD -MP -MF malloc/$(DEPDIR)/libgnulib_la-dynarray_finalize.Tpo -c -o malloc/libgnulib_la-dynarray_finalize.lo `test -f 'malloc/dynarray_finalize.c' || echo '$(srcdir)/'`malloc/dynarray_finalize.c -@am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) malloc/$(DEPDIR)/libgnulib_la-dynarray_finalize.Tpo malloc/$(DEPDIR)/libgnulib_la-dynarray_finalize.Plo -@AMDEP_TRUE@@am__fastdepCC_FALSE@ $(AM_V_CC)source='malloc/dynarray_finalize.c' object='malloc/libgnulib_la-dynarray_finalize.lo' libtool=yes @AMDEPBACKSLASH@ -@AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ -@am__fastdepCC_FALSE@ $(AM_V_CC@am__nodep@)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libgnulib_la_CFLAGS) $(CFLAGS) -c -o malloc/libgnulib_la-dynarray_finalize.lo `test -f 'malloc/dynarray_finalize.c' || echo '$(srcdir)/'`malloc/dynarray_finalize.c - -malloc/libgnulib_la-dynarray_resize.lo: malloc/dynarray_resize.c -@am__fastdepCC_TRUE@ $(AM_V_CC)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libgnulib_la_CFLAGS) $(CFLAGS) -MT malloc/libgnulib_la-dynarray_resize.lo -MD -MP -MF malloc/$(DEPDIR)/libgnulib_la-dynarray_resize.Tpo -c -o malloc/libgnulib_la-dynarray_resize.lo `test -f 'malloc/dynarray_resize.c' || echo '$(srcdir)/'`malloc/dynarray_resize.c -@am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) malloc/$(DEPDIR)/libgnulib_la-dynarray_resize.Tpo malloc/$(DEPDIR)/libgnulib_la-dynarray_resize.Plo -@AMDEP_TRUE@@am__fastdepCC_FALSE@ $(AM_V_CC)source='malloc/dynarray_resize.c' object='malloc/libgnulib_la-dynarray_resize.lo' libtool=yes @AMDEPBACKSLASH@ -@AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ -@am__fastdepCC_FALSE@ $(AM_V_CC@am__nodep@)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libgnulib_la_CFLAGS) $(CFLAGS) -c -o malloc/libgnulib_la-dynarray_resize.lo `test -f 'malloc/dynarray_resize.c' || echo '$(srcdir)/'`malloc/dynarray_resize.c - -malloc/libgnulib_la-dynarray_resize_clear.lo: malloc/dynarray_resize_clear.c -@am__fastdepCC_TRUE@ $(AM_V_CC)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libgnulib_la_CFLAGS) $(CFLAGS) -MT malloc/libgnulib_la-dynarray_resize_clear.lo -MD -MP -MF malloc/$(DEPDIR)/libgnulib_la-dynarray_resize_clear.Tpo -c -o malloc/libgnulib_la-dynarray_resize_clear.lo `test -f 'malloc/dynarray_resize_clear.c' || echo '$(srcdir)/'`malloc/dynarray_resize_clear.c -@am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) malloc/$(DEPDIR)/libgnulib_la-dynarray_resize_clear.Tpo malloc/$(DEPDIR)/libgnulib_la-dynarray_resize_clear.Plo -@AMDEP_TRUE@@am__fastdepCC_FALSE@ $(AM_V_CC)source='malloc/dynarray_resize_clear.c' object='malloc/libgnulib_la-dynarray_resize_clear.lo' libtool=yes @AMDEPBACKSLASH@ -@AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ -@am__fastdepCC_FALSE@ $(AM_V_CC@am__nodep@)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libgnulib_la_CFLAGS) $(CFLAGS) -c -o malloc/libgnulib_la-dynarray_resize_clear.lo `test -f 'malloc/dynarray_resize_clear.c' || echo '$(srcdir)/'`malloc/dynarray_resize_clear.c - libgnulib_la-error.lo: error.c @am__fastdepCC_TRUE@ $(AM_V_CC)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libgnulib_la_CFLAGS) $(CFLAGS) -MT libgnulib_la-error.lo -MD -MP -MF $(DEPDIR)/libgnulib_la-error.Tpo -c -o libgnulib_la-error.lo `test -f 'error.c' || echo '$(srcdir)/'`error.c @am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/libgnulib_la-error.Tpo $(DEPDIR)/libgnulib_la-error.Plo @@ -2559,6 +2626,62 @@ libgnulib_la-getrandom.lo: getrandom.c @AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ @am__fastdepCC_FALSE@ $(AM_V_CC@am__nodep@)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libgnulib_la_CFLAGS) $(CFLAGS) -c -o libgnulib_la-getrandom.lo `test -f 'getrandom.c' || echo '$(srcdir)/'`getrandom.c +malloc/libgnulib_la-dynarray_at_failure.lo: malloc/dynarray_at_failure.c +@am__fastdepCC_TRUE@ $(AM_V_CC)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libgnulib_la_CFLAGS) $(CFLAGS) -MT malloc/libgnulib_la-dynarray_at_failure.lo -MD -MP -MF malloc/$(DEPDIR)/libgnulib_la-dynarray_at_failure.Tpo -c -o malloc/libgnulib_la-dynarray_at_failure.lo `test -f 'malloc/dynarray_at_failure.c' || echo '$(srcdir)/'`malloc/dynarray_at_failure.c +@am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) malloc/$(DEPDIR)/libgnulib_la-dynarray_at_failure.Tpo malloc/$(DEPDIR)/libgnulib_la-dynarray_at_failure.Plo +@AMDEP_TRUE@@am__fastdepCC_FALSE@ $(AM_V_CC)source='malloc/dynarray_at_failure.c' object='malloc/libgnulib_la-dynarray_at_failure.lo' libtool=yes @AMDEPBACKSLASH@ +@AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ +@am__fastdepCC_FALSE@ $(AM_V_CC@am__nodep@)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libgnulib_la_CFLAGS) $(CFLAGS) -c -o malloc/libgnulib_la-dynarray_at_failure.lo `test -f 'malloc/dynarray_at_failure.c' || echo '$(srcdir)/'`malloc/dynarray_at_failure.c + +malloc/libgnulib_la-dynarray_emplace_enlarge.lo: malloc/dynarray_emplace_enlarge.c +@am__fastdepCC_TRUE@ $(AM_V_CC)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libgnulib_la_CFLAGS) $(CFLAGS) -MT malloc/libgnulib_la-dynarray_emplace_enlarge.lo -MD -MP -MF malloc/$(DEPDIR)/libgnulib_la-dynarray_emplace_enlarge.Tpo -c -o malloc/libgnulib_la-dynarray_emplace_enlarge.lo `test -f 'malloc/dynarray_emplace_enlarge.c' || echo '$(srcdir)/'`malloc/dynarray_emplace_enlarge.c +@am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) malloc/$(DEPDIR)/libgnulib_la-dynarray_emplace_enlarge.Tpo malloc/$(DEPDIR)/libgnulib_la-dynarray_emplace_enlarge.Plo +@AMDEP_TRUE@@am__fastdepCC_FALSE@ $(AM_V_CC)source='malloc/dynarray_emplace_enlarge.c' object='malloc/libgnulib_la-dynarray_emplace_enlarge.lo' libtool=yes @AMDEPBACKSLASH@ +@AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ +@am__fastdepCC_FALSE@ $(AM_V_CC@am__nodep@)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libgnulib_la_CFLAGS) $(CFLAGS) -c -o malloc/libgnulib_la-dynarray_emplace_enlarge.lo `test -f 'malloc/dynarray_emplace_enlarge.c' || echo '$(srcdir)/'`malloc/dynarray_emplace_enlarge.c + +malloc/libgnulib_la-dynarray_finalize.lo: malloc/dynarray_finalize.c +@am__fastdepCC_TRUE@ $(AM_V_CC)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libgnulib_la_CFLAGS) $(CFLAGS) -MT malloc/libgnulib_la-dynarray_finalize.lo -MD -MP -MF malloc/$(DEPDIR)/libgnulib_la-dynarray_finalize.Tpo -c -o malloc/libgnulib_la-dynarray_finalize.lo `test -f 'malloc/dynarray_finalize.c' || echo '$(srcdir)/'`malloc/dynarray_finalize.c +@am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) malloc/$(DEPDIR)/libgnulib_la-dynarray_finalize.Tpo malloc/$(DEPDIR)/libgnulib_la-dynarray_finalize.Plo +@AMDEP_TRUE@@am__fastdepCC_FALSE@ $(AM_V_CC)source='malloc/dynarray_finalize.c' object='malloc/libgnulib_la-dynarray_finalize.lo' libtool=yes @AMDEPBACKSLASH@ +@AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ +@am__fastdepCC_FALSE@ $(AM_V_CC@am__nodep@)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libgnulib_la_CFLAGS) $(CFLAGS) -c -o malloc/libgnulib_la-dynarray_finalize.lo `test -f 'malloc/dynarray_finalize.c' || echo '$(srcdir)/'`malloc/dynarray_finalize.c + +malloc/libgnulib_la-dynarray_resize.lo: malloc/dynarray_resize.c +@am__fastdepCC_TRUE@ $(AM_V_CC)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libgnulib_la_CFLAGS) $(CFLAGS) -MT malloc/libgnulib_la-dynarray_resize.lo -MD -MP -MF malloc/$(DEPDIR)/libgnulib_la-dynarray_resize.Tpo -c -o malloc/libgnulib_la-dynarray_resize.lo `test -f 'malloc/dynarray_resize.c' || echo '$(srcdir)/'`malloc/dynarray_resize.c +@am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) malloc/$(DEPDIR)/libgnulib_la-dynarray_resize.Tpo malloc/$(DEPDIR)/libgnulib_la-dynarray_resize.Plo +@AMDEP_TRUE@@am__fastdepCC_FALSE@ $(AM_V_CC)source='malloc/dynarray_resize.c' object='malloc/libgnulib_la-dynarray_resize.lo' libtool=yes @AMDEPBACKSLASH@ +@AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ +@am__fastdepCC_FALSE@ $(AM_V_CC@am__nodep@)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libgnulib_la_CFLAGS) $(CFLAGS) -c -o malloc/libgnulib_la-dynarray_resize.lo `test -f 'malloc/dynarray_resize.c' || echo '$(srcdir)/'`malloc/dynarray_resize.c + +malloc/libgnulib_la-dynarray_resize_clear.lo: malloc/dynarray_resize_clear.c +@am__fastdepCC_TRUE@ $(AM_V_CC)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libgnulib_la_CFLAGS) $(CFLAGS) -MT malloc/libgnulib_la-dynarray_resize_clear.lo -MD -MP -MF malloc/$(DEPDIR)/libgnulib_la-dynarray_resize_clear.Tpo -c -o malloc/libgnulib_la-dynarray_resize_clear.lo `test -f 'malloc/dynarray_resize_clear.c' || echo '$(srcdir)/'`malloc/dynarray_resize_clear.c +@am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) malloc/$(DEPDIR)/libgnulib_la-dynarray_resize_clear.Tpo malloc/$(DEPDIR)/libgnulib_la-dynarray_resize_clear.Plo +@AMDEP_TRUE@@am__fastdepCC_FALSE@ $(AM_V_CC)source='malloc/dynarray_resize_clear.c' object='malloc/libgnulib_la-dynarray_resize_clear.lo' libtool=yes @AMDEPBACKSLASH@ +@AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ +@am__fastdepCC_FALSE@ $(AM_V_CC@am__nodep@)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libgnulib_la_CFLAGS) $(CFLAGS) -c -o malloc/libgnulib_la-dynarray_resize_clear.lo `test -f 'malloc/dynarray_resize_clear.c' || echo '$(srcdir)/'`malloc/dynarray_resize_clear.c + +malloc/libgnulib_la-scratch_buffer_grow.lo: malloc/scratch_buffer_grow.c +@am__fastdepCC_TRUE@ $(AM_V_CC)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libgnulib_la_CFLAGS) $(CFLAGS) -MT malloc/libgnulib_la-scratch_buffer_grow.lo -MD -MP -MF malloc/$(DEPDIR)/libgnulib_la-scratch_buffer_grow.Tpo -c -o malloc/libgnulib_la-scratch_buffer_grow.lo `test -f 'malloc/scratch_buffer_grow.c' || echo '$(srcdir)/'`malloc/scratch_buffer_grow.c +@am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) malloc/$(DEPDIR)/libgnulib_la-scratch_buffer_grow.Tpo malloc/$(DEPDIR)/libgnulib_la-scratch_buffer_grow.Plo +@AMDEP_TRUE@@am__fastdepCC_FALSE@ $(AM_V_CC)source='malloc/scratch_buffer_grow.c' object='malloc/libgnulib_la-scratch_buffer_grow.lo' libtool=yes @AMDEPBACKSLASH@ +@AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ +@am__fastdepCC_FALSE@ $(AM_V_CC@am__nodep@)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libgnulib_la_CFLAGS) $(CFLAGS) -c -o malloc/libgnulib_la-scratch_buffer_grow.lo `test -f 'malloc/scratch_buffer_grow.c' || echo '$(srcdir)/'`malloc/scratch_buffer_grow.c + +malloc/libgnulib_la-scratch_buffer_grow_preserve.lo: malloc/scratch_buffer_grow_preserve.c +@am__fastdepCC_TRUE@ $(AM_V_CC)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libgnulib_la_CFLAGS) $(CFLAGS) -MT malloc/libgnulib_la-scratch_buffer_grow_preserve.lo -MD -MP -MF malloc/$(DEPDIR)/libgnulib_la-scratch_buffer_grow_preserve.Tpo -c -o malloc/libgnulib_la-scratch_buffer_grow_preserve.lo `test -f 'malloc/scratch_buffer_grow_preserve.c' || echo '$(srcdir)/'`malloc/scratch_buffer_grow_preserve.c +@am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) malloc/$(DEPDIR)/libgnulib_la-scratch_buffer_grow_preserve.Tpo malloc/$(DEPDIR)/libgnulib_la-scratch_buffer_grow_preserve.Plo +@AMDEP_TRUE@@am__fastdepCC_FALSE@ $(AM_V_CC)source='malloc/scratch_buffer_grow_preserve.c' object='malloc/libgnulib_la-scratch_buffer_grow_preserve.lo' libtool=yes @AMDEPBACKSLASH@ +@AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ +@am__fastdepCC_FALSE@ $(AM_V_CC@am__nodep@)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libgnulib_la_CFLAGS) $(CFLAGS) -c -o malloc/libgnulib_la-scratch_buffer_grow_preserve.lo `test -f 'malloc/scratch_buffer_grow_preserve.c' || echo '$(srcdir)/'`malloc/scratch_buffer_grow_preserve.c + +malloc/libgnulib_la-scratch_buffer_set_array_size.lo: malloc/scratch_buffer_set_array_size.c +@am__fastdepCC_TRUE@ $(AM_V_CC)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libgnulib_la_CFLAGS) $(CFLAGS) -MT malloc/libgnulib_la-scratch_buffer_set_array_size.lo -MD -MP -MF malloc/$(DEPDIR)/libgnulib_la-scratch_buffer_set_array_size.Tpo -c -o malloc/libgnulib_la-scratch_buffer_set_array_size.lo `test -f 'malloc/scratch_buffer_set_array_size.c' || echo '$(srcdir)/'`malloc/scratch_buffer_set_array_size.c +@am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) malloc/$(DEPDIR)/libgnulib_la-scratch_buffer_set_array_size.Tpo malloc/$(DEPDIR)/libgnulib_la-scratch_buffer_set_array_size.Plo +@AMDEP_TRUE@@am__fastdepCC_FALSE@ $(AM_V_CC)source='malloc/scratch_buffer_set_array_size.c' object='malloc/libgnulib_la-scratch_buffer_set_array_size.lo' libtool=yes @AMDEPBACKSLASH@ +@AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ +@am__fastdepCC_FALSE@ $(AM_V_CC@am__nodep@)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libgnulib_la_CFLAGS) $(CFLAGS) -c -o malloc/libgnulib_la-scratch_buffer_set_array_size.lo `test -f 'malloc/scratch_buffer_set_array_size.c' || echo '$(srcdir)/'`malloc/scratch_buffer_set_array_size.c + libgnulib_la-hard-locale.lo: hard-locale.c @am__fastdepCC_TRUE@ $(AM_V_CC)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libgnulib_la_CFLAGS) $(CFLAGS) -MT libgnulib_la-hard-locale.lo -MD -MP -MF $(DEPDIR)/libgnulib_la-hard-locale.Tpo -c -o libgnulib_la-hard-locale.lo `test -f 'hard-locale.c' || echo '$(srcdir)/'`hard-locale.c @am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/libgnulib_la-hard-locale.Tpo $(DEPDIR)/libgnulib_la-hard-locale.Plo @@ -2762,34 +2885,6 @@ libgnulib_la-safe-read.lo: safe-read.c @AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ @am__fastdepCC_FALSE@ $(AM_V_CC@am__nodep@)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libgnulib_la_CFLAGS) $(CFLAGS) -c -o libgnulib_la-safe-read.lo `test -f 'safe-read.c' || echo '$(srcdir)/'`safe-read.c -malloc/libgnulib_la-scratch_buffer_dupfree.lo: malloc/scratch_buffer_dupfree.c -@am__fastdepCC_TRUE@ $(AM_V_CC)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libgnulib_la_CFLAGS) $(CFLAGS) -MT malloc/libgnulib_la-scratch_buffer_dupfree.lo -MD -MP -MF malloc/$(DEPDIR)/libgnulib_la-scratch_buffer_dupfree.Tpo -c -o malloc/libgnulib_la-scratch_buffer_dupfree.lo `test -f 'malloc/scratch_buffer_dupfree.c' || echo '$(srcdir)/'`malloc/scratch_buffer_dupfree.c -@am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) malloc/$(DEPDIR)/libgnulib_la-scratch_buffer_dupfree.Tpo malloc/$(DEPDIR)/libgnulib_la-scratch_buffer_dupfree.Plo -@AMDEP_TRUE@@am__fastdepCC_FALSE@ $(AM_V_CC)source='malloc/scratch_buffer_dupfree.c' object='malloc/libgnulib_la-scratch_buffer_dupfree.lo' libtool=yes @AMDEPBACKSLASH@ -@AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ -@am__fastdepCC_FALSE@ $(AM_V_CC@am__nodep@)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libgnulib_la_CFLAGS) $(CFLAGS) -c -o malloc/libgnulib_la-scratch_buffer_dupfree.lo `test -f 'malloc/scratch_buffer_dupfree.c' || echo '$(srcdir)/'`malloc/scratch_buffer_dupfree.c - -malloc/libgnulib_la-scratch_buffer_grow.lo: malloc/scratch_buffer_grow.c -@am__fastdepCC_TRUE@ $(AM_V_CC)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libgnulib_la_CFLAGS) $(CFLAGS) -MT malloc/libgnulib_la-scratch_buffer_grow.lo -MD -MP -MF malloc/$(DEPDIR)/libgnulib_la-scratch_buffer_grow.Tpo -c -o malloc/libgnulib_la-scratch_buffer_grow.lo `test -f 'malloc/scratch_buffer_grow.c' || echo '$(srcdir)/'`malloc/scratch_buffer_grow.c -@am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) malloc/$(DEPDIR)/libgnulib_la-scratch_buffer_grow.Tpo malloc/$(DEPDIR)/libgnulib_la-scratch_buffer_grow.Plo -@AMDEP_TRUE@@am__fastdepCC_FALSE@ $(AM_V_CC)source='malloc/scratch_buffer_grow.c' object='malloc/libgnulib_la-scratch_buffer_grow.lo' libtool=yes @AMDEPBACKSLASH@ -@AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ -@am__fastdepCC_FALSE@ $(AM_V_CC@am__nodep@)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libgnulib_la_CFLAGS) $(CFLAGS) -c -o malloc/libgnulib_la-scratch_buffer_grow.lo `test -f 'malloc/scratch_buffer_grow.c' || echo '$(srcdir)/'`malloc/scratch_buffer_grow.c - -malloc/libgnulib_la-scratch_buffer_grow_preserve.lo: malloc/scratch_buffer_grow_preserve.c -@am__fastdepCC_TRUE@ $(AM_V_CC)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libgnulib_la_CFLAGS) $(CFLAGS) -MT malloc/libgnulib_la-scratch_buffer_grow_preserve.lo -MD -MP -MF malloc/$(DEPDIR)/libgnulib_la-scratch_buffer_grow_preserve.Tpo -c -o malloc/libgnulib_la-scratch_buffer_grow_preserve.lo `test -f 'malloc/scratch_buffer_grow_preserve.c' || echo '$(srcdir)/'`malloc/scratch_buffer_grow_preserve.c -@am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) malloc/$(DEPDIR)/libgnulib_la-scratch_buffer_grow_preserve.Tpo malloc/$(DEPDIR)/libgnulib_la-scratch_buffer_grow_preserve.Plo -@AMDEP_TRUE@@am__fastdepCC_FALSE@ $(AM_V_CC)source='malloc/scratch_buffer_grow_preserve.c' object='malloc/libgnulib_la-scratch_buffer_grow_preserve.lo' libtool=yes @AMDEPBACKSLASH@ -@AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ -@am__fastdepCC_FALSE@ $(AM_V_CC@am__nodep@)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libgnulib_la_CFLAGS) $(CFLAGS) -c -o malloc/libgnulib_la-scratch_buffer_grow_preserve.lo `test -f 'malloc/scratch_buffer_grow_preserve.c' || echo '$(srcdir)/'`malloc/scratch_buffer_grow_preserve.c - -malloc/libgnulib_la-scratch_buffer_set_array_size.lo: malloc/scratch_buffer_set_array_size.c -@am__fastdepCC_TRUE@ $(AM_V_CC)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libgnulib_la_CFLAGS) $(CFLAGS) -MT malloc/libgnulib_la-scratch_buffer_set_array_size.lo -MD -MP -MF malloc/$(DEPDIR)/libgnulib_la-scratch_buffer_set_array_size.Tpo -c -o malloc/libgnulib_la-scratch_buffer_set_array_size.lo `test -f 'malloc/scratch_buffer_set_array_size.c' || echo '$(srcdir)/'`malloc/scratch_buffer_set_array_size.c -@am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) malloc/$(DEPDIR)/libgnulib_la-scratch_buffer_set_array_size.Tpo malloc/$(DEPDIR)/libgnulib_la-scratch_buffer_set_array_size.Plo -@AMDEP_TRUE@@am__fastdepCC_FALSE@ $(AM_V_CC)source='malloc/scratch_buffer_set_array_size.c' object='malloc/libgnulib_la-scratch_buffer_set_array_size.lo' libtool=yes @AMDEPBACKSLASH@ -@AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ -@am__fastdepCC_FALSE@ $(AM_V_CC@am__nodep@)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libgnulib_la_CFLAGS) $(CFLAGS) -c -o malloc/libgnulib_la-scratch_buffer_set_array_size.lo `test -f 'malloc/scratch_buffer_set_array_size.c' || echo '$(srcdir)/'`malloc/scratch_buffer_set_array_size.c - libgnulib_la-setlocale_null.lo: setlocale_null.c @am__fastdepCC_TRUE@ $(AM_V_CC)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libgnulib_la_CFLAGS) $(CFLAGS) -MT libgnulib_la-setlocale_null.lo -MD -MP -MF $(DEPDIR)/libgnulib_la-setlocale_null.Tpo -c -o libgnulib_la-setlocale_null.lo `test -f 'setlocale_null.c' || echo '$(srcdir)/'`setlocale_null.c @am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/libgnulib_la-setlocale_null.Tpo $(DEPDIR)/libgnulib_la-setlocale_null.Plo @@ -3021,13 +3116,6 @@ libgnulib_la-calloc.lo: calloc.c @AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ @am__fastdepCC_FALSE@ $(AM_V_CC@am__nodep@)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libgnulib_la_CFLAGS) $(CFLAGS) -c -o libgnulib_la-calloc.lo `test -f 'calloc.c' || echo '$(srcdir)/'`calloc.c -malloc/libgnulib_la-dynarray-skeleton.lo: malloc/dynarray-skeleton.c -@am__fastdepCC_TRUE@ $(AM_V_CC)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libgnulib_la_CFLAGS) $(CFLAGS) -MT malloc/libgnulib_la-dynarray-skeleton.lo -MD -MP -MF malloc/$(DEPDIR)/libgnulib_la-dynarray-skeleton.Tpo -c -o malloc/libgnulib_la-dynarray-skeleton.lo `test -f 'malloc/dynarray-skeleton.c' || echo '$(srcdir)/'`malloc/dynarray-skeleton.c -@am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) malloc/$(DEPDIR)/libgnulib_la-dynarray-skeleton.Tpo malloc/$(DEPDIR)/libgnulib_la-dynarray-skeleton.Plo -@AMDEP_TRUE@@am__fastdepCC_FALSE@ $(AM_V_CC)source='malloc/dynarray-skeleton.c' object='malloc/libgnulib_la-dynarray-skeleton.lo' libtool=yes @AMDEPBACKSLASH@ -@AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ -@am__fastdepCC_FALSE@ $(AM_V_CC@am__nodep@)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libgnulib_la_CFLAGS) $(CFLAGS) -c -o malloc/libgnulib_la-dynarray-skeleton.lo `test -f 'malloc/dynarray-skeleton.c' || echo '$(srcdir)/'`malloc/dynarray-skeleton.c - libgnulib_la-stat-w32.lo: stat-w32.c @am__fastdepCC_TRUE@ $(AM_V_CC)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libgnulib_la_CFLAGS) $(CFLAGS) -MT libgnulib_la-stat-w32.lo -MD -MP -MF $(DEPDIR)/libgnulib_la-stat-w32.Tpo -c -o libgnulib_la-stat-w32.lo `test -f 'stat-w32.c' || echo '$(srcdir)/'`stat-w32.c @am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/libgnulib_la-stat-w32.Tpo $(DEPDIR)/libgnulib_la-stat-w32.Plo @@ -3035,6 +3123,13 @@ libgnulib_la-stat-w32.lo: stat-w32.c @AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ @am__fastdepCC_FALSE@ $(AM_V_CC@am__nodep@)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libgnulib_la_CFLAGS) $(CFLAGS) -c -o libgnulib_la-stat-w32.lo `test -f 'stat-w32.c' || echo '$(srcdir)/'`stat-w32.c +malloc/libgnulib_la-dynarray-skeleton.lo: malloc/dynarray-skeleton.c +@am__fastdepCC_TRUE@ $(AM_V_CC)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libgnulib_la_CFLAGS) $(CFLAGS) -MT malloc/libgnulib_la-dynarray-skeleton.lo -MD -MP -MF malloc/$(DEPDIR)/libgnulib_la-dynarray-skeleton.Tpo -c -o malloc/libgnulib_la-dynarray-skeleton.lo `test -f 'malloc/dynarray-skeleton.c' || echo '$(srcdir)/'`malloc/dynarray-skeleton.c +@am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) malloc/$(DEPDIR)/libgnulib_la-dynarray-skeleton.Tpo malloc/$(DEPDIR)/libgnulib_la-dynarray-skeleton.Plo +@AMDEP_TRUE@@am__fastdepCC_FALSE@ $(AM_V_CC)source='malloc/dynarray-skeleton.c' object='malloc/libgnulib_la-dynarray-skeleton.lo' libtool=yes @AMDEPBACKSLASH@ +@AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ +@am__fastdepCC_FALSE@ $(AM_V_CC@am__nodep@)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libgnulib_la_CFLAGS) $(CFLAGS) -c -o malloc/libgnulib_la-dynarray-skeleton.lo `test -f 'malloc/dynarray-skeleton.c' || echo '$(srcdir)/'`malloc/dynarray-skeleton.c + libgnulib_la-malloc.lo: malloc.c @am__fastdepCC_TRUE@ $(AM_V_CC)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libgnulib_la_CFLAGS) $(CFLAGS) -MT libgnulib_la-malloc.lo -MD -MP -MF $(DEPDIR)/libgnulib_la-malloc.Tpo -c -o libgnulib_la-malloc.lo `test -f 'malloc.c' || echo '$(srcdir)/'`malloc.c @am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/libgnulib_la-malloc.Tpo $(DEPDIR)/libgnulib_la-malloc.Plo @@ -3349,7 +3444,6 @@ distclean: distclean-am -rm -f malloc/$(DEPDIR)/libgnulib_la-dynarray_finalize.Plo -rm -f malloc/$(DEPDIR)/libgnulib_la-dynarray_resize.Plo -rm -f malloc/$(DEPDIR)/libgnulib_la-dynarray_resize_clear.Plo - -rm -f malloc/$(DEPDIR)/libgnulib_la-scratch_buffer_dupfree.Plo -rm -f malloc/$(DEPDIR)/libgnulib_la-scratch_buffer_grow.Plo -rm -f malloc/$(DEPDIR)/libgnulib_la-scratch_buffer_grow_preserve.Plo -rm -f malloc/$(DEPDIR)/libgnulib_la-scratch_buffer_set_array_size.Plo @@ -3506,7 +3600,6 @@ maintainer-clean: maintainer-clean-am -rm -f malloc/$(DEPDIR)/libgnulib_la-dynarray_finalize.Plo -rm -f malloc/$(DEPDIR)/libgnulib_la-dynarray_resize.Plo -rm -f malloc/$(DEPDIR)/libgnulib_la-dynarray_resize_clear.Plo - -rm -f malloc/$(DEPDIR)/libgnulib_la-scratch_buffer_dupfree.Plo -rm -f malloc/$(DEPDIR)/libgnulib_la-scratch_buffer_grow.Plo -rm -f malloc/$(DEPDIR)/libgnulib_la-scratch_buffer_grow_preserve.Plo -rm -f malloc/$(DEPDIR)/libgnulib_la-scratch_buffer_set_array_size.Plo @@ -3559,6 +3652,25 @@ uninstall-am: @GL_GENERATE_ALLOCA_H_FALSE@alloca.h: $(top_builddir)/config.status @GL_GENERATE_ALLOCA_H_FALSE@ rm -f $@ +# We need the following in order to create <assert.h> when the system +# doesn't have one that works with the given compiler. +@GL_GENERATE_ASSERT_H_TRUE@assert.h: assert.in.h verify.h $(top_builddir)/config.status +@GL_GENERATE_ASSERT_H_TRUE@ $(gl_V_at){ $(SED_HEADER_STDOUT) \ +@GL_GENERATE_ASSERT_H_TRUE@ -e 's|@''INCLUDE_NEXT''@|$(INCLUDE_NEXT)|g' \ +@GL_GENERATE_ASSERT_H_TRUE@ -e 's|@''PRAGMA_SYSTEM_HEADER''@|@PRAGMA_SYSTEM_HEADER@|g' \ +@GL_GENERATE_ASSERT_H_TRUE@ -e 's|@''PRAGMA_COLUMNS''@|@PRAGMA_COLUMNS@|g' \ +@GL_GENERATE_ASSERT_H_TRUE@ -e 's|@''NEXT_ASSERT_H''@|$(NEXT_ASSERT_H)|g' \ +@GL_GENERATE_ASSERT_H_TRUE@ < $(srcdir)/assert.in.h && \ +@GL_GENERATE_ASSERT_H_TRUE@ sed -e '/@assert.h omit start@/,/@assert.h omit end@/d' \ +@GL_GENERATE_ASSERT_H_TRUE@ -e 's|_gl_verify|_gl_static_assert|g' \ +@GL_GENERATE_ASSERT_H_TRUE@ -e 's|_GL_VERIFY|_GL_STATIC_ASSERT|g' \ +@GL_GENERATE_ASSERT_H_TRUE@ -e 's|_GL\(_STATIC_ASSERT_H\)|_GL\1|g' \ +@GL_GENERATE_ASSERT_H_TRUE@ < $(srcdir)/verify.h; \ +@GL_GENERATE_ASSERT_H_TRUE@ } > $@-t +@GL_GENERATE_ASSERT_H_TRUE@ $(AM_V_at)mv $@-t $@ +@GL_GENERATE_ASSERT_H_FALSE@assert.h: $(top_builddir)/config.status +@GL_GENERATE_ASSERT_H_FALSE@ rm -f $@ + # Listed in the same order as the GNU makefile conventions, and # provided by autoconf 2.59c+ or 2.70. # The Automake-defined pkg* macros are appended, in the order @@ -3568,56 +3680,37 @@ configmake.h: Makefile echo '#if HAVE_WINSOCK2_H'; \ echo '# include <winsock2.h> /* avoid mingw pollution on DATADIR */'; \ echo '#endif'; \ - echo '#define PREFIX "$(prefix)"'; \ - echo '#define EXEC_PREFIX "$(exec_prefix)"'; \ - echo '#define BINDIR "$(bindir)"'; \ - echo '#define SBINDIR "$(sbindir)"'; \ - echo '#define LIBEXECDIR "$(libexecdir)"'; \ - echo '#define DATAROOTDIR "$(datarootdir)"'; \ - echo '#define DATADIR "$(datadir)"'; \ - echo '#define SYSCONFDIR "$(sysconfdir)"'; \ - echo '#define SHAREDSTATEDIR "$(sharedstatedir)"'; \ - echo '#define LOCALSTATEDIR "$(localstatedir)"'; \ - echo '#define RUNSTATEDIR "$(runstatedir)"'; \ - echo '#define INCLUDEDIR "$(includedir)"'; \ - echo '#define OLDINCLUDEDIR "$(oldincludedir)"'; \ - echo '#define DOCDIR "$(docdir)"'; \ - echo '#define INFODIR "$(infodir)"'; \ - echo '#define HTMLDIR "$(htmldir)"'; \ - echo '#define DVIDIR "$(dvidir)"'; \ - echo '#define PDFDIR "$(pdfdir)"'; \ - echo '#define PSDIR "$(psdir)"'; \ - echo '#define LIBDIR "$(libdir)"'; \ - echo '#define LISPDIR "$(lispdir)"'; \ - echo '#define LOCALEDIR "$(localedir)"'; \ - echo '#define MANDIR "$(mandir)"'; \ - echo '#define MANEXT "$(manext)"'; \ - echo '#define PKGDATADIR "$(pkgdatadir)"'; \ - echo '#define PKGINCLUDEDIR "$(pkgincludedir)"'; \ - echo '#define PKGLIBDIR "$(pkglibdir)"'; \ - echo '#define PKGLIBEXECDIR "$(pkglibexecdir)"'; \ + printf '#define PREFIX %s\n' $(prefix_c_make); \ + printf '#define EXEC_PREFIX %s\n' $(exec_prefix_c_make); \ + printf '#define BINDIR %s\n' $(bindir_c_make); \ + printf '#define SBINDIR %s\n' $(sbindir_c_make); \ + printf '#define LIBEXECDIR %s\n' $(libexecdir_c_make); \ + printf '#define DATAROOTDIR %s\n' $(datarootdir_c_make); \ + printf '#define DATADIR %s\n' $(datadir_c_make); \ + printf '#define SYSCONFDIR %s\n' $(sysconfdir_c_make); \ + printf '#define SHAREDSTATEDIR %s\n' $(sharedstatedir_c_make); \ + printf '#define LOCALSTATEDIR %s\n' $(localstatedir_c_make); \ + printf '#define RUNSTATEDIR %s\n' $(runstatedir_c_make); \ + printf '#define INCLUDEDIR %s\n' $(includedir_c_make); \ + printf '#define OLDINCLUDEDIR %s\n' $(oldincludedir_c_make); \ + printf '#define DOCDIR %s\n' $(docdir_c_make); \ + printf '#define INFODIR %s\n' $(infodir_c_make); \ + printf '#define HTMLDIR %s\n' $(htmldir_c_make); \ + printf '#define DVIDIR %s\n' $(dvidir_c_make); \ + printf '#define PDFDIR %s\n' $(pdfdir_c_make); \ + printf '#define PSDIR %s\n' $(psdir_c_make); \ + printf '#define LIBDIR %s\n' $(libdir_c_make); \ + printf '#define LISPDIR %s\n' $(lispdir_c_make); \ + printf '#define LOCALEDIR %s\n' $(localedir_c_make); \ + printf '#define MANDIR %s\n' $(mandir_c_make); \ + printf '#define MANEXT %s\n' \"$(manext)\"; \ + printf '#define PKGDATADIR %s\n' $(pkgdatadir_c_make); \ + printf '#define PKGINCLUDEDIR %s\n' $(pkgincludedir_c_make); \ + printf '#define PKGLIBDIR %s\n' $(pkglibdir_c_make); \ + printf '#define PKGLIBEXECDIR %s\n' $(pkglibexecdir_c_make); \ } | sed '/""/d' > $@-t $(AM_V_at)mv $@-t $@ -malloc/dynarray.gl.h: malloc/dynarray.h - $(AM_V_GEN)$(MKDIR_P) 'malloc' - $(AM_V_at)$(SED_HEADER_STDOUT) \ - -e '/libc_hidden_proto/d' \ - $(srcdir)/malloc/dynarray.h > $@-t - $(AM_V_at)mv $@-t $@ - -malloc/dynarray-skeleton.gl.h: malloc/dynarray-skeleton.c - $(AM_V_GEN)$(MKDIR_P) 'malloc' - $(AM_V_at)$(SED_HEADER_STDOUT) \ - -e 's|<malloc/dynarray\.h>|<malloc/dynarray.gl.h>|g' \ - -e 's|__attribute_maybe_unused__|_GL_ATTRIBUTE_MAYBE_UNUSED|g' \ - -e 's|__attribute_nonnull__|_GL_ATTRIBUTE_NONNULL|g' \ - -e 's|__attribute_warn_unused_result__|_GL_ATTRIBUTE_NODISCARD|g' \ - -e 's|__glibc_likely|_GL_LIKELY|g' \ - -e 's|__glibc_unlikely|_GL_UNLIKELY|g' \ - $(srcdir)/malloc/dynarray-skeleton.c > $@-t - $(AM_V_at)mv $@-t $@ - # We need the following in order to create <errno.h> when the system # doesn't have one that is POSIX compliant. @GL_GENERATE_ERRNO_H_TRUE@errno.h: errno.in.h $(top_builddir)/config.status @@ -3638,6 +3731,25 @@ malloc/dynarray-skeleton.gl.h: malloc/dynarray-skeleton.c @GL_GENERATE_ERRNO_H_FALSE@errno.h: $(top_builddir)/config.status @GL_GENERATE_ERRNO_H_FALSE@ rm -f $@ +# We need the following in order to create <error.h> when the system +# doesn't have one that works. +@GL_GENERATE_ERROR_H_TRUE@error.h: error.in.h $(top_builddir)/config.status $(CXXDEFS_H) +@GL_GENERATE_ERROR_H_TRUE@ $(gl_V_at)$(SED_HEADER_STDOUT) \ +@GL_GENERATE_ERROR_H_TRUE@ -e 's|@''GUARD_PREFIX''@|GL|g' \ +@GL_GENERATE_ERROR_H_TRUE@ -e 's|@''HAVE_ERROR_H''@|$(HAVE_ERROR_H)|g' \ +@GL_GENERATE_ERROR_H_TRUE@ -e 's|@''INCLUDE_NEXT''@|$(INCLUDE_NEXT)|g' \ +@GL_GENERATE_ERROR_H_TRUE@ -e 's|@''PRAGMA_SYSTEM_HEADER''@|@PRAGMA_SYSTEM_HEADER@|g' \ +@GL_GENERATE_ERROR_H_TRUE@ -e 's|@''NEXT_ERROR_H''@|$(NEXT_ERROR_H)|g' \ +@GL_GENERATE_ERROR_H_TRUE@ -e 's|@''HAVE_ERROR''@|$(HAVE_ERROR)|g' \ +@GL_GENERATE_ERROR_H_TRUE@ -e 's|@''HAVE_ERROR_AT_LINE''@|$(HAVE_ERROR_AT_LINE)|g' \ +@GL_GENERATE_ERROR_H_TRUE@ -e 's|@''REPLACE_ERROR''@|$(REPLACE_ERROR)|g' \ +@GL_GENERATE_ERROR_H_TRUE@ -e 's|@''REPLACE_ERROR_AT_LINE''@|$(REPLACE_ERROR_AT_LINE)|g' \ +@GL_GENERATE_ERROR_H_TRUE@ -e '/definitions of _GL_FUNCDECL_RPL/r $(CXXDEFS_H)' \ +@GL_GENERATE_ERROR_H_TRUE@ $(srcdir)/error.in.h > $@-t +@GL_GENERATE_ERROR_H_TRUE@ $(AM_V_at)mv $@-t $@ +@GL_GENERATE_ERROR_H_FALSE@error.h: $(top_builddir)/config.status +@GL_GENERATE_ERROR_H_FALSE@ rm -f $@ + # We need the following in order to create <fcntl.h> when the system # doesn't have one that works with the given compiler. fcntl.h: fcntl.in.h $(top_builddir)/config.status $(CXXDEFS_H) $(ARG_NONNULL_H) $(WARN_ON_USE_H) @@ -3689,6 +3801,35 @@ fcntl.h: fcntl.in.h $(top_builddir)/config.status $(CXXDEFS_H) $(ARG_NONNULL_H) @GL_GENERATE_GETOPT_CDEFS_H_TRUE@ $(AM_V_at)mv $@-t $@ @GL_GENERATE_GETOPT_CDEFS_H_FALSE@getopt-cdefs.h: $(top_builddir)/config.status @GL_GENERATE_GETOPT_CDEFS_H_FALSE@ rm -f $@ + +malloc/dynarray.gl.h: malloc/dynarray.h + $(AM_V_GEN)$(MKDIR_P) 'malloc' + $(AM_V_at)$(SED_HEADER_STDOUT) \ + -e '/libc_hidden_proto/d' \ + $(srcdir)/malloc/dynarray.h > $@-t + $(AM_V_at)mv $@-t $@ + +malloc/dynarray-skeleton.gl.h: malloc/dynarray-skeleton.c + $(AM_V_GEN)$(MKDIR_P) 'malloc' + $(AM_V_at)$(SED_HEADER_STDOUT) \ + -e 's|<malloc/dynarray\.h>|<malloc/dynarray.gl.h>|g' \ + -e 's|__attribute_maybe_unused__|_GL_ATTRIBUTE_MAYBE_UNUSED|g' \ + -e 's|__attribute_nonnull__|_GL_ATTRIBUTE_NONNULL|g' \ + -e 's|__attribute_warn_unused_result__|_GL_ATTRIBUTE_NODISCARD|g' \ + -e 's|__glibc_likely|_GL_LIKELY|g' \ + -e 's|__glibc_unlikely|_GL_UNLIKELY|g' \ + $(srcdir)/malloc/dynarray-skeleton.c > $@-t + $(AM_V_at)mv $@-t $@ + +malloc/scratch_buffer.gl.h: malloc/scratch_buffer.h + $(AM_V_GEN)$(MKDIR_P) 'malloc' + $(AM_V_at)$(SED_HEADER_STDOUT) \ + -e 's|__always_inline|inline _GL_ATTRIBUTE_ALWAYS_INLINE|g' \ + -e 's|__glibc_likely|_GL_LIKELY|g' \ + -e 's|__glibc_unlikely|_GL_UNLIKELY|g' \ + -e '/libc_hidden_proto/d' \ + $(srcdir)/malloc/scratch_buffer.h > $@-t + $(AM_V_at)mv $@-t $@ distclean-local: clean-GNUmakefile clean-GNUmakefile: test '$(srcdir)' = . || rm -f $(top_builddir)/GNUmakefile @@ -3713,6 +3854,8 @@ inttypes.h: inttypes.in.h $(top_builddir)/config.status $(CXXDEFS_H) $(WARN_ON_U -e 's/@''HAVE_DECL_STRTOIMAX''@/$(HAVE_DECL_STRTOIMAX)/g' \ -e 's/@''HAVE_DECL_STRTOUMAX''@/$(HAVE_DECL_STRTOUMAX)/g' \ -e 's/@''HAVE_IMAXDIV_T''@/$(HAVE_IMAXDIV_T)/g' \ + -e 's/@''REPLACE_IMAXABS''@/$(REPLACE_IMAXABS)/g' \ + -e 's/@''REPLACE_IMAXDIV''@/$(REPLACE_IMAXDIV)/g' \ -e 's/@''REPLACE_STRTOIMAX''@/$(REPLACE_STRTOIMAX)/g' \ -e 's/@''REPLACE_STRTOUMAX''@/$(REPLACE_STRTOUMAX)/g' \ -e 's/@''INT32_MAX_LT_INTMAX_MAX''@/$(INT32_MAX_LT_INTMAX_MAX)/g' \ @@ -3793,24 +3936,6 @@ locale.h: locale.in.h $(top_builddir)/config.status $(CXXDEFS_H) $(ARG_NONNULL_H $(srcdir)/locale.in.h > $@-t $(AM_V_at)mv $@-t $@ -malloc/scratch_buffer.gl.h: malloc/scratch_buffer.h - $(AM_V_GEN)$(MKDIR_P) 'malloc' - $(AM_V_at)$(SED_HEADER_STDOUT) \ - -e 's|__always_inline|inline _GL_ATTRIBUTE_ALWAYS_INLINE|g' \ - -e 's|__glibc_likely|_GL_LIKELY|g' \ - -e 's|__glibc_unlikely|_GL_UNLIKELY|g' \ - -e '/libc_hidden_proto/d' \ - $(srcdir)/malloc/scratch_buffer.h > $@-t - $(AM_V_at)mv $@-t $@ - -# We need the following in order to create <stdalign.h> when the system -# doesn't have one that works. -@GL_GENERATE_STDALIGN_H_TRUE@stdalign.h: stdalign.in.h $(top_builddir)/config.status -@GL_GENERATE_STDALIGN_H_TRUE@ $(gl_V_at)$(SED_HEADER_TO_AT_t) $(srcdir)/stdalign.in.h -@GL_GENERATE_STDALIGN_H_TRUE@ $(AM_V_at)mv $@-t $@ -@GL_GENERATE_STDALIGN_H_FALSE@stdalign.h: $(top_builddir)/config.status -@GL_GENERATE_STDALIGN_H_FALSE@ rm -f $@ - # We need the following in order to create <stdarg.h> when the system # doesn't have one that works with the given compiler. @GL_GENERATE_STDARG_H_TRUE@stdarg.h: stdarg.in.h $(top_builddir)/config.status @@ -3825,15 +3950,14 @@ malloc/scratch_buffer.gl.h: malloc/scratch_buffer.h @GL_GENERATE_STDARG_H_FALSE@stdarg.h: $(top_builddir)/config.status @GL_GENERATE_STDARG_H_FALSE@ rm -f $@ -# We need the following in order to create <stdbool.h> when the system -# doesn't have one that works. -@GL_GENERATE_STDBOOL_H_TRUE@stdbool.h: stdbool.in.h $(top_builddir)/config.status -@GL_GENERATE_STDBOOL_H_TRUE@ $(gl_V_at)$(SED_HEADER_STDOUT) \ -@GL_GENERATE_STDBOOL_H_TRUE@ -e 's/@''HAVE__BOOL''@/$(HAVE__BOOL)/g' \ -@GL_GENERATE_STDBOOL_H_TRUE@ $(srcdir)/stdbool.in.h > $@-t -@GL_GENERATE_STDBOOL_H_TRUE@ $(AM_V_at)mv $@-t $@ -@GL_GENERATE_STDBOOL_H_FALSE@stdbool.h: $(top_builddir)/config.status -@GL_GENERATE_STDBOOL_H_FALSE@ rm -f $@ +# We need the following in order to create <stdckdint.h> when the system +# doesn't have one that works with the given compiler. +@GL_GENERATE_STDCKDINT_H_TRUE@stdckdint.h: stdckdint.in.h $(top_builddir)/config.status +@GL_GENERATE_STDCKDINT_H_TRUE@ $(gl_V_at)$(SED_HEADER_STDOUT) \ +@GL_GENERATE_STDCKDINT_H_TRUE@ $(srcdir)/stdckdint.in.h > $@-t +@GL_GENERATE_STDCKDINT_H_TRUE@ $(AM_V_at)mv $@-t $@ +@GL_GENERATE_STDCKDINT_H_FALSE@stdckdint.h: $(top_builddir)/config.status +@GL_GENERATE_STDCKDINT_H_FALSE@ rm -f $@ # We need the following in order to create <stddef.h> when the system # doesn't have one that works with the given compiler. @@ -3964,7 +4088,9 @@ stdio.h: stdio.in.h $(top_builddir)/config.status $(CXXDEFS_H) $(ARG_NONNULL_H) -e 's|@''HAVE_DECL_FTELLO''@|$(HAVE_DECL_FTELLO)|g' \ -e 's|@''HAVE_DECL_GETDELIM''@|$(HAVE_DECL_GETDELIM)|g' \ -e 's|@''HAVE_DECL_GETLINE''@|$(HAVE_DECL_GETLINE)|g' \ + -e 's|@''HAVE_DECL_GETW''@|$(HAVE_DECL_GETW)|g' \ -e 's|@''HAVE_DECL_OBSTACK_PRINTF''@|$(HAVE_DECL_OBSTACK_PRINTF)|g' \ + -e 's|@''HAVE_DECL_PUTW''@|$(HAVE_DECL_PUTW)|g' \ -e 's|@''HAVE_DECL_SNPRINTF''@|$(HAVE_DECL_SNPRINTF)|g' \ -e 's|@''HAVE_DECL_VSNPRINTF''@|$(HAVE_DECL_VSNPRINTF)|g' \ -e 's|@''HAVE_DPRINTF''@|$(HAVE_DPRINTF)|g' \ @@ -4033,6 +4159,7 @@ stdlib.h: stdlib.in.h $(top_builddir)/config.status $(CXXDEFS_H) \ -e 's/@''GNULIB_CANONICALIZE_FILE_NAME''@/$(GL_GNULIB_CANONICALIZE_FILE_NAME)/g' \ -e 's/@''GNULIB_FREE_POSIX''@/$(GL_GNULIB_FREE_POSIX)/g' \ -e 's/@''GNULIB_GETLOADAVG''@/$(GL_GNULIB_GETLOADAVG)/g' \ + -e 's/@''GNULIB_GETPROGNAME''@/$(GL_GNULIB_GETPROGNAME)/g' \ -e 's/@''GNULIB_GETSUBOPT''@/$(GL_GNULIB_GETSUBOPT)/g' \ -e 's/@''GNULIB_GRANTPT''@/$(GL_GNULIB_GRANTPT)/g' \ -e 's/@''GNULIB_MALLOC_GNU''@/$(GL_GNULIB_MALLOC_GNU)/g' \ @@ -4082,6 +4209,7 @@ stdlib.h: stdlib.in.h $(top_builddir)/config.status $(CXXDEFS_H) \ -e 's|@''HAVE_DECL_FCVT''@|$(HAVE_DECL_FCVT)|g' \ -e 's|@''HAVE_DECL_GCVT''@|$(HAVE_DECL_GCVT)|g' \ -e 's|@''HAVE_DECL_GETLOADAVG''@|$(HAVE_DECL_GETLOADAVG)|g' \ + -e 's|@''HAVE_GETPROGNAME''@|$(HAVE_GETPROGNAME)|g' \ -e 's|@''HAVE_GETSUBOPT''@|$(HAVE_GETSUBOPT)|g' \ -e 's|@''HAVE_GRANTPT''@|$(HAVE_GRANTPT)|g' \ -e 's|@''HAVE_INITSTATE''@|$(HAVE_INITSTATE)|g' \ @@ -4117,17 +4245,24 @@ stdlib.h: stdlib.in.h $(top_builddir)/config.status $(CXXDEFS_H) \ -e 's|@''HAVE_SYS_LOADAVG_H''@|$(HAVE_SYS_LOADAVG_H)|g' \ -e 's|@''HAVE_UNLOCKPT''@|$(HAVE_UNLOCKPT)|g' \ -e 's|@''HAVE_DECL_UNSETENV''@|$(HAVE_DECL_UNSETENV)|g' \ + -e 's|@''REPLACE__EXIT''@|$(REPLACE__EXIT)|g' \ -e 's|@''REPLACE_ALIGNED_ALLOC''@|$(REPLACE_ALIGNED_ALLOC)|g' \ -e 's|@''REPLACE_CALLOC_FOR_CALLOC_GNU''@|$(REPLACE_CALLOC_FOR_CALLOC_GNU)|g' \ -e 's|@''REPLACE_CALLOC_FOR_CALLOC_POSIX''@|$(REPLACE_CALLOC_FOR_CALLOC_POSIX)|g' \ -e 's|@''REPLACE_CANONICALIZE_FILE_NAME''@|$(REPLACE_CANONICALIZE_FILE_NAME)|g' \ -e 's|@''REPLACE_FREE''@|$(REPLACE_FREE)|g' \ + -e 's|@''REPLACE_GETLOADAVG''@|$(REPLACE_GETLOADAVG)|g' \ + -e 's|@''REPLACE_GETPROGNAME''@|$(REPLACE_GETPROGNAME)|g' \ + -e 's|@''REPLACE_GETSUBOPT''@|$(REPLACE_GETSUBOPT)|g' \ -e 's|@''REPLACE_INITSTATE''@|$(REPLACE_INITSTATE)|g' \ -e 's|@''REPLACE_MALLOC_FOR_MALLOC_GNU''@|$(REPLACE_MALLOC_FOR_MALLOC_GNU)|g' \ -e 's|@''REPLACE_MALLOC_FOR_MALLOC_POSIX''@|$(REPLACE_MALLOC_FOR_MALLOC_POSIX)|g' \ -e 's|@''REPLACE_MBTOWC''@|$(REPLACE_MBTOWC)|g' \ + -e 's|@''REPLACE_MKOSTEMP''@|$(REPLACE_MKOSTEMP)|g' \ + -e 's|@''REPLACE_MKOSTEMPS''@|$(REPLACE_MKOSTEMPS)|g' \ -e 's|@''REPLACE_MKSTEMP''@|$(REPLACE_MKSTEMP)|g' \ -e 's|@''REPLACE_POSIX_MEMALIGN''@|$(REPLACE_POSIX_MEMALIGN)|g' \ + -e 's|@''REPLACE_POSIX_OPENPT''@|$(REPLACE_POSIX_OPENPT)|g' \ -e 's|@''REPLACE_PTSNAME''@|$(REPLACE_PTSNAME)|g' \ -e 's|@''REPLACE_PTSNAME_R''@|$(REPLACE_PTSNAME_R)|g' \ -e 's|@''REPLACE_PUTENV''@|$(REPLACE_PUTENV)|g' \ @@ -4185,6 +4320,7 @@ string.h: string.in.h $(top_builddir)/config.status $(CXXDEFS_H) $(ARG_NONNULL_H -e 's/@''GNULIB_MEMMEM''@/$(GL_GNULIB_MEMMEM)/g' \ -e 's/@''GNULIB_MEMPCPY''@/$(GL_GNULIB_MEMPCPY)/g' \ -e 's/@''GNULIB_MEMRCHR''@/$(GL_GNULIB_MEMRCHR)/g' \ + -e 's/@''GNULIB_MEMSET_EXPLICIT''@/$(GL_GNULIB_MEMSET_EXPLICIT)/g' \ -e 's/@''GNULIB_RAWMEMCHR''@/$(GL_GNULIB_RAWMEMCHR)/g' \ -e 's/@''GNULIB_STPCPY''@/$(GL_GNULIB_STPCPY)/g' \ -e 's/@''GNULIB_STPNCPY''@/$(GL_GNULIB_STPNCPY)/g' \ @@ -4216,6 +4352,7 @@ string.h: string.in.h $(top_builddir)/config.status $(CXXDEFS_H) $(ARG_NONNULL_H -e 's|@''HAVE_DECL_MEMMEM''@|$(HAVE_DECL_MEMMEM)|g' \ -e 's|@''HAVE_MEMPCPY''@|$(HAVE_MEMPCPY)|g' \ -e 's|@''HAVE_DECL_MEMRCHR''@|$(HAVE_DECL_MEMRCHR)|g' \ + -e 's|@''HAVE_MEMSET_EXPLICIT''@|$(HAVE_MEMSET_EXPLICIT)|g' \ -e 's|@''HAVE_RAWMEMCHR''@|$(HAVE_RAWMEMCHR)|g' \ -e 's|@''HAVE_STPCPY''@|$(HAVE_STPCPY)|g' \ -e 's|@''HAVE_STPNCPY''@|$(HAVE_STPNCPY)|g' \ @@ -4236,7 +4373,9 @@ string.h: string.in.h $(top_builddir)/config.status $(CXXDEFS_H) $(ARG_NONNULL_H -e 's|@''REPLACE_FFSLL''@|$(REPLACE_FFSLL)|g' \ -e 's|@''REPLACE_MEMCHR''@|$(REPLACE_MEMCHR)|g' \ -e 's|@''REPLACE_MEMMEM''@|$(REPLACE_MEMMEM)|g' \ + -e 's|@''REPLACE_MEMPCPY''@|$(REPLACE_MEMPCPY)|g' \ -e 's|@''REPLACE_FREE''@|$(REPLACE_FREE)|g' \ + -e 's|@''REPLACE_STPCPY''@|$(REPLACE_STPCPY)|g' \ -e 's|@''REPLACE_STPNCPY''@|$(REPLACE_STPNCPY)|g' \ -e 's|@''REPLACE_STRCHRNUL''@|$(REPLACE_STRCHRNUL)|g' \ -e 's|@''REPLACE_STRDUP''@|$(REPLACE_STRDUP)|g' \ @@ -4289,6 +4428,7 @@ sys/stat.h: sys_stat.in.h $(top_builddir)/config.status $(CXXDEFS_H) $(ARG_NONNU -e 's|@''NEXT_SYS_STAT_H''@|$(NEXT_SYS_STAT_H)|g' \ -e 's|@''WINDOWS_64_BIT_ST_SIZE''@|$(WINDOWS_64_BIT_ST_SIZE)|g' \ -e 's|@''WINDOWS_STAT_TIMESPEC''@|$(WINDOWS_STAT_TIMESPEC)|g' \ + -e 's/@''GNULIB_CHMOD''@/$(GL_GNULIB_CHMOD)/g' \ -e 's/@''GNULIB_FCHMODAT''@/$(GL_GNULIB_FCHMODAT)/g' \ -e 's/@''GNULIB_FSTAT''@/$(GL_GNULIB_FSTAT)/g' \ -e 's/@''GNULIB_FSTATAT''@/$(GL_GNULIB_FSTATAT)/g' \ @@ -4320,6 +4460,7 @@ sys/stat.h: sys_stat.in.h $(top_builddir)/config.status $(CXXDEFS_H) $(ARG_NONNU -e 's|@''HAVE_MKNOD''@|$(HAVE_MKNOD)|g' \ -e 's|@''HAVE_MKNODAT''@|$(HAVE_MKNODAT)|g' \ -e 's|@''HAVE_UTIMENSAT''@|$(HAVE_UTIMENSAT)|g' \ + -e 's|@''REPLACE_CHMOD''@|$(REPLACE_CHMOD)|g' \ -e 's|@''REPLACE_FCHMODAT''@|$(REPLACE_FCHMODAT)|g' \ -e 's|@''REPLACE_FSTAT''@|$(REPLACE_FSTAT)|g' \ -e 's|@''REPLACE_FSTATAT''@|$(REPLACE_FSTATAT)|g' \ @@ -4368,6 +4509,7 @@ time.h: time.in.h $(top_builddir)/config.status $(CXXDEFS_H) $(ARG_NONNULL_H) $( -e 's/@''GNULIB_NANOSLEEP''@/$(GL_GNULIB_NANOSLEEP)/g' \ -e 's/@''GNULIB_STRFTIME''@/$(GL_GNULIB_STRFTIME)/g' \ -e 's/@''GNULIB_STRPTIME''@/$(GL_GNULIB_STRPTIME)/g' \ + -e 's/@''GNULIB_TIME''@/$(GL_GNULIB_TIME)/g' \ -e 's/@''GNULIB_TIMEGM''@/$(GL_GNULIB_TIMEGM)/g' \ -e 's/@''GNULIB_TIMESPEC_GET''@/$(GL_GNULIB_TIMESPEC_GET)/g' \ -e 's/@''GNULIB_TIMESPEC_GETRES''@/$(GL_GNULIB_TIMESPEC_GETRES)/g' \ @@ -4389,7 +4531,9 @@ time.h: time.in.h $(top_builddir)/config.status $(CXXDEFS_H) $(ARG_NONNULL_H) $( -e 's|@''REPLACE_MKTIME''@|$(REPLACE_MKTIME)|g' \ -e 's|@''REPLACE_NANOSLEEP''@|$(REPLACE_NANOSLEEP)|g' \ -e 's|@''REPLACE_STRFTIME''@|$(REPLACE_STRFTIME)|g' \ + -e 's|@''REPLACE_TIME''@|$(REPLACE_TIME)|g' \ -e 's|@''REPLACE_TIMEGM''@|$(REPLACE_TIMEGM)|g' \ + -e 's|@''REPLACE_TIMESPEC_GET''@|$(REPLACE_TIMESPEC_GET)|g' \ -e 's|@''REPLACE_TZSET''@|$(REPLACE_TZSET)|g' \ -e 's|@''PTHREAD_H_DEFINES_STRUCT_TIMESPEC''@|$(PTHREAD_H_DEFINES_STRUCT_TIMESPEC)|g' \ -e 's|@''SYS_TIME_H_DEFINES_STRUCT_TIMESPEC''@|$(SYS_TIME_H_DEFINES_STRUCT_TIMESPEC)|g' \ @@ -4552,6 +4696,7 @@ unistd.h: unistd.in.h $(top_builddir)/config.status $(CXXDEFS_H) $(ARG_NONNULL_H -e 's|@''REPLACE_COPY_FILE_RANGE''@|$(REPLACE_COPY_FILE_RANGE)|g' \ -e 's|@''REPLACE_DUP''@|$(REPLACE_DUP)|g' \ -e 's|@''REPLACE_DUP2''@|$(REPLACE_DUP2)|g' \ + -e 's|@''REPLACE_DUP3''@|$(REPLACE_DUP3)|g' \ -e 's|@''REPLACE_EXECL''@|$(REPLACE_EXECL)|g' \ -e 's|@''REPLACE_EXECLE''@|$(REPLACE_EXECLE)|g' \ -e 's|@''REPLACE_EXECLP''@|$(REPLACE_EXECLP)|g' \ @@ -4561,10 +4706,12 @@ unistd.h: unistd.in.h $(top_builddir)/config.status $(CXXDEFS_H) $(ARG_NONNULL_H -e 's|@''REPLACE_EXECVPE''@|$(REPLACE_EXECVPE)|g' \ -e 's|@''REPLACE_FACCESSAT''@|$(REPLACE_FACCESSAT)|g' \ -e 's|@''REPLACE_FCHOWNAT''@|$(REPLACE_FCHOWNAT)|g' \ + -e 's|@''REPLACE_FDATASYNC''@|$(REPLACE_FDATASYNC)|g' \ -e 's|@''REPLACE_FTRUNCATE''@|$(REPLACE_FTRUNCATE)|g' \ -e 's|@''REPLACE_GETCWD''@|$(REPLACE_GETCWD)|g' \ -e 's|@''REPLACE_GETDOMAINNAME''@|$(REPLACE_GETDOMAINNAME)|g' \ -e 's|@''REPLACE_GETDTABLESIZE''@|$(REPLACE_GETDTABLESIZE)|g' \ + -e 's|@''REPLACE_GETENTROPY''@|$(REPLACE_GETENTROPY)|g' \ -e 's|@''REPLACE_GETLOGIN_R''@|$(REPLACE_GETLOGIN_R)|g' \ -e 's|@''REPLACE_GETGROUPS''@|$(REPLACE_GETGROUPS)|g' \ -e 's|@''REPLACE_GETPAGESIZE''@|$(REPLACE_GETPAGESIZE)|g' \ @@ -4575,12 +4722,14 @@ unistd.h: unistd.in.h $(top_builddir)/config.status $(CXXDEFS_H) $(ARG_NONNULL_H -e 's|@''REPLACE_LINK''@|$(REPLACE_LINK)|g' \ -e 's|@''REPLACE_LINKAT''@|$(REPLACE_LINKAT)|g' \ -e 's|@''REPLACE_LSEEK''@|$(REPLACE_LSEEK)|g' \ + -e 's|@''REPLACE_PIPE2''@|$(REPLACE_PIPE2)|g' \ -e 's|@''REPLACE_PREAD''@|$(REPLACE_PREAD)|g' \ -e 's|@''REPLACE_PWRITE''@|$(REPLACE_PWRITE)|g' \ -e 's|@''REPLACE_READ''@|$(REPLACE_READ)|g' \ -e 's|@''REPLACE_READLINK''@|$(REPLACE_READLINK)|g' \ -e 's|@''REPLACE_READLINKAT''@|$(REPLACE_READLINKAT)|g' \ -e 's|@''REPLACE_RMDIR''@|$(REPLACE_RMDIR)|g' \ + -e 's|@''REPLACE_SETHOSTNAME''@|$(REPLACE_SETHOSTNAME)|g' \ -e 's|@''REPLACE_SLEEP''@|$(REPLACE_SLEEP)|g' \ -e 's|@''REPLACE_SYMLINK''@|$(REPLACE_SYMLINK)|g' \ -e 's|@''REPLACE_SYMLINKAT''@|$(REPLACE_SYMLINKAT)|g' \ @@ -4716,6 +4865,7 @@ wchar.h: wchar.in.h $(top_builddir)/config.status $(CXXDEFS_H) $(ARG_NONNULL_H) -e 's|@''REPLACE_WCSWIDTH''@|$(REPLACE_WCSWIDTH)|g' \ -e 's|@''REPLACE_WCSFTIME''@|$(REPLACE_WCSFTIME)|g' \ -e 's|@''REPLACE_WCSTOK''@|$(REPLACE_WCSTOK)|g' \ + -e 's|@''REPLACE_WMEMPCPY''@|$(REPLACE_WMEMPCPY)|g' \ -e '/definitions of _GL_FUNCDECL_RPL/r $(CXXDEFS_H)' \ -e '/definition of _GL_ARG_NONNULL/r $(ARG_NONNULL_H)' \ -e '/definition of _GL_WARN_ON_USE/r $(WARN_ON_USE_H)' \ diff --git a/lib/_Noreturn.h b/lib/_Noreturn.h index e914627..6ecea98 100644 --- a/lib/_Noreturn.h +++ b/lib/_Noreturn.h @@ -1,5 +1,5 @@ /* A C macro for declaring that a function does not return. - Copyright (C) 2011-2022 Free Software Foundation, Inc. + Copyright (C) 2011-2023 Free Software Foundation, Inc. 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 @@ -26,6 +26,11 @@ AIX system header files and several gnulib header files use precisely this syntax with 'extern'. */ # define _Noreturn [[noreturn]] +# elif (defined __clang__ && __clang_major__ < 16 \ + && defined _GL_WORK_AROUND_LLVM_BUG_59792) + /* Compile with -D_GL_WORK_AROUND_LLVM_BUG_59792 to work around + that rare LLVM bug, though you may get many false-alarm warnings. */ +# define _Noreturn # elif ((!defined __cplusplus || defined __clang__) \ && (201112 <= (defined __STDC_VERSION__ ? __STDC_VERSION__ : 0) \ || (!defined __STRICT_ANSI__ \ diff --git a/lib/alloca.c b/lib/alloca.c index 4880283..5eb16a9 100644 --- a/lib/alloca.c +++ b/lib/alloca.c @@ -30,17 +30,6 @@ #include <string.h> #include <stdlib.h> -#ifdef emacs -# include "lisp.h" -# include "blockinput.h" -# ifdef EMACS_FREE -# undef free -# define free EMACS_FREE -# endif -#else -# define memory_full() abort () -#endif - /* If compiling with GCC or clang, this file is not needed. */ #if !(defined __GNUC__ || defined __clang__) @@ -48,22 +37,6 @@ there must be some other way alloca is supposed to work. */ # ifndef alloca -# ifdef emacs -# ifdef static -/* actually, only want this if static is defined as "" - -- this is for usg, in which emacs must undefine static - in order to make unexec workable - */ -# ifndef STACK_DIRECTION -you -lose --- must know STACK_DIRECTION at compile-time -/* Using #error here is not wise since this file should work for - old and obscure compilers. */ -# endif /* STACK_DIRECTION undefined */ -# endif /* static */ -# endif /* emacs */ - /* Define STACK_DIRECTION if you know the direction of stack growth for your system; otherwise it will be automatically deduced at run-time. @@ -145,10 +118,6 @@ alloca (size_t size) { register header *hp; /* Traverses linked list. */ -# ifdef emacs - BLOCK_INPUT; -# endif - for (hp = last_alloca_header; hp != NULL;) if ((STACK_DIR > 0 && hp->h.deep > depth) || (STACK_DIR < 0 && hp->h.deep < depth)) @@ -163,10 +132,6 @@ alloca (size_t size) break; /* Rest are not deeper. */ last_alloca_header = hp; /* -> last valid storage. */ - -# ifdef emacs - UNBLOCK_INPUT; -# endif } if (size == 0) diff --git a/lib/alloca.in.h b/lib/alloca.in.h index e2b1461..a1bb3d7 100644 --- a/lib/alloca.in.h +++ b/lib/alloca.in.h @@ -1,6 +1,6 @@ /* Memory allocation on the stack. - Copyright (C) 1995, 1999, 2001-2004, 2006-2022 Free Software Foundation, + Copyright (C) 1995, 1999, 2001-2004, 2006-2023 Free Software Foundation, Inc. This file is free software: you can redistribute it and/or modify diff --git a/lib/arg-nonnull.h b/lib/arg-nonnull.h index e4513ef..9498ae1 100644 --- a/lib/arg-nonnull.h +++ b/lib/arg-nonnull.h @@ -1,5 +1,5 @@ /* A C macro for declaring that specific arguments must not be NULL. - Copyright (C) 2009-2022 Free Software Foundation, Inc. + Copyright (C) 2009-2023 Free Software Foundation, Inc. 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 diff --git a/lib/argmatch.c b/lib/argmatch.c index 2a28900..9cddb37 100644 --- a/lib/argmatch.c +++ b/lib/argmatch.c @@ -1,6 +1,6 @@ /* argmatch.c -- find a match for a string in an array - Copyright (C) 1990, 1998-1999, 2001-2007, 2009-2022 Free Software + Copyright (C) 1990, 1998-1999, 2001-2007, 2009-2023 Free Software Foundation, Inc. This program is free software: you can redistribute it and/or modify @@ -24,7 +24,6 @@ /* Specification. */ #include "argmatch.h" -#include <stdbool.h> #include <stdio.h> #include <stdlib.h> #include <string.h> @@ -33,7 +32,6 @@ #include "error.h" #include "quotearg.h" -#include "getprogname.h" #if USE_UNLOCKED_IO # include "unlocked-io.h" diff --git a/lib/argmatch.h b/lib/argmatch.h index 52f2bb7..f18127f 100644 --- a/lib/argmatch.h +++ b/lib/argmatch.h @@ -1,6 +1,6 @@ /* argmatch.h -- definitions and prototypes for argmatch.c - Copyright (C) 1990, 1998-1999, 2001-2002, 2004-2005, 2009-2022 Free Software + Copyright (C) 1990, 1998-1999, 2001-2002, 2004-2005, 2009-2023 Free Software Foundation, Inc. This program is free software: you can redistribute it and/or modify @@ -23,14 +23,12 @@ # define ARGMATCH_H_ 1 # include <limits.h> -# include <stdbool.h> # include <stddef.h> # include <stdio.h> # include <string.h> /* memcmp */ # include "gettext.h" # include "quote.h" -# include "verify.h" # ifdef __cplusplus extern "C" { @@ -42,7 +40,8 @@ extern "C" { (argument list ends with a NULL guard). */ # define ARGMATCH_VERIFY(Arglist, Vallist) \ - verify (ARRAY_CARDINALITY (Arglist) == ARRAY_CARDINALITY (Vallist) + 1) + static_assert (ARRAY_CARDINALITY (Arglist) \ + == ARRAY_CARDINALITY (Vallist) + 1) /* Return the index of the element of ARGLIST (NULL terminated) that matches with ARG. If VALLIST is not NULL, then use it to resolve diff --git a/lib/assert.in.h b/lib/assert.in.h new file mode 100644 index 0000000..b0ab99c --- /dev/null +++ b/lib/assert.in.h @@ -0,0 +1,27 @@ +/* Substitute for and wrapper around <assert.h> + Copyright (C) 2011-2023 Free Software Foundation, Inc. + + 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 <https://www.gnu.org/licenses/>. */ + +/* Do not guard the include, since <assert.h> is supposed to define + the assert macro each time it is included. */ + +#if __GNUC__ >= 3 +@PRAGMA_SYSTEM_HEADER@ +#endif +@PRAGMA_COLUMNS@ + +#@INCLUDE_NEXT@ @NEXT_ASSERT_H@ + +/* The definition of static_assert is copied here. */ diff --git a/lib/assure.h b/lib/assure.h index 20e806a..e31076d 100644 --- a/lib/assure.h +++ b/lib/assure.h @@ -1,6 +1,6 @@ /* Run-time assert-like macros. - Copyright (C) 2014-2022 Free Software Foundation, Inc. + Copyright (C) 2014-2023 Free Software Foundation, Inc. This file is free software: you can redistribute it and/or modify it under the terms of the GNU Lesser General Public License as diff --git a/lib/attribute.h b/lib/attribute.h index 378d4f0..130644d 100644 --- a/lib/attribute.h +++ b/lib/attribute.h @@ -1,6 +1,6 @@ /* ATTRIBUTE_* macros for using attributes in GCC and similar compilers - Copyright 2020-2022 Free Software Foundation, Inc. + Copyright 2020-2023 Free Software Foundation, Inc. This file is free software: you can redistribute it and/or modify it under the terms of the GNU Lesser General Public License as @@ -32,7 +32,7 @@ /* This file defines two types of attributes: - * C2x standard attributes. These have macro names that do not begin with + * C23 standard attributes. These have macro names that do not begin with 'ATTRIBUTE_'. * Selected GCC attributes; see: https://gcc.gnu.org/onlinedocs/gcc/Common-Function-Attributes.html diff --git a/lib/basename-lgpl.c b/lib/basename-lgpl.c index eb07e25..6de60aa 100644 --- a/lib/basename-lgpl.c +++ b/lib/basename-lgpl.c @@ -1,6 +1,6 @@ /* basename.c -- return the last element in a file name - Copyright (C) 1990, 1998-2001, 2003-2006, 2009-2022 Free Software + Copyright (C) 1990, 1998-2001, 2003-2006, 2009-2023 Free Software Foundation, Inc. This file is free software: you can redistribute it and/or modify @@ -21,7 +21,6 @@ /* Specification. */ #include "basename-lgpl.h" -#include <stdbool.h> #include <string.h> #include "filename.h" diff --git a/lib/basename-lgpl.h b/lib/basename-lgpl.h index 5569f21..5d996c1 100644 --- a/lib/basename-lgpl.h +++ b/lib/basename-lgpl.h @@ -1,6 +1,6 @@ /* Extract the last component (base name) of a file name. - Copyright (C) 1998, 2001, 2003-2006, 2009-2022 Free Software Foundation, + Copyright (C) 1998, 2001, 2003-2006, 2009-2023 Free Software Foundation, Inc. This file is free software: you can redistribute it and/or modify diff --git a/lib/basename.c b/lib/basename.c index 0e372ca..21fab1e 100644 --- a/lib/basename.c +++ b/lib/basename.c @@ -1,6 +1,6 @@ /* basename.c -- return the last element in a file name - Copyright (C) 1990, 1998-2001, 2003-2006, 2009-2022 Free Software + Copyright (C) 1990, 1998-2001, 2003-2006, 2009-2023 Free Software Foundation, Inc. This program is free software: you can redistribute it and/or modify diff --git a/lib/btowc.c b/lib/btowc.c index 4af58bb..caadbd7 100644 --- a/lib/btowc.c +++ b/lib/btowc.c @@ -1,5 +1,5 @@ /* Convert unibyte character to wide character. - Copyright (C) 2008, 2010-2022 Free Software Foundation, Inc. + Copyright (C) 2008, 2010-2023 Free Software Foundation, Inc. Written by Bruno Haible <bruno@clisp.org>, 2008. This file is free software: you can redistribute it and/or modify diff --git a/lib/c++defs.h b/lib/c++defs.h index ad18155..8ad4695 100644 --- a/lib/c++defs.h +++ b/lib/c++defs.h @@ -1,5 +1,5 @@ /* C++ compatible function declaration macros. - Copyright (C) 2010-2022 Free Software Foundation, Inc. + Copyright (C) 2010-2023 Free Software Foundation, Inc. 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 diff --git a/lib/c-ctype.c b/lib/c-ctype.c index a247514..a4343f4 100644 --- a/lib/c-ctype.c +++ b/lib/c-ctype.c @@ -1,6 +1,6 @@ /* Character handling in C locale. - Copyright (C) 2003-2022 Free Software Foundation, Inc. + Copyright (C) 2003-2023 Free Software Foundation, Inc. This file is free software: you can redistribute it and/or modify it under the terms of the GNU Lesser General Public License as diff --git a/lib/c-ctype.h b/lib/c-ctype.h index 1a4f603..35ca83d 100644 --- a/lib/c-ctype.h +++ b/lib/c-ctype.h @@ -5,7 +5,7 @@ <ctype.h> functions' behaviour depends on the current locale set via setlocale. - Copyright (C) 2000-2003, 2006, 2008-2022 Free Software Foundation, Inc. + Copyright (C) 2000-2003, 2006, 2008-2023 Free Software Foundation, Inc. This file is free software: you can redistribute it and/or modify it under the terms of the GNU Lesser General Public License as @@ -23,8 +23,6 @@ #ifndef C_CTYPE_H #define C_CTYPE_H -#include <stdbool.h> - #ifndef _GL_INLINE_HEADER_BEGIN #error "Please include config.h first." #endif diff --git a/lib/c-strcase.h b/lib/c-strcase.h index 3e874b5..9bcca01 100644 --- a/lib/c-strcase.h +++ b/lib/c-strcase.h @@ -1,5 +1,5 @@ /* Case-insensitive string comparison functions in C locale. - Copyright (C) 1995-1996, 2001, 2003, 2005, 2009-2022 Free Software + Copyright (C) 1995-1996, 2001, 2003, 2005, 2009-2023 Free Software Foundation, Inc. This file is free software: you can redistribute it and/or modify diff --git a/lib/c-strcasecmp.c b/lib/c-strcasecmp.c index 87b993c..8a958dc 100644 --- a/lib/c-strcasecmp.c +++ b/lib/c-strcasecmp.c @@ -1,5 +1,5 @@ /* c-strcasecmp.c -- case insensitive string comparator in C locale - Copyright (C) 1998-1999, 2005-2006, 2009-2022 Free Software Foundation, Inc. + Copyright (C) 1998-1999, 2005-2006, 2009-2023 Free Software Foundation, Inc. This file is free software: you can redistribute it and/or modify it under the terms of the GNU Lesser General Public License as diff --git a/lib/c-strcaseeq.h b/lib/c-strcaseeq.h index 1c4607c..1d0759a 100644 --- a/lib/c-strcaseeq.h +++ b/lib/c-strcaseeq.h @@ -1,5 +1,5 @@ /* Optimized case-insensitive string comparison in C locale. - Copyright (C) 2001-2002, 2007, 2009-2022 Free Software Foundation, Inc. + Copyright (C) 2001-2002, 2007, 2009-2023 Free Software Foundation, Inc. This file is free software: you can redistribute it and/or modify it under the terms of the GNU Lesser General Public License as diff --git a/lib/c-strncasecmp.c b/lib/c-strncasecmp.c index 5a5d30b..4ca8c5f 100644 --- a/lib/c-strncasecmp.c +++ b/lib/c-strncasecmp.c @@ -1,5 +1,5 @@ /* c-strncasecmp.c -- case insensitive string comparator in C locale - Copyright (C) 1998-1999, 2005-2006, 2009-2022 Free Software Foundation, Inc. + Copyright (C) 1998-1999, 2005-2006, 2009-2023 Free Software Foundation, Inc. This file is free software: you can redistribute it and/or modify it under the terms of the GNU Lesser General Public License as diff --git a/lib/calloc.c b/lib/calloc.c index 0a934b3..08843ac 100644 --- a/lib/calloc.c +++ b/lib/calloc.c @@ -1,6 +1,6 @@ /* calloc() function that is glibc compatible. This wrapper function is required at least on Tru64 UNIX 5.1 and mingw. - Copyright (C) 2004-2007, 2009-2022 Free Software Foundation, Inc. + Copyright (C) 2004-2007, 2009-2023 Free Software Foundation, Inc. This file is free software: you can redistribute it and/or modify it under the terms of the GNU Lesser General Public License as diff --git a/lib/canonicalize-lgpl.c b/lib/canonicalize-lgpl.c index a7fa7fe..e701297 100644 --- a/lib/canonicalize-lgpl.c +++ b/lib/canonicalize-lgpl.c @@ -1,5 +1,5 @@ /* Return the canonical absolute name of a given file. - Copyright (C) 1996-2022 Free Software Foundation, Inc. + Copyright (C) 1996-2023 Free Software Foundation, Inc. This file is part of the GNU C Library. The GNU C Library is free software; you can redistribute it and/or @@ -30,7 +30,6 @@ #include <errno.h> #include <fcntl.h> #include <limits.h> -#include <stdbool.h> #include <string.h> #include <sys/stat.h> #include <unistd.h> @@ -48,6 +47,7 @@ #else # define __canonicalize_file_name canonicalize_file_name # define __realpath realpath +# define __strdup strdup # include "pathmax.h" # define __faccessat faccessat # if defined _WIN32 && !defined __CYGWIN__ @@ -180,27 +180,16 @@ get_path_max (void) return path_max < 0 ? 1024 : path_max <= IDX_MAX ? path_max : IDX_MAX; } -/* Act like __realpath (see below), with an additional argument - rname_buf that can be used as temporary storage. - - If GCC_LINT is defined, do not inline this function with GCC 10.1 - and later, to avoid creating a pointer to the stack that GCC - -Wreturn-local-addr incorrectly complains about. See: - https://gcc.gnu.org/bugzilla/show_bug.cgi?id=93644 - Although the noinline attribute can hurt performance a bit, no better way - to pacify GCC is known; even an explicit #pragma does not pacify GCC. - When the GCC bug is fixed this workaround should be limited to the - broken GCC versions. */ -# if __GNUC_PREREQ (10, 1) -# if defined GCC_LINT || defined lint -__attribute__ ((__noinline__)) -# elif __OPTIMIZE__ && !__NO_INLINE__ -# define GCC_BOGUS_WRETURN_LOCAL_ADDR -# endif -# endif +/* Scratch buffers used by realpath_stk and managed by __realpath. */ +struct realpath_bufs +{ + struct scratch_buffer rname; + struct scratch_buffer extra; + struct scratch_buffer link; +}; + static char * -realpath_stk (const char *name, char *resolved, - struct scratch_buffer *rname_buf) +realpath_stk (const char *name, char *resolved, struct realpath_bufs *bufs) { char *dest; char const *start; @@ -225,12 +214,7 @@ realpath_stk (const char *name, char *resolved, return NULL; } - struct scratch_buffer extra_buffer, link_buffer; - scratch_buffer_init (&extra_buffer); - scratch_buffer_init (&link_buffer); - scratch_buffer_init (rname_buf); - char *rname_on_stack = rname_buf->data; - char *rname = rname_on_stack; + char *rname = bufs->rname.data; bool end_in_extra_buffer = false; bool failed = true; @@ -240,16 +224,16 @@ realpath_stk (const char *name, char *resolved, if (!IS_ABSOLUTE_FILE_NAME (name)) { - while (!__getcwd (rname, rname_buf->length)) + while (!__getcwd (bufs->rname.data, bufs->rname.length)) { if (errno != ERANGE) { dest = rname; goto error; } - if (!scratch_buffer_grow (rname_buf)) - goto error_nomem; - rname = rname_buf->data; + if (!scratch_buffer_grow (&bufs->rname)) + return NULL; + rname = bufs->rname.data; } dest = __rawmemchr (rname, '\0'); start = name; @@ -303,13 +287,13 @@ realpath_stk (const char *name, char *resolved, if (!ISSLASH (dest[-1])) *dest++ = '/'; - while (rname + rname_buf->length - dest + while (rname + bufs->rname.length - dest < startlen + sizeof dir_suffix) { idx_t dest_offset = dest - rname; - if (!scratch_buffer_grow_preserve (rname_buf)) - goto error_nomem; - rname = rname_buf->data; + if (!scratch_buffer_grow_preserve (&bufs->rname)) + return NULL; + rname = bufs->rname.data; dest = rname + dest_offset; } @@ -320,13 +304,13 @@ realpath_stk (const char *name, char *resolved, ssize_t n; while (true) { - buf = link_buffer.data; - idx_t bufsize = link_buffer.length; + buf = bufs->link.data; + idx_t bufsize = bufs->link.length; n = __readlink (rname, buf, bufsize - 1); if (n < bufsize - 1) break; - if (!scratch_buffer_grow (&link_buffer)) - goto error_nomem; + if (!scratch_buffer_grow (&bufs->link)) + return NULL; } if (0 <= n) { @@ -338,7 +322,7 @@ realpath_stk (const char *name, char *resolved, buf[n] = '\0'; - char *extra_buf = extra_buffer.data; + char *extra_buf = bufs->extra.data; idx_t end_idx IF_LINT (= 0); if (end_in_extra_buffer) end_idx = end - extra_buf; @@ -346,13 +330,13 @@ realpath_stk (const char *name, char *resolved, if (INT_ADD_OVERFLOW (len, n)) { __set_errno (ENOMEM); - goto error_nomem; + return NULL; } - while (extra_buffer.length <= len + n) + while (bufs->extra.length <= len + n) { - if (!scratch_buffer_grow_preserve (&extra_buffer)) - goto error_nomem; - extra_buf = extra_buffer.data; + if (!scratch_buffer_grow_preserve (&bufs->extra)) + return NULL; + extra_buf = bufs->extra.data; } if (end_in_extra_buffer) end = extra_buf + end_idx; @@ -404,20 +388,30 @@ realpath_stk (const char *name, char *resolved, error: *dest++ = '\0'; - if (resolved != NULL && dest - rname <= get_path_max ()) - rname = strcpy (resolved, rname); - -error_nomem: - scratch_buffer_free (&extra_buffer); - scratch_buffer_free (&link_buffer); - - if (failed || rname == resolved) + if (resolved != NULL) + { + /* Copy the full result on success or partial result if failure was due + to the path not existing or not being accessible. */ + if ((!failed || errno == ENOENT || errno == EACCES) + && dest - rname <= get_path_max ()) + { + strcpy (resolved, rname); + if (failed) + return NULL; + else + return resolved; + } + if (!failed) + __set_errno (ENAMETOOLONG); + return NULL; + } + else { - scratch_buffer_free (rname_buf); - return failed ? NULL : resolved; + if (failed) + return NULL; + else + return __strdup (bufs->rname.data); } - - return scratch_buffer_dupfree (rname_buf, dest - rname); } /* Return the canonical absolute name of file NAME. A canonical name @@ -434,12 +428,15 @@ error_nomem: char * __realpath (const char *name, char *resolved) { - #ifdef GCC_BOGUS_WRETURN_LOCAL_ADDR - #warning "GCC might issue a bogus -Wreturn-local-addr warning here." - #warning "See <https://gcc.gnu.org/bugzilla/show_bug.cgi?id=93644>." - #endif - struct scratch_buffer rname_buffer; - return realpath_stk (name, resolved, &rname_buffer); + struct realpath_bufs bufs; + scratch_buffer_init (&bufs.rname); + scratch_buffer_init (&bufs.extra); + scratch_buffer_init (&bufs.link); + char *result = realpath_stk (name, resolved, &bufs); + scratch_buffer_free (&bufs.link); + scratch_buffer_free (&bufs.extra); + scratch_buffer_free (&bufs.rname); + return result; } libc_hidden_def (__realpath) versioned_symbol (libc, __realpath, realpath, GLIBC_2_3); diff --git a/lib/cdefs.h b/lib/cdefs.h index cb25145..412f036 100644 --- a/lib/cdefs.h +++ b/lib/cdefs.h @@ -1,4 +1,4 @@ -/* Copyright (C) 1992-2022 Free Software Foundation, Inc. +/* Copyright (C) 1992-2023 Free Software Foundation, Inc. Copyright The GNU Toolchain Authors. This file is part of the GNU C Library. @@ -140,42 +140,47 @@ #endif +/* Gnulib avoids these definitions, as they don't work on non-glibc platforms. + In particular, __bos and __bos0 are defined differently in the Android libc. + */ +#ifndef __GNULIB_CDEFS + /* Fortify support. */ -#define __bos(ptr) __builtin_object_size (ptr, __USE_FORTIFY_LEVEL > 1) -#define __bos0(ptr) __builtin_object_size (ptr, 0) +# define __bos(ptr) __builtin_object_size (ptr, __USE_FORTIFY_LEVEL > 1) +# define __bos0(ptr) __builtin_object_size (ptr, 0) /* Use __builtin_dynamic_object_size at _FORTIFY_SOURCE=3 when available. */ -#if __USE_FORTIFY_LEVEL == 3 && (__glibc_clang_prereq (9, 0) \ - || __GNUC_PREREQ (12, 0)) -# define __glibc_objsize0(__o) __builtin_dynamic_object_size (__o, 0) -# define __glibc_objsize(__o) __builtin_dynamic_object_size (__o, 1) -#else -# define __glibc_objsize0(__o) __bos0 (__o) -# define __glibc_objsize(__o) __bos (__o) -#endif +# if __USE_FORTIFY_LEVEL == 3 && (__glibc_clang_prereq (9, 0) \ + || __GNUC_PREREQ (12, 0)) +# define __glibc_objsize0(__o) __builtin_dynamic_object_size (__o, 0) +# define __glibc_objsize(__o) __builtin_dynamic_object_size (__o, 1) +# else +# define __glibc_objsize0(__o) __bos0 (__o) +# define __glibc_objsize(__o) __bos (__o) +# endif /* Compile time conditions to choose between the regular, _chk and _chk_warn variants. These conditions should get evaluated to constant and optimized away. */ -#define __glibc_safe_len_cond(__l, __s, __osz) ((__l) <= (__osz) / (__s)) -#define __glibc_unsigned_or_positive(__l) \ +# define __glibc_safe_len_cond(__l, __s, __osz) ((__l) <= (__osz) / (__s)) +# define __glibc_unsigned_or_positive(__l) \ ((__typeof (__l)) 0 < (__typeof (__l)) -1 \ || (__builtin_constant_p (__l) && (__l) > 0)) /* Length is known to be safe at compile time if the __L * __S <= __OBJSZ - condition can be folded to a constant and if it is true. The -1 check is - redundant because since it implies that __glibc_safe_len_cond is true. */ -#define __glibc_safe_or_unknown_len(__l, __s, __osz) \ - (__glibc_unsigned_or_positive (__l) \ - && __builtin_constant_p (__glibc_safe_len_cond ((__SIZE_TYPE__) (__l), \ - __s, __osz)) \ - && __glibc_safe_len_cond ((__SIZE_TYPE__) (__l), __s, __osz)) + condition can be folded to a constant and if it is true, or unknown (-1) */ +# define __glibc_safe_or_unknown_len(__l, __s, __osz) \ + ((__osz) == (__SIZE_TYPE__) -1 \ + || (__glibc_unsigned_or_positive (__l) \ + && __builtin_constant_p (__glibc_safe_len_cond ((__SIZE_TYPE__) (__l), \ + (__s), (__osz))) \ + && __glibc_safe_len_cond ((__SIZE_TYPE__) (__l), (__s), (__osz)))) /* Conversely, we know at compile time that the length is unsafe if the __L * __S <= __OBJSZ condition can be folded to a constant and if it is false. */ -#define __glibc_unsafe_len(__l, __s, __osz) \ +# define __glibc_unsafe_len(__l, __s, __osz) \ (__glibc_unsigned_or_positive (__l) \ && __builtin_constant_p (__glibc_safe_len_cond ((__SIZE_TYPE__) (__l), \ __s, __osz)) \ @@ -184,7 +189,7 @@ /* Fortify function f. __f_alias, __f_chk and __f_chk_warn must be declared. */ -#define __glibc_fortify(f, __l, __s, __osz, ...) \ +# define __glibc_fortify(f, __l, __s, __osz, ...) \ (__glibc_safe_or_unknown_len (__l, __s, __osz) \ ? __ ## f ## _alias (__VA_ARGS__) \ : (__glibc_unsafe_len (__l, __s, __osz) \ @@ -194,13 +199,16 @@ /* Fortify function f, where object size argument passed to f is the number of elements and not total size. */ -#define __glibc_fortify_n(f, __l, __s, __osz, ...) \ +# define __glibc_fortify_n(f, __l, __s, __osz, ...) \ (__glibc_safe_or_unknown_len (__l, __s, __osz) \ ? __ ## f ## _alias (__VA_ARGS__) \ : (__glibc_unsafe_len (__l, __s, __osz) \ ? __ ## f ## _chk_warn (__VA_ARGS__, (__osz) / (__s)) \ : __ ## f ## _chk (__VA_ARGS__, (__osz) / (__s)))) \ +#endif + + #if __GNUC_PREREQ (4,3) # define __warnattr(msg) __attribute__((__warning__ (msg))) # define __errordecl(name, msg) \ diff --git a/lib/cloexec.c b/lib/cloexec.c index 812be01..e4cecbd 100644 --- a/lib/cloexec.c +++ b/lib/cloexec.c @@ -1,6 +1,6 @@ /* cloexec.c - set or clear the close-on-exec descriptor flag - Copyright (C) 1991, 2004-2006, 2009-2022 Free Software Foundation, Inc. + Copyright (C) 1991, 2004-2006, 2009-2023 Free Software Foundation, Inc. This file is free software: you can redistribute it and/or modify it under the terms of the GNU Lesser General Public License as diff --git a/lib/cloexec.h b/lib/cloexec.h index 7a22d77..057fd66 100644 --- a/lib/cloexec.h +++ b/lib/cloexec.h @@ -1,6 +1,6 @@ /* cloexec.c - set or clear the close-on-exec descriptor flag - Copyright (C) 2004, 2009-2022 Free Software Foundation, Inc. + Copyright (C) 2004, 2009-2023 Free Software Foundation, Inc. This file is free software: you can redistribute it and/or modify it under the terms of the GNU Lesser General Public License as @@ -15,8 +15,6 @@ You should have received a copy of the GNU Lesser General Public License along with this program. If not, see <https://www.gnu.org/licenses/>. */ -#include <stdbool.h> - /* Set the 'FD_CLOEXEC' flag of DESC if VALUE is true, or clear the flag if VALUE is false. Return 0 on success, or -1 on error with 'errno' set. diff --git a/lib/close-stream.c b/lib/close-stream.c index 9b0e97b..ab686ba 100644 --- a/lib/close-stream.c +++ b/lib/close-stream.c @@ -1,6 +1,6 @@ /* Close a stream, with nicer error checking than fclose's. - Copyright (C) 1998-2002, 2004, 2006-2022 Free Software Foundation, Inc. + Copyright (C) 1998-2002, 2004, 2006-2023 Free Software Foundation, Inc. This program is free software: you can redistribute it and/or modify it under the terms of the GNU General Public License as published by @@ -20,7 +20,6 @@ #include "close-stream.h" #include <errno.h> -#include <stdbool.h> #include "fpending.h" diff --git a/lib/close-stream.h b/lib/close-stream.h index 2b4c8ed..3b52cc6 100644 --- a/lib/close-stream.h +++ b/lib/close-stream.h @@ -1,6 +1,6 @@ /* Close a stream, with nicer error checking than fclose's. - Copyright (C) 2006-2022 Free Software Foundation, Inc. + Copyright (C) 2006-2023 Free Software Foundation, Inc. This file is free software: you can redistribute it and/or modify it under the terms of the GNU General Public License as published diff --git a/lib/close.c b/lib/close.c index 44990ba..3c1b09e 100644 --- a/lib/close.c +++ b/lib/close.c @@ -1,5 +1,5 @@ /* close replacement. - Copyright (C) 2008-2022 Free Software Foundation, Inc. + Copyright (C) 2008-2023 Free Software Foundation, Inc. This file is free software: you can redistribute it and/or modify it under the terms of the GNU Lesser General Public License as diff --git a/lib/closeout.c b/lib/closeout.c index 688cd73..d9e8211 100644 --- a/lib/closeout.c +++ b/lib/closeout.c @@ -1,6 +1,6 @@ /* Close standard output and standard error, exiting with a diagnostic on error. - Copyright (C) 1998-2002, 2004, 2006, 2008-2022 Free Software Foundation, + Copyright (C) 1998-2002, 2004, 2006, 2008-2023 Free Software Foundation, Inc. This program is free software: you can redistribute it and/or modify @@ -21,7 +21,6 @@ #include "closeout.h" #include <errno.h> -#include <stdbool.h> #include <stdio.h> #include <unistd.h> diff --git a/lib/closeout.h b/lib/closeout.h index fe24c4e..d975725 100644 --- a/lib/closeout.h +++ b/lib/closeout.h @@ -1,6 +1,6 @@ /* Close standard output and standard error. - Copyright (C) 1998, 2000, 2003-2004, 2006, 2008-2022 Free Software + Copyright (C) 1998, 2000, 2003-2004, 2006, 2008-2023 Free Software Foundation, Inc. This program is free software: you can redistribute it and/or modify @@ -19,8 +19,6 @@ #ifndef CLOSEOUT_H # define CLOSEOUT_H 1 -# include <stdbool.h> - # ifdef __cplusplus extern "C" { # endif diff --git a/lib/config.h.in b/lib/config.h.in index 0e15a62..5b9dca5 100644 --- a/lib/config.h.in +++ b/lib/config.h.in @@ -222,6 +222,9 @@ /* Define to 1 when the gnulib module getpagesize should be tested. */ #undef GNULIB_TEST_GETPAGESIZE +/* Define to 1 when the gnulib module getprogname should be tested. */ +#undef GNULIB_TEST_GETPROGNAME + /* Define to 1 when the gnulib module getrandom should be tested. */ #undef GNULIB_TEST_GETRANDOM @@ -261,6 +264,9 @@ /* Define to 1 when the gnulib module mbtowc should be tested. */ #undef GNULIB_TEST_MBTOWC +/* Define to 1 when the gnulib module memchr should be tested. */ +#undef GNULIB_TEST_MEMCHR + /* Define to 1 when the gnulib module mempcpy should be tested. */ #undef GNULIB_TEST_MEMPCPY @@ -387,6 +393,9 @@ /* Define to 1 when the gnulib module symlink should be tested. */ #undef GNULIB_TEST_SYMLINK +/* Define to 1 when the gnulib module time should be tested. */ +#undef GNULIB_TEST_TIME + /* Define to 1 when the gnulib module unlink should be tested. */ #undef GNULIB_TEST_UNLINK @@ -438,6 +447,9 @@ /* Define to 1 if you have the <blkid/blkid.h> header file. */ #undef HAVE_BLKID_BLKID_H +/* Define to 1 if you have the <bp-sym.h> header file. */ +#undef HAVE_BP_SYM_H + /* Define to 1 if you have the `btowc' function. */ #undef HAVE_BTOWC @@ -470,6 +482,15 @@ /* Define to 1 if you have the <crtdefs.h> header file. */ #undef HAVE_CRTDEFS_H +/* Define to 1 if the alignas and alignof keywords work. */ +#undef HAVE_C_ALIGNASOF + +/* Define to 1 if bool, true and false work as per C2023. */ +#undef HAVE_C_BOOL + +/* Define to 1 if the static_assert keyword works. */ +#undef HAVE_C_STATIC_ASSERT + /* Define to 1 if C supports variable-length arrays. */ #undef HAVE_C_VARARRAYS @@ -505,6 +526,10 @@ don't. */ #undef HAVE_DECL_GETDTABLESIZE +/* Define to 1 if you have the declaration of `getw', and to 0 if you don't. + */ +#undef HAVE_DECL_GETW + /* Define to 1 if you have the declaration of `inet_pton', and to 0 if you don't. */ #undef HAVE_DECL_INET_PTON @@ -529,6 +554,10 @@ and to 0 if you don't. */ #undef HAVE_DECL_PROGRAM_INVOCATION_SHORT_NAME +/* Define to 1 if you have the declaration of `putw', and to 0 if you don't. + */ +#undef HAVE_DECL_PUTW + /* Define to 1 if you have the declaration of `setenv', and to 0 if you don't. */ #undef HAVE_DECL_SETENV @@ -586,6 +615,12 @@ /* Define if you have the declaration of environ. */ #undef HAVE_ENVIRON_DECL +/* Define to 1 if you have the `error' function. */ +#undef HAVE_ERROR + +/* Define to 1 if you have the <error.h> header file. */ +#undef HAVE_ERROR_H + /* Define to 1 if you have the `faccessat' function. */ #undef HAVE_FACCESSAT @@ -889,6 +924,12 @@ /* Define if the locale_t type is as on Solaris 11.4. */ #undef HAVE_SOLARIS114_LOCALES +/* Define to 1 if you have the <stdbool.h> header file. */ +#undef HAVE_STDBOOL_H + +/* Define to 1 if you have the <stdckdint.h> header file. */ +#undef HAVE_STDCKDINT_H + /* Define to 1 if you have the <stdint.h> header file. */ #undef HAVE_STDINT_H @@ -1071,9 +1112,6 @@ /* Define to 1 if you have the <xlocale.h> header file. */ #undef HAVE_XLOCALE_H -/* Define to 1 if the system has the type `_Bool'. */ -#undef HAVE__BOOL - /* Define to 1 if you have the `_chsize' function. */ #undef HAVE__CHSIZE @@ -1480,11 +1518,15 @@ #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 ISO/IEC TS 18661-3:2015. */ +/* Enable extensions specified by C23 Annex H and ISO/IEC TS 18661-3:2015. */ #ifndef __STDC_WANT_IEC_60559_TYPES_EXT__ # undef __STDC_WANT_IEC_60559_TYPES_EXT__ #endif @@ -1563,7 +1605,7 @@ /* Define to enable the declarations of ISO C 11 types and functions. */ #undef _ISOC11_SOURCE -/* Define for large files, on AIX-style hosts. */ +/* Define to 1 on platforms where this makes off_t a 64-bit type. */ #undef _LARGE_FILES /* Define to 1 on Solaris. */ @@ -1582,6 +1624,11 @@ AIX system header files and several gnulib header files use precisely this syntax with 'extern'. */ # define _Noreturn [[noreturn]] +# elif (defined __clang__ && __clang_major__ < 16 \ + && defined _GL_WORK_AROUND_LLVM_BUG_59792) + /* Compile with -D_GL_WORK_AROUND_LLVM_BUG_59792 to work around + that rare LLVM bug, though you may get many false-alarm warnings. */ +# define _Noreturn # elif ((!defined __cplusplus || defined __clang__) \ && (201112 <= (defined __STDC_VERSION__ ? __STDC_VERSION__ : 0) \ || (!defined __STRICT_ANSI__ \ @@ -1611,7 +1658,7 @@ /* Define if you want regoff_t to be at least as wide POSIX requires. */ #undef _REGEX_LARGE_OFFSETS -/* Number of bits in a timestamp, on hosts where this is settable. */ +/* Number of bits in time_t, on hosts where this is settable. */ #undef _TIME_BITS /* For standard stat data types on VMS. */ @@ -1621,7 +1668,7 @@ used. */ #undef __GETOPT_PREFIX -/* For 64-bit time_t on 32-bit mingw. */ +/* Define to 1 on platforms where this makes time_t a 64-bit type. */ #undef __MINGW_USE_VC2005_COMPAT /* Define to 1 if the system <stdint.h> predates C++11. */ @@ -1666,7 +1713,7 @@ && (!defined __clang_minor__ \ || (defined __apple_build_version__ \ ? 6000000 <= __apple_build_version__ \ - : 3 < __clang_major__ + (5 <= __clang_minor__)))) + : 5 <= __clang_major__))) # define _GL_HAS_ATTRIBUTE(attr) __has_attribute (__##attr##__) #else # define _GL_HAS_ATTRIBUTE(attr) _GL_ATTR_##attr @@ -1700,10 +1747,10 @@ # define _GL_ATTR_warn_unused_result _GL_GNUC_PREREQ (3, 4) #endif -#ifdef __has_c_attribute -# define _GL_HAS_C_ATTRIBUTE(attr) __has_c_attribute (__##attr##__) -#else -# define _GL_HAS_C_ATTRIBUTE(attr) 0 +/* Disable GCC -Wpedantic if using __has_c_attribute and this is not C23+. */ +#if (defined __has_c_attribute && _GL_GNUC_PREREQ (4, 6) \ + && (defined __STDC_VERSION__ ? __STDC_VERSION__ : 0) <= 201710) +# pragma GCC diagnostic ignored "-Wpedantic" #endif @@ -1713,29 +1760,35 @@ by the Nth argument of the function is the size of the returned memory block. */ /* Applies to: function, pointer to function, function types. */ -#if _GL_HAS_ATTRIBUTE (alloc_size) -# define _GL_ATTRIBUTE_ALLOC_SIZE(args) __attribute__ ((__alloc_size__ args)) -#else -# define _GL_ATTRIBUTE_ALLOC_SIZE(args) +#ifndef _GL_ATTRIBUTE_ALLOC_SIZE +# if _GL_HAS_ATTRIBUTE (alloc_size) +# define _GL_ATTRIBUTE_ALLOC_SIZE(args) __attribute__ ((__alloc_size__ args)) +# else +# define _GL_ATTRIBUTE_ALLOC_SIZE(args) +# endif #endif /* _GL_ATTRIBUTE_ALWAYS_INLINE tells that the compiler should always inline the function and report an error if it cannot do so. */ /* Applies to: function. */ -#if _GL_HAS_ATTRIBUTE (always_inline) -# define _GL_ATTRIBUTE_ALWAYS_INLINE __attribute__ ((__always_inline__)) -#else -# define _GL_ATTRIBUTE_ALWAYS_INLINE +#ifndef _GL_ATTRIBUTE_ALWAYS_INLINE +# if _GL_HAS_ATTRIBUTE (always_inline) +# define _GL_ATTRIBUTE_ALWAYS_INLINE __attribute__ ((__always_inline__)) +# else +# define _GL_ATTRIBUTE_ALWAYS_INLINE +# endif #endif /* _GL_ATTRIBUTE_ARTIFICIAL declares that the function is not important to show in stack traces when debugging. The compiler should omit the function from stack traces. */ /* Applies to: function. */ -#if _GL_HAS_ATTRIBUTE (artificial) -# define _GL_ATTRIBUTE_ARTIFICIAL __attribute__ ((__artificial__)) -#else -# define _GL_ATTRIBUTE_ARTIFICIAL +#ifndef _GL_ATTRIBUTE_ARTIFICIAL +# if _GL_HAS_ATTRIBUTE (artificial) +# define _GL_ATTRIBUTE_ARTIFICIAL __attribute__ ((__artificial__)) +# else +# define _GL_ATTRIBUTE_ARTIFICIAL +# endif #endif /* _GL_ATTRIBUTE_COLD declares that the function is rarely executed. */ @@ -1743,14 +1796,16 @@ /* Avoid __attribute__ ((cold)) on MinGW; see thread starting at <https://lists.gnu.org/r/emacs-devel/2019-04/msg01152.html>. Also, Oracle Studio 12.6 requires 'cold' not '__cold__'. */ -#if _GL_HAS_ATTRIBUTE (cold) && !defined __MINGW32__ -# ifndef __SUNPRO_C -# define _GL_ATTRIBUTE_COLD __attribute__ ((__cold__)) +#ifndef _GL_ATTRIBUTE_COLD +# if _GL_HAS_ATTRIBUTE (cold) && !defined __MINGW32__ +# ifndef __SUNPRO_C +# define _GL_ATTRIBUTE_COLD __attribute__ ((__cold__)) +# else +# define _GL_ATTRIBUTE_COLD __attribute__ ((cold)) +# endif # else -# define _GL_ATTRIBUTE_COLD __attribute__ ((cold)) +# define _GL_ATTRIBUTE_COLD # endif -#else -# define _GL_ATTRIBUTE_COLD #endif /* _GL_ATTRIBUTE_CONST declares that it is OK for a compiler to omit duplicate @@ -1760,10 +1815,12 @@ forever, and does not call longjmp. (This attribute is stricter than _GL_ATTRIBUTE_PURE.) */ /* Applies to: functions. */ -#if _GL_HAS_ATTRIBUTE (const) -# define _GL_ATTRIBUTE_CONST __attribute__ ((__const__)) -#else -# define _GL_ATTRIBUTE_CONST +#ifndef _GL_ATTRIBUTE_CONST +# if _GL_HAS_ATTRIBUTE (const) +# define _GL_ATTRIBUTE_CONST __attribute__ ((__const__)) +# else +# define _GL_ATTRIBUTE_CONST +# endif #endif /* _GL_ATTRIBUTE_DEALLOC (F, I) declares that the function returns pointers @@ -1772,16 +1829,25 @@ _GL_ATTRIBUTE_DEALLOC_FREE declares that the function returns pointers that can be freed via 'free'; it can be used only after declaring 'free'. */ /* Applies to: functions. Cannot be used on inline functions. */ -#if _GL_GNUC_PREREQ (11, 0) -# define _GL_ATTRIBUTE_DEALLOC(f, i) __attribute__ ((__malloc__ (f, i))) -#else -# define _GL_ATTRIBUTE_DEALLOC(f, i) +#ifndef _GL_ATTRIBUTE_DEALLOC +# if _GL_GNUC_PREREQ (11, 0) +# define _GL_ATTRIBUTE_DEALLOC(f, i) __attribute__ ((__malloc__ (f, i))) +# else +# define _GL_ATTRIBUTE_DEALLOC(f, i) +# endif #endif /* If gnulib's <string.h> or <wchar.h> has already defined this macro, continue to use this earlier definition, since <stdlib.h> may not have been included yet. */ #ifndef _GL_ATTRIBUTE_DEALLOC_FREE -# define _GL_ATTRIBUTE_DEALLOC_FREE _GL_ATTRIBUTE_DEALLOC (free, 1) +# if defined __cplusplus && defined __GNUC__ && !defined __clang__ +/* Work around GCC bug <https://gcc.gnu.org/bugzilla/show_bug.cgi?id=108231> */ +# define _GL_ATTRIBUTE_DEALLOC_FREE \ + _GL_ATTRIBUTE_DEALLOC ((void (*) (void *)) free, 1) +# else +# define _GL_ATTRIBUTE_DEALLOC_FREE \ + _GL_ATTRIBUTE_DEALLOC (free, 1) +# endif #endif /* _GL_ATTRIBUTE_DEPRECATED: Declares that an entity is deprecated. @@ -1792,12 +1858,18 @@ - enumeration, enumeration item, - typedef, in C++ also: namespace, class, template specialization. */ -#if _GL_HAS_C_ATTRIBUTE (deprecated) -# define _GL_ATTRIBUTE_DEPRECATED [[__deprecated__]] -#elif _GL_HAS_ATTRIBUTE (deprecated) -# define _GL_ATTRIBUTE_DEPRECATED __attribute__ ((__deprecated__)) -#else -# define _GL_ATTRIBUTE_DEPRECATED +#ifndef _GL_ATTRIBUTE_DEPRECATED +# ifdef __has_c_attribute +# if __has_c_attribute (__deprecated__) +# define _GL_ATTRIBUTE_DEPRECATED [[__deprecated__]] +# endif +# endif +# if !defined _GL_ATTRIBUTE_DEPRECATED && _GL_HAS_ATTRIBUTE (deprecated) +# define _GL_ATTRIBUTE_DEPRECATED __attribute__ ((__deprecated__)) +# endif +# ifndef _GL_ATTRIBUTE_DEPRECATED +# define _GL_ATTRIBUTE_DEPRECATED +# endif #endif /* _GL_ATTRIBUTE_ERROR(msg) requests an error if a function is called and @@ -1805,24 +1877,28 @@ _GL_ATTRIBUTE_WARNING(msg) requests a warning if a function is called and the function call is not optimized away. */ /* Applies to: functions. */ -#if _GL_HAS_ATTRIBUTE (error) -# define _GL_ATTRIBUTE_ERROR(msg) __attribute__ ((__error__ (msg))) -# define _GL_ATTRIBUTE_WARNING(msg) __attribute__ ((__warning__ (msg))) -#elif _GL_HAS_ATTRIBUTE (diagnose_if) -# define _GL_ATTRIBUTE_ERROR(msg) __attribute__ ((__diagnose_if__ (1, msg, "error"))) -# define _GL_ATTRIBUTE_WARNING(msg) __attribute__ ((__diagnose_if__ (1, msg, "warning"))) -#else -# define _GL_ATTRIBUTE_ERROR(msg) -# define _GL_ATTRIBUTE_WARNING(msg) +#if !(defined _GL_ATTRIBUTE_ERROR && defined _GL_ATTRIBUTE_WARNING) +# if _GL_HAS_ATTRIBUTE (error) +# define _GL_ATTRIBUTE_ERROR(msg) __attribute__ ((__error__ (msg))) +# define _GL_ATTRIBUTE_WARNING(msg) __attribute__ ((__warning__ (msg))) +# elif _GL_HAS_ATTRIBUTE (diagnose_if) +# define _GL_ATTRIBUTE_ERROR(msg) __attribute__ ((__diagnose_if__ (1, msg, "error"))) +# define _GL_ATTRIBUTE_WARNING(msg) __attribute__ ((__diagnose_if__ (1, msg, "warning"))) +# else +# define _GL_ATTRIBUTE_ERROR(msg) +# define _GL_ATTRIBUTE_WARNING(msg) +# endif #endif /* _GL_ATTRIBUTE_EXTERNALLY_VISIBLE declares that the entity should remain visible to debuggers etc., even with '-fwhole-program'. */ /* Applies to: functions, variables. */ -#if _GL_HAS_ATTRIBUTE (externally_visible) -# define _GL_ATTRIBUTE_EXTERNALLY_VISIBLE __attribute__ ((externally_visible)) -#else -# define _GL_ATTRIBUTE_EXTERNALLY_VISIBLE +#ifndef _GL_ATTRIBUTE_EXTERNALLY_VISIBLE +# if _GL_HAS_ATTRIBUTE (externally_visible) +# define _GL_ATTRIBUTE_EXTERNALLY_VISIBLE __attribute__ ((externally_visible)) +# else +# define _GL_ATTRIBUTE_EXTERNALLY_VISIBLE +# endif #endif /* _GL_ATTRIBUTE_FALLTHROUGH declares that it is not a programming mistake if @@ -1830,12 +1906,18 @@ 'default' label. The compiler should not warn in this case. */ /* Applies to: Empty statement (;), inside a 'switch' statement. */ /* Always expands to something. */ -#if _GL_HAS_C_ATTRIBUTE (fallthrough) -# define _GL_ATTRIBUTE_FALLTHROUGH [[__fallthrough__]] -#elif _GL_HAS_ATTRIBUTE (fallthrough) -# define _GL_ATTRIBUTE_FALLTHROUGH __attribute__ ((__fallthrough__)) -#else -# define _GL_ATTRIBUTE_FALLTHROUGH ((void) 0) +#ifndef _GL_ATTRIBUTE_FALLTHROUGH +# ifdef __has_c_attribute +# if __has_c_attribute (__fallthrough__) +# define _GL_ATTRIBUTE_FALLTHROUGH [[__fallthrough__]] +# endif +# endif +# if !defined _GL_ATTRIBUTE_FALLTHROUGH && _GL_HAS_ATTRIBUTE (fallthrough) +# define _GL_ATTRIBUTE_FALLTHROUGH __attribute__ ((__fallthrough__)) +# endif +# ifndef _GL_ATTRIBUTE_FALLTHROUGH +# define _GL_ATTRIBUTE_FALLTHROUGH ((void) 0) +# endif #endif /* _GL_ATTRIBUTE_FORMAT ((ARCHETYPE, STRING-INDEX, FIRST-TO-CHECK)) @@ -1849,10 +1931,12 @@ If FIRST-TO-CHECK is not 0, arguments starting at FIRST-TO_CHECK are suitable for the format string. */ /* Applies to: functions. */ -#if _GL_HAS_ATTRIBUTE (format) -# define _GL_ATTRIBUTE_FORMAT(spec) __attribute__ ((__format__ spec)) -#else -# define _GL_ATTRIBUTE_FORMAT(spec) +#ifndef _GL_ATTRIBUTE_FORMAT +# if _GL_HAS_ATTRIBUTE (format) +# define _GL_ATTRIBUTE_FORMAT(spec) __attribute__ ((__format__ spec)) +# else +# define _GL_ATTRIBUTE_FORMAT(spec) +# endif #endif /* _GL_ATTRIBUTE_LEAF declares that if the function is called from some other @@ -1860,19 +1944,23 @@ exception handling. This declaration lets the compiler optimize that unit more aggressively. */ /* Applies to: functions. */ -#if _GL_HAS_ATTRIBUTE (leaf) -# define _GL_ATTRIBUTE_LEAF __attribute__ ((__leaf__)) -#else -# define _GL_ATTRIBUTE_LEAF +#ifndef _GL_ATTRIBUTE_LEAF +# if _GL_HAS_ATTRIBUTE (leaf) +# define _GL_ATTRIBUTE_LEAF __attribute__ ((__leaf__)) +# else +# define _GL_ATTRIBUTE_LEAF +# endif #endif /* _GL_ATTRIBUTE_MALLOC declares that the function returns a pointer to freshly allocated memory. */ /* Applies to: functions. */ -#if _GL_HAS_ATTRIBUTE (malloc) -# define _GL_ATTRIBUTE_MALLOC __attribute__ ((__malloc__)) -#else -# define _GL_ATTRIBUTE_MALLOC +#ifndef _GL_ATTRIBUTE_MALLOC +# if _GL_HAS_ATTRIBUTE (malloc) +# define _GL_ATTRIBUTE_MALLOC __attribute__ ((__malloc__)) +# else +# define _GL_ATTRIBUTE_MALLOC +# endif #endif /* _GL_ATTRIBUTE_MAY_ALIAS declares that pointers to the type may point to the @@ -1880,10 +1968,12 @@ strict aliasing optimization. */ /* Applies to: types. */ /* Oracle Studio 12.6 mishandles may_alias despite __has_attribute OK. */ -#if _GL_HAS_ATTRIBUTE (may_alias) && !defined __SUNPRO_C -# define _GL_ATTRIBUTE_MAY_ALIAS __attribute__ ((__may_alias__)) -#else -# define _GL_ATTRIBUTE_MAY_ALIAS +#ifndef _GL_ATTRIBUTE_MAY_ALIAS +# if _GL_HAS_ATTRIBUTE (may_alias) && !defined __SUNPRO_C +# define _GL_ATTRIBUTE_MAY_ALIAS __attribute__ ((__may_alias__)) +# else +# define _GL_ATTRIBUTE_MAY_ALIAS +# endif #endif /* _GL_ATTRIBUTE_MAYBE_UNUSED declares that it is not a programming mistake if @@ -1895,15 +1985,27 @@ - enumeration, enumeration item, - typedef, in C++ also: class. */ -/* In C++ and C2x, this is spelled [[__maybe_unused__]]. +/* In C++ and C23, this is spelled [[__maybe_unused__]]. GCC's syntax is __attribute__ ((__unused__)). - clang supports both syntaxes. */ -#if _GL_HAS_C_ATTRIBUTE (maybe_unused) -# define _GL_ATTRIBUTE_MAYBE_UNUSED [[__maybe_unused__]] -#else -# define _GL_ATTRIBUTE_MAYBE_UNUSED _GL_ATTRIBUTE_UNUSED + clang supports both syntaxes. Except that with clang ≥ 6, < 10, in C++ mode, + __has_c_attribute (__maybe_unused__) yields true but the use of + [[__maybe_unused__]] nevertheless produces a warning. */ +#ifndef _GL_ATTRIBUTE_MAYBE_UNUSED +# if defined __clang__ && defined __cplusplus +# if !defined __apple_build_version__ && __clang_major__ >= 10 +# define _GL_ATTRIBUTE_MAYBE_UNUSED [[__maybe_unused__]] +# endif +# elif defined __has_c_attribute +# if __has_c_attribute (__maybe_unused__) +# define _GL_ATTRIBUTE_MAYBE_UNUSED [[__maybe_unused__]] +# endif +# endif +# ifndef _GL_ATTRIBUTE_MAYBE_UNUSED +# define _GL_ATTRIBUTE_MAYBE_UNUSED _GL_ATTRIBUTE_UNUSED +# endif #endif -/* Alternative spelling of this macro, for convenience. */ +/* Alternative spelling of this macro, for convenience and for + compatibility with glibc/include/libc-symbols.h. */ #define _GL_UNUSED _GL_ATTRIBUTE_MAYBE_UNUSED /* Earlier spellings of this macro. */ #define _UNUSED_PARAMETER_ _GL_ATTRIBUTE_MAYBE_UNUSED @@ -1912,21 +2014,38 @@ discard the return value. The compiler may warn if the caller does not use the return value, unless the caller uses something like ignore_value. */ /* Applies to: function, enumeration, class. */ -#if _GL_HAS_C_ATTRIBUTE (nodiscard) -# define _GL_ATTRIBUTE_NODISCARD [[__nodiscard__]] -#elif _GL_HAS_ATTRIBUTE (warn_unused_result) -# define _GL_ATTRIBUTE_NODISCARD __attribute__ ((__warn_unused_result__)) -#else -# define _GL_ATTRIBUTE_NODISCARD +#ifndef _GL_ATTRIBUTE_NODISCARD +# if defined __clang__ && defined __cplusplus + /* With clang up to 15.0.6 (at least), in C++ mode, [[__nodiscard__]] produces + a warning. + The 1000 below means a yet unknown threshold. When clang++ version X + starts supporting [[__nodiscard__]] without warning about it, you can + replace the 1000 with X. */ +# if __clang_major__ >= 1000 +# define _GL_ATTRIBUTE_NODISCARD [[__nodiscard__]] +# endif +# elif defined __has_c_attribute +# if __has_c_attribute (__nodiscard__) +# define _GL_ATTRIBUTE_NODISCARD [[__nodiscard__]] +# endif +# endif +# if !defined _GL_ATTRIBUTE_NODISCARD && _GL_HAS_ATTRIBUTE (warn_unused_result) +# define _GL_ATTRIBUTE_NODISCARD __attribute__ ((__warn_unused_result__)) +# endif +# ifndef _GL_ATTRIBUTE_NODISCARD +# define _GL_ATTRIBUTE_NODISCARD +# endif #endif /* _GL_ATTRIBUTE_NOINLINE tells that the compiler should not inline the function. */ /* Applies to: functions. */ -#if _GL_HAS_ATTRIBUTE (noinline) -# define _GL_ATTRIBUTE_NOINLINE __attribute__ ((__noinline__)) -#else -# define _GL_ATTRIBUTE_NOINLINE +#ifndef _GL_ATTRIBUTE_NOINLINE +# if _GL_HAS_ATTRIBUTE (noinline) +# define _GL_ATTRIBUTE_NOINLINE __attribute__ ((__noinline__)) +# else +# define _GL_ATTRIBUTE_NOINLINE +# endif #endif /* _GL_ATTRIBUTE_NONNULL ((N1, N2,...)) declares that the arguments N1, N2,... @@ -1934,20 +2053,24 @@ _GL_ATTRIBUTE_NONNULL () declares that all pointer arguments must not be null. */ /* Applies to: functions. */ -#if _GL_HAS_ATTRIBUTE (nonnull) -# define _GL_ATTRIBUTE_NONNULL(args) __attribute__ ((__nonnull__ args)) -#else -# define _GL_ATTRIBUTE_NONNULL(args) +#ifndef _GL_ATTRIBUTE_NONNULL +# if _GL_HAS_ATTRIBUTE (nonnull) +# define _GL_ATTRIBUTE_NONNULL(args) __attribute__ ((__nonnull__ args)) +# else +# define _GL_ATTRIBUTE_NONNULL(args) +# endif #endif /* _GL_ATTRIBUTE_NONSTRING declares that the contents of a character array is not meant to be NUL-terminated. */ /* Applies to: struct/union members and variables that are arrays of element type '[[un]signed] char'. */ -#if _GL_HAS_ATTRIBUTE (nonstring) -# define _GL_ATTRIBUTE_NONSTRING __attribute__ ((__nonstring__)) -#else -# define _GL_ATTRIBUTE_NONSTRING +#ifndef _GL_ATTRIBUTE_NONSTRING +# if _GL_HAS_ATTRIBUTE (nonstring) +# define _GL_ATTRIBUTE_NONSTRING __attribute__ ((__nonstring__)) +# else +# define _GL_ATTRIBUTE_NONSTRING +# endif #endif /* There is no _GL_ATTRIBUTE_NORETURN; use _Noreturn instead. */ @@ -1955,10 +2078,12 @@ /* _GL_ATTRIBUTE_NOTHROW declares that the function does not throw exceptions. */ /* Applies to: functions. */ -#if _GL_HAS_ATTRIBUTE (nothrow) && !defined __cplusplus -# define _GL_ATTRIBUTE_NOTHROW __attribute__ ((__nothrow__)) -#else -# define _GL_ATTRIBUTE_NOTHROW +#ifndef _GL_ATTRIBUTE_NOTHROW +# if _GL_HAS_ATTRIBUTE (nothrow) && !defined __cplusplus +# define _GL_ATTRIBUTE_NOTHROW __attribute__ ((__nothrow__)) +# else +# define _GL_ATTRIBUTE_NOTHROW +# endif #endif /* _GL_ATTRIBUTE_PACKED declares: @@ -1967,10 +2092,12 @@ minimizing the memory required. */ /* Applies to: struct members, struct, union, in C++ also: class. */ -#if _GL_HAS_ATTRIBUTE (packed) -# define _GL_ATTRIBUTE_PACKED __attribute__ ((__packed__)) -#else -# define _GL_ATTRIBUTE_PACKED +#ifndef _GL_ATTRIBUTE_PACKED +# if _GL_HAS_ATTRIBUTE (packed) +# define _GL_ATTRIBUTE_PACKED __attribute__ ((__packed__)) +# else +# define _GL_ATTRIBUTE_PACKED +# endif #endif /* _GL_ATTRIBUTE_PURE declares that It is OK for a compiler to omit duplicate @@ -1980,19 +2107,23 @@ observable state, and always returns exactly once. (This attribute is looser than _GL_ATTRIBUTE_CONST.) */ /* Applies to: functions. */ -#if _GL_HAS_ATTRIBUTE (pure) -# define _GL_ATTRIBUTE_PURE __attribute__ ((__pure__)) -#else -# define _GL_ATTRIBUTE_PURE +#ifndef _GL_ATTRIBUTE_PURE +# if _GL_HAS_ATTRIBUTE (pure) +# define _GL_ATTRIBUTE_PURE __attribute__ ((__pure__)) +# else +# define _GL_ATTRIBUTE_PURE +# endif #endif /* _GL_ATTRIBUTE_RETURNS_NONNULL declares that the function's return value is a non-NULL pointer. */ /* Applies to: functions. */ -#if _GL_HAS_ATTRIBUTE (returns_nonnull) -# define _GL_ATTRIBUTE_RETURNS_NONNULL __attribute__ ((__returns_nonnull__)) -#else -# define _GL_ATTRIBUTE_RETURNS_NONNULL +#ifndef _GL_ATTRIBUTE_RETURNS_NONNULL +# if _GL_HAS_ATTRIBUTE (returns_nonnull) +# define _GL_ATTRIBUTE_RETURNS_NONNULL __attribute__ ((__returns_nonnull__)) +# else +# define _GL_ATTRIBUTE_RETURNS_NONNULL +# endif #endif /* _GL_ATTRIBUTE_SENTINEL(pos) declares that the variadic function expects a @@ -2000,17 +2131,21 @@ _GL_ATTRIBUTE_SENTINEL () - The last argument is NULL (requires C99). _GL_ATTRIBUTE_SENTINEL ((N)) - The (N+1)st argument from the end is NULL. */ /* Applies to: functions. */ -#if _GL_HAS_ATTRIBUTE (sentinel) -# define _GL_ATTRIBUTE_SENTINEL(pos) __attribute__ ((__sentinel__ pos)) -#else -# define _GL_ATTRIBUTE_SENTINEL(pos) +#ifndef _GL_ATTRIBUTE_SENTINEL +# if _GL_HAS_ATTRIBUTE (sentinel) +# define _GL_ATTRIBUTE_SENTINEL(pos) __attribute__ ((__sentinel__ pos)) +# else +# define _GL_ATTRIBUTE_SENTINEL(pos) +# endif #endif /* A helper macro. Don't use it directly. */ -#if _GL_HAS_ATTRIBUTE (unused) -# define _GL_ATTRIBUTE_UNUSED __attribute__ ((__unused__)) -#else -# define _GL_ATTRIBUTE_UNUSED +#ifndef _GL_ATTRIBUTE_UNUSED +# if _GL_HAS_ATTRIBUTE (unused) +# define _GL_ATTRIBUTE_UNUSED __attribute__ ((__unused__)) +# else +# define _GL_ATTRIBUTE_UNUSED +# endif #endif @@ -2020,10 +2155,12 @@ /* Applies to: label (both in C and C++). */ /* Note that g++ < 4.5 does not support the '__attribute__ ((__unused__)) ;' syntax. But clang does. */ -#if !(defined __cplusplus && !_GL_GNUC_PREREQ (4, 5)) || defined __clang__ -# define _GL_UNUSED_LABEL _GL_ATTRIBUTE_UNUSED -#else -# define _GL_UNUSED_LABEL +#ifndef _GL_UNUSED_LABEL +# if !(defined __cplusplus && !_GL_GNUC_PREREQ (4, 5)) || defined __clang__ +# define _GL_UNUSED_LABEL _GL_ATTRIBUTE_UNUSED +# else +# define _GL_UNUSED_LABEL +# endif #endif @@ -2160,3 +2297,149 @@ /* Define as a macro for copying va_list variables. */ #undef va_copy + +#if !defined HAVE_C_ALIGNASOF && __cplusplus < 201103 && !defined alignof +# if HAVE_STDALIGN_H +# include <stdalign.h> +# endif + +/* ISO C23 alignas and alignof for platforms that lack it. + + References: + ISO C23 (latest free draft + <http://www.open-std.org/jtc1/sc22/wg14/www/docs/n3047.pdf>) + sections 6.5.3.4, 6.7.5, 7.15. + C++11 (latest free draft + <http://www.open-std.org/jtc1/sc22/wg21/docs/papers/2011/n3242.pdf>) + section 18.10. */ + +/* alignof (TYPE), also known as _Alignof (TYPE), yields the alignment + requirement of a structure member (i.e., slot or field) that is of + type TYPE, as an integer constant expression. + + This differs from GCC's and clang's __alignof__ operator, which can + yield a better-performing alignment for an object of that type. For + example, on x86 with GCC and on Linux/x86 with clang, + __alignof__ (double) and __alignof__ (long long) are 8, whereas + alignof (double) and alignof (long long) are 4 unless the option + '-malign-double' is used. + + The result cannot be used as a value for an 'enum' constant, if you + want to be portable to HP-UX 10.20 cc and AIX 3.2.5 xlc. */ + +/* GCC releases before GCC 4.9 had a bug in _Alignof. See GCC bug 52023 + <https://gcc.gnu.org/bugzilla/show_bug.cgi?id=52023>. + clang versions < 8.0.0 have the same bug. */ +# if (!defined __STDC_VERSION__ || __STDC_VERSION__ < 201112 \ + || (defined __GNUC__ && __GNUC__ < 4 + (__GNUC_MINOR__ < 9) \ + && !defined __clang__) \ + || (defined __clang__ && __clang_major__ < 8)) +# undef/**/_Alignof +# ifdef __cplusplus +# if (201103 <= __cplusplus || defined _MSC_VER) +# define _Alignof(type) alignof (type) +# else + template <class __t> struct __alignof_helper { char __a; __t __b; }; +# define _Alignof(type) offsetof (__alignof_helper<type>, __b) +# define _GL_STDALIGN_NEEDS_STDDEF 1 +# endif +# else +# if (defined __GNUC__ && 4 <= __GNUC__) || defined __clang__ +# define _Alignof(type) __builtin_offsetof (struct { char __a; type __b; }, __b) +# else +# define _Alignof(type) offsetof (struct { char __a; type __b; }, __b) +# define _GL_STDALIGN_NEEDS_STDDEF 1 +# endif +# endif +# endif +# if ! (defined __cplusplus && (201103 <= __cplusplus || defined _MSC_VER)) +# undef/**/alignof +# define alignof _Alignof +# endif + +/* alignas (A), also known as _Alignas (A), aligns a variable or type + to the alignment A, where A is an integer constant expression. For + example: + + int alignas (8) foo; + struct s { int a; int alignas (8) bar; }; + + aligns the address of FOO and the offset of BAR to be multiples of 8. + + A should be a power of two that is at least the type's alignment + and at most the implementation's alignment limit. This limit is + 2**28 on typical GNUish hosts, and 2**13 on MSVC. To be portable + to MSVC through at least version 10.0, A should be an integer + constant, as MSVC does not support expressions such as 1 << 3. + To be portable to Sun C 5.11, do not align auto variables to + anything stricter than their default alignment. + + The following C23 requirements are not supported here: + + - If A is zero, alignas has no effect. + - alignas can be used multiple times; the strictest one wins. + - alignas (TYPE) is equivalent to alignas (alignof (TYPE)). + + */ +# if !HAVE_STDALIGN_H +# if !defined __STDC_VERSION__ || __STDC_VERSION__ < 201112 +# if defined __cplusplus && (201103 <= __cplusplus || defined _MSC_VER) +# define _Alignas(a) alignas (a) +# elif (!defined __attribute__ \ + && ((defined __APPLE__ && defined __MACH__ \ + ? 4 < __GNUC__ + (1 <= __GNUC_MINOR__) \ + : __GNUC__ && !defined __ibmxl__) \ + || (4 <= __clang_major__) \ + || (__ia64 && (61200 <= __HP_cc || 61200 <= __HP_aCC)) \ + || __ICC || 0x590 <= __SUNPRO_C || 0x0600 <= __xlC__)) +# define _Alignas(a) __attribute__ ((__aligned__ (a))) +# elif 1300 <= _MSC_VER +# define _Alignas(a) __declspec (align (a)) +# endif +# endif +# if ((defined _Alignas \ + && !(defined __cplusplus \ + && (201103 <= __cplusplus || defined _MSC_VER))) \ + || (defined __STDC_VERSION__ && 201112 <= __STDC_VERSION__)) +# define alignas _Alignas +# endif +# endif + +# if _GL_STDALIGN_NEEDS_STDDEF +# include <stddef.h> +# endif +#endif + +#ifndef HAVE_C_BOOL +# if !defined __cplusplus && !defined __bool_true_false_are_defined +# if HAVE_STDBOOL_H +# include <stdbool.h> +# else +# if defined __SUNPRO_C +# error "<stdbool.h> is not usable with this configuration. To make it usable, add -D_STDC_C99= to $CC." +# else +# error "<stdbool.h> does not exist on this platform. Use gnulib module 'stdbool-c99' instead of gnulib module 'stdbool'." +# endif +# endif +# endif +# if !true +# define true (!false) +# endif +#endif + +#if (!defined HAVE_C_STATIC_ASSERT && !defined assert \ + && (!defined __cplusplus \ + || (__cpp_static_assert < 201411 \ + && __GNUG__ < 6 && __clang_major__ < 6))) + #include <assert.h> + #undef/**/assert + #ifdef __sgi + #undef/**/__ASSERT_H__ + #endif + /* Solaris 11.4 <assert.h> defines static_assert as a macro with 2 arguments. + We need it also to be invocable with a single argument. */ + #if defined __sun && (__STDC_VERSION__ - 0 >= 201112L) && !defined __cplusplus + #undef/**/static_assert + #define static_assert _Static_assert + #endif +#endif diff --git a/lib/dirname-lgpl.c b/lib/dirname-lgpl.c index d54f6a9..e9454af 100644 --- a/lib/dirname-lgpl.c +++ b/lib/dirname-lgpl.c @@ -1,6 +1,6 @@ /* dirname.c -- return all but the last element in a file name - Copyright (C) 1990, 1998, 2000-2001, 2003-2006, 2009-2022 Free Software + Copyright (C) 1990, 1998, 2000-2001, 2003-2006, 2009-2023 Free Software Foundation, Inc. This file is free software: you can redistribute it and/or modify diff --git a/lib/dirname.c b/lib/dirname.c index 3d2aaf1..e72f713 100644 --- a/lib/dirname.c +++ b/lib/dirname.c @@ -1,6 +1,6 @@ /* dirname.c -- return all but the last element in a file name - Copyright (C) 1990, 1998, 2000-2001, 2003-2006, 2009-2022 Free Software + Copyright (C) 1990, 1998, 2000-2001, 2003-2006, 2009-2023 Free Software Foundation, Inc. This program is free software: you can redistribute it and/or modify diff --git a/lib/dirname.h b/lib/dirname.h index e18a97e..f98e83b 100644 --- a/lib/dirname.h +++ b/lib/dirname.h @@ -1,6 +1,6 @@ /* Take file names apart into directory and base names. - Copyright (C) 1998, 2001, 2003-2006, 2009-2022 Free Software Foundation, + Copyright (C) 1998, 2001, 2003-2006, 2009-2023 Free Software Foundation, Inc. This file is free software: you can redistribute it and/or modify @@ -19,7 +19,6 @@ #ifndef DIRNAME_H_ # define DIRNAME_H_ 1 -# include <stdbool.h> # include <stdlib.h> # include "filename.h" # include "basename-lgpl.h" @@ -1,6 +1,6 @@ /* Duplicate an open file descriptor to a specified file descriptor. - Copyright (C) 1999, 2004-2007, 2009-2022 Free Software Foundation, Inc. + Copyright (C) 1999, 2004-2007, 2009-2023 Free Software Foundation, Inc. This file is free software: you can redistribute it and/or modify it under the terms of the GNU Lesser General Public License as diff --git a/lib/dynarray.h b/lib/dynarray.h index ca6439d..9155910 100644 --- a/lib/dynarray.h +++ b/lib/dynarray.h @@ -1,5 +1,5 @@ /* Type-safe arrays which grow dynamically. - Copyright 2021-2022 Free Software Foundation, Inc. + Copyright 2021-2023 Free Software Foundation, Inc. This file is free software: you can redistribute it and/or modify it under the terms of the GNU Lesser General Public License as diff --git a/lib/eloop-threshold.h b/lib/eloop-threshold.h index 8b31457..510f261 100644 --- a/lib/eloop-threshold.h +++ b/lib/eloop-threshold.h @@ -1,5 +1,5 @@ /* Threshold at which to diagnose ELOOP. Generic version. - Copyright (C) 2012-2022 Free Software Foundation, Inc. + Copyright (C) 2012-2023 Free Software Foundation, Inc. This file is part of the GNU C Library. The GNU C Library is free software; you can redistribute it and/or diff --git a/lib/errno.in.h b/lib/errno.in.h index 3ec1845..3dda9c2 100644 --- a/lib/errno.in.h +++ b/lib/errno.in.h @@ -1,6 +1,6 @@ /* A POSIX-like <errno.h>. - Copyright (C) 2008-2022 Free Software Foundation, Inc. + Copyright (C) 2008-2023 Free Software Foundation, Inc. This file is free software: you can redistribute it and/or modify it under the terms of the GNU Lesser General Public License as diff --git a/lib/error.c b/lib/error.c index 272d45e..ef43728 100644 --- a/lib/error.c +++ b/lib/error.c @@ -1,5 +1,5 @@ /* Error handler for noninteractive utilities - Copyright (C) 1990-1998, 2000-2007, 2009-2022 Free Software Foundation, Inc. + Copyright (C) 1990-1998, 2000-2007, 2009-2023 Free Software Foundation, Inc. This file is part of the GNU C Library. This file is free software: you can redistribute it and/or modify @@ -42,8 +42,6 @@ # define USE_UNLOCKED_IO 0 # define _GL_ATTRIBUTE_FORMAT_PRINTF_STANDARD(a, b) # define _GL_ARG_NONNULL(a) -#else -# include "getprogname.h" #endif #if USE_UNLOCKED_IO diff --git a/lib/error.h b/lib/error.h deleted file mode 100644 index 45ec2a5..0000000 --- a/lib/error.h +++ /dev/null @@ -1,66 +0,0 @@ -/* Declaration for error-reporting function - Copyright (C) 1995-1997, 2003, 2006, 2008-2022 Free Software Foundation, - Inc. - This file is part of 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 <https://www.gnu.org/licenses/>. */ - -#ifndef _ERROR_H -#define _ERROR_H 1 - -/* Get _GL_ATTRIBUTE_SPEC_PRINTF_STANDARD, _GL_ATTRIBUTE_SPEC_PRINTF_SYSTEM. */ -#include <stdio.h> - -#ifdef __cplusplus -extern "C" { -#endif - -/* Print a message with 'fprintf (stderr, FORMAT, ...)'; - if ERRNUM is nonzero, follow it with ": " and strerror (ERRNUM). - If STATUS is nonzero, terminate the program with 'exit (STATUS)'. */ - -extern void error (int __status, int __errnum, const char *__format, ...) -#if GNULIB_VFPRINTF_POSIX - _GL_ATTRIBUTE_FORMAT ((_GL_ATTRIBUTE_SPEC_PRINTF_STANDARD, 3, 4)) -#else - _GL_ATTRIBUTE_FORMAT ((_GL_ATTRIBUTE_SPEC_PRINTF_SYSTEM, 3, 4)) -#endif - ; - -extern void error_at_line (int __status, int __errnum, const char *__fname, - unsigned int __lineno, const char *__format, ...) -#if GNULIB_VFPRINTF_POSIX - _GL_ATTRIBUTE_FORMAT ((_GL_ATTRIBUTE_SPEC_PRINTF_STANDARD, 5, 6)) -#else - _GL_ATTRIBUTE_FORMAT ((_GL_ATTRIBUTE_SPEC_PRINTF_SYSTEM, 5, 6)) -#endif - ; - -/* If NULL, error will flush stdout, then print on stderr the program - name, a colon and a space. Otherwise, error will call this - function without parameters instead. */ -extern void (*error_print_progname) (void); - -/* This variable is incremented each time 'error' is called. */ -extern unsigned int error_message_count; - -/* Sometimes we want to have at most one error per line. This - variable controls whether this mode is selected or not. */ -extern int error_one_per_line; - -#ifdef __cplusplus -} -#endif - -#endif /* error.h */ diff --git a/lib/error.in.h b/lib/error.in.h new file mode 100644 index 0000000..dcb49d1 --- /dev/null +++ b/lib/error.in.h @@ -0,0 +1,118 @@ +/* Declarations for error-reporting functions. + Copyright (C) 1995-1997, 2003, 2006, 2008-2023 Free Software Foundation, + Inc. + This file is part of 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 <https://www.gnu.org/licenses/>. */ + +#ifndef _@GUARD_PREFIX@_ERROR_H + +#if __GNUC__ >= 3 +@PRAGMA_SYSTEM_HEADER@ +#endif + +/* The include_next requires a split double-inclusion guard. */ +#if @HAVE_ERROR_H@ +# @INCLUDE_NEXT@ @NEXT_ERROR_H@ +#endif + +#ifndef _@GUARD_PREFIX@_ERROR_H +#define _@GUARD_PREFIX@_ERROR_H + +/* Get _GL_ATTRIBUTE_SPEC_PRINTF_STANDARD, _GL_ATTRIBUTE_SPEC_PRINTF_SYSTEM. */ +#include <stdio.h> + +/* The definitions of _GL_FUNCDECL_RPL etc. are copied here. */ + +#if GNULIB_VFPRINTF_POSIX +# define _GL_ATTRIBUTE_SPEC_PRINTF_ERROR _GL_ATTRIBUTE_SPEC_PRINTF_STANDARD +#else +# define _GL_ATTRIBUTE_SPEC_PRINTF_ERROR _GL_ATTRIBUTE_SPEC_PRINTF_SYSTEM +#endif + +#ifdef __cplusplus +extern "C" { +#endif + +/* Print a message with 'fprintf (stderr, FORMAT, ...)'; + if ERRNUM is nonzero, follow it with ": " and strerror (ERRNUM). + If STATUS is nonzero, terminate the program with 'exit (STATUS)'. */ +#if @REPLACE_ERROR@ +# if !(defined __cplusplus && defined GNULIB_NAMESPACE) +# undef error +# define error rpl_error +# endif +_GL_FUNCDECL_RPL (error, void, + (int __status, int __errnum, const char *__format, ...) + _GL_ATTRIBUTE_FORMAT ((_GL_ATTRIBUTE_SPEC_PRINTF_ERROR, 3, 4))); +_GL_CXXALIAS_RPL (error, void, + (int __status, int __errnum, const char *__format, ...)); +#else +# if ! @HAVE_ERROR@ +_GL_FUNCDECL_SYS (error, void, + (int __status, int __errnum, const char *__format, ...) + _GL_ATTRIBUTE_FORMAT ((_GL_ATTRIBUTE_SPEC_PRINTF_ERROR, 3, 4))); +# endif +_GL_CXXALIAS_SYS (error, void, + (int __status, int __errnum, const char *__format, ...)); +#endif +#if __GLIBC__ >= 2 +_GL_CXXALIASWARN (error); +#endif + +/* Likewise. If FILENAME is non-NULL, include FILENAME:LINENO: in the + message. */ +#if @REPLACE_ERROR_AT_LINE@ +# if !(defined __cplusplus && defined GNULIB_NAMESPACE) +# undef error_at_line +# define error_at_line rpl_error_at_line +# endif +_GL_FUNCDECL_RPL (error_at_line, void, + (int __status, int __errnum, const char *__filename, + unsigned int __lineno, const char *__format, ...) + _GL_ATTRIBUTE_FORMAT ((_GL_ATTRIBUTE_SPEC_PRINTF_ERROR, 5, 6))); +_GL_CXXALIAS_RPL (error_at_line, void, + (int __status, int __errnum, const char *__filename, + unsigned int __lineno, const char *__format, ...)); +#else +# if ! @HAVE_ERROR_AT_LINE@ +_GL_FUNCDECL_SYS (error_at_line, void, + (int __status, int __errnum, const char *__filename, + unsigned int __lineno, const char *__format, ...) + _GL_ATTRIBUTE_FORMAT ((_GL_ATTRIBUTE_SPEC_PRINTF_ERROR, 5, 6))); +# endif +_GL_CXXALIAS_SYS (error_at_line, void, + (int __status, int __errnum, const char *__filename, + unsigned int __lineno, const char *__format, ...)); +#endif +_GL_CXXALIASWARN (error_at_line); + +/* If NULL, error will flush stdout, then print on stderr the program + name, a colon and a space. Otherwise, error will call this + function without parameters instead. */ +extern void (*error_print_progname) (void); + +/* This variable is incremented each time 'error' is called. */ +extern unsigned int error_message_count; + +/* Sometimes we want to have at most one error per line. This + variable controls whether this mode is selected or not. */ +extern int error_one_per_line; + +#ifdef __cplusplus +} +#endif + +#endif /* _@GUARD_PREFIX@_ERROR_H */ +#endif /* _@GUARD_PREFIX@_ERROR_H */ diff --git a/lib/exitfail.c b/lib/exitfail.c index 84fb0ef..d67a130 100644 --- a/lib/exitfail.c +++ b/lib/exitfail.c @@ -1,6 +1,6 @@ /* Failure exit status - Copyright (C) 2002-2003, 2005-2007, 2009-2022 Free Software Foundation, Inc. + Copyright (C) 2002-2003, 2005-2007, 2009-2023 Free Software Foundation, Inc. This file is free software: you can redistribute it and/or modify it under the terms of the GNU Lesser General Public License as diff --git a/lib/exitfail.h b/lib/exitfail.h index 865f096..85a6af6 100644 --- a/lib/exitfail.h +++ b/lib/exitfail.h @@ -1,6 +1,6 @@ /* Failure exit status - Copyright (C) 2002, 2009-2022 Free Software Foundation, Inc. + Copyright (C) 2002, 2009-2023 Free Software Foundation, Inc. This file is free software: you can redistribute it and/or modify it under the terms of the GNU Lesser General Public License as diff --git a/lib/fcntl.c b/lib/fcntl.c index f9753c4..e220800 100644 --- a/lib/fcntl.c +++ b/lib/fcntl.c @@ -1,6 +1,6 @@ /* Provide file descriptor control. - Copyright (C) 2009-2022 Free Software Foundation, Inc. + Copyright (C) 2009-2023 Free Software Foundation, Inc. This file is free software: you can redistribute it and/or modify it under the terms of the GNU Lesser General Public License as diff --git a/lib/fcntl.in.h b/lib/fcntl.in.h index 9270ced..e034eaf 100644 --- a/lib/fcntl.in.h +++ b/lib/fcntl.in.h @@ -1,6 +1,6 @@ /* Like <fcntl.h>, but with non-working flags defined to 0. - Copyright (C) 2006-2022 Free Software Foundation, Inc. + Copyright (C) 2006-2023 Free Software Foundation, Inc. This file is free software: you can redistribute it and/or modify it under the terms of the GNU Lesser General Public License as diff --git a/lib/fd-hook.c b/lib/fd-hook.c index 64a7a80..3626115 100644 --- a/lib/fd-hook.c +++ b/lib/fd-hook.c @@ -1,5 +1,5 @@ /* Hook for making file descriptor functions close(), ioctl() extensible. - Copyright (C) 2009-2022 Free Software Foundation, Inc. + Copyright (C) 2009-2023 Free Software Foundation, Inc. Written by Bruno Haible <bruno@clisp.org>, 2009. This file is free software: you can redistribute it and/or modify diff --git a/lib/fd-hook.h b/lib/fd-hook.h index d6c4964..6bf3c24 100644 --- a/lib/fd-hook.h +++ b/lib/fd-hook.h @@ -1,5 +1,5 @@ /* Hook for making file descriptor functions close(), ioctl() extensible. - Copyright (C) 2009-2022 Free Software Foundation, Inc. + Copyright (C) 2009-2023 Free Software Foundation, Inc. This file is free software: you can redistribute it and/or modify it under the terms of the GNU Lesser General Public License as diff --git a/lib/filename.h b/lib/filename.h index ab77ca2..a2400a9 100644 --- a/lib/filename.h +++ b/lib/filename.h @@ -1,5 +1,5 @@ /* Basic filename support macros. - Copyright (C) 2001-2022 Free Software Foundation, Inc. + Copyright (C) 2001-2023 Free Software Foundation, Inc. This file is part of the GNU C Library. The GNU C Library is free software; you can redistribute it and/or diff --git a/lib/fpending.c b/lib/fpending.c index 6408cff..e57155e 100644 --- a/lib/fpending.c +++ b/lib/fpending.c @@ -1,5 +1,5 @@ /* fpending.c -- return the number of pending output bytes on a stream - Copyright (C) 2000, 2004, 2006-2007, 2009-2022 Free Software Foundation, + Copyright (C) 2000, 2004, 2006-2007, 2009-2023 Free Software Foundation, Inc. This program is free software: you can redistribute it and/or modify @@ -41,7 +41,7 @@ __fpending (FILE *fp) return fp->_IO_write_ptr - fp->_IO_write_base; #elif defined __sferror || defined __DragonFly__ || defined __ANDROID__ /* FreeBSD, NetBSD, OpenBSD, DragonFly, Mac OS X, Cygwin < 1.7.34, Minix 3, Android */ - return fp->_p - fp->_bf._base; + return fp_->_p - fp_->_bf._base; #elif defined __EMX__ /* emx+gcc */ return fp->_ptr - fp->_buffer; #elif defined __minix /* Minix */ diff --git a/lib/fpending.h b/lib/fpending.h index 43542c5..5e860db 100644 --- a/lib/fpending.h +++ b/lib/fpending.h @@ -1,6 +1,6 @@ /* Declare __fpending. - Copyright (C) 2000, 2003, 2005-2006, 2009-2022 Free Software Foundation, + Copyright (C) 2000, 2003, 2005-2006, 2009-2023 Free Software Foundation, Inc. This program is free software: you can redistribute it and/or modify @@ -1,6 +1,6 @@ /* Make free() preserve errno. - Copyright (C) 2003, 2006, 2009-2022 Free Software Foundation, Inc. + Copyright (C) 2003, 2006, 2009-2023 Free Software Foundation, Inc. This file is free software: you can redistribute it and/or modify it under the terms of the GNU Lesser General Public License as diff --git a/lib/fstat.c b/lib/fstat.c index 3928c86..6a23500 100644 --- a/lib/fstat.c +++ b/lib/fstat.c @@ -1,5 +1,5 @@ /* fstat() replacement. - Copyright (C) 2011-2022 Free Software Foundation, Inc. + Copyright (C) 2011-2023 Free Software Foundation, Inc. This file is free software: you can redistribute it and/or modify it under the terms of the GNU Lesser General Public License as diff --git a/lib/fsync.c b/lib/fsync.c index 9b561ab..5131466 100644 --- a/lib/fsync.c +++ b/lib/fsync.c @@ -7,7 +7,7 @@ Written by Richard W.M. Jones <rjones.at.redhat.com> - Copyright (C) 2008-2022 Free Software Foundation, Inc. + Copyright (C) 2008-2023 Free Software Foundation, Inc. This file is free software: you can redistribute it and/or modify it under the terms of the GNU Lesser General Public License as diff --git a/lib/getdtablesize.c b/lib/getdtablesize.c index 793e0f8..ac2d175 100644 --- a/lib/getdtablesize.c +++ b/lib/getdtablesize.c @@ -1,5 +1,5 @@ /* getdtablesize() function: Return maximum possible file descriptor value + 1. - Copyright (C) 2008-2022 Free Software Foundation, Inc. + Copyright (C) 2008-2023 Free Software Foundation, Inc. Written by Bruno Haible <bruno@clisp.org>, 2008. This file is free software: you can redistribute it and/or modify diff --git a/lib/getopt-cdefs.in.h b/lib/getopt-cdefs.in.h index b6dd913..e76c78c 100644 --- a/lib/getopt-cdefs.in.h +++ b/lib/getopt-cdefs.in.h @@ -1,5 +1,5 @@ /* getopt-on-non-glibc compatibility macros. - Copyright (C) 1989-2022 Free Software Foundation, Inc. + 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. diff --git a/lib/getopt-core.h b/lib/getopt-core.h index 1c40ecc..c5dd493 100644 --- a/lib/getopt-core.h +++ b/lib/getopt-core.h @@ -1,5 +1,5 @@ /* Declarations for getopt (basic, portable features only). - Copyright (C) 1989-2022 Free Software Foundation, Inc. + 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. diff --git a/lib/getopt-ext.h b/lib/getopt-ext.h index d661fcc..d37c293 100644 --- a/lib/getopt-ext.h +++ b/lib/getopt-ext.h @@ -1,5 +1,5 @@ /* Declarations for getopt (GNU extensions). - Copyright (C) 1989-2022 Free Software Foundation, Inc. + 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. diff --git a/lib/getopt-pfx-core.h b/lib/getopt-pfx-core.h index 3eead0e..095e393 100644 --- a/lib/getopt-pfx-core.h +++ b/lib/getopt-pfx-core.h @@ -1,5 +1,5 @@ /* getopt (basic, portable features) gnulib wrapper header. - Copyright (C) 1989-2022 Free Software Foundation, Inc. + 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. @@ -47,7 +47,7 @@ # define optind __GETOPT_ID (optind) # define optopt __GETOPT_ID (optopt) -/* Work around a a problem on macOS, which declares getopt with a +/* 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 <https://bugs.gnu.org/40205>. */ diff --git a/lib/getopt-pfx-ext.h b/lib/getopt-pfx-ext.h index 85a6cb5..8578d72 100644 --- a/lib/getopt-pfx-ext.h +++ b/lib/getopt-pfx-ext.h @@ -1,5 +1,5 @@ /* getopt (GNU extensions) gnulib wrapper header. - Copyright (C) 1989-2022 Free Software Foundation, Inc. + 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. diff --git a/lib/getopt.c b/lib/getopt.c index 128dc7f..1e2441c 100644 --- a/lib/getopt.c +++ b/lib/getopt.c @@ -1,5 +1,5 @@ /* Getopt for GNU. - Copyright (C) 1987-2022 Free Software Foundation, Inc. + 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. diff --git a/lib/getopt.in.h b/lib/getopt.in.h index 9bc50ee..0867d36 100644 --- a/lib/getopt.in.h +++ b/lib/getopt.in.h @@ -1,5 +1,5 @@ /* Declarations for getopt. - Copyright (C) 1989-2022 Free Software Foundation, Inc. + 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 diff --git a/lib/getopt1.c b/lib/getopt1.c index 990eee1..49323aa 100644 --- a/lib/getopt1.c +++ b/lib/getopt1.c @@ -1,5 +1,5 @@ /* getopt_long and getopt_long_only entry points for GNU getopt. - Copyright (C) 1987-2022 Free Software Foundation, Inc. + 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. diff --git a/lib/getopt_int.h b/lib/getopt_int.h index ccdbb97..4d9e24b 100644 --- a/lib/getopt_int.h +++ b/lib/getopt_int.h @@ -1,5 +1,5 @@ /* Internal declarations for getopt. - Copyright (C) 1989-2022 Free Software Foundation, Inc. + 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. diff --git a/lib/getprogname.c b/lib/getprogname.c index 62a4800..279d79f 100644 --- a/lib/getprogname.c +++ b/lib/getprogname.c @@ -1,5 +1,5 @@ /* Program name management. - Copyright (C) 2016-2022 Free Software Foundation, Inc. + Copyright (C) 2016-2023 Free Software Foundation, Inc. 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 @@ -16,11 +16,10 @@ #include <config.h> -/* Specification. */ -#include "getprogname.h" +/* Specification. Also get __argv declaration. */ +#include <stdlib.h> #include <errno.h> /* get program_invocation_name declaration */ -#include <stdlib.h> /* get __argv declaration */ #ifdef _AIX # include <unistd.h> @@ -53,13 +52,12 @@ #if defined __SCO_VERSION__ || defined __sysv5__ # include <fcntl.h> -# include <stdlib.h> # include <string.h> #endif #include "basename-lgpl.h" -#ifndef HAVE_GETPROGNAME /* not Mac OS X, FreeBSD, NetBSD, OpenBSD >= 5.4, Cygwin */ +#ifndef HAVE_GETPROGNAME /* not Mac OS X, FreeBSD, NetBSD, OpenBSD >= 5.4, Solaris >= 11, Cygwin, Android API level >= 21 */ char const * getprogname (void) { diff --git a/lib/getprogname.h b/lib/getprogname.h index 9a35e58..13314f2 100644 --- a/lib/getprogname.h +++ b/lib/getprogname.h @@ -1,5 +1,5 @@ /* Program name management. - Copyright (C) 2016-2022 Free Software Foundation, Inc. + Copyright (C) 2016-2023 Free Software Foundation, Inc. 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 @@ -19,22 +19,8 @@ #include <stdlib.h> -#ifdef __cplusplus -extern "C" { -#endif - -/* Return the base name of the executing program. - On native Windows this will usually end in ".exe" or ".EXE". */ -#ifndef HAVE_GETPROGNAME -extern char const *getprogname (void) -# ifdef HAVE_DECL_PROGRAM_INVOCATION_NAME - _GL_ATTRIBUTE_PURE -# endif - ; -#endif - -#ifdef __cplusplus -} +#if __GNUC__ || (__clang_major__ >= 4) +# warning "The include file getprogname.h is deprecated. Use <stdlib.h> instead." #endif #endif diff --git a/lib/getrandom.c b/lib/getrandom.c index e146873..19bb342 100644 --- a/lib/getrandom.c +++ b/lib/getrandom.c @@ -1,6 +1,6 @@ /* Obtain a series of random bytes. - Copyright 2020-2022 Free Software Foundation, Inc. + Copyright 2020-2023 Free Software Foundation, Inc. This file is free software: you can redistribute it and/or modify it under the terms of the GNU Lesser General Public License as @@ -23,7 +23,6 @@ #include <errno.h> #include <fcntl.h> -#include <stdbool.h> #include <unistd.h> #if defined _WIN32 && ! defined __CYGWIN__ diff --git a/lib/gettext.h b/lib/gettext.h index b3577a0..d0462c4 100644 --- a/lib/gettext.h +++ b/lib/gettext.h @@ -1,5 +1,5 @@ /* Convenience header for conditional use of GNU <libintl.h>. - Copyright (C) 1995-1998, 2000-2002, 2004-2006, 2009-2022 Free Software + Copyright (C) 1995-1998, 2000-2002, 2004-2006, 2009-2023 Free Software Foundation, Inc. This file is free software: you can redistribute it and/or modify diff --git a/lib/glthread/lock.c b/lib/glthread/lock.c index b650c21..82fb755 100644 --- a/lib/glthread/lock.c +++ b/lib/glthread/lock.c @@ -1,5 +1,5 @@ /* Locking in multithreaded situations. - Copyright (C) 2005-2022 Free Software Foundation, Inc. + Copyright (C) 2005-2023 Free Software Foundation, Inc. This file is free software: you can redistribute it and/or modify it under the terms of the GNU Lesser General Public License as diff --git a/lib/glthread/lock.h b/lib/glthread/lock.h index 47eed8f..ae3ee2d 100644 --- a/lib/glthread/lock.h +++ b/lib/glthread/lock.h @@ -1,5 +1,5 @@ /* Locking in multithreaded situations. - Copyright (C) 2005-2022 Free Software Foundation, Inc. + Copyright (C) 2005-2023 Free Software Foundation, Inc. This file is free software: you can redistribute it and/or modify it under the terms of the GNU Lesser General Public License as diff --git a/lib/glthread/threadlib.c b/lib/glthread/threadlib.c index 88a76ba..5ecf827 100644 --- a/lib/glthread/threadlib.c +++ b/lib/glthread/threadlib.c @@ -1,5 +1,5 @@ /* Multithreading primitives. - Copyright (C) 2005-2022 Free Software Foundation, Inc. + Copyright (C) 2005-2023 Free Software Foundation, Inc. This file is free software: you can redistribute it and/or modify it under the terms of the GNU Lesser General Public License as diff --git a/lib/gnulib.mk b/lib/gnulib.mk index a4eb7ad..83cd117 100644 --- a/lib/gnulib.mk +++ b/lib/gnulib.mk @@ -1,6 +1,6 @@ ## DO NOT EDIT! GENERATED AUTOMATICALLY! ## Process this file with automake to produce Makefile.in. -# Copyright (C) 2002-2022 Free Software Foundation, Inc. +# Copyright (C) 2002-2023 Free Software Foundation, Inc. # # This file is free software; you can redistribute it and/or modify # it under the terms of the GNU General Public License as published by @@ -95,13 +95,13 @@ libgnulib_la_DEPENDENCIES = $(gl_LTLIBOBJS) EXTRA_libgnulib_la_SOURCES = libgnulib_la_LDFLAGS = $(AM_LDFLAGS) libgnulib_la_LDFLAGS += -no-undefined +libgnulib_la_LDFLAGS += $(CLOCK_TIME_LIB) +libgnulib_la_LDFLAGS += $(GETRANDOM_LIB) +libgnulib_la_LDFLAGS += $(HARD_LOCALE_LIB) libgnulib_la_LDFLAGS += $(LIBTHREAD) -libgnulib_la_LDFLAGS += $(LIB_CLOCK_GETTIME) -libgnulib_la_LDFLAGS += $(LIB_GETRANDOM) -libgnulib_la_LDFLAGS += $(LIB_HARD_LOCALE) -libgnulib_la_LDFLAGS += $(LIB_MBRTOWC) -libgnulib_la_LDFLAGS += $(LIB_SETLOCALE_NULL) libgnulib_la_LDFLAGS += $(LTLIBINTL) +libgnulib_la_LDFLAGS += $(MBRTOWC_LIB) +libgnulib_la_LDFLAGS += $(SETLOCALE_NULL_LIB) ## begin gnulib module absolute-header @@ -160,6 +160,37 @@ EXTRA_DIST += argmatch.h ## end gnulib module argmatch +## begin gnulib module assert-h + +BUILT_SOURCES += $(ASSERT_H) + +# We need the following in order to create <assert.h> when the system +# doesn't have one that works with the given compiler. +if GL_GENERATE_ASSERT_H +assert.h: assert.in.h verify.h $(top_builddir)/config.status + $(gl_V_at){ $(SED_HEADER_STDOUT) \ + -e 's|@''INCLUDE_NEXT''@|$(INCLUDE_NEXT)|g' \ + -e 's|@''PRAGMA_SYSTEM_HEADER''@|@PRAGMA_SYSTEM_HEADER@|g' \ + -e 's|@''PRAGMA_COLUMNS''@|@PRAGMA_COLUMNS@|g' \ + -e 's|@''NEXT_ASSERT_H''@|$(NEXT_ASSERT_H)|g' \ + < $(srcdir)/assert.in.h && \ + sed -e '/@assert.h omit start@/,/@assert.h omit end@/d' \ + -e 's|_gl_verify|_gl_static_assert|g' \ + -e 's|_GL_VERIFY|_GL_STATIC_ASSERT|g' \ + -e 's|_GL\(_STATIC_ASSERT_H\)|_GL\1|g' \ + < $(srcdir)/verify.h; \ + } > $@-t + $(AM_V_at)mv $@-t $@ +else +assert.h: $(top_builddir)/config.status + rm -f $@ +endif +MOSTLYCLEANFILES += assert.h assert.h-t + +EXTRA_DIST += assert.in.h verify.h + +## end gnulib module assert-h + ## begin gnulib module assure @@ -278,34 +309,34 @@ configmake.h: Makefile echo '#if HAVE_WINSOCK2_H'; \ echo '# include <winsock2.h> /* avoid mingw pollution on DATADIR */'; \ echo '#endif'; \ - echo '#define PREFIX "$(prefix)"'; \ - echo '#define EXEC_PREFIX "$(exec_prefix)"'; \ - echo '#define BINDIR "$(bindir)"'; \ - echo '#define SBINDIR "$(sbindir)"'; \ - echo '#define LIBEXECDIR "$(libexecdir)"'; \ - echo '#define DATAROOTDIR "$(datarootdir)"'; \ - echo '#define DATADIR "$(datadir)"'; \ - echo '#define SYSCONFDIR "$(sysconfdir)"'; \ - echo '#define SHAREDSTATEDIR "$(sharedstatedir)"'; \ - echo '#define LOCALSTATEDIR "$(localstatedir)"'; \ - echo '#define RUNSTATEDIR "$(runstatedir)"'; \ - echo '#define INCLUDEDIR "$(includedir)"'; \ - echo '#define OLDINCLUDEDIR "$(oldincludedir)"'; \ - echo '#define DOCDIR "$(docdir)"'; \ - echo '#define INFODIR "$(infodir)"'; \ - echo '#define HTMLDIR "$(htmldir)"'; \ - echo '#define DVIDIR "$(dvidir)"'; \ - echo '#define PDFDIR "$(pdfdir)"'; \ - echo '#define PSDIR "$(psdir)"'; \ - echo '#define LIBDIR "$(libdir)"'; \ - echo '#define LISPDIR "$(lispdir)"'; \ - echo '#define LOCALEDIR "$(localedir)"'; \ - echo '#define MANDIR "$(mandir)"'; \ - echo '#define MANEXT "$(manext)"'; \ - echo '#define PKGDATADIR "$(pkgdatadir)"'; \ - echo '#define PKGINCLUDEDIR "$(pkgincludedir)"'; \ - echo '#define PKGLIBDIR "$(pkglibdir)"'; \ - echo '#define PKGLIBEXECDIR "$(pkglibexecdir)"'; \ + printf '#define PREFIX %s\n' $(prefix_c_make); \ + printf '#define EXEC_PREFIX %s\n' $(exec_prefix_c_make); \ + printf '#define BINDIR %s\n' $(bindir_c_make); \ + printf '#define SBINDIR %s\n' $(sbindir_c_make); \ + printf '#define LIBEXECDIR %s\n' $(libexecdir_c_make); \ + printf '#define DATAROOTDIR %s\n' $(datarootdir_c_make); \ + printf '#define DATADIR %s\n' $(datadir_c_make); \ + printf '#define SYSCONFDIR %s\n' $(sysconfdir_c_make); \ + printf '#define SHAREDSTATEDIR %s\n' $(sharedstatedir_c_make); \ + printf '#define LOCALSTATEDIR %s\n' $(localstatedir_c_make); \ + printf '#define RUNSTATEDIR %s\n' $(runstatedir_c_make); \ + printf '#define INCLUDEDIR %s\n' $(includedir_c_make); \ + printf '#define OLDINCLUDEDIR %s\n' $(oldincludedir_c_make); \ + printf '#define DOCDIR %s\n' $(docdir_c_make); \ + printf '#define INFODIR %s\n' $(infodir_c_make); \ + printf '#define HTMLDIR %s\n' $(htmldir_c_make); \ + printf '#define DVIDIR %s\n' $(dvidir_c_make); \ + printf '#define PDFDIR %s\n' $(pdfdir_c_make); \ + printf '#define PSDIR %s\n' $(psdir_c_make); \ + printf '#define LIBDIR %s\n' $(libdir_c_make); \ + printf '#define LISPDIR %s\n' $(lispdir_c_make); \ + printf '#define LOCALEDIR %s\n' $(localedir_c_make); \ + printf '#define MANDIR %s\n' $(mandir_c_make); \ + printf '#define MANEXT %s\n' \"$(manext)\"; \ + printf '#define PKGDATADIR %s\n' $(pkgdatadir_c_make); \ + printf '#define PKGINCLUDEDIR %s\n' $(pkgincludedir_c_make); \ + printf '#define PKGLIBDIR %s\n' $(pkglibdir_c_make); \ + printf '#define PKGLIBEXECDIR %s\n' $(pkglibexecdir_c_make); \ } | sed '/""/d' > $@-t $(AM_V_at)mv $@-t $@ @@ -347,39 +378,6 @@ endif ## end gnulib module dup2 -## begin gnulib module dynarray - -BUILT_SOURCES += malloc/dynarray.gl.h malloc/dynarray-skeleton.gl.h - -malloc/dynarray.gl.h: malloc/dynarray.h - $(AM_V_GEN)$(MKDIR_P) '%reldir%/malloc' - $(AM_V_at)$(SED_HEADER_STDOUT) \ - -e '/libc_hidden_proto/d' \ - $(srcdir)/malloc/dynarray.h > $@-t - $(AM_V_at)mv $@-t $@ -MOSTLYCLEANFILES += malloc/dynarray.gl.h malloc/dynarray.gl.h-t - -malloc/dynarray-skeleton.gl.h: malloc/dynarray-skeleton.c - $(AM_V_GEN)$(MKDIR_P) '%reldir%/malloc' - $(AM_V_at)$(SED_HEADER_STDOUT) \ - -e 's|<malloc/dynarray\.h>|<malloc/dynarray.gl.h>|g' \ - -e 's|__attribute_maybe_unused__|_GL_ATTRIBUTE_MAYBE_UNUSED|g' \ - -e 's|__attribute_nonnull__|_GL_ATTRIBUTE_NONNULL|g' \ - -e 's|__attribute_warn_unused_result__|_GL_ATTRIBUTE_NODISCARD|g' \ - -e 's|__glibc_likely|_GL_LIKELY|g' \ - -e 's|__glibc_unlikely|_GL_UNLIKELY|g' \ - $(srcdir)/malloc/dynarray-skeleton.c > $@-t - $(AM_V_at)mv $@-t $@ -MOSTLYCLEANFILES += malloc/dynarray-skeleton.gl.h malloc/dynarray-skeleton.gl.h-t - -libgnulib_la_SOURCES += malloc/dynarray_at_failure.c malloc/dynarray_emplace_enlarge.c malloc/dynarray_finalize.c malloc/dynarray_resize.c malloc/dynarray_resize_clear.c - -EXTRA_DIST += dynarray.h malloc/dynarray-skeleton.c malloc/dynarray.h - -EXTRA_libgnulib_la_SOURCES += malloc/dynarray-skeleton.c - -## end gnulib module dynarray - ## begin gnulib module eloop-threshold @@ -425,10 +423,39 @@ if GL_COND_OBJ_ERROR libgnulib_la_SOURCES += error.c endif -EXTRA_DIST += error.h - ## end gnulib module error +## begin gnulib module error-h + +BUILT_SOURCES += $(ERROR_H) + +# We need the following in order to create <error.h> when the system +# doesn't have one that works. +if GL_GENERATE_ERROR_H +error.h: error.in.h $(top_builddir)/config.status $(CXXDEFS_H) + $(gl_V_at)$(SED_HEADER_STDOUT) \ + -e 's|@''GUARD_PREFIX''@|GL|g' \ + -e 's|@''HAVE_ERROR_H''@|$(HAVE_ERROR_H)|g' \ + -e 's|@''INCLUDE_NEXT''@|$(INCLUDE_NEXT)|g' \ + -e 's|@''PRAGMA_SYSTEM_HEADER''@|@PRAGMA_SYSTEM_HEADER@|g' \ + -e 's|@''NEXT_ERROR_H''@|$(NEXT_ERROR_H)|g' \ + -e 's|@''HAVE_ERROR''@|$(HAVE_ERROR)|g' \ + -e 's|@''HAVE_ERROR_AT_LINE''@|$(HAVE_ERROR_AT_LINE)|g' \ + -e 's|@''REPLACE_ERROR''@|$(REPLACE_ERROR)|g' \ + -e 's|@''REPLACE_ERROR_AT_LINE''@|$(REPLACE_ERROR_AT_LINE)|g' \ + -e '/definitions of _GL_FUNCDECL_RPL/r $(CXXDEFS_H)' \ + $(srcdir)/error.in.h > $@-t + $(AM_V_at)mv $@-t $@ +else +error.h: $(top_builddir)/config.status + rm -f $@ +endif +MOSTLYCLEANFILES += error.h error.h-t + +EXTRA_DIST += error.in.h + +## end gnulib module error-h + ## begin gnulib module exitfail libgnulib_la_SOURCES += exitfail.c @@ -615,7 +642,11 @@ EXTRA_DIST += getopt-cdefs.in.h getopt-core.h getopt-ext.h getopt-pfx-core.h get ## begin gnulib module getprogname -libgnulib_la_SOURCES += getprogname.h getprogname.c +if GL_COND_OBJ_GETPROGNAME +libgnulib_la_SOURCES += getprogname.c +endif + +EXTRA_DIST += getprogname.h ## end gnulib module getprogname @@ -647,6 +678,60 @@ EXTRA_DIST += $(top_srcdir)/build-aux/gitlog-to-changelog ## end gnulib module gitlog-to-changelog +## begin gnulib module glibc-internal/dynarray + +BUILT_SOURCES += malloc/dynarray.gl.h malloc/dynarray-skeleton.gl.h + +malloc/dynarray.gl.h: malloc/dynarray.h + $(AM_V_GEN)$(MKDIR_P) '%reldir%/malloc' + $(AM_V_at)$(SED_HEADER_STDOUT) \ + -e '/libc_hidden_proto/d' \ + $(srcdir)/malloc/dynarray.h > $@-t + $(AM_V_at)mv $@-t $@ +MOSTLYCLEANFILES += malloc/dynarray.gl.h malloc/dynarray.gl.h-t + +malloc/dynarray-skeleton.gl.h: malloc/dynarray-skeleton.c + $(AM_V_GEN)$(MKDIR_P) '%reldir%/malloc' + $(AM_V_at)$(SED_HEADER_STDOUT) \ + -e 's|<malloc/dynarray\.h>|<malloc/dynarray.gl.h>|g' \ + -e 's|__attribute_maybe_unused__|_GL_ATTRIBUTE_MAYBE_UNUSED|g' \ + -e 's|__attribute_nonnull__|_GL_ATTRIBUTE_NONNULL|g' \ + -e 's|__attribute_warn_unused_result__|_GL_ATTRIBUTE_NODISCARD|g' \ + -e 's|__glibc_likely|_GL_LIKELY|g' \ + -e 's|__glibc_unlikely|_GL_UNLIKELY|g' \ + $(srcdir)/malloc/dynarray-skeleton.c > $@-t + $(AM_V_at)mv $@-t $@ +MOSTLYCLEANFILES += malloc/dynarray-skeleton.gl.h malloc/dynarray-skeleton.gl.h-t + +libgnulib_la_SOURCES += malloc/dynarray_at_failure.c malloc/dynarray_emplace_enlarge.c malloc/dynarray_finalize.c malloc/dynarray_resize.c malloc/dynarray_resize_clear.c + +EXTRA_DIST += dynarray.h malloc/dynarray-skeleton.c malloc/dynarray.h + +EXTRA_libgnulib_la_SOURCES += malloc/dynarray-skeleton.c + +## end gnulib module glibc-internal/dynarray + +## begin gnulib module glibc-internal/scratch_buffer + +BUILT_SOURCES += malloc/scratch_buffer.gl.h + +malloc/scratch_buffer.gl.h: malloc/scratch_buffer.h + $(AM_V_GEN)$(MKDIR_P) '%reldir%/malloc' + $(AM_V_at)$(SED_HEADER_STDOUT) \ + -e 's|__always_inline|inline _GL_ATTRIBUTE_ALWAYS_INLINE|g' \ + -e 's|__glibc_likely|_GL_LIKELY|g' \ + -e 's|__glibc_unlikely|_GL_UNLIKELY|g' \ + -e '/libc_hidden_proto/d' \ + $(srcdir)/malloc/scratch_buffer.h > $@-t + $(AM_V_at)mv $@-t $@ +MOSTLYCLEANFILES += malloc/scratch_buffer.gl.h malloc/scratch_buffer.gl.h-t + +libgnulib_la_SOURCES += malloc/scratch_buffer_grow.c malloc/scratch_buffer_grow_preserve.c malloc/scratch_buffer_set_array_size.c + +EXTRA_DIST += malloc/scratch_buffer.h scratch_buffer.h + +## end gnulib module glibc-internal/scratch_buffer + ## begin gnulib module gnu-web-doc-update @@ -695,7 +780,7 @@ libgnulib_la_SOURCES += idx.h ## begin gnulib module intprops -EXTRA_DIST += intprops.h +EXTRA_DIST += intprops-internal.h intprops.h ## end gnulib module intprops @@ -723,6 +808,8 @@ inttypes.h: inttypes.in.h $(top_builddir)/config.status $(CXXDEFS_H) $(WARN_ON_U -e 's/@''HAVE_DECL_STRTOIMAX''@/$(HAVE_DECL_STRTOIMAX)/g' \ -e 's/@''HAVE_DECL_STRTOUMAX''@/$(HAVE_DECL_STRTOUMAX)/g' \ -e 's/@''HAVE_IMAXDIV_T''@/$(HAVE_IMAXDIV_T)/g' \ + -e 's/@''REPLACE_IMAXABS''@/$(REPLACE_IMAXABS)/g' \ + -e 's/@''REPLACE_IMAXDIV''@/$(REPLACE_IMAXDIV)/g' \ -e 's/@''REPLACE_STRTOIMAX''@/$(REPLACE_STRTOIMAX)/g' \ -e 's/@''REPLACE_STRTOUMAX''@/$(REPLACE_STRTOUMAX)/g' \ -e 's/@''INT32_MAX_LT_INTMAX_MAX''@/$(INT32_MAX_LT_INTMAX_MAX)/g' \ @@ -1139,27 +1226,6 @@ EXTRA_DIST += safe-read.h sys-limits.h ## end gnulib module safe-read -## begin gnulib module scratch_buffer - -BUILT_SOURCES += malloc/scratch_buffer.gl.h - -malloc/scratch_buffer.gl.h: malloc/scratch_buffer.h - $(AM_V_GEN)$(MKDIR_P) '%reldir%/malloc' - $(AM_V_at)$(SED_HEADER_STDOUT) \ - -e 's|__always_inline|inline _GL_ATTRIBUTE_ALWAYS_INLINE|g' \ - -e 's|__glibc_likely|_GL_LIKELY|g' \ - -e 's|__glibc_unlikely|_GL_UNLIKELY|g' \ - -e '/libc_hidden_proto/d' \ - $(srcdir)/malloc/scratch_buffer.h > $@-t - $(AM_V_at)mv $@-t $@ -MOSTLYCLEANFILES += malloc/scratch_buffer.gl.h malloc/scratch_buffer.gl.h-t - -libgnulib_la_SOURCES += malloc/scratch_buffer_dupfree.c malloc/scratch_buffer_grow.c malloc/scratch_buffer_grow_preserve.c malloc/scratch_buffer_set_array_size.c - -EXTRA_DIST += malloc/scratch_buffer.h scratch_buffer.h - -## end gnulib module scratch_buffer - ## begin gnulib module setlocale-null libgnulib_la_SOURCES += setlocale_null.c @@ -1247,26 +1313,6 @@ EXTRA_DIST += stat-time.h ## end gnulib module stat-time -## begin gnulib module stdalign - -BUILT_SOURCES += $(STDALIGN_H) - -# We need the following in order to create <stdalign.h> when the system -# doesn't have one that works. -if GL_GENERATE_STDALIGN_H -stdalign.h: stdalign.in.h $(top_builddir)/config.status - $(gl_V_at)$(SED_HEADER_TO_AT_t) $(srcdir)/stdalign.in.h - $(AM_V_at)mv $@-t $@ -else -stdalign.h: $(top_builddir)/config.status - rm -f $@ -endif -MOSTLYCLEANFILES += stdalign.h stdalign.h-t - -EXTRA_DIST += stdalign.in.h - -## end gnulib module stdalign - ## begin gnulib module stdarg BUILT_SOURCES += $(STDARG_H) @@ -1293,27 +1339,26 @@ EXTRA_DIST += stdarg.in.h ## end gnulib module stdarg -## begin gnulib module stdbool +## begin gnulib module stdckdint -BUILT_SOURCES += $(STDBOOL_H) +BUILT_SOURCES += $(STDCKDINT_H) -# We need the following in order to create <stdbool.h> when the system -# doesn't have one that works. -if GL_GENERATE_STDBOOL_H -stdbool.h: stdbool.in.h $(top_builddir)/config.status +# We need the following in order to create <stdckdint.h> when the system +# doesn't have one that works with the given compiler. +if GL_GENERATE_STDCKDINT_H +stdckdint.h: stdckdint.in.h $(top_builddir)/config.status $(gl_V_at)$(SED_HEADER_STDOUT) \ - -e 's/@''HAVE__BOOL''@/$(HAVE__BOOL)/g' \ - $(srcdir)/stdbool.in.h > $@-t + $(srcdir)/stdckdint.in.h > $@-t $(AM_V_at)mv $@-t $@ else -stdbool.h: $(top_builddir)/config.status +stdckdint.h: $(top_builddir)/config.status rm -f $@ endif -MOSTLYCLEANFILES += stdbool.h stdbool.h-t +MOSTLYCLEANFILES += stdckdint.h stdckdint.h-t -EXTRA_DIST += stdbool.in.h +EXTRA_DIST += intprops-internal.h stdckdint.in.h -## end gnulib module stdbool +## end gnulib module stdckdint ## begin gnulib module stddef @@ -1472,7 +1517,9 @@ stdio.h: stdio.in.h $(top_builddir)/config.status $(CXXDEFS_H) $(ARG_NONNULL_H) -e 's|@''HAVE_DECL_FTELLO''@|$(HAVE_DECL_FTELLO)|g' \ -e 's|@''HAVE_DECL_GETDELIM''@|$(HAVE_DECL_GETDELIM)|g' \ -e 's|@''HAVE_DECL_GETLINE''@|$(HAVE_DECL_GETLINE)|g' \ + -e 's|@''HAVE_DECL_GETW''@|$(HAVE_DECL_GETW)|g' \ -e 's|@''HAVE_DECL_OBSTACK_PRINTF''@|$(HAVE_DECL_OBSTACK_PRINTF)|g' \ + -e 's|@''HAVE_DECL_PUTW''@|$(HAVE_DECL_PUTW)|g' \ -e 's|@''HAVE_DECL_SNPRINTF''@|$(HAVE_DECL_SNPRINTF)|g' \ -e 's|@''HAVE_DECL_VSNPRINTF''@|$(HAVE_DECL_VSNPRINTF)|g' \ -e 's|@''HAVE_DPRINTF''@|$(HAVE_DPRINTF)|g' \ @@ -1557,6 +1604,7 @@ stdlib.h: stdlib.in.h $(top_builddir)/config.status $(CXXDEFS_H) \ -e 's/@''GNULIB_CANONICALIZE_FILE_NAME''@/$(GL_GNULIB_CANONICALIZE_FILE_NAME)/g' \ -e 's/@''GNULIB_FREE_POSIX''@/$(GL_GNULIB_FREE_POSIX)/g' \ -e 's/@''GNULIB_GETLOADAVG''@/$(GL_GNULIB_GETLOADAVG)/g' \ + -e 's/@''GNULIB_GETPROGNAME''@/$(GL_GNULIB_GETPROGNAME)/g' \ -e 's/@''GNULIB_GETSUBOPT''@/$(GL_GNULIB_GETSUBOPT)/g' \ -e 's/@''GNULIB_GRANTPT''@/$(GL_GNULIB_GRANTPT)/g' \ -e 's/@''GNULIB_MALLOC_GNU''@/$(GL_GNULIB_MALLOC_GNU)/g' \ @@ -1606,6 +1654,7 @@ stdlib.h: stdlib.in.h $(top_builddir)/config.status $(CXXDEFS_H) \ -e 's|@''HAVE_DECL_FCVT''@|$(HAVE_DECL_FCVT)|g' \ -e 's|@''HAVE_DECL_GCVT''@|$(HAVE_DECL_GCVT)|g' \ -e 's|@''HAVE_DECL_GETLOADAVG''@|$(HAVE_DECL_GETLOADAVG)|g' \ + -e 's|@''HAVE_GETPROGNAME''@|$(HAVE_GETPROGNAME)|g' \ -e 's|@''HAVE_GETSUBOPT''@|$(HAVE_GETSUBOPT)|g' \ -e 's|@''HAVE_GRANTPT''@|$(HAVE_GRANTPT)|g' \ -e 's|@''HAVE_INITSTATE''@|$(HAVE_INITSTATE)|g' \ @@ -1641,17 +1690,24 @@ stdlib.h: stdlib.in.h $(top_builddir)/config.status $(CXXDEFS_H) \ -e 's|@''HAVE_SYS_LOADAVG_H''@|$(HAVE_SYS_LOADAVG_H)|g' \ -e 's|@''HAVE_UNLOCKPT''@|$(HAVE_UNLOCKPT)|g' \ -e 's|@''HAVE_DECL_UNSETENV''@|$(HAVE_DECL_UNSETENV)|g' \ + -e 's|@''REPLACE__EXIT''@|$(REPLACE__EXIT)|g' \ -e 's|@''REPLACE_ALIGNED_ALLOC''@|$(REPLACE_ALIGNED_ALLOC)|g' \ -e 's|@''REPLACE_CALLOC_FOR_CALLOC_GNU''@|$(REPLACE_CALLOC_FOR_CALLOC_GNU)|g' \ -e 's|@''REPLACE_CALLOC_FOR_CALLOC_POSIX''@|$(REPLACE_CALLOC_FOR_CALLOC_POSIX)|g' \ -e 's|@''REPLACE_CANONICALIZE_FILE_NAME''@|$(REPLACE_CANONICALIZE_FILE_NAME)|g' \ -e 's|@''REPLACE_FREE''@|$(REPLACE_FREE)|g' \ + -e 's|@''REPLACE_GETLOADAVG''@|$(REPLACE_GETLOADAVG)|g' \ + -e 's|@''REPLACE_GETPROGNAME''@|$(REPLACE_GETPROGNAME)|g' \ + -e 's|@''REPLACE_GETSUBOPT''@|$(REPLACE_GETSUBOPT)|g' \ -e 's|@''REPLACE_INITSTATE''@|$(REPLACE_INITSTATE)|g' \ -e 's|@''REPLACE_MALLOC_FOR_MALLOC_GNU''@|$(REPLACE_MALLOC_FOR_MALLOC_GNU)|g' \ -e 's|@''REPLACE_MALLOC_FOR_MALLOC_POSIX''@|$(REPLACE_MALLOC_FOR_MALLOC_POSIX)|g' \ -e 's|@''REPLACE_MBTOWC''@|$(REPLACE_MBTOWC)|g' \ + -e 's|@''REPLACE_MKOSTEMP''@|$(REPLACE_MKOSTEMP)|g' \ + -e 's|@''REPLACE_MKOSTEMPS''@|$(REPLACE_MKOSTEMPS)|g' \ -e 's|@''REPLACE_MKSTEMP''@|$(REPLACE_MKSTEMP)|g' \ -e 's|@''REPLACE_POSIX_MEMALIGN''@|$(REPLACE_POSIX_MEMALIGN)|g' \ + -e 's|@''REPLACE_POSIX_OPENPT''@|$(REPLACE_POSIX_OPENPT)|g' \ -e 's|@''REPLACE_PTSNAME''@|$(REPLACE_PTSNAME)|g' \ -e 's|@''REPLACE_PTSNAME_R''@|$(REPLACE_PTSNAME_R)|g' \ -e 's|@''REPLACE_PUTENV''@|$(REPLACE_PUTENV)|g' \ @@ -1751,6 +1807,7 @@ string.h: string.in.h $(top_builddir)/config.status $(CXXDEFS_H) $(ARG_NONNULL_H -e 's/@''GNULIB_MEMMEM''@/$(GL_GNULIB_MEMMEM)/g' \ -e 's/@''GNULIB_MEMPCPY''@/$(GL_GNULIB_MEMPCPY)/g' \ -e 's/@''GNULIB_MEMRCHR''@/$(GL_GNULIB_MEMRCHR)/g' \ + -e 's/@''GNULIB_MEMSET_EXPLICIT''@/$(GL_GNULIB_MEMSET_EXPLICIT)/g' \ -e 's/@''GNULIB_RAWMEMCHR''@/$(GL_GNULIB_RAWMEMCHR)/g' \ -e 's/@''GNULIB_STPCPY''@/$(GL_GNULIB_STPCPY)/g' \ -e 's/@''GNULIB_STPNCPY''@/$(GL_GNULIB_STPNCPY)/g' \ @@ -1782,6 +1839,7 @@ string.h: string.in.h $(top_builddir)/config.status $(CXXDEFS_H) $(ARG_NONNULL_H -e 's|@''HAVE_DECL_MEMMEM''@|$(HAVE_DECL_MEMMEM)|g' \ -e 's|@''HAVE_MEMPCPY''@|$(HAVE_MEMPCPY)|g' \ -e 's|@''HAVE_DECL_MEMRCHR''@|$(HAVE_DECL_MEMRCHR)|g' \ + -e 's|@''HAVE_MEMSET_EXPLICIT''@|$(HAVE_MEMSET_EXPLICIT)|g' \ -e 's|@''HAVE_RAWMEMCHR''@|$(HAVE_RAWMEMCHR)|g' \ -e 's|@''HAVE_STPCPY''@|$(HAVE_STPCPY)|g' \ -e 's|@''HAVE_STPNCPY''@|$(HAVE_STPNCPY)|g' \ @@ -1802,7 +1860,9 @@ string.h: string.in.h $(top_builddir)/config.status $(CXXDEFS_H) $(ARG_NONNULL_H -e 's|@''REPLACE_FFSLL''@|$(REPLACE_FFSLL)|g' \ -e 's|@''REPLACE_MEMCHR''@|$(REPLACE_MEMCHR)|g' \ -e 's|@''REPLACE_MEMMEM''@|$(REPLACE_MEMMEM)|g' \ + -e 's|@''REPLACE_MEMPCPY''@|$(REPLACE_MEMPCPY)|g' \ -e 's|@''REPLACE_FREE''@|$(REPLACE_FREE)|g' \ + -e 's|@''REPLACE_STPCPY''@|$(REPLACE_STPCPY)|g' \ -e 's|@''REPLACE_STPNCPY''@|$(REPLACE_STPNCPY)|g' \ -e 's|@''REPLACE_STRCHRNUL''@|$(REPLACE_STRCHRNUL)|g' \ -e 's|@''REPLACE_STRDUP''@|$(REPLACE_STRDUP)|g' \ @@ -1898,6 +1958,7 @@ sys/stat.h: sys_stat.in.h $(top_builddir)/config.status $(CXXDEFS_H) $(ARG_NONNU -e 's|@''NEXT_SYS_STAT_H''@|$(NEXT_SYS_STAT_H)|g' \ -e 's|@''WINDOWS_64_BIT_ST_SIZE''@|$(WINDOWS_64_BIT_ST_SIZE)|g' \ -e 's|@''WINDOWS_STAT_TIMESPEC''@|$(WINDOWS_STAT_TIMESPEC)|g' \ + -e 's/@''GNULIB_CHMOD''@/$(GL_GNULIB_CHMOD)/g' \ -e 's/@''GNULIB_FCHMODAT''@/$(GL_GNULIB_FCHMODAT)/g' \ -e 's/@''GNULIB_FSTAT''@/$(GL_GNULIB_FSTAT)/g' \ -e 's/@''GNULIB_FSTATAT''@/$(GL_GNULIB_FSTATAT)/g' \ @@ -1929,6 +1990,7 @@ sys/stat.h: sys_stat.in.h $(top_builddir)/config.status $(CXXDEFS_H) $(ARG_NONNU -e 's|@''HAVE_MKNOD''@|$(HAVE_MKNOD)|g' \ -e 's|@''HAVE_MKNODAT''@|$(HAVE_MKNODAT)|g' \ -e 's|@''HAVE_UTIMENSAT''@|$(HAVE_UTIMENSAT)|g' \ + -e 's|@''REPLACE_CHMOD''@|$(REPLACE_CHMOD)|g' \ -e 's|@''REPLACE_FCHMODAT''@|$(REPLACE_FCHMODAT)|g' \ -e 's|@''REPLACE_FSTAT''@|$(REPLACE_FSTAT)|g' \ -e 's|@''REPLACE_FSTATAT''@|$(REPLACE_FSTATAT)|g' \ @@ -1991,7 +2053,7 @@ libgnulib_la_SOURCES += glthread/threadlib.c ## end gnulib module threadlib -## begin gnulib module time +## begin gnulib module time-h BUILT_SOURCES += time.h @@ -2010,6 +2072,7 @@ time.h: time.in.h $(top_builddir)/config.status $(CXXDEFS_H) $(ARG_NONNULL_H) $( -e 's/@''GNULIB_NANOSLEEP''@/$(GL_GNULIB_NANOSLEEP)/g' \ -e 's/@''GNULIB_STRFTIME''@/$(GL_GNULIB_STRFTIME)/g' \ -e 's/@''GNULIB_STRPTIME''@/$(GL_GNULIB_STRPTIME)/g' \ + -e 's/@''GNULIB_TIME''@/$(GL_GNULIB_TIME)/g' \ -e 's/@''GNULIB_TIMEGM''@/$(GL_GNULIB_TIMEGM)/g' \ -e 's/@''GNULIB_TIMESPEC_GET''@/$(GL_GNULIB_TIMESPEC_GET)/g' \ -e 's/@''GNULIB_TIMESPEC_GETRES''@/$(GL_GNULIB_TIMESPEC_GETRES)/g' \ @@ -2031,7 +2094,9 @@ time.h: time.in.h $(top_builddir)/config.status $(CXXDEFS_H) $(ARG_NONNULL_H) $( -e 's|@''REPLACE_MKTIME''@|$(REPLACE_MKTIME)|g' \ -e 's|@''REPLACE_NANOSLEEP''@|$(REPLACE_NANOSLEEP)|g' \ -e 's|@''REPLACE_STRFTIME''@|$(REPLACE_STRFTIME)|g' \ + -e 's|@''REPLACE_TIME''@|$(REPLACE_TIME)|g' \ -e 's|@''REPLACE_TIMEGM''@|$(REPLACE_TIMEGM)|g' \ + -e 's|@''REPLACE_TIMESPEC_GET''@|$(REPLACE_TIMESPEC_GET)|g' \ -e 's|@''REPLACE_TZSET''@|$(REPLACE_TZSET)|g' \ -e 's|@''PTHREAD_H_DEFINES_STRUCT_TIMESPEC''@|$(PTHREAD_H_DEFINES_STRUCT_TIMESPEC)|g' \ -e 's|@''SYS_TIME_H_DEFINES_STRUCT_TIMESPEC''@|$(SYS_TIME_H_DEFINES_STRUCT_TIMESPEC)|g' \ @@ -2047,7 +2112,7 @@ MOSTLYCLEANFILES += time.h time.h-t EXTRA_DIST += time.in.h -## end gnulib module time +## end gnulib module time-h ## begin gnulib module unistd @@ -2204,6 +2269,7 @@ unistd.h: unistd.in.h $(top_builddir)/config.status $(CXXDEFS_H) $(ARG_NONNULL_H -e 's|@''REPLACE_COPY_FILE_RANGE''@|$(REPLACE_COPY_FILE_RANGE)|g' \ -e 's|@''REPLACE_DUP''@|$(REPLACE_DUP)|g' \ -e 's|@''REPLACE_DUP2''@|$(REPLACE_DUP2)|g' \ + -e 's|@''REPLACE_DUP3''@|$(REPLACE_DUP3)|g' \ -e 's|@''REPLACE_EXECL''@|$(REPLACE_EXECL)|g' \ -e 's|@''REPLACE_EXECLE''@|$(REPLACE_EXECLE)|g' \ -e 's|@''REPLACE_EXECLP''@|$(REPLACE_EXECLP)|g' \ @@ -2213,10 +2279,12 @@ unistd.h: unistd.in.h $(top_builddir)/config.status $(CXXDEFS_H) $(ARG_NONNULL_H -e 's|@''REPLACE_EXECVPE''@|$(REPLACE_EXECVPE)|g' \ -e 's|@''REPLACE_FACCESSAT''@|$(REPLACE_FACCESSAT)|g' \ -e 's|@''REPLACE_FCHOWNAT''@|$(REPLACE_FCHOWNAT)|g' \ + -e 's|@''REPLACE_FDATASYNC''@|$(REPLACE_FDATASYNC)|g' \ -e 's|@''REPLACE_FTRUNCATE''@|$(REPLACE_FTRUNCATE)|g' \ -e 's|@''REPLACE_GETCWD''@|$(REPLACE_GETCWD)|g' \ -e 's|@''REPLACE_GETDOMAINNAME''@|$(REPLACE_GETDOMAINNAME)|g' \ -e 's|@''REPLACE_GETDTABLESIZE''@|$(REPLACE_GETDTABLESIZE)|g' \ + -e 's|@''REPLACE_GETENTROPY''@|$(REPLACE_GETENTROPY)|g' \ -e 's|@''REPLACE_GETLOGIN_R''@|$(REPLACE_GETLOGIN_R)|g' \ -e 's|@''REPLACE_GETGROUPS''@|$(REPLACE_GETGROUPS)|g' \ -e 's|@''REPLACE_GETPAGESIZE''@|$(REPLACE_GETPAGESIZE)|g' \ @@ -2227,12 +2295,14 @@ unistd.h: unistd.in.h $(top_builddir)/config.status $(CXXDEFS_H) $(ARG_NONNULL_H -e 's|@''REPLACE_LINK''@|$(REPLACE_LINK)|g' \ -e 's|@''REPLACE_LINKAT''@|$(REPLACE_LINKAT)|g' \ -e 's|@''REPLACE_LSEEK''@|$(REPLACE_LSEEK)|g' \ + -e 's|@''REPLACE_PIPE2''@|$(REPLACE_PIPE2)|g' \ -e 's|@''REPLACE_PREAD''@|$(REPLACE_PREAD)|g' \ -e 's|@''REPLACE_PWRITE''@|$(REPLACE_PWRITE)|g' \ -e 's|@''REPLACE_READ''@|$(REPLACE_READ)|g' \ -e 's|@''REPLACE_READLINK''@|$(REPLACE_READLINK)|g' \ -e 's|@''REPLACE_READLINKAT''@|$(REPLACE_READLINKAT)|g' \ -e 's|@''REPLACE_RMDIR''@|$(REPLACE_RMDIR)|g' \ + -e 's|@''REPLACE_SETHOSTNAME''@|$(REPLACE_SETHOSTNAME)|g' \ -e 's|@''REPLACE_SLEEP''@|$(REPLACE_SLEEP)|g' \ -e 's|@''REPLACE_SYMLINK''@|$(REPLACE_SYMLINK)|g' \ -e 's|@''REPLACE_SYMLINKAT''@|$(REPLACE_SYMLINKAT)|g' \ @@ -2433,6 +2503,7 @@ wchar.h: wchar.in.h $(top_builddir)/config.status $(CXXDEFS_H) $(ARG_NONNULL_H) -e 's|@''REPLACE_WCSWIDTH''@|$(REPLACE_WCSWIDTH)|g' \ -e 's|@''REPLACE_WCSFTIME''@|$(REPLACE_WCSFTIME)|g' \ -e 's|@''REPLACE_WCSTOK''@|$(REPLACE_WCSTOK)|g' \ + -e 's|@''REPLACE_WMEMPCPY''@|$(REPLACE_WMEMPCPY)|g' \ -e '/definitions of _GL_FUNCDECL_RPL/r $(CXXDEFS_H)' \ -e '/definition of _GL_ARG_NONNULL/r $(ARG_NONNULL_H)' \ -e '/definition of _GL_WARN_ON_USE/r $(WARN_ON_USE_H)' \ diff --git a/lib/hard-locale.c b/lib/hard-locale.c index f7fbc47..c01fce5 100644 --- a/lib/hard-locale.c +++ b/lib/hard-locale.c @@ -1,6 +1,6 @@ /* hard-locale.c -- Determine whether a locale is hard. - Copyright (C) 1997-1999, 2002-2004, 2006-2007, 2009-2022 Free Software + Copyright (C) 1997-1999, 2002-2004, 2006-2007, 2009-2023 Free Software Foundation, Inc. This file is free software: you can redistribute it and/or modify @@ -21,6 +21,7 @@ #include "hard-locale.h" #include <locale.h> +#include <stdlib.h> #include <string.h> bool @@ -31,5 +32,16 @@ hard_locale (int category) if (setlocale_null_r (category, locale, sizeof (locale))) return false; - return !(strcmp (locale, "C") == 0 || strcmp (locale, "POSIX") == 0); + if (!(strcmp (locale, "C") == 0 || strcmp (locale, "POSIX") == 0)) + return true; + +#if defined __ANDROID__ + /* On Android 5.0 or newer, it is possible to set a locale that has the same + name as the "C" locale but in fact uses UTF-8 encoding. Cf. test case 2 in + <https://lists.gnu.org/archive/html/bug-gnulib/2023-01/msg00141.html>. */ + if (MB_CUR_MAX > 1) + return true; +#endif + + return false; } diff --git a/lib/hard-locale.h b/lib/hard-locale.h index 6066f4e..5123d71 100644 --- a/lib/hard-locale.h +++ b/lib/hard-locale.h @@ -1,6 +1,6 @@ /* Determine whether a locale is hard. - Copyright (C) 1999, 2003-2004, 2009-2022 Free Software Foundation, Inc. + Copyright (C) 1999, 2003-2004, 2009-2023 Free Software Foundation, Inc. This file is free software: you can redistribute it and/or modify it under the terms of the GNU Lesser General Public License as @@ -18,11 +18,11 @@ #ifndef HARD_LOCALE_H_ # define HARD_LOCALE_H_ 1 -# include <stdbool.h> - /* Return true if the specified CATEGORY of the current locale is hard, i.e. different from the C or POSIX locale that has a fixed behavior. - CATEGORY must be one of the LC_* values, but not LC_ALL. */ + CATEGORY must be one of the LC_* values, but not LC_ALL. + Note: This function uses the current global locale; it ignores the + per-thread locale. */ extern bool hard_locale (int category); #endif /* HARD_LOCALE_H_ */ diff --git a/lib/ialloc.c b/lib/ialloc.c index 43c1043..cd44d8c 100644 --- a/lib/ialloc.c +++ b/lib/ialloc.c @@ -1,6 +1,6 @@ /* malloc with idx_t rather than size_t - Copyright 2021-2022 Free Software Foundation, Inc. + Copyright 2021-2023 Free Software Foundation, Inc. This file is free software: you can redistribute it and/or modify it under the terms of the GNU Lesser General Public License as diff --git a/lib/ialloc.h b/lib/ialloc.h index 37cf4bf..1d43faf 100644 --- a/lib/ialloc.h +++ b/lib/ialloc.h @@ -1,6 +1,6 @@ /* ialloc.h -- malloc with idx_t rather than size_t - Copyright 2021-2022 Free Software Foundation, Inc. + Copyright 2021-2023 Free Software Foundation, Inc. This file is free software: you can redistribute it and/or modify it under the terms of the GNU Lesser General Public License as @@ -1,5 +1,5 @@ /* A type for indices and sizes. - Copyright (C) 2020-2022 Free Software Foundation, Inc. + Copyright (C) 2020-2023 Free Software Foundation, Inc. This file is part of the GNU C Library. The GNU C Library is free software; you can redistribute it and/or diff --git a/lib/intprops-internal.h b/lib/intprops-internal.h new file mode 100644 index 0000000..0467a9c --- /dev/null +++ b/lib/intprops-internal.h @@ -0,0 +1,392 @@ +/* intprops-internal.h -- properties of integer types not visible to users + + Copyright (C) 2001-2023 Free Software Foundation, Inc. + + 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 of the License, or + (at your option) any later version. + + This program is distributed in the hope that it will be useful, + but WITHOUT ANY WARRANTY; without even the implied warranty of + MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + GNU 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 <https://www.gnu.org/licenses/>. */ + +#ifndef _GL_INTPROPS_INTERNAL_H +#define _GL_INTPROPS_INTERNAL_H + +#include <limits.h> + +/* Return a value with the common real type of E and V and the value of V. + Do not evaluate E. */ +#define _GL_INT_CONVERT(e, v) ((1 ? 0 : (e)) + (v)) + +/* Act like _GL_INT_CONVERT (E, -V) but work around a bug in IRIX 6.5 cc; see + <https://lists.gnu.org/r/bug-gnulib/2011-05/msg00406.html>. */ +#define _GL_INT_NEGATE_CONVERT(e, v) ((1 ? 0 : (e)) - (v)) + +/* The extra casts in the following macros work around compiler bugs, + e.g., in Cray C 5.0.3.0. */ + +/* True if the real type T is signed. */ +#define _GL_TYPE_SIGNED(t) (! ((t) 0 < (t) -1)) + +/* Return 1 if the real expression E, after promotion, has a + signed or floating type. Do not evaluate E. */ +#define _GL_EXPR_SIGNED(e) (_GL_INT_NEGATE_CONVERT (e, 1) < 0) + + +/* Minimum and maximum values for integer types and expressions. */ + +/* The width in bits of the integer type or expression T. + Do not evaluate T. T must not be a bit-field expression. + Padding bits are not supported; this is checked at compile-time below. */ +#define _GL_TYPE_WIDTH(t) (sizeof (t) * CHAR_BIT) + +/* The maximum and minimum values for the type of the expression E, + after integer promotion. E is not evaluated. */ +#define _GL_INT_MINIMUM(e) \ + (_GL_EXPR_SIGNED (e) \ + ? ~ _GL_SIGNED_INT_MAXIMUM (e) \ + : _GL_INT_CONVERT (e, 0)) +#define _GL_INT_MAXIMUM(e) \ + (_GL_EXPR_SIGNED (e) \ + ? _GL_SIGNED_INT_MAXIMUM (e) \ + : _GL_INT_NEGATE_CONVERT (e, 1)) +#define _GL_SIGNED_INT_MAXIMUM(e) \ + (((_GL_INT_CONVERT (e, 1) << (_GL_TYPE_WIDTH (+ (e)) - 2)) - 1) * 2 + 1) + +/* Work around OpenVMS incompatibility with C99. */ +#if !defined LLONG_MAX && defined __INT64_MAX +# define LLONG_MAX __INT64_MAX +# define LLONG_MIN __INT64_MIN +#endif + +/* This include file assumes that signed types are two's complement without + padding bits; the above macros have undefined behavior otherwise. + If this is a problem for you, please let us know how to fix it for your host. + This assumption is tested by the intprops-tests module. */ + +/* Does the __typeof__ keyword work? This could be done by + 'configure', but for now it's easier to do it by hand. */ +#if (2 <= __GNUC__ \ + || (4 <= __clang_major__) \ + || (1210 <= __IBMC__ && defined __IBM__TYPEOF__) \ + || (0x5110 <= __SUNPRO_C && !__STDC__)) +# define _GL_HAVE___TYPEOF__ 1 +#else +# define _GL_HAVE___TYPEOF__ 0 +#endif + +/* Return 1 if the integer type or expression T might be signed. Return 0 + if it is definitely unsigned. T must not be a bit-field expression. + This macro does not evaluate its argument, and expands to an + integer constant expression. */ +#if _GL_HAVE___TYPEOF__ +# define _GL_SIGNED_TYPE_OR_EXPR(t) _GL_TYPE_SIGNED (__typeof__ (t)) +#else +# define _GL_SIGNED_TYPE_OR_EXPR(t) 1 +#endif + +/* Return 1 if - A would overflow in [MIN,MAX] arithmetic. + A should not have side effects, and A's type should be an + integer with minimum value MIN and maximum MAX. */ +#define _GL_INT_NEGATE_RANGE_OVERFLOW(a, min, max) \ + ((min) < 0 ? (a) < - (max) : 0 < (a)) + +/* True if __builtin_add_overflow (A, B, P) and __builtin_sub_overflow + (A, B, P) work when P is non-null. */ +#ifdef __EDG__ +/* EDG-based compilers like nvc 22.1 cannot add 64-bit signed to unsigned + <https://bugs.gnu.org/53256>. */ +# define _GL_HAS_BUILTIN_ADD_OVERFLOW 0 +#elif defined __has_builtin +# define _GL_HAS_BUILTIN_ADD_OVERFLOW __has_builtin (__builtin_add_overflow) +/* __builtin_{add,sub}_overflow exists but is not reliable in GCC 5.x and 6.x, + see <https://gcc.gnu.org/bugzilla/show_bug.cgi?id=98269>. */ +#elif 7 <= __GNUC__ +# define _GL_HAS_BUILTIN_ADD_OVERFLOW 1 +#else +# define _GL_HAS_BUILTIN_ADD_OVERFLOW 0 +#endif + +/* True if __builtin_mul_overflow (A, B, P) works when P is non-null. */ +#if defined __clang_major__ && __clang_major__ < 14 +/* Work around Clang bug <https://bugs.llvm.org/show_bug.cgi?id=16404>. */ +# define _GL_HAS_BUILTIN_MUL_OVERFLOW 0 +#else +# define _GL_HAS_BUILTIN_MUL_OVERFLOW _GL_HAS_BUILTIN_ADD_OVERFLOW +#endif + +/* True if __builtin_add_overflow_p (A, B, C) works, and similarly for + __builtin_sub_overflow_p and __builtin_mul_overflow_p. */ +#ifdef __EDG__ +/* In EDG-based compilers like ICC 2021.3 and earlier, + __builtin_add_overflow_p etc. are not treated as integral constant + expressions even when all arguments are. */ +# define _GL_HAS_BUILTIN_OVERFLOW_P 0 +#elif defined __has_builtin +# define _GL_HAS_BUILTIN_OVERFLOW_P __has_builtin (__builtin_mul_overflow_p) +#else +# define _GL_HAS_BUILTIN_OVERFLOW_P (7 <= __GNUC__) +#endif + +#if (!defined _GL_STDCKDINT_H && 202311 <= __STDC_VERSION__ \ + && ! (_GL_HAS_BUILTIN_ADD_OVERFLOW && _GL_HAS_BUILTIN_MUL_OVERFLOW)) +# include <stdckdint.h> +#endif + +/* Store the low-order bits of A + B, A - B, A * B, respectively, into *R. + Return 1 if the result overflows. Arguments should not have side + effects and A, B and *R can be of any integer type other than char, + bool, a bit-precise integer type, or an enumeration type. */ +#if _GL_HAS_BUILTIN_ADD_OVERFLOW +# define _GL_INT_ADD_WRAPV(a, b, r) __builtin_add_overflow (a, b, r) +# define _GL_INT_SUBTRACT_WRAPV(a, b, r) __builtin_sub_overflow (a, b, r) +#elif defined ckd_add && defined ckd_sub && !defined _GL_STDCKDINT_H +# define _GL_INT_ADD_WRAPV(a, b, r) ckd_add (r, + (a), + (b)) +# define _GL_INT_SUBTRACT_WRAPV(a, b, r) ckd_sub (r, + (a), + (b)) +#else +# define _GL_INT_ADD_WRAPV(a, b, r) \ + _GL_INT_OP_WRAPV (a, b, r, +, _GL_INT_ADD_RANGE_OVERFLOW) +# define _GL_INT_SUBTRACT_WRAPV(a, b, r) \ + _GL_INT_OP_WRAPV (a, b, r, -, _GL_INT_SUBTRACT_RANGE_OVERFLOW) +#endif +#if _GL_HAS_BUILTIN_MUL_OVERFLOW +# if ((9 < __GNUC__ + (3 <= __GNUC_MINOR__) \ + || (__GNUC__ == 8 && 4 <= __GNUC_MINOR__)) \ + && !defined __EDG__) +# define _GL_INT_MULTIPLY_WRAPV(a, b, r) __builtin_mul_overflow (a, b, r) +# else + /* Work around GCC bug 91450. */ +# define _GL_INT_MULTIPLY_WRAPV(a, b, r) \ + ((!_GL_SIGNED_TYPE_OR_EXPR (*(r)) && _GL_EXPR_SIGNED (a) && _GL_EXPR_SIGNED (b) \ + && _GL_INT_MULTIPLY_RANGE_OVERFLOW (a, b, 0, (__typeof__ (*(r))) -1)) \ + ? ((void) __builtin_mul_overflow (a, b, r), 1) \ + : __builtin_mul_overflow (a, b, r)) +# endif +#elif defined ckd_mul && !defined _GL_STDCKDINT_H +# define _GL_INT_MULTIPLY_WRAPV(a, b, r) ckd_mul (r, + (a), + (b)) +#else +# define _GL_INT_MULTIPLY_WRAPV(a, b, r) \ + _GL_INT_OP_WRAPV (a, b, r, *, _GL_INT_MULTIPLY_RANGE_OVERFLOW) +#endif + +/* Nonzero if this compiler has GCC bug 68193 or Clang bug 25390. See: + https://gcc.gnu.org/bugzilla/show_bug.cgi?id=68193 + https://llvm.org/bugs/show_bug.cgi?id=25390 + For now, assume all versions of GCC-like compilers generate bogus + warnings for _Generic. This matters only for compilers that + lack relevant builtins. */ +#if __GNUC__ || defined __clang__ +# define _GL__GENERIC_BOGUS 1 +#else +# define _GL__GENERIC_BOGUS 0 +#endif + +/* Store the low-order bits of A <op> B into *R, where OP specifies + the operation and OVERFLOW the overflow predicate. Return 1 if the + result overflows. Arguments should not have side effects, + and A, B and *R can be of any integer type other than char, bool, a + bit-precise integer type, or an enumeration type. */ +#if 201112 <= __STDC_VERSION__ && !_GL__GENERIC_BOGUS +# define _GL_INT_OP_WRAPV(a, b, r, op, overflow) \ + (_Generic \ + (*(r), \ + signed char: \ + _GL_INT_OP_CALC (a, b, r, op, overflow, unsigned int, \ + signed char, SCHAR_MIN, SCHAR_MAX), \ + unsigned char: \ + _GL_INT_OP_CALC (a, b, r, op, overflow, unsigned int, \ + unsigned char, 0, UCHAR_MAX), \ + short int: \ + _GL_INT_OP_CALC (a, b, r, op, overflow, unsigned int, \ + short int, SHRT_MIN, SHRT_MAX), \ + unsigned short int: \ + _GL_INT_OP_CALC (a, b, r, op, overflow, unsigned int, \ + unsigned short int, 0, USHRT_MAX), \ + int: \ + _GL_INT_OP_CALC (a, b, r, op, overflow, unsigned int, \ + int, INT_MIN, INT_MAX), \ + unsigned int: \ + _GL_INT_OP_CALC (a, b, r, op, overflow, unsigned int, \ + unsigned int, 0, UINT_MAX), \ + long int: \ + _GL_INT_OP_CALC (a, b, r, op, overflow, unsigned long int, \ + long int, LONG_MIN, LONG_MAX), \ + unsigned long int: \ + _GL_INT_OP_CALC (a, b, r, op, overflow, unsigned long int, \ + unsigned long int, 0, ULONG_MAX), \ + long long int: \ + _GL_INT_OP_CALC (a, b, r, op, overflow, unsigned long long int, \ + long long int, LLONG_MIN, LLONG_MAX), \ + unsigned long long int: \ + _GL_INT_OP_CALC (a, b, r, op, overflow, unsigned long long int, \ + unsigned long long int, 0, ULLONG_MAX))) +#else +/* Store the low-order bits of A <op> B into *R, where OP specifies + the operation and OVERFLOW the overflow predicate. If *R is + signed, its type is ST with bounds SMIN..SMAX; otherwise its type + is UT with bounds U..UMAX. ST and UT are narrower than int. + Return 1 if the result overflows. Arguments should not have side + effects, and A, B and *R can be of any integer type other than + char, bool, a bit-precise integer type, or an enumeration type. */ +# if _GL_HAVE___TYPEOF__ +# define _GL_INT_OP_WRAPV_SMALLISH(a,b,r,op,overflow,st,smin,smax,ut,umax) \ + (_GL_TYPE_SIGNED (__typeof__ (*(r))) \ + ? _GL_INT_OP_CALC (a, b, r, op, overflow, unsigned int, st, smin, smax) \ + : _GL_INT_OP_CALC (a, b, r, op, overflow, unsigned int, ut, 0, umax)) +# else +# define _GL_INT_OP_WRAPV_SMALLISH(a,b,r,op,overflow,st,smin,smax,ut,umax) \ + (overflow (a, b, smin, smax) \ + ? (overflow (a, b, 0, umax) \ + ? (*(r) = _GL_INT_OP_WRAPV_VIA_UNSIGNED (a,b,op,unsigned,st), 1) \ + : (*(r) = _GL_INT_OP_WRAPV_VIA_UNSIGNED (a,b,op,unsigned,st)) < 0) \ + : (overflow (a, b, 0, umax) \ + ? (*(r) = _GL_INT_OP_WRAPV_VIA_UNSIGNED (a,b,op,unsigned,st)) >= 0 \ + : (*(r) = _GL_INT_OP_WRAPV_VIA_UNSIGNED (a,b,op,unsigned,st), 0))) +# endif + +# define _GL_INT_OP_WRAPV(a, b, r, op, overflow) \ + (sizeof *(r) == sizeof (signed char) \ + ? _GL_INT_OP_WRAPV_SMALLISH (a, b, r, op, overflow, \ + signed char, SCHAR_MIN, SCHAR_MAX, \ + unsigned char, UCHAR_MAX) \ + : sizeof *(r) == sizeof (short int) \ + ? _GL_INT_OP_WRAPV_SMALLISH (a, b, r, op, overflow, \ + short int, SHRT_MIN, SHRT_MAX, \ + unsigned short int, USHRT_MAX) \ + : sizeof *(r) == sizeof (int) \ + ? (_GL_EXPR_SIGNED (*(r)) \ + ? _GL_INT_OP_CALC (a, b, r, op, overflow, unsigned int, \ + int, INT_MIN, INT_MAX) \ + : _GL_INT_OP_CALC (a, b, r, op, overflow, unsigned int, \ + unsigned int, 0, UINT_MAX)) \ + : _GL_INT_OP_WRAPV_LONGISH(a, b, r, op, overflow)) +# ifdef LLONG_MAX +# define _GL_INT_OP_WRAPV_LONGISH(a, b, r, op, overflow) \ + (sizeof *(r) == sizeof (long int) \ + ? (_GL_EXPR_SIGNED (*(r)) \ + ? _GL_INT_OP_CALC (a, b, r, op, overflow, unsigned long int, \ + long int, LONG_MIN, LONG_MAX) \ + : _GL_INT_OP_CALC (a, b, r, op, overflow, unsigned long int, \ + unsigned long int, 0, ULONG_MAX)) \ + : (_GL_EXPR_SIGNED (*(r)) \ + ? _GL_INT_OP_CALC (a, b, r, op, overflow, unsigned long long int, \ + long long int, LLONG_MIN, LLONG_MAX) \ + : _GL_INT_OP_CALC (a, b, r, op, overflow, unsigned long long int, \ + unsigned long long int, 0, ULLONG_MAX))) +# else +# define _GL_INT_OP_WRAPV_LONGISH(a, b, r, op, overflow) \ + (_GL_EXPR_SIGNED (*(r)) \ + ? _GL_INT_OP_CALC (a, b, r, op, overflow, unsigned long int, \ + long int, LONG_MIN, LONG_MAX) \ + : _GL_INT_OP_CALC (a, b, r, op, overflow, unsigned long int, \ + unsigned long int, 0, ULONG_MAX)) +# endif +#endif + +/* Store the low-order bits of A <op> B into *R, where the operation + is given by OP. Use the unsigned type UT for calculation to avoid + overflow problems. *R's type is T, with extrema TMIN and TMAX. + T can be any signed integer type other than char, bool, a + bit-precise integer type, or an enumeration type. + Return 1 if the result overflows. */ +#define _GL_INT_OP_CALC(a, b, r, op, overflow, ut, t, tmin, tmax) \ + (overflow (a, b, tmin, tmax) \ + ? (*(r) = _GL_INT_OP_WRAPV_VIA_UNSIGNED (a, b, op, ut, t), 1) \ + : (*(r) = _GL_INT_OP_WRAPV_VIA_UNSIGNED (a, b, op, ut, t), 0)) + +/* Return 1 if the integer expressions A - B and -A would overflow, + respectively. Arguments should not have side effects, + and can be any signed integer type other than char, bool, a + bit-precise integer type, or an enumeration type. + These macros are tuned for their last input argument being a constant. */ + +#if _GL_HAS_BUILTIN_OVERFLOW_P +# define _GL_INT_NEGATE_OVERFLOW(a) \ + __builtin_sub_overflow_p (0, a, (__typeof__ (- (a))) 0) +#else +# define _GL_INT_NEGATE_OVERFLOW(a) \ + _GL_INT_NEGATE_RANGE_OVERFLOW (a, _GL_INT_MINIMUM (a), _GL_INT_MAXIMUM (a)) +#endif + +/* Return the low-order bits of A <op> B, where the operation is given + by OP. Use the unsigned type UT for calculation to avoid undefined + behavior on signed integer overflow, and convert the result to type T. + UT is at least as wide as T and is no narrower than unsigned int, + T is two's complement, and there is no padding or trap representations. + Assume that converting UT to T yields the low-order bits, as is + done in all known two's-complement C compilers. E.g., see: + https://gcc.gnu.org/onlinedocs/gcc/Integers-implementation.html + + According to the C standard, converting UT to T yields an + implementation-defined result or signal for values outside T's + range. However, code that works around this theoretical problem + runs afoul of a compiler bug in Oracle Studio 12.3 x86. See: + https://lists.gnu.org/r/bug-gnulib/2017-04/msg00049.html + As the compiler bug is real, don't try to work around the + theoretical problem. */ + +#define _GL_INT_OP_WRAPV_VIA_UNSIGNED(a, b, op, ut, t) \ + ((t) ((ut) (a) op (ut) (b))) + +/* Return true if the numeric values A + B, A - B, A * B fall outside + the range TMIN..TMAX. Arguments should not have side effects + and can be any integer type other than char, bool, + a bit-precise integer type, or an enumeration type. + TMIN should be signed and nonpositive. + TMAX should be positive, and should be signed unless TMIN is zero. */ +#define _GL_INT_ADD_RANGE_OVERFLOW(a, b, tmin, tmax) \ + ((b) < 0 \ + ? (((tmin) \ + ? ((_GL_EXPR_SIGNED (_GL_INT_CONVERT (a, (tmin) - (b))) || (b) < (tmin)) \ + && (a) < (tmin) - (b)) \ + : (a) <= -1 - (b)) \ + || ((_GL_EXPR_SIGNED (a) ? 0 <= (a) : (tmax) < (a)) && (tmax) < (a) + (b))) \ + : (a) < 0 \ + ? (((tmin) \ + ? ((_GL_EXPR_SIGNED (_GL_INT_CONVERT (b, (tmin) - (a))) || (a) < (tmin)) \ + && (b) < (tmin) - (a)) \ + : (b) <= -1 - (a)) \ + || ((_GL_EXPR_SIGNED (_GL_INT_CONVERT (a, b)) || (tmax) < (b)) \ + && (tmax) < (a) + (b))) \ + : (tmax) < (b) || (tmax) - (b) < (a)) +#define _GL_INT_SUBTRACT_RANGE_OVERFLOW(a, b, tmin, tmax) \ + (((a) < 0) == ((b) < 0) \ + ? ((a) < (b) \ + ? !(tmin) || -1 - (tmin) < (b) - (a) - 1 \ + : (tmax) < (a) - (b)) \ + : (a) < 0 \ + ? ((!_GL_EXPR_SIGNED (_GL_INT_CONVERT ((a) - (tmin), b)) && (a) - (tmin) < 0) \ + || (a) - (tmin) < (b)) \ + : ((! (_GL_EXPR_SIGNED (_GL_INT_CONVERT (tmax, b)) \ + && _GL_EXPR_SIGNED (_GL_INT_CONVERT ((tmax) + (b), a))) \ + && (tmax) <= -1 - (b)) \ + || (tmax) + (b) < (a))) +#define _GL_INT_MULTIPLY_RANGE_OVERFLOW(a, b, tmin, tmax) \ + ((b) < 0 \ + ? ((a) < 0 \ + ? (_GL_EXPR_SIGNED (_GL_INT_CONVERT (tmax, b)) \ + ? (a) < (tmax) / (b) \ + : ((_GL_INT_NEGATE_OVERFLOW (b) \ + ? _GL_INT_CONVERT (b, tmax) >> (_GL_TYPE_WIDTH (+ (b)) - 1) \ + : (tmax) / -(b)) \ + <= -1 - (a))) \ + : _GL_INT_NEGATE_OVERFLOW (_GL_INT_CONVERT (b, tmin)) && (b) == -1 \ + ? (_GL_EXPR_SIGNED (a) \ + ? 0 < (a) + (tmin) \ + : 0 < (a) && -1 - (tmin) < (a) - 1) \ + : (tmin) / (b) < (a)) \ + : (b) == 0 \ + ? 0 \ + : ((a) < 0 \ + ? (_GL_INT_NEGATE_OVERFLOW (_GL_INT_CONVERT (a, tmin)) && (a) == -1 \ + ? (_GL_EXPR_SIGNED (b) ? 0 < (b) + (tmin) : -1 - (tmin) < (b) - 1) \ + : (tmin) / (a) < (b)) \ + : (tmax) / (b) < (a))) + +#endif /* _GL_INTPROPS_INTERNAL_H */ diff --git a/lib/intprops.h b/lib/intprops.h index d4a917f..44b5e60 100644 --- a/lib/intprops.h +++ b/lib/intprops.h @@ -1,6 +1,6 @@ /* intprops.h -- properties of integer types - Copyright (C) 2001-2022 Free Software Foundation, Inc. + Copyright (C) 2001-2023 Free Software Foundation, Inc. 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 @@ -15,19 +15,10 @@ You should have received a copy of the GNU Lesser General Public License along with this program. If not, see <https://www.gnu.org/licenses/>. */ - #ifndef _GL_INTPROPS_H #define _GL_INTPROPS_H -#include <limits.h> - -/* Return a value with the common real type of E and V and the value of V. - Do not evaluate E. */ -#define _GL_INT_CONVERT(e, v) ((1 ? 0 : (e)) + (v)) - -/* Act like _GL_INT_CONVERT (E, -V) but work around a bug in IRIX 6.5 cc; see - <https://lists.gnu.org/r/bug-gnulib/2011-05/msg00406.html>. */ -#define _GL_INT_NEGATE_CONVERT(e, v) ((1 ? 0 : (e)) - (v)) +#include "intprops-internal.h" /* The extra casts in the following macros work around compiler bugs, e.g., in Cray C 5.0.3.0. */ @@ -37,11 +28,11 @@ #define TYPE_IS_INTEGER(t) ((t) 1.5 == 1) /* True if the real type T is signed. */ -#define TYPE_SIGNED(t) (! ((t) 0 < (t) -1)) +#define TYPE_SIGNED(t) _GL_TYPE_SIGNED (t) /* Return 1 if the real expression E, after promotion, has a signed or floating type. Do not evaluate E. */ -#define EXPR_SIGNED(e) (_GL_INT_NEGATE_CONVERT (e, 1) < 0) +#define EXPR_SIGNED(e) _GL_EXPR_SIGNED (e) /* Minimum and maximum values for integer types and expressions. */ @@ -49,7 +40,7 @@ /* The width in bits of the integer type or expression T. Do not evaluate T. T must not be a bit-field expression. Padding bits are not supported; this is checked at compile-time below. */ -#define TYPE_WIDTH(t) (sizeof (t) * CHAR_BIT) +#define TYPE_WIDTH(t) _GL_TYPE_WIDTH (t) /* The maximum and minimum values for the integer type T. */ #define TYPE_MINIMUM(t) ((t) ~ TYPE_MAXIMUM (t)) @@ -58,51 +49,6 @@ ? (t) -1 \ : ((((t) 1 << (TYPE_WIDTH (t) - 2)) - 1) * 2 + 1))) -/* The maximum and minimum values for the type of the expression E, - after integer promotion. E is not evaluated. */ -#define _GL_INT_MINIMUM(e) \ - (EXPR_SIGNED (e) \ - ? ~ _GL_SIGNED_INT_MAXIMUM (e) \ - : _GL_INT_CONVERT (e, 0)) -#define _GL_INT_MAXIMUM(e) \ - (EXPR_SIGNED (e) \ - ? _GL_SIGNED_INT_MAXIMUM (e) \ - : _GL_INT_NEGATE_CONVERT (e, 1)) -#define _GL_SIGNED_INT_MAXIMUM(e) \ - (((_GL_INT_CONVERT (e, 1) << (TYPE_WIDTH (+ (e)) - 2)) - 1) * 2 + 1) - -/* Work around OpenVMS incompatibility with C99. */ -#if !defined LLONG_MAX && defined __INT64_MAX -# define LLONG_MAX __INT64_MAX -# define LLONG_MIN __INT64_MIN -#endif - -/* This include file assumes that signed types are two's complement without - padding bits; the above macros have undefined behavior otherwise. - If this is a problem for you, please let us know how to fix it for your host. - This assumption is tested by the intprops-tests module. */ - -/* Does the __typeof__ keyword work? This could be done by - 'configure', but for now it's easier to do it by hand. */ -#if (2 <= __GNUC__ \ - || (4 <= __clang_major__) \ - || (1210 <= __IBMC__ && defined __IBM__TYPEOF__) \ - || (0x5110 <= __SUNPRO_C && !__STDC__)) -# define _GL_HAVE___TYPEOF__ 1 -#else -# define _GL_HAVE___TYPEOF__ 0 -#endif - -/* Return 1 if the integer type or expression T might be signed. Return 0 - if it is definitely unsigned. T must not be a bit-field expression. - This macro does not evaluate its argument, and expands to an - integer constant expression. */ -#if _GL_HAVE___TYPEOF__ -# define _GL_SIGNED_TYPE_OR_EXPR(t) TYPE_SIGNED (__typeof__ (t)) -#else -# define _GL_SIGNED_TYPE_OR_EXPR(t) 1 -#endif - /* Bound on length of the string representing an unsigned integer value representable in B bits. log10 (2.0) < 146/485. The smallest value of B where this bound is not tight is 2621. */ @@ -129,12 +75,11 @@ /* Range overflow checks. The INT_<op>_RANGE_OVERFLOW macros return 1 if the corresponding C - operators might not yield numerically correct answers due to - arithmetic overflow. They do not rely on undefined or - implementation-defined behavior. Their implementations are simple - and straightforward, but they are harder to use and may be less - efficient than the INT_<op>_WRAPV, INT_<op>_OK, and - INT_<op>_OVERFLOW macros described below. + operators overflow arithmetically when given the same arguments. + These macros do not rely on undefined or implementation-defined behavior. + Although their implementations are simple and straightforward, + they are harder to use and may be less efficient than the + INT_<op>_WRAPV, INT_<op>_OK, and INT_<op>_OVERFLOW macros described below. Example usage: @@ -181,9 +126,7 @@ /* Return 1 if - A would overflow in [MIN,MAX] arithmetic. See above for restrictions. */ #define INT_NEGATE_RANGE_OVERFLOW(a, min, max) \ - ((min) < 0 \ - ? (a) < - (max) \ - : 0 < (a)) + _GL_INT_NEGATE_RANGE_OVERFLOW (a, min, max) /* Return 1 if A * B would overflow in [MIN,MAX] arithmetic. See above for restrictions. Avoid && and || as they tickle @@ -227,43 +170,6 @@ ? (a) < (min) >> (b) \ : (max) >> (b) < (a)) -/* True if __builtin_add_overflow (A, B, P) and __builtin_sub_overflow - (A, B, P) work when P is non-null. */ -#ifdef __EDG__ -/* EDG-based compilers like nvc 22.1 cannot add 64-bit signed to unsigned - <https://bugs.gnu.org/53256>. */ -# define _GL_HAS_BUILTIN_ADD_OVERFLOW 0 -#elif defined __has_builtin -# define _GL_HAS_BUILTIN_ADD_OVERFLOW __has_builtin (__builtin_add_overflow) -/* __builtin_{add,sub}_overflow exists but is not reliable in GCC 5.x and 6.x, - see <https://gcc.gnu.org/bugzilla/show_bug.cgi?id=98269>. */ -#elif 7 <= __GNUC__ -# define _GL_HAS_BUILTIN_ADD_OVERFLOW 1 -#else -# define _GL_HAS_BUILTIN_ADD_OVERFLOW 0 -#endif - -/* True if __builtin_mul_overflow (A, B, P) works when P is non-null. */ -#if defined __clang_major__ && __clang_major__ < 14 -/* Work around Clang bug <https://bugs.llvm.org/show_bug.cgi?id=16404>. */ -# define _GL_HAS_BUILTIN_MUL_OVERFLOW 0 -#else -# define _GL_HAS_BUILTIN_MUL_OVERFLOW _GL_HAS_BUILTIN_ADD_OVERFLOW -#endif - -/* True if __builtin_add_overflow_p (A, B, C) works, and similarly for - __builtin_sub_overflow_p and __builtin_mul_overflow_p. */ -#ifdef __EDG__ -/* In EDG-based compilers like ICC 2021.3 and earlier, - __builtin_add_overflow_p etc. are not treated as integral constant - expressions even when all arguments are. */ -# define _GL_HAS_BUILTIN_OVERFLOW_P 0 -#elif defined __has_builtin -# define _GL_HAS_BUILTIN_OVERFLOW_P __has_builtin (__builtin_mul_overflow_p) -#else -# define _GL_HAS_BUILTIN_OVERFLOW_P (7 <= __GNUC__) -#endif - /* The _GL*_OVERFLOW macros have the same restrictions as the *_RANGE_OVERFLOW macros, except that they do not assume that operands (e.g., A and B) have the same type as MIN and MAX. Instead, they assume @@ -350,13 +256,18 @@ Because the WRAPV macros convert the result, they report overflow in different circumstances than the OVERFLOW macros do. For example, in the typical case with 16-bit 'short' and 32-bit 'int', - if A, B and R are all of type 'short' then INT_ADD_OVERFLOW (A, B) + if A, B and *R are all of type 'short' then INT_ADD_OVERFLOW (A, B) returns false because the addition cannot overflow after A and B - are converted to 'int', whereas INT_ADD_WRAPV (A, B, &R) returns + are converted to 'int', whereas INT_ADD_WRAPV (A, B, R) returns true or false depending on whether the sum fits into 'short'. These macros are tuned for their last input argument being a constant. + A, B, and *R should be integers; they need not be the same type, + and they need not be all signed or all unsigned. + However, none of the integer types should be bit-precise, + and *R's type should not be char, bool, or an enumeration type. + Return 1 if the integer expressions A * B, A - B, -A, A * B, A / B, A % B, and A << B would overflow, respectively. */ @@ -364,12 +275,7 @@ _GL_BINARY_OP_OVERFLOW (a, b, _GL_ADD_OVERFLOW) #define INT_SUBTRACT_OVERFLOW(a, b) \ _GL_BINARY_OP_OVERFLOW (a, b, _GL_SUBTRACT_OVERFLOW) -#if _GL_HAS_BUILTIN_OVERFLOW_P -# define INT_NEGATE_OVERFLOW(a) INT_SUBTRACT_OVERFLOW (0, a) -#else -# define INT_NEGATE_OVERFLOW(a) \ - INT_NEGATE_RANGE_OVERFLOW (a, _GL_INT_MINIMUM (a), _GL_INT_MAXIMUM (a)) -#endif +#define INT_NEGATE_OVERFLOW(a) _GL_INT_NEGATE_OVERFLOW (a) #define INT_MULTIPLY_OVERFLOW(a, b) \ _GL_BINARY_OP_OVERFLOW (a, b, _GL_MULTIPLY_OVERFLOW) #define INT_DIVIDE_OVERFLOW(a, b) \ @@ -391,224 +297,9 @@ /* Store the low-order bits of A + B, A - B, A * B, respectively, into *R. Return 1 if the result overflows. See above for restrictions. */ -#if _GL_HAS_BUILTIN_ADD_OVERFLOW -# define INT_ADD_WRAPV(a, b, r) __builtin_add_overflow (a, b, r) -# define INT_SUBTRACT_WRAPV(a, b, r) __builtin_sub_overflow (a, b, r) -#else -# define INT_ADD_WRAPV(a, b, r) \ - _GL_INT_OP_WRAPV (a, b, r, +, _GL_INT_ADD_RANGE_OVERFLOW) -# define INT_SUBTRACT_WRAPV(a, b, r) \ - _GL_INT_OP_WRAPV (a, b, r, -, _GL_INT_SUBTRACT_RANGE_OVERFLOW) -#endif -#if _GL_HAS_BUILTIN_MUL_OVERFLOW -# if ((9 < __GNUC__ + (3 <= __GNUC_MINOR__) \ - || (__GNUC__ == 8 && 4 <= __GNUC_MINOR__)) \ - && !defined __EDG__) -# define INT_MULTIPLY_WRAPV(a, b, r) __builtin_mul_overflow (a, b, r) -# else - /* Work around GCC bug 91450. */ -# define INT_MULTIPLY_WRAPV(a, b, r) \ - ((!_GL_SIGNED_TYPE_OR_EXPR (*(r)) && EXPR_SIGNED (a) && EXPR_SIGNED (b) \ - && _GL_INT_MULTIPLY_RANGE_OVERFLOW (a, b, 0, (__typeof__ (*(r))) -1)) \ - ? ((void) __builtin_mul_overflow (a, b, r), 1) \ - : __builtin_mul_overflow (a, b, r)) -# endif -#else -# define INT_MULTIPLY_WRAPV(a, b, r) \ - _GL_INT_OP_WRAPV (a, b, r, *, _GL_INT_MULTIPLY_RANGE_OVERFLOW) -#endif - -/* Nonzero if this compiler has GCC bug 68193 or Clang bug 25390. See: - https://gcc.gnu.org/bugzilla/show_bug.cgi?id=68193 - https://llvm.org/bugs/show_bug.cgi?id=25390 - For now, assume all versions of GCC-like compilers generate bogus - warnings for _Generic. This matters only for compilers that - lack relevant builtins. */ -#if __GNUC__ || defined __clang__ -# define _GL__GENERIC_BOGUS 1 -#else -# define _GL__GENERIC_BOGUS 0 -#endif - -/* Store the low-order bits of A <op> B into *R, where OP specifies - the operation and OVERFLOW the overflow predicate. Return 1 if the - result overflows. See above for restrictions. */ -#if 201112 <= __STDC_VERSION__ && !_GL__GENERIC_BOGUS -# define _GL_INT_OP_WRAPV(a, b, r, op, overflow) \ - (_Generic \ - (*(r), \ - signed char: \ - _GL_INT_OP_CALC (a, b, r, op, overflow, unsigned int, \ - signed char, SCHAR_MIN, SCHAR_MAX), \ - unsigned char: \ - _GL_INT_OP_CALC (a, b, r, op, overflow, unsigned int, \ - unsigned char, 0, UCHAR_MAX), \ - short int: \ - _GL_INT_OP_CALC (a, b, r, op, overflow, unsigned int, \ - short int, SHRT_MIN, SHRT_MAX), \ - unsigned short int: \ - _GL_INT_OP_CALC (a, b, r, op, overflow, unsigned int, \ - unsigned short int, 0, USHRT_MAX), \ - int: \ - _GL_INT_OP_CALC (a, b, r, op, overflow, unsigned int, \ - int, INT_MIN, INT_MAX), \ - unsigned int: \ - _GL_INT_OP_CALC (a, b, r, op, overflow, unsigned int, \ - unsigned int, 0, UINT_MAX), \ - long int: \ - _GL_INT_OP_CALC (a, b, r, op, overflow, unsigned long int, \ - long int, LONG_MIN, LONG_MAX), \ - unsigned long int: \ - _GL_INT_OP_CALC (a, b, r, op, overflow, unsigned long int, \ - unsigned long int, 0, ULONG_MAX), \ - long long int: \ - _GL_INT_OP_CALC (a, b, r, op, overflow, unsigned long long int, \ - long long int, LLONG_MIN, LLONG_MAX), \ - unsigned long long int: \ - _GL_INT_OP_CALC (a, b, r, op, overflow, unsigned long long int, \ - unsigned long long int, 0, ULLONG_MAX))) -#else -/* Store the low-order bits of A <op> B into *R, where OP specifies - the operation and OVERFLOW the overflow predicate. If *R is - signed, its type is ST with bounds SMIN..SMAX; otherwise its type - is UT with bounds U..UMAX. ST and UT are narrower than int. - Return 1 if the result overflows. See above for restrictions. */ -# if _GL_HAVE___TYPEOF__ -# define _GL_INT_OP_WRAPV_SMALLISH(a,b,r,op,overflow,st,smin,smax,ut,umax) \ - (TYPE_SIGNED (__typeof__ (*(r))) \ - ? _GL_INT_OP_CALC (a, b, r, op, overflow, unsigned int, st, smin, smax) \ - : _GL_INT_OP_CALC (a, b, r, op, overflow, unsigned int, ut, 0, umax)) -# else -# define _GL_INT_OP_WRAPV_SMALLISH(a,b,r,op,overflow,st,smin,smax,ut,umax) \ - (overflow (a, b, smin, smax) \ - ? (overflow (a, b, 0, umax) \ - ? (*(r) = _GL_INT_OP_WRAPV_VIA_UNSIGNED (a,b,op,unsigned,st), 1) \ - : (*(r) = _GL_INT_OP_WRAPV_VIA_UNSIGNED (a,b,op,unsigned,st)) < 0) \ - : (overflow (a, b, 0, umax) \ - ? (*(r) = _GL_INT_OP_WRAPV_VIA_UNSIGNED (a,b,op,unsigned,st)) >= 0 \ - : (*(r) = _GL_INT_OP_WRAPV_VIA_UNSIGNED (a,b,op,unsigned,st), 0))) -# endif - -# define _GL_INT_OP_WRAPV(a, b, r, op, overflow) \ - (sizeof *(r) == sizeof (signed char) \ - ? _GL_INT_OP_WRAPV_SMALLISH (a, b, r, op, overflow, \ - signed char, SCHAR_MIN, SCHAR_MAX, \ - unsigned char, UCHAR_MAX) \ - : sizeof *(r) == sizeof (short int) \ - ? _GL_INT_OP_WRAPV_SMALLISH (a, b, r, op, overflow, \ - short int, SHRT_MIN, SHRT_MAX, \ - unsigned short int, USHRT_MAX) \ - : sizeof *(r) == sizeof (int) \ - ? (EXPR_SIGNED (*(r)) \ - ? _GL_INT_OP_CALC (a, b, r, op, overflow, unsigned int, \ - int, INT_MIN, INT_MAX) \ - : _GL_INT_OP_CALC (a, b, r, op, overflow, unsigned int, \ - unsigned int, 0, UINT_MAX)) \ - : _GL_INT_OP_WRAPV_LONGISH(a, b, r, op, overflow)) -# ifdef LLONG_MAX -# define _GL_INT_OP_WRAPV_LONGISH(a, b, r, op, overflow) \ - (sizeof *(r) == sizeof (long int) \ - ? (EXPR_SIGNED (*(r)) \ - ? _GL_INT_OP_CALC (a, b, r, op, overflow, unsigned long int, \ - long int, LONG_MIN, LONG_MAX) \ - : _GL_INT_OP_CALC (a, b, r, op, overflow, unsigned long int, \ - unsigned long int, 0, ULONG_MAX)) \ - : (EXPR_SIGNED (*(r)) \ - ? _GL_INT_OP_CALC (a, b, r, op, overflow, unsigned long long int, \ - long long int, LLONG_MIN, LLONG_MAX) \ - : _GL_INT_OP_CALC (a, b, r, op, overflow, unsigned long long int, \ - unsigned long long int, 0, ULLONG_MAX))) -# else -# define _GL_INT_OP_WRAPV_LONGISH(a, b, r, op, overflow) \ - (EXPR_SIGNED (*(r)) \ - ? _GL_INT_OP_CALC (a, b, r, op, overflow, unsigned long int, \ - long int, LONG_MIN, LONG_MAX) \ - : _GL_INT_OP_CALC (a, b, r, op, overflow, unsigned long int, \ - unsigned long int, 0, ULONG_MAX)) -# endif -#endif - -/* Store the low-order bits of A <op> B into *R, where the operation - is given by OP. Use the unsigned type UT for calculation to avoid - overflow problems. *R's type is T, with extrema TMIN and TMAX. - T must be a signed integer type. Return 1 if the result overflows. */ -#define _GL_INT_OP_CALC(a, b, r, op, overflow, ut, t, tmin, tmax) \ - (overflow (a, b, tmin, tmax) \ - ? (*(r) = _GL_INT_OP_WRAPV_VIA_UNSIGNED (a, b, op, ut, t), 1) \ - : (*(r) = _GL_INT_OP_WRAPV_VIA_UNSIGNED (a, b, op, ut, t), 0)) - -/* Return the low-order bits of A <op> B, where the operation is given - by OP. Use the unsigned type UT for calculation to avoid undefined - behavior on signed integer overflow, and convert the result to type T. - UT is at least as wide as T and is no narrower than unsigned int, - T is two's complement, and there is no padding or trap representations. - Assume that converting UT to T yields the low-order bits, as is - done in all known two's-complement C compilers. E.g., see: - https://gcc.gnu.org/onlinedocs/gcc/Integers-implementation.html - - According to the C standard, converting UT to T yields an - implementation-defined result or signal for values outside T's - range. However, code that works around this theoretical problem - runs afoul of a compiler bug in Oracle Studio 12.3 x86. See: - https://lists.gnu.org/r/bug-gnulib/2017-04/msg00049.html - As the compiler bug is real, don't try to work around the - theoretical problem. */ - -#define _GL_INT_OP_WRAPV_VIA_UNSIGNED(a, b, op, ut, t) \ - ((t) ((ut) (a) op (ut) (b))) - -/* Return true if the numeric values A + B, A - B, A * B fall outside - the range TMIN..TMAX. Arguments should be integer expressions - without side effects. TMIN should be signed and nonpositive. - TMAX should be positive, and should be signed unless TMIN is zero. */ -#define _GL_INT_ADD_RANGE_OVERFLOW(a, b, tmin, tmax) \ - ((b) < 0 \ - ? (((tmin) \ - ? ((EXPR_SIGNED (_GL_INT_CONVERT (a, (tmin) - (b))) || (b) < (tmin)) \ - && (a) < (tmin) - (b)) \ - : (a) <= -1 - (b)) \ - || ((EXPR_SIGNED (a) ? 0 <= (a) : (tmax) < (a)) && (tmax) < (a) + (b))) \ - : (a) < 0 \ - ? (((tmin) \ - ? ((EXPR_SIGNED (_GL_INT_CONVERT (b, (tmin) - (a))) || (a) < (tmin)) \ - && (b) < (tmin) - (a)) \ - : (b) <= -1 - (a)) \ - || ((EXPR_SIGNED (_GL_INT_CONVERT (a, b)) || (tmax) < (b)) \ - && (tmax) < (a) + (b))) \ - : (tmax) < (b) || (tmax) - (b) < (a)) -#define _GL_INT_SUBTRACT_RANGE_OVERFLOW(a, b, tmin, tmax) \ - (((a) < 0) == ((b) < 0) \ - ? ((a) < (b) \ - ? !(tmin) || -1 - (tmin) < (b) - (a) - 1 \ - : (tmax) < (a) - (b)) \ - : (a) < 0 \ - ? ((!EXPR_SIGNED (_GL_INT_CONVERT ((a) - (tmin), b)) && (a) - (tmin) < 0) \ - || (a) - (tmin) < (b)) \ - : ((! (EXPR_SIGNED (_GL_INT_CONVERT (tmax, b)) \ - && EXPR_SIGNED (_GL_INT_CONVERT ((tmax) + (b), a))) \ - && (tmax) <= -1 - (b)) \ - || (tmax) + (b) < (a))) -#define _GL_INT_MULTIPLY_RANGE_OVERFLOW(a, b, tmin, tmax) \ - ((b) < 0 \ - ? ((a) < 0 \ - ? (EXPR_SIGNED (_GL_INT_CONVERT (tmax, b)) \ - ? (a) < (tmax) / (b) \ - : ((INT_NEGATE_OVERFLOW (b) \ - ? _GL_INT_CONVERT (b, tmax) >> (TYPE_WIDTH (+ (b)) - 1) \ - : (tmax) / -(b)) \ - <= -1 - (a))) \ - : INT_NEGATE_OVERFLOW (_GL_INT_CONVERT (b, tmin)) && (b) == -1 \ - ? (EXPR_SIGNED (a) \ - ? 0 < (a) + (tmin) \ - : 0 < (a) && -1 - (tmin) < (a) - 1) \ - : (tmin) / (b) < (a)) \ - : (b) == 0 \ - ? 0 \ - : ((a) < 0 \ - ? (INT_NEGATE_OVERFLOW (_GL_INT_CONVERT (a, tmin)) && (a) == -1 \ - ? (EXPR_SIGNED (b) ? 0 < (b) + (tmin) : -1 - (tmin) < (b) - 1) \ - : (tmin) / (a) < (b)) \ - : (tmax) / (b) < (a))) +#define INT_ADD_WRAPV(a, b, r) _GL_INT_ADD_WRAPV (a, b, r) +#define INT_SUBTRACT_WRAPV(a, b, r) _GL_INT_SUBTRACT_WRAPV (a, b, r) +#define INT_MULTIPLY_WRAPV(a, b, r) _GL_INT_MULTIPLY_WRAPV (a, b, r) /* The following macros compute A + B, A - B, and A * B, respectively. If no overflow occurs, they set *R to the result and return 1; @@ -624,6 +315,8 @@ A, B, and *R should be integers; they need not be the same type, and they need not be all signed or all unsigned. + However, none of the integer types should be bit-precise, + and *R's type should not be char, bool, or an enumeration type. These macros work correctly on all known practical hosts, and do not rely on undefined behavior due to signed arithmetic overflow. @@ -635,8 +328,8 @@ These macros are tuned for B being a constant. */ -#define INT_ADD_OK(a, b, r) ! INT_ADD_WRAPV (a, b, r) -#define INT_SUBTRACT_OK(a, b, r) ! INT_SUBTRACT_WRAPV (a, b, r) -#define INT_MULTIPLY_OK(a, b, r) ! INT_MULTIPLY_WRAPV (a, b, r) +#define INT_ADD_OK(a, b, r) (! INT_ADD_WRAPV (a, b, r)) +#define INT_SUBTRACT_OK(a, b, r) (! INT_SUBTRACT_WRAPV (a, b, r)) +#define INT_MULTIPLY_OK(a, b, r) (! INT_MULTIPLY_WRAPV (a, b, r)) #endif /* _GL_INTPROPS_H */ diff --git a/lib/inttypes.in.h b/lib/inttypes.in.h index 853eca0..5b7ef12 100644 --- a/lib/inttypes.in.h +++ b/lib/inttypes.in.h @@ -1,4 +1,4 @@ -/* Copyright (C) 2006-2022 Free Software Foundation, Inc. +/* Copyright (C) 2006-2023 Free Software Foundation, Inc. Written by Paul Eggert, Bruno Haible, Derek Price. This file is part of gnulib. @@ -903,8 +903,21 @@ extern "C" { #endif #if @GNULIB_IMAXABS@ -# if !@HAVE_DECL_IMAXABS@ -extern intmax_t imaxabs (intmax_t); +# if @REPLACE_IMAXABS@ +# if !(defined __cplusplus && defined GNULIB_NAMESPACE) +# undef imaxabs +# define imaxabs rpl_imaxabs +# endif +_GL_FUNCDECL_RPL (imaxabs, intmax_t, (intmax_t x)); +_GL_CXXALIAS_RPL (imaxabs, intmax_t, (intmax_t x)); +# else +# if !@HAVE_DECL_IMAXABS@ +_GL_FUNCDECL_SYS (imaxabs, intmax_t, (intmax_t x)); +# endif +_GL_CXXALIAS_SYS (imaxabs, intmax_t, (intmax_t x)); +# endif +# if __GLIBC__ >= 2 +_GL_CXXALIASWARN (imaxabs); # endif #elif defined GNULIB_POSIXCHECK # undef imaxabs @@ -921,8 +934,21 @@ typedef struct { intmax_t quot; intmax_t rem; } imaxdiv_t; # define GNULIB_defined_imaxdiv_t 1 # endif # endif -# if !@HAVE_DECL_IMAXDIV@ -extern imaxdiv_t imaxdiv (intmax_t, intmax_t); +# if @REPLACE_IMAXDIV@ +# if !(defined __cplusplus && defined GNULIB_NAMESPACE) +# undef imaxdiv +# define imaxdiv rpl_imaxdiv +# endif +_GL_FUNCDECL_RPL (imaxdiv, imaxdiv_t, (intmax_t numer, intmax_t denom)); +_GL_CXXALIAS_RPL (imaxdiv, imaxdiv_t, (intmax_t numer, intmax_t denom)); +# else +# if !@HAVE_DECL_IMAXDIV@ +_GL_FUNCDECL_SYS (imaxdiv, imaxdiv_t, (intmax_t numer, intmax_t denom)); +# endif +_GL_CXXALIAS_SYS (imaxdiv, imaxdiv_t, (intmax_t numer, intmax_t denom)); +# endif +# if __GLIBC__ >= 2 +_GL_CXXALIASWARN (imaxdiv); # endif #elif defined GNULIB_POSIXCHECK # undef imaxdiv diff --git a/lib/langinfo.in.h b/lib/langinfo.in.h index 98aea6a..82e1e3c 100644 --- a/lib/langinfo.in.h +++ b/lib/langinfo.in.h @@ -1,5 +1,5 @@ /* Substitute for and wrapper around <langinfo.h>. - Copyright (C) 2009-2022 Free Software Foundation, Inc. + Copyright (C) 2009-2023 Free Software Foundation, Inc. This file is free software: you can redistribute it and/or modify it under the terms of the GNU Lesser General Public License as @@ -208,7 +208,9 @@ _GL_FUNCDECL_SYS (nl_langinfo, char *, (nl_item item)); # endif _GL_CXXALIAS_SYS (nl_langinfo, char *, (nl_item item)); # endif +# if __GLIBC__ >= 2 _GL_CXXALIASWARN (nl_langinfo); +# endif #elif defined GNULIB_POSIXCHECK # undef nl_langinfo # if HAVE_RAW_DECL_NL_LANGINFO diff --git a/lib/lc-charset-dispatch.c b/lib/lc-charset-dispatch.c index 66d78fd..cd74466 100644 --- a/lib/lc-charset-dispatch.c +++ b/lib/lc-charset-dispatch.c @@ -1,5 +1,5 @@ /* Dispatching based on the current locale's character encoding. - Copyright (C) 2018-2022 Free Software Foundation, Inc. + Copyright (C) 2018-2023 Free Software Foundation, Inc. This file is free software: you can redistribute it and/or modify it under the terms of the GNU Lesser General Public License as diff --git a/lib/lc-charset-dispatch.h b/lib/lc-charset-dispatch.h index 3867c32..c82b6a6 100644 --- a/lib/lc-charset-dispatch.h +++ b/lib/lc-charset-dispatch.h @@ -1,5 +1,5 @@ /* Dispatching based on the current locale's character encoding. - Copyright (C) 2018-2022 Free Software Foundation, Inc. + Copyright (C) 2018-2023 Free Software Foundation, Inc. This file is free software: you can redistribute it and/or modify it under the terms of the GNU Lesser General Public License as diff --git a/lib/libc-config.h b/lib/libc-config.h index 8fec489..5f5ad01 100644 --- a/lib/libc-config.h +++ b/lib/libc-config.h @@ -1,6 +1,6 @@ /* System definitions for code taken from the GNU C Library - Copyright 2017-2022 Free Software Foundation, Inc. + Copyright 2017-2023 Free Software Foundation, Inc. This program is free software; you can redistribute it and/or modify it under the terms of the GNU Lesser General Public @@ -121,6 +121,7 @@ # undef __attr_dealloc # undef __attr_dealloc_free # undef __attribute__ +# undef __attribute_alloc_align__ # undef __attribute_alloc_size__ # undef __attribute_artificial__ # undef __attribute_const__ @@ -129,28 +130,27 @@ # undef __attribute_format_arg__ # undef __attribute_format_strfmon__ # undef __attribute_malloc__ +# undef __attribute_maybe_unused__ # undef __attribute_noinline__ # undef __attribute_nonstring__ # undef __attribute_pure__ # undef __attribute_returns_twice__ # undef __attribute_used__ # undef __attribute_warn_unused_result__ -# undef __bos -# undef __bos0 # undef __errordecl # undef __extension__ # undef __extern_always_inline # undef __extern_inline # undef __flexarr +# undef __fortified_attr_access # undef __fortify_function # undef __glibc_c99_flexarr_available # undef __glibc_has_attribute # undef __glibc_has_builtin # undef __glibc_has_extension +# undef __glibc_likely # undef __glibc_macro_warning # undef __glibc_macro_warning1 -# undef __glibc_objsize -# undef __glibc_objsize0 # undef __glibc_unlikely # undef __inline # undef __ptr_t @@ -159,6 +159,19 @@ # undef __va_arg_pack # undef __va_arg_pack_len # undef __warnattr +# undef __wur +# ifndef __GNULIB_CDEFS +# undef __bos +# undef __bos0 +# undef __glibc_fortify +# undef __glibc_fortify_n +# undef __glibc_objsize +# undef __glibc_objsize0 +# undef __glibc_safe_len_cond +# undef __glibc_safe_or_unknown_len +# undef __glibc_unsafe_len +# undef __glibc_unsigned_or_positive +# endif /* Include our copy of glibc <sys/cdefs.h>. */ # include <cdefs.h> diff --git a/lib/limits.in.h b/lib/limits.in.h index b77bf75..a01b4c6 100644 --- a/lib/limits.in.h +++ b/lib/limits.in.h @@ -1,6 +1,6 @@ /* A GNU-like <limits.h>. - Copyright 2016-2022 Free Software Foundation, Inc. + Copyright 2016-2023 Free Software Foundation, Inc. This file is free software: you can redistribute it and/or modify it under the terms of the GNU Lesser General Public License as @@ -99,7 +99,7 @@ # endif #endif -/* Macros specified by C2x and by ISO/IEC TS 18661-1:2014. */ +/* Macros specified by C23 and by ISO/IEC TS 18661-1:2014. */ #if (! defined ULLONG_WIDTH \ && (defined _GNU_SOURCE || defined __STDC_WANT_IEC_60559_BFP_EXT__ \ @@ -117,13 +117,16 @@ # define ULLONG_WIDTH _GL_INTEGER_WIDTH (0, ULLONG_MAX) #endif -/* Macros specified by C2x. */ +/* Macros specified by C23. */ -#if (! defined BOOL_WIDTH \ - && (defined _GNU_SOURCE \ - || (defined __STDC_VERSION__ && 201710 < __STDC_VERSION__))) -# define BOOL_MAX 1 -# define BOOL_WIDTH 1 +#if (defined _GNU_SOURCE \ + || (defined __STDC_VERSION__ && 201710 < __STDC_VERSION__)) +# if ! defined BOOL_WIDTH +# define BOOL_WIDTH 1 +# define BOOL_MAX 1 +# elif ! defined BOOL_MAX +# define BOOL_MAX ((((1U << (BOOL_WIDTH - 1)) - 1) << 1) + 1) +# endif #endif #endif /* _@GUARD_PREFIX@_LIMITS_H */ diff --git a/lib/localcharset.c b/lib/localcharset.c index 17a4a1e..7ed9c95 100644 --- a/lib/localcharset.c +++ b/lib/localcharset.c @@ -1,6 +1,6 @@ /* Determine a canonical name for the current locale's character encoding. - Copyright (C) 2000-2006, 2008-2022 Free Software Foundation, Inc. + Copyright (C) 2000-2006, 2008-2023 Free Software Foundation, Inc. This file is free software: you can redistribute it and/or modify it under the terms of the GNU Lesser General Public License as diff --git a/lib/localcharset.h b/lib/localcharset.h index 62efbf3..29ee8dc 100644 --- a/lib/localcharset.h +++ b/lib/localcharset.h @@ -1,5 +1,5 @@ /* Determine a canonical name for the current locale's character encoding. - Copyright (C) 2000-2003, 2009-2022 Free Software Foundation, Inc. + Copyright (C) 2000-2003, 2009-2023 Free Software Foundation, Inc. This file is part of the GNU CHARSET Library. This file is free software: you can redistribute it and/or modify diff --git a/lib/locale.in.h b/lib/locale.in.h index 4aef74d..e9c3418 100644 --- a/lib/locale.in.h +++ b/lib/locale.in.h @@ -1,5 +1,5 @@ /* A POSIX <locale.h>. - Copyright (C) 2007-2022 Free Software Foundation, Inc. + Copyright (C) 2007-2023 Free Software Foundation, Inc. This file is free software: you can redistribute it and/or modify it under the terms of the GNU Lesser General Public License as @@ -229,7 +229,7 @@ _GL_CXXALIAS_SYS (newlocale, locale_t, (int category_mask, const char *name, locale_t base)); # endif # endif -# if @HAVE_NEWLOCALE@ +# if __GLIBC__ >= 2 && @HAVE_NEWLOCALE@ _GL_CXXALIASWARN (newlocale); # endif # if @HAVE_NEWLOCALE@ || @REPLACE_NEWLOCALE@ @@ -258,7 +258,7 @@ _GL_CXXALIAS_RPL (duplocale, locale_t, (locale_t locale)); _GL_CXXALIAS_SYS (duplocale, locale_t, (locale_t locale)); # endif # endif -# if @HAVE_DUPLOCALE@ +# if __GLIBC__ >= 2 && @HAVE_DUPLOCALE@ _GL_CXXALIASWARN (duplocale); # endif # if @HAVE_DUPLOCALE@ || @REPLACE_DUPLOCALE@ @@ -290,7 +290,7 @@ _GL_CXXALIAS_RPL (freelocale, void, (locale_t locale)); _GL_CXXALIAS_SYS_CAST (freelocale, void, (locale_t locale)); # endif # endif -# if @HAVE_FREELOCALE@ +# if __GLIBC__ >= 2 && @HAVE_FREELOCALE@ _GL_CXXALIASWARN (freelocale); # endif #elif defined GNULIB_POSIXCHECK diff --git a/lib/localeconv.c b/lib/localeconv.c index ef26120..60c050f 100644 --- a/lib/localeconv.c +++ b/lib/localeconv.c @@ -1,5 +1,5 @@ /* Query locale dependent information for formatting numbers. - Copyright (C) 2012-2022 Free Software Foundation, Inc. + Copyright (C) 2012-2023 Free Software Foundation, Inc. This file is free software: you can redistribute it and/or modify it under the terms of the GNU Lesser General Public License as diff --git a/lib/long-options.c b/lib/long-options.c index 7c8fa1b..212863d 100644 --- a/lib/long-options.c +++ b/lib/long-options.c @@ -1,6 +1,6 @@ /* Utility to accept --help and --version options as unobtrusively as possible. - Copyright (C) 1993-1994, 1998-2000, 2002-2006, 2009-2022 Free Software + Copyright (C) 1993-1994, 1998-2000, 2002-2006, 2009-2023 Free Software Foundation, Inc. This program is free software: you can redistribute it and/or modify diff --git a/lib/long-options.h b/lib/long-options.h index 4ec42cc..ef40356 100644 --- a/lib/long-options.h +++ b/lib/long-options.h @@ -1,5 +1,5 @@ /* long-options.h -- declaration for --help- and --version-handling function. - Copyright (C) 1993-1994, 1998-1999, 2003, 2009-2022 Free Software + Copyright (C) 1993-1994, 1998-1999, 2003, 2009-2023 Free Software Foundation, Inc. This program is free software: you can redistribute it and/or modify @@ -20,8 +20,6 @@ #ifndef LONG_OPTIONS_H_ # define LONG_OPTIONS_H_ 1 -# include <stdbool.h> - void parse_long_options (int _argc, char **_argv, const char *_command_name, diff --git a/lib/lseek.c b/lib/lseek.c index 1a9c49b..7919b03 100644 --- a/lib/lseek.c +++ b/lib/lseek.c @@ -1,5 +1,5 @@ /* An lseek() function that detects pipes. - Copyright (C) 2007, 2009-2022 Free Software Foundation, Inc. + Copyright (C) 2007, 2009-2023 Free Software Foundation, Inc. This file is free software: you can redistribute it and/or modify it under the terms of the GNU Lesser General Public License as diff --git a/lib/lstat.c b/lib/lstat.c index 472bfbc..00a4ce2 100644 --- a/lib/lstat.c +++ b/lib/lstat.c @@ -1,6 +1,6 @@ /* Work around a bug of lstat on some systems - Copyright (C) 1997-2006, 2008-2022 Free Software Foundation, Inc. + Copyright (C) 1997-2006, 2008-2023 Free Software Foundation, Inc. This file is free software: you can redistribute it and/or modify it under the terms of the GNU Lesser General Public License as diff --git a/lib/malloc.c b/lib/malloc.c index f334dd6..3ade35c 100644 --- a/lib/malloc.c +++ b/lib/malloc.c @@ -1,6 +1,6 @@ /* malloc() function that is glibc compatible. - Copyright (C) 1997-1998, 2006-2007, 2009-2022 Free Software Foundation, Inc. + Copyright (C) 1997-1998, 2006-2007, 2009-2023 Free Software Foundation, Inc. This file is free software: you can redistribute it and/or modify it under the terms of the GNU Lesser General Public License as diff --git a/lib/malloc/dynarray-skeleton.c b/lib/malloc/dynarray-skeleton.c index bad548a..580c278 100644 --- a/lib/malloc/dynarray-skeleton.c +++ b/lib/malloc/dynarray-skeleton.c @@ -1,5 +1,5 @@ /* Type-safe arrays which grow dynamically. - Copyright (C) 2017-2022 Free Software Foundation, Inc. + Copyright (C) 2017-2023 Free Software Foundation, Inc. This file is part of the GNU C Library. The GNU C Library is free software; you can redistribute it and/or diff --git a/lib/malloc/dynarray.h b/lib/malloc/dynarray.h index f16fd95..a9a3b08 100644 --- a/lib/malloc/dynarray.h +++ b/lib/malloc/dynarray.h @@ -1,5 +1,5 @@ /* Type-safe arrays which grow dynamically. Shared definitions. - Copyright (C) 2017-2022 Free Software Foundation, Inc. + Copyright (C) 2017-2023 Free Software Foundation, Inc. This file is part of the GNU C Library. The GNU C Library is free software; you can redistribute it and/or @@ -94,7 +94,6 @@ #ifndef _DYNARRAY_H #define _DYNARRAY_H -#include <stdbool.h> #include <stddef.h> #include <string.h> diff --git a/lib/malloc/dynarray_at_failure.c b/lib/malloc/dynarray_at_failure.c index 062ab70..ebc9310 100644 --- a/lib/malloc/dynarray_at_failure.c +++ b/lib/malloc/dynarray_at_failure.c @@ -1,5 +1,5 @@ /* Report an dynamic array index out of bounds condition. - Copyright (C) 2017-2022 Free Software Foundation, Inc. + Copyright (C) 2017-2023 Free Software Foundation, Inc. This file is part of the GNU C Library. The GNU C Library is free software; you can redistribute it and/or diff --git a/lib/malloc/dynarray_emplace_enlarge.c b/lib/malloc/dynarray_emplace_enlarge.c index 0cff2e7..7da5393 100644 --- a/lib/malloc/dynarray_emplace_enlarge.c +++ b/lib/malloc/dynarray_emplace_enlarge.c @@ -1,5 +1,5 @@ /* Increase the size of a dynamic array in preparation of an emplace operation. - Copyright (C) 2017-2022 Free Software Foundation, Inc. + Copyright (C) 2017-2023 Free Software Foundation, Inc. This file is part of the GNU C Library. The GNU C Library is free software; you can redistribute it and/or diff --git a/lib/malloc/dynarray_finalize.c b/lib/malloc/dynarray_finalize.c index 3f360c3..673595a 100644 --- a/lib/malloc/dynarray_finalize.c +++ b/lib/malloc/dynarray_finalize.c @@ -1,5 +1,5 @@ /* Copy the dynamically-allocated area to an explicitly-sized heap allocation. - Copyright (C) 2017-2022 Free Software Foundation, Inc. + Copyright (C) 2017-2023 Free Software Foundation, Inc. This file is part of the GNU C Library. The GNU C Library is free software; you can redistribute it and/or diff --git a/lib/malloc/dynarray_resize.c b/lib/malloc/dynarray_resize.c index 8d1922e..7ecd4de 100644 --- a/lib/malloc/dynarray_resize.c +++ b/lib/malloc/dynarray_resize.c @@ -1,5 +1,5 @@ /* Increase the size of a dynamic array. - Copyright (C) 2017-2022 Free Software Foundation, Inc. + Copyright (C) 2017-2023 Free Software Foundation, Inc. This file is part of the GNU C Library. The GNU C Library is free software; you can redistribute it and/or diff --git a/lib/malloc/dynarray_resize_clear.c b/lib/malloc/dynarray_resize_clear.c index 8cf1b0d..bb23c52 100644 --- a/lib/malloc/dynarray_resize_clear.c +++ b/lib/malloc/dynarray_resize_clear.c @@ -1,5 +1,5 @@ /* Increase the size of a dynamic array and clear the new part. - Copyright (C) 2017-2022 Free Software Foundation, Inc. + Copyright (C) 2017-2023 Free Software Foundation, Inc. This file is part of the GNU C Library. The GNU C Library is free software; you can redistribute it and/or diff --git a/lib/malloc/scratch_buffer.h b/lib/malloc/scratch_buffer.h index e4c5c8a..33fd2b2 100644 --- a/lib/malloc/scratch_buffer.h +++ b/lib/malloc/scratch_buffer.h @@ -1,5 +1,5 @@ /* Variable-sized buffer with on-stack default allocation. - Copyright (C) 2015-2022 Free Software Foundation, Inc. + Copyright (C) 2015-2023 Free Software Foundation, Inc. This file is part of the GNU C Library. The GNU C Library is free software; you can redistribute it and/or @@ -132,20 +132,4 @@ scratch_buffer_set_array_size (struct scratch_buffer *buffer, (buffer, nelem, size)); } -/* Return a copy of *BUFFER's first SIZE bytes as a heap-allocated block, - deallocating *BUFFER if it was heap-allocated. SIZE must be at - most *BUFFER's size. Return NULL (setting errno) on memory - exhaustion. */ -void *__libc_scratch_buffer_dupfree (struct scratch_buffer *buffer, - size_t size); -libc_hidden_proto (__libc_scratch_buffer_dupfree) - -/* Alias for __libc_scratch_dupfree. */ -static __always_inline void * -scratch_buffer_dupfree (struct scratch_buffer *buffer, size_t size) -{ - void *r = __libc_scratch_buffer_dupfree (buffer, size); - return __glibc_likely (r != NULL) ? r : NULL; -} - #endif /* _SCRATCH_BUFFER_H */ diff --git a/lib/malloc/scratch_buffer_dupfree.c b/lib/malloc/scratch_buffer_dupfree.c deleted file mode 100644 index eb3b95c..0000000 --- a/lib/malloc/scratch_buffer_dupfree.c +++ /dev/null @@ -1,41 +0,0 @@ -/* Variable-sized buffer with on-stack default allocation. - Copyright (C) 2020-2022 Free Software Foundation, Inc. - This file is part of the GNU C Library. - - The GNU C Library is free software; you can redistribute it and/or - modify it under the terms of the GNU 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 - <https://www.gnu.org/licenses/>. */ - -#ifndef _LIBC -# include <libc-config.h> -#endif - -#include <scratch_buffer.h> -#include <string.h> - -void * -__libc_scratch_buffer_dupfree (struct scratch_buffer *buffer, size_t size) -{ - void *data = buffer->data; - if (data == buffer->__space.__c) - { - void *copy = malloc (size); - return copy != NULL ? memcpy (copy, data, size) : NULL; - } - else - { - void *copy = realloc (data, size); - return copy != NULL ? copy : data; - } -} -libc_hidden_def (__libc_scratch_buffer_dupfree) diff --git a/lib/malloc/scratch_buffer_grow.c b/lib/malloc/scratch_buffer_grow.c index 9a5e4db..a5e8f2f 100644 --- a/lib/malloc/scratch_buffer_grow.c +++ b/lib/malloc/scratch_buffer_grow.c @@ -1,5 +1,5 @@ /* Variable-sized buffer with on-stack default allocation. - Copyright (C) 2015-2022 Free Software Foundation, Inc. + Copyright (C) 2015-2023 Free Software Foundation, Inc. This file is part of the GNU C Library. The GNU C Library is free software; you can redistribute it and/or diff --git a/lib/malloc/scratch_buffer_grow_preserve.c b/lib/malloc/scratch_buffer_grow_preserve.c index 3fe5a07..c0b5d87 100644 --- a/lib/malloc/scratch_buffer_grow_preserve.c +++ b/lib/malloc/scratch_buffer_grow_preserve.c @@ -1,5 +1,5 @@ /* Variable-sized buffer with on-stack default allocation. - Copyright (C) 2015-2022 Free Software Foundation, Inc. + Copyright (C) 2015-2023 Free Software Foundation, Inc. This file is part of the GNU C Library. The GNU C Library is free software; you can redistribute it and/or diff --git a/lib/malloc/scratch_buffer_set_array_size.c b/lib/malloc/scratch_buffer_set_array_size.c index 89c37a9..24c3935 100644 --- a/lib/malloc/scratch_buffer_set_array_size.c +++ b/lib/malloc/scratch_buffer_set_array_size.c @@ -1,5 +1,5 @@ /* Variable-sized buffer with on-stack default allocation. - Copyright (C) 2015-2022 Free Software Foundation, Inc. + Copyright (C) 2015-2023 Free Software Foundation, Inc. This file is part of the GNU C Library. The GNU C Library is free software; you can redistribute it and/or diff --git a/lib/malloca.c b/lib/malloca.c index e7beaaf..f055b1e 100644 --- a/lib/malloca.c +++ b/lib/malloca.c @@ -1,5 +1,5 @@ /* Safe automatic memory allocation. - Copyright (C) 2003, 2006-2007, 2009-2022 Free Software Foundation, Inc. + Copyright (C) 2003, 2006-2007, 2009-2023 Free Software Foundation, Inc. Written by Bruno Haible <bruno@clisp.org>, 2003, 2018. This file is free software: you can redistribute it and/or modify @@ -21,9 +21,9 @@ /* Specification. */ #include "malloca.h" +#include <stdckdint.h> + #include "idx.h" -#include "intprops.h" -#include "verify.h" /* The speed critical point in this file is freea() applied to an alloca() result: it must be fast, to match the speed of alloca(). The speed of @@ -39,7 +39,7 @@ /* Type for holding very small pointer differences. */ typedef unsigned char small_t; /* Verify that it is wide enough. */ -verify (2 * sa_alignment_max - 1 <= (small_t) -1); +static_assert (2 * sa_alignment_max - 1 <= (small_t) -1); void * mmalloca (size_t n) @@ -50,17 +50,16 @@ mmalloca (size_t n) uintptr_t alignment2_mask = 2 * sa_alignment_max - 1; int plus = sizeof (small_t) + alignment2_mask; idx_t nplus; - if (!INT_ADD_WRAPV (n, plus, &nplus) && !xalloc_oversized (nplus, 1)) + if (!ckd_add (&nplus, n, plus) && !xalloc_oversized (nplus, 1)) { char *mem = (char *) malloc (nplus); if (mem != NULL) { uintptr_t umem = (uintptr_t)mem, umemplus; - /* The INT_ADD_WRAPV avoids signed integer overflow on + /* The ckd_add avoids signed integer overflow on theoretical platforms where UINTPTR_MAX <= INT_MAX. */ - INT_ADD_WRAPV (umem, sizeof (small_t) + sa_alignment_max - 1, - &umemplus); + ckd_add (&umemplus, umem, sizeof (small_t) + sa_alignment_max - 1); idx_t offset = ((umemplus & ~alignment2_mask) + sa_alignment_max - umem); void *vp = mem + offset; diff --git a/lib/malloca.h b/lib/malloca.h index 7ec235f..325c727 100644 --- a/lib/malloca.h +++ b/lib/malloca.h @@ -1,5 +1,5 @@ /* Safe automatic memory allocation. - Copyright (C) 2003-2007, 2009-2022 Free Software Foundation, Inc. + Copyright (C) 2003-2007, 2009-2023 Free Software Foundation, Inc. Written by Bruno Haible <bruno@clisp.org>, 2003. This file is free software: you can redistribute it and/or modify diff --git a/lib/mbrtowc-impl-utf8.h b/lib/mbrtowc-impl-utf8.h index 8e5ac14..4fdd65d 100644 --- a/lib/mbrtowc-impl-utf8.h +++ b/lib/mbrtowc-impl-utf8.h @@ -1,5 +1,5 @@ /* Convert multibyte character to wide character. - Copyright (C) 1999-2002, 2005-2022 Free Software Foundation, Inc. + Copyright (C) 1999-2002, 2005-2023 Free Software Foundation, Inc. This file is free software: you can redistribute it and/or modify it under the terms of the GNU Lesser General Public License as diff --git a/lib/mbrtowc-impl.h b/lib/mbrtowc-impl.h index 65538e7..e9c04ed 100644 --- a/lib/mbrtowc-impl.h +++ b/lib/mbrtowc-impl.h @@ -1,5 +1,5 @@ /* Convert multibyte character to wide character. - Copyright (C) 1999-2002, 2005-2022 Free Software Foundation, Inc. + Copyright (C) 1999-2002, 2005-2023 Free Software Foundation, Inc. This file is free software: you can redistribute it and/or modify it under the terms of the GNU Lesser General Public License as diff --git a/lib/mbrtowc.c b/lib/mbrtowc.c index 4b164ed..c1a689a 100644 --- a/lib/mbrtowc.c +++ b/lib/mbrtowc.c @@ -1,5 +1,5 @@ /* Convert multibyte character to wide character. - Copyright (C) 1999-2002, 2005-2022 Free Software Foundation, Inc. + Copyright (C) 1999-2002, 2005-2023 Free Software Foundation, Inc. Written by Bruno Haible <bruno@clisp.org>, 2008. This file is free software: you can redistribute it and/or modify @@ -51,11 +51,10 @@ # endif # include "attribute.h" -# include "verify.h" # include "lc-charset-dispatch.h" # include "mbtowc-lock.h" -verify (sizeof (mbstate_t) >= 4); +static_assert (sizeof (mbstate_t) >= 4); static char internal_state[4]; size_t diff --git a/lib/mbsinit.c b/lib/mbsinit.c index 9621def..6e60079 100644 --- a/lib/mbsinit.c +++ b/lib/mbsinit.c @@ -1,5 +1,5 @@ /* Test for initial conversion state. - Copyright (C) 2008-2022 Free Software Foundation, Inc. + Copyright (C) 2008-2023 Free Software Foundation, Inc. Written by Bruno Haible <bruno@clisp.org>, 2008. This file is free software: you can redistribute it and/or modify @@ -20,7 +20,6 @@ /* Specification. */ #include <wchar.h> -#include "verify.h" #if GNULIB_defined_mbstate_t @@ -39,7 +38,7 @@ - In wc -> mb direction, mbstate_t contains no information. In other words, it is always in the initial state. */ -verify (sizeof (mbstate_t) >= 4); +static_assert (sizeof (mbstate_t) >= 4); int mbsinit (const mbstate_t *ps) diff --git a/lib/mbtowc-impl.h b/lib/mbtowc-impl.h index 2b27baf..39b977b 100644 --- a/lib/mbtowc-impl.h +++ b/lib/mbtowc-impl.h @@ -1,5 +1,5 @@ /* Convert multibyte character to wide character. - Copyright (C) 2011-2022 Free Software Foundation, Inc. + Copyright (C) 2011-2023 Free Software Foundation, Inc. Written by Bruno Haible <bruno@clisp.org>, 2011. This file is free software: you can redistribute it and/or modify diff --git a/lib/mbtowc-lock.c b/lib/mbtowc-lock.c index 06d3224..6ca6e10 100644 --- a/lib/mbtowc-lock.c +++ b/lib/mbtowc-lock.c @@ -1,5 +1,5 @@ /* Return the internal lock used by mbrtowc and mbrtoc32. - Copyright (C) 2019-2022 Free Software Foundation, Inc. + Copyright (C) 2019-2023 Free Software Foundation, Inc. This file is free software: you can redistribute it and/or modify it under the terms of the GNU Lesser General Public License as diff --git a/lib/mbtowc-lock.h b/lib/mbtowc-lock.h index ecfd44e..2dc22ac 100644 --- a/lib/mbtowc-lock.h +++ b/lib/mbtowc-lock.h @@ -1,5 +1,5 @@ /* Use the internal lock used by mbrtowc and mbrtoc32. - Copyright (C) 2019-2022 Free Software Foundation, Inc. + Copyright (C) 2019-2023 Free Software Foundation, Inc. This file is free software: you can redistribute it and/or modify it under the terms of the GNU Lesser General Public License as diff --git a/lib/mbtowc.c b/lib/mbtowc.c index a9a7995..8d9b06d 100644 --- a/lib/mbtowc.c +++ b/lib/mbtowc.c @@ -1,5 +1,5 @@ /* Convert multibyte character to wide character. - Copyright (C) 2011-2022 Free Software Foundation, Inc. + Copyright (C) 2011-2023 Free Software Foundation, Inc. Written by Bruno Haible <bruno@clisp.org>, 2011. This file is free software: you can redistribute it and/or modify diff --git a/lib/mempcpy.c b/lib/mempcpy.c index 9aae418..24a3135 100644 --- a/lib/mempcpy.c +++ b/lib/mempcpy.c @@ -1,5 +1,5 @@ /* Copy memory area and return pointer after last written byte. - Copyright (C) 2003, 2007, 2009-2022 Free Software Foundation, Inc. + Copyright (C) 2003, 2007, 2009-2023 Free Software Foundation, Inc. This file is free software: you can redistribute it and/or modify it under the terms of the GNU Lesser General Public License as diff --git a/lib/minmax.h b/lib/minmax.h index b4b1345..1fbfc66 100644 --- a/lib/minmax.h +++ b/lib/minmax.h @@ -1,5 +1,5 @@ /* MIN, MAX macros. - Copyright (C) 1995, 1998, 2001, 2003, 2005, 2009-2022 Free Software + Copyright (C) 1995, 1998, 2001, 2003, 2005, 2009-2023 Free Software Foundation, Inc. This file is free software: you can redistribute it and/or modify diff --git a/lib/mkdir.c b/lib/mkdir.c index 4901701..f94aba1 100644 --- a/lib/mkdir.c +++ b/lib/mkdir.c @@ -1,7 +1,7 @@ /* On some systems, mkdir ("foo/", 0700) fails because of the trailing slash. On those systems, this wrapper removes the trailing slash. - Copyright (C) 2001, 2003, 2006, 2008-2022 Free Software Foundation, Inc. + Copyright (C) 2001, 2003, 2006, 2008-2023 Free Software Foundation, Inc. This file is free software: you can redistribute it and/or modify it under the terms of the GNU Lesser General Public License as diff --git a/lib/mkstemp.c b/lib/mkstemp.c index 7e0a214..77aadbb 100644 --- a/lib/mkstemp.c +++ b/lib/mkstemp.c @@ -1,4 +1,4 @@ -/* Copyright (C) 1998-1999, 2001, 2005-2007, 2009-2022 Free Software +/* Copyright (C) 1998-1999, 2001, 2005-2007, 2009-2023 Free Software Foundation, Inc. This file is derived from the one in the GNU C Library. diff --git a/lib/msvc-inval.c b/lib/msvc-inval.c index d6651ca..c5149a8 100644 --- a/lib/msvc-inval.c +++ b/lib/msvc-inval.c @@ -1,5 +1,5 @@ /* Invalid parameter handler for MSVC runtime libraries. - Copyright (C) 2011-2022 Free Software Foundation, Inc. + Copyright (C) 2011-2023 Free Software Foundation, Inc. This file is free software: you can redistribute it and/or modify it under the terms of the GNU Lesser General Public License as diff --git a/lib/msvc-inval.h b/lib/msvc-inval.h index 1230b89..ed00461 100644 --- a/lib/msvc-inval.h +++ b/lib/msvc-inval.h @@ -1,5 +1,5 @@ /* Invalid parameter handler for MSVC runtime libraries. - Copyright (C) 2011-2022 Free Software Foundation, Inc. + Copyright (C) 2011-2023 Free Software Foundation, Inc. This file is free software: you can redistribute it and/or modify it under the terms of the GNU Lesser General Public License as diff --git a/lib/msvc-nothrow.c b/lib/msvc-nothrow.c index aa06964..f729fe6 100644 --- a/lib/msvc-nothrow.c +++ b/lib/msvc-nothrow.c @@ -1,6 +1,6 @@ /* Wrappers that don't throw invalid parameter notifications with MSVC runtime libraries. - Copyright (C) 2011-2022 Free Software Foundation, Inc. + Copyright (C) 2011-2023 Free Software Foundation, Inc. This file is free software: you can redistribute it and/or modify it under the terms of the GNU Lesser General Public License as diff --git a/lib/msvc-nothrow.h b/lib/msvc-nothrow.h index 5345155..82d3f6a 100644 --- a/lib/msvc-nothrow.h +++ b/lib/msvc-nothrow.h @@ -1,6 +1,6 @@ /* Wrappers that don't throw invalid parameter notifications with MSVC runtime libraries. - Copyright (C) 2011-2022 Free Software Foundation, Inc. + Copyright (C) 2011-2023 Free Software Foundation, Inc. This file is free software: you can redistribute it and/or modify it under the terms of the GNU Lesser General Public License as diff --git a/lib/nl_langinfo-lock.c b/lib/nl_langinfo-lock.c index c36882d..e5cdcd3 100644 --- a/lib/nl_langinfo-lock.c +++ b/lib/nl_langinfo-lock.c @@ -1,5 +1,5 @@ /* Return the internal lock used by nl_langinfo. - Copyright (C) 2019-2022 Free Software Foundation, Inc. + Copyright (C) 2019-2023 Free Software Foundation, Inc. This file is free software: you can redistribute it and/or modify it under the terms of the GNU Lesser General Public License as diff --git a/lib/nl_langinfo.c b/lib/nl_langinfo.c index 3fa4782..f872c6d 100644 --- a/lib/nl_langinfo.c +++ b/lib/nl_langinfo.c @@ -1,6 +1,6 @@ /* nl_langinfo() replacement: query locale dependent information. - Copyright (C) 2007-2022 Free Software Foundation, Inc. + Copyright (C) 2007-2023 Free Software Foundation, Inc. This file is free software: you can redistribute it and/or modify it under the terms of the GNU Lesser General Public License as @@ -70,6 +70,8 @@ static char * ctype_codeset (void) { + /* This function is only used on platforms which don't have uselocale(). + Therefore we don't need to look at the per-thread locale first, here. */ static char result[2 + 10 + 1]; char buf[2 + 10 + 1]; char locale[SETLOCALE_NULL_MAX]; @@ -1,5 +1,5 @@ /* Open a descriptor to a file. - Copyright (C) 2007-2022 Free Software Foundation, Inc. + Copyright (C) 2007-2023 Free Software Foundation, Inc. This file is free software: you can redistribute it and/or modify it under the terms of the GNU Lesser General Public License as diff --git a/lib/pathmax.h b/lib/pathmax.h index 19b93d7..0dd8f3b 100644 --- a/lib/pathmax.h +++ b/lib/pathmax.h @@ -1,5 +1,5 @@ /* Define PATH_MAX somehow. Requires sys/types.h. - Copyright (C) 1992, 1999, 2001, 2003, 2005, 2009-2022 Free Software + Copyright (C) 1992, 1999, 2001, 2003, 2005, 2009-2023 Free Software Foundation, Inc. This file is free software: you can redistribute it and/or modify diff --git a/lib/progname.c b/lib/progname.c index 6f09c2b..ed928e0 100644 --- a/lib/progname.c +++ b/lib/progname.c @@ -1,5 +1,5 @@ /* Program name management. - Copyright (C) 2001-2003, 2005-2022 Free Software Foundation, Inc. + Copyright (C) 2001-2003, 2005-2023 Free Software Foundation, Inc. Written by Bruno Haible <bruno@clisp.org>, 2001. This program is free software: you can redistribute it and/or modify diff --git a/lib/progname.h b/lib/progname.h index 0561089..945d169 100644 --- a/lib/progname.h +++ b/lib/progname.h @@ -1,5 +1,5 @@ /* Program name management. - Copyright (C) 2001-2004, 2006, 2009-2022 Free Software Foundation, Inc. + Copyright (C) 2001-2004, 2006, 2009-2023 Free Software Foundation, Inc. Written by Bruno Haible <bruno@clisp.org>, 2001. This program is free software: you can redistribute it and/or modify diff --git a/lib/quote.h b/lib/quote.h index 0910ffd..9ec5747 100644 --- a/lib/quote.h +++ b/lib/quote.h @@ -1,6 +1,6 @@ /* quote.h - prototypes for quote.c - Copyright (C) 1998-2001, 2003, 2009-2022 Free Software Foundation, Inc. + Copyright (C) 1998-2001, 2003, 2009-2023 Free Software Foundation, Inc. This program is free software: you can redistribute it and/or modify it under the terms of the GNU General Public License as published by diff --git a/lib/quotearg.c b/lib/quotearg.c index 9180d9a..975bd61 100644 --- a/lib/quotearg.c +++ b/lib/quotearg.c @@ -1,6 +1,6 @@ /* quotearg.c - quote arguments for output - Copyright (C) 1998-2002, 2004-2022 Free Software Foundation, Inc. + Copyright (C) 1998-2002, 2004-2023 Free Software Foundation, Inc. This program is free software: you can redistribute it and/or modify it under the terms of the GNU General Public License as published by @@ -38,7 +38,6 @@ #include <ctype.h> #include <errno.h> #include <limits.h> -#include <stdbool.h> #include <stdint.h> #include <stdlib.h> #include <string.h> diff --git a/lib/quotearg.h b/lib/quotearg.h index 2009fac..eb15612 100644 --- a/lib/quotearg.h +++ b/lib/quotearg.h @@ -1,6 +1,6 @@ /* quotearg.h - quote arguments for output - Copyright (C) 1998-2002, 2004, 2006, 2008-2022 Free Software Foundation, + Copyright (C) 1998-2002, 2004, 2006, 2008-2023 Free Software Foundation, Inc. This program is free software: you can redistribute it and/or modify diff --git a/lib/rawmemchr.c b/lib/rawmemchr.c index ea68c1b..45c6cd3 100644 --- a/lib/rawmemchr.c +++ b/lib/rawmemchr.c @@ -1,5 +1,5 @@ /* Searching in a string. - Copyright (C) 2008-2022 Free Software Foundation, Inc. + Copyright (C) 2008-2023 Free Software Foundation, Inc. This file is free software: you can redistribute it and/or modify it under the terms of the GNU Lesser General Public License as @@ -23,10 +23,8 @@ #if !HAVE_RAWMEMCHR # include <limits.h> -# include <stdalign.h> # include <stdint.h> -# include "verify.h" /* Find the first occurrence of C in S. */ void * @@ -36,7 +34,7 @@ rawmemchr (const void *s, int c_in) typedef uintptr_t longword; /* If you change the "uintptr_t", you should change UINTPTR_WIDTH to match. This verifies that the type does not have padding bits. */ - verify (UINTPTR_WIDTH == UCHAR_WIDTH * sizeof (longword)); + static_assert (UINTPTR_WIDTH == UCHAR_WIDTH * sizeof (longword)); const unsigned char *char_ptr; unsigned char c = c_in; diff --git a/lib/rawmemchr.valgrind b/lib/rawmemchr.valgrind index 64cf86c..f3e4cb0 100644 --- a/lib/rawmemchr.valgrind +++ b/lib/rawmemchr.valgrind @@ -1,6 +1,6 @@ # Suppress a valgrind message about use of uninitialized memory in rawmemchr(). -# Copyright (C) 2008-2022 Free Software Foundation, Inc. +# Copyright (C) 2008-2023 Free Software Foundation, Inc. # # This file is free software: you can redistribute it and/or modify # it under the terms of the GNU Lesser General Public License as @@ -1,5 +1,5 @@ /* POSIX compatible read() function. - Copyright (C) 2008-2022 Free Software Foundation, Inc. + Copyright (C) 2008-2023 Free Software Foundation, Inc. Written by Bruno Haible <bruno@clisp.org>, 2011. This file is free software: you can redistribute it and/or modify diff --git a/lib/readlink.c b/lib/readlink.c index ed03cc8..14bbb7f 100644 --- a/lib/readlink.c +++ b/lib/readlink.c @@ -1,5 +1,5 @@ /* Read the contents of a symbolic link. - Copyright (C) 2003-2007, 2009-2022 Free Software Foundation, Inc. + Copyright (C) 2003-2007, 2009-2023 Free Software Foundation, Inc. This file is free software: you can redistribute it and/or modify it under the terms of the GNU Lesser General Public License as diff --git a/lib/realloc.c b/lib/realloc.c index c878381..1063eb0 100644 --- a/lib/realloc.c +++ b/lib/realloc.c @@ -1,6 +1,6 @@ /* realloc() function that is glibc compatible. - Copyright (C) 1997, 2003-2004, 2006-2007, 2009-2022 Free Software + Copyright (C) 1997, 2003-2004, 2006-2007, 2009-2023 Free Software Foundation, Inc. This file is free software: you can redistribute it and/or modify diff --git a/lib/reallocarray.c b/lib/reallocarray.c index bc4cba4..8c99250 100644 --- a/lib/reallocarray.c +++ b/lib/reallocarray.c @@ -1,6 +1,6 @@ /* reallocarray function that is glibc compatible. - Copyright (C) 2017-2022 Free Software Foundation, Inc. + Copyright (C) 2017-2023 Free Software Foundation, Inc. This file is free software: you can redistribute it and/or modify it under the terms of the GNU Lesser General Public License as @@ -19,16 +19,15 @@ #include <config.h> +#include <stdckdint.h> #include <stdlib.h> #include <errno.h> -#include "intprops.h" - void * reallocarray (void *ptr, size_t nmemb, size_t size) { size_t nbytes; - if (INT_MULTIPLY_WRAPV (nmemb, size, &nbytes)) + if (ckd_mul (&nbytes, nmemb, size)) { errno = ENOMEM; return NULL; diff --git a/lib/regcomp.c b/lib/regcomp.c index b607c85..8947839 100644 --- a/lib/regcomp.c +++ b/lib/regcomp.c @@ -1,5 +1,5 @@ /* Extended regular expression matching and search library. - Copyright (C) 2002-2022 Free Software Foundation, Inc. + Copyright (C) 2002-2023 Free Software Foundation, Inc. This file is part of the GNU C Library. Contributed by Isamu Hasegawa <isamu@yamato.ibm.com>. @@ -2038,15 +2038,25 @@ peek_token_bracket (re_token_t *token, re_string_t *input, reg_syntax_t syntax) } switch (c) { - case '-': - token->type = OP_CHARSET_RANGE; - break; case ']': token->type = OP_CLOSE_BRACKET; break; case '^': token->type = OP_NON_MATCH_LIST; break; + case '-': + /* In V7 Unix grep and Unix awk and mawk, [...---...] + (3 adjacent minus signs) stands for a single minus sign. + Support that without breaking anything else. */ + if (! (re_string_cur_idx (input) + 2 < re_string_length (input) + && re_string_peek_byte (input, 1) == '-' + && re_string_peek_byte (input, 2) == '-')) + { + token->type = OP_CHARSET_RANGE; + break; + } + re_string_skip_bytes (input, 2); + FALLTHROUGH; default: token->type = CHARACTER; } diff --git a/lib/regex.c b/lib/regex.c index ff11767..3beb0de 100644 --- a/lib/regex.c +++ b/lib/regex.c @@ -1,5 +1,5 @@ /* Extended regular expression matching and search library. - Copyright (C) 2002-2022 Free Software Foundation, Inc. + Copyright (C) 2002-2023 Free Software Foundation, Inc. This file is part of the GNU C Library. Contributed by Isamu Hasegawa <isamu@yamato.ibm.com>. diff --git a/lib/regex.h b/lib/regex.h index a7e0bd0..9ef0252 100644 --- a/lib/regex.h +++ b/lib/regex.h @@ -1,6 +1,6 @@ /* Definitions for data structures and routines for the regular expression library. - Copyright (C) 1985, 1989-2022 Free Software Foundation, Inc. + Copyright (C) 1985, 1989-2023 Free Software Foundation, Inc. This file is part of the GNU C Library. The GNU C Library is free software; you can redistribute it and/or diff --git a/lib/regex_internal.c b/lib/regex_internal.c index 0e6919f..998a19b 100644 --- a/lib/regex_internal.c +++ b/lib/regex_internal.c @@ -1,5 +1,5 @@ /* Extended regular expression matching and search library. - Copyright (C) 2002-2022 Free Software Foundation, Inc. + Copyright (C) 2002-2023 Free Software Foundation, Inc. This file is part of the GNU C Library. Contributed by Isamu Hasegawa <isamu@yamato.ibm.com>. diff --git a/lib/regex_internal.h b/lib/regex_internal.h index 57a455b..149ec2e 100644 --- a/lib/regex_internal.h +++ b/lib/regex_internal.h @@ -1,5 +1,5 @@ /* Extended regular expression matching and search library. - Copyright (C) 2002-2022 Free Software Foundation, Inc. + Copyright (C) 2002-2023 Free Software Foundation, Inc. This file is part of the GNU C Library. Contributed by Isamu Hasegawa <isamu@yamato.ibm.com>. @@ -29,7 +29,6 @@ #include <locale.h> #include <wchar.h> #include <wctype.h> -#include <stdbool.h> #include <stdint.h> #ifndef _LIBC diff --git a/lib/regexec.c b/lib/regexec.c index 521cb02..13e0349 100644 --- a/lib/regexec.c +++ b/lib/regexec.c @@ -1,5 +1,5 @@ /* Extended regular expression matching and search library. - Copyright (C) 2002-2022 Free Software Foundation, Inc. + Copyright (C) 2002-2023 Free Software Foundation, Inc. This file is part of the GNU C Library. Contributed by Isamu Hasegawa <isamu@yamato.ibm.com>. diff --git a/lib/rpmatch.c b/lib/rpmatch.c index 01eab24..a07c9b9 100644 --- a/lib/rpmatch.c +++ b/lib/rpmatch.c @@ -1,7 +1,7 @@ /* Determine whether string value is affirmation or negative response according to current locale's data. - Copyright (C) 1996, 1998, 2000, 2002-2003, 2006-2022 Free Software + Copyright (C) 1996, 1998, 2000, 2002-2003, 2006-2023 Free Software Foundation, Inc. This program is free software: you can redistribute it and/or modify @@ -22,7 +22,6 @@ /* Specification. */ #include <stdlib.h> -#include <stdbool.h> #include <stddef.h> #if ENABLE_NLS diff --git a/lib/safe-read.c b/lib/safe-read.c index 04ffa7b..7f6dc09 100644 --- a/lib/safe-read.c +++ b/lib/safe-read.c @@ -1,6 +1,6 @@ /* An interface to read and write that retries after interrupts. - Copyright (C) 1993-1994, 1998, 2002-2006, 2009-2022 Free Software + Copyright (C) 1993-1994, 1998, 2002-2006, 2009-2023 Free Software Foundation, Inc. This file is free software: you can redistribute it and/or modify diff --git a/lib/safe-read.h b/lib/safe-read.h index a39bb98..d087447 100644 --- a/lib/safe-read.h +++ b/lib/safe-read.h @@ -1,5 +1,5 @@ /* An interface to read() that retries after interrupts. - Copyright (C) 2002, 2006, 2009-2022 Free Software Foundation, Inc. + Copyright (C) 2002, 2006, 2009-2023 Free Software Foundation, Inc. This file is free software: you can redistribute it and/or modify it under the terms of the GNU Lesser General Public License as diff --git a/lib/scratch_buffer.h b/lib/scratch_buffer.h index f4fe5e8..4cf60d2 100644 --- a/lib/scratch_buffer.h +++ b/lib/scratch_buffer.h @@ -1,5 +1,5 @@ /* Variable-sized buffer with on-stack default allocation. - Copyright (C) 2017-2022 Free Software Foundation, Inc. + Copyright (C) 2017-2023 Free Software Foundation, Inc. This file is free software: you can redistribute it and/or modify it under the terms of the GNU Lesser General Public License as @@ -98,20 +98,10 @@ extern bool scratch_buffer_set_array_size (struct scratch_buffer *buffer, size_t nelem, size_t size); #endif -/* Return a copy of *BUFFER's first SIZE bytes as a heap-allocated block, - deallocating *BUFFER if it was heap-allocated. SIZE must be at - most *BUFFER's size. Return NULL (setting errno) on memory - exhaustion. */ -#if 0 -extern void *scratch_buffer_dupfree (struct scratch_buffer *buffer, - size_t size); -#endif - /* The implementation is imported from glibc. */ /* Avoid possible conflicts with symbols exported by the GNU libc. */ -#define __libc_scratch_buffer_dupfree gl_scratch_buffer_dupfree #define __libc_scratch_buffer_grow gl_scratch_buffer_grow #define __libc_scratch_buffer_grow_preserve gl_scratch_buffer_grow_preserve #define __libc_scratch_buffer_set_array_size gl_scratch_buffer_set_array_size diff --git a/lib/setlocale-lock.c b/lib/setlocale-lock.c index 4e7540e..b70ba09 100644 --- a/lib/setlocale-lock.c +++ b/lib/setlocale-lock.c @@ -1,5 +1,5 @@ /* Return the internal lock used by setlocale_null_r. - Copyright (C) 2019-2022 Free Software Foundation, Inc. + Copyright (C) 2019-2023 Free Software Foundation, Inc. This file is free software: you can redistribute it and/or modify it under the terms of the GNU Lesser General Public License as diff --git a/lib/setlocale_null.c b/lib/setlocale_null.c index 778429b..89c8a06 100644 --- a/lib/setlocale_null.c +++ b/lib/setlocale_null.c @@ -1,5 +1,5 @@ /* Query the name of the current global locale. - Copyright (C) 2019-2022 Free Software Foundation, Inc. + Copyright (C) 2019-2023 Free Software Foundation, Inc. This file is free software: you can redistribute it and/or modify it under the terms of the GNU Lesser General Public License as @@ -173,7 +173,7 @@ setlocale_null_unlocked (int category, char *buf, size_t bufsize) #endif } -#if !(SETLOCALE_NULL_ALL_MTSAFE && SETLOCALE_NULL_ONE_MTSAFE) /* musl libc, macOS, FreeBSD, NetBSD, OpenBSD, AIX, Haiku, Cygwin */ +#if !(SETLOCALE_NULL_ALL_MTSAFE && SETLOCALE_NULL_ONE_MTSAFE) /* musl libc, macOS, FreeBSD, NetBSD, OpenBSD, AIX, Haiku, Cygwin < 3.4.6 */ /* Use a lock, so that no two threads can invoke setlocale_null_unlocked at the same time. */ @@ -198,7 +198,7 @@ setlocale_null_with_lock (int category, char *buf, size_t bufsize) return ret; } -# elif HAVE_PTHREAD_API /* musl libc, macOS, FreeBSD, NetBSD, OpenBSD, AIX, Haiku, Cygwin */ +# elif HAVE_PTHREAD_API /* musl libc, macOS, FreeBSD, NetBSD, OpenBSD, AIX, Haiku, Cygwin < 3.4.6 */ extern # if defined _WIN32 || defined __CYGWIN__ diff --git a/lib/setlocale_null.h b/lib/setlocale_null.h index d1921b0..c740fa0 100644 --- a/lib/setlocale_null.h +++ b/lib/setlocale_null.h @@ -1,5 +1,5 @@ /* Query the name of the current global locale. - Copyright (C) 2019-2022 Free Software Foundation, Inc. + Copyright (C) 2019-2023 Free Software Foundation, Inc. This file is free software: you can redistribute it and/or modify it under the terms of the GNU Lesser General Public License as diff --git a/lib/sleep.c b/lib/sleep.c index 7a6fb15..37c1213 100644 --- a/lib/sleep.c +++ b/lib/sleep.c @@ -1,5 +1,5 @@ /* Pausing execution of the current thread. - Copyright (C) 2007, 2009-2022 Free Software Foundation, Inc. + Copyright (C) 2007, 2009-2023 Free Software Foundation, Inc. Written by Bruno Haible <bruno@clisp.org>, 2007. This file is free software: you can redistribute it and/or modify @@ -22,8 +22,6 @@ #include <limits.h> -#include "verify.h" - #if defined _WIN32 && ! defined __CYGWIN__ # define WIN32_LEAN_AND_MEAN /* avoid including junk */ @@ -56,7 +54,7 @@ unsigned int rpl_sleep (unsigned int seconds) { /* This requires int larger than 16 bits. */ - verify (UINT_MAX / 24 / 24 / 60 / 60); + static_assert (UINT_MAX / 24 / 24 / 60 / 60); const unsigned int limit = 24 * 24 * 60 * 60; while (limit < seconds) { diff --git a/lib/stat-time.c b/lib/stat-time.c index 3d48a2b..bc28223 100644 --- a/lib/stat-time.c +++ b/lib/stat-time.c @@ -1,6 +1,6 @@ /* stat-related time functions. - Copyright (C) 2012-2022 Free Software Foundation, Inc. + Copyright (C) 2012-2023 Free Software Foundation, Inc. This file is free software: you can redistribute it and/or modify it under the terms of the GNU Lesser General Public License as diff --git a/lib/stat-time.h b/lib/stat-time.h index 6b0088e..92aa1e6 100644 --- a/lib/stat-time.h +++ b/lib/stat-time.h @@ -1,6 +1,6 @@ /* stat-related time functions. - Copyright (C) 2005, 2007, 2009-2022 Free Software Foundation, Inc. + Copyright (C) 2005, 2007, 2009-2023 Free Software Foundation, Inc. This file is free software: you can redistribute it and/or modify it under the terms of the GNU Lesser General Public License as @@ -20,9 +20,8 @@ #ifndef STAT_TIME_H #define STAT_TIME_H 1 -#include "intprops.h" - #include <errno.h> +#include <stdckdint.h> #include <stddef.h> #include <sys/stat.h> #include <time.h> @@ -232,7 +231,7 @@ stat_time_normalize (int result, _GL_UNUSED struct stat *st) /* Overflow is possible, as Solaris 11 stat can yield tv_sec == TYPE_MINIMUM (time_t) && tv_nsec == -1000000000. INT_ADD_WRAPV is OK, since time_t is signed on Solaris. */ - if (INT_ADD_WRAPV (q, ts->tv_sec, &ts->tv_sec)) + if (ckd_add (&ts->tv_sec, q, ts->tv_sec)) { errno = EOVERFLOW; return -1; diff --git a/lib/stat-w32.c b/lib/stat-w32.c index c1a2923..2f01197 100644 --- a/lib/stat-w32.c +++ b/lib/stat-w32.c @@ -1,5 +1,5 @@ /* Core of implementation of fstat and stat for native Windows. - Copyright (C) 2017-2022 Free Software Foundation, Inc. + Copyright (C) 2017-2023 Free Software Foundation, Inc. This file is free software: you can redistribute it and/or modify it under the terms of the GNU Lesser General Public License as @@ -50,7 +50,6 @@ #include "stat-w32.h" #include "pathmax.h" -#include "verify.h" /* Don't assume that UNICODE is not defined. */ #undef LoadLibrary @@ -228,7 +227,7 @@ _gl_fstat_by_handle (HANDLE h, const char *path, struct stat *buf) if (GetFileInformationByHandleExFunc (h, FileIdInfo, &id, sizeof (id))) { buf->st_dev = id.VolumeSerialNumber; - verify (sizeof (ino_t) == sizeof (id.FileId)); + static_assert (sizeof (ino_t) == sizeof (id.FileId)); memcpy (&buf->st_ino, &id.FileId, sizeof (ino_t)); goto ino_done; } diff --git a/lib/stat-w32.h b/lib/stat-w32.h index 0f79d61..c673874 100644 --- a/lib/stat-w32.h +++ b/lib/stat-w32.h @@ -1,5 +1,5 @@ /* Core of implementation of fstat and stat for native Windows. - Copyright (C) 2017-2022 Free Software Foundation, Inc. + Copyright (C) 2017-2023 Free Software Foundation, Inc. This file is free software: you can redistribute it and/or modify it under the terms of the GNU Lesser General Public License as @@ -1,5 +1,5 @@ /* Work around platform bugs in stat. - Copyright (C) 2009-2022 Free Software Foundation, Inc. + Copyright (C) 2009-2023 Free Software Foundation, Inc. This file is free software: you can redistribute it and/or modify it under the terms of the GNU Lesser General Public License as @@ -55,11 +55,9 @@ orig_stat (const char *filename, struct stat *buf) #include <errno.h> #include <limits.h> -#include <stdbool.h> #include <string.h> #include "filename.h" #include "malloca.h" -#include "verify.h" #ifdef WINDOWS_NATIVE # define WIN32_LEAN_AND_MEAN diff --git a/lib/stdalign.in.h b/lib/stdalign.in.h deleted file mode 100644 index 3b117df..0000000 --- a/lib/stdalign.in.h +++ /dev/null @@ -1,127 +0,0 @@ -/* A substitute for ISO C11 <stdalign.h>. - - Copyright 2011-2022 Free Software Foundation, Inc. - - 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 <https://www.gnu.org/licenses/>. */ - -/* Written by Paul Eggert and Bruno Haible. */ - -#ifndef _GL_STDALIGN_H -#define _GL_STDALIGN_H - -/* ISO C11 <stdalign.h> for platforms that lack it. - - References: - ISO C11 (latest free draft - <http://www.open-std.org/jtc1/sc22/wg14/www/docs/n1570.pdf>) - sections 6.5.3.4, 6.7.5, 7.15. - C++11 (latest free draft - <http://www.open-std.org/jtc1/sc22/wg21/docs/papers/2011/n3242.pdf>) - section 18.10. */ - -/* alignof (TYPE), also known as _Alignof (TYPE), yields the alignment - requirement of a structure member (i.e., slot or field) that is of - type TYPE, as an integer constant expression. - - This differs from GCC's and clang's __alignof__ operator, which can - yield a better-performing alignment for an object of that type. For - example, on x86 with GCC and on Linux/x86 with clang, - __alignof__ (double) and __alignof__ (long long) are 8, whereas - alignof (double) and alignof (long long) are 4 unless the option - '-malign-double' is used. - - The result cannot be used as a value for an 'enum' constant, if you - want to be portable to HP-UX 10.20 cc and AIX 3.2.5 xlc. - - Include <stddef.h> for offsetof. */ -#include <stddef.h> - -/* FreeBSD 9.1 <sys/cdefs.h>, included by <stddef.h> and lots of other - standard headers, defines conflicting implementations of _Alignas - and _Alignof that are no better than ours; override them. */ -#undef _Alignas -#undef _Alignof - -/* GCC releases before GCC 4.9 had a bug in _Alignof. See GCC bug 52023 - <https://gcc.gnu.org/bugzilla/show_bug.cgi?id=52023>. - clang versions < 8.0.0 have the same bug. */ -#if (!defined __STDC_VERSION__ || __STDC_VERSION__ < 201112 \ - || (defined __GNUC__ && __GNUC__ < 4 + (__GNUC_MINOR__ < 9) \ - && !defined __clang__) \ - || (defined __clang__ && __clang_major__ < 8)) -# ifdef __cplusplus -# if 201103 <= __cplusplus -# define _Alignof(type) alignof (type) -# else - template <class __t> struct __alignof_helper { char __a; __t __b; }; -# define _Alignof(type) offsetof (__alignof_helper<type>, __b) -# endif -# else -# define _Alignof(type) offsetof (struct { char __a; type __b; }, __b) -# endif -#endif -#if ! (defined __cplusplus && 201103 <= __cplusplus) -# define alignof _Alignof -#endif -#define __alignof_is_defined 1 - -/* alignas (A), also known as _Alignas (A), aligns a variable or type - to the alignment A, where A is an integer constant expression. For - example: - - int alignas (8) foo; - struct s { int a; int alignas (8) bar; }; - - aligns the address of FOO and the offset of BAR to be multiples of 8. - - A should be a power of two that is at least the type's alignment - and at most the implementation's alignment limit. This limit is - 2**28 on typical GNUish hosts, and 2**13 on MSVC. To be portable - to MSVC through at least version 10.0, A should be an integer - constant, as MSVC does not support expressions such as 1 << 3. - To be portable to Sun C 5.11, do not align auto variables to - anything stricter than their default alignment. - - The following C11 requirements are not supported here: - - - If A is zero, alignas has no effect. - - alignas can be used multiple times; the strictest one wins. - - alignas (TYPE) is equivalent to alignas (alignof (TYPE)). - - */ - -#if !defined __STDC_VERSION__ || __STDC_VERSION__ < 201112 -# if defined __cplusplus && 201103 <= __cplusplus -# define _Alignas(a) alignas (a) -# elif (!defined __attribute__ \ - && ((defined __APPLE__ && defined __MACH__ \ - ? 4 < __GNUC__ + (1 <= __GNUC_MINOR__) \ - : __GNUC__ && !defined __ibmxl__) \ - || (4 <= __clang_major__) \ - || (__ia64 && (61200 <= __HP_cc || 61200 <= __HP_aCC)) \ - || __ICC || 0x590 <= __SUNPRO_C || 0x0600 <= __xlC__)) -# define _Alignas(a) __attribute__ ((__aligned__ (a))) -# elif 1300 <= _MSC_VER -# define _Alignas(a) __declspec (align (a)) -# endif -#endif -#if ((defined _Alignas && ! (defined __cplusplus && 201103 <= __cplusplus)) \ - || (defined __STDC_VERSION__ && 201112 <= __STDC_VERSION__)) -# define alignas _Alignas -#endif -#if defined alignas || (defined __cplusplus && 201103 <= __cplusplus) -# define __alignas_is_defined 1 -#endif - -#endif /* _GL_STDALIGN_H */ diff --git a/lib/stdarg.in.h b/lib/stdarg.in.h index 95306bf..64baf87 100644 --- a/lib/stdarg.in.h +++ b/lib/stdarg.in.h @@ -1,5 +1,5 @@ /* Substitute for and wrapper around <stdarg.h>. - Copyright (C) 2008-2022 Free Software Foundation, Inc. + Copyright (C) 2008-2023 Free Software Foundation, Inc. This file is free software: you can redistribute it and/or modify it under the terms of the GNU Lesser General Public License as diff --git a/lib/stdbool.in.h b/lib/stdbool.in.h deleted file mode 100644 index 03840f1..0000000 --- a/lib/stdbool.in.h +++ /dev/null @@ -1,132 +0,0 @@ -/* Copyright (C) 2001-2003, 2006-2022 Free Software Foundation, Inc. - Written by Bruno Haible <haible@clisp.cons.org>, 2001. - - 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 <https://www.gnu.org/licenses/>. */ - -#ifndef _GL_STDBOOL_H -#define _GL_STDBOOL_H - -/* ISO C 99 <stdbool.h> for platforms that lack it. */ - -/* Usage suggestions: - - Programs that use <stdbool.h> should be aware of some limitations - and standards compliance issues. - - Standards compliance: - - - <stdbool.h> must be #included before 'bool', 'false', 'true' - can be used. - - - You cannot assume that sizeof (bool) == 1. - - - Programs should not undefine the macros bool, true, and false, - as C99 lists that as an "obsolescent feature". - - Limitations of this substitute, when used in a C89 environment: - - - <stdbool.h> must be #included before the '_Bool' type can be used. - - - You cannot assume that _Bool is a typedef; it might be a macro. - - - Bit-fields of type 'bool' are not supported. Portable code - should use 'unsigned int foo : 1;' rather than 'bool foo : 1;'. - - - In C99, casts and automatic conversions to '_Bool' or 'bool' are - performed in such a way that every nonzero value gets converted - to 'true', and zero gets converted to 'false'. This doesn't work - with this substitute. With this substitute, only the values 0 and 1 - give the expected result when converted to _Bool' or 'bool'. - - - C99 allows the use of (_Bool)0.0 in constant expressions, but - this substitute cannot always provide this property. - - Also, it is suggested that programs use 'bool' rather than '_Bool'; - this isn't required, but 'bool' is more common. */ - - -/* 7.16. Boolean type and values */ - -/* BeOS <sys/socket.h> already #defines false 0, true 1. We use the same - definitions below, but temporarily we have to #undef them. */ -#if defined __BEOS__ && !defined __HAIKU__ -# include <OS.h> /* defines bool but not _Bool */ -# undef false -# undef true -#endif - -#ifdef __cplusplus -# define _Bool bool -# define bool bool -#else -# if defined __BEOS__ && !defined __HAIKU__ - /* A compiler known to have 'bool'. */ - /* If the compiler already has both 'bool' and '_Bool', we can assume they - are the same types. */ -# if !@HAVE__BOOL@ -typedef bool _Bool; -# endif -# else -# if !defined __GNUC__ - /* If @HAVE__BOOL@: - Some HP-UX cc and AIX IBM C compiler versions have compiler bugs when - the built-in _Bool type is used. See - https://gcc.gnu.org/ml/gcc-patches/2003-12/msg02303.html - https://lists.gnu.org/r/bug-coreutils/2005-11/msg00161.html - https://lists.gnu.org/r/bug-coreutils/2005-10/msg00086.html - Similar bugs are likely with other compilers as well; this file - wouldn't be used if <stdbool.h> was working. - So we override the _Bool type. - If !@HAVE__BOOL@: - Need to define _Bool ourselves. As 'signed char' or as an enum type? - Use of a typedef, with SunPRO C, leads to a stupid - "warning: _Bool is a keyword in ISO C99". - Use of an enum type, with IRIX cc, leads to a stupid - "warning(1185): enumerated type mixed with another type". - Even the existence of an enum type, without a typedef, - "Invalid enumerator. (badenum)" with HP-UX cc on Tru64. - The only benefit of the enum, debuggability, is not important - with these compilers. So use 'signed char' and no enum. */ -# define _Bool signed char -# else - /* With this compiler, trust the _Bool type if the compiler has it. */ -# if !@HAVE__BOOL@ - /* For the sake of symbolic names in gdb, define true and false as - enum constants, not only as macros. - It is tempting to write - typedef enum { false = 0, true = 1 } _Bool; - so that gdb prints values of type 'bool' symbolically. But then - values of type '_Bool' might promote to 'int' or 'unsigned int' - (see ISO C 99 6.7.2.2.(4)); however, '_Bool' must promote to 'int' - (see ISO C 99 6.3.1.1.(2)). So add a negative value to the - enum; this ensures that '_Bool' promotes to 'int'. */ -typedef enum { _Bool_must_promote_to_int = -1, false = 0, true = 1 } _Bool; -# endif -# endif -# endif -# define bool _Bool -#endif - -/* The other macros must be usable in preprocessor directives. */ -#ifdef __cplusplus -# define false false -# define true true -#else -# define false 0 -# define true 1 -#endif - -#define __bool_true_false_are_defined 1 - -#endif /* _GL_STDBOOL_H */ diff --git a/lib/stdckdint.in.h b/lib/stdckdint.in.h new file mode 100644 index 0000000..71bab5f --- /dev/null +++ b/lib/stdckdint.in.h @@ -0,0 +1,35 @@ +/* stdckdint.h -- checked integer arithmetic + + Copyright 2022-2023 Free Software Foundation, Inc. + + 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 of the License, or + (at your option) any later version. + + This program is distributed in the hope that it will be useful, + but WITHOUT ANY WARRANTY; without even the implied warranty of + MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + GNU 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 <https://www.gnu.org/licenses/>. */ + +#ifndef _GL_STDCKDINT_H +#define _GL_STDCKDINT_H + +#include "intprops-internal.h" + +/* Store into *R the low-order bits of A + B, A - B, A * B, respectively. + Return 1 if the result overflows, 0 otherwise. + A, B, and *R can have any integer type other than char, bool, a + bit-precise integer type, or an enumeration type. + + These are like the standard macros introduced in C23, except that + arguments should not have side effects. */ + +#define ckd_add(r, a, b) ((bool) _GL_INT_ADD_WRAPV (a, b, r)) +#define ckd_sub(r, a, b) ((bool) _GL_INT_SUBTRACT_WRAPV (a, b, r)) +#define ckd_mul(r, a, b) ((bool) _GL_INT_MULTIPLY_WRAPV (a, b, r)) + +#endif /* _GL_STDCKDINT_H */ diff --git a/lib/stddef.in.h b/lib/stddef.in.h index 5c9a747..c7ce608 100644 --- a/lib/stddef.in.h +++ b/lib/stddef.in.h @@ -1,6 +1,6 @@ /* A substitute for POSIX 2008 <stddef.h>, for platforms that have issues. - Copyright (C) 2009-2022 Free Software Foundation, Inc. + Copyright (C) 2009-2023 Free Software Foundation, Inc. This file is free software: you can redistribute it and/or modify it under the terms of the GNU Lesser General Public License as @@ -18,7 +18,7 @@ /* Written by Eric Blake. */ /* - * POSIX 2008 <stddef.h> for platforms that have issues. + * POSIX 2008 and ISO C 23 <stddef.h> for platforms that have issues. * <https://pubs.opengroup.org/onlinepubs/9699919799/basedefs/stddef.h.html> */ @@ -69,6 +69,7 @@ typedef long rpl_max_align_t; typedef long max_align_t; # define _MAX_ALIGN_T # endif +# define __CLANG_MAX_ALIGN_T_DEFINED # define GNULIB_defined_max_align_t 1 # endif # endif @@ -137,11 +138,49 @@ typedef union long int __i _GL_STDDEF_ALIGNAS (long int); } rpl_max_align_t; # define max_align_t rpl_max_align_t +# define __CLANG_MAX_ALIGN_T_DEFINED # define GNULIB_defined_max_align_t 1 # endif # endif #endif +/* ISO C 23 § 7.21.1 The unreachable macro */ +#ifndef unreachable + +/* Code borrowed from verify.h. */ +# ifndef _GL_HAS_BUILTIN_UNREACHABLE +# if defined __clang_major__ && __clang_major__ < 5 +# define _GL_HAS_BUILTIN_UNREACHABLE 0 +# elif 4 < __GNUC__ + (5 <= __GNUC_MINOR__) +# define _GL_HAS_BUILTIN_UNREACHABLE 1 +# elif defined __has_builtin +# define _GL_HAS_BUILTIN_UNREACHABLE __has_builtin (__builtin_unreachable) +# else +# define _GL_HAS_BUILTIN_UNREACHABLE 0 +# endif +# endif + +# if _GL_HAS_BUILTIN_UNREACHABLE +# define unreachable() __builtin_unreachable () +# elif 1200 <= _MSC_VER +# define unreachable() __assume (0) +# else +/* Declare abort(), without including <stdlib.h>. */ +extern +# if defined __cplusplus +"C" +# endif +_Noreturn +void abort (void) +# if defined __cplusplus && (__GLIBC__ >= 2) +throw () +# endif +; +# define unreachable() abort () +# endif + +#endif + # endif /* _@GUARD_PREFIX@_STDDEF_H */ # endif /* _@GUARD_PREFIX@_STDDEF_H */ #endif /* __need_XXX */ diff --git a/lib/stdint.in.h b/lib/stdint.in.h index eaa7874..5ddc644 100644 --- a/lib/stdint.in.h +++ b/lib/stdint.in.h @@ -1,4 +1,4 @@ -/* Copyright (C) 2001-2002, 2004-2022 Free Software Foundation, Inc. +/* Copyright (C) 2001-2002, 2004-2023 Free Software Foundation, Inc. Written by Paul Eggert, Bruno Haible, Sam Steingold, Peter Burwood. This file is part of gnulib. diff --git a/lib/stdio-impl.h b/lib/stdio-impl.h index ed32e69..46608be 100644 --- a/lib/stdio-impl.h +++ b/lib/stdio-impl.h @@ -1,5 +1,5 @@ /* Implementation details of FILE streams. - Copyright (C) 2007-2008, 2010-2022 Free Software Foundation, Inc. + Copyright (C) 2007-2008, 2010-2023 Free Software Foundation, Inc. This file is free software: you can redistribute it and/or modify it under the terms of the GNU Lesser General Public License as @@ -71,6 +71,12 @@ # else # define _gl_flags_file_t short # endif +# ifdef __LP64__ +# define _gl_file_offset_t int64_t +# else + /* see https://android.googlesource.com/platform/bionic/+/master/docs/32-bit-abi.md */ +# define _gl_file_offset_t __kernel_off_t +# endif /* Up to this commit from 2015-10-12 <https://android.googlesource.com/platform/bionic.git/+/f0141dfab10a4b332769d52fa76631a64741297a> the innards of FILE were public, and fp_ub could be defined like for OpenBSD, @@ -96,7 +102,7 @@ unsigned char _nbuf[1]; \ struct { unsigned char *_base; size_t _size; } _lb; \ int _blksize; \ - fpos_t _offset; \ + _gl_file_offset_t _offset; \ /* More fields, not relevant here. */ \ } *) fp) # else diff --git a/lib/stdio-read.c b/lib/stdio-read.c index 85efa0d..6e2984c 100644 --- a/lib/stdio-read.c +++ b/lib/stdio-read.c @@ -1,5 +1,5 @@ /* POSIX compatible FILE stream read function. - Copyright (C) 2008-2022 Free Software Foundation, Inc. + Copyright (C) 2008-2023 Free Software Foundation, Inc. Written by Bruno Haible <bruno@clisp.org>, 2011. This file is free software: you can redistribute it and/or modify diff --git a/lib/stdio-write.c b/lib/stdio-write.c index 82facf5..9cf36cc 100644 --- a/lib/stdio-write.c +++ b/lib/stdio-write.c @@ -1,5 +1,5 @@ /* POSIX compatible FILE stream write function. - Copyright (C) 2008-2022 Free Software Foundation, Inc. + Copyright (C) 2008-2023 Free Software Foundation, Inc. Written by Bruno Haible <bruno@clisp.org>, 2008. This file is free software: you can redistribute it and/or modify diff --git a/lib/stdio.in.h b/lib/stdio.in.h index 7b36dac..098f841 100644 --- a/lib/stdio.in.h +++ b/lib/stdio.in.h @@ -1,6 +1,6 @@ /* A GNU-like <stdio.h>. - Copyright (C) 2004, 2007-2022 Free Software Foundation, Inc. + Copyright (C) 2004, 2007-2023 Free Software Foundation, Inc. This file is free software: you can redistribute it and/or modify it under the terms of the GNU Lesser General Public License as @@ -36,6 +36,12 @@ #ifndef _@GUARD_PREFIX@_STDIO_H +/* Suppress macOS deprecation warnings for sprintf and vsprintf. */ +#if (defined __APPLE__ && defined __MACH__) && !defined _POSIX_C_SOURCE +# define _POSIX_C_SOURCE 200809L +# define _GL_DEFINED__POSIX_C_SOURCE +#endif + #define _GL_ALREADY_INCLUDING_STDIO_H /* The include_next requires a split double-inclusion guard. */ @@ -43,6 +49,11 @@ #undef _GL_ALREADY_INCLUDING_STDIO_H +#ifdef _GL_DEFINED__POSIX_C_SOURCE +# undef _GL_DEFINED__POSIX_C_SOURCE +# undef _POSIX_C_SOURCE +#endif + #ifndef _@GUARD_PREFIX@_STDIO_H #define _@GUARD_PREFIX@_STDIO_H @@ -210,7 +221,9 @@ _GL_FUNCDECL_SYS (dprintf, int, (int fd, const char *restrict format, ...) # endif _GL_CXXALIAS_SYS (dprintf, int, (int fd, const char *restrict format, ...)); # endif +# if __GLIBC__ >= 2 _GL_CXXALIASWARN (dprintf); +# endif #elif defined GNULIB_POSIXCHECK # undef dprintf # if HAVE_RAW_DECL_DPRINTF @@ -882,7 +895,9 @@ _GL_CXXALIAS_SYS (getdelim, ssize_t, int delimiter, FILE *restrict stream)); # endif +# if __GLIBC__ >= 2 _GL_CXXALIASWARN (getdelim); +# endif #elif defined GNULIB_POSIXCHECK # undef getdelim # if HAVE_RAW_DECL_GETDELIM @@ -921,7 +936,7 @@ _GL_CXXALIAS_SYS (getline, ssize_t, (char **restrict lineptr, size_t *restrict linesize, FILE *restrict stream)); # endif -# if @HAVE_DECL_GETLINE@ +# if __GLIBC__ >= 2 && @HAVE_DECL_GETLINE@ _GL_CXXALIASWARN (getline); # endif #elif defined GNULIB_POSIXCHECK @@ -951,9 +966,13 @@ _GL_WARN_ON_USE (gets, "gets is a security hole - use fgets instead"); # endif _GL_CXXALIAS_MDA (getw, int, (FILE *restrict stream)); # else +# if @HAVE_DECL_GETW@ _GL_CXXALIAS_SYS (getw, int, (FILE *restrict stream)); +# endif # endif +# if __GLIBC__ >= 2 _GL_CXXALIASWARN (getw); +# endif #endif #if @GNULIB_OBSTACK_PRINTF@ || @GNULIB_OBSTACK_PRINTF_POSIX@ @@ -1190,9 +1209,13 @@ _GL_CXXALIASWARN (puts); # endif _GL_CXXALIAS_MDA (putw, int, (int w, FILE *restrict stream)); # else +# if @HAVE_DECL_PUTW@ _GL_CXXALIAS_SYS (putw, int, (int w, FILE *restrict stream)); +# endif # endif +# if __GLIBC__ >= 2 _GL_CXXALIASWARN (putw); +# endif #endif #if @GNULIB_REMOVE@ diff --git a/lib/stdlib.in.h b/lib/stdlib.in.h index d52c2f7..a91f4e2 100644 --- a/lib/stdlib.in.h +++ b/lib/stdlib.in.h @@ -1,6 +1,6 @@ /* A GNU-like <stdlib.h>. - Copyright (C) 1995, 2001-2004, 2006-2022 Free Software Foundation, Inc. + Copyright (C) 1995, 2001-2004, 2006-2023 Free Software Foundation, Inc. This file is free software: you can redistribute it and/or modify it under the terms of the GNU Lesser General Public License as @@ -164,11 +164,22 @@ struct random_data #if @GNULIB__EXIT@ /* Terminate the current process with the given return code, without running the 'atexit' handlers. */ -# if !@HAVE__EXIT@ +# if @REPLACE__EXIT@ +# if !(defined __cplusplus && defined GNULIB_NAMESPACE) +# undef _Exit +# define _Exit rpl__Exit +# endif +_GL_FUNCDECL_RPL (_Exit, _Noreturn void, (int status)); +_GL_CXXALIAS_RPL (_Exit, void, (int status)); +# else +# if !@HAVE__EXIT@ _GL_FUNCDECL_SYS (_Exit, _Noreturn void, (int status)); -# endif +# endif _GL_CXXALIAS_SYS (_Exit, void, (int status)); +# endif +# if __GLIBC__ >= 2 _GL_CXXALIASWARN (_Exit); +# endif #elif defined GNULIB_POSIXCHECK # undef _Exit # if HAVE_RAW_DECL__EXIT @@ -184,7 +195,11 @@ _GL_WARN_ON_USE (_Exit, "_Exit is unportable - " # undef free # define free rpl_free # endif +# if defined __cplusplus && (__GLIBC__ + (__GLIBC_MINOR__ >= 14) > 2) +_GL_FUNCDECL_RPL (free, void, (void *ptr) throw ()); +# else _GL_FUNCDECL_RPL (free, void, (void *ptr)); +# endif _GL_CXXALIAS_RPL (free, void, (void *ptr)); # else _GL_CXXALIAS_SYS (free, void, (void *ptr)); @@ -222,7 +237,7 @@ _GL_FUNCDECL_SYS (aligned_alloc, void *, _GL_CXXALIAS_SYS (aligned_alloc, void *, (size_t alignment, size_t size)); # endif # endif -# if @HAVE_ALIGNED_ALLOC@ +# if (__GLIBC__ >= 2) && @HAVE_ALIGNED_ALLOC@ _GL_CXXALIASWARN (aligned_alloc); # endif #else @@ -412,12 +427,24 @@ _GL_CXXALIASWARN (gcvt); The three numbers are the load average of the last 1 minute, the last 5 minutes, and the last 15 minutes, respectively. LOADAVG is an array of NELEM numbers. */ -# if !@HAVE_DECL_GETLOADAVG@ +# if @REPLACE_GETLOADAVG@ +# if !(defined __cplusplus && defined GNULIB_NAMESPACE) +# undef getloadavg +# define getloadavg rpl_getloadavg +# endif +_GL_FUNCDECL_RPL (getloadavg, int, (double loadavg[], int nelem) + _GL_ARG_NONNULL ((1))); +_GL_CXXALIAS_RPL (getloadavg, int, (double loadavg[], int nelem)); +# else +# if !@HAVE_DECL_GETLOADAVG@ _GL_FUNCDECL_SYS (getloadavg, int, (double loadavg[], int nelem) _GL_ARG_NONNULL ((1))); -# endif +# endif _GL_CXXALIAS_SYS (getloadavg, int, (double loadavg[], int nelem)); +# endif +# if __GLIBC__ >= 2 _GL_CXXALIASWARN (getloadavg); +# endif #elif defined GNULIB_POSIXCHECK # undef getloadavg # if HAVE_RAW_DECL_GETLOADAVG @@ -426,6 +453,41 @@ _GL_WARN_ON_USE (getloadavg, "getloadavg is not portable - " # endif #endif +#if @GNULIB_GETPROGNAME@ +/* Return the base name of the executing program. + On native Windows this will usually end in ".exe" or ".EXE". */ +# if @REPLACE_GETPROGNAME@ +# if !(defined __cplusplus && defined GNULIB_NAMESPACE) +# undef getprogname +# define getprogname rpl_getprogname +# endif +# ifdef HAVE_DECL_PROGRAM_INVOCATION_NAME +_GL_FUNCDECL_RPL (getprogname, const char *, (void) _GL_ATTRIBUTE_PURE); +# else +_GL_FUNCDECL_RPL (getprogname, const char *, (void)); +# endif +_GL_CXXALIAS_RPL (getprogname, const char *, (void)); +# else +# if !@HAVE_GETPROGNAME@ +# ifdef HAVE_DECL_PROGRAM_INVOCATION_NAME +_GL_FUNCDECL_SYS (getprogname, const char *, (void) _GL_ATTRIBUTE_PURE); +# else +_GL_FUNCDECL_SYS (getprogname, const char *, (void)); +# endif +# endif +_GL_CXXALIAS_SYS (getprogname, const char *, (void)); +# endif +# if __GLIBC__ >= 2 +_GL_CXXALIASWARN (getprogname); +# endif +#elif defined GNULIB_POSIXCHECK +# undef getprogname +# if HAVE_RAW_DECL_GETPROGNAME +_GL_WARN_ON_USE (getprogname, "getprogname is unportable - " + "use gnulib module getprogname for portability"); +# endif +#endif + #if @GNULIB_GETSUBOPT@ /* Assuming *OPTIONP is a comma separated list of elements of the form "token" or "token=value", getsubopt parses the first of these elements. @@ -438,14 +500,28 @@ _GL_WARN_ON_USE (getloadavg, "getloadavg is not portable - " Otherwise it returns -1, and *OPTIONP and *VALUEP are undefined. For more details see the POSIX specification. https://pubs.opengroup.org/onlinepubs/9699919799/functions/getsubopt.html */ -# if !@HAVE_GETSUBOPT@ +# if @REPLACE_GETSUBOPT@ +# if !(defined __cplusplus && defined GNULIB_NAMESPACE) +# undef getsubopt +# define getsubopt rpl_getsubopt +# endif +_GL_FUNCDECL_RPL (getsubopt, int, + (char **optionp, char *const *tokens, char **valuep) + _GL_ARG_NONNULL ((1, 2, 3))); +_GL_CXXALIAS_RPL (getsubopt, int, + (char **optionp, char *const *tokens, char **valuep)); +# else +# if !@HAVE_GETSUBOPT@ _GL_FUNCDECL_SYS (getsubopt, int, (char **optionp, char *const *tokens, char **valuep) _GL_ARG_NONNULL ((1, 2, 3))); -# endif +# endif _GL_CXXALIAS_SYS (getsubopt, int, (char **optionp, char *const *tokens, char **valuep)); +# endif +# if __GLIBC__ >= 2 _GL_CXXALIASWARN (getsubopt); +# endif #elif defined GNULIB_POSIXCHECK # undef getsubopt # if HAVE_RAW_DECL_GETSUBOPT @@ -575,12 +651,24 @@ _GL_WARN_ON_USE (mkdtemp, "mkdtemp is unportable - " implementation. Returns the open file descriptor if successful, otherwise -1 and errno set. */ -# if !@HAVE_MKOSTEMP@ +# if @REPLACE_MKOSTEMP@ +# if !(defined __cplusplus && defined GNULIB_NAMESPACE) +# undef mkostemp +# define mkostemp rpl_mkostemp +# endif +_GL_FUNCDECL_RPL (mkostemp, int, (char * /*template*/, int /*flags*/) + _GL_ARG_NONNULL ((1))); +_GL_CXXALIAS_RPL (mkostemp, int, (char * /*template*/, int /*flags*/)); +# else +# if !@HAVE_MKOSTEMP@ _GL_FUNCDECL_SYS (mkostemp, int, (char * /*template*/, int /*flags*/) _GL_ARG_NONNULL ((1))); -# endif +# endif _GL_CXXALIAS_SYS (mkostemp, int, (char * /*template*/, int /*flags*/)); +# endif +# if __GLIBC__ >= 2 _GL_CXXALIASWARN (mkostemp); +# endif #elif defined GNULIB_POSIXCHECK # undef mkostemp # if HAVE_RAW_DECL_MKOSTEMP @@ -603,14 +691,28 @@ _GL_WARN_ON_USE (mkostemp, "mkostemp is unportable - " implementation. Returns the open file descriptor if successful, otherwise -1 and errno set. */ -# if !@HAVE_MKOSTEMPS@ +# if @REPLACE_MKOSTEMPS@ +# if !(defined __cplusplus && defined GNULIB_NAMESPACE) +# undef mkostemps +# define mkostemps rpl_mkostemps +# endif +_GL_FUNCDECL_RPL (mkostemps, int, + (char * /*template*/, int /*suffixlen*/, int /*flags*/) + _GL_ARG_NONNULL ((1))); +_GL_CXXALIAS_RPL (mkostemps, int, + (char * /*template*/, int /*suffixlen*/, int /*flags*/)); +# else +# if !@HAVE_MKOSTEMPS@ _GL_FUNCDECL_SYS (mkostemps, int, (char * /*template*/, int /*suffixlen*/, int /*flags*/) _GL_ARG_NONNULL ((1))); -# endif +# endif _GL_CXXALIAS_SYS (mkostemps, int, (char * /*template*/, int /*suffixlen*/, int /*flags*/)); +# endif +# if __GLIBC__ >= 2 _GL_CXXALIASWARN (mkostemps); +# endif #elif defined GNULIB_POSIXCHECK # undef mkostemps # if HAVE_RAW_DECL_MKOSTEMPS @@ -709,7 +811,7 @@ _GL_CXXALIAS_SYS (posix_memalign, int, (void **memptr, size_t alignment, size_t size)); # endif # endif -# if @HAVE_POSIX_MEMALIGN@ +# if __GLIBC__ >= 2 && @HAVE_POSIX_MEMALIGN@ _GL_CXXALIASWARN (posix_memalign); # endif #elif defined GNULIB_POSIXCHECK @@ -723,11 +825,22 @@ _GL_WARN_ON_USE (posix_memalign, "posix_memalign is not portable - " #if @GNULIB_POSIX_OPENPT@ /* Return an FD open to the master side of a pseudo-terminal. Flags should include O_RDWR, and may also include O_NOCTTY. */ -# if !@HAVE_POSIX_OPENPT@ +# if @REPLACE_POSIX_OPENPT@ +# if !(defined __cplusplus && defined GNULIB_NAMESPACE) +# undef posix_openpt +# define posix_openpt rpl_posix_openpt +# endif +_GL_FUNCDECL_RPL (posix_openpt, int, (int flags)); +_GL_CXXALIAS_RPL (posix_openpt, int, (int flags)); +# else +# if !@HAVE_POSIX_OPENPT@ _GL_FUNCDECL_SYS (posix_openpt, int, (int flags)); -# endif +# endif _GL_CXXALIAS_SYS (posix_openpt, int, (int flags)); +# endif +# if __GLIBC__ >= 2 _GL_CXXALIASWARN (posix_openpt); +# endif #elif defined GNULIB_POSIXCHECK # undef posix_openpt # if HAVE_RAW_DECL_POSIX_OPENPT @@ -952,7 +1065,9 @@ _GL_FUNCDECL_SYS (initstate, char *, _GL_CXXALIAS_SYS_CAST (initstate, char *, (unsigned int seed, char *buf, size_t buf_size)); # endif +# if __GLIBC__ >= 2 _GL_CXXALIASWARN (initstate); +# endif #elif defined GNULIB_POSIXCHECK # undef initstate # if HAVE_RAW_DECL_INITSTATE @@ -977,7 +1092,9 @@ _GL_FUNCDECL_SYS (setstate, char *, (char *arg_state) _GL_ARG_NONNULL ((1))); is const char *arg_state. */ _GL_CXXALIAS_SYS_CAST (setstate, char *, (char *arg_state)); # endif +# if __GLIBC__ >= 2 _GL_CXXALIASWARN (setstate); +# endif #elif defined GNULIB_POSIXCHECK # undef setstate # if HAVE_RAW_DECL_SETSTATE @@ -1163,7 +1280,9 @@ _GL_FUNCDECL_SYS (reallocarray, void *, _GL_CXXALIAS_SYS (reallocarray, void *, (void *ptr, size_t nmemb, size_t size)); # endif +# if __GLIBC__ >= 2 _GL_CXXALIASWARN (reallocarray); +# endif #elif defined GNULIB_POSIXCHECK # undef reallocarray # if HAVE_RAW_DECL_REALLOCARRAY @@ -1359,7 +1478,9 @@ _GL_CXXALIAS_SYS (strtol, long, (const char *restrict string, char **restrict endptr, int base)); # endif +# if __GLIBC__ >= 2 _GL_CXXALIASWARN (strtol); +# endif #elif defined GNULIB_POSIXCHECK # undef strtol # if HAVE_RAW_DECL_STRTOL @@ -1440,7 +1561,9 @@ _GL_CXXALIAS_SYS (strtoul, unsigned long, (const char *restrict string, char **restrict endptr, int base)); # endif +# if __GLIBC__ >= 2 _GL_CXXALIASWARN (strtoul); +# endif #elif defined GNULIB_POSIXCHECK # undef strtoul # if HAVE_RAW_DECL_STRTOUL diff --git a/lib/strdup.c b/lib/strdup.c index 2a0df02..08c40d5 100644 --- a/lib/strdup.c +++ b/lib/strdup.c @@ -1,4 +1,4 @@ -/* Copyright (C) 1991, 1996-1998, 2002-2004, 2006-2007, 2009-2022 Free Software +/* Copyright (C) 1991, 1996-1998, 2002-2004, 2006-2007, 2009-2023 Free Software Foundation, Inc. This file is part of the GNU C Library. diff --git a/lib/streq.h b/lib/streq.h index 49f73c1..712948e 100644 --- a/lib/streq.h +++ b/lib/streq.h @@ -1,5 +1,5 @@ /* Optimized string comparison. - Copyright (C) 2001-2002, 2007, 2009-2022 Free Software Foundation, Inc. + Copyright (C) 2001-2002, 2007, 2009-2023 Free Software Foundation, Inc. This file is free software: you can redistribute it and/or modify it under the terms of the GNU Lesser General Public License as diff --git a/lib/strerror-override.c b/lib/strerror-override.c index 6be1afd..cddaa4a 100644 --- a/lib/strerror-override.c +++ b/lib/strerror-override.c @@ -1,6 +1,6 @@ /* strerror-override.c --- POSIX compatible system error routine - Copyright (C) 2010-2022 Free Software Foundation, Inc. + Copyright (C) 2010-2023 Free Software Foundation, Inc. This file is free software: you can redistribute it and/or modify it under the terms of the GNU Lesser General Public License as diff --git a/lib/strerror-override.h b/lib/strerror-override.h index d010d27..388cc28 100644 --- a/lib/strerror-override.h +++ b/lib/strerror-override.h @@ -1,6 +1,6 @@ /* strerror-override.h --- POSIX compatible system error routine - Copyright (C) 2010-2022 Free Software Foundation, Inc. + Copyright (C) 2010-2023 Free Software Foundation, Inc. This file is free software: you can redistribute it and/or modify it under the terms of the GNU Lesser General Public License as diff --git a/lib/strerror.c b/lib/strerror.c index 67c5216..d754f60 100644 --- a/lib/strerror.c +++ b/lib/strerror.c @@ -1,6 +1,6 @@ /* strerror.c --- POSIX compatible system error routine - Copyright (C) 2007-2022 Free Software Foundation, Inc. + Copyright (C) 2007-2023 Free Software Foundation, Inc. This file is free software: you can redistribute it and/or modify it under the terms of the GNU Lesser General Public License as @@ -27,7 +27,6 @@ #include "intprops.h" #include "strerror-override.h" -#include "verify.h" /* Use the system functions, not the gnulib overrides in this file. */ #undef sprintf @@ -55,7 +54,7 @@ strerror (int n) if (!msg || !*msg) { static char const fmt[] = "Unknown error %d"; - verify (sizeof buf >= sizeof (fmt) + INT_STRLEN_BOUND (n)); + static_assert (sizeof buf >= sizeof (fmt) + INT_STRLEN_BOUND (n)); sprintf (buf, fmt, n); errno = EINVAL; return buf; diff --git a/lib/string.in.h b/lib/string.in.h index b6840fa..b6bf432 100644 --- a/lib/string.in.h +++ b/lib/string.in.h @@ -1,6 +1,6 @@ /* A GNU-like <string.h>. - Copyright (C) 1995-1996, 2001-2022 Free Software Foundation, Inc. + Copyright (C) 1995-1996, 2001-2023 Free Software Foundation, Inc. This file is free software: you can redistribute it and/or modify it under the terms of the GNU Lesser General Public License as @@ -59,10 +59,11 @@ # include <unistd.h> #endif -/* AIX 7.2 declares ffsl and ffsll in <strings.h>, not in <string.h>. */ +/* AIX 7.2 and Android 13 declare ffsl and ffsll in <strings.h>, not in + <string.h>. */ /* But in any case avoid namespace pollution on glibc systems. */ #if ((@GNULIB_FFSL@ || @GNULIB_FFSLL@ || defined GNULIB_POSIXCHECK) \ - && defined _AIX) \ + && (defined _AIX || defined __ANDROID__)) \ && ! defined __GLIBC__ # include <strings.h> #endif @@ -82,7 +83,14 @@ can be freed via 'free'; it can be used only after declaring 'free'. */ /* Applies to: functions. Cannot be used on inline functions. */ #ifndef _GL_ATTRIBUTE_DEALLOC_FREE -# define _GL_ATTRIBUTE_DEALLOC_FREE _GL_ATTRIBUTE_DEALLOC (free, 1) +# if defined __cplusplus && defined __GNUC__ && !defined __clang__ +/* Work around GCC bug <https://gcc.gnu.org/bugzilla/show_bug.cgi?id=108231> */ +# define _GL_ATTRIBUTE_DEALLOC_FREE \ + _GL_ATTRIBUTE_DEALLOC ((void (*) (void *)) free, 1) +# else +# define _GL_ATTRIBUTE_DEALLOC_FREE \ + _GL_ATTRIBUTE_DEALLOC (free, 1) +# endif #endif /* _GL_ATTRIBUTE_MALLOC declares that the function returns a pointer to freshly @@ -118,12 +126,20 @@ # if (@REPLACE_FREE@ && !defined free \ && !(defined __cplusplus && defined GNULIB_NAMESPACE)) /* We can't do '#define free rpl_free' here. */ +# if defined __cplusplus && (__GLIBC__ + (__GLIBC_MINOR__ >= 14) > 2) +_GL_EXTERN_C void rpl_free (void *) throw (); +# else _GL_EXTERN_C void rpl_free (void *); +# endif # undef _GL_ATTRIBUTE_DEALLOC_FREE # define _GL_ATTRIBUTE_DEALLOC_FREE _GL_ATTRIBUTE_DEALLOC (rpl_free, 1) # else -# if defined _MSC_VER -_GL_EXTERN_C void __cdecl free (void *); +# if defined _MSC_VER && !defined free +_GL_EXTERN_C +# if defined _DLL + __declspec (dllimport) +# endif + void __cdecl free (void *); # else # if defined __cplusplus && (__GLIBC__ + (__GLIBC_MINOR__ >= 14) > 2) _GL_EXTERN_C void free (void *) throw (); @@ -133,8 +149,12 @@ _GL_EXTERN_C void free (void *); # endif # endif #else -# if defined _MSC_VER -_GL_EXTERN_C void __cdecl free (void *); +# if defined _MSC_VER && !defined free +_GL_EXTERN_C +# if defined _DLL + __declspec (dllimport) +# endif + void __cdecl free (void *); # else # if defined __cplusplus && (__GLIBC__ + (__GLIBC_MINOR__ >= 14) > 2) _GL_EXTERN_C void free (void *) throw (); @@ -292,16 +312,32 @@ _GL_WARN_ON_USE (memmem, "memmem is unportable and often quadratic - " /* Copy N bytes of SRC to DEST, return pointer to bytes after the last written byte. */ #if @GNULIB_MEMPCPY@ -# if ! @HAVE_MEMPCPY@ +# if @REPLACE_MEMPCPY@ +# if !(defined __cplusplus && defined GNULIB_NAMESPACE) +# undef mempcpy +# define mempcpy rpl_mempcpy +# endif +_GL_FUNCDECL_RPL (mempcpy, void *, + (void *restrict __dest, void const *restrict __src, + size_t __n) + _GL_ARG_NONNULL ((1, 2))); +_GL_CXXALIAS_RPL (mempcpy, void *, + (void *restrict __dest, void const *restrict __src, + size_t __n)); +# else +# if !@HAVE_MEMPCPY@ _GL_FUNCDECL_SYS (mempcpy, void *, (void *restrict __dest, void const *restrict __src, size_t __n) _GL_ARG_NONNULL ((1, 2))); -# endif +# endif _GL_CXXALIAS_SYS (mempcpy, void *, (void *restrict __dest, void const *restrict __src, size_t __n)); +# endif +# if __GLIBC__ >= 2 _GL_CXXALIASWARN (mempcpy); +# endif #elif defined GNULIB_POSIXCHECK # undef mempcpy # if HAVE_RAW_DECL_MEMPCPY @@ -328,7 +364,7 @@ _GL_CXXALIAS_SYS_CAST2 (memrchr, || defined __clang__) _GL_CXXALIASWARN1 (memrchr, void *, (void *, int, size_t) throw ()); _GL_CXXALIASWARN1 (memrchr, void const *, (void const *, int, size_t) throw ()); -# else +# elif __GLIBC__ >= 2 _GL_CXXALIASWARN (memrchr); # endif #elif defined GNULIB_POSIXCHECK @@ -339,6 +375,23 @@ _GL_WARN_ON_USE (memrchr, "memrchr is unportable - " # endif #endif +/* Overwrite a block of memory. The compiler will not optimize + effects away, even if the block is dead after the call. */ +#if @GNULIB_MEMSET_EXPLICIT@ +# if ! @HAVE_MEMSET_EXPLICIT@ +_GL_FUNCDECL_SYS (memset_explicit, void *, + (void *__dest, int __c, size_t __n) _GL_ARG_NONNULL ((1))); +# endif +_GL_CXXALIAS_SYS (memset_explicit, void *, (void *__dest, int __c, size_t __n)); +_GL_CXXALIASWARN (memset_explicit); +#elif defined GNULIB_POSIXCHECK +# undef memset_explicit +# if HAVE_RAW_DECL_MEMSET_EXPLICIT +_GL_WARN_ON_USE (memset_explicit, "memset_explicit is unportable - " + "use gnulib module memset_explicit for portability"); +# endif +#endif + /* Find the first occurrence of C in S. More efficient than memchr(S,C,N), at the expense of undefined behavior if C does not occur within N bytes. */ @@ -373,14 +426,28 @@ _GL_WARN_ON_USE (rawmemchr, "rawmemchr is unportable - " /* Copy SRC to DST, returning the address of the terminating '\0' in DST. */ #if @GNULIB_STPCPY@ -# if ! @HAVE_STPCPY@ +# if @REPLACE_STPCPY@ +# if !(defined __cplusplus && defined GNULIB_NAMESPACE) +# undef stpcpy +# define stpcpy rpl_stpcpy +# endif +_GL_FUNCDECL_RPL (stpcpy, char *, + (char *restrict __dst, char const *restrict __src) + _GL_ARG_NONNULL ((1, 2))); +_GL_CXXALIAS_RPL (stpcpy, char *, + (char *restrict __dst, char const *restrict __src)); +# else +# if !@HAVE_STPCPY@ _GL_FUNCDECL_SYS (stpcpy, char *, (char *restrict __dst, char const *restrict __src) _GL_ARG_NONNULL ((1, 2))); -# endif +# endif _GL_CXXALIAS_SYS (stpcpy, char *, (char *restrict __dst, char const *restrict __src)); +# endif +# if __GLIBC__ >= 2 _GL_CXXALIASWARN (stpcpy); +# endif #elif defined GNULIB_POSIXCHECK # undef stpcpy # if HAVE_RAW_DECL_STPCPY @@ -415,7 +482,9 @@ _GL_CXXALIAS_SYS (stpncpy, char *, (char *restrict __dst, char const *restrict __src, size_t __n)); # endif +# if __GLIBC__ >= 2 _GL_CXXALIASWARN (stpncpy); +# endif #elif defined GNULIB_POSIXCHECK # undef stpncpy # if HAVE_RAW_DECL_STPNCPY @@ -466,7 +535,7 @@ _GL_CXXALIAS_SYS_CAST2 (strchrnul, _GL_CXXALIASWARN1 (strchrnul, char *, (char *__s, int __c_in) throw ()); _GL_CXXALIASWARN1 (strchrnul, char const *, (char const *__s, int __c_in) throw ()); -# else +# elif __GLIBC__ >= 2 _GL_CXXALIASWARN (strchrnul); # endif #elif defined GNULIB_POSIXCHECK @@ -583,7 +652,7 @@ _GL_FUNCDECL_RPL (strndup, char *, _GL_ATTRIBUTE_MALLOC _GL_ATTRIBUTE_DEALLOC_FREE); _GL_CXXALIAS_RPL (strndup, char *, (char const *__s, size_t __n)); # else -# if !@HAVE_DECL_STRNDUP@ || __GNUC__ >= 11 +# if !@HAVE_DECL_STRNDUP@ || (__GNUC__ >= 11 && !defined strndup) _GL_FUNCDECL_SYS (strndup, char *, (char const *__s, size_t __n) _GL_ARG_NONNULL ((1)) @@ -593,7 +662,7 @@ _GL_CXXALIAS_SYS (strndup, char *, (char const *__s, size_t __n)); # endif _GL_CXXALIASWARN (strndup); #else -# if __GNUC__ >= 11 +# if __GNUC__ >= 11 && !defined strndup /* For -Wmismatched-dealloc: Associate strndup with free or rpl_free. */ _GL_FUNCDECL_SYS (strndup, char *, (char const *__s, size_t __n) @@ -831,7 +900,7 @@ _GL_CXXALIASWARN1 (strcasestr, char *, (char *haystack, const char *needle) throw ()); _GL_CXXALIASWARN1 (strcasestr, const char *, (const char *haystack, const char *needle) throw ()); -# else +# elif __GLIBC__ >= 2 _GL_CXXALIASWARN (strcasestr); # endif #elif defined GNULIB_POSIXCHECK @@ -935,7 +1004,9 @@ _GL_FUNCDECL_SYS (mbslen, size_t, (const char *string) _GL_ARG_NONNULL ((1))); _GL_CXXALIAS_SYS (mbslen, size_t, (const char *string)); # endif +# if __GLIBC__ >= 2 _GL_CXXALIASWARN (mbslen); +# endif #endif #if @GNULIB_MBSNLEN@ @@ -1177,7 +1248,7 @@ _GL_FUNCDECL_SYS (strerror_r, int, (int errnum, char *buf, size_t buflen) # endif _GL_CXXALIAS_SYS (strerror_r, int, (int errnum, char *buf, size_t buflen)); # endif -# if @HAVE_DECL_STRERROR_R@ +# if __GLIBC__ >= 2 && @HAVE_DECL_STRERROR_R@ _GL_CXXALIASWARN (strerror_r); # endif #elif defined GNULIB_POSIXCHECK diff --git a/lib/stripslash.c b/lib/stripslash.c index aee89b7..fe46a9c 100644 --- a/lib/stripslash.c +++ b/lib/stripslash.c @@ -1,6 +1,6 @@ /* stripslash.c -- remove redundant trailing slashes from a file name - Copyright (C) 1990, 2001, 2003-2006, 2009-2022 Free Software Foundation, + Copyright (C) 1990, 2001, 2003-2006, 2009-2023 Free Software Foundation, Inc. This file is free software: you can redistribute it and/or modify diff --git a/lib/strtol.c b/lib/strtol.c index 6c2e933..b93483d 100644 --- a/lib/strtol.c +++ b/lib/strtol.c @@ -1,6 +1,6 @@ /* Convert string representation of a number into an integer value. - Copyright (C) 1991-1992, 1994-1999, 2003, 2005-2007, 2009-2022 Free Software + Copyright (C) 1991-1992, 1994-1999, 2003, 2005-2007, 2009-2023 Free Software Foundation, Inc. NOTE: The canonical source of this file is maintained with the GNU C @@ -288,6 +288,11 @@ INTERNAL (strtol) (const STRING_TYPE *nptr, STRING_TYPE **endptr, s += 2; base = 16; } + else if ((base == 0 || base == 2) && TOUPPER (s[1]) == L_('B')) + { + s += 2; + base = 2; + } else if (base == 0) base = 8; } @@ -378,11 +383,14 @@ INTERNAL (strtol) (const STRING_TYPE *nptr, STRING_TYPE **endptr, noconv: /* We must handle a special case here: the base is 0 or 16 and the first two characters are '0' and 'x', but the rest are no - hexadecimal digits. This is no error case. We return 0 and - ENDPTR points to the 'x'. */ + hexadecimal digits. Likewise when the base is 0 or 2 and the + first two characters are '0' and 'b', but the rest are no binary + digits. This is no error case. We return 0 and ENDPTR points to + the 'x' or 'b'. */ if (endptr != NULL) { - if (save - nptr >= 2 && TOUPPER (save[-1]) == L_('X') + if (save - nptr >= 2 + && (TOUPPER (save[-1]) == L_('X') || TOUPPER (save[-1]) == L_('B')) && save[-2] == L_('0')) *endptr = (STRING_TYPE *) &save[-1]; else diff --git a/lib/strtoll.c b/lib/strtoll.c index acea42e..9fdfa19 100644 --- a/lib/strtoll.c +++ b/lib/strtoll.c @@ -1,5 +1,5 @@ /* Function to parse a 'long long int' from text. - Copyright (C) 1995-1997, 1999, 2001, 2009-2022 Free Software Foundation, + Copyright (C) 1995-1997, 1999, 2001, 2009-2023 Free Software Foundation, Inc. This file is part of the GNU C Library. diff --git a/lib/strtoul.c b/lib/strtoul.c index 7408b54..2a360c7 100644 --- a/lib/strtoul.c +++ b/lib/strtoul.c @@ -1,4 +1,4 @@ -/* Copyright (C) 1991, 1997, 2009-2022 Free Software Foundation, Inc. +/* Copyright (C) 1991, 1997, 2009-2023 Free Software Foundation, Inc. This file is part of the GNU C Library. This file is free software: you can redistribute it and/or modify diff --git a/lib/strtoull.c b/lib/strtoull.c index 84657b9..f05d34f 100644 --- a/lib/strtoull.c +++ b/lib/strtoull.c @@ -1,5 +1,5 @@ /* Function to parse an 'unsigned long long int' from text. - Copyright (C) 1995-1997, 1999, 2009-2022 Free Software Foundation, Inc. + Copyright (C) 1995-1997, 1999, 2009-2023 Free Software Foundation, Inc. NOTE: The canonical source of this file is maintained with the GNU C Library. Bugs can be reported to bug-glibc@gnu.org. diff --git a/lib/sys-limits.h b/lib/sys-limits.h index d154f0b..0e9556d 100644 --- a/lib/sys-limits.h +++ b/lib/sys-limits.h @@ -1,6 +1,6 @@ /* System call limits - Copyright 2018-2022 Free Software Foundation, Inc. + Copyright 2018-2023 Free Software Foundation, Inc. This file is free software: you can redistribute it and/or modify it under the terms of the GNU Lesser General Public License as diff --git a/lib/sys_random.in.h b/lib/sys_random.in.h index e730e61..8dca132 100644 --- a/lib/sys_random.in.h +++ b/lib/sys_random.in.h @@ -1,5 +1,5 @@ /* Substitute for <sys/random.h>. - Copyright (C) 2020-2022 Free Software Foundation, Inc. + Copyright (C) 2020-2023 Free Software Foundation, Inc. This file is free software: you can redistribute it and/or modify it under the terms of the GNU Lesser General Public License as @@ -84,7 +84,9 @@ _GL_FUNCDECL_SYS (getrandom, ssize_t, _GL_CXXALIAS_SYS (getrandom, ssize_t, (void *buffer, size_t length, unsigned int flags)); # endif +# if __GLIBC__ + (__GLIBC_MINOR__ >= 25) > 2 _GL_CXXALIASWARN (getrandom); +# endif #elif defined GNULIB_POSIXCHECK # undef getrandom # if HAVE_RAW_DECL_GETRANDOM diff --git a/lib/sys_stat.in.h b/lib/sys_stat.in.h index 28ddd42..0c2f39c 100644 --- a/lib/sys_stat.in.h +++ b/lib/sys_stat.in.h @@ -1,5 +1,5 @@ /* Provide a more complete sys/stat.h header file. - Copyright (C) 2005-2022 Free Software Foundation, Inc. + Copyright (C) 2005-2023 Free Software Foundation, Inc. This file is free software: you can redistribute it and/or modify it under the terms of the GNU Lesser General Public License as @@ -391,7 +391,33 @@ struct stat #endif -#if @GNULIB_MDA_CHMOD@ +#if @GNULIB_CHMOD@ +# if @REPLACE_CHMOD@ +# if !(defined __cplusplus && defined GNULIB_NAMESPACE) +# undef chmod +# define chmod rpl_chmod +# endif +_GL_FUNCDECL_RPL (chmod, int, (const char *filename, mode_t mode) + _GL_ARG_NONNULL ((1))); +_GL_CXXALIAS_RPL (chmod, int, (const char *filename, mode_t mode)); +# elif defined _WIN32 && !defined __CYGWIN__ +# if !(defined __cplusplus && defined GNULIB_NAMESPACE) +# undef chmod +# define chmod _chmod +# endif +/* Need to cast, because in mingw the last argument is 'int mode'. */ +_GL_CXXALIAS_MDA_CAST (chmod, int, (const char *filename, mode_t mode)); +# else +_GL_CXXALIAS_SYS (chmod, int, (const char *filename, mode_t mode)); +# endif +_GL_CXXALIASWARN (chmod); +#elif defined GNULIB_POSIXCHECK +# undef chmod +# if HAVE_RAW_DECL_CHMOD +_GL_WARN_ON_USE (chmod, "chmod has portability problems - " + "use gnulib module chmod for portability"); +# endif +#elif @GNULIB_MDA_CHMOD@ /* On native Windows, map 'chmod' to '_chmod', so that -loldnames is not required. In C++ with GNULIB_NAMESPACE, avoid differences between platforms by defining GNULIB_NAMESPACE::chmod always. */ @@ -523,7 +549,7 @@ _GL_FUNCDECL_SYS (futimens, int, (int fd, struct timespec const times[2])); # endif _GL_CXXALIAS_SYS (futimens, int, (int fd, struct timespec const times[2])); # endif -# if @HAVE_FUTIMENS@ +# if __GLIBC__ >= 2 && @HAVE_FUTIMENS@ _GL_CXXALIASWARN (futimens); # endif #elif defined GNULIB_POSIXCHECK @@ -570,44 +596,6 @@ _GL_WARN_ON_USE (lchmod, "lchmod is unportable - " #endif -#if @GNULIB_LSTAT@ -# if ! @HAVE_LSTAT@ -/* mingw does not support symlinks, therefore it does not have lstat. But - without links, stat does just fine. */ -# if !(defined __cplusplus && defined GNULIB_NAMESPACE) -# define lstat stat -# endif -_GL_CXXALIAS_RPL_1 (lstat, stat, int, - (const char *restrict name, struct stat *restrict buf)); -# elif @REPLACE_LSTAT@ -# if !(defined __cplusplus && defined GNULIB_NAMESPACE) -# undef lstat -# define lstat rpl_lstat -# endif -_GL_FUNCDECL_RPL (lstat, int, - (const char *restrict name, struct stat *restrict buf) - _GL_ARG_NONNULL ((1, 2))); -_GL_CXXALIAS_RPL (lstat, int, - (const char *restrict name, struct stat *restrict buf)); -# else -_GL_CXXALIAS_SYS (lstat, int, - (const char *restrict name, struct stat *restrict buf)); -# endif -# if @HAVE_LSTAT@ -_GL_CXXALIASWARN (lstat); -# endif -#elif @GNULIB_OVERRIDES_STRUCT_STAT@ -# undef lstat -# define lstat lstat_used_without_requesting_gnulib_module_lstat -#elif defined GNULIB_POSIXCHECK -# undef lstat -# if HAVE_RAW_DECL_LSTAT -_GL_WARN_ON_USE (lstat, "lstat is unportable - " - "use gnulib module lstat for portability"); -# endif -#endif - - #if @GNULIB_MKDIR@ # if @REPLACE_MKDIR@ # if !(defined __cplusplus && defined GNULIB_NAMESPACE) @@ -728,7 +716,9 @@ _GL_FUNCDECL_SYS (mkfifoat, int, (int fd, char const *file, mode_t mode) # endif _GL_CXXALIAS_SYS (mkfifoat, int, (int fd, char const *file, mode_t mode)); # endif +# if __GLIBC__ >= 2 _GL_CXXALIASWARN (mkfifoat); +# endif #elif defined GNULIB_POSIXCHECK # undef mkfifoat # if HAVE_RAW_DECL_MKFIFOAT @@ -785,7 +775,9 @@ _GL_FUNCDECL_SYS (mknodat, int, _GL_CXXALIAS_SYS (mknodat, int, (int fd, char const *file, mode_t mode, dev_t dev)); # endif +# if __GLIBC__ >= 2 _GL_CXXALIASWARN (mknodat); +# endif #elif defined GNULIB_POSIXCHECK # undef mknodat # if HAVE_RAW_DECL_MKNODAT @@ -869,6 +861,44 @@ _GL_WARN_ON_USE (stat, "stat is unportable - " #endif +#if @GNULIB_LSTAT@ +# if ! @HAVE_LSTAT@ +/* mingw does not support symlinks, therefore it does not have lstat. But + without links, stat does just fine. */ +# if !(defined __cplusplus && defined GNULIB_NAMESPACE) +# define lstat stat +# endif +_GL_CXXALIAS_RPL_1 (lstat, stat, int, + (const char *restrict name, struct stat *restrict buf)); +# elif @REPLACE_LSTAT@ +# if !(defined __cplusplus && defined GNULIB_NAMESPACE) +# undef lstat +# define lstat rpl_lstat +# endif +_GL_FUNCDECL_RPL (lstat, int, + (const char *restrict name, struct stat *restrict buf) + _GL_ARG_NONNULL ((1, 2))); +_GL_CXXALIAS_RPL (lstat, int, + (const char *restrict name, struct stat *restrict buf)); +# else +_GL_CXXALIAS_SYS (lstat, int, + (const char *restrict name, struct stat *restrict buf)); +# endif +# if @HAVE_LSTAT@ +_GL_CXXALIASWARN (lstat); +# endif +#elif @GNULIB_OVERRIDES_STRUCT_STAT@ +# undef lstat +# define lstat lstat_used_without_requesting_gnulib_module_lstat +#elif defined GNULIB_POSIXCHECK +# undef lstat +# if HAVE_RAW_DECL_LSTAT +_GL_WARN_ON_USE (lstat, "lstat is unportable - " + "use gnulib module lstat for portability"); +# endif +#endif + + #if @GNULIB_MDA_UMASK@ /* On native Windows, map 'umask' to '_umask', so that -loldnames is not required. In C++ with GNULIB_NAMESPACE, avoid differences between @@ -911,7 +941,7 @@ _GL_FUNCDECL_SYS (utimensat, int, (int fd, char const *name, _GL_CXXALIAS_SYS (utimensat, int, (int fd, char const *name, struct timespec const times[2], int flag)); # endif -# if @HAVE_UTIMENSAT@ +# if __GLIBC__ >= 2 && @HAVE_UTIMENSAT@ _GL_CXXALIASWARN (utimensat); # endif #elif defined GNULIB_POSIXCHECK diff --git a/lib/sys_types.in.h b/lib/sys_types.in.h index 698e88d..082a6c6 100644 --- a/lib/sys_types.in.h +++ b/lib/sys_types.in.h @@ -1,6 +1,6 @@ /* Provide a more complete sys/types.h. - Copyright (C) 2011-2022 Free Software Foundation, Inc. + Copyright (C) 2011-2023 Free Software Foundation, Inc. This file is free software: you can redistribute it and/or modify it under the terms of the GNU Lesser General Public License as diff --git a/lib/tempname.c b/lib/tempname.c index 5fc5efe..bf362db 100644 --- a/lib/tempname.c +++ b/lib/tempname.c @@ -1,4 +1,4 @@ -/* Copyright (C) 1991-2022 Free Software Foundation, Inc. +/* Copyright (C) 1991-2023 Free Software Foundation, Inc. This file is part of the GNU C Library. The GNU C Library is free software; you can redistribute it and/or @@ -20,16 +20,9 @@ # include "tempname.h" #endif -#include <sys/types.h> -#include <assert.h> -#include <stdbool.h> - #include <errno.h> #include <stdio.h> -#ifndef P_tmpdir -# define P_tmpdir "/tmp" -#endif #ifndef TMP_MAX # define TMP_MAX 238328 #endif @@ -43,27 +36,23 @@ # error report this to bug-gnulib@gnu.org #endif -#include <stddef.h> #include <stdlib.h> #include <string.h> #include <fcntl.h> -#include <stdalign.h> #include <stdint.h> #include <sys/random.h> #include <sys/stat.h> #include <time.h> #if _LIBC -# define struct_stat64 struct stat64 -# define __secure_getenv __libc_secure_getenv +# define struct_stat64 struct __stat64_t64 #else # define struct_stat64 struct stat # define __gen_tempname gen_tempname # define __mkdir mkdir # define __open open -# define __lstat64(file, buf) lstat (file, buf) -# define __stat64(file, buf) stat (file, buf) +# define __lstat64_time64(file, buf) lstat (file, buf) # define __getrandom getrandom # define __clock_gettime64 clock_gettime # define __timespec64 timespec @@ -77,94 +66,56 @@ typedef uint_fast64_t random_value; #define BASE_62_DIGITS 10 /* 62**10 < UINT_FAST64_MAX */ #define BASE_62_POWER (62LL * 62 * 62 * 62 * 62 * 62 * 62 * 62 * 62 * 62) +/* Return the result of mixing the entropy from R and S. + Assume that R and S are not particularly random, + and that the result should look randomish to an untrained eye. */ + static random_value -random_bits (random_value var, bool use_getrandom) +mix_random_values (random_value r, random_value s) { - random_value r; - /* Without GRND_NONBLOCK it can be blocked for minutes on some systems. */ - if (use_getrandom && __getrandom (&r, sizeof r, GRND_NONBLOCK) == sizeof r) - return r; -#if _LIBC || (defined CLOCK_MONOTONIC && HAVE_CLOCK_GETTIME) - /* Add entropy if getrandom did not work. */ - struct __timespec64 tv; - __clock_gettime64 (CLOCK_MONOTONIC, &tv); - var ^= tv.tv_nsec; -#endif - return 2862933555777941757 * var + 3037000493; + /* As this code is used only when high-quality randomness is neither + available nor necessary, there is no need for fancier polynomials + such as those in the Linux kernel's 'random' driver. */ + return (2862933555777941757 * r + 3037000493) ^ s; } -#if _LIBC -/* Return nonzero if DIR is an existent directory. */ -static int -direxists (const char *dir) -{ - struct_stat64 buf; - return __stat64 (dir, &buf) == 0 && S_ISDIR (buf.st_mode); -} +/* Set *R to a random value. + Return true if *R is set to high-quality value taken from getrandom. + Otherwise return false, falling back to a low-quality *R that might + depend on S. -/* Path search algorithm, for tmpnam, tmpfile, etc. If DIR is - non-null and exists, uses it; otherwise uses the first of $TMPDIR, - P_tmpdir, /tmp that exists. Copies into TMPL a template suitable - for use with mk[s]temp. Will fail (-1) if DIR is non-null and - doesn't exist, none of the searched dirs exists, or there's not - enough space in TMPL. */ -int -__path_search (char *tmpl, size_t tmpl_len, const char *dir, const char *pfx, - int try_tmpdir) + This function returns false only when getrandom fails. + On GNU systems this should happen only early in the boot process, + when the fallback should be good enough for programs using tempname + because any attacker likely has root privileges already. */ + +static bool +random_bits (random_value *r, random_value s) { - const char *d; - size_t dlen, plen; + /* Without GRND_NONBLOCK it can be blocked for minutes on some systems. */ + if (__getrandom (r, sizeof *r, GRND_NONBLOCK) == sizeof *r) + return true; - if (!pfx || !pfx[0]) - { - pfx = "file"; - plen = 4; - } - else - { - plen = strlen (pfx); - if (plen > 5) - plen = 5; - } + /* If getrandom did not work, use ersatz entropy based on low-order + clock bits. On GNU systems getrandom should fail only + early in booting, when ersatz should be good enough. + Do not use ASLR-based entropy, as that would leak ASLR info into + the resulting file name which is typically public. - if (try_tmpdir) - { - d = __secure_getenv ("TMPDIR"); - if (d != NULL && direxists (d)) - dir = d; - else if (dir != NULL && direxists (dir)) - /* nothing */ ; - else - dir = NULL; - } - if (dir == NULL) - { - if (direxists (P_tmpdir)) - dir = P_tmpdir; - else if (strcmp (P_tmpdir, "/tmp") != 0 && direxists ("/tmp")) - dir = "/tmp"; - else - { - __set_errno (ENOENT); - return -1; - } - } + Of course we are in a state of sin here. */ - dlen = strlen (dir); - while (dlen > 1 && dir[dlen - 1] == '/') - dlen--; /* remove trailing slashes */ + random_value v = s; - /* check we have room for "${dir}/${pfx}XXXXXX\0" */ - if (tmpl_len < dlen + 1 + plen + 6 + 1) - { - __set_errno (EINVAL); - return -1; - } +#if _LIBC || (defined CLOCK_REALTIME && HAVE_CLOCK_GETTIME) + struct __timespec64 tv; + __clock_gettime64 (CLOCK_REALTIME, &tv); + v = mix_random_values (v, tv.tv_sec); + v = mix_random_values (v, tv.tv_nsec); +#endif - sprintf (tmpl, "%.*s/%.*sXXXXXX", (int) dlen, dir, (int) plen, pfx); - return 0; + *r = mix_random_values (v, clock ()); + return false; } -#endif /* _LIBC */ #if _LIBC static int try_tempname_len (char *, int, void *, int (*) (char *, void *), @@ -191,7 +142,7 @@ try_nocreate (char *tmpl, _GL_UNUSED void *flags) { struct_stat64 st; - if (__lstat64 (tmpl, &st) == 0 || errno == EOVERFLOW) + if (__lstat64_time64 (tmpl, &st) == 0 || errno == EOVERFLOW) __set_errno (EEXIST); return errno == ENOENT ? 0 : -1; } @@ -213,7 +164,7 @@ static const char letters[] = and return a read-write fd. The file is mode 0600. __GT_DIR: create a directory, which will be mode 0700. - We use a clever algorithm to get hard-to-predict names. */ + */ #ifdef _LIBC static #endif @@ -261,25 +212,17 @@ try_tempname_len (char *tmpl, int suffixlen, void *args, unsigned int attempts = ATTEMPTS_MIN; #endif - /* A random variable. The initial value is used only the for fallback path - on 'random_bits' on 'getrandom' failure. Its initial value tries to use - some entropy from the ASLR and ignore possible bits from the stack - alignment. */ - random_value v = ((uintptr_t) &v) / alignof (max_align_t); + /* A random variable. */ + random_value v = 0; - /* How many random base-62 digits can currently be extracted from V. */ + /* A value derived from the random variable, and how many random + base-62 digits can currently be extracted from VDIGBUF. */ + random_value vdigbuf; int vdigits = 0; - /* Whether to consume entropy when acquiring random bits. On the - first try it's worth the entropy cost with __GT_NOCREATE, which - is inherently insecure and can use the entropy to make it a bit - less secure. On the (rare) second and later attempts it might - help against DoS attacks. */ - bool use_getrandom = tryfunc == try_nocreate; - - /* Least unfair value for V. If V is less than this, V can generate - BASE_62_DIGITS digits fairly. Otherwise it might be biased. */ - random_value const unfair_min + /* Least biased value for V. If V is less than this, V can generate + BASE_62_DIGITS unbiased digits. Otherwise the digits are biased. */ + random_value const biased_min = RANDOM_VALUE_MAX - RANDOM_VALUE_MAX % BASE_62_POWER; len = strlen (tmpl); @@ -299,18 +242,16 @@ try_tempname_len (char *tmpl, int suffixlen, void *args, { if (vdigits == 0) { - do - { - v = random_bits (v, use_getrandom); - use_getrandom = true; - } - while (unfair_min <= v); + /* Worry about bias only if the bits are high quality. */ + while (random_bits (&v, v) && biased_min <= v) + continue; + vdigbuf = v; vdigits = BASE_62_DIGITS; } - XXXXXX[i] = letters[v % 62]; - v /= 62; + XXXXXX[i] = letters[vdigbuf % 62]; + vdigbuf /= 62; vdigits--; } diff --git a/lib/tempname.h b/lib/tempname.h index c172820..36a5138 100644 --- a/lib/tempname.h +++ b/lib/tempname.h @@ -1,6 +1,6 @@ /* Create a temporary file or directory. - Copyright (C) 2006, 2009-2022 Free Software Foundation, Inc. + Copyright (C) 2006, 2009-2023 Free Software Foundation, Inc. This file is free software: you can redistribute it and/or modify it under the terms of the GNU Lesser General Public License as @@ -48,7 +48,7 @@ extern "C" { and return a read-write fd. The file is mode 0600. GT_DIR: create a directory, which will be mode 0700. - We use a clever algorithm to get hard-to-predict names. */ + */ extern int gen_tempname (char *tmpl, int suffixlen, int flags, int kind); /* Similar, except X_SUFFIX_LEN gives the number of Xs. */ extern int gen_tempname_len (char *tmpl, int suffixlen, int flags, int kind, diff --git a/lib/time.in.h b/lib/time.in.h index 6d4c771..3f9af92 100644 --- a/lib/time.in.h +++ b/lib/time.in.h @@ -1,6 +1,6 @@ /* A more-standard <time.h>. - Copyright (C) 2007-2022 Free Software Foundation, Inc. + Copyright (C) 2007-2023 Free Software Foundation, Inc. This file is free software: you can redistribute it and/or modify it under the terms of the GNU Lesser General Public License as @@ -112,12 +112,24 @@ struct __time_t_must_be_integral { /* Set *TS to the current time, and return BASE. Upon failure, return 0. */ # if @GNULIB_TIMESPEC_GET@ -# if ! @HAVE_TIMESPEC_GET@ +# if @REPLACE_TIMESPEC_GET@ +# if !(defined __cplusplus && defined GNULIB_NAMESPACE) +# undef timespec_get +# define timespec_get rpl_timespec_get +# endif +_GL_FUNCDECL_RPL (timespec_get, int, (struct timespec *ts, int base) + _GL_ARG_NONNULL ((1))); +_GL_CXXALIAS_RPL (timespec_get, int, (struct timespec *ts, int base)); +# else +# if !@HAVE_TIMESPEC_GET@ _GL_FUNCDECL_SYS (timespec_get, int, (struct timespec *ts, int base) _GL_ARG_NONNULL ((1))); -# endif +# endif _GL_CXXALIAS_SYS (timespec_get, int, (struct timespec *ts, int base)); +# endif +# if __GLIBC__ >= 2 _GL_CXXALIASWARN (timespec_get); +# endif # endif /* Set *TS to the current time resolution, and return BASE. @@ -131,6 +143,20 @@ _GL_CXXALIAS_SYS (timespec_getres, int, (struct timespec *ts, int base)); _GL_CXXALIASWARN (timespec_getres); # endif +/* Return the number of seconds that have elapsed since the Epoch. */ +# if @GNULIB_TIME@ +# if @REPLACE_TIME@ +# if !(defined __cplusplus && defined GNULIB_NAMESPACE) +# define time rpl_time +# endif +_GL_FUNCDECL_RPL (time, time_t, (time_t *__tp)); +_GL_CXXALIAS_RPL (time, time_t, (time_t *__tp)); +# else +_GL_CXXALIAS_SYS (time, time_t, (time_t *__tp)); +# endif +_GL_CXXALIASWARN (time); +# endif + /* Sleep for at least RQTP seconds unless interrupted, If interrupted, return -1 and store the remaining time into RMTP. See <https://pubs.opengroup.org/onlinepubs/9699919799/functions/nanosleep.html>. */ @@ -315,6 +341,7 @@ _GL_CXXALIASWARN (strptime); # if !(defined __cplusplus && defined GNULIB_NAMESPACE) # define ctime rpl_ctime # endif +_GL_ATTRIBUTE_DEPRECATED _GL_FUNCDECL_RPL (ctime, char *, (time_t const *__tp) _GL_ARG_NONNULL ((1))); _GL_CXXALIAS_RPL (ctime, char *, (time_t const *__tp)); @@ -422,7 +449,9 @@ _GL_FUNCDECL_SYS (timegm, time_t, (struct tm *__tm) _GL_ARG_NONNULL ((1))); # endif _GL_CXXALIAS_SYS (timegm, time_t, (struct tm *__tm)); # endif +# if __GLIBC__ >= 2 _GL_CXXALIASWARN (timegm); +# endif # endif /* Encourage applications to avoid unsafe functions that can overrun @@ -435,8 +464,10 @@ _GL_WARN_ON_USE (asctime, "asctime can overrun buffers in some cases - " # endif # if defined GNULIB_POSIXCHECK # undef asctime_r +# if HAVE_RAW_DECL_ASCTIME_R _GL_WARN_ON_USE (asctime_r, "asctime_r can overrun buffers in some cases - " "better use strftime (or even sprintf) instead"); +# endif # endif # if defined GNULIB_POSIXCHECK # undef ctime @@ -445,8 +476,10 @@ _GL_WARN_ON_USE (ctime, "ctime can overrun buffers in some cases - " # endif # if defined GNULIB_POSIXCHECK # undef ctime_r +# if HAVE_RAW_DECL_CTIME_R _GL_WARN_ON_USE (ctime_r, "ctime_r can overrun buffers in some cases - " "better use strftime (or even sprintf) instead"); +# endif # endif #endif diff --git a/lib/unistd.c b/lib/unistd.c index 95978e6..be7a825 100644 --- a/lib/unistd.c +++ b/lib/unistd.c @@ -1,6 +1,6 @@ /* Inline functions for <unistd.h>. - Copyright (C) 2012-2022 Free Software Foundation, Inc. + Copyright (C) 2012-2023 Free Software Foundation, Inc. This file is free software: you can redistribute it and/or modify it under the terms of the GNU Lesser General Public License as diff --git a/lib/unistd.in.h b/lib/unistd.in.h index 57df09e..8ba9867 100644 --- a/lib/unistd.in.h +++ b/lib/unistd.in.h @@ -1,5 +1,5 @@ /* Substitute for and wrapper around <unistd.h>. - Copyright (C) 2003-2022 Free Software Foundation, Inc. + Copyright (C) 2003-2023 Free Software Foundation, Inc. This file is free software: you can redistribute it and/or modify it under the terms of the GNU Lesser General Public License as @@ -40,6 +40,24 @@ # undef _GL_INCLUDING_UNISTD_H #endif +/* Avoid lseek bugs in FreeBSD, macOS <https://bugs.gnu.org/61386>. + This bug is fixed after FreeBSD 13; see <https://bugs.freebsd.org/256205>. + Use macOS "9999" to stand for a future fixed macOS version. */ +#if defined __FreeBSD__ && __FreeBSD__ < 14 +# undef SEEK_DATA +# undef SEEK_HOLE +#elif defined __APPLE__ && defined __MACH__ && defined SEEK_DATA +# ifdef __ENVIRONMENT_MAC_OS_X_VERSION_MIN_REQUIRED__ +# include <AvailabilityMacros.h> +# endif +# if (!defined MAC_OS_X_VERSION_MIN_REQUIRED \ + || MAC_OS_X_VERSION_MIN_REQUIRED < 99990000) +# include <sys/fcntl.h> /* It also defines the two macros. */ +# undef SEEK_DATA +# undef SEEK_HOLE +# endif +#endif + /* Get all possible declarations of gethostname(). */ #if @GNULIB_GETHOSTNAME@ && @UNISTD_H_HAVE_WINSOCK2_H@ \ && !defined _GL_INCLUDING_WINSOCK2_H @@ -541,17 +559,22 @@ _GL_CXXALIASWARN (dup2); Return newfd if successful, otherwise -1 and errno set. See the Linux man page at <https://www.kernel.org/doc/man-pages/online/pages/man2/dup3.2.html>. */ -# if @HAVE_DUP3@ +# if @REPLACE_DUP3@ # if !(defined __cplusplus && defined GNULIB_NAMESPACE) +# undef dup3 # define dup3 rpl_dup3 # endif _GL_FUNCDECL_RPL (dup3, int, (int oldfd, int newfd, int flags)); _GL_CXXALIAS_RPL (dup3, int, (int oldfd, int newfd, int flags)); # else +# if !@HAVE_DUP3@ _GL_FUNCDECL_SYS (dup3, int, (int oldfd, int newfd, int flags)); +# endif _GL_CXXALIAS_SYS (dup3, int, (int oldfd, int newfd, int flags)); # endif +# if __GLIBC__ >= 2 _GL_CXXALIASWARN (dup3); +# endif #elif defined GNULIB_POSIXCHECK # undef dup3 # if HAVE_RAW_DECL_DUP3 @@ -870,7 +893,9 @@ _GL_FUNCDECL_SYS (execvpe, int, _GL_CXXALIAS_SYS (execvpe, int, (const char *program, char * const *argv, char * const *env)); # endif +# if __GLIBC__ >= 2 _GL_CXXALIASWARN (execvpe); +# endif #elif defined GNULIB_POSIXCHECK # undef execvpe # if HAVE_RAW_DECL_EXECVPE @@ -925,7 +950,9 @@ _GL_FUNCDECL_SYS (faccessat, int, _GL_CXXALIAS_SYS (faccessat, int, (int fd, char const *file, int mode, int flag)); # endif +# if __GLIBC__ >= 2 _GL_CXXALIASWARN (faccessat); +# endif #elif defined GNULIB_POSIXCHECK # undef faccessat # if HAVE_RAW_DECL_FACCESSAT @@ -1002,11 +1029,22 @@ _GL_WARN_ON_USE (fchownat, "fchownat is not portable - " Return 0 if successful, otherwise -1 and errno set. See POSIX:2008 specification <https://pubs.opengroup.org/onlinepubs/9699919799/functions/fdatasync.html>. */ -# if !@HAVE_FDATASYNC@ || !@HAVE_DECL_FDATASYNC@ +# if @REPLACE_FDATASYNC@ +# if !(defined __cplusplus && defined GNULIB_NAMESPACE) +# undef fdatasync +# define fdatasync rpl_fdatasync +# endif +_GL_FUNCDECL_RPL (fdatasync, int, (int fd)); +_GL_CXXALIAS_RPL (fdatasync, int, (int fd)); +# else +# if !@HAVE_FDATASYNC@|| !@HAVE_DECL_FDATASYNC@ _GL_FUNCDECL_SYS (fdatasync, int, (int fd)); -# endif +# endif _GL_CXXALIAS_SYS (fdatasync, int, (int fd)); +# endif +# if __GLIBC__ >= 2 _GL_CXXALIASWARN (fdatasync); +# endif #elif defined GNULIB_POSIXCHECK # undef fdatasync # if HAVE_RAW_DECL_FDATASYNC @@ -1053,7 +1091,9 @@ _GL_FUNCDECL_SYS (ftruncate, int, (int fd, off_t length)); # endif _GL_CXXALIAS_SYS (ftruncate, int, (int fd, off_t length)); # endif +# if __GLIBC__ >= 2 _GL_CXXALIASWARN (ftruncate); +# endif #elif defined GNULIB_POSIXCHECK # undef ftruncate # if HAVE_RAW_DECL_FTRUNCATE @@ -1143,7 +1183,9 @@ _GL_FUNCDECL_SYS (getdomainname, int, (char *name, size_t len) # endif _GL_CXXALIAS_SYS (getdomainname, int, (char *name, size_t len)); # endif +# if __GLIBC__ >= 2 _GL_CXXALIASWARN (getdomainname); +# endif #elif defined GNULIB_POSIXCHECK # undef getdomainname # if HAVE_RAW_DECL_GETDOMAINNAME @@ -1183,11 +1225,22 @@ _GL_WARN_ON_USE (getdtablesize, "getdtablesize is unportable - " #if @GNULIB_GETENTROPY@ /* Fill a buffer with random bytes. */ -# if !@HAVE_GETENTROPY@ +# if @REPLACE_GETENTROPY@ +# if !(defined __cplusplus && defined GNULIB_NAMESPACE) +# undef getentropy +# define getentropy rpl_getentropy +# endif +_GL_FUNCDECL_RPL (getentropy, int, (void *buffer, size_t length)); +_GL_CXXALIAS_RPL (getentropy, int, (void *buffer, size_t length)); +# else +# if !@HAVE_GETENTROPY@ _GL_FUNCDECL_SYS (getentropy, int, (void *buffer, size_t length)); -# endif +# endif _GL_CXXALIAS_SYS (getentropy, int, (void *buffer, size_t length)); +# endif +# if __GLIBC__ >= 2 _GL_CXXALIASWARN (getentropy); +# endif #elif defined GNULIB_POSIXCHECK # undef getentropy # if HAVE_RAW_DECL_GETENTROPY @@ -1321,7 +1374,9 @@ _GL_FUNCDECL_SYS (getlogin_r, int, (char *name, size_t size) int size. */ _GL_CXXALIAS_SYS_CAST (getlogin_r, int, (char *name, size_t size)); # endif +# if __GLIBC__ >= 2 _GL_CXXALIASWARN (getlogin_r); +# endif #elif defined GNULIB_POSIXCHECK # undef getlogin_r # if HAVE_RAW_DECL_GETLOGIN_R @@ -1659,7 +1714,9 @@ _GL_CXXALIAS_SYS (linkat, int, (int fd1, const char *path1, int fd2, const char *path2, int flag)); # endif +# if __GLIBC__ >= 2 _GL_CXXALIASWARN (linkat); +# endif #elif defined GNULIB_POSIXCHECK # undef linkat # if HAVE_RAW_DECL_LINKAT @@ -1740,8 +1797,9 @@ _GL_WARN_ON_USE (pipe, "pipe is unportable - " Return 0 upon success, or -1 with errno set upon failure. See also the Linux man page at <https://www.kernel.org/doc/man-pages/online/pages/man2/pipe2.2.html>. */ -# if @HAVE_PIPE2@ +# if @REPLACE_PIPE2@ # if !(defined __cplusplus && defined GNULIB_NAMESPACE) +# undef pipe2 # define pipe2 rpl_pipe2 # endif _GL_FUNCDECL_RPL (pipe2, int, (int fd[2], int flags) _GL_ARG_NONNULL ((1))); @@ -1750,7 +1808,9 @@ _GL_CXXALIAS_RPL (pipe2, int, (int fd[2], int flags)); _GL_FUNCDECL_SYS (pipe2, int, (int fd[2], int flags) _GL_ARG_NONNULL ((1))); _GL_CXXALIAS_SYS (pipe2, int, (int fd[2], int flags)); # endif +# if __GLIBC__ >= 2 _GL_CXXALIASWARN (pipe2); +# endif #elif defined GNULIB_POSIXCHECK # undef pipe2 # if HAVE_RAW_DECL_PIPE2 @@ -1785,7 +1845,9 @@ _GL_FUNCDECL_SYS (pread, ssize_t, _GL_CXXALIAS_SYS (pread, ssize_t, (int fd, void *buf, size_t bufsize, off_t offset)); # endif +# if __GLIBC__ >= 2 _GL_CXXALIASWARN (pread); +# endif #elif defined GNULIB_POSIXCHECK # undef pread # if HAVE_RAW_DECL_PREAD @@ -1820,7 +1882,9 @@ _GL_FUNCDECL_SYS (pwrite, ssize_t, _GL_CXXALIAS_SYS (pwrite, ssize_t, (int fd, const void *buf, size_t bufsize, off_t offset)); # endif +# if __GLIBC__ >= 2 _GL_CXXALIASWARN (pwrite); +# endif #elif defined GNULIB_POSIXCHECK # undef pwrite # if HAVE_RAW_DECL_PWRITE @@ -1934,7 +1998,9 @@ _GL_CXXALIAS_SYS (readlinkat, ssize_t, (int fd, char const *restrict file, char *restrict buf, size_t len)); # endif +# if __GLIBC__ >= 2 _GL_CXXALIASWARN (readlinkat); +# endif #elif defined GNULIB_POSIXCHECK # undef readlinkat # if HAVE_RAW_DECL_READLINKAT @@ -1994,15 +2060,27 @@ _GL_CXXALIASWARN (rmdir); Platforms with no ability to set the hostname return -1 and set errno = ENOSYS. */ -# if !@HAVE_SETHOSTNAME@ || !@HAVE_DECL_SETHOSTNAME@ +# if @REPLACE_SETHOSTNAME@ +# if !(defined __cplusplus && defined GNULIB_NAMESPACE) +# undef sethostname +# define sethostname rpl_sethostname +# endif +_GL_FUNCDECL_RPL (sethostname, int, (const char *name, size_t len) + _GL_ARG_NONNULL ((1))); +_GL_CXXALIAS_RPL (sethostname, int, (const char *name, size_t len)); +# else +# if !@HAVE_SETHOSTNAME@ || !@HAVE_DECL_SETHOSTNAME@ _GL_FUNCDECL_SYS (sethostname, int, (const char *name, size_t len) _GL_ARG_NONNULL ((1))); -# endif +# endif /* Need to cast, because on Solaris 11 2011-10, Mac OS X 10.5, IRIX 6.5 and FreeBSD 6.4 the second parameter is int. On Solaris 11 2011-10, the first parameter is not const. */ _GL_CXXALIAS_SYS_CAST (sethostname, int, (const char *name, size_t len)); +# endif +# if __GLIBC__ >= 2 _GL_CXXALIASWARN (sethostname); +# endif #elif defined GNULIB_POSIXCHECK # undef sethostname # if HAVE_RAW_DECL_SETHOSTNAME @@ -2055,7 +2133,7 @@ _GL_CXXALIAS_MDA_CAST (swab, void, (char *from, char *to, int n)); # else # if defined __hpux /* HP-UX */ _GL_CXXALIAS_SYS (swab, void, (const char *from, char *to, int n)); -# elif defined __sun && !defined _XPG4 /* Solaris */ +# elif defined __sun && (defined __SunOS_5_10 || defined __XOPEN_OR_POSIX) && !defined _XPG4 /* Solaris */ _GL_CXXALIAS_SYS (swab, void, (const char *from, char *to, ssize_t n)); # else _GL_CXXALIAS_SYS (swab, void, (const void *from, void *to, ssize_t n)); @@ -2111,7 +2189,9 @@ _GL_FUNCDECL_SYS (symlinkat, int, _GL_CXXALIAS_SYS (symlinkat, int, (char const *contents, int fd, char const *file)); # endif +# if __GLIBC__ >= 2 _GL_CXXALIASWARN (symlinkat); +# endif #elif defined GNULIB_POSIXCHECK # undef symlinkat # if HAVE_RAW_DECL_SYMLINKAT @@ -2141,7 +2221,9 @@ _GL_FUNCDECL_SYS (truncate, int, (const char *filename, off_t length) # endif _GL_CXXALIAS_SYS (truncate, int, (const char *filename, off_t length)); # endif +# if __GLIBC__ >= 2 _GL_CXXALIASWARN (truncate); +# endif #elif defined GNULIB_POSIXCHECK # undef truncate # if HAVE_RAW_DECL_TRUNCATE @@ -2171,7 +2253,9 @@ _GL_FUNCDECL_SYS (ttyname_r, int, _GL_CXXALIAS_SYS (ttyname_r, int, (int fd, char *buf, size_t buflen)); # endif +# if __GLIBC__ >= 2 _GL_CXXALIASWARN (ttyname_r); +# endif #elif defined GNULIB_POSIXCHECK # undef ttyname_r # if HAVE_RAW_DECL_TTYNAME_R diff --git a/lib/unlink.c b/lib/unlink.c index b549dd4..d77d262 100644 --- a/lib/unlink.c +++ b/lib/unlink.c @@ -1,6 +1,6 @@ /* Work around unlink bugs. - Copyright (C) 2009-2022 Free Software Foundation, Inc. + Copyright (C) 2009-2023 Free Software Foundation, Inc. This file is free software: you can redistribute it and/or modify it under the terms of the GNU Lesser General Public License as diff --git a/lib/usleep.c b/lib/usleep.c index e4289c4..08a2251 100644 --- a/lib/usleep.c +++ b/lib/usleep.c @@ -1,5 +1,5 @@ /* Pausing execution of the current thread. - Copyright (C) 2009-2022 Free Software Foundation, Inc. + Copyright (C) 2009-2023 Free Software Foundation, Inc. Written by Eric Blake <ebb9@byu.net>, 2009. This file is free software: you can redistribute it and/or modify diff --git a/lib/verify.h b/lib/verify.h index c2d2a56..c700243 100644 --- a/lib/verify.h +++ b/lib/verify.h @@ -1,6 +1,6 @@ /* Compile-time assert-like macros. - Copyright (C) 2005-2006, 2009-2022 Free Software Foundation, Inc. + Copyright (C) 2005-2006, 2009-2023 Free Software Foundation, Inc. This file is free software: you can redistribute it and/or modify it under the terms of the GNU Lesser General Public License as @@ -25,19 +25,19 @@ works as per C11. This is supported by GCC 4.6.0+ and by clang 4+. Define _GL_HAVE__STATIC_ASSERT1 to 1 if _Static_assert (R) works as - per C2x. This is supported by GCC 9.1+. + per C23. This is supported by GCC 9.1+. Support compilers claiming conformance to the relevant standard, and also support GCC when not pedantic. If we were willing to slow 'configure' down we could also use it with other compilers, but since this affects only the quality of diagnostics, why bother? */ #ifndef __cplusplus -# if (201112L <= __STDC_VERSION__ \ +# if (201112 <= __STDC_VERSION__ \ || (!defined __STRICT_ANSI__ \ && (4 < __GNUC__ + (6 <= __GNUC_MINOR__) || 5 <= __clang_major__))) # define _GL_HAVE__STATIC_ASSERT 1 # endif -# if (202000L <= __STDC_VERSION__ \ +# if (202311 <= __STDC_VERSION__ \ || (!defined __STRICT_ANSI__ && 9 <= __GNUC__)) # define _GL_HAVE__STATIC_ASSERT1 1 # endif @@ -202,12 +202,12 @@ template <int w> This macro requires three or more arguments but uses at most the first two, so that the _Static_assert macro optionally defined below supports - both the C11 two-argument syntax and the C2x one-argument syntax. + both the C11 two-argument syntax and the C23 one-argument syntax. Unfortunately, unlike C11, this implementation must appear as an ordinary declaration, and cannot appear inside struct { ... }. */ -#if 200410 <= __cpp_static_assert +#if 202311 <= __STDC_VERSION__ || 200410 <= __cpp_static_assert # define _GL_VERIFY(R, DIAGNOSTIC, ...) static_assert (R, DIAGNOSTIC) #elif defined _GL_HAVE__STATIC_ASSERT # define _GL_VERIFY(R, DIAGNOSTIC, ...) _Static_assert (R, DIAGNOSTIC) @@ -215,22 +215,69 @@ template <int w> # define _GL_VERIFY(R, DIAGNOSTIC, ...) \ extern int (*_GL_GENSYM (_gl_verify_function) (void)) \ [_GL_VERIFY_TRUE (R, DIAGNOSTIC)] +# if 4 < __GNUC__ + (6 <= __GNUC_MINOR__) +# pragma GCC diagnostic ignored "-Wnested-externs" +# endif #endif /* _GL_STATIC_ASSERT_H is defined if this code is copied into assert.h. */ #ifdef _GL_STATIC_ASSERT_H -# if !defined _GL_HAVE__STATIC_ASSERT1 && !defined _Static_assert -# define _Static_assert(...) \ - _GL_VERIFY (__VA_ARGS__, "static assertion failed", -) +/* Define _Static_assert if needed. */ +/* With clang ≥ 3.8.0 in C++ mode, _Static_assert already works and accepts + 1 or 2 arguments. We better don't override it, because clang's standard + C++ library uses static_assert inside classes in several places, and our + replacement via _GL_VERIFY does not work in these contexts. */ +# if (defined __cplusplus && defined __clang__ \ + && (4 <= __clang_major__ + (8 <= __clang_minor__))) +# if 5 <= __clang_major__ +/* Avoid "warning: 'static_assert' with no message is a C++17 extension". */ +# pragma clang diagnostic ignored "-Wc++17-extensions" +# else +/* Avoid "warning: static_assert with no message is a C++1z extension". */ +# pragma clang diagnostic ignored "-Wc++1z-extensions" +# endif +# elif !defined _GL_HAVE__STATIC_ASSERT1 && !defined _Static_assert +# if !defined _MSC_VER || defined __clang__ +# define _Static_assert(...) \ + _GL_VERIFY (__VA_ARGS__, "static assertion failed", -) +# else + /* Work around MSVC preprocessor incompatibility with ISO C; see + <https://stackoverflow.com/questions/5134523/>. */ +# define _Static_assert(R, ...) \ + _GL_VERIFY ((R), "static assertion failed", -) +# endif # endif -# if __cpp_static_assert < 201411 && !defined static_assert -# define static_assert _Static_assert /* C11 requires this #define. */ +/* Define static_assert if needed. */ +# if (!defined static_assert \ + && __STDC_VERSION__ < 202311 \ + && (!defined __cplusplus \ + || (__cpp_static_assert < 201411 \ + && __GNUG__ < 6 && __clang_major__ < 6))) +# if defined __cplusplus && _MSC_VER >= 1900 && !defined __clang__ +/* MSVC 14 in C++ mode supports the two-arguments static_assert but not + the one-argument static_assert, and it does not support _Static_assert. + We have to play preprocessor tricks to distinguish the two cases. + Since the MSVC preprocessor is not ISO C compliant (see above),. + the solution is specific to MSVC. */ +# define _GL_EXPAND(x) x +# define _GL_SA1(a1) static_assert ((a1), "static assertion failed") +# define _GL_SA2 static_assert +# define _GL_SA3 static_assert +# define _GL_SA_PICK(x1,x2,x3,x4,...) x4 +# define static_assert(...) _GL_EXPAND(_GL_SA_PICK(__VA_ARGS__,_GL_SA3,_GL_SA2,_GL_SA1)) (__VA_ARGS__) +/* Avoid "fatal error C1189: #error: The C++ Standard Library forbids macroizing keywords." */ +# define _ALLOW_KEYWORD_MACROS 1 +# else +# define static_assert _Static_assert /* C11 requires this #define. */ +# endif # endif #endif /* @assert.h omit start@ */ -#if 3 < __GNUC__ + (3 < __GNUC_MINOR__ + (4 <= __GNUC_PATCHLEVEL__)) +#if defined __clang_major__ && __clang_major__ < 5 +# define _GL_HAS_BUILTIN_TRAP 0 +#elif 3 < __GNUC__ + (3 < __GNUC_MINOR__ + (4 <= __GNUC_PATCHLEVEL__)) # define _GL_HAS_BUILTIN_TRAP 1 #elif defined __has_builtin # define _GL_HAS_BUILTIN_TRAP __has_builtin (__builtin_trap) @@ -238,12 +285,16 @@ template <int w> # define _GL_HAS_BUILTIN_TRAP 0 #endif -#if 4 < __GNUC__ + (5 <= __GNUC_MINOR__) -# define _GL_HAS_BUILTIN_UNREACHABLE 1 -#elif defined __has_builtin -# define _GL_HAS_BUILTIN_UNREACHABLE __has_builtin (__builtin_unreachable) -#else -# define _GL_HAS_BUILTIN_UNREACHABLE 0 +#ifndef _GL_HAS_BUILTIN_UNREACHABLE +# if defined __clang_major__ && __clang_major__ < 5 +# define _GL_HAS_BUILTIN_UNREACHABLE 0 +# elif 4 < __GNUC__ + (5 <= __GNUC_MINOR__) +# define _GL_HAS_BUILTIN_UNREACHABLE 1 +# elif defined __has_builtin +# define _GL_HAS_BUILTIN_UNREACHABLE __has_builtin (__builtin_unreachable) +# else +# define _GL_HAS_BUILTIN_UNREACHABLE 0 +# endif #endif /* Each of these macros verifies that its argument R is nonzero. To @@ -300,13 +351,16 @@ template <int w> # define assume(R) ((R) ? (void) 0 : __builtin_unreachable ()) #elif 1200 <= _MSC_VER # define assume(R) __assume (R) +#elif 202311 <= __STDC_VERSION__ +# include <stddef.h> +# define assume(R) ((R) ? (void) 0 : unreachable ()) #elif (defined GCC_LINT || defined lint) && _GL_HAS_BUILTIN_TRAP /* Doing it this way helps various packages when configured with --enable-gcc-warnings, which compiles with -Dlint. It's nicer - when 'assume' silences warnings even with older GCCs. */ + if 'assume' silences warnings with GCC 3.4 through GCC 4.4.7 (2012). */ # define assume(R) ((R) ? (void) 0 : __builtin_trap ()) #else - /* Some tools grok NOTREACHED, e.g., Oracle Studio 12.6. */ + /* Some older tools grok NOTREACHED, e.g., Oracle Studio 12.6 (2017). */ # define assume(R) ((R) ? (void) 0 : /*NOTREACHED*/ (void) 0) #endif diff --git a/lib/version-etc-fsf.c b/lib/version-etc-fsf.c index 79ea256..a34996d 100644 --- a/lib/version-etc-fsf.c +++ b/lib/version-etc-fsf.c @@ -1,5 +1,5 @@ /* Variable with FSF copyright information, for version-etc. - Copyright (C) 1999-2006, 2009-2022 Free Software Foundation, Inc. + Copyright (C) 1999-2006, 2009-2023 Free Software Foundation, Inc. This file is free software: you can redistribute it and/or modify it under the terms of the GNU Lesser General Public License as diff --git a/lib/version-etc.c b/lib/version-etc.c index 6b27e32..8e3b573 100644 --- a/lib/version-etc.c +++ b/lib/version-etc.c @@ -1,5 +1,5 @@ /* Print --version and bug-reporting information in a consistent format. - Copyright (C) 1999-2022 Free Software Foundation, Inc. + Copyright (C) 1999-2023 Free Software Foundation, Inc. This file is free software: you can redistribute it and/or modify it under the terms of the GNU Lesser General Public License as @@ -37,7 +37,7 @@ # define PACKAGE PACKAGE_TARNAME #endif -enum { COPYRIGHT_YEAR = 2022 }; +enum { COPYRIGHT_YEAR = 2023 }; /* The three functions below display the --version information the standard way. diff --git a/lib/version-etc.h b/lib/version-etc.h index c6b4eef..58297fc 100644 --- a/lib/version-etc.h +++ b/lib/version-etc.h @@ -1,5 +1,5 @@ /* Print --version and bug-reporting information in a consistent format. - Copyright (C) 1999, 2003, 2005, 2009-2022 Free Software Foundation, Inc. + Copyright (C) 1999, 2003, 2005, 2009-2023 Free Software Foundation, Inc. This file is free software: you can redistribute it and/or modify it under the terms of the GNU Lesser General Public License as diff --git a/lib/warn-on-use.h b/lib/warn-on-use.h index 94f5b92..3075603 100644 --- a/lib/warn-on-use.h +++ b/lib/warn-on-use.h @@ -1,5 +1,5 @@ /* A C macro for emitting warnings if a function is used. - Copyright (C) 2010-2022 Free Software Foundation, Inc. + Copyright (C) 2010-2023 Free Software Foundation, Inc. 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 diff --git a/lib/wchar.in.h b/lib/wchar.in.h index 0d5c0b7..2beddd7 100644 --- a/lib/wchar.in.h +++ b/lib/wchar.in.h @@ -1,6 +1,6 @@ /* A substitute for ISO C99 <wchar.h>, for platforms that have issues. - Copyright (C) 2007-2022 Free Software Foundation, Inc. + Copyright (C) 2007-2023 Free Software Foundation, Inc. This file is free software: you can redistribute it and/or modify it under the terms of the GNU Lesser General Public License as @@ -99,7 +99,14 @@ can be freed via 'free'; it can be used only after declaring 'free'. */ /* Applies to: functions. Cannot be used on inline functions. */ #ifndef _GL_ATTRIBUTE_DEALLOC_FREE -# define _GL_ATTRIBUTE_DEALLOC_FREE _GL_ATTRIBUTE_DEALLOC (free, 1) +# if defined __cplusplus && defined __GNUC__ && !defined __clang__ +/* Work around GCC bug <https://gcc.gnu.org/bugzilla/show_bug.cgi?id=108231> */ +# define _GL_ATTRIBUTE_DEALLOC_FREE \ + _GL_ATTRIBUTE_DEALLOC ((void (*) (void *)) free, 1) +# else +# define _GL_ATTRIBUTE_DEALLOC_FREE \ + _GL_ATTRIBUTE_DEALLOC (free, 1) +# endif #endif /* _GL_ATTRIBUTE_MALLOC declares that the function returns a pointer to freshly @@ -181,12 +188,20 @@ typedef int rpl_mbstate_t; # if (@REPLACE_FREE@ && !defined free \ && !(defined __cplusplus && defined GNULIB_NAMESPACE)) /* We can't do '#define free rpl_free' here. */ +# if defined __cplusplus && (__GLIBC__ + (__GLIBC_MINOR__ >= 14) > 2) +_GL_EXTERN_C void rpl_free (void *) throw (); +# else _GL_EXTERN_C void rpl_free (void *); +# endif # undef _GL_ATTRIBUTE_DEALLOC_FREE # define _GL_ATTRIBUTE_DEALLOC_FREE _GL_ATTRIBUTE_DEALLOC (rpl_free, 1) # else -# if defined _MSC_VER -_GL_EXTERN_C void __cdecl free (void *); +# if defined _MSC_VER && !defined free +_GL_EXTERN_C +# if defined _DLL + __declspec (dllimport) +# endif + void __cdecl free (void *); # else # if defined __cplusplus && (__GLIBC__ + (__GLIBC_MINOR__ >= 14) > 2) _GL_EXTERN_C void free (void *) throw (); @@ -196,8 +211,12 @@ _GL_EXTERN_C void free (void *); # endif # endif #else -# if defined _MSC_VER -_GL_EXTERN_C void __cdecl free (void *); +# if defined _MSC_VER && !defined free +_GL_EXTERN_C +# if defined _DLL + __declspec (dllimport) +# endif + void __cdecl free (void *); # else # if defined __cplusplus && (__GLIBC__ + (__GLIBC_MINOR__ >= 14) > 2) _GL_EXTERN_C void free (void *) throw (); @@ -426,7 +445,9 @@ _GL_CXXALIAS_SYS (mbsnrtowcs, size_t, const char **restrict srcp, size_t srclen, size_t len, mbstate_t *restrict ps)); # endif +# if __GLIBC__ >= 2 _GL_CXXALIASWARN (mbsnrtowcs); +# endif #elif defined GNULIB_POSIXCHECK # undef mbsnrtowcs # if HAVE_RAW_DECL_MBSNRTOWCS @@ -679,14 +700,27 @@ _GL_WARN_ON_USE (wmemmove, "wmemmove is unportable - " /* Copy N wide characters of SRC to DEST. Return pointer to wide characters after the last written wide character. */ #if @GNULIB_WMEMPCPY@ -# if !@HAVE_WMEMPCPY@ +# if @REPLACE_WMEMPCPY@ +# if !(defined __cplusplus && defined GNULIB_NAMESPACE) +# undef wmempcpy +# define wmempcpy rpl_wmempcpy +# endif +_GL_FUNCDECL_RPL (wmempcpy, wchar_t *, + (wchar_t *restrict dest, + const wchar_t *restrict src, size_t n)); +_GL_CXXALIAS_RPL (wmempcpy, wchar_t *, + (wchar_t *restrict dest, + const wchar_t *restrict src, size_t n)); +# else +# if !@HAVE_WMEMPCPY@ _GL_FUNCDECL_SYS (wmempcpy, wchar_t *, (wchar_t *restrict dest, const wchar_t *restrict src, size_t n)); -# endif +# endif _GL_CXXALIAS_SYS (wmempcpy, wchar_t *, (wchar_t *restrict dest, const wchar_t *restrict src, size_t n)); +# endif # if __GLIBC__ >= 2 _GL_CXXALIASWARN (wmempcpy); # endif @@ -737,7 +771,10 @@ _GL_WARN_ON_USE (wcslen, "wcslen is unportable - " /* Return the number of wide characters in S, but at most MAXLEN. */ #if @GNULIB_WCSNLEN@ -# if !@HAVE_WCSNLEN@ +/* On Solaris 11.3, the header files declare the function in the std:: + namespace, not in the global namespace. So, force a declaration in + the global namespace. */ +# if !@HAVE_WCSNLEN@ || (defined __sun && defined __cplusplus) _GL_FUNCDECL_SYS (wcsnlen, size_t, (const wchar_t *s, size_t maxlen) _GL_ATTRIBUTE_PURE); # endif @@ -774,7 +811,10 @@ _GL_WARN_ON_USE (wcscpy, "wcscpy is unportable - " /* Copy SRC to DEST, returning the address of the terminating L'\0' in DEST. */ #if @GNULIB_WCPCPY@ -# if !@HAVE_WCPCPY@ +/* On Solaris 11.3, the header files declare the function in the std:: + namespace, not in the global namespace. So, force a declaration in + the global namespace. */ +# if !@HAVE_WCPCPY@ || (defined __sun && defined __cplusplus) _GL_FUNCDECL_SYS (wcpcpy, wchar_t *, (wchar_t *restrict dest, const wchar_t *restrict src)); # endif @@ -815,7 +855,10 @@ _GL_WARN_ON_USE (wcsncpy, "wcsncpy is unportable - " /* Copy no more than N characters of SRC to DEST, returning the address of the last character written into DEST. */ #if @GNULIB_WCPNCPY@ -# if !@HAVE_WCPNCPY@ +/* On Solaris 11.3, the header files declare the function in the std:: + namespace, not in the global namespace. So, force a declaration in + the global namespace. */ +# if !@HAVE_WCPNCPY@ || (defined __sun && defined __cplusplus) _GL_FUNCDECL_SYS (wcpncpy, wchar_t *, (wchar_t *restrict dest, const wchar_t *restrict src, size_t n)); @@ -917,7 +960,10 @@ _GL_WARN_ON_USE (wcsncmp, "wcsncmp is unportable - " /* Compare S1 and S2, ignoring case. */ #if @GNULIB_WCSCASECMP@ -# if !@HAVE_WCSCASECMP@ +/* On Solaris 11.3, the header files declare the function in the std:: + namespace, not in the global namespace. So, force a declaration in + the global namespace. */ +# if !@HAVE_WCSCASECMP@ || (defined __sun && defined __cplusplus) _GL_FUNCDECL_SYS (wcscasecmp, int, (const wchar_t *s1, const wchar_t *s2) _GL_ATTRIBUTE_PURE); # endif @@ -934,7 +980,10 @@ _GL_WARN_ON_USE (wcscasecmp, "wcscasecmp is unportable - " /* Compare no more than N chars of S1 and S2, ignoring case. */ #if @GNULIB_WCSNCASECMP@ -# if !@HAVE_WCSNCASECMP@ +/* On Solaris 11.3, the header files declare the function in the std:: + namespace, not in the global namespace. So, force a declaration in + the global namespace. */ +# if !@HAVE_WCSNCASECMP@ || (defined __sun && defined __cplusplus) _GL_FUNCDECL_SYS (wcsncasecmp, int, (const wchar_t *s1, const wchar_t *s2, size_t n) _GL_ATTRIBUTE_PURE); @@ -1001,7 +1050,10 @@ _GL_WARN_ON_USE (wcsxfrm, "wcsxfrm is unportable - " # endif _GL_CXXALIAS_MDA (wcsdup, wchar_t *, (const wchar_t *s)); # else -# if !@HAVE_WCSDUP@ || __GNUC__ >= 11 +/* On Solaris 11.3, the header files declare the function in the std:: + namespace, not in the global namespace. So, force a declaration in + the global namespace. */ +# if !@HAVE_WCSDUP@ || (defined __sun && defined __cplusplus) || __GNUC__ >= 11 _GL_FUNCDECL_SYS (wcsdup, wchar_t *, (const wchar_t *s) _GL_ATTRIBUTE_MALLOC _GL_ATTRIBUTE_DEALLOC_FREE); diff --git a/lib/wcrtomb.c b/lib/wcrtomb.c index e14d802..48a6c8e 100644 --- a/lib/wcrtomb.c +++ b/lib/wcrtomb.c @@ -1,5 +1,5 @@ /* Convert wide character to multibyte character. - Copyright (C) 2008-2022 Free Software Foundation, Inc. + Copyright (C) 2008-2023 Free Software Foundation, Inc. Written by Bruno Haible <bruno@clisp.org>, 2008. This file is free software: you can redistribute it and/or modify diff --git a/lib/wctype-h.c b/lib/wctype-h.c index 1278143..7d3e14a 100644 --- a/lib/wctype-h.c +++ b/lib/wctype-h.c @@ -1,6 +1,6 @@ /* Inline functions for <wctype.h>. - Copyright (C) 2012-2022 Free Software Foundation, Inc. + Copyright (C) 2012-2023 Free Software Foundation, Inc. This file is free software: you can redistribute it and/or modify it under the terms of the GNU Lesser General Public License as diff --git a/lib/wctype.in.h b/lib/wctype.in.h index 98cafee..f6e474d 100644 --- a/lib/wctype.in.h +++ b/lib/wctype.in.h @@ -1,6 +1,6 @@ /* A substitute for ISO C99 <wctype.h>, for platforms that lack it. - Copyright (C) 2006-2022 Free Software Foundation, Inc. + Copyright (C) 2006-2023 Free Software Foundation, Inc. This file is free software: you can redistribute it and/or modify it under the terms of the GNU Lesser General Public License as diff --git a/lib/windows-initguard.h b/lib/windows-initguard.h index a29d7e9..9d36f53 100644 --- a/lib/windows-initguard.h +++ b/lib/windows-initguard.h @@ -1,5 +1,5 @@ /* Init guards, somewhat like spinlocks (native Windows implementation). - Copyright (C) 2005-2022 Free Software Foundation, Inc. + Copyright (C) 2005-2023 Free Software Foundation, Inc. This file is free software: you can redistribute it and/or modify it under the terms of the GNU Lesser General Public License as diff --git a/lib/windows-mutex.c b/lib/windows-mutex.c index 28e429c..ab7258c 100644 --- a/lib/windows-mutex.c +++ b/lib/windows-mutex.c @@ -1,5 +1,5 @@ /* Plain mutexes (native Windows implementation). - Copyright (C) 2005-2022 Free Software Foundation, Inc. + Copyright (C) 2005-2023 Free Software Foundation, Inc. This file is free software: you can redistribute it and/or modify it under the terms of the GNU Lesser General Public License as diff --git a/lib/windows-mutex.h b/lib/windows-mutex.h index 7aedfdf..039eb70 100644 --- a/lib/windows-mutex.h +++ b/lib/windows-mutex.h @@ -1,5 +1,5 @@ /* Plain mutexes (native Windows implementation). - Copyright (C) 2005-2022 Free Software Foundation, Inc. + Copyright (C) 2005-2023 Free Software Foundation, Inc. This file is free software: you can redistribute it and/or modify it under the terms of the GNU Lesser General Public License as diff --git a/lib/windows-once.c b/lib/windows-once.c index deea548..0d28281 100644 --- a/lib/windows-once.c +++ b/lib/windows-once.c @@ -1,5 +1,5 @@ /* Once-only control (native Windows implementation). - Copyright (C) 2005-2022 Free Software Foundation, Inc. + Copyright (C) 2005-2023 Free Software Foundation, Inc. This file is free software: you can redistribute it and/or modify it under the terms of the GNU Lesser General Public License as diff --git a/lib/windows-once.h b/lib/windows-once.h index 85534c9..5488568 100644 --- a/lib/windows-once.h +++ b/lib/windows-once.h @@ -1,5 +1,5 @@ /* Once-only control (native Windows implementation). - Copyright (C) 2005-2022 Free Software Foundation, Inc. + Copyright (C) 2005-2023 Free Software Foundation, Inc. This file is free software: you can redistribute it and/or modify it under the terms of the GNU Lesser General Public License as diff --git a/lib/windows-recmutex.c b/lib/windows-recmutex.c index d8087ac..a8ce9a0 100644 --- a/lib/windows-recmutex.c +++ b/lib/windows-recmutex.c @@ -1,5 +1,5 @@ /* Plain recursive mutexes (native Windows implementation). - Copyright (C) 2005-2022 Free Software Foundation, Inc. + Copyright (C) 2005-2023 Free Software Foundation, Inc. This file is free software: you can redistribute it and/or modify it under the terms of the GNU Lesser General Public License as diff --git a/lib/windows-recmutex.h b/lib/windows-recmutex.h index 746e75c..08ff459 100644 --- a/lib/windows-recmutex.h +++ b/lib/windows-recmutex.h @@ -1,5 +1,5 @@ /* Plain recursive mutexes (native Windows implementation). - Copyright (C) 2005-2022 Free Software Foundation, Inc. + Copyright (C) 2005-2023 Free Software Foundation, Inc. This file is free software: you can redistribute it and/or modify it under the terms of the GNU Lesser General Public License as diff --git a/lib/windows-rwlock.c b/lib/windows-rwlock.c index d186e03..7cbd7bb 100644 --- a/lib/windows-rwlock.c +++ b/lib/windows-rwlock.c @@ -1,5 +1,5 @@ /* Read-write locks (native Windows implementation). - Copyright (C) 2005-2022 Free Software Foundation, Inc. + Copyright (C) 2005-2023 Free Software Foundation, Inc. This file is free software: you can redistribute it and/or modify it under the terms of the GNU Lesser General Public License as diff --git a/lib/windows-rwlock.h b/lib/windows-rwlock.h index 65c5ab4..fe8381e 100644 --- a/lib/windows-rwlock.h +++ b/lib/windows-rwlock.h @@ -1,5 +1,5 @@ /* Read-write locks (native Windows implementation). - Copyright (C) 2005-2022 Free Software Foundation, Inc. + Copyright (C) 2005-2023 Free Software Foundation, Inc. This file is free software: you can redistribute it and/or modify it under the terms of the GNU Lesser General Public License as diff --git a/lib/xalloc-die.c b/lib/xalloc-die.c index 5b947f1..7605eee 100644 --- a/lib/xalloc-die.c +++ b/lib/xalloc-die.c @@ -1,6 +1,6 @@ /* Report a memory allocation failure and exit. - Copyright (C) 1997-2000, 2002-2004, 2006, 2009-2022 Free Software + Copyright (C) 1997-2000, 2002-2004, 2006, 2009-2023 Free Software Foundation, Inc. This program is free software: you can redistribute it and/or modify diff --git a/lib/xalloc-oversized.h b/lib/xalloc-oversized.h index aefa6fd..5dbdfb5 100644 --- a/lib/xalloc-oversized.h +++ b/lib/xalloc-oversized.h @@ -1,6 +1,6 @@ /* xalloc-oversized.h -- memory allocation size checking - Copyright (C) 1990-2000, 2003-2004, 2006-2022 Free Software Foundation, Inc. + Copyright (C) 1990-2000, 2003-2004, 2006-2023 Free Software Foundation, Inc. This file is free software: you can redistribute it and/or modify it under the terms of the GNU Lesser General Public License as diff --git a/lib/xalloc.h b/lib/xalloc.h index 9f4bf8d..f373c2f 100644 --- a/lib/xalloc.h +++ b/lib/xalloc.h @@ -1,6 +1,6 @@ /* xalloc.h -- malloc with out-of-memory checking - Copyright (C) 1990-2000, 2003-2004, 2006-2022 Free Software Foundation, Inc. + Copyright (C) 1990-2000, 2003-2004, 2006-2023 Free Software Foundation, Inc. This program is free software: you can redistribute it and/or modify it under the terms of the GNU General Public License as published by @@ -20,11 +20,9 @@ #include <stddef.h> #include <stdlib.h> -#include <stdint.h> #if GNULIB_XALLOC # include "idx.h" -# include "intprops.h" #endif #ifndef _GL_INLINE_HEADER_BEGIN diff --git a/lib/xmalloc.c b/lib/xmalloc.c index 993c1ee..289cbd0 100644 --- a/lib/xmalloc.c +++ b/lib/xmalloc.c @@ -1,6 +1,6 @@ /* xmalloc.c -- malloc with out of memory checking - Copyright (C) 1990-2000, 2002-2006, 2008-2022 Free Software Foundation, Inc. + Copyright (C) 1990-2000, 2002-2006, 2008-2023 Free Software Foundation, Inc. This program is free software: you can redistribute it and/or modify it under the terms of the GNU General Public License as published by @@ -22,10 +22,11 @@ #include "xalloc.h" #include "ialloc.h" -#include "intprops.h" #include "minmax.h" +#include <stdckdint.h> #include <stdlib.h> +#include <stdint.h> #include <string.h> static void * _GL_ATTRIBUTE_PURE @@ -195,7 +196,7 @@ x2nrealloc (void *p, size_t *pn, size_t s) else { /* Set N = floor (1.5 * N) + 1 to make progress even if N == 0. */ - if (INT_ADD_WRAPV (n, (n >> 1) + 1, &n)) + if (ckd_add (&n, n, (n >> 1) + 1)) xalloc_die (); } @@ -236,7 +237,7 @@ xpalloc (void *pa, idx_t *pn, idx_t n_incr_min, ptrdiff_t n_max, idx_t s) N_MAX, and what the C language can represent safely. */ idx_t n; - if (INT_ADD_WRAPV (n0, n0 >> 1, &n)) + if (ckd_add (&n, n0, n0 >> 1)) n = IDX_MAX; if (0 <= n_max && n_max < n) n = n_max; @@ -251,7 +252,7 @@ xpalloc (void *pa, idx_t *pn, idx_t n_incr_min, ptrdiff_t n_max, idx_t s) size_t nbytes; #endif idx_t adjusted_nbytes - = (INT_MULTIPLY_WRAPV (n, s, &nbytes) + = (ckd_mul (&nbytes, n, s) ? MIN (IDX_MAX, SIZE_MAX) : nbytes < DEFAULT_MXFAST ? DEFAULT_MXFAST : 0); if (adjusted_nbytes) @@ -263,9 +264,9 @@ xpalloc (void *pa, idx_t *pn, idx_t n_incr_min, ptrdiff_t n_max, idx_t s) if (! pa) *pn = 0; if (n - n0 < n_incr_min - && (INT_ADD_WRAPV (n0, n_incr_min, &n) + && (ckd_add (&n, n0, n_incr_min) || (0 <= n_max && n_max < n) - || INT_MULTIPLY_WRAPV (n, s, &nbytes))) + || ckd_mul (&nbytes, n, s))) xalloc_die (); pa = xrealloc (pa, nbytes); *pn = n; diff --git a/lib/xstrtol.c b/lib/xstrtol.c index e0a692f..9695b42 100644 --- a/lib/xstrtol.c +++ b/lib/xstrtol.c @@ -1,6 +1,6 @@ /* A more useful interface to strtol. - Copyright (C) 1995-1996, 1998-2001, 2003-2007, 2009-2022 Free Software + Copyright (C) 1995-1996, 1998-2001, 2003-2007, 2009-2023 Free Software Foundation, Inc. This program is free software: you can redistribute it and/or modify @@ -140,7 +140,7 @@ __xstrtol (const char *s, char **ptr, int strtol_base, switch (**p) { case 'E': case 'G': case 'g': case 'k': case 'K': case 'M': case 'm': - case 'P': case 'T': case 't': case 'Y': case 'Z': + case 'P': case 'Q': case 'R': case 'T': case 't': case 'Y': case 'Z': /* The "valid suffix" '0' is a special flag meaning that an optional second suffix is allowed, which can change @@ -205,6 +205,14 @@ __xstrtol (const char *s, char **ptr, int strtol_base, overflow = bkm_scale_by_power (&tmp, base, 5); break; + case 'Q': /* quetta or 2**100 */ + overflow = bkm_scale_by_power (&tmp, base, 10); + break; + + case 'R': /* ronna or 2**90 */ + overflow = bkm_scale_by_power (&tmp, base, 9); + break; + case 'T': /* tera or tebi */ case 't': /* 't' is undocumented; for compatibility only */ overflow = bkm_scale_by_power (&tmp, base, 4); diff --git a/lib/xstrtol.h b/lib/xstrtol.h index a0159a7..f70119a 100644 --- a/lib/xstrtol.h +++ b/lib/xstrtol.h @@ -1,6 +1,6 @@ /* A more useful interface to strtol. - Copyright (C) 1995-1996, 1998-1999, 2001-2004, 2006-2022 Free Software + Copyright (C) 1995-1996, 1998-1999, 2001-2004, 2006-2023 Free Software Foundation, Inc. This program is free software: you can redistribute it and/or modify diff --git a/lib/xstrtoll.c b/lib/xstrtoll.c index 11dbcb2..2127c9d 100644 --- a/lib/xstrtoll.c +++ b/lib/xstrtoll.c @@ -1,6 +1,6 @@ /* Convert string to 'long long', with error checking. - Copyright (C) 2011-2022 Free Software Foundation, Inc. + Copyright (C) 2011-2023 Free Software Foundation, Inc. This file is free software: you can redistribute it and/or modify it under the terms of the GNU General Public License as published diff --git a/lib/xstrtoul.c b/lib/xstrtoul.c index 368e815..33c38d4 100644 --- a/lib/xstrtoul.c +++ b/lib/xstrtoul.c @@ -1,6 +1,6 @@ /* Convert string to 'unsigned long', with error checking. - Copyright (C) 1994-2022 Free Software Foundation, Inc. + Copyright (C) 1994-2023 Free Software Foundation, Inc. This file is free software: you can redistribute it and/or modify it under the terms of the GNU General Public License as published diff --git a/lib/xstrtoull.c b/lib/xstrtoull.c index df4a3ce..543e30a 100644 --- a/lib/xstrtoull.c +++ b/lib/xstrtoull.c @@ -1,6 +1,6 @@ /* Convert string to 'unsigned long long', with error checking. - Copyright (C) 2010-2022 Free Software Foundation, Inc. + Copyright (C) 2010-2023 Free Software Foundation, Inc. This file is free software: you can redistribute it and/or modify it under the terms of the GNU General Public License as published diff --git a/libparted/Makefile.am b/libparted/Makefile.am index 7844293..db29a18 100644 --- a/libparted/Makefile.am +++ b/libparted/Makefile.am @@ -1,5 +1,5 @@ # This file is part of GNU Parted -# Copyright (C) 1999-2001, 2007, 2009-2014, 2019-2022 Free Software Foundation, +# Copyright (C) 1999-2001, 2007, 2009-2014, 2019-2023 Free Software Foundation, # Inc. # # This file may be modified and/or distributed without restriction. @@ -24,7 +24,7 @@ lib_LTLIBRARIES = libparted.la # For details, see the "Updating library version information" section of # "info libtool". CURRENT = 2 -REVISION = 4 +REVISION = 5 AGE = 0 libparted_la_LDFLAGS = -version-info $(CURRENT):$(REVISION):$(AGE) diff --git a/libparted/Makefile.in b/libparted/Makefile.in index 3df5020..3708494 100644 --- a/libparted/Makefile.in +++ b/libparted/Makefile.in @@ -15,7 +15,7 @@ @SET_MAKE@ # This file is part of GNU Parted -# Copyright (C) 1999-2001, 2007, 2009-2014, 2019-2022 Free Software Foundation, +# Copyright (C) 1999-2001, 2007, 2009-2014, 2019-2023 Free Software Foundation, # Inc. # # This file may be modified and/or distributed without restriction. @@ -76,9 +76,6 @@ am__make_running_with_option = \ test $$has_opt = yes am__make_dryrun = (target_option=n; $(am__make_running_with_option)) am__make_keepgoing = (target_option=k; $(am__make_running_with_option)) -pkgdatadir = $(datadir)/@PACKAGE@ -pkgincludedir = $(includedir)/@PACKAGE@ -pkglibdir = $(libdir)/@PACKAGE@ am__cd = CDPATH="$${ZSH_VERSION+.}$(PATH_SEPARATOR)" && cd install_sh_DATA = $(install_sh) -c -m 644 install_sh_PROGRAM = $(install_sh) -c @@ -100,7 +97,9 @@ am__aclocal_m4_deps = $(top_srcdir)/m4/00gnulib.m4 \ $(top_srcdir)/m4/__inline.m4 \ $(top_srcdir)/m4/absolute-header.m4 $(top_srcdir)/m4/alloca.m4 \ $(top_srcdir)/m4/arpa_inet_h.m4 $(top_srcdir)/m4/assert.m4 \ - $(top_srcdir)/m4/btowc.m4 $(top_srcdir)/m4/builtin-expect.m4 \ + $(top_srcdir)/m4/assert_h.m4 $(top_srcdir)/m4/btowc.m4 \ + $(top_srcdir)/m4/build-to-host.m4 \ + $(top_srcdir)/m4/builtin-expect.m4 $(top_srcdir)/m4/c-bool.m4 \ $(top_srcdir)/m4/calloc.m4 $(top_srcdir)/m4/canonicalize.m4 \ $(top_srcdir)/m4/clock_time.m4 $(top_srcdir)/m4/close.m4 \ $(top_srcdir)/m4/codeset.m4 $(top_srcdir)/m4/config-h.m4 \ @@ -108,7 +107,7 @@ am__aclocal_m4_deps = $(top_srcdir)/m4/00gnulib.m4 \ $(top_srcdir)/m4/double-slash-root.m4 $(top_srcdir)/m4/dup2.m4 \ $(top_srcdir)/m4/eealloc.m4 $(top_srcdir)/m4/environ.m4 \ $(top_srcdir)/m4/errno_h.m4 $(top_srcdir)/m4/error.m4 \ - $(top_srcdir)/m4/extensions.m4 \ + $(top_srcdir)/m4/error_h.m4 $(top_srcdir)/m4/extensions.m4 \ $(top_srcdir)/m4/extern-inline.m4 $(top_srcdir)/m4/fcntl-o.m4 \ $(top_srcdir)/m4/fcntl.m4 $(top_srcdir)/m4/fcntl_h.m4 \ $(top_srcdir)/m4/fdopen.m4 $(top_srcdir)/m4/flexmember.m4 \ @@ -140,10 +139,11 @@ am__aclocal_m4_deps = $(top_srcdir)/m4/00gnulib.m4 \ $(top_srcdir)/m4/malloc.m4 $(top_srcdir)/m4/malloca.m4 \ $(top_srcdir)/m4/manywarnings.m4 $(top_srcdir)/m4/mbrtowc.m4 \ $(top_srcdir)/m4/mbsinit.m4 $(top_srcdir)/m4/mbstate_t.m4 \ - $(top_srcdir)/m4/mbtowc.m4 $(top_srcdir)/m4/mempcpy.m4 \ - $(top_srcdir)/m4/minmax.m4 $(top_srcdir)/m4/mkdir.m4 \ - $(top_srcdir)/m4/mkstemp.m4 $(top_srcdir)/m4/mmap-anon.m4 \ - $(top_srcdir)/m4/mode_t.m4 $(top_srcdir)/m4/msvc-inval.m4 \ + $(top_srcdir)/m4/mbtowc.m4 $(top_srcdir)/m4/memchr.m4 \ + $(top_srcdir)/m4/mempcpy.m4 $(top_srcdir)/m4/minmax.m4 \ + $(top_srcdir)/m4/mkdir.m4 $(top_srcdir)/m4/mkstemp.m4 \ + $(top_srcdir)/m4/mmap-anon.m4 $(top_srcdir)/m4/mode_t.m4 \ + $(top_srcdir)/m4/msvc-inval.m4 \ $(top_srcdir)/m4/msvc-nothrow.m4 $(top_srcdir)/m4/multiarch.m4 \ $(top_srcdir)/m4/musl.m4 $(top_srcdir)/m4/nanosleep.m4 \ $(top_srcdir)/m4/netinet_in_h.m4 \ @@ -174,29 +174,29 @@ am__aclocal_m4_deps = $(top_srcdir)/m4/00gnulib.m4 \ $(top_srcdir)/m4/socklen.m4 $(top_srcdir)/m4/sockpfaf.m4 \ $(top_srcdir)/m4/ssize_t.m4 $(top_srcdir)/m4/stat-time.m4 \ $(top_srcdir)/m4/stat.m4 $(top_srcdir)/m4/stdalign.m4 \ - $(top_srcdir)/m4/stdarg.m4 $(top_srcdir)/m4/stdbool.m4 \ - $(top_srcdir)/m4/stddef_h.m4 $(top_srcdir)/m4/stdint.m4 \ - $(top_srcdir)/m4/stdio_h.m4 $(top_srcdir)/m4/stdlib_h.m4 \ - $(top_srcdir)/m4/strdup.m4 $(top_srcdir)/m4/strerror.m4 \ - $(top_srcdir)/m4/strerror_r.m4 $(top_srcdir)/m4/string_h.m4 \ - $(top_srcdir)/m4/strtoll.m4 $(top_srcdir)/m4/strtoull.m4 \ - $(top_srcdir)/m4/symlink.m4 $(top_srcdir)/m4/sys_ioctl_h.m4 \ + $(top_srcdir)/m4/stdarg.m4 $(top_srcdir)/m4/stddef_h.m4 \ + $(top_srcdir)/m4/stdint.m4 $(top_srcdir)/m4/stdio_h.m4 \ + $(top_srcdir)/m4/stdlib_h.m4 $(top_srcdir)/m4/strdup.m4 \ + $(top_srcdir)/m4/strerror.m4 $(top_srcdir)/m4/strerror_r.m4 \ + $(top_srcdir)/m4/string_h.m4 $(top_srcdir)/m4/strtoll.m4 \ + $(top_srcdir)/m4/strtoull.m4 $(top_srcdir)/m4/symlink.m4 \ + $(top_srcdir)/m4/sys_ioctl_h.m4 \ $(top_srcdir)/m4/sys_random_h.m4 \ $(top_srcdir)/m4/sys_select_h.m4 \ $(top_srcdir)/m4/sys_socket_h.m4 \ $(top_srcdir)/m4/sys_stat_h.m4 $(top_srcdir)/m4/sys_time_h.m4 \ $(top_srcdir)/m4/sys_types_h.m4 $(top_srcdir)/m4/sys_uio_h.m4 \ $(top_srcdir)/m4/tempname.m4 $(top_srcdir)/m4/thread.m4 \ - $(top_srcdir)/m4/threadlib.m4 $(top_srcdir)/m4/time_h.m4 \ - $(top_srcdir)/m4/unistd_h.m4 $(top_srcdir)/m4/unlink.m4 \ - $(top_srcdir)/m4/unlinkdir.m4 $(top_srcdir)/m4/usleep.m4 \ - $(top_srcdir)/m4/version-etc.m4 $(top_srcdir)/m4/visibility.m4 \ - $(top_srcdir)/m4/warn-on-use.m4 $(top_srcdir)/m4/warnings.m4 \ - $(top_srcdir)/m4/wchar_h.m4 $(top_srcdir)/m4/wchar_t.m4 \ - $(top_srcdir)/m4/wcrtomb.m4 $(top_srcdir)/m4/wctob.m4 \ - $(top_srcdir)/m4/wctomb.m4 $(top_srcdir)/m4/wctype_h.m4 \ - $(top_srcdir)/m4/wint_t.m4 $(top_srcdir)/m4/xalloc.m4 \ - $(top_srcdir)/m4/xstrtol.m4 $(top_srcdir)/m4/year2038.m4 \ + $(top_srcdir)/m4/threadlib.m4 $(top_srcdir)/m4/time.m4 \ + $(top_srcdir)/m4/time_h.m4 $(top_srcdir)/m4/unistd_h.m4 \ + $(top_srcdir)/m4/unlink.m4 $(top_srcdir)/m4/unlinkdir.m4 \ + $(top_srcdir)/m4/usleep.m4 $(top_srcdir)/m4/version-etc.m4 \ + $(top_srcdir)/m4/visibility.m4 $(top_srcdir)/m4/warn-on-use.m4 \ + $(top_srcdir)/m4/warnings.m4 $(top_srcdir)/m4/wchar_h.m4 \ + $(top_srcdir)/m4/wchar_t.m4 $(top_srcdir)/m4/wcrtomb.m4 \ + $(top_srcdir)/m4/wctob.m4 $(top_srcdir)/m4/wctomb.m4 \ + $(top_srcdir)/m4/wctype_h.m4 $(top_srcdir)/m4/wint_t.m4 \ + $(top_srcdir)/m4/xalloc.m4 $(top_srcdir)/m4/xstrtol.m4 \ $(top_srcdir)/m4/yield.m4 $(top_srcdir)/m4/zzgnulib.m4 \ $(top_srcdir)/configure.ac am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \ @@ -365,6 +365,9 @@ am__relativize = \ dir1=`echo "$$dir1" | sed -e "$$sed_rest"`; \ done; \ reldir="$$dir2" +pkgdatadir = @pkgdatadir@ +pkgincludedir = @pkgincludedir@ +pkglibdir = @pkglibdir@ pkglibexecdir = @pkglibexecdir@ ACLOCAL = @ACLOCAL@ ALLOCA = @ALLOCA@ @@ -374,6 +377,7 @@ AM_DEFAULT_VERBOSITY = @AM_DEFAULT_VERBOSITY@ APPLE_UNIVERSAL_BUILD = @APPLE_UNIVERSAL_BUILD@ AR = @AR@ ARFLAGS = @ARFLAGS@ +ASSERT_H = @ASSERT_H@ AUTOCONF = @AUTOCONF@ AUTOHEADER = @AUTOHEADER@ AUTOMAKE = @AUTOMAKE@ @@ -390,6 +394,7 @@ CFLAGS = @CFLAGS@ CFLAG_VISIBILITY = @CFLAG_VISIBILITY@ CHECK_CFLAGS = @CHECK_CFLAGS@ CHECK_LIBS = @CHECK_LIBS@ +CLOCK_TIME_LIB = @CLOCK_TIME_LIB@ CONFIG_INCLUDE = @CONFIG_INCLUDE@ CPP = @CPP@ CPPFLAGS = @CPPFLAGS@ @@ -414,12 +419,14 @@ ENOLINK_VALUE = @ENOLINK_VALUE@ EOVERFLOW_HIDDEN = @EOVERFLOW_HIDDEN@ EOVERFLOW_VALUE = @EOVERFLOW_VALUE@ ERRNO_H = @ERRNO_H@ +ERROR_H = @ERROR_H@ ETAGS = @ETAGS@ EXEEXT = @EXEEXT@ FGREP = @FGREP@ FILECMD = @FILECMD@ GETOPT_CDEFS_H = @GETOPT_CDEFS_H@ GETOPT_H = @GETOPT_H@ +GETRANDOM_LIB = @GETRANDOM_LIB@ GETTEXT_MACRO_VERSION = @GETTEXT_MACRO_VERSION@ GL_CFLAG_ALLOW_WARNINGS = @GL_CFLAG_ALLOW_WARNINGS@ GL_CFLAG_GNULIB_WARNINGS = @GL_CFLAG_GNULIB_WARNINGS@ @@ -435,6 +442,7 @@ GL_GNULIB_CALLOC_GNU = @GL_GNULIB_CALLOC_GNU@ GL_GNULIB_CALLOC_POSIX = @GL_GNULIB_CALLOC_POSIX@ GL_GNULIB_CANONICALIZE_FILE_NAME = @GL_GNULIB_CANONICALIZE_FILE_NAME@ GL_GNULIB_CHDIR = @GL_GNULIB_CHDIR@ +GL_GNULIB_CHMOD = @GL_GNULIB_CHMOD@ GL_GNULIB_CHOWN = @GL_GNULIB_CHOWN@ GL_GNULIB_CLOSE = @GL_GNULIB_CLOSE@ GL_GNULIB_CONNECT = @GL_GNULIB_CONNECT@ @@ -508,6 +516,7 @@ GL_GNULIB_GETPAGESIZE = @GL_GNULIB_GETPAGESIZE@ GL_GNULIB_GETPASS = @GL_GNULIB_GETPASS@ GL_GNULIB_GETPASS_GNU = @GL_GNULIB_GETPASS_GNU@ GL_GNULIB_GETPEERNAME = @GL_GNULIB_GETPEERNAME@ +GL_GNULIB_GETPROGNAME = @GL_GNULIB_GETPROGNAME@ GL_GNULIB_GETRANDOM = @GL_GNULIB_GETRANDOM@ GL_GNULIB_GETSOCKNAME = @GL_GNULIB_GETSOCKNAME@ GL_GNULIB_GETSOCKOPT = @GL_GNULIB_GETSOCKOPT@ @@ -605,6 +614,7 @@ GL_GNULIB_MEMCHR = @GL_GNULIB_MEMCHR@ GL_GNULIB_MEMMEM = @GL_GNULIB_MEMMEM@ GL_GNULIB_MEMPCPY = @GL_GNULIB_MEMPCPY@ GL_GNULIB_MEMRCHR = @GL_GNULIB_MEMRCHR@ +GL_GNULIB_MEMSET_EXPLICIT = @GL_GNULIB_MEMSET_EXPLICIT@ GL_GNULIB_MKDIR = @GL_GNULIB_MKDIR@ GL_GNULIB_MKDIRAT = @GL_GNULIB_MKDIRAT@ GL_GNULIB_MKDTEMP = @GL_GNULIB_MKDTEMP@ @@ -725,6 +735,7 @@ GL_GNULIB_STRVERSCMP = @GL_GNULIB_STRVERSCMP@ GL_GNULIB_SYMLINK = @GL_GNULIB_SYMLINK@ GL_GNULIB_SYMLINKAT = @GL_GNULIB_SYMLINKAT@ GL_GNULIB_SYSTEM_POSIX = @GL_GNULIB_SYSTEM_POSIX@ +GL_GNULIB_TIME = @GL_GNULIB_TIME@ GL_GNULIB_TIMEGM = @GL_GNULIB_TIMEGM@ GL_GNULIB_TIMESPEC_GET = @GL_GNULIB_TIMESPEC_GET@ GL_GNULIB_TIMESPEC_GETRES = @GL_GNULIB_TIMESPEC_GETRES@ @@ -799,6 +810,7 @@ GMSGFMT_015 = @GMSGFMT_015@ GNULIBHEADERS_OVERRIDE_WINT_T = @GNULIBHEADERS_OVERRIDE_WINT_T@ GNULIB_GETTIMEOFDAY = @GNULIB_GETTIMEOFDAY@ GREP = @GREP@ +HARD_LOCALE_LIB = @HARD_LOCALE_LIB@ HAVE_ACCEPT4 = @HAVE_ACCEPT4@ HAVE_ALIGNED_ALLOC = @HAVE_ALIGNED_ALLOC@ HAVE_ALLOCA_H = @HAVE_ALLOCA_H@ @@ -829,6 +841,7 @@ HAVE_DECL_GETLOGIN = @HAVE_DECL_GETLOGIN@ HAVE_DECL_GETLOGIN_R = @HAVE_DECL_GETLOGIN_R@ HAVE_DECL_GETPAGESIZE = @HAVE_DECL_GETPAGESIZE@ HAVE_DECL_GETUSERSHELL = @HAVE_DECL_GETUSERSHELL@ +HAVE_DECL_GETW = @HAVE_DECL_GETW@ HAVE_DECL_IMAXABS = @HAVE_DECL_IMAXABS@ HAVE_DECL_IMAXDIV = @HAVE_DECL_IMAXDIV@ HAVE_DECL_INET_NTOP = @HAVE_DECL_INET_NTOP@ @@ -838,6 +851,7 @@ HAVE_DECL_LOCALTIME_R = @HAVE_DECL_LOCALTIME_R@ HAVE_DECL_MEMMEM = @HAVE_DECL_MEMMEM@ HAVE_DECL_MEMRCHR = @HAVE_DECL_MEMRCHR@ HAVE_DECL_OBSTACK_PRINTF = @HAVE_DECL_OBSTACK_PRINTF@ +HAVE_DECL_PUTW = @HAVE_DECL_PUTW@ HAVE_DECL_SETENV = @HAVE_DECL_SETENV@ HAVE_DECL_SETHOSTNAME = @HAVE_DECL_SETHOSTNAME@ HAVE_DECL_SETSTATE = @HAVE_DECL_SETSTATE@ @@ -860,6 +874,9 @@ HAVE_DECL_WCWIDTH = @HAVE_DECL_WCWIDTH@ HAVE_DPRINTF = @HAVE_DPRINTF@ HAVE_DUP3 = @HAVE_DUP3@ HAVE_DUPLOCALE = @HAVE_DUPLOCALE@ +HAVE_ERROR = @HAVE_ERROR@ +HAVE_ERROR_AT_LINE = @HAVE_ERROR_AT_LINE@ +HAVE_ERROR_H = @HAVE_ERROR_H@ HAVE_EUIDACCESS = @HAVE_EUIDACCESS@ HAVE_EXECVPE = @HAVE_EXECVPE@ HAVE_EXPLICIT_BZERO = @HAVE_EXPLICIT_BZERO@ @@ -887,12 +904,15 @@ HAVE_GETLOGIN = @HAVE_GETLOGIN@ HAVE_GETOPT_H = @HAVE_GETOPT_H@ HAVE_GETPAGESIZE = @HAVE_GETPAGESIZE@ HAVE_GETPASS = @HAVE_GETPASS@ +HAVE_GETPROGNAME = @HAVE_GETPROGNAME@ HAVE_GETRANDOM = @HAVE_GETRANDOM@ HAVE_GETSUBOPT = @HAVE_GETSUBOPT@ HAVE_GETTIMEOFDAY = @HAVE_GETTIMEOFDAY@ HAVE_GETUMASK = @HAVE_GETUMASK@ HAVE_GRANTPT = @HAVE_GRANTPT@ HAVE_GROUP_MEMBER = @HAVE_GROUP_MEMBER@ +HAVE_IMAXABS = @HAVE_IMAXABS@ +HAVE_IMAXDIV = @HAVE_IMAXDIV@ HAVE_IMAXDIV_T = @HAVE_IMAXDIV_T@ HAVE_INITSTATE = @HAVE_INITSTATE@ HAVE_INTTYPES_H = @HAVE_INTTYPES_H@ @@ -919,6 +939,7 @@ HAVE_MBSNRTOWCS = @HAVE_MBSNRTOWCS@ HAVE_MBSRTOWCS = @HAVE_MBSRTOWCS@ HAVE_MBTOWC = @HAVE_MBTOWC@ HAVE_MEMPCPY = @HAVE_MEMPCPY@ +HAVE_MEMSET_EXPLICIT = @HAVE_MEMSET_EXPLICIT@ HAVE_MKDIRAT = @HAVE_MKDIRAT@ HAVE_MKDTEMP = @HAVE_MKDTEMP@ HAVE_MKFIFO = @HAVE_MKFIFO@ @@ -1127,7 +1148,6 @@ HAVE_WMEMPCPY = @HAVE_WMEMPCPY@ HAVE_WMEMSET = @HAVE_WMEMSET@ HAVE_WS2TCPIP_H = @HAVE_WS2TCPIP_H@ HAVE_XLOCALE_H = @HAVE_XLOCALE_H@ -HAVE__BOOL = @HAVE__BOOL@ HAVE__EXIT = @HAVE__EXIT@ IGNORE_UNUSED_LIBRARIES_CFLAGS = @IGNORE_UNUSED_LIBRARIES_CFLAGS@ INCLUDE_NEXT = @INCLUDE_NEXT@ @@ -1194,15 +1214,20 @@ LT_REVISION = @LT_REVISION@ LT_SYS_LIBRARY_PATH = @LT_SYS_LIBRARY_PATH@ MAKEINFO = @MAKEINFO@ MANIFEST_TOOL = @MANIFEST_TOOL@ +MBRTOWC_LIB = @MBRTOWC_LIB@ MKDIR_P = @MKDIR_P@ MSGFMT = @MSGFMT@ MSGFMT_015 = @MSGFMT_015@ MSGMERGE = @MSGMERGE@ +NANOSLEEP_LIB = @NANOSLEEP_LIB@ NETINET_IN_H = @NETINET_IN_H@ NEXT_ARPA_INET_H = @NEXT_ARPA_INET_H@ +NEXT_ASSERT_H = @NEXT_ASSERT_H@ NEXT_AS_FIRST_DIRECTIVE_ARPA_INET_H = @NEXT_AS_FIRST_DIRECTIVE_ARPA_INET_H@ +NEXT_AS_FIRST_DIRECTIVE_ASSERT_H = @NEXT_AS_FIRST_DIRECTIVE_ASSERT_H@ NEXT_AS_FIRST_DIRECTIVE_CTYPE_H = @NEXT_AS_FIRST_DIRECTIVE_CTYPE_H@ NEXT_AS_FIRST_DIRECTIVE_ERRNO_H = @NEXT_AS_FIRST_DIRECTIVE_ERRNO_H@ +NEXT_AS_FIRST_DIRECTIVE_ERROR_H = @NEXT_AS_FIRST_DIRECTIVE_ERROR_H@ NEXT_AS_FIRST_DIRECTIVE_FCNTL_H = @NEXT_AS_FIRST_DIRECTIVE_FCNTL_H@ NEXT_AS_FIRST_DIRECTIVE_GETOPT_H = @NEXT_AS_FIRST_DIRECTIVE_GETOPT_H@ NEXT_AS_FIRST_DIRECTIVE_INTTYPES_H = @NEXT_AS_FIRST_DIRECTIVE_INTTYPES_H@ @@ -1233,6 +1258,7 @@ NEXT_AS_FIRST_DIRECTIVE_WCHAR_H = @NEXT_AS_FIRST_DIRECTIVE_WCHAR_H@ NEXT_AS_FIRST_DIRECTIVE_WCTYPE_H = @NEXT_AS_FIRST_DIRECTIVE_WCTYPE_H@ NEXT_CTYPE_H = @NEXT_CTYPE_H@ NEXT_ERRNO_H = @NEXT_ERRNO_H@ +NEXT_ERROR_H = @NEXT_ERROR_H@ NEXT_FCNTL_H = @NEXT_FCNTL_H@ NEXT_GETOPT_H = @NEXT_GETOPT_H@ NEXT_INTTYPES_H = @NEXT_INTTYPES_H@ @@ -1288,6 +1314,7 @@ PRAGMA_COLUMNS = @PRAGMA_COLUMNS@ PRAGMA_SYSTEM_HEADER = @PRAGMA_SYSTEM_HEADER@ PRIPTR_PREFIX = @PRIPTR_PREFIX@ PTHREAD_H_DEFINES_STRUCT_TIMESPEC = @PTHREAD_H_DEFINES_STRUCT_TIMESPEC@ +PTHREAD_SIGMASK_LIB = @PTHREAD_SIGMASK_LIB@ PTRDIFF_T_SUFFIX = @PTRDIFF_T_SUFFIX@ RANLIB = @RANLIB@ REPLACE_ACCESS = @REPLACE_ACCESS@ @@ -1296,6 +1323,7 @@ REPLACE_BTOWC = @REPLACE_BTOWC@ REPLACE_CALLOC_FOR_CALLOC_GNU = @REPLACE_CALLOC_FOR_CALLOC_GNU@ REPLACE_CALLOC_FOR_CALLOC_POSIX = @REPLACE_CALLOC_FOR_CALLOC_POSIX@ REPLACE_CANONICALIZE_FILE_NAME = @REPLACE_CANONICALIZE_FILE_NAME@ +REPLACE_CHMOD = @REPLACE_CHMOD@ REPLACE_CHOWN = @REPLACE_CHOWN@ REPLACE_CLOSE = @REPLACE_CLOSE@ REPLACE_COPY_FILE_RANGE = @REPLACE_COPY_FILE_RANGE@ @@ -1304,7 +1332,10 @@ REPLACE_CTIME = @REPLACE_CTIME@ REPLACE_DPRINTF = @REPLACE_DPRINTF@ REPLACE_DUP = @REPLACE_DUP@ REPLACE_DUP2 = @REPLACE_DUP2@ +REPLACE_DUP3 = @REPLACE_DUP3@ REPLACE_DUPLOCALE = @REPLACE_DUPLOCALE@ +REPLACE_ERROR = @REPLACE_ERROR@ +REPLACE_ERROR_AT_LINE = @REPLACE_ERROR_AT_LINE@ REPLACE_EXECL = @REPLACE_EXECL@ REPLACE_EXECLE = @REPLACE_EXECLE@ REPLACE_EXECLP = @REPLACE_EXECLP@ @@ -1317,6 +1348,7 @@ REPLACE_FCHMODAT = @REPLACE_FCHMODAT@ REPLACE_FCHOWNAT = @REPLACE_FCHOWNAT@ REPLACE_FCLOSE = @REPLACE_FCLOSE@ REPLACE_FCNTL = @REPLACE_FCNTL@ +REPLACE_FDATASYNC = @REPLACE_FDATASYNC@ REPLACE_FDOPEN = @REPLACE_FDOPEN@ REPLACE_FFLUSH = @REPLACE_FFLUSH@ REPLACE_FFSLL = @REPLACE_FFSLL@ @@ -1339,15 +1371,21 @@ REPLACE_GETCWD = @REPLACE_GETCWD@ REPLACE_GETDELIM = @REPLACE_GETDELIM@ REPLACE_GETDOMAINNAME = @REPLACE_GETDOMAINNAME@ REPLACE_GETDTABLESIZE = @REPLACE_GETDTABLESIZE@ +REPLACE_GETENTROPY = @REPLACE_GETENTROPY@ REPLACE_GETGROUPS = @REPLACE_GETGROUPS@ REPLACE_GETLINE = @REPLACE_GETLINE@ +REPLACE_GETLOADAVG = @REPLACE_GETLOADAVG@ REPLACE_GETLOGIN_R = @REPLACE_GETLOGIN_R@ REPLACE_GETPAGESIZE = @REPLACE_GETPAGESIZE@ REPLACE_GETPASS = @REPLACE_GETPASS@ REPLACE_GETPASS_FOR_GETPASS_GNU = @REPLACE_GETPASS_FOR_GETPASS_GNU@ +REPLACE_GETPROGNAME = @REPLACE_GETPROGNAME@ REPLACE_GETRANDOM = @REPLACE_GETRANDOM@ +REPLACE_GETSUBOPT = @REPLACE_GETSUBOPT@ REPLACE_GETTIMEOFDAY = @REPLACE_GETTIMEOFDAY@ REPLACE_GMTIME = @REPLACE_GMTIME@ +REPLACE_IMAXABS = @REPLACE_IMAXABS@ +REPLACE_IMAXDIV = @REPLACE_IMAXDIV@ REPLACE_INET_NTOP = @REPLACE_INET_NTOP@ REPLACE_INET_PTON = @REPLACE_INET_PTON@ REPLACE_INITSTATE = @REPLACE_INITSTATE@ @@ -1376,11 +1414,14 @@ REPLACE_MBSTATE_T = @REPLACE_MBSTATE_T@ REPLACE_MBTOWC = @REPLACE_MBTOWC@ REPLACE_MEMCHR = @REPLACE_MEMCHR@ REPLACE_MEMMEM = @REPLACE_MEMMEM@ +REPLACE_MEMPCPY = @REPLACE_MEMPCPY@ REPLACE_MKDIR = @REPLACE_MKDIR@ REPLACE_MKFIFO = @REPLACE_MKFIFO@ REPLACE_MKFIFOAT = @REPLACE_MKFIFOAT@ REPLACE_MKNOD = @REPLACE_MKNOD@ REPLACE_MKNODAT = @REPLACE_MKNODAT@ +REPLACE_MKOSTEMP = @REPLACE_MKOSTEMP@ +REPLACE_MKOSTEMPS = @REPLACE_MKOSTEMPS@ REPLACE_MKSTEMP = @REPLACE_MKSTEMP@ REPLACE_MKTIME = @REPLACE_MKTIME@ REPLACE_NANOSLEEP = @REPLACE_NANOSLEEP@ @@ -1391,8 +1432,10 @@ REPLACE_OBSTACK_PRINTF = @REPLACE_OBSTACK_PRINTF@ REPLACE_OPEN = @REPLACE_OPEN@ REPLACE_OPENAT = @REPLACE_OPENAT@ REPLACE_PERROR = @REPLACE_PERROR@ +REPLACE_PIPE2 = @REPLACE_PIPE2@ REPLACE_POPEN = @REPLACE_POPEN@ REPLACE_POSIX_MEMALIGN = @REPLACE_POSIX_MEMALIGN@ +REPLACE_POSIX_OPENPT = @REPLACE_POSIX_OPENPT@ REPLACE_PREAD = @REPLACE_PREAD@ REPLACE_PRINTF = @REPLACE_PRINTF@ REPLACE_PSELECT = @REPLACE_PSELECT@ @@ -1470,6 +1513,7 @@ REPLACE_RMDIR = @REPLACE_RMDIR@ REPLACE_SCHED_YIELD = @REPLACE_SCHED_YIELD@ REPLACE_SELECT = @REPLACE_SELECT@ REPLACE_SETENV = @REPLACE_SETENV@ +REPLACE_SETHOSTNAME = @REPLACE_SETHOSTNAME@ REPLACE_SETLOCALE = @REPLACE_SETLOCALE@ REPLACE_SETSTATE = @REPLACE_SETSTATE@ REPLACE_SLEEP = @REPLACE_SLEEP@ @@ -1478,6 +1522,7 @@ REPLACE_SPRINTF = @REPLACE_SPRINTF@ REPLACE_STAT = @REPLACE_STAT@ REPLACE_STDIO_READ_FUNCS = @REPLACE_STDIO_READ_FUNCS@ REPLACE_STDIO_WRITE_FUNCS = @REPLACE_STDIO_WRITE_FUNCS@ +REPLACE_STPCPY = @REPLACE_STPCPY@ REPLACE_STPNCPY = @REPLACE_STPNCPY@ REPLACE_STRCASESTR = @REPLACE_STRCASESTR@ REPLACE_STRCHRNUL = @REPLACE_STRCHRNUL@ @@ -1504,7 +1549,9 @@ REPLACE_STRUCT_LCONV = @REPLACE_STRUCT_LCONV@ REPLACE_STRUCT_TIMEVAL = @REPLACE_STRUCT_TIMEVAL@ REPLACE_SYMLINK = @REPLACE_SYMLINK@ REPLACE_SYMLINKAT = @REPLACE_SYMLINKAT@ +REPLACE_TIME = @REPLACE_TIME@ REPLACE_TIMEGM = @REPLACE_TIMEGM@ +REPLACE_TIMESPEC_GET = @REPLACE_TIMESPEC_GET@ REPLACE_TMPFILE = @REPLACE_TMPFILE@ REPLACE_TOWLOWER = @REPLACE_TOWLOWER@ REPLACE_TRUNCATE = @REPLACE_TRUNCATE@ @@ -1530,15 +1577,20 @@ REPLACE_WCSWIDTH = @REPLACE_WCSWIDTH@ REPLACE_WCTOB = @REPLACE_WCTOB@ REPLACE_WCTOMB = @REPLACE_WCTOMB@ REPLACE_WCWIDTH = @REPLACE_WCWIDTH@ +REPLACE_WMEMPCPY = @REPLACE_WMEMPCPY@ REPLACE_WRITE = @REPLACE_WRITE@ +REPLACE__EXIT = @REPLACE__EXIT@ +SCHED_YIELD_LIB = @SCHED_YIELD_LIB@ SED = @SED@ +SELECT_LIB = @SELECT_LIB@ +SETLOCALE_LIB = @SETLOCALE_LIB@ +SETLOCALE_NULL_LIB = @SETLOCALE_NULL_LIB@ SET_MAKE = @SET_MAKE@ SHELL = @SHELL@ SIG_ATOMIC_T_SUFFIX = @SIG_ATOMIC_T_SUFFIX@ SIZE_T_SUFFIX = @SIZE_T_SUFFIX@ -STDALIGN_H = @STDALIGN_H@ STDARG_H = @STDARG_H@ -STDBOOL_H = @STDBOOL_H@ +STDCKDINT_H = @STDCKDINT_H@ STDDEF_H = @STDDEF_H@ STDINT_H = @STDINT_H@ STRIP = @STRIP@ @@ -1582,6 +1634,8 @@ am__quote = @am__quote@ am__tar = @am__tar@ am__untar = @am__untar@ bindir = @bindir@ +bindir_c = @bindir_c@ +bindir_c_make = @bindir_c_make@ build = @build@ build_alias = @build_alias@ build_cpu = @build_cpu@ @@ -1589,10 +1643,20 @@ build_os = @build_os@ build_vendor = @build_vendor@ builddir = @builddir@ datadir = @datadir@ +datadir_c = @datadir_c@ +datadir_c_make = @datadir_c_make@ datarootdir = @datarootdir@ +datarootdir_c = @datarootdir_c@ +datarootdir_c_make = @datarootdir_c_make@ docdir = @docdir@ +docdir_c = @docdir_c@ +docdir_c_make = @docdir_c_make@ dvidir = @dvidir@ +dvidir_c = @dvidir_c@ +dvidir_c_make = @dvidir_c_make@ exec_prefix = @exec_prefix@ +exec_prefix_c = @exec_prefix_c@ +exec_prefix_c_make = @exec_prefix_c_make@ gl_LIBOBJDEPS = @gl_LIBOBJDEPS@ gl_LIBOBJS = @gl_LIBOBJS@ gl_LTLIBOBJS = @gl_LTLIBOBJS@ @@ -1606,26 +1670,68 @@ host_cpu = @host_cpu@ host_os = @host_os@ host_vendor = @host_vendor@ htmldir = @htmldir@ +htmldir_c = @htmldir_c@ +htmldir_c_make = @htmldir_c_make@ includedir = @includedir@ +includedir_c = @includedir_c@ +includedir_c_make = @includedir_c_make@ infodir = @infodir@ +infodir_c = @infodir_c@ +infodir_c_make = @infodir_c_make@ install_sh = @install_sh@ libdir = @libdir@ +libdir_c = @libdir_c@ +libdir_c_make = @libdir_c_make@ libexecdir = @libexecdir@ +libexecdir_c = @libexecdir_c@ +libexecdir_c_make = @libexecdir_c_make@ lispdir = @lispdir@ +lispdir_c = @lispdir_c@ +lispdir_c_make = @lispdir_c_make@ localedir = @localedir@ +localedir_c = @localedir_c@ +localedir_c_make = @localedir_c_make@ localstatedir = @localstatedir@ +localstatedir_c = @localstatedir_c@ +localstatedir_c_make = @localstatedir_c_make@ mandir = @mandir@ +mandir_c = @mandir_c@ +mandir_c_make = @mandir_c_make@ mkdir_p = @mkdir_p@ oldincludedir = @oldincludedir@ +oldincludedir_c = @oldincludedir_c@ +oldincludedir_c_make = @oldincludedir_c_make@ pdfdir = @pdfdir@ +pdfdir_c = @pdfdir_c@ +pdfdir_c_make = @pdfdir_c_make@ +pkgdatadir_c = @pkgdatadir_c@ +pkgdatadir_c_make = @pkgdatadir_c_make@ +pkgincludedir_c = @pkgincludedir_c@ +pkgincludedir_c_make = @pkgincludedir_c_make@ +pkglibdir_c = @pkglibdir_c@ +pkglibdir_c_make = @pkglibdir_c_make@ +pkglibexecdir_c = @pkglibexecdir_c@ +pkglibexecdir_c_make = @pkglibexecdir_c_make@ prefix = @prefix@ +prefix_c = @prefix_c@ +prefix_c_make = @prefix_c_make@ program_transform_name = @program_transform_name@ psdir = @psdir@ +psdir_c = @psdir_c@ +psdir_c_make = @psdir_c_make@ runstatedir = @runstatedir@ +runstatedir_c = @runstatedir_c@ +runstatedir_c_make = @runstatedir_c_make@ sbindir = @sbindir@ +sbindir_c = @sbindir_c@ +sbindir_c_make = @sbindir_c_make@ sharedstatedir = @sharedstatedir@ +sharedstatedir_c = @sharedstatedir_c@ +sharedstatedir_c_make = @sharedstatedir_c_make@ srcdir = @srcdir@ sysconfdir = @sysconfdir@ +sysconfdir_c = @sysconfdir_c@ +sysconfdir_c_make = @sysconfdir_c_make@ target_alias = @target_alias@ top_build_prefix = @top_build_prefix@ top_builddir = @top_builddir@ @@ -1643,7 +1749,7 @@ lib_LTLIBRARIES = libparted.la # For details, see the "Updating library version information" section of # "info libtool". CURRENT = 2 -REVISION = 4 +REVISION = 5 AGE = 0 libparted_la_LDFLAGS = -version-info $(CURRENT):$(REVISION):$(AGE) libparted_la_SOURCES = debug.c \ diff --git a/libparted/arch/beos.c b/libparted/arch/beos.c index 1a762fe..df14b99 100644 --- a/libparted/arch/beos.c +++ b/libparted/arch/beos.c @@ -1,6 +1,6 @@ /* libparted - a library for manipulating disk partitions - Copyright (C) 2006-2007, 2009-2014, 2019-2022 Free Software Foundation, + Copyright (C) 2006-2007, 2009-2014, 2019-2023 Free Software Foundation, Inc. This program is free software; you can redistribute it and/or modify diff --git a/libparted/arch/gnu.c b/libparted/arch/gnu.c index c6d6de7..b2f0428 100644 --- a/libparted/arch/gnu.c +++ b/libparted/arch/gnu.c @@ -1,6 +1,6 @@ /* libparted - a library for manipulating disk partitions - Copyright (C) 1999-2001, 2005, 2007, 2009-2014, 2019-2022 Free Software + Copyright (C) 1999-2001, 2005, 2007, 2009-2014, 2019-2023 Free Software Foundation, Inc. This program is free software; you can redistribute it and/or modify diff --git a/libparted/arch/linux.c b/libparted/arch/linux.c index f3bf14d..ccbba86 100644 --- a/libparted/arch/linux.c +++ b/libparted/arch/linux.c @@ -1,5 +1,5 @@ /* libparted - a library for manipulating disk partitions - Copyright (C) 1999-2014, 2019-2022 Free Software Foundation, Inc. + Copyright (C) 1999-2014, 2019-2023 Free Software Foundation, Inc. This program is free software; you can redistribute it and/or modify it under the terms of the GNU General Public License as published by diff --git a/libparted/arch/linux.h b/libparted/arch/linux.h index 8b1164e..3d4e5fa 100644 --- a/libparted/arch/linux.h +++ b/libparted/arch/linux.h @@ -1,5 +1,5 @@ /* libparted - a library for manipulating disk partitions - Copyright (C) 2009-2014, 2019-2022 Free Software Foundation, Inc. + Copyright (C) 2009-2014, 2019-2023 Free Software Foundation, Inc. This program is free software; you can redistribute it and/or modify it under the terms of the GNU General Public License as published by diff --git a/libparted/architecture.c b/libparted/architecture.c index 3acca67..4020f98 100644 --- a/libparted/architecture.c +++ b/libparted/architecture.c @@ -1,6 +1,6 @@ /* libparted - a library for manipulating disk partitions - Copyright (C) 2007, 2009-2014, 2019-2022 Free Software Foundation, Inc. + Copyright (C) 2007, 2009-2014, 2019-2023 Free Software Foundation, Inc. This program is free software; you can redistribute it and/or modify it under the terms of the GNU General Public License as published by diff --git a/libparted/architecture.h b/libparted/architecture.h index e5d7284..f058f74 100644 --- a/libparted/architecture.h +++ b/libparted/architecture.h @@ -1,6 +1,6 @@ /* libparted - a library for manipulating disk partitions - Copyright (C) 2007, 2009-2014, 2019-2022 Free Software Foundation, Inc. + Copyright (C) 2007, 2009-2014, 2019-2023 Free Software Foundation, Inc. This program is free software; you can redistribute it and/or modify it under the terms of the GNU General Public License as published by diff --git a/libparted/cs/constraint.c b/libparted/cs/constraint.c index f55b3ae..146c318 100644 --- a/libparted/cs/constraint.c +++ b/libparted/cs/constraint.c @@ -1,6 +1,6 @@ /* libparted - a library for manipulating disk partitions - Copyright (C) 2000-2001, 2007, 2009-2014, 2019-2022 Free Software + Copyright (C) 2000-2001, 2007, 2009-2014, 2019-2023 Free Software Foundation, Inc. This program is free software; you can redistribute it and/or modify diff --git a/libparted/cs/geom.c b/libparted/cs/geom.c index 7ced112..99280ac 100644 --- a/libparted/cs/geom.c +++ b/libparted/cs/geom.c @@ -1,6 +1,6 @@ /* libparted - a library for manipulating disk partitions - Copyright (C) 1999-2000, 2005, 2007-2014, 2019-2022 Free Software + Copyright (C) 1999-2000, 2005, 2007-2014, 2019-2023 Free Software Foundation, Inc. This program is free software; you can redistribute it and/or modify diff --git a/libparted/cs/natmath.c b/libparted/cs/natmath.c index 2674342..ea53afc 100644 --- a/libparted/cs/natmath.c +++ b/libparted/cs/natmath.c @@ -1,6 +1,6 @@ /* libparted - a library for manipulating disk partitions - Copyright (C) 2000, 2007-2014, 2019-2022 Free Software Foundation, Inc. + Copyright (C) 2000, 2007-2014, 2019-2023 Free Software Foundation, Inc. This program is free software; you can redistribute it and/or modify it under the terms of the GNU General Public License as published by diff --git a/libparted/debug.c b/libparted/debug.c index c3ffff3..9a348bd 100644 --- a/libparted/debug.c +++ b/libparted/debug.c @@ -1,6 +1,6 @@ /* libparted - a library for manipulating disk partitions - Copyright (C) 2000, 2005, 2007, 2009-2014, 2019-2022 Free Software + Copyright (C) 2000, 2005, 2007, 2009-2014, 2019-2023 Free Software Foundation, Inc. This program is free software; you can redistribute it and/or modify diff --git a/libparted/disk.c b/libparted/disk.c index 3bf7634..0db7b5c 100644 --- a/libparted/disk.c +++ b/libparted/disk.c @@ -1,6 +1,6 @@ /* libparted - a library for manipulating disk partitions - Copyright (C) 1999-2003, 2005, 2007-2014, 2019-2022 Free Software + Copyright (C) 1999-2003, 2005, 2007-2014, 2019-2023 Free Software Foundation, Inc. This program is free software; you can redistribute it and/or modify @@ -886,6 +886,37 @@ ped_disk_flag_next(PedDiskFlag flag) return (flag + 1) % (PED_DISK_LAST_FLAG + 1); } +static int +_assert_disk_uuid_feature (const PedDiskType* disk_type) +{ + if (!ped_disk_type_check_feature ( + disk_type, PED_DISK_TYPE_DISK_UUID)) { + ped_exception_throw ( + PED_EXCEPTION_ERROR, + PED_EXCEPTION_CANCEL, + "%s disk labels do not support disk uuids.", + disk_type->name); + return 0; + } + return 1; +} + +/** + * Get the uuid of the disk \p disk. This will only work if the disk label + * supports it. + */ +uint8_t* +ped_disk_get_uuid (const PedDisk *disk) +{ + PED_ASSERT (disk != NULL); + + if (!_assert_disk_uuid_feature (disk->type)) + return NULL; + + PED_ASSERT (disk->type->ops->disk_get_uuid != NULL); + return disk->type->ops->disk_get_uuid (disk); +} + /** * \internal We turned a really nasty bureaucracy problem into an elegant maths * problem :-) Basically, there are some constraints to a partition's @@ -1458,6 +1489,51 @@ _assert_partition_name_feature (const PedDiskType* disk_type) return 1; } +static int +_assert_partition_type_id_feature (const PedDiskType* disk_type) +{ + if (!ped_disk_type_check_feature ( + disk_type, PED_DISK_TYPE_PARTITION_TYPE_ID)) { + ped_exception_throw ( + PED_EXCEPTION_ERROR, + PED_EXCEPTION_CANCEL, + "%s disk labels do not support partition type-ids.", + disk_type->name); + return 0; + } + return 1; +} + +static int +_assert_partition_type_uuid_feature (const PedDiskType* disk_type) +{ + if (!ped_disk_type_check_feature ( + disk_type, PED_DISK_TYPE_PARTITION_TYPE_UUID)) { + ped_exception_throw ( + PED_EXCEPTION_ERROR, + PED_EXCEPTION_CANCEL, + "%s disk labels do not support partition type-uuids.", + disk_type->name); + return 0; + } + return 1; +} + +static int +_assert_partition_uuid_feature (const PedDiskType* disk_type) +{ + if (!ped_disk_type_check_feature ( + disk_type, PED_DISK_TYPE_PARTITION_UUID)) { + ped_exception_throw ( + PED_EXCEPTION_ERROR, + PED_EXCEPTION_CANCEL, + "%s disk labels do not support partition uuids.", + disk_type->name); + return 0; + } + return 1; +} + /** * Sets the name of a partition. * @@ -1510,6 +1586,96 @@ ped_partition_get_name (const PedPartition* part) return part->disk->type->ops->partition_get_name (part); } +/** + * Set the type-id of the partition \p part. This will only work if the disk label + * supports it. + */ +int +ped_partition_set_type_id (PedPartition *part, uint8_t id) +{ + PED_ASSERT (part != NULL); + PED_ASSERT (part->disk != NULL); + PED_ASSERT (ped_partition_is_active (part)); + + if (!_assert_partition_type_id_feature (part->disk->type)) + return 0; + + PED_ASSERT (part->disk->type->ops->partition_set_type_id != NULL); + return part->disk->type->ops->partition_set_type_id (part, id); +} + +/** + * Get the type-id of the partition \p part. This will only work if the disk label + * supports it. + */ +uint8_t +ped_partition_get_type_id (const PedPartition *part) +{ + PED_ASSERT (part != NULL); + PED_ASSERT (part->disk != NULL); + PED_ASSERT (ped_partition_is_active (part)); + + if (!_assert_partition_type_id_feature (part->disk->type)) + return 0; + + PED_ASSERT (part->disk->type->ops->partition_get_type_id != NULL); + return part->disk->type->ops->partition_get_type_id (part); +} + +/** + * Set the type-uuid of the partition \p part. This will only work if the disk label + * supports it. + */ +int +ped_partition_set_type_uuid (PedPartition *part, const uint8_t* uuid) +{ + PED_ASSERT (part != NULL); + PED_ASSERT (part->disk != NULL); + PED_ASSERT (ped_partition_is_active (part)); + + if (!_assert_partition_type_uuid_feature (part->disk->type)) + return 0; + + PED_ASSERT (part->disk->type->ops->partition_set_type_uuid != NULL); + return part->disk->type->ops->partition_set_type_uuid (part, uuid); +} + +/** + * Get the type-uuid of the partition \p part. This will only work if the disk label + * supports it. + */ +uint8_t* +ped_partition_get_type_uuid (const PedPartition *part) +{ + PED_ASSERT (part != NULL); + PED_ASSERT (part->disk != NULL); + PED_ASSERT (ped_partition_is_active (part)); + + if (!_assert_partition_type_uuid_feature (part->disk->type)) + return NULL; + + PED_ASSERT (part->disk->type->ops->partition_get_type_uuid != NULL); + return part->disk->type->ops->partition_get_type_uuid (part); +} + +/** + * Get the uuid of the partition \p part. This will only work if the disk label + * supports it. + */ +uint8_t* +ped_partition_get_uuid (const PedPartition *part) +{ + PED_ASSERT (part != NULL); + PED_ASSERT (part->disk != NULL); + PED_ASSERT (ped_partition_is_active (part)); + + if (!_assert_partition_uuid_feature (part->disk->type)) + return NULL; + + PED_ASSERT (part->disk->type->ops->partition_get_uuid != NULL); + return part->disk->type->ops->partition_get_uuid (part); +} + /** @} */ /** @@ -1552,8 +1718,11 @@ ped_disk_next_partition (const PedDisk* disk, const PedPartition* part) return part->part_list ? part->part_list : part->next; if (part->next) return part->next; - if (part->type & PED_PARTITION_LOGICAL) + if (part->type & PED_PARTITION_LOGICAL) { + if (!ped_disk_extended_partition (disk)) + return NULL; return ped_disk_extended_partition (disk)->next; + } return NULL; } @@ -1794,7 +1963,7 @@ _partition_get_overlap_constraint (PedPartition* part, PedGeometry* geom) if (walk) max_end = walk->geom.start - 1; - if (min_start >= max_end) + if (min_start > max_end) return NULL; ped_geometry_init (&free_space, part->disk->dev, @@ -2413,6 +2582,8 @@ ped_partition_flag_get_name (PedPartitionFlag flag) return N_("bls_boot"); case PED_PARTITION_LINUX_HOME: return N_("linux-home"); + case PED_PARTITION_NO_AUTOMOUNT: + return N_("no_automount"); default: ped_exception_throw ( diff --git a/libparted/exception.c b/libparted/exception.c index 334562b..1d95853 100644 --- a/libparted/exception.c +++ b/libparted/exception.c @@ -1,6 +1,6 @@ /* libparted - a library for manipulating disk partitions - Copyright (C) 1999-2000, 2007-2014, 2019-2022 Free Software Foundation, + Copyright (C) 1999-2000, 2007-2014, 2019-2023 Free Software Foundation, Inc. This program is free software; you can redistribute it and/or modify diff --git a/libparted/filesys.c b/libparted/filesys.c index 576372c..f67a4e8 100644 --- a/libparted/filesys.c +++ b/libparted/filesys.c @@ -1,6 +1,6 @@ /* libparted - a library for manipulating disk partitions - Copyright (C) 1999-2001, 2007-2014, 2019-2022 Free Software Foundation, + Copyright (C) 1999-2001, 2007-2014, 2019-2023 Free Software Foundation, Inc. This program is free software; you can redistribute it and/or modify diff --git a/libparted/fs/Makefile.am b/libparted/fs/Makefile.am index 2f345f3..41a60d9 100644 --- a/libparted/fs/Makefile.am +++ b/libparted/fs/Makefile.am @@ -1,5 +1,5 @@ # This file is part of GNU Parted -# Copyright (C) 1999-2001, 2007, 2009-2014, 2019-2022 Free Software Foundation, +# Copyright (C) 1999-2001, 2007, 2009-2014, 2019-2023 Free Software Foundation, # Inc. # # This file may be modified and/or distributed without restriction. @@ -65,7 +65,7 @@ EXTRA_DIST = \ # For details, see the "Updating library version information" section of # "info libtool". CURRENT = 0 -REVISION = 4 +REVISION = 5 AGE = 0 sym_file = $(srcdir)/fsresize.sym diff --git a/libparted/fs/Makefile.in b/libparted/fs/Makefile.in index ff84898..3b552b8 100644 --- a/libparted/fs/Makefile.in +++ b/libparted/fs/Makefile.in @@ -15,7 +15,7 @@ @SET_MAKE@ # This file is part of GNU Parted -# Copyright (C) 1999-2001, 2007, 2009-2014, 2019-2022 Free Software Foundation, +# Copyright (C) 1999-2001, 2007, 2009-2014, 2019-2023 Free Software Foundation, # Inc. # # This file may be modified and/or distributed without restriction. @@ -76,9 +76,6 @@ am__make_running_with_option = \ test $$has_opt = yes am__make_dryrun = (target_option=n; $(am__make_running_with_option)) am__make_keepgoing = (target_option=k; $(am__make_running_with_option)) -pkgdatadir = $(datadir)/@PACKAGE@ -pkgincludedir = $(includedir)/@PACKAGE@ -pkglibdir = $(libdir)/@PACKAGE@ am__cd = CDPATH="$${ZSH_VERSION+.}$(PATH_SEPARATOR)" && cd install_sh_DATA = $(install_sh) -c -m 644 install_sh_PROGRAM = $(install_sh) -c @@ -99,7 +96,9 @@ am__aclocal_m4_deps = $(top_srcdir)/m4/00gnulib.m4 \ $(top_srcdir)/m4/__inline.m4 \ $(top_srcdir)/m4/absolute-header.m4 $(top_srcdir)/m4/alloca.m4 \ $(top_srcdir)/m4/arpa_inet_h.m4 $(top_srcdir)/m4/assert.m4 \ - $(top_srcdir)/m4/btowc.m4 $(top_srcdir)/m4/builtin-expect.m4 \ + $(top_srcdir)/m4/assert_h.m4 $(top_srcdir)/m4/btowc.m4 \ + $(top_srcdir)/m4/build-to-host.m4 \ + $(top_srcdir)/m4/builtin-expect.m4 $(top_srcdir)/m4/c-bool.m4 \ $(top_srcdir)/m4/calloc.m4 $(top_srcdir)/m4/canonicalize.m4 \ $(top_srcdir)/m4/clock_time.m4 $(top_srcdir)/m4/close.m4 \ $(top_srcdir)/m4/codeset.m4 $(top_srcdir)/m4/config-h.m4 \ @@ -107,7 +106,7 @@ am__aclocal_m4_deps = $(top_srcdir)/m4/00gnulib.m4 \ $(top_srcdir)/m4/double-slash-root.m4 $(top_srcdir)/m4/dup2.m4 \ $(top_srcdir)/m4/eealloc.m4 $(top_srcdir)/m4/environ.m4 \ $(top_srcdir)/m4/errno_h.m4 $(top_srcdir)/m4/error.m4 \ - $(top_srcdir)/m4/extensions.m4 \ + $(top_srcdir)/m4/error_h.m4 $(top_srcdir)/m4/extensions.m4 \ $(top_srcdir)/m4/extern-inline.m4 $(top_srcdir)/m4/fcntl-o.m4 \ $(top_srcdir)/m4/fcntl.m4 $(top_srcdir)/m4/fcntl_h.m4 \ $(top_srcdir)/m4/fdopen.m4 $(top_srcdir)/m4/flexmember.m4 \ @@ -139,10 +138,11 @@ am__aclocal_m4_deps = $(top_srcdir)/m4/00gnulib.m4 \ $(top_srcdir)/m4/malloc.m4 $(top_srcdir)/m4/malloca.m4 \ $(top_srcdir)/m4/manywarnings.m4 $(top_srcdir)/m4/mbrtowc.m4 \ $(top_srcdir)/m4/mbsinit.m4 $(top_srcdir)/m4/mbstate_t.m4 \ - $(top_srcdir)/m4/mbtowc.m4 $(top_srcdir)/m4/mempcpy.m4 \ - $(top_srcdir)/m4/minmax.m4 $(top_srcdir)/m4/mkdir.m4 \ - $(top_srcdir)/m4/mkstemp.m4 $(top_srcdir)/m4/mmap-anon.m4 \ - $(top_srcdir)/m4/mode_t.m4 $(top_srcdir)/m4/msvc-inval.m4 \ + $(top_srcdir)/m4/mbtowc.m4 $(top_srcdir)/m4/memchr.m4 \ + $(top_srcdir)/m4/mempcpy.m4 $(top_srcdir)/m4/minmax.m4 \ + $(top_srcdir)/m4/mkdir.m4 $(top_srcdir)/m4/mkstemp.m4 \ + $(top_srcdir)/m4/mmap-anon.m4 $(top_srcdir)/m4/mode_t.m4 \ + $(top_srcdir)/m4/msvc-inval.m4 \ $(top_srcdir)/m4/msvc-nothrow.m4 $(top_srcdir)/m4/multiarch.m4 \ $(top_srcdir)/m4/musl.m4 $(top_srcdir)/m4/nanosleep.m4 \ $(top_srcdir)/m4/netinet_in_h.m4 \ @@ -173,29 +173,29 @@ am__aclocal_m4_deps = $(top_srcdir)/m4/00gnulib.m4 \ $(top_srcdir)/m4/socklen.m4 $(top_srcdir)/m4/sockpfaf.m4 \ $(top_srcdir)/m4/ssize_t.m4 $(top_srcdir)/m4/stat-time.m4 \ $(top_srcdir)/m4/stat.m4 $(top_srcdir)/m4/stdalign.m4 \ - $(top_srcdir)/m4/stdarg.m4 $(top_srcdir)/m4/stdbool.m4 \ - $(top_srcdir)/m4/stddef_h.m4 $(top_srcdir)/m4/stdint.m4 \ - $(top_srcdir)/m4/stdio_h.m4 $(top_srcdir)/m4/stdlib_h.m4 \ - $(top_srcdir)/m4/strdup.m4 $(top_srcdir)/m4/strerror.m4 \ - $(top_srcdir)/m4/strerror_r.m4 $(top_srcdir)/m4/string_h.m4 \ - $(top_srcdir)/m4/strtoll.m4 $(top_srcdir)/m4/strtoull.m4 \ - $(top_srcdir)/m4/symlink.m4 $(top_srcdir)/m4/sys_ioctl_h.m4 \ + $(top_srcdir)/m4/stdarg.m4 $(top_srcdir)/m4/stddef_h.m4 \ + $(top_srcdir)/m4/stdint.m4 $(top_srcdir)/m4/stdio_h.m4 \ + $(top_srcdir)/m4/stdlib_h.m4 $(top_srcdir)/m4/strdup.m4 \ + $(top_srcdir)/m4/strerror.m4 $(top_srcdir)/m4/strerror_r.m4 \ + $(top_srcdir)/m4/string_h.m4 $(top_srcdir)/m4/strtoll.m4 \ + $(top_srcdir)/m4/strtoull.m4 $(top_srcdir)/m4/symlink.m4 \ + $(top_srcdir)/m4/sys_ioctl_h.m4 \ $(top_srcdir)/m4/sys_random_h.m4 \ $(top_srcdir)/m4/sys_select_h.m4 \ $(top_srcdir)/m4/sys_socket_h.m4 \ $(top_srcdir)/m4/sys_stat_h.m4 $(top_srcdir)/m4/sys_time_h.m4 \ $(top_srcdir)/m4/sys_types_h.m4 $(top_srcdir)/m4/sys_uio_h.m4 \ $(top_srcdir)/m4/tempname.m4 $(top_srcdir)/m4/thread.m4 \ - $(top_srcdir)/m4/threadlib.m4 $(top_srcdir)/m4/time_h.m4 \ - $(top_srcdir)/m4/unistd_h.m4 $(top_srcdir)/m4/unlink.m4 \ - $(top_srcdir)/m4/unlinkdir.m4 $(top_srcdir)/m4/usleep.m4 \ - $(top_srcdir)/m4/version-etc.m4 $(top_srcdir)/m4/visibility.m4 \ - $(top_srcdir)/m4/warn-on-use.m4 $(top_srcdir)/m4/warnings.m4 \ - $(top_srcdir)/m4/wchar_h.m4 $(top_srcdir)/m4/wchar_t.m4 \ - $(top_srcdir)/m4/wcrtomb.m4 $(top_srcdir)/m4/wctob.m4 \ - $(top_srcdir)/m4/wctomb.m4 $(top_srcdir)/m4/wctype_h.m4 \ - $(top_srcdir)/m4/wint_t.m4 $(top_srcdir)/m4/xalloc.m4 \ - $(top_srcdir)/m4/xstrtol.m4 $(top_srcdir)/m4/year2038.m4 \ + $(top_srcdir)/m4/threadlib.m4 $(top_srcdir)/m4/time.m4 \ + $(top_srcdir)/m4/time_h.m4 $(top_srcdir)/m4/unistd_h.m4 \ + $(top_srcdir)/m4/unlink.m4 $(top_srcdir)/m4/unlinkdir.m4 \ + $(top_srcdir)/m4/usleep.m4 $(top_srcdir)/m4/version-etc.m4 \ + $(top_srcdir)/m4/visibility.m4 $(top_srcdir)/m4/warn-on-use.m4 \ + $(top_srcdir)/m4/warnings.m4 $(top_srcdir)/m4/wchar_h.m4 \ + $(top_srcdir)/m4/wchar_t.m4 $(top_srcdir)/m4/wcrtomb.m4 \ + $(top_srcdir)/m4/wctob.m4 $(top_srcdir)/m4/wctomb.m4 \ + $(top_srcdir)/m4/wctype_h.m4 $(top_srcdir)/m4/wint_t.m4 \ + $(top_srcdir)/m4/xalloc.m4 $(top_srcdir)/m4/xstrtol.m4 \ $(top_srcdir)/m4/yield.m4 $(top_srcdir)/m4/zzgnulib.m4 \ $(top_srcdir)/configure.ac am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \ @@ -345,6 +345,9 @@ am__define_uniq_tagged_files = \ am__DIST_COMMON = $(srcdir)/Makefile.in \ $(top_srcdir)/build-aux/depcomp DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST) +pkgdatadir = @pkgdatadir@ +pkgincludedir = @pkgincludedir@ +pkglibdir = @pkglibdir@ pkglibexecdir = @pkglibexecdir@ ACLOCAL = @ACLOCAL@ ALLOCA = @ALLOCA@ @@ -354,6 +357,7 @@ AM_DEFAULT_VERBOSITY = @AM_DEFAULT_VERBOSITY@ APPLE_UNIVERSAL_BUILD = @APPLE_UNIVERSAL_BUILD@ AR = @AR@ ARFLAGS = @ARFLAGS@ +ASSERT_H = @ASSERT_H@ AUTOCONF = @AUTOCONF@ AUTOHEADER = @AUTOHEADER@ AUTOMAKE = @AUTOMAKE@ @@ -370,6 +374,7 @@ CFLAGS = @CFLAGS@ CFLAG_VISIBILITY = @CFLAG_VISIBILITY@ CHECK_CFLAGS = @CHECK_CFLAGS@ CHECK_LIBS = @CHECK_LIBS@ +CLOCK_TIME_LIB = @CLOCK_TIME_LIB@ CONFIG_INCLUDE = @CONFIG_INCLUDE@ CPP = @CPP@ CPPFLAGS = @CPPFLAGS@ @@ -394,12 +399,14 @@ ENOLINK_VALUE = @ENOLINK_VALUE@ EOVERFLOW_HIDDEN = @EOVERFLOW_HIDDEN@ EOVERFLOW_VALUE = @EOVERFLOW_VALUE@ ERRNO_H = @ERRNO_H@ +ERROR_H = @ERROR_H@ ETAGS = @ETAGS@ EXEEXT = @EXEEXT@ FGREP = @FGREP@ FILECMD = @FILECMD@ GETOPT_CDEFS_H = @GETOPT_CDEFS_H@ GETOPT_H = @GETOPT_H@ +GETRANDOM_LIB = @GETRANDOM_LIB@ GETTEXT_MACRO_VERSION = @GETTEXT_MACRO_VERSION@ GL_CFLAG_ALLOW_WARNINGS = @GL_CFLAG_ALLOW_WARNINGS@ GL_CFLAG_GNULIB_WARNINGS = @GL_CFLAG_GNULIB_WARNINGS@ @@ -415,6 +422,7 @@ GL_GNULIB_CALLOC_GNU = @GL_GNULIB_CALLOC_GNU@ GL_GNULIB_CALLOC_POSIX = @GL_GNULIB_CALLOC_POSIX@ GL_GNULIB_CANONICALIZE_FILE_NAME = @GL_GNULIB_CANONICALIZE_FILE_NAME@ GL_GNULIB_CHDIR = @GL_GNULIB_CHDIR@ +GL_GNULIB_CHMOD = @GL_GNULIB_CHMOD@ GL_GNULIB_CHOWN = @GL_GNULIB_CHOWN@ GL_GNULIB_CLOSE = @GL_GNULIB_CLOSE@ GL_GNULIB_CONNECT = @GL_GNULIB_CONNECT@ @@ -488,6 +496,7 @@ GL_GNULIB_GETPAGESIZE = @GL_GNULIB_GETPAGESIZE@ GL_GNULIB_GETPASS = @GL_GNULIB_GETPASS@ GL_GNULIB_GETPASS_GNU = @GL_GNULIB_GETPASS_GNU@ GL_GNULIB_GETPEERNAME = @GL_GNULIB_GETPEERNAME@ +GL_GNULIB_GETPROGNAME = @GL_GNULIB_GETPROGNAME@ GL_GNULIB_GETRANDOM = @GL_GNULIB_GETRANDOM@ GL_GNULIB_GETSOCKNAME = @GL_GNULIB_GETSOCKNAME@ GL_GNULIB_GETSOCKOPT = @GL_GNULIB_GETSOCKOPT@ @@ -585,6 +594,7 @@ GL_GNULIB_MEMCHR = @GL_GNULIB_MEMCHR@ GL_GNULIB_MEMMEM = @GL_GNULIB_MEMMEM@ GL_GNULIB_MEMPCPY = @GL_GNULIB_MEMPCPY@ GL_GNULIB_MEMRCHR = @GL_GNULIB_MEMRCHR@ +GL_GNULIB_MEMSET_EXPLICIT = @GL_GNULIB_MEMSET_EXPLICIT@ GL_GNULIB_MKDIR = @GL_GNULIB_MKDIR@ GL_GNULIB_MKDIRAT = @GL_GNULIB_MKDIRAT@ GL_GNULIB_MKDTEMP = @GL_GNULIB_MKDTEMP@ @@ -705,6 +715,7 @@ GL_GNULIB_STRVERSCMP = @GL_GNULIB_STRVERSCMP@ GL_GNULIB_SYMLINK = @GL_GNULIB_SYMLINK@ GL_GNULIB_SYMLINKAT = @GL_GNULIB_SYMLINKAT@ GL_GNULIB_SYSTEM_POSIX = @GL_GNULIB_SYSTEM_POSIX@ +GL_GNULIB_TIME = @GL_GNULIB_TIME@ GL_GNULIB_TIMEGM = @GL_GNULIB_TIMEGM@ GL_GNULIB_TIMESPEC_GET = @GL_GNULIB_TIMESPEC_GET@ GL_GNULIB_TIMESPEC_GETRES = @GL_GNULIB_TIMESPEC_GETRES@ @@ -779,6 +790,7 @@ GMSGFMT_015 = @GMSGFMT_015@ GNULIBHEADERS_OVERRIDE_WINT_T = @GNULIBHEADERS_OVERRIDE_WINT_T@ GNULIB_GETTIMEOFDAY = @GNULIB_GETTIMEOFDAY@ GREP = @GREP@ +HARD_LOCALE_LIB = @HARD_LOCALE_LIB@ HAVE_ACCEPT4 = @HAVE_ACCEPT4@ HAVE_ALIGNED_ALLOC = @HAVE_ALIGNED_ALLOC@ HAVE_ALLOCA_H = @HAVE_ALLOCA_H@ @@ -809,6 +821,7 @@ HAVE_DECL_GETLOGIN = @HAVE_DECL_GETLOGIN@ HAVE_DECL_GETLOGIN_R = @HAVE_DECL_GETLOGIN_R@ HAVE_DECL_GETPAGESIZE = @HAVE_DECL_GETPAGESIZE@ HAVE_DECL_GETUSERSHELL = @HAVE_DECL_GETUSERSHELL@ +HAVE_DECL_GETW = @HAVE_DECL_GETW@ HAVE_DECL_IMAXABS = @HAVE_DECL_IMAXABS@ HAVE_DECL_IMAXDIV = @HAVE_DECL_IMAXDIV@ HAVE_DECL_INET_NTOP = @HAVE_DECL_INET_NTOP@ @@ -818,6 +831,7 @@ HAVE_DECL_LOCALTIME_R = @HAVE_DECL_LOCALTIME_R@ HAVE_DECL_MEMMEM = @HAVE_DECL_MEMMEM@ HAVE_DECL_MEMRCHR = @HAVE_DECL_MEMRCHR@ HAVE_DECL_OBSTACK_PRINTF = @HAVE_DECL_OBSTACK_PRINTF@ +HAVE_DECL_PUTW = @HAVE_DECL_PUTW@ HAVE_DECL_SETENV = @HAVE_DECL_SETENV@ HAVE_DECL_SETHOSTNAME = @HAVE_DECL_SETHOSTNAME@ HAVE_DECL_SETSTATE = @HAVE_DECL_SETSTATE@ @@ -840,6 +854,9 @@ HAVE_DECL_WCWIDTH = @HAVE_DECL_WCWIDTH@ HAVE_DPRINTF = @HAVE_DPRINTF@ HAVE_DUP3 = @HAVE_DUP3@ HAVE_DUPLOCALE = @HAVE_DUPLOCALE@ +HAVE_ERROR = @HAVE_ERROR@ +HAVE_ERROR_AT_LINE = @HAVE_ERROR_AT_LINE@ +HAVE_ERROR_H = @HAVE_ERROR_H@ HAVE_EUIDACCESS = @HAVE_EUIDACCESS@ HAVE_EXECVPE = @HAVE_EXECVPE@ HAVE_EXPLICIT_BZERO = @HAVE_EXPLICIT_BZERO@ @@ -867,12 +884,15 @@ HAVE_GETLOGIN = @HAVE_GETLOGIN@ HAVE_GETOPT_H = @HAVE_GETOPT_H@ HAVE_GETPAGESIZE = @HAVE_GETPAGESIZE@ HAVE_GETPASS = @HAVE_GETPASS@ +HAVE_GETPROGNAME = @HAVE_GETPROGNAME@ HAVE_GETRANDOM = @HAVE_GETRANDOM@ HAVE_GETSUBOPT = @HAVE_GETSUBOPT@ HAVE_GETTIMEOFDAY = @HAVE_GETTIMEOFDAY@ HAVE_GETUMASK = @HAVE_GETUMASK@ HAVE_GRANTPT = @HAVE_GRANTPT@ HAVE_GROUP_MEMBER = @HAVE_GROUP_MEMBER@ +HAVE_IMAXABS = @HAVE_IMAXABS@ +HAVE_IMAXDIV = @HAVE_IMAXDIV@ HAVE_IMAXDIV_T = @HAVE_IMAXDIV_T@ HAVE_INITSTATE = @HAVE_INITSTATE@ HAVE_INTTYPES_H = @HAVE_INTTYPES_H@ @@ -899,6 +919,7 @@ HAVE_MBSNRTOWCS = @HAVE_MBSNRTOWCS@ HAVE_MBSRTOWCS = @HAVE_MBSRTOWCS@ HAVE_MBTOWC = @HAVE_MBTOWC@ HAVE_MEMPCPY = @HAVE_MEMPCPY@ +HAVE_MEMSET_EXPLICIT = @HAVE_MEMSET_EXPLICIT@ HAVE_MKDIRAT = @HAVE_MKDIRAT@ HAVE_MKDTEMP = @HAVE_MKDTEMP@ HAVE_MKFIFO = @HAVE_MKFIFO@ @@ -1107,7 +1128,6 @@ HAVE_WMEMPCPY = @HAVE_WMEMPCPY@ HAVE_WMEMSET = @HAVE_WMEMSET@ HAVE_WS2TCPIP_H = @HAVE_WS2TCPIP_H@ HAVE_XLOCALE_H = @HAVE_XLOCALE_H@ -HAVE__BOOL = @HAVE__BOOL@ HAVE__EXIT = @HAVE__EXIT@ IGNORE_UNUSED_LIBRARIES_CFLAGS = @IGNORE_UNUSED_LIBRARIES_CFLAGS@ INCLUDE_NEXT = @INCLUDE_NEXT@ @@ -1174,15 +1194,20 @@ LT_REVISION = @LT_REVISION@ LT_SYS_LIBRARY_PATH = @LT_SYS_LIBRARY_PATH@ MAKEINFO = @MAKEINFO@ MANIFEST_TOOL = @MANIFEST_TOOL@ +MBRTOWC_LIB = @MBRTOWC_LIB@ MKDIR_P = @MKDIR_P@ MSGFMT = @MSGFMT@ MSGFMT_015 = @MSGFMT_015@ MSGMERGE = @MSGMERGE@ +NANOSLEEP_LIB = @NANOSLEEP_LIB@ NETINET_IN_H = @NETINET_IN_H@ NEXT_ARPA_INET_H = @NEXT_ARPA_INET_H@ +NEXT_ASSERT_H = @NEXT_ASSERT_H@ NEXT_AS_FIRST_DIRECTIVE_ARPA_INET_H = @NEXT_AS_FIRST_DIRECTIVE_ARPA_INET_H@ +NEXT_AS_FIRST_DIRECTIVE_ASSERT_H = @NEXT_AS_FIRST_DIRECTIVE_ASSERT_H@ NEXT_AS_FIRST_DIRECTIVE_CTYPE_H = @NEXT_AS_FIRST_DIRECTIVE_CTYPE_H@ NEXT_AS_FIRST_DIRECTIVE_ERRNO_H = @NEXT_AS_FIRST_DIRECTIVE_ERRNO_H@ +NEXT_AS_FIRST_DIRECTIVE_ERROR_H = @NEXT_AS_FIRST_DIRECTIVE_ERROR_H@ NEXT_AS_FIRST_DIRECTIVE_FCNTL_H = @NEXT_AS_FIRST_DIRECTIVE_FCNTL_H@ NEXT_AS_FIRST_DIRECTIVE_GETOPT_H = @NEXT_AS_FIRST_DIRECTIVE_GETOPT_H@ NEXT_AS_FIRST_DIRECTIVE_INTTYPES_H = @NEXT_AS_FIRST_DIRECTIVE_INTTYPES_H@ @@ -1213,6 +1238,7 @@ NEXT_AS_FIRST_DIRECTIVE_WCHAR_H = @NEXT_AS_FIRST_DIRECTIVE_WCHAR_H@ NEXT_AS_FIRST_DIRECTIVE_WCTYPE_H = @NEXT_AS_FIRST_DIRECTIVE_WCTYPE_H@ NEXT_CTYPE_H = @NEXT_CTYPE_H@ NEXT_ERRNO_H = @NEXT_ERRNO_H@ +NEXT_ERROR_H = @NEXT_ERROR_H@ NEXT_FCNTL_H = @NEXT_FCNTL_H@ NEXT_GETOPT_H = @NEXT_GETOPT_H@ NEXT_INTTYPES_H = @NEXT_INTTYPES_H@ @@ -1268,6 +1294,7 @@ PRAGMA_COLUMNS = @PRAGMA_COLUMNS@ PRAGMA_SYSTEM_HEADER = @PRAGMA_SYSTEM_HEADER@ PRIPTR_PREFIX = @PRIPTR_PREFIX@ PTHREAD_H_DEFINES_STRUCT_TIMESPEC = @PTHREAD_H_DEFINES_STRUCT_TIMESPEC@ +PTHREAD_SIGMASK_LIB = @PTHREAD_SIGMASK_LIB@ PTRDIFF_T_SUFFIX = @PTRDIFF_T_SUFFIX@ RANLIB = @RANLIB@ REPLACE_ACCESS = @REPLACE_ACCESS@ @@ -1276,6 +1303,7 @@ REPLACE_BTOWC = @REPLACE_BTOWC@ REPLACE_CALLOC_FOR_CALLOC_GNU = @REPLACE_CALLOC_FOR_CALLOC_GNU@ REPLACE_CALLOC_FOR_CALLOC_POSIX = @REPLACE_CALLOC_FOR_CALLOC_POSIX@ REPLACE_CANONICALIZE_FILE_NAME = @REPLACE_CANONICALIZE_FILE_NAME@ +REPLACE_CHMOD = @REPLACE_CHMOD@ REPLACE_CHOWN = @REPLACE_CHOWN@ REPLACE_CLOSE = @REPLACE_CLOSE@ REPLACE_COPY_FILE_RANGE = @REPLACE_COPY_FILE_RANGE@ @@ -1284,7 +1312,10 @@ REPLACE_CTIME = @REPLACE_CTIME@ REPLACE_DPRINTF = @REPLACE_DPRINTF@ REPLACE_DUP = @REPLACE_DUP@ REPLACE_DUP2 = @REPLACE_DUP2@ +REPLACE_DUP3 = @REPLACE_DUP3@ REPLACE_DUPLOCALE = @REPLACE_DUPLOCALE@ +REPLACE_ERROR = @REPLACE_ERROR@ +REPLACE_ERROR_AT_LINE = @REPLACE_ERROR_AT_LINE@ REPLACE_EXECL = @REPLACE_EXECL@ REPLACE_EXECLE = @REPLACE_EXECLE@ REPLACE_EXECLP = @REPLACE_EXECLP@ @@ -1297,6 +1328,7 @@ REPLACE_FCHMODAT = @REPLACE_FCHMODAT@ REPLACE_FCHOWNAT = @REPLACE_FCHOWNAT@ REPLACE_FCLOSE = @REPLACE_FCLOSE@ REPLACE_FCNTL = @REPLACE_FCNTL@ +REPLACE_FDATASYNC = @REPLACE_FDATASYNC@ REPLACE_FDOPEN = @REPLACE_FDOPEN@ REPLACE_FFLUSH = @REPLACE_FFLUSH@ REPLACE_FFSLL = @REPLACE_FFSLL@ @@ -1319,15 +1351,21 @@ REPLACE_GETCWD = @REPLACE_GETCWD@ REPLACE_GETDELIM = @REPLACE_GETDELIM@ REPLACE_GETDOMAINNAME = @REPLACE_GETDOMAINNAME@ REPLACE_GETDTABLESIZE = @REPLACE_GETDTABLESIZE@ +REPLACE_GETENTROPY = @REPLACE_GETENTROPY@ REPLACE_GETGROUPS = @REPLACE_GETGROUPS@ REPLACE_GETLINE = @REPLACE_GETLINE@ +REPLACE_GETLOADAVG = @REPLACE_GETLOADAVG@ REPLACE_GETLOGIN_R = @REPLACE_GETLOGIN_R@ REPLACE_GETPAGESIZE = @REPLACE_GETPAGESIZE@ REPLACE_GETPASS = @REPLACE_GETPASS@ REPLACE_GETPASS_FOR_GETPASS_GNU = @REPLACE_GETPASS_FOR_GETPASS_GNU@ +REPLACE_GETPROGNAME = @REPLACE_GETPROGNAME@ REPLACE_GETRANDOM = @REPLACE_GETRANDOM@ +REPLACE_GETSUBOPT = @REPLACE_GETSUBOPT@ REPLACE_GETTIMEOFDAY = @REPLACE_GETTIMEOFDAY@ REPLACE_GMTIME = @REPLACE_GMTIME@ +REPLACE_IMAXABS = @REPLACE_IMAXABS@ +REPLACE_IMAXDIV = @REPLACE_IMAXDIV@ REPLACE_INET_NTOP = @REPLACE_INET_NTOP@ REPLACE_INET_PTON = @REPLACE_INET_PTON@ REPLACE_INITSTATE = @REPLACE_INITSTATE@ @@ -1356,11 +1394,14 @@ REPLACE_MBSTATE_T = @REPLACE_MBSTATE_T@ REPLACE_MBTOWC = @REPLACE_MBTOWC@ REPLACE_MEMCHR = @REPLACE_MEMCHR@ REPLACE_MEMMEM = @REPLACE_MEMMEM@ +REPLACE_MEMPCPY = @REPLACE_MEMPCPY@ REPLACE_MKDIR = @REPLACE_MKDIR@ REPLACE_MKFIFO = @REPLACE_MKFIFO@ REPLACE_MKFIFOAT = @REPLACE_MKFIFOAT@ REPLACE_MKNOD = @REPLACE_MKNOD@ REPLACE_MKNODAT = @REPLACE_MKNODAT@ +REPLACE_MKOSTEMP = @REPLACE_MKOSTEMP@ +REPLACE_MKOSTEMPS = @REPLACE_MKOSTEMPS@ REPLACE_MKSTEMP = @REPLACE_MKSTEMP@ REPLACE_MKTIME = @REPLACE_MKTIME@ REPLACE_NANOSLEEP = @REPLACE_NANOSLEEP@ @@ -1371,8 +1412,10 @@ REPLACE_OBSTACK_PRINTF = @REPLACE_OBSTACK_PRINTF@ REPLACE_OPEN = @REPLACE_OPEN@ REPLACE_OPENAT = @REPLACE_OPENAT@ REPLACE_PERROR = @REPLACE_PERROR@ +REPLACE_PIPE2 = @REPLACE_PIPE2@ REPLACE_POPEN = @REPLACE_POPEN@ REPLACE_POSIX_MEMALIGN = @REPLACE_POSIX_MEMALIGN@ +REPLACE_POSIX_OPENPT = @REPLACE_POSIX_OPENPT@ REPLACE_PREAD = @REPLACE_PREAD@ REPLACE_PRINTF = @REPLACE_PRINTF@ REPLACE_PSELECT = @REPLACE_PSELECT@ @@ -1450,6 +1493,7 @@ REPLACE_RMDIR = @REPLACE_RMDIR@ REPLACE_SCHED_YIELD = @REPLACE_SCHED_YIELD@ REPLACE_SELECT = @REPLACE_SELECT@ REPLACE_SETENV = @REPLACE_SETENV@ +REPLACE_SETHOSTNAME = @REPLACE_SETHOSTNAME@ REPLACE_SETLOCALE = @REPLACE_SETLOCALE@ REPLACE_SETSTATE = @REPLACE_SETSTATE@ REPLACE_SLEEP = @REPLACE_SLEEP@ @@ -1458,6 +1502,7 @@ REPLACE_SPRINTF = @REPLACE_SPRINTF@ REPLACE_STAT = @REPLACE_STAT@ REPLACE_STDIO_READ_FUNCS = @REPLACE_STDIO_READ_FUNCS@ REPLACE_STDIO_WRITE_FUNCS = @REPLACE_STDIO_WRITE_FUNCS@ +REPLACE_STPCPY = @REPLACE_STPCPY@ REPLACE_STPNCPY = @REPLACE_STPNCPY@ REPLACE_STRCASESTR = @REPLACE_STRCASESTR@ REPLACE_STRCHRNUL = @REPLACE_STRCHRNUL@ @@ -1484,7 +1529,9 @@ REPLACE_STRUCT_LCONV = @REPLACE_STRUCT_LCONV@ REPLACE_STRUCT_TIMEVAL = @REPLACE_STRUCT_TIMEVAL@ REPLACE_SYMLINK = @REPLACE_SYMLINK@ REPLACE_SYMLINKAT = @REPLACE_SYMLINKAT@ +REPLACE_TIME = @REPLACE_TIME@ REPLACE_TIMEGM = @REPLACE_TIMEGM@ +REPLACE_TIMESPEC_GET = @REPLACE_TIMESPEC_GET@ REPLACE_TMPFILE = @REPLACE_TMPFILE@ REPLACE_TOWLOWER = @REPLACE_TOWLOWER@ REPLACE_TRUNCATE = @REPLACE_TRUNCATE@ @@ -1510,15 +1557,20 @@ REPLACE_WCSWIDTH = @REPLACE_WCSWIDTH@ REPLACE_WCTOB = @REPLACE_WCTOB@ REPLACE_WCTOMB = @REPLACE_WCTOMB@ REPLACE_WCWIDTH = @REPLACE_WCWIDTH@ +REPLACE_WMEMPCPY = @REPLACE_WMEMPCPY@ REPLACE_WRITE = @REPLACE_WRITE@ +REPLACE__EXIT = @REPLACE__EXIT@ +SCHED_YIELD_LIB = @SCHED_YIELD_LIB@ SED = @SED@ +SELECT_LIB = @SELECT_LIB@ +SETLOCALE_LIB = @SETLOCALE_LIB@ +SETLOCALE_NULL_LIB = @SETLOCALE_NULL_LIB@ SET_MAKE = @SET_MAKE@ SHELL = @SHELL@ SIG_ATOMIC_T_SUFFIX = @SIG_ATOMIC_T_SUFFIX@ SIZE_T_SUFFIX = @SIZE_T_SUFFIX@ -STDALIGN_H = @STDALIGN_H@ STDARG_H = @STDARG_H@ -STDBOOL_H = @STDBOOL_H@ +STDCKDINT_H = @STDCKDINT_H@ STDDEF_H = @STDDEF_H@ STDINT_H = @STDINT_H@ STRIP = @STRIP@ @@ -1562,6 +1614,8 @@ am__quote = @am__quote@ am__tar = @am__tar@ am__untar = @am__untar@ bindir = @bindir@ +bindir_c = @bindir_c@ +bindir_c_make = @bindir_c_make@ build = @build@ build_alias = @build_alias@ build_cpu = @build_cpu@ @@ -1569,10 +1623,20 @@ build_os = @build_os@ build_vendor = @build_vendor@ builddir = @builddir@ datadir = @datadir@ +datadir_c = @datadir_c@ +datadir_c_make = @datadir_c_make@ datarootdir = @datarootdir@ +datarootdir_c = @datarootdir_c@ +datarootdir_c_make = @datarootdir_c_make@ docdir = @docdir@ +docdir_c = @docdir_c@ +docdir_c_make = @docdir_c_make@ dvidir = @dvidir@ +dvidir_c = @dvidir_c@ +dvidir_c_make = @dvidir_c_make@ exec_prefix = @exec_prefix@ +exec_prefix_c = @exec_prefix_c@ +exec_prefix_c_make = @exec_prefix_c_make@ gl_LIBOBJDEPS = @gl_LIBOBJDEPS@ gl_LIBOBJS = @gl_LIBOBJS@ gl_LTLIBOBJS = @gl_LTLIBOBJS@ @@ -1586,26 +1650,68 @@ host_cpu = @host_cpu@ host_os = @host_os@ host_vendor = @host_vendor@ htmldir = @htmldir@ +htmldir_c = @htmldir_c@ +htmldir_c_make = @htmldir_c_make@ includedir = @includedir@ +includedir_c = @includedir_c@ +includedir_c_make = @includedir_c_make@ infodir = @infodir@ +infodir_c = @infodir_c@ +infodir_c_make = @infodir_c_make@ install_sh = @install_sh@ libdir = @libdir@ +libdir_c = @libdir_c@ +libdir_c_make = @libdir_c_make@ libexecdir = @libexecdir@ +libexecdir_c = @libexecdir_c@ +libexecdir_c_make = @libexecdir_c_make@ lispdir = @lispdir@ +lispdir_c = @lispdir_c@ +lispdir_c_make = @lispdir_c_make@ localedir = @localedir@ +localedir_c = @localedir_c@ +localedir_c_make = @localedir_c_make@ localstatedir = @localstatedir@ +localstatedir_c = @localstatedir_c@ +localstatedir_c_make = @localstatedir_c_make@ mandir = @mandir@ +mandir_c = @mandir_c@ +mandir_c_make = @mandir_c_make@ mkdir_p = @mkdir_p@ oldincludedir = @oldincludedir@ +oldincludedir_c = @oldincludedir_c@ +oldincludedir_c_make = @oldincludedir_c_make@ pdfdir = @pdfdir@ +pdfdir_c = @pdfdir_c@ +pdfdir_c_make = @pdfdir_c_make@ +pkgdatadir_c = @pkgdatadir_c@ +pkgdatadir_c_make = @pkgdatadir_c_make@ +pkgincludedir_c = @pkgincludedir_c@ +pkgincludedir_c_make = @pkgincludedir_c_make@ +pkglibdir_c = @pkglibdir_c@ +pkglibdir_c_make = @pkglibdir_c_make@ +pkglibexecdir_c = @pkglibexecdir_c@ +pkglibexecdir_c_make = @pkglibexecdir_c_make@ prefix = @prefix@ +prefix_c = @prefix_c@ +prefix_c_make = @prefix_c_make@ program_transform_name = @program_transform_name@ psdir = @psdir@ +psdir_c = @psdir_c@ +psdir_c_make = @psdir_c_make@ runstatedir = @runstatedir@ +runstatedir_c = @runstatedir_c@ +runstatedir_c_make = @runstatedir_c_make@ sbindir = @sbindir@ +sbindir_c = @sbindir_c@ +sbindir_c_make = @sbindir_c_make@ sharedstatedir = @sharedstatedir@ +sharedstatedir_c = @sharedstatedir_c@ +sharedstatedir_c_make = @sharedstatedir_c_make@ srcdir = @srcdir@ sysconfdir = @sysconfdir@ +sysconfdir_c = @sysconfdir_c@ +sysconfdir_c_make = @sysconfdir_c_make@ target_alias = @target_alias@ top_build_prefix = @top_build_prefix@ top_builddir = @top_builddir@ @@ -1664,7 +1770,7 @@ EXTRA_DIST = hfs/DOC hfs/HISTORY hfs/TODO fsresize.sym # For details, see the "Updating library version information" section of # "info libtool". CURRENT = 0 -REVISION = 4 +REVISION = 5 AGE = 0 sym_file = $(srcdir)/fsresize.sym libparted_fs_resize_la_LDFLAGS = \ diff --git a/libparted/fs/amiga/a-interface.c b/libparted/fs/amiga/a-interface.c index a7f31ed..0ae84dd 100644 --- a/libparted/fs/amiga/a-interface.c +++ b/libparted/fs/amiga/a-interface.c @@ -1,6 +1,6 @@ /* interface.c -- parted support amiga file systems - Copyright (C) 1998-2000, 2007, 2009-2014, 2019-2022 Free Software + Copyright (C) 1998-2000, 2007, 2009-2014, 2019-2023 Free Software Foundation, Inc. This program is free software; you can redistribute it and/or modify diff --git a/libparted/fs/amiga/affs.c b/libparted/fs/amiga/affs.c index f11201e..750eab2 100644 --- a/libparted/fs/amiga/affs.c +++ b/libparted/fs/amiga/affs.c @@ -1,6 +1,6 @@ /* affs.c -- parted support for affs file systems - Copyright (C) 1998-2000, 2007, 2009-2014, 2019-2022 Free Software + Copyright (C) 1998-2000, 2007, 2009-2014, 2019-2023 Free Software Foundation, Inc. This program is free software; you can redistribute it and/or modify diff --git a/libparted/fs/amiga/affs.h b/libparted/fs/amiga/affs.h index c313a63..d1650f2 100644 --- a/libparted/fs/amiga/affs.h +++ b/libparted/fs/amiga/affs.h @@ -1,7 +1,7 @@ /* affs.h -- parted suppoer for affs filesystems header files - Copyright (C) 1998-2000, 2007, 2009-2014, 2019-2022 Free Software + Copyright (C) 1998-2000, 2007, 2009-2014, 2019-2023 Free Software Foundation, Inc. This program is free software; you can redistribute it and/or modify diff --git a/libparted/fs/amiga/amiga.c b/libparted/fs/amiga/amiga.c index 980740e..1a909fc 100644 --- a/libparted/fs/amiga/amiga.c +++ b/libparted/fs/amiga/amiga.c @@ -1,6 +1,6 @@ /* libparted/fs_amiga - amiga file system support. - Copyright (C) 2000-2001, 2007, 2009-2014, 2019-2022 Free Software + Copyright (C) 2000-2001, 2007, 2009-2014, 2019-2023 Free Software Foundation, Inc. This program is free software; you can redistribute it and/or modify diff --git a/libparted/fs/amiga/amiga.h b/libparted/fs/amiga/amiga.h index 79b1bc0..30f5b82 100644 --- a/libparted/fs/amiga/amiga.h +++ b/libparted/fs/amiga/amiga.h @@ -1,6 +1,6 @@ /* util.h -- amiga partition table headers. - Copyright (C) 1998-2000, 2007, 2009-2014, 2019-2022 Free Software + Copyright (C) 1998-2000, 2007, 2009-2014, 2019-2023 Free Software Foundation, Inc. This program is free software; you can redistribute it and/or modify diff --git a/libparted/fs/amiga/apfs.c b/libparted/fs/amiga/apfs.c index c1455e1..aeaa1f3 100644 --- a/libparted/fs/amiga/apfs.c +++ b/libparted/fs/amiga/apfs.c @@ -1,6 +1,6 @@ /* apfs.c -- parted support for apfs file systems - Copyright (C) 1998-2000, 2007, 2009-2014, 2019-2022 Free Software + Copyright (C) 1998-2000, 2007, 2009-2014, 2019-2023 Free Software Foundation, Inc. This program is free software; you can redistribute it and/or modify diff --git a/libparted/fs/amiga/apfs.h b/libparted/fs/amiga/apfs.h index 7788bfc..972941b 100644 --- a/libparted/fs/amiga/apfs.h +++ b/libparted/fs/amiga/apfs.h @@ -1,6 +1,6 @@ /* apfs.h -- parted support for apfs file systems header files - Copyright (C) 1998-2000, 2007, 2009-2014, 2019-2022 Free Software + Copyright (C) 1998-2000, 2007, 2009-2014, 2019-2023 Free Software Foundation, Inc. This program is free software; you can redistribute it and/or modify diff --git a/libparted/fs/amiga/asfs.c b/libparted/fs/amiga/asfs.c index d3d55d6..c4c65e5 100644 --- a/libparted/fs/amiga/asfs.c +++ b/libparted/fs/amiga/asfs.c @@ -1,6 +1,6 @@ /* asfs.c -- parted asfs filesystem support - Copyright (C) 1998-2000, 2007, 2009-2014, 2019-2022 Free Software + Copyright (C) 1998-2000, 2007, 2009-2014, 2019-2023 Free Software Foundation, Inc. This program is free software; you can redistribute it and/or modify diff --git a/libparted/fs/amiga/asfs.h b/libparted/fs/amiga/asfs.h index 3fb6930..2b70a94 100644 --- a/libparted/fs/amiga/asfs.h +++ b/libparted/fs/amiga/asfs.h @@ -1,6 +1,6 @@ /* asfs.h -- parted asfs filesystem support header files - Copyright (C) 1998-2000, 2007, 2009-2014, 2019-2022 Free Software + Copyright (C) 1998-2000, 2007, 2009-2014, 2019-2023 Free Software Foundation, Inc. This program is free software; you can redistribute it and/or modify diff --git a/libparted/fs/btrfs/btrfs.c b/libparted/fs/btrfs/btrfs.c index f78dc47..6eded8b 100644 --- a/libparted/fs/btrfs/btrfs.c +++ b/libparted/fs/btrfs/btrfs.c @@ -1,6 +1,6 @@ /* libparted - a library for manipulating disk partitions - Copyright (C) 2013-2014, 2019-2022 Free Software Foundation, Inc. + Copyright (C) 2013-2014, 2019-2023 Free Software Foundation, Inc. This program is free software; you can redistribute it and/or modify it under the terms of the GNU General Public License as published by diff --git a/libparted/fs/ext2/ext2.h b/libparted/fs/ext2/ext2.h index f9b5ecd..d23f63e 100644 --- a/libparted/fs/ext2/ext2.h +++ b/libparted/fs/ext2/ext2.h @@ -1,6 +1,6 @@ /* ext2.h -- ext2 header - Copyright (C) 1998-2000, 2007, 2009-2014, 2019-2022 Free Software + Copyright (C) 1998-2000, 2007, 2009-2014, 2019-2023 Free Software Foundation, Inc. This program is free software; you can redistribute it and/or modify diff --git a/libparted/fs/ext2/ext2_fs.h b/libparted/fs/ext2/ext2_fs.h index a62aca1..1eca7ab 100644 --- a/libparted/fs/ext2/ext2_fs.h +++ b/libparted/fs/ext2/ext2_fs.h @@ -15,7 +15,7 @@ /* * EXT2_*_*() convienience macros added by Andrew Clausen <clausen@gnu.org> - * Copyright (C) 2000, 2009-2014, 2019-2022 Free Software Foundation, Inc. + * Copyright (C) 2000, 2009-2014, 2019-2023 Free Software Foundation, Inc. */ #ifndef _EXT2_FS_H diff --git a/libparted/fs/ext2/interface.c b/libparted/fs/ext2/interface.c index 3b47866..7e0b197 100644 --- a/libparted/fs/ext2/interface.c +++ b/libparted/fs/ext2/interface.c @@ -1,6 +1,6 @@ /* interface.c -- parted binding glue to libext2resize - Copyright (C) 1998-2000, 2007-2014, 2019-2022 Free Software Foundation, + Copyright (C) 1998-2000, 2007-2014, 2019-2023 Free Software Foundation, Inc. This program is free software; you can redistribute it and/or modify diff --git a/libparted/fs/f2fs/f2fs.c b/libparted/fs/f2fs/f2fs.c index 6d32670..68ed092 100644 --- a/libparted/fs/f2fs/f2fs.c +++ b/libparted/fs/f2fs/f2fs.c @@ -1,6 +1,6 @@ /* libparted/fs/f2fs - Flash-Friendly File System - Copyright (C) 2020-2022 Free Software Foundation, Inc. + Copyright (C) 2020-2023 Free Software Foundation, Inc. This program is free software; you can redistribute it and/or modify it under the terms of the GNU General Public License as published by diff --git a/libparted/fs/f2fs/f2fs.h b/libparted/fs/f2fs/f2fs.h index 88ad0eb..9341337 100644 --- a/libparted/fs/f2fs/f2fs.h +++ b/libparted/fs/f2fs/f2fs.h @@ -1,6 +1,6 @@ /* libparted/fs/f2fs - Flash-Friendly File System - Copyright (C) 2020-2022 Free Software Foundation, Inc. + Copyright (C) 2020-2023 Free Software Foundation, Inc. This program is free software; you can redistribute it and/or modify it under the terms of the GNU General Public License as published by diff --git a/libparted/fs/fat/bootsector.c b/libparted/fs/fat/bootsector.c index 1b0e3b9..f02685b 100644 --- a/libparted/fs/fat/bootsector.c +++ b/libparted/fs/fat/bootsector.c @@ -1,6 +1,6 @@ /* libparted - Copyright (C) 1998-2000, 2002, 2004, 2007, 2009-2014, 2019-2022 Free + Copyright (C) 1998-2000, 2002, 2004, 2007, 2009-2014, 2019-2023 Free Software Foundation, Inc. This program is free software; you can redistribute it and/or modify diff --git a/libparted/fs/fat/bootsector.h b/libparted/fs/fat/bootsector.h index 9f3cd6a..328ba2f 100644 --- a/libparted/fs/fat/bootsector.h +++ b/libparted/fs/fat/bootsector.h @@ -1,6 +1,6 @@ /* libparted - Copyright (C) 1998-2000, 2007, 2009-2014, 2019-2022 Free Software + Copyright (C) 1998-2000, 2007, 2009-2014, 2019-2023 Free Software Foundation, Inc. This program is free software; you can redistribute it and/or modify diff --git a/libparted/fs/fat/count.h b/libparted/fs/fat/count.h index 3d8cb21..bb7d6af 100644 --- a/libparted/fs/fat/count.h +++ b/libparted/fs/fat/count.h @@ -1,6 +1,6 @@ /* libparted - Copyright (C) 1999-2000, 2007-2014, 2019-2022 Free Software Foundation, + Copyright (C) 1999-2000, 2007-2014, 2019-2023 Free Software Foundation, Inc. This program is free software; you can redistribute it and/or modify diff --git a/libparted/fs/fat/fat.c b/libparted/fs/fat/fat.c index 4df802e..c04f178 100644 --- a/libparted/fs/fat/fat.c +++ b/libparted/fs/fat/fat.c @@ -1,6 +1,6 @@ /* libparted - Copyright (C) 1998-2001, 2007-2014, 2019-2022 Free Software Foundation, + Copyright (C) 1998-2001, 2007-2014, 2019-2023 Free Software Foundation, Inc. This program is free software; you can redistribute it and/or modify diff --git a/libparted/fs/fat/fat.h b/libparted/fs/fat/fat.h index fa6a567..f5302d9 100644 --- a/libparted/fs/fat/fat.h +++ b/libparted/fs/fat/fat.h @@ -1,6 +1,6 @@ /* libparted - Copyright (C) 1998-2001, 2007, 2009-2014, 2019-2022 Free Software + Copyright (C) 1998-2001, 2007, 2009-2014, 2019-2023 Free Software Foundation, Inc. This program is free software; you can redistribute it and/or modify diff --git a/libparted/fs/hfs/hfs.c b/libparted/fs/hfs/hfs.c index dca1be6..3684646 100644 --- a/libparted/fs/hfs/hfs.c +++ b/libparted/fs/hfs/hfs.c @@ -1,6 +1,6 @@ /* libparted - a library for manipulating disk partitions - Copyright (C) 2000, 2003-2005, 2007, 2009-2014, 2019-2022 Free Software + Copyright (C) 2000, 2003-2005, 2007, 2009-2014, 2019-2023 Free Software Foundation, Inc. This program is free software; you can redistribute it and/or modify diff --git a/libparted/fs/hfs/hfs.h b/libparted/fs/hfs/hfs.h index c9ceade..5b9138c 100644 --- a/libparted/fs/hfs/hfs.h +++ b/libparted/fs/hfs/hfs.h @@ -1,6 +1,6 @@ /* libparted - a library for manipulating disk partitions - Copyright (C) 2003-2005, 2007, 2009-2014, 2019-2022 Free Software + Copyright (C) 2003-2005, 2007, 2009-2014, 2019-2023 Free Software Foundation, Inc. This program is free software; you can redistribute it and/or modify diff --git a/libparted/fs/hfs/probe.c b/libparted/fs/hfs/probe.c index d2119f7..d02ca28 100644 --- a/libparted/fs/hfs/probe.c +++ b/libparted/fs/hfs/probe.c @@ -1,6 +1,6 @@ /* libparted - a library for manipulating disk partitions - Copyright (C) 2004-2005, 2007, 2009-2014, 2019-2022 Free Software + Copyright (C) 2004-2005, 2007, 2009-2014, 2019-2023 Free Software Foundation, Inc. This program is free software; you can redistribute it and/or modify diff --git a/libparted/fs/hfs/probe.h b/libparted/fs/hfs/probe.h index 3362d52..29ce880 100644 --- a/libparted/fs/hfs/probe.h +++ b/libparted/fs/hfs/probe.h @@ -1,6 +1,6 @@ /* libparted - a library for manipulating disk partitions - Copyright (C) 2004-2005, 2007, 2009-2014, 2019-2022 Free Software + Copyright (C) 2004-2005, 2007, 2009-2014, 2019-2023 Free Software Foundation, Inc. This program is free software; you can redistribute it and/or modify diff --git a/libparted/fs/jfs/jfs.c b/libparted/fs/jfs/jfs.c index 5ff8848..f00bd9f 100644 --- a/libparted/fs/jfs/jfs.c +++ b/libparted/fs/jfs/jfs.c @@ -1,6 +1,6 @@ /* libparted - a library for manipulating disk partitions - Copyright (C) 2001, 2007, 2009-2014, 2019-2022 Free Software Foundation, + Copyright (C) 2001, 2007, 2009-2014, 2019-2023 Free Software Foundation, Inc. This program is free software; you can redistribute it and/or modify diff --git a/libparted/fs/linux_swap/linux_swap.c b/libparted/fs/linux_swap/linux_swap.c index 8878cdf..60100b0 100644 --- a/libparted/fs/linux_swap/linux_swap.c +++ b/libparted/fs/linux_swap/linux_swap.c @@ -1,6 +1,6 @@ /* libparted - a library for manipulating disk partitions - Copyright (C) 1999-2000, 2002, 2007-2014, 2019-2022 Free Software + Copyright (C) 1999-2000, 2002, 2007-2014, 2019-2023 Free Software Foundation, Inc. This program is free software; you can redistribute it and/or modify diff --git a/libparted/fs/nilfs2/nilfs2.c b/libparted/fs/nilfs2/nilfs2.c index fa45fb5..6204542 100644 --- a/libparted/fs/nilfs2/nilfs2.c +++ b/libparted/fs/nilfs2/nilfs2.c @@ -3,7 +3,7 @@ * * Written by Jiro SEKIBA <jir@unicus.jp> * - * Copyright (C) 2011-2014, 2019-2022 Free Software Foundation, Inc. + * Copyright (C) 2011-2014, 2019-2023 Free Software Foundation, Inc. * * This program is free software; you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by diff --git a/libparted/fs/ntfs/ntfs.c b/libparted/fs/ntfs/ntfs.c index aaa29c5..9829f39 100644 --- a/libparted/fs/ntfs/ntfs.c +++ b/libparted/fs/ntfs/ntfs.c @@ -1,6 +1,6 @@ /* libparted - a library for manipulating disk partitions - Copyright (C) 2000, 2007, 2009-2014, 2019-2022 Free Software Foundation, + Copyright (C) 2000, 2007, 2009-2014, 2019-2023 Free Software Foundation, Inc. This program is free software; you can redistribute it and/or modify diff --git a/libparted/fs/r/fat/bootsector.c b/libparted/fs/r/fat/bootsector.c index 31ed7ef..85ccc0f 100644 --- a/libparted/fs/r/fat/bootsector.c +++ b/libparted/fs/r/fat/bootsector.c @@ -1,6 +1,6 @@ /* libparted - Copyright (C) 1998-2000, 2002, 2004, 2007, 2009-2014, 2019-2022 Free + Copyright (C) 1998-2000, 2002, 2004, 2007, 2009-2014, 2019-2023 Free Software Foundation, Inc. This program is free software; you can redistribute it and/or modify diff --git a/libparted/fs/r/fat/bootsector.h b/libparted/fs/r/fat/bootsector.h index d9fbf0b..699d6cf 100644 --- a/libparted/fs/r/fat/bootsector.h +++ b/libparted/fs/r/fat/bootsector.h @@ -1,6 +1,6 @@ /* libparted - Copyright (C) 1998-2000, 2007, 2009-2014, 2019-2022 Free Software + Copyright (C) 1998-2000, 2007, 2009-2014, 2019-2023 Free Software Foundation, Inc. This program is free software; you can redistribute it and/or modify diff --git a/libparted/fs/r/fat/calc.c b/libparted/fs/r/fat/calc.c index 45c1709..4ba1030 100644 --- a/libparted/fs/r/fat/calc.c +++ b/libparted/fs/r/fat/calc.c @@ -1,6 +1,6 @@ /* libparted - Copyright (C) 1998-2000, 2002, 2007, 2009-2014, 2019-2022 Free Software + Copyright (C) 1998-2000, 2002, 2007, 2009-2014, 2019-2023 Free Software Foundation, Inc. This program is free software; you can redistribute it and/or modify diff --git a/libparted/fs/r/fat/calc.h b/libparted/fs/r/fat/calc.h index d078713..d4884c1 100644 --- a/libparted/fs/r/fat/calc.h +++ b/libparted/fs/r/fat/calc.h @@ -1,6 +1,6 @@ /* libparted - Copyright (C) 1998-2000, 2007, 2009-2014, 2019-2022 Free Software + Copyright (C) 1998-2000, 2007, 2009-2014, 2019-2023 Free Software Foundation, Inc. This program is free software; you can redistribute it and/or modify diff --git a/libparted/fs/r/fat/clstdup.c b/libparted/fs/r/fat/clstdup.c index 4c18259..6a3054f 100644 --- a/libparted/fs/r/fat/clstdup.c +++ b/libparted/fs/r/fat/clstdup.c @@ -1,6 +1,6 @@ /* libparted - Copyright (C) 1998-2001, 2007, 2009-2014, 2019-2022 Free Software + Copyright (C) 1998-2001, 2007, 2009-2014, 2019-2023 Free Software Foundation, Inc. This program is free software; you can redistribute it and/or modify diff --git a/libparted/fs/r/fat/clstdup.h b/libparted/fs/r/fat/clstdup.h index 46c249d..23e51b4 100644 --- a/libparted/fs/r/fat/clstdup.h +++ b/libparted/fs/r/fat/clstdup.h @@ -1,6 +1,6 @@ /* libparted - Copyright (C) 1999, 2007, 2009-2014, 2019-2022 Free Software Foundation, + Copyright (C) 1999, 2007, 2009-2014, 2019-2023 Free Software Foundation, Inc. This program is free software; you can redistribute it and/or modify diff --git a/libparted/fs/r/fat/context.c b/libparted/fs/r/fat/context.c index 82b1b95..c782323 100644 --- a/libparted/fs/r/fat/context.c +++ b/libparted/fs/r/fat/context.c @@ -1,6 +1,6 @@ /* libparted - Copyright (C) 1998-2000, 2007, 2009-2014, 2019-2022 Free Software + Copyright (C) 1998-2000, 2007, 2009-2014, 2019-2023 Free Software Foundation, Inc. This program is free software; you can redistribute it and/or modify diff --git a/libparted/fs/r/fat/context.h b/libparted/fs/r/fat/context.h index 0c8c8f6..9a76a47 100644 --- a/libparted/fs/r/fat/context.h +++ b/libparted/fs/r/fat/context.h @@ -1,6 +1,6 @@ /* libparted - Copyright (C) 1999-2000, 2007, 2009-2014, 2019-2022 Free Software + Copyright (C) 1999-2000, 2007, 2009-2014, 2019-2023 Free Software Foundation, Inc. This program is free software; you can redistribute it and/or modify diff --git a/libparted/fs/r/fat/count.c b/libparted/fs/r/fat/count.c index d5f60ac..e23404b 100644 --- a/libparted/fs/r/fat/count.c +++ b/libparted/fs/r/fat/count.c @@ -1,6 +1,6 @@ /* libparted - Copyright (C) 1998-2000, 2007, 2009-2014, 2019-2022 Free Software + Copyright (C) 1998-2000, 2007, 2009-2014, 2019-2023 Free Software Foundation, Inc. This program is free software; you can redistribute it and/or modify diff --git a/libparted/fs/r/fat/count.h b/libparted/fs/r/fat/count.h index 3d8cb21..bb7d6af 100644 --- a/libparted/fs/r/fat/count.h +++ b/libparted/fs/r/fat/count.h @@ -1,6 +1,6 @@ /* libparted - Copyright (C) 1999-2000, 2007-2014, 2019-2022 Free Software Foundation, + Copyright (C) 1999-2000, 2007-2014, 2019-2023 Free Software Foundation, Inc. This program is free software; you can redistribute it and/or modify diff --git a/libparted/fs/r/fat/fat.c b/libparted/fs/r/fat/fat.c index 969d07e..6583b5b 100644 --- a/libparted/fs/r/fat/fat.c +++ b/libparted/fs/r/fat/fat.c @@ -1,6 +1,6 @@ /* libparted - Copyright (C) 1998-2001, 2007-2014, 2019-2022 Free Software Foundation, + Copyright (C) 1998-2001, 2007-2014, 2019-2023 Free Software Foundation, Inc. This program is free software; you can redistribute it and/or modify diff --git a/libparted/fs/r/fat/fat.h b/libparted/fs/r/fat/fat.h index a969a29..54f0669 100644 --- a/libparted/fs/r/fat/fat.h +++ b/libparted/fs/r/fat/fat.h @@ -1,6 +1,6 @@ /* libparted - Copyright (C) 1998-2001, 2007, 2009-2014, 2019-2022 Free Software + Copyright (C) 1998-2001, 2007, 2009-2014, 2019-2023 Free Software Foundation, Inc. This program is free software; you can redistribute it and/or modify diff --git a/libparted/fs/r/fat/fatio.c b/libparted/fs/r/fat/fatio.c index 1c852b4..3a947ff 100644 --- a/libparted/fs/r/fat/fatio.c +++ b/libparted/fs/r/fat/fatio.c @@ -1,6 +1,6 @@ /* libparted - Copyright (C) 1998-2000, 2007, 2009-2014, 2019-2022 Free Software + Copyright (C) 1998-2000, 2007, 2009-2014, 2019-2023 Free Software Foundation, Inc. This program is free software; you can redistribute it and/or modify diff --git a/libparted/fs/r/fat/fatio.h b/libparted/fs/r/fat/fatio.h index afa026c..53ebed7 100644 --- a/libparted/fs/r/fat/fatio.h +++ b/libparted/fs/r/fat/fatio.h @@ -1,6 +1,6 @@ /* libparted - Copyright (C) 1998-2000, 2007, 2009-2014, 2019-2022 Free Software + Copyright (C) 1998-2000, 2007, 2009-2014, 2019-2023 Free Software Foundation, Inc. This program is free software; you can redistribute it and/or modify diff --git a/libparted/fs/r/fat/resize.c b/libparted/fs/r/fat/resize.c index b72afa1..78dede4 100644 --- a/libparted/fs/r/fat/resize.c +++ b/libparted/fs/r/fat/resize.c @@ -1,6 +1,6 @@ /* libparted - Copyright (C) 1998-2000, 2007-2014, 2019-2022 Free Software Foundation, + Copyright (C) 1998-2000, 2007-2014, 2019-2023 Free Software Foundation, Inc. This program is free software; you can redistribute it and/or modify diff --git a/libparted/fs/r/fat/table.c b/libparted/fs/r/fat/table.c index 4f0d60c..ec0907f 100644 --- a/libparted/fs/r/fat/table.c +++ b/libparted/fs/r/fat/table.c @@ -1,6 +1,6 @@ /* libparted - Copyright (C) 1998-2000, 2007-2014, 2019-2022 Free Software Foundation, + Copyright (C) 1998-2000, 2007-2014, 2019-2023 Free Software Foundation, Inc. This program is free software; you can redistribute it and/or modify diff --git a/libparted/fs/r/fat/table.h b/libparted/fs/r/fat/table.h index 96cc866..a70241b 100644 --- a/libparted/fs/r/fat/table.h +++ b/libparted/fs/r/fat/table.h @@ -1,6 +1,6 @@ /* libparted - Copyright (C) 1998-2000, 2007, 2009-2014, 2019-2022 Free Software + Copyright (C) 1998-2000, 2007, 2009-2014, 2019-2023 Free Software Foundation, Inc. This program is free software; you can redistribute it and/or modify diff --git a/libparted/fs/r/fat/traverse.c b/libparted/fs/r/fat/traverse.c index 736bd63..42eeff9 100644 --- a/libparted/fs/r/fat/traverse.c +++ b/libparted/fs/r/fat/traverse.c @@ -1,6 +1,6 @@ /* libparted - Copyright (C) 1998-2000, 2005, 2007-2014, 2019-2022 Free Software + Copyright (C) 1998-2000, 2005, 2007-2014, 2019-2023 Free Software Foundation, Inc. This program is free software; you can redistribute it and/or modify diff --git a/libparted/fs/r/fat/traverse.h b/libparted/fs/r/fat/traverse.h index 4e56051..02318ba 100644 --- a/libparted/fs/r/fat/traverse.h +++ b/libparted/fs/r/fat/traverse.h @@ -1,6 +1,6 @@ /* libparted - Copyright (C) 1998-2000, 2007-2014, 2019-2022 Free Software Foundation, + Copyright (C) 1998-2000, 2007-2014, 2019-2023 Free Software Foundation, Inc. This program is free software; you can redistribute it and/or modify diff --git a/libparted/fs/r/filesys.c b/libparted/fs/r/filesys.c index 9dafd71..856238c 100644 --- a/libparted/fs/r/filesys.c +++ b/libparted/fs/r/filesys.c @@ -1,5 +1,5 @@ /* libparted - a library for manipulating disk partitions - Copyright (C) 1999-2001, 2007-2014, 2019-2022 Free Software Foundation, + Copyright (C) 1999-2001, 2007-2014, 2019-2023 Free Software Foundation, Inc. This program is free software; you can redistribute it and/or modify @@ -198,8 +198,9 @@ ped_file_system_close (PedFileSystem* fs) { PED_ASSERT (fs != NULL); PedDevice *dev = fs->geom->dev; + close_fn_t fn = close_fn (fs->type->name); - if (!(close_fn (fs->type->name) (fs))) + if (!fn || !(fn (fs))) goto error_close_dev; ped_device_close (dev); return 1; diff --git a/libparted/fs/r/hfs/advfs.c b/libparted/fs/r/hfs/advfs.c index b37d76f..cb66e9e 100644 --- a/libparted/fs/r/hfs/advfs.c +++ b/libparted/fs/r/hfs/advfs.c @@ -1,6 +1,6 @@ /* libparted - a library for manipulating disk partitions - Copyright (C) 2004-2005, 2007, 2009-2014, 2019-2022 Free Software + Copyright (C) 2004-2005, 2007, 2009-2014, 2019-2023 Free Software Foundation, Inc. This program is free software; you can redistribute it and/or modify diff --git a/libparted/fs/r/hfs/advfs.h b/libparted/fs/r/hfs/advfs.h index edae12a..094298e 100644 --- a/libparted/fs/r/hfs/advfs.h +++ b/libparted/fs/r/hfs/advfs.h @@ -1,6 +1,6 @@ /* libparted - a library for manipulating disk partitions - Copyright (C) 2004, 2007, 2009-2014, 2019-2022 Free Software Foundation, + Copyright (C) 2004, 2007, 2009-2014, 2019-2023 Free Software Foundation, Inc. This program is free software; you can redistribute it and/or modify diff --git a/libparted/fs/r/hfs/advfs_plus.c b/libparted/fs/r/hfs/advfs_plus.c index 872ceb2..6104460 100644 --- a/libparted/fs/r/hfs/advfs_plus.c +++ b/libparted/fs/r/hfs/advfs_plus.c @@ -1,6 +1,6 @@ /* libparted - a library for manipulating disk partitions - Copyright (C) 2004-2005, 2007, 2009-2014, 2019-2022 Free Software + Copyright (C) 2004-2005, 2007, 2009-2014, 2019-2023 Free Software Foundation, Inc. This program is free software; you can redistribute it and/or modify diff --git a/libparted/fs/r/hfs/advfs_plus.h b/libparted/fs/r/hfs/advfs_plus.h index bae0d0c..61972c2 100644 --- a/libparted/fs/r/hfs/advfs_plus.h +++ b/libparted/fs/r/hfs/advfs_plus.h @@ -1,6 +1,6 @@ /* libparted - a library for manipulating disk partitions - Copyright (C) 2004, 2007, 2009-2014, 2019-2022 Free Software Foundation, + Copyright (C) 2004, 2007, 2009-2014, 2019-2023 Free Software Foundation, Inc. This program is free software; you can redistribute it and/or modify diff --git a/libparted/fs/r/hfs/cache.c b/libparted/fs/r/hfs/cache.c index 545ff88..255f1fd 100644 --- a/libparted/fs/r/hfs/cache.c +++ b/libparted/fs/r/hfs/cache.c @@ -1,6 +1,6 @@ /* libparted - a library for manipulating disk partitions - Copyright (C) 2004-2005, 2007, 2009-2014, 2019-2022 Free Software + Copyright (C) 2004-2005, 2007, 2009-2014, 2019-2023 Free Software Foundation, Inc. This program is free software; you can redistribute it and/or modify diff --git a/libparted/fs/r/hfs/cache.h b/libparted/fs/r/hfs/cache.h index e10a285..d009fd9 100644 --- a/libparted/fs/r/hfs/cache.h +++ b/libparted/fs/r/hfs/cache.h @@ -1,6 +1,6 @@ /* libparted - a library for manipulating disk partitions - Copyright (C) 2004-2005, 2007, 2009-2014, 2019-2022 Free Software + Copyright (C) 2004-2005, 2007, 2009-2014, 2019-2023 Free Software Foundation, Inc. This program is free software; you can redistribute it and/or modify diff --git a/libparted/fs/r/hfs/file.c b/libparted/fs/r/hfs/file.c index 5cc7c13..6024d84 100644 --- a/libparted/fs/r/hfs/file.c +++ b/libparted/fs/r/hfs/file.c @@ -1,6 +1,6 @@ /* libparted - a library for manipulating disk partitions - Copyright (C) 2004-2005, 2007, 2009-2014, 2019-2022 Free Software + Copyright (C) 2004-2005, 2007, 2009-2014, 2019-2023 Free Software Foundation, Inc. This program is free software; you can redistribute it and/or modify diff --git a/libparted/fs/r/hfs/file.h b/libparted/fs/r/hfs/file.h index c191b20..f8cb485 100644 --- a/libparted/fs/r/hfs/file.h +++ b/libparted/fs/r/hfs/file.h @@ -1,6 +1,6 @@ /* libparted - a library for manipulating disk partitions - Copyright (C) 2004, 2007, 2009-2014, 2019-2022 Free Software Foundation, + Copyright (C) 2004, 2007, 2009-2014, 2019-2023 Free Software Foundation, Inc. This program is free software; you can redistribute it and/or modify diff --git a/libparted/fs/r/hfs/file_plus.c b/libparted/fs/r/hfs/file_plus.c index 12778d8..aeff5ee 100644 --- a/libparted/fs/r/hfs/file_plus.c +++ b/libparted/fs/r/hfs/file_plus.c @@ -1,6 +1,6 @@ /* libparted - a library for manipulating disk partitions - Copyright (C) 2004-2005, 2007, 2009-2014, 2019-2022 Free Software + Copyright (C) 2004-2005, 2007, 2009-2014, 2019-2023 Free Software Foundation, Inc. This program is free software; you can redistribute it and/or modify diff --git a/libparted/fs/r/hfs/file_plus.h b/libparted/fs/r/hfs/file_plus.h index 9500a0c..cd54f3f 100644 --- a/libparted/fs/r/hfs/file_plus.h +++ b/libparted/fs/r/hfs/file_plus.h @@ -1,6 +1,6 @@ /* libparted - a library for manipulating disk partitions - Copyright (C) 2004, 2007, 2009-2014, 2019-2022 Free Software Foundation, + Copyright (C) 2004, 2007, 2009-2014, 2019-2023 Free Software Foundation, Inc. This program is free software; you can redistribute it and/or modify diff --git a/libparted/fs/r/hfs/hfs.c b/libparted/fs/r/hfs/hfs.c index 44741f2..8959b47 100644 --- a/libparted/fs/r/hfs/hfs.c +++ b/libparted/fs/r/hfs/hfs.c @@ -1,6 +1,6 @@ /* libparted - a library for manipulating disk partitions - Copyright (C) 2000, 2003-2005, 2007, 2009-2014, 2019-2022 Free Software + Copyright (C) 2000, 2003-2005, 2007, 2009-2014, 2019-2023 Free Software Foundation, Inc. This program is free software; you can redistribute it and/or modify diff --git a/libparted/fs/r/hfs/hfs.h b/libparted/fs/r/hfs/hfs.h index c9ceade..5b9138c 100644 --- a/libparted/fs/r/hfs/hfs.h +++ b/libparted/fs/r/hfs/hfs.h @@ -1,6 +1,6 @@ /* libparted - a library for manipulating disk partitions - Copyright (C) 2003-2005, 2007, 2009-2014, 2019-2022 Free Software + Copyright (C) 2003-2005, 2007, 2009-2014, 2019-2023 Free Software Foundation, Inc. This program is free software; you can redistribute it and/or modify diff --git a/libparted/fs/r/hfs/journal.c b/libparted/fs/r/hfs/journal.c index b59e5e7..7a2a8dc 100644 --- a/libparted/fs/r/hfs/journal.c +++ b/libparted/fs/r/hfs/journal.c @@ -1,6 +1,6 @@ /* libparted - a library for manipulating disk partitions - Copyright (C) 2004-2005, 2007, 2009-2014, 2019-2022 Free Software + Copyright (C) 2004-2005, 2007, 2009-2014, 2019-2023 Free Software Foundation, Inc. This program is free software; you can redistribute it and/or modify diff --git a/libparted/fs/r/hfs/journal.h b/libparted/fs/r/hfs/journal.h index fdfaba3..66eb2b1 100644 --- a/libparted/fs/r/hfs/journal.h +++ b/libparted/fs/r/hfs/journal.h @@ -1,6 +1,6 @@ /* libparted - a library for manipulating disk partitions - Copyright (C) 2004, 2007, 2009-2014, 2019-2022 Free Software Foundation, + Copyright (C) 2004, 2007, 2009-2014, 2019-2023 Free Software Foundation, Inc. This program is free software; you can redistribute it and/or modify diff --git a/libparted/fs/r/hfs/probe.c b/libparted/fs/r/hfs/probe.c index 463cba1..ee4ae31 100644 --- a/libparted/fs/r/hfs/probe.c +++ b/libparted/fs/r/hfs/probe.c @@ -1,6 +1,6 @@ /* libparted - a library for manipulating disk partitions - Copyright (C) 2004-2005, 2007, 2009-2014, 2019-2022 Free Software + Copyright (C) 2004-2005, 2007, 2009-2014, 2019-2023 Free Software Foundation, Inc. This program is free software; you can redistribute it and/or modify diff --git a/libparted/fs/r/hfs/probe.h b/libparted/fs/r/hfs/probe.h index 854ac4a..21be916 100644 --- a/libparted/fs/r/hfs/probe.h +++ b/libparted/fs/r/hfs/probe.h @@ -1,6 +1,6 @@ /* libparted - a library for manipulating disk partitions - Copyright (C) 2004-2005, 2007, 2009-2014, 2019-2022 Free Software + Copyright (C) 2004-2005, 2007, 2009-2014, 2019-2023 Free Software Foundation, Inc. This program is free software; you can redistribute it and/or modify diff --git a/libparted/fs/r/hfs/reloc.c b/libparted/fs/r/hfs/reloc.c index 9d99f16..05ec76a 100644 --- a/libparted/fs/r/hfs/reloc.c +++ b/libparted/fs/r/hfs/reloc.c @@ -1,6 +1,6 @@ /* libparted - a library for manipulating disk partitions - Copyright (C) 2004-2005, 2007, 2009-2014, 2019-2022 Free Software + Copyright (C) 2004-2005, 2007, 2009-2014, 2019-2023 Free Software Foundation, Inc. This program is free software; you can redistribute it and/or modify diff --git a/libparted/fs/r/hfs/reloc.h b/libparted/fs/r/hfs/reloc.h index be76817..d8b1e6d 100644 --- a/libparted/fs/r/hfs/reloc.h +++ b/libparted/fs/r/hfs/reloc.h @@ -1,6 +1,6 @@ /* libparted - a library for manipulating disk partitions - Copyright (C) 2004, 2007, 2009-2014, 2019-2022 Free Software Foundation, + Copyright (C) 2004, 2007, 2009-2014, 2019-2023 Free Software Foundation, Inc. This program is free software; you can redistribute it and/or modify diff --git a/libparted/fs/r/hfs/reloc_plus.c b/libparted/fs/r/hfs/reloc_plus.c index a1ca742..904929c 100644 --- a/libparted/fs/r/hfs/reloc_plus.c +++ b/libparted/fs/r/hfs/reloc_plus.c @@ -1,6 +1,6 @@ /* libparted - a library for manipulating disk partitions - Copyright (C) 2004-2005, 2007, 2009-2014, 2019-2022 Free Software + Copyright (C) 2004-2005, 2007, 2009-2014, 2019-2023 Free Software Foundation, Inc. This program is free software; you can redistribute it and/or modify diff --git a/libparted/fs/r/hfs/reloc_plus.h b/libparted/fs/r/hfs/reloc_plus.h index 2708115..8c5998a 100644 --- a/libparted/fs/r/hfs/reloc_plus.h +++ b/libparted/fs/r/hfs/reloc_plus.h @@ -1,6 +1,6 @@ /* libparted - a library for manipulating disk partitions - Copyright (C) 2004, 2007, 2009-2014, 2019-2022 Free Software Foundation, + Copyright (C) 2004, 2007, 2009-2014, 2019-2023 Free Software Foundation, Inc. This program is free software; you can redistribute it and/or modify diff --git a/libparted/fs/reiserfs/reiserfs.c b/libparted/fs/reiserfs/reiserfs.c index e41f3ce..0638f3e 100644 --- a/libparted/fs/reiserfs/reiserfs.c +++ b/libparted/fs/reiserfs/reiserfs.c @@ -1,6 +1,6 @@ /* reiserfs.c -- ReiserFS detection - Copyright (C) 2001-2002, 2007, 2009-2014, 2019-2022 Free Software + Copyright (C) 2001-2002, 2007, 2009-2014, 2019-2023 Free Software Foundation, Inc. This program is free software; you can redistribute it and/or modify diff --git a/libparted/fs/reiserfs/reiserfs.h b/libparted/fs/reiserfs/reiserfs.h index a5613da..ee92b62 100644 --- a/libparted/fs/reiserfs/reiserfs.h +++ b/libparted/fs/reiserfs/reiserfs.h @@ -1,6 +1,6 @@ /* libparted - a library for manipulating disk partitions - Copyright (C) 2000, 2007, 2009-2014, 2019-2022 Free Software Foundation, + Copyright (C) 2000, 2007, 2009-2014, 2019-2023 Free Software Foundation, Inc. This program is free software; you can redistribute it and/or modify diff --git a/libparted/fs/udf/udf.c b/libparted/fs/udf/udf.c index a3a4edb..a48a42e 100644 --- a/libparted/fs/udf/udf.c +++ b/libparted/fs/udf/udf.c @@ -1,6 +1,6 @@ /* libparted - a library for manipulating disk partitions - Copyright (C) 2018-2022 Free Software Foundation, Inc. + Copyright (C) 2018-2023 Free Software Foundation, Inc. This program is free software; you can redistribute it and/or modify it under the terms of the GNU General Public License as published by diff --git a/libparted/fs/ufs/ufs.c b/libparted/fs/ufs/ufs.c index 40d6e4e..d2bf421 100644 --- a/libparted/fs/ufs/ufs.c +++ b/libparted/fs/ufs/ufs.c @@ -1,6 +1,6 @@ /* libparted - a library for manipulating disk partitions - Copyright (C) 2001, 2007, 2009-2014, 2019-2022 Free Software Foundation, + Copyright (C) 2001, 2007, 2009-2014, 2019-2023 Free Software Foundation, Inc. This program is free software; you can redistribute it and/or modify diff --git a/libparted/fs/xfs/xfs.c b/libparted/fs/xfs/xfs.c index ec38d23..f5cf96a 100644 --- a/libparted/fs/xfs/xfs.c +++ b/libparted/fs/xfs/xfs.c @@ -1,6 +1,6 @@ /* libparted - a library for manipulating disk partitions - Copyright (C) 2001, 2009-2014, 2019-2022 Free Software Foundation, Inc. + Copyright (C) 2001, 2009-2014, 2019-2023 Free Software Foundation, Inc. This program is free software; you can redistribute it and/or modify it under the terms of the GNU General Public License as published by diff --git a/libparted/labels/Makefile.am b/libparted/labels/Makefile.am index 318f808..edc3860 100644 --- a/libparted/labels/Makefile.am +++ b/libparted/labels/Makefile.am @@ -1,5 +1,5 @@ # This file is part of GNU Parted -# Copyright (C) 1999-2001, 2007-2014, 2019-2022 Free Software Foundation, Inc. +# Copyright (C) 1999-2001, 2007-2014, 2019-2023 Free Software Foundation, Inc. # # This file may be modified and/or distributed without restriction. diff --git a/libparted/labels/Makefile.in b/libparted/labels/Makefile.in index 35f0835..cbf6ef4 100644 --- a/libparted/labels/Makefile.in +++ b/libparted/labels/Makefile.in @@ -15,7 +15,7 @@ @SET_MAKE@ # This file is part of GNU Parted -# Copyright (C) 1999-2001, 2007-2014, 2019-2022 Free Software Foundation, Inc. +# Copyright (C) 1999-2001, 2007-2014, 2019-2023 Free Software Foundation, Inc. # # This file may be modified and/or distributed without restriction. @@ -75,9 +75,6 @@ am__make_running_with_option = \ test $$has_opt = yes am__make_dryrun = (target_option=n; $(am__make_running_with_option)) am__make_keepgoing = (target_option=k; $(am__make_running_with_option)) -pkgdatadir = $(datadir)/@PACKAGE@ -pkgincludedir = $(includedir)/@PACKAGE@ -pkglibdir = $(libdir)/@PACKAGE@ am__cd = CDPATH="$${ZSH_VERSION+.}$(PATH_SEPARATOR)" && cd install_sh_DATA = $(install_sh) -c -m 644 install_sh_PROGRAM = $(install_sh) -c @@ -98,7 +95,9 @@ am__aclocal_m4_deps = $(top_srcdir)/m4/00gnulib.m4 \ $(top_srcdir)/m4/__inline.m4 \ $(top_srcdir)/m4/absolute-header.m4 $(top_srcdir)/m4/alloca.m4 \ $(top_srcdir)/m4/arpa_inet_h.m4 $(top_srcdir)/m4/assert.m4 \ - $(top_srcdir)/m4/btowc.m4 $(top_srcdir)/m4/builtin-expect.m4 \ + $(top_srcdir)/m4/assert_h.m4 $(top_srcdir)/m4/btowc.m4 \ + $(top_srcdir)/m4/build-to-host.m4 \ + $(top_srcdir)/m4/builtin-expect.m4 $(top_srcdir)/m4/c-bool.m4 \ $(top_srcdir)/m4/calloc.m4 $(top_srcdir)/m4/canonicalize.m4 \ $(top_srcdir)/m4/clock_time.m4 $(top_srcdir)/m4/close.m4 \ $(top_srcdir)/m4/codeset.m4 $(top_srcdir)/m4/config-h.m4 \ @@ -106,7 +105,7 @@ am__aclocal_m4_deps = $(top_srcdir)/m4/00gnulib.m4 \ $(top_srcdir)/m4/double-slash-root.m4 $(top_srcdir)/m4/dup2.m4 \ $(top_srcdir)/m4/eealloc.m4 $(top_srcdir)/m4/environ.m4 \ $(top_srcdir)/m4/errno_h.m4 $(top_srcdir)/m4/error.m4 \ - $(top_srcdir)/m4/extensions.m4 \ + $(top_srcdir)/m4/error_h.m4 $(top_srcdir)/m4/extensions.m4 \ $(top_srcdir)/m4/extern-inline.m4 $(top_srcdir)/m4/fcntl-o.m4 \ $(top_srcdir)/m4/fcntl.m4 $(top_srcdir)/m4/fcntl_h.m4 \ $(top_srcdir)/m4/fdopen.m4 $(top_srcdir)/m4/flexmember.m4 \ @@ -138,10 +137,11 @@ am__aclocal_m4_deps = $(top_srcdir)/m4/00gnulib.m4 \ $(top_srcdir)/m4/malloc.m4 $(top_srcdir)/m4/malloca.m4 \ $(top_srcdir)/m4/manywarnings.m4 $(top_srcdir)/m4/mbrtowc.m4 \ $(top_srcdir)/m4/mbsinit.m4 $(top_srcdir)/m4/mbstate_t.m4 \ - $(top_srcdir)/m4/mbtowc.m4 $(top_srcdir)/m4/mempcpy.m4 \ - $(top_srcdir)/m4/minmax.m4 $(top_srcdir)/m4/mkdir.m4 \ - $(top_srcdir)/m4/mkstemp.m4 $(top_srcdir)/m4/mmap-anon.m4 \ - $(top_srcdir)/m4/mode_t.m4 $(top_srcdir)/m4/msvc-inval.m4 \ + $(top_srcdir)/m4/mbtowc.m4 $(top_srcdir)/m4/memchr.m4 \ + $(top_srcdir)/m4/mempcpy.m4 $(top_srcdir)/m4/minmax.m4 \ + $(top_srcdir)/m4/mkdir.m4 $(top_srcdir)/m4/mkstemp.m4 \ + $(top_srcdir)/m4/mmap-anon.m4 $(top_srcdir)/m4/mode_t.m4 \ + $(top_srcdir)/m4/msvc-inval.m4 \ $(top_srcdir)/m4/msvc-nothrow.m4 $(top_srcdir)/m4/multiarch.m4 \ $(top_srcdir)/m4/musl.m4 $(top_srcdir)/m4/nanosleep.m4 \ $(top_srcdir)/m4/netinet_in_h.m4 \ @@ -172,29 +172,29 @@ am__aclocal_m4_deps = $(top_srcdir)/m4/00gnulib.m4 \ $(top_srcdir)/m4/socklen.m4 $(top_srcdir)/m4/sockpfaf.m4 \ $(top_srcdir)/m4/ssize_t.m4 $(top_srcdir)/m4/stat-time.m4 \ $(top_srcdir)/m4/stat.m4 $(top_srcdir)/m4/stdalign.m4 \ - $(top_srcdir)/m4/stdarg.m4 $(top_srcdir)/m4/stdbool.m4 \ - $(top_srcdir)/m4/stddef_h.m4 $(top_srcdir)/m4/stdint.m4 \ - $(top_srcdir)/m4/stdio_h.m4 $(top_srcdir)/m4/stdlib_h.m4 \ - $(top_srcdir)/m4/strdup.m4 $(top_srcdir)/m4/strerror.m4 \ - $(top_srcdir)/m4/strerror_r.m4 $(top_srcdir)/m4/string_h.m4 \ - $(top_srcdir)/m4/strtoll.m4 $(top_srcdir)/m4/strtoull.m4 \ - $(top_srcdir)/m4/symlink.m4 $(top_srcdir)/m4/sys_ioctl_h.m4 \ + $(top_srcdir)/m4/stdarg.m4 $(top_srcdir)/m4/stddef_h.m4 \ + $(top_srcdir)/m4/stdint.m4 $(top_srcdir)/m4/stdio_h.m4 \ + $(top_srcdir)/m4/stdlib_h.m4 $(top_srcdir)/m4/strdup.m4 \ + $(top_srcdir)/m4/strerror.m4 $(top_srcdir)/m4/strerror_r.m4 \ + $(top_srcdir)/m4/string_h.m4 $(top_srcdir)/m4/strtoll.m4 \ + $(top_srcdir)/m4/strtoull.m4 $(top_srcdir)/m4/symlink.m4 \ + $(top_srcdir)/m4/sys_ioctl_h.m4 \ $(top_srcdir)/m4/sys_random_h.m4 \ $(top_srcdir)/m4/sys_select_h.m4 \ $(top_srcdir)/m4/sys_socket_h.m4 \ $(top_srcdir)/m4/sys_stat_h.m4 $(top_srcdir)/m4/sys_time_h.m4 \ $(top_srcdir)/m4/sys_types_h.m4 $(top_srcdir)/m4/sys_uio_h.m4 \ $(top_srcdir)/m4/tempname.m4 $(top_srcdir)/m4/thread.m4 \ - $(top_srcdir)/m4/threadlib.m4 $(top_srcdir)/m4/time_h.m4 \ - $(top_srcdir)/m4/unistd_h.m4 $(top_srcdir)/m4/unlink.m4 \ - $(top_srcdir)/m4/unlinkdir.m4 $(top_srcdir)/m4/usleep.m4 \ - $(top_srcdir)/m4/version-etc.m4 $(top_srcdir)/m4/visibility.m4 \ - $(top_srcdir)/m4/warn-on-use.m4 $(top_srcdir)/m4/warnings.m4 \ - $(top_srcdir)/m4/wchar_h.m4 $(top_srcdir)/m4/wchar_t.m4 \ - $(top_srcdir)/m4/wcrtomb.m4 $(top_srcdir)/m4/wctob.m4 \ - $(top_srcdir)/m4/wctomb.m4 $(top_srcdir)/m4/wctype_h.m4 \ - $(top_srcdir)/m4/wint_t.m4 $(top_srcdir)/m4/xalloc.m4 \ - $(top_srcdir)/m4/xstrtol.m4 $(top_srcdir)/m4/year2038.m4 \ + $(top_srcdir)/m4/threadlib.m4 $(top_srcdir)/m4/time.m4 \ + $(top_srcdir)/m4/time_h.m4 $(top_srcdir)/m4/unistd_h.m4 \ + $(top_srcdir)/m4/unlink.m4 $(top_srcdir)/m4/unlinkdir.m4 \ + $(top_srcdir)/m4/usleep.m4 $(top_srcdir)/m4/version-etc.m4 \ + $(top_srcdir)/m4/visibility.m4 $(top_srcdir)/m4/warn-on-use.m4 \ + $(top_srcdir)/m4/warnings.m4 $(top_srcdir)/m4/wchar_h.m4 \ + $(top_srcdir)/m4/wchar_t.m4 $(top_srcdir)/m4/wcrtomb.m4 \ + $(top_srcdir)/m4/wctob.m4 $(top_srcdir)/m4/wctomb.m4 \ + $(top_srcdir)/m4/wctype_h.m4 $(top_srcdir)/m4/wint_t.m4 \ + $(top_srcdir)/m4/xalloc.m4 $(top_srcdir)/m4/xstrtol.m4 \ $(top_srcdir)/m4/yield.m4 $(top_srcdir)/m4/zzgnulib.m4 \ $(top_srcdir)/configure.ac am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \ @@ -288,6 +288,9 @@ am__define_uniq_tagged_files = \ am__DIST_COMMON = $(srcdir)/Makefile.in \ $(top_srcdir)/build-aux/depcomp DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST) +pkgdatadir = @pkgdatadir@ +pkgincludedir = @pkgincludedir@ +pkglibdir = @pkglibdir@ pkglibexecdir = @pkglibexecdir@ ACLOCAL = @ACLOCAL@ ALLOCA = @ALLOCA@ @@ -297,6 +300,7 @@ AM_DEFAULT_VERBOSITY = @AM_DEFAULT_VERBOSITY@ APPLE_UNIVERSAL_BUILD = @APPLE_UNIVERSAL_BUILD@ AR = @AR@ ARFLAGS = @ARFLAGS@ +ASSERT_H = @ASSERT_H@ AUTOCONF = @AUTOCONF@ AUTOHEADER = @AUTOHEADER@ AUTOMAKE = @AUTOMAKE@ @@ -313,6 +317,7 @@ CFLAGS = @CFLAGS@ CFLAG_VISIBILITY = @CFLAG_VISIBILITY@ CHECK_CFLAGS = @CHECK_CFLAGS@ CHECK_LIBS = @CHECK_LIBS@ +CLOCK_TIME_LIB = @CLOCK_TIME_LIB@ CONFIG_INCLUDE = @CONFIG_INCLUDE@ CPP = @CPP@ CPPFLAGS = @CPPFLAGS@ @@ -337,12 +342,14 @@ ENOLINK_VALUE = @ENOLINK_VALUE@ EOVERFLOW_HIDDEN = @EOVERFLOW_HIDDEN@ EOVERFLOW_VALUE = @EOVERFLOW_VALUE@ ERRNO_H = @ERRNO_H@ +ERROR_H = @ERROR_H@ ETAGS = @ETAGS@ EXEEXT = @EXEEXT@ FGREP = @FGREP@ FILECMD = @FILECMD@ GETOPT_CDEFS_H = @GETOPT_CDEFS_H@ GETOPT_H = @GETOPT_H@ +GETRANDOM_LIB = @GETRANDOM_LIB@ GETTEXT_MACRO_VERSION = @GETTEXT_MACRO_VERSION@ GL_CFLAG_ALLOW_WARNINGS = @GL_CFLAG_ALLOW_WARNINGS@ GL_CFLAG_GNULIB_WARNINGS = @GL_CFLAG_GNULIB_WARNINGS@ @@ -358,6 +365,7 @@ GL_GNULIB_CALLOC_GNU = @GL_GNULIB_CALLOC_GNU@ GL_GNULIB_CALLOC_POSIX = @GL_GNULIB_CALLOC_POSIX@ GL_GNULIB_CANONICALIZE_FILE_NAME = @GL_GNULIB_CANONICALIZE_FILE_NAME@ GL_GNULIB_CHDIR = @GL_GNULIB_CHDIR@ +GL_GNULIB_CHMOD = @GL_GNULIB_CHMOD@ GL_GNULIB_CHOWN = @GL_GNULIB_CHOWN@ GL_GNULIB_CLOSE = @GL_GNULIB_CLOSE@ GL_GNULIB_CONNECT = @GL_GNULIB_CONNECT@ @@ -431,6 +439,7 @@ GL_GNULIB_GETPAGESIZE = @GL_GNULIB_GETPAGESIZE@ GL_GNULIB_GETPASS = @GL_GNULIB_GETPASS@ GL_GNULIB_GETPASS_GNU = @GL_GNULIB_GETPASS_GNU@ GL_GNULIB_GETPEERNAME = @GL_GNULIB_GETPEERNAME@ +GL_GNULIB_GETPROGNAME = @GL_GNULIB_GETPROGNAME@ GL_GNULIB_GETRANDOM = @GL_GNULIB_GETRANDOM@ GL_GNULIB_GETSOCKNAME = @GL_GNULIB_GETSOCKNAME@ GL_GNULIB_GETSOCKOPT = @GL_GNULIB_GETSOCKOPT@ @@ -528,6 +537,7 @@ GL_GNULIB_MEMCHR = @GL_GNULIB_MEMCHR@ GL_GNULIB_MEMMEM = @GL_GNULIB_MEMMEM@ GL_GNULIB_MEMPCPY = @GL_GNULIB_MEMPCPY@ GL_GNULIB_MEMRCHR = @GL_GNULIB_MEMRCHR@ +GL_GNULIB_MEMSET_EXPLICIT = @GL_GNULIB_MEMSET_EXPLICIT@ GL_GNULIB_MKDIR = @GL_GNULIB_MKDIR@ GL_GNULIB_MKDIRAT = @GL_GNULIB_MKDIRAT@ GL_GNULIB_MKDTEMP = @GL_GNULIB_MKDTEMP@ @@ -648,6 +658,7 @@ GL_GNULIB_STRVERSCMP = @GL_GNULIB_STRVERSCMP@ GL_GNULIB_SYMLINK = @GL_GNULIB_SYMLINK@ GL_GNULIB_SYMLINKAT = @GL_GNULIB_SYMLINKAT@ GL_GNULIB_SYSTEM_POSIX = @GL_GNULIB_SYSTEM_POSIX@ +GL_GNULIB_TIME = @GL_GNULIB_TIME@ GL_GNULIB_TIMEGM = @GL_GNULIB_TIMEGM@ GL_GNULIB_TIMESPEC_GET = @GL_GNULIB_TIMESPEC_GET@ GL_GNULIB_TIMESPEC_GETRES = @GL_GNULIB_TIMESPEC_GETRES@ @@ -722,6 +733,7 @@ GMSGFMT_015 = @GMSGFMT_015@ GNULIBHEADERS_OVERRIDE_WINT_T = @GNULIBHEADERS_OVERRIDE_WINT_T@ GNULIB_GETTIMEOFDAY = @GNULIB_GETTIMEOFDAY@ GREP = @GREP@ +HARD_LOCALE_LIB = @HARD_LOCALE_LIB@ HAVE_ACCEPT4 = @HAVE_ACCEPT4@ HAVE_ALIGNED_ALLOC = @HAVE_ALIGNED_ALLOC@ HAVE_ALLOCA_H = @HAVE_ALLOCA_H@ @@ -752,6 +764,7 @@ HAVE_DECL_GETLOGIN = @HAVE_DECL_GETLOGIN@ HAVE_DECL_GETLOGIN_R = @HAVE_DECL_GETLOGIN_R@ HAVE_DECL_GETPAGESIZE = @HAVE_DECL_GETPAGESIZE@ HAVE_DECL_GETUSERSHELL = @HAVE_DECL_GETUSERSHELL@ +HAVE_DECL_GETW = @HAVE_DECL_GETW@ HAVE_DECL_IMAXABS = @HAVE_DECL_IMAXABS@ HAVE_DECL_IMAXDIV = @HAVE_DECL_IMAXDIV@ HAVE_DECL_INET_NTOP = @HAVE_DECL_INET_NTOP@ @@ -761,6 +774,7 @@ HAVE_DECL_LOCALTIME_R = @HAVE_DECL_LOCALTIME_R@ HAVE_DECL_MEMMEM = @HAVE_DECL_MEMMEM@ HAVE_DECL_MEMRCHR = @HAVE_DECL_MEMRCHR@ HAVE_DECL_OBSTACK_PRINTF = @HAVE_DECL_OBSTACK_PRINTF@ +HAVE_DECL_PUTW = @HAVE_DECL_PUTW@ HAVE_DECL_SETENV = @HAVE_DECL_SETENV@ HAVE_DECL_SETHOSTNAME = @HAVE_DECL_SETHOSTNAME@ HAVE_DECL_SETSTATE = @HAVE_DECL_SETSTATE@ @@ -783,6 +797,9 @@ HAVE_DECL_WCWIDTH = @HAVE_DECL_WCWIDTH@ HAVE_DPRINTF = @HAVE_DPRINTF@ HAVE_DUP3 = @HAVE_DUP3@ HAVE_DUPLOCALE = @HAVE_DUPLOCALE@ +HAVE_ERROR = @HAVE_ERROR@ +HAVE_ERROR_AT_LINE = @HAVE_ERROR_AT_LINE@ +HAVE_ERROR_H = @HAVE_ERROR_H@ HAVE_EUIDACCESS = @HAVE_EUIDACCESS@ HAVE_EXECVPE = @HAVE_EXECVPE@ HAVE_EXPLICIT_BZERO = @HAVE_EXPLICIT_BZERO@ @@ -810,12 +827,15 @@ HAVE_GETLOGIN = @HAVE_GETLOGIN@ HAVE_GETOPT_H = @HAVE_GETOPT_H@ HAVE_GETPAGESIZE = @HAVE_GETPAGESIZE@ HAVE_GETPASS = @HAVE_GETPASS@ +HAVE_GETPROGNAME = @HAVE_GETPROGNAME@ HAVE_GETRANDOM = @HAVE_GETRANDOM@ HAVE_GETSUBOPT = @HAVE_GETSUBOPT@ HAVE_GETTIMEOFDAY = @HAVE_GETTIMEOFDAY@ HAVE_GETUMASK = @HAVE_GETUMASK@ HAVE_GRANTPT = @HAVE_GRANTPT@ HAVE_GROUP_MEMBER = @HAVE_GROUP_MEMBER@ +HAVE_IMAXABS = @HAVE_IMAXABS@ +HAVE_IMAXDIV = @HAVE_IMAXDIV@ HAVE_IMAXDIV_T = @HAVE_IMAXDIV_T@ HAVE_INITSTATE = @HAVE_INITSTATE@ HAVE_INTTYPES_H = @HAVE_INTTYPES_H@ @@ -842,6 +862,7 @@ HAVE_MBSNRTOWCS = @HAVE_MBSNRTOWCS@ HAVE_MBSRTOWCS = @HAVE_MBSRTOWCS@ HAVE_MBTOWC = @HAVE_MBTOWC@ HAVE_MEMPCPY = @HAVE_MEMPCPY@ +HAVE_MEMSET_EXPLICIT = @HAVE_MEMSET_EXPLICIT@ HAVE_MKDIRAT = @HAVE_MKDIRAT@ HAVE_MKDTEMP = @HAVE_MKDTEMP@ HAVE_MKFIFO = @HAVE_MKFIFO@ @@ -1050,7 +1071,6 @@ HAVE_WMEMPCPY = @HAVE_WMEMPCPY@ HAVE_WMEMSET = @HAVE_WMEMSET@ HAVE_WS2TCPIP_H = @HAVE_WS2TCPIP_H@ HAVE_XLOCALE_H = @HAVE_XLOCALE_H@ -HAVE__BOOL = @HAVE__BOOL@ HAVE__EXIT = @HAVE__EXIT@ IGNORE_UNUSED_LIBRARIES_CFLAGS = @IGNORE_UNUSED_LIBRARIES_CFLAGS@ INCLUDE_NEXT = @INCLUDE_NEXT@ @@ -1117,15 +1137,20 @@ LT_REVISION = @LT_REVISION@ LT_SYS_LIBRARY_PATH = @LT_SYS_LIBRARY_PATH@ MAKEINFO = @MAKEINFO@ MANIFEST_TOOL = @MANIFEST_TOOL@ +MBRTOWC_LIB = @MBRTOWC_LIB@ MKDIR_P = @MKDIR_P@ MSGFMT = @MSGFMT@ MSGFMT_015 = @MSGFMT_015@ MSGMERGE = @MSGMERGE@ +NANOSLEEP_LIB = @NANOSLEEP_LIB@ NETINET_IN_H = @NETINET_IN_H@ NEXT_ARPA_INET_H = @NEXT_ARPA_INET_H@ +NEXT_ASSERT_H = @NEXT_ASSERT_H@ NEXT_AS_FIRST_DIRECTIVE_ARPA_INET_H = @NEXT_AS_FIRST_DIRECTIVE_ARPA_INET_H@ +NEXT_AS_FIRST_DIRECTIVE_ASSERT_H = @NEXT_AS_FIRST_DIRECTIVE_ASSERT_H@ NEXT_AS_FIRST_DIRECTIVE_CTYPE_H = @NEXT_AS_FIRST_DIRECTIVE_CTYPE_H@ NEXT_AS_FIRST_DIRECTIVE_ERRNO_H = @NEXT_AS_FIRST_DIRECTIVE_ERRNO_H@ +NEXT_AS_FIRST_DIRECTIVE_ERROR_H = @NEXT_AS_FIRST_DIRECTIVE_ERROR_H@ NEXT_AS_FIRST_DIRECTIVE_FCNTL_H = @NEXT_AS_FIRST_DIRECTIVE_FCNTL_H@ NEXT_AS_FIRST_DIRECTIVE_GETOPT_H = @NEXT_AS_FIRST_DIRECTIVE_GETOPT_H@ NEXT_AS_FIRST_DIRECTIVE_INTTYPES_H = @NEXT_AS_FIRST_DIRECTIVE_INTTYPES_H@ @@ -1156,6 +1181,7 @@ NEXT_AS_FIRST_DIRECTIVE_WCHAR_H = @NEXT_AS_FIRST_DIRECTIVE_WCHAR_H@ NEXT_AS_FIRST_DIRECTIVE_WCTYPE_H = @NEXT_AS_FIRST_DIRECTIVE_WCTYPE_H@ NEXT_CTYPE_H = @NEXT_CTYPE_H@ NEXT_ERRNO_H = @NEXT_ERRNO_H@ +NEXT_ERROR_H = @NEXT_ERROR_H@ NEXT_FCNTL_H = @NEXT_FCNTL_H@ NEXT_GETOPT_H = @NEXT_GETOPT_H@ NEXT_INTTYPES_H = @NEXT_INTTYPES_H@ @@ -1211,6 +1237,7 @@ PRAGMA_COLUMNS = @PRAGMA_COLUMNS@ PRAGMA_SYSTEM_HEADER = @PRAGMA_SYSTEM_HEADER@ PRIPTR_PREFIX = @PRIPTR_PREFIX@ PTHREAD_H_DEFINES_STRUCT_TIMESPEC = @PTHREAD_H_DEFINES_STRUCT_TIMESPEC@ +PTHREAD_SIGMASK_LIB = @PTHREAD_SIGMASK_LIB@ PTRDIFF_T_SUFFIX = @PTRDIFF_T_SUFFIX@ RANLIB = @RANLIB@ REPLACE_ACCESS = @REPLACE_ACCESS@ @@ -1219,6 +1246,7 @@ REPLACE_BTOWC = @REPLACE_BTOWC@ REPLACE_CALLOC_FOR_CALLOC_GNU = @REPLACE_CALLOC_FOR_CALLOC_GNU@ REPLACE_CALLOC_FOR_CALLOC_POSIX = @REPLACE_CALLOC_FOR_CALLOC_POSIX@ REPLACE_CANONICALIZE_FILE_NAME = @REPLACE_CANONICALIZE_FILE_NAME@ +REPLACE_CHMOD = @REPLACE_CHMOD@ REPLACE_CHOWN = @REPLACE_CHOWN@ REPLACE_CLOSE = @REPLACE_CLOSE@ REPLACE_COPY_FILE_RANGE = @REPLACE_COPY_FILE_RANGE@ @@ -1227,7 +1255,10 @@ REPLACE_CTIME = @REPLACE_CTIME@ REPLACE_DPRINTF = @REPLACE_DPRINTF@ REPLACE_DUP = @REPLACE_DUP@ REPLACE_DUP2 = @REPLACE_DUP2@ +REPLACE_DUP3 = @REPLACE_DUP3@ REPLACE_DUPLOCALE = @REPLACE_DUPLOCALE@ +REPLACE_ERROR = @REPLACE_ERROR@ +REPLACE_ERROR_AT_LINE = @REPLACE_ERROR_AT_LINE@ REPLACE_EXECL = @REPLACE_EXECL@ REPLACE_EXECLE = @REPLACE_EXECLE@ REPLACE_EXECLP = @REPLACE_EXECLP@ @@ -1240,6 +1271,7 @@ REPLACE_FCHMODAT = @REPLACE_FCHMODAT@ REPLACE_FCHOWNAT = @REPLACE_FCHOWNAT@ REPLACE_FCLOSE = @REPLACE_FCLOSE@ REPLACE_FCNTL = @REPLACE_FCNTL@ +REPLACE_FDATASYNC = @REPLACE_FDATASYNC@ REPLACE_FDOPEN = @REPLACE_FDOPEN@ REPLACE_FFLUSH = @REPLACE_FFLUSH@ REPLACE_FFSLL = @REPLACE_FFSLL@ @@ -1262,15 +1294,21 @@ REPLACE_GETCWD = @REPLACE_GETCWD@ REPLACE_GETDELIM = @REPLACE_GETDELIM@ REPLACE_GETDOMAINNAME = @REPLACE_GETDOMAINNAME@ REPLACE_GETDTABLESIZE = @REPLACE_GETDTABLESIZE@ +REPLACE_GETENTROPY = @REPLACE_GETENTROPY@ REPLACE_GETGROUPS = @REPLACE_GETGROUPS@ REPLACE_GETLINE = @REPLACE_GETLINE@ +REPLACE_GETLOADAVG = @REPLACE_GETLOADAVG@ REPLACE_GETLOGIN_R = @REPLACE_GETLOGIN_R@ REPLACE_GETPAGESIZE = @REPLACE_GETPAGESIZE@ REPLACE_GETPASS = @REPLACE_GETPASS@ REPLACE_GETPASS_FOR_GETPASS_GNU = @REPLACE_GETPASS_FOR_GETPASS_GNU@ +REPLACE_GETPROGNAME = @REPLACE_GETPROGNAME@ REPLACE_GETRANDOM = @REPLACE_GETRANDOM@ +REPLACE_GETSUBOPT = @REPLACE_GETSUBOPT@ REPLACE_GETTIMEOFDAY = @REPLACE_GETTIMEOFDAY@ REPLACE_GMTIME = @REPLACE_GMTIME@ +REPLACE_IMAXABS = @REPLACE_IMAXABS@ +REPLACE_IMAXDIV = @REPLACE_IMAXDIV@ REPLACE_INET_NTOP = @REPLACE_INET_NTOP@ REPLACE_INET_PTON = @REPLACE_INET_PTON@ REPLACE_INITSTATE = @REPLACE_INITSTATE@ @@ -1299,11 +1337,14 @@ REPLACE_MBSTATE_T = @REPLACE_MBSTATE_T@ REPLACE_MBTOWC = @REPLACE_MBTOWC@ REPLACE_MEMCHR = @REPLACE_MEMCHR@ REPLACE_MEMMEM = @REPLACE_MEMMEM@ +REPLACE_MEMPCPY = @REPLACE_MEMPCPY@ REPLACE_MKDIR = @REPLACE_MKDIR@ REPLACE_MKFIFO = @REPLACE_MKFIFO@ REPLACE_MKFIFOAT = @REPLACE_MKFIFOAT@ REPLACE_MKNOD = @REPLACE_MKNOD@ REPLACE_MKNODAT = @REPLACE_MKNODAT@ +REPLACE_MKOSTEMP = @REPLACE_MKOSTEMP@ +REPLACE_MKOSTEMPS = @REPLACE_MKOSTEMPS@ REPLACE_MKSTEMP = @REPLACE_MKSTEMP@ REPLACE_MKTIME = @REPLACE_MKTIME@ REPLACE_NANOSLEEP = @REPLACE_NANOSLEEP@ @@ -1314,8 +1355,10 @@ REPLACE_OBSTACK_PRINTF = @REPLACE_OBSTACK_PRINTF@ REPLACE_OPEN = @REPLACE_OPEN@ REPLACE_OPENAT = @REPLACE_OPENAT@ REPLACE_PERROR = @REPLACE_PERROR@ +REPLACE_PIPE2 = @REPLACE_PIPE2@ REPLACE_POPEN = @REPLACE_POPEN@ REPLACE_POSIX_MEMALIGN = @REPLACE_POSIX_MEMALIGN@ +REPLACE_POSIX_OPENPT = @REPLACE_POSIX_OPENPT@ REPLACE_PREAD = @REPLACE_PREAD@ REPLACE_PRINTF = @REPLACE_PRINTF@ REPLACE_PSELECT = @REPLACE_PSELECT@ @@ -1393,6 +1436,7 @@ REPLACE_RMDIR = @REPLACE_RMDIR@ REPLACE_SCHED_YIELD = @REPLACE_SCHED_YIELD@ REPLACE_SELECT = @REPLACE_SELECT@ REPLACE_SETENV = @REPLACE_SETENV@ +REPLACE_SETHOSTNAME = @REPLACE_SETHOSTNAME@ REPLACE_SETLOCALE = @REPLACE_SETLOCALE@ REPLACE_SETSTATE = @REPLACE_SETSTATE@ REPLACE_SLEEP = @REPLACE_SLEEP@ @@ -1401,6 +1445,7 @@ REPLACE_SPRINTF = @REPLACE_SPRINTF@ REPLACE_STAT = @REPLACE_STAT@ REPLACE_STDIO_READ_FUNCS = @REPLACE_STDIO_READ_FUNCS@ REPLACE_STDIO_WRITE_FUNCS = @REPLACE_STDIO_WRITE_FUNCS@ +REPLACE_STPCPY = @REPLACE_STPCPY@ REPLACE_STPNCPY = @REPLACE_STPNCPY@ REPLACE_STRCASESTR = @REPLACE_STRCASESTR@ REPLACE_STRCHRNUL = @REPLACE_STRCHRNUL@ @@ -1427,7 +1472,9 @@ REPLACE_STRUCT_LCONV = @REPLACE_STRUCT_LCONV@ REPLACE_STRUCT_TIMEVAL = @REPLACE_STRUCT_TIMEVAL@ REPLACE_SYMLINK = @REPLACE_SYMLINK@ REPLACE_SYMLINKAT = @REPLACE_SYMLINKAT@ +REPLACE_TIME = @REPLACE_TIME@ REPLACE_TIMEGM = @REPLACE_TIMEGM@ +REPLACE_TIMESPEC_GET = @REPLACE_TIMESPEC_GET@ REPLACE_TMPFILE = @REPLACE_TMPFILE@ REPLACE_TOWLOWER = @REPLACE_TOWLOWER@ REPLACE_TRUNCATE = @REPLACE_TRUNCATE@ @@ -1453,15 +1500,20 @@ REPLACE_WCSWIDTH = @REPLACE_WCSWIDTH@ REPLACE_WCTOB = @REPLACE_WCTOB@ REPLACE_WCTOMB = @REPLACE_WCTOMB@ REPLACE_WCWIDTH = @REPLACE_WCWIDTH@ +REPLACE_WMEMPCPY = @REPLACE_WMEMPCPY@ REPLACE_WRITE = @REPLACE_WRITE@ +REPLACE__EXIT = @REPLACE__EXIT@ +SCHED_YIELD_LIB = @SCHED_YIELD_LIB@ SED = @SED@ +SELECT_LIB = @SELECT_LIB@ +SETLOCALE_LIB = @SETLOCALE_LIB@ +SETLOCALE_NULL_LIB = @SETLOCALE_NULL_LIB@ SET_MAKE = @SET_MAKE@ SHELL = @SHELL@ SIG_ATOMIC_T_SUFFIX = @SIG_ATOMIC_T_SUFFIX@ SIZE_T_SUFFIX = @SIZE_T_SUFFIX@ -STDALIGN_H = @STDALIGN_H@ STDARG_H = @STDARG_H@ -STDBOOL_H = @STDBOOL_H@ +STDCKDINT_H = @STDCKDINT_H@ STDDEF_H = @STDDEF_H@ STDINT_H = @STDINT_H@ STRIP = @STRIP@ @@ -1505,6 +1557,8 @@ am__quote = @am__quote@ am__tar = @am__tar@ am__untar = @am__untar@ bindir = @bindir@ +bindir_c = @bindir_c@ +bindir_c_make = @bindir_c_make@ build = @build@ build_alias = @build_alias@ build_cpu = @build_cpu@ @@ -1512,10 +1566,20 @@ build_os = @build_os@ build_vendor = @build_vendor@ builddir = @builddir@ datadir = @datadir@ +datadir_c = @datadir_c@ +datadir_c_make = @datadir_c_make@ datarootdir = @datarootdir@ +datarootdir_c = @datarootdir_c@ +datarootdir_c_make = @datarootdir_c_make@ docdir = @docdir@ +docdir_c = @docdir_c@ +docdir_c_make = @docdir_c_make@ dvidir = @dvidir@ +dvidir_c = @dvidir_c@ +dvidir_c_make = @dvidir_c_make@ exec_prefix = @exec_prefix@ +exec_prefix_c = @exec_prefix_c@ +exec_prefix_c_make = @exec_prefix_c_make@ gl_LIBOBJDEPS = @gl_LIBOBJDEPS@ gl_LIBOBJS = @gl_LIBOBJS@ gl_LTLIBOBJS = @gl_LTLIBOBJS@ @@ -1529,26 +1593,68 @@ host_cpu = @host_cpu@ host_os = @host_os@ host_vendor = @host_vendor@ htmldir = @htmldir@ +htmldir_c = @htmldir_c@ +htmldir_c_make = @htmldir_c_make@ includedir = @includedir@ +includedir_c = @includedir_c@ +includedir_c_make = @includedir_c_make@ infodir = @infodir@ +infodir_c = @infodir_c@ +infodir_c_make = @infodir_c_make@ install_sh = @install_sh@ libdir = @libdir@ +libdir_c = @libdir_c@ +libdir_c_make = @libdir_c_make@ libexecdir = @libexecdir@ +libexecdir_c = @libexecdir_c@ +libexecdir_c_make = @libexecdir_c_make@ lispdir = @lispdir@ +lispdir_c = @lispdir_c@ +lispdir_c_make = @lispdir_c_make@ localedir = @localedir@ +localedir_c = @localedir_c@ +localedir_c_make = @localedir_c_make@ localstatedir = @localstatedir@ +localstatedir_c = @localstatedir_c@ +localstatedir_c_make = @localstatedir_c_make@ mandir = @mandir@ +mandir_c = @mandir_c@ +mandir_c_make = @mandir_c_make@ mkdir_p = @mkdir_p@ oldincludedir = @oldincludedir@ +oldincludedir_c = @oldincludedir_c@ +oldincludedir_c_make = @oldincludedir_c_make@ pdfdir = @pdfdir@ +pdfdir_c = @pdfdir_c@ +pdfdir_c_make = @pdfdir_c_make@ +pkgdatadir_c = @pkgdatadir_c@ +pkgdatadir_c_make = @pkgdatadir_c_make@ +pkgincludedir_c = @pkgincludedir_c@ +pkgincludedir_c_make = @pkgincludedir_c_make@ +pkglibdir_c = @pkglibdir_c@ +pkglibdir_c_make = @pkglibdir_c_make@ +pkglibexecdir_c = @pkglibexecdir_c@ +pkglibexecdir_c_make = @pkglibexecdir_c_make@ prefix = @prefix@ +prefix_c = @prefix_c@ +prefix_c_make = @prefix_c_make@ program_transform_name = @program_transform_name@ psdir = @psdir@ +psdir_c = @psdir_c@ +psdir_c_make = @psdir_c_make@ runstatedir = @runstatedir@ +runstatedir_c = @runstatedir_c@ +runstatedir_c_make = @runstatedir_c_make@ sbindir = @sbindir@ +sbindir_c = @sbindir_c@ +sbindir_c_make = @sbindir_c_make@ sharedstatedir = @sharedstatedir@ +sharedstatedir_c = @sharedstatedir_c@ +sharedstatedir_c_make = @sharedstatedir_c_make@ srcdir = @srcdir@ sysconfdir = @sysconfdir@ +sysconfdir_c = @sysconfdir_c@ +sysconfdir_c_make = @sysconfdir_c_make@ target_alias = @target_alias@ top_build_prefix = @top_build_prefix@ top_builddir = @top_builddir@ diff --git a/libparted/labels/aix.c b/libparted/labels/aix.c index 91468dd..8adb4db 100644 --- a/libparted/labels/aix.c +++ b/libparted/labels/aix.c @@ -1,7 +1,7 @@ /* -*- Mode: c; tab-width: 8; indent-tabs-mode: nil; c-basic-offset: 8 -*- libparted - a library for manipulating disk partitions - Copyright (C) 2000-2001, 2007-2014, 2019-2022 Free Software Foundation, + Copyright (C) 2000-2001, 2007-2014, 2019-2023 Free Software Foundation, Inc. This program is free software; you can redistribute it and/or modify diff --git a/libparted/labels/atari.c b/libparted/labels/atari.c index f60a3eb..8ab3720 100644 --- a/libparted/labels/atari.c +++ b/libparted/labels/atari.c @@ -2,7 +2,7 @@ libparted - a library for manipulating disk partitions atari.c - libparted module to manipulate Atari partition tables. - Copyright (C) 2000-2001, 2004, 2007-2014, 2019-2022 Free Software + Copyright (C) 2000-2001, 2004, 2007-2014, 2019-2023 Free Software Foundation, Inc. This program is free software; you can redistribute it and/or modify diff --git a/libparted/labels/bsd.c b/libparted/labels/bsd.c index 1696c95..38bc64c 100644 --- a/libparted/labels/bsd.c +++ b/libparted/labels/bsd.c @@ -1,7 +1,7 @@ /* -*- Mode: c; tab-width: 8; indent-tabs-mode: nil; c-basic-offset: 8 -*- libparted - a library for manipulating disk partitions - Copyright (C) 2000-2001, 2007-2014, 2019-2022 Free Software Foundation, + Copyright (C) 2000-2001, 2007-2014, 2019-2023 Free Software Foundation, Inc. This program is free software; you can redistribute it and/or modify diff --git a/libparted/labels/dasd.c b/libparted/labels/dasd.c index 38f2b00..1d99458 100644 --- a/libparted/labels/dasd.c +++ b/libparted/labels/dasd.c @@ -1,7 +1,7 @@ /* -*- Mode: c; tab-width: 8; indent-tabs-mode: nil; c-basic-offset: 8 -*- libparted - a library for manipulating disk partitions - Copyright (C) 2000-2001, 2007-2014, 2019-2022 Free Software Foundation, + Copyright (C) 2000-2001, 2007-2014, 2019-2023 Free Software Foundation, Inc. This program is free software; you can redistribute it and/or modify @@ -53,10 +53,8 @@ #define PARTITION_LINUX_SWAP 0x82 #define PARTITION_LINUX 0x83 -#define PARTITION_LINUX_EXT 0x85 #define PARTITION_LINUX_LVM 0x8e #define PARTITION_LINUX_RAID 0xfd -#define PARTITION_LINUX_LVM_OLD 0xfe extern void ped_disk_dasd_init (); extern void ped_disk_dasd_done (); @@ -66,8 +64,6 @@ extern void ped_disk_dasd_done (); typedef struct { int type; int system; - int raid; - int lvm; } DasdPartitionData; typedef struct { @@ -117,6 +113,10 @@ static PedDiskOps dasd_disk_ops = { partition_set_name: NULL, partition_get_name: NULL, + partition_set_type_id: NULL, + partition_get_type_id: NULL, + partition_set_type_uuid: NULL, + partition_get_type_uuid: NULL, get_partition_alignment: dasd_get_partition_alignment, @@ -130,6 +130,31 @@ static PedDiskType dasd_disk_type = { features: 0 }; +struct flag_id_mapping_t +{ + enum _PedPartitionFlag flag; + int type_id; +}; + +static const struct flag_id_mapping_t flag_id_mapping[] = +{ + { PED_PARTITION_LVM, PARTITION_LINUX_LVM }, + { PED_PARTITION_RAID, PARTITION_LINUX_RAID }, + { PED_PARTITION_SWAP, PARTITION_LINUX_SWAP }, +}; + +static const struct flag_id_mapping_t* _GL_ATTRIBUTE_CONST +dasd_find_flag_id_mapping (PedPartitionFlag flag) +{ + int n = sizeof(flag_id_mapping) / sizeof(flag_id_mapping[0]); + + for (int i = 0; i < n; ++i) + if (flag_id_mapping[i].flag == flag) + return &flag_id_mapping[i]; + + return NULL; +} + static PedDisk* dasd_alloc (const PedDevice* dev) { @@ -306,8 +331,6 @@ dasd_read (PedDisk* disk) part->num = 1; part->fs_type = ped_file_system_probe (&part->geom); dasd_data = part->disk_specific; - dasd_data->raid = 0; - dasd_data->lvm = 0; dasd_data->type = 0; if (!ped_disk_add_partition (disk, part, NULL)) @@ -390,8 +413,6 @@ dasd_read (PedDisk* disk) part->num = 1; part->fs_type = ped_file_system_probe (&part->geom); dasd_data = part->disk_specific; - dasd_data->raid = 0; - dasd_data->lvm = 0; dasd_data->type = 0; if (!ped_disk_add_partition (disk, part, NULL)) @@ -448,25 +469,12 @@ dasd_read (PedDisk* disk) dasd_data = part->disk_specific; - if ((strncmp(PART_TYPE_RAID, str, 6) == 0) && - (ped_file_system_probe(&part->geom) == NULL)) - ped_partition_set_flag(part, PED_PARTITION_RAID, 1); - else - ped_partition_set_flag(part, PED_PARTITION_RAID, 0); - - if ((strncmp(PART_TYPE_LVM, str, 6) == 0) && - (ped_file_system_probe(&part->geom) == NULL)) - ped_partition_set_flag(part, PED_PARTITION_LVM, 1); - else - ped_partition_set_flag(part, PED_PARTITION_LVM, 0); - - if (strncmp(PART_TYPE_SWAP, str, 6) == 0) { - fs = ped_file_system_probe(&part->geom); - if (fs && is_linux_swap(fs->name)) { - dasd_data->system = PARTITION_LINUX_SWAP; - PDEBUG; - } - } + if (strncmp(PART_TYPE_RAID, str, 6) == 0) + dasd_data->system = PARTITION_LINUX_RAID; + else if (strncmp(PART_TYPE_LVM, str, 6) == 0) + dasd_data->system = PARTITION_LINUX_LVM; + else if (strncmp(PART_TYPE_SWAP, str, 6) == 0) + dasd_data->system = PARTITION_LINUX_SWAP; vtoc_ebcdic_enc(p->f1->DS1DSNAM, p->f1->DS1DSNAM, 44); @@ -743,20 +751,17 @@ dasd_partition_set_flag (PedPartition* part, PedPartitionFlag flag, int state) PED_ASSERT(part->disk_specific != NULL); dasd_data = part->disk_specific; - switch (flag) { - case PED_PARTITION_RAID: - if (state) - dasd_data->lvm = 0; - dasd_data->raid = state; - return ped_partition_set_system(part, part->fs_type); - case PED_PARTITION_LVM: - if (state) - dasd_data->raid = 0; - dasd_data->lvm = state; - return ped_partition_set_system(part, part->fs_type); - default: - return 0; + const struct flag_id_mapping_t* p = dasd_find_flag_id_mapping (flag); + if (p) + { + if (state) + dasd_data->system = p->type_id; + else if (dasd_data->system == p->type_id) + return dasd_partition_set_system (part, part->fs_type); + return 1; } + + return 0; } static int @@ -768,14 +773,11 @@ dasd_partition_get_flag (const PedPartition* part, PedPartitionFlag flag) PED_ASSERT (part->disk_specific != NULL); dasd_data = part->disk_specific; - switch (flag) { - case PED_PARTITION_RAID: - return dasd_data->raid; - case PED_PARTITION_LVM: - return dasd_data->lvm; - default: - return 0; - } + const struct flag_id_mapping_t* p = dasd_find_flag_id_mapping (flag); + if (p) + return dasd_data->system == p->type_id; + + return 0; } /* @@ -796,14 +798,10 @@ dasd_partition_is_flag_available (const PedPartition* part, if (disk_specific->format_type == 1) return 0; - switch (flag) { - case PED_PARTITION_RAID: - return 1; - case PED_PARTITION_LVM: - return 1; - default: - return 0; - } + if (dasd_find_flag_id_mapping (flag)) + return 1; + + return 0; } @@ -934,18 +932,6 @@ dasd_partition_set_system (PedPartition* part, part->fs_type = fs_type; - if (dasd_data->lvm) { - dasd_data->system = PARTITION_LINUX_LVM; - PDEBUG; - return 1; - } - - if (dasd_data->raid) { - dasd_data->system = PARTITION_LINUX_RAID; - PDEBUG; - return 1; - } - if (!fs_type) { dasd_data->system = PARTITION_LINUX; PDEBUG; diff --git a/libparted/labels/dos.c b/libparted/labels/dos.c index 26d8804..e6a0105 100644 --- a/libparted/labels/dos.c +++ b/libparted/labels/dos.c @@ -1,6 +1,6 @@ /* libparted - a library for manipulating disk partitions - Copyright (C) 1999-2001, 2004-2005, 2007-2014, 2019-2022 Free Software + Copyright (C) 1999-2001, 2004-2005, 2007-2014, 2019-2023 Free Software Foundation, Inc. This program is free software; you can redistribute it and/or modify @@ -100,6 +100,225 @@ static const char MBR_BOOT_CODE[] = { #define PARTITION_LINUX_RAID 0xfd #define PARTITION_LINUX_LVM_OLD 0xfe +struct flag_id_mapping_t +{ + enum _PedPartitionFlag flag; + unsigned char type_id; + unsigned char alt_type_id; +}; + +static const struct flag_id_mapping_t flag_id_mapping[] = +{ + { PED_PARTITION_BLS_BOOT, PARTITION_BLS_BOOT }, + { PED_PARTITION_DIAG, PARTITION_COMPAQ_DIAG, PARTITION_DELL_DIAG }, + { PED_PARTITION_ESP, PARTITION_ESP }, + { PED_PARTITION_IRST, PARTITION_IRST }, + { PED_PARTITION_LVM, PARTITION_LINUX_LVM, PARTITION_LINUX_LVM_OLD }, + { PED_PARTITION_MSFT_RESERVED, PARTITION_MSFT_RECOVERY }, + { PED_PARTITION_PALO, PARTITION_PALO }, + { PED_PARTITION_PREP, PARTITION_PREP }, + { PED_PARTITION_RAID, PARTITION_LINUX_RAID }, + { PED_PARTITION_SWAP, PARTITION_LINUX_SWAP }, +}; + +static const unsigned char skip_set_system_types[] = +{ + PARTITION_EXT_LBA, + PARTITION_DOS_EXT, + PARTITION_COMPAQ_DIAG, + PARTITION_MSFT_RECOVERY, + PARTITION_LINUX_LVM, + PARTITION_LINUX_SWAP, + PARTITION_LINUX_RAID, + PARTITION_PALO, + PARTITION_PREP, + PARTITION_IRST, + PARTITION_ESP, + PARTITION_BLS_BOOT +}; + +static const struct flag_id_mapping_t* _GL_ATTRIBUTE_CONST +dos_find_flag_id_mapping (PedPartitionFlag flag) +{ + int n = sizeof(flag_id_mapping) / sizeof(flag_id_mapping[0]); + + for (int i = 0; i < n; ++i) + if (flag_id_mapping[i].flag == flag) + return &flag_id_mapping[i]; + + return NULL; +} + +/** + * Check whether the type_id supports the hidden flag. Returns true for both hidden and + * non-hidden id. + */ +static bool +dos_type_id_supports_hidden(unsigned char type_id) +{ + switch (type_id) + { + case PARTITION_DOS_EXT: + case PARTITION_DOS_EXT_H: + case PARTITION_FAT12: + case PARTITION_FAT12_H: + case PARTITION_FAT16: + case PARTITION_FAT16_H: + case PARTITION_FAT16_LBA: + case PARTITION_FAT16_LBA_H: + case PARTITION_FAT16_SM: + case PARTITION_FAT16_SM_H: + case PARTITION_FAT32: + case PARTITION_FAT32_H: + case PARTITION_FAT32_LBA: + case PARTITION_FAT32_LBA_H: + case PARTITION_NTFS: + case PARTITION_NTFS_H: + return true; + + default: + return false; + } +} + +/** + * Check whether the type_id has the hidden flag set. + */ +static bool +dos_type_id_is_hidden(unsigned char type_id) +{ + switch (type_id) + { + case PARTITION_DOS_EXT_H: + case PARTITION_FAT12_H: + case PARTITION_FAT16_H: + case PARTITION_FAT16_LBA_H: + case PARTITION_FAT16_SM_H: + case PARTITION_FAT32_H: + case PARTITION_FAT32_LBA_H: + case PARTITION_NTFS_H: + return true; + + default: + return false; + } +} + +/** + * Sets the hidden flag on type_id. + */ +static bool +dos_type_id_set_hidden(unsigned char* type_id, bool state) +{ + PED_ASSERT (type_id); + + if (!dos_type_id_supports_hidden(*type_id)) + return false; + + if (state) + *type_id |= PART_FLAG_HIDDEN; + else + *type_id &= ~PART_FLAG_HIDDEN; + + return 1; +} + +/** + * Check whether the type_id supports the lba flag. Returns true for both lba and non-lba + * id. + */ +static bool +dos_type_id_supports_lba(unsigned char type_id) +{ + switch (type_id) + { + case PARTITION_FAT16: + case PARTITION_FAT16_H: + case PARTITION_FAT16_LBA: + case PARTITION_FAT16_LBA_H: + case PARTITION_FAT32: + case PARTITION_FAT32_H: + case PARTITION_FAT32_LBA: + case PARTITION_FAT32_LBA_H: + case PARTITION_DOS_EXT: + case PARTITION_EXT_LBA: + return true; + + default: + return false; + } +} + +/** + * Check whether the type_id has the lba flag set. + */ +static bool +dos_type_id_is_lba(unsigned char type_id) +{ + switch (type_id) + { + case PARTITION_FAT16_LBA: + case PARTITION_FAT16_LBA_H: + case PARTITION_FAT32_LBA: + case PARTITION_FAT32_LBA_H: + case PARTITION_EXT_LBA: + return true; + + default: + return false; + } +} + +/** + * Sets the lba flag on type_id. + */ +static bool +dos_type_id_set_lba(unsigned char* type_id, bool state) +{ + PED_ASSERT (type_id); + + if (!dos_type_id_supports_lba(*type_id)) + return false; + + if (state) + { + switch (*type_id) + { + case PARTITION_FAT16: + *type_id = PARTITION_FAT16_LBA; + break; + + case PARTITION_FAT32: + *type_id = PARTITION_FAT32_LBA; + break; + + case PARTITION_DOS_EXT: + *type_id = PARTITION_EXT_LBA; + break; + } + } + else + { + switch (*type_id) + { + case PARTITION_FAT16_LBA: + *type_id = PARTITION_FAT16; + break; + + case PARTITION_FAT32_LBA: + *type_id = PARTITION_FAT32; + break; + + case PARTITION_EXT_LBA: + *type_id = PARTITION_DOS_EXT; + break; + } + } + + return true; +} + + /* This constant contains the maximum cylinder number that can be represented * in (C,H,S) notation. Higher cylinder numbers are reserved for * "too big" indicators (in which case only LBA addressing can be used). @@ -156,18 +375,6 @@ typedef struct { typedef struct { unsigned char system; int boot; - int hidden; - int msftres; - int raid; - int lvm; - int swap; - int lba; - int palo; - int prep; - int diag; - int irst; - int esp; - int bls_boot; OrigState* orig; /* used for CHS stuff */ } DosPartitionData; @@ -891,48 +1098,6 @@ raw_part_is_extended (const DosRawPartition* raw_part) return 0; } -static int _GL_ATTRIBUTE_PURE -raw_part_is_hidden (const DosRawPartition* raw_part) -{ - PED_ASSERT (raw_part != NULL); - - switch (raw_part->type) { - case PARTITION_FAT12_H: - case PARTITION_FAT16_SM_H: - case PARTITION_FAT16_H: - case PARTITION_FAT32_H: - case PARTITION_NTFS_H: - case PARTITION_FAT32_LBA_H: - case PARTITION_FAT16_LBA_H: - return 1; - - default: - return 0; - } - - return 0; -} - -static int _GL_ATTRIBUTE_PURE -raw_part_is_lba (const DosRawPartition* raw_part) -{ - PED_ASSERT (raw_part != NULL); - - switch (raw_part->type) { - case PARTITION_FAT32_LBA: - case PARTITION_FAT16_LBA: - case PARTITION_EXT_LBA: - case PARTITION_FAT32_LBA_H: - case PARTITION_FAT16_LBA_H: - return 1; - - default: - return 0; - } - - return 0; -} - static PedPartition* raw_part_parse (const PedDisk* disk, const DosRawPartition* raw_part, PedSector lba_offset, PedPartitionType type) @@ -952,20 +1117,6 @@ raw_part_parse (const PedDisk* disk, const DosRawPartition* raw_part, dos_data = part->disk_specific; dos_data->system = raw_part->type; dos_data->boot = raw_part->boot_ind != 0; - dos_data->diag = raw_part->type == PARTITION_COMPAQ_DIAG || - raw_part->type == PARTITION_DELL_DIAG; - dos_data->msftres = raw_part->type == PARTITION_MSFT_RECOVERY; - dos_data->hidden = raw_part_is_hidden (raw_part); - dos_data->raid = raw_part->type == PARTITION_LINUX_RAID; - dos_data->lvm = raw_part->type == PARTITION_LINUX_LVM_OLD - || raw_part->type == PARTITION_LINUX_LVM; - dos_data->swap = raw_part->type == PARTITION_LINUX_SWAP; - dos_data->lba = raw_part_is_lba (raw_part); - dos_data->palo = raw_part->type == PARTITION_PALO; - dos_data->prep = raw_part->type == PARTITION_PREP; - dos_data->irst = raw_part->type == PARTITION_IRST; - dos_data->esp = raw_part->type == PARTITION_ESP; - dos_data->bls_boot = raw_part->type == PARTITION_BLS_BOOT; dos_data->orig = ped_malloc (sizeof (OrigState)); if (!dos_data->orig) { ped_partition_destroy (part); @@ -1377,18 +1528,6 @@ msdos_partition_duplicate (const PedPartition* part) new_dos_data = (DosPartitionData*) new_part->disk_specific; new_dos_data->system = old_dos_data->system; new_dos_data->boot = old_dos_data->boot; - new_dos_data->diag = old_dos_data->diag; - new_dos_data->hidden = old_dos_data->hidden; - new_dos_data->msftres = old_dos_data->msftres; - new_dos_data->raid = old_dos_data->raid; - new_dos_data->lvm = old_dos_data->lvm; - new_dos_data->swap = old_dos_data->swap; - new_dos_data->lba = old_dos_data->lba; - new_dos_data->palo = old_dos_data->palo; - new_dos_data->prep = old_dos_data->prep; - new_dos_data->irst = old_dos_data->irst; - new_dos_data->esp = old_dos_data->esp; - new_dos_data->bls_boot = old_dos_data->bls_boot; if (old_dos_data->orig) { new_dos_data->orig = ped_malloc (sizeof (OrigState)); @@ -1417,6 +1556,21 @@ msdos_partition_destroy (PedPartition* part) free (part); } +/* is_skip_type checks the type against the list of types that should not be + * overridden by set_system. It returns a 1 if it is in the list. +*/ +static bool +is_skip_type(unsigned char type_id) { + int n = sizeof(skip_set_system_types) / sizeof(skip_set_system_types[0]); + for (int i = 0; i < n; ++i) { + if (type_id == skip_set_system_types[i]) { + return true; + } + } + + return false; +} + static int msdos_partition_set_system (PedPartition* part, const PedFileSystemType* fs_type) @@ -1425,234 +1579,94 @@ msdos_partition_set_system (PedPartition* part, part->fs_type = fs_type; - if (dos_data->hidden - && fs_type - && strncmp (fs_type->name, "fat", 3) != 0 - && strcmp (fs_type->name, "ntfs") != 0) - dos_data->hidden = 0; - - if (dos_data->msftres - && fs_type - && strcmp (fs_type->name, "ntfs") != 0) - dos_data->msftres = 0; - - if (part->type & PED_PARTITION_EXTENDED) { - dos_data->diag = 0; - dos_data->raid = 0; - dos_data->lvm = 0; - dos_data->swap = 0; - dos_data->palo = 0; - dos_data->prep = 0; - dos_data->irst = 0; - dos_data->esp = 0; - if (dos_data->lba) - dos_data->system = PARTITION_EXT_LBA; - else - dos_data->system = PARTITION_DOS_EXT; + // Is this a type that should skip fs_type checking? + if (is_skip_type(dos_data->system)) { return 1; } - if (dos_data->diag) { - /* Don't change the system if it already is a diag type, - otherwise use Compaq as almost all vendors use that. */ - if (dos_data->system != PARTITION_COMPAQ_DIAG && - dos_data->system != PARTITION_DELL_DIAG) - dos_data->system = PARTITION_COMPAQ_DIAG; - return 1; - } - if (dos_data->msftres) { - dos_data->system = PARTITION_MSFT_RECOVERY; - return 1; - } - if (dos_data->lvm) { - dos_data->system = PARTITION_LINUX_LVM; - return 1; - } - if (dos_data->swap) { - dos_data->system = PARTITION_LINUX_SWAP; - return 1; - } - if (dos_data->raid) { - dos_data->system = PARTITION_LINUX_RAID; - return 1; - } - if (dos_data->palo) { - dos_data->system = PARTITION_PALO; - return 1; - } - if (dos_data->prep) { - dos_data->system = PARTITION_PREP; - return 1; - } - if (dos_data->irst) { - dos_data->system = PARTITION_IRST; - return 1; - } - if (dos_data->esp) { - dos_data->system = PARTITION_ESP; - return 1; - } - if (dos_data->bls_boot) { - dos_data->system = PARTITION_BLS_BOOT; + if (part->type & PED_PARTITION_EXTENDED) { + dos_data->system = PARTITION_EXT_LBA; return 1; } if (!fs_type) dos_data->system = PARTITION_LINUX; - else if (!strcmp (fs_type->name, "fat16")) { - dos_data->system = dos_data->lba - ? PARTITION_FAT16_LBA : PARTITION_FAT16; - dos_data->system |= dos_data->hidden ? PART_FLAG_HIDDEN : 0; - } else if (!strcmp (fs_type->name, "fat32")) { - dos_data->system = dos_data->lba - ? PARTITION_FAT32_LBA : PARTITION_FAT32; - dos_data->system |= dos_data->hidden ? PART_FLAG_HIDDEN : 0; - } else if (!strcmp (fs_type->name, "ntfs") - || !strcmp (fs_type->name, "hpfs")) { + else if (!strcmp (fs_type->name, "fat16")) + dos_data->system = PARTITION_FAT16; + else if (!strcmp (fs_type->name, "fat32")) + dos_data->system = PARTITION_FAT32; + else if (!strcmp (fs_type->name, "ntfs") + || !strcmp (fs_type->name, "hpfs")) dos_data->system = PARTITION_NTFS; - dos_data->system |= dos_data->hidden ? PART_FLAG_HIDDEN : 0; - } else if (!strcmp (fs_type->name, "hfs") + else if (!strcmp (fs_type->name, "hfs") || !strcmp (fs_type->name, "hfs+")) dos_data->system = PARTITION_HFS; else if (!strcmp (fs_type->name, "udf")) dos_data->system = PARTITION_UDF; else if (!strcmp (fs_type->name, "sun-ufs")) dos_data->system = PARTITION_SUN_UFS; - else if (is_linux_swap (fs_type->name)) { + else if (is_linux_swap (fs_type->name)) dos_data->system = PARTITION_LINUX_SWAP; - dos_data->swap = 1; - } else + else dos_data->system = PARTITION_LINUX; return 1; } -static void -clear_flags (DosPartitionData *dos_data) -{ - dos_data->diag = 0; - dos_data->hidden = 0; - dos_data->msftres = 0; - dos_data->lvm = 0; - dos_data->swap = 0; - dos_data->palo = 0; - dos_data->prep = 0; - dos_data->irst = 0; - dos_data->esp = 0; - dos_data->raid = 0; - dos_data->bls_boot = 0; -} - static int msdos_partition_set_flag (PedPartition* part, PedPartitionFlag flag, int state) { - PedDisk* disk; - PedPartition* walk; - DosPartitionData* dos_data; - PED_ASSERT (part != NULL); PED_ASSERT (part->disk_specific != NULL); PED_ASSERT (part->disk != NULL); - dos_data = part->disk_specific; - disk = part->disk; - - switch (flag) { - case PED_PARTITION_HIDDEN: - if (part->type == PED_PARTITION_EXTENDED) { - ped_exception_throw ( - PED_EXCEPTION_ERROR, - PED_EXCEPTION_CANCEL, - _("Extended partitions cannot be hidden on " - "msdos disk labels.")); - return 0; - } - dos_data->hidden = state; - return ped_partition_set_system (part, part->fs_type); + DosPartitionData* dos_data = part->disk_specific; - case PED_PARTITION_MSFT_RESERVED: - if (part->type == PED_PARTITION_EXTENDED) { - ped_exception_throw ( - PED_EXCEPTION_ERROR, - PED_EXCEPTION_CANCEL, - _("Extended partitions cannot be recovery partitions on " - "msdos disk labels.")); + const struct flag_id_mapping_t* p = dos_find_flag_id_mapping (flag); + if (p) + { + if (part->type & PED_PARTITION_EXTENDED) return 0; - } - dos_data->msftres = state; - return ped_partition_set_system (part, part->fs_type); - case PED_PARTITION_BOOT: - dos_data->boot = state; - if (!state) - return 1; - - walk = ped_disk_next_partition (disk, NULL); - for (; walk; walk = ped_disk_next_partition (disk, walk)) { - if (walk == part || !ped_partition_is_active (walk)) - continue; - msdos_partition_set_flag (walk, PED_PARTITION_BOOT, 0); + if (state) { + dos_data->system = p->type_id; + } else if (dos_data->system == p->type_id || dos_data->system == p->alt_type_id) { + // Clear the type so that fs_type will be used to return it to the default + dos_data->system = PARTITION_LINUX; + return ped_partition_set_system (part, part->fs_type); } return 1; + } - case PED_PARTITION_DIAG: - if (state) - clear_flags (dos_data); - dos_data->diag = state; - return ped_partition_set_system (part, part->fs_type); - - case PED_PARTITION_RAID: - if (state) - clear_flags (dos_data); - dos_data->raid = state; - return ped_partition_set_system (part, part->fs_type); - - case PED_PARTITION_LVM: - if (state) - clear_flags (dos_data); - dos_data->lvm = state; - return ped_partition_set_system (part, part->fs_type); - - case PED_PARTITION_SWAP: - if (state) - clear_flags (dos_data); - dos_data->swap = state; - return ped_partition_set_system (part, part->fs_type); + switch (flag) { + case PED_PARTITION_HIDDEN: + { + return dos_type_id_set_hidden(&dos_data->system, state); + } case PED_PARTITION_LBA: - dos_data->lba = state; - return ped_partition_set_system (part, part->fs_type); - - case PED_PARTITION_PALO: - if (state) - clear_flags (dos_data); - dos_data->palo = state; - return ped_partition_set_system (part, part->fs_type); - - case PED_PARTITION_PREP: - if (state) - clear_flags (dos_data); - dos_data->prep = state; - return ped_partition_set_system (part, part->fs_type); + { + return dos_type_id_set_lba(&dos_data->system, state); + } - case PED_PARTITION_IRST: - if (state) - clear_flags (dos_data); - dos_data->irst = state; - return ped_partition_set_system (part, part->fs_type); + case PED_PARTITION_BOOT: + { + dos_data->boot = state; - case PED_PARTITION_ESP: if (state) - clear_flags (dos_data); - dos_data->esp = state; - return ped_partition_set_system (part, part->fs_type); + { + PedDisk* disk = part->disk; + PedPartition* walk = ped_disk_next_partition (disk, NULL); + for (; walk; walk = ped_disk_next_partition (disk, walk)) { + if (walk == part || !ped_partition_is_active (walk)) + continue; + msdos_partition_set_flag (walk, PED_PARTITION_BOOT, 0); + } + } - case PED_PARTITION_BLS_BOOT: - if (state) - clear_flags (dos_data); - dos_data->bls_boot = state; - return ped_partition_set_system (part, part->fs_type); + return 1; + } default: return 0; @@ -1662,58 +1676,25 @@ msdos_partition_set_flag (PedPartition* part, static int _GL_ATTRIBUTE_PURE msdos_partition_get_flag (const PedPartition* part, PedPartitionFlag flag) { - DosPartitionData* dos_data; - PED_ASSERT (part != NULL); PED_ASSERT (part->disk_specific != NULL); - dos_data = part->disk_specific; + DosPartitionData* dos_data = part->disk_specific; + + const struct flag_id_mapping_t* p = dos_find_flag_id_mapping (flag); + if (p) + return dos_data->system == p->type_id || dos_data->system == p->alt_type_id; + switch (flag) { case PED_PARTITION_HIDDEN: - if (part->type == PED_PARTITION_EXTENDED) - return 0; - else - return dos_data->hidden; + return dos_type_id_is_hidden(dos_data->system); - case PED_PARTITION_MSFT_RESERVED: - if (part->type == PED_PARTITION_EXTENDED) - return 0; - else - return dos_data->msftres; + case PED_PARTITION_LBA: + return dos_type_id_is_lba(dos_data->system); case PED_PARTITION_BOOT: return dos_data->boot; - case PED_PARTITION_DIAG: - return dos_data->diag; - - case PED_PARTITION_RAID: - return dos_data->raid; - - case PED_PARTITION_LVM: - return dos_data->lvm; - - case PED_PARTITION_SWAP: - return dos_data->swap; - - case PED_PARTITION_LBA: - return dos_data->lba; - - case PED_PARTITION_PALO: - return dos_data->palo; - - case PED_PARTITION_PREP: - return dos_data->prep; - - case PED_PARTITION_IRST: - return dos_data->irst; - - case PED_PARTITION_ESP: - return dos_data->esp; - - case PED_PARTITION_BLS_BOOT: - return dos_data->bls_boot; - default: return 0; } @@ -1723,30 +1704,19 @@ static int msdos_partition_is_flag_available (const PedPartition* part, PedPartitionFlag flag) { + if (dos_find_flag_id_mapping (flag)) + return part->type != PED_PARTITION_EXTENDED; + + DosPartitionData* dos_data = part->disk_specific; + switch (flag) { case PED_PARTITION_HIDDEN: - if (part->type == PED_PARTITION_EXTENDED) - return 0; - else - return 1; + return dos_type_id_supports_hidden(dos_data->system); - case PED_PARTITION_MSFT_RESERVED: - if (part->type == PED_PARTITION_EXTENDED) - return 0; - else - return 1; + case PED_PARTITION_LBA: + return dos_type_id_supports_lba(dos_data->system); case PED_PARTITION_BOOT: - case PED_PARTITION_RAID: - case PED_PARTITION_LVM: - case PED_PARTITION_SWAP: - case PED_PARTITION_LBA: - case PED_PARTITION_PALO: - case PED_PARTITION_PREP: - case PED_PARTITION_IRST: - case PED_PARTITION_ESP: - case PED_PARTITION_BLS_BOOT: - case PED_PARTITION_DIAG: return 1; default: @@ -1754,6 +1724,27 @@ msdos_partition_is_flag_available (const PedPartition* part, } } + +int +msdos_partition_set_type_id (PedPartition* part, uint8_t id) +{ + DosPartitionData* dos_data = part->disk_specific; + + dos_data->system = id; + + return 1; +} + + +uint8_t _GL_ATTRIBUTE_PURE +msdos_partition_get_type_id (const PedPartition* part) +{ + const DosPartitionData* dos_data = part->disk_specific; + + return dos_data->system; +} + + static PedGeometry* _try_constraint (const PedPartition* part, const PedConstraint* external, PedConstraint* internal) @@ -2590,6 +2581,10 @@ static PedDiskOps msdos_disk_ops = { partition_set_name: NULL, partition_get_name: NULL, + partition_set_type_id: msdos_partition_set_type_id, + partition_get_type_id: msdos_partition_get_type_id, + partition_set_type_uuid: NULL, + partition_get_type_uuid: NULL, PT_op_function_initializers (msdos) }; @@ -2598,7 +2593,7 @@ static PedDiskType msdos_disk_type = { next: NULL, name: "msdos", ops: &msdos_disk_ops, - features: PED_DISK_TYPE_EXTENDED + features: PED_DISK_TYPE_EXTENDED | PED_DISK_TYPE_PARTITION_TYPE_ID }; void diff --git a/libparted/labels/dvh.c b/libparted/labels/dvh.c index 957ef82..0f9124d 100644 --- a/libparted/labels/dvh.c +++ b/libparted/labels/dvh.c @@ -1,6 +1,6 @@ /* libparted - a library for manipulating disk partitions - Copyright (C) 2001-2002, 2005, 2007-2014, 2019-2022 Free Software + Copyright (C) 2001-2002, 2005, 2007-2014, 2019-2023 Free Software Foundation, Inc. This program is free software; you can redistribute it and/or modify diff --git a/libparted/labels/gpt.c b/libparted/labels/gpt.c index 037d021..780fb70 100644 --- a/libparted/labels/gpt.c +++ b/libparted/labels/gpt.c @@ -196,6 +196,24 @@ static const struct flag_uuid_mapping_t flag_uuid_mapping[] = { PED_PARTITION_SWAP, PARTITION_SWAP_GUID }, }; +static const efi_guid_t skip_set_system_guids[] = +{ + PARTITION_LVM_GUID, + PARTITION_SWAP_GUID, + PARTITION_RAID_GUID, + PARTITION_PREP_GUID, + PARTITION_SYSTEM_GUID, + PARTITION_BIOS_GRUB_GUID, + PARTITION_HPSERVICE_GUID, + PARTITION_MSFT_RESERVED_GUID, + PARTITION_BASIC_DATA_GUID, + PARTITION_MSFT_RECOVERY, + PARTITION_APPLE_TV_RECOVERY_GUID, + PARTITION_IRST_GUID, + PARTITION_CHROMEOS_KERNEL_GUID, + PARTITION_BLS_BOOT_GUID, +}; + static const struct flag_uuid_mapping_t* _GL_ATTRIBUTE_CONST gpt_find_flag_uuid_mapping (PedPartitionFlag flag) { @@ -234,7 +252,8 @@ struct __attribute__ ((packed)) _GuidPartitionEntryAttributes_t uint64_t NoBlockIOProtocol:1; uint64_t LegacyBIOSBootable:1; uint64_t Reserved:45; - uint64_t GuidSpecific:16; + uint64_t GuidSpecific:15; + uint64_t NoAutomount:1; #else # warning "Using crippled partition entry type" uint32_t RequiredToFunction:1; @@ -242,7 +261,8 @@ struct __attribute__ ((packed)) _GuidPartitionEntryAttributes_t uint32_t LegacyBIOSBootable:1; uint32_t Reserved:30; uint32_t LOST:5; - uint32_t GuidSpecific:16; + uint32_t GuidSpecific:15; + uint32_t NoAutomount:1; #endif }; @@ -1421,6 +1441,21 @@ gpt_partition_destroy (PedPartition *part) _ped_partition_free (part); } +/* is_skip_guid checks the guid against the list of guids that should not be + * overridden by set_system. It returns a 1 if it is in the list. +*/ +static bool +is_skip_guid(efi_guid_t guid) { + int n = sizeof(skip_set_system_guids) / sizeof(skip_set_system_guids[0]); + for (int i = 0; i < n; ++i) { + if (guid_cmp(guid, skip_set_system_guids[i]) == 0) { + return true; + } + } + + return false; +} + static int gpt_partition_set_system (PedPartition *part, const PedFileSystemType *fs_type) @@ -1431,6 +1466,11 @@ gpt_partition_set_system (PedPartition *part, part->fs_type = fs_type; + // Is this a GUID that should skip fs_type checking? + if (is_skip_guid(gpt_part_data->type)) { + return 1; + } + if (fs_type) { if (strncmp (fs_type->name, "fat", 3) == 0 @@ -1538,6 +1578,24 @@ gpt_disk_is_flag_available(const PedDisk *disk, PedDiskFlag flag) } } +static uint8_t* +gpt_disk_get_uuid (const PedDisk *disk) +{ + GPTDiskData *gpt_disk_data = disk->disk_specific; + + efi_guid_t uuid = gpt_disk_data->uuid; + + /* uuid is always LE, while uint8_t is always kind of BE */ + + uuid.time_low = PED_SWAP32(uuid.time_low); + uuid.time_mid = PED_SWAP16(uuid.time_mid); + uuid.time_hi_and_version = PED_SWAP16(uuid.time_hi_and_version); + + uint8_t *buf = ped_malloc(sizeof (uuid_t)); + memcpy(buf, &uuid, sizeof (uuid_t)); + return buf; +} + static int gpt_disk_get_flag (const PedDisk *disk, PedDiskFlag flag) { @@ -1563,10 +1621,13 @@ gpt_partition_set_flag (PedPartition *part, PedPartitionFlag flag, int state) const struct flag_uuid_mapping_t* p = gpt_find_flag_uuid_mapping (flag); if (p) { - if (state) + if (state) { gpt_part_data->type = p->type_uuid; - else if (guid_cmp (gpt_part_data->type, p->type_uuid) == 0) + } else if (guid_cmp (gpt_part_data->type, p->type_uuid) == 0) { + // Clear the GUID so that fs_type will be used to return it to the default + gpt_part_data->type = PARTITION_LINUX_DATA_GUID; return gpt_partition_set_system (part, part->fs_type); + } return 1; } @@ -1578,6 +1639,9 @@ gpt_partition_set_flag (PedPartition *part, PedPartitionFlag flag, int state) case PED_PARTITION_LEGACY_BOOT: gpt_part_data->attributes.LegacyBIOSBootable = state; return 1; + case PED_PARTITION_NO_AUTOMOUNT: + gpt_part_data->attributes.NoAutomount = state; + return 1; case PED_PARTITION_ROOT: case PED_PARTITION_LBA: default: @@ -1603,6 +1667,8 @@ gpt_partition_get_flag (const PedPartition *part, PedPartitionFlag flag) return gpt_part_data->attributes.RequiredToFunction; case PED_PARTITION_LEGACY_BOOT: return gpt_part_data->attributes.LegacyBIOSBootable; + case PED_PARTITION_NO_AUTOMOUNT: + return gpt_part_data->attributes.NoAutomount; case PED_PARTITION_LBA: case PED_PARTITION_ROOT: default: @@ -1622,6 +1688,7 @@ gpt_partition_is_flag_available (const PedPartition *part, { case PED_PARTITION_HIDDEN: case PED_PARTITION_LEGACY_BOOT: + case PED_PARTITION_NO_AUTOMOUNT: return 1; case PED_PARTITION_ROOT: case PED_PARTITION_LBA: @@ -1686,6 +1753,61 @@ gpt_partition_get_name (const PedPartition *part) return gpt_part_data->translated_name; } + +static int +gpt_partition_set_type_uuid (PedPartition *part, const uint8_t *uuid) +{ + GPTPartitionData *gpt_part_data = part->disk_specific; + + efi_guid_t* type_uuid = &gpt_part_data->type; + memcpy(type_uuid, uuid, sizeof (efi_guid_t)); + + /* type_uuid is always LE, while uint8_t is always kind of BE */ + + type_uuid->time_low = PED_SWAP32(type_uuid->time_low); + type_uuid->time_mid = PED_SWAP16(type_uuid->time_mid); + type_uuid->time_hi_and_version = PED_SWAP16(type_uuid->time_hi_and_version); + + return 1; +} + + +static uint8_t* +gpt_partition_get_type_uuid (const PedPartition *part) +{ + const GPTPartitionData *gpt_part_data = part->disk_specific; + + efi_guid_t type_uuid = gpt_part_data->type; + + /* type_uuid is always LE, while uint8_t is always kind of BE */ + + type_uuid.time_low = PED_SWAP32(type_uuid.time_low); + type_uuid.time_mid = PED_SWAP16(type_uuid.time_mid); + type_uuid.time_hi_and_version = PED_SWAP16(type_uuid.time_hi_and_version); + + uint8_t *buf = ped_malloc(sizeof (uuid_t)); + memcpy(buf, &type_uuid, sizeof (uuid_t)); + return buf; +} + +static uint8_t* +gpt_partition_get_uuid (const PedPartition *part) +{ + const GPTPartitionData *gpt_part_data = part->disk_specific; + + efi_guid_t uuid = gpt_part_data->uuid; + + /* uuid is always LE, while uint8_t is always kind of BE */ + + uuid.time_low = PED_SWAP32(uuid.time_low); + uuid.time_mid = PED_SWAP16(uuid.time_mid); + uuid.time_hi_and_version = PED_SWAP16(uuid.time_hi_and_version); + + uint8_t *buf = ped_malloc(sizeof (uuid_t)); + memcpy(buf, &uuid, sizeof (uuid_t)); + return buf; +} + static int gpt_get_max_primary_partition_count (const PedDisk *disk) { @@ -1781,9 +1903,15 @@ static PedDiskOps gpt_disk_ops = partition_set_name: gpt_partition_set_name, partition_get_name: gpt_partition_get_name, + partition_set_type_id: NULL, + partition_get_type_id: NULL, + partition_set_type_uuid: gpt_partition_set_type_uuid, + partition_get_type_uuid: gpt_partition_get_type_uuid, + partition_get_uuid: gpt_partition_get_uuid, disk_set_flag: gpt_disk_set_flag, disk_get_flag: gpt_disk_get_flag, disk_is_flag_available: gpt_disk_is_flag_available, + disk_get_uuid: gpt_disk_get_uuid, PT_op_function_initializers (gpt) }; @@ -1793,7 +1921,8 @@ static PedDiskType gpt_disk_type = next: NULL, name: "gpt", ops: &gpt_disk_ops, - features: PED_DISK_TYPE_PARTITION_NAME + features: PED_DISK_TYPE_PARTITION_NAME | PED_DISK_TYPE_PARTITION_TYPE_UUID | + PED_DISK_TYPE_DISK_UUID | PED_DISK_TYPE_PARTITION_UUID }; void diff --git a/libparted/labels/loop.c b/libparted/labels/loop.c index dc141dc..45d169d 100644 --- a/libparted/labels/loop.c +++ b/libparted/labels/loop.c @@ -1,6 +1,6 @@ /* libparted - a library for manipulating disk partitions - Copyright (C) 1999-2000, 2007-2014, 2019-2022 Free Software Foundation, + Copyright (C) 1999-2000, 2007-2014, 2019-2023 Free Software Foundation, Inc. This program is free software; you can redistribute it and/or modify diff --git a/libparted/labels/mac.c b/libparted/labels/mac.c index 241a866..6711d87 100644 --- a/libparted/labels/mac.c +++ b/libparted/labels/mac.c @@ -1,6 +1,6 @@ /* libparted - a library for manipulating disk partitions - Copyright (C) 2000, 2002, 2004, 2007-2014, 2019-2022 Free Software + Copyright (C) 2000, 2002, 2004, 2007-2014, 2019-2023 Free Software Foundation, Inc. This program is free software; you can redistribute it and/or modify diff --git a/libparted/labels/misc.h b/libparted/labels/misc.h index 9593fd1..7c11388 100644 --- a/libparted/labels/misc.h +++ b/libparted/labels/misc.h @@ -1,7 +1,7 @@ /* -*- Mode: c; indent-tabs-mode: nil -*- libparted - a library for manipulating disk partitions - Copyright (C) 2007, 2009-2014, 2019-2022 Free Software Foundation, Inc. + Copyright (C) 2007, 2009-2014, 2019-2023 Free Software Foundation, Inc. This program is free software; you can redistribute it and/or modify it under the terms of the GNU General Public License as published by diff --git a/libparted/labels/pc98.c b/libparted/labels/pc98.c index 0df776f..cfa3ba4 100644 --- a/libparted/labels/pc98.c +++ b/libparted/labels/pc98.c @@ -1,6 +1,6 @@ /* libparted - a library for manipulating disk partitions - Copyright (C) 2000-2001, 2007-2014, 2019-2022 Free Software Foundation, + Copyright (C) 2000-2001, 2007-2014, 2019-2023 Free Software Foundation, Inc. This program is free software; you can redistribute it and/or modify diff --git a/libparted/labels/pt-tools.c b/libparted/labels/pt-tools.c index 6c77276..add4c45 100644 --- a/libparted/labels/pt-tools.c +++ b/libparted/labels/pt-tools.c @@ -1,5 +1,5 @@ /* partition table tools - Copyright (C) 2008-2014, 2019-2022 Free Software Foundation, Inc. + Copyright (C) 2008-2014, 2019-2023 Free Software Foundation, Inc. This program is free software; you can redistribute it and/or modify it under the terms of the GNU General Public License as published by diff --git a/libparted/labels/pt-tools.h b/libparted/labels/pt-tools.h index e01f8bc..34562f7 100644 --- a/libparted/labels/pt-tools.h +++ b/libparted/labels/pt-tools.h @@ -1,5 +1,5 @@ /* libparted - a library for manipulating disk partitions - Copyright (C) 2008-2014, 2019-2022 Free Software Foundation, Inc. + Copyright (C) 2008-2014, 2019-2023 Free Software Foundation, Inc. This program is free software; you can redistribute it and/or modify it under the terms of the GNU General Public License as published by diff --git a/libparted/labels/rdb.c b/libparted/labels/rdb.c index 68f64ff..499d385 100644 --- a/libparted/labels/rdb.c +++ b/libparted/labels/rdb.c @@ -2,7 +2,7 @@ libparted - a library for manipulating disk partitions disk_amiga.c - libparted module to manipulate amiga RDB partition tables. - Copyright (C) 2000-2001, 2004, 2007-2014, 2019-2022 Free Software + Copyright (C) 2000-2001, 2004, 2007-2014, 2019-2023 Free Software Foundation, Inc. This program is free software; you can redistribute it and/or modify diff --git a/libparted/labels/sun.c b/libparted/labels/sun.c index 622c984..5ed2886 100644 --- a/libparted/labels/sun.c +++ b/libparted/labels/sun.c @@ -1,7 +1,7 @@ /* -*- Mode: c; tab-width: 8; indent-tabs-mode: nil; c-basic-offset: 8 -*- libparted - a library for manipulating disk partitions - Copyright (C) 2000-2001, 2005, 2007-2014, 2019-2022 Free Software + Copyright (C) 2000-2001, 2005, 2007-2014, 2019-2023 Free Software Foundation, Inc. This program is free software; you can redistribute it and/or modify diff --git a/libparted/libparted.c b/libparted/libparted.c index ecae39d..204ce00 100644 --- a/libparted/libparted.c +++ b/libparted/libparted.c @@ -1,6 +1,6 @@ /* libparted - a library for manipulating disk partitions - Copyright (C) 1999-2001, 2007-2014, 2019-2022 Free Software Foundation, + Copyright (C) 1999-2001, 2007-2014, 2019-2023 Free Software Foundation, Inc. This program is free software; you can redistribute it and/or modify diff --git a/libparted/mbr.s b/libparted/mbr.s index aa5fd5b..8ac2240 100644 --- a/libparted/mbr.s +++ b/libparted/mbr.s @@ -1,5 +1,5 @@ ; libparted - a library for manipulating disk partitions -; Copyright (C) 1999-2000, 2007, 2009-2014, 2019-2022 Free Software +; Copyright (C) 1999-2000, 2007, 2009-2014, 2019-2023 Free Software ; Foundation, Inc. ; ; This program is free software; you can redistribute it and/or modify diff --git a/libparted/tests/Makefile.am b/libparted/tests/Makefile.am index fd5cba5..1097743 100644 --- a/libparted/tests/Makefile.am +++ b/libparted/tests/Makefile.am @@ -1,11 +1,12 @@ # This file is part of GNU Parted -# Copyright (C) 1999-2001, 2007-2014, 2019-2022 Free Software Foundation, Inc. +# Copyright (C) 1999-2001, 2007-2014, 2019-2023 Free Software Foundation, Inc. # # This file may be modified and/or distributed without restriction. -TESTS = t1000-label.sh t2000-disk.sh t2100-zerolen.sh t3000-symlink.sh t4000-volser.sh +TESTS = t1000-label.sh t1001-flags.sh t2000-disk.sh t2100-zerolen.sh \ + t3000-symlink.sh t4000-volser.sh EXTRA_DIST = $(TESTS) -check_PROGRAMS = label disk zerolen symlink volser +check_PROGRAMS = label disk zerolen symlink volser flags AM_CFLAGS = $(WARN_CFLAGS) $(WERROR_CFLAGS) LDADD = \ @@ -24,6 +25,7 @@ disk_SOURCES = common.h common.c disk.c zerolen_SOURCES = common.h common.c zerolen.c symlink_SOURCES = common.h common.c symlink.c volser_SOURCES = common.h common.c volser.c +flags_SOURCES = common.h common.c flags.c # Arrange to symlink to tests/init.sh. CLEANFILES = init.sh diff --git a/libparted/tests/Makefile.in b/libparted/tests/Makefile.in index a1b7a87..48fd115 100644 --- a/libparted/tests/Makefile.in +++ b/libparted/tests/Makefile.in @@ -15,7 +15,7 @@ @SET_MAKE@ # This file is part of GNU Parted -# Copyright (C) 1999-2001, 2007-2014, 2019-2022 Free Software Foundation, Inc. +# Copyright (C) 1999-2001, 2007-2014, 2019-2023 Free Software Foundation, Inc. # # This file may be modified and/or distributed without restriction. VPATH = @srcdir@ @@ -74,9 +74,6 @@ am__make_running_with_option = \ test $$has_opt = yes am__make_dryrun = (target_option=n; $(am__make_running_with_option)) am__make_keepgoing = (target_option=k; $(am__make_running_with_option)) -pkgdatadir = $(datadir)/@PACKAGE@ -pkgincludedir = $(includedir)/@PACKAGE@ -pkglibdir = $(libdir)/@PACKAGE@ am__cd = CDPATH="$${ZSH_VERSION+.}$(PATH_SEPARATOR)" && cd install_sh_DATA = $(install_sh) -c -m 644 install_sh_PROGRAM = $(install_sh) -c @@ -92,14 +89,16 @@ POST_UNINSTALL = : build_triplet = @build@ host_triplet = @host@ check_PROGRAMS = label$(EXEEXT) disk$(EXEEXT) zerolen$(EXEEXT) \ - symlink$(EXEEXT) volser$(EXEEXT) + symlink$(EXEEXT) volser$(EXEEXT) flags$(EXEEXT) subdir = libparted/tests ACLOCAL_M4 = $(top_srcdir)/aclocal.m4 am__aclocal_m4_deps = $(top_srcdir)/m4/00gnulib.m4 \ $(top_srcdir)/m4/__inline.m4 \ $(top_srcdir)/m4/absolute-header.m4 $(top_srcdir)/m4/alloca.m4 \ $(top_srcdir)/m4/arpa_inet_h.m4 $(top_srcdir)/m4/assert.m4 \ - $(top_srcdir)/m4/btowc.m4 $(top_srcdir)/m4/builtin-expect.m4 \ + $(top_srcdir)/m4/assert_h.m4 $(top_srcdir)/m4/btowc.m4 \ + $(top_srcdir)/m4/build-to-host.m4 \ + $(top_srcdir)/m4/builtin-expect.m4 $(top_srcdir)/m4/c-bool.m4 \ $(top_srcdir)/m4/calloc.m4 $(top_srcdir)/m4/canonicalize.m4 \ $(top_srcdir)/m4/clock_time.m4 $(top_srcdir)/m4/close.m4 \ $(top_srcdir)/m4/codeset.m4 $(top_srcdir)/m4/config-h.m4 \ @@ -107,7 +106,7 @@ am__aclocal_m4_deps = $(top_srcdir)/m4/00gnulib.m4 \ $(top_srcdir)/m4/double-slash-root.m4 $(top_srcdir)/m4/dup2.m4 \ $(top_srcdir)/m4/eealloc.m4 $(top_srcdir)/m4/environ.m4 \ $(top_srcdir)/m4/errno_h.m4 $(top_srcdir)/m4/error.m4 \ - $(top_srcdir)/m4/extensions.m4 \ + $(top_srcdir)/m4/error_h.m4 $(top_srcdir)/m4/extensions.m4 \ $(top_srcdir)/m4/extern-inline.m4 $(top_srcdir)/m4/fcntl-o.m4 \ $(top_srcdir)/m4/fcntl.m4 $(top_srcdir)/m4/fcntl_h.m4 \ $(top_srcdir)/m4/fdopen.m4 $(top_srcdir)/m4/flexmember.m4 \ @@ -139,10 +138,11 @@ am__aclocal_m4_deps = $(top_srcdir)/m4/00gnulib.m4 \ $(top_srcdir)/m4/malloc.m4 $(top_srcdir)/m4/malloca.m4 \ $(top_srcdir)/m4/manywarnings.m4 $(top_srcdir)/m4/mbrtowc.m4 \ $(top_srcdir)/m4/mbsinit.m4 $(top_srcdir)/m4/mbstate_t.m4 \ - $(top_srcdir)/m4/mbtowc.m4 $(top_srcdir)/m4/mempcpy.m4 \ - $(top_srcdir)/m4/minmax.m4 $(top_srcdir)/m4/mkdir.m4 \ - $(top_srcdir)/m4/mkstemp.m4 $(top_srcdir)/m4/mmap-anon.m4 \ - $(top_srcdir)/m4/mode_t.m4 $(top_srcdir)/m4/msvc-inval.m4 \ + $(top_srcdir)/m4/mbtowc.m4 $(top_srcdir)/m4/memchr.m4 \ + $(top_srcdir)/m4/mempcpy.m4 $(top_srcdir)/m4/minmax.m4 \ + $(top_srcdir)/m4/mkdir.m4 $(top_srcdir)/m4/mkstemp.m4 \ + $(top_srcdir)/m4/mmap-anon.m4 $(top_srcdir)/m4/mode_t.m4 \ + $(top_srcdir)/m4/msvc-inval.m4 \ $(top_srcdir)/m4/msvc-nothrow.m4 $(top_srcdir)/m4/multiarch.m4 \ $(top_srcdir)/m4/musl.m4 $(top_srcdir)/m4/nanosleep.m4 \ $(top_srcdir)/m4/netinet_in_h.m4 \ @@ -173,29 +173,29 @@ am__aclocal_m4_deps = $(top_srcdir)/m4/00gnulib.m4 \ $(top_srcdir)/m4/socklen.m4 $(top_srcdir)/m4/sockpfaf.m4 \ $(top_srcdir)/m4/ssize_t.m4 $(top_srcdir)/m4/stat-time.m4 \ $(top_srcdir)/m4/stat.m4 $(top_srcdir)/m4/stdalign.m4 \ - $(top_srcdir)/m4/stdarg.m4 $(top_srcdir)/m4/stdbool.m4 \ - $(top_srcdir)/m4/stddef_h.m4 $(top_srcdir)/m4/stdint.m4 \ - $(top_srcdir)/m4/stdio_h.m4 $(top_srcdir)/m4/stdlib_h.m4 \ - $(top_srcdir)/m4/strdup.m4 $(top_srcdir)/m4/strerror.m4 \ - $(top_srcdir)/m4/strerror_r.m4 $(top_srcdir)/m4/string_h.m4 \ - $(top_srcdir)/m4/strtoll.m4 $(top_srcdir)/m4/strtoull.m4 \ - $(top_srcdir)/m4/symlink.m4 $(top_srcdir)/m4/sys_ioctl_h.m4 \ + $(top_srcdir)/m4/stdarg.m4 $(top_srcdir)/m4/stddef_h.m4 \ + $(top_srcdir)/m4/stdint.m4 $(top_srcdir)/m4/stdio_h.m4 \ + $(top_srcdir)/m4/stdlib_h.m4 $(top_srcdir)/m4/strdup.m4 \ + $(top_srcdir)/m4/strerror.m4 $(top_srcdir)/m4/strerror_r.m4 \ + $(top_srcdir)/m4/string_h.m4 $(top_srcdir)/m4/strtoll.m4 \ + $(top_srcdir)/m4/strtoull.m4 $(top_srcdir)/m4/symlink.m4 \ + $(top_srcdir)/m4/sys_ioctl_h.m4 \ $(top_srcdir)/m4/sys_random_h.m4 \ $(top_srcdir)/m4/sys_select_h.m4 \ $(top_srcdir)/m4/sys_socket_h.m4 \ $(top_srcdir)/m4/sys_stat_h.m4 $(top_srcdir)/m4/sys_time_h.m4 \ $(top_srcdir)/m4/sys_types_h.m4 $(top_srcdir)/m4/sys_uio_h.m4 \ $(top_srcdir)/m4/tempname.m4 $(top_srcdir)/m4/thread.m4 \ - $(top_srcdir)/m4/threadlib.m4 $(top_srcdir)/m4/time_h.m4 \ - $(top_srcdir)/m4/unistd_h.m4 $(top_srcdir)/m4/unlink.m4 \ - $(top_srcdir)/m4/unlinkdir.m4 $(top_srcdir)/m4/usleep.m4 \ - $(top_srcdir)/m4/version-etc.m4 $(top_srcdir)/m4/visibility.m4 \ - $(top_srcdir)/m4/warn-on-use.m4 $(top_srcdir)/m4/warnings.m4 \ - $(top_srcdir)/m4/wchar_h.m4 $(top_srcdir)/m4/wchar_t.m4 \ - $(top_srcdir)/m4/wcrtomb.m4 $(top_srcdir)/m4/wctob.m4 \ - $(top_srcdir)/m4/wctomb.m4 $(top_srcdir)/m4/wctype_h.m4 \ - $(top_srcdir)/m4/wint_t.m4 $(top_srcdir)/m4/xalloc.m4 \ - $(top_srcdir)/m4/xstrtol.m4 $(top_srcdir)/m4/year2038.m4 \ + $(top_srcdir)/m4/threadlib.m4 $(top_srcdir)/m4/time.m4 \ + $(top_srcdir)/m4/time_h.m4 $(top_srcdir)/m4/unistd_h.m4 \ + $(top_srcdir)/m4/unlink.m4 $(top_srcdir)/m4/unlinkdir.m4 \ + $(top_srcdir)/m4/usleep.m4 $(top_srcdir)/m4/version-etc.m4 \ + $(top_srcdir)/m4/visibility.m4 $(top_srcdir)/m4/warn-on-use.m4 \ + $(top_srcdir)/m4/warnings.m4 $(top_srcdir)/m4/wchar_h.m4 \ + $(top_srcdir)/m4/wchar_t.m4 $(top_srcdir)/m4/wcrtomb.m4 \ + $(top_srcdir)/m4/wctob.m4 $(top_srcdir)/m4/wctomb.m4 \ + $(top_srcdir)/m4/wctype_h.m4 $(top_srcdir)/m4/wint_t.m4 \ + $(top_srcdir)/m4/xalloc.m4 $(top_srcdir)/m4/xstrtol.m4 \ $(top_srcdir)/m4/yield.m4 $(top_srcdir)/m4/zzgnulib.m4 \ $(top_srcdir)/configure.ac am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \ @@ -215,6 +215,11 @@ AM_V_lt = $(am__v_lt_@AM_V@) am__v_lt_ = $(am__v_lt_@AM_DEFAULT_V@) am__v_lt_0 = --silent am__v_lt_1 = +am_flags_OBJECTS = common.$(OBJEXT) flags.$(OBJEXT) +flags_OBJECTS = $(am_flags_OBJECTS) +flags_LDADD = $(LDADD) +flags_DEPENDENCIES = $(top_builddir)/libparted/libparted.la \ + $(am__DEPENDENCIES_1) am_label_OBJECTS = common.$(OBJEXT) label.$(OBJEXT) label_OBJECTS = $(am_label_OBJECTS) label_LDADD = $(LDADD) @@ -251,8 +256,9 @@ DEFAULT_INCLUDES = -I.@am__isrc@ -I$(top_builddir)/lib depcomp = $(SHELL) $(top_srcdir)/build-aux/depcomp am__maybe_remake_depfiles = depfiles am__depfiles_remade = ./$(DEPDIR)/common.Po ./$(DEPDIR)/disk.Po \ - ./$(DEPDIR)/label.Po ./$(DEPDIR)/symlink.Po \ - ./$(DEPDIR)/volser.Po ./$(DEPDIR)/zerolen.Po + ./$(DEPDIR)/flags.Po ./$(DEPDIR)/label.Po \ + ./$(DEPDIR)/symlink.Po ./$(DEPDIR)/volser.Po \ + ./$(DEPDIR)/zerolen.Po am__mv = mv -f COMPILE = $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) \ $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) @@ -272,10 +278,10 @@ AM_V_CCLD = $(am__v_CCLD_@AM_V@) am__v_CCLD_ = $(am__v_CCLD_@AM_DEFAULT_V@) am__v_CCLD_0 = @echo " CCLD " $@; am__v_CCLD_1 = -SOURCES = $(disk_SOURCES) $(label_SOURCES) $(symlink_SOURCES) \ - $(volser_SOURCES) $(zerolen_SOURCES) -DIST_SOURCES = $(disk_SOURCES) $(label_SOURCES) $(symlink_SOURCES) \ - $(volser_SOURCES) $(zerolen_SOURCES) +SOURCES = $(disk_SOURCES) $(flags_SOURCES) $(label_SOURCES) \ + $(symlink_SOURCES) $(volser_SOURCES) $(zerolen_SOURCES) +DIST_SOURCES = $(disk_SOURCES) $(flags_SOURCES) $(label_SOURCES) \ + $(symlink_SOURCES) $(volser_SOURCES) $(zerolen_SOURCES) am__can_run_installinfo = \ case $$AM_UPDATE_INFO_DIR in \ n|no|NO) false;; \ @@ -507,6 +513,9 @@ am__DIST_COMMON = $(srcdir)/Makefile.in \ $(top_srcdir)/build-aux/depcomp \ $(top_srcdir)/build-aux/test-driver DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST) +pkgdatadir = @pkgdatadir@ +pkgincludedir = @pkgincludedir@ +pkglibdir = @pkglibdir@ pkglibexecdir = @pkglibexecdir@ ACLOCAL = @ACLOCAL@ ALLOCA = @ALLOCA@ @@ -516,6 +525,7 @@ AM_DEFAULT_VERBOSITY = @AM_DEFAULT_VERBOSITY@ APPLE_UNIVERSAL_BUILD = @APPLE_UNIVERSAL_BUILD@ AR = @AR@ ARFLAGS = @ARFLAGS@ +ASSERT_H = @ASSERT_H@ AUTOCONF = @AUTOCONF@ AUTOHEADER = @AUTOHEADER@ AUTOMAKE = @AUTOMAKE@ @@ -532,6 +542,7 @@ CFLAGS = @CFLAGS@ CFLAG_VISIBILITY = @CFLAG_VISIBILITY@ CHECK_CFLAGS = @CHECK_CFLAGS@ CHECK_LIBS = @CHECK_LIBS@ +CLOCK_TIME_LIB = @CLOCK_TIME_LIB@ CONFIG_INCLUDE = @CONFIG_INCLUDE@ CPP = @CPP@ CPPFLAGS = @CPPFLAGS@ @@ -556,12 +567,14 @@ ENOLINK_VALUE = @ENOLINK_VALUE@ EOVERFLOW_HIDDEN = @EOVERFLOW_HIDDEN@ EOVERFLOW_VALUE = @EOVERFLOW_VALUE@ ERRNO_H = @ERRNO_H@ +ERROR_H = @ERROR_H@ ETAGS = @ETAGS@ EXEEXT = @EXEEXT@ FGREP = @FGREP@ FILECMD = @FILECMD@ GETOPT_CDEFS_H = @GETOPT_CDEFS_H@ GETOPT_H = @GETOPT_H@ +GETRANDOM_LIB = @GETRANDOM_LIB@ GETTEXT_MACRO_VERSION = @GETTEXT_MACRO_VERSION@ GL_CFLAG_ALLOW_WARNINGS = @GL_CFLAG_ALLOW_WARNINGS@ GL_CFLAG_GNULIB_WARNINGS = @GL_CFLAG_GNULIB_WARNINGS@ @@ -577,6 +590,7 @@ GL_GNULIB_CALLOC_GNU = @GL_GNULIB_CALLOC_GNU@ GL_GNULIB_CALLOC_POSIX = @GL_GNULIB_CALLOC_POSIX@ GL_GNULIB_CANONICALIZE_FILE_NAME = @GL_GNULIB_CANONICALIZE_FILE_NAME@ GL_GNULIB_CHDIR = @GL_GNULIB_CHDIR@ +GL_GNULIB_CHMOD = @GL_GNULIB_CHMOD@ GL_GNULIB_CHOWN = @GL_GNULIB_CHOWN@ GL_GNULIB_CLOSE = @GL_GNULIB_CLOSE@ GL_GNULIB_CONNECT = @GL_GNULIB_CONNECT@ @@ -650,6 +664,7 @@ GL_GNULIB_GETPAGESIZE = @GL_GNULIB_GETPAGESIZE@ GL_GNULIB_GETPASS = @GL_GNULIB_GETPASS@ GL_GNULIB_GETPASS_GNU = @GL_GNULIB_GETPASS_GNU@ GL_GNULIB_GETPEERNAME = @GL_GNULIB_GETPEERNAME@ +GL_GNULIB_GETPROGNAME = @GL_GNULIB_GETPROGNAME@ GL_GNULIB_GETRANDOM = @GL_GNULIB_GETRANDOM@ GL_GNULIB_GETSOCKNAME = @GL_GNULIB_GETSOCKNAME@ GL_GNULIB_GETSOCKOPT = @GL_GNULIB_GETSOCKOPT@ @@ -747,6 +762,7 @@ GL_GNULIB_MEMCHR = @GL_GNULIB_MEMCHR@ GL_GNULIB_MEMMEM = @GL_GNULIB_MEMMEM@ GL_GNULIB_MEMPCPY = @GL_GNULIB_MEMPCPY@ GL_GNULIB_MEMRCHR = @GL_GNULIB_MEMRCHR@ +GL_GNULIB_MEMSET_EXPLICIT = @GL_GNULIB_MEMSET_EXPLICIT@ GL_GNULIB_MKDIR = @GL_GNULIB_MKDIR@ GL_GNULIB_MKDIRAT = @GL_GNULIB_MKDIRAT@ GL_GNULIB_MKDTEMP = @GL_GNULIB_MKDTEMP@ @@ -867,6 +883,7 @@ GL_GNULIB_STRVERSCMP = @GL_GNULIB_STRVERSCMP@ GL_GNULIB_SYMLINK = @GL_GNULIB_SYMLINK@ GL_GNULIB_SYMLINKAT = @GL_GNULIB_SYMLINKAT@ GL_GNULIB_SYSTEM_POSIX = @GL_GNULIB_SYSTEM_POSIX@ +GL_GNULIB_TIME = @GL_GNULIB_TIME@ GL_GNULIB_TIMEGM = @GL_GNULIB_TIMEGM@ GL_GNULIB_TIMESPEC_GET = @GL_GNULIB_TIMESPEC_GET@ GL_GNULIB_TIMESPEC_GETRES = @GL_GNULIB_TIMESPEC_GETRES@ @@ -941,6 +958,7 @@ GMSGFMT_015 = @GMSGFMT_015@ GNULIBHEADERS_OVERRIDE_WINT_T = @GNULIBHEADERS_OVERRIDE_WINT_T@ GNULIB_GETTIMEOFDAY = @GNULIB_GETTIMEOFDAY@ GREP = @GREP@ +HARD_LOCALE_LIB = @HARD_LOCALE_LIB@ HAVE_ACCEPT4 = @HAVE_ACCEPT4@ HAVE_ALIGNED_ALLOC = @HAVE_ALIGNED_ALLOC@ HAVE_ALLOCA_H = @HAVE_ALLOCA_H@ @@ -971,6 +989,7 @@ HAVE_DECL_GETLOGIN = @HAVE_DECL_GETLOGIN@ HAVE_DECL_GETLOGIN_R = @HAVE_DECL_GETLOGIN_R@ HAVE_DECL_GETPAGESIZE = @HAVE_DECL_GETPAGESIZE@ HAVE_DECL_GETUSERSHELL = @HAVE_DECL_GETUSERSHELL@ +HAVE_DECL_GETW = @HAVE_DECL_GETW@ HAVE_DECL_IMAXABS = @HAVE_DECL_IMAXABS@ HAVE_DECL_IMAXDIV = @HAVE_DECL_IMAXDIV@ HAVE_DECL_INET_NTOP = @HAVE_DECL_INET_NTOP@ @@ -980,6 +999,7 @@ HAVE_DECL_LOCALTIME_R = @HAVE_DECL_LOCALTIME_R@ HAVE_DECL_MEMMEM = @HAVE_DECL_MEMMEM@ HAVE_DECL_MEMRCHR = @HAVE_DECL_MEMRCHR@ HAVE_DECL_OBSTACK_PRINTF = @HAVE_DECL_OBSTACK_PRINTF@ +HAVE_DECL_PUTW = @HAVE_DECL_PUTW@ HAVE_DECL_SETENV = @HAVE_DECL_SETENV@ HAVE_DECL_SETHOSTNAME = @HAVE_DECL_SETHOSTNAME@ HAVE_DECL_SETSTATE = @HAVE_DECL_SETSTATE@ @@ -1002,6 +1022,9 @@ HAVE_DECL_WCWIDTH = @HAVE_DECL_WCWIDTH@ HAVE_DPRINTF = @HAVE_DPRINTF@ HAVE_DUP3 = @HAVE_DUP3@ HAVE_DUPLOCALE = @HAVE_DUPLOCALE@ +HAVE_ERROR = @HAVE_ERROR@ +HAVE_ERROR_AT_LINE = @HAVE_ERROR_AT_LINE@ +HAVE_ERROR_H = @HAVE_ERROR_H@ HAVE_EUIDACCESS = @HAVE_EUIDACCESS@ HAVE_EXECVPE = @HAVE_EXECVPE@ HAVE_EXPLICIT_BZERO = @HAVE_EXPLICIT_BZERO@ @@ -1029,12 +1052,15 @@ HAVE_GETLOGIN = @HAVE_GETLOGIN@ HAVE_GETOPT_H = @HAVE_GETOPT_H@ HAVE_GETPAGESIZE = @HAVE_GETPAGESIZE@ HAVE_GETPASS = @HAVE_GETPASS@ +HAVE_GETPROGNAME = @HAVE_GETPROGNAME@ HAVE_GETRANDOM = @HAVE_GETRANDOM@ HAVE_GETSUBOPT = @HAVE_GETSUBOPT@ HAVE_GETTIMEOFDAY = @HAVE_GETTIMEOFDAY@ HAVE_GETUMASK = @HAVE_GETUMASK@ HAVE_GRANTPT = @HAVE_GRANTPT@ HAVE_GROUP_MEMBER = @HAVE_GROUP_MEMBER@ +HAVE_IMAXABS = @HAVE_IMAXABS@ +HAVE_IMAXDIV = @HAVE_IMAXDIV@ HAVE_IMAXDIV_T = @HAVE_IMAXDIV_T@ HAVE_INITSTATE = @HAVE_INITSTATE@ HAVE_INTTYPES_H = @HAVE_INTTYPES_H@ @@ -1061,6 +1087,7 @@ HAVE_MBSNRTOWCS = @HAVE_MBSNRTOWCS@ HAVE_MBSRTOWCS = @HAVE_MBSRTOWCS@ HAVE_MBTOWC = @HAVE_MBTOWC@ HAVE_MEMPCPY = @HAVE_MEMPCPY@ +HAVE_MEMSET_EXPLICIT = @HAVE_MEMSET_EXPLICIT@ HAVE_MKDIRAT = @HAVE_MKDIRAT@ HAVE_MKDTEMP = @HAVE_MKDTEMP@ HAVE_MKFIFO = @HAVE_MKFIFO@ @@ -1269,7 +1296,6 @@ HAVE_WMEMPCPY = @HAVE_WMEMPCPY@ HAVE_WMEMSET = @HAVE_WMEMSET@ HAVE_WS2TCPIP_H = @HAVE_WS2TCPIP_H@ HAVE_XLOCALE_H = @HAVE_XLOCALE_H@ -HAVE__BOOL = @HAVE__BOOL@ HAVE__EXIT = @HAVE__EXIT@ IGNORE_UNUSED_LIBRARIES_CFLAGS = @IGNORE_UNUSED_LIBRARIES_CFLAGS@ INCLUDE_NEXT = @INCLUDE_NEXT@ @@ -1336,15 +1362,20 @@ LT_REVISION = @LT_REVISION@ LT_SYS_LIBRARY_PATH = @LT_SYS_LIBRARY_PATH@ MAKEINFO = @MAKEINFO@ MANIFEST_TOOL = @MANIFEST_TOOL@ +MBRTOWC_LIB = @MBRTOWC_LIB@ MKDIR_P = @MKDIR_P@ MSGFMT = @MSGFMT@ MSGFMT_015 = @MSGFMT_015@ MSGMERGE = @MSGMERGE@ +NANOSLEEP_LIB = @NANOSLEEP_LIB@ NETINET_IN_H = @NETINET_IN_H@ NEXT_ARPA_INET_H = @NEXT_ARPA_INET_H@ +NEXT_ASSERT_H = @NEXT_ASSERT_H@ NEXT_AS_FIRST_DIRECTIVE_ARPA_INET_H = @NEXT_AS_FIRST_DIRECTIVE_ARPA_INET_H@ +NEXT_AS_FIRST_DIRECTIVE_ASSERT_H = @NEXT_AS_FIRST_DIRECTIVE_ASSERT_H@ NEXT_AS_FIRST_DIRECTIVE_CTYPE_H = @NEXT_AS_FIRST_DIRECTIVE_CTYPE_H@ NEXT_AS_FIRST_DIRECTIVE_ERRNO_H = @NEXT_AS_FIRST_DIRECTIVE_ERRNO_H@ +NEXT_AS_FIRST_DIRECTIVE_ERROR_H = @NEXT_AS_FIRST_DIRECTIVE_ERROR_H@ NEXT_AS_FIRST_DIRECTIVE_FCNTL_H = @NEXT_AS_FIRST_DIRECTIVE_FCNTL_H@ NEXT_AS_FIRST_DIRECTIVE_GETOPT_H = @NEXT_AS_FIRST_DIRECTIVE_GETOPT_H@ NEXT_AS_FIRST_DIRECTIVE_INTTYPES_H = @NEXT_AS_FIRST_DIRECTIVE_INTTYPES_H@ @@ -1375,6 +1406,7 @@ NEXT_AS_FIRST_DIRECTIVE_WCHAR_H = @NEXT_AS_FIRST_DIRECTIVE_WCHAR_H@ NEXT_AS_FIRST_DIRECTIVE_WCTYPE_H = @NEXT_AS_FIRST_DIRECTIVE_WCTYPE_H@ NEXT_CTYPE_H = @NEXT_CTYPE_H@ NEXT_ERRNO_H = @NEXT_ERRNO_H@ +NEXT_ERROR_H = @NEXT_ERROR_H@ NEXT_FCNTL_H = @NEXT_FCNTL_H@ NEXT_GETOPT_H = @NEXT_GETOPT_H@ NEXT_INTTYPES_H = @NEXT_INTTYPES_H@ @@ -1430,6 +1462,7 @@ PRAGMA_COLUMNS = @PRAGMA_COLUMNS@ PRAGMA_SYSTEM_HEADER = @PRAGMA_SYSTEM_HEADER@ PRIPTR_PREFIX = @PRIPTR_PREFIX@ PTHREAD_H_DEFINES_STRUCT_TIMESPEC = @PTHREAD_H_DEFINES_STRUCT_TIMESPEC@ +PTHREAD_SIGMASK_LIB = @PTHREAD_SIGMASK_LIB@ PTRDIFF_T_SUFFIX = @PTRDIFF_T_SUFFIX@ RANLIB = @RANLIB@ REPLACE_ACCESS = @REPLACE_ACCESS@ @@ -1438,6 +1471,7 @@ REPLACE_BTOWC = @REPLACE_BTOWC@ REPLACE_CALLOC_FOR_CALLOC_GNU = @REPLACE_CALLOC_FOR_CALLOC_GNU@ REPLACE_CALLOC_FOR_CALLOC_POSIX = @REPLACE_CALLOC_FOR_CALLOC_POSIX@ REPLACE_CANONICALIZE_FILE_NAME = @REPLACE_CANONICALIZE_FILE_NAME@ +REPLACE_CHMOD = @REPLACE_CHMOD@ REPLACE_CHOWN = @REPLACE_CHOWN@ REPLACE_CLOSE = @REPLACE_CLOSE@ REPLACE_COPY_FILE_RANGE = @REPLACE_COPY_FILE_RANGE@ @@ -1446,7 +1480,10 @@ REPLACE_CTIME = @REPLACE_CTIME@ REPLACE_DPRINTF = @REPLACE_DPRINTF@ REPLACE_DUP = @REPLACE_DUP@ REPLACE_DUP2 = @REPLACE_DUP2@ +REPLACE_DUP3 = @REPLACE_DUP3@ REPLACE_DUPLOCALE = @REPLACE_DUPLOCALE@ +REPLACE_ERROR = @REPLACE_ERROR@ +REPLACE_ERROR_AT_LINE = @REPLACE_ERROR_AT_LINE@ REPLACE_EXECL = @REPLACE_EXECL@ REPLACE_EXECLE = @REPLACE_EXECLE@ REPLACE_EXECLP = @REPLACE_EXECLP@ @@ -1459,6 +1496,7 @@ REPLACE_FCHMODAT = @REPLACE_FCHMODAT@ REPLACE_FCHOWNAT = @REPLACE_FCHOWNAT@ REPLACE_FCLOSE = @REPLACE_FCLOSE@ REPLACE_FCNTL = @REPLACE_FCNTL@ +REPLACE_FDATASYNC = @REPLACE_FDATASYNC@ REPLACE_FDOPEN = @REPLACE_FDOPEN@ REPLACE_FFLUSH = @REPLACE_FFLUSH@ REPLACE_FFSLL = @REPLACE_FFSLL@ @@ -1481,15 +1519,21 @@ REPLACE_GETCWD = @REPLACE_GETCWD@ REPLACE_GETDELIM = @REPLACE_GETDELIM@ REPLACE_GETDOMAINNAME = @REPLACE_GETDOMAINNAME@ REPLACE_GETDTABLESIZE = @REPLACE_GETDTABLESIZE@ +REPLACE_GETENTROPY = @REPLACE_GETENTROPY@ REPLACE_GETGROUPS = @REPLACE_GETGROUPS@ REPLACE_GETLINE = @REPLACE_GETLINE@ +REPLACE_GETLOADAVG = @REPLACE_GETLOADAVG@ REPLACE_GETLOGIN_R = @REPLACE_GETLOGIN_R@ REPLACE_GETPAGESIZE = @REPLACE_GETPAGESIZE@ REPLACE_GETPASS = @REPLACE_GETPASS@ REPLACE_GETPASS_FOR_GETPASS_GNU = @REPLACE_GETPASS_FOR_GETPASS_GNU@ +REPLACE_GETPROGNAME = @REPLACE_GETPROGNAME@ REPLACE_GETRANDOM = @REPLACE_GETRANDOM@ +REPLACE_GETSUBOPT = @REPLACE_GETSUBOPT@ REPLACE_GETTIMEOFDAY = @REPLACE_GETTIMEOFDAY@ REPLACE_GMTIME = @REPLACE_GMTIME@ +REPLACE_IMAXABS = @REPLACE_IMAXABS@ +REPLACE_IMAXDIV = @REPLACE_IMAXDIV@ REPLACE_INET_NTOP = @REPLACE_INET_NTOP@ REPLACE_INET_PTON = @REPLACE_INET_PTON@ REPLACE_INITSTATE = @REPLACE_INITSTATE@ @@ -1518,11 +1562,14 @@ REPLACE_MBSTATE_T = @REPLACE_MBSTATE_T@ REPLACE_MBTOWC = @REPLACE_MBTOWC@ REPLACE_MEMCHR = @REPLACE_MEMCHR@ REPLACE_MEMMEM = @REPLACE_MEMMEM@ +REPLACE_MEMPCPY = @REPLACE_MEMPCPY@ REPLACE_MKDIR = @REPLACE_MKDIR@ REPLACE_MKFIFO = @REPLACE_MKFIFO@ REPLACE_MKFIFOAT = @REPLACE_MKFIFOAT@ REPLACE_MKNOD = @REPLACE_MKNOD@ REPLACE_MKNODAT = @REPLACE_MKNODAT@ +REPLACE_MKOSTEMP = @REPLACE_MKOSTEMP@ +REPLACE_MKOSTEMPS = @REPLACE_MKOSTEMPS@ REPLACE_MKSTEMP = @REPLACE_MKSTEMP@ REPLACE_MKTIME = @REPLACE_MKTIME@ REPLACE_NANOSLEEP = @REPLACE_NANOSLEEP@ @@ -1533,8 +1580,10 @@ REPLACE_OBSTACK_PRINTF = @REPLACE_OBSTACK_PRINTF@ REPLACE_OPEN = @REPLACE_OPEN@ REPLACE_OPENAT = @REPLACE_OPENAT@ REPLACE_PERROR = @REPLACE_PERROR@ +REPLACE_PIPE2 = @REPLACE_PIPE2@ REPLACE_POPEN = @REPLACE_POPEN@ REPLACE_POSIX_MEMALIGN = @REPLACE_POSIX_MEMALIGN@ +REPLACE_POSIX_OPENPT = @REPLACE_POSIX_OPENPT@ REPLACE_PREAD = @REPLACE_PREAD@ REPLACE_PRINTF = @REPLACE_PRINTF@ REPLACE_PSELECT = @REPLACE_PSELECT@ @@ -1612,6 +1661,7 @@ REPLACE_RMDIR = @REPLACE_RMDIR@ REPLACE_SCHED_YIELD = @REPLACE_SCHED_YIELD@ REPLACE_SELECT = @REPLACE_SELECT@ REPLACE_SETENV = @REPLACE_SETENV@ +REPLACE_SETHOSTNAME = @REPLACE_SETHOSTNAME@ REPLACE_SETLOCALE = @REPLACE_SETLOCALE@ REPLACE_SETSTATE = @REPLACE_SETSTATE@ REPLACE_SLEEP = @REPLACE_SLEEP@ @@ -1620,6 +1670,7 @@ REPLACE_SPRINTF = @REPLACE_SPRINTF@ REPLACE_STAT = @REPLACE_STAT@ REPLACE_STDIO_READ_FUNCS = @REPLACE_STDIO_READ_FUNCS@ REPLACE_STDIO_WRITE_FUNCS = @REPLACE_STDIO_WRITE_FUNCS@ +REPLACE_STPCPY = @REPLACE_STPCPY@ REPLACE_STPNCPY = @REPLACE_STPNCPY@ REPLACE_STRCASESTR = @REPLACE_STRCASESTR@ REPLACE_STRCHRNUL = @REPLACE_STRCHRNUL@ @@ -1646,7 +1697,9 @@ REPLACE_STRUCT_LCONV = @REPLACE_STRUCT_LCONV@ REPLACE_STRUCT_TIMEVAL = @REPLACE_STRUCT_TIMEVAL@ REPLACE_SYMLINK = @REPLACE_SYMLINK@ REPLACE_SYMLINKAT = @REPLACE_SYMLINKAT@ +REPLACE_TIME = @REPLACE_TIME@ REPLACE_TIMEGM = @REPLACE_TIMEGM@ +REPLACE_TIMESPEC_GET = @REPLACE_TIMESPEC_GET@ REPLACE_TMPFILE = @REPLACE_TMPFILE@ REPLACE_TOWLOWER = @REPLACE_TOWLOWER@ REPLACE_TRUNCATE = @REPLACE_TRUNCATE@ @@ -1672,15 +1725,20 @@ REPLACE_WCSWIDTH = @REPLACE_WCSWIDTH@ REPLACE_WCTOB = @REPLACE_WCTOB@ REPLACE_WCTOMB = @REPLACE_WCTOMB@ REPLACE_WCWIDTH = @REPLACE_WCWIDTH@ +REPLACE_WMEMPCPY = @REPLACE_WMEMPCPY@ REPLACE_WRITE = @REPLACE_WRITE@ +REPLACE__EXIT = @REPLACE__EXIT@ +SCHED_YIELD_LIB = @SCHED_YIELD_LIB@ SED = @SED@ +SELECT_LIB = @SELECT_LIB@ +SETLOCALE_LIB = @SETLOCALE_LIB@ +SETLOCALE_NULL_LIB = @SETLOCALE_NULL_LIB@ SET_MAKE = @SET_MAKE@ SHELL = @SHELL@ SIG_ATOMIC_T_SUFFIX = @SIG_ATOMIC_T_SUFFIX@ SIZE_T_SUFFIX = @SIZE_T_SUFFIX@ -STDALIGN_H = @STDALIGN_H@ STDARG_H = @STDARG_H@ -STDBOOL_H = @STDBOOL_H@ +STDCKDINT_H = @STDCKDINT_H@ STDDEF_H = @STDDEF_H@ STDINT_H = @STDINT_H@ STRIP = @STRIP@ @@ -1724,6 +1782,8 @@ am__quote = @am__quote@ am__tar = @am__tar@ am__untar = @am__untar@ bindir = @bindir@ +bindir_c = @bindir_c@ +bindir_c_make = @bindir_c_make@ build = @build@ build_alias = @build_alias@ build_cpu = @build_cpu@ @@ -1731,10 +1791,20 @@ build_os = @build_os@ build_vendor = @build_vendor@ builddir = @builddir@ datadir = @datadir@ +datadir_c = @datadir_c@ +datadir_c_make = @datadir_c_make@ datarootdir = @datarootdir@ +datarootdir_c = @datarootdir_c@ +datarootdir_c_make = @datarootdir_c_make@ docdir = @docdir@ +docdir_c = @docdir_c@ +docdir_c_make = @docdir_c_make@ dvidir = @dvidir@ +dvidir_c = @dvidir_c@ +dvidir_c_make = @dvidir_c_make@ exec_prefix = @exec_prefix@ +exec_prefix_c = @exec_prefix_c@ +exec_prefix_c_make = @exec_prefix_c_make@ gl_LIBOBJDEPS = @gl_LIBOBJDEPS@ gl_LIBOBJS = @gl_LIBOBJS@ gl_LTLIBOBJS = @gl_LTLIBOBJS@ @@ -1748,31 +1818,75 @@ host_cpu = @host_cpu@ host_os = @host_os@ host_vendor = @host_vendor@ htmldir = @htmldir@ +htmldir_c = @htmldir_c@ +htmldir_c_make = @htmldir_c_make@ includedir = @includedir@ +includedir_c = @includedir_c@ +includedir_c_make = @includedir_c_make@ infodir = @infodir@ +infodir_c = @infodir_c@ +infodir_c_make = @infodir_c_make@ install_sh = @install_sh@ libdir = @libdir@ +libdir_c = @libdir_c@ +libdir_c_make = @libdir_c_make@ libexecdir = @libexecdir@ +libexecdir_c = @libexecdir_c@ +libexecdir_c_make = @libexecdir_c_make@ lispdir = @lispdir@ +lispdir_c = @lispdir_c@ +lispdir_c_make = @lispdir_c_make@ localedir = @localedir@ +localedir_c = @localedir_c@ +localedir_c_make = @localedir_c_make@ localstatedir = @localstatedir@ +localstatedir_c = @localstatedir_c@ +localstatedir_c_make = @localstatedir_c_make@ mandir = @mandir@ +mandir_c = @mandir_c@ +mandir_c_make = @mandir_c_make@ mkdir_p = @mkdir_p@ oldincludedir = @oldincludedir@ +oldincludedir_c = @oldincludedir_c@ +oldincludedir_c_make = @oldincludedir_c_make@ pdfdir = @pdfdir@ +pdfdir_c = @pdfdir_c@ +pdfdir_c_make = @pdfdir_c_make@ +pkgdatadir_c = @pkgdatadir_c@ +pkgdatadir_c_make = @pkgdatadir_c_make@ +pkgincludedir_c = @pkgincludedir_c@ +pkgincludedir_c_make = @pkgincludedir_c_make@ +pkglibdir_c = @pkglibdir_c@ +pkglibdir_c_make = @pkglibdir_c_make@ +pkglibexecdir_c = @pkglibexecdir_c@ +pkglibexecdir_c_make = @pkglibexecdir_c_make@ prefix = @prefix@ +prefix_c = @prefix_c@ +prefix_c_make = @prefix_c_make@ program_transform_name = @program_transform_name@ psdir = @psdir@ +psdir_c = @psdir_c@ +psdir_c_make = @psdir_c_make@ runstatedir = @runstatedir@ +runstatedir_c = @runstatedir_c@ +runstatedir_c_make = @runstatedir_c_make@ sbindir = @sbindir@ +sbindir_c = @sbindir_c@ +sbindir_c_make = @sbindir_c_make@ sharedstatedir = @sharedstatedir@ +sharedstatedir_c = @sharedstatedir_c@ +sharedstatedir_c_make = @sharedstatedir_c_make@ srcdir = @srcdir@ sysconfdir = @sysconfdir@ +sysconfdir_c = @sysconfdir_c@ +sysconfdir_c_make = @sysconfdir_c_make@ target_alias = @target_alias@ top_build_prefix = @top_build_prefix@ top_builddir = @top_builddir@ top_srcdir = @top_srcdir@ -TESTS = t1000-label.sh t2000-disk.sh t2100-zerolen.sh t3000-symlink.sh t4000-volser.sh +TESTS = t1000-label.sh t1001-flags.sh t2000-disk.sh t2100-zerolen.sh \ + t3000-symlink.sh t4000-volser.sh + EXTRA_DIST = $(TESTS) AM_CFLAGS = $(WARN_CFLAGS) $(WERROR_CFLAGS) LDADD = \ @@ -1791,6 +1905,7 @@ disk_SOURCES = common.h common.c disk.c zerolen_SOURCES = common.h common.c zerolen.c symlink_SOURCES = common.h common.c symlink.c volser_SOURCES = common.h common.c volser.c +flags_SOURCES = common.h common.c flags.c # Arrange to symlink to tests/init.sh. CLEANFILES = init.sh @@ -1846,6 +1961,10 @@ disk$(EXEEXT): $(disk_OBJECTS) $(disk_DEPENDENCIES) $(EXTRA_disk_DEPENDENCIES) @rm -f disk$(EXEEXT) $(AM_V_CCLD)$(LINK) $(disk_OBJECTS) $(disk_LDADD) $(LIBS) +flags$(EXEEXT): $(flags_OBJECTS) $(flags_DEPENDENCIES) $(EXTRA_flags_DEPENDENCIES) + @rm -f flags$(EXEEXT) + $(AM_V_CCLD)$(LINK) $(flags_OBJECTS) $(flags_LDADD) $(LIBS) + label$(EXEEXT): $(label_OBJECTS) $(label_DEPENDENCIES) $(EXTRA_label_DEPENDENCIES) @rm -f label$(EXEEXT) $(AM_V_CCLD)$(LINK) $(label_OBJECTS) $(label_LDADD) $(LIBS) @@ -1870,6 +1989,7 @@ distclean-compile: @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/common.Po@am__quote@ # am--include-marker @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/disk.Po@am__quote@ # am--include-marker +@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/flags.Po@am__quote@ # am--include-marker @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/label.Po@am__quote@ # am--include-marker @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/symlink.Po@am__quote@ # am--include-marker @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/volser.Po@am__quote@ # am--include-marker @@ -2111,6 +2231,13 @@ t1000-label.sh.log: t1000-label.sh --log-file $$b.log --trs-file $$b.trs \ $(am__common_driver_flags) $(AM_LOG_DRIVER_FLAGS) $(LOG_DRIVER_FLAGS) -- $(LOG_COMPILE) \ "$$tst" $(AM_TESTS_FD_REDIRECT) +t1001-flags.sh.log: t1001-flags.sh + @p='t1001-flags.sh'; \ + b='t1001-flags.sh'; \ + $(am__check_pre) $(LOG_DRIVER) --test-name "$$f" \ + --log-file $$b.log --trs-file $$b.trs \ + $(am__common_driver_flags) $(AM_LOG_DRIVER_FLAGS) $(LOG_DRIVER_FLAGS) -- $(LOG_COMPILE) \ + "$$tst" $(AM_TESTS_FD_REDIRECT) t2000-disk.sh.log: t2000-disk.sh @p='t2000-disk.sh'; \ b='t2000-disk.sh'; \ @@ -2234,6 +2361,7 @@ clean-am: clean-checkPROGRAMS clean-generic clean-libtool \ distclean: distclean-am -rm -f ./$(DEPDIR)/common.Po -rm -f ./$(DEPDIR)/disk.Po + -rm -f ./$(DEPDIR)/flags.Po -rm -f ./$(DEPDIR)/label.Po -rm -f ./$(DEPDIR)/symlink.Po -rm -f ./$(DEPDIR)/volser.Po @@ -2285,6 +2413,7 @@ installcheck-am: maintainer-clean: maintainer-clean-am -rm -f ./$(DEPDIR)/common.Po -rm -f ./$(DEPDIR)/disk.Po + -rm -f ./$(DEPDIR)/flags.Po -rm -f ./$(DEPDIR)/label.Po -rm -f ./$(DEPDIR)/symlink.Po -rm -f ./$(DEPDIR)/volser.Po diff --git a/libparted/tests/common.c b/libparted/tests/common.c index 2be0e3a..8c42ece 100644 --- a/libparted/tests/common.c +++ b/libparted/tests/common.c @@ -27,7 +27,7 @@ size_t get_sector_size (void) PedExceptionOption _test_exception_handler (PedException* e) { - fail ("Exception of type %s has been raised: %s", + ck_abort_msg("Exception of type %s has been raised: %s", ped_exception_get_type_string (e->type), e->message); @@ -69,10 +69,10 @@ _create_disk_label (PedDevice *dev, PedDiskType *type) /* Create the label */ disk = ped_disk_new_fresh (dev, type); - fail_if (!disk, "Failed to create a label of type: %s", + ck_assert_msg(disk != NULL, "Failed to create a label of type: %s", type->name); - fail_if (!ped_disk_commit(disk), - "Failed to commit label to device"); + ck_assert_msg(ped_disk_commit(disk) != 0, + "Failed to commit label to device"); return disk; } diff --git a/libparted/tests/disk.c b/libparted/tests/disk.c index 62d20c1..a2e304c 100644 --- a/libparted/tests/disk.c +++ b/libparted/tests/disk.c @@ -14,7 +14,7 @@ static void create_disk (void) { temporary_disk = _create_disk (get_sector_size () * 4 * 10 * 1024); - fail_if (temporary_disk == NULL, "Failed to create temporary disk"); + ck_assert_msg(temporary_disk != NULL, "Failed to create temporary disk"); } static void @@ -72,10 +72,10 @@ START_TEST (test_duplicate) part = ped_disk_get_partition (disk, *i); part_dup = ped_disk_get_partition (disk_dup, *i); - fail_if (part->geom.start != part_dup->geom.start || - part->geom.end != part_dup->geom.end, + ck_assert_msg(part->geom.start == part_dup->geom.start && + part->geom.end == part_dup->geom.end, "Duplicated partition %d doesn't match. " - "Details are start: %d/%d end: %d/%d\n", + "Details are start: %lld/%lld end: %lld/%lld\n", *i, part->geom.start, part_dup->geom.start, part->geom.end, part_dup->geom.end); } diff --git a/libparted/tests/flags.c b/libparted/tests/flags.c new file mode 100644 index 0000000..ff4ae71 --- /dev/null +++ b/libparted/tests/flags.c @@ -0,0 +1,116 @@ +#include <config.h> +#include <unistd.h> + +#include <check.h> + +#include <parted/parted.h> + +#include "common.h" +#include "progname.h" + +#define STREQ(a, b) (strcmp (a, b) == 0) + +static char* temporary_disk; + +static void +create_disk (void) +{ + temporary_disk = _create_disk (80 * 1024 * 1024); + ck_assert_msg(temporary_disk != NULL, "Failed to create temporary disk"); +} + +static void +destroy_disk (void) +{ + unlink (temporary_disk); + free (temporary_disk); +} + +/* TEST: Test partition type flag on gpt disklabel */ +START_TEST (test_gpt_flag) +{ + PedDevice* dev = ped_device_get (temporary_disk); + if (dev == NULL) + return; + + PedDisk* disk = ped_disk_new_fresh (dev, ped_disk_type_get ("gpt")); + PedConstraint *constraint = ped_constraint_any (dev); + PedPartition *part = ped_partition_new (disk, PED_PARTITION_NORMAL, + ped_file_system_type_get("ext4"), 2048, 4096); + ped_partition_set_flag(part, PED_PARTITION_BIOS_GRUB, 1); + // Type should remain set to BIOS_GRUB + ped_partition_set_system(part, ped_file_system_type_get("ext4")); + + ped_disk_add_partition (disk, part, constraint); + ped_disk_commit (disk); + ped_constraint_destroy (constraint); + + // Check flag to confirm it is still set + part = ped_disk_get_partition (disk, 1); + ck_assert_msg(ped_partition_get_flag(part, PED_PARTITION_BIOS_GRUB) == 1, "BIOS_GRUB flag not set"); + + ped_disk_destroy (disk); + ped_device_destroy (dev); +} +END_TEST + +/* TEST: Test partition type flag on msdos disklabel */ +START_TEST (test_msdos_flag) +{ + PedDevice* dev = ped_device_get (temporary_disk); + if (dev == NULL) + return; + + PedDisk* disk = ped_disk_new_fresh (dev, ped_disk_type_get ("msdos")); + PedConstraint *constraint = ped_constraint_any (dev); + PedPartition *part = ped_partition_new (disk, PED_PARTITION_NORMAL, + ped_file_system_type_get("ext4"), 2048, 4096); + ped_partition_set_flag(part, PED_PARTITION_BLS_BOOT, 1); + // Type should remain set to BIOS_GRUB + ped_partition_set_system(part, ped_file_system_type_get("ext4")); + + ped_disk_add_partition (disk, part, constraint); + ped_disk_commit (disk); + ped_constraint_destroy (constraint); + + // Check flag to confirm it is still set + part = ped_disk_get_partition (disk, 1); + ck_assert_msg(ped_partition_get_flag(part, PED_PARTITION_BLS_BOOT) == 1, "BLS_BOOT flag not set"); + + ped_disk_destroy (disk); + ped_device_destroy (dev); +} +END_TEST + +int +main (int argc, char **argv) +{ + set_program_name (argv[0]); + int number_failed; + Suite* suite = suite_create ("Partition Flags"); + TCase* tcase_gpt = tcase_create ("GPT"); + TCase* tcase_msdos = tcase_create ("MSDOS"); + + /* Fail when an exception is raised */ + ped_exception_set_handler (_test_exception_handler); + + tcase_add_checked_fixture (tcase_gpt, create_disk, destroy_disk); + tcase_add_test (tcase_gpt, test_gpt_flag); + /* Disable timeout for this test */ + tcase_set_timeout (tcase_gpt, 0); + suite_add_tcase (suite, tcase_gpt); + + tcase_add_checked_fixture (tcase_msdos, create_disk, destroy_disk); + tcase_add_test (tcase_msdos, test_msdos_flag); + /* Disable timeout for this test */ + tcase_set_timeout (tcase_msdos, 0); + suite_add_tcase (suite, tcase_msdos); + + SRunner* srunner = srunner_create (suite); + srunner_run_all (srunner, CK_VERBOSE); + + number_failed = srunner_ntests_failed (srunner); + srunner_free (srunner); + + return (number_failed == 0) ? EXIT_SUCCESS : EXIT_FAILURE; +} diff --git a/libparted/tests/label.c b/libparted/tests/label.c index e0d63c7..67b1b07 100644 --- a/libparted/tests/label.c +++ b/libparted/tests/label.c @@ -16,7 +16,7 @@ static void create_disk (void) { temporary_disk = _create_disk (80 * 1024 * 1024); - fail_if (temporary_disk == NULL, "Failed to create temporary disk"); + ck_assert_msg(temporary_disk != NULL, "Failed to create temporary disk"); } static void @@ -72,12 +72,11 @@ START_TEST (test_probe_label) /* Try to probe the disk label. */ probed = ped_disk_probe (dev); - fail_if (!probed, + ck_assert_msg(probed, "Failed to probe the just created label of type: %s", type->name); if (probed && !STREQ (probed->name, type->name)) - fail_if (1, - "Probe returned label of type: %s as type: %s", + ck_abort_msg("Probe returned label of type: %s as type: %s", type->name, probed->name); } ped_device_destroy (dev); @@ -105,12 +104,11 @@ START_TEST (test_read_label) /* Try to read the disk label. */ disk = ped_disk_new (dev); - fail_if (!disk, + ck_assert_msg(disk, "Failed to read the just created label of type: %s", type->name); if (disk && !STREQ (disk->type->name, type->name)) - fail_if (1, - "Read returned label of type: %s as type: %s", + ck_abort_msg("Read returned label of type: %s as type: %s", type->name, disk->type->name); ped_disk_destroy (disk); @@ -138,7 +136,7 @@ START_TEST (test_clone_label) /* Try to clone the disk label. */ PedDisk* clone = ped_disk_duplicate (disk); - fail_if (!clone, + ck_assert_msg(clone, "Failed to clone the just created label of type: %s", type->name); diff --git a/libparted/tests/symlink.c b/libparted/tests/symlink.c index 52e99ca..7be02cd 100644 --- a/libparted/tests/symlink.c +++ b/libparted/tests/symlink.c @@ -30,7 +30,7 @@ static void create_disk (void) { temporary_disk = _create_disk (4096 * 1024); - fail_if (temporary_disk == NULL, "Failed to create temporary disk"); + ck_assert_msg(temporary_disk != NULL, "Failed to create temporary disk"); } static void @@ -45,7 +45,7 @@ START_TEST (test_symlink) char cwd[256], ln[256] = "/dev/mapper/parted-test-XXXXXX"; if (!getcwd (cwd, sizeof cwd)) { - fail ("Could not get cwd"); + ck_abort_msg("Could not get cwd"); return; } @@ -53,7 +53,7 @@ START_TEST (test_symlink) temporary disk */ int tmp_fd = mkstemp (ln); if (tmp_fd == -1) { - fail ("Could not create tempfile"); + ck_abort_msg("Could not create tempfile"); return; } @@ -61,12 +61,18 @@ START_TEST (test_symlink) here, but as /dev/mapper is root owned this is a non issue */ close (tmp_fd); unlink (ln); - char temp_disk_path[256]; - snprintf (temp_disk_path, sizeof temp_disk_path, "%s/%s", cwd, - temporary_disk); + char temp_disk_path[259]; + int r = snprintf(temp_disk_path, sizeof temp_disk_path, "%s/%s", + cwd, + temporary_disk); + if (r < 0 || r >= sizeof temp_disk_path) { + ck_abort_msg("symlink truncated"); + return; + } + int res = symlink (temp_disk_path, ln); if (res) { - fail ("could not create symlink"); + ck_abort_msg("could not create symlink"); return; } @@ -77,7 +83,7 @@ START_TEST (test_symlink) /* Create a second temporary_disk */ char *temporary_disk2 = _create_disk (4096 * 1024); if (temporary_disk2 == NULL) { - fail ("Failed to create 2nd temporary disk"); + ck_abort_msg("Failed to create 2nd temporary disk"); goto exit_destroy_dev; } @@ -89,11 +95,16 @@ START_TEST (test_symlink) /* Update symlink to point to our new / second temporary disk */ unlink (ln); - snprintf (temp_disk_path, sizeof temp_disk_path, "%s/%s", cwd, - temporary_disk); + r = snprintf (temp_disk_path, sizeof temp_disk_path, "%s/%s", + cwd, temporary_disk); + if (r < 0 || r >= sizeof temp_disk_path) { + ck_abort_msg("2nd symlink truncated"); + goto exit_destroy_dev; + } + res = symlink (temp_disk_path, ln); if (res) { - fail ("could not create 2nd symlink"); + ck_abort_msg("could not create 2nd symlink"); goto exit_destroy_dev; } diff --git a/libparted/tests/t1000-label.sh b/libparted/tests/t1000-label.sh index 80befe7..c71fe55 100755 --- a/libparted/tests/t1000-label.sh +++ b/libparted/tests/t1000-label.sh @@ -1,7 +1,7 @@ #!/bin/sh # run the label unit tests in a directory supporting O_DIRECT -# Copyright (C) 2007-2014, 2019-2022 Free Software Foundation, Inc. +# Copyright (C) 2007-2014, 2019-2023 Free Software Foundation, Inc. # This program is free software; you can redistribute it and/or modify # it under the terms of the GNU General Public License as published by diff --git a/libparted/tests/t1001-flags.sh b/libparted/tests/t1001-flags.sh new file mode 100755 index 0000000..7ceffe8 --- /dev/null +++ b/libparted/tests/t1001-flags.sh @@ -0,0 +1,23 @@ +#!/bin/sh +# run the flags unittest + +# Copyright (C) 2007-2014, 2019-2023 Free Software Foundation, Inc. + +# This program is free software; you can redistribute it and/or modify +# it under the terms of the GNU General Public License as published by +# the Free Software Foundation; either version 3 of the License, or +# (at your option) any later version. + +# This program is distributed in the hope that it will be useful, +# but WITHOUT ANY WARRANTY; without even the implied warranty of +# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +# GNU General Public License for more details. + +# You should have received a copy of the GNU General Public License +# along with this program. If not, see <http://www.gnu.org/licenses/>. + +. "${top_srcdir=../..}/tests/init.sh"; path_prepend_ . + +flags || fail=1 + +Exit $fail diff --git a/libparted/tests/t2000-disk.sh b/libparted/tests/t2000-disk.sh index b6927df..0e7c774 100755 --- a/libparted/tests/t2000-disk.sh +++ b/libparted/tests/t2000-disk.sh @@ -1,7 +1,7 @@ #!/bin/sh # run the disk unit tests in a directory supporting O_DIRECT -# Copyright (C) 2007-2014, 2019-2022 Free Software Foundation, Inc. +# Copyright (C) 2007-2014, 2019-2023 Free Software Foundation, Inc. # This program is free software; you can redistribute it and/or modify # it under the terms of the GNU General Public License as published by diff --git a/libparted/tests/t2100-zerolen.sh b/libparted/tests/t2100-zerolen.sh index 013b240..8b9bfe0 100755 --- a/libparted/tests/t2100-zerolen.sh +++ b/libparted/tests/t2100-zerolen.sh @@ -1,7 +1,7 @@ #!/bin/sh # run the zerolen unit tests in a directory supporting O_DIRECT -# Copyright (C) 2007-2014, 2019-2022 Free Software Foundation, Inc. +# Copyright (C) 2007-2014, 2019-2023 Free Software Foundation, Inc. # This program is free software; you can redistribute it and/or modify # it under the terms of the GNU General Public License as published by diff --git a/libparted/tests/t3000-symlink.sh b/libparted/tests/t3000-symlink.sh index e6304fa..cd92879 100755 --- a/libparted/tests/t3000-symlink.sh +++ b/libparted/tests/t3000-symlink.sh @@ -1,7 +1,7 @@ #!/bin/sh # run the /dev/mapper symlink test -# Copyright (C) 2007-2014, 2019-2022 Free Software Foundation, Inc. +# Copyright (C) 2007-2014, 2019-2023 Free Software Foundation, Inc. # This program is free software; you can redistribute it and/or modify # it under the terms of the GNU General Public License as published by diff --git a/libparted/tests/volser.c b/libparted/tests/volser.c index c6efa5f..4b6e2d1 100644 --- a/libparted/tests/volser.c +++ b/libparted/tests/volser.c @@ -34,7 +34,7 @@ static void set_test (void) type = ped_disk_type_get ("dasd"); tmp_disk = _create_disk (20*1024*1024); - fail_if (tmp_disk == NULL, "Failed to create temporary disk"); + ck_assert_msg(tmp_disk != NULL, "Failed to create temporary disk"); dev = ped_device_get (tmp_disk); if (dev == NULL) return; diff --git a/libparted/tests/zerolen.c b/libparted/tests/zerolen.c index cf2bd1c..2d9b424 100644 --- a/libparted/tests/zerolen.c +++ b/libparted/tests/zerolen.c @@ -28,7 +28,7 @@ main (int argc, char **argv) TCase* tcase_probe = tcase_create ("Probe"); if (argc < 2) { - fail ("Insufficient arguments"); + ck_abort_msg("Insufficient arguments"); return EXIT_FAILURE; } temporary_disk = argv[1]; diff --git a/libparted/timer.c b/libparted/timer.c index a7dc907..b913150 100644 --- a/libparted/timer.c +++ b/libparted/timer.c @@ -1,6 +1,6 @@ /* libparted - a library for manipulating disk partitions - Copyright (C) 2001, 2007, 2009-2014, 2019-2022 Free Software Foundation, + Copyright (C) 2001, 2007, 2009-2014, 2019-2023 Free Software Foundation, Inc. This program is free software; you can redistribute it and/or modify diff --git a/libparted/unit.c b/libparted/unit.c index d86658c..a63b98d 100644 --- a/libparted/unit.c +++ b/libparted/unit.c @@ -1,6 +1,6 @@ /* libparted - a library for manipulating disk partitions - Copyright (C) 2005, 2007, 2009-2014, 2019-2022 Free Software Foundation, + Copyright (C) 2005, 2007, 2009-2014, 2019-2023 Free Software Foundation, Inc. This program is free software; you can redistribute it and/or modify diff --git a/m4/00gnulib.m4 b/m4/00gnulib.m4 index dea34e8..7fe03e0 100644 --- a/m4/00gnulib.m4 +++ b/m4/00gnulib.m4 @@ -1,5 +1,5 @@ # 00gnulib.m4 serial 8 -dnl Copyright (C) 2009-2022 Free Software Foundation, Inc. +dnl Copyright (C) 2009-2023 Free Software Foundation, Inc. dnl This file is free software; the Free Software Foundation dnl gives unlimited permission to copy and/or distribute it, dnl with or without modifications, as long as this notice is preserved. diff --git a/m4/__inline.m4 b/m4/__inline.m4 index fbe2098..acf8668 100644 --- a/m4/__inline.m4 +++ b/m4/__inline.m4 @@ -1,5 +1,5 @@ # Test for __inline keyword -dnl Copyright 2017-2022 Free Software Foundation, Inc. +dnl Copyright 2017-2023 Free Software Foundation, Inc. dnl This file is free software; the Free Software Foundation dnl gives unlimited permission to copy and/or distribute it, dnl with or without modifications, as long as this notice is preserved. diff --git a/m4/absolute-header.m4 b/m4/absolute-header.m4 index 67d6507..e794764 100644 --- a/m4/absolute-header.m4 +++ b/m4/absolute-header.m4 @@ -1,5 +1,5 @@ # absolute-header.m4 serial 17 -dnl Copyright (C) 2006-2022 Free Software Foundation, Inc. +dnl Copyright (C) 2006-2023 Free Software Foundation, Inc. dnl This file is free software; the Free Software Foundation dnl gives unlimited permission to copy and/or distribute it, dnl with or without modifications, as long as this notice is preserved. diff --git a/m4/alloca.m4 b/m4/alloca.m4 index dc6f47e..c685fac 100644 --- a/m4/alloca.m4 +++ b/m4/alloca.m4 @@ -1,5 +1,5 @@ # alloca.m4 serial 21 -dnl Copyright (C) 2002-2004, 2006-2007, 2009-2022 Free Software Foundation, +dnl Copyright (C) 2002-2004, 2006-2007, 2009-2023 Free Software Foundation, dnl Inc. dnl This file is free software; the Free Software Foundation dnl gives unlimited permission to copy and/or distribute it, diff --git a/m4/arpa_inet_h.m4 b/m4/arpa_inet_h.m4 index 057e13f..fa5fe83 100644 --- a/m4/arpa_inet_h.m4 +++ b/m4/arpa_inet_h.m4 @@ -1,5 +1,5 @@ # arpa_inet_h.m4 serial 17 -dnl Copyright (C) 2006, 2008-2022 Free Software Foundation, Inc. +dnl Copyright (C) 2006, 2008-2023 Free Software Foundation, Inc. dnl This file is free software; the Free Software Foundation dnl gives unlimited permission to copy and/or distribute it, dnl with or without modifications, as long as this notice is preserved. diff --git a/m4/assert.m4 b/m4/assert.m4 index e88979a..deeac70 100644 --- a/m4/assert.m4 +++ b/m4/assert.m4 @@ -1,6 +1,6 @@ #serial 7 -# Copyright (C) 1998-1999, 2001, 2004, 2008-2022 Free Software Foundation, Inc. +# Copyright (C) 1998-1999, 2001, 2004, 2008-2023 Free Software Foundation, Inc. # This file is free software; the Free Software Foundation # gives unlimited permission to copy and/or distribute it, # with or without modifications, as long as this notice is preserved. diff --git a/m4/assert_h.m4 b/m4/assert_h.m4 new file mode 100644 index 0000000..d255855 --- /dev/null +++ b/m4/assert_h.m4 @@ -0,0 +1,73 @@ +# assert-h.m4 +dnl Copyright (C) 2011-2023 Free Software Foundation, Inc. +dnl This file is free software; the Free Software Foundation +dnl gives unlimited permission to copy and/or distribute it, +dnl with or without modifications, as long as this notice is preserved. + +dnl From Paul Eggert. + +AC_DEFUN([gl_ASSERT_H], +[ + AC_CACHE_CHECK([for static_assert], [gl_cv_static_assert], + [gl_save_CFLAGS=$CFLAGS + for gl_working in "yes, a keyword" "yes, an <assert.h> macro"; do + AS_CASE([$gl_working], + [*assert.h*], [CFLAGS="$gl_save_CFLAGS -DINCLUDE_ASSERT_H"]) + + AC_COMPILE_IFELSE( + [AC_LANG_PROGRAM( + [[#if defined __clang__ && __STDC_VERSION__ < 202311 + #pragma clang diagnostic error "-Wc2x-extensions" + #pragma clang diagnostic error "-Wc++1z-extensions" + #endif + #ifdef INCLUDE_ASSERT_H + #include <assert.h> + #endif + static_assert (2 + 2 == 4, "arithmetic does not work"); + static_assert (2 + 2 == 4); + ]], + [[ + static_assert (sizeof (char) == 1, "sizeof does not work"); + static_assert (sizeof (char) == 1); + ]])], + [gl_cv_static_assert=$gl_working], + [gl_cv_static_assert=no]) + CFLAGS=$gl_save_CFLAGS + test "$gl_cv_static_assert" != no && break + done]) + + GL_GENERATE_ASSERT_H=false + AS_CASE([$gl_cv_static_assert], + [yes*keyword*], + [AC_DEFINE([HAVE_C_STATIC_ASSERT], [1], + [Define to 1 if the static_assert keyword works.])], + [no], + [GL_GENERATE_ASSERT_H=true + gl_NEXT_HEADERS([assert.h])]) + + dnl The "zz" puts this toward config.h's end, to avoid potential + dnl collisions with other definitions. + dnl #undef assert so that programs are not tempted to use it without + dnl specifically including assert.h. + dnl #undef __ASSERT_H__ so that on IRIX, when programs later include + dnl <assert.h>, this include actually defines assert. + dnl Break the #undef_s apart with a comment so that 'configure' does + dnl not comment them out. + AH_VERBATIM([zzstatic_assert], +[#if (!defined HAVE_C_STATIC_ASSERT && !defined assert \ + && (!defined __cplusplus \ + || (__cpp_static_assert < 201411 \ + && __GNUG__ < 6 && __clang_major__ < 6))) + #include <assert.h> + #undef/**/assert + #ifdef __sgi + #undef/**/__ASSERT_H__ + #endif + /* Solaris 11.4 <assert.h> defines static_assert as a macro with 2 arguments. + We need it also to be invocable with a single argument. */ + #if defined __sun && (__STDC_VERSION__ - 0 >= 201112L) && !defined __cplusplus + #undef/**/static_assert + #define static_assert _Static_assert + #endif +#endif]) +]) diff --git a/m4/btowc.m4 b/m4/btowc.m4 index 45a61f5..77218a7 100644 --- a/m4/btowc.m4 +++ b/m4/btowc.m4 @@ -1,5 +1,5 @@ # btowc.m4 serial 12 -dnl Copyright (C) 2008-2022 Free Software Foundation, Inc. +dnl Copyright (C) 2008-2023 Free Software Foundation, Inc. dnl This file is free software; the Free Software Foundation dnl gives unlimited permission to copy and/or distribute it, dnl with or without modifications, as long as this notice is preserved. diff --git a/m4/build-to-host.m4 b/m4/build-to-host.m4 new file mode 100644 index 0000000..e3c7287 --- /dev/null +++ b/m4/build-to-host.m4 @@ -0,0 +1,73 @@ +# build-to-host.m4 serial 1 +dnl Copyright (C) 2023 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]" + dnl Translate it from build syntax to host syntax. + case "$build_os" in + cygwin*) + case "$host_os" in + mingw*) + gl_final_[$1]=`cygpath -w "$gl_final_[$1]"` ;; + esac + ;; + esac + dnl Convert it to C string syntax. + [$1]_c=`echo "$gl_final_[$1]" | sed -e "$gl_sed_double_backslashes" -e "$gl_sed_escape_doublequotes"` + [$1]_c='"'"$[$1]_c"'"' + AC_SUBST([$1_c]) + + dnl Define somedir_c_make. + [$1]_c_make=`echo "$[$1]_c" | sed -e "$gl_sed_escape_for_make_1" -e "$gl_sed_escape_for_make_2"` + 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 + AC_SUBST([$1_c_make]) +]) + +dnl Some initializations for gl_BUILD_TO_HOST. +AC_DEFUN([gl_BUILD_TO_HOST_INIT], +[ + gl_sed_double_backslashes='s/\\/\\\\/g' + gl_sed_escape_doublequotes='s/"/\\"/g' +changequote(,)dnl + gl_sed_escape_for_make_1="s,\\([ \"&'();<>\\\\\`|]\\),\\\\\\1,g" +changequote([,])dnl + gl_sed_escape_for_make_2='s,\$,\\$$,g' +]) diff --git a/m4/builtin-expect.m4 b/m4/builtin-expect.m4 index b1fb12a..531ed48 100644 --- a/m4/builtin-expect.m4 +++ b/m4/builtin-expect.m4 @@ -1,6 +1,6 @@ dnl Check for __builtin_expect. -dnl Copyright 2016-2022 Free Software Foundation, Inc. +dnl Copyright 2016-2023 Free Software Foundation, Inc. dnl This file is free software; the Free Software Foundation dnl gives unlimited permission to copy and/or distribute it, dnl with or without modifications, as long as this notice is preserved. diff --git a/m4/c-bool.m4 b/m4/c-bool.m4 new file mode 100644 index 0000000..f614371 --- /dev/null +++ b/m4/c-bool.m4 @@ -0,0 +1,51 @@ +# Check for bool that conforms to C2023. + +dnl Copyright 2022-2023 Free Software Foundation, Inc. +dnl This file is free software; the Free Software Foundation +dnl gives unlimited permission to copy and/or distribute it, +dnl with or without modifications, as long as this notice is preserved. + +AC_DEFUN([gl_C_BOOL], +[ + AC_CACHE_CHECK([for bool, true, false], [gl_cv_c_bool], + [AC_COMPILE_IFELSE( + [AC_LANG_SOURCE([[ + #if true == false + #error "true == false" + #endif + extern bool b; + bool b = true == false;]])], + [gl_cv_c_bool=yes], + [gl_cv_c_bool=no])]) + if test "$gl_cv_c_bool" = yes; then + AC_DEFINE([HAVE_C_BOOL], [1], + [Define to 1 if bool, true and false work as per C2023.]) + fi + + AC_CHECK_HEADERS_ONCE([stdbool.h]) + + dnl The "zz" puts this toward config.h's end, to avoid potential + dnl collisions with other definitions. + dnl If 'bool', 'true' and 'false' do not work, arrange for them to work. + dnl In C, this means including <stdbool.h> if it is not already included. + dnl However, if the preprocessor mistakenly treats 'true' as 0, + dnl define it to a bool expression equal to 1; this is needed in + dnl Sun C++ 5.11 (Oracle Solaris Studio 12.2, 2010) and older. + AH_VERBATIM([zzbool], +[#ifndef HAVE_C_BOOL +# if !defined __cplusplus && !defined __bool_true_false_are_defined +# if HAVE_STDBOOL_H +# include <stdbool.h> +# else +# if defined __SUNPRO_C +# error "<stdbool.h> is not usable with this configuration. To make it usable, add -D_STDC_C99= to $CC." +# else +# error "<stdbool.h> does not exist on this platform. Use gnulib module 'stdbool-c99' instead of gnulib module 'stdbool'." +# endif +# endif +# endif +# if !true +# define true (!false) +# endif +#endif]) +]) diff --git a/m4/calloc.m4 b/m4/calloc.m4 index c01520e..3789cbf 100644 --- a/m4/calloc.m4 +++ b/m4/calloc.m4 @@ -1,6 +1,6 @@ -# calloc.m4 serial 29 +# calloc.m4 serial 30 -# Copyright (C) 2004-2022 Free Software Foundation, Inc. +# Copyright (C) 2004-2023 Free Software Foundation, Inc. # This file is free software; the Free Software Foundation # gives unlimited permission to copy and/or distribute it, # with or without modifications, as long as this notice is preserved. @@ -36,14 +36,14 @@ AC_DEFUN([_AC_FUNC_CALLOC_IF], [ac_cv_func_calloc_0_nonnull=no]) else case "$host_os" in - # Guess yes on glibc systems. - *-gnu* | gnu*) ac_cv_func_calloc_0_nonnull="guessing yes" ;; - # Guess yes on musl systems. - *-musl*) ac_cv_func_calloc_0_nonnull="guessing yes" ;; - # Guess yes on native Windows. - mingw*) ac_cv_func_calloc_0_nonnull="guessing yes" ;; - # If we don't know, obey --enable-cross-guesses. - *) ac_cv_func_calloc_0_nonnull="$gl_cross_guess_normal" ;; + # Guess yes on glibc systems. + *-gnu* | gnu*) ac_cv_func_calloc_0_nonnull="guessing yes" ;; + # Guess yes on musl systems. + *-musl* | midipix*) ac_cv_func_calloc_0_nonnull="guessing yes" ;; + # Guess yes on native Windows. + mingw*) ac_cv_func_calloc_0_nonnull="guessing yes" ;; + # If we don't know, obey --enable-cross-guesses. + *) ac_cv_func_calloc_0_nonnull="$gl_cross_guess_normal" ;; esac fi ]) diff --git a/m4/canonicalize.m4 b/m4/canonicalize.m4 index b55d5c0..d319645 100644 --- a/m4/canonicalize.m4 +++ b/m4/canonicalize.m4 @@ -1,6 +1,6 @@ -# canonicalize.m4 serial 37 +# canonicalize.m4 serial 38 -dnl Copyright (C) 2003-2007, 2009-2022 Free Software Foundation, Inc. +dnl Copyright (C) 2003-2007, 2009-2023 Free Software Foundation, Inc. dnl This file is free software; the Free Software Foundation dnl gives unlimited permission to copy and/or distribute it, @@ -12,7 +12,8 @@ AC_DEFUN([gl_FUNC_CANONICALIZE_FILENAME_MODE], [ AC_REQUIRE([gl_USE_SYSTEM_EXTENSIONS]) AC_REQUIRE([gl_FUNC_LSTAT_FOLLOWS_SLASHED_SYMLINK]) - AC_CHECK_FUNCS_ONCE([canonicalize_file_name faccessat]) + AC_CHECK_FUNCS_ONCE([canonicalize_file_name]) + gl_CHECK_FUNCS_ANDROID([faccessat], [[#include <unistd.h>]]) AC_REQUIRE([gl_DOUBLE_SLASH_ROOT]) AC_REQUIRE([gl_FUNC_REALPATH_WORKS]) if test $ac_cv_func_canonicalize_file_name = no; then @@ -58,7 +59,8 @@ AC_DEFUN([gl_CANONICALIZE_LGPL_SEPARATE], [ AC_REQUIRE([gl_USE_SYSTEM_EXTENSIONS]) AC_REQUIRE([gl_FUNC_LSTAT_FOLLOWS_SLASHED_SYMLINK]) - AC_CHECK_FUNCS_ONCE([canonicalize_file_name faccessat]) + AC_CHECK_FUNCS_ONCE([canonicalize_file_name]) + gl_CHECK_FUNCS_ANDROID([faccessat], [[#include <unistd.h>]]) dnl On native Windows, we use _getcwd(), regardless whether getcwd() is dnl available through the linker option '-loldnames'. diff --git a/m4/clock_time.m4 b/m4/clock_time.m4 index 2253553..d624a73 100644 --- a/m4/clock_time.m4 +++ b/m4/clock_time.m4 @@ -1,14 +1,14 @@ -# clock_time.m4 serial 11 -dnl Copyright (C) 2002-2006, 2009-2022 Free Software Foundation, Inc. +# clock_time.m4 serial 12 +dnl Copyright (C) 2002-2006, 2009-2023 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. # Check for clock_getres, clock_gettime and clock_settime, -# and set LIB_CLOCK_GETTIME. +# and set CLOCK_TIME_LIB. # For a program named, say foo, you should add a line like the following # in the corresponding Makefile.am file: -# foo_LDADD = $(LDADD) $(LIB_CLOCK_GETTIME) +# foo_LDADD = $(LDADD) $(CLOCK_TIME_LIB) AC_DEFUN([gl_CLOCK_TIME], [ @@ -21,12 +21,15 @@ AC_DEFUN([gl_CLOCK_TIME], # Save and restore LIBS so e.g., -lrt, isn't added to it. Otherwise, *all* # programs in the package would end up linked with that potentially-shared # library, inducing unnecessary run-time overhead. - LIB_CLOCK_GETTIME= - AC_SUBST([LIB_CLOCK_GETTIME]) + CLOCK_TIME_LIB= + AC_SUBST([CLOCK_TIME_LIB]) gl_saved_libs=$LIBS AC_SEARCH_LIBS([clock_gettime], [rt posix4], [test "$ac_cv_search_clock_gettime" = "none required" || - LIB_CLOCK_GETTIME=$ac_cv_search_clock_gettime]) + CLOCK_TIME_LIB=$ac_cv_search_clock_gettime]) AC_CHECK_FUNCS([clock_getres clock_gettime clock_settime]) LIBS=$gl_saved_libs + # For backward compatibility. + LIB_CLOCK_GETTIME="$CLOCK_TIME_LIB" + AC_SUBST([LIB_CLOCK_GETTIME]) ]) diff --git a/m4/close.m4 b/m4/close.m4 index f95dbc9..9f95c67 100644 --- a/m4/close.m4 +++ b/m4/close.m4 @@ -1,5 +1,5 @@ # close.m4 serial 9 -dnl Copyright (C) 2008-2022 Free Software Foundation, Inc. +dnl Copyright (C) 2008-2023 Free Software Foundation, Inc. dnl This file is free software; the Free Software Foundation dnl gives unlimited permission to copy and/or distribute it, dnl with or without modifications, as long as this notice is preserved. diff --git a/m4/codeset.m4 b/m4/codeset.m4 index eb73260..5804f47 100644 --- a/m4/codeset.m4 +++ b/m4/codeset.m4 @@ -1,5 +1,5 @@ # codeset.m4 serial 5 (gettext-0.18.2) -dnl Copyright (C) 2000-2002, 2006, 2008-2014, 2016, 2019-2022 Free Software +dnl Copyright (C) 2000-2002, 2006, 2008-2014, 2016, 2019-2023 Free Software dnl Foundation, Inc. dnl This file is free software; the Free Software Foundation dnl gives unlimited permission to copy and/or distribute it, diff --git a/m4/config-h.m4 b/m4/config-h.m4 index 803888a..185a3e4 100644 --- a/m4/config-h.m4 +++ b/m4/config-h.m4 @@ -1,6 +1,6 @@ # Say that -DHAVE_CONFIG_H is not needed. -dnl Copyright (C) 2006, 2009-2022 Free Software Foundation, Inc. +dnl Copyright (C) 2006, 2009-2023 Free Software Foundation, Inc. dnl This file is free software; the Free Software Foundation dnl gives unlimited permission to copy and/or distribute it, dnl with or without modifications, as long as this notice is preserved. diff --git a/m4/configmake.m4 b/m4/configmake.m4 index c3a088b..94f8ae2 100644 --- a/m4/configmake.m4 +++ b/m4/configmake.m4 @@ -1,5 +1,5 @@ -# configmake.m4 serial 4 -dnl Copyright (C) 2010-2022 Free Software Foundation, Inc. +# configmake.m4 serial 5 +dnl Copyright (C) 2010-2023 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. @@ -21,7 +21,148 @@ AC_DEFUN([gl_CONFIGMAKE_PREP], AC_SUBST([runstatedir], ['${localstatedir}/run']) fi - dnl Automake 1.11 provides pkglibexecdir merely without AC_SUBST. - dnl This blind use of AC_SUBST is safe. + dnl Automake 1.11 provides the pkg*dir variables merely without AC_SUBST, + dnl that is, only at the Makefile.am level. AC_SUBST them, so that + dnl gl_CONFIGMAKE can compute the final values at configure time. + dnl Blindly assigning the value at configure time is OK, since configure + dnl does not have --pkg*dir=... options. + AC_SUBST([pkgdatadir], ['${datadir}/${PACKAGE}']) + AC_SUBST([pkgincludedir], ['${includedir}/${PACKAGE}']) + AC_SUBST([pkglibdir], ['${libdir}/${PACKAGE}']) AC_SUBST([pkglibexecdir], ['${libexecdir}/${PACKAGE}']) ]) + +# gl_CONFIGMAKE +# ------------- +# Find the final values of the standard directory variables, and create +# AC_SUBSTed *_c and *_c_make variables with the corresponding values in +# target runtime environment ($host_os) syntax. +AC_DEFUN([gl_CONFIGMAKE], +[ + AC_REQUIRE([gl_CONFIGMAKE_PREP]) + + dnl Save the values. + gl_save_prefix="${prefix}" + gl_save_exec_prefix="${exec_prefix}" + gl_save_bindir="${bindir}" + gl_save_sbindir="${sbindir}" + gl_save_libexecdir="${libexecdir}" + gl_save_datarootdir="${datarootdir}" + gl_save_datadir="${datadir}" + gl_save_sysconfdir="${sysconfdir}" + gl_save_sharedstatedir="${sharedstatedir}" + gl_save_localstatedir="${localstatedir}" + gl_save_runstatedir="${runstatedir}" + gl_save_includedir="${includedir}" + gl_save_oldincludedir="${oldincludedir}" + gl_save_docdir="${docdir}" + gl_save_infodir="${infodir}" + gl_save_htmldir="${htmldir}" + gl_save_dvidir="${dvidir}" + gl_save_pdfdir="${pdfdir}" + gl_save_psdir="${psdir}" + gl_save_libdir="${libdir}" + gl_save_lispdir="${lispdir}" + gl_save_localedir="${localedir}" + gl_save_mandir="${mandir}" + gl_save_pkgdatadir="${pkgdatadir}" + gl_save_pkgincludedir="${pkgincludedir}" + gl_save_pkglibdir="${pkglibdir}" + gl_save_pkglibexecdir="${pkglibexecdir}" + + dnl Find the final values. + dnl Unfortunately, prefix gets only finally determined at the end of + dnl configure. + if test "X$prefix" = "XNONE"; then + prefix="$ac_default_prefix" + fi + dnl Unfortunately, exec_prefix gets only finally determined at the end of + dnl configure. + if test "X$exec_prefix" = "XNONE"; then + exec_prefix='${prefix}' + fi + eval exec_prefix="$exec_prefix" + eval bindir="$bindir" + eval sbindir="$sbindir" + eval libexecdir="$libexecdir" + eval datarootdir="$datarootdir" + eval datadir="$datadir" + eval sysconfdir="$sysconfdir" + eval sharedstatedir="$sharedstatedir" + eval localstatedir="$localstatedir" + eval runstatedir="$runstatedir" + eval includedir="$includedir" + eval oldincludedir="$oldincludedir" + eval docdir="$docdir" + eval infodir="$infodir" + eval htmldir="$htmldir" + eval dvidir="$dvidir" + eval pdfdir="$pdfdir" + eval psdir="$psdir" + eval libdir="$libdir" + eval lispdir="$lispdir" + eval localedir="$localedir" + eval mandir="$mandir" + eval pkgdatadir="$pkgdatadir" + eval pkgincludedir="$pkgincludedir" + eval pkglibdir="$pkglibdir" + eval pkglibexecdir="$pkglibexecdir" + + dnl Transform the final values. + gl_BUILD_TO_HOST([prefix]) + gl_BUILD_TO_HOST([exec_prefix]) + gl_BUILD_TO_HOST([bindir]) + gl_BUILD_TO_HOST([sbindir]) + gl_BUILD_TO_HOST([libexecdir]) + gl_BUILD_TO_HOST([datarootdir]) + gl_BUILD_TO_HOST([datadir]) + gl_BUILD_TO_HOST([sysconfdir]) + gl_BUILD_TO_HOST([sharedstatedir]) + gl_BUILD_TO_HOST([localstatedir]) + gl_BUILD_TO_HOST([runstatedir]) + gl_BUILD_TO_HOST([includedir]) + gl_BUILD_TO_HOST([oldincludedir]) + gl_BUILD_TO_HOST([docdir]) + gl_BUILD_TO_HOST([infodir]) + gl_BUILD_TO_HOST([htmldir]) + gl_BUILD_TO_HOST([dvidir]) + gl_BUILD_TO_HOST([pdfdir]) + gl_BUILD_TO_HOST([psdir]) + gl_BUILD_TO_HOST([libdir]) + gl_BUILD_TO_HOST([lispdir]) + gl_BUILD_TO_HOST([localedir]) + gl_BUILD_TO_HOST([mandir]) + gl_BUILD_TO_HOST([pkgdatadir]) + gl_BUILD_TO_HOST([pkgincludedir]) + gl_BUILD_TO_HOST([pkglibdir]) + gl_BUILD_TO_HOST([pkglibexecdir]) + + dnl Restore the values. + pkglibexecdir="${gl_save_pkglibexecdir}" + pkglibdir="${gl_save_pkglibdir}" + pkgincludedir="${gl_save_pkgincludedir}" + pkgdatadir="${gl_save_pkgdatadir}" + mandir="${gl_save_mandir}" + localedir="${gl_save_localedir}" + lispdir="${gl_save_lispdir}" + libdir="${gl_save_libdir}" + psdir="${gl_save_psdir}" + pdfdir="${gl_save_pdfdir}" + dvidir="${gl_save_dvidir}" + htmldir="${gl_save_htmldir}" + infodir="${gl_save_infodir}" + docdir="${gl_save_docdir}" + oldincludedir="${gl_save_oldincludedir}" + includedir="${gl_save_includedir}" + runstatedir="${gl_save_runstatedir}" + localstatedir="${gl_save_localstatedir}" + sharedstatedir="${gl_save_sharedstatedir}" + sysconfdir="${gl_save_sysconfdir}" + datadir="${gl_save_datadir}" + datarootdir="${gl_save_datarootdir}" + libexecdir="${gl_save_libexecdir}" + sbindir="${gl_save_sbindir}" + bindir="${gl_save_bindir}" + exec_prefix="${gl_save_exec_prefix}" + prefix="${gl_save_prefix}" +]) diff --git a/m4/ctype_h.m4 b/m4/ctype_h.m4 index 6f420de..219f2ed 100644 --- a/m4/ctype_h.m4 +++ b/m4/ctype_h.m4 @@ -1,5 +1,5 @@ # ctype_h.m4 serial 9 -dnl Copyright (C) 2009-2022 Free Software Foundation, Inc. +dnl Copyright (C) 2009-2023 Free Software Foundation, Inc. dnl This file is free software; the Free Software Foundation dnl gives unlimited permission to copy and/or distribute it, dnl with or without modifications, as long as this notice is preserved. diff --git a/m4/double-slash-root.m4 b/m4/double-slash-root.m4 index 09ff5f0..1776e5e 100644 --- a/m4/double-slash-root.m4 +++ b/m4/double-slash-root.m4 @@ -1,5 +1,5 @@ # double-slash-root.m4 serial 4 -*- Autoconf -*- -dnl Copyright (C) 2006, 2008-2022 Free Software Foundation, Inc. +dnl Copyright (C) 2006, 2008-2023 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. @@ -1,5 +1,5 @@ #serial 27 -dnl Copyright (C) 2002, 2005, 2007, 2009-2022 Free Software Foundation, Inc. +dnl Copyright (C) 2002, 2005, 2007, 2009-2023 Free Software Foundation, Inc. dnl This file is free software; the Free Software Foundation dnl gives unlimited permission to copy and/or distribute it, dnl with or without modifications, as long as this notice is preserved. diff --git a/m4/eealloc.m4 b/m4/eealloc.m4 index a6aa2f8..cb3e08f 100644 --- a/m4/eealloc.m4 +++ b/m4/eealloc.m4 @@ -1,5 +1,5 @@ # eealloc.m4 serial 3 -dnl Copyright (C) 2003, 2009-2022 Free Software Foundation, Inc. +dnl Copyright (C) 2003, 2009-2023 Free Software Foundation, Inc. dnl This file is free software; the Free Software Foundation dnl gives unlimited permission to copy and/or distribute it, dnl with or without modifications, as long as this notice is preserved. diff --git a/m4/environ.m4 b/m4/environ.m4 index 583dac3..741dfc5 100644 --- a/m4/environ.m4 +++ b/m4/environ.m4 @@ -1,5 +1,5 @@ # environ.m4 serial 8 -dnl Copyright (C) 2001-2004, 2006-2022 Free Software Foundation, Inc. +dnl Copyright (C) 2001-2004, 2006-2023 Free Software Foundation, Inc. dnl This file is free software; the Free Software Foundation dnl gives unlimited permission to copy and/or distribute it, dnl with or without modifications, as long as this notice is preserved. diff --git a/m4/errno_h.m4 b/m4/errno_h.m4 index 4be9780..4c70d22 100644 --- a/m4/errno_h.m4 +++ b/m4/errno_h.m4 @@ -1,5 +1,5 @@ # errno_h.m4 serial 14 -dnl Copyright (C) 2004, 2006, 2008-2022 Free Software Foundation, Inc. +dnl Copyright (C) 2004, 2006, 2008-2023 Free Software Foundation, Inc. dnl This file is free software; the Free Software Foundation dnl gives unlimited permission to copy and/or distribute it, dnl with or without modifications, as long as this notice is preserved. diff --git a/m4/error.m4 b/m4/error.m4 index 7a10344..93a7558 100644 --- a/m4/error.m4 +++ b/m4/error.m4 @@ -1,6 +1,6 @@ -#serial 15 +#serial 16 -# Copyright (C) 1996-1998, 2001-2004, 2009-2022 Free Software Foundation, Inc. +# Copyright (C) 1996-1998, 2001-2004, 2009-2023 Free Software Foundation, Inc. # # This file is free software; the Free Software Foundation # gives unlimited permission to copy and/or distribute it, @@ -8,15 +8,6 @@ AC_DEFUN([gl_ERROR], [ - dnl We don't use AC_FUNC_ERROR_AT_LINE any more, because it is no longer - dnl maintained in Autoconf and because it invokes AC_LIBOBJ. - AC_CACHE_CHECK([for error_at_line], [ac_cv_lib_error_at_line], - [AC_LINK_IFELSE( - [AC_LANG_PROGRAM( - [[#include <error.h>]], - [[error_at_line (0, 0, "", 0, "an error occurred");]])], - [ac_cv_lib_error_at_line=yes], - [ac_cv_lib_error_at_line=no])]) ]) # Prerequisites of lib/error.c. diff --git a/m4/error_h.m4 b/m4/error_h.m4 new file mode 100644 index 0000000..f38e4ea --- /dev/null +++ b/m4/error_h.m4 @@ -0,0 +1,125 @@ +# error_h.m4 serial 3 +dnl Copyright (C) 1996-2023 Free Software Foundation, Inc. +dnl This file is free software; the Free Software Foundation +dnl gives unlimited permission to copy and/or distribute it, +dnl with or without modifications, as long as this notice is preserved. + +dnl From Bruno Haible. +dnl Provide a working "error.h". + +AC_DEFUN_ONCE([gl_ERROR_H], +[ + AC_REQUIRE([AC_CANONICAL_HOST]) dnl for cross-compiles + + gl_CHECK_NEXT_HEADERS([error.h]) + if test $ac_cv_header_error_h = yes; then + HAVE_ERROR_H=1 + else + HAVE_ERROR_H=0 + fi + AC_SUBST([HAVE_ERROR_H]) + + REPLACE_ERROR=0 + + gl_CHECK_FUNCS_ANDROID([error], [[#include <error.h>]]) + if test $ac_cv_func_error = yes; then + HAVE_ERROR=1 + else + HAVE_ERROR=0 + case "$gl_cv_onwards_func_error" in + future*) REPLACE_ERROR=1 ;; + esac + fi + + dnl We don't use AC_FUNC_ERROR_AT_LINE any more, because it is no longer + dnl maintained in Autoconf and because it invokes AC_LIBOBJ. + dnl We need to notice a missing declaration, like gl_CHECK_FUNCS_ANDROID does. + AC_CHECK_DECL([error_at_line], , , [[#include <error.h>]]) + if test $ac_cv_have_decl_error_at_line = yes; then + AC_CACHE_CHECK([for error_at_line], [ac_cv_lib_error_at_line], + [AC_LINK_IFELSE( + [AC_LANG_PROGRAM( + [[#include <error.h>]], + [[error_at_line (0, 0, "", 0, "an error occurred");]])], + [ac_cv_lib_error_at_line=yes], + [ac_cv_lib_error_at_line=no])]) + else + ac_cv_lib_error_at_line=no + fi + if test $ac_cv_lib_error_at_line = yes; then + HAVE_ERROR_AT_LINE=1 + else + HAVE_ERROR_AT_LINE=0 + fi + REPLACE_ERROR_AT_LINE=0 + + if test $ac_cv_func_error = yes && test $ac_cv_lib_error_at_line = yes; then + dnl On Android 11, when error_print_progname is set, the output of the + dnl error() function contains an extra space. + AC_CACHE_CHECK([for working error function], + [gl_cv_func_working_error], + [if test $cross_compiling != yes; then + AC_LINK_IFELSE( + [AC_LANG_PROGRAM([[ + #include <error.h> + static void print_no_progname (void) {} + ]], [[ + error_print_progname = print_no_progname; + error (0, 0, "foo"); + ]]) + ], + [rm -f conftest.out + if test -s conftest$ac_exeext \ + && ./conftest$ac_exeext 2> conftest.out; then + if grep ' ' conftest.out >/dev/null; then + gl_cv_func_working_error=no + else + gl_cv_func_working_error=yes + fi + else + gl_cv_func_working_error=no + fi + rm -f conftest.out + ], + [gl_cv_func_working_error=no]) + else + AC_COMPILE_IFELSE( + [AC_LANG_PROGRAM([[ + #include <error.h> + ]], [[ + error (0, 0, "foo"); + ]]) + ], + [case "$host_os" in + # Guess yes on glibc systems. + *-gnu* | gnu*) gl_cv_func_working_error="guessing yes" ;; + # Guess no on Android. + linux*-android*) gl_cv_func_working_error="guessing no" ;; + # If we don't know, obey --enable-cross-guesses. + *) gl_cv_func_working_error="$gl_cross_guess_normal" ;; + esac + ], + [gl_cv_func_working_error=no]) + fi + ]) + case "$gl_cv_func_working_error" in + *no) + REPLACE_ERROR=1 + REPLACE_ERROR_AT_LINE=1 + ;; + esac + fi + + if test $HAVE_ERROR = 0 || test $REPLACE_ERROR = 1 \ + || test $HAVE_ERROR_AT_LINE = 0 || test $REPLACE_ERROR_AT_LINE = 1; then + dnl Provide a substitute <error.h> file. + GL_GENERATE_ERROR_H=true + else + GL_GENERATE_ERROR_H=false + fi + + AC_SUBST([HAVE_ERROR]) + AC_SUBST([HAVE_ERROR_AT_LINE]) + AC_SUBST([REPLACE_ERROR]) + AC_SUBST([REPLACE_ERROR_AT_LINE]) +]) diff --git a/m4/extensions.m4 b/m4/extensions.m4 index 0b3e4b5..5336b8d 100644 --- a/m4/extensions.m4 +++ b/m4/extensions.m4 @@ -1,7 +1,7 @@ -# serial 22 -*- Autoconf -*- +# serial 23 -*- Autoconf -*- # Enable extensions on systems that normally disable them. -# Copyright (C) 2003, 2006-2022 Free Software Foundation, Inc. +# Copyright (C) 2003, 2006-2023 Free Software Foundation, Inc. # This file is free software; the Free Software Foundation # gives unlimited permission to copy and/or distribute it, # with or without modifications, as long as this notice is preserved. @@ -31,7 +31,7 @@ m4_ifndef([AC_CHECK_INCLUDES_DEFAULT], # its dependencies. This will ensure that the gl_USE_SYSTEM_EXTENSIONS # invocation occurs in gl_EARLY, not in gl_INIT. -m4_version_prereq([2.70.1], [], [ +m4_version_prereq([2.72], [], [ # AC_USE_SYSTEM_EXTENSIONS # ------------------------ @@ -113,11 +113,15 @@ AH_VERBATIM([USE_SYSTEM_EXTENSIONS], #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 ISO/IEC TS 18661-3:2015. */ +/* Enable extensions specified by C23 Annex H and ISO/IEC TS 18661-3:2015. */ #ifndef __STDC_WANT_IEC_60559_TYPES_EXT__ # undef __STDC_WANT_IEC_60559_TYPES_EXT__ #endif @@ -187,6 +191,7 @@ dnl it should only be defined when necessary. AC_DEFINE([__STDC_WANT_IEC_60559_ATTRIBS_EXT__]) AC_DEFINE([__STDC_WANT_IEC_60559_BFP_EXT__]) AC_DEFINE([__STDC_WANT_IEC_60559_DFP_EXT__]) + AC_DEFINE([__STDC_WANT_IEC_60559_EXT__]) AC_DEFINE([__STDC_WANT_IEC_60559_FUNCS_EXT__]) AC_DEFINE([__STDC_WANT_IEC_60559_TYPES_EXT__]) AC_DEFINE([__STDC_WANT_LIB_EXT2__]) diff --git a/m4/extern-inline.m4 b/m4/extern-inline.m4 index 8a12bdd..c001b1c 100644 --- a/m4/extern-inline.m4 +++ b/m4/extern-inline.m4 @@ -1,6 +1,6 @@ dnl 'extern inline' a la ISO C99. -dnl Copyright 2012-2022 Free Software Foundation, Inc. +dnl Copyright 2012-2023 Free Software Foundation, Inc. dnl This file is free software; the Free Software Foundation dnl gives unlimited permission to copy and/or distribute it, dnl with or without modifications, as long as this notice is preserved. diff --git a/m4/fcntl-o.m4 b/m4/fcntl-o.m4 index 4dcde9e..59d558b 100644 --- a/m4/fcntl-o.m4 +++ b/m4/fcntl-o.m4 @@ -1,5 +1,5 @@ # fcntl-o.m4 serial 7 -dnl Copyright (C) 2006, 2009-2022 Free Software Foundation, Inc. +dnl Copyright (C) 2006, 2009-2023 Free Software Foundation, Inc. dnl This file is free software; the Free Software Foundation dnl gives unlimited permission to copy and/or distribute it, dnl with or without modifications, as long as this notice is preserved. diff --git a/m4/fcntl.m4 b/m4/fcntl.m4 index 428e570..524a99a 100644 --- a/m4/fcntl.m4 +++ b/m4/fcntl.m4 @@ -1,5 +1,5 @@ # fcntl.m4 serial 11 -dnl Copyright (C) 2009-2022 Free Software Foundation, Inc. +dnl Copyright (C) 2009-2023 Free Software Foundation, Inc. dnl This file is free software; the Free Software Foundation dnl gives unlimited permission to copy and/or distribute it, dnl with or without modifications, as long as this notice is preserved. diff --git a/m4/fcntl_h.m4 b/m4/fcntl_h.m4 index 267f98b..68f4e64 100644 --- a/m4/fcntl_h.m4 +++ b/m4/fcntl_h.m4 @@ -1,6 +1,6 @@ # serial 20 # Configure fcntl.h. -dnl Copyright (C) 2006-2007, 2009-2022 Free Software Foundation, Inc. +dnl Copyright (C) 2006-2007, 2009-2023 Free Software Foundation, Inc. dnl This file is free software; the Free Software Foundation dnl gives unlimited permission to copy and/or distribute it, dnl with or without modifications, as long as this notice is preserved. diff --git a/m4/fdopen.m4 b/m4/fdopen.m4 index 32e0e1d..6b3909b 100644 --- a/m4/fdopen.m4 +++ b/m4/fdopen.m4 @@ -1,5 +1,5 @@ # fdopen.m4 serial 5 -dnl Copyright (C) 2011-2022 Free Software Foundation, Inc. +dnl Copyright (C) 2011-2023 Free Software Foundation, Inc. dnl This file is free software; the Free Software Foundation dnl gives unlimited permission to copy and/or distribute it, dnl with or without modifications, as long as this notice is preserved. diff --git a/m4/flexmember.m4 b/m4/flexmember.m4 index 3b4237e..13f7e87 100644 --- a/m4/flexmember.m4 +++ b/m4/flexmember.m4 @@ -1,7 +1,7 @@ # serial 5 # Check for flexible array member support. -# Copyright (C) 2006, 2009-2022 Free Software Foundation, Inc. +# Copyright (C) 2006, 2009-2023 Free Software Foundation, Inc. # This file is free software; the Free Software Foundation # gives unlimited permission to copy and/or distribute it, # with or without modifications, as long as this notice is preserved. diff --git a/m4/fpending.m4 b/m4/fpending.m4 index de4eb7f..6991f81 100644 --- a/m4/fpending.m4 +++ b/m4/fpending.m4 @@ -1,6 +1,6 @@ # serial 23 -# Copyright (C) 2000-2001, 2004-2022 Free Software Foundation, Inc. +# Copyright (C) 2000-2001, 2004-2023 Free Software Foundation, Inc. # This file is free software; the Free Software Foundation # gives unlimited permission to copy and/or distribute it, # with or without modifications, as long as this notice is preserved. @@ -1,5 +1,5 @@ # free.m4 serial 6 -# Copyright (C) 2003-2005, 2009-2022 Free Software Foundation, Inc. +# Copyright (C) 2003-2005, 2009-2023 Free Software Foundation, Inc. # This file is free software; the Free Software Foundation # gives unlimited permission to copy and/or distribute it, # with or without modifications, as long as this notice is preserved. diff --git a/m4/fstat.m4 b/m4/fstat.m4 index 9e61bcc..7cb2edb 100644 --- a/m4/fstat.m4 +++ b/m4/fstat.m4 @@ -1,5 +1,5 @@ # fstat.m4 serial 8 -dnl Copyright (C) 2011-2022 Free Software Foundation, Inc. +dnl Copyright (C) 2011-2023 Free Software Foundation, Inc. dnl This file is free software; the Free Software Foundation dnl gives unlimited permission to copy and/or distribute it, dnl with or without modifications, as long as this notice is preserved. diff --git a/m4/fsync.m4 b/m4/fsync.m4 index cbf35fe..857e495 100644 --- a/m4/fsync.m4 +++ b/m4/fsync.m4 @@ -1,5 +1,5 @@ # fsync.m4 serial 2 -dnl Copyright (C) 2008-2022 Free Software Foundation, Inc. +dnl Copyright (C) 2008-2023 Free Software Foundation, Inc. dnl This file is free software; the Free Software Foundation dnl gives unlimited permission to copy and/or distribute it, dnl with or without modifications, as long as this notice is preserved. diff --git a/m4/ftruncate.m4 b/m4/ftruncate.m4 index 2697e0e..cbb5f42 100644 --- a/m4/ftruncate.m4 +++ b/m4/ftruncate.m4 @@ -1,8 +1,8 @@ -# serial 21 +# serial 23 # See if we need to emulate a missing ftruncate function using _chsize. -# Copyright (C) 2000-2001, 2003-2007, 2009-2022 Free Software Foundation, Inc. +# Copyright (C) 2000-2001, 2003-2007, 2009-2023 Free Software Foundation, Inc. # This file is free software; the Free Software Foundation # gives unlimited permission to copy and/or distribute it, # with or without modifications, as long as this notice is preserved. @@ -10,7 +10,7 @@ AC_DEFUN([gl_FUNC_FTRUNCATE], [ AC_REQUIRE([gl_UNISTD_H_DEFAULTS]) - AC_CHECK_FUNCS_ONCE([ftruncate]) + gl_CHECK_FUNCS_ANDROID([ftruncate], [[#include <unistd.h>]]) if test $ac_cv_func_ftruncate = yes; then m4_ifdef([gl_LARGEFILE], [ AC_REQUIRE([AC_CANONICAL_HOST]) @@ -30,6 +30,9 @@ AC_DEFUN([gl_FUNC_FTRUNCATE], ]) else HAVE_FTRUNCATE=0 + case "$gl_cv_onwards_func_ftruncate" in + future*) REPLACE_FTRUNCATE=1 ;; + esac fi ]) diff --git a/m4/getcwd.m4 b/m4/getcwd.m4 index 076ca31..e95db05 100644 --- a/m4/getcwd.m4 +++ b/m4/getcwd.m4 @@ -1,12 +1,12 @@ # getcwd.m4 - check for working getcwd that is compatible with glibc -# Copyright (C) 2001, 2003-2007, 2009-2022 Free Software Foundation, Inc. +# Copyright (C) 2001, 2003-2007, 2009-2023 Free Software Foundation, Inc. # This file is free software; the Free Software Foundation # gives unlimited permission to copy and/or distribute it, # with or without modifications, as long as this notice is preserved. # Written by Paul Eggert. -# serial 19 +# serial 20 AC_DEFUN([gl_FUNC_GETCWD_NULL], [ @@ -53,6 +53,8 @@ AC_DEFUN([gl_FUNC_GETCWD_NULL], *-gnu* | gnu*) gl_cv_func_getcwd_null="guessing yes";; # Guess yes on musl systems. *-musl*) gl_cv_func_getcwd_null="guessing yes";; + # Guess yes on systems that emulate the Linux system calls. + midipix*) gl_cv_func_getcwd_null="guessing yes";; # Guess yes on Cygwin. cygwin*) gl_cv_func_getcwd_null="guessing yes";; # If we don't know, obey --enable-cross-guesses. diff --git a/m4/getdtablesize.m4 b/m4/getdtablesize.m4 index 6134eaa..8bcda90 100644 --- a/m4/getdtablesize.m4 +++ b/m4/getdtablesize.m4 @@ -1,5 +1,5 @@ # getdtablesize.m4 serial 8 -dnl Copyright (C) 2008-2022 Free Software Foundation, Inc. +dnl Copyright (C) 2008-2023 Free Software Foundation, Inc. dnl This file is free software; the Free Software Foundation dnl gives unlimited permission to copy and/or distribute it, dnl with or without modifications, as long as this notice is preserved. diff --git a/m4/getopt.m4 b/m4/getopt.m4 index ff78ed5..7981a09 100644 --- a/m4/getopt.m4 +++ b/m4/getopt.m4 @@ -1,5 +1,5 @@ # getopt.m4 serial 48 -dnl Copyright (C) 2002-2006, 2008-2022 Free Software Foundation, Inc. +dnl Copyright (C) 2002-2006, 2008-2023 Free Software Foundation, Inc. dnl This file is free software; the Free Software Foundation dnl gives unlimited permission to copy and/or distribute it, dnl with or without modifications, as long as this notice is preserved. diff --git a/m4/getpagesize.m4 b/m4/getpagesize.m4 index 19f894c..79925a7 100644 --- a/m4/getpagesize.m4 +++ b/m4/getpagesize.m4 @@ -1,5 +1,5 @@ # getpagesize.m4 serial 10 -dnl Copyright (C) 2002, 2004-2005, 2007, 2009-2022 Free Software Foundation, +dnl Copyright (C) 2002, 2004-2005, 2007, 2009-2023 Free Software Foundation, dnl Inc. dnl This file is free software; the Free Software Foundation dnl gives unlimited permission to copy and/or distribute it, diff --git a/m4/getprogname.m4 b/m4/getprogname.m4 index b26146e..b8636e1 100644 --- a/m4/getprogname.m4 +++ b/m4/getprogname.m4 @@ -1,16 +1,27 @@ # getprogname.m4 - check for getprogname or replacements for it -# Copyright (C) 2016-2022 Free Software Foundation, Inc. +# Copyright (C) 2016-2023 Free Software Foundation, Inc. # This file is free software; the Free Software Foundation # gives unlimited permission to copy and/or distribute it, # with or without modifications, as long as this notice is preserved. -# serial 4 +# serial 7 AC_DEFUN([gl_FUNC_GETPROGNAME], [ - AC_CHECK_FUNCS_ONCE([getprogname getexecname]) + gl_CHECK_FUNCS_ANDROID([getprogname], [[#include <stdlib.h>]]) + if test $ac_cv_func_getprogname = no; then + HAVE_GETPROGNAME=0 + case "$gl_cv_onwards_func_getprogname" in + future*) REPLACE_GETPROGNAME=1 ;; + esac + fi +]) + +AC_DEFUN([gl_PREREQ_GETPROGNAME], +[ AC_REQUIRE([gl_USE_SYSTEM_EXTENSIONS]) + AC_CHECK_FUNCS_ONCE([getexecname]) ac_found=0 AC_CHECK_DECLS([program_invocation_name], [ac_found=1], [], [#include <errno.h>]) diff --git a/m4/getrandom.m4 b/m4/getrandom.m4 index 6ca7150..7b7f9ce 100644 --- a/m4/getrandom.m4 +++ b/m4/getrandom.m4 @@ -1,5 +1,5 @@ -# getrandom.m4 serial 8 -dnl Copyright 2020-2022 Free Software Foundation, Inc. +# getrandom.m4 serial 11 +dnl Copyright 2020-2023 Free Software Foundation, Inc. dnl This file is free software; the Free Software Foundation dnl gives unlimited permission to copy and/or distribute it, dnl with or without modifications, as long as this notice is preserved. @@ -9,9 +9,18 @@ dnl Written by Paul Eggert. AC_DEFUN([gl_FUNC_GETRANDOM], [ AC_REQUIRE([gl_SYS_RANDOM_H_DEFAULTS]) - AC_CHECK_FUNCS_ONCE([getrandom]) + gl_CHECK_FUNCS_ANDROID([getrandom], + [[/* Additional includes are needed before <sys/random.h> on uClibc + and Mac OS X. */ + #include <sys/types.h> + #include <stdlib.h> + #include <sys/random.h> + ]]) if test "$ac_cv_func_getrandom" != yes; then HAVE_GETRANDOM=0 + case "$gl_cv_onwards_func_getrandom" in + future*) REPLACE_GETRANDOM=1 ;; + esac else dnl On Solaris 11.4 the return type is 'int', not 'ssize_t'. AC_CACHE_CHECK([whether getrandom is compatible with its GNU+BSD signature], @@ -56,13 +65,16 @@ AC_DEFUN([gl_FUNC_GETRANDOM], if test $gl_cv_lib_assume_bcrypt = yes; then AC_DEFINE([HAVE_LIB_BCRYPT], [1], [Define to 1 if the bcrypt library is guaranteed to be present.]) - LIB_GETRANDOM='-lbcrypt' + GETRANDOM_LIB='-lbcrypt' else - LIB_GETRANDOM='-ladvapi32' + GETRANDOM_LIB='-ladvapi32' fi ;; *) - LIB_GETRANDOM= ;; + GETRANDOM_LIB= ;; esac + AC_SUBST([GETRANDOM_LIB]) + dnl For backward compatibility. + LIB_GETRANDOM="$GETRANDOM_LIB" AC_SUBST([LIB_GETRANDOM]) ]) diff --git a/m4/gettimeofday.m4 b/m4/gettimeofday.m4 index f729601..5051d61 100644 --- a/m4/gettimeofday.m4 +++ b/m4/gettimeofday.m4 @@ -1,6 +1,6 @@ # serial 29 -# Copyright (C) 2001-2003, 2005, 2007, 2009-2022 Free Software Foundation, Inc. +# Copyright (C) 2001-2003, 2005, 2007, 2009-2023 Free Software Foundation, Inc. # This file is free software; the Free Software Foundation # gives unlimited permission to copy and/or distribute it, # with or without modifications, as long as this notice is preserved. diff --git a/m4/gnulib-common.m4 b/m4/gnulib-common.m4 index c5ced04..c84a2af 100644 --- a/m4/gnulib-common.m4 +++ b/m4/gnulib-common.m4 @@ -1,5 +1,5 @@ -# gnulib-common.m4 serial 72 -dnl Copyright (C) 2007-2022 Free Software Foundation, Inc. +# gnulib-common.m4 serial 82 +dnl Copyright (C) 2007-2023 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. @@ -38,6 +38,11 @@ AC_DEFUN([gl_COMMON_BODY], [ AIX system header files and several gnulib header files use precisely this syntax with 'extern'. */ # define _Noreturn [[noreturn]] +# elif (defined __clang__ && __clang_major__ < 16 \ + && defined _GL_WORK_AROUND_LLVM_BUG_59792) + /* Compile with -D_GL_WORK_AROUND_LLVM_BUG_59792 to work around + that rare LLVM bug, though you may get many false-alarm warnings. */ +# define _Noreturn # elif ((!defined __cplusplus || defined __clang__) \ && (201112 <= (defined __STDC_VERSION__ ? __STDC_VERSION__ : 0) \ || (!defined __STRICT_ANSI__ \ @@ -71,7 +76,7 @@ AC_DEFUN([gl_COMMON_BODY], [ && (!defined __clang_minor__ \ || (defined __apple_build_version__ \ ? 6000000 <= __apple_build_version__ \ - : 3 < __clang_major__ + (5 <= __clang_minor__)))) + : 5 <= __clang_major__))) # define _GL_HAS_ATTRIBUTE(attr) __has_attribute (__##attr##__) #else # define _GL_HAS_ATTRIBUTE(attr) _GL_ATTR_##attr @@ -105,13 +110,13 @@ AC_DEFUN([gl_COMMON_BODY], [ # define _GL_ATTR_warn_unused_result _GL_GNUC_PREREQ (3, 4) #endif -#ifdef __has_c_attribute -# define _GL_HAS_C_ATTRIBUTE(attr) __has_c_attribute (__##attr##__) -#else -# define _GL_HAS_C_ATTRIBUTE(attr) 0 +/* Disable GCC -Wpedantic if using __has_c_attribute and this is not C23+. */ +#if (defined __has_c_attribute && _GL_GNUC_PREREQ (4, 6) \ + && (defined __STDC_VERSION__ ? __STDC_VERSION__ : 0) <= 201710) +# pragma GCC diagnostic ignored "-Wpedantic" #endif -]dnl There is no _GL_ATTRIBUTE_ALIGNED; use stdalign's _Alignas instead. +]dnl There is no _GL_ATTRIBUTE_ALIGNED; use stdalign's alignas instead. [ /* _GL_ATTRIBUTE_ALLOC_SIZE ((N)) declares that the Nth argument of the function is the size of the returned memory block. @@ -119,29 +124,35 @@ AC_DEFUN([gl_COMMON_BODY], [ by the Nth argument of the function is the size of the returned memory block. */ /* Applies to: function, pointer to function, function types. */ -#if _GL_HAS_ATTRIBUTE (alloc_size) -# define _GL_ATTRIBUTE_ALLOC_SIZE(args) __attribute__ ((__alloc_size__ args)) -#else -# define _GL_ATTRIBUTE_ALLOC_SIZE(args) +#ifndef _GL_ATTRIBUTE_ALLOC_SIZE +# if _GL_HAS_ATTRIBUTE (alloc_size) +# define _GL_ATTRIBUTE_ALLOC_SIZE(args) __attribute__ ((__alloc_size__ args)) +# else +# define _GL_ATTRIBUTE_ALLOC_SIZE(args) +# endif #endif /* _GL_ATTRIBUTE_ALWAYS_INLINE tells that the compiler should always inline the function and report an error if it cannot do so. */ /* Applies to: function. */ -#if _GL_HAS_ATTRIBUTE (always_inline) -# define _GL_ATTRIBUTE_ALWAYS_INLINE __attribute__ ((__always_inline__)) -#else -# define _GL_ATTRIBUTE_ALWAYS_INLINE +#ifndef _GL_ATTRIBUTE_ALWAYS_INLINE +# if _GL_HAS_ATTRIBUTE (always_inline) +# define _GL_ATTRIBUTE_ALWAYS_INLINE __attribute__ ((__always_inline__)) +# else +# define _GL_ATTRIBUTE_ALWAYS_INLINE +# endif #endif /* _GL_ATTRIBUTE_ARTIFICIAL declares that the function is not important to show in stack traces when debugging. The compiler should omit the function from stack traces. */ /* Applies to: function. */ -#if _GL_HAS_ATTRIBUTE (artificial) -# define _GL_ATTRIBUTE_ARTIFICIAL __attribute__ ((__artificial__)) -#else -# define _GL_ATTRIBUTE_ARTIFICIAL +#ifndef _GL_ATTRIBUTE_ARTIFICIAL +# if _GL_HAS_ATTRIBUTE (artificial) +# define _GL_ATTRIBUTE_ARTIFICIAL __attribute__ ((__artificial__)) +# else +# define _GL_ATTRIBUTE_ARTIFICIAL +# endif #endif /* _GL_ATTRIBUTE_COLD declares that the function is rarely executed. */ @@ -149,14 +160,16 @@ AC_DEFUN([gl_COMMON_BODY], [ /* Avoid __attribute__ ((cold)) on MinGW; see thread starting at <https://lists.gnu.org/r/emacs-devel/2019-04/msg01152.html>. Also, Oracle Studio 12.6 requires 'cold' not '__cold__'. */ -#if _GL_HAS_ATTRIBUTE (cold) && !defined __MINGW32__ -# ifndef __SUNPRO_C -# define _GL_ATTRIBUTE_COLD __attribute__ ((__cold__)) +#ifndef _GL_ATTRIBUTE_COLD +# if _GL_HAS_ATTRIBUTE (cold) && !defined __MINGW32__ +# ifndef __SUNPRO_C +# define _GL_ATTRIBUTE_COLD __attribute__ ((__cold__)) +# else +# define _GL_ATTRIBUTE_COLD __attribute__ ((cold)) +# endif # else -# define _GL_ATTRIBUTE_COLD __attribute__ ((cold)) +# define _GL_ATTRIBUTE_COLD # endif -#else -# define _GL_ATTRIBUTE_COLD #endif /* _GL_ATTRIBUTE_CONST declares that it is OK for a compiler to omit duplicate @@ -166,10 +179,12 @@ AC_DEFUN([gl_COMMON_BODY], [ forever, and does not call longjmp. (This attribute is stricter than _GL_ATTRIBUTE_PURE.) */ /* Applies to: functions. */ -#if _GL_HAS_ATTRIBUTE (const) -# define _GL_ATTRIBUTE_CONST __attribute__ ((__const__)) -#else -# define _GL_ATTRIBUTE_CONST +#ifndef _GL_ATTRIBUTE_CONST +# if _GL_HAS_ATTRIBUTE (const) +# define _GL_ATTRIBUTE_CONST __attribute__ ((__const__)) +# else +# define _GL_ATTRIBUTE_CONST +# endif #endif /* _GL_ATTRIBUTE_DEALLOC (F, I) declares that the function returns pointers @@ -178,16 +193,25 @@ AC_DEFUN([gl_COMMON_BODY], [ _GL_ATTRIBUTE_DEALLOC_FREE declares that the function returns pointers that can be freed via 'free'; it can be used only after declaring 'free'. */ /* Applies to: functions. Cannot be used on inline functions. */ -#if _GL_GNUC_PREREQ (11, 0) -# define _GL_ATTRIBUTE_DEALLOC(f, i) __attribute__ ((__malloc__ (f, i))) -#else -# define _GL_ATTRIBUTE_DEALLOC(f, i) +#ifndef _GL_ATTRIBUTE_DEALLOC +# if _GL_GNUC_PREREQ (11, 0) +# define _GL_ATTRIBUTE_DEALLOC(f, i) __attribute__ ((__malloc__ (f, i))) +# else +# define _GL_ATTRIBUTE_DEALLOC(f, i) +# endif #endif /* If gnulib's <string.h> or <wchar.h> has already defined this macro, continue to use this earlier definition, since <stdlib.h> may not have been included yet. */ #ifndef _GL_ATTRIBUTE_DEALLOC_FREE -# define _GL_ATTRIBUTE_DEALLOC_FREE _GL_ATTRIBUTE_DEALLOC (free, 1) +# if defined __cplusplus && defined __GNUC__ && !defined __clang__ +/* Work around GCC bug <https://gcc.gnu.org/bugzilla/show_bug.cgi?id=108231> */ +# define _GL_ATTRIBUTE_DEALLOC_FREE \ + _GL_ATTRIBUTE_DEALLOC ((void (*) (void *)) free, 1) +# else +# define _GL_ATTRIBUTE_DEALLOC_FREE \ + _GL_ATTRIBUTE_DEALLOC (free, 1) +# endif #endif /* _GL_ATTRIBUTE_DEPRECATED: Declares that an entity is deprecated. @@ -198,12 +222,18 @@ AC_DEFUN([gl_COMMON_BODY], [ - enumeration, enumeration item, - typedef, in C++ also: namespace, class, template specialization. */ -#if _GL_HAS_C_ATTRIBUTE (deprecated) -# define _GL_ATTRIBUTE_DEPRECATED [[__deprecated__]] -#elif _GL_HAS_ATTRIBUTE (deprecated) -# define _GL_ATTRIBUTE_DEPRECATED __attribute__ ((__deprecated__)) -#else -# define _GL_ATTRIBUTE_DEPRECATED +#ifndef _GL_ATTRIBUTE_DEPRECATED +# ifdef __has_c_attribute +# if __has_c_attribute (__deprecated__) +# define _GL_ATTRIBUTE_DEPRECATED [[__deprecated__]] +# endif +# endif +# if !defined _GL_ATTRIBUTE_DEPRECATED && _GL_HAS_ATTRIBUTE (deprecated) +# define _GL_ATTRIBUTE_DEPRECATED __attribute__ ((__deprecated__)) +# endif +# ifndef _GL_ATTRIBUTE_DEPRECATED +# define _GL_ATTRIBUTE_DEPRECATED +# endif #endif /* _GL_ATTRIBUTE_ERROR(msg) requests an error if a function is called and @@ -211,24 +241,28 @@ AC_DEFUN([gl_COMMON_BODY], [ _GL_ATTRIBUTE_WARNING(msg) requests a warning if a function is called and the function call is not optimized away. */ /* Applies to: functions. */ -#if _GL_HAS_ATTRIBUTE (error) -# define _GL_ATTRIBUTE_ERROR(msg) __attribute__ ((__error__ (msg))) -# define _GL_ATTRIBUTE_WARNING(msg) __attribute__ ((__warning__ (msg))) -#elif _GL_HAS_ATTRIBUTE (diagnose_if) -# define _GL_ATTRIBUTE_ERROR(msg) __attribute__ ((__diagnose_if__ (1, msg, "error"))) -# define _GL_ATTRIBUTE_WARNING(msg) __attribute__ ((__diagnose_if__ (1, msg, "warning"))) -#else -# define _GL_ATTRIBUTE_ERROR(msg) -# define _GL_ATTRIBUTE_WARNING(msg) +#if !(defined _GL_ATTRIBUTE_ERROR && defined _GL_ATTRIBUTE_WARNING) +# if _GL_HAS_ATTRIBUTE (error) +# define _GL_ATTRIBUTE_ERROR(msg) __attribute__ ((__error__ (msg))) +# define _GL_ATTRIBUTE_WARNING(msg) __attribute__ ((__warning__ (msg))) +# elif _GL_HAS_ATTRIBUTE (diagnose_if) +# define _GL_ATTRIBUTE_ERROR(msg) __attribute__ ((__diagnose_if__ (1, msg, "error"))) +# define _GL_ATTRIBUTE_WARNING(msg) __attribute__ ((__diagnose_if__ (1, msg, "warning"))) +# else +# define _GL_ATTRIBUTE_ERROR(msg) +# define _GL_ATTRIBUTE_WARNING(msg) +# endif #endif /* _GL_ATTRIBUTE_EXTERNALLY_VISIBLE declares that the entity should remain visible to debuggers etc., even with '-fwhole-program'. */ /* Applies to: functions, variables. */ -#if _GL_HAS_ATTRIBUTE (externally_visible) -# define _GL_ATTRIBUTE_EXTERNALLY_VISIBLE __attribute__ ((externally_visible)) -#else -# define _GL_ATTRIBUTE_EXTERNALLY_VISIBLE +#ifndef _GL_ATTRIBUTE_EXTERNALLY_VISIBLE +# if _GL_HAS_ATTRIBUTE (externally_visible) +# define _GL_ATTRIBUTE_EXTERNALLY_VISIBLE __attribute__ ((externally_visible)) +# else +# define _GL_ATTRIBUTE_EXTERNALLY_VISIBLE +# endif #endif /* _GL_ATTRIBUTE_FALLTHROUGH declares that it is not a programming mistake if @@ -236,12 +270,18 @@ AC_DEFUN([gl_COMMON_BODY], [ 'default' label. The compiler should not warn in this case. */ /* Applies to: Empty statement (;), inside a 'switch' statement. */ /* Always expands to something. */ -#if _GL_HAS_C_ATTRIBUTE (fallthrough) -# define _GL_ATTRIBUTE_FALLTHROUGH [[__fallthrough__]] -#elif _GL_HAS_ATTRIBUTE (fallthrough) -# define _GL_ATTRIBUTE_FALLTHROUGH __attribute__ ((__fallthrough__)) -#else -# define _GL_ATTRIBUTE_FALLTHROUGH ((void) 0) +#ifndef _GL_ATTRIBUTE_FALLTHROUGH +# ifdef __has_c_attribute +# if __has_c_attribute (__fallthrough__) +# define _GL_ATTRIBUTE_FALLTHROUGH [[__fallthrough__]] +# endif +# endif +# if !defined _GL_ATTRIBUTE_FALLTHROUGH && _GL_HAS_ATTRIBUTE (fallthrough) +# define _GL_ATTRIBUTE_FALLTHROUGH __attribute__ ((__fallthrough__)) +# endif +# ifndef _GL_ATTRIBUTE_FALLTHROUGH +# define _GL_ATTRIBUTE_FALLTHROUGH ((void) 0) +# endif #endif /* _GL_ATTRIBUTE_FORMAT ((ARCHETYPE, STRING-INDEX, FIRST-TO-CHECK)) @@ -255,10 +295,12 @@ AC_DEFUN([gl_COMMON_BODY], [ If FIRST-TO-CHECK is not 0, arguments starting at FIRST-TO_CHECK are suitable for the format string. */ /* Applies to: functions. */ -#if _GL_HAS_ATTRIBUTE (format) -# define _GL_ATTRIBUTE_FORMAT(spec) __attribute__ ((__format__ spec)) -#else -# define _GL_ATTRIBUTE_FORMAT(spec) +#ifndef _GL_ATTRIBUTE_FORMAT +# if _GL_HAS_ATTRIBUTE (format) +# define _GL_ATTRIBUTE_FORMAT(spec) __attribute__ ((__format__ spec)) +# else +# define _GL_ATTRIBUTE_FORMAT(spec) +# endif #endif /* _GL_ATTRIBUTE_LEAF declares that if the function is called from some other @@ -266,19 +308,23 @@ AC_DEFUN([gl_COMMON_BODY], [ exception handling. This declaration lets the compiler optimize that unit more aggressively. */ /* Applies to: functions. */ -#if _GL_HAS_ATTRIBUTE (leaf) -# define _GL_ATTRIBUTE_LEAF __attribute__ ((__leaf__)) -#else -# define _GL_ATTRIBUTE_LEAF +#ifndef _GL_ATTRIBUTE_LEAF +# if _GL_HAS_ATTRIBUTE (leaf) +# define _GL_ATTRIBUTE_LEAF __attribute__ ((__leaf__)) +# else +# define _GL_ATTRIBUTE_LEAF +# endif #endif /* _GL_ATTRIBUTE_MALLOC declares that the function returns a pointer to freshly allocated memory. */ /* Applies to: functions. */ -#if _GL_HAS_ATTRIBUTE (malloc) -# define _GL_ATTRIBUTE_MALLOC __attribute__ ((__malloc__)) -#else -# define _GL_ATTRIBUTE_MALLOC +#ifndef _GL_ATTRIBUTE_MALLOC +# if _GL_HAS_ATTRIBUTE (malloc) +# define _GL_ATTRIBUTE_MALLOC __attribute__ ((__malloc__)) +# else +# define _GL_ATTRIBUTE_MALLOC +# endif #endif /* _GL_ATTRIBUTE_MAY_ALIAS declares that pointers to the type may point to the @@ -286,10 +332,12 @@ AC_DEFUN([gl_COMMON_BODY], [ strict aliasing optimization. */ /* Applies to: types. */ /* Oracle Studio 12.6 mishandles may_alias despite __has_attribute OK. */ -#if _GL_HAS_ATTRIBUTE (may_alias) && !defined __SUNPRO_C -# define _GL_ATTRIBUTE_MAY_ALIAS __attribute__ ((__may_alias__)) -#else -# define _GL_ATTRIBUTE_MAY_ALIAS +#ifndef _GL_ATTRIBUTE_MAY_ALIAS +# if _GL_HAS_ATTRIBUTE (may_alias) && !defined __SUNPRO_C +# define _GL_ATTRIBUTE_MAY_ALIAS __attribute__ ((__may_alias__)) +# else +# define _GL_ATTRIBUTE_MAY_ALIAS +# endif #endif /* _GL_ATTRIBUTE_MAYBE_UNUSED declares that it is not a programming mistake if @@ -301,15 +349,27 @@ AC_DEFUN([gl_COMMON_BODY], [ - enumeration, enumeration item, - typedef, in C++ also: class. */ -/* In C++ and C2x, this is spelled [[__maybe_unused__]]. +/* In C++ and C23, this is spelled [[__maybe_unused__]]. GCC's syntax is __attribute__ ((__unused__)). - clang supports both syntaxes. */ -#if _GL_HAS_C_ATTRIBUTE (maybe_unused) -# define _GL_ATTRIBUTE_MAYBE_UNUSED [[__maybe_unused__]] -#else -# define _GL_ATTRIBUTE_MAYBE_UNUSED _GL_ATTRIBUTE_UNUSED + clang supports both syntaxes. Except that with clang ≥ 6, < 10, in C++ mode, + __has_c_attribute (__maybe_unused__) yields true but the use of + [[__maybe_unused__]] nevertheless produces a warning. */ +#ifndef _GL_ATTRIBUTE_MAYBE_UNUSED +# if defined __clang__ && defined __cplusplus +# if !defined __apple_build_version__ && __clang_major__ >= 10 +# define _GL_ATTRIBUTE_MAYBE_UNUSED [[__maybe_unused__]] +# endif +# elif defined __has_c_attribute +# if __has_c_attribute (__maybe_unused__) +# define _GL_ATTRIBUTE_MAYBE_UNUSED [[__maybe_unused__]] +# endif +# endif +# ifndef _GL_ATTRIBUTE_MAYBE_UNUSED +# define _GL_ATTRIBUTE_MAYBE_UNUSED _GL_ATTRIBUTE_UNUSED +# endif #endif -/* Alternative spelling of this macro, for convenience. */ +/* Alternative spelling of this macro, for convenience and for + compatibility with glibc/include/libc-symbols.h. */ #define _GL_UNUSED _GL_ATTRIBUTE_MAYBE_UNUSED /* Earlier spellings of this macro. */ #define _UNUSED_PARAMETER_ _GL_ATTRIBUTE_MAYBE_UNUSED @@ -318,21 +378,38 @@ AC_DEFUN([gl_COMMON_BODY], [ discard the return value. The compiler may warn if the caller does not use the return value, unless the caller uses something like ignore_value. */ /* Applies to: function, enumeration, class. */ -#if _GL_HAS_C_ATTRIBUTE (nodiscard) -# define _GL_ATTRIBUTE_NODISCARD [[__nodiscard__]] -#elif _GL_HAS_ATTRIBUTE (warn_unused_result) -# define _GL_ATTRIBUTE_NODISCARD __attribute__ ((__warn_unused_result__)) -#else -# define _GL_ATTRIBUTE_NODISCARD +#ifndef _GL_ATTRIBUTE_NODISCARD +# if defined __clang__ && defined __cplusplus + /* With clang up to 15.0.6 (at least), in C++ mode, [[__nodiscard__]] produces + a warning. + The 1000 below means a yet unknown threshold. When clang++ version X + starts supporting [[__nodiscard__]] without warning about it, you can + replace the 1000 with X. */ +# if __clang_major__ >= 1000 +# define _GL_ATTRIBUTE_NODISCARD [[__nodiscard__]] +# endif +# elif defined __has_c_attribute +# if __has_c_attribute (__nodiscard__) +# define _GL_ATTRIBUTE_NODISCARD [[__nodiscard__]] +# endif +# endif +# if !defined _GL_ATTRIBUTE_NODISCARD && _GL_HAS_ATTRIBUTE (warn_unused_result) +# define _GL_ATTRIBUTE_NODISCARD __attribute__ ((__warn_unused_result__)) +# endif +# ifndef _GL_ATTRIBUTE_NODISCARD +# define _GL_ATTRIBUTE_NODISCARD +# endif #endif /* _GL_ATTRIBUTE_NOINLINE tells that the compiler should not inline the function. */ /* Applies to: functions. */ -#if _GL_HAS_ATTRIBUTE (noinline) -# define _GL_ATTRIBUTE_NOINLINE __attribute__ ((__noinline__)) -#else -# define _GL_ATTRIBUTE_NOINLINE +#ifndef _GL_ATTRIBUTE_NOINLINE +# if _GL_HAS_ATTRIBUTE (noinline) +# define _GL_ATTRIBUTE_NOINLINE __attribute__ ((__noinline__)) +# else +# define _GL_ATTRIBUTE_NOINLINE +# endif #endif /* _GL_ATTRIBUTE_NONNULL ((N1, N2,...)) declares that the arguments N1, N2,... @@ -340,20 +417,24 @@ AC_DEFUN([gl_COMMON_BODY], [ _GL_ATTRIBUTE_NONNULL () declares that all pointer arguments must not be null. */ /* Applies to: functions. */ -#if _GL_HAS_ATTRIBUTE (nonnull) -# define _GL_ATTRIBUTE_NONNULL(args) __attribute__ ((__nonnull__ args)) -#else -# define _GL_ATTRIBUTE_NONNULL(args) +#ifndef _GL_ATTRIBUTE_NONNULL +# if _GL_HAS_ATTRIBUTE (nonnull) +# define _GL_ATTRIBUTE_NONNULL(args) __attribute__ ((__nonnull__ args)) +# else +# define _GL_ATTRIBUTE_NONNULL(args) +# endif #endif /* _GL_ATTRIBUTE_NONSTRING declares that the contents of a character array is not meant to be NUL-terminated. */ /* Applies to: struct/union members and variables that are arrays of element type '[[un]signed] char'. */ -#if _GL_HAS_ATTRIBUTE (nonstring) -# define _GL_ATTRIBUTE_NONSTRING __attribute__ ((__nonstring__)) -#else -# define _GL_ATTRIBUTE_NONSTRING +#ifndef _GL_ATTRIBUTE_NONSTRING +# if _GL_HAS_ATTRIBUTE (nonstring) +# define _GL_ATTRIBUTE_NONSTRING __attribute__ ((__nonstring__)) +# else +# define _GL_ATTRIBUTE_NONSTRING +# endif #endif /* There is no _GL_ATTRIBUTE_NORETURN; use _Noreturn instead. */ @@ -361,10 +442,12 @@ AC_DEFUN([gl_COMMON_BODY], [ /* _GL_ATTRIBUTE_NOTHROW declares that the function does not throw exceptions. */ /* Applies to: functions. */ -#if _GL_HAS_ATTRIBUTE (nothrow) && !defined __cplusplus -# define _GL_ATTRIBUTE_NOTHROW __attribute__ ((__nothrow__)) -#else -# define _GL_ATTRIBUTE_NOTHROW +#ifndef _GL_ATTRIBUTE_NOTHROW +# if _GL_HAS_ATTRIBUTE (nothrow) && !defined __cplusplus +# define _GL_ATTRIBUTE_NOTHROW __attribute__ ((__nothrow__)) +# else +# define _GL_ATTRIBUTE_NOTHROW +# endif #endif /* _GL_ATTRIBUTE_PACKED declares: @@ -373,10 +456,12 @@ AC_DEFUN([gl_COMMON_BODY], [ minimizing the memory required. */ /* Applies to: struct members, struct, union, in C++ also: class. */ -#if _GL_HAS_ATTRIBUTE (packed) -# define _GL_ATTRIBUTE_PACKED __attribute__ ((__packed__)) -#else -# define _GL_ATTRIBUTE_PACKED +#ifndef _GL_ATTRIBUTE_PACKED +# if _GL_HAS_ATTRIBUTE (packed) +# define _GL_ATTRIBUTE_PACKED __attribute__ ((__packed__)) +# else +# define _GL_ATTRIBUTE_PACKED +# endif #endif /* _GL_ATTRIBUTE_PURE declares that It is OK for a compiler to omit duplicate @@ -386,19 +471,23 @@ AC_DEFUN([gl_COMMON_BODY], [ observable state, and always returns exactly once. (This attribute is looser than _GL_ATTRIBUTE_CONST.) */ /* Applies to: functions. */ -#if _GL_HAS_ATTRIBUTE (pure) -# define _GL_ATTRIBUTE_PURE __attribute__ ((__pure__)) -#else -# define _GL_ATTRIBUTE_PURE +#ifndef _GL_ATTRIBUTE_PURE +# if _GL_HAS_ATTRIBUTE (pure) +# define _GL_ATTRIBUTE_PURE __attribute__ ((__pure__)) +# else +# define _GL_ATTRIBUTE_PURE +# endif #endif /* _GL_ATTRIBUTE_RETURNS_NONNULL declares that the function's return value is a non-NULL pointer. */ /* Applies to: functions. */ -#if _GL_HAS_ATTRIBUTE (returns_nonnull) -# define _GL_ATTRIBUTE_RETURNS_NONNULL __attribute__ ((__returns_nonnull__)) -#else -# define _GL_ATTRIBUTE_RETURNS_NONNULL +#ifndef _GL_ATTRIBUTE_RETURNS_NONNULL +# if _GL_HAS_ATTRIBUTE (returns_nonnull) +# define _GL_ATTRIBUTE_RETURNS_NONNULL __attribute__ ((__returns_nonnull__)) +# else +# define _GL_ATTRIBUTE_RETURNS_NONNULL +# endif #endif /* _GL_ATTRIBUTE_SENTINEL(pos) declares that the variadic function expects a @@ -406,17 +495,21 @@ AC_DEFUN([gl_COMMON_BODY], [ _GL_ATTRIBUTE_SENTINEL () - The last argument is NULL (requires C99). _GL_ATTRIBUTE_SENTINEL ((N)) - The (N+1)st argument from the end is NULL. */ /* Applies to: functions. */ -#if _GL_HAS_ATTRIBUTE (sentinel) -# define _GL_ATTRIBUTE_SENTINEL(pos) __attribute__ ((__sentinel__ pos)) -#else -# define _GL_ATTRIBUTE_SENTINEL(pos) +#ifndef _GL_ATTRIBUTE_SENTINEL +# if _GL_HAS_ATTRIBUTE (sentinel) +# define _GL_ATTRIBUTE_SENTINEL(pos) __attribute__ ((__sentinel__ pos)) +# else +# define _GL_ATTRIBUTE_SENTINEL(pos) +# endif #endif /* A helper macro. Don't use it directly. */ -#if _GL_HAS_ATTRIBUTE (unused) -# define _GL_ATTRIBUTE_UNUSED __attribute__ ((__unused__)) -#else -# define _GL_ATTRIBUTE_UNUSED +#ifndef _GL_ATTRIBUTE_UNUSED +# if _GL_HAS_ATTRIBUTE (unused) +# define _GL_ATTRIBUTE_UNUSED __attribute__ ((__unused__)) +# else +# define _GL_ATTRIBUTE_UNUSED +# endif #endif ]dnl There is no _GL_ATTRIBUTE_VISIBILITY; see m4/visibility.m4 instead. @@ -427,10 +520,12 @@ AC_DEFUN([gl_COMMON_BODY], [ /* Applies to: label (both in C and C++). */ /* Note that g++ < 4.5 does not support the '__attribute__ ((__unused__)) ;' syntax. But clang does. */ -#if !(defined __cplusplus && !_GL_GNUC_PREREQ (4, 5)) || defined __clang__ -# define _GL_UNUSED_LABEL _GL_ATTRIBUTE_UNUSED -#else -# define _GL_UNUSED_LABEL +#ifndef _GL_UNUSED_LABEL +# if !(defined __cplusplus && !_GL_GNUC_PREREQ (4, 5)) || defined __clang__ +# define _GL_UNUSED_LABEL _GL_ATTRIBUTE_UNUSED +# else +# define _GL_UNUSED_LABEL +# endif #endif ]) AH_VERBATIM([async_safe], @@ -1000,6 +1095,238 @@ AC_DEFUN([gl_CONDITIONAL_HEADER], m4_popdef([gl_header_name]) ]) +dnl Preparations for gl_CHECK_FUNCS_MACOS. +AC_DEFUN([gl_PREPARE_CHECK_FUNCS_MACOS], +[ + AC_REQUIRE([AC_CANONICAL_HOST]) + AC_REQUIRE([gl_COMPILER_CLANG]) + AC_CACHE_CHECK([for compiler option needed when checking for future declarations], + [gl_cv_compiler_check_future_option], + [case "$host_os" in + dnl This is only needed on macOS. + darwin*) + if test $gl_cv_compiler_clang = yes; then + dnl Test whether the compiler supports the option + dnl '-Werror=unguarded-availability-new'. + save_ac_compile="$ac_compile" + ac_compile="$ac_compile -Werror=unguarded-availability-new" + AC_COMPILE_IFELSE([AC_LANG_PROGRAM([[]],[[]])], + [gl_cv_compiler_check_future_option='-Werror=unguarded-availability-new'], + [gl_cv_compiler_check_future_option=none]) + ac_compile="$save_ac_compile" + else + gl_cv_compiler_check_future_option=none + fi + ;; + *) gl_cv_compiler_check_future_option=none ;; + esac + ]) +]) + +dnl Pieces of the expansion of +dnl gl_CHECK_FUNCS_ANDROID +dnl gl_CHECK_FUNCS_MACOS +dnl gl_CHECK_FUNCS_ANDROID_MACOS + +AC_DEFUN([gl_CHECK_FUNCS_DEFAULT_CASE], +[ + *) + AC_CHECK_FUNC([$1]) + [gl_cv_onwards_func_][$1]=$[ac_cv_func_][$1] + ;; +]) + +AC_DEFUN([gl_CHECK_FUNCS_CASE_FOR_ANDROID], +[ + linux*-android*) + AC_CHECK_DECL([$1], , , [$2]) + if test $[ac_cv_have_decl_][$1] = yes; then + AC_CHECK_FUNC([[$1]]) + if test $[ac_cv_func_][$1] = yes; then + [gl_cv_onwards_func_][$1]=yes + else + dnl The function is declared but does not exist. This should not + dnl happen normally. But anyway, we know that a future version + dnl of Android will have the function. + [gl_cv_onwards_func_][$1]='future OS version' + fi + else + [gl_cv_onwards_func_][$1]='future OS version' + fi + ;; +]) + +AC_DEFUN([gl_CHECK_FUNCS_CASE_FOR_MACOS], +[ + darwin*) + if test "x$gl_cv_compiler_check_future_option" != "xnone"; then + dnl Use a compile test, not a link test. + save_ac_compile="$ac_compile" + ac_compile="$ac_compile $gl_cv_compiler_check_future_option" + save_ac_compile_for_check_decl="$ac_compile_for_check_decl" + ac_compile_for_check_decl="$ac_compile_for_check_decl $gl_cv_compiler_check_future_option" + unset [ac_cv_have_decl_][$1] + AC_CHECK_DECL([$1], , , [$2]) + ac_compile="$save_ac_compile" + ac_compile_for_check_decl="$save_ac_compile_for_check_decl" + [ac_cv_func_][$1]="$[ac_cv_have_decl_][$1]" + if test $[ac_cv_func_][$1] = yes; then + [gl_cv_onwards_func_][$1]=yes + else + unset [ac_cv_have_decl_][$1] + AC_CHECK_DECL([$1], , , [$2]) + if test $[ac_cv_have_decl_][$1] = yes; then + [gl_cv_onwards_func_][$1]='future OS version' + else + [gl_cv_onwards_func_][$1]=no + fi + fi + else + AC_CHECK_FUNC([$1]) + [gl_cv_onwards_func_][$1]=$[ac_cv_func_][$1] + fi + ;; +]) + +AC_DEFUN([gl_CHECK_FUNCS_SET_RESULTS], +[ + case "$[gl_cv_onwards_func_][$1]" in + future*) [ac_cv_func_][$1]=no ;; + *) [ac_cv_func_][$1]=$[gl_cv_onwards_func_][$1] ;; + esac + if test $[ac_cv_func_][$1] = yes; then + AC_DEFINE([HAVE_]m4_translit([[$1]], + [abcdefghijklmnopqrstuvwxyz], + [ABCDEFGHIJKLMNOPQRSTUVWXYZ]), + [1], [Define to 1 if you have the `$1' function.]) + fi +]) + +dnl gl_CHECK_FUNCS_ANDROID([func], [[#include <foo.h>]]) +dnl is like AC_CHECK_FUNCS([func]), taking into account a portability problem +dnl on Android. +dnl +dnl When code is compiled on Android, it is in the context of a certain +dnl "Android API level", which indicates the minimum version of Android on +dnl which the app can be installed. In other words, you don't compile for a +dnl specific version of Android. You compile for all versions of Android, +dnl onwards from the given API level. +dnl Thus, the question "does the OS have the function func" has three possible +dnl answers: +dnl - yes, in all versions starting from the given API level, +dnl - no, in no version, +dnl - not in the given API level, but in a later version of Android. +dnl +dnl In detail, this works as follows: +dnl If func was added to Android API level, say, 28, then the libc.so has the +dnl symbol func always, whereas the header file <foo.h> declares func +dnl conditionally: +dnl #if __ANDROID_API__ >= 28 +dnl ... func (...) __INTRODUCED_IN(28); +dnl #endif +dnl Thus, when compiling with "clang -target armv7a-unknown-linux-android28", +dnl the function func is declared and exists in libc. +dnl Whereas when compiling with "clang -target armv7a-unknown-linux-android27", +dnl the function func is not declared but exists in libc. +dnl +dnl This macro sets two variables: +dnl - gl_cv_onwards_func_<func> to yes / no / "future OS version" +dnl - ac_cv_func_<func> to yes / no / no +dnl The first variable allows to distinguish all three cases. +dnl The second variable is set, so that an invocation +dnl gl_CHECK_FUNCS_ANDROID([func], [[#include <foo.h>]]) +dnl can be used as a drop-in replacement for +dnl AC_CHECK_FUNCS([func]). +AC_DEFUN([gl_CHECK_FUNCS_ANDROID], +[ + AC_REQUIRE([AC_CANONICAL_HOST]) + AC_CACHE_CHECK([for [$1]], + [[gl_cv_onwards_func_][$1]], + [gl_SILENT([ + case "$host_os" in + gl_CHECK_FUNCS_CASE_FOR_ANDROID([$1], [$2]) + gl_CHECK_FUNCS_DEFAULT_CASE([$1]) + esac + ]) + ]) + gl_CHECK_FUNCS_SET_RESULTS([$1]) +]) + +dnl gl_CHECK_FUNCS_MACOS([func], [[#include <foo.h>]]) +dnl is like AC_CHECK_FUNCS([func]), taking into account a portability problem +dnl on macOS. +dnl +dnl When code is compiled on macOS, it is in the context of a certain minimum +dnl macOS version, that can be set through the option '-mmacosx-version-min='. +dnl In other words, you don't compile for a specific version of macOS. You +dnl compile for all versions of macOS, onwards from the given version. +dnl Thus, the question "does the OS have the function func" has three possible +dnl answers: +dnl - yes, in all versions starting from the given version, +dnl - no, in no version, +dnl - not in the given version, but in a later version of macOS. +dnl +dnl In detail, this works as follows: +dnl If func was added to, say, macOS version 13, then the libc has the +dnl symbol func always, whereas the header file <foo.h> declares func +dnl conditionally with a special availability attribute: +dnl ... func (...) __attribute__((availability(macos,introduced=13.0))); +dnl Thus, when compiling with "clang mmacosx-version-min=13", there is no +dnl warning about the use of func, and the resulting binary +dnl - runs fine on macOS 13, +dnl - aborts with a dyld "Symbol not found" message on macOS 12. +dnl Whereas, when compiling with "clang mmacosx-version-min=12", there is a +dnl warning: 'func' is only available on macOS 13.0 or newer +dnl [-Wunguarded-availability-new], +dnl and the resulting binary +dnl - runs fine on macOS 13, +dnl - crashes with a SIGSEGV (signal 11) on macOS 12. +dnl +dnl This macro sets two variables: +dnl - gl_cv_onwards_func_<func> to yes / no / "future OS version" +dnl - ac_cv_func_<func> to yes / no / no +dnl The first variable allows to distinguish all three cases. +dnl The second variable is set, so that an invocation +dnl gl_CHECK_FUNCS_MACOS([func], [[#include <foo.h>]]) +dnl can be used as a drop-in replacement for +dnl AC_CHECK_FUNCS([func]). +AC_DEFUN([gl_CHECK_FUNCS_MACOS], +[ + AC_REQUIRE([AC_CANONICAL_HOST]) + AC_REQUIRE([gl_PREPARE_CHECK_FUNCS_MACOS]) + AC_CACHE_CHECK([for [$1]], + [[gl_cv_onwards_func_][$1]], + [gl_SILENT([ + case "$host_os" in + gl_CHECK_FUNCS_CASE_FOR_MACOS([$1], [$2]) + gl_CHECK_FUNCS_DEFAULT_CASE([$1]) + esac + ]) + ]) + gl_CHECK_FUNCS_SET_RESULTS([$1]) +]) + +dnl gl_CHECK_FUNCS_ANDROID_MACOS([func], [[#include <foo.h>]]) +dnl is like AC_CHECK_FUNCS([func]), taking into account a portability problem +dnl on Android and on macOS. +dnl It is the combination of gl_CHECK_FUNCS_ANDROID and gl_CHECK_FUNCS_MACOS. +AC_DEFUN([gl_CHECK_FUNCS_ANDROID_MACOS], +[ + AC_REQUIRE([AC_CANONICAL_HOST]) + AC_REQUIRE([gl_PREPARE_CHECK_FUNCS_MACOS]) + AC_CACHE_CHECK([for [$1]], + [[gl_cv_onwards_func_][$1]], + [gl_SILENT([ + case "$host_os" in + gl_CHECK_FUNCS_CASE_FOR_ANDROID([$1], [$2]) + gl_CHECK_FUNCS_CASE_FOR_MACOS([$1], [$2]) + gl_CHECK_FUNCS_DEFAULT_CASE([$1]) + esac + ]) + ]) + gl_CHECK_FUNCS_SET_RESULTS([$1]) +]) + dnl Expands to some code for use in .c programs that, on native Windows, defines dnl the Microsoft deprecated alias function names to the underscore-prefixed dnl actual function names. With this macro, these function names are available diff --git a/m4/gnulib-comp.m4 b/m4/gnulib-comp.m4 index 5e18abd..2afa046 100644 --- a/m4/gnulib-comp.m4 +++ b/m4/gnulib-comp.m4 @@ -1,5 +1,5 @@ # DO NOT EDIT! GENERATED AUTOMATICALLY! -# Copyright (C) 2002-2022 Free Software Foundation, Inc. +# Copyright (C) 2002-2023 Free Software Foundation, Inc. # # This file is free software; you can redistribute it and/or modify # it under the terms of the GNU General Public License as published by @@ -45,6 +45,8 @@ AC_DEFUN([gl_EARLY], # Code from module absolute-header: # Code from module accept: # Code from module accept-tests: + # Code from module alignasof: + # Code from module alignasof-tests: # Code from module alloca: # Code from module alloca-opt: # Code from module alloca-opt-tests: @@ -54,6 +56,8 @@ AC_DEFUN([gl_EARLY], # Code from module arpa_inet: # Code from module arpa_inet-tests: # Code from module assert: + # Code from module assert-h: + # Code from module assert-h-tests: # Code from module assure: # Code from module attribute: # Code from module basename-lgpl: @@ -69,6 +73,8 @@ AC_DEFUN([gl_EARLY], # Code from module c-strcase: # Code from module c-strcase-tests: # Code from module c-strcaseeq: + # Code from module c-strcasestr: + # Code from module c-strcasestr-tests: # Code from module c99: # Code from module calloc-gnu: # Code from module calloc-gnu-tests: @@ -95,14 +101,14 @@ AC_DEFUN([gl_EARLY], # Code from module double-slash-root: # Code from module dup2: # Code from module dup2-tests: - # Code from module dynarray: - # Code from module dynarray-tests: # Code from module eloop-threshold: # Code from module environ: # Code from module environ-tests: # Code from module errno: # Code from module errno-tests: # Code from module error: + # Code from module error-h: + # Code from module error-tests: # Code from module exitfail: # Code from module extensions: # Code from module extern-inline: @@ -150,6 +156,10 @@ AC_DEFUN([gl_EARLY], # Code from module gettimeofday-tests: # Code from module git-version-gen: # Code from module gitlog-to-changelog: + # Code from module glibc-internal/dynarray: + # Code from module glibc-internal/dynarray-tests: + # Code from module glibc-internal/scratch_buffer: + # Code from module glibc-internal/scratch_buffer-tests: # Code from module gnu-web-doc-update: # Code from module gnumakefile: # Code from module gnupload: @@ -175,7 +185,6 @@ AC_DEFUN([gl_EARLY], # Code from module langinfo-tests: # Code from module largefile: AC_REQUIRE([AC_SYS_LARGEFILE]) - AC_REQUIRE([gl_YEAR2038_EARLY]) # Code from module lib-ignore: # Code from module libc-config: # Code from module limits-h: @@ -209,6 +218,8 @@ AC_DEFUN([gl_EARLY], # Code from module mbsinit: # Code from module mbsinit-tests: # Code from module mbtowc: + # Code from module memchr: + # Code from module memchr-tests: # Code from module mempcpy: # Code from module minmax: # Code from module mkdir: @@ -272,8 +283,6 @@ AC_DEFUN([gl_EARLY], # Code from module sched: # Code from module sched-tests: # Code from module sched_yield: - # Code from module scratch_buffer: - # Code from module scratch_buffer-tests: # Code from module select: # Code from module select-tests: # Code from module setenv: @@ -305,8 +314,6 @@ AC_DEFUN([gl_EARLY], # Code from module stat-time: # Code from module stat-time-tests: # Code from module std-gnu11: - # Code from module stdalign: - # Code from module stdalign-tests: # Code from module stdarg: dnl Some compilers (e.g., AIX 5.3 cc) need to be in c99 mode dnl for the builtin va_copy to work. gl_PROG_CC_C99 arranges for this. @@ -314,6 +321,8 @@ AC_DEFUN([gl_EARLY], # Code from module stdarg-tests: # Code from module stdbool: # Code from module stdbool-tests: + # Code from module stdckdint: + # Code from module stdckdint-tests: # Code from module stddef: # Code from module stddef-tests: # Code from module stdint: @@ -362,6 +371,8 @@ AC_DEFUN([gl_EARLY], # Code from module threadlib: gl_THREADLIB_EARLY # Code from module time: + # Code from module time-h: + # Code from module time-h-tests: # Code from module time-tests: # Code from module unistd: # Code from module unistd-tests: @@ -428,6 +439,7 @@ AC_DEFUN([gl_INIT], gl_COMMON gl_source_base='lib' gl_source_base_prefix= + gl_ALIGNASOF changequote(,)dnl LTALLOCA=`echo "$ALLOCA" | sed -e 's/\.[^.]* /.lo /g;s/\.[^.]*$/.lo/'` changequote([, ])dnl @@ -436,6 +448,9 @@ AC_SUBST([LTALLOCA]) gl_CONDITIONAL_HEADER([alloca.h]) AC_PROG_MKDIR_P gl_ASSERT + gl_ASSERT_H + gl_CONDITIONAL_HEADER([assert.h]) + AC_PROG_MKDIR_P gl_FUNC_BTOWC gl_CONDITIONAL([GL_COND_OBJ_BTOWC], [test $HAVE_BTOWC = 0 || test $REPLACE_BTOWC = 1]) @@ -467,7 +482,7 @@ AC_SUBST([LTALLOCA]) gl_UNISTD_MODULE_INDICATOR([close]) gl_MODULE_INDICATOR([close-stream]) gl_CONFIG_H - gl_CONFIGMAKE_PREP + gl_CONFIGMAKE AC_PROG_MKDIR_P gl_MODULE_INDICATOR([dirname]) gl_DOUBLE_SLASH_ROOT @@ -477,18 +492,21 @@ AC_SUBST([LTALLOCA]) gl_PREREQ_DUP2 ]) gl_UNISTD_MODULE_INDICATOR([dup2]) - AC_PROG_MKDIR_P gl_HEADER_ERRNO_H gl_CONDITIONAL_HEADER([errno.h]) AC_PROG_MKDIR_P + AC_REQUIRE([gl_ERROR_H]) gl_ERROR - gl_CONDITIONAL([GL_COND_OBJ_ERROR], [test "$ac_cv_lib_error_at_line" = no]) + gl_CONDITIONAL([GL_COND_OBJ_ERROR], [test $GL_GENERATE_ERROR_H = true]) AM_COND_IF([GL_COND_OBJ_ERROR], [ gl_PREREQ_ERROR ]) m4_ifdef([AM_XGETTEXT_OPTION], [AM_][XGETTEXT_OPTION([--flag=error:3:c-format]) AM_][XGETTEXT_OPTION([--flag=error_at_line:5:c-format])]) + gl_ERROR_H + gl_CONDITIONAL_HEADER([error.h]) + AC_PROG_MKDIR_P AC_REQUIRE([gl_EXTERN_INLINE]) gl_FUNC_FCNTL gl_CONDITIONAL([GL_COND_OBJ_FCNTL], @@ -545,6 +563,12 @@ AC_SUBST([LTALLOCA]) ]) gl_UNISTD_MODULE_INDICATOR([getopt-posix]) gl_FUNC_GETPROGNAME + gl_CONDITIONAL([GL_COND_OBJ_GETPROGNAME], + [test $HAVE_GETPROGNAME = 0 || test $REPLACE_GETPROGNAME = 1]) + AM_COND_IF([GL_COND_OBJ_GETPROGNAME], [ + gl_PREREQ_GETPROGNAME + ]) + gl_STDLIB_MODULE_INDICATOR([getprogname]) AC_REQUIRE([AC_CANONICAL_HOST]) gl_FUNC_GETRANDOM gl_CONDITIONAL([GL_COND_OBJ_GETRANDOM], @@ -552,6 +576,8 @@ AC_SUBST([LTALLOCA]) gl_SYS_RANDOM_MODULE_INDICATOR([getrandom]) AC_SUBST([LIBINTL]) AC_SUBST([LTLIBINTL]) + AC_PROG_MKDIR_P + AC_PROG_MKDIR_P # Autoconf 2.61a.99 and earlier don't support linking a file only # in VPATH builds. But since GNUmakefile is for maintainer use # only, it does not matter if we skip the link with older autoconf. @@ -563,7 +589,10 @@ AC_SUBST([LTALLOCA]) [AC_CONFIG_LINKS([$GNUmakefile:$GNUmakefile], [], [GNUmakefile=$GNUmakefile])]) AC_REQUIRE([gl_FUNC_SETLOCALE_NULL]) - LIB_HARD_LOCALE="$LIB_SETLOCALE_NULL" + HARD_LOCALE_LIB="$SETLOCALE_NULL_LIB" + AC_SUBST([HARD_LOCALE_LIB]) + dnl For backward compatibility. + LIB_HARD_LOCALE="$HARD_LOCALE_LIB" AC_SUBST([LIB_HARD_LOCALE]) gl_INTTYPES_H gl_INTTYPES_INCOMPLETE @@ -644,7 +673,8 @@ AC_SUBST([LTALLOCA]) ]) gl_STDLIB_MODULE_INDICATOR([mbtowc]) gl_FUNC_MEMPCPY - gl_CONDITIONAL([GL_COND_OBJ_MEMPCPY], [test $HAVE_MEMPCPY = 0]) + gl_CONDITIONAL([GL_COND_OBJ_MEMPCPY], + [test $HAVE_MEMPCPY = 0 || test $REPLACE_MEMPCPY = 1]) AM_COND_IF([GL_COND_OBJ_MEMPCPY], [ gl_PREREQ_MEMPCPY ]) @@ -737,7 +767,6 @@ AC_SUBST([LTALLOCA]) ]) gl_STDLIB_MODULE_INDICATOR([rpmatch]) gl_PREREQ_SAFE_READ - AC_PROG_MKDIR_P gl_FUNC_SETLOCALE_NULL gl_CONDITIONAL([GL_COND_OBJ_SETLOCALE_LOCK], [test $SETLOCALE_NULL_ALL_MTSAFE = 0 || test $SETLOCALE_NULL_ONE_MTSAFE = 0]) @@ -763,14 +792,17 @@ AC_SUBST([LTALLOCA]) gl_SYS_STAT_MODULE_INDICATOR([stat]) gl_STAT_TIME gl_STAT_BIRTHTIME - gl_STDALIGN_H - gl_CONDITIONAL_HEADER([stdalign.h]) - AC_PROG_MKDIR_P gl_STDARG_H gl_CONDITIONAL_HEADER([stdarg.h]) AC_PROG_MKDIR_P - gl_STDBOOL_H - gl_CONDITIONAL_HEADER([stdbool.h]) + gl_C_BOOL + AC_CHECK_HEADERS_ONCE([stdckdint.h]) + if test $ac_cv_header_stdckdint_h = yes; then + GL_GENERATE_STDCKDINT_H=false + else + GL_GENERATE_STDCKDINT_H=true + fi + gl_CONDITIONAL_HEADER([stdckdint.h]) AC_PROG_MKDIR_P gl_STDDEF_H gl_STDDEF_H_REQUIRE_DEFAULTS @@ -1017,7 +1049,7 @@ changequote([, ])dnl gl_SYS_TIME_MODULE_INDICATOR([gettimeofday]) gl_MUSL_LIBC dnl Distinguish OpenBSD >= 6.2 from OpenBSD < 6.2. - AC_CHECK_FUNCS_ONCE([duplocale]) + gl_CHECK_FUNCS_ANDROID([duplocale], [[#include <locale.h>]]) gl_FUNC_INET_PTON gl_CONDITIONAL([GL_COND_OBJ_INET_PTON], [test $HAVE_INET_PTON = 0 || test $REPLACE_INET_PTON = 1]) @@ -1037,10 +1069,10 @@ changequote([, ])dnl AC_REQUIRE([gl_SYS_SOCKET_H]) gl_CONDITIONAL([GL_COND_OBJ_LISTEN], [test "$ac_cv_header_winsock2_h" = yes]) gl_SYS_SOCKET_MODULE_INDICATOR([listen]) - AC_CHECK_FUNCS_ONCE([newlocale]) + gl_CHECK_FUNCS_ANDROID([newlocale], [[#include <locale.h>]]) gl_LOCALENAME gl_LOCALE_MODULE_INDICATOR([localename]) - AC_CHECK_FUNCS_ONCE([newlocale]) + gl_CHECK_FUNCS_ANDROID([newlocale], [[#include <locale.h>]]) AC_CHECK_HEADERS_ONCE([semaphore.h]) AC_CHECK_DECLS_ONCE([alarm]) AC_REQUIRE([gl_SEMAPHORE]) @@ -1049,6 +1081,16 @@ changequote([, ])dnl gt_LOCALE_JA gt_LOCALE_ZH_CN gt_LOCALE_FR_UTF8 + gl_FUNC_MEMCHR + gl_CONDITIONAL([GL_COND_OBJ_MEMCHR], [test $REPLACE_MEMCHR = 1]) + AM_COND_IF([GL_COND_OBJ_MEMCHR], [ + gl_PREREQ_MEMCHR + ]) + gl_STRING_MODULE_INDICATOR([memchr]) + dnl Check for prerequisites for memory fence checks. + gl_FUNC_MMAP_ANON + AC_CHECK_HEADERS_ONCE([sys/mman.h]) + AC_CHECK_FUNCS_ONCE([mprotect]) gl_FUNC_NANOSLEEP gl_CONDITIONAL([GL_COND_OBJ_NANOSLEEP], [test $HAVE_NANOSLEEP = 0 || test $REPLACE_NANOSLEEP = 1]) @@ -1059,6 +1101,7 @@ changequote([, ])dnl AC_PROG_MKDIR_P gt_LOCALE_FR gt_LOCALE_FR_UTF8 + gt_FUNC_USELOCALE gl_FUNC_PERROR gl_CONDITIONAL([GL_COND_OBJ_PERROR], [test $REPLACE_PERROR = 1]) gl_STRING_MODULE_INDICATOR([perror]) @@ -1193,6 +1236,12 @@ changequote([, ])dnl AC_PROG_MKDIR_P gl_THREAD AC_CHECK_HEADERS([sys/single_threaded.h]) + gl_FUNC_TIME + gl_CONDITIONAL([GL_COND_OBJ_TIME], [test $REPLACE_TIME = 1]) + AM_COND_IF([GL_COND_OBJ_TIME], [ + gl_PREREQ_TIME + ]) + gl_TIME_MODULE_INDICATOR([time]) gl_UNLINKDIR gl_FUNC_UNSETENV gl_CONDITIONAL([GL_COND_OBJ_UNSETENV], @@ -1356,6 +1405,7 @@ AC_DEFUN([gl_FILE_LIST], [ lib/arg-nonnull.h lib/argmatch.c lib/argmatch.h + lib/assert.in.h lib/assure.h lib/attribute.h lib/basename-lgpl.c @@ -1387,7 +1437,7 @@ AC_DEFUN([gl_FILE_LIST], [ lib/eloop-threshold.h lib/errno.in.h lib/error.c - lib/error.h + lib/error.in.h lib/exitfail.c lib/exitfail.h lib/fcntl.c @@ -1422,6 +1472,7 @@ AC_DEFUN([gl_FILE_LIST], [ lib/ialloc.c lib/ialloc.h lib/idx.h + lib/intprops-internal.h lib/intprops.h lib/inttypes.in.h lib/langinfo.in.h @@ -1446,7 +1497,6 @@ AC_DEFUN([gl_FILE_LIST], [ lib/malloc/dynarray_resize.c lib/malloc/dynarray_resize_clear.c lib/malloc/scratch_buffer.h - lib/malloc/scratch_buffer_dupfree.c lib/malloc/scratch_buffer_grow.c lib/malloc/scratch_buffer_grow_preserve.c lib/malloc/scratch_buffer_set_array_size.c @@ -1502,9 +1552,8 @@ AC_DEFUN([gl_FILE_LIST], [ lib/stat-w32.c lib/stat-w32.h lib/stat.c - lib/stdalign.in.h lib/stdarg.in.h - lib/stdbool.in.h + lib/stdckdint.in.h lib/stddef.in.h lib/stdint.in.h lib/stdio-impl.h @@ -1567,8 +1616,11 @@ AC_DEFUN([gl_FILE_LIST], [ m4/alloca.m4 m4/arpa_inet_h.m4 m4/assert.m4 + m4/assert_h.m4 m4/btowc.m4 + m4/build-to-host.m4 m4/builtin-expect.m4 + m4/c-bool.m4 m4/calloc.m4 m4/canonicalize.m4 m4/clock_time.m4 @@ -1583,6 +1635,7 @@ AC_DEFUN([gl_FILE_LIST], [ m4/environ.m4 m4/errno_h.m4 m4/error.m4 + m4/error_h.m4 m4/extensions.m4 m4/extern-inline.m4 m4/fcntl-o.m4 @@ -1634,6 +1687,7 @@ AC_DEFUN([gl_FILE_LIST], [ m4/mbsinit.m4 m4/mbstate_t.m4 m4/mbtowc.m4 + m4/memchr.m4 m4/mempcpy.m4 m4/minmax.m4 m4/mkdir.m4 @@ -1694,7 +1748,6 @@ AC_DEFUN([gl_FILE_LIST], [ m4/std-gnu11.m4 m4/stdalign.m4 m4/stdarg.m4 - m4/stdbool.m4 m4/stddef_h.m4 m4/stdint.m4 m4/stdio_h.m4 @@ -1717,6 +1770,7 @@ AC_DEFUN([gl_FILE_LIST], [ m4/tempname.m4 m4/thread.m4 m4/threadlib.m4 + m4/time.m4 m4/time_h.m4 m4/unistd_h.m4 m4/unlink.m4 @@ -1736,7 +1790,6 @@ AC_DEFUN([gl_FILE_LIST], [ m4/wint_t.m4 m4/xalloc.m4 m4/xstrtol.m4 - m4/year2038.m4 m4/yield.m4 m4/zzgnulib.m4 tests/atomic-int-gnulib.h @@ -1747,9 +1800,11 @@ AC_DEFUN([gl_FILE_LIST], [ tests/null-ptr.h tests/signature.h tests/test-accept.c + tests/test-alignasof.c tests/test-alloca-opt.c tests/test-argmatch.c tests/test-arpa_inet.c + tests/test-assert.c tests/test-binary-io.c tests/test-binary-io.sh tests/test-bind.c @@ -1759,6 +1814,7 @@ AC_DEFUN([gl_FILE_LIST], [ tests/test-c-ctype.c tests/test-c-strcase.sh tests/test-c-strcasecmp.c + tests/test-c-strcasestr.c tests/test-c-strncasecmp.c tests/test-calloc-gnu.c tests/test-canonicalize-lgpl.c @@ -1771,6 +1827,8 @@ AC_DEFUN([gl_FILE_LIST], [ tests/test-dynarray.c tests/test-environ.c tests/test-errno.c + tests/test-error.c + tests/test-error.sh tests/test-fcntl-h.c tests/test-fcntl.c tests/test-fdopen.c @@ -1833,13 +1891,16 @@ AC_DEFUN([gl_FILE_LIST], [ tests/test-mbrtowc5.sh tests/test-mbsinit.c tests/test-mbsinit.sh + tests/test-memchr.c tests/test-mkdir.c tests/test-mkdir.h tests/test-nanosleep.c tests/test-netinet_in.c tests/test-nl_langinfo-mt.c - tests/test-nl_langinfo.c - tests/test-nl_langinfo.sh + tests/test-nl_langinfo1.c + tests/test-nl_langinfo1.sh + tests/test-nl_langinfo2.c + tests/test-nl_langinfo2.sh tests/test-once.c tests/test-open.c tests/test-open.h @@ -1889,8 +1950,8 @@ AC_DEFUN([gl_FILE_LIST], [ tests/test-stat-time.c tests/test-stat.c tests/test-stat.h - tests/test-stdalign.c tests/test-stdbool.c + tests/test-stdckdint.c tests/test-stddef.c tests/test-stdint.c tests/test-stdio.c @@ -1913,6 +1974,7 @@ AC_DEFUN([gl_FILE_LIST], [ tests/test-sys_wait.h tests/test-thread_create.c tests/test-thread_self.c + tests/test-time-h.c tests/test-time.c tests/test-unistd.c tests/test-unlink.c @@ -1956,6 +2018,8 @@ AC_DEFUN([gl_FILE_LIST], [ tests=lib/binary-io.h tests=lib/bind.c tests=lib/c++defs.h + tests=lib/c-strcasestr.c + tests=lib/c-strcasestr.h tests=lib/connect.c tests=lib/ctype.in.h tests=lib/fdopen.c @@ -1976,6 +2040,8 @@ AC_DEFUN([gl_FILE_LIST], [ tests=lib/localename-table.h tests=lib/localename.c tests=lib/localename.h + tests=lib/memchr.c + tests=lib/memchr.valgrind tests=lib/nanosleep.c tests=lib/netinet_in.in.h tests=lib/perror.c @@ -2001,6 +2067,7 @@ AC_DEFUN([gl_FILE_LIST], [ tests=lib/socket.c tests=lib/sockets.c tests=lib/sockets.h + tests=lib/str-two-way.h tests=lib/strerror_r.c tests=lib/symlink.c tests=lib/sys_ioctl.in.h @@ -2010,6 +2077,7 @@ AC_DEFUN([gl_FILE_LIST], [ tests=lib/sys_time.in.h tests=lib/sys_uio.in.h tests=lib/thread-optim.h + tests=lib/time.c tests=lib/unlinkdir.c tests=lib/unlinkdir.h tests=lib/unsetenv.c diff --git a/m4/include_next.m4 b/m4/include_next.m4 index a9247f6..9f19215 100644 --- a/m4/include_next.m4 +++ b/m4/include_next.m4 @@ -1,5 +1,5 @@ # include_next.m4 serial 26 -dnl Copyright (C) 2006-2022 Free Software Foundation, Inc. +dnl Copyright (C) 2006-2023 Free Software Foundation, Inc. dnl This file is free software; the Free Software Foundation dnl gives unlimited permission to copy and/or distribute it, dnl with or without modifications, as long as this notice is preserved. diff --git a/m4/inet_pton.m4 b/m4/inet_pton.m4 index 9507296..94695c1 100644 --- a/m4/inet_pton.m4 +++ b/m4/inet_pton.m4 @@ -1,5 +1,5 @@ # inet_pton.m4 serial 19 -dnl Copyright (C) 2006, 2008-2022 Free Software Foundation, Inc. +dnl Copyright (C) 2006, 2008-2023 Free Software Foundation, Inc. dnl This file is free software; the Free Software Foundation dnl gives unlimited permission to copy and/or distribute it, dnl with or without modifications, as long as this notice is preserved. diff --git a/m4/intl-thread-locale.m4 b/m4/intl-thread-locale.m4 index d5d5b26..90bc3b1 100644 --- a/m4/intl-thread-locale.m4 +++ b/m4/intl-thread-locale.m4 @@ -1,5 +1,5 @@ -# intl-thread-locale.m4 serial 9 -dnl Copyright (C) 2015-2022 Free Software Foundation, Inc. +# intl-thread-locale.m4 serial 10 +dnl Copyright (C) 2015-2023 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. @@ -171,7 +171,7 @@ AC_DEFUN([gt_FUNC_USELOCALE], dnl Persuade glibc and Solaris <locale.h> to define 'locale_t'. AC_REQUIRE([AC_USE_SYSTEM_EXTENSIONS]) - AC_CHECK_FUNCS_ONCE([uselocale]) + gl_CHECK_FUNCS_ANDROID([uselocale], [[#include <locale.h>]]) dnl On AIX 7.2, the uselocale() function is not documented and leads to dnl crashes in subsequent setlocale() invocations. diff --git a/m4/intlmacosx.m4 b/m4/intlmacosx.m4 index ecc88d6..81eefd7 100644 --- a/m4/intlmacosx.m4 +++ b/m4/intlmacosx.m4 @@ -1,5 +1,5 @@ # intlmacosx.m4 serial 8 (gettext-0.20.2) -dnl Copyright (C) 2004-2014, 2016, 2019-2022 Free Software Foundation, Inc. +dnl Copyright (C) 2004-2014, 2016, 2019-2023 Free Software Foundation, Inc. dnl This file is free software; the Free Software Foundation dnl gives unlimited permission to copy and/or distribute it, dnl with or without modifications, as long as this notice is preserved. diff --git a/m4/inttypes.m4 b/m4/inttypes.m4 index df25a21..e7efbe9 100644 --- a/m4/inttypes.m4 +++ b/m4/inttypes.m4 @@ -1,5 +1,5 @@ -# inttypes.m4 serial 36 -dnl Copyright (C) 2006-2022 Free Software Foundation, Inc. +# inttypes.m4 serial 37 +dnl Copyright (C) 2006-2023 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. @@ -170,6 +170,10 @@ AC_DEFUN([gl_INTTYPES_H_DEFAULTS], HAVE_DECL_STRTOIMAX=1; AC_SUBST([HAVE_DECL_STRTOIMAX]) HAVE_DECL_STRTOUMAX=1; AC_SUBST([HAVE_DECL_STRTOUMAX]) HAVE_IMAXDIV_T=1; AC_SUBST([HAVE_IMAXDIV_T]) + HAVE_IMAXABS=1; AC_SUBST([HAVE_IMAXABS]) + HAVE_IMAXDIV=1; AC_SUBST([HAVE_IMAXDIV]) + REPLACE_IMAXABS=0; AC_SUBST([REPLACE_IMAXABS]) + REPLACE_IMAXDIV=0; AC_SUBST([REPLACE_IMAXDIV]) REPLACE_STRTOIMAX=0; AC_SUBST([REPLACE_STRTOIMAX]) REPLACE_STRTOUMAX=0; AC_SUBST([REPLACE_STRTOUMAX]) INT32_MAX_LT_INTMAX_MAX=1; AC_SUBST([INT32_MAX_LT_INTMAX_MAX]) diff --git a/m4/ioctl.m4 b/m4/ioctl.m4 index 7c72134..83036c3 100644 --- a/m4/ioctl.m4 +++ b/m4/ioctl.m4 @@ -1,5 +1,5 @@ # ioctl.m4 serial 6 -dnl Copyright (C) 2008-2022 Free Software Foundation, Inc. +dnl Copyright (C) 2008-2023 Free Software Foundation, Inc. dnl This file is free software; the Free Software Foundation dnl gives unlimited permission to copy and/or distribute it, dnl with or without modifications, as long as this notice is preserved. diff --git a/m4/isblank.m4 b/m4/isblank.m4 index 1d0ed6c..809eab4 100644 --- a/m4/isblank.m4 +++ b/m4/isblank.m4 @@ -1,5 +1,5 @@ # isblank.m4 serial 3 -dnl Copyright (C) 2009-2022 Free Software Foundation, Inc. +dnl Copyright (C) 2009-2023 Free Software Foundation, Inc. dnl This file is free software; the Free Software Foundation dnl gives unlimited permission to copy and/or distribute it, dnl with or without modifications, as long as this notice is preserved. diff --git a/m4/langinfo_h.m4 b/m4/langinfo_h.m4 index 563c8c4..b17a526 100644 --- a/m4/langinfo_h.m4 +++ b/m4/langinfo_h.m4 @@ -1,5 +1,5 @@ # langinfo_h.m4 serial 12 -dnl Copyright (C) 2009-2022 Free Software Foundation, Inc. +dnl Copyright (C) 2009-2023 Free Software Foundation, Inc. dnl This file is free software; the Free Software Foundation dnl gives unlimited permission to copy and/or distribute it, dnl with or without modifications, as long as this notice is preserved. diff --git a/m4/largefile.m4 b/m4/largefile.m4 index 3e8b5e3..7fb81b8 100644 --- a/m4/largefile.m4 +++ b/m4/largefile.m4 @@ -1,7 +1,7 @@ # Enable large files on systems where this is not the default. # Enable support for files on Linux file systems with 64-bit inode numbers. -# Copyright 1992-1996, 1998-2022 Free Software Foundation, Inc. +# Copyright 1992-1996, 1998-2023 Free Software Foundation, Inc. # This file is free software; the Free Software Foundation # gives unlimited permission to copy and/or distribute it, # with or without modifications, as long as this notice is preserved. @@ -10,8 +10,9 @@ # It does not set _LARGEFILE_SOURCE=1 on HP-UX/ia64 32-bit, although this # setting of _LARGEFILE_SOURCE is needed so that <stdio.h> declares fseeko # and ftello in C++ mode as well. +# Fixed in Autoconf 2.72, which has AC_SYS_YEAR2038. AC_DEFUN([gl_SET_LARGEFILE_SOURCE], -[ + m4_ifndef([AC_SYS_YEAR2038], [[ AC_REQUIRE([AC_CANONICAL_HOST]) AC_FUNC_FSEEKO case "$host_os" in @@ -20,10 +21,10 @@ AC_DEFUN([gl_SET_LARGEFILE_SOURCE], [Define to 1 to make fseeko visible on some hosts (e.g. glibc 2.2).]) ;; esac -]) + ]]) +) -# Work around a problem in Autoconf through at least 2.71 on glibc 2.34+ -# with _TIME_BITS. Also, work around a problem in autoconf <= 2.69: +# Work around a problem in autoconf <= 2.69: # AC_SYS_LARGEFILE does not configure for large inodes on Mac OS X 10.5, # or configures them incorrectly in some cases. m4_version_prereq([2.70], [], [ @@ -43,33 +44,258 @@ m4_define([_AC_SYS_LARGEFILE_TEST_INCLUDES], ]) ])# m4_version_prereq 2.70 +# Support AC_SYS_YEAR2038, even if Autoconf 2.71 or earlier. +# This code is taken from Autoconf master. +m4_ifndef([AC_SYS_YEAR2038], [ + +# _AC_SYS_YEAR2038_TEST_CODE +# -------------------------- +# C code used to probe for time_t that can represent time points more +# than 2**31 - 1 seconds after the epoch. With the usual Unix epoch, +# these correspond to dates after 2038-01-18 22:14:07 +0000 (Gregorian), +# hence the name. +AC_DEFUN([_AC_SYS_YEAR2038_TEST_CODE], +[[ + #include <time.h> + /* 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]; +]]) + +# _AC_SYS_YEAR2038_OPTIONS +# ------------------------ +# List of known ways to enable support for large time_t. If you change +# this list you probably also need to change the AS_CASE at the end of +# _AC_SYS_YEAR2038_PROBE. +m4_define([_AC_SYS_YEAR2038_OPTIONS], m4_normalize( + ["none needed"] dnl 64-bit and newer 32-bit Unix + ["-D_TIME_BITS=64"] dnl glibc 2.34 with some 32-bit ABIs + ["-D__MINGW_USE_VC2005_COMPAT"] dnl 32-bit MinGW + ["-U_USE_32_BIT_TIME_T -D__MINGW_USE_VC2005_COMPAT"] + dnl 32-bit MinGW (misconfiguration) +)) + +# _AC_SYS_YEAR2038_PROBE([IF-NOT-DETECTED]) +# ----------------------------------------- +# Subroutine of AC_SYS_YEAR2038. Probe for time_t that can represent +# time points more than 2**31 - 1 seconds after the epoch (dates after +# 2038-01-18, see above) and set the cache variable ac_cv_sys_year2038_opts +# to one of the values in the _AC_SYS_YEAR2038_OPTIONS list, or to +# "support not detected" if none of them worked. Then, set compilation +# options and #defines as necessary to enable large time_t support. +# +# Note that we do not test whether mktime, localtime, etc. handle +# large values of time_t correctly, as that would require use of +# AC_TRY_RUN. Note also that some systems only support large time_t +# together with large off_t. +# +# If support is not detected, the behavior depends on which of the +# top-level AC_SYS_YEAR2038 macros was used (see below). +# +# If you change this macro you may also need to change +# _AC_SYS_YEAR2038_OPTIONS. +AC_DEFUN([_AC_SYS_YEAR2038_PROBE], +[AC_CACHE_CHECK([for $CC option to enable timestamps after Jan 2038], + [ac_cv_sys_year2038_opts], + [ac_save_CPPFLAGS="$CPPFLAGS" + ac_opt_found=no + for ac_opt in _AC_SYS_YEAR2038_OPTIONS; do + AS_IF([test x"$ac_opt" != x"none needed"], + [CPPFLAGS="$ac_save_CPPFLAGS $ac_opt"]) + AC_COMPILE_IFELSE([AC_LANG_PROGRAM([_AC_SYS_YEAR2038_TEST_CODE])], + [ac_cv_sys_year2038_opts="$ac_opt" + ac_opt_found=yes]) + test $ac_opt_found = no || break + done + CPPFLAGS="$ac_save_CPPFLAGS" + test $ac_opt_found = yes || ac_cv_sys_year2038_opts="support not detected"]) + +ac_have_year2038=yes +AS_CASE([$ac_cv_sys_year2038_opts], + ["none needed"], [], + ["support not detected"], + [ac_have_year2038=no + AS_CASE([$enable_year2038], + [yes], + [# If we're not cross compiling and 'touch' works with a large + # timestamp, then we can presume the system supports wider time_t + # *somehow* and we just weren't able to detect it. One common + # case that we deliberately *don't* probe for is a system that + # supports both 32- and 64-bit ABIs but only the 64-bit ABI offers + # wide time_t. (It would be inappropriate for us to override an + # intentional use of -m32.) Error out, demanding use of + # --disable-year2038 if this is intentional. + AS_IF([test $cross_compiling = no], + [AS_IF([TZ=UTC0 touch -t 210602070628.15 conftest.time 2>/dev/null], + [AS_CASE([`TZ=UTC0 LC_ALL=C ls -l conftest.time 2>/dev/null`], + [*'Feb 7 2106'* | *'Feb 7 17:10'*], + [AC_MSG_FAILURE(m4_text_wrap( + [this system appears to support timestamps after January 2038, + but no mechanism for enabling wide 'time_t' was detected. + Did you mean to build a 64-bit binary? (e.g. 'CC="${CC} -m64"'.) + To proceed with 32-bit time_t, configure with '--disable-year2038'.], + [], [], [55]))])])])])], + + ["-D_TIME_BITS=64"], + [AC_DEFINE([_TIME_BITS], [64], + [Number of bits in time_t, on hosts where this is settable.])], + + ["-D__MINGW_USE_VC2005_COMPAT=1"], + [AC_DEFINE([__MINGW_USE_VC2005_COMPAT], [1], + [Define to 1 on platforms where this makes time_t a 64-bit type.])], -# _AC_SYS_LARGEFILE_MACRO_VALUE(C-MACRO, VALUE, -# CACHE-VAR, -# DESCRIPTION, -# PROLOGUE, [FUNCTION-BODY]) -# -------------------------------------------------------- -m4_define([_AC_SYS_LARGEFILE_MACRO_VALUE], -[AC_CACHE_CHECK([for $1 value needed for large files], [$3], -[while :; do - m4_ifval([$6], [AC_LINK_IFELSE], [AC_COMPILE_IFELSE])( - [AC_LANG_PROGRAM([$5], [$6])], - [$3=no; break]) - m4_ifval([$6], [AC_LINK_IFELSE], [AC_COMPILE_IFELSE])( - [AC_LANG_PROGRAM([#undef $1 -#define $1 $2 -$5], [$6])], - [$3=$2; break]) - $3=unknown - break -done]) -case $$3 in #( - no | unknown) ;; - *) AC_DEFINE_UNQUOTED([$1], [$$3], [$4]);; -esac -rm -rf conftest*[]dnl -])# _AC_SYS_LARGEFILE_MACRO_VALUE + ["-U_USE_32_BIT_TIME_T"*], + [AC_MSG_FAILURE(m4_text_wrap( + [the 'time_t' type is currently forced to be 32-bit. + It will stop working after January 2038. + Remove _USE_32BIT_TIME_T from the compiler flags.], + [], [], [55]))], + + [AC_MSG_ERROR( + [internal error: bad value for \$ac_cv_sys_year2038_opts])]) +]) + +# _AC_SYS_YEAR2038_ENABLE +# ----------------------- +# Subroutine of AC_SYS_YEAR2038 and _AC_SYS_YEAR2038_OPT_IN. +# Depending on which of the YEAR2038 macros was used, add either an +# --enable-year2038, or a --disable-year2038, or no option at all to +# the configure script. Note that this is expanded very late and +# therefore there cannot be any code in the AC_ARG_ENABLE. The +# default value for enable_year2038 is emitted unconditionally +# because the generated code always looks at this variable. +m4_define([_AC_SYS_YEAR2038_ENABLE], +[m4_divert_text([DEFAULTS], + m4_provide_if([AC_SYS_YEAR2038], + [enable_year2038=yes], + [enable_year2038=no]))]dnl +[AC_ARG_ENABLE([year2038], + m4_provide_if([AC_SYS_YEAR2038], + [AS_HELP_STRING([--disable-year2038], + [do not support timestamps after 2038])], + [AS_HELP_STRING([--enable-year2038], + [support timestamps after 2038])]))]) + +# _AC_SYS_YEAR2038_OPT_IN +# ----------------------- +# If the --enable-year2038 option is given to configure, attempt to +# detect and activate support for large time_t on 32-bit systems. +# This macro is automatically invoked by AC_SYS_LARGEFILE when large +# *file* support is detected. It does not AC_REQUIRE AC_SYS_LARGEFILE +# to avoid a dependency loop, and is therefore unsafe to expose as a +# documented macro. +AC_DEFUN([_AC_SYS_YEAR2038_OPT_IN], +[m4_provide_if([_AC_SYS_YEAR2038_PROBE], [], [dnl + AS_IF([test "$enable_year2038" != no], [_AC_SYS_YEAR2038_PROBE]) + AC_CONFIG_COMMANDS_PRE([_AC_SYS_YEAR2038_ENABLE]) +])]) + +# AC_SYS_YEAR2038 +# --------------- +# Attempt to detect and activate support for large time_t. +# On systems where time_t is not always 64 bits, this probe can be +# skipped by passing the --disable-year2038 option to configure. +AC_DEFUN([AC_SYS_YEAR2038], +[AC_REQUIRE([AC_SYS_LARGEFILE])]dnl +[m4_provide_if([_AC_SYS_YEAR2038_PROBE], [], [dnl + AS_IF([test "$enable_year2038" != no], [_AC_SYS_YEAR2038_PROBE]) + AC_CONFIG_COMMANDS_PRE([_AC_SYS_YEAR2038_ENABLE]) +])]) + +# _AC_SYS_LARGEFILE_TEST_CODE +# --------------------------- +# C code used to probe for large file support. +m4_define([_AC_SYS_LARGEFILE_TEST_CODE], +[@%:@include <sys/types.h> + /* 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]];[]dnl +]) + +# _AC_SYS_LARGEFILE_OPTIONS +# ------------------------- +# List of known ways to enable support for large files. If you change +# this list you probably also need to change the AS_CASE at the end of +# _AC_SYS_LARGEFILE_PROBE. +m4_define([_AC_SYS_LARGEFILE_OPTIONS], m4_normalize( + ["none needed"] dnl Most current systems + ["-D_FILE_OFFSET_BITS=64"] dnl X/Open LFS spec + ["-D_LARGE_FILES=1"] dnl AIX (which versions?) + ["-n32"] dnl Irix 6.2 w/ SGI compiler +)) + +# _AC_SYS_LARGEFILE_PROBE +# ----------------------- +# Subroutine of AC_SYS_LARGEFILE. Probe for large file support and set +# the cache variable ac_cv_sys_largefile_opts to one of the values in +# the _AC_SYS_LARGEFILE_OPTIONS list, or to "support not detected" if +# none of the options in that list worked. Then, set compilation +# options and #defines as necessary to enable large file support. +# +# If large file support is not detected, the behavior depends on which of +# the top-level AC_SYS_LARGEFILE macros was used (see below). +# +# If you change this macro you may also need to change +# _AC_SYS_LARGEFILE_OPTIONS. +AC_DEFUN([_AC_SYS_LARGEFILE_PROBE], +[AC_CACHE_CHECK([for $CC option to enable large file support], + [ac_cv_sys_largefile_opts], + [ac_save_CC="$CC" + ac_opt_found=no + for ac_opt in _AC_SYS_LARGEFILE_OPTIONS; do + AS_IF([test x"$ac_opt" != x"none needed"], + [CC="$ac_save_CC $ac_opt"]) + AC_COMPILE_IFELSE([AC_LANG_PROGRAM([_AC_SYS_LARGEFILE_TEST_CODE])], + [ac_cv_sys_largefile_opts="$ac_opt" + ac_opt_found=yes]) + test $ac_opt_found = no || break + done + CC="$ac_save_CC" + test $ac_opt_found = yes || ac_cv_sys_largefile_opts="support not detected"]) + +ac_have_largefile=yes +AS_CASE([$ac_cv_sys_largefile_opts], + ["none needed"], [], + ["support not detected"], + [ac_have_largefile=no], + + ["-D_FILE_OFFSET_BITS=64"], + [AC_DEFINE([_FILE_OFFSET_BITS], [64], + [Number of bits in a file offset, on hosts where this is settable.])], + + ["-D_LARGE_FILES=1"], + [AC_DEFINE([_LARGE_FILES], [1], + [Define to 1 on platforms where this makes off_t a 64-bit type.])], + + ["-n32"], + [CC="$CC -n32"], + + [AC_MSG_ERROR( + [internal error: bad value for \$ac_cv_sys_largefile_opts])]) + +_AC_SYS_YEAR2038_OPT_IN +]) +# _AC_SYS_LARGEFILE_ENABLE +# ------------------------ +# Subroutine of AC_SYS_LARGEFILE. Note that this +# is expanded very late and therefore there cannot be any code in the +# AC_ARG_ENABLE. The default value for enable_largefile is emitted +# unconditionally because the generated shell code always looks at +# this variable. +m4_define([_AC_SYS_LARGEFILE_ENABLE], +[m4_divert_text([DEFAULTS], + enable_largefile=yes)]dnl +[AC_ARG_ENABLE([largefile], + [AS_HELP_STRING([--disable-largefile], [omit support for large files])])]) # AC_SYS_LARGEFILE # ---------------- @@ -80,44 +306,14 @@ rm -rf conftest*[]dnl # Additionally, on Linux file systems with 64-bit inodes a file that happens # to have a 64-bit inode number cannot be accessed by 32-bit applications on # Linux x86/x86_64. This can occur with file systems such as XFS and NFS. +# This macro allows configuration to continue if the system doesn't support +# large files. AC_DEFUN([AC_SYS_LARGEFILE], -[AC_ARG_ENABLE(largefile, - [ --disable-largefile omit support for large files]) -AS_IF([test "$enable_largefile" != no], - [AC_CACHE_CHECK([for special C compiler options needed for large files], - ac_cv_sys_largefile_CC, - [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. - AC_LANG_CONFTEST([AC_LANG_PROGRAM([_AC_SYS_LARGEFILE_TEST_INCLUDES])]) - AC_COMPILE_IFELSE([], [break]) - CC="$CC -n32" - AC_COMPILE_IFELSE([], [ac_cv_sys_largefile_CC=' -n32'; break]) - break - done - CC=$ac_save_CC - rm -f conftest.$ac_ext - fi]) - if test "$ac_cv_sys_largefile_CC" != no; then - CC=$CC$ac_cv_sys_largefile_CC - fi - - _AC_SYS_LARGEFILE_MACRO_VALUE(_FILE_OFFSET_BITS, 64, - ac_cv_sys_file_offset_bits, - [Number of bits in a file offset, on hosts where this is settable.], - [_AC_SYS_LARGEFILE_TEST_INCLUDES]) - AS_CASE([$ac_cv_sys_file_offset_bits], - [unknown], - [_AC_SYS_LARGEFILE_MACRO_VALUE([_LARGE_FILES], [1], - [ac_cv_sys_large_files], - [Define for large files, on AIX-style hosts.], - [_AC_SYS_LARGEFILE_TEST_INCLUDES])], - [64], - [gl_YEAR2038_BODY([])])]) -])# AC_SYS_LARGEFILE +[m4_provide_if([_AC_SYS_LARGEFILE_PROBE], [], [dnl + AS_IF([test "$enable_largefile" != no], [_AC_SYS_LARGEFILE_PROBE]) + AC_CONFIG_COMMANDS_PRE([_AC_SYS_LARGEFILE_ENABLE]) +])]) +])# m4_ifndef AC_SYS_YEAR2038 # Enable large files on systems where this is implemented by Gnulib, not by the # system headers. diff --git a/m4/lcmessage.m4 b/m4/lcmessage.m4 index 1a3eefe..2e56de6 100644 --- a/m4/lcmessage.m4 +++ b/m4/lcmessage.m4 @@ -1,5 +1,5 @@ # lcmessage.m4 serial 8 -dnl Copyright (C) 1995-2002, 2004-2005, 2008-2014, 2016, 2019-2022 Free +dnl Copyright (C) 1995-2002, 2004-2005, 2008-2014, 2016, 2019-2023 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 --git a/m4/lib-ignore.m4 b/m4/lib-ignore.m4 index 4928e67..c4d0217 100644 --- a/m4/lib-ignore.m4 +++ b/m4/lib-ignore.m4 @@ -1,6 +1,6 @@ # If possible, ignore libraries that are not depended on. -dnl Copyright (C) 2006, 2009-2022 Free Software Foundation, Inc. +dnl Copyright (C) 2006, 2009-2023 Free Software Foundation, Inc. dnl This file is free software; the Free Software Foundation dnl gives unlimited permission to copy and/or distribute it, dnl with or without modifications, as long as this notice is preserved. diff --git a/m4/limits-h.m4 b/m4/limits-h.m4 index 5d5a5bf..4f8ce41 100644 --- a/m4/limits-h.m4 +++ b/m4/limits-h.m4 @@ -1,6 +1,6 @@ dnl Check whether limits.h has needed features. -dnl Copyright 2016-2022 Free Software Foundation, Inc. +dnl Copyright 2016-2023 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. @@ -23,6 +23,7 @@ AC_DEFUN_ONCE([gl_LIMITS_H], int wb = WORD_BIT; int ullw = ULLONG_WIDTH; int bw = BOOL_WIDTH; + int bm = BOOL_MAX; ]])], [gl_cv_header_limits_width=yes], [gl_cv_header_limits_width=no])]) diff --git a/m4/localcharset.m4 b/m4/localcharset.m4 index f5dbbd4..15b6b2a 100644 --- a/m4/localcharset.m4 +++ b/m4/localcharset.m4 @@ -1,5 +1,5 @@ # localcharset.m4 serial 8 -dnl Copyright (C) 2002, 2004, 2006, 2009-2022 Free Software Foundation, Inc. +dnl Copyright (C) 2002, 2004, 2006, 2009-2023 Free Software Foundation, Inc. dnl This file is free software; the Free Software Foundation dnl gives unlimited permission to copy and/or distribute it, dnl with or without modifications, as long as this notice is preserved. diff --git a/m4/locale-fr.m4 b/m4/locale-fr.m4 index 3753891..8c41fad 100644 --- a/m4/locale-fr.m4 +++ b/m4/locale-fr.m4 @@ -1,5 +1,5 @@ # locale-fr.m4 serial 20 -dnl Copyright (C) 2003, 2005-2022 Free Software Foundation, Inc. +dnl Copyright (C) 2003, 2005-2023 Free Software Foundation, Inc. dnl This file is free software; the Free Software Foundation dnl gives unlimited permission to copy and/or distribute it, dnl with or without modifications, as long as this notice is preserved. diff --git a/m4/locale-ja.m4 b/m4/locale-ja.m4 index 73a5d1a..2590173 100644 --- a/m4/locale-ja.m4 +++ b/m4/locale-ja.m4 @@ -1,5 +1,5 @@ # locale-ja.m4 serial 15 -dnl Copyright (C) 2003, 2005-2022 Free Software Foundation, Inc. +dnl Copyright (C) 2003, 2005-2023 Free Software Foundation, Inc. dnl This file is free software; the Free Software Foundation dnl gives unlimited permission to copy and/or distribute it, dnl with or without modifications, as long as this notice is preserved. diff --git a/m4/locale-tr.m4 b/m4/locale-tr.m4 index 4b99e67..847fb0d 100644 --- a/m4/locale-tr.m4 +++ b/m4/locale-tr.m4 @@ -1,5 +1,5 @@ # locale-tr.m4 serial 13 -dnl Copyright (C) 2003, 2005-2022 Free Software Foundation, Inc. +dnl Copyright (C) 2003, 2005-2023 Free Software Foundation, Inc. dnl This file is free software; the Free Software Foundation dnl gives unlimited permission to copy and/or distribute it, dnl with or without modifications, as long as this notice is preserved. diff --git a/m4/locale-zh.m4 b/m4/locale-zh.m4 index c997971..b9f9eef 100644 --- a/m4/locale-zh.m4 +++ b/m4/locale-zh.m4 @@ -1,5 +1,5 @@ # locale-zh.m4 serial 15 -dnl Copyright (C) 2003, 2005-2022 Free Software Foundation, Inc. +dnl Copyright (C) 2003, 2005-2023 Free Software Foundation, Inc. dnl This file is free software; the Free Software Foundation dnl gives unlimited permission to copy and/or distribute it, dnl with or without modifications, as long as this notice is preserved. diff --git a/m4/locale_h.m4 b/m4/locale_h.m4 index ca5d0d0..a33a0a4 100644 --- a/m4/locale_h.m4 +++ b/m4/locale_h.m4 @@ -1,5 +1,5 @@ # locale_h.m4 serial 28 -dnl Copyright (C) 2007, 2009-2022 Free Software Foundation, Inc. +dnl Copyright (C) 2007, 2009-2023 Free Software Foundation, Inc. dnl This file is free software; the Free Software Foundation dnl gives unlimited permission to copy and/or distribute it, dnl with or without modifications, as long as this notice is preserved. diff --git a/m4/localeconv.m4 b/m4/localeconv.m4 index 09c1a1a..ae225fe 100644 --- a/m4/localeconv.m4 +++ b/m4/localeconv.m4 @@ -1,5 +1,5 @@ # localeconv.m4 serial 1 -dnl Copyright (C) 2012-2022 Free Software Foundation, Inc. +dnl Copyright (C) 2012-2023 Free Software Foundation, Inc. dnl This file is free software; the Free Software Foundation dnl gives unlimited permission to copy and/or distribute it, dnl with or without modifications, as long as this notice is preserved. diff --git a/m4/localename.m4 b/m4/localename.m4 index e0cf8c5..8c43a13 100644 --- a/m4/localename.m4 +++ b/m4/localename.m4 @@ -1,5 +1,5 @@ -# localename.m4 serial 8 -dnl Copyright (C) 2007, 2009-2022 Free Software Foundation, Inc. +# localename.m4 serial 10 +dnl Copyright (C) 2007, 2009-2023 Free Software Foundation, Inc. dnl This file is free software; the Free Software Foundation dnl gives unlimited permission to copy and/or distribute it, dnl with or without modifications, as long as this notice is preserved. @@ -13,25 +13,39 @@ AC_DEFUN([gl_LOCALENAME], AC_REQUIRE([gt_INTL_MACOSX]) AC_CHECK_HEADERS_ONCE([langinfo.h]) if test $HAVE_LOCALE_T = 1; then - AC_CHECK_FUNCS_ONCE([newlocale duplocale freelocale]) + gl_CHECK_FUNCS_ANDROID([newlocale], [[#include <locale.h>]]) + gl_CHECK_FUNCS_ANDROID([duplocale], [[#include <locale.h>]]) + gl_CHECK_FUNCS_ANDROID([freelocale], [[#include <locale.h>]]) gl_func_newlocale="$ac_cv_func_newlocale" gl_func_duplocale="$ac_cv_func_duplocale" gl_func_freelocale="$ac_cv_func_freelocale" else dnl In 2019, some versions of z/OS lack the locale_t type and have broken dnl newlocale, duplocale, freelocale functions. + gl_cv_onwards_func_newlocale='future OS version' + gl_cv_onwards_func_duplocale='future OS version' + gl_cv_onwards_func_freelocale='future OS version' gl_func_newlocale=no gl_func_duplocale=no gl_func_freelocale=no fi if test $gl_func_newlocale != yes; then HAVE_NEWLOCALE=0 + case "$gl_cv_onwards_func_newlocale" in + future*) REPLACE_NEWLOCALE=1 ;; + esac fi if test $gl_func_duplocale != yes; then HAVE_DUPLOCALE=0 + case "$gl_cv_onwards_func_duplocale" in + future*) REPLACE_DUPLOCALE=1 ;; + esac fi if test $gl_func_freelocale != yes; then HAVE_FREELOCALE=0 + case "$gl_cv_onwards_func_freelocale" in + future*) REPLACE_FREELOCALE=1 ;; + esac fi if test $gt_localename_enhances_locale_funcs = yes; then REPLACE_NEWLOCALE=1 @@ -1,5 +1,5 @@ # lock.m4 serial 14 -dnl Copyright (C) 2005-2022 Free Software Foundation, Inc. +dnl Copyright (C) 2005-2023 Free Software Foundation, Inc. dnl This file is free software; the Free Software Foundation dnl gives unlimited permission to copy and/or distribute it, dnl with or without modifications, as long as this notice is preserved. diff --git a/m4/lseek.m4 b/m4/lseek.m4 index 0583511..6e1ab6f 100644 --- a/m4/lseek.m4 +++ b/m4/lseek.m4 @@ -1,5 +1,5 @@ -# lseek.m4 serial 12 -dnl Copyright (C) 2007, 2009-2022 Free Software Foundation, Inc. +# lseek.m4 serial 13 +dnl Copyright (C) 2007, 2009-2023 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. @@ -70,9 +70,29 @@ AC_DEFUN([gl_FUNC_LSEEK], REPLACE_LSEEK=1 fi - dnl macOS SEEK_DATA is incompatible with other platforms. - case $host_os in - darwin*) - REPLACE_LSEEK=1;; - esac + AS_IF([test $REPLACE_LSEEK = 0], + [AC_CACHE_CHECK([whether SEEK_DATA works but is incompatible with GNU], + [gl_cv_func_lseek_works_but_incompatible], + [AC_PREPROC_IFELSE( + [AC_LANG_SOURCE( + dnl Use macOS "9999" to stand for a future fixed macOS version. + dnl See ../lib/unistd.in.h and <https://bugs.gnu.org/61386>. + [[#include <unistd.h> + #if defined __APPLE__ && defined __MACH__ && defined SEEK_DATA + # ifdef __ENVIRONMENT_MAC_OS_X_VERSION_MIN_REQUIRED__ + # include <AvailabilityMacros.h> + # endif + # if 99990000 <= MAC_OS_X_VERSION_MIN_REQUIRED + # define LSEEK_WORKS_BUT_IS_INCOMPATIBLE_WITH_GNU + # endif + #endif + #ifndef LSEEK_WORKS_BUT_IS_INCOMPATIBLE_WITH_GNU + #error "No need to work around the bug" + #endif + ]])], + [gl_cv_func_lseek_works_but_incompatible=yes], + [gl_cv_func_lseek_works_but_incompatible=no])]) + if test "$gl_cv_func_lseek_works_but_incompatible" = yes; then + REPLACE_LSEEK=1 + fi]) ]) diff --git a/m4/lstat.m4 b/m4/lstat.m4 index d987060..2bc4669 100644 --- a/m4/lstat.m4 +++ b/m4/lstat.m4 @@ -1,6 +1,6 @@ -# serial 33 +# serial 34 -# Copyright (C) 1997-2001, 2003-2022 Free Software Foundation, Inc. +# Copyright (C) 1997-2001, 2003-2023 Free Software Foundation, Inc. # # This file is free software; the Free Software Foundation # gives unlimited permission to copy and/or distribute it, @@ -56,6 +56,9 @@ AC_DEFUN([gl_FUNC_LSTAT_FOLLOWS_SLASHED_SYMLINK], linux-* | linux) # Guess yes on Linux systems. gl_cv_func_lstat_dereferences_slashed_symlink="guessing yes" ;; + midipix*) + # Guess yes on systems that emulate the Linux system calls. + gl_cv_func_lstat_dereferences_slashed_symlink="guessing yes" ;; *-gnu* | gnu*) # Guess yes on glibc systems. gl_cv_func_lstat_dereferences_slashed_symlink="guessing yes" ;; diff --git a/m4/malloc.m4 b/m4/malloc.m4 index 6b76c1e..bc58017 100644 --- a/m4/malloc.m4 +++ b/m4/malloc.m4 @@ -1,5 +1,5 @@ -# malloc.m4 serial 28 -dnl Copyright (C) 2007, 2009-2022 Free Software Foundation, Inc. +# malloc.m4 serial 29 +dnl Copyright (C) 2007, 2009-2023 Free Software Foundation, Inc. dnl This file is free software; the Free Software Foundation dnl gives unlimited permission to copy and/or distribute it, dnl with or without modifications, as long as this notice is preserved. @@ -25,7 +25,7 @@ AC_DEFUN([_AC_FUNC_MALLOC_IF], [case "$host_os" in # Guess yes on platforms where we know the result. *-gnu* | freebsd* | netbsd* | openbsd* | bitrig* \ - | gnu* | *-musl* | midnightbsd* \ + | gnu* | *-musl* | midipix* | midnightbsd* \ | hpux* | solaris* | cygwin* | mingw* | msys* ) ac_cv_func_malloc_0_nonnull="guessing yes" ;; # If we don't know, obey --enable-cross-guesses. diff --git a/m4/malloca.m4 b/m4/malloca.m4 index 77eb96a..1d777eb 100644 --- a/m4/malloca.m4 +++ b/m4/malloca.m4 @@ -1,5 +1,5 @@ # malloca.m4 serial 2 -dnl Copyright (C) 2003-2004, 2006-2007, 2009-2022 Free Software Foundation, +dnl Copyright (C) 2003-2004, 2006-2007, 2009-2023 Free Software Foundation, dnl Inc. dnl This file is free software; the Free Software Foundation dnl gives unlimited permission to copy and/or distribute it, diff --git a/m4/manywarnings.m4 b/m4/manywarnings.m4 index 253393e..2fac86e 100644 --- a/m4/manywarnings.m4 +++ b/m4/manywarnings.m4 @@ -1,5 +1,5 @@ # manywarnings.m4 serial 23 -dnl Copyright (C) 2008-2022 Free Software Foundation, Inc. +dnl Copyright (C) 2008-2023 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. @@ -167,11 +167,13 @@ AC_DEFUN([gl_MANYWARN_ALL_GCC(C)], # them here so that the above 'comm' command doesn't report a false match. gl_AS_VAR_APPEND([$1], [' -Warray-bounds=2']) gl_AS_VAR_APPEND([$1], [' -Wattribute-alias=2']) + gl_AS_VAR_APPEND([$1], [' -Wbidi-chars=any,ucn']) gl_AS_VAR_APPEND([$1], [' -Wformat-overflow=2']) gl_AS_VAR_APPEND([$1], [' -Wformat=2']) gl_AS_VAR_APPEND([$1], [' -Wformat-truncation=2']) gl_AS_VAR_APPEND([$1], [' -Wimplicit-fallthrough=5']) gl_AS_VAR_APPEND([$1], [' -Wshift-overflow=2']) + gl_AS_VAR_APPEND([$1], [' -Wuse-after-free=3']) gl_AS_VAR_APPEND([$1], [' -Wunused-const-variable=2']) gl_AS_VAR_APPEND([$1], [' -Wvla-larger-than=4031']) diff --git a/m4/mbrtowc.m4 b/m4/mbrtowc.m4 index ec8716b..4bf91be 100644 --- a/m4/mbrtowc.m4 +++ b/m4/mbrtowc.m4 @@ -1,5 +1,5 @@ -# mbrtowc.m4 serial 38 -*- coding: utf-8 -*- -dnl Copyright (C) 2001-2002, 2004-2005, 2008-2022 Free Software Foundation, +# mbrtowc.m4 serial 39 -*- coding: utf-8 -*- +dnl Copyright (C) 2001-2002, 2004-2005, 2008-2023 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, @@ -91,20 +91,23 @@ AC_DEFUN([gl_FUNC_MBRTOWC], fi if test $REPLACE_MBSTATE_T = 1; then case "$host_os" in - mingw*) LIB_MBRTOWC= ;; + mingw*) MBRTOWC_LIB= ;; *) gl_WEAK_SYMBOLS case "$gl_cv_have_weak" in - *yes) LIB_MBRTOWC= ;; - *) LIB_MBRTOWC="$LIBPTHREAD" ;; + *yes) MBRTOWC_LIB= ;; + *) MBRTOWC_LIB="$LIBPTHREAD" ;; esac ;; esac else - LIB_MBRTOWC= + MBRTOWC_LIB= fi - dnl LIB_MBRTOWC is expected to be '-pthread' or '-lpthread' on AIX + dnl MBRTOWC_LIB is expected to be '-pthread' or '-lpthread' on AIX dnl with gcc or xlc, and empty otherwise. + AC_SUBST([MBRTOWC_LIB]) + dnl For backward compatibility. + LIB_MBRTOWC="$MBRTOWC_LIB" AC_SUBST([LIB_MBRTOWC]) ]) diff --git a/m4/mbsinit.m4 b/m4/mbsinit.m4 index ebd2d4f..c388a8b 100644 --- a/m4/mbsinit.m4 +++ b/m4/mbsinit.m4 @@ -1,5 +1,5 @@ # mbsinit.m4 serial 9 -dnl Copyright (C) 2008, 2010-2022 Free Software Foundation, Inc. +dnl Copyright (C) 2008, 2010-2023 Free Software Foundation, Inc. dnl This file is free software; the Free Software Foundation dnl gives unlimited permission to copy and/or distribute it, dnl with or without modifications, as long as this notice is preserved. diff --git a/m4/mbstate_t.m4 b/m4/mbstate_t.m4 index a6eba1b..dcd66b9 100644 --- a/m4/mbstate_t.m4 +++ b/m4/mbstate_t.m4 @@ -1,5 +1,5 @@ # mbstate_t.m4 serial 14 -dnl Copyright (C) 2000-2002, 2008-2022 Free Software Foundation, Inc. +dnl Copyright (C) 2000-2002, 2008-2023 Free Software Foundation, Inc. dnl This file is free software; the Free Software Foundation dnl gives unlimited permission to copy and/or distribute it, dnl with or without modifications, as long as this notice is preserved. diff --git a/m4/mbtowc.m4 b/m4/mbtowc.m4 index 2827e83..02ed6eb 100644 --- a/m4/mbtowc.m4 +++ b/m4/mbtowc.m4 @@ -1,5 +1,5 @@ -# mbtowc.m4 serial 3 -dnl Copyright (C) 2011-2022 Free Software Foundation, Inc. +# mbtowc.m4 serial 5 +dnl Copyright (C) 2011-2023 Free Software Foundation, Inc. dnl This file is free software; the Free Software Foundation dnl gives unlimited permission to copy and/or distribute it, dnl with or without modifications, as long as this notice is preserved. @@ -8,9 +8,12 @@ AC_DEFUN([gl_FUNC_MBTOWC], [ AC_REQUIRE([gl_STDLIB_H_DEFAULTS]) - AC_CHECK_FUNCS([mbtowc]) + gl_CHECK_FUNCS_ANDROID([mbtowc], [[#include <stdlib.h>]]) if test $ac_cv_func_mbtowc = no; then HAVE_MBTOWC=0 + case "$gl_cv_onwards_func_mbtowc" in + future*) REPLACE_MBTOWC=1 ;; + esac else if false; then REPLACE_MBTOWC=1 diff --git a/m4/memchr.m4 b/m4/memchr.m4 new file mode 100644 index 0000000..4f1aed0 --- /dev/null +++ b/m4/memchr.m4 @@ -0,0 +1,106 @@ +# memchr.m4 serial 18 +dnl Copyright (C) 2002-2004, 2009-2023 Free Software Foundation, Inc. +dnl This file is free software; the Free Software Foundation +dnl gives unlimited permission to copy and/or distribute it, +dnl with or without modifications, as long as this notice is preserved. + +AC_DEFUN_ONCE([gl_FUNC_MEMCHR], +[ + AC_REQUIRE([AC_CANONICAL_HOST]) dnl for cross-compiles + + dnl Check for prerequisites for memory fence checks. + gl_FUNC_MMAP_ANON + AC_CHECK_HEADERS_ONCE([sys/mman.h]) + AC_CHECK_FUNCS_ONCE([mprotect]) + + AC_REQUIRE([gl_STRING_H_DEFAULTS]) + # Detect platform-specific bugs in some versions of glibc: + # memchr should not dereference anything with length 0 + # https://bugzilla.redhat.com/show_bug.cgi?id=499689 + # memchr should not dereference overestimated length after a match + # https://bugs.debian.org/cgi-bin/bugreport.cgi?bug=521737 + # https://sourceware.org/bugzilla/show_bug.cgi?id=10162 + # memchr should cast the second argument to 'unsigned char'. + # This bug exists in Android 4.3. + # Assume that memchr works on platforms that lack mprotect. + AC_CACHE_CHECK([whether memchr works], [gl_cv_func_memchr_works], + [AC_RUN_IFELSE([AC_LANG_PROGRAM([[ +#include <string.h> +#if HAVE_SYS_MMAN_H +# include <fcntl.h> +# include <unistd.h> +# include <sys/types.h> +# include <sys/mman.h> +# ifndef MAP_FILE +# define MAP_FILE 0 +# endif +#endif +]], [[ + int result = 0; + char *fence = NULL; +#if HAVE_SYS_MMAN_H && HAVE_MPROTECT +# if HAVE_MAP_ANONYMOUS + const int flags = MAP_ANONYMOUS | MAP_PRIVATE; + const int fd = -1; +# else /* !HAVE_MAP_ANONYMOUS */ + const int flags = MAP_FILE | MAP_PRIVATE; + int fd = open ("/dev/zero", O_RDONLY, 0666); + if (fd >= 0) +# endif + { + int pagesize = getpagesize (); + char *two_pages = + (char *) mmap (NULL, 2 * pagesize, PROT_READ | PROT_WRITE, + flags, fd, 0); + if (two_pages != (char *)(-1) + && mprotect (two_pages + pagesize, pagesize, PROT_NONE) == 0) + fence = two_pages + pagesize; + } +#endif + if (fence) + { + /* Test against bugs on glibc systems. */ + if (memchr (fence, 0, 0)) + result |= 1; + strcpy (fence - 9, "12345678"); + if (memchr (fence - 9, 0, 79) != fence - 1) + result |= 2; + if (memchr (fence - 1, 0, 3) != fence - 1) + result |= 4; + /* Test against bug on AIX 7.2. */ + if (memchr (fence - 4, '6', 16) != fence - 4) + result |= 8; + } + /* Test against bug on Android 4.3. */ + { + char input[3]; + input[0] = 'a'; + input[1] = 'b'; + input[2] = 'c'; + if (memchr (input, 0x789abc00 | 'b', 3) != input + 1) + result |= 16; + } + return result; +]])], + [gl_cv_func_memchr_works=yes], + [gl_cv_func_memchr_works=no], + [case "$host_os" in + # Guess no on Android. + linux*-android*) gl_cv_func_memchr_works="guessing no" ;; + # Guess yes on native Windows. + mingw*) gl_cv_func_memchr_works="guessing yes" ;; + # If we don't know, obey --enable-cross-guesses. + *) gl_cv_func_memchr_works="$gl_cross_guess_normal" ;; + esac + ]) + ]) + case "$gl_cv_func_memchr_works" in + *yes) ;; + *) REPLACE_MEMCHR=1 ;; + esac +]) + +# Prerequisites of lib/memchr.c. +AC_DEFUN([gl_PREREQ_MEMCHR], [ + AC_CHECK_HEADERS([bp-sym.h]) +]) diff --git a/m4/mempcpy.m4 b/m4/mempcpy.m4 index 1107eb4..612b77b 100644 --- a/m4/mempcpy.m4 +++ b/m4/mempcpy.m4 @@ -1,5 +1,5 @@ -# mempcpy.m4 serial 12 -dnl Copyright (C) 2003-2004, 2006-2007, 2009-2022 Free Software Foundation, +# mempcpy.m4 serial 14 +dnl Copyright (C) 2003-2004, 2006-2007, 2009-2023 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, @@ -14,9 +14,12 @@ AC_DEFUN([gl_FUNC_MEMPCPY], AC_REQUIRE([AC_C_RESTRICT]) AC_REQUIRE([gl_STRING_H_DEFAULTS]) - AC_CHECK_FUNCS([mempcpy]) + gl_CHECK_FUNCS_ANDROID([mempcpy], [[#include <string.h>]]) if test $ac_cv_func_mempcpy = no; then HAVE_MEMPCPY=0 + case "$gl_cv_onwards_func_mempcpy" in + future*) REPLACE_MEMPCPY=1 ;; + esac fi ]) diff --git a/m4/minmax.m4 b/m4/minmax.m4 index b976739..fd09846 100644 --- a/m4/minmax.m4 +++ b/m4/minmax.m4 @@ -1,5 +1,5 @@ # minmax.m4 serial 4 -dnl Copyright (C) 2005, 2009-2022 Free Software Foundation, Inc. +dnl Copyright (C) 2005, 2009-2023 Free Software Foundation, Inc. dnl This file is free software; the Free Software Foundation dnl gives unlimited permission to copy and/or distribute it, dnl with or without modifications, as long as this notice is preserved. diff --git a/m4/mkdir.m4 b/m4/mkdir.m4 index 8b78ce9..c2bc4da 100644 --- a/m4/mkdir.m4 +++ b/m4/mkdir.m4 @@ -1,6 +1,6 @@ -# serial 17 +# serial 18 -# Copyright (C) 2001, 2003-2004, 2006, 2008-2022 Free Software Foundation, Inc. +# Copyright (C) 2001, 2003-2004, 2006, 2008-2023 Free Software Foundation, Inc. # This file is free software; the Free Software Foundation # gives unlimited permission to copy and/or distribute it, # with or without modifications, as long as this notice is preserved. @@ -27,6 +27,8 @@ AC_DEFUN([gl_FUNC_MKDIR], [case "$host_os" in # Guess yes on Linux systems. linux-* | linux) gl_cv_func_mkdir_trailing_slash_works="guessing yes" ;; + # Guess yes on systems that emulate the Linux system calls. + midipix*) gl_cv_func_mkdir_trailing_slash_works="guessing yes" ;; # Guess yes on glibc systems. *-gnu* | gnu*) gl_cv_func_mkdir_trailing_slash_works="guessing yes" ;; # Guess yes on MSVC, no on mingw. @@ -67,6 +69,8 @@ AC_DEFUN([gl_FUNC_MKDIR], *-gnu* | gnu*) gl_cv_func_mkdir_trailing_dot_works="guessing yes" ;; # Guess yes on musl systems. *-musl*) gl_cv_func_mkdir_trailing_dot_works="guessing yes" ;; + # Guess yes on systems that emulate the Linux system calls. + midipix*) gl_cv_func_mkdir_trailing_dot_works="guessing yes" ;; # Guess no on native Windows. mingw*) gl_cv_func_mkdir_trailing_dot_works="guessing no" ;; # If we don't know, obey --enable-cross-guesses. diff --git a/m4/mkstemp.m4 b/m4/mkstemp.m4 index 322f4bc..d4a15ea 100644 --- a/m4/mkstemp.m4 +++ b/m4/mkstemp.m4 @@ -1,6 +1,6 @@ -#serial 28 +#serial 29 -# Copyright (C) 2001, 2003-2007, 2009-2022 Free Software Foundation, Inc. +# Copyright (C) 2001, 2003-2007, 2009-2023 Free Software Foundation, Inc. # This file is free software; the Free Software Foundation # gives unlimited permission to copy and/or distribute it, # with or without modifications, as long as this notice is preserved. @@ -58,14 +58,14 @@ AC_DEFUN([gl_FUNC_MKSTEMP], [gl_cv_func_working_mkstemp=yes], [gl_cv_func_working_mkstemp=no], [case "$host_os" in - # Guess yes on glibc systems. - *-gnu* | gnu*) gl_cv_func_working_mkstemp="guessing yes" ;; - # Guess yes on musl systems. - *-musl*) gl_cv_func_working_mkstemp="guessing yes" ;; - # Guess no on native Windows. - mingw*) gl_cv_func_working_mkstemp="guessing no" ;; - # If we don't know, obey --enable-cross-guesses. - *) gl_cv_func_working_mkstemp="$gl_cross_guess_normal" ;; + # Guess yes on glibc systems. + *-gnu* | gnu*) gl_cv_func_working_mkstemp="guessing yes" ;; + # Guess yes on musl systems. + *-musl* | midipix*) gl_cv_func_working_mkstemp="guessing yes" ;; + # Guess no on native Windows. + mingw*) gl_cv_func_working_mkstemp="guessing no" ;; + # If we don't know, obey --enable-cross-guesses. + *) gl_cv_func_working_mkstemp="$gl_cross_guess_normal" ;; esac ]) rm -rf conftest.mkstemp diff --git a/m4/mmap-anon.m4 b/m4/mmap-anon.m4 index a4580ff..d07d26e 100644 --- a/m4/mmap-anon.m4 +++ b/m4/mmap-anon.m4 @@ -1,5 +1,5 @@ # mmap-anon.m4 serial 12 -dnl Copyright (C) 2005, 2007, 2009-2022 Free Software Foundation, Inc. +dnl Copyright (C) 2005, 2007, 2009-2023 Free Software Foundation, Inc. dnl This file is free software; the Free Software Foundation dnl gives unlimited permission to copy and/or distribute it, dnl with or without modifications, as long as this notice is preserved. diff --git a/m4/mode_t.m4 b/m4/mode_t.m4 index e08d27a..82197c0 100644 --- a/m4/mode_t.m4 +++ b/m4/mode_t.m4 @@ -1,5 +1,5 @@ # mode_t.m4 serial 2 -dnl Copyright (C) 2009-2022 Free Software Foundation, Inc. +dnl Copyright (C) 2009-2023 Free Software Foundation, Inc. dnl This file is free software; the Free Software Foundation dnl gives unlimited permission to copy and/or distribute it, dnl with or without modifications, as long as this notice is preserved. diff --git a/m4/msvc-inval.m4 b/m4/msvc-inval.m4 index b32cf6e..8d9d21b 100644 --- a/m4/msvc-inval.m4 +++ b/m4/msvc-inval.m4 @@ -1,5 +1,5 @@ # msvc-inval.m4 serial 1 -dnl Copyright (C) 2011-2022 Free Software Foundation, Inc. +dnl Copyright (C) 2011-2023 Free Software Foundation, Inc. dnl This file is free software; the Free Software Foundation dnl gives unlimited permission to copy and/or distribute it, dnl with or without modifications, as long as this notice is preserved. diff --git a/m4/msvc-nothrow.m4 b/m4/msvc-nothrow.m4 index 16ceb1f..0263e49 100644 --- a/m4/msvc-nothrow.m4 +++ b/m4/msvc-nothrow.m4 @@ -1,5 +1,5 @@ # msvc-nothrow.m4 serial 1 -dnl Copyright (C) 2011-2022 Free Software Foundation, Inc. +dnl Copyright (C) 2011-2023 Free Software Foundation, Inc. dnl This file is free software; the Free Software Foundation dnl gives unlimited permission to copy and/or distribute it, dnl with or without modifications, as long as this notice is preserved. diff --git a/m4/multiarch.m4 b/m4/multiarch.m4 index 5d94276..3ba5b0f 100644 --- a/m4/multiarch.m4 +++ b/m4/multiarch.m4 @@ -1,5 +1,5 @@ # multiarch.m4 serial 9 -dnl Copyright (C) 2008-2022 Free Software Foundation, Inc. +dnl Copyright (C) 2008-2023 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. @@ -1,5 +1,5 @@ -# musl.m4 serial 3 -dnl Copyright (C) 2019-2022 Free Software Foundation, Inc. +# musl.m4 serial 4 +dnl Copyright (C) 2019-2023 Free Software Foundation, Inc. dnl This file is free software; the Free Software Foundation dnl gives unlimited permission to copy and/or distribute it, dnl with or without modifications, as long as this notice is preserved. @@ -13,6 +13,8 @@ AC_DEFUN_ONCE([gl_MUSL_LIBC], [ AC_REQUIRE([AC_CANONICAL_HOST]) case "$host_os" in - *-musl*) AC_DEFINE([MUSL_LIBC], [1], [Define to 1 on musl libc.]) ;; + *-musl* | midipix*) + AC_DEFINE([MUSL_LIBC], [1], [Define to 1 on musl libc.]) + ;; esac ]) diff --git a/m4/nanosleep.m4 b/m4/nanosleep.m4 index 1964b1e..e21a3e3 100644 --- a/m4/nanosleep.m4 +++ b/m4/nanosleep.m4 @@ -1,11 +1,11 @@ -# serial 41 +# serial 43 dnl From Jim Meyering. dnl Check for the nanosleep function. dnl If not found, use the supplied replacement. dnl -# Copyright (C) 1999-2001, 2003-2022 Free Software Foundation, Inc. +# Copyright (C) 1999-2001, 2003-2023 Free Software Foundation, Inc. # This file is free software; the Free Software Foundation # gives unlimited permission to copy and/or distribute it, @@ -25,11 +25,11 @@ AC_DEFUN([gl_FUNC_NANOSLEEP], # Solaris 2.5.1 needs -lposix4 to get the nanosleep function. # Solaris 7 prefers the library name -lrt to the obsolescent name -lposix4. - LIB_NANOSLEEP= - AC_SUBST([LIB_NANOSLEEP]) + NANOSLEEP_LIB= + AC_SUBST([NANOSLEEP_LIB]) AC_SEARCH_LIBS([nanosleep], [rt posix4], [test "$ac_cv_search_nanosleep" = "none required" || - LIB_NANOSLEEP=$ac_cv_search_nanosleep]) + NANOSLEEP_LIB=$ac_cv_search_nanosleep]) if test "x$ac_cv_search_nanosleep" != xno; then dnl The system has a nanosleep function. @@ -100,15 +100,22 @@ AC_DEFUN([gl_FUNC_NANOSLEEP], #else /* A simpler test for native Windows. */ if (nanosleep (&ts_sleep, &ts_remaining) < 0) return 3; + /* Test for 32-bit mingw bug: negative nanosecond values do not + cause failure. */ + ts_sleep.tv_sec = 1; + ts_sleep.tv_nsec = -1; + if (nanosleep (&ts_sleep, &ts_remaining) != -1) + return 7; #endif return 0; }]])], [gl_cv_func_nanosleep=yes], - [case $? in dnl ( - 4|5|6) gl_cv_func_nanosleep='no (mishandles large arguments)';; dnl ( - *) gl_cv_func_nanosleep=no;; + [case $? in + 4|5|6) gl_cv_func_nanosleep='no (mishandles large arguments)' ;; + 7) gl_cv_func_nanosleep='no (mishandles negative tv_nsec)' ;; + *) gl_cv_func_nanosleep=no ;; esac], - [case "$host_os" in dnl (( + [case "$host_os" in linux*) # Guess it halfway works when the kernel is Linux. gl_cv_func_nanosleep='guessing no (mishandles large arguments)' ;; mingw*) # Guess no on native Windows. @@ -136,4 +143,8 @@ AC_DEFUN([gl_FUNC_NANOSLEEP], HAVE_NANOSLEEP=0 fi LIBS=$nanosleep_save_libs + + # For backward compatibility. + LIB_NANOSLEEP="$NANOSLEEP_LIB" + AC_SUBST([LIB_NANOSLEEP]) ]) diff --git a/m4/netinet_in_h.m4 b/m4/netinet_in_h.m4 index de26fe8..7115419 100644 --- a/m4/netinet_in_h.m4 +++ b/m4/netinet_in_h.m4 @@ -1,5 +1,5 @@ # netinet_in_h.m4 serial 6 -dnl Copyright (C) 2006-2022 Free Software Foundation, Inc. +dnl Copyright (C) 2006-2023 Free Software Foundation, Inc. dnl This file is free software; the Free Software Foundation dnl gives unlimited permission to copy and/or distribute it, dnl with or without modifications, as long as this notice is preserved. diff --git a/m4/nl_langinfo.m4 b/m4/nl_langinfo.m4 index d20a09c..7648d52 100644 --- a/m4/nl_langinfo.m4 +++ b/m4/nl_langinfo.m4 @@ -1,5 +1,5 @@ -# nl_langinfo.m4 serial 8 -dnl Copyright (C) 2009-2022 Free Software Foundation, Inc. +# nl_langinfo.m4 serial 11 +dnl Copyright (C) 2009-2023 Free Software Foundation, Inc. dnl This file is free software; the Free Software Foundation dnl gives unlimited permission to copy and/or distribute it, dnl with or without modifications, as long as this notice is preserved. @@ -8,7 +8,7 @@ AC_DEFUN([gl_FUNC_NL_LANGINFO], [ AC_REQUIRE([gl_LANGINFO_H_DEFAULTS]) AC_REQUIRE([gl_LANGINFO_H]) - AC_CHECK_FUNCS_ONCE([nl_langinfo]) + gl_CHECK_FUNCS_ANDROID([nl_langinfo], [[#include <langinfo.h>]]) AC_REQUIRE([AC_CANONICAL_HOST]) AC_REQUIRE([gl_FUNC_SETLOCALE_NULL]) AC_REQUIRE([gl_PTHREADLIB]) @@ -60,9 +60,12 @@ AC_DEFUN([gl_FUNC_NL_LANGINFO], fi else HAVE_NL_LANGINFO=0 + case "$gl_cv_onwards_func_nl_langinfo" in + future*) REPLACE_NL_LANGINFO=1 ;; + esac fi if test $HAVE_NL_LANGINFO = 0 || test $HAVE_LANGINFO_CODESET = 0; then - LIB_NL_LANGINFO="$LIB_SETLOCALE_NULL" + LIB_NL_LANGINFO="$SETLOCALE_NULL_LIB" else LIB_NL_LANGINFO= fi diff --git a/m4/nocrash.m4 b/m4/nocrash.m4 index 91f00c1..6a76638 100644 --- a/m4/nocrash.m4 +++ b/m4/nocrash.m4 @@ -1,5 +1,5 @@ # nocrash.m4 serial 5 -dnl Copyright (C) 2005, 2009-2022 Free Software Foundation, Inc. +dnl Copyright (C) 2005, 2009-2023 Free Software Foundation, Inc. dnl This file is free software; the Free Software Foundation dnl gives unlimited permission to copy and/or distribute it, dnl with or without modifications, as long as this notice is preserved. diff --git a/m4/o-direct.m4 b/m4/o-direct.m4 index d00b381..7229d66 100644 --- a/m4/o-direct.m4 +++ b/m4/o-direct.m4 @@ -3,7 +3,7 @@ # The problem is that on systems supporting O_DIRECT, open with O_DIRECT # fails for some file system types (e.g., tmpfs on linux-2.6.21). -# Copyright (C) 2007-2014, 2019-2022 Free Software Foundation, Inc. +# Copyright (C) 2007-2014, 2019-2023 Free Software Foundation, Inc. # This file is free software; the Free Software Foundation # gives unlimited permission to copy and/or distribute it, # with or without modifications, as long as this notice is preserved. diff --git a/m4/off_t.m4 b/m4/off_t.m4 index 0890ada..880f347 100644 --- a/m4/off_t.m4 +++ b/m4/off_t.m4 @@ -1,5 +1,5 @@ # off_t.m4 serial 1 -dnl Copyright (C) 2012-2022 Free Software Foundation, Inc. +dnl Copyright (C) 2012-2023 Free Software Foundation, Inc. dnl This file is free software; the Free Software Foundation dnl gives unlimited permission to copy and/or distribute it, dnl with or without modifications, as long as this notice is preserved. diff --git a/m4/open-cloexec.m4 b/m4/open-cloexec.m4 index 16cd5ec..fd572fc 100644 --- a/m4/open-cloexec.m4 +++ b/m4/open-cloexec.m4 @@ -1,6 +1,6 @@ # Test whether O_CLOEXEC is defined. -dnl Copyright 2017-2022 Free Software Foundation, Inc. +dnl Copyright 2017-2023 Free Software Foundation, Inc. dnl This file is free software; the Free Software Foundation dnl gives unlimited permission to copy and/or distribute it, dnl with or without modifications, as long as this notice is preserved. diff --git a/m4/open-slash.m4 b/m4/open-slash.m4 index 4fbf491..1f731f8 100644 --- a/m4/open-slash.m4 +++ b/m4/open-slash.m4 @@ -1,5 +1,5 @@ # open-slash.m4 serial 2 -dnl Copyright (C) 2007-2022 Free Software Foundation, Inc. +dnl Copyright (C) 2007-2023 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. @@ -1,5 +1,5 @@ # open.m4 serial 15 -dnl Copyright (C) 2007-2022 Free Software Foundation, Inc. +dnl Copyright (C) 2007-2023 Free Software Foundation, Inc. dnl This file is free software; the Free Software Foundation dnl gives unlimited permission to copy and/or distribute it, dnl with or without modifications, as long as this notice is preserved. diff --git a/m4/pathmax.m4 b/m4/pathmax.m4 index 44add99..6d47d2c 100644 --- a/m4/pathmax.m4 +++ b/m4/pathmax.m4 @@ -1,5 +1,5 @@ # pathmax.m4 serial 11 -dnl Copyright (C) 2002-2003, 2005-2006, 2009-2022 Free Software Foundation, +dnl Copyright (C) 2002-2003, 2005-2006, 2009-2023 Free Software Foundation, dnl Inc. dnl This file is free software; the Free Software Foundation dnl gives unlimited permission to copy and/or distribute it, diff --git a/m4/perror.m4 b/m4/perror.m4 index 02d44ca..9842b24 100644 --- a/m4/perror.m4 +++ b/m4/perror.m4 @@ -1,5 +1,5 @@ -# perror.m4 serial 10 -dnl Copyright (C) 2008-2022 Free Software Foundation, Inc. +# perror.m4 serial 12 +dnl Copyright (C) 2008-2023 Free Software Foundation, Inc. dnl This file is free software; the Free Software Foundation dnl gives unlimited permission to copy and/or distribute it, dnl with or without modifications, as long as this notice is preserved. @@ -10,7 +10,7 @@ AC_DEFUN([gl_FUNC_PERROR], AC_REQUIRE([gl_HEADER_ERRNO_H]) AC_REQUIRE([gl_FUNC_STRERROR_R]) AC_REQUIRE([gl_FUNC_STRERROR_0]) - AC_REQUIRE([AC_CANONICAL_HOST]) dnl for cross-compiles + AC_REQUIRE([AC_CANONICAL_HOST]) dnl We intentionally do not check for the broader REPLACE_STRERROR_R, dnl since on glibc systems, strerror_r is replaced only for signature dnl issues, and perror is just fine. Rather, we only want to @@ -48,12 +48,12 @@ AC_DEFUN([gl_FUNC_PERROR], rm -rf conftest.txt1 conftest.txt2], [gl_cv_func_perror_works=no], [case "$host_os" in - # Guess yes on musl systems. - *-musl*) gl_cv_func_perror_works="guessing yes" ;; - # Guess yes on native Windows. - mingw*) gl_cv_func_perror_works="guessing yes" ;; - # Otherwise obey --enable-cross-guesses. - *) gl_cv_func_perror_works="$gl_cross_guess_normal" ;; + # Guess yes on musl systems. + *-musl* | midipix*) gl_cv_func_perror_works="guessing yes" ;; + # Guess yes on native Windows. + mingw*) gl_cv_func_perror_works="guessing yes" ;; + # Otherwise obey --enable-cross-guesses. + *) gl_cv_func_perror_works="$gl_cross_guess_normal" ;; esac ]) ]) @@ -68,4 +68,9 @@ AC_DEFUN([gl_FUNC_PERROR], REPLACE_PERROR=1 ;; esac + dnl Does perror clobber the strerror buffer? + case "$host_os" in + # Yes on Android 11. + linux*-android*) REPLACE_PERROR=1 ;; + esac ]) @@ -1,5 +1,5 @@ # pipe.m4 serial 2 -dnl Copyright (C) 2010-2022 Free Software Foundation, Inc. +dnl Copyright (C) 2010-2023 Free Software Foundation, Inc. dnl This file is free software; the Free Software Foundation dnl gives unlimited permission to copy and/or distribute it, dnl with or without modifications, as long as this notice is preserved. diff --git a/m4/priv-set.m4 b/m4/priv-set.m4 index 113c32a..00cbbd7 100644 --- a/m4/priv-set.m4 +++ b/m4/priv-set.m4 @@ -1,6 +1,6 @@ # serial 8 -# Copyright (C) 2009-2022 Free Software Foundation, Inc. +# Copyright (C) 2009-2023 Free Software Foundation, Inc. # # This file is free software; the Free Software Foundation # gives unlimited permission to copy and/or distribute it, diff --git a/m4/pselect.m4 b/m4/pselect.m4 index 8611441..6c3d1b8 100644 --- a/m4/pselect.m4 +++ b/m4/pselect.m4 @@ -1,5 +1,5 @@ -# pselect.m4 serial 10 -dnl Copyright (C) 2011-2022 Free Software Foundation, Inc. +# pselect.m4 serial 11 +dnl Copyright (C) 2011-2023 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. @@ -54,6 +54,8 @@ AC_DEFUN([gl_FUNC_PSELECT], case "$host_os" in # Guess yes on Linux systems. linux-* | linux) gl_cv_func_pselect_detects_ebadf="guessing yes" ;; + # Guess yes on systems that emulate the Linux system calls. + midipix*) gl_cv_func_pselect_detects_ebadf="guessing yes" ;; # Guess yes on glibc systems. *-gnu* | gnu*) gl_cv_func_pselect_detects_ebadf="guessing yes" ;; # If we don't know, obey --enable-cross-guesses. diff --git a/m4/pthread-thread.m4 b/m4/pthread-thread.m4 index 969628e..aafd979 100644 --- a/m4/pthread-thread.m4 +++ b/m4/pthread-thread.m4 @@ -1,5 +1,5 @@ # pthread-thread.m4 serial 2 -dnl Copyright (C) 2019-2022 Free Software Foundation, Inc. +dnl Copyright (C) 2019-2023 Free Software Foundation, Inc. dnl This file is free software; the Free Software Foundation dnl gives unlimited permission to copy and/or distribute it, dnl with or without modifications, as long as this notice is preserved. diff --git a/m4/pthread_h.m4 b/m4/pthread_h.m4 index 4146aef..0d536fc 100644 --- a/m4/pthread_h.m4 +++ b/m4/pthread_h.m4 @@ -1,5 +1,5 @@ # pthread_h.m4 serial 8 -dnl Copyright (C) 2009-2022 Free Software Foundation, Inc. +dnl Copyright (C) 2009-2023 Free Software Foundation, Inc. dnl This file is free software; the Free Software Foundation dnl gives unlimited permission to copy and/or distribute it, dnl with or without modifications, as long as this notice is preserved. diff --git a/m4/pthread_rwlock_rdlock.m4 b/m4/pthread_rwlock_rdlock.m4 index 8ad7839..66b29f8 100644 --- a/m4/pthread_rwlock_rdlock.m4 +++ b/m4/pthread_rwlock_rdlock.m4 @@ -1,5 +1,5 @@ -# pthread_rwlock_rdlock.m4 serial 4 -dnl Copyright (C) 2017-2022 Free Software Foundation, Inc. +# pthread_rwlock_rdlock.m4 serial 5 +dnl Copyright (C) 2017-2023 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. @@ -156,22 +156,22 @@ main () [gl_cv_pthread_rwlock_rdlock_prefer_writer=yes], [gl_cv_pthread_rwlock_rdlock_prefer_writer=no], [case "$host_os" in - # Guess no on glibc systems. - *-gnu* | gnu*) gl_cv_pthread_rwlock_rdlock_prefer_writer="guessing no" ;; - # Guess no on musl systems. - *-musl*) gl_cv_pthread_rwlock_rdlock_prefer_writer="guessing no" ;; - # Guess no on bionic systems. - *-android*) gl_cv_pthread_rwlock_rdlock_prefer_writer="guessing no" ;; - # Guess yes on native Windows with the mingw-w64 winpthreads library. - # Guess no on native Windows with the gnulib windows-rwlock module. - mingw*) if test "$gl_use_threads" = yes || test "$gl_use_threads" = posix; then - gl_cv_pthread_rwlock_rdlock_prefer_writer="guessing yes" - else - gl_cv_pthread_rwlock_rdlock_prefer_writer="guessing no" - fi - ;; - # If we don't know, obey --enable-cross-guesses. - *) gl_cv_pthread_rwlock_rdlock_prefer_writer="$gl_cross_guess_normal" ;; + # Guess no on glibc systems. + *-gnu* | gnu*) gl_cv_pthread_rwlock_rdlock_prefer_writer="guessing no" ;; + # Guess no on musl systems. + *-musl* | midipix*) gl_cv_pthread_rwlock_rdlock_prefer_writer="guessing no" ;; + # Guess no on bionic systems. + *-android*) gl_cv_pthread_rwlock_rdlock_prefer_writer="guessing no" ;; + # Guess yes on native Windows with the mingw-w64 winpthreads library. + # Guess no on native Windows with the gnulib windows-rwlock module. + mingw*) if test "$gl_use_threads" = yes || test "$gl_use_threads" = posix; then + gl_cv_pthread_rwlock_rdlock_prefer_writer="guessing yes" + else + gl_cv_pthread_rwlock_rdlock_prefer_writer="guessing no" + fi + ;; + # If we don't know, obey --enable-cross-guesses. + *) gl_cv_pthread_rwlock_rdlock_prefer_writer="$gl_cross_guess_normal" ;; esac ]) LIBS="$save_LIBS" diff --git a/m4/pthread_sigmask.m4 b/m4/pthread_sigmask.m4 index 0aa8c53..2779528 100644 --- a/m4/pthread_sigmask.m4 +++ b/m4/pthread_sigmask.m4 @@ -1,5 +1,5 @@ -# pthread_sigmask.m4 serial 21 -dnl Copyright (C) 2011-2022 Free Software Foundation, Inc. +# pthread_sigmask.m4 serial 22 +dnl Copyright (C) 2011-2023 Free Software Foundation, Inc. dnl This file is free software; the Free Software Foundation dnl gives unlimited permission to copy and/or distribute it, dnl with or without modifications, as long as this notice is preserved. @@ -24,7 +24,7 @@ AC_DEFUN([gl_FUNC_PTHREAD_SIGMASK], [gl_cv_func_pthread_sigmask_macro=no]) ]) - LIB_PTHREAD_SIGMASK= + PTHREAD_SIGMASK_LIB= if test $gl_cv_func_pthread_sigmask_macro = yes; then dnl pthread_sigmask is a dummy macro. @@ -62,7 +62,7 @@ AC_DEFUN([gl_FUNC_PTHREAD_SIGMASK], ]) if test $gl_cv_func_pthread_sigmask_in_LIBMULTITHREAD = yes; then dnl pthread_sigmask is available with -pthread or -lpthread. - LIB_PTHREAD_SIGMASK="$LIBMULTITHREAD" + PTHREAD_SIGMASK_LIB="$LIBMULTITHREAD" else dnl pthread_sigmask is not available at all. HAVE_PTHREAD_SIGMASK=0 @@ -101,6 +101,9 @@ AC_DEFUN([gl_FUNC_PTHREAD_SIGMASK], ]) fi + AC_SUBST([PTHREAD_SIGMASK_LIB]) + dnl For backward compatibility. + LIB_PTHREAD_SIGMASK="$PTHREAD_SIGMASK_LIB" AC_SUBST([LIB_PTHREAD_SIGMASK]) dnl We don't need a variable LTLIB_PTHREAD_SIGMASK, because when dnl "$gl_threads_api" = posix, $LTLIBMULTITHREAD and $LIBMULTITHREAD are the @@ -114,7 +117,7 @@ AC_DEFUN([gl_FUNC_PTHREAD_SIGMASK], dnl On FreeBSD 13.0, MidnightBSD 1.1, HP-UX 11.31, Solaris 9, in programs dnl that are not linked with -lpthread, the pthread_sigmask() function dnl always returns 0 and has no effect. - if test -z "$LIB_PTHREAD_SIGMASK"; then + if test -z "$PTHREAD_SIGMASK_LIB"; then case " $LIBS " in *' -pthread '*) ;; *' -lpthread '*) ;; @@ -162,7 +165,7 @@ AC_DEFUN([gl_FUNC_PTHREAD_SIGMASK], [gl_cv_func_pthread_sigmask_return_works], [ gl_save_LIBS="$LIBS" - LIBS="$LIBS $LIB_PTHREAD_SIGMASK" + LIBS="$LIBS $PTHREAD_SIGMASK_LIB" AC_RUN_IFELSE( [AC_LANG_SOURCE([[ #include <pthread.h> @@ -208,13 +211,14 @@ int main () gl_cv_func_pthread_sigmask_unblock_works="guessing yes";; esac m4_ifdef([gl_][THREADLIB], - [dnl Link against $LIBMULTITHREAD, not only $LIB_PTHREAD_SIGMASK. + [dnl Link against $LIBMULTITHREAD, not only $PTHREAD_SIGMASK_LIB. dnl Otherwise we get a false positive on those platforms where dnl $gl_cv_func_pthread_sigmask_in_libc_works is "no". gl_save_LIBS=$LIBS LIBS="$LIBS $LIBMULTITHREAD"]) AC_RUN_IFELSE( [AC_LANG_SOURCE([[ +#include <limits.h> #include <pthread.h> #include <signal.h> #include <stdio.h> @@ -230,14 +234,16 @@ sigint_handler (int sig) int main () { sigset_t set; - int pid = getpid (); + pid_t pid = getpid (); char command[80]; + if (LONG_MAX < pid) + return 6; signal (SIGINT, sigint_handler); sigemptyset (&set); sigaddset (&set, SIGINT); if (!(pthread_sigmask (SIG_BLOCK, &set, NULL) == 0)) return 1; - sprintf (command, "sh -c 'sleep 1; kill -%d %d' &", SIGINT, pid); + sprintf (command, "sh -c 'sleep 1; kill -INT %ld' &", (long) pid); if (!(system (command) == 0)) return 2; sleep (2); diff --git a/m4/putenv.m4 b/m4/putenv.m4 index c7b4503..d37a602 100644 --- a/m4/putenv.m4 +++ b/m4/putenv.m4 @@ -1,5 +1,5 @@ -# putenv.m4 serial 25 -dnl Copyright (C) 2002-2022 Free Software Foundation, Inc. +# putenv.m4 serial 26 +dnl Copyright (C) 2002-2023 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. @@ -38,14 +38,14 @@ AC_DEFUN([gl_FUNC_PUTENV], [gl_cv_func_svid_putenv=no], [dnl When crosscompiling, assume putenv is broken. case "$host_os" in - # Guess yes on glibc systems. - *-gnu* | gnu*) gl_cv_func_svid_putenv="guessing yes" ;; - # Guess yes on musl systems. - *-musl*) gl_cv_func_svid_putenv="guessing yes" ;; - # Guess no on native Windows. - mingw*) gl_cv_func_svid_putenv="guessing no" ;; - # If we don't know, obey --enable-cross-guesses. - *) gl_cv_func_svid_putenv="$gl_cross_guess_normal" ;; + # Guess yes on glibc systems. + *-gnu* | gnu*) gl_cv_func_svid_putenv="guessing yes" ;; + # Guess yes on musl systems. + *-musl* | midipix*) gl_cv_func_svid_putenv="guessing yes" ;; + # Guess no on native Windows. + mingw*) gl_cv_func_svid_putenv="guessing no" ;; + # If we don't know, obey --enable-cross-guesses. + *) gl_cv_func_svid_putenv="$gl_cross_guess_normal" ;; esac ]) ]) diff --git a/m4/quote.m4 b/m4/quote.m4 index 47b1a0f..551437f 100644 --- a/m4/quote.m4 +++ b/m4/quote.m4 @@ -1,5 +1,5 @@ # quote.m4 serial 6 -dnl Copyright (C) 2002-2003, 2005-2006, 2009-2022 Free Software Foundation, +dnl Copyright (C) 2002-2003, 2005-2006, 2009-2023 Free Software Foundation, dnl Inc. dnl This file is free software; the Free Software Foundation dnl gives unlimited permission to copy and/or distribute it, diff --git a/m4/quotearg.m4 b/m4/quotearg.m4 index a07420f..15e4aa6 100644 --- a/m4/quotearg.m4 +++ b/m4/quotearg.m4 @@ -1,5 +1,5 @@ # quotearg.m4 serial 10 -dnl Copyright (C) 2002, 2004-2022 Free Software Foundation, Inc. +dnl Copyright (C) 2002, 2004-2023 Free Software Foundation, Inc. dnl This file is free software; the Free Software Foundation dnl gives unlimited permission to copy and/or distribute it, dnl with or without modifications, as long as this notice is preserved. diff --git a/m4/raise.m4 b/m4/raise.m4 index 0c78d09..f20c439 100644 --- a/m4/raise.m4 +++ b/m4/raise.m4 @@ -1,5 +1,5 @@ # raise.m4 serial 4 -dnl Copyright (C) 2011-2022 Free Software Foundation, Inc. +dnl Copyright (C) 2011-2023 Free Software Foundation, Inc. dnl This file is free software; the Free Software Foundation dnl gives unlimited permission to copy and/or distribute it, dnl with or without modifications, as long as this notice is preserved. diff --git a/m4/rawmemchr.m4 b/m4/rawmemchr.m4 index dae4193..a48d829 100644 --- a/m4/rawmemchr.m4 +++ b/m4/rawmemchr.m4 @@ -1,5 +1,5 @@ # rawmemchr.m4 serial 3 -dnl Copyright (C) 2003, 2007-2022 Free Software Foundation, Inc. +dnl Copyright (C) 2003, 2007-2023 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. @@ -1,5 +1,5 @@ # read.m4 serial 5 -dnl Copyright (C) 2011-2022 Free Software Foundation, Inc. +dnl Copyright (C) 2011-2023 Free Software Foundation, Inc. dnl This file is free software; the Free Software Foundation dnl gives unlimited permission to copy and/or distribute it, dnl with or without modifications, as long as this notice is preserved. diff --git a/m4/readlink.m4 b/m4/readlink.m4 index d1dd521..f1d41d2 100644 --- a/m4/readlink.m4 +++ b/m4/readlink.m4 @@ -1,5 +1,5 @@ -# readlink.m4 serial 16 -dnl Copyright (C) 2003, 2007, 2009-2022 Free Software Foundation, Inc. +# readlink.m4 serial 17 +dnl Copyright (C) 2003, 2007, 2009-2023 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. @@ -38,6 +38,9 @@ AC_DEFUN([gl_FUNC_READLINK], # Guess yes on Linux or glibc systems. linux-* | linux | *-gnu* | gnu*) gl_cv_func_readlink_trailing_slash="guessing yes" ;; + # Guess yes on systems that emulate the Linux system calls. + midipix*) + gl_cv_func_readlink_trailing_slash="guessing yes" ;; # Guess no on AIX or HP-UX. aix* | hpux*) gl_cv_func_readlink_trailing_slash="guessing no" ;; @@ -75,6 +78,9 @@ AC_DEFUN([gl_FUNC_READLINK], # Guess yes on Linux or glibc systems. linux-* | linux | *-gnu* | gnu*) gl_cv_func_readlink_truncate="guessing yes" ;; + # Guess yes on systems that emulate the Linux system calls. + midipix*) + gl_cv_func_readlink_truncate="guessing yes" ;; # Guess no on AIX or HP-UX. aix* | hpux*) gl_cv_func_readlink_truncate="guessing no" ;; diff --git a/m4/realloc.m4 b/m4/realloc.m4 index 86e57c2..2605391 100644 --- a/m4/realloc.m4 +++ b/m4/realloc.m4 @@ -1,5 +1,5 @@ -# realloc.m4 serial 26 -dnl Copyright (C) 2007, 2009-2022 Free Software Foundation, Inc. +# realloc.m4 serial 27 +dnl Copyright (C) 2007, 2009-2023 Free Software Foundation, Inc. dnl This file is free software; the Free Software Foundation dnl gives unlimited permission to copy and/or distribute it, dnl with or without modifications, as long as this notice is preserved. @@ -25,7 +25,7 @@ AC_DEFUN([_AC_FUNC_REALLOC_IF], [case "$host_os" in # Guess yes on platforms where we know the result. *-gnu* | freebsd* | netbsd* | openbsd* | bitrig* \ - | gnu* | *-musl* | midnightbsd* \ + | gnu* | *-musl* | midipix* | midnightbsd* \ | hpux* | solaris* | cygwin* | mingw* | msys* ) ac_cv_func_realloc_0_nonnull="guessing yes" ;; # If we don't know, obey --enable-cross-guesses. diff --git a/m4/reallocarray.m4 b/m4/reallocarray.m4 index f39ab6e..6a5b5ab 100644 --- a/m4/reallocarray.m4 +++ b/m4/reallocarray.m4 @@ -1,5 +1,5 @@ -# reallocarray.m4 serial 3 -dnl Copyright (C) 2017-2022 Free Software Foundation, Inc. +# reallocarray.m4 serial 5 +dnl Copyright (C) 2017-2023 Free Software Foundation, Inc. dnl This file is free software; the Free Software Foundation dnl gives unlimited permission to copy and/or distribute it, dnl with or without modifications, as long as this notice is preserved. @@ -11,9 +11,12 @@ AC_DEFUN([gl_FUNC_REALLOCARRAY], AC_REQUIRE([gl_STDLIB_H_DEFAULTS]) AC_REQUIRE([gl_CHECK_MALLOC_PTRDIFF]) - AC_CHECK_FUNCS([reallocarray]) + gl_CHECK_FUNCS_ANDROID([reallocarray], [[#include <stdlib.h>]]) if test "$ac_cv_func_reallocarray" = no; then HAVE_REALLOCARRAY=0 + case "$gl_cv_onwards_func_reallocarray" in + future*) REPLACE_REALLOCARRAY=1 ;; + esac elif test "$gl_cv_malloc_ptrdiff" = no; then REPLACE_REALLOCARRAY=1 fi diff --git a/m4/regex.m4 b/m4/regex.m4 index 4734298..c89a143 100644 --- a/m4/regex.m4 +++ b/m4/regex.m4 @@ -1,6 +1,6 @@ # serial 73 -# Copyright (C) 1996-2001, 2003-2022 Free Software Foundation, Inc. +# Copyright (C) 1996-2001, 2003-2023 Free Software Foundation, Inc. # # This file is free software; the Free Software Foundation # gives unlimited permission to copy and/or distribute it, diff --git a/m4/rpmatch.m4 b/m4/rpmatch.m4 index e5946f0..4a8bdf7 100644 --- a/m4/rpmatch.m4 +++ b/m4/rpmatch.m4 @@ -1,5 +1,5 @@ # rpmatch.m4 serial 10 -dnl Copyright (C) 2002-2003, 2007-2022 Free Software Foundation, Inc. +dnl Copyright (C) 2002-2003, 2007-2023 Free Software Foundation, Inc. dnl This file is free software; the Free Software Foundation dnl gives unlimited permission to copy and/or distribute it, dnl with or without modifications, as long as this notice is preserved. diff --git a/m4/safe-read.m4 b/m4/safe-read.m4 index 54d4769..fe4ab75 100644 --- a/m4/safe-read.m4 +++ b/m4/safe-read.m4 @@ -1,5 +1,5 @@ # safe-read.m4 serial 6 -dnl Copyright (C) 2002-2003, 2005-2006, 2009-2022 Free Software Foundation, +dnl Copyright (C) 2002-2003, 2005-2006, 2009-2023 Free Software Foundation, dnl Inc. dnl This file is free software; the Free Software Foundation dnl gives unlimited permission to copy and/or distribute it, diff --git a/m4/sched_h.m4 b/m4/sched_h.m4 index ce44f7b..980d256 100644 --- a/m4/sched_h.m4 +++ b/m4/sched_h.m4 @@ -1,5 +1,5 @@ # sched_h.m4 serial 15 -dnl Copyright (C) 2008-2022 Free Software Foundation, Inc. +dnl Copyright (C) 2008-2023 Free Software Foundation, Inc. dnl This file is free software; the Free Software Foundation dnl gives unlimited permission to copy and/or distribute it, dnl with or without modifications, as long as this notice is preserved. diff --git a/m4/sched_yield.m4 b/m4/sched_yield.m4 index d463a70..a1cb91e 100644 --- a/m4/sched_yield.m4 +++ b/m4/sched_yield.m4 @@ -1,5 +1,5 @@ # sched_yield.m4 serial 2 -dnl Copyright (C) 2019-2022 Free Software Foundation, Inc. +dnl Copyright (C) 2019-2023 Free Software Foundation, Inc. dnl This file is free software; the Free Software Foundation dnl gives unlimited permission to copy and/or distribute it, dnl with or without modifications, as long as this notice is preserved. diff --git a/m4/select.m4 b/m4/select.m4 index 163f8fb..88861af 100644 --- a/m4/select.m4 +++ b/m4/select.m4 @@ -1,5 +1,5 @@ -# select.m4 serial 13 -dnl Copyright (C) 2009-2022 Free Software Foundation, Inc. +# select.m4 serial 15 +dnl Copyright (C) 2009-2023 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. @@ -77,6 +77,8 @@ changequote([,])dnl case "$host_os" in # Guess yes on Linux systems. linux-* | linux) gl_cv_func_select_detects_ebadf="guessing yes" ;; + # Guess yes on systems that emulate the Linux system calls. + midipix*) gl_cv_func_select_detects_ebadf="guessing yes" ;; # Guess yes on glibc systems. *-gnu* | gnu*) gl_cv_func_select_detects_ebadf="guessing yes" ;; # If we don't know, obey --enable-cross-guesses. @@ -91,7 +93,7 @@ changequote([,])dnl fi dnl Determine the needed libraries. - LIB_SELECT="$LIBSOCKET" + SELECT_LIB="$LIBSOCKET" if test $REPLACE_SELECT = 1; then case "$host_os" in mingw*) @@ -109,9 +111,12 @@ main () return 0; }]])], [], - [LIB_SELECT="$LIB_SELECT -luser32"]) + [SELECT_LIB="$SELECT_LIB -luser32"]) ;; esac fi + AC_SUBST([SELECT_LIB]) + dnl For backward compatibility. + LIB_SELECT="$LIB_SELECT" AC_SUBST([LIB_SELECT]) ]) diff --git a/m4/semaphore.m4 b/m4/semaphore.m4 index c6be7b9..edbed96 100644 --- a/m4/semaphore.m4 +++ b/m4/semaphore.m4 @@ -1,5 +1,5 @@ # semaphore.m4 serial 1 -dnl Copyright (C) 2019-2022 Free Software Foundation, Inc. +dnl Copyright (C) 2019-2023 Free Software Foundation, Inc. dnl This file is free software; the Free Software Foundation dnl gives unlimited permission to copy and/or distribute it, dnl with or without modifications, as long as this notice is preserved. diff --git a/m4/setenv.m4 b/m4/setenv.m4 index 2000039..ef068ad 100644 --- a/m4/setenv.m4 +++ b/m4/setenv.m4 @@ -1,5 +1,5 @@ -# setenv.m4 serial 30 -dnl Copyright (C) 2001-2004, 2006-2022 Free Software Foundation, Inc. +# setenv.m4 serial 32 +dnl Copyright (C) 2001-2004, 2006-2023 Free Software Foundation, Inc. dnl This file is free software; the Free Software Foundation dnl gives unlimited permission to copy and/or distribute it, dnl with or without modifications, as long as this notice is preserved. @@ -35,12 +35,12 @@ AC_DEFUN([gl_FUNC_SETENV], ]])], [gl_cv_func_setenv_works=yes], [gl_cv_func_setenv_works=no], [case "$host_os" in - # Guess yes on glibc systems. - *-gnu* | gnu*) gl_cv_func_setenv_works="guessing yes" ;; - # Guess yes on musl systems. - *-musl*) gl_cv_func_setenv_works="guessing yes" ;; - # If we don't know, obey --enable-cross-guesses. - *) gl_cv_func_setenv_works="$gl_cross_guess_normal" ;; + # Guess yes on glibc systems. + *-gnu* | gnu*) gl_cv_func_setenv_works="guessing yes" ;; + # Guess yes on musl systems. + *-musl* | midipix*) gl_cv_func_setenv_works="guessing yes" ;; + # If we don't know, obey --enable-cross-guesses. + *) gl_cv_func_setenv_works="$gl_cross_guess_normal" ;; esac ])]) case "$gl_cv_func_setenv_works" in @@ -155,7 +155,7 @@ AC_DEFUN([gl_PREREQ_SETENV], AC_REQUIRE([gl_ENVIRON]) AC_CHECK_HEADERS_ONCE([unistd.h]) AC_CHECK_HEADERS([search.h]) - AC_CHECK_FUNCS([tsearch]) + gl_CHECK_FUNCS_ANDROID([tsearch], [[#include <search.h>]]) ]) # Prerequisites of lib/unsetenv.c. diff --git a/m4/setlocale.m4 b/m4/setlocale.m4 index c0023d9..2e8094d 100644 --- a/m4/setlocale.m4 +++ b/m4/setlocale.m4 @@ -1,5 +1,5 @@ -# setlocale.m4 serial 7 -dnl Copyright (C) 2011-2022 Free Software Foundation, Inc. +# setlocale.m4 serial 9 +dnl Copyright (C) 2011-2023 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. @@ -66,12 +66,15 @@ int main () fi if test $NEED_SETLOCALE_MTSAFE = 1; then - LIB_SETLOCALE="$LIB_SETLOCALE_NULL" + SETLOCALE_LIB="$SETLOCALE_NULL_LIB" else - LIB_SETLOCALE= + SETLOCALE_LIB= fi - dnl LIB_SETLOCALE is expected to be '-pthread' or '-lpthread' on AIX with gcc + dnl SETLOCALE_LIB is expected to be '-pthread' or '-lpthread' on AIX with gcc dnl or xlc, and empty otherwise. + AC_SUBST([SETLOCALE_LIB]) + dnl For backward compatibility. + LIB_SETLOCALE="$SETLOCALE_LIB" AC_SUBST([LIB_SETLOCALE]) ]) diff --git a/m4/setlocale_null.m4 b/m4/setlocale_null.m4 index 09ea50e..1105d69 100644 --- a/m4/setlocale_null.m4 +++ b/m4/setlocale_null.m4 @@ -1,5 +1,5 @@ -# setlocale_null.m4 serial 5 -dnl Copyright (C) 2019-2022 Free Software Foundation, Inc. +# setlocale_null.m4 serial 8 +dnl Copyright (C) 2019-2023 Free Software Foundation, Inc. dnl This file is free software; the Free Software Foundation dnl gives unlimited permission to copy and/or distribute it, dnl with or without modifications, as long as this notice is preserved. @@ -13,9 +13,23 @@ AC_DEFUN([gl_FUNC_SETLOCALE_NULL], AC_CACHE_CHECK([whether setlocale (LC_ALL, NULL) is multithread-safe], [gl_cv_func_setlocale_null_all_mtsafe], [case "$host_os" in - # Guess no on musl libc, macOS, FreeBSD, NetBSD, OpenBSD, AIX, Haiku, Cygwin. - *-musl* | darwin* | freebsd* | midnightbsd* | netbsd* | openbsd* | aix* | haiku* | cygwin*) + # Guess no on musl libc, macOS, FreeBSD, NetBSD, OpenBSD, AIX, Haiku. + *-musl* | midipix* | darwin* | freebsd* | midnightbsd* | netbsd* | openbsd* | aix* | haiku*) gl_cv_func_setlocale_null_all_mtsafe=no ;; + # Guess no on Cygwin < 3.4.6. + cygwin*) + AC_EGREP_CPP([Lucky user], + [ +#if defined __CYGWIN__ + #include <cygwin/version.h> + #if CYGWIN_VERSION_DLL_COMBINED >= CYGWIN_VERSION_DLL_MAKE_COMBINED (3004, 6) + Lucky user + #endif +#endif + ], + [gl_cv_func_setlocale_null_all_mtsafe=yes], + [gl_cv_func_setlocale_null_all_mtsafe=no]) + ;; # Guess yes on glibc, HP-UX, IRIX, Solaris, native Windows. *-gnu* | gnu* | hpux* | irix* | solaris* | mingw*) gl_cv_func_setlocale_null_all_mtsafe=yes ;; @@ -48,7 +62,7 @@ AC_DEFUN([gl_FUNC_SETLOCALE_NULL], openbsd* | aix*) gl_cv_func_setlocale_null_one_mtsafe=no ;; # Guess yes on glibc, musl libc, macOS, FreeBSD, NetBSD, HP-UX, IRIX, Solaris, Haiku, Cygwin, native Windows. - *-gnu* | gnu* | *-musl* | darwin* | freebsd* | midnightbsd* | netbsd* | hpux* | irix* | solaris* | haiku* | cygwin* | mingw*) + *-gnu* | gnu* | *-musl* | midipix* | darwin* | freebsd* | midnightbsd* | netbsd* | hpux* | irix* | solaris* | haiku* | cygwin* | mingw*) gl_cv_func_setlocale_null_one_mtsafe=yes ;; # If we don't know, obey --enable-cross-guesses. *) @@ -74,20 +88,23 @@ AC_DEFUN([gl_FUNC_SETLOCALE_NULL], dnl Determine link dependencies of lib/setlocale_null.c and lib/setlocale-lock.c. if test $SETLOCALE_NULL_ALL_MTSAFE = 0 || test $SETLOCALE_NULL_ONE_MTSAFE = 0; then case "$host_os" in - mingw*) LIB_SETLOCALE_NULL= ;; + mingw*) SETLOCALE_NULL_LIB= ;; *) gl_WEAK_SYMBOLS case "$gl_cv_have_weak" in - *yes) LIB_SETLOCALE_NULL= ;; - *) LIB_SETLOCALE_NULL="$LIBPTHREAD" ;; + *yes) SETLOCALE_NULL_LIB= ;; + *) SETLOCALE_NULL_LIB="$LIBPTHREAD" ;; esac ;; esac else - LIB_SETLOCALE_NULL= + SETLOCALE_NULL_LIB= fi - dnl LIB_SETLOCALE_NULL is expected to be '-pthread' or '-lpthread' on AIX + dnl SETLOCALE_NULL_LIB is expected to be '-pthread' or '-lpthread' on AIX dnl with gcc or xlc, and empty otherwise. + AC_SUBST([SETLOCALE_NULL_LIB]) + dnl For backward compatibility. + LIB_SETLOCALE_NULL="$SETLOCALE_NULL_LIB" AC_SUBST([LIB_SETLOCALE_NULL]) ]) diff --git a/m4/signal_h.m4 b/m4/signal_h.m4 index 4c05c62..cdd6812 100644 --- a/m4/signal_h.m4 +++ b/m4/signal_h.m4 @@ -1,5 +1,5 @@ # signal_h.m4 serial 22 -dnl Copyright (C) 2007-2022 Free Software Foundation, Inc. +dnl Copyright (C) 2007-2023 Free Software Foundation, Inc. dnl This file is free software; the Free Software Foundation dnl gives unlimited permission to copy and/or distribute it, dnl with or without modifications, as long as this notice is preserved. diff --git a/m4/signalblocking.m4 b/m4/signalblocking.m4 index b586ef5..81cc91a 100644 --- a/m4/signalblocking.m4 +++ b/m4/signalblocking.m4 @@ -1,5 +1,5 @@ # signalblocking.m4 serial 17 -dnl Copyright (C) 2001-2002, 2006-2022 Free Software Foundation, Inc. +dnl Copyright (C) 2001-2002, 2006-2023 Free Software Foundation, Inc. dnl This file is free software; the Free Software Foundation dnl gives unlimited permission to copy and/or distribute it, dnl with or without modifications, as long as this notice is preserved. diff --git a/m4/sleep.m4 b/m4/sleep.m4 index e73651f..269b73b 100644 --- a/m4/sleep.m4 +++ b/m4/sleep.m4 @@ -1,5 +1,5 @@ -# sleep.m4 serial 11 -dnl Copyright (C) 2007-2022 Free Software Foundation, Inc. +# sleep.m4 serial 12 +dnl Copyright (C) 2007-2023 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. @@ -50,6 +50,8 @@ handle_alarm (int sig) *-gnu* | gnu*) gl_cv_func_sleep_works="guessing yes" ;; # Guess yes on musl systems. *-musl*) gl_cv_func_sleep_works="guessing yes" ;; + # Guess yes on systems that emulate the Linux system calls. + midipix*) gl_cv_func_sleep_works="guessing yes" ;; # Guess no on native Windows. mingw*) gl_cv_func_sleep_works="guessing no" ;; # If we don't know, obey --enable-cross-guesses. diff --git a/m4/socketlib.m4 b/m4/socketlib.m4 index b8bd0af..a556af1 100644 --- a/m4/socketlib.m4 +++ b/m4/socketlib.m4 @@ -1,5 +1,5 @@ # socketlib.m4 serial 3 -dnl Copyright (C) 2008-2022 Free Software Foundation, Inc. +dnl Copyright (C) 2008-2023 Free Software Foundation, Inc. dnl This file is free software; the Free Software Foundation dnl gives unlimited permission to copy and/or distribute it, dnl with or without modifications, as long as this notice is preserved. diff --git a/m4/sockets.m4 b/m4/sockets.m4 index aa04acc..ed9cb87 100644 --- a/m4/sockets.m4 +++ b/m4/sockets.m4 @@ -1,5 +1,5 @@ # sockets.m4 serial 7 -dnl Copyright (C) 2008-2022 Free Software Foundation, Inc. +dnl Copyright (C) 2008-2023 Free Software Foundation, Inc. dnl This file is free software; the Free Software Foundation dnl gives unlimited permission to copy and/or distribute it, dnl with or without modifications, as long as this notice is preserved. diff --git a/m4/socklen.m4 b/m4/socklen.m4 index 1390ac4..1c63a85 100644 --- a/m4/socklen.m4 +++ b/m4/socklen.m4 @@ -1,5 +1,5 @@ # socklen.m4 serial 11 -dnl Copyright (C) 2005-2007, 2009-2022 Free Software Foundation, Inc. +dnl Copyright (C) 2005-2007, 2009-2023 Free Software Foundation, Inc. dnl This file is free software; the Free Software Foundation dnl gives unlimited permission to copy and/or distribute it, dnl with or without modifications, as long as this notice is preserved. diff --git a/m4/sockpfaf.m4 b/m4/sockpfaf.m4 index b1c4068..6c6dc2f 100644 --- a/m4/sockpfaf.m4 +++ b/m4/sockpfaf.m4 @@ -1,5 +1,5 @@ # sockpfaf.m4 serial 10 -dnl Copyright (C) 2004, 2006, 2009-2022 Free Software Foundation, Inc. +dnl Copyright (C) 2004, 2006, 2009-2023 Free Software Foundation, Inc. dnl This file is free software; the Free Software Foundation dnl gives unlimited permission to copy and/or distribute it, dnl with or without modifications, as long as this notice is preserved. diff --git a/m4/ssize_t.m4 b/m4/ssize_t.m4 index 03b2b89..1c12c33 100644 --- a/m4/ssize_t.m4 +++ b/m4/ssize_t.m4 @@ -1,5 +1,5 @@ # ssize_t.m4 serial 5 (gettext-0.18.2) -dnl Copyright (C) 2001-2003, 2006, 2010-2022 Free Software Foundation, Inc. +dnl Copyright (C) 2001-2003, 2006, 2010-2023 Free Software Foundation, Inc. dnl This file is free software; the Free Software Foundation dnl gives unlimited permission to copy and/or distribute it, dnl with or without modifications, as long as this notice is preserved. diff --git a/m4/stat-time.m4 b/m4/stat-time.m4 index 342857d..40993d5 100644 --- a/m4/stat-time.m4 +++ b/m4/stat-time.m4 @@ -1,6 +1,6 @@ # Checks for stat-related time functions. -# Copyright (C) 1998-1999, 2001, 2003, 2005-2007, 2009-2022 Free Software +# Copyright (C) 1998-1999, 2001, 2003, 2005-2007, 2009-2023 Free Software # Foundation, Inc. # This file is free software; the Free Software Foundation @@ -1,6 +1,6 @@ -# serial 18 +# serial 19 -# Copyright (C) 2009-2022 Free Software Foundation, Inc. +# Copyright (C) 2009-2023 Free Software Foundation, Inc. # # This file is free software; the Free Software Foundation # gives unlimited permission to copy and/or distribute it, @@ -45,6 +45,8 @@ AC_DEFUN([gl_FUNC_STAT], [case "$host_os" in # Guess yes on Linux systems. linux-* | linux) gl_cv_func_stat_file_slash="guessing yes" ;; + # Guess yes on systems that emulate the Linux system calls. + midipix*) gl_cv_func_stat_file_slash="guessing yes" ;; # Guess yes on glibc systems. *-gnu* | gnu*) gl_cv_func_stat_file_slash="guessing yes" ;; # If we don't know, obey --enable-cross-guesses. diff --git a/m4/stdalign.m4 b/m4/stdalign.m4 index 78577cb..f49cf8e 100644 --- a/m4/stdalign.m4 +++ b/m4/stdalign.m4 @@ -1,20 +1,28 @@ -# Check for stdalign.h that conforms to C11. +# Check for alignas and alignof that conform to C23. -dnl Copyright 2011-2022 Free Software Foundation, Inc. +dnl Copyright 2011-2023 Free Software Foundation, Inc. dnl This file is free software; the Free Software Foundation dnl gives unlimited permission to copy and/or distribute it, dnl with or without modifications, as long as this notice is preserved. +dnl Written by Paul Eggert and Bruno Haible. + # Prepare for substituting <stdalign.h> if it is not supported. -AC_DEFUN([gl_STDALIGN_H], +AC_DEFUN([gl_ALIGNASOF], [ - AC_CACHE_CHECK([for working stdalign.h], + AC_CACHE_CHECK([for alignas and alignof], [gl_cv_header_working_stdalign_h], - [AC_COMPILE_IFELSE( + [gl_save_CFLAGS=$CFLAGS + for gl_working in "yes, keywords" "yes, <stdalign.h> macros"; do + AS_CASE([$gl_working], + [*stdalign.h*], [CFLAGS="$gl_save_CFLAGS -DINCLUDE_STDALIGN_H"]) + AC_COMPILE_IFELSE( [AC_LANG_PROGRAM( [[#include <stdint.h> - #include <stdalign.h> + #ifdef INCLUDE_STDALIGN_H + #include <stdalign.h> + #endif #include <stddef.h> /* Test that alignof yields a result consistent with offsetof. @@ -30,7 +38,7 @@ AC_DEFUN([gl_STDALIGN_H], char test_long[ao (long int) % _Alignof (long int) == 0 ? 1 : -1]; char test_alignof[alignof (double) == _Alignof (double) ? 1 : -1]; - /* Test _Alignas only on platforms where gnulib can help. */ + /* Test alignas only on platforms where gnulib can help. */ #if \ ((defined __cplusplus && 201103 <= __cplusplus) \ || (__TINYC__ && defined __attribute__) \ @@ -45,12 +53,148 @@ AC_DEFUN([gl_STDALIGN_H], ? 1 : -1]; #endif ]])], - [gl_cv_header_working_stdalign_h=yes], - [gl_cv_header_working_stdalign_h=no])]) + [gl_cv_header_working_stdalign_h=$gl_working], + [gl_cv_header_working_stdalign_h=no]) + + CFLAGS=$gl_save_CFLAGS + test "$gl_cv_header_working_stdalign_h" != no && break + done]) + + AS_CASE([$gl_cv_header_working_stdalign_h], + [yes*keyword*], + [AC_DEFINE([HAVE_C_ALIGNASOF], [1], + [Define to 1 if the alignas and alignof keywords work.])]) + + dnl The "zz" puts this toward config.h's end, to avoid potential + dnl collisions with other definitions. + AH_VERBATIM([zzalignas], +[#if !defined HAVE_C_ALIGNASOF && __cplusplus < 201103 && !defined alignof +# if HAVE_STDALIGN_H +# include <stdalign.h> +# endif + +/* ISO C23 alignas and alignof for platforms that lack it. + + References: + ISO C23 (latest free draft + <http://www.open-std.org/jtc1/sc22/wg14/www/docs/n3047.pdf>) + sections 6.5.3.4, 6.7.5, 7.15. + C++11 (latest free draft + <http://www.open-std.org/jtc1/sc22/wg21/docs/papers/2011/n3242.pdf>) + section 18.10. */ + +/* alignof (TYPE), also known as _Alignof (TYPE), yields the alignment + requirement of a structure member (i.e., slot or field) that is of + type TYPE, as an integer constant expression. + + This differs from GCC's and clang's __alignof__ operator, which can + yield a better-performing alignment for an object of that type. For + example, on x86 with GCC and on Linux/x86 with clang, + __alignof__ (double) and __alignof__ (long long) are 8, whereas + alignof (double) and alignof (long long) are 4 unless the option + '-malign-double' is used. + + The result cannot be used as a value for an 'enum' constant, if you + want to be portable to HP-UX 10.20 cc and AIX 3.2.5 xlc. */ + +/* GCC releases before GCC 4.9 had a bug in _Alignof. See GCC bug 52023 + <https://gcc.gnu.org/bugzilla/show_bug.cgi?id=52023>. + clang versions < 8.0.0 have the same bug. */ +# if (!defined __STDC_VERSION__ || __STDC_VERSION__ < 201112 \ + || (defined __GNUC__ && __GNUC__ < 4 + (__GNUC_MINOR__ < 9) \ + && !defined __clang__) \ + || (defined __clang__ && __clang_major__ < 8)) +# undef/**/_Alignof +# ifdef __cplusplus +# if (201103 <= __cplusplus || defined _MSC_VER) +# define _Alignof(type) alignof (type) +# else + template <class __t> struct __alignof_helper { char __a; __t __b; }; +# define _Alignof(type) offsetof (__alignof_helper<type>, __b) +# define _GL_STDALIGN_NEEDS_STDDEF 1 +# endif +# else +# if (defined __GNUC__ && 4 <= __GNUC__) || defined __clang__ +# define _Alignof(type) __builtin_offsetof (struct { char __a; type __b; }, __b) +# else +# define _Alignof(type) offsetof (struct { char __a; type __b; }, __b) +# define _GL_STDALIGN_NEEDS_STDDEF 1 +# endif +# endif +# endif +# if ! (defined __cplusplus && (201103 <= __cplusplus || defined _MSC_VER)) +# undef/**/alignof +# define alignof _Alignof +# endif + +/* alignas (A), also known as _Alignas (A), aligns a variable or type + to the alignment A, where A is an integer constant expression. For + example: + + int alignas (8) foo; + struct s { int a; int alignas (8) bar; }; - if test $gl_cv_header_working_stdalign_h = yes; then + aligns the address of FOO and the offset of BAR to be multiples of 8. + + A should be a power of two that is at least the type's alignment + and at most the implementation's alignment limit. This limit is + 2**28 on typical GNUish hosts, and 2**13 on MSVC. To be portable + to MSVC through at least version 10.0, A should be an integer + constant, as MSVC does not support expressions such as 1 << 3. + To be portable to Sun C 5.11, do not align auto variables to + anything stricter than their default alignment. + + The following C23 requirements are not supported here: + + - If A is zero, alignas has no effect. + - alignas can be used multiple times; the strictest one wins. + - alignas (TYPE) is equivalent to alignas (alignof (TYPE)). + + */ +# if !HAVE_STDALIGN_H +# if !defined __STDC_VERSION__ || __STDC_VERSION__ < 201112 +# if defined __cplusplus && (201103 <= __cplusplus || defined _MSC_VER) +# define _Alignas(a) alignas (a) +# elif (!defined __attribute__ \ + && ((defined __APPLE__ && defined __MACH__ \ + ? 4 < __GNUC__ + (1 <= __GNUC_MINOR__) \ + : __GNUC__ && !defined __ibmxl__) \ + || (4 <= __clang_major__) \ + || (__ia64 && (61200 <= __HP_cc || 61200 <= __HP_aCC)) \ + || __ICC || 0x590 <= __SUNPRO_C || 0x0600 <= __xlC__)) +# define _Alignas(a) __attribute__ ((__aligned__ (a))) +# elif 1300 <= _MSC_VER +# define _Alignas(a) __declspec (align (a)) +# endif +# endif +# if ((defined _Alignas \ + && !(defined __cplusplus \ + && (201103 <= __cplusplus || defined _MSC_VER))) \ + || (defined __STDC_VERSION__ && 201112 <= __STDC_VERSION__)) +# define alignas _Alignas +# endif +# endif + +# if _GL_STDALIGN_NEEDS_STDDEF +# include <stddef.h> +# endif +#endif]) +]) + +AC_DEFUN([gl_STDALIGN_H], +[ + AC_REQUIRE([gl_ALIGNASOF]) + if test "$gl_cv_header_working_stdalign_h" = no; then + GL_GENERATE_STDALIGN_H=true + else GL_GENERATE_STDALIGN_H=false + fi + + gl_CHECK_NEXT_HEADERS([stdalign.h]) + if test $ac_cv_header_stdalign_h = yes; then + HAVE_STDALIGN_H=1 else - GL_GENERATE_STDALIGN_H=true + HAVE_STDALIGN_H=0 fi + AC_SUBST([HAVE_STDALIGN_H]) ]) diff --git a/m4/stdarg.m4 b/m4/stdarg.m4 index eafa86c..94787cc 100644 --- a/m4/stdarg.m4 +++ b/m4/stdarg.m4 @@ -1,5 +1,5 @@ # stdarg.m4 serial 8 -dnl Copyright (C) 2006, 2008-2022 Free Software Foundation, Inc. +dnl Copyright (C) 2006, 2008-2023 Free Software Foundation, Inc. dnl This file is free software; the Free Software Foundation dnl gives unlimited permission to copy and/or distribute it, dnl with or without modifications, as long as this notice is preserved. diff --git a/m4/stdbool.m4 b/m4/stdbool.m4 deleted file mode 100644 index 3e6c400..0000000 --- a/m4/stdbool.m4 +++ /dev/null @@ -1,117 +0,0 @@ -# Check for stdbool.h that conforms to C99. - -dnl Copyright (C) 2002-2006, 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. - -#serial 9 - -# Prepare for substituting <stdbool.h> if it is not supported. - -AC_DEFUN([gl_STDBOOL_H], -[ - AC_REQUIRE([AC_CHECK_HEADER_STDBOOL]) - AC_REQUIRE([AC_CANONICAL_HOST]) - - dnl On some platforms, <stdbool.h> does not exist or does not conform to C99. - dnl On Solaris 10 with CC=cc CXX=CC, <stdbool.h> exists but is not usable - dnl in C++ mode (and no <cstdbool> exists). In this case, we use our - dnl replacement, also in C mode (for binary compatibility between C and C++). - if test "$ac_cv_header_stdbool_h" = yes; then - case "$host_os" in - solaris*) - if test -z "$GCC"; then - GL_GENERATE_STDBOOL_H=true - else - GL_GENERATE_STDBOOL_H=false - fi - ;; - *) - GL_GENERATE_STDBOOL_H=false - ;; - esac - else - GL_GENERATE_STDBOOL_H=true - fi - - if test "$ac_cv_type__Bool" = yes; then - HAVE__BOOL=1 - else - HAVE__BOOL=0 - fi - AC_SUBST([HAVE__BOOL]) -]) - -# This version of the macro is needed in autoconf <= 2.68. - -AC_DEFUN([AC_CHECK_HEADER_STDBOOL], - [AC_CACHE_CHECK([for stdbool.h that conforms to C99], - [ac_cv_header_stdbool_h], - [AC_COMPILE_IFELSE( - [AC_LANG_PROGRAM( - [[ - #include <stdbool.h> - - #ifdef __cplusplus - typedef bool Bool; - #else - typedef _Bool Bool; - #ifndef bool - "error: bool is not defined" - #endif - #ifndef false - "error: false is not defined" - #endif - #if false - "error: false is not 0" - #endif - #ifndef true - "error: true is not defined" - #endif - #if true != 1 - "error: true is not 1" - #endif - #endif - - #ifndef __bool_true_false_are_defined - "error: __bool_true_false_are_defined is not defined" - #endif - - struct s { Bool s: 1; Bool t; bool u: 1; bool v; } s; - - char a[true == 1 ? 1 : -1]; - char b[false == 0 ? 1 : -1]; - char c[__bool_true_false_are_defined == 1 ? 1 : -1]; - char d[(bool) 0.5 == true ? 1 : -1]; - /* See body of main program for 'e'. */ - char f[(Bool) 0.0 == false ? 1 : -1]; - char g[true]; - char h[sizeof (Bool)]; - char i[sizeof s.t]; - enum { j = false, k = true, l = false * true, m = true * 256 }; - /* The following fails for - HP aC++/ANSI C B3910B A.05.55 [Dec 04 2003]. */ - Bool n[m]; - char o[sizeof n == m * sizeof n[0] ? 1 : -1]; - char p[-1 - (Bool) 0 < 0 && -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 - */ - Bool q = true; - Bool *pq = &q; - bool *qq = &q; - ]], - [[ - bool e = &s; - *pq |= q; *pq |= ! q; - *qq |= q; *qq |= ! q; - /* Refer to every declared value, to avoid compiler optimizations. */ - return (!a + !b + !c + !d + !e + !f + !g + !h + !i + !!j + !k + !!l - + !m + !n + !o + !p + !q + !pq + !qq); - ]])], - [ac_cv_header_stdbool_h=yes], - [ac_cv_header_stdbool_h=no])]) - AC_CHECK_TYPES([_Bool]) -]) diff --git a/m4/stddef_h.m4 b/m4/stddef_h.m4 index abfd203..aa01221 100644 --- a/m4/stddef_h.m4 +++ b/m4/stddef_h.m4 @@ -1,5 +1,5 @@ -# stddef_h.m4 serial 12 -dnl Copyright (C) 2009-2022 Free Software Foundation, Inc. +# stddef_h.m4 serial 14 +dnl Copyright (C) 2009-2023 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. @@ -22,7 +22,14 @@ AC_DEFUN_ONCE([gl_STDDEF_H], [gl_cv_type_max_align_t], [AC_COMPILE_IFELSE( [AC_LANG_PROGRAM( - [[#include <stddef.h> + [[/* On FreeBSD 12.0/x86, max_align_t defined by <stddef.h> has + the correct alignment with the default (wrong) definition of + _Alignof, but a wrong alignment as soon as we activate an + ISO C compliant _Alignof definition. */ + #if ((defined __GNUC__ && 4 <= __GNUC__) || defined __clang__) && !defined __cplusplus + #define _Alignof(type) __builtin_offsetof (struct { char __a; type __b; }, __b) + #endif + #include <stddef.h> unsigned int s = sizeof (max_align_t); #if defined __GNUC__ || defined __clang__ || defined __IBM__ALIGNOF__ int check1[2 * (__alignof__ (double) <= __alignof__ (max_align_t)) - 1]; @@ -61,6 +68,21 @@ AC_DEFUN_ONCE([gl_STDDEF_H], GL_GENERATE_STDDEF_H=true fi + AC_CACHE_CHECK([for unreachable], + [gl_cv_func_unreachable], + [AC_LINK_IFELSE( + [AC_LANG_PROGRAM( + [[#include <stddef.h> + ]], + [[unreachable (); + ]])], + [gl_cv_func_unreachable=yes], + [gl_cv_func_unreachable=no]) + ]) + if test $gl_cv_func_unreachable = no; then + GL_GENERATE_STDDEF_H=true + fi + if $GL_GENERATE_STDDEF_H; then gl_NEXT_HEADERS([stddef.h]) fi diff --git a/m4/stdint.m4 b/m4/stdint.m4 index c3f0894..d6961b0 100644 --- a/m4/stdint.m4 +++ b/m4/stdint.m4 @@ -1,5 +1,5 @@ # stdint.m4 serial 61 -dnl Copyright (C) 2001-2022 Free Software Foundation, Inc. +dnl Copyright (C) 2001-2023 Free Software Foundation, Inc. dnl This file is free software; the Free Software Foundation dnl gives unlimited permission to copy and/or distribute it, dnl with or without modifications, as long as this notice is preserved. diff --git a/m4/stdio_h.m4 b/m4/stdio_h.m4 index 42e9607..0756996 100644 --- a/m4/stdio_h.m4 +++ b/m4/stdio_h.m4 @@ -1,5 +1,5 @@ -# stdio_h.m4 serial 59 -dnl Copyright (C) 2007-2022 Free Software Foundation, Inc. +# stdio_h.m4 serial 61 +dnl Copyright (C) 2007-2023 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. @@ -82,6 +82,16 @@ AC_DEFUN_ONCE([gl_STDIO_H], if test $ac_cv_have_decl_fcloseall = no; then HAVE_DECL_FCLOSEALL=0 fi + + AC_CHECK_DECLS_ONCE([getw]) + if test $ac_cv_have_decl_getw = no; then + HAVE_DECL_GETW=0 + fi + + AC_CHECK_DECLS_ONCE([putw]) + if test $ac_cv_have_decl_putw = no; then + HAVE_DECL_PUTW=0 + fi ]) # gl_STDIO_MODULE_INDICATOR([modulename]) @@ -178,7 +188,9 @@ AC_DEFUN([gl_STDIO_H_DEFAULTS], HAVE_DECL_FTELLO=1; AC_SUBST([HAVE_DECL_FTELLO]) HAVE_DECL_GETDELIM=1; AC_SUBST([HAVE_DECL_GETDELIM]) HAVE_DECL_GETLINE=1; AC_SUBST([HAVE_DECL_GETLINE]) + HAVE_DECL_GETW=1; AC_SUBST([HAVE_DECL_GETW]) HAVE_DECL_OBSTACK_PRINTF=1; AC_SUBST([HAVE_DECL_OBSTACK_PRINTF]) + HAVE_DECL_PUTW=1; AC_SUBST([HAVE_DECL_PUTW]) HAVE_DECL_SNPRINTF=1; AC_SUBST([HAVE_DECL_SNPRINTF]) HAVE_DECL_VSNPRINTF=1; AC_SUBST([HAVE_DECL_VSNPRINTF]) HAVE_DPRINTF=1; AC_SUBST([HAVE_DPRINTF]) diff --git a/m4/stdlib_h.m4 b/m4/stdlib_h.m4 index 9e20969..249ef65 100644 --- a/m4/stdlib_h.m4 +++ b/m4/stdlib_h.m4 @@ -1,5 +1,5 @@ -# stdlib_h.m4 serial 66 -dnl Copyright (C) 2007-2022 Free Software Foundation, Inc. +# stdlib_h.m4 serial 71 +dnl Copyright (C) 2007-2023 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. @@ -23,7 +23,7 @@ AC_DEFUN_ONCE([gl_STDLIB_H], # include <random.h> #endif ]], [_Exit aligned_alloc atoll canonicalize_file_name free - getloadavg getsubopt grantpt + getloadavg getprogname getsubopt grantpt initstate initstate_r mbtowc mkdtemp mkostemp mkostemps mkstemp mkstemps posix_memalign posix_openpt ptsname ptsname_r qsort_r random random_r reallocarray realpath rpmatch secure_getenv setenv @@ -73,6 +73,7 @@ AC_DEFUN([gl_STDLIB_H_REQUIRE_DEFAULTS], gl_MODULE_INDICATOR_INIT_VARIABLE([GNULIB_CANONICALIZE_FILE_NAME]) gl_MODULE_INDICATOR_INIT_VARIABLE([GNULIB_FREE_POSIX]) gl_MODULE_INDICATOR_INIT_VARIABLE([GNULIB_GETLOADAVG]) + gl_MODULE_INDICATOR_INIT_VARIABLE([GNULIB_GETPROGNAME]) gl_MODULE_INDICATOR_INIT_VARIABLE([GNULIB_GETSUBOPT]) gl_MODULE_INDICATOR_INIT_VARIABLE([GNULIB_GRANTPT]) gl_MODULE_INDICATOR_INIT_VARIABLE([GNULIB_MALLOC_GNU]) @@ -130,6 +131,7 @@ AC_DEFUN([gl_STDLIB_H_DEFAULTS], HAVE_DECL_FCVT=1; AC_SUBST([HAVE_DECL_FCVT]) HAVE_DECL_GCVT=1; AC_SUBST([HAVE_DECL_GCVT]) HAVE_DECL_GETLOADAVG=1; AC_SUBST([HAVE_DECL_GETLOADAVG]) + HAVE_GETPROGNAME=1; AC_SUBST([HAVE_GETPROGNAME]) HAVE_GETSUBOPT=1; AC_SUBST([HAVE_GETSUBOPT]) HAVE_GRANTPT=1; AC_SUBST([HAVE_GRANTPT]) HAVE_INITSTATE=1; AC_SUBST([HAVE_INITSTATE]) @@ -166,17 +168,24 @@ AC_DEFUN([gl_STDLIB_H_DEFAULTS], HAVE_SYS_LOADAVG_H=0; AC_SUBST([HAVE_SYS_LOADAVG_H]) HAVE_UNLOCKPT=1; AC_SUBST([HAVE_UNLOCKPT]) HAVE_DECL_UNSETENV=1; AC_SUBST([HAVE_DECL_UNSETENV]) + REPLACE__EXIT=0; AC_SUBST([REPLACE__EXIT]) REPLACE_ALIGNED_ALLOC=0; AC_SUBST([REPLACE_ALIGNED_ALLOC]) REPLACE_CALLOC_FOR_CALLOC_GNU=0; AC_SUBST([REPLACE_CALLOC_FOR_CALLOC_GNU]) REPLACE_CALLOC_FOR_CALLOC_POSIX=0; AC_SUBST([REPLACE_CALLOC_FOR_CALLOC_POSIX]) REPLACE_CANONICALIZE_FILE_NAME=0; AC_SUBST([REPLACE_CANONICALIZE_FILE_NAME]) REPLACE_FREE=0; AC_SUBST([REPLACE_FREE]) + REPLACE_GETLOADAVG=0; AC_SUBST([REPLACE_GETLOADAVG]) + REPLACE_GETPROGNAME=0; AC_SUBST([REPLACE_GETPROGNAME]) + REPLACE_GETSUBOPT=0; AC_SUBST([REPLACE_GETSUBOPT]) REPLACE_INITSTATE=0; AC_SUBST([REPLACE_INITSTATE]) REPLACE_MALLOC_FOR_MALLOC_GNU=0; AC_SUBST([REPLACE_MALLOC_FOR_MALLOC_GNU]) REPLACE_MALLOC_FOR_MALLOC_POSIX=0; AC_SUBST([REPLACE_MALLOC_FOR_MALLOC_POSIX]) REPLACE_MBTOWC=0; AC_SUBST([REPLACE_MBTOWC]) + REPLACE_MKOSTEMP=0; AC_SUBST([REPLACE_MKOSTEMP]) + REPLACE_MKOSTEMPS=0; AC_SUBST([REPLACE_MKOSTEMPS]) REPLACE_MKSTEMP=0; AC_SUBST([REPLACE_MKSTEMP]) REPLACE_POSIX_MEMALIGN=0; AC_SUBST([REPLACE_POSIX_MEMALIGN]) + REPLACE_POSIX_OPENPT=0; AC_SUBST([REPLACE_POSIX_OPENPT]) REPLACE_PTSNAME=0; AC_SUBST([REPLACE_PTSNAME]) REPLACE_PTSNAME_R=0; AC_SUBST([REPLACE_PTSNAME_R]) REPLACE_PUTENV=0; AC_SUBST([REPLACE_PUTENV]) diff --git a/m4/strdup.m4 b/m4/strdup.m4 index da8899d..ecfcdd0 100644 --- a/m4/strdup.m4 +++ b/m4/strdup.m4 @@ -1,6 +1,6 @@ # strdup.m4 serial 15 -dnl Copyright (C) 2002-2022 Free Software Foundation, Inc. +dnl Copyright (C) 2002-2023 Free Software Foundation, Inc. dnl This file is free software; the Free Software Foundation dnl gives unlimited permission to copy and/or distribute it, diff --git a/m4/strerror.m4 b/m4/strerror.m4 index 4716649..9f1dddd 100644 --- a/m4/strerror.m4 +++ b/m4/strerror.m4 @@ -1,5 +1,5 @@ -# strerror.m4 serial 23 -dnl Copyright (C) 2002, 2007-2022 Free Software Foundation, Inc. +# strerror.m4 serial 24 +dnl Copyright (C) 2002, 2007-2023 Free Software Foundation, Inc. dnl This file is free software; the Free Software Foundation dnl gives unlimited permission to copy and/or distribute it, dnl with or without modifications, as long as this notice is preserved. @@ -24,12 +24,12 @@ AC_DEFUN([gl_FUNC_STRERROR], [gl_cv_func_working_strerror=yes], [gl_cv_func_working_strerror=no], [case "$host_os" in - # Guess yes on glibc systems. - *-gnu* | gnu*) gl_cv_func_working_strerror="guessing yes" ;; - # Guess yes on musl systems. - *-musl*) gl_cv_func_working_strerror="guessing yes" ;; - # If we don't know, obey --enable-cross-guesses. - *) gl_cv_func_working_strerror="$gl_cross_guess_normal" ;; + # Guess yes on glibc systems. + *-gnu* | gnu*) gl_cv_func_working_strerror="guessing yes" ;; + # Guess yes on musl systems. + *-musl* | midipix*) gl_cv_func_working_strerror="guessing yes" ;; + # If we don't know, obey --enable-cross-guesses. + *) gl_cv_func_working_strerror="$gl_cross_guess_normal" ;; esac ]) ]) @@ -80,14 +80,14 @@ AC_DEFUN([gl_FUNC_STRERROR_0], [gl_cv_func_strerror_0_works=yes], [gl_cv_func_strerror_0_works=no], [case "$host_os" in - # Guess yes on glibc systems. - *-gnu* | gnu*) gl_cv_func_strerror_0_works="guessing yes" ;; - # Guess yes on musl systems. - *-musl*) gl_cv_func_strerror_0_works="guessing yes" ;; - # Guess yes on native Windows. - mingw*) gl_cv_func_strerror_0_works="guessing yes" ;; - # If we don't know, obey --enable-cross-guesses. - *) gl_cv_func_strerror_0_works="$gl_cross_guess_normal" ;; + # Guess yes on glibc systems. + *-gnu* | gnu*) gl_cv_func_strerror_0_works="guessing yes" ;; + # Guess yes on musl systems. + *-musl* | midipix*) gl_cv_func_strerror_0_works="guessing yes" ;; + # Guess yes on native Windows. + mingw*) gl_cv_func_strerror_0_works="guessing yes" ;; + # If we don't know, obey --enable-cross-guesses. + *) gl_cv_func_strerror_0_works="$gl_cross_guess_normal" ;; esac ]) ]) diff --git a/m4/strerror_r.m4 b/m4/strerror_r.m4 index 23c3b42..d790ba8 100644 --- a/m4/strerror_r.m4 +++ b/m4/strerror_r.m4 @@ -1,5 +1,5 @@ -# strerror_r.m4 serial 24 -dnl Copyright (C) 2002, 2007-2022 Free Software Foundation, Inc. +# strerror_r.m4 serial 26 +dnl Copyright (C) 2002, 2007-2023 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. @@ -40,7 +40,7 @@ AC_DEFUN([gl_PREREQ_STRERROR_R], [ AC_REQUIRE([AC_FUNC_STRERROR_R]) dnl glibc >= 2.3.4 and cygwin 1.7.9 have a function __xpg_strerror_r. AC_CHECK_FUNCS_ONCE([__xpg_strerror_r]) - AC_CHECK_FUNCS_ONCE([catgets]) + gl_CHECK_FUNCS_ANDROID([catgets], [[#include <nl_types.h>]]) AC_CHECK_FUNCS_ONCE([snprintf]) ]) @@ -57,7 +57,7 @@ AC_DEFUN([gl_FUNC_STRERROR_R_WORKS], AC_REQUIRE([gl_FUNC_STRERROR_0]) - AC_CHECK_FUNCS_ONCE([strerror_r]) + gl_CHECK_FUNCS_ANDROID([strerror_r], [[#include <string.h>]]) if test $ac_cv_func_strerror_r = yes; then if test "$GL_GENERATE_ERRNO_H:$REPLACE_STRERROR_0" = false:0; then dnl The POSIX prototype is: int strerror_r (int, char *, size_t); @@ -172,5 +172,9 @@ changequote([,])dnl fi fi fi + else + case "$gl_cv_onwards_func_strerror_r" in + future*) REPLACE_STRERROR_R=1 ;; + esac fi ]) diff --git a/m4/string_h.m4 b/m4/string_h.m4 index 9e09b96..7f51391 100644 --- a/m4/string_h.m4 +++ b/m4/string_h.m4 @@ -1,11 +1,11 @@ # Configure a GNU-like replacement for <string.h>. -# Copyright (C) 2007-2022 Free Software Foundation, Inc. +# Copyright (C) 2007-2023 Free Software Foundation, Inc. # This file is free software; the Free Software Foundation # gives unlimited permission to copy and/or distribute it, # with or without modifications, as long as this notice is preserved. -# serial 34 +# serial 37 # Written by Paul Eggert. @@ -21,7 +21,8 @@ AC_DEFUN_ONCE([gl_STRING_H], dnl guaranteed by C89. gl_WARN_ON_USE_PREPARE([[#include <string.h> ]], - [ffsl ffsll memmem mempcpy memrchr rawmemchr stpcpy stpncpy strchrnul + [explicit_bzero ffsl ffsll memmem mempcpy memrchr memset_explicit + rawmemchr stpcpy stpncpy strchrnul strdup strncat strndup strnlen strpbrk strsep strcasestr strtok_r strerror_r strerrorname_np sigabbrev_np sigdescr_np strsignal strverscmp]) @@ -54,6 +55,7 @@ AC_DEFUN([gl_STRING_H_REQUIRE_DEFAULTS], gl_MODULE_INDICATOR_INIT_VARIABLE([GNULIB_MEMMEM]) gl_MODULE_INDICATOR_INIT_VARIABLE([GNULIB_MEMPCPY]) gl_MODULE_INDICATOR_INIT_VARIABLE([GNULIB_MEMRCHR]) + gl_MODULE_INDICATOR_INIT_VARIABLE([GNULIB_MEMSET_EXPLICIT]) gl_MODULE_INDICATOR_INIT_VARIABLE([GNULIB_RAWMEMCHR]) gl_MODULE_INDICATOR_INIT_VARIABLE([GNULIB_STPCPY]) gl_MODULE_INDICATOR_INIT_VARIABLE([GNULIB_STPNCPY]) @@ -107,6 +109,7 @@ AC_DEFUN([gl_STRING_H_DEFAULTS], HAVE_FFSLL=1; AC_SUBST([HAVE_FFSLL]) HAVE_DECL_MEMMEM=1; AC_SUBST([HAVE_DECL_MEMMEM]) HAVE_MEMPCPY=1; AC_SUBST([HAVE_MEMPCPY]) + HAVE_MEMSET_EXPLICIT=1; AC_SUBST([HAVE_MEMSET_EXPLICIT]) HAVE_DECL_MEMRCHR=1; AC_SUBST([HAVE_DECL_MEMRCHR]) HAVE_RAWMEMCHR=1; AC_SUBST([HAVE_RAWMEMCHR]) HAVE_STPCPY=1; AC_SUBST([HAVE_STPCPY]) @@ -128,6 +131,8 @@ AC_DEFUN([gl_STRING_H_DEFAULTS], REPLACE_FFSLL=0; AC_SUBST([REPLACE_FFSLL]) REPLACE_MEMCHR=0; AC_SUBST([REPLACE_MEMCHR]) REPLACE_MEMMEM=0; AC_SUBST([REPLACE_MEMMEM]) + REPLACE_MEMPCPY=0; AC_SUBST([REPLACE_MEMPCPY]) + REPLACE_STPCPY=0; AC_SUBST([REPLACE_STPCPY]) REPLACE_STPNCPY=0; AC_SUBST([REPLACE_STPNCPY]) REPLACE_STRCHRNUL=0; AC_SUBST([REPLACE_STRCHRNUL]) REPLACE_STRDUP=0; AC_SUBST([REPLACE_STRDUP]) diff --git a/m4/strtoll.m4 b/m4/strtoll.m4 index dc37d99..ec09609 100644 --- a/m4/strtoll.m4 +++ b/m4/strtoll.m4 @@ -1,5 +1,5 @@ -# strtoll.m4 serial 9 -dnl Copyright (C) 2002, 2004, 2006, 2008-2022 Free Software Foundation, Inc. +# strtoll.m4 serial 10 +dnl Copyright (C) 2002, 2004, 2006, 2008-2023 Free Software Foundation, Inc. dnl This file is free software; the Free Software Foundation dnl gives unlimited permission to copy and/or distribute it, dnl with or without modifications, as long as this notice is preserved. @@ -24,15 +24,26 @@ AC_DEFUN([gl_FUNC_STRTOLL], if (term != input + 1) result |= 1; } + /* This test fails on pre-C23 platforms. */ + { + const char input[] = "0b1"; + (void) strtoll (input, &term, 2); + if (term != input + 3) + result |= 2; + } return result; ]]) ], [gl_cv_func_strtoll_works=yes], [gl_cv_func_strtoll_works=no], [case "$host_os" in - # Guess no on native Windows. - mingw*) gl_cv_func_strtoll_works="guessing no" ;; - *) gl_cv_func_strtoll_works="$gl_cross_guess_normal" ;; + # Guess no on native Windows. + mingw*) gl_cv_func_strtoll_works="guessing no" ;; + # Guess no on glibc systems. + *-gnu* | gnu*) gl_cv_func_strtoll_works="guessing no" ;; + # Guess no on musl systems. + *-musl* | midipix*) gl_cv_func_strtoll_works="guessing no" ;; + *) gl_cv_func_strtoll_works="$gl_cross_guess_normal" ;; esac ]) ]) diff --git a/m4/strtoull.m4 b/m4/strtoull.m4 index 8c8e30c..4f895c7 100644 --- a/m4/strtoull.m4 +++ b/m4/strtoull.m4 @@ -1,5 +1,5 @@ -# strtoull.m4 serial 9 -dnl Copyright (C) 2002, 2004, 2006, 2008-2022 Free Software Foundation, Inc. +# strtoull.m4 serial 10 +dnl Copyright (C) 2002, 2004, 2006, 2008-2023 Free Software Foundation, Inc. dnl This file is free software; the Free Software Foundation dnl gives unlimited permission to copy and/or distribute it, dnl with or without modifications, as long as this notice is preserved. @@ -24,15 +24,26 @@ AC_DEFUN([gl_FUNC_STRTOULL], if (term != input + 1) result |= 1; } + /* This test fails on pre-C23 platforms. */ + { + const char input[] = "0b1"; + (void) strtoull (input, &term, 2); + if (term != input + 3) + result |= 2; + } return result; ]]) ], [gl_cv_func_strtoull_works=yes], [gl_cv_func_strtoull_works=no], [case "$host_os" in - # Guess no on native Windows. - mingw*) gl_cv_func_strtoull_works="guessing no" ;; - *) gl_cv_func_strtoull_works="$gl_cross_guess_normal" ;; + # Guess no on native Windows. + mingw*) gl_cv_func_strtoull_works="guessing no" ;; + # Guess no on glibc systems. + *-gnu* | gnu*) gl_cv_func_strtoull_works="guessing no" ;; + # Guess no on musl systems. + *-musl* | midipix*) gl_cv_func_strtoull_works="guessing no" ;; + *) gl_cv_func_strtoull_works="$gl_cross_guess_normal" ;; esac ]) ]) diff --git a/m4/symlink.m4 b/m4/symlink.m4 index 5be2bab..52d6c11 100644 --- a/m4/symlink.m4 +++ b/m4/symlink.m4 @@ -1,7 +1,7 @@ -# serial 9 +# serial 10 # See if we need to provide symlink replacement. -dnl Copyright (C) 2009-2022 Free Software Foundation, Inc. +dnl Copyright (C) 2009-2023 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. @@ -38,6 +38,8 @@ AC_DEFUN([gl_FUNC_SYMLINK], [case "$host_os" in # Guess yes on Linux systems. linux-* | linux) gl_cv_func_symlink_works="guessing yes" ;; + # Guess yes on systems that emulate the Linux system calls. + midipix*) gl_cv_func_symlink_works="guessing yes" ;; # Guess yes on glibc systems. *-gnu* | gnu*) gl_cv_func_symlink_works="guessing yes" ;; # If we don't know, obey --enable-cross-guesses. diff --git a/m4/sys_ioctl_h.m4 b/m4/sys_ioctl_h.m4 index be65364..80f0510 100644 --- a/m4/sys_ioctl_h.m4 +++ b/m4/sys_ioctl_h.m4 @@ -1,5 +1,5 @@ # sys_ioctl_h.m4 serial 15 -dnl Copyright (C) 2008-2022 Free Software Foundation, Inc. +dnl Copyright (C) 2008-2023 Free Software Foundation, Inc. dnl This file is free software; the Free Software Foundation dnl gives unlimited permission to copy and/or distribute it, dnl with or without modifications, as long as this notice is preserved. diff --git a/m4/sys_random_h.m4 b/m4/sys_random_h.m4 index a5ba85c..01d5fee 100644 --- a/m4/sys_random_h.m4 +++ b/m4/sys_random_h.m4 @@ -1,5 +1,5 @@ # sys_random_h.m4 serial 8 -dnl Copyright (C) 2020-2022 Free Software Foundation, Inc. +dnl Copyright (C) 2020-2023 Free Software Foundation, Inc. dnl This file is free software; the Free Software Foundation dnl gives unlimited permission to copy and/or distribute it, dnl with or without modifications, as long as this notice is preserved. diff --git a/m4/sys_select_h.m4 b/m4/sys_select_h.m4 index 2743cd1..4ec5ed7 100644 --- a/m4/sys_select_h.m4 +++ b/m4/sys_select_h.m4 @@ -1,5 +1,5 @@ # sys_select_h.m4 serial 23 -dnl Copyright (C) 2006-2022 Free Software Foundation, Inc. +dnl Copyright (C) 2006-2023 Free Software Foundation, Inc. dnl This file is free software; the Free Software Foundation dnl gives unlimited permission to copy and/or distribute it, dnl with or without modifications, as long as this notice is preserved. diff --git a/m4/sys_socket_h.m4 b/m4/sys_socket_h.m4 index ba3ae68..98a1041 100644 --- a/m4/sys_socket_h.m4 +++ b/m4/sys_socket_h.m4 @@ -1,5 +1,5 @@ # sys_socket_h.m4 serial 29 -dnl Copyright (C) 2005-2022 Free Software Foundation, Inc. +dnl Copyright (C) 2005-2023 Free Software Foundation, Inc. dnl This file is free software; the Free Software Foundation dnl gives unlimited permission to copy and/or distribute it, dnl with or without modifications, as long as this notice is preserved. diff --git a/m4/sys_stat_h.m4 b/m4/sys_stat_h.m4 index b5a9789..ca57398 100644 --- a/m4/sys_stat_h.m4 +++ b/m4/sys_stat_h.m4 @@ -1,5 +1,5 @@ -# sys_stat_h.m4 serial 41 -*- Autoconf -*- -dnl Copyright (C) 2006-2022 Free Software Foundation, Inc. +# sys_stat_h.m4 serial 42 -*- Autoconf -*- +dnl Copyright (C) 2006-2023 Free Software Foundation, Inc. dnl This file is free software; the Free Software Foundation dnl gives unlimited permission to copy and/or distribute it, dnl with or without modifications, as long as this notice is preserved. @@ -46,7 +46,7 @@ AC_DEFUN_ONCE([gl_SYS_STAT_H], dnl Check for declarations of anything we want to poison if the dnl corresponding gnulib module is not in use. gl_WARN_ON_USE_PREPARE([[#include <sys/stat.h> - ]], [fchmodat fstat fstatat futimens getumask lchmod lstat + ]], [chmod fchmodat fstat fstatat futimens getumask lchmod lstat mkdirat mkfifo mkfifoat mknod mknodat stat utimensat]) AC_REQUIRE([AC_C_RESTRICT]) @@ -72,6 +72,7 @@ AC_DEFUN([gl_SYS_STAT_H_REQUIRE_DEFAULTS], [ m4_defun(GL_MODULE_INDICATOR_PREFIX[_SYS_STAT_H_MODULE_INDICATOR_DEFAULTS], [ gl_UNISTD_H_REQUIRE_DEFAULTS dnl for REPLACE_FCHDIR + gl_MODULE_INDICATOR_INIT_VARIABLE([GNULIB_CHMOD]) gl_MODULE_INDICATOR_INIT_VARIABLE([GNULIB_FCHMODAT]) gl_MODULE_INDICATOR_INIT_VARIABLE([GNULIB_FSTAT]) gl_MODULE_INDICATOR_INIT_VARIABLE([GNULIB_FSTATAT]) @@ -112,6 +113,7 @@ AC_DEFUN([gl_SYS_STAT_H_DEFAULTS], HAVE_MKNOD=1; AC_SUBST([HAVE_MKNOD]) HAVE_MKNODAT=1; AC_SUBST([HAVE_MKNODAT]) HAVE_UTIMENSAT=1; AC_SUBST([HAVE_UTIMENSAT]) + REPLACE_CHMOD=0; AC_SUBST([REPLACE_CHMOD]) REPLACE_FCHMODAT=0; AC_SUBST([REPLACE_FCHMODAT]) REPLACE_FSTAT=0; AC_SUBST([REPLACE_FSTAT]) REPLACE_FSTATAT=0; AC_SUBST([REPLACE_FSTATAT]) diff --git a/m4/sys_time_h.m4 b/m4/sys_time_h.m4 index bc5e2b1..45a1f8b 100644 --- a/m4/sys_time_h.m4 +++ b/m4/sys_time_h.m4 @@ -1,7 +1,7 @@ # Configure a replacement for <sys/time.h>. # serial 12 -# Copyright (C) 2007, 2009-2022 Free Software Foundation, Inc. +# Copyright (C) 2007, 2009-2023 Free Software Foundation, Inc. # This file is free software; the Free Software Foundation # gives unlimited permission to copy and/or distribute it, # with or without modifications, as long as this notice is preserved. diff --git a/m4/sys_types_h.m4 b/m4/sys_types_h.m4 index a5bef22..627671f 100644 --- a/m4/sys_types_h.m4 +++ b/m4/sys_types_h.m4 @@ -1,5 +1,5 @@ # sys_types_h.m4 serial 13 -dnl Copyright (C) 2011-2022 Free Software Foundation, Inc. +dnl Copyright (C) 2011-2023 Free Software Foundation, Inc. dnl This file is free software; the Free Software Foundation dnl gives unlimited permission to copy and/or distribute it, dnl with or without modifications, as long as this notice is preserved. diff --git a/m4/sys_uio_h.m4 b/m4/sys_uio_h.m4 index 36f55ea..93a65d2 100644 --- a/m4/sys_uio_h.m4 +++ b/m4/sys_uio_h.m4 @@ -1,5 +1,5 @@ # sys_uio_h.m4 serial 3 -dnl Copyright (C) 2011-2022 Free Software Foundation, Inc. +dnl Copyright (C) 2011-2023 Free Software Foundation, Inc. dnl This file is free software; the Free Software Foundation dnl gives unlimited permission to copy and/or distribute it, dnl with or without modifications, as long as this notice is preserved. diff --git a/m4/tempname.m4 b/m4/tempname.m4 index 22ccec1..abed799 100644 --- a/m4/tempname.m4 +++ b/m4/tempname.m4 @@ -1,6 +1,6 @@ #serial 5 -# Copyright (C) 2006-2007, 2009-2022 Free Software Foundation, Inc. +# Copyright (C) 2006-2007, 2009-2023 Free Software Foundation, Inc. # This file is free software; the Free Software Foundation # gives unlimited permission to copy and/or distribute it, # with or without modifications, as long as this notice is preserved. diff --git a/m4/thread.m4 b/m4/thread.m4 index 1a8e543..9c63df3 100644 --- a/m4/thread.m4 +++ b/m4/thread.m4 @@ -1,5 +1,5 @@ -# thread.m4 serial 3 -dnl Copyright (C) 2008-2022 Free Software Foundation, Inc. +# thread.m4 serial 4 +dnl Copyright (C) 2008-2023 Free Software Foundation, Inc. dnl This file is free software; the Free Software Foundation dnl gives unlimited permission to copy and/or distribute it, dnl with or without modifications, as long as this notice is preserved. @@ -11,7 +11,7 @@ AC_DEFUN([gl_THREAD], if test $gl_threads_api = posix; then gl_save_LIBS="$LIBS" LIBS="$LIBS $LIBMULTITHREAD" - AC_CHECK_FUNCS([pthread_atfork]) + gl_CHECK_FUNCS_ANDROID([pthread_atfork], [[#include <pthread.h>]]) LIBS="$gl_save_LIBS" fi ]) diff --git a/m4/threadlib.m4 b/m4/threadlib.m4 index ecb4970..7202b95 100644 --- a/m4/threadlib.m4 +++ b/m4/threadlib.m4 @@ -1,5 +1,5 @@ -# threadlib.m4 serial 32 -dnl Copyright (C) 2005-2022 Free Software Foundation, Inc. +# threadlib.m4 serial 35 +dnl Copyright (C) 2005-2023 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. @@ -174,7 +174,7 @@ dnl Sets the variable LIBPMULTITHREAD, for programs that really need dnl multithread functionality. The difference between LIBPTHREAD and dnl LIBPMULTITHREAD is that on platforms supporting weak symbols, typically dnl LIBPTHREAD is empty whereas LIBPMULTITHREAD is not. -dnl Sets the variable LIB_SCHED_YIELD to the linker options needed to use the +dnl Sets the variable SCHED_YIELD_LIB to the linker options needed to use the dnl sched_yield() function. dnl Adds to CPPFLAGS the flag -D_REENTRANT or -D_THREAD_SAFE if needed for dnl multithread-safe programs. @@ -261,7 +261,9 @@ AC_DEFUN([gl_PTHREADLIB_BODY], # On Solaris 10 or newer, this test is no longer needed, because # libc contains the fully functional pthread functions. case "$host_os" in +changequote(,)dnl solaris | solaris2.[1-9] | solaris2.[1-9].* | hpux*) +changequote([,])dnl AC_DEFINE([PTHREAD_IN_USE_DETECTION_HARD], [1], [Define if the pthread_in_use() detection is hard.]) esac @@ -297,13 +299,16 @@ AC_DEFUN([gl_PTHREADLIB_BODY], [AC_LANG_PROGRAM( [[#include <sched.h>]], [[sched_yield ();]])], - [LIB_SCHED_YIELD= + [SCHED_YIELD_LIB= ], [dnl Solaris 7...10 has sched_yield in librt, not in libpthread or libc. - AC_CHECK_LIB([rt], [sched_yield], [LIB_SCHED_YIELD=-lrt], + AC_CHECK_LIB([rt], [sched_yield], [SCHED_YIELD_LIB=-lrt], [dnl Solaris 2.5.1, 2.6 has sched_yield in libposix4, not librt. - AC_CHECK_LIB([posix4], [sched_yield], [LIB_SCHED_YIELD=-lposix4])]) + AC_CHECK_LIB([posix4], [sched_yield], [SCHED_YIELD_LIB=-lposix4])]) ]) + AC_SUBST([SCHED_YIELD_LIB]) + dnl For backward compatibility. + LIB_SCHED_YIELD="$SCHED_YIELD_LIB" AC_SUBST([LIB_SCHED_YIELD]) gl_pthreadlib_body_done=done @@ -349,7 +354,7 @@ AC_DEFUN([gl_STDTHREADLIB_BODY], dnl on libpthread (for the symbol 'pthread_mutexattr_gettype'). dnl glibc >= 2.34, AIX >= 7.1, and Solaris >= 11.4 have thrd_create in dnl libc. - AC_CHECK_FUNCS([thrd_create]) + gl_CHECK_FUNCS_ANDROID([thrd_create], [[#include <threads.h>]]) if test $ac_cv_func_thrd_create = yes; then LIBSTDTHREAD= else @@ -362,7 +367,7 @@ AC_DEFUN([gl_STDTHREADLIB_BODY], fi else dnl Libraries needed by thrd.c, mtx.c, cnd.c, tss.c. - LIBSTDTHREAD="$LIBPMULTITHREAD $LIB_SCHED_YIELD" + LIBSTDTHREAD="$LIBPMULTITHREAD $SCHED_YIELD_LIB" fi ;; esac diff --git a/m4/time.m4 b/m4/time.m4 new file mode 100644 index 0000000..4c4e411 --- /dev/null +++ b/m4/time.m4 @@ -0,0 +1,48 @@ +# time.m4 serial 3 +dnl Copyright (C) 2023 Free Software Foundation, Inc. +dnl This file is free software; the Free Software Foundation +dnl gives unlimited permission to copy and/or distribute it, +dnl with or without modifications, as long as this notice is preserved. + +dnl From Bruno Haible. + +AC_DEFUN([gl_FUNC_TIME], +[ + AC_REQUIRE([AC_CANONICAL_HOST]) + dnl glibc has the bug https://sourceware.org/bugzilla/show_bug.cgi?id=30200 . + AC_CACHE_CHECK([whether time() works], + [gl_cv_func_time_works], + [dnl Guess that it works except on + dnl - glibc >= 2.31 with Linux. And binaries produced on glibc < 2.31 + dnl need to run fine on newer glibc versions as well; therefore ignore + dnl __GLIBC_MINOR__. + dnl - AIX, + dnl - native Windows. + case "$host_os" in + linux*-gnu*) + AC_EGREP_CPP([Unlucky], [ + #include <features.h> + #ifdef __GNU_LIBRARY__ + #if __GLIBC__ == 2 + Unlucky GNU user + #endif + #endif + ], + [gl_cv_func_time_works="guessing no"], + [gl_cv_func_time_works="guessing yes"]) + ;; + aix*) gl_cv_func_time_works="guessing no";; + mingw*) gl_cv_func_time_works="guessing no";; + *) gl_cv_func_time_works="guessing yes";; + esac + ]) + case "$gl_cv_func_time_works" in + *no) REPLACE_TIME=1 ;; + esac +]) + +# Prerequisites of lib/time.c. +AC_DEFUN([gl_PREREQ_TIME], +[ + : +]) diff --git a/m4/time_h.m4 b/m4/time_h.m4 index 98d7b6e..51d553a 100644 --- a/m4/time_h.m4 +++ b/m4/time_h.m4 @@ -1,8 +1,8 @@ # Configure a more-standard replacement for <time.h>. -# Copyright (C) 2000-2001, 2003-2007, 2009-2022 Free Software Foundation, Inc. +# Copyright (C) 2000-2001, 2003-2007, 2009-2023 Free Software Foundation, Inc. -# serial 19 +# serial 22 # This file is free software; the Free Software Foundation # gives unlimited permission to copy and/or distribute it, @@ -19,6 +19,12 @@ AC_DEFUN_ONCE([gl_TIME_H], gl_NEXT_HEADERS([time.h]) AC_REQUIRE([gl_CHECK_TYPE_STRUCT_TIMESPEC]) + dnl Check for declarations of anything we want to poison if the + dnl corresponding gnulib module is not in use. + gl_WARN_ON_USE_PREPARE([[ +#include <time.h> + ]], [asctime_r ctime_r]) + AC_REQUIRE([AC_C_RESTRICT]) AC_CACHE_CHECK([for TIME_UTC in <time.h>], @@ -131,6 +137,7 @@ AC_DEFUN([gl_TIME_H_REQUIRE_DEFAULTS], gl_MODULE_INDICATOR_INIT_VARIABLE([GNULIB_NANOSLEEP]) gl_MODULE_INDICATOR_INIT_VARIABLE([GNULIB_STRFTIME]) gl_MODULE_INDICATOR_INIT_VARIABLE([GNULIB_STRPTIME]) + gl_MODULE_INDICATOR_INIT_VARIABLE([GNULIB_TIME]) gl_MODULE_INDICATOR_INIT_VARIABLE([GNULIB_TIMEGM]) gl_MODULE_INDICATOR_INIT_VARIABLE([GNULIB_TIMESPEC_GET]) gl_MODULE_INDICATOR_INIT_VARIABLE([GNULIB_TIMESPEC_GETRES]) @@ -163,7 +170,9 @@ AC_DEFUN([gl_TIME_H_DEFAULTS], REPLACE_MKTIME=GNULIB_PORTCHECK; AC_SUBST([REPLACE_MKTIME]) REPLACE_NANOSLEEP=GNULIB_PORTCHECK; AC_SUBST([REPLACE_NANOSLEEP]) REPLACE_STRFTIME=GNULIB_PORTCHECK; AC_SUBST([REPLACE_STRFTIME]) + REPLACE_TIME=0; AC_SUBST([REPLACE_TIME]) REPLACE_TIMEGM=GNULIB_PORTCHECK; AC_SUBST([REPLACE_TIMEGM]) + REPLACE_TIMESPEC_GET=GNULIB_PORTCHECK; AC_SUBST([REPLACE_TIMESPEC_GET]) REPLACE_TZSET=GNULIB_PORTCHECK; AC_SUBST([REPLACE_TZSET]) dnl Hack so that the time module doesn't depend on the sys_time module. diff --git a/m4/unistd_h.m4 b/m4/unistd_h.m4 index 4c66ccc..1c96158 100644 --- a/m4/unistd_h.m4 +++ b/m4/unistd_h.m4 @@ -1,5 +1,5 @@ -# unistd_h.m4 serial 90 -dnl Copyright (C) 2006-2022 Free Software Foundation, Inc. +# unistd_h.m4 serial 94 +dnl Copyright (C) 2006-2023 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. @@ -225,6 +225,7 @@ AC_DEFUN([gl_UNISTD_H_DEFAULTS], REPLACE_COPY_FILE_RANGE=0; AC_SUBST([REPLACE_COPY_FILE_RANGE]) REPLACE_DUP=0; AC_SUBST([REPLACE_DUP]) REPLACE_DUP2=0; AC_SUBST([REPLACE_DUP2]) + REPLACE_DUP3=0; AC_SUBST([REPLACE_DUP3]) REPLACE_EXECL=0; AC_SUBST([REPLACE_EXECL]) REPLACE_EXECLE=0; AC_SUBST([REPLACE_EXECLE]) REPLACE_EXECLP=0; AC_SUBST([REPLACE_EXECLP]) @@ -234,10 +235,12 @@ AC_DEFUN([gl_UNISTD_H_DEFAULTS], REPLACE_EXECVPE=0; AC_SUBST([REPLACE_EXECVPE]) REPLACE_FACCESSAT=0; AC_SUBST([REPLACE_FACCESSAT]) REPLACE_FCHOWNAT=0; AC_SUBST([REPLACE_FCHOWNAT]) + REPLACE_FDATASYNC=0; AC_SUBST([REPLACE_FDATASYNC]) REPLACE_FTRUNCATE=0; AC_SUBST([REPLACE_FTRUNCATE]) REPLACE_GETCWD=0; AC_SUBST([REPLACE_GETCWD]) REPLACE_GETDOMAINNAME=0; AC_SUBST([REPLACE_GETDOMAINNAME]) REPLACE_GETDTABLESIZE=0; AC_SUBST([REPLACE_GETDTABLESIZE]) + REPLACE_GETENTROPY=0; AC_SUBST([REPLACE_GETENTROPY]) REPLACE_GETLOGIN_R=0; AC_SUBST([REPLACE_GETLOGIN_R]) REPLACE_GETGROUPS=0; AC_SUBST([REPLACE_GETGROUPS]) REPLACE_GETPAGESIZE=0; AC_SUBST([REPLACE_GETPAGESIZE]) @@ -248,12 +251,14 @@ AC_DEFUN([gl_UNISTD_H_DEFAULTS], REPLACE_LINK=0; AC_SUBST([REPLACE_LINK]) REPLACE_LINKAT=0; AC_SUBST([REPLACE_LINKAT]) REPLACE_LSEEK=0; AC_SUBST([REPLACE_LSEEK]) + REPLACE_PIPE2=0; AC_SUBST([REPLACE_PIPE2]) REPLACE_PREAD=0; AC_SUBST([REPLACE_PREAD]) REPLACE_PWRITE=0; AC_SUBST([REPLACE_PWRITE]) REPLACE_READ=0; AC_SUBST([REPLACE_READ]) REPLACE_READLINK=0; AC_SUBST([REPLACE_READLINK]) REPLACE_READLINKAT=0; AC_SUBST([REPLACE_READLINKAT]) REPLACE_RMDIR=0; AC_SUBST([REPLACE_RMDIR]) + REPLACE_SETHOSTNAME=0; AC_SUBST([REPLACE_SETHOSTNAME]) REPLACE_SLEEP=0; AC_SUBST([REPLACE_SLEEP]) REPLACE_SYMLINK=0; AC_SUBST([REPLACE_SYMLINK]) REPLACE_SYMLINKAT=0; AC_SUBST([REPLACE_SYMLINKAT]) diff --git a/m4/unlink.m4 b/m4/unlink.m4 index e25b567..1fecaac 100644 --- a/m4/unlink.m4 +++ b/m4/unlink.m4 @@ -1,5 +1,5 @@ -# unlink.m4 serial 15 -dnl Copyright (C) 2009-2022 Free Software Foundation, Inc. +# unlink.m4 serial 16 +dnl Copyright (C) 2009-2023 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. @@ -45,6 +45,8 @@ AC_DEFUN([gl_FUNC_UNLINK], [case "$host_os" in # Guess yes on Linux systems. linux-* | linux) gl_cv_func_unlink_honors_slashes="guessing yes" ;; + # Guess yes on systems that emulate the Linux system calls. + midipix*) gl_cv_func_unlink_honors_slashes="guessing yes" ;; # Guess yes on glibc systems. *-gnu*) gl_cv_func_unlink_honors_slashes="guessing yes" ;; # Guess no on native Windows. diff --git a/m4/unlinkdir.m4 b/m4/unlinkdir.m4 index 8e3aa9a..c3a9cfd 100644 --- a/m4/unlinkdir.m4 +++ b/m4/unlinkdir.m4 @@ -1,6 +1,6 @@ # serial 7 -# Copyright (C) 2005-2007, 2009-2022 Free Software Foundation, Inc. +# Copyright (C) 2005-2007, 2009-2023 Free Software Foundation, Inc. # # This file is free software; the Free Software Foundation # gives unlimited permission to copy and/or distribute it, diff --git a/m4/usleep.m4 b/m4/usleep.m4 index 25d23f5..d904224 100644 --- a/m4/usleep.m4 +++ b/m4/usleep.m4 @@ -1,5 +1,5 @@ -# usleep.m4 serial 7 -dnl Copyright (C) 2009-2022 Free Software Foundation, Inc. +# usleep.m4 serial 8 +dnl Copyright (C) 2009-2023 Free Software Foundation, Inc. dnl This file is free software; the Free Software Foundation dnl gives unlimited permission to copy and/or distribute it, dnl with or without modifications, as long as this notice is preserved. @@ -33,6 +33,8 @@ AC_DEFUN([gl_FUNC_USLEEP], *-gnu* | gnu*) gl_cv_func_usleep_works="guessing yes" ;; # Guess yes on musl systems. *-musl*) gl_cv_func_usleep_works="guessing yes" ;; + # Guess yes on systems that emulate the Linux system calls. + midipix*) gl_cv_func_usleep_works="guessing yes" ;; # Guess no on native Windows. mingw*) gl_cv_func_usleep_works="guessing no" ;; # If we don't know, obey --enable-cross-guesses. diff --git a/m4/version-etc.m4 b/m4/version-etc.m4 index c1f355b..76b5d3e 100644 --- a/m4/version-etc.m4 +++ b/m4/version-etc.m4 @@ -1,5 +1,5 @@ # version-etc.m4 serial 1 -# Copyright (C) 2009-2022 Free Software Foundation, Inc. +# Copyright (C) 2009-2023 Free Software Foundation, Inc. # This file is free software; the Free Software Foundation # gives unlimited permission to copy and/or distribute it, # with or without modifications, as long as this notice is preserved. diff --git a/m4/visibility.m4 b/m4/visibility.m4 index 4a212a4..f0468e8 100644 --- a/m4/visibility.m4 +++ b/m4/visibility.m4 @@ -1,5 +1,5 @@ # visibility.m4 serial 8 -dnl Copyright (C) 2005, 2008, 2010-2022 Free Software Foundation, Inc. +dnl Copyright (C) 2005, 2008, 2010-2023 Free Software Foundation, Inc. dnl This file is free software; the Free Software Foundation dnl gives unlimited permission to copy and/or distribute it, dnl with or without modifications, as long as this notice is preserved. diff --git a/m4/warn-on-use.m4 b/m4/warn-on-use.m4 index d43355a..10649c5 100644 --- a/m4/warn-on-use.m4 +++ b/m4/warn-on-use.m4 @@ -1,5 +1,5 @@ -# warn-on-use.m4 serial 9 -dnl Copyright (C) 2010-2022 Free Software Foundation, Inc. +# warn-on-use.m4 serial 10 +dnl Copyright (C) 2010-2023 Free Software Foundation, Inc. dnl This file is free software; the Free Software Foundation dnl gives unlimited permission to copy and/or distribute it, dnl with or without modifications, as long as this notice is preserved. @@ -32,17 +32,30 @@ AC_DEFUN([gl_WARN_ON_USE_PREPARE], undefining macros.])])dnl for gl_func in m4_flatten([$2]); do AS_VAR_PUSHDEF([gl_Symbol], [gl_cv_have_raw_decl_$gl_func])dnl + dnl As a workaround to implicit built-in function declarations in + dnl clang (e.g. strndup), reference ac_compile_for_check_decl instead + dnl of ac_compile. If, for whatever reason, the override of AC_PROG_CC + dnl in zzgnulib.m4 is inactive, use the original ac_compile. + ac_save_ac_compile="$ac_compile" + if test -n "$ac_compile_for_check_decl"; then + ac_compile="$ac_compile_for_check_decl" + fi AC_CACHE_CHECK([whether $gl_func is declared without a macro], [gl_Symbol], [AC_COMPILE_IFELSE([AC_LANG_PROGRAM([$1], [[#undef $gl_func (void) $gl_func;]])], [AS_VAR_SET([gl_Symbol], [yes])], [AS_VAR_SET([gl_Symbol], [no])])]) + ac_compile="$ac_save_ac_compile" AS_VAR_IF([gl_Symbol], [yes], [AC_DEFINE_UNQUOTED(AS_TR_CPP([HAVE_RAW_DECL_$gl_func]), [1]) - dnl shortcut - if the raw declaration exists, then set a cache - dnl variable to allow skipping any later AC_CHECK_DECL efforts - eval ac_cv_have_decl_$gl_func=yes]) + dnl Shortcut for an AC_CHECK_DECL invocation that may come later: + dnl If the raw declaration exists with the given includes, then + dnl AC_CHECK_DECL with its many includes would see it as well. + dnl So, set a cache variable to allow skipping any later + dnl AC_CHECK_DECL invocation for $gl_func. + eval "ac_cv_have_decl_$gl_func=yes" + ]) AS_VAR_POPDEF([gl_Symbol])dnl done ]) diff --git a/m4/warnings.m4 b/m4/warnings.m4 index 60088f9..063bc5c 100644 --- a/m4/warnings.m4 +++ b/m4/warnings.m4 @@ -1,5 +1,5 @@ # warnings.m4 serial 16 -dnl Copyright (C) 2008-2022 Free Software Foundation, Inc. +dnl Copyright (C) 2008-2023 Free Software Foundation, Inc. dnl This file is free software; the Free Software Foundation dnl gives unlimited permission to copy and/or distribute it, dnl with or without modifications, as long as this notice is preserved. diff --git a/m4/wchar_h.m4 b/m4/wchar_h.m4 index 4baba1a..ad3d4ec 100644 --- a/m4/wchar_h.m4 +++ b/m4/wchar_h.m4 @@ -1,13 +1,13 @@ dnl A placeholder for ISO C99 <wchar.h>, for platforms that have issues. -dnl Copyright (C) 2007-2022 Free Software Foundation, Inc. +dnl Copyright (C) 2007-2023 Free Software Foundation, Inc. dnl This file is free software; the Free Software Foundation dnl gives unlimited permission to copy and/or distribute it, dnl with or without modifications, as long as this notice is preserved. dnl Written by Eric Blake. -# wchar_h.m4 serial 55 +# wchar_h.m4 serial 56 AC_DEFUN_ONCE([gl_WCHAR_H], [ @@ -254,4 +254,5 @@ AC_DEFUN([gl_WCHAR_H_DEFAULTS], REPLACE_WCSWIDTH=0; AC_SUBST([REPLACE_WCSWIDTH]) REPLACE_WCSFTIME=0; AC_SUBST([REPLACE_WCSFTIME]) REPLACE_WCSTOK=0; AC_SUBST([REPLACE_WCSTOK]) + REPLACE_WMEMPCPY=0; AC_SUBST([REPLACE_WMEMPCPY]) ]) diff --git a/m4/wchar_t.m4 b/m4/wchar_t.m4 index 268e3e5..50bde08 100644 --- a/m4/wchar_t.m4 +++ b/m4/wchar_t.m4 @@ -1,5 +1,5 @@ # wchar_t.m4 serial 4 (gettext-0.18.2) -dnl Copyright (C) 2002-2003, 2008-2022 Free Software Foundation, Inc. +dnl Copyright (C) 2002-2003, 2008-2023 Free Software Foundation, Inc. dnl This file is free software; the Free Software Foundation dnl gives unlimited permission to copy and/or distribute it, dnl with or without modifications, as long as this notice is preserved. diff --git a/m4/wcrtomb.m4 b/m4/wcrtomb.m4 index fee21d7..d51b36e 100644 --- a/m4/wcrtomb.m4 +++ b/m4/wcrtomb.m4 @@ -1,5 +1,5 @@ # wcrtomb.m4 serial 17 -dnl Copyright (C) 2008-2022 Free Software Foundation, Inc. +dnl Copyright (C) 2008-2023 Free Software Foundation, Inc. dnl This file is free software; the Free Software Foundation dnl gives unlimited permission to copy and/or distribute it, dnl with or without modifications, as long as this notice is preserved. diff --git a/m4/wctob.m4 b/m4/wctob.m4 index af172cd..90042a5 100644 --- a/m4/wctob.m4 +++ b/m4/wctob.m4 @@ -1,5 +1,5 @@ # wctob.m4 serial 13 -dnl Copyright (C) 2008-2022 Free Software Foundation, Inc. +dnl Copyright (C) 2008-2023 Free Software Foundation, Inc. dnl This file is free software; the Free Software Foundation dnl gives unlimited permission to copy and/or distribute it, dnl with or without modifications, as long as this notice is preserved. diff --git a/m4/wctomb.m4 b/m4/wctomb.m4 index 12329d8..2e22310 100644 --- a/m4/wctomb.m4 +++ b/m4/wctomb.m4 @@ -1,5 +1,5 @@ # wctomb.m4 serial 2 -dnl Copyright (C) 2011-2022 Free Software Foundation, Inc. +dnl Copyright (C) 2011-2023 Free Software Foundation, Inc. dnl This file is free software; the Free Software Foundation dnl gives unlimited permission to copy and/or distribute it, dnl with or without modifications, as long as this notice is preserved. diff --git a/m4/wctype_h.m4 b/m4/wctype_h.m4 index 702cb39..6856a73 100644 --- a/m4/wctype_h.m4 +++ b/m4/wctype_h.m4 @@ -2,7 +2,7 @@ dnl A placeholder for ISO C99 <wctype.h>, for platforms that lack it. -dnl Copyright (C) 2006-2022 Free Software Foundation, Inc. +dnl Copyright (C) 2006-2023 Free Software Foundation, Inc. dnl This file is free software; the Free Software Foundation dnl gives unlimited permission to copy and/or distribute it, dnl with or without modifications, as long as this notice is preserved. diff --git a/m4/wint_t.m4 b/m4/wint_t.m4 index adc5866..dfd743b 100644 --- a/m4/wint_t.m4 +++ b/m4/wint_t.m4 @@ -1,5 +1,5 @@ # wint_t.m4 serial 11 -dnl Copyright (C) 2003, 2007-2022 Free Software Foundation, Inc. +dnl Copyright (C) 2003, 2007-2023 Free Software Foundation, Inc. dnl This file is free software; the Free Software Foundation dnl gives unlimited permission to copy and/or distribute it, dnl with or without modifications, as long as this notice is preserved. diff --git a/m4/xalloc.m4 b/m4/xalloc.m4 index 17a9c06..fc56f59 100644 --- a/m4/xalloc.m4 +++ b/m4/xalloc.m4 @@ -1,5 +1,5 @@ # xalloc.m4 serial 18 -dnl Copyright (C) 2002-2006, 2009-2022 Free Software Foundation, Inc. +dnl Copyright (C) 2002-2006, 2009-2023 Free Software Foundation, Inc. dnl This file is free software; the Free Software Foundation dnl gives unlimited permission to copy and/or distribute it, dnl with or without modifications, as long as this notice is preserved. diff --git a/m4/xstrtol.m4 b/m4/xstrtol.m4 index 3793de6..dc41261 100644 --- a/m4/xstrtol.m4 +++ b/m4/xstrtol.m4 @@ -1,5 +1,5 @@ #serial 11 -dnl Copyright (C) 2002-2007, 2009-2022 Free Software Foundation, Inc. +dnl Copyright (C) 2002-2007, 2009-2023 Free Software Foundation, Inc. dnl This file is free software; the Free Software Foundation dnl gives unlimited permission to copy and/or distribute it, dnl with or without modifications, as long as this notice is preserved. diff --git a/m4/year2038.m4 b/m4/year2038.m4 deleted file mode 100644 index 06db589..0000000 --- a/m4/year2038.m4 +++ /dev/null @@ -1,124 +0,0 @@ -# year2038.m4 serial 7 -dnl Copyright (C) 2017-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. - -dnl Attempt to ensure that 'time_t' can go past the year 2038 and that -dnl the functions 'time', 'stat', etc. work with post-2038 timestamps. - -AC_DEFUN([gl_YEAR2038_EARLY], -[ - AC_REQUIRE([AC_CANONICAL_HOST]) - case "$host_os" in - mingw*) - AC_DEFINE([__MINGW_USE_VC2005_COMPAT], [1], - [For 64-bit time_t on 32-bit mingw.]) - ;; - esac -]) - -# gl_YEAR2038_TEST_INCLUDES -# ------------------------- -AC_DEFUN([gl_YEAR2038_TEST_INCLUDES], -[[ - #include <time.h> - /* 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]; -]]) - -# gl_YEAR2038_BODY(REQUIRE-YEAR2038-SAFE) ------------------------------------------ -AC_DEFUN([gl_YEAR2038_BODY], -[ - AC_ARG_ENABLE([year2038], - [ --disable-year2038 omit support for timestamps past the year 2038]) - AS_IF([test "$enable_year2038" != no], - [ - dnl On many systems, time_t is already a 64-bit type. - dnl On those systems where time_t is still 32-bit, it requires kernel - dnl and libc support to make it 64-bit. For glibc 2.34 and later on Linux, - dnl defining _TIME_BITS=64 and _FILE_OFFSET_BITS=64 is needed on x86 and ARM. - dnl - dnl On native Windows, the system include files define types __time32_t - dnl and __time64_t. By default, time_t is an alias of - dnl - __time32_t on 32-bit mingw, - dnl - __time64_t on 64-bit mingw and on MSVC (since MSVC 8). - dnl But when compiling with -D__MINGW_USE_VC2005_COMPAT, time_t is an - dnl alias of __time64_t. - dnl And when compiling with -D_USE_32BIT_TIME_T, time_t is an alias of - dnl __time32_t. - AC_CACHE_CHECK([for time_t past the year 2038], [gl_cv_type_time_t_y2038], - [AC_COMPILE_IFELSE( - [AC_LANG_SOURCE([gl_YEAR2038_TEST_INCLUDES])], - [gl_cv_type_time_t_y2038=yes], [gl_cv_type_time_t_y2038=no]) - ]) - if test "$gl_cv_type_time_t_y2038" = no; then - AC_CACHE_CHECK([for 64-bit time_t with _TIME_BITS=64], - [gl_cv_type_time_t_bits_macro], - [AC_COMPILE_IFELSE( - [AC_LANG_SOURCE([[#define _TIME_BITS 64 - #define _FILE_OFFSET_BITS 64 - ]gl_YEAR2038_TEST_INCLUDES])], - [gl_cv_type_time_t_bits_macro=yes], - [gl_cv_type_time_t_bits_macro=no]) - ]) - if test "$gl_cv_type_time_t_bits_macro" = yes; then - AC_DEFINE([_TIME_BITS], [64], - [Number of bits in a timestamp, on hosts where this is settable.]) - dnl AC_SYS_LARGFILE also defines this; it's OK if we do too. - AC_DEFINE([_FILE_OFFSET_BITS], [64], - [Number of bits in a file offset, on hosts where this is settable.]) - gl_cv_type_time_t_y2038=yes - fi - fi - if test $gl_cv_type_time_t_y2038 = no; then - AC_COMPILE_IFELSE( - [AC_LANG_SOURCE( - [[#ifdef _USE_32BIT_TIME_T - int ok; - #else - error fail - #endif - ]])], - [AC_MSG_FAILURE( - [The 'time_t' type stops working after January 2038. - Remove _USE_32BIT_TIME_T from the compiler flags.])], - [# If not cross-compiling and $1 says we should check, - # and 'touch' works with a large timestamp, then evidently wider time_t - # is desired and supported, so fail and ask the builder to fix the - # problem. Otherwise, just warn the builder. - m4_ifval([$1], - [if test $cross_compiling = no \ - && TZ=UTC0 touch -t 210602070628.15 conftest.time 2>/dev/null; then - case `TZ=UTC0 LC_ALL=C ls -l conftest.time 2>/dev/null` in - *'Feb 7 2106'* | *'Feb 7 17:10'*) - AC_MSG_FAILURE( - [The 'time_t' type stops working after January 2038, - and your system appears to support a wider 'time_t'. - Try configuring with 'CC="${CC} -m64"'. - To build with a 32-bit time_t anyway (not recommended), - configure with '--disable-year2038'.]);; - esac - rm -f conftest.time - fi]) - if test "$gl_warned_about_y2038" != yes; then - AC_MSG_WARN( - [The 'time_t' type stops working after January 2038, - and this package needs a wider 'time_t' type - if there is any way to access timestamps after that. - Configure with 'CC="${CC} -m64"' perhaps?]) - gl_warned_about_y2038=yes - fi - ]) - fi]) -]) - -AC_DEFUN([gl_YEAR2038], -[ - gl_YEAR2038_BODY([require-year2038-safe]) -]) diff --git a/m4/yield.m4 b/m4/yield.m4 index 58bdb51..4eb6bd9 100644 --- a/m4/yield.m4 +++ b/m4/yield.m4 @@ -1,5 +1,5 @@ -# yield.m4 serial 4 -dnl Copyright (C) 2005-2022 Free Software Foundation, Inc. +# yield.m4 serial 5 +dnl Copyright (C) 2005-2023 Free Software Foundation, Inc. dnl This file is free software; the Free Software Foundation dnl gives unlimited permission to copy and/or distribute it, dnl with or without modifications, as long as this notice is preserved. @@ -10,7 +10,7 @@ AC_DEFUN([gl_YIELD], AC_REQUIRE([gl_THREADLIB]) if test $gl_threads_api = posix; then - YIELD_LIB="$LIB_SCHED_YIELD" + YIELD_LIB="$SCHED_YIELD_LIB" else YIELD_LIB= fi diff --git a/m4/zzgnulib.m4 b/m4/zzgnulib.m4 index fd73a20..362102b 100644 --- a/m4/zzgnulib.m4 +++ b/m4/zzgnulib.m4 @@ -1,5 +1,5 @@ # zzgnulib.m4 serial 1 -dnl Copyright (C) 2020-2022 Free Software Foundation, Inc. +dnl Copyright (C) 2020-2023 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. @@ -2,7 +2,7 @@ # This Makefile fragment tries to be general-purpose enough to be # used by many projects via the gnulib maintainer-makefile module. -## Copyright (C) 2001-2022 Free Software Foundation, Inc. +## Copyright (C) 2001-2023 Free Software Foundation, Inc. ## ## This program is free software: you can redistribute it and/or modify ## it under the terms of the GNU General Public License as published by @@ -64,10 +64,10 @@ VC_LIST = $(srcdir)/$(_build-aux)/vc-list-files -C $(srcdir) # You can override this variable in cfg.mk if your gnulib submodule lives # in a different location. -gnulib_dir ?= $(shell if test -f $(srcdir)/gnulib/gnulib-tool; then \ - echo $(srcdir)/gnulib; \ +gnulib_dir ?= $(shell if test -n "$(GNULIB_SRCDIR)" && test -f "$(GNULIB_SRCDIR)/gnulib-tool"; then \ + echo "$(GNULIB_SRCDIR)"; \ else \ - echo ${GNULIB_SRCDIR}; \ + echo $(srcdir)/gnulib; \ fi) # You can override this variable in cfg.mk to set your own regexp @@ -622,9 +622,9 @@ sc_prohibit_xalloc_without_use: $(_sc_header_without_use) # Extract function names: -# perl -lne '/^(?:extern )?(?:void|char) \*?(\w+) *\(/ and print $1' lib/hash.h +# perl -lne '/^(?:extern )?(?:void|char|Hash_table) \*?(\w+) *\(/ and print $1' lib/hash.h _hash_re = \ -clear|delete|free|get_(first|next)|insert|lookup|print_statistics|reset_tuning +hash_(re(set_tuning|move)|xin(itialize|sert)|in(itialize|sert)|get_(firs|nex)t|print_statistics|(delet|fre)e|lookup|clear) _hash_fn = \<($(_hash_re)) *\( _hash_struct = (struct )?\<[Hh]ash_(table|tuning)\> sc_prohibit_hash_without_use: @@ -765,7 +765,7 @@ sc_prohibit_dirent_without_use: # Prohibit the inclusion of verify.h without an actual use. sc_prohibit_verify_without_use: @h='verify.h' \ - re='\<(verify(true|expr)?|assume|static_assert) *\(' \ + re='\<(verify(_expr)?|assume) *\(' \ $(_sc_header_without_use) # Don't include xfreopen.h unless you use one of its functions. @@ -823,7 +823,7 @@ sc_trailing_blank: # Match lines like the following, but where there is only one space # between the options and the description: # -D, --all-repeated[=delimit-method] print all duplicate lines\n -longopt_re = --[a-z][0-9A-Za-z-]*(\[?=[0-9A-Za-z-]*\]?)? +longopt_re = --[a-z][0-9A-Za-z-]*(\[?=[0-9A-Za-z-]*]?)? sc_two_space_separator_in_usage: @prohibit='^ *(-[A-Za-z],)? $(longopt_re) [^ ].*\\$$' \ halt='help2man requires at least two spaces between an option and its description'\ @@ -1256,6 +1256,12 @@ sc_makefile_path_separator_check: halt=$(msg) \ $(_sc_search_regexp) +sc_makefile_DISTCHECK_CONFIGURE_FLAGS: + @prohibit='^DISTCHECK_CONFIGURE_FLAGS' \ + in_vc_files='akefile|\.mk$$' \ + halt="use AM_DISTCHECK_CONFIGURE_FLAGS" \ + $(_sc_search_regexp) + # Check that 'make alpha' will not fail at the end of the process, # i.e., when pkg-M.N.tar.xz already exists (either in "." or in ../release) # and is read-only. @@ -1286,7 +1292,7 @@ sc_copyright_check: in_vc_files=$(sample-test) \ halt='out of date copyright in $(sample-test); update it' \ $(_sc_search_regexp) - @require='Copyright @copyright\{\} .*'$$(date +%Y) \ + @require='Copyright @copyright\{} .*'$$(date +%Y) \ in_vc_files=$(texi) \ halt='out of date copyright in $(texi); update it' \ $(_sc_search_regexp) @@ -1367,6 +1373,10 @@ sc_vulnerable_makefile_CVE-2012-3386: ' see https://bugzilla.redhat.com/show_bug.cgi?id=CVE-2012-3386 for details') \ $(_sc_search_regexp) +sc_unportable_grep_q: + @prohibit='grep -q' halt="unportable 'grep -q', use >/dev/null instead" \ + $(_sc_search_regexp) + vc-diff-check: $(AM_V_GEN)(unset CDPATH; cd $(srcdir) && $(VC) diff) > vc-diffs || : $(AM_V_at)if test -s vc-diffs; then \ @@ -1390,7 +1400,7 @@ gpg_key_ID ?= \ $$(cd $(srcdir) \ && git cat-file tag v$(VERSION) \ | $(gpgv) --status-fd 1 --keyring /dev/null - - 2>/dev/null \ - | $(AWK) '/^\[GNUPG:\] ERRSIG / {print $$3; exit}') + | $(AWK) '/^\[GNUPG:] ERRSIG / {print $$3; exit}') gpg_key_email ?= \ $$(gpg --list-key --with-colons $(gpg_key_ID) 2>/dev/null \ | $(AWK) -F: '/^uid/ {print $$10; exit}' \ @@ -1653,8 +1663,8 @@ indent: # Running indent once is not idempotent, but running it twice is. indent $(indent_args) $(INDENT_SOURCES) sc_indent: - @if ! command -v indent > /dev/null; then \ - echo 1>&2 '$(ME): sc_indent: indent is missing'; \ + @if ! indent --version 2> /dev/null | grep 'GNU indent' > /dev/null; then \ + echo 1>&2 '$(ME): sc_indent: GNU indent is missing'; \ else \ fail=0; files="$(INDENT_SOURCES)"; \ for f in $$files; do \ @@ -1743,8 +1753,8 @@ _gl_TS_unmarked_extern_vars ?= # a macro like this: GLOBAL(type, var_name, initializer), then you # can override this definition to automatically extract those names: # export _gl_TS_var_match = \ -# /^(?:$(_gl_TS_extern)) .*?\**(\w+)(\[.*?\])?;/ || /\bGLOBAL\(.*?,\s*(.*?),/ -_gl_TS_var_match ?= /^(?:$(_gl_TS_extern)) .*?(\w+)(\[.*?\])?;/ +# /^(?:$(_gl_TS_extern)) .*?\**(\w+)(\[.*?])?;/ || /\bGLOBAL\(.*?,\s*(.*?),/ +_gl_TS_var_match ?= /^(?:$(_gl_TS_extern)) .*?(\w+)(\[.*?])?;/ # The names of object files in (or relative to) $(_gl_TS_dir). _gl_TS_obj_files ?= *.$(OBJEXT) diff --git a/parted.spec b/parted.spec index 3cae09a..c373682 100644 --- a/parted.spec +++ b/parted.spec @@ -6,7 +6,7 @@ Summary: The GNU disk partition manipulation program Name: parted -Version: 3.5 +Version: 3.6 Release: 1 Source: ftp://ftp.gnu.org/gnu/%{name}/%{name}-%{version}.tar.bz2 Buildroot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) diff --git a/parted/Makefile.in b/parted/Makefile.in index fa8dce6..8faf73b 100644 --- a/parted/Makefile.in +++ b/parted/Makefile.in @@ -71,9 +71,6 @@ am__make_running_with_option = \ test $$has_opt = yes am__make_dryrun = (target_option=n; $(am__make_running_with_option)) am__make_keepgoing = (target_option=k; $(am__make_running_with_option)) -pkgdatadir = $(datadir)/@PACKAGE@ -pkgincludedir = $(includedir)/@PACKAGE@ -pkglibdir = $(libdir)/@PACKAGE@ am__cd = CDPATH="$${ZSH_VERSION+.}$(PATH_SEPARATOR)" && cd install_sh_DATA = $(install_sh) -c -m 644 install_sh_PROGRAM = $(install_sh) -c @@ -95,7 +92,9 @@ am__aclocal_m4_deps = $(top_srcdir)/m4/00gnulib.m4 \ $(top_srcdir)/m4/__inline.m4 \ $(top_srcdir)/m4/absolute-header.m4 $(top_srcdir)/m4/alloca.m4 \ $(top_srcdir)/m4/arpa_inet_h.m4 $(top_srcdir)/m4/assert.m4 \ - $(top_srcdir)/m4/btowc.m4 $(top_srcdir)/m4/builtin-expect.m4 \ + $(top_srcdir)/m4/assert_h.m4 $(top_srcdir)/m4/btowc.m4 \ + $(top_srcdir)/m4/build-to-host.m4 \ + $(top_srcdir)/m4/builtin-expect.m4 $(top_srcdir)/m4/c-bool.m4 \ $(top_srcdir)/m4/calloc.m4 $(top_srcdir)/m4/canonicalize.m4 \ $(top_srcdir)/m4/clock_time.m4 $(top_srcdir)/m4/close.m4 \ $(top_srcdir)/m4/codeset.m4 $(top_srcdir)/m4/config-h.m4 \ @@ -103,7 +102,7 @@ am__aclocal_m4_deps = $(top_srcdir)/m4/00gnulib.m4 \ $(top_srcdir)/m4/double-slash-root.m4 $(top_srcdir)/m4/dup2.m4 \ $(top_srcdir)/m4/eealloc.m4 $(top_srcdir)/m4/environ.m4 \ $(top_srcdir)/m4/errno_h.m4 $(top_srcdir)/m4/error.m4 \ - $(top_srcdir)/m4/extensions.m4 \ + $(top_srcdir)/m4/error_h.m4 $(top_srcdir)/m4/extensions.m4 \ $(top_srcdir)/m4/extern-inline.m4 $(top_srcdir)/m4/fcntl-o.m4 \ $(top_srcdir)/m4/fcntl.m4 $(top_srcdir)/m4/fcntl_h.m4 \ $(top_srcdir)/m4/fdopen.m4 $(top_srcdir)/m4/flexmember.m4 \ @@ -135,10 +134,11 @@ am__aclocal_m4_deps = $(top_srcdir)/m4/00gnulib.m4 \ $(top_srcdir)/m4/malloc.m4 $(top_srcdir)/m4/malloca.m4 \ $(top_srcdir)/m4/manywarnings.m4 $(top_srcdir)/m4/mbrtowc.m4 \ $(top_srcdir)/m4/mbsinit.m4 $(top_srcdir)/m4/mbstate_t.m4 \ - $(top_srcdir)/m4/mbtowc.m4 $(top_srcdir)/m4/mempcpy.m4 \ - $(top_srcdir)/m4/minmax.m4 $(top_srcdir)/m4/mkdir.m4 \ - $(top_srcdir)/m4/mkstemp.m4 $(top_srcdir)/m4/mmap-anon.m4 \ - $(top_srcdir)/m4/mode_t.m4 $(top_srcdir)/m4/msvc-inval.m4 \ + $(top_srcdir)/m4/mbtowc.m4 $(top_srcdir)/m4/memchr.m4 \ + $(top_srcdir)/m4/mempcpy.m4 $(top_srcdir)/m4/minmax.m4 \ + $(top_srcdir)/m4/mkdir.m4 $(top_srcdir)/m4/mkstemp.m4 \ + $(top_srcdir)/m4/mmap-anon.m4 $(top_srcdir)/m4/mode_t.m4 \ + $(top_srcdir)/m4/msvc-inval.m4 \ $(top_srcdir)/m4/msvc-nothrow.m4 $(top_srcdir)/m4/multiarch.m4 \ $(top_srcdir)/m4/musl.m4 $(top_srcdir)/m4/nanosleep.m4 \ $(top_srcdir)/m4/netinet_in_h.m4 \ @@ -169,29 +169,29 @@ am__aclocal_m4_deps = $(top_srcdir)/m4/00gnulib.m4 \ $(top_srcdir)/m4/socklen.m4 $(top_srcdir)/m4/sockpfaf.m4 \ $(top_srcdir)/m4/ssize_t.m4 $(top_srcdir)/m4/stat-time.m4 \ $(top_srcdir)/m4/stat.m4 $(top_srcdir)/m4/stdalign.m4 \ - $(top_srcdir)/m4/stdarg.m4 $(top_srcdir)/m4/stdbool.m4 \ - $(top_srcdir)/m4/stddef_h.m4 $(top_srcdir)/m4/stdint.m4 \ - $(top_srcdir)/m4/stdio_h.m4 $(top_srcdir)/m4/stdlib_h.m4 \ - $(top_srcdir)/m4/strdup.m4 $(top_srcdir)/m4/strerror.m4 \ - $(top_srcdir)/m4/strerror_r.m4 $(top_srcdir)/m4/string_h.m4 \ - $(top_srcdir)/m4/strtoll.m4 $(top_srcdir)/m4/strtoull.m4 \ - $(top_srcdir)/m4/symlink.m4 $(top_srcdir)/m4/sys_ioctl_h.m4 \ + $(top_srcdir)/m4/stdarg.m4 $(top_srcdir)/m4/stddef_h.m4 \ + $(top_srcdir)/m4/stdint.m4 $(top_srcdir)/m4/stdio_h.m4 \ + $(top_srcdir)/m4/stdlib_h.m4 $(top_srcdir)/m4/strdup.m4 \ + $(top_srcdir)/m4/strerror.m4 $(top_srcdir)/m4/strerror_r.m4 \ + $(top_srcdir)/m4/string_h.m4 $(top_srcdir)/m4/strtoll.m4 \ + $(top_srcdir)/m4/strtoull.m4 $(top_srcdir)/m4/symlink.m4 \ + $(top_srcdir)/m4/sys_ioctl_h.m4 \ $(top_srcdir)/m4/sys_random_h.m4 \ $(top_srcdir)/m4/sys_select_h.m4 \ $(top_srcdir)/m4/sys_socket_h.m4 \ $(top_srcdir)/m4/sys_stat_h.m4 $(top_srcdir)/m4/sys_time_h.m4 \ $(top_srcdir)/m4/sys_types_h.m4 $(top_srcdir)/m4/sys_uio_h.m4 \ $(top_srcdir)/m4/tempname.m4 $(top_srcdir)/m4/thread.m4 \ - $(top_srcdir)/m4/threadlib.m4 $(top_srcdir)/m4/time_h.m4 \ - $(top_srcdir)/m4/unistd_h.m4 $(top_srcdir)/m4/unlink.m4 \ - $(top_srcdir)/m4/unlinkdir.m4 $(top_srcdir)/m4/usleep.m4 \ - $(top_srcdir)/m4/version-etc.m4 $(top_srcdir)/m4/visibility.m4 \ - $(top_srcdir)/m4/warn-on-use.m4 $(top_srcdir)/m4/warnings.m4 \ - $(top_srcdir)/m4/wchar_h.m4 $(top_srcdir)/m4/wchar_t.m4 \ - $(top_srcdir)/m4/wcrtomb.m4 $(top_srcdir)/m4/wctob.m4 \ - $(top_srcdir)/m4/wctomb.m4 $(top_srcdir)/m4/wctype_h.m4 \ - $(top_srcdir)/m4/wint_t.m4 $(top_srcdir)/m4/xalloc.m4 \ - $(top_srcdir)/m4/xstrtol.m4 $(top_srcdir)/m4/year2038.m4 \ + $(top_srcdir)/m4/threadlib.m4 $(top_srcdir)/m4/time.m4 \ + $(top_srcdir)/m4/time_h.m4 $(top_srcdir)/m4/unistd_h.m4 \ + $(top_srcdir)/m4/unlink.m4 $(top_srcdir)/m4/unlinkdir.m4 \ + $(top_srcdir)/m4/usleep.m4 $(top_srcdir)/m4/version-etc.m4 \ + $(top_srcdir)/m4/visibility.m4 $(top_srcdir)/m4/warn-on-use.m4 \ + $(top_srcdir)/m4/warnings.m4 $(top_srcdir)/m4/wchar_h.m4 \ + $(top_srcdir)/m4/wchar_t.m4 $(top_srcdir)/m4/wcrtomb.m4 \ + $(top_srcdir)/m4/wctob.m4 $(top_srcdir)/m4/wctomb.m4 \ + $(top_srcdir)/m4/wctype_h.m4 $(top_srcdir)/m4/wint_t.m4 \ + $(top_srcdir)/m4/xalloc.m4 $(top_srcdir)/m4/xstrtol.m4 \ $(top_srcdir)/m4/yield.m4 $(top_srcdir)/m4/zzgnulib.m4 \ $(top_srcdir)/configure.ac am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \ @@ -291,6 +291,9 @@ am__define_uniq_tagged_files = \ am__DIST_COMMON = $(srcdir)/Makefile.in \ $(top_srcdir)/build-aux/depcomp DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST) +pkgdatadir = @pkgdatadir@ +pkgincludedir = @pkgincludedir@ +pkglibdir = @pkglibdir@ pkglibexecdir = @pkglibexecdir@ ACLOCAL = @ACLOCAL@ ALLOCA = @ALLOCA@ @@ -300,6 +303,7 @@ AM_DEFAULT_VERBOSITY = @AM_DEFAULT_VERBOSITY@ APPLE_UNIVERSAL_BUILD = @APPLE_UNIVERSAL_BUILD@ AR = @AR@ ARFLAGS = @ARFLAGS@ +ASSERT_H = @ASSERT_H@ AUTOCONF = @AUTOCONF@ AUTOHEADER = @AUTOHEADER@ AUTOMAKE = @AUTOMAKE@ @@ -316,6 +320,7 @@ CFLAGS = @CFLAGS@ CFLAG_VISIBILITY = @CFLAG_VISIBILITY@ CHECK_CFLAGS = @CHECK_CFLAGS@ CHECK_LIBS = @CHECK_LIBS@ +CLOCK_TIME_LIB = @CLOCK_TIME_LIB@ CONFIG_INCLUDE = @CONFIG_INCLUDE@ CPP = @CPP@ CPPFLAGS = @CPPFLAGS@ @@ -340,12 +345,14 @@ ENOLINK_VALUE = @ENOLINK_VALUE@ EOVERFLOW_HIDDEN = @EOVERFLOW_HIDDEN@ EOVERFLOW_VALUE = @EOVERFLOW_VALUE@ ERRNO_H = @ERRNO_H@ +ERROR_H = @ERROR_H@ ETAGS = @ETAGS@ EXEEXT = @EXEEXT@ FGREP = @FGREP@ FILECMD = @FILECMD@ GETOPT_CDEFS_H = @GETOPT_CDEFS_H@ GETOPT_H = @GETOPT_H@ +GETRANDOM_LIB = @GETRANDOM_LIB@ GETTEXT_MACRO_VERSION = @GETTEXT_MACRO_VERSION@ GL_CFLAG_ALLOW_WARNINGS = @GL_CFLAG_ALLOW_WARNINGS@ GL_CFLAG_GNULIB_WARNINGS = @GL_CFLAG_GNULIB_WARNINGS@ @@ -361,6 +368,7 @@ GL_GNULIB_CALLOC_GNU = @GL_GNULIB_CALLOC_GNU@ GL_GNULIB_CALLOC_POSIX = @GL_GNULIB_CALLOC_POSIX@ GL_GNULIB_CANONICALIZE_FILE_NAME = @GL_GNULIB_CANONICALIZE_FILE_NAME@ GL_GNULIB_CHDIR = @GL_GNULIB_CHDIR@ +GL_GNULIB_CHMOD = @GL_GNULIB_CHMOD@ GL_GNULIB_CHOWN = @GL_GNULIB_CHOWN@ GL_GNULIB_CLOSE = @GL_GNULIB_CLOSE@ GL_GNULIB_CONNECT = @GL_GNULIB_CONNECT@ @@ -434,6 +442,7 @@ GL_GNULIB_GETPAGESIZE = @GL_GNULIB_GETPAGESIZE@ GL_GNULIB_GETPASS = @GL_GNULIB_GETPASS@ GL_GNULIB_GETPASS_GNU = @GL_GNULIB_GETPASS_GNU@ GL_GNULIB_GETPEERNAME = @GL_GNULIB_GETPEERNAME@ +GL_GNULIB_GETPROGNAME = @GL_GNULIB_GETPROGNAME@ GL_GNULIB_GETRANDOM = @GL_GNULIB_GETRANDOM@ GL_GNULIB_GETSOCKNAME = @GL_GNULIB_GETSOCKNAME@ GL_GNULIB_GETSOCKOPT = @GL_GNULIB_GETSOCKOPT@ @@ -531,6 +540,7 @@ GL_GNULIB_MEMCHR = @GL_GNULIB_MEMCHR@ GL_GNULIB_MEMMEM = @GL_GNULIB_MEMMEM@ GL_GNULIB_MEMPCPY = @GL_GNULIB_MEMPCPY@ GL_GNULIB_MEMRCHR = @GL_GNULIB_MEMRCHR@ +GL_GNULIB_MEMSET_EXPLICIT = @GL_GNULIB_MEMSET_EXPLICIT@ GL_GNULIB_MKDIR = @GL_GNULIB_MKDIR@ GL_GNULIB_MKDIRAT = @GL_GNULIB_MKDIRAT@ GL_GNULIB_MKDTEMP = @GL_GNULIB_MKDTEMP@ @@ -651,6 +661,7 @@ GL_GNULIB_STRVERSCMP = @GL_GNULIB_STRVERSCMP@ GL_GNULIB_SYMLINK = @GL_GNULIB_SYMLINK@ GL_GNULIB_SYMLINKAT = @GL_GNULIB_SYMLINKAT@ GL_GNULIB_SYSTEM_POSIX = @GL_GNULIB_SYSTEM_POSIX@ +GL_GNULIB_TIME = @GL_GNULIB_TIME@ GL_GNULIB_TIMEGM = @GL_GNULIB_TIMEGM@ GL_GNULIB_TIMESPEC_GET = @GL_GNULIB_TIMESPEC_GET@ GL_GNULIB_TIMESPEC_GETRES = @GL_GNULIB_TIMESPEC_GETRES@ @@ -725,6 +736,7 @@ GMSGFMT_015 = @GMSGFMT_015@ GNULIBHEADERS_OVERRIDE_WINT_T = @GNULIBHEADERS_OVERRIDE_WINT_T@ GNULIB_GETTIMEOFDAY = @GNULIB_GETTIMEOFDAY@ GREP = @GREP@ +HARD_LOCALE_LIB = @HARD_LOCALE_LIB@ HAVE_ACCEPT4 = @HAVE_ACCEPT4@ HAVE_ALIGNED_ALLOC = @HAVE_ALIGNED_ALLOC@ HAVE_ALLOCA_H = @HAVE_ALLOCA_H@ @@ -755,6 +767,7 @@ HAVE_DECL_GETLOGIN = @HAVE_DECL_GETLOGIN@ HAVE_DECL_GETLOGIN_R = @HAVE_DECL_GETLOGIN_R@ HAVE_DECL_GETPAGESIZE = @HAVE_DECL_GETPAGESIZE@ HAVE_DECL_GETUSERSHELL = @HAVE_DECL_GETUSERSHELL@ +HAVE_DECL_GETW = @HAVE_DECL_GETW@ HAVE_DECL_IMAXABS = @HAVE_DECL_IMAXABS@ HAVE_DECL_IMAXDIV = @HAVE_DECL_IMAXDIV@ HAVE_DECL_INET_NTOP = @HAVE_DECL_INET_NTOP@ @@ -764,6 +777,7 @@ HAVE_DECL_LOCALTIME_R = @HAVE_DECL_LOCALTIME_R@ HAVE_DECL_MEMMEM = @HAVE_DECL_MEMMEM@ HAVE_DECL_MEMRCHR = @HAVE_DECL_MEMRCHR@ HAVE_DECL_OBSTACK_PRINTF = @HAVE_DECL_OBSTACK_PRINTF@ +HAVE_DECL_PUTW = @HAVE_DECL_PUTW@ HAVE_DECL_SETENV = @HAVE_DECL_SETENV@ HAVE_DECL_SETHOSTNAME = @HAVE_DECL_SETHOSTNAME@ HAVE_DECL_SETSTATE = @HAVE_DECL_SETSTATE@ @@ -786,6 +800,9 @@ HAVE_DECL_WCWIDTH = @HAVE_DECL_WCWIDTH@ HAVE_DPRINTF = @HAVE_DPRINTF@ HAVE_DUP3 = @HAVE_DUP3@ HAVE_DUPLOCALE = @HAVE_DUPLOCALE@ +HAVE_ERROR = @HAVE_ERROR@ +HAVE_ERROR_AT_LINE = @HAVE_ERROR_AT_LINE@ +HAVE_ERROR_H = @HAVE_ERROR_H@ HAVE_EUIDACCESS = @HAVE_EUIDACCESS@ HAVE_EXECVPE = @HAVE_EXECVPE@ HAVE_EXPLICIT_BZERO = @HAVE_EXPLICIT_BZERO@ @@ -813,12 +830,15 @@ HAVE_GETLOGIN = @HAVE_GETLOGIN@ HAVE_GETOPT_H = @HAVE_GETOPT_H@ HAVE_GETPAGESIZE = @HAVE_GETPAGESIZE@ HAVE_GETPASS = @HAVE_GETPASS@ +HAVE_GETPROGNAME = @HAVE_GETPROGNAME@ HAVE_GETRANDOM = @HAVE_GETRANDOM@ HAVE_GETSUBOPT = @HAVE_GETSUBOPT@ HAVE_GETTIMEOFDAY = @HAVE_GETTIMEOFDAY@ HAVE_GETUMASK = @HAVE_GETUMASK@ HAVE_GRANTPT = @HAVE_GRANTPT@ HAVE_GROUP_MEMBER = @HAVE_GROUP_MEMBER@ +HAVE_IMAXABS = @HAVE_IMAXABS@ +HAVE_IMAXDIV = @HAVE_IMAXDIV@ HAVE_IMAXDIV_T = @HAVE_IMAXDIV_T@ HAVE_INITSTATE = @HAVE_INITSTATE@ HAVE_INTTYPES_H = @HAVE_INTTYPES_H@ @@ -845,6 +865,7 @@ HAVE_MBSNRTOWCS = @HAVE_MBSNRTOWCS@ HAVE_MBSRTOWCS = @HAVE_MBSRTOWCS@ HAVE_MBTOWC = @HAVE_MBTOWC@ HAVE_MEMPCPY = @HAVE_MEMPCPY@ +HAVE_MEMSET_EXPLICIT = @HAVE_MEMSET_EXPLICIT@ HAVE_MKDIRAT = @HAVE_MKDIRAT@ HAVE_MKDTEMP = @HAVE_MKDTEMP@ HAVE_MKFIFO = @HAVE_MKFIFO@ @@ -1053,7 +1074,6 @@ HAVE_WMEMPCPY = @HAVE_WMEMPCPY@ HAVE_WMEMSET = @HAVE_WMEMSET@ HAVE_WS2TCPIP_H = @HAVE_WS2TCPIP_H@ HAVE_XLOCALE_H = @HAVE_XLOCALE_H@ -HAVE__BOOL = @HAVE__BOOL@ HAVE__EXIT = @HAVE__EXIT@ IGNORE_UNUSED_LIBRARIES_CFLAGS = @IGNORE_UNUSED_LIBRARIES_CFLAGS@ INCLUDE_NEXT = @INCLUDE_NEXT@ @@ -1120,15 +1140,20 @@ LT_REVISION = @LT_REVISION@ LT_SYS_LIBRARY_PATH = @LT_SYS_LIBRARY_PATH@ MAKEINFO = @MAKEINFO@ MANIFEST_TOOL = @MANIFEST_TOOL@ +MBRTOWC_LIB = @MBRTOWC_LIB@ MKDIR_P = @MKDIR_P@ MSGFMT = @MSGFMT@ MSGFMT_015 = @MSGFMT_015@ MSGMERGE = @MSGMERGE@ +NANOSLEEP_LIB = @NANOSLEEP_LIB@ NETINET_IN_H = @NETINET_IN_H@ NEXT_ARPA_INET_H = @NEXT_ARPA_INET_H@ +NEXT_ASSERT_H = @NEXT_ASSERT_H@ NEXT_AS_FIRST_DIRECTIVE_ARPA_INET_H = @NEXT_AS_FIRST_DIRECTIVE_ARPA_INET_H@ +NEXT_AS_FIRST_DIRECTIVE_ASSERT_H = @NEXT_AS_FIRST_DIRECTIVE_ASSERT_H@ NEXT_AS_FIRST_DIRECTIVE_CTYPE_H = @NEXT_AS_FIRST_DIRECTIVE_CTYPE_H@ NEXT_AS_FIRST_DIRECTIVE_ERRNO_H = @NEXT_AS_FIRST_DIRECTIVE_ERRNO_H@ +NEXT_AS_FIRST_DIRECTIVE_ERROR_H = @NEXT_AS_FIRST_DIRECTIVE_ERROR_H@ NEXT_AS_FIRST_DIRECTIVE_FCNTL_H = @NEXT_AS_FIRST_DIRECTIVE_FCNTL_H@ NEXT_AS_FIRST_DIRECTIVE_GETOPT_H = @NEXT_AS_FIRST_DIRECTIVE_GETOPT_H@ NEXT_AS_FIRST_DIRECTIVE_INTTYPES_H = @NEXT_AS_FIRST_DIRECTIVE_INTTYPES_H@ @@ -1159,6 +1184,7 @@ NEXT_AS_FIRST_DIRECTIVE_WCHAR_H = @NEXT_AS_FIRST_DIRECTIVE_WCHAR_H@ NEXT_AS_FIRST_DIRECTIVE_WCTYPE_H = @NEXT_AS_FIRST_DIRECTIVE_WCTYPE_H@ NEXT_CTYPE_H = @NEXT_CTYPE_H@ NEXT_ERRNO_H = @NEXT_ERRNO_H@ +NEXT_ERROR_H = @NEXT_ERROR_H@ NEXT_FCNTL_H = @NEXT_FCNTL_H@ NEXT_GETOPT_H = @NEXT_GETOPT_H@ NEXT_INTTYPES_H = @NEXT_INTTYPES_H@ @@ -1214,6 +1240,7 @@ PRAGMA_COLUMNS = @PRAGMA_COLUMNS@ PRAGMA_SYSTEM_HEADER = @PRAGMA_SYSTEM_HEADER@ PRIPTR_PREFIX = @PRIPTR_PREFIX@ PTHREAD_H_DEFINES_STRUCT_TIMESPEC = @PTHREAD_H_DEFINES_STRUCT_TIMESPEC@ +PTHREAD_SIGMASK_LIB = @PTHREAD_SIGMASK_LIB@ PTRDIFF_T_SUFFIX = @PTRDIFF_T_SUFFIX@ RANLIB = @RANLIB@ REPLACE_ACCESS = @REPLACE_ACCESS@ @@ -1222,6 +1249,7 @@ REPLACE_BTOWC = @REPLACE_BTOWC@ REPLACE_CALLOC_FOR_CALLOC_GNU = @REPLACE_CALLOC_FOR_CALLOC_GNU@ REPLACE_CALLOC_FOR_CALLOC_POSIX = @REPLACE_CALLOC_FOR_CALLOC_POSIX@ REPLACE_CANONICALIZE_FILE_NAME = @REPLACE_CANONICALIZE_FILE_NAME@ +REPLACE_CHMOD = @REPLACE_CHMOD@ REPLACE_CHOWN = @REPLACE_CHOWN@ REPLACE_CLOSE = @REPLACE_CLOSE@ REPLACE_COPY_FILE_RANGE = @REPLACE_COPY_FILE_RANGE@ @@ -1230,7 +1258,10 @@ REPLACE_CTIME = @REPLACE_CTIME@ REPLACE_DPRINTF = @REPLACE_DPRINTF@ REPLACE_DUP = @REPLACE_DUP@ REPLACE_DUP2 = @REPLACE_DUP2@ +REPLACE_DUP3 = @REPLACE_DUP3@ REPLACE_DUPLOCALE = @REPLACE_DUPLOCALE@ +REPLACE_ERROR = @REPLACE_ERROR@ +REPLACE_ERROR_AT_LINE = @REPLACE_ERROR_AT_LINE@ REPLACE_EXECL = @REPLACE_EXECL@ REPLACE_EXECLE = @REPLACE_EXECLE@ REPLACE_EXECLP = @REPLACE_EXECLP@ @@ -1243,6 +1274,7 @@ REPLACE_FCHMODAT = @REPLACE_FCHMODAT@ REPLACE_FCHOWNAT = @REPLACE_FCHOWNAT@ REPLACE_FCLOSE = @REPLACE_FCLOSE@ REPLACE_FCNTL = @REPLACE_FCNTL@ +REPLACE_FDATASYNC = @REPLACE_FDATASYNC@ REPLACE_FDOPEN = @REPLACE_FDOPEN@ REPLACE_FFLUSH = @REPLACE_FFLUSH@ REPLACE_FFSLL = @REPLACE_FFSLL@ @@ -1265,15 +1297,21 @@ REPLACE_GETCWD = @REPLACE_GETCWD@ REPLACE_GETDELIM = @REPLACE_GETDELIM@ REPLACE_GETDOMAINNAME = @REPLACE_GETDOMAINNAME@ REPLACE_GETDTABLESIZE = @REPLACE_GETDTABLESIZE@ +REPLACE_GETENTROPY = @REPLACE_GETENTROPY@ REPLACE_GETGROUPS = @REPLACE_GETGROUPS@ REPLACE_GETLINE = @REPLACE_GETLINE@ +REPLACE_GETLOADAVG = @REPLACE_GETLOADAVG@ REPLACE_GETLOGIN_R = @REPLACE_GETLOGIN_R@ REPLACE_GETPAGESIZE = @REPLACE_GETPAGESIZE@ REPLACE_GETPASS = @REPLACE_GETPASS@ REPLACE_GETPASS_FOR_GETPASS_GNU = @REPLACE_GETPASS_FOR_GETPASS_GNU@ +REPLACE_GETPROGNAME = @REPLACE_GETPROGNAME@ REPLACE_GETRANDOM = @REPLACE_GETRANDOM@ +REPLACE_GETSUBOPT = @REPLACE_GETSUBOPT@ REPLACE_GETTIMEOFDAY = @REPLACE_GETTIMEOFDAY@ REPLACE_GMTIME = @REPLACE_GMTIME@ +REPLACE_IMAXABS = @REPLACE_IMAXABS@ +REPLACE_IMAXDIV = @REPLACE_IMAXDIV@ REPLACE_INET_NTOP = @REPLACE_INET_NTOP@ REPLACE_INET_PTON = @REPLACE_INET_PTON@ REPLACE_INITSTATE = @REPLACE_INITSTATE@ @@ -1302,11 +1340,14 @@ REPLACE_MBSTATE_T = @REPLACE_MBSTATE_T@ REPLACE_MBTOWC = @REPLACE_MBTOWC@ REPLACE_MEMCHR = @REPLACE_MEMCHR@ REPLACE_MEMMEM = @REPLACE_MEMMEM@ +REPLACE_MEMPCPY = @REPLACE_MEMPCPY@ REPLACE_MKDIR = @REPLACE_MKDIR@ REPLACE_MKFIFO = @REPLACE_MKFIFO@ REPLACE_MKFIFOAT = @REPLACE_MKFIFOAT@ REPLACE_MKNOD = @REPLACE_MKNOD@ REPLACE_MKNODAT = @REPLACE_MKNODAT@ +REPLACE_MKOSTEMP = @REPLACE_MKOSTEMP@ +REPLACE_MKOSTEMPS = @REPLACE_MKOSTEMPS@ REPLACE_MKSTEMP = @REPLACE_MKSTEMP@ REPLACE_MKTIME = @REPLACE_MKTIME@ REPLACE_NANOSLEEP = @REPLACE_NANOSLEEP@ @@ -1317,8 +1358,10 @@ REPLACE_OBSTACK_PRINTF = @REPLACE_OBSTACK_PRINTF@ REPLACE_OPEN = @REPLACE_OPEN@ REPLACE_OPENAT = @REPLACE_OPENAT@ REPLACE_PERROR = @REPLACE_PERROR@ +REPLACE_PIPE2 = @REPLACE_PIPE2@ REPLACE_POPEN = @REPLACE_POPEN@ REPLACE_POSIX_MEMALIGN = @REPLACE_POSIX_MEMALIGN@ +REPLACE_POSIX_OPENPT = @REPLACE_POSIX_OPENPT@ REPLACE_PREAD = @REPLACE_PREAD@ REPLACE_PRINTF = @REPLACE_PRINTF@ REPLACE_PSELECT = @REPLACE_PSELECT@ @@ -1396,6 +1439,7 @@ REPLACE_RMDIR = @REPLACE_RMDIR@ REPLACE_SCHED_YIELD = @REPLACE_SCHED_YIELD@ REPLACE_SELECT = @REPLACE_SELECT@ REPLACE_SETENV = @REPLACE_SETENV@ +REPLACE_SETHOSTNAME = @REPLACE_SETHOSTNAME@ REPLACE_SETLOCALE = @REPLACE_SETLOCALE@ REPLACE_SETSTATE = @REPLACE_SETSTATE@ REPLACE_SLEEP = @REPLACE_SLEEP@ @@ -1404,6 +1448,7 @@ REPLACE_SPRINTF = @REPLACE_SPRINTF@ REPLACE_STAT = @REPLACE_STAT@ REPLACE_STDIO_READ_FUNCS = @REPLACE_STDIO_READ_FUNCS@ REPLACE_STDIO_WRITE_FUNCS = @REPLACE_STDIO_WRITE_FUNCS@ +REPLACE_STPCPY = @REPLACE_STPCPY@ REPLACE_STPNCPY = @REPLACE_STPNCPY@ REPLACE_STRCASESTR = @REPLACE_STRCASESTR@ REPLACE_STRCHRNUL = @REPLACE_STRCHRNUL@ @@ -1430,7 +1475,9 @@ REPLACE_STRUCT_LCONV = @REPLACE_STRUCT_LCONV@ REPLACE_STRUCT_TIMEVAL = @REPLACE_STRUCT_TIMEVAL@ REPLACE_SYMLINK = @REPLACE_SYMLINK@ REPLACE_SYMLINKAT = @REPLACE_SYMLINKAT@ +REPLACE_TIME = @REPLACE_TIME@ REPLACE_TIMEGM = @REPLACE_TIMEGM@ +REPLACE_TIMESPEC_GET = @REPLACE_TIMESPEC_GET@ REPLACE_TMPFILE = @REPLACE_TMPFILE@ REPLACE_TOWLOWER = @REPLACE_TOWLOWER@ REPLACE_TRUNCATE = @REPLACE_TRUNCATE@ @@ -1456,15 +1503,20 @@ REPLACE_WCSWIDTH = @REPLACE_WCSWIDTH@ REPLACE_WCTOB = @REPLACE_WCTOB@ REPLACE_WCTOMB = @REPLACE_WCTOMB@ REPLACE_WCWIDTH = @REPLACE_WCWIDTH@ +REPLACE_WMEMPCPY = @REPLACE_WMEMPCPY@ REPLACE_WRITE = @REPLACE_WRITE@ +REPLACE__EXIT = @REPLACE__EXIT@ +SCHED_YIELD_LIB = @SCHED_YIELD_LIB@ SED = @SED@ +SELECT_LIB = @SELECT_LIB@ +SETLOCALE_LIB = @SETLOCALE_LIB@ +SETLOCALE_NULL_LIB = @SETLOCALE_NULL_LIB@ SET_MAKE = @SET_MAKE@ SHELL = @SHELL@ SIG_ATOMIC_T_SUFFIX = @SIG_ATOMIC_T_SUFFIX@ SIZE_T_SUFFIX = @SIZE_T_SUFFIX@ -STDALIGN_H = @STDALIGN_H@ STDARG_H = @STDARG_H@ -STDBOOL_H = @STDBOOL_H@ +STDCKDINT_H = @STDCKDINT_H@ STDDEF_H = @STDDEF_H@ STDINT_H = @STDINT_H@ STRIP = @STRIP@ @@ -1508,6 +1560,8 @@ am__quote = @am__quote@ am__tar = @am__tar@ am__untar = @am__untar@ bindir = @bindir@ +bindir_c = @bindir_c@ +bindir_c_make = @bindir_c_make@ build = @build@ build_alias = @build_alias@ build_cpu = @build_cpu@ @@ -1515,10 +1569,20 @@ build_os = @build_os@ build_vendor = @build_vendor@ builddir = @builddir@ datadir = @datadir@ +datadir_c = @datadir_c@ +datadir_c_make = @datadir_c_make@ datarootdir = @datarootdir@ +datarootdir_c = @datarootdir_c@ +datarootdir_c_make = @datarootdir_c_make@ docdir = @docdir@ +docdir_c = @docdir_c@ +docdir_c_make = @docdir_c_make@ dvidir = @dvidir@ +dvidir_c = @dvidir_c@ +dvidir_c_make = @dvidir_c_make@ exec_prefix = @exec_prefix@ +exec_prefix_c = @exec_prefix_c@ +exec_prefix_c_make = @exec_prefix_c_make@ gl_LIBOBJDEPS = @gl_LIBOBJDEPS@ gl_LIBOBJS = @gl_LIBOBJS@ gl_LTLIBOBJS = @gl_LTLIBOBJS@ @@ -1532,26 +1596,68 @@ host_cpu = @host_cpu@ host_os = @host_os@ host_vendor = @host_vendor@ htmldir = @htmldir@ +htmldir_c = @htmldir_c@ +htmldir_c_make = @htmldir_c_make@ includedir = @includedir@ +includedir_c = @includedir_c@ +includedir_c_make = @includedir_c_make@ infodir = @infodir@ +infodir_c = @infodir_c@ +infodir_c_make = @infodir_c_make@ install_sh = @install_sh@ libdir = @libdir@ +libdir_c = @libdir_c@ +libdir_c_make = @libdir_c_make@ libexecdir = @libexecdir@ +libexecdir_c = @libexecdir_c@ +libexecdir_c_make = @libexecdir_c_make@ lispdir = @lispdir@ +lispdir_c = @lispdir_c@ +lispdir_c_make = @lispdir_c_make@ localedir = @localedir@ +localedir_c = @localedir_c@ +localedir_c_make = @localedir_c_make@ localstatedir = @localstatedir@ +localstatedir_c = @localstatedir_c@ +localstatedir_c_make = @localstatedir_c_make@ mandir = @mandir@ +mandir_c = @mandir_c@ +mandir_c_make = @mandir_c_make@ mkdir_p = @mkdir_p@ oldincludedir = @oldincludedir@ +oldincludedir_c = @oldincludedir_c@ +oldincludedir_c_make = @oldincludedir_c_make@ pdfdir = @pdfdir@ +pdfdir_c = @pdfdir_c@ +pdfdir_c_make = @pdfdir_c_make@ +pkgdatadir_c = @pkgdatadir_c@ +pkgdatadir_c_make = @pkgdatadir_c_make@ +pkgincludedir_c = @pkgincludedir_c@ +pkgincludedir_c_make = @pkgincludedir_c_make@ +pkglibdir_c = @pkglibdir_c@ +pkglibdir_c_make = @pkglibdir_c_make@ +pkglibexecdir_c = @pkglibexecdir_c@ +pkglibexecdir_c_make = @pkglibexecdir_c_make@ prefix = @prefix@ +prefix_c = @prefix_c@ +prefix_c_make = @prefix_c_make@ program_transform_name = @program_transform_name@ psdir = @psdir@ +psdir_c = @psdir_c@ +psdir_c_make = @psdir_c_make@ runstatedir = @runstatedir@ +runstatedir_c = @runstatedir_c@ +runstatedir_c_make = @runstatedir_c_make@ sbindir = @sbindir@ +sbindir_c = @sbindir_c@ +sbindir_c_make = @sbindir_c_make@ sharedstatedir = @sharedstatedir@ +sharedstatedir_c = @sharedstatedir_c@ +sharedstatedir_c_make = @sharedstatedir_c_make@ srcdir = @srcdir@ sysconfdir = @sysconfdir@ +sysconfdir_c = @sysconfdir_c@ +sysconfdir_c_make = @sysconfdir_c_make@ target_alias = @target_alias@ top_build_prefix = @top_build_prefix@ top_builddir = @top_builddir@ diff --git a/parted/command.c b/parted/command.c index 327afb2..41031ee 100644 --- a/parted/command.c +++ b/parted/command.c @@ -1,6 +1,6 @@ /* parted - a frontend to libparted - Copyright (C) 1999-2000, 2007, 2009-2014, 2019-2022 Free Software + Copyright (C) 1999-2000, 2007, 2009-2014, 2019-2023 Free Software Foundation, Inc. This program is free software; you can redistribute it and/or modify diff --git a/parted/command.h b/parted/command.h index bf0bcb2..c307dca 100644 --- a/parted/command.h +++ b/parted/command.h @@ -1,6 +1,6 @@ /* parted - a frontend to libparted - Copyright (C) 1999-2000, 2007, 2009-2014, 2019-2022 Free Software + Copyright (C) 1999-2000, 2007, 2009-2014, 2019-2023 Free Software Foundation, Inc. This program is free software; you can redistribute it and/or modify diff --git a/parted/parted.c b/parted/parted.c index 5c7c270..3abb52f 100644 --- a/parted/parted.c +++ b/parted/parted.c @@ -1,6 +1,6 @@ /* parted - a frontend to libparted - Copyright (C) 1999-2003, 2005-2014, 2019-2022 Free Software Foundation, + Copyright (C) 1999-2003, 2005-2014, 2019-2023 Free Software Foundation, Inc. This program is free software; you can redistribute it and/or modify @@ -19,6 +19,7 @@ #include <config.h> #include <stdbool.h> +#include <uuid/uuid.h> #include "argmatch.h" #include "closeout.h" @@ -174,6 +175,8 @@ static const char* end_msg = N_("END is disk location, such as " static const char* state_msg = N_("STATE is one of: on, off\n"); static const char* device_msg = N_("DEVICE is usually /dev/hda or /dev/sda\n"); static const char* name_msg = N_("NAME is any word you want\n"); +static const char* type_msg = N_("TYPE_ID is a value between 0x01 and 0xff, " + "TYPE_UUID is a UUID\n"); static const char* copyright_msg = N_( "Copyright (C) 1998 - 2006 Free Software Foundation, Inc.\n" @@ -580,16 +583,27 @@ void _strip_trailing_spaces(char *str) str[i]='\0'; } -/* Return true, if str ends with [kMGTPEZY]iB, i.e. IEC units. */ +/* Return true if the unit is one of the supported IEC unit values */ +static bool +_is_unit_IEC(const PedUnit unit) { + return (unit == PED_UNIT_KIBIBYTE) || (unit == PED_UNIT_MEBIBYTE) || + (unit == PED_UNIT_GIBIBYTE) || (unit == PED_UNIT_TEBIBYTE); +} + +/* Return true, if str ends with IEC units. */ static bool _string_ends_with_iec_unit(const char *str) { - /* 3 characters for the IEC unit and at least 1 digit */ - if (!str || strlen(str) < 4) - return false; + /* 3 characters for the IEC unit and at least 1 digit */ + if (!str || strlen(str) < 4) + return false; - char const *p = str + strlen(str) - 3; - return strchr ("kMGTPEZY", *p) && c_strcasecmp (p+1, "iB") == 0; + char const *p = str + strlen(str) - 3; + PedUnit unit = ped_unit_get_by_name(p); + if (unit == -1) { + return false; + } + return _is_unit_IEC(unit); } /* Return true if str ends with explicit unit identifier. @@ -609,7 +623,7 @@ _string_has_unit_suffix(const char *str) return false; } -/* If the selected unit is one of kiB, MiB, GiB or TiB and the partition is not +/* If the selected unit is one of KiB, MiB, GiB or TiB and the partition is not * only 1 sector long, then adjust the end so that it is one sector before the * given position. Also adjust range_end accordingly. Thus next partition can * start immediately after this one. @@ -633,9 +647,7 @@ _adjust_end_if_iec (PedSector* start, PedSector* end, _strip_trailing_spaces(end_input); PedUnit unit = ped_unit_get_default(); if (_string_ends_with_iec_unit(end_input) || - (!_string_has_unit_suffix(end_input) && - ((unit == PED_UNIT_KIBIBYTE) || (unit == PED_UNIT_MEBIBYTE) || - (unit == PED_UNIT_GIBIBYTE) || (unit == PED_UNIT_TEBIBYTE)))) { + (!_string_has_unit_suffix(end_input) && _is_unit_IEC(unit))) { *end -= 1; range_end->start -= 1; range_end->end -= 1; @@ -917,6 +929,90 @@ error: return 0; } +static int +do_type (PedDevice** dev, PedDisk** diskp) +{ + if (!*diskp) + *diskp = ped_disk_new (*dev); + if (!*diskp) + goto error; + + bool has_type_id = ped_disk_type_check_feature ((*diskp)->type, + PED_DISK_TYPE_PARTITION_TYPE_ID); + bool has_type_uuid = ped_disk_type_check_feature ((*diskp)->type, + PED_DISK_TYPE_PARTITION_TYPE_UUID); + + PED_ASSERT (!(has_type_id && has_type_uuid)); + + if (!has_type_id && !has_type_uuid) { + ped_exception_throw (PED_EXCEPTION_ERROR, PED_EXCEPTION_CANCEL, + _("%s disk labels do not support partition type."), + (*diskp)->type->name); + goto error; + } + + PedPartition* part = NULL; + if (!command_line_get_partition (_("Partition number?"), *diskp, &part)) + goto error; + + char* input = NULL; + + if (has_type_id) { + uint8_t type_id = ped_partition_get_type_id (part); + static char buf[8]; + snprintf(buf, 8, "0x%02x", type_id); + + input = command_line_get_word (_("Partition type-id?"), buf, NULL, 0); + if (!input) + goto error; + + unsigned int tmp = strtol (input, (char**) NULL, 16); + if (tmp < 0x01 || tmp > 0xff) { + ped_exception_throw (PED_EXCEPTION_ERROR, PED_EXCEPTION_CANCEL, + _("Invalid type-id.")); + goto error_free_input; + } + + if (!ped_partition_set_type_id (part, tmp)) + goto error_free_input; + } + + if (has_type_uuid) { + uint8_t* type_uuid = ped_partition_get_type_uuid (part); + static char buf[UUID_STR_LEN]; + uuid_unparse_lower (type_uuid, buf); + free (type_uuid); + + input = command_line_get_word (_("Partition type-uuid?"), buf, NULL, 0); + if (!input) + goto error; + + uuid_t tmp; + if (uuid_parse (input, tmp) != 0 || uuid_is_null (tmp)) { + ped_exception_throw (PED_EXCEPTION_ERROR, PED_EXCEPTION_CANCEL, + _("Invalid type-uuid.")); + goto error_free_input; + } + + if (!ped_partition_set_type_uuid (part, tmp)) + goto error_free_input; + } + + free (input); + + // Reset the fs_type based on the filesystem, if it exists + part->fs_type = ped_file_system_probe (&part->geom); + + if (!ped_disk_commit (*diskp)) + goto error; + return 1; + +error_free_input: + free (input); +error: + return 0; +} + static char* partition_print_flags (PedPartition const *part) { @@ -1128,9 +1224,16 @@ _print_disk_info (const PedDevice *dev, const PedDisk *diskp) ul_jsonwrt_value_u64 (&json, "physical-sector-size", dev->phys_sector_size); ul_jsonwrt_value_s (&json, "label", pt_name); if (diskp) { - if (diskp->type->ops->get_max_primary_partition_count) - ul_jsonwrt_value_u64 (&json, "max-partitions", - diskp->type->ops->get_max_primary_partition_count(diskp)); + bool has_disk_uuid = ped_disk_type_check_feature (diskp->type, PED_DISK_TYPE_DISK_UUID); + if (has_disk_uuid) { + uint8_t* uuid = ped_disk_get_uuid (diskp); + static char buf[UUID_STR_LEN]; + uuid_unparse_lower (uuid, buf); + ul_jsonwrt_value_s (&json, "uuid", buf); + free (uuid); + } + ul_jsonwrt_value_u64 (&json, "max-partitions", + ped_disk_get_max_primary_partition_count(diskp)); disk_print_flags_json (diskp); } } else { @@ -1270,6 +1373,12 @@ do_print (PedDevice** dev, PedDisk** diskp) PED_DISK_TYPE_EXTENDED); has_name = ped_disk_type_check_feature ((*diskp)->type, PED_DISK_TYPE_PARTITION_NAME); + bool has_type_id = ped_disk_type_check_feature ((*diskp)->type, + PED_DISK_TYPE_PARTITION_TYPE_ID); + bool has_type_uuid = ped_disk_type_check_feature ((*diskp)->type, + PED_DISK_TYPE_PARTITION_TYPE_UUID); + bool has_part_uuid = ped_disk_type_check_feature ((*diskp)->type, + PED_DISK_TYPE_PARTITION_UUID); PedPartition* part; if (opt_output_mode == HUMAN) { @@ -1407,10 +1516,33 @@ do_print (PedDevice** dev, PedDisk** diskp) if (!(part->type & PED_PARTITION_FREESPACE)) { + if (has_type_id) { + uint8_t type_id = ped_partition_get_type_id (part); + static char buf[8]; + snprintf(buf, 8, "0x%02x", type_id); + ul_jsonwrt_value_s (&json, "type-id", buf); + } + + if (has_type_uuid) { + uint8_t* type_uuid = ped_partition_get_type_uuid (part); + static char buf[UUID_STR_LEN]; + uuid_unparse_lower (type_uuid, buf); + ul_jsonwrt_value_s (&json, "type-uuid", buf); + free (type_uuid); + } + + if (has_part_uuid) { + uint8_t* uuid = ped_partition_get_uuid (part); + static char buf[UUID_STR_LEN]; + uuid_unparse_lower (uuid, buf); + ul_jsonwrt_value_s (&json, "uuid", buf); + free (uuid); + } + if (has_name) { name = ped_partition_get_name (part); if (strcmp (name, "") != 0) - ul_jsonwrt_value_s (&json, "name", ped_partition_get_name (part)); + ul_jsonwrt_value_s (&json, "name", name); } if (part->fs_type) @@ -2317,6 +2449,14 @@ NULL), str_list_create (_(number_msg), flag_msg, NULL), 1)); command_register (commands, command_create ( + str_list_create_unique ("type", _("type"), NULL), + do_type, + str_list_create ( +_("type NUMBER TYPE-ID or TYPE-UUID type set TYPE-ID or TYPE-UUID of partition NUMBER"), +NULL), + str_list_create (_(number_msg), _(type_msg), NULL), 1)); + +command_register (commands, command_create ( str_list_create_unique ("unit", _("unit"), NULL), do_unit, str_list_create ( diff --git a/parted/strlist.c b/parted/strlist.c index 71cba59..c4cb351 100644 --- a/parted/strlist.c +++ b/parted/strlist.c @@ -1,6 +1,6 @@ /* parted - a frontend to libparted - Copyright (C) 1999-2001, 2007, 2009-2014, 2019-2022 Free Software + Copyright (C) 1999-2001, 2007, 2009-2014, 2019-2023 Free Software Foundation, Inc. This program is free software; you can redistribute it and/or modify @@ -166,6 +166,8 @@ wchar_to_str (const wchar_t* str, size_t count) goto error; result = realloc (result, strlen (result) + 1); + if (!result) + goto error; return result; error: diff --git a/parted/strlist.h b/parted/strlist.h index 3e01943..f9c4183 100644 --- a/parted/strlist.h +++ b/parted/strlist.h @@ -1,6 +1,6 @@ /* parted - a frontend to libparted - Copyright (C) 1999-2001, 2007, 2009-2014, 2019-2022 Free Software + Copyright (C) 1999-2001, 2007, 2009-2014, 2019-2023 Free Software Foundation, Inc. This program is free software; you can redistribute it and/or modify diff --git a/parted/table.c b/parted/table.c index 4fb0f71..63c0e6a 100644 --- a/parted/table.c +++ b/parted/table.c @@ -3,7 +3,7 @@ */ /* parted - a frontend to libparted - Copyright (C) 2006-2014, 2019-2022 Free Software Foundation, Inc. + Copyright (C) 2006-2014, 2019-2023 Free Software Foundation, Inc. This program is free software; you can redistribute it and/or modify it under the terms of the GNU General Public License as published by diff --git a/parted/table.h b/parted/table.h index b6ed6c8..8c645d7 100644 --- a/parted/table.h +++ b/parted/table.h @@ -1,6 +1,6 @@ /* parted - a frontend to libparted - Copyright (C) 2006-2007, 2009-2014, 2019-2022 Free Software Foundation, + Copyright (C) 2006-2007, 2009-2014, 2019-2023 Free Software Foundation, Inc. This program is free software; you can redistribute it and/or modify diff --git a/parted/ui.c b/parted/ui.c index df14e55..33a1808 100644 --- a/parted/ui.c +++ b/parted/ui.c @@ -1,6 +1,6 @@ /* parted - a frontend to libparted - Copyright (C) 1999-2002, 2006-2014, 2019-2022 Free Software Foundation, + Copyright (C) 1999-2002, 2006-2014, 2019-2023 Free Software Foundation, Inc. This program is free software; you can redistribute it and/or modify @@ -564,8 +564,7 @@ _readline (const char* prompt, const StrList* possibilities) wipe_line (); #ifdef HAVE_LIBREADLINE if (!opt_script_mode) { - /* XXX: why isn't prompt const? */ - line = readline ((char*) prompt); + line = readline (prompt); if (line) _add_history_unique (line); } else @@ -781,6 +780,8 @@ realloc_and_cat (char* str, const char* append) int length = strlen (str) + strlen (append) + 1; char* new_str = realloc (str, length); + PED_ASSERT(new_str != NULL); + strcat (new_str, append); return new_str; } @@ -789,7 +790,9 @@ static char* _construct_prompt (const char* head, const char* def, const StrList* possibilities) { + PED_ASSERT(head != NULL); char* prompt = strdup (head); + PED_ASSERT(prompt != NULL); if (def && possibilities) PED_ASSERT (str_list_match_any (possibilities, def)); diff --git a/parted/ui.h b/parted/ui.h index fa62bcb..61a71de 100644 --- a/parted/ui.h +++ b/parted/ui.h @@ -1,6 +1,6 @@ /* parted - a frontend to libparted - Copyright (C) 1999-2001, 2007-2014, 2019-2022 Free Software Foundation, + Copyright (C) 1999-2001, 2007-2014, 2019-2023 Free Software Foundation, Inc. This program is free software; you can redistribute it and/or modify diff --git a/partprobe/Makefile.in b/partprobe/Makefile.in index bac2e1b..fa1d4ad 100644 --- a/partprobe/Makefile.in +++ b/partprobe/Makefile.in @@ -70,9 +70,6 @@ am__make_running_with_option = \ test $$has_opt = yes am__make_dryrun = (target_option=n; $(am__make_running_with_option)) am__make_keepgoing = (target_option=k; $(am__make_running_with_option)) -pkgdatadir = $(datadir)/@PACKAGE@ -pkgincludedir = $(includedir)/@PACKAGE@ -pkglibdir = $(libdir)/@PACKAGE@ am__cd = CDPATH="$${ZSH_VERSION+.}$(PATH_SEPARATOR)" && cd install_sh_DATA = $(install_sh) -c -m 644 install_sh_PROGRAM = $(install_sh) -c @@ -94,7 +91,9 @@ am__aclocal_m4_deps = $(top_srcdir)/m4/00gnulib.m4 \ $(top_srcdir)/m4/__inline.m4 \ $(top_srcdir)/m4/absolute-header.m4 $(top_srcdir)/m4/alloca.m4 \ $(top_srcdir)/m4/arpa_inet_h.m4 $(top_srcdir)/m4/assert.m4 \ - $(top_srcdir)/m4/btowc.m4 $(top_srcdir)/m4/builtin-expect.m4 \ + $(top_srcdir)/m4/assert_h.m4 $(top_srcdir)/m4/btowc.m4 \ + $(top_srcdir)/m4/build-to-host.m4 \ + $(top_srcdir)/m4/builtin-expect.m4 $(top_srcdir)/m4/c-bool.m4 \ $(top_srcdir)/m4/calloc.m4 $(top_srcdir)/m4/canonicalize.m4 \ $(top_srcdir)/m4/clock_time.m4 $(top_srcdir)/m4/close.m4 \ $(top_srcdir)/m4/codeset.m4 $(top_srcdir)/m4/config-h.m4 \ @@ -102,7 +101,7 @@ am__aclocal_m4_deps = $(top_srcdir)/m4/00gnulib.m4 \ $(top_srcdir)/m4/double-slash-root.m4 $(top_srcdir)/m4/dup2.m4 \ $(top_srcdir)/m4/eealloc.m4 $(top_srcdir)/m4/environ.m4 \ $(top_srcdir)/m4/errno_h.m4 $(top_srcdir)/m4/error.m4 \ - $(top_srcdir)/m4/extensions.m4 \ + $(top_srcdir)/m4/error_h.m4 $(top_srcdir)/m4/extensions.m4 \ $(top_srcdir)/m4/extern-inline.m4 $(top_srcdir)/m4/fcntl-o.m4 \ $(top_srcdir)/m4/fcntl.m4 $(top_srcdir)/m4/fcntl_h.m4 \ $(top_srcdir)/m4/fdopen.m4 $(top_srcdir)/m4/flexmember.m4 \ @@ -134,10 +133,11 @@ am__aclocal_m4_deps = $(top_srcdir)/m4/00gnulib.m4 \ $(top_srcdir)/m4/malloc.m4 $(top_srcdir)/m4/malloca.m4 \ $(top_srcdir)/m4/manywarnings.m4 $(top_srcdir)/m4/mbrtowc.m4 \ $(top_srcdir)/m4/mbsinit.m4 $(top_srcdir)/m4/mbstate_t.m4 \ - $(top_srcdir)/m4/mbtowc.m4 $(top_srcdir)/m4/mempcpy.m4 \ - $(top_srcdir)/m4/minmax.m4 $(top_srcdir)/m4/mkdir.m4 \ - $(top_srcdir)/m4/mkstemp.m4 $(top_srcdir)/m4/mmap-anon.m4 \ - $(top_srcdir)/m4/mode_t.m4 $(top_srcdir)/m4/msvc-inval.m4 \ + $(top_srcdir)/m4/mbtowc.m4 $(top_srcdir)/m4/memchr.m4 \ + $(top_srcdir)/m4/mempcpy.m4 $(top_srcdir)/m4/minmax.m4 \ + $(top_srcdir)/m4/mkdir.m4 $(top_srcdir)/m4/mkstemp.m4 \ + $(top_srcdir)/m4/mmap-anon.m4 $(top_srcdir)/m4/mode_t.m4 \ + $(top_srcdir)/m4/msvc-inval.m4 \ $(top_srcdir)/m4/msvc-nothrow.m4 $(top_srcdir)/m4/multiarch.m4 \ $(top_srcdir)/m4/musl.m4 $(top_srcdir)/m4/nanosleep.m4 \ $(top_srcdir)/m4/netinet_in_h.m4 \ @@ -168,29 +168,29 @@ am__aclocal_m4_deps = $(top_srcdir)/m4/00gnulib.m4 \ $(top_srcdir)/m4/socklen.m4 $(top_srcdir)/m4/sockpfaf.m4 \ $(top_srcdir)/m4/ssize_t.m4 $(top_srcdir)/m4/stat-time.m4 \ $(top_srcdir)/m4/stat.m4 $(top_srcdir)/m4/stdalign.m4 \ - $(top_srcdir)/m4/stdarg.m4 $(top_srcdir)/m4/stdbool.m4 \ - $(top_srcdir)/m4/stddef_h.m4 $(top_srcdir)/m4/stdint.m4 \ - $(top_srcdir)/m4/stdio_h.m4 $(top_srcdir)/m4/stdlib_h.m4 \ - $(top_srcdir)/m4/strdup.m4 $(top_srcdir)/m4/strerror.m4 \ - $(top_srcdir)/m4/strerror_r.m4 $(top_srcdir)/m4/string_h.m4 \ - $(top_srcdir)/m4/strtoll.m4 $(top_srcdir)/m4/strtoull.m4 \ - $(top_srcdir)/m4/symlink.m4 $(top_srcdir)/m4/sys_ioctl_h.m4 \ + $(top_srcdir)/m4/stdarg.m4 $(top_srcdir)/m4/stddef_h.m4 \ + $(top_srcdir)/m4/stdint.m4 $(top_srcdir)/m4/stdio_h.m4 \ + $(top_srcdir)/m4/stdlib_h.m4 $(top_srcdir)/m4/strdup.m4 \ + $(top_srcdir)/m4/strerror.m4 $(top_srcdir)/m4/strerror_r.m4 \ + $(top_srcdir)/m4/string_h.m4 $(top_srcdir)/m4/strtoll.m4 \ + $(top_srcdir)/m4/strtoull.m4 $(top_srcdir)/m4/symlink.m4 \ + $(top_srcdir)/m4/sys_ioctl_h.m4 \ $(top_srcdir)/m4/sys_random_h.m4 \ $(top_srcdir)/m4/sys_select_h.m4 \ $(top_srcdir)/m4/sys_socket_h.m4 \ $(top_srcdir)/m4/sys_stat_h.m4 $(top_srcdir)/m4/sys_time_h.m4 \ $(top_srcdir)/m4/sys_types_h.m4 $(top_srcdir)/m4/sys_uio_h.m4 \ $(top_srcdir)/m4/tempname.m4 $(top_srcdir)/m4/thread.m4 \ - $(top_srcdir)/m4/threadlib.m4 $(top_srcdir)/m4/time_h.m4 \ - $(top_srcdir)/m4/unistd_h.m4 $(top_srcdir)/m4/unlink.m4 \ - $(top_srcdir)/m4/unlinkdir.m4 $(top_srcdir)/m4/usleep.m4 \ - $(top_srcdir)/m4/version-etc.m4 $(top_srcdir)/m4/visibility.m4 \ - $(top_srcdir)/m4/warn-on-use.m4 $(top_srcdir)/m4/warnings.m4 \ - $(top_srcdir)/m4/wchar_h.m4 $(top_srcdir)/m4/wchar_t.m4 \ - $(top_srcdir)/m4/wcrtomb.m4 $(top_srcdir)/m4/wctob.m4 \ - $(top_srcdir)/m4/wctomb.m4 $(top_srcdir)/m4/wctype_h.m4 \ - $(top_srcdir)/m4/wint_t.m4 $(top_srcdir)/m4/xalloc.m4 \ - $(top_srcdir)/m4/xstrtol.m4 $(top_srcdir)/m4/year2038.m4 \ + $(top_srcdir)/m4/threadlib.m4 $(top_srcdir)/m4/time.m4 \ + $(top_srcdir)/m4/time_h.m4 $(top_srcdir)/m4/unistd_h.m4 \ + $(top_srcdir)/m4/unlink.m4 $(top_srcdir)/m4/unlinkdir.m4 \ + $(top_srcdir)/m4/usleep.m4 $(top_srcdir)/m4/version-etc.m4 \ + $(top_srcdir)/m4/visibility.m4 $(top_srcdir)/m4/warn-on-use.m4 \ + $(top_srcdir)/m4/warnings.m4 $(top_srcdir)/m4/wchar_h.m4 \ + $(top_srcdir)/m4/wchar_t.m4 $(top_srcdir)/m4/wcrtomb.m4 \ + $(top_srcdir)/m4/wctob.m4 $(top_srcdir)/m4/wctomb.m4 \ + $(top_srcdir)/m4/wctype_h.m4 $(top_srcdir)/m4/wint_t.m4 \ + $(top_srcdir)/m4/xalloc.m4 $(top_srcdir)/m4/xstrtol.m4 \ $(top_srcdir)/m4/yield.m4 $(top_srcdir)/m4/zzgnulib.m4 \ $(top_srcdir)/configure.ac am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \ @@ -277,6 +277,9 @@ am__define_uniq_tagged_files = \ am__DIST_COMMON = $(srcdir)/Makefile.in \ $(top_srcdir)/build-aux/depcomp DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST) +pkgdatadir = @pkgdatadir@ +pkgincludedir = @pkgincludedir@ +pkglibdir = @pkglibdir@ pkglibexecdir = @pkglibexecdir@ ACLOCAL = @ACLOCAL@ ALLOCA = @ALLOCA@ @@ -286,6 +289,7 @@ AM_DEFAULT_VERBOSITY = @AM_DEFAULT_VERBOSITY@ APPLE_UNIVERSAL_BUILD = @APPLE_UNIVERSAL_BUILD@ AR = @AR@ ARFLAGS = @ARFLAGS@ +ASSERT_H = @ASSERT_H@ AUTOCONF = @AUTOCONF@ AUTOHEADER = @AUTOHEADER@ AUTOMAKE = @AUTOMAKE@ @@ -302,6 +306,7 @@ CFLAGS = @CFLAGS@ CFLAG_VISIBILITY = @CFLAG_VISIBILITY@ CHECK_CFLAGS = @CHECK_CFLAGS@ CHECK_LIBS = @CHECK_LIBS@ +CLOCK_TIME_LIB = @CLOCK_TIME_LIB@ CONFIG_INCLUDE = @CONFIG_INCLUDE@ CPP = @CPP@ CPPFLAGS = @CPPFLAGS@ @@ -326,12 +331,14 @@ ENOLINK_VALUE = @ENOLINK_VALUE@ EOVERFLOW_HIDDEN = @EOVERFLOW_HIDDEN@ EOVERFLOW_VALUE = @EOVERFLOW_VALUE@ ERRNO_H = @ERRNO_H@ +ERROR_H = @ERROR_H@ ETAGS = @ETAGS@ EXEEXT = @EXEEXT@ FGREP = @FGREP@ FILECMD = @FILECMD@ GETOPT_CDEFS_H = @GETOPT_CDEFS_H@ GETOPT_H = @GETOPT_H@ +GETRANDOM_LIB = @GETRANDOM_LIB@ GETTEXT_MACRO_VERSION = @GETTEXT_MACRO_VERSION@ GL_CFLAG_ALLOW_WARNINGS = @GL_CFLAG_ALLOW_WARNINGS@ GL_CFLAG_GNULIB_WARNINGS = @GL_CFLAG_GNULIB_WARNINGS@ @@ -347,6 +354,7 @@ GL_GNULIB_CALLOC_GNU = @GL_GNULIB_CALLOC_GNU@ GL_GNULIB_CALLOC_POSIX = @GL_GNULIB_CALLOC_POSIX@ GL_GNULIB_CANONICALIZE_FILE_NAME = @GL_GNULIB_CANONICALIZE_FILE_NAME@ GL_GNULIB_CHDIR = @GL_GNULIB_CHDIR@ +GL_GNULIB_CHMOD = @GL_GNULIB_CHMOD@ GL_GNULIB_CHOWN = @GL_GNULIB_CHOWN@ GL_GNULIB_CLOSE = @GL_GNULIB_CLOSE@ GL_GNULIB_CONNECT = @GL_GNULIB_CONNECT@ @@ -420,6 +428,7 @@ GL_GNULIB_GETPAGESIZE = @GL_GNULIB_GETPAGESIZE@ GL_GNULIB_GETPASS = @GL_GNULIB_GETPASS@ GL_GNULIB_GETPASS_GNU = @GL_GNULIB_GETPASS_GNU@ GL_GNULIB_GETPEERNAME = @GL_GNULIB_GETPEERNAME@ +GL_GNULIB_GETPROGNAME = @GL_GNULIB_GETPROGNAME@ GL_GNULIB_GETRANDOM = @GL_GNULIB_GETRANDOM@ GL_GNULIB_GETSOCKNAME = @GL_GNULIB_GETSOCKNAME@ GL_GNULIB_GETSOCKOPT = @GL_GNULIB_GETSOCKOPT@ @@ -517,6 +526,7 @@ GL_GNULIB_MEMCHR = @GL_GNULIB_MEMCHR@ GL_GNULIB_MEMMEM = @GL_GNULIB_MEMMEM@ GL_GNULIB_MEMPCPY = @GL_GNULIB_MEMPCPY@ GL_GNULIB_MEMRCHR = @GL_GNULIB_MEMRCHR@ +GL_GNULIB_MEMSET_EXPLICIT = @GL_GNULIB_MEMSET_EXPLICIT@ GL_GNULIB_MKDIR = @GL_GNULIB_MKDIR@ GL_GNULIB_MKDIRAT = @GL_GNULIB_MKDIRAT@ GL_GNULIB_MKDTEMP = @GL_GNULIB_MKDTEMP@ @@ -637,6 +647,7 @@ GL_GNULIB_STRVERSCMP = @GL_GNULIB_STRVERSCMP@ GL_GNULIB_SYMLINK = @GL_GNULIB_SYMLINK@ GL_GNULIB_SYMLINKAT = @GL_GNULIB_SYMLINKAT@ GL_GNULIB_SYSTEM_POSIX = @GL_GNULIB_SYSTEM_POSIX@ +GL_GNULIB_TIME = @GL_GNULIB_TIME@ GL_GNULIB_TIMEGM = @GL_GNULIB_TIMEGM@ GL_GNULIB_TIMESPEC_GET = @GL_GNULIB_TIMESPEC_GET@ GL_GNULIB_TIMESPEC_GETRES = @GL_GNULIB_TIMESPEC_GETRES@ @@ -711,6 +722,7 @@ GMSGFMT_015 = @GMSGFMT_015@ GNULIBHEADERS_OVERRIDE_WINT_T = @GNULIBHEADERS_OVERRIDE_WINT_T@ GNULIB_GETTIMEOFDAY = @GNULIB_GETTIMEOFDAY@ GREP = @GREP@ +HARD_LOCALE_LIB = @HARD_LOCALE_LIB@ HAVE_ACCEPT4 = @HAVE_ACCEPT4@ HAVE_ALIGNED_ALLOC = @HAVE_ALIGNED_ALLOC@ HAVE_ALLOCA_H = @HAVE_ALLOCA_H@ @@ -741,6 +753,7 @@ HAVE_DECL_GETLOGIN = @HAVE_DECL_GETLOGIN@ HAVE_DECL_GETLOGIN_R = @HAVE_DECL_GETLOGIN_R@ HAVE_DECL_GETPAGESIZE = @HAVE_DECL_GETPAGESIZE@ HAVE_DECL_GETUSERSHELL = @HAVE_DECL_GETUSERSHELL@ +HAVE_DECL_GETW = @HAVE_DECL_GETW@ HAVE_DECL_IMAXABS = @HAVE_DECL_IMAXABS@ HAVE_DECL_IMAXDIV = @HAVE_DECL_IMAXDIV@ HAVE_DECL_INET_NTOP = @HAVE_DECL_INET_NTOP@ @@ -750,6 +763,7 @@ HAVE_DECL_LOCALTIME_R = @HAVE_DECL_LOCALTIME_R@ HAVE_DECL_MEMMEM = @HAVE_DECL_MEMMEM@ HAVE_DECL_MEMRCHR = @HAVE_DECL_MEMRCHR@ HAVE_DECL_OBSTACK_PRINTF = @HAVE_DECL_OBSTACK_PRINTF@ +HAVE_DECL_PUTW = @HAVE_DECL_PUTW@ HAVE_DECL_SETENV = @HAVE_DECL_SETENV@ HAVE_DECL_SETHOSTNAME = @HAVE_DECL_SETHOSTNAME@ HAVE_DECL_SETSTATE = @HAVE_DECL_SETSTATE@ @@ -772,6 +786,9 @@ HAVE_DECL_WCWIDTH = @HAVE_DECL_WCWIDTH@ HAVE_DPRINTF = @HAVE_DPRINTF@ HAVE_DUP3 = @HAVE_DUP3@ HAVE_DUPLOCALE = @HAVE_DUPLOCALE@ +HAVE_ERROR = @HAVE_ERROR@ +HAVE_ERROR_AT_LINE = @HAVE_ERROR_AT_LINE@ +HAVE_ERROR_H = @HAVE_ERROR_H@ HAVE_EUIDACCESS = @HAVE_EUIDACCESS@ HAVE_EXECVPE = @HAVE_EXECVPE@ HAVE_EXPLICIT_BZERO = @HAVE_EXPLICIT_BZERO@ @@ -799,12 +816,15 @@ HAVE_GETLOGIN = @HAVE_GETLOGIN@ HAVE_GETOPT_H = @HAVE_GETOPT_H@ HAVE_GETPAGESIZE = @HAVE_GETPAGESIZE@ HAVE_GETPASS = @HAVE_GETPASS@ +HAVE_GETPROGNAME = @HAVE_GETPROGNAME@ HAVE_GETRANDOM = @HAVE_GETRANDOM@ HAVE_GETSUBOPT = @HAVE_GETSUBOPT@ HAVE_GETTIMEOFDAY = @HAVE_GETTIMEOFDAY@ HAVE_GETUMASK = @HAVE_GETUMASK@ HAVE_GRANTPT = @HAVE_GRANTPT@ HAVE_GROUP_MEMBER = @HAVE_GROUP_MEMBER@ +HAVE_IMAXABS = @HAVE_IMAXABS@ +HAVE_IMAXDIV = @HAVE_IMAXDIV@ HAVE_IMAXDIV_T = @HAVE_IMAXDIV_T@ HAVE_INITSTATE = @HAVE_INITSTATE@ HAVE_INTTYPES_H = @HAVE_INTTYPES_H@ @@ -831,6 +851,7 @@ HAVE_MBSNRTOWCS = @HAVE_MBSNRTOWCS@ HAVE_MBSRTOWCS = @HAVE_MBSRTOWCS@ HAVE_MBTOWC = @HAVE_MBTOWC@ HAVE_MEMPCPY = @HAVE_MEMPCPY@ +HAVE_MEMSET_EXPLICIT = @HAVE_MEMSET_EXPLICIT@ HAVE_MKDIRAT = @HAVE_MKDIRAT@ HAVE_MKDTEMP = @HAVE_MKDTEMP@ HAVE_MKFIFO = @HAVE_MKFIFO@ @@ -1039,7 +1060,6 @@ HAVE_WMEMPCPY = @HAVE_WMEMPCPY@ HAVE_WMEMSET = @HAVE_WMEMSET@ HAVE_WS2TCPIP_H = @HAVE_WS2TCPIP_H@ HAVE_XLOCALE_H = @HAVE_XLOCALE_H@ -HAVE__BOOL = @HAVE__BOOL@ HAVE__EXIT = @HAVE__EXIT@ IGNORE_UNUSED_LIBRARIES_CFLAGS = @IGNORE_UNUSED_LIBRARIES_CFLAGS@ INCLUDE_NEXT = @INCLUDE_NEXT@ @@ -1106,15 +1126,20 @@ LT_REVISION = @LT_REVISION@ LT_SYS_LIBRARY_PATH = @LT_SYS_LIBRARY_PATH@ MAKEINFO = @MAKEINFO@ MANIFEST_TOOL = @MANIFEST_TOOL@ +MBRTOWC_LIB = @MBRTOWC_LIB@ MKDIR_P = @MKDIR_P@ MSGFMT = @MSGFMT@ MSGFMT_015 = @MSGFMT_015@ MSGMERGE = @MSGMERGE@ +NANOSLEEP_LIB = @NANOSLEEP_LIB@ NETINET_IN_H = @NETINET_IN_H@ NEXT_ARPA_INET_H = @NEXT_ARPA_INET_H@ +NEXT_ASSERT_H = @NEXT_ASSERT_H@ NEXT_AS_FIRST_DIRECTIVE_ARPA_INET_H = @NEXT_AS_FIRST_DIRECTIVE_ARPA_INET_H@ +NEXT_AS_FIRST_DIRECTIVE_ASSERT_H = @NEXT_AS_FIRST_DIRECTIVE_ASSERT_H@ NEXT_AS_FIRST_DIRECTIVE_CTYPE_H = @NEXT_AS_FIRST_DIRECTIVE_CTYPE_H@ NEXT_AS_FIRST_DIRECTIVE_ERRNO_H = @NEXT_AS_FIRST_DIRECTIVE_ERRNO_H@ +NEXT_AS_FIRST_DIRECTIVE_ERROR_H = @NEXT_AS_FIRST_DIRECTIVE_ERROR_H@ NEXT_AS_FIRST_DIRECTIVE_FCNTL_H = @NEXT_AS_FIRST_DIRECTIVE_FCNTL_H@ NEXT_AS_FIRST_DIRECTIVE_GETOPT_H = @NEXT_AS_FIRST_DIRECTIVE_GETOPT_H@ NEXT_AS_FIRST_DIRECTIVE_INTTYPES_H = @NEXT_AS_FIRST_DIRECTIVE_INTTYPES_H@ @@ -1145,6 +1170,7 @@ NEXT_AS_FIRST_DIRECTIVE_WCHAR_H = @NEXT_AS_FIRST_DIRECTIVE_WCHAR_H@ NEXT_AS_FIRST_DIRECTIVE_WCTYPE_H = @NEXT_AS_FIRST_DIRECTIVE_WCTYPE_H@ NEXT_CTYPE_H = @NEXT_CTYPE_H@ NEXT_ERRNO_H = @NEXT_ERRNO_H@ +NEXT_ERROR_H = @NEXT_ERROR_H@ NEXT_FCNTL_H = @NEXT_FCNTL_H@ NEXT_GETOPT_H = @NEXT_GETOPT_H@ NEXT_INTTYPES_H = @NEXT_INTTYPES_H@ @@ -1200,6 +1226,7 @@ PRAGMA_COLUMNS = @PRAGMA_COLUMNS@ PRAGMA_SYSTEM_HEADER = @PRAGMA_SYSTEM_HEADER@ PRIPTR_PREFIX = @PRIPTR_PREFIX@ PTHREAD_H_DEFINES_STRUCT_TIMESPEC = @PTHREAD_H_DEFINES_STRUCT_TIMESPEC@ +PTHREAD_SIGMASK_LIB = @PTHREAD_SIGMASK_LIB@ PTRDIFF_T_SUFFIX = @PTRDIFF_T_SUFFIX@ RANLIB = @RANLIB@ REPLACE_ACCESS = @REPLACE_ACCESS@ @@ -1208,6 +1235,7 @@ REPLACE_BTOWC = @REPLACE_BTOWC@ REPLACE_CALLOC_FOR_CALLOC_GNU = @REPLACE_CALLOC_FOR_CALLOC_GNU@ REPLACE_CALLOC_FOR_CALLOC_POSIX = @REPLACE_CALLOC_FOR_CALLOC_POSIX@ REPLACE_CANONICALIZE_FILE_NAME = @REPLACE_CANONICALIZE_FILE_NAME@ +REPLACE_CHMOD = @REPLACE_CHMOD@ REPLACE_CHOWN = @REPLACE_CHOWN@ REPLACE_CLOSE = @REPLACE_CLOSE@ REPLACE_COPY_FILE_RANGE = @REPLACE_COPY_FILE_RANGE@ @@ -1216,7 +1244,10 @@ REPLACE_CTIME = @REPLACE_CTIME@ REPLACE_DPRINTF = @REPLACE_DPRINTF@ REPLACE_DUP = @REPLACE_DUP@ REPLACE_DUP2 = @REPLACE_DUP2@ +REPLACE_DUP3 = @REPLACE_DUP3@ REPLACE_DUPLOCALE = @REPLACE_DUPLOCALE@ +REPLACE_ERROR = @REPLACE_ERROR@ +REPLACE_ERROR_AT_LINE = @REPLACE_ERROR_AT_LINE@ REPLACE_EXECL = @REPLACE_EXECL@ REPLACE_EXECLE = @REPLACE_EXECLE@ REPLACE_EXECLP = @REPLACE_EXECLP@ @@ -1229,6 +1260,7 @@ REPLACE_FCHMODAT = @REPLACE_FCHMODAT@ REPLACE_FCHOWNAT = @REPLACE_FCHOWNAT@ REPLACE_FCLOSE = @REPLACE_FCLOSE@ REPLACE_FCNTL = @REPLACE_FCNTL@ +REPLACE_FDATASYNC = @REPLACE_FDATASYNC@ REPLACE_FDOPEN = @REPLACE_FDOPEN@ REPLACE_FFLUSH = @REPLACE_FFLUSH@ REPLACE_FFSLL = @REPLACE_FFSLL@ @@ -1251,15 +1283,21 @@ REPLACE_GETCWD = @REPLACE_GETCWD@ REPLACE_GETDELIM = @REPLACE_GETDELIM@ REPLACE_GETDOMAINNAME = @REPLACE_GETDOMAINNAME@ REPLACE_GETDTABLESIZE = @REPLACE_GETDTABLESIZE@ +REPLACE_GETENTROPY = @REPLACE_GETENTROPY@ REPLACE_GETGROUPS = @REPLACE_GETGROUPS@ REPLACE_GETLINE = @REPLACE_GETLINE@ +REPLACE_GETLOADAVG = @REPLACE_GETLOADAVG@ REPLACE_GETLOGIN_R = @REPLACE_GETLOGIN_R@ REPLACE_GETPAGESIZE = @REPLACE_GETPAGESIZE@ REPLACE_GETPASS = @REPLACE_GETPASS@ REPLACE_GETPASS_FOR_GETPASS_GNU = @REPLACE_GETPASS_FOR_GETPASS_GNU@ +REPLACE_GETPROGNAME = @REPLACE_GETPROGNAME@ REPLACE_GETRANDOM = @REPLACE_GETRANDOM@ +REPLACE_GETSUBOPT = @REPLACE_GETSUBOPT@ REPLACE_GETTIMEOFDAY = @REPLACE_GETTIMEOFDAY@ REPLACE_GMTIME = @REPLACE_GMTIME@ +REPLACE_IMAXABS = @REPLACE_IMAXABS@ +REPLACE_IMAXDIV = @REPLACE_IMAXDIV@ REPLACE_INET_NTOP = @REPLACE_INET_NTOP@ REPLACE_INET_PTON = @REPLACE_INET_PTON@ REPLACE_INITSTATE = @REPLACE_INITSTATE@ @@ -1288,11 +1326,14 @@ REPLACE_MBSTATE_T = @REPLACE_MBSTATE_T@ REPLACE_MBTOWC = @REPLACE_MBTOWC@ REPLACE_MEMCHR = @REPLACE_MEMCHR@ REPLACE_MEMMEM = @REPLACE_MEMMEM@ +REPLACE_MEMPCPY = @REPLACE_MEMPCPY@ REPLACE_MKDIR = @REPLACE_MKDIR@ REPLACE_MKFIFO = @REPLACE_MKFIFO@ REPLACE_MKFIFOAT = @REPLACE_MKFIFOAT@ REPLACE_MKNOD = @REPLACE_MKNOD@ REPLACE_MKNODAT = @REPLACE_MKNODAT@ +REPLACE_MKOSTEMP = @REPLACE_MKOSTEMP@ +REPLACE_MKOSTEMPS = @REPLACE_MKOSTEMPS@ REPLACE_MKSTEMP = @REPLACE_MKSTEMP@ REPLACE_MKTIME = @REPLACE_MKTIME@ REPLACE_NANOSLEEP = @REPLACE_NANOSLEEP@ @@ -1303,8 +1344,10 @@ REPLACE_OBSTACK_PRINTF = @REPLACE_OBSTACK_PRINTF@ REPLACE_OPEN = @REPLACE_OPEN@ REPLACE_OPENAT = @REPLACE_OPENAT@ REPLACE_PERROR = @REPLACE_PERROR@ +REPLACE_PIPE2 = @REPLACE_PIPE2@ REPLACE_POPEN = @REPLACE_POPEN@ REPLACE_POSIX_MEMALIGN = @REPLACE_POSIX_MEMALIGN@ +REPLACE_POSIX_OPENPT = @REPLACE_POSIX_OPENPT@ REPLACE_PREAD = @REPLACE_PREAD@ REPLACE_PRINTF = @REPLACE_PRINTF@ REPLACE_PSELECT = @REPLACE_PSELECT@ @@ -1382,6 +1425,7 @@ REPLACE_RMDIR = @REPLACE_RMDIR@ REPLACE_SCHED_YIELD = @REPLACE_SCHED_YIELD@ REPLACE_SELECT = @REPLACE_SELECT@ REPLACE_SETENV = @REPLACE_SETENV@ +REPLACE_SETHOSTNAME = @REPLACE_SETHOSTNAME@ REPLACE_SETLOCALE = @REPLACE_SETLOCALE@ REPLACE_SETSTATE = @REPLACE_SETSTATE@ REPLACE_SLEEP = @REPLACE_SLEEP@ @@ -1390,6 +1434,7 @@ REPLACE_SPRINTF = @REPLACE_SPRINTF@ REPLACE_STAT = @REPLACE_STAT@ REPLACE_STDIO_READ_FUNCS = @REPLACE_STDIO_READ_FUNCS@ REPLACE_STDIO_WRITE_FUNCS = @REPLACE_STDIO_WRITE_FUNCS@ +REPLACE_STPCPY = @REPLACE_STPCPY@ REPLACE_STPNCPY = @REPLACE_STPNCPY@ REPLACE_STRCASESTR = @REPLACE_STRCASESTR@ REPLACE_STRCHRNUL = @REPLACE_STRCHRNUL@ @@ -1416,7 +1461,9 @@ REPLACE_STRUCT_LCONV = @REPLACE_STRUCT_LCONV@ REPLACE_STRUCT_TIMEVAL = @REPLACE_STRUCT_TIMEVAL@ REPLACE_SYMLINK = @REPLACE_SYMLINK@ REPLACE_SYMLINKAT = @REPLACE_SYMLINKAT@ +REPLACE_TIME = @REPLACE_TIME@ REPLACE_TIMEGM = @REPLACE_TIMEGM@ +REPLACE_TIMESPEC_GET = @REPLACE_TIMESPEC_GET@ REPLACE_TMPFILE = @REPLACE_TMPFILE@ REPLACE_TOWLOWER = @REPLACE_TOWLOWER@ REPLACE_TRUNCATE = @REPLACE_TRUNCATE@ @@ -1442,15 +1489,20 @@ REPLACE_WCSWIDTH = @REPLACE_WCSWIDTH@ REPLACE_WCTOB = @REPLACE_WCTOB@ REPLACE_WCTOMB = @REPLACE_WCTOMB@ REPLACE_WCWIDTH = @REPLACE_WCWIDTH@ +REPLACE_WMEMPCPY = @REPLACE_WMEMPCPY@ REPLACE_WRITE = @REPLACE_WRITE@ +REPLACE__EXIT = @REPLACE__EXIT@ +SCHED_YIELD_LIB = @SCHED_YIELD_LIB@ SED = @SED@ +SELECT_LIB = @SELECT_LIB@ +SETLOCALE_LIB = @SETLOCALE_LIB@ +SETLOCALE_NULL_LIB = @SETLOCALE_NULL_LIB@ SET_MAKE = @SET_MAKE@ SHELL = @SHELL@ SIG_ATOMIC_T_SUFFIX = @SIG_ATOMIC_T_SUFFIX@ SIZE_T_SUFFIX = @SIZE_T_SUFFIX@ -STDALIGN_H = @STDALIGN_H@ STDARG_H = @STDARG_H@ -STDBOOL_H = @STDBOOL_H@ +STDCKDINT_H = @STDCKDINT_H@ STDDEF_H = @STDDEF_H@ STDINT_H = @STDINT_H@ STRIP = @STRIP@ @@ -1494,6 +1546,8 @@ am__quote = @am__quote@ am__tar = @am__tar@ am__untar = @am__untar@ bindir = @bindir@ +bindir_c = @bindir_c@ +bindir_c_make = @bindir_c_make@ build = @build@ build_alias = @build_alias@ build_cpu = @build_cpu@ @@ -1501,10 +1555,20 @@ build_os = @build_os@ build_vendor = @build_vendor@ builddir = @builddir@ datadir = @datadir@ +datadir_c = @datadir_c@ +datadir_c_make = @datadir_c_make@ datarootdir = @datarootdir@ +datarootdir_c = @datarootdir_c@ +datarootdir_c_make = @datarootdir_c_make@ docdir = @docdir@ +docdir_c = @docdir_c@ +docdir_c_make = @docdir_c_make@ dvidir = @dvidir@ +dvidir_c = @dvidir_c@ +dvidir_c_make = @dvidir_c_make@ exec_prefix = @exec_prefix@ +exec_prefix_c = @exec_prefix_c@ +exec_prefix_c_make = @exec_prefix_c_make@ gl_LIBOBJDEPS = @gl_LIBOBJDEPS@ gl_LIBOBJS = @gl_LIBOBJS@ gl_LTLIBOBJS = @gl_LTLIBOBJS@ @@ -1518,26 +1582,68 @@ host_cpu = @host_cpu@ host_os = @host_os@ host_vendor = @host_vendor@ htmldir = @htmldir@ +htmldir_c = @htmldir_c@ +htmldir_c_make = @htmldir_c_make@ includedir = @includedir@ +includedir_c = @includedir_c@ +includedir_c_make = @includedir_c_make@ infodir = @infodir@ +infodir_c = @infodir_c@ +infodir_c_make = @infodir_c_make@ install_sh = @install_sh@ libdir = @libdir@ +libdir_c = @libdir_c@ +libdir_c_make = @libdir_c_make@ libexecdir = @libexecdir@ +libexecdir_c = @libexecdir_c@ +libexecdir_c_make = @libexecdir_c_make@ lispdir = @lispdir@ +lispdir_c = @lispdir_c@ +lispdir_c_make = @lispdir_c_make@ localedir = @localedir@ +localedir_c = @localedir_c@ +localedir_c_make = @localedir_c_make@ localstatedir = @localstatedir@ +localstatedir_c = @localstatedir_c@ +localstatedir_c_make = @localstatedir_c_make@ mandir = @mandir@ +mandir_c = @mandir_c@ +mandir_c_make = @mandir_c_make@ mkdir_p = @mkdir_p@ oldincludedir = @oldincludedir@ +oldincludedir_c = @oldincludedir_c@ +oldincludedir_c_make = @oldincludedir_c_make@ pdfdir = @pdfdir@ +pdfdir_c = @pdfdir_c@ +pdfdir_c_make = @pdfdir_c_make@ +pkgdatadir_c = @pkgdatadir_c@ +pkgdatadir_c_make = @pkgdatadir_c_make@ +pkgincludedir_c = @pkgincludedir_c@ +pkgincludedir_c_make = @pkgincludedir_c_make@ +pkglibdir_c = @pkglibdir_c@ +pkglibdir_c_make = @pkglibdir_c_make@ +pkglibexecdir_c = @pkglibexecdir_c@ +pkglibexecdir_c_make = @pkglibexecdir_c_make@ prefix = @prefix@ +prefix_c = @prefix_c@ +prefix_c_make = @prefix_c_make@ program_transform_name = @program_transform_name@ psdir = @psdir@ +psdir_c = @psdir_c@ +psdir_c_make = @psdir_c_make@ runstatedir = @runstatedir@ +runstatedir_c = @runstatedir_c@ +runstatedir_c_make = @runstatedir_c_make@ sbindir = @sbindir@ +sbindir_c = @sbindir_c@ +sbindir_c_make = @sbindir_c_make@ sharedstatedir = @sharedstatedir@ +sharedstatedir_c = @sharedstatedir_c@ +sharedstatedir_c_make = @sharedstatedir_c_make@ srcdir = @srcdir@ sysconfdir = @sysconfdir@ +sysconfdir_c = @sysconfdir_c@ +sysconfdir_c_make = @sysconfdir_c_make@ target_alias = @target_alias@ top_build_prefix = @top_build_prefix@ top_builddir = @top_builddir@ diff --git a/partprobe/partprobe.c b/partprobe/partprobe.c index 4c3caeb..bdd8963 100644 --- a/partprobe/partprobe.c +++ b/partprobe/partprobe.c @@ -1,6 +1,6 @@ /* partprobe - informs the OS kernel of partition layout - Copyright (C) 2001-2002, 2007-2014, 2019-2022 Free Software Foundation, + Copyright (C) 2001-2002, 2007-2014, 2019-2023 Free Software Foundation, Inc. This program is free software; you can redistribute it and/or modify @@ -10,6 +10,7 @@ hu id it ja +ka ko nl nn diff --git a/po/Makevars b/po/Makevars index bc7bab2..e646f1b 100644 --- a/po/Makevars +++ b/po/Makevars @@ -9,7 +9,7 @@ top_builddir = .. # These options get passed to xgettext. XGETTEXT_OPTIONS = --keyword=_ --keyword=N_ \ - \ + \ --flag=_:1:pass-c-format\ --flag=N_:1:pass-c-format\ --flag=error:3:c-format --flag=error_at_line:5:c-format\ diff --git a/po/POTFILES.in b/po/POTFILES.in index fb556e3..3c45cfc 100644 --- a/po/POTFILES.in +++ b/po/POTFILES.in @@ -1,5 +1,5 @@ # libparted -# Copyright (C) 1999-2001, 2006-2014, 2019-2022 Free Software Foundation, Inc. +# Copyright (C) 1999-2001, 2006-2014, 2019-2023 Free Software Foundation, Inc. # This file may be modified and/or copied without restriction. # list of files containing translatable strings @@ -6,7 +6,7 @@ msgid "" msgstr "" "Project-Id-Version: parted 1.6.0\n" "Report-Msgid-Bugs-To: bug-parted@gnu.org\n" -"POT-Creation-Date: 2022-04-18 14:44-0400\n" +"POT-Creation-Date: 2023-04-10 15:50-0700\n" "PO-Revision-Date: 2002-05-05 14:47+0100\n" "Last-Translator: Miquel Matas <miquelmatas@wanadoo.es>\n" "Language-Team: Catalan <ca@dodds.net>\n" @@ -17,25 +17,25 @@ msgstr "" "X-Bugs: Report translation errors to the Language-Team address.\n" "X-Generator: KBabel 0.7\n" -#: lib/argmatch.c:147 +#: lib/argmatch.c:145 #, c-format msgid "invalid argument %s for %s" msgstr "" -#: lib/argmatch.c:148 +#: lib/argmatch.c:146 #, c-format msgid "ambiguous argument %s for %s" msgstr "" -#: lib/argmatch.c:167 lib/argmatch.h:238 +#: lib/argmatch.c:165 lib/argmatch.h:237 msgid "Valid arguments are:" msgstr "" -#: lib/closeout.c:122 libparted/labels/fdasd.c:145 +#: lib/closeout.c:121 libparted/labels/fdasd.c:145 msgid "write error" msgstr "" -#: lib/error.c:195 +#: lib/error.c:193 #, fuzzy msgid "Unknown system error" msgstr "Tipus de sistema de fitxers desconegut \"%s\"." @@ -96,11 +96,11 @@ msgstr "" #. If you don't know what to put here, please see #. <https://en.wikipedia.org/wiki/Quotation_marks_in_other_languages> #. and use glyphs suitable for your language. -#: lib/quotearg.c:355 +#: lib/quotearg.c:354 msgid "`" msgstr "" -#: lib/quotearg.c:356 +#: lib/quotearg.c:355 msgid "'" msgstr "" @@ -182,7 +182,7 @@ msgstr "" #. To enquire the regular expression that your system uses for this #. purpose, you can use the command #. locale -k LC_MESSAGES | grep '^yesexpr=' -#: lib/rpmatch.c:150 +#: lib/rpmatch.c:149 msgid "^[yY]" msgstr "" @@ -192,7 +192,7 @@ msgstr "" #. To enquire the regular expression that your system uses for this #. purpose, you can use the command #. locale -k LC_MESSAGES | grep '^noexpr=' -#: lib/rpmatch.c:163 +#: lib/rpmatch.c:162 msgid "^[nN]" msgstr "" @@ -700,22 +700,22 @@ msgstr "boot" msgid "Unknown disk flag, %d." msgstr "Flag desconegut a %d." -#: libparted/disk.c:1289 +#: libparted/disk.c:1320 #, c-format msgid "%s disk labels do not support extended partitions." msgstr "Les etiquetes de disc de %s no suporten particions exteses." -#: libparted/disk.c:1821 +#: libparted/disk.c:1990 #, c-format msgid "%s disk labels don't support logical or extended partitions." msgstr "Les etiquetes de disc de %s no suporten particions lògiques o exteses." -#: libparted/disk.c:1834 +#: libparted/disk.c:2003 #, fuzzy msgid "Too many primary partitions." msgstr "Massa particions primàries." -#: libparted/disk.c:1843 +#: libparted/disk.c:2012 #, c-format msgid "" "Can't add a logical partition to %s, because there is no extended partition." @@ -723,141 +723,145 @@ msgstr "" "No es pot afegir una partició lògica a %s, ja que no hi ha una partició " "extesa" -#: libparted/disk.c:1867 +#: libparted/disk.c:2036 #, fuzzy, c-format msgid "Can't have more than one extended partition on %s." msgstr "No pot haver més d'una partició extesa a %s" -#: libparted/disk.c:1877 +#: libparted/disk.c:2046 msgid "Can't have logical partitions outside of the extended partition." msgstr "No poden haver particions lògiques fora de la partició extesa." -#: libparted/disk.c:1902 +#: libparted/disk.c:2071 #, c-format msgid "Can't have a logical partition outside of the extended partition on %s." msgstr "No pot haver una partició lògica fora de la partició extesa a %s." -#: libparted/disk.c:1912 +#: libparted/disk.c:2081 msgid "Can't have a primary partition inside an extended partition." msgstr "No pot haver una partició primaria dins d'una partició extesa." -#: libparted/disk.c:1921 +#: libparted/disk.c:2090 msgid "Can't have a partition outside the disk!" msgstr "No es pot fer una partició fora del disc!" -#: libparted/disk.c:1972 libparted/disk.c:2150 +#: libparted/disk.c:2141 libparted/disk.c:2319 #, fuzzy msgid "Can't have overlapping partitions." msgstr "No poden haver particions solapades." -#: libparted/disk.c:2351 +#: libparted/disk.c:2520 msgid "metadata" msgstr "metadata" -#: libparted/disk.c:2353 +#: libparted/disk.c:2522 msgid "free" msgstr "lliure" -#: libparted/disk.c:2355 parted/ui.c:1271 parted/ui.c:1299 +#: libparted/disk.c:2524 parted/ui.c:1274 parted/ui.c:1302 msgid "extended" msgstr "extesa" -#: libparted/disk.c:2357 parted/ui.c:1275 parted/ui.c:1303 +#: libparted/disk.c:2526 parted/ui.c:1278 parted/ui.c:1306 msgid "logical" msgstr "lògica" -#: libparted/disk.c:2359 parted/ui.c:1267 parted/ui.c:1295 +#: libparted/disk.c:2528 parted/ui.c:1270 parted/ui.c:1298 msgid "primary" msgstr "primària" -#: libparted/disk.c:2375 +#: libparted/disk.c:2544 msgid "boot" msgstr "boot" -#: libparted/disk.c:2377 +#: libparted/disk.c:2546 msgid "bios_grub" msgstr "" -#: libparted/disk.c:2379 +#: libparted/disk.c:2548 msgid "root" msgstr "root" -#: libparted/disk.c:2381 +#: libparted/disk.c:2550 msgid "swap" msgstr "swap" -#: libparted/disk.c:2383 +#: libparted/disk.c:2552 msgid "hidden" msgstr "oculta" -#: libparted/disk.c:2385 +#: libparted/disk.c:2554 msgid "raid" msgstr "raid" -#: libparted/disk.c:2387 +#: libparted/disk.c:2556 msgid "lvm" msgstr "lvm" -#: libparted/disk.c:2389 +#: libparted/disk.c:2558 msgid "lba" msgstr "lba" -#: libparted/disk.c:2391 +#: libparted/disk.c:2560 msgid "hp-service" msgstr "servei-hp" -#: libparted/disk.c:2393 +#: libparted/disk.c:2562 msgid "palo" msgstr "" -#: libparted/disk.c:2395 +#: libparted/disk.c:2564 msgid "prep" msgstr "" -#: libparted/disk.c:2397 +#: libparted/disk.c:2566 msgid "msftres" msgstr "" -#: libparted/disk.c:2399 +#: libparted/disk.c:2568 #, fuzzy msgid "msftdata" msgstr "metadata" -#: libparted/disk.c:2401 +#: libparted/disk.c:2570 msgid "atvrecv" msgstr "" -#: libparted/disk.c:2403 +#: libparted/disk.c:2572 msgid "diag" msgstr "" -#: libparted/disk.c:2405 +#: libparted/disk.c:2574 msgid "legacy_boot" msgstr "" -#: libparted/disk.c:2407 +#: libparted/disk.c:2576 msgid "irst" msgstr "" -#: libparted/disk.c:2409 +#: libparted/disk.c:2578 #, fuzzy msgid "esp" msgstr "Sí" -#: libparted/disk.c:2411 +#: libparted/disk.c:2580 msgid "chromeos_kernel" msgstr "" -#: libparted/disk.c:2413 +#: libparted/disk.c:2582 #, fuzzy msgid "bls_boot" msgstr "boot" -#: libparted/disk.c:2415 +#: libparted/disk.c:2584 msgid "linux-home" msgstr "" -#: libparted/disk.c:2421 +#: libparted/disk.c:2586 +msgid "no_automount" +msgstr "" + +#: libparted/disk.c:2592 #, fuzzy, c-format msgid "Unknown partition flag, %d." msgstr "Flag desconegut a %d." @@ -1048,8 +1052,8 @@ msgid "" msgstr "" #: libparted/labels/atari.c:1662 libparted/labels/bsd.c:563 -#: libparted/labels/dasd.c:895 libparted/labels/dos.c:2303 -#: libparted/labels/dvh.c:770 libparted/labels/gpt.c:1769 +#: libparted/labels/dasd.c:893 libparted/labels/dos.c:2294 +#: libparted/labels/dvh.c:770 libparted/labels/gpt.c:1891 #: libparted/labels/loop.c:244 libparted/labels/mac.c:1409 #: libparted/labels/pc98.c:697 libparted/labels/rdb.c:1054 #: libparted/labels/sun.c:781 @@ -1073,39 +1077,30 @@ msgstr "S'esperava un múmero de partició." msgid "Unable to allocate a bsd disklabel slot." msgstr "No s'ha pogut reservar una etiqueta bsd" -#: libparted/labels/dasd.c:626 +#: libparted/labels/dasd.c:634 msgid "The partition table of DASD-LDL device cannot be changed.\n" msgstr "" -#: libparted/labels/dasd.c:921 +#: libparted/labels/dasd.c:919 #, fuzzy msgid "Unable to allocate a dasd disklabel slot" msgstr "No s'ha pogut reservar una etiqueta bsd" -#: libparted/labels/dos.c:1008 +#: libparted/labels/dos.c:1159 #, fuzzy, c-format msgid "Invalid partition table on %s -- wrong signature %x." msgstr "Taula de particions invàlida a %s - signatura dolenta %x." -#: libparted/labels/dos.c:1036 +#: libparted/labels/dos.c:1187 #, c-format msgid "Invalid partition table - recursive partition on %s." msgstr "Taula de particions invàlida - partició recursiva a %s." -#: libparted/labels/dos.c:1567 -msgid "Extended partitions cannot be hidden on msdos disk labels." -msgstr "" - -#: libparted/labels/dos.c:1579 -#, fuzzy -msgid "Extended partitions cannot be recovery partitions on msdos disk labels." -msgstr "Taula de particions invàlida - partició recursiva a %s." - -#: libparted/labels/dos.c:2285 +#: libparted/labels/dos.c:2276 msgid "Parted can't resize partitions managed by Windows Dynamic Disk." msgstr "" -#: libparted/labels/dos.c:2541 +#: libparted/labels/dos.c:2532 #, fuzzy msgid "cannot create any more partitions" msgstr "No es pot crear cap més partició." @@ -1253,12 +1248,12 @@ msgstr "" msgid "Disk geometry does not match a DASD device of type 3390." msgstr "" -#: libparted/labels/gpt.c:569 +#: libparted/labels/gpt.c:589 #, fuzzy msgid "device is too small for GPT" msgstr "Sistema de fitxers massa petit per ext2." -#: libparted/labels/gpt.c:771 +#: libparted/labels/gpt.c:791 #, fuzzy, c-format msgid "" "The format of the GPT partition table is version %x, which is newer than " @@ -1267,7 +1262,7 @@ msgstr "" "El format de la taula de particions GPT és més nou que el que Parted pot " "reconeixer. Si-us-plau, diga'ns-ho a bug-parted@gnu.org" -#: libparted/labels/gpt.c:807 +#: libparted/labels/gpt.c:827 #, c-format msgid "" "Not all of the space available to %s appears to be used, you can fix the GPT " @@ -1275,7 +1270,7 @@ msgid "" "setting? " msgstr "" -#: libparted/labels/gpt.c:1006 +#: libparted/labels/gpt.c:1026 #, fuzzy msgid "" "The backup GPT table is not at the end of the disk, as it should be. Fix, " @@ -1285,7 +1280,7 @@ msgstr "" "voler dir que un altre sistema operatiu creu que el disc és més petit. Ho " "voleu arreglar novent la còpia al final ( i esborrant la còpia antiga)?" -#: libparted/labels/gpt.c:1024 +#: libparted/labels/gpt.c:1044 #, fuzzy msgid "" "Both the primary and backup GPT tables are corrupt. Try making a fresh " @@ -1295,7 +1290,7 @@ msgstr "" "taula actualitzada, i fent servir la opció de rescat de Parted per " "reconstruïr les particions." -#: libparted/labels/gpt.c:1035 +#: libparted/labels/gpt.c:1055 #, fuzzy msgid "" "The backup GPT table is corrupt, but the primary appears OK, so that will be " @@ -1304,7 +1299,7 @@ msgstr "" "La taula primària GPT és corrupte, però la còpia sembla correcta, per tant " "es farà servir aquesta." -#: libparted/labels/gpt.c:1047 +#: libparted/labels/gpt.c:1067 #, fuzzy msgid "" "The primary GPT table is corrupt, but the backup appears OK, so that will be " @@ -1313,11 +1308,11 @@ msgstr "" "La taula primària GPT és corrupte, però la còpia sembla correcta, per tant " "es farà servir aquesta." -#: libparted/labels/gpt.c:1071 +#: libparted/labels/gpt.c:1091 msgid "primary partition table array CRC mismatch" msgstr "" -#: libparted/labels/gpt.c:1655 libparted/labels/gpt.c:1682 +#: libparted/labels/gpt.c:1722 libparted/labels/gpt.c:1749 #, fuzzy msgid "failed to translate partition name" msgstr "No s'ha pogut determinar si la partició està muntada." @@ -2007,7 +2002,7 @@ msgstr "fat_table_alloc_cluster: no hi ha clústers lliures" msgid "Could not detect file system." msgstr "No s'ha pogut detectar el sistema de fitxers." -#: libparted/fs/r/filesys.c:159 libparted/fs/r/filesys.c:284 +#: libparted/fs/r/filesys.c:159 libparted/fs/r/filesys.c:285 #, fuzzy, c-format msgid "resizing %s file systems is not supported" msgstr "" @@ -2279,40 +2274,40 @@ msgstr "" msgid "This HFS+ volume has no extents overflow file. This is quite unusual!" msgstr "" -#: parted/parted.c:137 +#: parted/parted.c:138 msgid "displays this help message" msgstr "mostra aquest missatge d'ajuda" -#: parted/parted.c:138 +#: parted/parted.c:139 msgid "lists partition layout on all block devices" msgstr "" -#: parted/parted.c:139 +#: parted/parted.c:140 msgid "displays machine parseable output" msgstr "" -#: parted/parted.c:140 +#: parted/parted.c:141 msgid "displays JSON output" msgstr "" -#: parted/parted.c:141 +#: parted/parted.c:142 msgid "never prompts for user intervention" msgstr "mai pregunta a l'usuari" -#: parted/parted.c:142 +#: parted/parted.c:143 msgid "in script mode, fix instead of abort when asked" msgstr "" -#: parted/parted.c:143 +#: parted/parted.c:144 msgid "displays the version" msgstr "mostra la versió" -#: parted/parted.c:144 +#: parted/parted.c:145 #, fuzzy msgid "alignment for new partitions" msgstr "No es poden copiar particions exteses." -#: parted/parted.c:157 +#: parted/parted.c:158 #, fuzzy msgid "" "NUMBER is the partition number used by Linux. On MS-DOS disk labels, the " @@ -2322,57 +2317,61 @@ msgstr "" "msdos, les particions primàries són numeradas de 1 a 4, i les particions " "lògiques de la 5 en davant.\n" -#: parted/parted.c:160 +#: parted/parted.c:161 msgid "LABEL-TYPE is one of: " msgstr "TIPUS-ETI és una d'aquestes: " -#: parted/parted.c:161 parted/parted.c:162 +#: parted/parted.c:162 parted/parted.c:163 msgid "FLAG is one of: " msgstr "FLAG és una d'aquests:" -#: parted/parted.c:163 +#: parted/parted.c:164 #, fuzzy msgid "UNIT is one of: " msgstr "FLAG és una d'aquests:" -#: parted/parted.c:164 +#: parted/parted.c:165 msgid "desired alignment: minimum or optimal" msgstr "" -#: parted/parted.c:165 +#: parted/parted.c:166 msgid "PART-TYPE is one of: primary, logical, extended\n" msgstr "TIPUS-PART és una d'aquestes: primària, lògica, extesa\n" -#: parted/parted.c:167 +#: parted/parted.c:168 msgid "FS-TYPE is one of: " msgstr "TIPUS-SF és un d'aquests: " -#: parted/parted.c:168 +#: parted/parted.c:169 msgid "" "START and END are disk locations, such as 4GB or 10%. Negative values count " "from the end of the disk. For example, -1s specifies exactly the last " "sector.\n" msgstr "" -#: parted/parted.c:171 +#: parted/parted.c:172 msgid "" "END is disk location, such as 4GB or 10%. Negative value counts from the " "end of the disk. For example, -1s specifies exactly the last sector.\n" msgstr "" -#: parted/parted.c:174 +#: parted/parted.c:175 msgid "STATE is one of: on, off\n" msgstr "ESTAT és un d'aquests: on, off\n" -#: parted/parted.c:175 +#: parted/parted.c:176 msgid "DEVICE is usually /dev/hda or /dev/sda\n" msgstr "DISPOS és, normalment, /dev/hda o /dev/sda\n" -#: parted/parted.c:176 +#: parted/parted.c:177 msgid "NAME is any word you want\n" msgstr "NOM és qualsevol paraula que vulguis\n" -#: parted/parted.c:179 +#: parted/parted.c:178 +msgid "TYPE_ID is a value between 0x01 and 0xff, TYPE_UUID is a UUID\n" +msgstr "" + +#: parted/parted.c:182 #, fuzzy msgid "" "Copyright (C) 1998 - 2006 Free Software Foundation, Inc.\n" @@ -2393,155 +2392,178 @@ msgstr "" "General Pública GNU.\n" "\n" -#: parted/parted.c:229 +#: parted/parted.c:232 #, c-format msgid "%0.f%%\t(time left %.2d:%.2d)" msgstr "%0.f%%\t(temps que queda %.2d:%.2d)" -#: parted/parted.c:248 +#: parted/parted.c:251 #, c-format msgid "Partition %s is being used. Are you sure you want to continue?" msgstr "" -#: parted/parted.c:269 +#: parted/parted.c:272 #, c-format msgid "Partition(s) on %s are being used." msgstr "La(s) partició(ns) a %s s'està utilitzant." -#: parted/parted.c:281 +#: parted/parted.c:284 #, c-format msgid "" "The existing disk label on %s will be destroyed and all data on this disk " "will be lost. Do you want to continue?" msgstr "" -#: parted/parted.c:542 +#: parted/parted.c:545 msgid "New disk label type?" msgstr "Nou tipus d'etiqueta?" -#: parted/parted.c:680 +#: parted/parted.c:692 msgid "Partition type?" msgstr "Tipus de partició?" -#: parted/parted.c:698 parted/parted.c:902 +#: parted/parted.c:710 parted/parted.c:914 msgid "Partition name?" msgstr "Nom de la partició?" -#: parted/parted.c:708 +#: parted/parted.c:720 msgid "File system type?" msgstr "Sistema de fitxers?" -#: parted/parted.c:713 parted/parted.c:1683 +#: parted/parted.c:725 parted/parted.c:1815 msgid "Start?" msgstr "Inici?" -#: parted/parted.c:715 parted/parted.c:1685 parted/parted.c:1768 +#: parted/parted.c:727 parted/parted.c:1817 parted/parted.c:1900 msgid "End?" msgstr "Fi?" -#: parted/parted.c:782 +#: parted/parted.c:794 #, c-format msgid "" "You requested a partition from %s to %s (sectors %llu..%llu).\n" "The closest location we can manage is %s to %s (sectors %llu..%llu).%s" msgstr "" -#: parted/parted.c:791 +#: parted/parted.c:803 msgid "" "\n" "Is this still acceptable to you?" msgstr "" -#: parted/parted.c:814 +#: parted/parted.c:826 #, c-format msgid "" "The resulting partition is not properly aligned for best performance: %s" msgstr "" -#: parted/parted.c:816 parted/parted.c:1925 +#: parted/parted.c:828 parted/parted.c:2057 msgid "unknown (malloc failed)" msgstr "" -#: parted/parted.c:894 +#: parted/parted.c:906 #, fuzzy, c-format msgid "%s disk labels do not support partition name." msgstr "Les etiquetes de disc de %s no suporten particions exteses." -#: parted/parted.c:899 parted/parted.c:1748 parted/parted.c:1814 -#: parted/parted.c:1908 parted/parted.c:1983 +#: parted/parted.c:911 parted/parted.c:955 parted/parted.c:1880 +#: parted/parted.c:1946 parted/parted.c:2040 parted/parted.c:2115 msgid "Partition number?" msgstr "Número de partició?" -#: parted/parted.c:1050 +#: parted/parted.c:949 +#, fuzzy, c-format +msgid "%s disk labels do not support partition type." +msgstr "Les etiquetes de disc de %s no suporten particions exteses." + +#: parted/parted.c:965 +#, fuzzy +msgid "Partition type-id?" +msgstr "Tipus de partició?" + +#: parted/parted.c:972 +msgid "Invalid type-id." +msgstr "" + +#: parted/parted.c:986 +#, fuzzy +msgid "Partition type-uuid?" +msgstr "Tipus de partició?" + +#: parted/parted.c:993 +msgid "Invalid type-uuid." +msgstr "" + +#: parted/parted.c:1146 #, c-format msgid "BIOS cylinder,head,sector geometry: %d,%d,%d. Each cylinder is %s.\n" msgstr "" -#: parted/parted.c:1137 +#: parted/parted.c:1240 #, c-format msgid "Model: %s (%s)\n" msgstr "" -#: parted/parted.c:1139 +#: parted/parted.c:1242 #, fuzzy, c-format msgid "Disk %s: %s\n" msgstr "Tipus d'etiqueta: %s\n" -#: parted/parted.c:1140 +#: parted/parted.c:1243 #, c-format msgid "Sector size (logical/physical): %lldB/%lldB\n" msgstr "" -#: parted/parted.c:1152 +#: parted/parted.c:1255 #, fuzzy, c-format msgid "Partition Table: %s\n" msgstr "Nom de la partició?" -#: parted/parted.c:1153 +#: parted/parted.c:1256 #, fuzzy, c-format msgid "Disk Flags: %s\n" msgstr "Tipus d'etiqueta: %s\n" -#: parted/parted.c:1279 parted/parted.c:1282 +#: parted/parted.c:1388 parted/parted.c:1391 msgid "Number" msgstr "" -#: parted/parted.c:1279 parted/parted.c:1282 +#: parted/parted.c:1388 parted/parted.c:1391 #, fuzzy msgid "Start" msgstr "Inici?" -#: parted/parted.c:1280 parted/parted.c:1283 +#: parted/parted.c:1389 parted/parted.c:1392 #, fuzzy msgid "End" msgstr "Fi?" -#: parted/parted.c:1283 +#: parted/parted.c:1392 msgid "Size" msgstr "" -#: parted/parted.c:1287 +#: parted/parted.c:1396 msgid "Type" msgstr "" -#: parted/parted.c:1289 +#: parted/parted.c:1398 #, fuzzy msgid "File system" msgstr "Sistema de fitxers?" -#: parted/parted.c:1292 +#: parted/parted.c:1401 msgid "Name" msgstr "" -#: parted/parted.c:1294 +#: parted/parted.c:1403 msgid "Flags" msgstr "Flags" -#: parted/parted.c:1352 +#: parted/parted.c:1461 msgid "Free Space" msgstr "" -#: parted/parted.c:1570 +#: parted/parted.c:1702 #, fuzzy, c-format msgid "" "A %s %s partition was found at %s -> %s. Do you want to add it to the " @@ -2550,82 +2572,82 @@ msgstr "" "Una partició %s %s ha estat trobada a %.3fMb -> %.3fMb. Vols afegir-la a la " "taula de particions?" -#: parted/parted.c:1613 +#: parted/parted.c:1745 #, fuzzy msgid "searching for file systems" msgstr "sistema de fitxers creixent" -#: parted/parted.c:1720 +#: parted/parted.c:1852 msgid "The resize command has been removed in parted 3.0" msgstr "" -#: parted/parted.c:1782 +#: parted/parted.c:1914 msgid "" "Shrinking a partition can cause data loss, are you sure you want to continue?" msgstr "" -#: parted/parted.c:1838 +#: parted/parted.c:1970 msgid "New device?" msgstr "Nou dispositiu?" -#: parted/parted.c:1906 +#: parted/parted.c:2038 msgid "alignment type(min/opt)" msgstr "" -#: parted/parted.c:1921 +#: parted/parted.c:2053 #, c-format msgid "%d aligned\n" msgstr "" -#: parted/parted.c:1923 +#: parted/parted.c:2055 #, c-format msgid "%d not aligned: %s\n" msgstr "" -#: parted/parted.c:1948 parted/parted.c:1985 +#: parted/parted.c:2080 parted/parted.c:2117 #, fuzzy msgid "Flag to Invert?" msgstr "Flag a canviar?" -#: parted/parted.c:1953 parted/parted.c:1990 +#: parted/parted.c:2085 parted/parted.c:2122 msgid "New state?" msgstr "Nou estat?" -#: parted/parted.c:2036 +#: parted/parted.c:2168 msgid "Unit?" msgstr "" -#: parted/parted.c:2171 +#: parted/parted.c:2303 #, fuzzy msgid "align-check" msgstr "comprova" -#: parted/parted.c:2174 +#: parted/parted.c:2306 msgid "" "align-check TYPE N check partition N for TYPE(min|opt) " "alignment" msgstr "" -#: parted/parted.c:2182 +#: parted/parted.c:2314 msgid "help" msgstr "ajuda" -#: parted/parted.c:2185 +#: parted/parted.c:2317 #, fuzzy msgid "" "help [COMMAND] print general help, or help on " "COMMAND" msgstr "Ajuda [ORDRE] imprimeix ajuda general, o ajuda d'ORDRE" -#: parted/parted.c:2191 +#: parted/parted.c:2323 msgid "mklabel" msgstr "mklabel" -#: parted/parted.c:2191 +#: parted/parted.c:2323 msgid "mktable" msgstr "" -#: parted/parted.c:2194 +#: parted/parted.c:2326 #, fuzzy msgid "" "mklabel,mktable LABEL-TYPE create a new disklabel (partition " @@ -2633,16 +2655,16 @@ msgid "" msgstr "" "mklabel TIPUS-ETI crea una nova etiqueta de disc (taula de partició)" -#: parted/parted.c:2200 +#: parted/parted.c:2332 msgid "mkpart" msgstr "mkpart" -#: parted/parted.c:2203 +#: parted/parted.c:2335 #, fuzzy msgid "mkpart PART-TYPE [FS-TYPE] START END make a partition" msgstr "mkpart TIPUS-PART [TIPUS-SF] INICI FI crea una partició" -#: parted/parted.c:2209 +#: parted/parted.c:2341 #, fuzzy msgid "" "'mkpart' makes a partition without creating a new file system on the " @@ -2651,20 +2673,20 @@ msgstr "" "mkpart crea una partició sense crear cap sistema de fitxers a la partició. " "TIPUS-SF ha de ser especificat per assignar una ID de partició.\n" -#: parted/parted.c:2214 +#: parted/parted.c:2346 msgid "name" msgstr "name" -#: parted/parted.c:2217 +#: parted/parted.c:2349 #, fuzzy msgid "name NUMBER NAME name partition NUMBER as NAME" msgstr "name MINOR NOM anomena la partició MINOR NOM" -#: parted/parted.c:2222 +#: parted/parted.c:2354 msgid "print" msgstr "print" -#: parted/parted.c:2225 +#: parted/parted.c:2357 #, fuzzy msgid "" "print [devices|free|list,all] display the partition table, or " @@ -2672,161 +2694,171 @@ msgid "" msgstr "" "print[MINOR] mostra la taula de particions; o una partició" -#: parted/parted.c:2229 +#: parted/parted.c:2361 msgid "" "Without arguments, 'print' displays the entire partition table. However with " "the following arguments it performs various other actions.\n" msgstr "" -#: parted/parted.c:2231 +#: parted/parted.c:2363 msgid " devices : display all active block devices\n" msgstr "" -#: parted/parted.c:2232 +#: parted/parted.c:2364 msgid "" " free : display information about free unpartitioned space on the " "current block device\n" msgstr "" -#: parted/parted.c:2234 +#: parted/parted.c:2366 msgid "" " list, all : display the partition tables of all active block devices\n" msgstr "" -#: parted/parted.c:2238 +#: parted/parted.c:2370 msgid "quit" msgstr "quit" -#: parted/parted.c:2241 +#: parted/parted.c:2373 #, fuzzy msgid "quit exit program" msgstr "quit surt del programa" -#: parted/parted.c:2246 +#: parted/parted.c:2378 msgid "rescue" msgstr "rescatar" -#: parted/parted.c:2249 +#: parted/parted.c:2381 #, fuzzy msgid "" "rescue START END rescue a lost partition near START " "and END" msgstr "rescatar INICI FI rescata particions perdudes entre INICI i FI" -#: parted/parted.c:2255 +#: parted/parted.c:2387 msgid "resize" msgstr "resize" -#: parted/parted.c:2258 +#: parted/parted.c:2390 msgid "The resize command was removed in parted 3.0\n" msgstr "" -#: parted/parted.c:2261 +#: parted/parted.c:2393 #, fuzzy msgid "resizepart" msgstr "resize" -#: parted/parted.c:2264 +#: parted/parted.c:2396 #, fuzzy msgid "resizepart NUMBER END resize partition NUMBER" msgstr "rm MINOR suprimeix la partició MINOR" -#: parted/parted.c:2269 +#: parted/parted.c:2401 msgid "rm" msgstr "rm" -#: parted/parted.c:2272 +#: parted/parted.c:2404 #, fuzzy msgid "rm NUMBER delete partition NUMBER" msgstr "rm MINOR suprimeix la partició MINOR" -#: parted/parted.c:2277 +#: parted/parted.c:2409 msgid "select" msgstr "select" -#: parted/parted.c:2280 +#: parted/parted.c:2412 #, fuzzy msgid "select DEVICE choose the device to edit" msgstr "select DISPOSITIU escollir el dispositiu a editar" -#: parted/parted.c:2285 +#: parted/parted.c:2417 msgid "disk_set" msgstr "" -#: parted/parted.c:2288 +#: parted/parted.c:2420 msgid "" "disk_set FLAG STATE change the FLAG on selected device" msgstr "" -#: parted/parted.c:2293 +#: parted/parted.c:2425 msgid "disk_toggle" msgstr "" -#: parted/parted.c:2296 +#: parted/parted.c:2428 msgid "" "disk_toggle [FLAG] toggle the state of FLAG on " "selected device" msgstr "" -#: parted/parted.c:2302 +#: parted/parted.c:2434 msgid "set" msgstr "set" -#: parted/parted.c:2305 +#: parted/parted.c:2437 #, fuzzy msgid "" "set NUMBER FLAG STATE change the FLAG on partition NUMBER" msgstr "set MINOR FLAG ESTAT canvia un flag a la partició MINOR" -#: parted/parted.c:2311 +#: parted/parted.c:2443 msgid "toggle" msgstr "" -#: parted/parted.c:2314 +#: parted/parted.c:2446 msgid "" "toggle [NUMBER [FLAG]] toggle the state of FLAG on " "partition NUMBER" msgstr "" -#: parted/parted.c:2320 +#: parted/parted.c:2452 +msgid "type" +msgstr "" + +#: parted/parted.c:2455 +msgid "" +"type NUMBER TYPE-ID or TYPE-UUID type set TYPE-ID or TYPE-UUID of " +"partition NUMBER" +msgstr "" + +#: parted/parted.c:2460 msgid "unit" msgstr "" -#: parted/parted.c:2323 +#: parted/parted.c:2463 #, fuzzy msgid "unit UNIT set the default unit to UNIT" msgstr "quit surt del programa" -#: parted/parted.c:2328 +#: parted/parted.c:2468 msgid "version" msgstr "" -#: parted/parted.c:2331 +#: parted/parted.c:2471 msgid "" "version display the version number and " "copyright information of GNU Parted" msgstr "" -#: parted/parted.c:2335 +#: parted/parted.c:2475 msgid "" "'version' displays copyright and version information corresponding to this " "copy of GNU Parted\n" msgstr "" -#: parted/parted.c:2405 +#: parted/parted.c:2545 #, c-format msgid "Usage: %s [-hlmsfv] [-a<align>] [DEVICE [COMMAND [PARAMETERS]]...]\n" msgstr "" -#: parted/parted.c:2449 +#: parted/parted.c:2589 msgid "No device found" msgstr "No s'ha trobat el dispositiu" -#: parted/parted.c:2486 +#: parted/parted.c:2626 msgid "WARNING: You are not superuser. Watch out for permissions.\n" msgstr "" -#: parted/parted.c:2519 +#: parted/parted.c:2659 msgid "" "You should reinstall your boot loader before rebooting. Read section 4 of " "the Parted User documentation for more information." @@ -2834,7 +2866,7 @@ msgstr "" "S'ha de reinstal·lar el carregador d'arrencada abans de rearrencar llegir la " "secció 4 de la documentació de l'Usuari de Parted per més informació." -#: parted/parted.c:2526 +#: parted/parted.c:2666 #, fuzzy msgid "You may need to update /etc/fstab.\n" msgstr "No us oblideu d'actualitzar /etc/fstab si cal.\n" @@ -3022,81 +3054,81 @@ msgid "" "Error: A general SIGILL signal was encountered." msgstr "" -#: parted/ui.c:901 +#: parted/ui.c:904 #, fuzzy, c-format msgid "invalid token: %s" msgstr "Taula de particions invàlida a %s" -#: parted/ui.c:1082 +#: parted/ui.c:1085 msgid "Expecting a partition number." msgstr "S'esperava un múmero de partició." -#: parted/ui.c:1091 +#: parted/ui.c:1094 msgid "Partition doesn't exist." msgstr "La partició no existeix." -#: parted/ui.c:1111 +#: parted/ui.c:1114 msgid "Expecting a file system type." msgstr "S'esperava un tipus de sistema de fitxers." -#: parted/ui.c:1118 +#: parted/ui.c:1121 #, c-format msgid "Unknown file system type \"%s\"." msgstr "Tipus de sistema de fitxers desconegut \"%s\"." -#: parted/ui.c:1139 +#: parted/ui.c:1142 msgid "Expecting a disk label type." msgstr "S'esperava un tipus de etiqueta de dics." -#: parted/ui.c:1170 parted/ui.c:1206 +#: parted/ui.c:1173 parted/ui.c:1209 msgid "No flags supported" msgstr "" -#: parted/ui.c:1280 +#: parted/ui.c:1283 msgid "Can't create any more partitions." msgstr "No es pot crear cap més partició." -#: parted/ui.c:1290 +#: parted/ui.c:1293 msgid "Expecting a partition type." msgstr "S'esperava un tipus de partició." -#: parted/ui.c:1439 +#: parted/ui.c:1442 msgid "on" msgstr "on" -#: parted/ui.c:1440 +#: parted/ui.c:1443 msgid "off" msgstr "off" -#: parted/ui.c:1457 +#: parted/ui.c:1460 msgid "optimal" msgstr "" -#: parted/ui.c:1458 +#: parted/ui.c:1461 msgid "minimal" msgstr "" -#: parted/ui.c:1591 +#: parted/ui.c:1594 msgid "OPTIONs:" msgstr "OPCIONS:" -#: parted/ui.c:1596 +#: parted/ui.c:1599 msgid "COMMANDs:" msgstr "ORDRES:" -#: parted/ui.c:1599 +#: parted/ui.c:1602 #, c-format msgid "" "\n" "Report bugs to %s\n" msgstr "" -#: parted/ui.c:1606 +#: parted/ui.c:1609 #, c-format msgid "Using %s\n" msgstr "Utilitzant %s\n" -#: parted/ui.c:1686 +#: parted/ui.c:1689 msgid "This command does not make sense in non-interactive mode.\n" msgstr "" @@ -6,7 +6,7 @@ msgid "" msgstr "" "Project-Id-Version: parted 1.8.8\n" "Report-Msgid-Bugs-To: bug-parted@gnu.org\n" -"POT-Creation-Date: 2022-04-18 14:44-0400\n" +"POT-Creation-Date: 2023-04-10 15:50-0700\n" "PO-Revision-Date: 2007-09-11 14:02+0200\n" "Last-Translator: Miloslav Trmac <mitr@volny.cz>\n" "Language-Team: Czech <translation-team-cs@lists.sourceforge.net>\n" @@ -16,25 +16,25 @@ msgstr "" "Content-Transfer-Encoding: 8bit\n" "X-Bugs: Report translation errors to the Language-Team address.\n" -#: lib/argmatch.c:147 +#: lib/argmatch.c:145 #, fuzzy, c-format msgid "invalid argument %s for %s" msgstr "neplatný token: %s" -#: lib/argmatch.c:148 +#: lib/argmatch.c:146 #, c-format msgid "ambiguous argument %s for %s" msgstr "" -#: lib/argmatch.c:167 lib/argmatch.h:238 +#: lib/argmatch.c:165 lib/argmatch.h:237 msgid "Valid arguments are:" msgstr "" -#: lib/closeout.c:122 libparted/labels/fdasd.c:145 +#: lib/closeout.c:121 libparted/labels/fdasd.c:145 msgid "write error" msgstr "chyba pÅ™i zápisu" -#: lib/error.c:195 +#: lib/error.c:193 msgid "Unknown system error" msgstr "Neznámá chyba systému" @@ -94,11 +94,11 @@ msgstr "%s: pÅ™epÃnaÄ vyžaduje parametr -- %c\n" #. If you don't know what to put here, please see #. <https://en.wikipedia.org/wiki/Quotation_marks_in_other_languages> #. and use glyphs suitable for your language. -#: lib/quotearg.c:355 +#: lib/quotearg.c:354 msgid "`" msgstr "„" -#: lib/quotearg.c:356 +#: lib/quotearg.c:355 msgid "'" msgstr "â€" @@ -181,7 +181,7 @@ msgstr "Žádný pÅ™edchozà regulárnà výraz" #. To enquire the regular expression that your system uses for this #. purpose, you can use the command #. locale -k LC_MESSAGES | grep '^yesexpr=' -#: lib/rpmatch.c:150 +#: lib/rpmatch.c:149 msgid "^[yY]" msgstr "^[aA]" @@ -191,7 +191,7 @@ msgstr "^[aA]" #. To enquire the regular expression that your system uses for this #. purpose, you can use the command #. locale -k LC_MESSAGES | grep '^noexpr=' -#: lib/rpmatch.c:163 +#: lib/rpmatch.c:162 msgid "^[nN]" msgstr "^[nN]" @@ -746,160 +746,164 @@ msgstr "boot" msgid "Unknown disk flag, %d." msgstr "Neznámý pÅ™Ãznak oddÃlu, %d." -#: libparted/disk.c:1289 +#: libparted/disk.c:1320 #, c-format msgid "%s disk labels do not support extended partitions." msgstr "Jmenovky disku %s nepodporujà rozÅ¡ÃÅ™ené oddÃly." -#: libparted/disk.c:1821 +#: libparted/disk.c:1990 #, c-format msgid "%s disk labels don't support logical or extended partitions." msgstr "Jmenovky disku %s nepodporujà logické nebo rozÅ¡ÃÅ™ené oddÃly." -#: libparted/disk.c:1834 +#: libparted/disk.c:2003 msgid "Too many primary partitions." msgstr "PÅ™ÃliÅ¡ mnoho primárnÃch oddÃlů." -#: libparted/disk.c:1843 +#: libparted/disk.c:2012 #, c-format msgid "" "Can't add a logical partition to %s, because there is no extended partition." msgstr "Nemohu pÅ™idat logický oddÃl do %s, protože neexistuje rozÅ¡ÃÅ™ený oddÃl." -#: libparted/disk.c:1867 +#: libparted/disk.c:2036 #, c-format msgid "Can't have more than one extended partition on %s." msgstr "Nemohu mÃt vÃce než jeden rozÅ¡ÃÅ™ený oddÃl na %s." -#: libparted/disk.c:1877 +#: libparted/disk.c:2046 msgid "Can't have logical partitions outside of the extended partition." msgstr "Nemohu mÃt logické oddÃly mimo rozÅ¡ÃÅ™ený oddÃl." -#: libparted/disk.c:1902 +#: libparted/disk.c:2071 #, c-format msgid "Can't have a logical partition outside of the extended partition on %s." msgstr "Nemohu mÃt logický oddÃl mimo rozÅ¡ÃÅ™ený oddÃl na %s." -#: libparted/disk.c:1912 +#: libparted/disk.c:2081 msgid "Can't have a primary partition inside an extended partition." msgstr "Nemohu mÃt primárnà oddÃl uvnitÅ™ rozÅ¡ÃÅ™eného oddÃlu." -#: libparted/disk.c:1921 +#: libparted/disk.c:2090 msgid "Can't have a partition outside the disk!" msgstr "Nemohu mÃt oddÃl mimo disk!" -#: libparted/disk.c:1972 libparted/disk.c:2150 +#: libparted/disk.c:2141 libparted/disk.c:2319 msgid "Can't have overlapping partitions." msgstr "Nemohu mÃt pÅ™ekrývajÃcà se oddÃly." -#: libparted/disk.c:2351 +#: libparted/disk.c:2520 msgid "metadata" msgstr "metadata" -#: libparted/disk.c:2353 +#: libparted/disk.c:2522 msgid "free" msgstr "volné" -#: libparted/disk.c:2355 parted/ui.c:1271 parted/ui.c:1299 +#: libparted/disk.c:2524 parted/ui.c:1274 parted/ui.c:1302 msgid "extended" msgstr "rozÅ¡ÃÅ™ený" -#: libparted/disk.c:2357 parted/ui.c:1275 parted/ui.c:1303 +#: libparted/disk.c:2526 parted/ui.c:1278 parted/ui.c:1306 msgid "logical" msgstr "logický" -#: libparted/disk.c:2359 parted/ui.c:1267 parted/ui.c:1295 +#: libparted/disk.c:2528 parted/ui.c:1270 parted/ui.c:1298 msgid "primary" msgstr "primárnÃ" -#: libparted/disk.c:2375 +#: libparted/disk.c:2544 msgid "boot" msgstr "boot" -#: libparted/disk.c:2377 +#: libparted/disk.c:2546 msgid "bios_grub" msgstr "" -#: libparted/disk.c:2379 +#: libparted/disk.c:2548 msgid "root" msgstr "root" -#: libparted/disk.c:2381 +#: libparted/disk.c:2550 msgid "swap" msgstr "swap" -#: libparted/disk.c:2383 +#: libparted/disk.c:2552 msgid "hidden" msgstr "skrytý" -#: libparted/disk.c:2385 +#: libparted/disk.c:2554 msgid "raid" msgstr "raid" -#: libparted/disk.c:2387 +#: libparted/disk.c:2556 msgid "lvm" msgstr "lvm" -#: libparted/disk.c:2389 +#: libparted/disk.c:2558 msgid "lba" msgstr "lba" -#: libparted/disk.c:2391 +#: libparted/disk.c:2560 msgid "hp-service" msgstr "hp-service" -#: libparted/disk.c:2393 +#: libparted/disk.c:2562 msgid "palo" msgstr "palo" -#: libparted/disk.c:2395 +#: libparted/disk.c:2564 msgid "prep" msgstr "prep" -#: libparted/disk.c:2397 +#: libparted/disk.c:2566 msgid "msftres" msgstr "msftres" -#: libparted/disk.c:2399 +#: libparted/disk.c:2568 #, fuzzy msgid "msftdata" msgstr "metadata" -#: libparted/disk.c:2401 +#: libparted/disk.c:2570 msgid "atvrecv" msgstr "" -#: libparted/disk.c:2403 +#: libparted/disk.c:2572 msgid "diag" msgstr "" -#: libparted/disk.c:2405 +#: libparted/disk.c:2574 msgid "legacy_boot" msgstr "" -#: libparted/disk.c:2407 +#: libparted/disk.c:2576 msgid "irst" msgstr "" -#: libparted/disk.c:2409 +#: libparted/disk.c:2578 #, fuzzy msgid "esp" msgstr "Ano" -#: libparted/disk.c:2411 +#: libparted/disk.c:2580 msgid "chromeos_kernel" msgstr "" -#: libparted/disk.c:2413 +#: libparted/disk.c:2582 #, fuzzy msgid "bls_boot" msgstr "boot" -#: libparted/disk.c:2415 +#: libparted/disk.c:2584 msgid "linux-home" msgstr "" -#: libparted/disk.c:2421 +#: libparted/disk.c:2586 +msgid "no_automount" +msgstr "" + +#: libparted/disk.c:2592 #, c-format msgid "Unknown partition flag, %d." msgstr "Neznámý pÅ™Ãznak oddÃlu, %d." @@ -1092,8 +1096,8 @@ msgid "" msgstr "" #: libparted/labels/atari.c:1662 libparted/labels/bsd.c:563 -#: libparted/labels/dasd.c:895 libparted/labels/dos.c:2303 -#: libparted/labels/dvh.c:770 libparted/labels/gpt.c:1769 +#: libparted/labels/dasd.c:893 libparted/labels/dos.c:2294 +#: libparted/labels/dvh.c:770 libparted/labels/gpt.c:1891 #: libparted/labels/loop.c:244 libparted/labels/mac.c:1409 #: libparted/labels/pc98.c:697 libparted/labels/rdb.c:1054 #: libparted/labels/sun.c:781 @@ -1115,39 +1119,30 @@ msgstr "Nemohu alokovat ÄÃslo oddÃlu." msgid "Unable to allocate a bsd disklabel slot." msgstr "Nemohu alokovat položku jmenovky disku bsd." -#: libparted/labels/dasd.c:626 +#: libparted/labels/dasd.c:634 msgid "The partition table of DASD-LDL device cannot be changed.\n" msgstr "" -#: libparted/labels/dasd.c:921 +#: libparted/labels/dasd.c:919 msgid "Unable to allocate a dasd disklabel slot" msgstr "Nemohu alokovat položku jmenovky disku dasd" -#: libparted/labels/dos.c:1008 +#: libparted/labels/dos.c:1159 #, c-format msgid "Invalid partition table on %s -- wrong signature %x." msgstr "Neplatná tabulka oddÃlů na %s - nesprávný podpis %x." -#: libparted/labels/dos.c:1036 +#: libparted/labels/dos.c:1187 #, c-format msgid "Invalid partition table - recursive partition on %s." msgstr "Neplatná tabulka oddÃlů - rekurzivnà oddÃl na %s." -#: libparted/labels/dos.c:1567 -msgid "Extended partitions cannot be hidden on msdos disk labels." -msgstr "RozÅ¡ÃÅ™ené oddÃly nelze na jmenovkách disku msdos skrývat." - -#: libparted/labels/dos.c:1579 -#, fuzzy -msgid "Extended partitions cannot be recovery partitions on msdos disk labels." -msgstr "RozÅ¡ÃÅ™ené oddÃly nelze na jmenovkách disku msdos skrývat." - -#: libparted/labels/dos.c:2285 +#: libparted/labels/dos.c:2276 msgid "Parted can't resize partitions managed by Windows Dynamic Disk." msgstr "" "Parted neumà mÄ›nit velikost oddÃlů spravovaných pomocà Windows Dynamic Disk." -#: libparted/labels/dos.c:2541 +#: libparted/labels/dos.c:2532 #, fuzzy msgid "cannot create any more partitions" msgstr "Nemohu vytvářet dalÅ¡Ã oddÃly." @@ -1288,12 +1283,12 @@ msgstr "Nemohu zÃskat informace o velikosti bloku." msgid "Disk geometry does not match a DASD device of type 3390." msgstr "" -#: libparted/labels/gpt.c:569 +#: libparted/labels/gpt.c:589 #, fuzzy msgid "device is too small for GPT" msgstr "ZaÅ™Ãzenà pro %lu bloků pÅ™ÃliÅ¡ malé." -#: libparted/labels/gpt.c:771 +#: libparted/labels/gpt.c:791 #, fuzzy, c-format msgid "" "The format of the GPT partition table is version %x, which is newer than " @@ -1302,7 +1297,7 @@ msgstr "" "Formát tabulky oddÃlů GPT je verze %x, což je novÄ›jÅ¡Ã, než kterou umà " "rozpoznat Parted. Oznamte nám to prosÃm! bug-parted@gnu.org" -#: libparted/labels/gpt.c:807 +#: libparted/labels/gpt.c:827 #, c-format msgid "" "Not all of the space available to %s appears to be used, you can fix the GPT " @@ -1313,7 +1308,7 @@ msgstr "" "použÃvala vÅ¡echno mÃsto (dalÅ¡Ãch %llu bloků) nebo pokraÄovat se souÄasným " "nasatvenÃm? " -#: libparted/labels/gpt.c:1006 +#: libparted/labels/gpt.c:1026 #, fuzzy msgid "" "The backup GPT table is not at the end of the disk, as it should be. Fix, " @@ -1323,7 +1318,7 @@ msgstr "" "že jiný operaÄnà systém si myslÃ, že disk je menÅ¡Ã. Mám to opravit " "pÅ™esunutÃm zálohy na konec (a odstranÄ›nÃm staré zálohy)?" -#: libparted/labels/gpt.c:1024 +#: libparted/labels/gpt.c:1044 msgid "" "Both the primary and backup GPT tables are corrupt. Try making a fresh " "table, and using Parted's rescue feature to recover partitions." @@ -1331,7 +1326,7 @@ msgstr "" "Primárnà i záložnà tabulka GPT je poÅ¡kozena. Zkuste vytvoÅ™it novou tabulku a " "obnovit oddÃly pomocà schopnosti Partedu rescue." -#: libparted/labels/gpt.c:1035 +#: libparted/labels/gpt.c:1055 #, fuzzy msgid "" "The backup GPT table is corrupt, but the primary appears OK, so that will be " @@ -1340,7 +1335,7 @@ msgstr "" "Primárnà tabulka GPT je poÅ¡kozena, ale záloha se zdá být v pořádku, takže " "bude použita záloha." -#: libparted/labels/gpt.c:1047 +#: libparted/labels/gpt.c:1067 msgid "" "The primary GPT table is corrupt, but the backup appears OK, so that will be " "used." @@ -1348,11 +1343,11 @@ msgstr "" "Primárnà tabulka GPT je poÅ¡kozena, ale záloha se zdá být v pořádku, takže " "bude použita záloha." -#: libparted/labels/gpt.c:1071 +#: libparted/labels/gpt.c:1091 msgid "primary partition table array CRC mismatch" msgstr "" -#: libparted/labels/gpt.c:1655 libparted/labels/gpt.c:1682 +#: libparted/labels/gpt.c:1722 libparted/labels/gpt.c:1749 #, fuzzy msgid "failed to translate partition name" msgstr "Nemohu alokovat ÄÃslo oddÃlu." @@ -2017,7 +2012,7 @@ msgstr "fat_table_alloc_cluster: nejsou volné clustery" msgid "Could not detect file system." msgstr "Nemohu detekovat systém souborů." -#: libparted/fs/r/filesys.c:159 libparted/fs/r/filesys.c:284 +#: libparted/fs/r/filesys.c:159 libparted/fs/r/filesys.c:285 #, fuzzy, c-format msgid "resizing %s file systems is not supported" msgstr "" @@ -2302,41 +2297,41 @@ msgid "This HFS+ volume has no extents overflow file. This is quite unusual!" msgstr "" "Tento svazek HFS+ nemá soubor pÅ™eteÄenà rozsahů. To je celkem neobvyklé!" -#: parted/parted.c:137 +#: parted/parted.c:138 msgid "displays this help message" msgstr "zobrazà tuto zprávu nápovÄ›dy" -#: parted/parted.c:138 +#: parted/parted.c:139 msgid "lists partition layout on all block devices" msgstr "vypÃÅ¡e rozloženà oddÃlů na vÅ¡ech blokových zaÅ™ÃzenÃch" -#: parted/parted.c:139 +#: parted/parted.c:140 msgid "displays machine parseable output" msgstr "zobrazà strojovÄ› zpracovatelný výstup" -#: parted/parted.c:140 +#: parted/parted.c:141 #, fuzzy msgid "displays JSON output" msgstr "zobrazà strojovÄ› zpracovatelný výstup" -#: parted/parted.c:141 +#: parted/parted.c:142 msgid "never prompts for user intervention" msgstr "nikdy nežádá o intervenci uživatele" -#: parted/parted.c:142 +#: parted/parted.c:143 msgid "in script mode, fix instead of abort when asked" msgstr "" -#: parted/parted.c:143 +#: parted/parted.c:144 msgid "displays the version" msgstr "zobrazà verzi" -#: parted/parted.c:144 +#: parted/parted.c:145 #, fuzzy msgid "alignment for new partitions" msgstr "Nemohu vytvářet dalÅ¡Ã oddÃly." -#: parted/parted.c:157 +#: parted/parted.c:158 msgid "" "NUMBER is the partition number used by Linux. On MS-DOS disk labels, the " "primary partitions number from 1 to 4, logical partitions from 5 onwards.\n" @@ -2344,31 +2339,31 @@ msgstr "" "ÄŒÃSLO je ÄÃslo oddÃlu použÃvané Linuxem. Na jmenovkách disku MS-DOS majà " "primárnà oddÃly ÄÃsla 1-4 a logické oddÃly od 5 dál.\n" -#: parted/parted.c:160 +#: parted/parted.c:161 msgid "LABEL-TYPE is one of: " msgstr "TYP-JMENOVKY je jeden z: " -#: parted/parted.c:161 parted/parted.c:162 +#: parted/parted.c:162 parted/parted.c:163 msgid "FLAG is one of: " msgstr "PŘEPÃNAÄŒ je jeden z: " -#: parted/parted.c:163 +#: parted/parted.c:164 msgid "UNIT is one of: " msgstr "JEDNOTKA je jedna z: " -#: parted/parted.c:164 +#: parted/parted.c:165 msgid "desired alignment: minimum or optimal" msgstr "" -#: parted/parted.c:165 +#: parted/parted.c:166 msgid "PART-TYPE is one of: primary, logical, extended\n" msgstr "TYP-ODDÃLU je jeden z: primary, logical, extended\n" -#: parted/parted.c:167 +#: parted/parted.c:168 msgid "FS-TYPE is one of: " msgstr "TYP-FS je jeden z: " -#: parted/parted.c:168 +#: parted/parted.c:169 msgid "" "START and END are disk locations, such as 4GB or 10%. Negative values count " "from the end of the disk. For example, -1s specifies exactly the last " @@ -2377,7 +2372,7 @@ msgstr "" "ZAÄŒÃTEK a KONEC jsou mÃsta na disku, napÅ™. 4GB nebo 10%. Záporné hodnoty se " "poÄÃtajà od konce disku. NapÅ™Ãklad -1s urÄuje pÅ™esnÄ› poslednà sektor.\n" -#: parted/parted.c:171 +#: parted/parted.c:172 #, fuzzy msgid "" "END is disk location, such as 4GB or 10%. Negative value counts from the " @@ -2386,19 +2381,23 @@ msgstr "" "ZAÄŒÃTEK a KONEC jsou mÃsta na disku, napÅ™. 4GB nebo 10%. Záporné hodnoty se " "poÄÃtajà od konce disku. NapÅ™Ãklad -1s urÄuje pÅ™esnÄ› poslednà sektor.\n" -#: parted/parted.c:174 +#: parted/parted.c:175 msgid "STATE is one of: on, off\n" msgstr "STAV je jeden z: on, off\n" -#: parted/parted.c:175 +#: parted/parted.c:176 msgid "DEVICE is usually /dev/hda or /dev/sda\n" msgstr "ZAŘÃZENà je obvykle /dev/hda nebo /dev/sda\n" -#: parted/parted.c:176 +#: parted/parted.c:177 msgid "NAME is any word you want\n" msgstr "NÃZEV je libovolné slovo\n" -#: parted/parted.c:179 +#: parted/parted.c:178 +msgid "TYPE_ID is a value between 0x01 and 0xff, TYPE_UUID is a UUID\n" +msgstr "" + +#: parted/parted.c:182 msgid "" "Copyright (C) 1998 - 2006 Free Software Foundation, Inc.\n" "This program is free software, covered by the GNU General Public License.\n" @@ -2418,23 +2417,23 @@ msgstr "" "podrobnosti najdete v GNU General Public License.\n" "\n" -#: parted/parted.c:229 +#: parted/parted.c:232 #, c-format msgid "%0.f%%\t(time left %.2d:%.2d)" msgstr "%0.f%%\t(zbylý Äas %.2d:%.2d)" -#: parted/parted.c:248 +#: parted/parted.c:251 #, fuzzy, c-format msgid "Partition %s is being used. Are you sure you want to continue?" msgstr "" "OddÃl %s se použÃvá. Než jej budete upravovat Partedem, musÃte jej odpojit." -#: parted/parted.c:269 +#: parted/parted.c:272 #, c-format msgid "Partition(s) on %s are being used." msgstr "OddÃl(a) na %s jsou použÃvány." -#: parted/parted.c:281 +#: parted/parted.c:284 #, c-format msgid "" "The existing disk label on %s will be destroyed and all data on this disk " @@ -2443,31 +2442,31 @@ msgstr "" "ExistujÃcà jmenovka disku na %s bude zniÄena a vÅ¡echna data na tomto disku " "budou ztracena. Chcete pokraÄovat?" -#: parted/parted.c:542 +#: parted/parted.c:545 msgid "New disk label type?" msgstr "Typ nové jmenovky disku?" -#: parted/parted.c:680 +#: parted/parted.c:692 msgid "Partition type?" msgstr "Typ oddÃlu?" -#: parted/parted.c:698 parted/parted.c:902 +#: parted/parted.c:710 parted/parted.c:914 msgid "Partition name?" msgstr "Název oddÃlu?" -#: parted/parted.c:708 +#: parted/parted.c:720 msgid "File system type?" msgstr "Typ souborového systému?" -#: parted/parted.c:713 parted/parted.c:1683 +#: parted/parted.c:725 parted/parted.c:1815 msgid "Start?" msgstr "ZaÄátek?" -#: parted/parted.c:715 parted/parted.c:1685 parted/parted.c:1768 +#: parted/parted.c:727 parted/parted.c:1817 parted/parted.c:1900 msgid "End?" msgstr "Konec?" -#: parted/parted.c:782 +#: parted/parted.c:794 #, fuzzy, c-format msgid "" "You requested a partition from %s to %s (sectors %llu..%llu).\n" @@ -2477,99 +2476,124 @@ msgstr "" "Nejbližšà umÃstÄ›nÃ, které zvládneme, je %s až %s. Je to pro vás jeÅ¡tÄ› " "pÅ™ijatelné?" -#: parted/parted.c:791 +#: parted/parted.c:803 msgid "" "\n" "Is this still acceptable to you?" msgstr "" -#: parted/parted.c:814 +#: parted/parted.c:826 #, c-format msgid "" "The resulting partition is not properly aligned for best performance: %s" msgstr "" -#: parted/parted.c:816 parted/parted.c:1925 +#: parted/parted.c:828 parted/parted.c:2057 msgid "unknown (malloc failed)" msgstr "" -#: parted/parted.c:894 +#: parted/parted.c:906 #, fuzzy, c-format msgid "%s disk labels do not support partition name." msgstr "Jmenovky disku %s nepodporujà rozÅ¡ÃÅ™ené oddÃly." -#: parted/parted.c:899 parted/parted.c:1748 parted/parted.c:1814 -#: parted/parted.c:1908 parted/parted.c:1983 +#: parted/parted.c:911 parted/parted.c:955 parted/parted.c:1880 +#: parted/parted.c:1946 parted/parted.c:2040 parted/parted.c:2115 msgid "Partition number?" msgstr "ÄŒÃslo oddÃlu?" -#: parted/parted.c:1050 +#: parted/parted.c:949 +#, fuzzy, c-format +msgid "%s disk labels do not support partition type." +msgstr "Jmenovky disku %s nepodporujà rozÅ¡ÃÅ™ené oddÃly." + +#: parted/parted.c:965 +#, fuzzy +msgid "Partition type-id?" +msgstr "Typ oddÃlu?" + +#: parted/parted.c:972 +#, fuzzy +msgid "Invalid type-id." +msgstr "Neplatné ÄÃslo." + +#: parted/parted.c:986 +#, fuzzy +msgid "Partition type-uuid?" +msgstr "Typ oddÃlu?" + +#: parted/parted.c:993 +#, fuzzy +msgid "Invalid type-uuid." +msgstr "Neplatné ÄÃslo." + +#: parted/parted.c:1146 #, c-format msgid "BIOS cylinder,head,sector geometry: %d,%d,%d. Each cylinder is %s.\n" msgstr "Geometrie cylindr,hlava,sektor BIOSu: %d,%d,%d. Každý cylindr je %s.\n" -#: parted/parted.c:1137 +#: parted/parted.c:1240 #, c-format msgid "Model: %s (%s)\n" msgstr "Model: %s (%s)\n" -#: parted/parted.c:1139 +#: parted/parted.c:1242 #, c-format msgid "Disk %s: %s\n" msgstr "Disk %s: %s\n" -#: parted/parted.c:1140 +#: parted/parted.c:1243 #, c-format msgid "Sector size (logical/physical): %lldB/%lldB\n" msgstr "Sector size (logical/physical): %lldB/%lldB\n" -#: parted/parted.c:1152 +#: parted/parted.c:1255 #, c-format msgid "Partition Table: %s\n" msgstr "Tabulka oddÃlů: %s\n" -#: parted/parted.c:1153 +#: parted/parted.c:1256 #, fuzzy, c-format msgid "Disk Flags: %s\n" msgstr "Disk %s: %s\n" -#: parted/parted.c:1279 parted/parted.c:1282 +#: parted/parted.c:1388 parted/parted.c:1391 msgid "Number" msgstr "ÄŒÃslo" -#: parted/parted.c:1279 parted/parted.c:1282 +#: parted/parted.c:1388 parted/parted.c:1391 msgid "Start" msgstr "ZaÄátek" -#: parted/parted.c:1280 parted/parted.c:1283 +#: parted/parted.c:1389 parted/parted.c:1392 msgid "End" msgstr "Konec" -#: parted/parted.c:1283 +#: parted/parted.c:1392 msgid "Size" msgstr "Velikost" -#: parted/parted.c:1287 +#: parted/parted.c:1396 msgid "Type" msgstr "Typ" -#: parted/parted.c:1289 +#: parted/parted.c:1398 msgid "File system" msgstr "Systém souborů" -#: parted/parted.c:1292 +#: parted/parted.c:1401 msgid "Name" msgstr "Název" -#: parted/parted.c:1294 +#: parted/parted.c:1403 msgid "Flags" msgstr "PÅ™epÃnaÄe" -#: parted/parted.c:1352 +#: parted/parted.c:1461 msgid "Free Space" msgstr "Volné mÃsto" -#: parted/parted.c:1570 +#: parted/parted.c:1702 #, c-format msgid "" "A %s %s partition was found at %s -> %s. Do you want to add it to the " @@ -2577,65 +2601,65 @@ msgid "" msgstr "" "Byl nalezen oddÃl %s %s na %s -> %s. Chcete jej pÅ™idat do tabulky oddÃlů?" -#: parted/parted.c:1613 +#: parted/parted.c:1745 msgid "searching for file systems" msgstr "hledám systémy souborů" -#: parted/parted.c:1720 +#: parted/parted.c:1852 msgid "The resize command has been removed in parted 3.0" msgstr "" -#: parted/parted.c:1782 +#: parted/parted.c:1914 msgid "" "Shrinking a partition can cause data loss, are you sure you want to continue?" msgstr "" -#: parted/parted.c:1838 +#: parted/parted.c:1970 msgid "New device?" msgstr "Nové zaÅ™ÃzenÃ?" -#: parted/parted.c:1906 +#: parted/parted.c:2038 msgid "alignment type(min/opt)" msgstr "" -#: parted/parted.c:1921 +#: parted/parted.c:2053 #, c-format msgid "%d aligned\n" msgstr "" -#: parted/parted.c:1923 +#: parted/parted.c:2055 #, c-format msgid "%d not aligned: %s\n" msgstr "" -#: parted/parted.c:1948 parted/parted.c:1985 +#: parted/parted.c:2080 parted/parted.c:2117 msgid "Flag to Invert?" msgstr "PÅ™epÃnaÄ, který zmÄ›nit?" -#: parted/parted.c:1953 parted/parted.c:1990 +#: parted/parted.c:2085 parted/parted.c:2122 msgid "New state?" msgstr "Nový stav?" -#: parted/parted.c:2036 +#: parted/parted.c:2168 msgid "Unit?" msgstr "Jednotka?" -#: parted/parted.c:2171 +#: parted/parted.c:2303 #, fuzzy msgid "align-check" msgstr "check" -#: parted/parted.c:2174 +#: parted/parted.c:2306 msgid "" "align-check TYPE N check partition N for TYPE(min|opt) " "alignment" msgstr "" -#: parted/parted.c:2182 +#: parted/parted.c:2314 msgid "help" msgstr "help" -#: parted/parted.c:2185 +#: parted/parted.c:2317 msgid "" "help [COMMAND] print general help, or help on " "COMMAND" @@ -2643,15 +2667,15 @@ msgstr "" "help [PŘÃKAZ] vypsat obecnou nápovÄ›du nebo " "nápovÄ›du o PŘÃKAZu" -#: parted/parted.c:2191 +#: parted/parted.c:2323 msgid "mklabel" msgstr "mklabel" -#: parted/parted.c:2191 +#: parted/parted.c:2323 msgid "mktable" msgstr "mktable" -#: parted/parted.c:2194 +#: parted/parted.c:2326 msgid "" "mklabel,mktable LABEL-TYPE create a new disklabel (partition " "table)" @@ -2659,15 +2683,15 @@ msgstr "" "mklabel,mktable TYP-JMENOVKY vytvoÅ™it novou jmenovku disku " "(tabulku oddÃlů)" -#: parted/parted.c:2200 +#: parted/parted.c:2332 msgid "mkpart" msgstr "mkpart" -#: parted/parted.c:2203 +#: parted/parted.c:2335 msgid "mkpart PART-TYPE [FS-TYPE] START END make a partition" msgstr "mkpart TYP-ODDÃLU [TYP-FS] ZAÄŒÃTEK KONEC vytvoÅ™it oddÃl" -#: parted/parted.c:2209 +#: parted/parted.c:2341 msgid "" "'mkpart' makes a partition without creating a new file system on the " "partition. FS-TYPE may be specified to set an appropriate partition ID.\n" @@ -2675,19 +2699,19 @@ msgstr "" "'mkpart' vytvořà oddÃl bez vytvoÅ™enà nového systému souborů na nÄ›m. TYP-FS " "může být urÄen pro nastavenà odpovÃdajÃcÃho ID oddÃlu.\n" -#: parted/parted.c:2214 +#: parted/parted.c:2346 msgid "name" msgstr "name" -#: parted/parted.c:2217 +#: parted/parted.c:2349 msgid "name NUMBER NAME name partition NUMBER as NAME" msgstr "name ÄŒÃSLO NÃZEV pojmenovat oddÃl ÄŒÃSLO NÃZEV" -#: parted/parted.c:2222 +#: parted/parted.c:2354 msgid "print" msgstr "print" -#: parted/parted.c:2225 +#: parted/parted.c:2357 #, fuzzy msgid "" "print [devices|free|list,all] display the partition table, or " @@ -2696,7 +2720,7 @@ msgstr "" "print [devices|free|list,all|ÄŒÃSLO] zobrazit tabulku oddÃlů, dostupná " "zaÅ™ÃzenÃ, volné mÃsto, vÅ¡echny nalezené oddÃly, nebo konkrétnà oddÃl" -#: parted/parted.c:2229 +#: parted/parted.c:2361 msgid "" "Without arguments, 'print' displays the entire partition table. However with " "the following arguments it performs various other actions.\n" @@ -2704,11 +2728,11 @@ msgstr "" "'print' bez parametrů zobrazà celou tabulku oddÃlů. S následujÃcÃmi " "parametry ale provede různé jiné akce.\n" -#: parted/parted.c:2231 +#: parted/parted.c:2363 msgid " devices : display all active block devices\n" msgstr " devices : zobrazit vÅ¡echna aktivnà bloková zaÅ™ÃzenÃ\n" -#: parted/parted.c:2232 +#: parted/parted.c:2364 msgid "" " free : display information about free unpartitioned space on the " "current block device\n" @@ -2716,25 +2740,25 @@ msgstr "" " free : zobrazit informace o volném mÃstÄ› mimo oddÃly na aktuálnÃm " "blokovém zaÅ™ÃzenÃ\n" -#: parted/parted.c:2234 +#: parted/parted.c:2366 msgid "" " list, all : display the partition tables of all active block devices\n" msgstr "" " list, all : zobrazit tabulky oddÃlů vÅ¡ech aktivnÃch blokových zaÅ™ÃzenÃ\n" -#: parted/parted.c:2238 +#: parted/parted.c:2370 msgid "quit" msgstr "quit" -#: parted/parted.c:2241 +#: parted/parted.c:2373 msgid "quit exit program" msgstr "quit ukonÄit program" -#: parted/parted.c:2246 +#: parted/parted.c:2378 msgid "rescue" msgstr "rescue" -#: parted/parted.c:2249 +#: parted/parted.c:2381 msgid "" "rescue START END rescue a lost partition near START " "and END" @@ -2742,57 +2766,57 @@ msgstr "" "rescue ZAÄŒÃTEK KONEC zachránit ztracený oddÃl poblÞ " "ZAÄŒÃTKU a KONCE" -#: parted/parted.c:2255 +#: parted/parted.c:2387 msgid "resize" msgstr "resize" -#: parted/parted.c:2258 +#: parted/parted.c:2390 msgid "The resize command was removed in parted 3.0\n" msgstr "" -#: parted/parted.c:2261 +#: parted/parted.c:2393 #, fuzzy msgid "resizepart" msgstr "resize" -#: parted/parted.c:2264 +#: parted/parted.c:2396 #, fuzzy msgid "resizepart NUMBER END resize partition NUMBER" msgstr "move ÄŒÃSLO ZAÄŒÃTEK KONEC pÅ™esunout oddÃl ÄŒÃSLO" -#: parted/parted.c:2269 +#: parted/parted.c:2401 msgid "rm" msgstr "rm" -#: parted/parted.c:2272 +#: parted/parted.c:2404 msgid "rm NUMBER delete partition NUMBER" msgstr "rm ÄŒÃSLO odstranit oddÃl ÄŒÃSLO" -#: parted/parted.c:2277 +#: parted/parted.c:2409 msgid "select" msgstr "select" -#: parted/parted.c:2280 +#: parted/parted.c:2412 msgid "select DEVICE choose the device to edit" msgstr "select ZAŘÃZENà zvolit upravované zaÅ™ÃzenÃ" -#: parted/parted.c:2285 +#: parted/parted.c:2417 msgid "disk_set" msgstr "" -#: parted/parted.c:2288 +#: parted/parted.c:2420 #, fuzzy msgid "" "disk_set FLAG STATE change the FLAG on selected device" msgstr "" "set ÄŒÃSLO PŘEPÃNAÄŒ STAV zmÄ›nit PŘEPÃNAÄŒ na oddÃlu ÄŒÃSLO" -#: parted/parted.c:2293 +#: parted/parted.c:2425 #, fuzzy msgid "disk_toggle" msgstr "toggle" -#: parted/parted.c:2296 +#: parted/parted.c:2428 #, fuzzy msgid "" "disk_toggle [FLAG] toggle the state of FLAG on " @@ -2801,21 +2825,21 @@ msgstr "" "toggle [ÄŒÃSLO [PŘEPÃNAÄŒ]] pÅ™epnout stav PŘEPÃNAÄŒE na oddÃlu " "ÄŒÃSLO" -#: parted/parted.c:2302 +#: parted/parted.c:2434 msgid "set" msgstr "set" -#: parted/parted.c:2305 +#: parted/parted.c:2437 msgid "" "set NUMBER FLAG STATE change the FLAG on partition NUMBER" msgstr "" "set ÄŒÃSLO PŘEPÃNAÄŒ STAV zmÄ›nit PŘEPÃNAÄŒ na oddÃlu ÄŒÃSLO" -#: parted/parted.c:2311 +#: parted/parted.c:2443 msgid "toggle" msgstr "toggle" -#: parted/parted.c:2314 +#: parted/parted.c:2446 msgid "" "toggle [NUMBER [FLAG]] toggle the state of FLAG on " "partition NUMBER" @@ -2823,21 +2847,32 @@ msgstr "" "toggle [ÄŒÃSLO [PŘEPÃNAÄŒ]] pÅ™epnout stav PŘEPÃNAÄŒE na oddÃlu " "ÄŒÃSLO" -#: parted/parted.c:2320 +#: parted/parted.c:2452 +msgid "type" +msgstr "" + +#: parted/parted.c:2455 +#, fuzzy +msgid "" +"type NUMBER TYPE-ID or TYPE-UUID type set TYPE-ID or TYPE-UUID of " +"partition NUMBER" +msgstr "move ÄŒÃSLO ZAÄŒÃTEK KONEC pÅ™esunout oddÃl ÄŒÃSLO" + +#: parted/parted.c:2460 msgid "unit" msgstr "unit" -#: parted/parted.c:2323 +#: parted/parted.c:2463 msgid "unit UNIT set the default unit to UNIT" msgstr "" "unit JEDNOTKA nastavit implicitnà jednotku na " "JEDNOTKA" -#: parted/parted.c:2328 +#: parted/parted.c:2468 msgid "version" msgstr "version" -#: parted/parted.c:2331 +#: parted/parted.c:2471 msgid "" "version display the version number and " "copyright information of GNU Parted" @@ -2845,7 +2880,7 @@ msgstr "" "version zobrazit ÄÃslo verze a informace o " "copyrightu GNU Parted" -#: parted/parted.c:2335 +#: parted/parted.c:2475 msgid "" "'version' displays copyright and version information corresponding to this " "copy of GNU Parted\n" @@ -2853,21 +2888,21 @@ msgstr "" "'version' zobrazà informace o copyrightu a informace o verzi odpovÃdajÃcà " "této kopii GNU Parted\n" -#: parted/parted.c:2405 +#: parted/parted.c:2545 #, fuzzy, c-format msgid "Usage: %s [-hlmsfv] [-a<align>] [DEVICE [COMMAND [PARAMETERS]]...]\n" msgstr "PoužitÃ: %s [-hlmsv] [ZAŘÃZENà [PŘÃKAZ [PARAMETRY]]...]\n" -#: parted/parted.c:2449 +#: parted/parted.c:2589 msgid "No device found" msgstr "Nenalezeno žádné zaÅ™ÃzenÃ" -#: parted/parted.c:2486 +#: parted/parted.c:2626 #, fuzzy msgid "WARNING: You are not superuser. Watch out for permissions.\n" msgstr "VAROVÃNÃ: Nejste superuživatel. Pozor na oprávnÄ›nÃ." -#: parted/parted.c:2519 +#: parted/parted.c:2659 msgid "" "You should reinstall your boot loader before rebooting. Read section 4 of " "the Parted User documentation for more information." @@ -2875,7 +2910,7 @@ msgstr "" "PÅ™ed restartem byste mÄ›li reinstalovat svůj zavadÄ›Ä systému. Pro vÃce " "informacà si pÅ™eÄtÄ›te oddÃl 4 Uživatelské dokumentace Parted." -#: parted/parted.c:2526 +#: parted/parted.c:2666 msgid "You may need to update /etc/fstab.\n" msgstr "Možná budete potÅ™ebovat aktualizovat /etc/fstab.\n" @@ -3133,69 +3168,69 @@ msgstr "" "\n" "Chyba: Byl pÅ™ijat obecný signál SIGILL." -#: parted/ui.c:901 +#: parted/ui.c:904 #, c-format msgid "invalid token: %s" msgstr "neplatný token: %s" -#: parted/ui.c:1082 +#: parted/ui.c:1085 msgid "Expecting a partition number." msgstr "OÄekávám ÄÃslo oddÃlu." -#: parted/ui.c:1091 +#: parted/ui.c:1094 msgid "Partition doesn't exist." msgstr "OddÃl neexistuje." -#: parted/ui.c:1111 +#: parted/ui.c:1114 msgid "Expecting a file system type." msgstr "OÄekávám typ systému souborů." -#: parted/ui.c:1118 +#: parted/ui.c:1121 #, c-format msgid "Unknown file system type \"%s\"." msgstr "Neznámý typ systému souborů \"%s\"." -#: parted/ui.c:1139 +#: parted/ui.c:1142 msgid "Expecting a disk label type." msgstr "OÄekávám typ jmenovky disku." -#: parted/ui.c:1170 parted/ui.c:1206 +#: parted/ui.c:1173 parted/ui.c:1209 msgid "No flags supported" msgstr "" -#: parted/ui.c:1280 +#: parted/ui.c:1283 msgid "Can't create any more partitions." msgstr "Nemohu vytvářet dalÅ¡Ã oddÃly." -#: parted/ui.c:1290 +#: parted/ui.c:1293 msgid "Expecting a partition type." msgstr "OÄekávám typ oddÃlu." -#: parted/ui.c:1439 +#: parted/ui.c:1442 msgid "on" msgstr "on" -#: parted/ui.c:1440 +#: parted/ui.c:1443 msgid "off" msgstr "off" -#: parted/ui.c:1457 +#: parted/ui.c:1460 msgid "optimal" msgstr "" -#: parted/ui.c:1458 +#: parted/ui.c:1461 msgid "minimal" msgstr "" -#: parted/ui.c:1591 +#: parted/ui.c:1594 msgid "OPTIONs:" msgstr "PŘEPÃNAÄŒe:" -#: parted/ui.c:1596 +#: parted/ui.c:1599 msgid "COMMANDs:" msgstr "PŘÃKAZy:" -#: parted/ui.c:1599 +#: parted/ui.c:1602 #, fuzzy, c-format msgid "" "\n" @@ -3204,12 +3239,12 @@ msgstr "" "\n" "Chyby hlaste na <%s>.\n" -#: parted/ui.c:1606 +#: parted/ui.c:1609 #, c-format msgid "Using %s\n" msgstr "PoužÃvám %s\n" -#: parted/ui.c:1686 +#: parted/ui.c:1689 msgid "This command does not make sense in non-interactive mode.\n" msgstr "Tento pÅ™Ãkaz nedává smysl v neinteraktivnÃm režimu.\n" @@ -3419,6 +3454,9 @@ msgstr "Tento pÅ™Ãkaz nedává smysl v neinteraktivnÃm režimu.\n" #~ msgid "Unable to determine the block size of this dasd" #~ msgstr "Nemohu urÄit bloku tohoto dasd" +#~ msgid "Extended partitions cannot be hidden on msdos disk labels." +#~ msgstr "RozÅ¡ÃÅ™ené oddÃly nelze na jmenovkách disku msdos skrývat." + #~ msgid "This is not an ECKD disk! This disk type is not supported!" #~ msgstr "Toto nenà disk ECKD! Tento typ disku nenà podporován!" @@ -8,7 +8,7 @@ msgid "" msgstr "" "Project-Id-Version: parted 3.0\n" "Report-Msgid-Bugs-To: bug-parted@gnu.org\n" -"POT-Creation-Date: 2022-04-18 14:44-0400\n" +"POT-Creation-Date: 2023-04-10 15:50-0700\n" "PO-Revision-Date: 2011-06-03 23:23+0200\n" "Last-Translator: Keld Simonsen <keld@keldix.com>\n" "Language-Team: Danish <dansk@dansk-gruppen.dk>\n" @@ -18,25 +18,25 @@ msgstr "" "Content-Transfer-Encoding: 8bit\n" "X-Bugs: Report translation errors to the Language-Team address.\n" -#: lib/argmatch.c:147 +#: lib/argmatch.c:145 #, c-format msgid "invalid argument %s for %s" msgstr "Ugyldigt argument %s for %s" -#: lib/argmatch.c:148 +#: lib/argmatch.c:146 #, c-format msgid "ambiguous argument %s for %s" msgstr "flertydigt argument %s for %s" -#: lib/argmatch.c:167 lib/argmatch.h:238 +#: lib/argmatch.c:165 lib/argmatch.h:237 msgid "Valid arguments are:" msgstr "Gyldige argumenter er:" -#: lib/closeout.c:122 libparted/labels/fdasd.c:145 +#: lib/closeout.c:121 libparted/labels/fdasd.c:145 msgid "write error" msgstr "skrivefejl" -#: lib/error.c:195 +#: lib/error.c:193 msgid "Unknown system error" msgstr "Ukendt systemfejl" @@ -96,11 +96,11 @@ msgstr "%s: flaget kræver et argument -- '%c'\n" #. If you don't know what to put here, please see #. <https://en.wikipedia.org/wiki/Quotation_marks_in_other_languages> #. and use glyphs suitable for your language. -#: lib/quotearg.c:355 +#: lib/quotearg.c:354 msgid "`" msgstr "'" -#: lib/quotearg.c:356 +#: lib/quotearg.c:355 msgid "'" msgstr "'" @@ -183,7 +183,7 @@ msgstr "Ingen tidligere regulære udtryk" #. To enquire the regular expression that your system uses for this #. purpose, you can use the command #. locale -k LC_MESSAGES | grep '^yesexpr=' -#: lib/rpmatch.c:150 +#: lib/rpmatch.c:149 msgid "^[yY]" msgstr "^[jJyY]" @@ -193,7 +193,7 @@ msgstr "^[jJyY]" #. To enquire the regular expression that your system uses for this #. purpose, you can use the command #. locale -k LC_MESSAGES | grep '^noexpr=' -#: lib/rpmatch.c:163 +#: lib/rpmatch.c:162 msgid "^[nN]" msgstr "^[nN]" @@ -754,23 +754,23 @@ msgstr "start" msgid "Unknown disk flag, %d." msgstr "Ukendt diskflag, %d." -#: libparted/disk.c:1289 +#: libparted/disk.c:1320 #, c-format msgid "%s disk labels do not support extended partitions." msgstr "Filallokeringstabeller for %s understøtter ikke udvidede partitioner." -#: libparted/disk.c:1821 +#: libparted/disk.c:1990 #, c-format msgid "%s disk labels don't support logical or extended partitions." msgstr "" "Filallokeringstabeller for %s understøtter ikke logiske eller udvidede " "partitioner." -#: libparted/disk.c:1834 +#: libparted/disk.c:2003 msgid "Too many primary partitions." msgstr "For mange primære partitioner." -#: libparted/disk.c:1843 +#: libparted/disk.c:2012 #, c-format msgid "" "Can't add a logical partition to %s, because there is no extended partition." @@ -778,141 +778,145 @@ msgstr "" "Kan ikke tilføje en logisk partition til %s, da der mangler en udvidet " "partition." -#: libparted/disk.c:1867 +#: libparted/disk.c:2036 #, c-format msgid "Can't have more than one extended partition on %s." msgstr "Kan ikke have mere end én udvidet partition på %s." -#: libparted/disk.c:1877 +#: libparted/disk.c:2046 msgid "Can't have logical partitions outside of the extended partition." msgstr "Kan ikke have logiske partitioner udenfor den udvidede partition." -#: libparted/disk.c:1902 +#: libparted/disk.c:2071 #, c-format msgid "Can't have a logical partition outside of the extended partition on %s." msgstr "" "Kan ikke have en logisk partition udenfor den udvidede partition på %s." -#: libparted/disk.c:1912 +#: libparted/disk.c:2081 msgid "Can't have a primary partition inside an extended partition." msgstr "Kan ikke have en primær partition inden i en udvidet partition." -#: libparted/disk.c:1921 +#: libparted/disk.c:2090 msgid "Can't have a partition outside the disk!" msgstr "Kan ikke have en partition udenfor disken!" -#: libparted/disk.c:1972 libparted/disk.c:2150 +#: libparted/disk.c:2141 libparted/disk.c:2319 msgid "Can't have overlapping partitions." msgstr "Kan ikke have overlappende partitioner." -#: libparted/disk.c:2351 +#: libparted/disk.c:2520 msgid "metadata" msgstr "metadata" -#: libparted/disk.c:2353 +#: libparted/disk.c:2522 msgid "free" msgstr "ledigt" -#: libparted/disk.c:2355 parted/ui.c:1271 parted/ui.c:1299 +#: libparted/disk.c:2524 parted/ui.c:1274 parted/ui.c:1302 msgid "extended" msgstr "udvidet" -#: libparted/disk.c:2357 parted/ui.c:1275 parted/ui.c:1303 +#: libparted/disk.c:2526 parted/ui.c:1278 parted/ui.c:1306 msgid "logical" msgstr "logisk" -#: libparted/disk.c:2359 parted/ui.c:1267 parted/ui.c:1295 +#: libparted/disk.c:2528 parted/ui.c:1270 parted/ui.c:1298 msgid "primary" msgstr "primær" -#: libparted/disk.c:2375 +#: libparted/disk.c:2544 msgid "boot" msgstr "start" -#: libparted/disk.c:2377 +#: libparted/disk.c:2546 msgid "bios_grub" msgstr "bios_grub" -#: libparted/disk.c:2379 +#: libparted/disk.c:2548 msgid "root" msgstr "rod" -#: libparted/disk.c:2381 +#: libparted/disk.c:2550 msgid "swap" msgstr "swapplads" -#: libparted/disk.c:2383 +#: libparted/disk.c:2552 msgid "hidden" msgstr "skjult" -#: libparted/disk.c:2385 +#: libparted/disk.c:2554 msgid "raid" msgstr "raid" -#: libparted/disk.c:2387 +#: libparted/disk.c:2556 msgid "lvm" msgstr "lvm" -#: libparted/disk.c:2389 +#: libparted/disk.c:2558 msgid "lba" msgstr "lba" -#: libparted/disk.c:2391 +#: libparted/disk.c:2560 msgid "hp-service" msgstr "hp-service" -#: libparted/disk.c:2393 +#: libparted/disk.c:2562 msgid "palo" msgstr "palo" -#: libparted/disk.c:2395 +#: libparted/disk.c:2564 msgid "prep" msgstr "prep" -#: libparted/disk.c:2397 +#: libparted/disk.c:2566 msgid "msftres" msgstr "msftres" -#: libparted/disk.c:2399 +#: libparted/disk.c:2568 #, fuzzy msgid "msftdata" msgstr "metadata" -#: libparted/disk.c:2401 +#: libparted/disk.c:2570 msgid "atvrecv" msgstr "atvrecv" -#: libparted/disk.c:2403 +#: libparted/disk.c:2572 msgid "diag" msgstr "diag" -#: libparted/disk.c:2405 +#: libparted/disk.c:2574 msgid "legacy_boot" msgstr "legacy_boot" -#: libparted/disk.c:2407 +#: libparted/disk.c:2576 msgid "irst" msgstr "" -#: libparted/disk.c:2409 +#: libparted/disk.c:2578 #, fuzzy msgid "esp" msgstr "Ja" -#: libparted/disk.c:2411 +#: libparted/disk.c:2580 msgid "chromeos_kernel" msgstr "" -#: libparted/disk.c:2413 +#: libparted/disk.c:2582 #, fuzzy msgid "bls_boot" msgstr "start" -#: libparted/disk.c:2415 +#: libparted/disk.c:2584 msgid "linux-home" msgstr "" -#: libparted/disk.c:2421 +#: libparted/disk.c:2586 +msgid "no_automount" +msgstr "" + +#: libparted/disk.c:2592 #, c-format msgid "Unknown partition flag, %d." msgstr "Ukendt partitionsflag, %d." @@ -1105,8 +1109,8 @@ msgid "" msgstr "" #: libparted/labels/atari.c:1662 libparted/labels/bsd.c:563 -#: libparted/labels/dasd.c:895 libparted/labels/dos.c:2303 -#: libparted/labels/dvh.c:770 libparted/labels/gpt.c:1769 +#: libparted/labels/dasd.c:893 libparted/labels/dos.c:2294 +#: libparted/labels/dvh.c:770 libparted/labels/gpt.c:1891 #: libparted/labels/loop.c:244 libparted/labels/mac.c:1409 #: libparted/labels/pc98.c:697 libparted/labels/rdb.c:1054 #: libparted/labels/sun.c:781 @@ -1128,40 +1132,31 @@ msgstr "Kan ikke tildele et partitionsnummer." msgid "Unable to allocate a bsd disklabel slot." msgstr "Kan ikke tildele en plads til bsd-disketikette." -#: libparted/labels/dasd.c:626 +#: libparted/labels/dasd.c:634 msgid "The partition table of DASD-LDL device cannot be changed.\n" msgstr "" -#: libparted/labels/dasd.c:921 +#: libparted/labels/dasd.c:919 msgid "Unable to allocate a dasd disklabel slot" msgstr "Kan ikke tildele en plads til dasd-disketikette" -#: libparted/labels/dos.c:1008 +#: libparted/labels/dos.c:1159 #, c-format msgid "Invalid partition table on %s -- wrong signature %x." msgstr "Ugyldig partitionstabel på %s - fejlagtig signatur %x." -#: libparted/labels/dos.c:1036 +#: libparted/labels/dos.c:1187 #, c-format msgid "Invalid partition table - recursive partition on %s." msgstr "Ugyldig partitionstabel - rekursiv partition på %s." -#: libparted/labels/dos.c:1567 -msgid "Extended partitions cannot be hidden on msdos disk labels." -msgstr "Udvidede partitioner kan ikke være skjulte i etiketter af typen msdos." - -#: libparted/labels/dos.c:1579 -#, fuzzy -msgid "Extended partitions cannot be recovery partitions on msdos disk labels." -msgstr "Udvidede partitioner kan ikke være skjulte i etiketter af typen msdos." - -#: libparted/labels/dos.c:2285 +#: libparted/labels/dos.c:2276 msgid "Parted can't resize partitions managed by Windows Dynamic Disk." msgstr "" "Parted kan ikke ændre størrelse på partitioner som håndteres af Windows " "Dynamic Disk." -#: libparted/labels/dos.c:2541 +#: libparted/labels/dos.c:2532 #, fuzzy msgid "cannot create any more partitions" msgstr "Kan ikke tilføje flere partitioner." @@ -1306,11 +1301,11 @@ msgstr "Kunne ikke få fat på information om blokstørrelse." msgid "Disk geometry does not match a DASD device of type 3390." msgstr "" -#: libparted/labels/gpt.c:569 +#: libparted/labels/gpt.c:589 msgid "device is too small for GPT" msgstr "" -#: libparted/labels/gpt.c:771 +#: libparted/labels/gpt.c:791 #, c-format msgid "" "The format of the GPT partition table is version %x, which is newer than " @@ -1319,7 +1314,7 @@ msgstr "" "Formatet på GPT-partitionstabellen er version %x, hvilket er nyere end hvad " "Parted kan genkende. Rapportér gerne dette!" -#: libparted/labels/gpt.c:807 +#: libparted/labels/gpt.c:827 #, c-format msgid "" "Not all of the space available to %s appears to be used, you can fix the GPT " @@ -1330,7 +1325,7 @@ msgstr "" "GPT til at bruge al pladsen (%llu blokke mere), eller fortsæt med at bruge " "den aktuelle indstilling? " -#: libparted/labels/gpt.c:1006 +#: libparted/labels/gpt.c:1026 #, fuzzy msgid "" "The backup GPT table is not at the end of the disk, as it should be. Fix, " @@ -1341,7 +1336,7 @@ msgstr "" "Skal det rettes ved at flytte sikkerhedskopien til slutningen (og fjerne den " "gamle sikkerhedskopi)?" -#: libparted/labels/gpt.c:1024 +#: libparted/labels/gpt.c:1044 msgid "" "Both the primary and backup GPT tables are corrupt. Try making a fresh " "table, and using Parted's rescue feature to recover partitions." @@ -1349,7 +1344,7 @@ msgstr "" "Både den primære GPT-tabel og sikkerhedskopien er ødelagt. Prøv at lave en " "frisk tabel, og at genskabe partitioner med Parteds redningsfacilitet." -#: libparted/labels/gpt.c:1035 +#: libparted/labels/gpt.c:1055 msgid "" "The backup GPT table is corrupt, but the primary appears OK, so that will be " "used." @@ -1357,7 +1352,7 @@ msgstr "" "Sikkerhedskopien af GPT-tabellen er ødelagt, men den primære tabel ser ud " "til at være i orden, så den vil blive brugt." -#: libparted/labels/gpt.c:1047 +#: libparted/labels/gpt.c:1067 msgid "" "The primary GPT table is corrupt, but the backup appears OK, so that will be " "used." @@ -1365,11 +1360,11 @@ msgstr "" "Den primære GPT-tabel er ødelagt, men sikkerhedskopien ser ud til at være i " "orden, så den vil blive brugt." -#: libparted/labels/gpt.c:1071 +#: libparted/labels/gpt.c:1091 msgid "primary partition table array CRC mismatch" msgstr "Uoverensstemmelse for CRC på primær partitionstabel" -#: libparted/labels/gpt.c:1655 libparted/labels/gpt.c:1682 +#: libparted/labels/gpt.c:1722 libparted/labels/gpt.c:1749 #, fuzzy msgid "failed to translate partition name" msgstr "Kan ikke tildele et partitionsnummer." @@ -2009,7 +2004,7 @@ msgstr "" msgid "Could not detect file system." msgstr "Kunne ikke tage status på enheden %s - %s." -#: libparted/fs/r/filesys.c:159 libparted/fs/r/filesys.c:284 +#: libparted/fs/r/filesys.c:159 libparted/fs/r/filesys.c:285 #, fuzzy, c-format msgid "resizing %s file systems is not supported" msgstr "Forventer en filsystemstype." @@ -2270,40 +2265,40 @@ msgstr "" msgid "This HFS+ volume has no extents overflow file. This is quite unusual!" msgstr "" -#: parted/parted.c:137 +#: parted/parted.c:138 msgid "displays this help message" msgstr "viser denne hjælpetekst" -#: parted/parted.c:138 +#: parted/parted.c:139 msgid "lists partition layout on all block devices" msgstr "lister partitionslayout for alle blokenheder" -#: parted/parted.c:139 +#: parted/parted.c:140 msgid "displays machine parseable output" msgstr "viser udskriften på maskintolkningsbar måde" -#: parted/parted.c:140 +#: parted/parted.c:141 #, fuzzy msgid "displays JSON output" msgstr "viser udskriften på maskintolkningsbar måde" -#: parted/parted.c:141 +#: parted/parted.c:142 msgid "never prompts for user intervention" msgstr "spørger aldrig brugeren om alternativer" -#: parted/parted.c:142 +#: parted/parted.c:143 msgid "in script mode, fix instead of abort when asked" msgstr "" -#: parted/parted.c:143 +#: parted/parted.c:144 msgid "displays the version" msgstr "viser versionen" -#: parted/parted.c:144 +#: parted/parted.c:145 msgid "alignment for new partitions" msgstr "justering for nye partitioner" -#: parted/parted.c:157 +#: parted/parted.c:158 msgid "" "NUMBER is the partition number used by Linux. On MS-DOS disk labels, the " "primary partitions number from 1 to 4, logical partitions from 5 onwards.\n" @@ -2312,31 +2307,31 @@ msgstr "" "er de primære partitioner numrerede fra 1 til 4, og de logiske partitioner " "fra 5 og opad.\n" -#: parted/parted.c:160 +#: parted/parted.c:161 msgid "LABEL-TYPE is one of: " msgstr "LABEL-TYPE er en af:" -#: parted/parted.c:161 parted/parted.c:162 +#: parted/parted.c:162 parted/parted.c:163 msgid "FLAG is one of: " msgstr "FLAG er et af: " -#: parted/parted.c:163 +#: parted/parted.c:164 msgid "UNIT is one of: " msgstr "ENHED er et af: " -#: parted/parted.c:164 +#: parted/parted.c:165 msgid "desired alignment: minimum or optimal" msgstr "ønsket tilpasning: mindste eller bedste" -#: parted/parted.c:165 +#: parted/parted.c:166 msgid "PART-TYPE is one of: primary, logical, extended\n" msgstr "PART-TYPE er en af: primær, logisk, udvidet\n" -#: parted/parted.c:167 +#: parted/parted.c:168 msgid "FS-TYPE is one of: " msgstr "FS-TYPE er en af: " -#: parted/parted.c:168 +#: parted/parted.c:169 msgid "" "START and END are disk locations, such as 4GB or 10%. Negative values count " "from the end of the disk. For example, -1s specifies exactly the last " @@ -2346,7 +2341,7 @@ msgstr "" "regnes fra slutningen på disken. For eksempel angiver -1s præcist den sidste " "sektor.\n" -#: parted/parted.c:171 +#: parted/parted.c:172 #, fuzzy msgid "" "END is disk location, such as 4GB or 10%. Negative value counts from the " @@ -2356,19 +2351,23 @@ msgstr "" "regnes fra slutningen på disken. For eksempel angiver -1s præcist den sidste " "sektor.\n" -#: parted/parted.c:174 +#: parted/parted.c:175 msgid "STATE is one of: on, off\n" msgstr "TILSTAND er en af: på, af\n" -#: parted/parted.c:175 +#: parted/parted.c:176 msgid "DEVICE is usually /dev/hda or /dev/sda\n" msgstr "ENHED er normalt /dev/hda eller /dev/sda\n" -#: parted/parted.c:176 +#: parted/parted.c:177 msgid "NAME is any word you want\n" msgstr "NAVN er et vilkårligt ord\n" -#: parted/parted.c:179 +#: parted/parted.c:178 +msgid "TYPE_ID is a value between 0x01 and 0xff, TYPE_UUID is a UUID\n" +msgstr "" + +#: parted/parted.c:182 msgid "" "Copyright (C) 1998 - 2006 Free Software Foundation, Inc.\n" "This program is free software, covered by the GNU General Public License.\n" @@ -2387,24 +2386,24 @@ msgstr "" "SALGBARHED eller EGNETHED FOR NOGET SPECIELT FORMÅL. Se GNU General\n" "Public License for yderligere information.\n" -#: parted/parted.c:229 +#: parted/parted.c:232 #, c-format msgid "%0.f%%\t(time left %.2d:%.2d)" msgstr "%0.f%%\t(tid tilbage %.2d:%.2d)" -#: parted/parted.c:248 +#: parted/parted.c:251 #, fuzzy, c-format msgid "Partition %s is being used. Are you sure you want to continue?" msgstr "" "Partitionen %s bruges. Du skal afmontere den inden du kan ændre den med " "Parted." -#: parted/parted.c:269 +#: parted/parted.c:272 #, c-format msgid "Partition(s) on %s are being used." msgstr "Partitionen på %s er i brug." -#: parted/parted.c:281 +#: parted/parted.c:284 #, c-format msgid "" "The existing disk label on %s will be destroyed and all data on this disk " @@ -2413,31 +2412,31 @@ msgstr "" "Den eksisterende disketikette på %s vil blive ødelagt og alle data på denne " "disk vil gå tabt. Vil du fortsætte?" -#: parted/parted.c:542 +#: parted/parted.c:545 msgid "New disk label type?" msgstr "Type på ny disketikette?" -#: parted/parted.c:680 +#: parted/parted.c:692 msgid "Partition type?" msgstr "Type på partitionen" -#: parted/parted.c:698 parted/parted.c:902 +#: parted/parted.c:710 parted/parted.c:914 msgid "Partition name?" msgstr "Navn på partitionen?" -#: parted/parted.c:708 +#: parted/parted.c:720 msgid "File system type?" msgstr "Type på filsystemet?" -#: parted/parted.c:713 parted/parted.c:1683 +#: parted/parted.c:725 parted/parted.c:1815 msgid "Start?" msgstr "Start?" -#: parted/parted.c:715 parted/parted.c:1685 parted/parted.c:1768 +#: parted/parted.c:727 parted/parted.c:1817 parted/parted.c:1900 msgid "End?" msgstr "Slut?" -#: parted/parted.c:782 +#: parted/parted.c:794 #, fuzzy, c-format msgid "" "You requested a partition from %s to %s (sectors %llu..%llu).\n" @@ -2446,7 +2445,7 @@ msgstr "" "Du bad om at oprette en partition fra %s til %s.\n" "Det nærmeste Parted kan klare er fra %s til %s.%s" -#: parted/parted.c:791 +#: parted/parted.c:803 msgid "" "\n" "Is this still acceptable to you?" @@ -2454,94 +2453,119 @@ msgstr "" "\n" "Er dette stadigvæk acceptabelt for dig?" -#: parted/parted.c:814 +#: parted/parted.c:826 #, fuzzy, c-format msgid "" "The resulting partition is not properly aligned for best performance: %s" msgstr "Den resulterende partition er ikke rigtigt justeret for bedste ydelse." -#: parted/parted.c:816 parted/parted.c:1925 +#: parted/parted.c:828 parted/parted.c:2057 msgid "unknown (malloc failed)" msgstr "" -#: parted/parted.c:894 +#: parted/parted.c:906 #, fuzzy, c-format msgid "%s disk labels do not support partition name." msgstr "Filallokeringstabeller for %s understøtter ikke udvidede partitioner." -#: parted/parted.c:899 parted/parted.c:1748 parted/parted.c:1814 -#: parted/parted.c:1908 parted/parted.c:1983 +#: parted/parted.c:911 parted/parted.c:955 parted/parted.c:1880 +#: parted/parted.c:1946 parted/parted.c:2040 parted/parted.c:2115 msgid "Partition number?" msgstr "Nummer på partitionen?" -#: parted/parted.c:1050 +#: parted/parted.c:949 +#, fuzzy, c-format +msgid "%s disk labels do not support partition type." +msgstr "Filallokeringstabeller for %s understøtter ikke udvidede partitioner." + +#: parted/parted.c:965 +#, fuzzy +msgid "Partition type-id?" +msgstr "Type på partitionen" + +#: parted/parted.c:972 +#, fuzzy +msgid "Invalid type-id." +msgstr "Ugyldigt nummer." + +#: parted/parted.c:986 +#, fuzzy +msgid "Partition type-uuid?" +msgstr "Type på partitionen" + +#: parted/parted.c:993 +#, fuzzy +msgid "Invalid type-uuid." +msgstr "Ugyldigt nummer." + +#: parted/parted.c:1146 #, c-format msgid "BIOS cylinder,head,sector geometry: %d,%d,%d. Each cylinder is %s.\n" msgstr "" "BIOS-geometri for cylinder,hoved,sektor: %d,%d,%d. Hver cylinder er %s.\n" -#: parted/parted.c:1137 +#: parted/parted.c:1240 #, c-format msgid "Model: %s (%s)\n" msgstr "Model: %s (%s)\n" -#: parted/parted.c:1139 +#: parted/parted.c:1242 #, c-format msgid "Disk %s: %s\n" msgstr "Disk %s: %s\n" -#: parted/parted.c:1140 +#: parted/parted.c:1243 #, c-format msgid "Sector size (logical/physical): %lldB/%lldB\n" msgstr "Sektorstørrelse (logisk/fysisk): %lldB/%lldB\n" -#: parted/parted.c:1152 +#: parted/parted.c:1255 #, c-format msgid "Partition Table: %s\n" msgstr "Partitionstabel: %s\n" -#: parted/parted.c:1153 +#: parted/parted.c:1256 #, fuzzy, c-format msgid "Disk Flags: %s\n" msgstr "Disk %s: %s\n" -#: parted/parted.c:1279 parted/parted.c:1282 +#: parted/parted.c:1388 parted/parted.c:1391 msgid "Number" msgstr "Nummer" -#: parted/parted.c:1279 parted/parted.c:1282 +#: parted/parted.c:1388 parted/parted.c:1391 msgid "Start" msgstr "Start" -#: parted/parted.c:1280 parted/parted.c:1283 +#: parted/parted.c:1389 parted/parted.c:1392 msgid "End" msgstr "Slut" -#: parted/parted.c:1283 +#: parted/parted.c:1392 msgid "Size" msgstr "Størrelse" -#: parted/parted.c:1287 +#: parted/parted.c:1396 msgid "Type" msgstr "Type" -#: parted/parted.c:1289 +#: parted/parted.c:1398 msgid "File system" msgstr "Filsystem" -#: parted/parted.c:1292 +#: parted/parted.c:1401 msgid "Name" msgstr "Name" -#: parted/parted.c:1294 +#: parted/parted.c:1403 msgid "Flags" msgstr "Flag" -#: parted/parted.c:1352 +#: parted/parted.c:1461 msgid "Free Space" msgstr "Fri plads" -#: parted/parted.c:1570 +#: parted/parted.c:1702 #, c-format msgid "" "A %s %s partition was found at %s -> %s. Do you want to add it to the " @@ -2550,54 +2574,54 @@ msgstr "" "En %s %s partition blev fundet på %s -> %s. Ønsker du at tilføje den til " "partitionstabellen?" -#: parted/parted.c:1613 +#: parted/parted.c:1745 msgid "searching for file systems" msgstr "leder efter filsystemer" -#: parted/parted.c:1720 +#: parted/parted.c:1852 msgid "The resize command has been removed in parted 3.0" msgstr "" -#: parted/parted.c:1782 +#: parted/parted.c:1914 msgid "" "Shrinking a partition can cause data loss, are you sure you want to continue?" msgstr "" -#: parted/parted.c:1838 +#: parted/parted.c:1970 msgid "New device?" msgstr "Ny enhed?" -#: parted/parted.c:1906 +#: parted/parted.c:2038 msgid "alignment type(min/opt)" msgstr "justeringstype (min/opt)" -#: parted/parted.c:1921 +#: parted/parted.c:2053 #, c-format msgid "%d aligned\n" msgstr "%d justeret\n" -#: parted/parted.c:1923 +#: parted/parted.c:2055 #, fuzzy, c-format msgid "%d not aligned: %s\n" msgstr "%d ikke justeret\n" -#: parted/parted.c:1948 parted/parted.c:1985 +#: parted/parted.c:2080 parted/parted.c:2117 msgid "Flag to Invert?" msgstr "Flag at invertere?" -#: parted/parted.c:1953 parted/parted.c:1990 +#: parted/parted.c:2085 parted/parted.c:2122 msgid "New state?" msgstr "Ny tilstand?" -#: parted/parted.c:2036 +#: parted/parted.c:2168 msgid "Unit?" msgstr "Enhed?" -#: parted/parted.c:2171 +#: parted/parted.c:2303 msgid "align-check" msgstr "align-check" -#: parted/parted.c:2174 +#: parted/parted.c:2306 #, fuzzy msgid "" "align-check TYPE N check partition N for TYPE(min|opt) " @@ -2606,11 +2630,11 @@ msgstr "" "align-check TYPE N tjek partition N for TYPE(min|opt) " "justering" -#: parted/parted.c:2182 +#: parted/parted.c:2314 msgid "help" msgstr "hjælp" -#: parted/parted.c:2185 +#: parted/parted.c:2317 msgid "" "help [COMMAND] print general help, or help on " "COMMAND" @@ -2618,15 +2642,15 @@ msgstr "" "hjælp [KOMMANDO] udskriver generel hjælp, eller " "speciel hjælp for KOMMANDO" -#: parted/parted.c:2191 +#: parted/parted.c:2323 msgid "mklabel" msgstr "mklabel" -#: parted/parted.c:2191 +#: parted/parted.c:2323 msgid "mktable" msgstr "mktable" -#: parted/parted.c:2194 +#: parted/parted.c:2326 msgid "" "mklabel,mktable LABEL-TYPE create a new disklabel (partition " "table)" @@ -2634,15 +2658,15 @@ msgstr "" "mklabel,mktable ETIKETTE-TYPE opret en ny disketikette " "(partitionstabel)" -#: parted/parted.c:2200 +#: parted/parted.c:2332 msgid "mkpart" msgstr "mkpart" -#: parted/parted.c:2203 +#: parted/parted.c:2335 msgid "mkpart PART-TYPE [FS-TYPE] START END make a partition" msgstr "mkpart PARTITIONSTYPE [FS-TYPE] START SLUT lav en partition" -#: parted/parted.c:2209 +#: parted/parted.c:2341 msgid "" "'mkpart' makes a partition without creating a new file system on the " "partition. FS-TYPE may be specified to set an appropriate partition ID.\n" @@ -2650,20 +2674,20 @@ msgstr "" "'mkpart' laver en partition uden at oprette et nyt filsystem på partitionen. " "FS-TYPE kan angives for at sætte en passende identitet på partitionen.\n" -#: parted/parted.c:2214 +#: parted/parted.c:2346 msgid "name" msgstr "name" -#: parted/parted.c:2217 +#: parted/parted.c:2349 msgid "name NUMBER NAME name partition NUMBER as NAME" msgstr "" "name NUMMER NAVN navngiv partition NUMMER som NAVN" -#: parted/parted.c:2222 +#: parted/parted.c:2354 msgid "print" msgstr "print" -#: parted/parted.c:2225 +#: parted/parted.c:2357 #, fuzzy msgid "" "print [devices|free|list,all] display the partition table, or " @@ -2673,7 +2697,7 @@ msgstr "" "tilgængelige enheder, ledig plads, alle partitioner som blev fundet, eller " "en specifik partition" -#: parted/parted.c:2229 +#: parted/parted.c:2361 msgid "" "Without arguments, 'print' displays the entire partition table. However with " "the following arguments it performs various other actions.\n" @@ -2682,11 +2706,11 @@ msgstr "" "en partition er angivet vil mere detaljeret information om denne partition " "blive vist.\n" -#: parted/parted.c:2231 +#: parted/parted.c:2363 msgid " devices : display all active block devices\n" msgstr " devices : vis alle aktive blokenheder\n" -#: parted/parted.c:2232 +#: parted/parted.c:2364 msgid "" " free : display information about free unpartitioned space on the " "current block device\n" @@ -2694,24 +2718,24 @@ msgstr "" " free : vis information om ledig upartitioneret plads på den aktuelle " "blokenhed\n" -#: parted/parted.c:2234 +#: parted/parted.c:2366 msgid "" " list, all : display the partition tables of all active block devices\n" msgstr " list, all : vis partitionstabellerne på alle aktive blokenheder\n" -#: parted/parted.c:2238 +#: parted/parted.c:2370 msgid "quit" msgstr "quit" -#: parted/parted.c:2241 +#: parted/parted.c:2373 msgid "quit exit program" msgstr "quit afslut programmet" -#: parted/parted.c:2246 +#: parted/parted.c:2378 msgid "rescue" msgstr "rescue" -#: parted/parted.c:2249 +#: parted/parted.c:2381 msgid "" "rescue START END rescue a lost partition near START " "and END" @@ -2719,56 +2743,56 @@ msgstr "" "rescue START SLUT red tabte partitioner nær ved START " "og SLUT" -#: parted/parted.c:2255 +#: parted/parted.c:2387 msgid "resize" msgstr "" -#: parted/parted.c:2258 +#: parted/parted.c:2390 msgid "The resize command was removed in parted 3.0\n" msgstr "" -#: parted/parted.c:2261 +#: parted/parted.c:2393 msgid "resizepart" msgstr "" -#: parted/parted.c:2264 +#: parted/parted.c:2396 #, fuzzy msgid "resizepart NUMBER END resize partition NUMBER" msgstr "rm NUMMER slet partition NUMMER" -#: parted/parted.c:2269 +#: parted/parted.c:2401 msgid "rm" msgstr "rm" -#: parted/parted.c:2272 +#: parted/parted.c:2404 msgid "rm NUMBER delete partition NUMBER" msgstr "rm NUMMER slet partition NUMMER" -#: parted/parted.c:2277 +#: parted/parted.c:2409 msgid "select" msgstr "vælg" -#: parted/parted.c:2280 +#: parted/parted.c:2412 msgid "select DEVICE choose the device to edit" msgstr "vælg ENHED vælg enhed at redigere" -#: parted/parted.c:2285 +#: parted/parted.c:2417 msgid "disk_set" msgstr "" -#: parted/parted.c:2288 +#: parted/parted.c:2420 #, fuzzy msgid "" "disk_set FLAG STATE change the FLAG on selected device" msgstr "" "sæt NUMMER FLAG TILSTAND ændr et flag på partition NUMMER" -#: parted/parted.c:2293 +#: parted/parted.c:2425 #, fuzzy msgid "disk_toggle" msgstr "skift" -#: parted/parted.c:2296 +#: parted/parted.c:2428 #, fuzzy msgid "" "disk_toggle [FLAG] toggle the state of FLAG on " @@ -2777,21 +2801,21 @@ msgstr "" "skift [NUMMER [FLAG]] væxla tilstandet for FLAG på " "partition NUMMER" -#: parted/parted.c:2302 +#: parted/parted.c:2434 msgid "set" msgstr "sæt" -#: parted/parted.c:2305 +#: parted/parted.c:2437 msgid "" "set NUMBER FLAG STATE change the FLAG on partition NUMBER" msgstr "" "sæt NUMMER FLAG TILSTAND ændr et flag på partition NUMMER" -#: parted/parted.c:2311 +#: parted/parted.c:2443 msgid "toggle" msgstr "skift" -#: parted/parted.c:2314 +#: parted/parted.c:2446 msgid "" "toggle [NUMBER [FLAG]] toggle the state of FLAG on " "partition NUMBER" @@ -2799,19 +2823,29 @@ msgstr "" "skift [NUMMER [FLAG]] væxla tilstandet for FLAG på " "partition NUMMER" -#: parted/parted.c:2320 +#: parted/parted.c:2452 +msgid "type" +msgstr "" + +#: parted/parted.c:2455 +msgid "" +"type NUMBER TYPE-ID or TYPE-UUID type set TYPE-ID or TYPE-UUID of " +"partition NUMBER" +msgstr "" + +#: parted/parted.c:2460 msgid "unit" msgstr "unit" -#: parted/parted.c:2323 +#: parted/parted.c:2463 msgid "unit UNIT set the default unit to UNIT" msgstr "enhed ENHED sæt standardenheden til ENHED" -#: parted/parted.c:2328 +#: parted/parted.c:2468 msgid "version" msgstr "version" -#: parted/parted.c:2331 +#: parted/parted.c:2471 msgid "" "version display the version number and " "copyright information of GNU Parted" @@ -2819,7 +2853,7 @@ msgstr "" "version vis versionsnummeret og " "ophavsretlig information om GNU Parted" -#: parted/parted.c:2335 +#: parted/parted.c:2475 msgid "" "'version' displays copyright and version information corresponding to this " "copy of GNU Parted\n" @@ -2827,22 +2861,22 @@ msgstr "" "'version' viser information om version og ophavsret for denne kopi af GNU " "Parted\n" -#: parted/parted.c:2405 +#: parted/parted.c:2545 #, fuzzy, c-format msgid "Usage: %s [-hlmsfv] [-a<align>] [DEVICE [COMMAND [PARAMETERS]]...]\n" msgstr "Usage: %s [-hlmsv] [-a<align>] [ENHED [KOMMANDO [PARAMETRE]]...]\n" -#: parted/parted.c:2449 +#: parted/parted.c:2589 msgid "No device found" msgstr "Ingen enhed fundet" -#: parted/parted.c:2486 +#: parted/parted.c:2626 #, fuzzy msgid "WARNING: You are not superuser. Watch out for permissions.\n" msgstr "" "ADVARSEL: Du er ikke superbruger. Vær opmærksom på rettighedsproblemer." -#: parted/parted.c:2519 +#: parted/parted.c:2659 msgid "" "You should reinstall your boot loader before rebooting. Read section 4 of " "the Parted User documentation for more information." @@ -2850,7 +2884,7 @@ msgstr "" "Du bør geninstallere opstartsprogrammet inden du genopstarter. Læs sektion 4 " "i Parteds brugermanual for mere information." -#: parted/parted.c:2526 +#: parted/parted.c:2666 msgid "You may need to update /etc/fstab.\n" msgstr "Glem ikke at opdatere /etc/fstab, om nødvendigt.\n" @@ -3110,69 +3144,69 @@ msgstr "" "\n" "Fejl: Et generelt SIGILL-signal indtraf." -#: parted/ui.c:901 +#: parted/ui.c:904 #, c-format msgid "invalid token: %s" msgstr "ugyldigt token: %s" -#: parted/ui.c:1082 +#: parted/ui.c:1085 msgid "Expecting a partition number." msgstr "Forventer et partitionsnummer." -#: parted/ui.c:1091 +#: parted/ui.c:1094 msgid "Partition doesn't exist." msgstr "Partitionen findes ikke." -#: parted/ui.c:1111 +#: parted/ui.c:1114 msgid "Expecting a file system type." msgstr "Forventer en filsystemstype." -#: parted/ui.c:1118 +#: parted/ui.c:1121 #, c-format msgid "Unknown file system type \"%s\"." msgstr "Ukendt filsystemstype '%s'." -#: parted/ui.c:1139 +#: parted/ui.c:1142 msgid "Expecting a disk label type." msgstr "Forventer en disketikettetype." -#: parted/ui.c:1170 parted/ui.c:1206 +#: parted/ui.c:1173 parted/ui.c:1209 msgid "No flags supported" msgstr "" -#: parted/ui.c:1280 +#: parted/ui.c:1283 msgid "Can't create any more partitions." msgstr "Kan ikke tilføje flere partitioner." -#: parted/ui.c:1290 +#: parted/ui.c:1293 msgid "Expecting a partition type." msgstr "Forventer eN partitionstype." -#: parted/ui.c:1439 +#: parted/ui.c:1442 msgid "on" msgstr "på" -#: parted/ui.c:1440 +#: parted/ui.c:1443 msgid "off" msgstr "fra" -#: parted/ui.c:1457 +#: parted/ui.c:1460 msgid "optimal" msgstr "optimal" -#: parted/ui.c:1458 +#: parted/ui.c:1461 msgid "minimal" msgstr "minimal" -#: parted/ui.c:1591 +#: parted/ui.c:1594 msgid "OPTIONs:" msgstr "FLAG:" -#: parted/ui.c:1596 +#: parted/ui.c:1599 msgid "COMMANDs:" msgstr "KOMMANDOer:" -#: parted/ui.c:1599 +#: parted/ui.c:1602 #, c-format msgid "" "\n" @@ -3181,12 +3215,12 @@ msgstr "" "\n" "Rapportér fejl til %s\n" -#: parted/ui.c:1606 +#: parted/ui.c:1609 #, c-format msgid "Using %s\n" msgstr "Bruger %s\n" -#: parted/ui.c:1686 +#: parted/ui.c:1689 msgid "This command does not make sense in non-interactive mode.\n" msgstr "Denne kommando er meningsløs i ikke-interaktiv tilstand.\n" @@ -3260,6 +3294,10 @@ msgstr "Denne kommando er meningsløs i ikke-interaktiv tilstand.\n" #~ "parted kunne ikke genindlæse partitionstabellen på %s (%s). Det betyder " #~ "at Linux ikke véd noget som helst om de ændringer du lavede. " +#~ msgid "Extended partitions cannot be hidden on msdos disk labels." +#~ msgstr "" +#~ "Udvidede partitioner kan ikke være skjulte i etiketter af typen msdos." + #, c-format #~ msgid "" #~ "%s contains GPT signatures, indicating that it has a GPT table. However, " Binary files differ@@ -8,7 +8,7 @@ msgid "" msgstr "" "Project-Id-Version: parted-3.4.64.2\n" "Report-Msgid-Bugs-To: bug-parted@gnu.org\n" -"POT-Creation-Date: 2022-04-18 14:44-0400\n" +"POT-Creation-Date: 2023-04-10 15:50-0700\n" "PO-Revision-Date: 2022-04-06 19:18+0200\n" "Last-Translator: Mario Blättermann <mario.blaettermann@gmail.com>\n" "Language-Team: German <translation-team-de@lists.sourceforge.net>\n" @@ -20,25 +20,25 @@ msgstr "" "X-Generator: Lokalize 21.12.3\n" "Plural-Forms: nplurals=2; plural=(n != 1);\n" -#: lib/argmatch.c:147 +#: lib/argmatch.c:145 #, c-format msgid "invalid argument %s for %s" msgstr "ungültiges Argument %s für %s" -#: lib/argmatch.c:148 +#: lib/argmatch.c:146 #, c-format msgid "ambiguous argument %s for %s" msgstr "Mehrdeutiges Argument %s für %s" -#: lib/argmatch.c:167 lib/argmatch.h:238 +#: lib/argmatch.c:165 lib/argmatch.h:237 msgid "Valid arguments are:" msgstr "Zulässige Argumente sind:" -#: lib/closeout.c:122 libparted/labels/fdasd.c:145 +#: lib/closeout.c:121 libparted/labels/fdasd.c:145 msgid "write error" msgstr "Schreibfehler" -#: lib/error.c:195 +#: lib/error.c:193 msgid "Unknown system error" msgstr "Unbekannter Systemfehler" @@ -98,11 +98,11 @@ msgstr "%s: Die Option benötigt ein Argument -- »%c«\n" #. If you don't know what to put here, please see #. <https://en.wikipedia.org/wiki/Quotation_marks_in_other_languages> #. and use glyphs suitable for your language. -#: lib/quotearg.c:355 +#: lib/quotearg.c:354 msgid "`" msgstr "»" -#: lib/quotearg.c:356 +#: lib/quotearg.c:355 msgid "'" msgstr "«" @@ -184,7 +184,7 @@ msgstr "Kein regulärer Ausdruck vorher" #. To enquire the regular expression that your system uses for this #. purpose, you can use the command #. locale -k LC_MESSAGES | grep '^yesexpr=' -#: lib/rpmatch.c:150 +#: lib/rpmatch.c:149 msgid "^[yY]" msgstr "^[jJ]" @@ -194,7 +194,7 @@ msgstr "^[jJ]" #. To enquire the regular expression that your system uses for this #. purpose, you can use the command #. locale -k LC_MESSAGES | grep '^noexpr=' -#: lib/rpmatch.c:163 +#: lib/rpmatch.c:162 msgid "^[nN]" msgstr "^[nN]" @@ -755,22 +755,22 @@ msgstr "pmbr_boot" msgid "Unknown disk flag, %d." msgstr "Unbekanntes Disk-Flag, %d." -#: libparted/disk.c:1289 +#: libparted/disk.c:1320 #, c-format msgid "%s disk labels do not support extended partitions." msgstr "%s-Disk-Labels unterstützen keine erweiterten Partitionen." -#: libparted/disk.c:1821 +#: libparted/disk.c:1990 #, c-format msgid "%s disk labels don't support logical or extended partitions." msgstr "" "%s-Disk-Labels unterstützen keine logischen oder erweiterten Partitionen." -#: libparted/disk.c:1834 +#: libparted/disk.c:2003 msgid "Too many primary partitions." msgstr "Zu viele primäre Partitionen." -#: libparted/disk.c:1843 +#: libparted/disk.c:2012 #, c-format msgid "" "Can't add a logical partition to %s, because there is no extended partition." @@ -778,140 +778,144 @@ msgstr "" "Zu %s kann keine logische Partition hinzugefügt werden, da es keine " "erweiterte Partition gibt." -#: libparted/disk.c:1867 +#: libparted/disk.c:2036 #, c-format msgid "Can't have more than one extended partition on %s." msgstr "Auf %s kann es nicht mehr als eine erweiterte Partition geben." -#: libparted/disk.c:1877 +#: libparted/disk.c:2046 msgid "Can't have logical partitions outside of the extended partition." msgstr "" "Logische Partitionen können nicht außerhalb der erweiterten Partition sein." -#: libparted/disk.c:1902 +#: libparted/disk.c:2071 #, c-format msgid "Can't have a logical partition outside of the extended partition on %s." msgstr "" "Außerhalb der erweiterten Partition auf %s kann keine logische Partition " "existieren." -#: libparted/disk.c:1912 +#: libparted/disk.c:2081 msgid "Can't have a primary partition inside an extended partition." msgstr "Es kann keine primäre Partition in einer erweiterten Partition sein." -#: libparted/disk.c:1921 +#: libparted/disk.c:2090 msgid "Can't have a partition outside the disk!" msgstr "Partitionen außerhalb der Festplatte sind nicht möglich!" -#: libparted/disk.c:1972 libparted/disk.c:2150 +#: libparted/disk.c:2141 libparted/disk.c:2319 msgid "Can't have overlapping partitions." msgstr "Es können keine überlappenden Partitionen existieren." -#: libparted/disk.c:2351 +#: libparted/disk.c:2520 msgid "metadata" msgstr "Metadaten" -#: libparted/disk.c:2353 +#: libparted/disk.c:2522 msgid "free" msgstr "frei" -#: libparted/disk.c:2355 parted/ui.c:1271 parted/ui.c:1299 +#: libparted/disk.c:2524 parted/ui.c:1274 parted/ui.c:1302 msgid "extended" msgstr "erweitert" -#: libparted/disk.c:2357 parted/ui.c:1275 parted/ui.c:1303 +#: libparted/disk.c:2526 parted/ui.c:1278 parted/ui.c:1306 msgid "logical" msgstr "logisch" -#: libparted/disk.c:2359 parted/ui.c:1267 parted/ui.c:1295 +#: libparted/disk.c:2528 parted/ui.c:1270 parted/ui.c:1298 msgid "primary" msgstr "primär" -#: libparted/disk.c:2375 +#: libparted/disk.c:2544 msgid "boot" msgstr "boot" -#: libparted/disk.c:2377 +#: libparted/disk.c:2546 msgid "bios_grub" msgstr "bios_grub" -#: libparted/disk.c:2379 +#: libparted/disk.c:2548 msgid "root" msgstr "root" -#: libparted/disk.c:2381 +#: libparted/disk.c:2550 msgid "swap" msgstr "swap" -#: libparted/disk.c:2383 +#: libparted/disk.c:2552 msgid "hidden" msgstr "versteckt" -#: libparted/disk.c:2385 +#: libparted/disk.c:2554 msgid "raid" msgstr "raid" -#: libparted/disk.c:2387 +#: libparted/disk.c:2556 msgid "lvm" msgstr "lvm" -#: libparted/disk.c:2389 +#: libparted/disk.c:2558 msgid "lba" msgstr "lba" -#: libparted/disk.c:2391 +#: libparted/disk.c:2560 msgid "hp-service" msgstr "hp-service" -#: libparted/disk.c:2393 +#: libparted/disk.c:2562 msgid "palo" msgstr "palo" -#: libparted/disk.c:2395 +#: libparted/disk.c:2564 msgid "prep" msgstr "prep" -#: libparted/disk.c:2397 +#: libparted/disk.c:2566 msgid "msftres" msgstr "msftres" -#: libparted/disk.c:2399 +#: libparted/disk.c:2568 msgid "msftdata" msgstr "msftdata" -#: libparted/disk.c:2401 +#: libparted/disk.c:2570 msgid "atvrecv" msgstr "atvrecv" -#: libparted/disk.c:2403 +#: libparted/disk.c:2572 msgid "diag" msgstr "diag" -#: libparted/disk.c:2405 +#: libparted/disk.c:2574 msgid "legacy_boot" msgstr "legacy_boot" -#: libparted/disk.c:2407 +#: libparted/disk.c:2576 msgid "irst" msgstr "irst" -#: libparted/disk.c:2409 +#: libparted/disk.c:2578 msgid "esp" msgstr "esp" -#: libparted/disk.c:2411 +#: libparted/disk.c:2580 msgid "chromeos_kernel" msgstr "chromeos_kernel" -#: libparted/disk.c:2413 +#: libparted/disk.c:2582 msgid "bls_boot" msgstr "bls_boot" -#: libparted/disk.c:2415 +#: libparted/disk.c:2584 msgid "linux-home" msgstr "linux-home" -#: libparted/disk.c:2421 +#: libparted/disk.c:2586 +msgid "no_automount" +msgstr "" + +#: libparted/disk.c:2592 #, c-format msgid "Unknown partition flag, %d." msgstr "Unbekanntes Partitionsflag %d." @@ -1125,8 +1129,8 @@ msgstr "" "doppelt)." #: libparted/labels/atari.c:1662 libparted/labels/bsd.c:563 -#: libparted/labels/dasd.c:895 libparted/labels/dos.c:2303 -#: libparted/labels/dvh.c:770 libparted/labels/gpt.c:1769 +#: libparted/labels/dasd.c:893 libparted/labels/dos.c:2294 +#: libparted/labels/dvh.c:770 libparted/labels/gpt.c:1891 #: libparted/labels/loop.c:244 libparted/labels/mac.c:1409 #: libparted/labels/pc98.c:697 libparted/labels/rdb.c:1054 #: libparted/labels/sun.c:781 @@ -1151,43 +1155,32 @@ msgstr "Die Partitionsnummer konnte nicht zugewiesen werden." msgid "Unable to allocate a bsd disklabel slot." msgstr "BSD-Disklabel-Zeilen können nicht belegt werden." -#: libparted/labels/dasd.c:626 +#: libparted/labels/dasd.c:634 msgid "The partition table of DASD-LDL device cannot be changed.\n" msgstr "" "Die Partitionstabelle des DASD-LDL-Gerätes kann nicht geändert werden.\n" -#: libparted/labels/dasd.c:921 +#: libparted/labels/dasd.c:919 msgid "Unable to allocate a dasd disklabel slot" msgstr "dasd-Disklabel-Zeilen können nicht belegt werden" -#: libparted/labels/dos.c:1008 +#: libparted/labels/dos.c:1159 #, c-format msgid "Invalid partition table on %s -- wrong signature %x." msgstr "Ungültige Partitionstabelle auf %s -- falsche Signatur %x." -#: libparted/labels/dos.c:1036 +#: libparted/labels/dos.c:1187 #, c-format msgid "Invalid partition table - recursive partition on %s." msgstr "Ungültige Partitionstabelle - Rekursive Partition auf %s." -#: libparted/labels/dos.c:1567 -msgid "Extended partitions cannot be hidden on msdos disk labels." -msgstr "" -"Erweiterte Partitionen können in MS-DOS-Disk-Labels nicht versteckt werden." - -#: libparted/labels/dos.c:1579 -msgid "Extended partitions cannot be recovery partitions on msdos disk labels." -msgstr "" -"Erweiterte Partitionen können in MS-DOS-Disk-Labels keine " -"Wiederherstellungspartitionen sein." - -#: libparted/labels/dos.c:2285 +#: libparted/labels/dos.c:2276 msgid "Parted can't resize partitions managed by Windows Dynamic Disk." msgstr "" "Parted kann von Windows Dynamic Disk verwaltete Partitionen nicht in der " "Größe verändern." -#: libparted/labels/dos.c:2541 +#: libparted/labels/dos.c:2532 msgid "cannot create any more partitions" msgstr "Es können keine weiteren Partitionen erzeugt werden." @@ -1331,11 +1324,11 @@ msgid "Disk geometry does not match a DASD device of type 3390." msgstr "" "Die Festplattengeometrie entspricht nicht einem DASD-Gerät des Typs 3390." -#: libparted/labels/gpt.c:569 +#: libparted/labels/gpt.c:589 msgid "device is too small for GPT" msgstr "Gerät ist für GPT zu klein" -#: libparted/labels/gpt.c:771 +#: libparted/labels/gpt.c:791 #, c-format msgid "" "The format of the GPT partition table is version %x, which is newer than " @@ -1344,7 +1337,7 @@ msgstr "" "Das Format der GPT-Partitionstabelle (%x) ist neuer als das von Parted " "verstandene. Bitte melden Sie das." -#: libparted/labels/gpt.c:807 +#: libparted/labels/gpt.c:827 #, c-format msgid "" "Not all of the space available to %s appears to be used, you can fix the GPT " @@ -1355,7 +1348,7 @@ msgstr "" "die GPT reparieren, damit der gesamte Platz verwendet wird (zusätzlich %llu " "Blöcke) oder Sie können mit den aktuellen Einstellungen fortfahren." -#: libparted/labels/gpt.c:1006 +#: libparted/labels/gpt.c:1026 msgid "" "The backup GPT table is not at the end of the disk, as it should be. Fix, " "by moving the backup to the end (and removing the old backup)?" @@ -1364,7 +1357,7 @@ msgstr "" "normalerweise sein sollte. Soll das durch Verschieben der Sicherung zum Ende " "(und löschen der alten Sicherung) korrigiert werden?" -#: libparted/labels/gpt.c:1024 +#: libparted/labels/gpt.c:1044 msgid "" "Both the primary and backup GPT tables are corrupt. Try making a fresh " "table, and using Parted's rescue feature to recover partitions." @@ -1373,7 +1366,7 @@ msgstr "" "Sie, eine neue Tabelle anzulegen und die Partititionen mit Hilfe von " "Parted's Rettungsmöglichkeiten zu restaurieren." -#: libparted/labels/gpt.c:1035 +#: libparted/labels/gpt.c:1055 msgid "" "The backup GPT table is corrupt, but the primary appears OK, so that will be " "used." @@ -1381,7 +1374,7 @@ msgstr "" "Die gesicherte GPT-Tabelle ist defekt, aber die primäre scheint in Ordnung " "zu sein, daher wird diese verwendet." -#: libparted/labels/gpt.c:1047 +#: libparted/labels/gpt.c:1067 msgid "" "The primary GPT table is corrupt, but the backup appears OK, so that will be " "used." @@ -1389,11 +1382,11 @@ msgstr "" "Die primäre GPT-Tabelle ist defekt, aber die Sicherung scheint in Ordnung zu " "sein. Daher wird die Sicherung verwendet." -#: libparted/labels/gpt.c:1071 +#: libparted/labels/gpt.c:1091 msgid "primary partition table array CRC mismatch" msgstr "Array der primären Partitionstabelle und CRC stimmen nicht überein" -#: libparted/labels/gpt.c:1655 libparted/labels/gpt.c:1682 +#: libparted/labels/gpt.c:1722 libparted/labels/gpt.c:1749 msgid "failed to translate partition name" msgstr "Der Partitionsname konnte nicht übersetzt werden." @@ -2080,7 +2073,7 @@ msgstr "fat_table_alloc_cluster: Keine freien Cluster" msgid "Could not detect file system." msgstr "Dateisystem wurde nicht erkannt." -#: libparted/fs/r/filesys.c:159 libparted/fs/r/filesys.c:284 +#: libparted/fs/r/filesys.c:159 libparted/fs/r/filesys.c:285 #, c-format msgid "resizing %s file systems is not supported" msgstr "Größenänderung von %s-Dateisystemen ist noch nicht implementiert." @@ -2386,39 +2379,39 @@ msgstr "" "Dieser HFS-Datenträger hat keine Ãœberlaufdatei für Erweiterungen. Das ist " "schon ungewöhnlich!" -#: parted/parted.c:137 +#: parted/parted.c:138 msgid "displays this help message" msgstr "zeigt diese Hilfe an" -#: parted/parted.c:138 +#: parted/parted.c:139 msgid "lists partition layout on all block devices" msgstr "zeigt das Partitionslayout aller blockorientierten Geräte" -#: parted/parted.c:139 +#: parted/parted.c:140 msgid "displays machine parseable output" msgstr "zeigt maschinenlesbare Ausgaben an" -#: parted/parted.c:140 +#: parted/parted.c:141 msgid "displays JSON output" msgstr "zeigt die Ausgabe im JSON-Format an" -#: parted/parted.c:141 +#: parted/parted.c:142 msgid "never prompts for user intervention" msgstr "bittet nie um Eingriff des Benutzers" -#: parted/parted.c:142 +#: parted/parted.c:143 msgid "in script mode, fix instead of abort when asked" msgstr "im Skriptmodus korrigieren anstatt abbrechen, wenn gefragt wird" -#: parted/parted.c:143 +#: parted/parted.c:144 msgid "displays the version" msgstr "zeigt die Version" -#: parted/parted.c:144 +#: parted/parted.c:145 msgid "alignment for new partitions" msgstr "Ausrichtung für neue Partitionen" -#: parted/parted.c:157 +#: parted/parted.c:158 msgid "" "NUMBER is the partition number used by Linux. On MS-DOS disk labels, the " "primary partitions number from 1 to 4, logical partitions from 5 onwards.\n" @@ -2427,31 +2420,31 @@ msgstr "" "Partitionstabellen ist für Primärpartitionen die Nummer zwischen 1 und 4, " "für logische Partitionen größer 5.\n" -#: parted/parted.c:160 +#: parted/parted.c:161 msgid "LABEL-TYPE is one of: " msgstr "LABEL-TYP ist eines von: " -#: parted/parted.c:161 parted/parted.c:162 +#: parted/parted.c:162 parted/parted.c:163 msgid "FLAG is one of: " msgstr "FLAG ist eines von: " -#: parted/parted.c:163 +#: parted/parted.c:164 msgid "UNIT is one of: " msgstr "EINHEIT ist eines von: " -#: parted/parted.c:164 +#: parted/parted.c:165 msgid "desired alignment: minimum or optimal" msgstr "Gewünschte Ausrichtung: minimum oder optimal" -#: parted/parted.c:165 +#: parted/parted.c:166 msgid "PART-TYPE is one of: primary, logical, extended\n" msgstr "PART-TYP ist eines von: primär, logisch, erweitert\n" -#: parted/parted.c:167 +#: parted/parted.c:168 msgid "FS-TYPE is one of: " msgstr "FS-TYP ist eines von: " -#: parted/parted.c:168 +#: parted/parted.c:169 msgid "" "START and END are disk locations, such as 4GB or 10%. Negative values count " "from the end of the disk. For example, -1s specifies exactly the last " @@ -2461,7 +2454,7 @@ msgstr "" "Werte zählen vom Ende der Festplatte aus. Beispielsweise steht -1s für genau " "den letzen Sektor.\n" -#: parted/parted.c:171 +#: parted/parted.c:172 msgid "" "END is disk location, such as 4GB or 10%. Negative value counts from the " "end of the disk. For example, -1s specifies exactly the last sector.\n" @@ -2470,19 +2463,23 @@ msgstr "" "zählen vom Ende der Festplatte aus. Beispielsweise steht -1s für genau den " "letzten Sektor.\n" -#: parted/parted.c:174 +#: parted/parted.c:175 msgid "STATE is one of: on, off\n" msgstr "STATUS ist eines von: an, aus\n" -#: parted/parted.c:175 +#: parted/parted.c:176 msgid "DEVICE is usually /dev/hda or /dev/sda\n" msgstr "GERÄT ist normalerweise /dev/hda oder /dev/sda\n" -#: parted/parted.c:176 +#: parted/parted.c:177 msgid "NAME is any word you want\n" msgstr "NAME ist ein beliebiges Wort Ihrer Wahl\n" -#: parted/parted.c:179 +#: parted/parted.c:178 +msgid "TYPE_ID is a value between 0x01 and 0xff, TYPE_UUID is a UUID\n" +msgstr "" + +#: parted/parted.c:182 msgid "" "Copyright (C) 1998 - 2006 Free Software Foundation, Inc.\n" "This program is free software, covered by the GNU General Public License.\n" @@ -2503,24 +2500,24 @@ msgstr "" "\"GNU General Public License\" können weitere Einzelheiten nachgelesen\n" "werden.\n" -#: parted/parted.c:229 +#: parted/parted.c:232 #, c-format msgid "%0.f%%\t(time left %.2d:%.2d)" msgstr "%0.f%%\t(Restzeit %.2d:%.2d)" -#: parted/parted.c:248 +#: parted/parted.c:251 #, c-format msgid "Partition %s is being used. Are you sure you want to continue?" msgstr "" "Die Partition %s wird gerade verwendet. Sind Sie sicher, dass Sie fortsetzen " "wollen?" -#: parted/parted.c:269 +#: parted/parted.c:272 #, c-format msgid "Partition(s) on %s are being used." msgstr "Partition(en) auf %s werden verwendet." -#: parted/parted.c:281 +#: parted/parted.c:284 #, c-format msgid "" "The existing disk label on %s will be destroyed and all data on this disk " @@ -2529,31 +2526,31 @@ msgstr "" "Die bestehende Partitionstabelle und alle Daten auf %s werden gelöscht. " "Wollen Sie fortfahren?" -#: parted/parted.c:542 +#: parted/parted.c:545 msgid "New disk label type?" msgstr "Neuer Disk-Label-Typ?" -#: parted/parted.c:680 +#: parted/parted.c:692 msgid "Partition type?" msgstr "Partitionstyp?" -#: parted/parted.c:698 parted/parted.c:902 +#: parted/parted.c:710 parted/parted.c:914 msgid "Partition name?" msgstr "Partitionsname?" -#: parted/parted.c:708 +#: parted/parted.c:720 msgid "File system type?" msgstr "Dateisystemtyp?" -#: parted/parted.c:713 parted/parted.c:1683 +#: parted/parted.c:725 parted/parted.c:1815 msgid "Start?" msgstr "Anfang?" -#: parted/parted.c:715 parted/parted.c:1685 parted/parted.c:1768 +#: parted/parted.c:727 parted/parted.c:1817 parted/parted.c:1900 msgid "End?" msgstr "Ende?" -#: parted/parted.c:782 +#: parted/parted.c:794 #, c-format msgid "" "You requested a partition from %s to %s (sectors %llu..%llu).\n" @@ -2563,7 +2560,7 @@ msgstr "" "Das Beste, was Parted bieten kann, ist von %s nach %s (Sektoren %llu..%llu)." "%s" -#: parted/parted.c:791 +#: parted/parted.c:803 msgid "" "\n" "Is this still acceptable to you?" @@ -2571,7 +2568,7 @@ msgstr "" "\n" "Ist dies noch akzeptabel für Sie?" -#: parted/parted.c:814 +#: parted/parted.c:826 #, c-format msgid "" "The resulting partition is not properly aligned for best performance: %s" @@ -2579,89 +2576,114 @@ msgstr "" "Die Partition ist nicht sauber ausgerichtet, gemessen an bester Performance: " "%s" -#: parted/parted.c:816 parted/parted.c:1925 +#: parted/parted.c:828 parted/parted.c:2057 msgid "unknown (malloc failed)" msgstr "unbekannt (»malloc« fehlgeschlagen)" -#: parted/parted.c:894 +#: parted/parted.c:906 #, c-format msgid "%s disk labels do not support partition name." msgstr "%s-Disk-Labels unterstützen keine Partitionsnamen." -#: parted/parted.c:899 parted/parted.c:1748 parted/parted.c:1814 -#: parted/parted.c:1908 parted/parted.c:1983 +#: parted/parted.c:911 parted/parted.c:955 parted/parted.c:1880 +#: parted/parted.c:1946 parted/parted.c:2040 parted/parted.c:2115 msgid "Partition number?" msgstr "Partitionsnummer?" -#: parted/parted.c:1050 +#: parted/parted.c:949 +#, fuzzy, c-format +msgid "%s disk labels do not support partition type." +msgstr "%s-Disk-Labels unterstützen keine Partitionsnamen." + +#: parted/parted.c:965 +#, fuzzy +msgid "Partition type-id?" +msgstr "Partitionstyp?" + +#: parted/parted.c:972 +#, fuzzy +msgid "Invalid type-id." +msgstr "Ungültige Nummer." + +#: parted/parted.c:986 +#, fuzzy +msgid "Partition type-uuid?" +msgstr "Partitionstyp?" + +#: parted/parted.c:993 +#, fuzzy +msgid "Invalid type-uuid." +msgstr "Ungültige Nummer." + +#: parted/parted.c:1146 #, c-format msgid "BIOS cylinder,head,sector geometry: %d,%d,%d. Each cylinder is %s.\n" msgstr "" "BIOS Zylinder-, Kopf-, Sektor-Geometrie: %d, %d, %d. Jeder Zylinder ist %s " "groß.\n" -#: parted/parted.c:1137 +#: parted/parted.c:1240 #, c-format msgid "Model: %s (%s)\n" msgstr "Modell: %s (%s)\n" -#: parted/parted.c:1139 +#: parted/parted.c:1242 #, c-format msgid "Disk %s: %s\n" msgstr "Festplatte %s: %s\n" -#: parted/parted.c:1140 +#: parted/parted.c:1243 #, c-format msgid "Sector size (logical/physical): %lldB/%lldB\n" msgstr "Sektorgröße (logisch/physisch): %lldB/%lldB\n" -#: parted/parted.c:1152 +#: parted/parted.c:1255 #, c-format msgid "Partition Table: %s\n" msgstr "Partitionstabelle: %s\n" -#: parted/parted.c:1153 +#: parted/parted.c:1256 #, c-format msgid "Disk Flags: %s\n" msgstr "Disk-Flags: %s\n" -#: parted/parted.c:1279 parted/parted.c:1282 +#: parted/parted.c:1388 parted/parted.c:1391 msgid "Number" msgstr "Nummer" -#: parted/parted.c:1279 parted/parted.c:1282 +#: parted/parted.c:1388 parted/parted.c:1391 msgid "Start" msgstr "Anfang" -#: parted/parted.c:1280 parted/parted.c:1283 +#: parted/parted.c:1389 parted/parted.c:1392 msgid "End" msgstr "Ende" -#: parted/parted.c:1283 +#: parted/parted.c:1392 msgid "Size" msgstr "Größe" -#: parted/parted.c:1287 +#: parted/parted.c:1396 msgid "Type" msgstr "Typ" -#: parted/parted.c:1289 +#: parted/parted.c:1398 msgid "File system" msgstr "Dateisystem" -#: parted/parted.c:1292 +#: parted/parted.c:1401 msgid "Name" msgstr "Name" -#: parted/parted.c:1294 +#: parted/parted.c:1403 msgid "Flags" msgstr "Flags" -#: parted/parted.c:1352 +#: parted/parted.c:1461 msgid "Free Space" msgstr "Freier Platz" -#: parted/parted.c:1570 +#: parted/parted.c:1702 #, c-format msgid "" "A %s %s partition was found at %s -> %s. Do you want to add it to the " @@ -2670,56 +2692,56 @@ msgstr "" "Eine %s %s-Partition wurde bei %s -> %s gefunden. Wollen Sie diese Partition " "zur Partitionstabelle hinzufügen?" -#: parted/parted.c:1613 +#: parted/parted.c:1745 msgid "searching for file systems" msgstr "Suche nach Dateisystemen" -#: parted/parted.c:1720 +#: parted/parted.c:1852 msgid "The resize command has been removed in parted 3.0" msgstr "Der resize-Befehl wurde in parted 3.0 entfernt." -#: parted/parted.c:1782 +#: parted/parted.c:1914 msgid "" "Shrinking a partition can cause data loss, are you sure you want to continue?" msgstr "" "Das Verkleinern einer Partition kann Datenverlust zur Folge haben, sind Sie " "sicher, dass Sie fortsetzen wollen?" -#: parted/parted.c:1838 +#: parted/parted.c:1970 msgid "New device?" msgstr "Neues Gerät?" -#: parted/parted.c:1906 +#: parted/parted.c:2038 msgid "alignment type(min/opt)" msgstr "Ausrichtungstyp (min/opt)" -#: parted/parted.c:1921 +#: parted/parted.c:2053 #, c-format msgid "%d aligned\n" msgstr "%d ausgerichtet\n" -#: parted/parted.c:1923 +#: parted/parted.c:2055 #, c-format msgid "%d not aligned: %s\n" msgstr "%d nicht ausgerichtet: %s\n" -#: parted/parted.c:1948 parted/parted.c:1985 +#: parted/parted.c:2080 parted/parted.c:2117 msgid "Flag to Invert?" msgstr "Umzukehrendes Flag?" -#: parted/parted.c:1953 parted/parted.c:1990 +#: parted/parted.c:2085 parted/parted.c:2122 msgid "New state?" msgstr "Neuer Zustand?" -#: parted/parted.c:2036 +#: parted/parted.c:2168 msgid "Unit?" msgstr "Einheit?" -#: parted/parted.c:2171 +#: parted/parted.c:2303 msgid "align-check" msgstr "align-check" -#: parted/parted.c:2174 +#: parted/parted.c:2306 msgid "" "align-check TYPE N check partition N for TYPE(min|opt) " "alignment" @@ -2727,26 +2749,26 @@ msgstr "" "align-check TYP N Partition N auf TYP (min|opt) der " "Ausrichtung prüfen" -#: parted/parted.c:2182 +#: parted/parted.c:2314 msgid "help" msgstr "help" -#: parted/parted.c:2185 +#: parted/parted.c:2317 msgid "" "help [COMMAND] print general help, or help on " "COMMAND" msgstr "" "help [BEFEHL] Allgemeine Hilfe, oder Hilfe zu BEFEHL" -#: parted/parted.c:2191 +#: parted/parted.c:2323 msgid "mklabel" msgstr "mklabel" -#: parted/parted.c:2191 +#: parted/parted.c:2323 msgid "mktable" msgstr "mktable" -#: parted/parted.c:2194 +#: parted/parted.c:2326 msgid "" "mklabel,mktable LABEL-TYPE create a new disklabel (partition " "table)" @@ -2754,15 +2776,15 @@ msgstr "" "mklabel,mktable LABEL-TYP Neues Disklabel (Partitionstabelle) " "erzeugen" -#: parted/parted.c:2200 +#: parted/parted.c:2332 msgid "mkpart" msgstr "mkpart" -#: parted/parted.c:2203 +#: parted/parted.c:2335 msgid "mkpart PART-TYPE [FS-TYPE] START END make a partition" msgstr "mkpart PART-TYP [FS-TYP] ANFANG ENDE Partition erzeugen" -#: parted/parted.c:2209 +#: parted/parted.c:2341 msgid "" "'mkpart' makes a partition without creating a new file system on the " "partition. FS-TYPE may be specified to set an appropriate partition ID.\n" @@ -2771,20 +2793,20 @@ msgstr "" "Partition zu erzeugen. FS-TYP kann angegeben werden, um eine geeignete " "Partitions-ID zu setzen.\n" -#: parted/parted.c:2214 +#: parted/parted.c:2346 msgid "name" msgstr "name" -#: parted/parted.c:2217 +#: parted/parted.c:2349 msgid "name NUMBER NAME name partition NUMBER as NAME" msgstr "" "name NUMMER NAME Partition NUMMER mit NAME benennen" -#: parted/parted.c:2222 +#: parted/parted.c:2354 msgid "print" msgstr "print" -#: parted/parted.c:2225 +#: parted/parted.c:2357 msgid "" "print [devices|free|list,all] display the partition table, or " "available devices, or free space, or all found partitions" @@ -2792,7 +2814,7 @@ msgstr "" "print [devices|free|list,all] Partitionstabelle, verfügbare Geräte, " "freien Speicher, oder alle Paritionen anzeigen" -#: parted/parted.c:2229 +#: parted/parted.c:2361 msgid "" "Without arguments, 'print' displays the entire partition table. However with " "the following arguments it performs various other actions.\n" @@ -2800,11 +2822,11 @@ msgstr "" "Ohne Argumente zeigt »print« die komplette Partitionstabelle an. Mit den " "folgenden Argumenten verrichtet es die zahlreichen anderen Aktionen.\n" -#: parted/parted.c:2231 +#: parted/parted.c:2363 msgid " devices : display all active block devices\n" msgstr " devices : zeigt alle aktiven blockorientierten Geräte an\n" -#: parted/parted.c:2232 +#: parted/parted.c:2364 msgid "" " free : display information about free unpartitioned space on the " "current block device\n" @@ -2813,26 +2835,26 @@ msgstr "" "dem\n" " aktuellen blockorientierten Gerät an\n" -#: parted/parted.c:2234 +#: parted/parted.c:2366 msgid "" " list, all : display the partition tables of all active block devices\n" msgstr "" " list, all : zeigt Partitionstabellen aller aktiven blockorientierten\n" " Geräte an\n" -#: parted/parted.c:2238 +#: parted/parted.c:2370 msgid "quit" msgstr "quit" -#: parted/parted.c:2241 +#: parted/parted.c:2373 msgid "quit exit program" msgstr "quit Programm beenden" -#: parted/parted.c:2246 +#: parted/parted.c:2378 msgid "rescue" msgstr "rescue" -#: parted/parted.c:2249 +#: parted/parted.c:2381 msgid "" "rescue START END rescue a lost partition near START " "and END" @@ -2840,56 +2862,56 @@ msgstr "" "rescue ANFANG ENDE Eine verlorene Partitionen zwischen " "ANFANG und ENDE retten" -#: parted/parted.c:2255 +#: parted/parted.c:2387 msgid "resize" msgstr "resize" -#: parted/parted.c:2258 +#: parted/parted.c:2390 msgid "The resize command was removed in parted 3.0\n" msgstr "Der resize-Befehl wurde in parted 3.0 entfernt.\n" -#: parted/parted.c:2261 +#: parted/parted.c:2393 msgid "resizepart" msgstr "resizepart" -#: parted/parted.c:2264 +#: parted/parted.c:2396 msgid "resizepart NUMBER END resize partition NUMBER" msgstr "" "resizepart NUMMER ENDE Größe der Partition NUMMER ändern" -#: parted/parted.c:2269 +#: parted/parted.c:2401 msgid "rm" msgstr "rm" -#: parted/parted.c:2272 +#: parted/parted.c:2404 msgid "rm NUMBER delete partition NUMBER" msgstr "rm NUMMER Partition NUMMER löschen" -#: parted/parted.c:2277 +#: parted/parted.c:2409 msgid "select" msgstr "select" -#: parted/parted.c:2280 +#: parted/parted.c:2412 msgid "select DEVICE choose the device to edit" msgstr "" "select GERÄT Wählen Sie ein GERÄT zur Bearbeitung" -#: parted/parted.c:2285 +#: parted/parted.c:2417 msgid "disk_set" msgstr "disk_set" -#: parted/parted.c:2288 +#: parted/parted.c:2420 msgid "" "disk_set FLAG STATE change the FLAG on selected device" msgstr "" "disk_set FLAG STATUS ändern des FLAGs auf dem gewählten " "Gerät" -#: parted/parted.c:2293 +#: parted/parted.c:2425 msgid "disk_toggle" msgstr "disk_toggle" -#: parted/parted.c:2296 +#: parted/parted.c:2428 msgid "" "disk_toggle [FLAG] toggle the state of FLAG on " "selected device" @@ -2897,22 +2919,22 @@ msgstr "" "disk_toggle [FLAG] Umschalten des FLAGs auf dem " "gewählten Gerät" -#: parted/parted.c:2302 +#: parted/parted.c:2434 msgid "set" msgstr "set" -#: parted/parted.c:2305 +#: parted/parted.c:2437 msgid "" "set NUMBER FLAG STATE change the FLAG on partition NUMBER" msgstr "" "set NUMMER FLAG STATUS Ändern des FLAGs auf der Partition " "NUMMER" -#: parted/parted.c:2311 +#: parted/parted.c:2443 msgid "toggle" msgstr "toggle" -#: parted/parted.c:2314 +#: parted/parted.c:2446 msgid "" "toggle [NUMBER [FLAG]] toggle the state of FLAG on " "partition NUMBER" @@ -2920,20 +2942,30 @@ msgstr "" "toggle [NUMMER [FLAG]] Umschalten des FLAGs von Partition " "NUMMER" -#: parted/parted.c:2320 +#: parted/parted.c:2452 +msgid "type" +msgstr "" + +#: parted/parted.c:2455 +msgid "" +"type NUMBER TYPE-ID or TYPE-UUID type set TYPE-ID or TYPE-UUID of " +"partition NUMBER" +msgstr "" + +#: parted/parted.c:2460 msgid "unit" msgstr "unit" -#: parted/parted.c:2323 +#: parted/parted.c:2463 msgid "unit UNIT set the default unit to UNIT" msgstr "" "unit EINHEIT die Standardgröße auf EINHEIT setzen" -#: parted/parted.c:2328 +#: parted/parted.c:2468 msgid "version" msgstr "version" -#: parted/parted.c:2331 +#: parted/parted.c:2471 msgid "" "version display the version number and " "copyright information of GNU Parted" @@ -2942,7 +2974,7 @@ msgstr "" "Informationen\n" " von GNU Parted an" -#: parted/parted.c:2335 +#: parted/parted.c:2475 msgid "" "'version' displays copyright and version information corresponding to this " "copy of GNU Parted\n" @@ -2950,22 +2982,22 @@ msgstr "" "»version« zeigt die Versions- und Copyright-Informationen zu dieser Kopie " "von GNU Parted an\n" -#: parted/parted.c:2405 +#: parted/parted.c:2545 #, c-format msgid "Usage: %s [-hlmsfv] [-a<align>] [DEVICE [COMMAND [PARAMETERS]]...]\n" msgstr "" "Aufruf: %s [-hlmsfv] [-a<Ausrichtung>] [GERÄT [BEFEHL [PARAMETER]] …]\n" -#: parted/parted.c:2449 +#: parted/parted.c:2589 msgid "No device found" msgstr "Kein Gerät gefunden" -#: parted/parted.c:2486 +#: parted/parted.c:2626 msgid "WARNING: You are not superuser. Watch out for permissions.\n" msgstr "" "WARNUNG: Sie sind kein Systemadministrator. Achten Sie auf Ihre Rechte.\n" -#: parted/parted.c:2519 +#: parted/parted.c:2659 msgid "" "You should reinstall your boot loader before rebooting. Read section 4 of " "the Parted User documentation for more information." @@ -2973,7 +3005,7 @@ msgstr "" "Vor einem Neustart sollten Sie Ihren Bootlader neu installieren. Lesen Sie " "den Abschnitt 4 der Benutzerdokumentation von Parted für mehr Informationen." -#: parted/parted.c:2526 +#: parted/parted.c:2666 msgid "You may need to update /etc/fstab.\n" msgstr "Möglicherweise müssen Sie /etc/fstab anpassen.\n" @@ -3237,69 +3269,69 @@ msgstr "" "\n" "Fehler: Ein generelles SIGILL-Signal wurde empfangen." -#: parted/ui.c:901 +#: parted/ui.c:904 #, c-format msgid "invalid token: %s" msgstr "Unbekanntes Zeichen: %s" -#: parted/ui.c:1082 +#: parted/ui.c:1085 msgid "Expecting a partition number." msgstr "Es wird eine Partitionsnummer erwartet." -#: parted/ui.c:1091 +#: parted/ui.c:1094 msgid "Partition doesn't exist." msgstr "Die Partition existiert nicht." -#: parted/ui.c:1111 +#: parted/ui.c:1114 msgid "Expecting a file system type." msgstr "Es wird ein Dateisystemtyp erwartet." -#: parted/ui.c:1118 +#: parted/ui.c:1121 #, c-format msgid "Unknown file system type \"%s\"." msgstr "Unbekannter Dateisystemtyp »%s«." -#: parted/ui.c:1139 +#: parted/ui.c:1142 msgid "Expecting a disk label type." msgstr "Es wird ein Disklabeltyp erwartet." -#: parted/ui.c:1170 parted/ui.c:1206 +#: parted/ui.c:1173 parted/ui.c:1209 msgid "No flags supported" msgstr "Keine Unterstützung für Flags" -#: parted/ui.c:1280 +#: parted/ui.c:1283 msgid "Can't create any more partitions." msgstr "Weitere Partitionen können nicht mehr erzeugt werden." -#: parted/ui.c:1290 +#: parted/ui.c:1293 msgid "Expecting a partition type." msgstr "Es wird ein Partitionstyp erwartet." -#: parted/ui.c:1439 +#: parted/ui.c:1442 msgid "on" msgstr "an" -#: parted/ui.c:1440 +#: parted/ui.c:1443 msgid "off" msgstr "aus" -#: parted/ui.c:1457 +#: parted/ui.c:1460 msgid "optimal" msgstr "optimal" -#: parted/ui.c:1458 +#: parted/ui.c:1461 msgid "minimal" msgstr "minimal" -#: parted/ui.c:1591 +#: parted/ui.c:1594 msgid "OPTIONs:" msgstr "OPTIONEN:" -#: parted/ui.c:1596 +#: parted/ui.c:1599 msgid "COMMANDs:" msgstr "BEFEHLE:" -#: parted/ui.c:1599 +#: parted/ui.c:1602 #, c-format msgid "" "\n" @@ -3308,15 +3340,26 @@ msgstr "" "\n" "Melden Sie Fehler an %s\n" -#: parted/ui.c:1606 +#: parted/ui.c:1609 #, c-format msgid "Using %s\n" msgstr "%s wird verwendet\n" -#: parted/ui.c:1686 +#: parted/ui.c:1689 msgid "This command does not make sense in non-interactive mode.\n" msgstr "Dieser Befehl ergibt im nicht-interaktiven Modus keinen Sinn.\n" +#~ msgid "Extended partitions cannot be hidden on msdos disk labels." +#~ msgstr "" +#~ "Erweiterte Partitionen können in MS-DOS-Disk-Labels nicht versteckt " +#~ "werden." + +#~ msgid "" +#~ "Extended partitions cannot be recovery partitions on msdos disk labels." +#~ msgstr "" +#~ "Erweiterte Partitionen können in MS-DOS-Disk-Labels keine " +#~ "Wiederherstellungspartitionen sein." + #~ msgid "" #~ " NUMBER : display more detailed information about this particular " #~ "partition\n" Binary files differ@@ -8,7 +8,7 @@ msgid "" msgstr "" "Project-Id-Version: GNU parted 3.4.64.2\n" "Report-Msgid-Bugs-To: bug-parted@gnu.org\n" -"POT-Creation-Date: 2022-04-18 14:44-0400\n" +"POT-Creation-Date: 2023-04-10 15:50-0700\n" "PO-Revision-Date: 2022-04-07 09:34-0600\n" "Last-Translator: Alejandro Cendejas Tena <alex.cendejas@gmail.com>\n" "Language-Team: Spanish <es@tp.org.es>\n" @@ -18,25 +18,25 @@ msgstr "" "Content-Transfer-Encoding: 8-bit\n" "X-Bugs: Report translation errors to the Language-Team address.\n" -#: lib/argmatch.c:147 +#: lib/argmatch.c:145 #, c-format msgid "invalid argument %s for %s" msgstr "argumento %s inválido para %s" -#: lib/argmatch.c:148 +#: lib/argmatch.c:146 #, c-format msgid "ambiguous argument %s for %s" msgstr "argumento %s ambiguo para %s" -#: lib/argmatch.c:167 lib/argmatch.h:238 +#: lib/argmatch.c:165 lib/argmatch.h:237 msgid "Valid arguments are:" msgstr "Los argumentos válidos son:" -#: lib/closeout.c:122 libparted/labels/fdasd.c:145 +#: lib/closeout.c:121 libparted/labels/fdasd.c:145 msgid "write error" msgstr "error de escritura" -#: lib/error.c:195 +#: lib/error.c:193 msgid "Unknown system error" msgstr "Error de sistema desconocido" @@ -96,11 +96,11 @@ msgstr "%s: la opción requiere un argumento -- '%c'\n" #. If you don't know what to put here, please see #. <https://en.wikipedia.org/wiki/Quotation_marks_in_other_languages> #. and use glyphs suitable for your language. -#: lib/quotearg.c:355 +#: lib/quotearg.c:354 msgid "`" msgstr "`" -#: lib/quotearg.c:356 +#: lib/quotearg.c:355 msgid "'" msgstr "'" @@ -182,7 +182,7 @@ msgstr "No hay ninguna expresión regular anterior" #. To enquire the regular expression that your system uses for this #. purpose, you can use the command #. locale -k LC_MESSAGES | grep '^yesexpr=' -#: lib/rpmatch.c:150 +#: lib/rpmatch.c:149 msgid "^[yY]" msgstr "^[sS]" @@ -192,7 +192,7 @@ msgstr "^[sS]" #. To enquire the regular expression that your system uses for this #. purpose, you can use the command #. locale -k LC_MESSAGES | grep '^noexpr=' -#: lib/rpmatch.c:163 +#: lib/rpmatch.c:162 msgid "^[nN]" msgstr "^[nN]" @@ -765,22 +765,22 @@ msgstr "arranque_pmbr" msgid "Unknown disk flag, %d." msgstr "Bandera de disco desconocida, %d." -#: libparted/disk.c:1289 +#: libparted/disk.c:1320 #, c-format msgid "%s disk labels do not support extended partitions." msgstr "Las etiquetas de disco de %s no soportan particiones extendidas." -#: libparted/disk.c:1821 +#: libparted/disk.c:1990 #, c-format msgid "%s disk labels don't support logical or extended partitions." msgstr "" "Las etiquetas de disco %s no soportan particiones extendidas o lógicas." -#: libparted/disk.c:1834 +#: libparted/disk.c:2003 msgid "Too many primary partitions." msgstr "Demasiadas particiones primarias." -#: libparted/disk.c:1843 +#: libparted/disk.c:2012 #, c-format msgid "" "Can't add a logical partition to %s, because there is no extended partition." @@ -788,140 +788,144 @@ msgstr "" "No se puede añadir una partición lógica en %s, porque no hay una partición " "extendida." -#: libparted/disk.c:1867 +#: libparted/disk.c:2036 #, c-format msgid "Can't have more than one extended partition on %s." msgstr "No se puede tener más de una partición extendida en %s." -#: libparted/disk.c:1877 +#: libparted/disk.c:2046 msgid "Can't have logical partitions outside of the extended partition." msgstr "" "No se puede tener una partición lógica fuera de la partición extendida." -#: libparted/disk.c:1902 +#: libparted/disk.c:2071 #, c-format msgid "Can't have a logical partition outside of the extended partition on %s." msgstr "" "No se puede tener una partición lógica fuera de la partición extendida en %s." -#: libparted/disk.c:1912 +#: libparted/disk.c:2081 msgid "Can't have a primary partition inside an extended partition." msgstr "" "No se puede tener una partición primaria dentro de una partición extendida." -#: libparted/disk.c:1921 +#: libparted/disk.c:2090 msgid "Can't have a partition outside the disk!" msgstr "¡No se puede hacer una partición fuera del disco!" -#: libparted/disk.c:1972 libparted/disk.c:2150 +#: libparted/disk.c:2141 libparted/disk.c:2319 msgid "Can't have overlapping partitions." msgstr "No se puede tener particiones superpuestas." -#: libparted/disk.c:2351 +#: libparted/disk.c:2520 msgid "metadata" msgstr "metadata" -#: libparted/disk.c:2353 +#: libparted/disk.c:2522 msgid "free" msgstr "libre" -#: libparted/disk.c:2355 parted/ui.c:1271 parted/ui.c:1299 +#: libparted/disk.c:2524 parted/ui.c:1274 parted/ui.c:1302 msgid "extended" msgstr "extendida" -#: libparted/disk.c:2357 parted/ui.c:1275 parted/ui.c:1303 +#: libparted/disk.c:2526 parted/ui.c:1278 parted/ui.c:1306 msgid "logical" msgstr "lógica" -#: libparted/disk.c:2359 parted/ui.c:1267 parted/ui.c:1295 +#: libparted/disk.c:2528 parted/ui.c:1270 parted/ui.c:1298 msgid "primary" msgstr "primaria" -#: libparted/disk.c:2375 +#: libparted/disk.c:2544 msgid "boot" msgstr "arranque" -#: libparted/disk.c:2377 +#: libparted/disk.c:2546 msgid "bios_grub" msgstr "grub_bios" -#: libparted/disk.c:2379 +#: libparted/disk.c:2548 msgid "root" msgstr "raíz" -#: libparted/disk.c:2381 +#: libparted/disk.c:2550 msgid "swap" msgstr "swap" -#: libparted/disk.c:2383 +#: libparted/disk.c:2552 msgid "hidden" msgstr "oculta" -#: libparted/disk.c:2385 +#: libparted/disk.c:2554 msgid "raid" msgstr "raid" -#: libparted/disk.c:2387 +#: libparted/disk.c:2556 msgid "lvm" msgstr "lvm" -#: libparted/disk.c:2389 +#: libparted/disk.c:2558 msgid "lba" msgstr "lba" -#: libparted/disk.c:2391 +#: libparted/disk.c:2560 msgid "hp-service" msgstr "utilidad-hp" -#: libparted/disk.c:2393 +#: libparted/disk.c:2562 msgid "palo" msgstr "palo" -#: libparted/disk.c:2395 +#: libparted/disk.c:2564 msgid "prep" msgstr "prep" -#: libparted/disk.c:2397 +#: libparted/disk.c:2566 msgid "msftres" msgstr "msftres" -#: libparted/disk.c:2399 +#: libparted/disk.c:2568 msgid "msftdata" msgstr "msftdata" -#: libparted/disk.c:2401 +#: libparted/disk.c:2570 msgid "atvrecv" msgstr "atvrecv" -#: libparted/disk.c:2403 +#: libparted/disk.c:2572 msgid "diag" msgstr "diag" -#: libparted/disk.c:2405 +#: libparted/disk.c:2574 msgid "legacy_boot" msgstr "arranque_legacy" -#: libparted/disk.c:2407 +#: libparted/disk.c:2576 msgid "irst" msgstr "irst" -#: libparted/disk.c:2409 +#: libparted/disk.c:2578 msgid "esp" msgstr "esp" -#: libparted/disk.c:2411 +#: libparted/disk.c:2580 msgid "chromeos_kernel" msgstr "núcleo_chromeos" -#: libparted/disk.c:2413 +#: libparted/disk.c:2582 msgid "bls_boot" msgstr "arranque_bls" -#: libparted/disk.c:2415 +#: libparted/disk.c:2584 msgid "linux-home" msgstr "linux-home" -#: libparted/disk.c:2421 +#: libparted/disk.c:2586 +msgid "no_automount" +msgstr "" + +#: libparted/disk.c:2592 #, c-format msgid "Unknown partition flag, %d." msgstr "Modificador de particiones desconocido, %d." @@ -1141,8 +1145,8 @@ msgstr "" # No se pueden, con N. # no pongas dos espacios seguidos #: libparted/labels/atari.c:1662 libparted/labels/bsd.c:563 -#: libparted/labels/dasd.c:895 libparted/labels/dos.c:2303 -#: libparted/labels/dvh.c:770 libparted/labels/gpt.c:1769 +#: libparted/labels/dasd.c:893 libparted/labels/dos.c:2294 +#: libparted/labels/dvh.c:770 libparted/labels/gpt.c:1891 #: libparted/labels/loop.c:244 libparted/labels/mac.c:1409 #: libparted/labels/pc98.c:697 libparted/labels/rdb.c:1054 #: libparted/labels/sun.c:781 @@ -1166,44 +1170,33 @@ msgstr "No se puede asignar un número de partición." msgid "Unable to allocate a bsd disklabel slot." msgstr "No se puede asignar una ranura de la etiqueta de disco bsd." -#: libparted/labels/dasd.c:626 +#: libparted/labels/dasd.c:634 msgid "The partition table of DASD-LDL device cannot be changed.\n" msgstr "" "No se puede cambiar la tabla de particiones del dispositivo DASD-LDL.\n" -#: libparted/labels/dasd.c:921 +#: libparted/labels/dasd.c:919 msgid "Unable to allocate a dasd disklabel slot" msgstr "No se puede asignar una ranura de la etiqueta de disco dasd." # te doy permiso para poner inválida -#: libparted/labels/dos.c:1008 +#: libparted/labels/dos.c:1159 #, c-format msgid "Invalid partition table on %s -- wrong signature %x." msgstr "Tabla de particiones inválida en %s -- firma errónea %x." -#: libparted/labels/dos.c:1036 +#: libparted/labels/dos.c:1187 #, c-format msgid "Invalid partition table - recursive partition on %s." msgstr "Tabla de particiones inválida - partición recursiva en %s." -#: libparted/labels/dos.c:1567 -msgid "Extended partitions cannot be hidden on msdos disk labels." -msgstr "" -"No pueden esconderse particiones extendidas en etiquetas de disco msdos." - -#: libparted/labels/dos.c:1579 -msgid "Extended partitions cannot be recovery partitions on msdos disk labels." -msgstr "" -"Las particiones extendidas no pueden ser particiones de recuperación en " -"etiquetas de disco msdos." - -#: libparted/labels/dos.c:2285 +#: libparted/labels/dos.c:2276 msgid "Parted can't resize partitions managed by Windows Dynamic Disk." msgstr "" "Parted no puede redimensionar particiones manejadas por Windows Dynamic Disk." # No se puede. -#: libparted/labels/dos.c:2541 +#: libparted/labels/dos.c:2532 msgid "cannot create any more partitions" msgstr "no se puede crear más particiones" @@ -1354,11 +1347,11 @@ msgstr "No se pudo recuperar la información de tamaño de bloques." msgid "Disk geometry does not match a DASD device of type 3390." msgstr "La geometría del disco no coincide con un dispositivo DASD tipo 3390." -#: libparted/labels/gpt.c:569 +#: libparted/labels/gpt.c:589 msgid "device is too small for GPT" msgstr "el dispositivo es demasiado pequeño para GPT" -#: libparted/labels/gpt.c:771 +#: libparted/labels/gpt.c:791 #, c-format msgid "" "The format of the GPT partition table is version %x, which is newer than " @@ -1367,7 +1360,7 @@ msgstr "" "El formato de la tabla de particiones GPT es la versión %x, el cual es más " "nuevo que lo que Parted puede reconocer. ¡Por favor, reporte esto!" -#: libparted/labels/gpt.c:807 +#: libparted/labels/gpt.c:827 #, c-format msgid "" "Not all of the space available to %s appears to be used, you can fix the GPT " @@ -1378,7 +1371,7 @@ msgstr "" "corregir la GPT para usar todo el espacio (%llu bloques extra) o ¿desea " "continuar con la configuración actual? " -#: libparted/labels/gpt.c:1006 +#: libparted/labels/gpt.c:1026 msgid "" "The backup GPT table is not at the end of the disk, as it should be. Fix, " "by moving the backup to the end (and removing the old backup)?" @@ -1386,7 +1379,7 @@ msgstr "" "La tabla GPT de respaldo no está al final del disco, como debería. ¿Corregir " "esto moviendo el respaldo al final (y quitando el respaldo viejo)?" -#: libparted/labels/gpt.c:1024 +#: libparted/labels/gpt.c:1044 msgid "" "Both the primary and backup GPT tables are corrupt. Try making a fresh " "table, and using Parted's rescue feature to recover partitions." @@ -1395,7 +1388,7 @@ msgstr "" "una tabla actualizada, y utilice la opción de rescate de Parted para " "reconstruir las particiones." -#: libparted/labels/gpt.c:1035 +#: libparted/labels/gpt.c:1055 msgid "" "The backup GPT table is corrupt, but the primary appears OK, so that will be " "used." @@ -1403,7 +1396,7 @@ msgstr "" "La tabla GPT de respaldo está dañada, pero la primaria parece correcta, por " "lo tanto se usará esta." -#: libparted/labels/gpt.c:1047 +#: libparted/labels/gpt.c:1067 msgid "" "The primary GPT table is corrupt, but the backup appears OK, so that will be " "used." @@ -1411,11 +1404,11 @@ msgstr "" "La tabla primaria GPT está corrupta, pero la copia de respaldo parece " "correcta, por lo tanto se usará esta." -#: libparted/labels/gpt.c:1071 +#: libparted/labels/gpt.c:1091 msgid "primary partition table array CRC mismatch" msgstr "discrepancia de CRC de la tabla de particiones primarias" -#: libparted/labels/gpt.c:1655 libparted/labels/gpt.c:1682 +#: libparted/labels/gpt.c:1722 libparted/labels/gpt.c:1749 msgid "failed to translate partition name" msgstr "falla al traducir el nombre de la partición" @@ -2117,7 +2110,7 @@ msgstr "fat_table_alloc_cluster: no quedan clusters libres" msgid "Could not detect file system." msgstr "No se pudo detectar el sistema de ficheros." -#: libparted/fs/r/filesys.c:159 libparted/fs/r/filesys.c:284 +#: libparted/fs/r/filesys.c:159 libparted/fs/r/filesys.c:285 #, c-format msgid "resizing %s file systems is not supported" msgstr "el redimensionamiento de sistemas de ficheros %s no está implementado" @@ -2413,40 +2406,40 @@ msgstr "" "Este volumen HFS+ no tiene un Fichero de Desbordamiento de Extensiones. " "¡Esto es muy extraño!" -#: parted/parted.c:137 +#: parted/parted.c:138 msgid "displays this help message" msgstr "muestra este mensaje de ayuda" -#: parted/parted.c:138 +#: parted/parted.c:139 msgid "lists partition layout on all block devices" msgstr "" "enlista la disposición de particiones en todos los dispositivos de bloque" -#: parted/parted.c:139 +#: parted/parted.c:140 msgid "displays machine parseable output" msgstr "muestra salida analizable" -#: parted/parted.c:140 +#: parted/parted.c:141 msgid "displays JSON output" msgstr "muestra salida JSON" -#: parted/parted.c:141 +#: parted/parted.c:142 msgid "never prompts for user intervention" msgstr "no pide nunca la intervención del usuario" -#: parted/parted.c:142 +#: parted/parted.c:143 msgid "in script mode, fix instead of abort when asked" msgstr "en modo guión, corrige en lugar de cancelar al solicitarlo" -#: parted/parted.c:143 +#: parted/parted.c:144 msgid "displays the version" msgstr "muestra la versión" -#: parted/parted.c:144 +#: parted/parted.c:145 msgid "alignment for new partitions" msgstr "alineación para nuevas particiones" -#: parted/parted.c:157 +#: parted/parted.c:158 msgid "" "NUMBER is the partition number used by Linux. On MS-DOS disk labels, the " "primary partitions number from 1 to 4, logical partitions from 5 onwards.\n" @@ -2455,31 +2448,31 @@ msgstr "" "disco MS-DOS, las particiones primarias van del 1 al 4, y las particiones " "lógicas del 5 en adelante.\n" -#: parted/parted.c:160 +#: parted/parted.c:161 msgid "LABEL-TYPE is one of: " msgstr "TIPO_ETIQUETA es uno de: " -#: parted/parted.c:161 parted/parted.c:162 +#: parted/parted.c:162 parted/parted.c:163 msgid "FLAG is one of: " msgstr "FLAG es uno de: " -#: parted/parted.c:163 +#: parted/parted.c:164 msgid "UNIT is one of: " msgstr "UNIDAD es uno de: " -#: parted/parted.c:164 +#: parted/parted.c:165 msgid "desired alignment: minimum or optimal" msgstr "alineación deseada: mínima u óptima" -#: parted/parted.c:165 +#: parted/parted.c:166 msgid "PART-TYPE is one of: primary, logical, extended\n" msgstr "TIPO-PART es uno de: primário, lógico, extendido\n" -#: parted/parted.c:167 +#: parted/parted.c:168 msgid "FS-TYPE is one of: " msgstr "TIPO-SF es uno de: " -#: parted/parted.c:168 +#: parted/parted.c:169 msgid "" "START and END are disk locations, such as 4GB or 10%. Negative values count " "from the end of the disk. For example, -1s specifies exactly the last " @@ -2489,7 +2482,7 @@ msgstr "" "cuentan desde el final del disco. Por ejemplo, -1s especifica exactamente el " "último sector.\n" -#: parted/parted.c:171 +#: parted/parted.c:172 msgid "" "END is disk location, such as 4GB or 10%. Negative value counts from the " "end of the disk. For example, -1s specifies exactly the last sector.\n" @@ -2498,22 +2491,26 @@ msgstr "" "desde el final del disco. Por ejemplo, -1s especifica exactamente el último " "sector.\n" -#: parted/parted.c:174 +#: parted/parted.c:175 msgid "STATE is one of: on, off\n" msgstr "ESTADO es uno de: on, off\n" -#: parted/parted.c:175 +#: parted/parted.c:176 msgid "DEVICE is usually /dev/hda or /dev/sda\n" msgstr "DISPOSITIVO es normalmente /dev/hda o /dev/sda\n" -#: parted/parted.c:176 +#: parted/parted.c:177 msgid "NAME is any word you want\n" msgstr "NOMBRE es cualquier palabra que quiera\n" +#: parted/parted.c:178 +msgid "TYPE_ID is a value between 0x01 and 0xff, TYPE_UUID is a UUID\n" +msgstr "" + # Please, busca este mismo texto en el .po de fileutils o textutils e intenta # que se parezca en la terminología, # por ejemplo: is distributed -> se distribuye -#: parted/parted.c:179 +#: parted/parted.c:182 msgid "" "Copyright (C) 1998 - 2006 Free Software Foundation, Inc.\n" "This program is free software, covered by the GNU General Public License.\n" @@ -2534,22 +2531,22 @@ msgstr "" "Licencia Pública General de GNU para obtener más detalles.\n" "\n" -#: parted/parted.c:229 +#: parted/parted.c:232 #, c-format msgid "%0.f%%\t(time left %.2d:%.2d)" msgstr "%0.f%%\t(tiempo que queda %.2d:%.2d)" -#: parted/parted.c:248 +#: parted/parted.c:251 #, c-format msgid "Partition %s is being used. Are you sure you want to continue?" msgstr "La partición %s está usandose. ¿Realmente desea continuar?" -#: parted/parted.c:269 +#: parted/parted.c:272 #, c-format msgid "Partition(s) on %s are being used." msgstr "La(s) partición(es) en %s está(n) siendo usada(s)." -#: parted/parted.c:281 +#: parted/parted.c:284 #, c-format msgid "" "The existing disk label on %s will be destroyed and all data on this disk " @@ -2558,31 +2555,31 @@ msgstr "" "La etiqueta de disco actual en %s será destruida y todos los datos en este " "disco se perderán. ¿Desea continuar?" -#: parted/parted.c:542 +#: parted/parted.c:545 msgid "New disk label type?" msgstr "¿Nuevo tipo de etiqueta de disco?" -#: parted/parted.c:680 +#: parted/parted.c:692 msgid "Partition type?" msgstr "¿Tipo de partición?" -#: parted/parted.c:698 parted/parted.c:902 +#: parted/parted.c:710 parted/parted.c:914 msgid "Partition name?" msgstr "¿Nombre de la partición?" -#: parted/parted.c:708 +#: parted/parted.c:720 msgid "File system type?" msgstr "¿Tipo de sistema de ficheros?" -#: parted/parted.c:713 parted/parted.c:1683 +#: parted/parted.c:725 parted/parted.c:1815 msgid "Start?" msgstr "¿Inicio?" -#: parted/parted.c:715 parted/parted.c:1685 parted/parted.c:1768 +#: parted/parted.c:727 parted/parted.c:1817 parted/parted.c:1900 msgid "End?" msgstr "¿Fin?" -#: parted/parted.c:782 +#: parted/parted.c:794 #, c-format msgid "" "You requested a partition from %s to %s (sectors %llu..%llu).\n" @@ -2592,7 +2589,7 @@ msgstr "" "La ubicación más cercana que podemos manejar es %s a %s (sectores %llu.." "%llu).%s" -#: parted/parted.c:791 +#: parted/parted.c:803 msgid "" "\n" "Is this still acceptable to you?" @@ -2600,7 +2597,7 @@ msgstr "" "\n" "¿Esto aún es aceptable para usted?" -#: parted/parted.c:814 +#: parted/parted.c:826 #, c-format msgid "" "The resulting partition is not properly aligned for best performance: %s" @@ -2608,89 +2605,114 @@ msgstr "" "La partición resultante no está correctamente alineada para el mejor " "desempeño: %s" -#: parted/parted.c:816 parted/parted.c:1925 +#: parted/parted.c:828 parted/parted.c:2057 msgid "unknown (malloc failed)" msgstr "desconocido (malloc falló)" -#: parted/parted.c:894 +#: parted/parted.c:906 #, c-format msgid "%s disk labels do not support partition name." msgstr "Las etiquetas de disco de %s no implementan nombre de partición." -#: parted/parted.c:899 parted/parted.c:1748 parted/parted.c:1814 -#: parted/parted.c:1908 parted/parted.c:1983 +#: parted/parted.c:911 parted/parted.c:955 parted/parted.c:1880 +#: parted/parted.c:1946 parted/parted.c:2040 parted/parted.c:2115 msgid "Partition number?" msgstr "¿Número de la partición?" -#: parted/parted.c:1050 +#: parted/parted.c:949 +#, fuzzy, c-format +msgid "%s disk labels do not support partition type." +msgstr "Las etiquetas de disco de %s no implementan nombre de partición." + +#: parted/parted.c:965 +#, fuzzy +msgid "Partition type-id?" +msgstr "¿Tipo de partición?" + +#: parted/parted.c:972 +#, fuzzy +msgid "Invalid type-id." +msgstr "Número inválido." + +#: parted/parted.c:986 +#, fuzzy +msgid "Partition type-uuid?" +msgstr "¿Tipo de partición?" + +#: parted/parted.c:993 +#, fuzzy +msgid "Invalid type-uuid." +msgstr "Número inválido." + +#: parted/parted.c:1146 #, c-format msgid "BIOS cylinder,head,sector geometry: %d,%d,%d. Each cylinder is %s.\n" msgstr "" "Geometría cilindro,encabezado,sector de BIOS: %d,%d,%d. Cada cilindro es " "%s.\n" -#: parted/parted.c:1137 +#: parted/parted.c:1240 #, c-format msgid "Model: %s (%s)\n" msgstr "Modelo: %s (%s)\n" -#: parted/parted.c:1139 +#: parted/parted.c:1242 #, c-format msgid "Disk %s: %s\n" msgstr "Disco %s: %s\n" -#: parted/parted.c:1140 +#: parted/parted.c:1243 #, c-format msgid "Sector size (logical/physical): %lldB/%lldB\n" msgstr "Tamaño de sector (lógico/físico): %lldB/%lldB\n" -#: parted/parted.c:1152 +#: parted/parted.c:1255 #, c-format msgid "Partition Table: %s\n" msgstr "Tabla de particiones: %s\n" -#: parted/parted.c:1153 +#: parted/parted.c:1256 #, c-format msgid "Disk Flags: %s\n" msgstr "Banderas de disco: %s\n" -#: parted/parted.c:1279 parted/parted.c:1282 +#: parted/parted.c:1388 parted/parted.c:1391 msgid "Number" msgstr "Número" -#: parted/parted.c:1279 parted/parted.c:1282 +#: parted/parted.c:1388 parted/parted.c:1391 msgid "Start" msgstr "Inicio" -#: parted/parted.c:1280 parted/parted.c:1283 +#: parted/parted.c:1389 parted/parted.c:1392 msgid "End" msgstr "Fin" -#: parted/parted.c:1283 +#: parted/parted.c:1392 msgid "Size" msgstr "Tamaño" -#: parted/parted.c:1287 +#: parted/parted.c:1396 msgid "Type" msgstr "Tipo" -#: parted/parted.c:1289 +#: parted/parted.c:1398 msgid "File system" msgstr "Sistema de ficheros" -#: parted/parted.c:1292 +#: parted/parted.c:1401 msgid "Name" msgstr "Nombre" -#: parted/parted.c:1294 +#: parted/parted.c:1403 msgid "Flags" msgstr "Banderas" -#: parted/parted.c:1352 +#: parted/parted.c:1461 msgid "Free Space" msgstr "Espacio Libre" -#: parted/parted.c:1570 +#: parted/parted.c:1702 #, c-format msgid "" "A %s %s partition was found at %s -> %s. Do you want to add it to the " @@ -2699,56 +2721,56 @@ msgstr "" "Ha sido encontrada una partición %s %s en %s -> %s. ¿Quiere añadirla a la " "tabla de particiones?" -#: parted/parted.c:1613 +#: parted/parted.c:1745 msgid "searching for file systems" msgstr "buscando los sistemas de ficheros" -#: parted/parted.c:1720 +#: parted/parted.c:1852 msgid "The resize command has been removed in parted 3.0" msgstr "La orden resize fue eliminada en parted 3.0" -#: parted/parted.c:1782 +#: parted/parted.c:1914 msgid "" "Shrinking a partition can cause data loss, are you sure you want to continue?" msgstr "" "Contraer una partición puede provocar pérdida de datos, ¿realmente desea " "continuar?" -#: parted/parted.c:1838 +#: parted/parted.c:1970 msgid "New device?" msgstr "¿Nuevo dispositivo?" -#: parted/parted.c:1906 +#: parted/parted.c:2038 msgid "alignment type(min/opt)" msgstr "tipo de alineación(min/opt)" -#: parted/parted.c:1921 +#: parted/parted.c:2053 #, c-format msgid "%d aligned\n" msgstr "%d alineada\n" -#: parted/parted.c:1923 +#: parted/parted.c:2055 #, c-format msgid "%d not aligned: %s\n" msgstr "%d no alineada: %s\n" -#: parted/parted.c:1948 parted/parted.c:1985 +#: parted/parted.c:2080 parted/parted.c:2117 msgid "Flag to Invert?" msgstr "¿Bandera a Inveritr?" -#: parted/parted.c:1953 parted/parted.c:1990 +#: parted/parted.c:2085 parted/parted.c:2122 msgid "New state?" msgstr "¿Nuevo estado?" -#: parted/parted.c:2036 +#: parted/parted.c:2168 msgid "Unit?" msgstr "¿Unidad?" -#: parted/parted.c:2171 +#: parted/parted.c:2303 msgid "align-check" msgstr "align-check" -#: parted/parted.c:2174 +#: parted/parted.c:2306 msgid "" "align-check TYPE N check partition N for TYPE(min|opt) " "alignment" @@ -2756,11 +2778,11 @@ msgstr "" "align-check TIPO N revisa TIPO(min|opt) de alineación de " "partición N" -#: parted/parted.c:2182 +#: parted/parted.c:2314 msgid "help" msgstr "help" -#: parted/parted.c:2185 +#: parted/parted.c:2317 msgid "" "help [COMMAND] print general help, or help on " "COMMAND" @@ -2768,15 +2790,15 @@ msgstr "" "help [ORDEN] muestra la ayuda general, o la ayuda " "sobre la ORDEN" -#: parted/parted.c:2191 +#: parted/parted.c:2323 msgid "mklabel" msgstr "mklabel" -#: parted/parted.c:2191 +#: parted/parted.c:2323 msgid "mktable" msgstr "mktable" -#: parted/parted.c:2194 +#: parted/parted.c:2326 msgid "" "mklabel,mktable LABEL-TYPE create a new disklabel (partition " "table)" @@ -2784,15 +2806,15 @@ msgstr "" "mklabel,mktable TIPO-ETIQUETA crea una nueva etiqueta de disco (en " "la tabla de particiones)" -#: parted/parted.c:2200 +#: parted/parted.c:2332 msgid "mkpart" msgstr "mkpart" -#: parted/parted.c:2203 +#: parted/parted.c:2335 msgid "mkpart PART-TYPE [FS-TYPE] START END make a partition" msgstr "mkpart TIPO-PART [TIPO-SF] INICIO FIN crea una partición" -#: parted/parted.c:2209 +#: parted/parted.c:2341 msgid "" "'mkpart' makes a partition without creating a new file system on the " "partition. FS-TYPE may be specified to set an appropriate partition ID.\n" @@ -2800,20 +2822,20 @@ msgstr "" "'mkpart' crea una partición sin crear un nuevo sistema de ficheros en la " "partición. Puede establecer el TIPO-SF para asignar una ID de partición.\n" -#: parted/parted.c:2214 +#: parted/parted.c:2346 msgid "name" msgstr "name" -#: parted/parted.c:2217 +#: parted/parted.c:2349 msgid "name NUMBER NAME name partition NUMBER as NAME" msgstr "" "name NUMERO NOMBRE nombra la partición NUMERO como NOMBRE" -#: parted/parted.c:2222 +#: parted/parted.c:2354 msgid "print" msgstr "print" -#: parted/parted.c:2225 +#: parted/parted.c:2357 msgid "" "print [devices|free|list,all] display the partition table, or " "available devices, or free space, or all found partitions" @@ -2821,7 +2843,7 @@ msgstr "" "print [devices|free|list,all] muestra la tabla de particiones, " "dispositivos disponibles, espacio libre, o todas las particiones" -#: parted/parted.c:2229 +#: parted/parted.c:2361 msgid "" "Without arguments, 'print' displays the entire partition table. However with " "the following arguments it performs various other actions.\n" @@ -2829,11 +2851,11 @@ msgstr "" "Sin argumentos, 'print' muestra la tabla de particiones completa. Sin " "embargo, con los argumentos siguientes, realiza otras acciones.\n" -#: parted/parted.c:2231 +#: parted/parted.c:2363 msgid " devices : display all active block devices\n" msgstr " devices : muestra todos los dispositivos de bloque activos\n" -#: parted/parted.c:2232 +#: parted/parted.c:2364 msgid "" " free : display information about free unpartitioned space on the " "current block device\n" @@ -2841,26 +2863,26 @@ msgstr "" " free : muestra información acerca de espacio libre sin particionar en " "el dispositivo de bloque actual\n" -#: parted/parted.c:2234 +#: parted/parted.c:2366 msgid "" " list, all : display the partition tables of all active block devices\n" msgstr "" " list, all : muestra las tablas de particiones de todos los dispositivos de " "bloque activos\n" -#: parted/parted.c:2238 +#: parted/parted.c:2370 msgid "quit" msgstr "quit" -#: parted/parted.c:2241 +#: parted/parted.c:2373 msgid "quit exit program" msgstr "quit sale del programa" -#: parted/parted.c:2246 +#: parted/parted.c:2378 msgid "rescue" msgstr "rescue" -#: parted/parted.c:2249 +#: parted/parted.c:2381 msgid "" "rescue START END rescue a lost partition near START " "and END" @@ -2868,55 +2890,55 @@ msgstr "" "rescue INICIO FIN recupera las particiones perdidas " "entre INICIO y FIN" -#: parted/parted.c:2255 +#: parted/parted.c:2387 msgid "resize" msgstr "resize" -#: parted/parted.c:2258 +#: parted/parted.c:2390 msgid "The resize command was removed in parted 3.0\n" msgstr "La orden resize fue eliminada en parted 3.0\n" -#: parted/parted.c:2261 +#: parted/parted.c:2393 msgid "resizepart" msgstr "resizepart" -#: parted/parted.c:2264 +#: parted/parted.c:2396 msgid "resizepart NUMBER END resize partition NUMBER" msgstr "" "resizepart NUMERO FIN redimensiona la partición NUMERO" -#: parted/parted.c:2269 +#: parted/parted.c:2401 msgid "rm" msgstr "rm" -#: parted/parted.c:2272 +#: parted/parted.c:2404 msgid "rm NUMBER delete partition NUMBER" msgstr "rm NUMERO borra la partición NUMERO" -#: parted/parted.c:2277 +#: parted/parted.c:2409 msgid "select" msgstr "select" -#: parted/parted.c:2280 +#: parted/parted.c:2412 msgid "select DEVICE choose the device to edit" msgstr "select DISPOSITIVO elige el dispositivo a editar" -#: parted/parted.c:2285 +#: parted/parted.c:2417 msgid "disk_set" msgstr "disk_set" -#: parted/parted.c:2288 +#: parted/parted.c:2420 msgid "" "disk_set FLAG STATE change the FLAG on selected device" msgstr "" "disk_set BANDERA ESTADO cambia la BANDERA en el dispositivo " "seleccionado" -#: parted/parted.c:2293 +#: parted/parted.c:2425 msgid "disk_toggle" msgstr "disk_toggle" -#: parted/parted.c:2296 +#: parted/parted.c:2428 msgid "" "disk_toggle [FLAG] toggle the state of FLAG on " "selected device" @@ -2924,22 +2946,22 @@ msgstr "" "disk_toggle [BANDERA] alterna el estado de BANDERA en el " "dispositivo seleccionado" -#: parted/parted.c:2302 +#: parted/parted.c:2434 msgid "set" msgstr "set" -#: parted/parted.c:2305 +#: parted/parted.c:2437 msgid "" "set NUMBER FLAG STATE change the FLAG on partition NUMBER" msgstr "" "set NUMERO BANDERA ESTADO cambia la BANDERA de la partición " "NUMERO" -#: parted/parted.c:2311 +#: parted/parted.c:2443 msgid "toggle" msgstr "toggle" -#: parted/parted.c:2314 +#: parted/parted.c:2446 msgid "" "toggle [NUMBER [FLAG]] toggle the state of FLAG on " "partition NUMBER" @@ -2947,21 +2969,34 @@ msgstr "" "toggle [NUMERO [BANDERA]] alterna el estado de BANDERA en la " "partición NUMERO" -#: parted/parted.c:2320 +#: parted/parted.c:2452 +msgid "type" +msgstr "" + +#: parted/parted.c:2455 +#, fuzzy +msgid "" +"type NUMBER TYPE-ID or TYPE-UUID type set TYPE-ID or TYPE-UUID of " +"partition NUMBER" +msgstr "" +"mkfs NUMERO TIPO-SF crea un sistema de ficheros TIPO-SF en la " +"partición NUMERO" + +#: parted/parted.c:2460 msgid "unit" msgstr "unit" -#: parted/parted.c:2323 +#: parted/parted.c:2463 msgid "unit UNIT set the default unit to UNIT" msgstr "" "unit UNIDAD configura la unidad por defecto para " "UNIDAD" -#: parted/parted.c:2328 +#: parted/parted.c:2468 msgid "version" msgstr "version" -#: parted/parted.c:2331 +#: parted/parted.c:2471 msgid "" "version display the version number and " "copyright information of GNU Parted" @@ -2969,7 +3004,7 @@ msgstr "" "version muestra el número de versión y la " "información de copyright de GNU Parted" -#: parted/parted.c:2335 +#: parted/parted.c:2475 msgid "" "'version' displays copyright and version information corresponding to this " "copy of GNU Parted\n" @@ -2977,23 +3012,23 @@ msgstr "" "'version' muestra la información de versión y copyright de esta copia de GNU " "Parted\n" -#: parted/parted.c:2405 +#: parted/parted.c:2545 #, c-format msgid "Usage: %s [-hlmsfv] [-a<align>] [DEVICE [COMMAND [PARAMETERS]]...]\n" msgstr "" "Modo de empleo: %s [-hlmsfv] [-a<alinear>] [DISPOSITIVO [ORDEN " "[PARÁMETROS]]...]\n" -#: parted/parted.c:2449 +#: parted/parted.c:2589 msgid "No device found" msgstr "No se encontró el dispositivo" -#: parted/parted.c:2486 +#: parted/parted.c:2626 msgid "WARNING: You are not superuser. Watch out for permissions.\n" msgstr "ADVERTENCIA: Usted no es superusuario. Esté atento a los permisos.\n" # boot loader -> cargador de arranque. -#: parted/parted.c:2519 +#: parted/parted.c:2659 msgid "" "You should reinstall your boot loader before rebooting. Read section 4 of " "the Parted User documentation for more information." @@ -3001,7 +3036,7 @@ msgstr "" "Debe reinstalar su cargador de arranque antes de reiniciar. Lea la sección " "4 de la documentación del Usuario de Parted para obtener más información." -#: parted/parted.c:2526 +#: parted/parted.c:2666 msgid "You may need to update /etc/fstab.\n" msgstr "Puede que tenga que actualizar /etc/fstab.\n" @@ -3262,71 +3297,71 @@ msgstr "" "\n" "Error: Se encontró una señal general de SIGILL." -#: parted/ui.c:901 +#: parted/ui.c:904 #, c-format msgid "invalid token: %s" msgstr "token inválido: %s" -#: parted/ui.c:1082 +#: parted/ui.c:1085 msgid "Expecting a partition number." msgstr "Se esperaba un número de partición." -#: parted/ui.c:1091 +#: parted/ui.c:1094 msgid "Partition doesn't exist." msgstr "La partición no existe." -#: parted/ui.c:1111 +#: parted/ui.c:1114 msgid "Expecting a file system type." msgstr "Se esperaba un tipo de sistema de ficheros." -#: parted/ui.c:1118 +#: parted/ui.c:1121 #, c-format msgid "Unknown file system type \"%s\"." msgstr "Tipo de sistema de ficheros \"%s\" desconocido." -#: parted/ui.c:1139 +#: parted/ui.c:1142 msgid "Expecting a disk label type." msgstr "Se esperaba un tipo de etiqueta de disco." -#: parted/ui.c:1170 parted/ui.c:1206 +#: parted/ui.c:1173 parted/ui.c:1209 msgid "No flags supported" msgstr "Ninguna bandera implementada" # No se puede. -#: parted/ui.c:1280 +#: parted/ui.c:1283 msgid "Can't create any more partitions." msgstr "No se puede crear más particiones." -#: parted/ui.c:1290 +#: parted/ui.c:1293 msgid "Expecting a partition type." msgstr "Se esperaba un tipo de partición." -#: parted/ui.c:1439 +#: parted/ui.c:1442 msgid "on" msgstr "on" -#: parted/ui.c:1440 +#: parted/ui.c:1443 msgid "off" msgstr "off" -#: parted/ui.c:1457 +#: parted/ui.c:1460 msgid "optimal" msgstr "optimal" -#: parted/ui.c:1458 +#: parted/ui.c:1461 msgid "minimal" msgstr "minimal" -#: parted/ui.c:1591 +#: parted/ui.c:1594 msgid "OPTIONs:" msgstr "OPCIÓNes:" # Comando es una barbaridad. En es@li.org usamos "orden". -#: parted/ui.c:1596 +#: parted/ui.c:1599 msgid "COMMANDs:" msgstr "ORDENes:" -#: parted/ui.c:1599 +#: parted/ui.c:1602 #, c-format msgid "" "\n" @@ -3335,15 +3370,25 @@ msgstr "" "\n" "Comunicar errores a %s\n" -#: parted/ui.c:1606 +#: parted/ui.c:1609 #, c-format msgid "Using %s\n" msgstr "Usando %s\n" -#: parted/ui.c:1686 +#: parted/ui.c:1689 msgid "This command does not make sense in non-interactive mode.\n" msgstr "Esta orden no tiene sentido en modo no-interactivo.\n" +#~ msgid "Extended partitions cannot be hidden on msdos disk labels." +#~ msgstr "" +#~ "No pueden esconderse particiones extendidas en etiquetas de disco msdos." + +#~ msgid "" +#~ "Extended partitions cannot be recovery partitions on msdos disk labels." +#~ msgstr "" +#~ "Las particiones extendidas no pueden ser particiones de recuperación en " +#~ "etiquetas de disco msdos." + #~ msgid "" #~ " NUMBER : display more detailed information about this particular " #~ "partition\n" @@ -3679,13 +3724,6 @@ msgstr "Esta orden no tiene sentido en modo no-interactivo.\n" #~ msgid "mkfs" #~ msgstr "mkfs" -#~ msgid "" -#~ "mkfs NUMBER FS-TYPE make a FS-TYPE file system on partititon " -#~ "NUMBER" -#~ msgstr "" -#~ "mkfs NUMERO TIPO-SF crea un sistema de ficheros TIPO-SF en la " -#~ "partición NUMERO" - #~ msgid "mkpartfs" #~ msgstr "mkpartfs" @@ -13,7 +13,7 @@ msgid "" msgstr "" "Project-Id-Version: parted 3.3.52\n" "Report-Msgid-Bugs-To: bug-parted@gnu.org\n" -"POT-Creation-Date: 2022-04-18 14:44-0400\n" +"POT-Creation-Date: 2023-04-10 15:50-0700\n" "PO-Revision-Date: 2021-11-21 01:19+0100\n" "Last-Translator: Stéphane Aulery <lkppo@free.fr>\n" "Language-Team: French <traduc@traduc.org>\n" @@ -24,25 +24,25 @@ msgstr "" "X-Bugs: Report translation errors to the Language-Team address.\n" "X-Generator: Poedit 1.6.10\n" -#: lib/argmatch.c:147 +#: lib/argmatch.c:145 #, c-format msgid "invalid argument %s for %s" msgstr "argument non valide %s pour %s" -#: lib/argmatch.c:148 +#: lib/argmatch.c:146 #, c-format msgid "ambiguous argument %s for %s" msgstr "argument ambigu %s pour %s" -#: lib/argmatch.c:167 lib/argmatch.h:238 +#: lib/argmatch.c:165 lib/argmatch.h:237 msgid "Valid arguments are:" msgstr "Arguments valides :" -#: lib/closeout.c:122 libparted/labels/fdasd.c:145 +#: lib/closeout.c:121 libparted/labels/fdasd.c:145 msgid "write error" msgstr "erreur d’écriture" -#: lib/error.c:195 +#: lib/error.c:193 msgid "Unknown system error" msgstr "Erreur système inconnue" @@ -102,11 +102,11 @@ msgstr "%s : cette option requiert un argument -- « %c »\n" #. If you don't know what to put here, please see #. <https://en.wikipedia.org/wiki/Quotation_marks_in_other_languages> #. and use glyphs suitable for your language. -#: lib/quotearg.c:355 +#: lib/quotearg.c:354 msgid "`" msgstr "«" -#: lib/quotearg.c:356 +#: lib/quotearg.c:355 msgid "'" msgstr "»" @@ -188,7 +188,7 @@ msgstr "Pas d’expression régulière précédente" #. To enquire the regular expression that your system uses for this #. purpose, you can use the command #. locale -k LC_MESSAGES | grep '^yesexpr=' -#: lib/rpmatch.c:150 +#: lib/rpmatch.c:149 msgid "^[yY]" msgstr "^[oO]" @@ -198,7 +198,7 @@ msgstr "^[oO]" #. To enquire the regular expression that your system uses for this #. purpose, you can use the command #. locale -k LC_MESSAGES | grep '^noexpr=' -#: lib/rpmatch.c:163 +#: lib/rpmatch.c:162 msgid "^[nN]" msgstr "^[nN]" @@ -754,25 +754,25 @@ msgstr "pmbr_boot" msgid "Unknown disk flag, %d." msgstr "Drapeau de partition inconnu, %d." -#: libparted/disk.c:1289 +#: libparted/disk.c:1320 #, c-format msgid "%s disk labels do not support extended partitions." msgstr "" "Les étiquettes du disque %s ne prennent pas en charge les partitions " "étendues." -#: libparted/disk.c:1821 +#: libparted/disk.c:1990 #, c-format msgid "%s disk labels don't support logical or extended partitions." msgstr "" "Les étiquettes du disque %s ne prennent pas en charge les partitions " "logiques ou étendues." -#: libparted/disk.c:1834 +#: libparted/disk.c:2003 msgid "Too many primary partitions." msgstr "Trop de partitions primaires." -#: libparted/disk.c:1843 +#: libparted/disk.c:2012 #, c-format msgid "" "Can't add a logical partition to %s, because there is no extended partition." @@ -780,142 +780,146 @@ msgstr "" "Impossible d’ajouter une partition logique sur %s parce qu’il n’y a pas de " "partition étendue." -#: libparted/disk.c:1867 +#: libparted/disk.c:2036 #, c-format msgid "Can't have more than one extended partition on %s." msgstr "Impossible d’avoir plus d’une partition étendue sur %s" -#: libparted/disk.c:1877 +#: libparted/disk.c:2046 msgid "Can't have logical partitions outside of the extended partition." msgstr "" "Impossible d’avoir des partitions logiques en dehors de la partition étendue." -#: libparted/disk.c:1902 +#: libparted/disk.c:2071 #, c-format msgid "Can't have a logical partition outside of the extended partition on %s." msgstr "" "Impossible d’avoir une partition logique en dehors de la partition étendue " "sur %s." -#: libparted/disk.c:1912 +#: libparted/disk.c:2081 msgid "Can't have a primary partition inside an extended partition." msgstr "" "Impossible d’avoir une partition primaire à l’intérieur d’une partition " "étendue." -#: libparted/disk.c:1921 +#: libparted/disk.c:2090 msgid "Can't have a partition outside the disk!" msgstr "Impossible d’avoir une partition en dehors du disque !" -#: libparted/disk.c:1972 libparted/disk.c:2150 +#: libparted/disk.c:2141 libparted/disk.c:2319 msgid "Can't have overlapping partitions." msgstr "Impossible d’avoir des partitions qui se chevauchent." -#: libparted/disk.c:2351 +#: libparted/disk.c:2520 msgid "metadata" msgstr "méta-données" -#: libparted/disk.c:2353 +#: libparted/disk.c:2522 msgid "free" msgstr "libre" -#: libparted/disk.c:2355 parted/ui.c:1271 parted/ui.c:1299 +#: libparted/disk.c:2524 parted/ui.c:1274 parted/ui.c:1302 msgid "extended" msgstr "étendue" -#: libparted/disk.c:2357 parted/ui.c:1275 parted/ui.c:1303 +#: libparted/disk.c:2526 parted/ui.c:1278 parted/ui.c:1306 msgid "logical" msgstr "logique" -#: libparted/disk.c:2359 parted/ui.c:1267 parted/ui.c:1295 +#: libparted/disk.c:2528 parted/ui.c:1270 parted/ui.c:1298 msgid "primary" msgstr "primaire" -#: libparted/disk.c:2375 +#: libparted/disk.c:2544 msgid "boot" msgstr "démarrage" -#: libparted/disk.c:2377 +#: libparted/disk.c:2546 msgid "bios_grub" msgstr "bios_grub" -#: libparted/disk.c:2379 +#: libparted/disk.c:2548 msgid "root" msgstr "racine" -#: libparted/disk.c:2381 +#: libparted/disk.c:2550 msgid "swap" msgstr "swap" -#: libparted/disk.c:2383 +#: libparted/disk.c:2552 msgid "hidden" msgstr "caché" -#: libparted/disk.c:2385 +#: libparted/disk.c:2554 msgid "raid" msgstr "raid" -#: libparted/disk.c:2387 +#: libparted/disk.c:2556 msgid "lvm" msgstr "lvm" -#: libparted/disk.c:2389 +#: libparted/disk.c:2558 msgid "lba" msgstr "lba" -#: libparted/disk.c:2391 +#: libparted/disk.c:2560 msgid "hp-service" msgstr "hp-service" -#: libparted/disk.c:2393 +#: libparted/disk.c:2562 msgid "palo" msgstr "palo" -#: libparted/disk.c:2395 +#: libparted/disk.c:2564 msgid "prep" msgstr "prep" -#: libparted/disk.c:2397 +#: libparted/disk.c:2566 msgid "msftres" msgstr "msftres" -#: libparted/disk.c:2399 +#: libparted/disk.c:2568 msgid "msftdata" msgstr "msftdata" -#: libparted/disk.c:2401 +#: libparted/disk.c:2570 msgid "atvrecv" msgstr "atvrecv" -#: libparted/disk.c:2403 +#: libparted/disk.c:2572 msgid "diag" msgstr "diag" -#: libparted/disk.c:2405 +#: libparted/disk.c:2574 msgid "legacy_boot" msgstr "legacy_boot" -#: libparted/disk.c:2407 +#: libparted/disk.c:2576 msgid "irst" msgstr "irst" -#: libparted/disk.c:2409 +#: libparted/disk.c:2578 msgid "esp" msgstr "esp" -#: libparted/disk.c:2411 +#: libparted/disk.c:2580 msgid "chromeos_kernel" msgstr "" -#: libparted/disk.c:2413 +#: libparted/disk.c:2582 msgid "bls_boot" msgstr "bls_boot" -#: libparted/disk.c:2415 +#: libparted/disk.c:2584 msgid "linux-home" msgstr "" -#: libparted/disk.c:2421 +#: libparted/disk.c:2586 +msgid "no_automount" +msgstr "" + +#: libparted/disk.c:2592 #, c-format msgid "Unknown partition flag, %d." msgstr "Drapeau de partition inconnu, %d." @@ -1111,8 +1115,8 @@ msgid "" msgstr "" #: libparted/labels/atari.c:1662 libparted/labels/bsd.c:563 -#: libparted/labels/dasd.c:895 libparted/labels/dos.c:2303 -#: libparted/labels/dvh.c:770 libparted/labels/gpt.c:1769 +#: libparted/labels/dasd.c:893 libparted/labels/dos.c:2294 +#: libparted/labels/dvh.c:770 libparted/labels/gpt.c:1891 #: libparted/labels/loop.c:244 libparted/labels/mac.c:1409 #: libparted/labels/pc98.c:697 libparted/labels/rdb.c:1054 #: libparted/labels/sun.c:781 @@ -1134,42 +1138,30 @@ msgstr "Impossible d’allouer un numéro de partition." msgid "Unable to allocate a bsd disklabel slot." msgstr "Impossible d’allouer l’entrée d’une étiquette de disque BSD." -#: libparted/labels/dasd.c:626 +#: libparted/labels/dasd.c:634 msgid "The partition table of DASD-LDL device cannot be changed.\n" msgstr "" -#: libparted/labels/dasd.c:921 +#: libparted/labels/dasd.c:919 msgid "Unable to allocate a dasd disklabel slot" msgstr "Impossible d’allouer l’entrée d’une étiquette de disque DASD." -#: libparted/labels/dos.c:1008 +#: libparted/labels/dos.c:1159 #, c-format msgid "Invalid partition table on %s -- wrong signature %x." msgstr "Table de partition invalide sur %s - signature erronée %x." -#: libparted/labels/dos.c:1036 +#: libparted/labels/dos.c:1187 #, c-format msgid "Invalid partition table - recursive partition on %s." msgstr "Table de partition invalide - partition récursive sur %s." -#: libparted/labels/dos.c:1567 -msgid "Extended partitions cannot be hidden on msdos disk labels." -msgstr "" -"Les partitions étendues ne peuvent être cachées sur les disques étiquetés MS-" -"DOS." - -#: libparted/labels/dos.c:1579 -msgid "Extended partitions cannot be recovery partitions on msdos disk labels." -msgstr "" -"Les partitions étendues ne peuvent être récupérés sur les disques étiquetés " -"MS-DOS." - -#: libparted/labels/dos.c:2285 +#: libparted/labels/dos.c:2276 msgid "Parted can't resize partitions managed by Windows Dynamic Disk." msgstr "" "Parted ne peut redimensionner les partitions gérées par Windows Dynamic Disk." -#: libparted/labels/dos.c:2541 +#: libparted/labels/dos.c:2532 msgid "cannot create any more partitions" msgstr "impossible de créer davantage de partitions" @@ -1313,11 +1305,11 @@ msgstr "Impossible de trouver la taille de bloc." msgid "Disk geometry does not match a DASD device of type 3390." msgstr "" -#: libparted/labels/gpt.c:569 +#: libparted/labels/gpt.c:589 msgid "device is too small for GPT" msgstr "périphérique trop petit pour GPT" -#: libparted/labels/gpt.c:771 +#: libparted/labels/gpt.c:791 #, c-format msgid "" "The format of the GPT partition table is version %x, which is newer than " @@ -1326,7 +1318,7 @@ msgstr "" "Le format de la table de partitions GPT est de version %x, ce qui est plus " "récent que ce que Parted peut reconnaître. SVP prévenez-nous !" -#: libparted/labels/gpt.c:807 +#: libparted/labels/gpt.c:827 #, c-format msgid "" "Not all of the space available to %s appears to be used, you can fix the GPT " @@ -1337,7 +1329,7 @@ msgstr "" "voulez-vous ajuster la table GPT pour utiliser tout l’espace (%llu blocs en " "plus) ou continuer ainsi ?" -#: libparted/labels/gpt.c:1006 +#: libparted/labels/gpt.c:1026 msgid "" "The backup GPT table is not at the end of the disk, as it should be. Fix, " "by moving the backup to the end (and removing the old backup)?" @@ -1346,7 +1338,7 @@ msgstr "" "devrait. Faut-il corriger en déplaçant la copie à la fin du disque (et " "enlever la vieille sauvegarde) ?" -#: libparted/labels/gpt.c:1024 +#: libparted/labels/gpt.c:1044 msgid "" "Both the primary and backup GPT tables are corrupt. Try making a fresh " "table, and using Parted's rescue feature to recover partitions." @@ -1355,7 +1347,7 @@ msgstr "" "les deux. Essayer d’écrire une nouvelle table et d’utiliser le mode de " "secours de Parted pour récupérer les partitions." -#: libparted/labels/gpt.c:1035 +#: libparted/labels/gpt.c:1055 msgid "" "The backup GPT table is corrupt, but the primary appears OK, so that will be " "used." @@ -1363,7 +1355,7 @@ msgstr "" "La sauvegarde de table GPT est corrompue mais l’originale semble valide et " "sera donc utilisée." -#: libparted/labels/gpt.c:1047 +#: libparted/labels/gpt.c:1067 msgid "" "The primary GPT table is corrupt, but the backup appears OK, so that will be " "used." @@ -1371,11 +1363,11 @@ msgstr "" "La table primaire GPT est corrompue mais sa sauvegarde semble valide, elle " "sera donc utilisée." -#: libparted/labels/gpt.c:1071 +#: libparted/labels/gpt.c:1091 msgid "primary partition table array CRC mismatch" msgstr "erreur CRC sur la table primaire de partitions" -#: libparted/labels/gpt.c:1655 libparted/labels/gpt.c:1682 +#: libparted/labels/gpt.c:1722 libparted/labels/gpt.c:1749 msgid "failed to translate partition name" msgstr "échec de traduction du nom de partition" @@ -2084,7 +2076,7 @@ msgstr "fat_table_alloc_cluster : pas de cluster disponible" msgid "Could not detect file system." msgstr "Impossible de détecter le système de fichiers." -#: libparted/fs/r/filesys.c:159 libparted/fs/r/filesys.c:284 +#: libparted/fs/r/filesys.c:159 libparted/fs/r/filesys.c:285 #, c-format msgid "resizing %s file systems is not supported" msgstr "" @@ -2401,40 +2393,40 @@ msgstr "" "Ce volume HFS+ n’a pas de fichier de zones additionnelles. C’est plutôt " "inhabituel !" -#: parted/parted.c:137 +#: parted/parted.c:138 msgid "displays this help message" msgstr "affiche ce message d’aide" -#: parted/parted.c:138 +#: parted/parted.c:139 msgid "lists partition layout on all block devices" msgstr "liste la structure des partitions sur tous les périphériques par blocs" -#: parted/parted.c:139 +#: parted/parted.c:140 msgid "displays machine parseable output" msgstr "sortie dans un style lisible par une machine" -#: parted/parted.c:140 +#: parted/parted.c:141 #, fuzzy msgid "displays JSON output" msgstr "sortie dans un style lisible par une machine" -#: parted/parted.c:141 +#: parted/parted.c:142 msgid "never prompts for user intervention" msgstr "ne demande jamais l’intervention de l’utilisateur" -#: parted/parted.c:142 +#: parted/parted.c:143 msgid "in script mode, fix instead of abort when asked" msgstr "" -#: parted/parted.c:143 +#: parted/parted.c:144 msgid "displays the version" msgstr "affiche la version" -#: parted/parted.c:144 +#: parted/parted.c:145 msgid "alignment for new partitions" msgstr "alignement des nouvelles partitions" -#: parted/parted.c:157 +#: parted/parted.c:158 msgid "" "NUMBER is the partition number used by Linux. On MS-DOS disk labels, the " "primary partitions number from 1 to 4, logical partitions from 5 onwards.\n" @@ -2443,31 +2435,31 @@ msgstr "" "disque MS-DOS, les partitions primaires sont numérotées de 1 à 4 et les " "partitions logiques à partir de 5.\n" -#: parted/parted.c:160 +#: parted/parted.c:161 msgid "LABEL-TYPE is one of: " msgstr "LABEL-TYPE est une des valeurs : " -#: parted/parted.c:161 parted/parted.c:162 +#: parted/parted.c:162 parted/parted.c:163 msgid "FLAG is one of: " msgstr "DRAPEAU est une des valeurs : " -#: parted/parted.c:163 +#: parted/parted.c:164 msgid "UNIT is one of: " msgstr "UNITÉ est parmi : " -#: parted/parted.c:164 +#: parted/parted.c:165 msgid "desired alignment: minimum or optimal" msgstr "alignement souhaité : minimum ou optimal" -#: parted/parted.c:165 +#: parted/parted.c:166 msgid "PART-TYPE is one of: primary, logical, extended\n" msgstr "PART-TYPE est une des valeurs : primaire, logique, étendue\n" -#: parted/parted.c:167 +#: parted/parted.c:168 msgid "FS-TYPE is one of: " msgstr "FS-TYPE est parmi : " -#: parted/parted.c:168 +#: parted/parted.c:169 msgid "" "START and END are disk locations, such as 4GB or 10%. Negative values count " "from the end of the disk. For example, -1s specifies exactly the last " @@ -2477,7 +2469,7 @@ msgstr "" "valeurs négatives se comptent à partir de la fin du disque. Par exemple, " "=-1s spécifie précisément le dernier secteur.\n" -#: parted/parted.c:171 +#: parted/parted.c:172 msgid "" "END is disk location, such as 4GB or 10%. Negative value counts from the " "end of the disk. For example, -1s specifies exactly the last sector.\n" @@ -2486,19 +2478,23 @@ msgstr "" "se compte à partir de la fin du disque. Par exemple, -1s spécifie " "précisément le dernier secteur.\n" -#: parted/parted.c:174 +#: parted/parted.c:175 msgid "STATE is one of: on, off\n" msgstr "ÉTAT est une des valeurs : on, off\n" -#: parted/parted.c:175 +#: parted/parted.c:176 msgid "DEVICE is usually /dev/hda or /dev/sda\n" msgstr "PÉRIPHÉRIQUE est habituellement du genre /dev/hda ou /dev/sda\n" -#: parted/parted.c:176 +#: parted/parted.c:177 msgid "NAME is any word you want\n" msgstr "NOM est un mot de votre choix\n" -#: parted/parted.c:179 +#: parted/parted.c:178 +msgid "TYPE_ID is a value between 0x01 and 0xff, TYPE_UUID is a UUID\n" +msgstr "" + +#: parted/parted.c:182 msgid "" "Copyright (C) 1998 - 2006 Free Software Foundation, Inc.\n" "This program is free software, covered by the GNU General Public License.\n" @@ -2518,24 +2514,24 @@ msgstr "" "GNU pour plus de détails.\n" "\n" -#: parted/parted.c:229 +#: parted/parted.c:232 #, c-format msgid "%0.f%%\t(time left %.2d:%.2d)" msgstr "%0.f%%\t(temps restant %.2d:%.2d)" -#: parted/parted.c:248 +#: parted/parted.c:251 #, c-format msgid "Partition %s is being used. Are you sure you want to continue?" msgstr "" "La partition %s est en cours d’utilisation. Êtes vous certain de vouloir " "continuer ?" -#: parted/parted.c:269 +#: parted/parted.c:272 #, c-format msgid "Partition(s) on %s are being used." msgstr "Au moins une partition de %s est en cours d’utilisation." -#: parted/parted.c:281 +#: parted/parted.c:284 #, c-format msgid "" "The existing disk label on %s will be destroyed and all data on this disk " @@ -2544,31 +2540,31 @@ msgstr "" "Le type du disque %s va être effacé et toutes les données vont être perdues. " "Voulez-vous continuer ?" -#: parted/parted.c:542 +#: parted/parted.c:545 msgid "New disk label type?" msgstr "Nouveau type d’étiquette de disque ?" -#: parted/parted.c:680 +#: parted/parted.c:692 msgid "Partition type?" msgstr "Type de partition ?" -#: parted/parted.c:698 parted/parted.c:902 +#: parted/parted.c:710 parted/parted.c:914 msgid "Partition name?" msgstr "Nom de la partition ?" -#: parted/parted.c:708 +#: parted/parted.c:720 msgid "File system type?" msgstr "Type de système de fichiers ?" -#: parted/parted.c:713 parted/parted.c:1683 +#: parted/parted.c:725 parted/parted.c:1815 msgid "Start?" msgstr "Début ?" -#: parted/parted.c:715 parted/parted.c:1685 parted/parted.c:1768 +#: parted/parted.c:727 parted/parted.c:1817 parted/parted.c:1900 msgid "End?" msgstr "Fin ?" -#: parted/parted.c:782 +#: parted/parted.c:794 #, c-format msgid "" "You requested a partition from %s to %s (sectors %llu..%llu).\n" @@ -2577,7 +2573,7 @@ msgstr "" "Vous voulez établir une partition de %s à %s (secteurs %llu..%llu).\n" "La position la plus proche gérable est %s à %s (secteurs %llu..%llu). %s" -#: parted/parted.c:791 +#: parted/parted.c:803 msgid "" "\n" "Is this still acceptable to you?" @@ -2585,7 +2581,7 @@ msgstr "" "\n" "Est-ce acceptable pour vous ?" -#: parted/parted.c:814 +#: parted/parted.c:826 #, c-format msgid "" "The resulting partition is not properly aligned for best performance: %s" @@ -2593,89 +2589,115 @@ msgstr "" "L’alignement de la partition ainsi définie n’est pas optimal au niveau " "performance : %s" -#: parted/parted.c:816 parted/parted.c:1925 +#: parted/parted.c:828 parted/parted.c:2057 msgid "unknown (malloc failed)" msgstr "" -#: parted/parted.c:894 +#: parted/parted.c:906 #, c-format msgid "%s disk labels do not support partition name." msgstr "" "Les étiquettes du disque %s ne prennent pas en charge les noms de partition." -#: parted/parted.c:899 parted/parted.c:1748 parted/parted.c:1814 -#: parted/parted.c:1908 parted/parted.c:1983 +#: parted/parted.c:911 parted/parted.c:955 parted/parted.c:1880 +#: parted/parted.c:1946 parted/parted.c:2040 parted/parted.c:2115 msgid "Partition number?" msgstr "Numéro de partition ?" -#: parted/parted.c:1050 +#: parted/parted.c:949 +#, fuzzy, c-format +msgid "%s disk labels do not support partition type." +msgstr "" +"Les étiquettes du disque %s ne prennent pas en charge les noms de partition." + +#: parted/parted.c:965 +#, fuzzy +msgid "Partition type-id?" +msgstr "Type de partition ?" + +#: parted/parted.c:972 +#, fuzzy +msgid "Invalid type-id." +msgstr "Nombre invalide." + +#: parted/parted.c:986 +#, fuzzy +msgid "Partition type-uuid?" +msgstr "Type de partition ?" + +#: parted/parted.c:993 +#, fuzzy +msgid "Invalid type-uuid." +msgstr "Nombre invalide." + +#: parted/parted.c:1146 #, c-format msgid "BIOS cylinder,head,sector geometry: %d,%d,%d. Each cylinder is %s.\n" msgstr "" "Géométrie BIOS cylindre,tête,secteur : %d,%d,%d. Chaque cylindre : %s.\n" -#: parted/parted.c:1137 +#: parted/parted.c:1240 #, c-format msgid "Model: %s (%s)\n" msgstr "Modèle : %s (%s)\n" -#: parted/parted.c:1139 +#: parted/parted.c:1242 #, c-format msgid "Disk %s: %s\n" msgstr "Disque %s : %s\n" -#: parted/parted.c:1140 +#: parted/parted.c:1243 #, c-format msgid "Sector size (logical/physical): %lldB/%lldB\n" msgstr "Taille des secteurs (logiques/physiques) : %lldB/%lldB\n" -#: parted/parted.c:1152 +#: parted/parted.c:1255 #, c-format msgid "Partition Table: %s\n" msgstr "Table de partitions : %s\n" -#: parted/parted.c:1153 +#: parted/parted.c:1256 #, c-format msgid "Disk Flags: %s\n" msgstr "Drapeaux de disque : %s\n" -#: parted/parted.c:1279 parted/parted.c:1282 +#: parted/parted.c:1388 parted/parted.c:1391 msgid "Number" msgstr "Numéro" -#: parted/parted.c:1279 parted/parted.c:1282 +#: parted/parted.c:1388 parted/parted.c:1391 msgid "Start" msgstr "Début" -#: parted/parted.c:1280 parted/parted.c:1283 +#: parted/parted.c:1389 parted/parted.c:1392 msgid "End" msgstr "Fin" -#: parted/parted.c:1283 +#: parted/parted.c:1392 msgid "Size" msgstr "Taille" -#: parted/parted.c:1287 +#: parted/parted.c:1396 msgid "Type" msgstr "Type" -#: parted/parted.c:1289 +#: parted/parted.c:1398 msgid "File system" msgstr "Système de fichiers" -#: parted/parted.c:1292 +#: parted/parted.c:1401 msgid "Name" msgstr "Nom" -#: parted/parted.c:1294 +#: parted/parted.c:1403 msgid "Flags" msgstr "Drapeaux" -#: parted/parted.c:1352 +#: parted/parted.c:1461 msgid "Free Space" msgstr "Espace libre" -#: parted/parted.c:1570 +#: parted/parted.c:1702 #, c-format msgid "" "A %s %s partition was found at %s -> %s. Do you want to add it to the " @@ -2684,56 +2706,56 @@ msgstr "" "Une partition %s %s a été localisée de %s à %s. Voulez-vous l’ajouter à la " "table de partition ?" -#: parted/parted.c:1613 +#: parted/parted.c:1745 msgid "searching for file systems" msgstr "recherche des systèmes de fichiers" -#: parted/parted.c:1720 +#: parted/parted.c:1852 msgid "The resize command has been removed in parted 3.0" msgstr "La commande de redimensionnement a été supprimer dans Parted 3.0" -#: parted/parted.c:1782 +#: parted/parted.c:1914 msgid "" "Shrinking a partition can cause data loss, are you sure you want to continue?" msgstr "" "Réduire une partition peut causer une perte de données ; Êtes vous certain " "de vouloir continuer ?" -#: parted/parted.c:1838 +#: parted/parted.c:1970 msgid "New device?" msgstr "Nouveau périphérique ?" -#: parted/parted.c:1906 +#: parted/parted.c:2038 msgid "alignment type(min/opt)" msgstr "type d’alignement (min/opt)" -#: parted/parted.c:1921 +#: parted/parted.c:2053 #, c-format msgid "%d aligned\n" msgstr "%d aligné(es)\n" -#: parted/parted.c:1923 +#: parted/parted.c:2055 #, c-format msgid "%d not aligned: %s\n" msgstr "%d non aligné(es) : %s\n" -#: parted/parted.c:1948 parted/parted.c:1985 +#: parted/parted.c:2080 parted/parted.c:2117 msgid "Flag to Invert?" msgstr "Drapeaux à basculer ?" -#: parted/parted.c:1953 parted/parted.c:1990 +#: parted/parted.c:2085 parted/parted.c:2122 msgid "New state?" msgstr "Nouvel état ?" -#: parted/parted.c:2036 +#: parted/parted.c:2168 msgid "Unit?" msgstr "Unité ?" -#: parted/parted.c:2171 +#: parted/parted.c:2303 msgid "align-check" msgstr "vérifier-align" -#: parted/parted.c:2174 +#: parted/parted.c:2306 msgid "" "align-check TYPE N check partition N for TYPE(min|opt) " "alignment" @@ -2741,11 +2763,11 @@ msgstr "" "vérifier-align TYPE N contrôle l’alignement de TYPE(min|" "opt) de la partition N" -#: parted/parted.c:2182 +#: parted/parted.c:2314 msgid "help" msgstr "aide" -#: parted/parted.c:2185 +#: parted/parted.c:2317 msgid "" "help [COMMAND] print general help, or help on " "COMMAND" @@ -2753,15 +2775,15 @@ msgstr "" "help [COMMANDE] affiche l’aide générale ou l’aide " "concernant la COMMANDE" -#: parted/parted.c:2191 +#: parted/parted.c:2323 msgid "mklabel" msgstr "mklabel" -#: parted/parted.c:2191 +#: parted/parted.c:2323 msgid "mktable" msgstr "mktable" -#: parted/parted.c:2194 +#: parted/parted.c:2326 msgid "" "mklabel,mktable LABEL-TYPE create a new disklabel (partition " "table)" @@ -2769,15 +2791,15 @@ msgstr "" "mklabel,mktable LABEL-TYPE crée une nouvelle étiquette de " "disque (table de partition)" -#: parted/parted.c:2200 +#: parted/parted.c:2332 msgid "mkpart" msgstr "mkpart" -#: parted/parted.c:2203 +#: parted/parted.c:2335 msgid "mkpart PART-TYPE [FS-TYPE] START END make a partition" msgstr "mkpart PART-TYPE [FS-TYPE] DEBUT FIN créer une partition" -#: parted/parted.c:2209 +#: parted/parted.c:2341 msgid "" "'mkpart' makes a partition without creating a new file system on the " "partition. FS-TYPE may be specified to set an appropriate partition ID.\n" @@ -2786,20 +2808,20 @@ msgstr "" "la partition. FS-TYPE doit être spécifié pour initialiser le type de " "partition approprié.\n" -#: parted/parted.c:2214 +#: parted/parted.c:2346 msgid "name" msgstr "nommer" -#: parted/parted.c:2217 +#: parted/parted.c:2349 msgid "name NUMBER NAME name partition NUMBER as NAME" msgstr "" "name NUMÉRO NOM donner un NOM à la partition NUMÉRO" -#: parted/parted.c:2222 +#: parted/parted.c:2354 msgid "print" msgstr "afficher" -#: parted/parted.c:2225 +#: parted/parted.c:2357 #, fuzzy msgid "" "print [devices|free|list,all] display the partition table, or " @@ -2809,7 +2831,7 @@ msgstr "" "les périphériques disponibles, l’espace libre, toutes les partitions ou une " "partition précise" -#: parted/parted.c:2229 +#: parted/parted.c:2361 msgid "" "Without arguments, 'print' displays the entire partition table. However with " "the following arguments it performs various other actions.\n" @@ -2817,11 +2839,11 @@ msgstr "" "Sans argument, « print » affiche toute la table de partitions. Toutefois " "avec les arguments suivants, elle permet bien d’autres actions.\n" -#: parted/parted.c:2231 +#: parted/parted.c:2363 msgid " devices : display all active block devices\n" msgstr " devices : affiche tous les périphériques par blocs actifs\n" -#: parted/parted.c:2232 +#: parted/parted.c:2364 msgid "" " free : display information about free unpartitioned space on the " "current block device\n" @@ -2829,26 +2851,26 @@ msgstr "" " free : affiche l’information sur l’espace libre non partitionné du " "périphérique courant\n" -#: parted/parted.c:2234 +#: parted/parted.c:2366 msgid "" " list, all : display the partition tables of all active block devices\n" msgstr "" " list,all : afficher la table de partitions de tous les périphériques par " "blocs actifs\n" -#: parted/parted.c:2238 +#: parted/parted.c:2370 msgid "quit" msgstr "quitter" -#: parted/parted.c:2241 +#: parted/parted.c:2373 msgid "quit exit program" msgstr "quit quitter le programme" -#: parted/parted.c:2246 +#: parted/parted.c:2378 msgid "rescue" msgstr "rescue" -#: parted/parted.c:2249 +#: parted/parted.c:2381 msgid "" "rescue START END rescue a lost partition near START " "and END" @@ -2856,55 +2878,55 @@ msgstr "" "rescue DEBUT FIN restaurer une partition perdue " "entre DEBUT et FIN" -#: parted/parted.c:2255 +#: parted/parted.c:2387 msgid "resize" msgstr "redimentionner" -#: parted/parted.c:2258 +#: parted/parted.c:2390 msgid "The resize command was removed in parted 3.0\n" msgstr "La commande de redimensionnement a été supprimée dans Parted 3.0\n" -#: parted/parted.c:2261 +#: parted/parted.c:2393 msgid "resizepart" msgstr "redimpart" -#: parted/parted.c:2264 +#: parted/parted.c:2396 msgid "resizepart NUMBER END resize partition NUMBER" msgstr "redimpart NUMÉRO FIN redim partition NUMÉRO" -#: parted/parted.c:2269 +#: parted/parted.c:2401 msgid "rm" msgstr "rm" -#: parted/parted.c:2272 +#: parted/parted.c:2404 msgid "rm NUMBER delete partition NUMBER" msgstr "rm NUMÉRO détruire partition NUMÉRO" -#: parted/parted.c:2277 +#: parted/parted.c:2409 msgid "select" msgstr "sélectionner" -#: parted/parted.c:2280 +#: parted/parted.c:2412 msgid "select DEVICE choose the device to edit" msgstr "" "choisir PÉRIPHÉRIQUE choisir le périphérique à modifier" -#: parted/parted.c:2285 +#: parted/parted.c:2417 msgid "disk_set" msgstr "disque_choix" -#: parted/parted.c:2288 +#: parted/parted.c:2420 msgid "" "disk_set FLAG STATE change the FLAG on selected device" msgstr "" "disque_choix DRAPEAU ÉTAT modifier le DRAPEAU du périphérique " "choisi" -#: parted/parted.c:2293 +#: parted/parted.c:2425 msgid "disk_toggle" msgstr "disque_basculer" -#: parted/parted.c:2296 +#: parted/parted.c:2428 msgid "" "disk_toggle [FLAG] toggle the state of FLAG on " "selected device" @@ -2912,22 +2934,22 @@ msgstr "" "disque_basculer [DRAPEAU] basculer l’état du drapeau du " "périphérique choisi" -#: parted/parted.c:2302 +#: parted/parted.c:2434 msgid "set" msgstr "positionner" -#: parted/parted.c:2305 +#: parted/parted.c:2437 msgid "" "set NUMBER FLAG STATE change the FLAG on partition NUMBER" msgstr "" "set NUMÉRO DRAPEAU ÉTAT modifier le DRAPEAU de la partition " "NUMÉRO" -#: parted/parted.c:2311 +#: parted/parted.c:2443 msgid "toggle" msgstr "basculer" -#: parted/parted.c:2314 +#: parted/parted.c:2446 msgid "" "toggle [NUMBER [FLAG]] toggle the state of FLAG on " "partition NUMBER" @@ -2935,20 +2957,30 @@ msgstr "" "basculer [NUMÉRO [DRAPEAU]] basculer l’état du DRAPEAU de la " "partition NUMÉRO" -#: parted/parted.c:2320 +#: parted/parted.c:2452 +msgid "type" +msgstr "" + +#: parted/parted.c:2455 +msgid "" +"type NUMBER TYPE-ID or TYPE-UUID type set TYPE-ID or TYPE-UUID of " +"partition NUMBER" +msgstr "" + +#: parted/parted.c:2460 msgid "unit" msgstr "unité" -#: parted/parted.c:2323 +#: parted/parted.c:2463 msgid "unit UNIT set the default unit to UNIT" msgstr "" "unité UNITÉ définie l’unité par défaut à UNITÉ" -#: parted/parted.c:2328 +#: parted/parted.c:2468 msgid "version" msgstr "version" -#: parted/parted.c:2331 +#: parted/parted.c:2471 msgid "" "version display the version number and " "copyright information of GNU Parted" @@ -2956,30 +2988,30 @@ msgstr "" "version affiche la version courante de GNU " "Parted ainsi que l’information sur le copyright" -#: parted/parted.c:2335 +#: parted/parted.c:2475 msgid "" "'version' displays copyright and version information corresponding to this " "copy of GNU Parted\n" msgstr "" "« version » affiche le copyright et la version de cette copie de GNU Parted\n" -#: parted/parted.c:2405 +#: parted/parted.c:2545 #, fuzzy, c-format msgid "Usage: %s [-hlmsfv] [-a<align>] [DEVICE [COMMAND [PARAMETERS]]...]\n" msgstr "" "Usage : %s [-hlmsv] [-a <alignement>] [PÉRIPHÉRIQUE [COMMANDE " "[PARAMÈTRES]]…]\n" -#: parted/parted.c:2449 +#: parted/parted.c:2589 msgid "No device found" msgstr "Aucun périphérique trouvé" -#: parted/parted.c:2486 +#: parted/parted.c:2626 msgid "WARNING: You are not superuser. Watch out for permissions.\n" msgstr "" "ATTENTION : vous n’êtes pas superutilisateur. Contrôlez les permissions.\n" -#: parted/parted.c:2519 +#: parted/parted.c:2659 msgid "" "You should reinstall your boot loader before rebooting. Read section 4 of " "the Parted User documentation for more information." @@ -2988,7 +3020,7 @@ msgstr "" "Consultez la section 4 de la documentation utilisateur de Parted pour plus " "d’informations." -#: parted/parted.c:2526 +#: parted/parted.c:2666 msgid "You may need to update /etc/fstab.\n" msgstr "Ne pas oublier de mettre à jour /etc/fstab si nécessaire.\n" @@ -3248,69 +3280,69 @@ msgstr "" "\n" "Erreur : un signal SIGILL général est survenu." -#: parted/ui.c:901 +#: parted/ui.c:904 #, c-format msgid "invalid token: %s" msgstr "élément incorrect : %s" -#: parted/ui.c:1082 +#: parted/ui.c:1085 msgid "Expecting a partition number." msgstr "Numéro de partition attendu." -#: parted/ui.c:1091 +#: parted/ui.c:1094 msgid "Partition doesn't exist." msgstr "La partition n’existe pas." -#: parted/ui.c:1111 +#: parted/ui.c:1114 msgid "Expecting a file system type." msgstr "Type de système de fichiers attendu." -#: parted/ui.c:1118 +#: parted/ui.c:1121 #, c-format msgid "Unknown file system type \"%s\"." msgstr "Type de système de fichiers inconnu « %s »." -#: parted/ui.c:1139 +#: parted/ui.c:1142 msgid "Expecting a disk label type." msgstr "Type d’étiquette de disque attendu." -#: parted/ui.c:1170 parted/ui.c:1206 +#: parted/ui.c:1173 parted/ui.c:1209 msgid "No flags supported" msgstr "" -#: parted/ui.c:1280 +#: parted/ui.c:1283 msgid "Can't create any more partitions." msgstr "Impossible d’ajouter de nouvelle partition." -#: parted/ui.c:1290 +#: parted/ui.c:1293 msgid "Expecting a partition type." msgstr "Type de partition attendu." -#: parted/ui.c:1439 +#: parted/ui.c:1442 msgid "on" msgstr "on" -#: parted/ui.c:1440 +#: parted/ui.c:1443 msgid "off" msgstr "off" -#: parted/ui.c:1457 +#: parted/ui.c:1460 msgid "optimal" msgstr "optimal" -#: parted/ui.c:1458 +#: parted/ui.c:1461 msgid "minimal" msgstr "minimal" -#: parted/ui.c:1591 +#: parted/ui.c:1594 msgid "OPTIONs:" msgstr "OPTIONS :" -#: parted/ui.c:1596 +#: parted/ui.c:1599 msgid "COMMANDs:" msgstr "COMMANDES :" -#: parted/ui.c:1599 +#: parted/ui.c:1602 #, c-format msgid "" "\n" @@ -3319,15 +3351,26 @@ msgstr "" "\n" "Rapporter les anomalies à %s\n" -#: parted/ui.c:1606 +#: parted/ui.c:1609 #, c-format msgid "Using %s\n" msgstr "Utilisation de %s\n" -#: parted/ui.c:1686 +#: parted/ui.c:1689 msgid "This command does not make sense in non-interactive mode.\n" msgstr "Cette commande n’a pas de sens en mode non-interactif.\n" +#~ msgid "Extended partitions cannot be hidden on msdos disk labels." +#~ msgstr "" +#~ "Les partitions étendues ne peuvent être cachées sur les disques étiquetés " +#~ "MS-DOS." + +#~ msgid "" +#~ "Extended partitions cannot be recovery partitions on msdos disk labels." +#~ msgstr "" +#~ "Les partitions étendues ne peuvent être récupérés sur les disques " +#~ "étiquetés MS-DOS." + #~ msgid "" #~ " NUMBER : display more detailed information about this particular " #~ "partition\n" Binary files differ@@ -1,70 +1,71 @@ # Friulian translation for the parted package # Copyright (C) 2019 Free Software Foundation, Inc. # This file is distributed under the same license as the parted package. -# Fabio Tomat <f.t.public@gmail.com>, 2019. +# Fabio Tomat <f.t.public@gmail.com>, 2023. # msgid "" msgstr "" -"Project-Id-Version: GNU parted 3.1.90\n" +"Project-Id-Version: GNU parted 3.4.64.2\n" "Report-Msgid-Bugs-To: bug-parted@gnu.org\n" -"POT-Creation-Date: 2022-04-18 14:44-0400\n" -"PO-Revision-Date: 2019-01-22 11:21+0100\n" -"Last-Translator: Fabio Tomat <f.t.public@gmail.com>\n" +"POT-Creation-Date: 2023-04-10 15:50-0700\n" +"PO-Revision-Date: 2023-01-31 13:46+0100\n" +"Last-Translator: Fabio T. <f.t.public@gmail.com>\n" "Language-Team: Friulian <f.t.public@gmail.com>\n" "Language: fur\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" -"X-Bugs: Report translation errors to the Language-Team address.\n" -"X-Generator: Poedit 2.2\n" "Plural-Forms: nplurals=2; plural=(n != 1);\n" +"X-Bugs: Report translation errors to the Language-Team address.\n" +"X-Editor: HaiPO 1.4 beta\n" +"X-Generator: Poedit 3.2.2\n" -#: lib/argmatch.c:147 +#: lib/argmatch.c:145 #, c-format msgid "invalid argument %s for %s" msgstr "argoment %s no valit par %s" -#: lib/argmatch.c:148 +#: lib/argmatch.c:146 #, c-format msgid "ambiguous argument %s for %s" msgstr "argoment %s ambigui par %s" -#: lib/argmatch.c:167 lib/argmatch.h:238 +#: lib/argmatch.c:165 lib/argmatch.h:237 msgid "Valid arguments are:" msgstr "I argoments valits a son:" -#: lib/closeout.c:122 libparted/labels/fdasd.c:145 +#: lib/closeout.c:121 libparted/labels/fdasd.c:145 msgid "write error" msgstr "erôr di scriture" -#: lib/error.c:195 +#: lib/error.c:193 msgid "Unknown system error" msgstr "Erôr di sisteme no cognossût" #: lib/getopt.c:278 -#, fuzzy, c-format +#, c-format msgid "%s: option '%s%s' is ambiguous\n" -msgstr "%s: la opzion '-W %s' e je ambigue\n" +msgstr "%s: la opzion ''%s%s' e je ambigue\n" #: lib/getopt.c:284 -#, fuzzy, c-format +#, c-format msgid "%s: option '%s%s' is ambiguous; possibilities:" -msgstr "%s: la opzion '%s' e je ambigue; pussibilitâts:" +msgstr "%s: la opzion '%s%s' e je ambigue; pussibilitâts:" #: lib/getopt.c:319 -#, fuzzy, c-format +#, c-format msgid "%s: unrecognized option '%s%s'\n" -msgstr "%s: opzions '%c %s' no ricognossude\n" +msgstr "%s: opzion '%s%s' no ricognossude\n" #: lib/getopt.c:345 -#, fuzzy, c-format +#, c-format msgid "%s: option '%s%s' doesn't allow an argument\n" -msgstr "%s: la opzion '%c %s' no permet un argoment\n" +msgstr "%s: la opzion '%s%s' no permet un argoment\n" #: lib/getopt.c:360 -#, fuzzy, c-format +#, c-format msgid "%s: option '%s%s' requires an argument\n" -msgstr "%s: la opzion '--%s' e à bisugne di un argoment\n" +msgstr "%s: la opzion '%s%s' e à bisugne di un argoment\n" #: lib/getopt.c:621 #, c-format @@ -97,11 +98,11 @@ msgstr "%s: la opzion e à bisugne di un argoment --'%c'\n" #. If you don't know what to put here, please see #. <https://en.wikipedia.org/wiki/Quotation_marks_in_other_languages> #. and use glyphs suitable for your language. -#: lib/quotearg.c:355 +#: lib/quotearg.c:354 msgid "`" msgstr "\\" -#: lib/quotearg.c:356 +#: lib/quotearg.c:355 msgid "'" msgstr "\\" @@ -134,9 +135,8 @@ msgid "Invalid back reference" msgstr "Riferiment indaûr no valit" #: lib/regcomp.c:143 -#, fuzzy msgid "Unmatched [, [^, [:, [., or [=" -msgstr "[ o [^ cence corispondence" +msgstr "[, [^, [:, [., o [= cence corispondence" #: lib/regcomp.c:146 msgid "Unmatched ( or \\(" @@ -184,7 +184,7 @@ msgstr "Nissune espression regolâr precedente" #. To enquire the regular expression that your system uses for this #. purpose, you can use the command #. locale -k LC_MESSAGES | grep '^yesexpr=' -#: lib/rpmatch.c:150 +#: lib/rpmatch.c:149 msgid "^[yY]" msgstr "^[sSyY]" @@ -194,7 +194,7 @@ msgstr "^[sSyY]" #. To enquire the regular expression that your system uses for this #. purpose, you can use the command #. locale -k LC_MESSAGES | grep '^noexpr=' -#: lib/rpmatch.c:163 +#: lib/rpmatch.c:162 msgid "^[nN]" msgstr "^[nN]" @@ -217,18 +217,15 @@ msgstr "©" #. TRANSLATORS: The %s placeholder is the web address of the GPL license. #: lib/version-etc.c:88 -#, fuzzy, c-format +#, c-format msgid "" "License GPLv3+: GNU GPL version 3 or later <%s>.\n" "This is free software: you are free to change and redistribute it.\n" "There is NO WARRANTY, to the extent permitted by law.\n" msgstr "" -"\n" -"Licence GPLv3+: GNU GPL version 3 o sucessive <http://gnu.org/licenses/gpl." -"html>.\n" -"Chest al è software libar: si è libars di cambiâlu e tornâ a distribuîlu.\n" +"Licence GPLv3+: GNU GPL version 3 o sucessive <%s>.\n" +"Chest al è software libar: tu sês libar di cambiâlu e tornâ a distribuîlu.\n" "No je NISSUNE GARANZIE, te misure consintude de leç.\n" -"\n" #. TRANSLATORS: %s denotes an author name. #: lib/version-etc.c:105 @@ -343,11 +340,9 @@ msgstr "" #. "Report translation bugs to <...>\n" with the address for translation #. bugs (typically your translation team's web or email address). #: lib/version-etc.c:249 -#, fuzzy, c-format +#, c-format msgid "Report bugs to: %s\n" -msgstr "" -"\n" -"Segnale i erôrs a: %s\n" +msgstr "Segnale i erôrs a: %s\n" #: lib/version-etc.c:251 #, c-format @@ -360,10 +355,9 @@ msgid "%s home page: <%s>\n" msgstr "Sît web di %s: <%s>\n" #: lib/version-etc.c:260 -#, fuzzy, c-format +#, c-format msgid "General help using GNU software: <%s>\n" -msgstr "" -"Jutori gjenerâl par doprâ software GNU: <http://www.gnu.org/gethelp/>\n" +msgstr "Jutori gjenerâl par doprâ software GNU: <%s>\n" #: lib/xalloc-die.c:34 msgid "memory exhausted" @@ -476,6 +470,9 @@ msgid "" "WARNING: the kernel failed to re-read the partition table on %s (%s). As a " "result, it may not reflect all of your changes until after reboot." msgstr "" +"ATENZION: il kernel nol è rivât a tornâ a lei la tabele des partizions su %s " +"(%s). Par chel al podarès no rifleti dutis lis modifichis fin dopo che il " +"sisteme nol ven tornât a inviâsi." #: libparted/arch/gnu.c:261 #, c-format @@ -483,6 +480,8 @@ msgid "" "Warning: unable to open %s (%s). As a result, it may not reflect all of your " "changes until after reboot." msgstr "" +"Atenzion: impussibil vierzi %s (%s). Par chel, al podarès no rifleti dutis " +"lis modifichis fin dopo che il sisteme al ven tornât a inviâsi." #: libparted/arch/gnu.c:274 #, c-format @@ -490,6 +489,9 @@ msgid "" "Warning: failed to make translator go away on %s (%s). As a result, it may " "not reflect all of your changes until after reboot." msgstr "" +"Atenzion: nol è stât pussibil fâ sparî il tradutôr su %s (%s). Par chel, al " +"podarès no rifleti dutis lis modifichis fin dopo che il sisteme al ven " +"tornât a inviâsi." #: libparted/arch/gnu.c:820 #, c-format @@ -580,9 +582,8 @@ msgid "Generic SD/MMC Storage Card" msgstr "Schede di archiviazion SD/MMC gjeneriche" #: libparted/arch/linux.c:1423 -#, fuzzy msgid "NVMe Device" -msgstr "Gnûf dispositîf?" +msgstr "Dispositîf NVMe" #: libparted/arch/linux.c:1484 msgid "DAC960 RAID controller" @@ -610,7 +611,7 @@ msgstr "Compaq Smart Array" #: libparted/arch/linux.c:1521 msgid "NVDIMM Device" -msgstr "" +msgstr "Dispositîf NVDIMM" #: libparted/arch/linux.c:1526 msgid "ATARAID Controller" @@ -651,7 +652,7 @@ msgstr "Array RAID Software Linux" #: libparted/arch/linux.c:1589 msgid "RAM Drive" -msgstr "" +msgstr "Unitât RAM" #: libparted/arch/linux.c:1596 msgid "ped_device_new() Unsupported device type" @@ -754,22 +755,22 @@ msgstr "pmbr_boot" msgid "Unknown disk flag, %d." msgstr "Opzion/flag disc no cognossude, %d." -#: libparted/disk.c:1289 +#: libparted/disk.c:1320 #, c-format msgid "%s disk labels do not support extended partitions." msgstr "Lis etichetis dai discs %s no supuartin partizions estesis." -#: libparted/disk.c:1821 +#: libparted/disk.c:1990 #, c-format msgid "%s disk labels don't support logical or extended partitions." msgstr "" "Lis etichetis dai discs %s no supuartin lis partizions logjichis o estesis." -#: libparted/disk.c:1834 +#: libparted/disk.c:2003 msgid "Too many primary partitions." msgstr "Masse partizions primariis." -#: libparted/disk.c:1843 +#: libparted/disk.c:2012 #, c-format msgid "" "Can't add a logical partition to %s, because there is no extended partition." @@ -777,138 +778,141 @@ msgstr "" "Impussibil zontâ une partizion logjiche a %s, parcè che no je nissune " "partizion estese." -#: libparted/disk.c:1867 +#: libparted/disk.c:2036 #, c-format msgid "Can't have more than one extended partition on %s." msgstr "No si pues vê plui di une partizion estese su %s." -#: libparted/disk.c:1877 +#: libparted/disk.c:2046 msgid "Can't have logical partitions outside of the extended partition." msgstr "No si pues vê partizions logjichis fûr de partizion estese." -#: libparted/disk.c:1902 +#: libparted/disk.c:2071 #, c-format msgid "Can't have a logical partition outside of the extended partition on %s." msgstr "No si pues vê une partizion logjiche fûr de partizion estese su %s." -#: libparted/disk.c:1912 +#: libparted/disk.c:2081 msgid "Can't have a primary partition inside an extended partition." msgstr "No si pues vê une partizion primarie dentri di une partizion estese." -#: libparted/disk.c:1921 +#: libparted/disk.c:2090 msgid "Can't have a partition outside the disk!" msgstr "No si pues vê une partizion fûr dal disc!" -#: libparted/disk.c:1972 libparted/disk.c:2150 +#: libparted/disk.c:2141 libparted/disk.c:2319 msgid "Can't have overlapping partitions." msgstr "No si pues soreponi lis partizions." -#: libparted/disk.c:2351 +#: libparted/disk.c:2520 msgid "metadata" msgstr "metadâts" -#: libparted/disk.c:2353 +#: libparted/disk.c:2522 msgid "free" msgstr "libar" -#: libparted/disk.c:2355 parted/ui.c:1271 parted/ui.c:1299 +#: libparted/disk.c:2524 parted/ui.c:1274 parted/ui.c:1302 msgid "extended" msgstr "estese" -#: libparted/disk.c:2357 parted/ui.c:1275 parted/ui.c:1303 +#: libparted/disk.c:2526 parted/ui.c:1278 parted/ui.c:1306 msgid "logical" msgstr "logjiche" -#: libparted/disk.c:2359 parted/ui.c:1267 parted/ui.c:1295 +#: libparted/disk.c:2528 parted/ui.c:1270 parted/ui.c:1298 msgid "primary" msgstr "primarie" -#: libparted/disk.c:2375 +#: libparted/disk.c:2544 msgid "boot" msgstr "inviament" -#: libparted/disk.c:2377 +#: libparted/disk.c:2546 msgid "bios_grub" msgstr "bios_grub" -#: libparted/disk.c:2379 +#: libparted/disk.c:2548 msgid "root" msgstr "root" -#: libparted/disk.c:2381 +#: libparted/disk.c:2550 msgid "swap" msgstr "swap" -#: libparted/disk.c:2383 +#: libparted/disk.c:2552 msgid "hidden" msgstr "platade" -#: libparted/disk.c:2385 +#: libparted/disk.c:2554 msgid "raid" msgstr "raid" -#: libparted/disk.c:2387 +#: libparted/disk.c:2556 msgid "lvm" msgstr "lvm" -#: libparted/disk.c:2389 +#: libparted/disk.c:2558 msgid "lba" msgstr "lba" -#: libparted/disk.c:2391 +#: libparted/disk.c:2560 msgid "hp-service" msgstr "hp-service" -#: libparted/disk.c:2393 +#: libparted/disk.c:2562 msgid "palo" msgstr "palo" -#: libparted/disk.c:2395 +#: libparted/disk.c:2564 msgid "prep" msgstr "prep" -#: libparted/disk.c:2397 +#: libparted/disk.c:2566 msgid "msftres" msgstr "msftres" -#: libparted/disk.c:2399 +#: libparted/disk.c:2568 msgid "msftdata" msgstr "msftdata" -#: libparted/disk.c:2401 +#: libparted/disk.c:2570 msgid "atvrecv" msgstr "atvrecv" -#: libparted/disk.c:2403 +#: libparted/disk.c:2572 msgid "diag" msgstr "diag" -#: libparted/disk.c:2405 +#: libparted/disk.c:2574 msgid "legacy_boot" msgstr "legacy_boot" -#: libparted/disk.c:2407 +#: libparted/disk.c:2576 msgid "irst" msgstr "irst" -#: libparted/disk.c:2409 +#: libparted/disk.c:2578 msgid "esp" msgstr "esp" -#: libparted/disk.c:2411 +#: libparted/disk.c:2580 msgid "chromeos_kernel" -msgstr "" +msgstr "chromeos_kernel" -#: libparted/disk.c:2413 -#, fuzzy +#: libparted/disk.c:2582 msgid "bls_boot" -msgstr "pmbr_boot" +msgstr "bls_boot" -#: libparted/disk.c:2415 +#: libparted/disk.c:2584 msgid "linux-home" +msgstr "linux-home" + +#: libparted/disk.c:2586 +msgid "no_automount" msgstr "" -#: libparted/disk.c:2421 +#: libparted/disk.c:2592 #, c-format msgid "Unknown partition flag, %d." msgstr "Opzion/flag di partizion no cognossude, %d." @@ -1020,35 +1024,40 @@ msgstr "" "stât ancjemò implementât." #: libparted/labels/atari.c:278 -#, fuzzy, c-format +#, c-format msgid "" "Can't use Atari partition tables on disks with a sector size not equal to %d " "bytes." msgstr "" -"Parted nol pues doprâ i file system HFS sui discs cun dimension di setôr che " -"no je uguâl a %d byte." +"Impussibil doprâ la tabele des partizions Atari sui discs cun dimension di " +"setôr che no je uguâl a %d bytes." #: libparted/labels/atari.c:290 #, c-format msgid "Can't use Atari partition tables on disks with more than %d sectors." msgstr "" +"Impussibil doprâ lis tabelis di partizion Atari sui discs cun plui di %d " +"setôrs." #: libparted/labels/atari.c:403 msgid "" "Too many Atari partitions detected. Maybe there is a loop in the XGM linked " "list. Aborting." msgstr "" +"Masse partizions Atari rilevadis. Forsit al è un cicli infinît te liste " +"colegade a XGM. Si interomp." #: libparted/labels/atari.c:601 #, c-format msgid "No data partition found in the ARS at sector %lli." -msgstr "" +msgstr "Nissune partizion cjatade tal ARS al setôr %lli." #: libparted/labels/atari.c:622 #, c-format msgid "" "The entry of the next logical ARS is not of type XGM in ARS at sector %lli." msgstr "" +"La vôs dal ARS logjic sucessîf nol è di gjenar XGM in ARS al setôr %lli." #: libparted/labels/atari.c:653 #, c-format @@ -1056,31 +1065,37 @@ msgid "" "There doesn't seem to be an Atari partition table on this disk (%s), or it " "is corrupted." msgstr "" +"Al somee che su chest disc (%s) no je une tabele di partizions Atari opûr " +"che e je ruvinade." #: libparted/labels/atari.c:883 #, c-format msgid "No room at sector %lli to store ARS of logical partition %d." msgstr "" +"Nissun spazi al setôr %lli par memorizâ l'ARS de partizion logjiche %d." #: libparted/labels/atari.c:890 #, c-format msgid "No room at sector %lli to store ARS." -msgstr "" +msgstr "Nissun spazi al setôr %lli par memorizâ l'ARS." #: libparted/labels/atari.c:967 msgid "" "The sector count that is stored in the partition table does not correspond " "to the size of your device. Do you want to fix the partition table?" msgstr "" +"La conte dai setôrs che e je memorizade te tabele des partizion no " +"corispuint ae dimension dal to dispositîf. Desideristu comedâ la tabele des " +"partizions?" #: libparted/labels/atari.c:1008 #, c-format msgid "No room at sector %lli to store BSL." -msgstr "" +msgstr "Nissun spazi al setôr %lli par memorizâ il BSL." #: libparted/labels/atari.c:1116 msgid "There were remaining partitions after filling the main AHDI table." -msgstr "" +msgstr "A jerin restadis partizions dopo vê jemplade la tabele AHDI principâl." #: libparted/labels/atari.c:1135 msgid "" @@ -1088,14 +1103,18 @@ msgid "" "not empty so more partitions of unknown size and position will be detected " "by ICD compatible software. Do you want to invalidate the ICD table?" msgstr "" +"La tabele AHDI principâl e je stade jemplade cun dutis lis partizions ma la " +"tabele ICD no je vueide duncje a vignaran rilevadis, dai software compatibii " +"cun ICD, plui partizions di dimension e posizion no cognossudis. " +"Desideristu invalidâ la tabele ICD?" #: libparted/labels/atari.c:1169 msgid "ICD entries can't contain extended or logical partitions." -msgstr "" +msgstr "Lis vôs ICD no puedin contignî partizions estesis o logjichis." #: libparted/labels/atari.c:1191 msgid "There were remaining partitions after filling the tables." -msgstr "" +msgstr "A jerin restadis partizions dopo vê jemplât lis tabelis." #: libparted/labels/atari.c:1231 #, c-format @@ -1103,10 +1122,12 @@ msgid "" "You can't use an extended XGM partition in ICD mode (more than %d primary " "partitions, if XGM is the first one it counts for two)." msgstr "" +"No tu puedis doprâ une partizion XGM estese in modalitât ICD (plui di %d " +"partizions primariis, se XGM e je la prime e vâl par dôs)." #: libparted/labels/atari.c:1662 libparted/labels/bsd.c:563 -#: libparted/labels/dasd.c:895 libparted/labels/dos.c:2303 -#: libparted/labels/dvh.c:770 libparted/labels/gpt.c:1769 +#: libparted/labels/dasd.c:893 libparted/labels/dos.c:2294 +#: libparted/labels/dvh.c:770 libparted/labels/gpt.c:1891 #: libparted/labels/loop.c:244 libparted/labels/mac.c:1409 #: libparted/labels/pc98.c:697 libparted/labels/rdb.c:1054 #: libparted/labels/sun.c:781 @@ -1119,6 +1140,9 @@ msgid "" "You can't use more than %d primary partitions (ICD mode) if you use an " "extended XGM partition. If XGM is the first partition it counts for two." msgstr "" +"No tu puedis doprâ plui di %d partizions primariis (modalitât ICD) se tu " +"dopris une partizion XGM estese. Se XGM e je la prime partizion e vâl par " +"dôs." #: libparted/labels/atari.c:1828 libparted/labels/rdb.c:1082 msgid "Unable to allocate a partition number." @@ -1128,42 +1152,32 @@ msgstr "Impussibil assegnâ un numar di partizion." msgid "Unable to allocate a bsd disklabel slot." msgstr "Impussibil assegnâ un toc di spazi par une etichete bsd." -#: libparted/labels/dasd.c:626 +#: libparted/labels/dasd.c:634 msgid "The partition table of DASD-LDL device cannot be changed.\n" msgstr "" +"Nol è pussibil cambiâ la tabele des partizions dal dispositîf DASD-LDL.\n" -#: libparted/labels/dasd.c:921 +#: libparted/labels/dasd.c:919 msgid "Unable to allocate a dasd disklabel slot" msgstr "Impussibil assegnâ un toc di spazi par une etichete dasd" -#: libparted/labels/dos.c:1008 +#: libparted/labels/dos.c:1159 #, c-format msgid "Invalid partition table on %s -- wrong signature %x." msgstr "Tabele des partizions no valide su %s -- firme %x sbaliade." -#: libparted/labels/dos.c:1036 +#: libparted/labels/dos.c:1187 #, c-format msgid "Invalid partition table - recursive partition on %s." msgstr "Tabele des partizion no valide - partizion ricorsive su %s." -#: libparted/labels/dos.c:1567 -msgid "Extended partitions cannot be hidden on msdos disk labels." -msgstr "" -"Lis partizions estesis no puedin jessi platadis su pes etichetis disc msdos." - -#: libparted/labels/dos.c:1579 -#, fuzzy -msgid "Extended partitions cannot be recovery partitions on msdos disk labels." -msgstr "" -"Lis partizions estesis no puedin jessi platadis su pes etichetis disc msdos." - -#: libparted/labels/dos.c:2285 +#: libparted/labels/dos.c:2276 msgid "Parted can't resize partitions managed by Windows Dynamic Disk." msgstr "" "Parted nol pues ridimensionâ lis partizions gjestidis di Windows Dynamic " "Disk." -#: libparted/labels/dos.c:2541 +#: libparted/labels/dos.c:2532 msgid "cannot create any more partitions" msgstr "impussibil creâ ancjemò partizions" @@ -1261,7 +1275,7 @@ msgstr "Il dispositîf specificât nol è un dispositîf DASD valit" #: libparted/labels/fdasd.c:188 msgid "VOLSER not found on device" -msgstr "" +msgstr "VOLSER nol è stât cjatât sul dispositîf" #: libparted/labels/fdasd.c:191 libparted/labels/vtoc.c:179 msgid "Fatal error" @@ -1292,9 +1306,8 @@ msgstr "" "driver dasd!" #: libparted/labels/fdasd.c:1020 -#, fuzzy msgid "Could not retrieve disk size." -msgstr "Impussibil recuperâ lis informazions sul disc." +msgstr "Impussibil recuperâ la dimension dal disc." #: libparted/labels/fdasd.c:1029 msgid "Could not retrieve disk geometry information." @@ -1307,12 +1320,13 @@ msgstr "Impussibil recuperâ lis informazions su la dimension dal bloc." #: libparted/labels/fdasd.c:1045 msgid "Disk geometry does not match a DASD device of type 3390." msgstr "" +"La gjeometrie dal disc no corispuint a un dispositîf DASD di gjenar 3390." -#: libparted/labels/gpt.c:569 +#: libparted/labels/gpt.c:589 msgid "device is too small for GPT" msgstr "il dispositîf al è masse piçul par GPT" -#: libparted/labels/gpt.c:771 +#: libparted/labels/gpt.c:791 #, c-format msgid "" "The format of the GPT partition table is version %x, which is newer than " @@ -1321,7 +1335,7 @@ msgstr "" "Il formât ae tabele des partizions GPT al è ae version %x, che al è plui " "gnûf di chel che al ricognòs Parted. Segnale chest probleme!" -#: libparted/labels/gpt.c:807 +#: libparted/labels/gpt.c:827 #, c-format msgid "" "Not all of the space available to %s appears to be used, you can fix the GPT " @@ -1332,7 +1346,7 @@ msgstr "" "fa un mût che al dopri dut il spazi (altris %llu blocs) o continuâ cun lis " "impostazions atuâls? " -#: libparted/labels/gpt.c:1006 +#: libparted/labels/gpt.c:1026 msgid "" "The backup GPT table is not at the end of the disk, as it should be. Fix, " "by moving the backup to the end (and removing the old backup)?" @@ -1340,7 +1354,7 @@ msgstr "" "La copie di backup de tabele GPT no je ae fin dal disc, come che al varès di " "jessi. Comedâ, spostant la copie di backup ae fin (e gjavant chê viele)?" -#: libparted/labels/gpt.c:1024 +#: libparted/labels/gpt.c:1044 msgid "" "Both the primary and backup GPT tables are corrupt. Try making a fresh " "table, and using Parted's rescue feature to recover partitions." @@ -1349,7 +1363,7 @@ msgstr "" "Prove a creâ une gnove tabele, e dopre la funzionalitât di ripristinament " "partizions di Parted." -#: libparted/labels/gpt.c:1035 +#: libparted/labels/gpt.c:1055 msgid "" "The backup GPT table is corrupt, but the primary appears OK, so that will be " "used." @@ -1357,7 +1371,7 @@ msgstr "" "La tabele GPT di backup e je ruvinade, ma chê primarie e semee a puest, " "duncje si doprarà chê." -#: libparted/labels/gpt.c:1047 +#: libparted/labels/gpt.c:1067 msgid "" "The primary GPT table is corrupt, but the backup appears OK, so that will be " "used." @@ -1365,11 +1379,11 @@ msgstr "" "La tabele GPT primarie e je ruvinade, ma chê di backup e semee a puest, " "duncje si doprarà chê." -#: libparted/labels/gpt.c:1071 +#: libparted/labels/gpt.c:1091 msgid "primary partition table array CRC mismatch" msgstr "il CRC dal array de tabele des partizions primarie nol corispuint" -#: libparted/labels/gpt.c:1655 libparted/labels/gpt.c:1682 +#: libparted/labels/gpt.c:1722 libparted/labels/gpt.c:1749 msgid "failed to translate partition name" msgstr "no si è rivâts a tradusi il non de partizion" @@ -2061,7 +2075,7 @@ msgstr "fat_table_alloc_cluster: nissun cluster libar" msgid "Could not detect file system." msgstr "Impussibil rilevâ il file system." -#: libparted/fs/r/filesys.c:159 libparted/fs/r/filesys.c:284 +#: libparted/fs/r/filesys.c:159 libparted/fs/r/filesys.c:285 #, c-format msgid "resizing %s file systems is not supported" msgstr "il ridimensionâ il file system %s, nol è supuartât" @@ -2091,13 +2105,13 @@ msgstr "" "a chê posizion. Si varès di controlâ il file system!" #: libparted/fs/r/hfs/cache.c:214 -#, fuzzy, c-format +#, c-format msgid "" "Trying to move an extent from block 0x%X to block 0x%X, but another one " "already exists at this position. This should not happen!" msgstr "" -"Si cîr di spostâ un extent dal bloc Ox%X al bloc Ox%X, ma un altri al esist " -"za a chê posizion. Nol varès di sucedi!" +"Si cîr di spostâ un extent dal bloc 0x%X al bloc 0x%X, ma un altri al esist " +"za in chê posizion. Chest nol varès di sucedi!" #: libparted/fs/r/hfs/file.c:143 #, c-format @@ -2245,13 +2259,12 @@ msgstr "" "regjistri (journal) (%i byte)." #: libparted/fs/r/hfs/journal.c:260 -#, fuzzy msgid "" "Journal stored outside of the volume are not supported. Try to deactivate " "the journal and run Parted again." msgstr "" -"I regjistris (journal) archiviâts fûr dal volum no son supuartâts. Prove " -"disative il regjisti (journal) e torne a eseguî Parted." +"I regjistris (journal) archiviâts fûr dal volum no son supuartâts. Prove a " +"disativâ il regjisti e torne a eseguî Parted." #: libparted/fs/r/hfs/journal.c:271 msgid "Journal offset or size is not multiple of the sector size." @@ -2357,40 +2370,39 @@ msgstr "" "Chest volum HFS+ nol à un \"extents overflow file\". Cheste e je une " "situazion vonde inusuâl!" -#: parted/parted.c:137 +#: parted/parted.c:138 msgid "displays this help message" msgstr "al mostre chest messaç di jutori" -#: parted/parted.c:138 +#: parted/parted.c:139 msgid "lists partition layout on all block devices" msgstr "al liste la disposizion des partizions su ducj i dispositîfs a blocs" -#: parted/parted.c:139 +#: parted/parted.c:140 msgid "displays machine parseable output" msgstr "al mostre un output che si pues analizâ dal computer" -#: parted/parted.c:140 -#, fuzzy +#: parted/parted.c:141 msgid "displays JSON output" -msgstr "al mostre un output che si pues analizâ dal computer" +msgstr "al mostre la jessude di JSON" -#: parted/parted.c:141 +#: parted/parted.c:142 msgid "never prompts for user intervention" msgstr "no sta domandâ mai l'intervent dal utent" -#: parted/parted.c:142 +#: parted/parted.c:143 msgid "in script mode, fix instead of abort when asked" -msgstr "" +msgstr "in modalitât script, comede invezit di interompi, se domandât" -#: parted/parted.c:143 +#: parted/parted.c:144 msgid "displays the version" msgstr "al mostre la version" -#: parted/parted.c:144 +#: parted/parted.c:145 msgid "alignment for new partitions" msgstr "inlineament pes gnovis partizions" -#: parted/parted.c:157 +#: parted/parted.c:158 msgid "" "NUMBER is the partition number used by Linux. On MS-DOS disk labels, the " "primary partitions number from 1 to 4, logical partitions from 5 onwards.\n" @@ -2399,31 +2411,31 @@ msgstr "" "MS-DOS, il numar des partizions primaris di 1 a 4, partizions logjichis di 5 " "indenant.\n" -#: parted/parted.c:160 +#: parted/parted.c:161 msgid "LABEL-TYPE is one of: " msgstr "GJENAR-ETIC al è un di: " -#: parted/parted.c:161 parted/parted.c:162 +#: parted/parted.c:162 parted/parted.c:163 msgid "FLAG is one of: " msgstr "FLAG al è un di: " -#: parted/parted.c:163 +#: parted/parted.c:164 msgid "UNIT is one of: " msgstr "UNITÂT al è un di: " -#: parted/parted.c:164 +#: parted/parted.c:165 msgid "desired alignment: minimum or optimal" msgstr "inlineament desiderât: minim o otimâl" -#: parted/parted.c:165 +#: parted/parted.c:166 msgid "PART-TYPE is one of: primary, logical, extended\n" msgstr "GJENAR-PART al è un di: primary, logical, extended\n" -#: parted/parted.c:167 +#: parted/parted.c:168 msgid "FS-TYPE is one of: " msgstr "GJENAR-FS al è un di: " -#: parted/parted.c:168 +#: parted/parted.c:169 msgid "" "START and END are disk locations, such as 4GB or 10%. Negative values count " "from the end of the disk. For example, -1s specifies exactly the last " @@ -2433,7 +2445,7 @@ msgstr "" "partissin de fin dal disc. Par esempli: -1s al specifiche in maniere " "precise l'ultin setôr.\n" -#: parted/parted.c:171 +#: parted/parted.c:172 msgid "" "END is disk location, such as 4GB or 10%. Negative value counts from the " "end of the disk. For example, -1s specifies exactly the last sector.\n" @@ -2442,19 +2454,23 @@ msgstr "" "partissin de fin dal disc. Par esempli: -1s al specifiche in maniere " "precise l'ultin setôr.\n" -#: parted/parted.c:174 +#: parted/parted.c:175 msgid "STATE is one of: on, off\n" msgstr "STÂT al è un di: on, off\n" -#: parted/parted.c:175 +#: parted/parted.c:176 msgid "DEVICE is usually /dev/hda or /dev/sda\n" msgstr "DISPOSITÃŽF al è di solit /dev/hda or /dev/sda\n" -#: parted/parted.c:176 +#: parted/parted.c:177 msgid "NAME is any word you want\n" msgstr "NON al è cualsisei peraule desiderade\n" -#: parted/parted.c:179 +#: parted/parted.c:178 +msgid "TYPE_ID is a value between 0x01 and 0xff, TYPE_UUID is a UUID\n" +msgstr "" + +#: parted/parted.c:182 msgid "" "Copyright (C) 1998 - 2006 Free Software Foundation, Inc.\n" "This program is free software, covered by the GNU General Public License.\n" @@ -2475,22 +2491,22 @@ msgstr "" "GNU General Public License par vê plui detais.\n" "\n" -#: parted/parted.c:229 +#: parted/parted.c:232 #, c-format msgid "%0.f%%\t(time left %.2d:%.2d)" msgstr "%0.f%%\t(a restin %.2d:%.2d)" -#: parted/parted.c:248 +#: parted/parted.c:251 #, c-format msgid "Partition %s is being used. Are you sure you want to continue?" msgstr "La partizion %s e je in ûs. Sigûrs di continuâ?" -#: parted/parted.c:269 +#: parted/parted.c:272 #, c-format msgid "Partition(s) on %s are being used." msgstr "Lis partizions su %s a son in ûs." -#: parted/parted.c:281 +#: parted/parted.c:284 #, c-format msgid "" "The existing disk label on %s will be destroyed and all data on this disk " @@ -2499,31 +2515,31 @@ msgstr "" "La etichete dal disc su %s e vignarà eliminade e ducj i dâts sul disc a " "laran pierdûts. Continuâ?" -#: parted/parted.c:542 +#: parted/parted.c:545 msgid "New disk label type?" msgstr "Gnûf gjenar di etichete disc?" -#: parted/parted.c:680 +#: parted/parted.c:692 msgid "Partition type?" msgstr "Gjenar di partizion?" -#: parted/parted.c:698 parted/parted.c:902 +#: parted/parted.c:710 parted/parted.c:914 msgid "Partition name?" msgstr "Non de partizion?" -#: parted/parted.c:708 +#: parted/parted.c:720 msgid "File system type?" msgstr "Gjenar di file system?" -#: parted/parted.c:713 parted/parted.c:1683 +#: parted/parted.c:725 parted/parted.c:1815 msgid "Start?" msgstr "Inizi?" -#: parted/parted.c:715 parted/parted.c:1685 parted/parted.c:1768 +#: parted/parted.c:727 parted/parted.c:1817 parted/parted.c:1900 msgid "End?" msgstr "Fin?" -#: parted/parted.c:782 +#: parted/parted.c:794 #, c-format msgid "" "You requested a partition from %s to %s (sectors %llu..%llu).\n" @@ -2532,7 +2548,7 @@ msgstr "" "E je stade domandade une partizion di %s a %s (setôrs %llu..%llu).\n" "La posizion disponibile plui dongje e je %s a %s (setôrs %llu..%llu).%s" -#: parted/parted.c:791 +#: parted/parted.c:803 msgid "" "\n" "Is this still acceptable to you?" @@ -2540,96 +2556,121 @@ msgstr "" "\n" "Ti vadial ben distès cussì?" -#: parted/parted.c:814 -#, fuzzy, c-format +#: parted/parted.c:826 +#, c-format msgid "" "The resulting partition is not properly aligned for best performance: %s" msgstr "" -"La partizion che e ven fûr no je inlineade ben par prestazions otimâls." +"La partizion che e ven fûr no je inlineade ben par prestazions otimâls: %s" -#: parted/parted.c:816 parted/parted.c:1925 +#: parted/parted.c:828 parted/parted.c:2057 msgid "unknown (malloc failed)" -msgstr "" +msgstr "no cognossût (malloc falît)" -#: parted/parted.c:894 -#, fuzzy, c-format +#: parted/parted.c:906 +#, c-format msgid "%s disk labels do not support partition name." -msgstr "Lis etichetis dai discs %s no supuartin partizions estesis." +msgstr "Lis etichetis dai discs %s no supuartin il non de partizion." -#: parted/parted.c:899 parted/parted.c:1748 parted/parted.c:1814 -#: parted/parted.c:1908 parted/parted.c:1983 +#: parted/parted.c:911 parted/parted.c:955 parted/parted.c:1880 +#: parted/parted.c:1946 parted/parted.c:2040 parted/parted.c:2115 msgid "Partition number?" msgstr "Numar di partizion?" -#: parted/parted.c:1050 +#: parted/parted.c:949 +#, fuzzy, c-format +msgid "%s disk labels do not support partition type." +msgstr "Lis etichetis dai discs %s no supuartin il non de partizion." + +#: parted/parted.c:965 +#, fuzzy +msgid "Partition type-id?" +msgstr "Gjenar di partizion?" + +#: parted/parted.c:972 +#, fuzzy +msgid "Invalid type-id." +msgstr "Numar no valit." + +#: parted/parted.c:986 +#, fuzzy +msgid "Partition type-uuid?" +msgstr "Gjenar di partizion?" + +#: parted/parted.c:993 +#, fuzzy +msgid "Invalid type-uuid." +msgstr "Numar no valit." + +#: parted/parted.c:1146 #, c-format msgid "BIOS cylinder,head,sector geometry: %d,%d,%d. Each cylinder is %s.\n" msgstr "" "Gjeometrie cilindri, testine, setôr dal BIOS: %d,%d,%d. Ogni cilindri al è " "%s.\n" -#: parted/parted.c:1137 +#: parted/parted.c:1240 #, c-format msgid "Model: %s (%s)\n" msgstr "Model: %s (%s)\n" -#: parted/parted.c:1139 +#: parted/parted.c:1242 #, c-format msgid "Disk %s: %s\n" msgstr "Disc %s: %s\n" -#: parted/parted.c:1140 +#: parted/parted.c:1243 #, c-format msgid "Sector size (logical/physical): %lldB/%lldB\n" msgstr "Dimension dal setôr (logjic/fisic): %lldB/%lldB\n" -#: parted/parted.c:1152 +#: parted/parted.c:1255 #, c-format msgid "Partition Table: %s\n" msgstr "Tabele des partizions: %s\n" -#: parted/parted.c:1153 +#: parted/parted.c:1256 #, c-format msgid "Disk Flags: %s\n" msgstr "Flag dal disc: %s\n" -#: parted/parted.c:1279 parted/parted.c:1282 +#: parted/parted.c:1388 parted/parted.c:1391 msgid "Number" msgstr "Numar" -#: parted/parted.c:1279 parted/parted.c:1282 +#: parted/parted.c:1388 parted/parted.c:1391 msgid "Start" msgstr "Inizi" -#: parted/parted.c:1280 parted/parted.c:1283 +#: parted/parted.c:1389 parted/parted.c:1392 msgid "End" msgstr "Fin" -#: parted/parted.c:1283 +#: parted/parted.c:1392 msgid "Size" msgstr "Dimension" -#: parted/parted.c:1287 +#: parted/parted.c:1396 msgid "Type" msgstr "Gjenar" -#: parted/parted.c:1289 +#: parted/parted.c:1398 msgid "File system" msgstr "File system" -#: parted/parted.c:1292 +#: parted/parted.c:1401 msgid "Name" msgstr "Non" -#: parted/parted.c:1294 +#: parted/parted.c:1403 msgid "Flags" msgstr "Flag" -#: parted/parted.c:1352 +#: parted/parted.c:1461 msgid "Free Space" msgstr "Spazi libar" -#: parted/parted.c:1570 +#: parted/parted.c:1702 #, c-format msgid "" "A %s %s partition was found at %s -> %s. Do you want to add it to the " @@ -2638,56 +2679,55 @@ msgstr "" "E je stade cjatade une partizion %s %s su %s -> %s. Desideristu zontâle ae " "tabele des partizions?" -#: parted/parted.c:1613 +#: parted/parted.c:1745 msgid "searching for file systems" msgstr "ricercje dai file system" -#: parted/parted.c:1720 +#: parted/parted.c:1852 msgid "The resize command has been removed in parted 3.0" msgstr "Il comant par ridimensionâ al è stât gjavât de version 3.0 di parted" -#: parted/parted.c:1782 +#: parted/parted.c:1914 msgid "" "Shrinking a partition can cause data loss, are you sure you want to continue?" msgstr "" "Scurtâ une partizion al pues causâ pierditis di dâts, sigûrs di continuâ?" -#: parted/parted.c:1838 +#: parted/parted.c:1970 msgid "New device?" msgstr "Gnûf dispositîf?" -#: parted/parted.c:1906 +#: parted/parted.c:2038 msgid "alignment type(min/opt)" msgstr "gjenar di inlineament(min/oti)" -#: parted/parted.c:1921 +#: parted/parted.c:2053 #, c-format msgid "%d aligned\n" msgstr "%d inlineade\n" -#: parted/parted.c:1923 -#, fuzzy, c-format +#: parted/parted.c:2055 +#, c-format msgid "%d not aligned: %s\n" -msgstr "%d no inlineade\n" +msgstr "%d no inlineade: %s\n" -#: parted/parted.c:1948 parted/parted.c:1985 +#: parted/parted.c:2080 parted/parted.c:2117 msgid "Flag to Invert?" msgstr "Flag di invertî?" -#: parted/parted.c:1953 parted/parted.c:1990 +#: parted/parted.c:2085 parted/parted.c:2122 msgid "New state?" msgstr "Gnûf stât?" -#: parted/parted.c:2036 +#: parted/parted.c:2168 msgid "Unit?" msgstr "Unitât?" -#: parted/parted.c:2171 +#: parted/parted.c:2303 msgid "align-check" msgstr "align-check" -#: parted/parted.c:2174 -#, fuzzy +#: parted/parted.c:2306 msgid "" "align-check TYPE N check partition N for TYPE(min|opt) " "alignment" @@ -2695,11 +2735,11 @@ msgstr "" "align-check GJENAR N controle la partizion N pal " "inlineament di GJENAR(min|oti)" -#: parted/parted.c:2182 +#: parted/parted.c:2314 msgid "help" msgstr "jutori" -#: parted/parted.c:2185 +#: parted/parted.c:2317 msgid "" "help [COMMAND] print general help, or help on " "COMMAND" @@ -2707,15 +2747,15 @@ msgstr "" "help [COMANT] stampe il jutori gjenerâl o sul " "COMANT" -#: parted/parted.c:2191 +#: parted/parted.c:2323 msgid "mklabel" msgstr "mklabel" -#: parted/parted.c:2191 +#: parted/parted.c:2323 msgid "mktable" msgstr "mktable" -#: parted/parted.c:2194 +#: parted/parted.c:2326 msgid "" "mklabel,mktable LABEL-TYPE create a new disklabel (partition " "table)" @@ -2723,15 +2763,15 @@ msgstr "" "mklabel,mktable GJENAR-ETIC cree une gnove etichete dal disc " "(tabele des partizions)" -#: parted/parted.c:2200 +#: parted/parted.c:2332 msgid "mkpart" msgstr "mkpart" -#: parted/parted.c:2203 +#: parted/parted.c:2335 msgid "mkpart PART-TYPE [FS-TYPE] START END make a partition" msgstr "mkpart GJENAR-PART [GJENAR-FS] INIZI FIN cree une partizion" -#: parted/parted.c:2209 +#: parted/parted.c:2341 msgid "" "'mkpart' makes a partition without creating a new file system on the " "partition. FS-TYPE may be specified to set an appropriate partition ID.\n" @@ -2740,30 +2780,28 @@ msgstr "" "partizion. Al pues jessi specificât GJENAR-FS par stabilî un ID di " "partizion adat.\n" -#: parted/parted.c:2214 +#: parted/parted.c:2346 msgid "name" msgstr "non" -#: parted/parted.c:2217 +#: parted/parted.c:2349 msgid "name NUMBER NAME name partition NUMBER as NAME" msgstr "" "name NUMAR NON clame la partizion NUMAR come NON" -#: parted/parted.c:2222 +#: parted/parted.c:2354 msgid "print" msgstr "print" -#: parted/parted.c:2225 -#, fuzzy +#: parted/parted.c:2357 msgid "" "print [devices|free|list,all] display the partition table, or " "available devices, or free space, or all found partitions" msgstr "" -"print [devices|free|list,all|NUMAR] mostre la tabele des partizions, i " -"dispositîfs disponibii, il spazi libar, dutis lis partizions cjatadis o une " -"partizion in particolâr" +"print [devices|free|list,all] mostre la tabele des partizions, i " +"dispositîfs disponibii, il spazi libar o dutis lis partizions cjatadis" -#: parted/parted.c:2229 +#: parted/parted.c:2361 msgid "" "Without arguments, 'print' displays the entire partition table. However with " "the following arguments it performs various other actions.\n" @@ -2771,11 +2809,11 @@ msgstr "" "Cence argoments, 'print' al mostre dute la tabele des partizions. Dut câs " "cui argoments chi sot al fasarà variis altris azions.\n" -#: parted/parted.c:2231 +#: parted/parted.c:2363 msgid " devices : display all active block devices\n" msgstr " devices : mostre ducj i dispositîfs a blocs atîfs\n" -#: parted/parted.c:2232 +#: parted/parted.c:2364 msgid "" " free : display information about free unpartitioned space on the " "current block device\n" @@ -2783,26 +2821,26 @@ msgstr "" " free : mostre lis informazions sul spazi libar no partizionât, sul " "dispositîf a blocs atuâl\n" -#: parted/parted.c:2234 +#: parted/parted.c:2366 msgid "" " list, all : display the partition tables of all active block devices\n" msgstr "" " list, all : mostre lis tabelis des partizions di ducj i dispositîfs a " "blocs atîfs\n" -#: parted/parted.c:2238 +#: parted/parted.c:2370 msgid "quit" msgstr "quit" -#: parted/parted.c:2241 +#: parted/parted.c:2373 msgid "quit exit program" msgstr "quit jes dal program" -#: parted/parted.c:2246 +#: parted/parted.c:2378 msgid "rescue" msgstr "rescue" -#: parted/parted.c:2249 +#: parted/parted.c:2381 msgid "" "rescue START END rescue a lost partition near START " "and END" @@ -2810,56 +2848,56 @@ msgstr "" "rescue INIZI FIN recupere une partizion pierdude " "dongje INIZI e FIN" -#: parted/parted.c:2255 +#: parted/parted.c:2387 msgid "resize" msgstr "resize" -#: parted/parted.c:2258 +#: parted/parted.c:2390 msgid "The resize command was removed in parted 3.0\n" msgstr "Il comant par ridimensionâ al è stât gjavât in parted 3.0\n" -#: parted/parted.c:2261 +#: parted/parted.c:2393 msgid "resizepart" msgstr "resizepart" -#: parted/parted.c:2264 +#: parted/parted.c:2396 msgid "resizepart NUMBER END resize partition NUMBER" msgstr "" "resizepart NUMAR FIN ridimensione la partizion NUMAR" -#: parted/parted.c:2269 +#: parted/parted.c:2401 msgid "rm" msgstr "rm" -#: parted/parted.c:2272 +#: parted/parted.c:2404 msgid "rm NUMBER delete partition NUMBER" msgstr "rm NUMAR elimine la partizion NUMAR" -#: parted/parted.c:2277 +#: parted/parted.c:2409 msgid "select" msgstr "select" -#: parted/parted.c:2280 +#: parted/parted.c:2412 msgid "select DEVICE choose the device to edit" msgstr "" "select DISPOSITÃŽF sielç il dispositîf di modificâ" -#: parted/parted.c:2285 +#: parted/parted.c:2417 msgid "disk_set" msgstr "disk_set" -#: parted/parted.c:2288 +#: parted/parted.c:2420 msgid "" "disk_set FLAG STATE change the FLAG on selected device" msgstr "" "disk_set FLAG STÂT cambie il FLAG sul dispositîf " "selezionât" -#: parted/parted.c:2293 +#: parted/parted.c:2425 msgid "disk_toggle" msgstr "disk_toggle" -#: parted/parted.c:2296 +#: parted/parted.c:2428 msgid "" "disk_toggle [FLAG] toggle the state of FLAG on " "selected device" @@ -2867,21 +2905,21 @@ msgstr "" "disk_toggle [FLAG] comute il stât dal FLAG sul " "dispositîf selezionât" -#: parted/parted.c:2302 +#: parted/parted.c:2434 msgid "set" msgstr "set" -#: parted/parted.c:2305 +#: parted/parted.c:2437 msgid "" "set NUMBER FLAG STATE change the FLAG on partition NUMBER" msgstr "" "set NUMAR FLAG STÂT cambie il FLAG su pe partizion NUMAR" -#: parted/parted.c:2311 +#: parted/parted.c:2443 msgid "toggle" msgstr "toggle" -#: parted/parted.c:2314 +#: parted/parted.c:2446 msgid "" "toggle [NUMBER [FLAG]] toggle the state of FLAG on " "partition NUMBER" @@ -2889,21 +2927,31 @@ msgstr "" "toggle [NUMAR [FLAG]] comute il stât di FLAG su pe " "partizion NUMAR" -#: parted/parted.c:2320 +#: parted/parted.c:2452 +msgid "type" +msgstr "" + +#: parted/parted.c:2455 +msgid "" +"type NUMBER TYPE-ID or TYPE-UUID type set TYPE-ID or TYPE-UUID of " +"partition NUMBER" +msgstr "" + +#: parted/parted.c:2460 msgid "unit" msgstr "unit" -#: parted/parted.c:2323 +#: parted/parted.c:2463 msgid "unit UNIT set the default unit to UNIT" msgstr "" "unit UNITÂT stabilìs la unitât predefinide a " "UNITÂT" -#: parted/parted.c:2328 +#: parted/parted.c:2468 msgid "version" msgstr "version" -#: parted/parted.c:2331 +#: parted/parted.c:2471 msgid "" "version display the version number and " "copyright information of GNU Parted" @@ -2911,7 +2959,7 @@ msgstr "" "version mostre il numar di version e lis " "informazions di copyright di GNU Parted" -#: parted/parted.c:2335 +#: parted/parted.c:2475 msgid "" "'version' displays copyright and version information corresponding to this " "copy of GNU Parted\n" @@ -2919,21 +2967,21 @@ msgstr "" "'version' al mostre lis informazions sul copyright e la version relative a " "cheste copie di GNU Parted\n" -#: parted/parted.c:2405 -#, fuzzy, c-format +#: parted/parted.c:2545 +#, c-format msgid "Usage: %s [-hlmsfv] [-a<align>] [DEVICE [COMMAND [PARAMETERS]]...]\n" msgstr "" -"Ûs: %s [-hlmsv] [-a<inlineament >] [DISPOSITÃŽF [COMANT [PARAMETRIS]]...]\n" +"Ûs: %s [-hlmsfv] [-a<inlineament>] [DISPOSITÃŽF [COMANT [PARAMETRIS]]...]\n" -#: parted/parted.c:2449 +#: parted/parted.c:2589 msgid "No device found" msgstr "Nissun dispositîf cjatât" -#: parted/parted.c:2486 +#: parted/parted.c:2626 msgid "WARNING: You are not superuser. Watch out for permissions.\n" msgstr "ATENZION: No tu sês un superutent. Fâs atenzion ai permès.\n" -#: parted/parted.c:2519 +#: parted/parted.c:2659 msgid "" "You should reinstall your boot loader before rebooting. Read section 4 of " "the Parted User documentation for more information." @@ -2941,7 +2989,7 @@ msgstr "" "Tu âs di tornâ a instalâ il boot loader prime di tornâ a inviâ. Lei la " "sezion 4 de documentazion di Parted par vê plui informazions." -#: parted/parted.c:2526 +#: parted/parted.c:2666 msgid "You may need to update /etc/fstab.\n" msgstr "Al podarès coventâ inzornâ /etc/fstab.\n" @@ -3201,69 +3249,69 @@ msgstr "" "\n" "Erôr: si è presentât un segnâl SIGILL gjenerâl." -#: parted/ui.c:901 +#: parted/ui.c:904 #, c-format msgid "invalid token: %s" msgstr "token no valit: %s" -#: parted/ui.c:1082 +#: parted/ui.c:1085 msgid "Expecting a partition number." msgstr "Si spiete un numar di partizion." -#: parted/ui.c:1091 +#: parted/ui.c:1094 msgid "Partition doesn't exist." msgstr "La partizion no esist." -#: parted/ui.c:1111 +#: parted/ui.c:1114 msgid "Expecting a file system type." msgstr "Si spiete un gjenar di file system." -#: parted/ui.c:1118 +#: parted/ui.c:1121 #, c-format msgid "Unknown file system type \"%s\"." msgstr "Gjenar di file system \"%s\" no cognossût." -#: parted/ui.c:1139 +#: parted/ui.c:1142 msgid "Expecting a disk label type." msgstr "Si spiete un gjenar di etichete di disc." -#: parted/ui.c:1170 parted/ui.c:1206 +#: parted/ui.c:1173 parted/ui.c:1209 msgid "No flags supported" -msgstr "" +msgstr "Nissun flag supuartât" -#: parted/ui.c:1280 +#: parted/ui.c:1283 msgid "Can't create any more partitions." -msgstr "impussibil creâ ancjemò altris partizions." +msgstr "Impussibil creâ ancjemò altris partizions." -#: parted/ui.c:1290 +#: parted/ui.c:1293 msgid "Expecting a partition type." msgstr "Si spiete un gjenar di partizion." -#: parted/ui.c:1439 +#: parted/ui.c:1442 msgid "on" msgstr "on" -#: parted/ui.c:1440 +#: parted/ui.c:1443 msgid "off" msgstr "off" -#: parted/ui.c:1457 +#: parted/ui.c:1460 msgid "optimal" msgstr "otimâl" -#: parted/ui.c:1458 +#: parted/ui.c:1461 msgid "minimal" msgstr "minimâl" -#: parted/ui.c:1591 +#: parted/ui.c:1594 msgid "OPTIONs:" msgstr "OPZIONs:" -#: parted/ui.c:1596 +#: parted/ui.c:1599 msgid "COMMANDs:" msgstr "COMANTs:" -#: parted/ui.c:1599 +#: parted/ui.c:1602 #, c-format msgid "" "\n" @@ -3272,44 +3320,47 @@ msgstr "" "\n" "segnale i erôrs a %s\n" -#: parted/ui.c:1606 +#: parted/ui.c:1609 #, c-format msgid "Using %s\n" msgstr "Al ven doprât %s\n" -#: parted/ui.c:1686 +#: parted/ui.c:1689 msgid "This command does not make sense in non-interactive mode.\n" msgstr "In modalitât no interative, chest comant nol à sens.\n" -#, c-format +#~ msgid "Extended partitions cannot be hidden on msdos disk labels." +#~ msgstr "" +#~ "Lis partizions estesis no puedin jessi platadis su pes etichetis disc " +#~ "msdos." + +#~ msgid "" +#~ "Extended partitions cannot be recovery partitions on msdos disk labels." +#~ msgstr "" +#~ "Lis partizions estesis no puedin jessi partizions di recupar su etichetis " +#~ "disc msdos." + #~ msgid "%s: option '--%s' doesn't allow an argument\n" #~ msgstr "%s: la opzion '--%s' no permet un argoment\n" -#, c-format #~ msgid "%s: unrecognized option '--%s'\n" #~ msgstr "%s: opzion '--%s' no ricognossude\n" -#, c-format #~ msgid "%s: option '-W %s' doesn't allow an argument\n" #~ msgstr "%s: la opzion '-W %s' no permet un argoment\n" -#, c-format #~ msgid "%s: option '-W %s' requires an argument\n" #~ msgstr "%s: la opzion '-W %s' e à bisugne di un argoment\n" -#, c-format #~ msgid "%s home page: <http://www.gnu.org/software/%s/>\n" #~ msgstr "Sît web di %s: <http://www.gnu.org/software/%s/>\n" -#, c-format #~ msgid "invalid %s%s argument '%s'" #~ msgstr "l'argoment \\\"%3$s\\\" di %1$s%2$s nol è valit" -#, c-format #~ msgid "invalid suffix in %s%s argument '%s'" #~ msgstr "il sufìs tal argomento \\\"%3$s\\\" di %1$s%2$s nol è valit" -#, c-format #~ msgid "%s%s argument '%s' too large" #~ msgstr "l'argoment \\\"%3$s\\\" di %1$s%2$s al è masse grant" @@ -3330,7 +3381,6 @@ msgstr "In modalitât no interative, chest comant nol à sens.\n" #~ "boot loader. Lei la sezion 4 de documentazion di Parted par vê plui " #~ "informazions." -#, c-format #~ msgid "" #~ "The partition table on %s cannot be re-read (%s). This means the Hurd " #~ "knows nothing about any modifications you made. You should reboot your " @@ -3343,7 +3393,6 @@ msgstr "In modalitât no interative, chest comant nol à sens.\n" #~ msgid "The boot region doesn't start at the start of the partition." #~ msgstr "La regjon di inviament/boot no scomence al inizi de partizion." -#, c-format #~ msgid "" #~ "This file system has a logical sector size of %d. GNU Parted is known " #~ "not to work properly with sector sizes other than 512 bytes." @@ -3351,7 +3400,6 @@ msgstr "In modalitât no interative, chest comant nol à sens.\n" #~ "Il file systen al à une dimension di setôr logjic di %d. Si sa che GNU " #~ "Parted nol lavore ben cun dimensions di setôr diviers di 512 byte." -#, c-format #~ msgid "" #~ "The file %s is marked as a system file. This means moving it could cause " #~ "some programs to stop working." Binary files differ@@ -13,7 +13,7 @@ msgid "" msgstr "" "Project-Id-Version: parted 3.1\n" "Report-Msgid-Bugs-To: bug-parted@gnu.org\n" -"POT-Creation-Date: 2022-04-18 14:44-0400\n" +"POT-Creation-Date: 2023-04-10 15:50-0700\n" "PO-Revision-Date: 2012-11-11 15:50+0100\n" "Last-Translator: Leandro Regueiro <leandro.regueiro@gmail.com>\n" "Language-Team: Galician <proxecto@trasno.net>\n" @@ -24,25 +24,25 @@ msgstr "" "X-Bugs: Report translation errors to the Language-Team address.\n" "Plural-Forms: nplurals=2; plural=(n != 1);\n" -#: lib/argmatch.c:147 +#: lib/argmatch.c:145 #, c-format msgid "invalid argument %s for %s" msgstr "argumento incorrecto %s para %s" -#: lib/argmatch.c:148 +#: lib/argmatch.c:146 #, c-format msgid "ambiguous argument %s for %s" msgstr "argumento %s ambiguo para %s" -#: lib/argmatch.c:167 lib/argmatch.h:238 +#: lib/argmatch.c:165 lib/argmatch.h:237 msgid "Valid arguments are:" msgstr "Os argumentos válidos son:" -#: lib/closeout.c:122 libparted/labels/fdasd.c:145 +#: lib/closeout.c:121 libparted/labels/fdasd.c:145 msgid "write error" msgstr "erro de escritura" -#: lib/error.c:195 +#: lib/error.c:193 msgid "Unknown system error" msgstr "Erro de sistema descoñecido" @@ -102,11 +102,11 @@ msgstr "%s: a opción require un argumento -- «%c»\n" #. If you don't know what to put here, please see #. <https://en.wikipedia.org/wiki/Quotation_marks_in_other_languages> #. and use glyphs suitable for your language. -#: lib/quotearg.c:355 +#: lib/quotearg.c:354 msgid "`" msgstr "«" -#: lib/quotearg.c:356 +#: lib/quotearg.c:355 msgid "'" msgstr "»" @@ -189,7 +189,7 @@ msgstr "Non hai ningunha expresión regular anterior" #. To enquire the regular expression that your system uses for this #. purpose, you can use the command #. locale -k LC_MESSAGES | grep '^yesexpr=' -#: lib/rpmatch.c:150 +#: lib/rpmatch.c:149 msgid "^[yY]" msgstr "^[sSyY]" @@ -199,7 +199,7 @@ msgstr "^[sSyY]" #. To enquire the regular expression that your system uses for this #. purpose, you can use the command #. locale -k LC_MESSAGES | grep '^noexpr=' -#: lib/rpmatch.c:163 +#: lib/rpmatch.c:162 msgid "^[nN]" msgstr "^[nN]" @@ -738,21 +738,21 @@ msgstr "" msgid "Unknown disk flag, %d." msgstr "Modificador de particións descoñecido, %d." -#: libparted/disk.c:1289 +#: libparted/disk.c:1320 #, c-format msgid "%s disk labels do not support extended partitions." msgstr "As etiquetas de disco %s non admiten particións estendidas." -#: libparted/disk.c:1821 +#: libparted/disk.c:1990 #, c-format msgid "%s disk labels don't support logical or extended partitions." msgstr "As etiquetas de disco %s non admiten particións lóxicas ou estendidas." -#: libparted/disk.c:1834 +#: libparted/disk.c:2003 msgid "Too many primary partitions." msgstr "Demasiadas particións primarias." -#: libparted/disk.c:1843 +#: libparted/disk.c:2012 #, c-format msgid "" "Can't add a logical partition to %s, because there is no extended partition." @@ -760,142 +760,146 @@ msgstr "" "Non é posÃbel engadir unha partición lóxica a %s, porque non hai unha " "partición estendida." -#: libparted/disk.c:1867 +#: libparted/disk.c:2036 #, c-format msgid "Can't have more than one extended partition on %s." msgstr "Non é posÃbel ter máis de unha partición estendida en %s." -#: libparted/disk.c:1877 +#: libparted/disk.c:2046 msgid "Can't have logical partitions outside of the extended partition." msgstr "Non é posÃbel ter particións lóxicas fóra da partición estendida." -#: libparted/disk.c:1902 +#: libparted/disk.c:2071 #, c-format msgid "Can't have a logical partition outside of the extended partition on %s." msgstr "" "Non é posÃbel ter unha partición lóxica fóra da partición estendida en %s." -#: libparted/disk.c:1912 +#: libparted/disk.c:2081 msgid "Can't have a primary partition inside an extended partition." msgstr "" "Non é posÃbel ter unha partición primaria dentro dunha partición estendida." -#: libparted/disk.c:1921 +#: libparted/disk.c:2090 msgid "Can't have a partition outside the disk!" msgstr "Non é posÃbel ter unha partición fóra do disco!" -#: libparted/disk.c:1972 libparted/disk.c:2150 +#: libparted/disk.c:2141 libparted/disk.c:2319 msgid "Can't have overlapping partitions." msgstr "Non é posÃbel ter particións que se solapen." -#: libparted/disk.c:2351 +#: libparted/disk.c:2520 msgid "metadata" msgstr "metadatos" -#: libparted/disk.c:2353 +#: libparted/disk.c:2522 msgid "free" msgstr "libre" -#: libparted/disk.c:2355 parted/ui.c:1271 parted/ui.c:1299 +#: libparted/disk.c:2524 parted/ui.c:1274 parted/ui.c:1302 msgid "extended" msgstr "estendida" -#: libparted/disk.c:2357 parted/ui.c:1275 parted/ui.c:1303 +#: libparted/disk.c:2526 parted/ui.c:1278 parted/ui.c:1306 msgid "logical" msgstr "lóxica" -#: libparted/disk.c:2359 parted/ui.c:1267 parted/ui.c:1295 +#: libparted/disk.c:2528 parted/ui.c:1270 parted/ui.c:1298 msgid "primary" msgstr "primaria" -#: libparted/disk.c:2375 +#: libparted/disk.c:2544 msgid "boot" msgstr "arranque" -#: libparted/disk.c:2377 +#: libparted/disk.c:2546 msgid "bios_grub" msgstr "bios_grub" -#: libparted/disk.c:2379 +#: libparted/disk.c:2548 msgid "root" msgstr "raÃz" -#: libparted/disk.c:2381 +#: libparted/disk.c:2550 msgid "swap" msgstr "intercambio" -#: libparted/disk.c:2383 +#: libparted/disk.c:2552 msgid "hidden" msgstr "oculta" -#: libparted/disk.c:2385 +#: libparted/disk.c:2554 msgid "raid" msgstr "raid" -#: libparted/disk.c:2387 +#: libparted/disk.c:2556 msgid "lvm" msgstr "lvm" -#: libparted/disk.c:2389 +#: libparted/disk.c:2558 msgid "lba" msgstr "lba" -#: libparted/disk.c:2391 +#: libparted/disk.c:2560 msgid "hp-service" msgstr "hp-service" -#: libparted/disk.c:2393 +#: libparted/disk.c:2562 msgid "palo" msgstr "palo" -#: libparted/disk.c:2395 +#: libparted/disk.c:2564 msgid "prep" msgstr "prep" -#: libparted/disk.c:2397 +#: libparted/disk.c:2566 msgid "msftres" msgstr "msftres" -#: libparted/disk.c:2399 +#: libparted/disk.c:2568 #, fuzzy msgid "msftdata" msgstr "metadatos" -#: libparted/disk.c:2401 +#: libparted/disk.c:2570 msgid "atvrecv" msgstr "atvrecv" -#: libparted/disk.c:2403 +#: libparted/disk.c:2572 msgid "diag" msgstr "diag" -#: libparted/disk.c:2405 +#: libparted/disk.c:2574 msgid "legacy_boot" msgstr "legacy_boot" -#: libparted/disk.c:2407 +#: libparted/disk.c:2576 msgid "irst" msgstr "" -#: libparted/disk.c:2409 +#: libparted/disk.c:2578 #, fuzzy msgid "esp" msgstr "Si" -#: libparted/disk.c:2411 +#: libparted/disk.c:2580 msgid "chromeos_kernel" msgstr "" -#: libparted/disk.c:2413 +#: libparted/disk.c:2582 #, fuzzy msgid "bls_boot" msgstr "arranque" -#: libparted/disk.c:2415 +#: libparted/disk.c:2584 msgid "linux-home" msgstr "" -#: libparted/disk.c:2421 +#: libparted/disk.c:2586 +msgid "no_automount" +msgstr "" + +#: libparted/disk.c:2592 #, fuzzy, c-format msgid "Unknown partition flag, %d." msgstr "Modificador de particións descoñecido, %d." @@ -1084,8 +1088,8 @@ msgid "" msgstr "" #: libparted/labels/atari.c:1662 libparted/labels/bsd.c:563 -#: libparted/labels/dasd.c:895 libparted/labels/dos.c:2303 -#: libparted/labels/dvh.c:770 libparted/labels/gpt.c:1769 +#: libparted/labels/dasd.c:893 libparted/labels/dos.c:2294 +#: libparted/labels/dvh.c:770 libparted/labels/gpt.c:1891 #: libparted/labels/loop.c:244 libparted/labels/mac.c:1409 #: libparted/labels/pc98.c:697 libparted/labels/rdb.c:1054 #: libparted/labels/sun.c:781 @@ -1107,40 +1111,29 @@ msgstr "Non foi posÃbel asignar un número de partición." msgid "Unable to allocate a bsd disklabel slot." msgstr "" -#: libparted/labels/dasd.c:626 +#: libparted/labels/dasd.c:634 msgid "The partition table of DASD-LDL device cannot be changed.\n" msgstr "" -#: libparted/labels/dasd.c:921 +#: libparted/labels/dasd.c:919 msgid "Unable to allocate a dasd disklabel slot" msgstr "" -#: libparted/labels/dos.c:1008 +#: libparted/labels/dos.c:1159 #, c-format msgid "Invalid partition table on %s -- wrong signature %x." msgstr "Táboa de particións incorrecta en %s -- sinatura %x incorrecta." -#: libparted/labels/dos.c:1036 +#: libparted/labels/dos.c:1187 #, c-format msgid "Invalid partition table - recursive partition on %s." msgstr "Táboa de particións incorrecta - partición recursiva en %s." -#: libparted/labels/dos.c:1567 -msgid "Extended partitions cannot be hidden on msdos disk labels." -msgstr "" -"As particións estendidas non poden estar ocultas en etiquetas de disco msdos." - -#: libparted/labels/dos.c:1579 -#, fuzzy -msgid "Extended partitions cannot be recovery partitions on msdos disk labels." -msgstr "" -"As particións estendidas non poden estar ocultas en etiquetas de disco msdos." - -#: libparted/labels/dos.c:2285 +#: libparted/labels/dos.c:2276 msgid "Parted can't resize partitions managed by Windows Dynamic Disk." msgstr "" -#: libparted/labels/dos.c:2541 +#: libparted/labels/dos.c:2532 msgid "cannot create any more partitions" msgstr "non é posÃbel crear máis particións" @@ -1282,12 +1275,12 @@ msgstr "" msgid "Disk geometry does not match a DASD device of type 3390." msgstr "" -#: libparted/labels/gpt.c:569 +#: libparted/labels/gpt.c:589 #, fuzzy msgid "device is too small for GPT" msgstr "O sistema de ficheiros é pequeno de máis para ext2." -#: libparted/labels/gpt.c:771 +#: libparted/labels/gpt.c:791 #, c-format msgid "" "The format of the GPT partition table is version %x, which is newer than " @@ -1296,7 +1289,7 @@ msgstr "" "O formato da táboa de partición GPT é da versión %x, que é máis recente do " "que Parted pode recoñecer. Por favor infórmenos!" -#: libparted/labels/gpt.c:807 +#: libparted/labels/gpt.c:827 #, c-format msgid "" "Not all of the space available to %s appears to be used, you can fix the GPT " @@ -1304,7 +1297,7 @@ msgid "" "setting? " msgstr "" -#: libparted/labels/gpt.c:1006 +#: libparted/labels/gpt.c:1026 #, fuzzy msgid "" "The backup GPT table is not at the end of the disk, as it should be. Fix, " @@ -1315,7 +1308,7 @@ msgstr "" "máis pequeno. Quere arranxalo, movendo a copia de seguridade ao final (e " "retirando a copia vella)?" -#: libparted/labels/gpt.c:1024 +#: libparted/labels/gpt.c:1044 msgid "" "Both the primary and backup GPT tables are corrupt. Try making a fresh " "table, and using Parted's rescue feature to recover partitions." @@ -1324,7 +1317,7 @@ msgstr "" "Probe a crear unha táboa nova e a empregar a caracterÃstica de rescate " "(rescue) de Parted para recuperar as particións." -#: libparted/labels/gpt.c:1035 +#: libparted/labels/gpt.c:1055 msgid "" "The backup GPT table is corrupt, but the primary appears OK, so that will be " "used." @@ -1332,7 +1325,7 @@ msgstr "" "A copia de seguridade da táboa GPT está danada, pero a primaria semella " "estar ben, asà que é a que se ha empregar." -#: libparted/labels/gpt.c:1047 +#: libparted/labels/gpt.c:1067 msgid "" "The primary GPT table is corrupt, but the backup appears OK, so that will be " "used." @@ -1340,11 +1333,11 @@ msgstr "" "A táboa GPT primaria está danada, pero a copia de seguridade semella estar " "ben, asà que é a que se ha empregar." -#: libparted/labels/gpt.c:1071 +#: libparted/labels/gpt.c:1091 msgid "primary partition table array CRC mismatch" msgstr "" -#: libparted/labels/gpt.c:1655 libparted/labels/gpt.c:1682 +#: libparted/labels/gpt.c:1722 libparted/labels/gpt.c:1749 #, fuzzy msgid "failed to translate partition name" msgstr "Non foi posÃbel asignar un número de partición." @@ -2024,7 +2017,7 @@ msgstr "fat_table_alloc_cluster: non hai clusters libres" msgid "Could not detect file system." msgstr "Non é posÃbel detectar un sistema de ficheiros." -#: libparted/fs/r/filesys.c:159 libparted/fs/r/filesys.c:284 +#: libparted/fs/r/filesys.c:159 libparted/fs/r/filesys.c:285 #, c-format msgid "resizing %s file systems is not supported" msgstr "" @@ -2284,39 +2277,39 @@ msgstr "" msgid "This HFS+ volume has no extents overflow file. This is quite unusual!" msgstr "" -#: parted/parted.c:137 +#: parted/parted.c:138 msgid "displays this help message" msgstr "mostra esta mensaxe de axuda" -#: parted/parted.c:138 +#: parted/parted.c:139 msgid "lists partition layout on all block devices" msgstr "lista a disposición das particións de todos os dispositivos de bloques" -#: parted/parted.c:139 +#: parted/parted.c:140 msgid "displays machine parseable output" msgstr "" -#: parted/parted.c:140 +#: parted/parted.c:141 msgid "displays JSON output" msgstr "" -#: parted/parted.c:141 +#: parted/parted.c:142 msgid "never prompts for user intervention" msgstr "non pedir nunca a intervención do usuario" -#: parted/parted.c:142 +#: parted/parted.c:143 msgid "in script mode, fix instead of abort when asked" msgstr "" -#: parted/parted.c:143 +#: parted/parted.c:144 msgid "displays the version" msgstr "mostra a versión" -#: parted/parted.c:144 +#: parted/parted.c:145 msgid "alignment for new partitions" msgstr "" -#: parted/parted.c:157 +#: parted/parted.c:158 msgid "" "NUMBER is the partition number used by Linux. On MS-DOS disk labels, the " "primary partitions number from 1 to 4, logical partitions from 5 onwards.\n" @@ -2325,58 +2318,62 @@ msgstr "" "as particións primarias teñen números de 1 a 4, e as lóxicas téñenos do 5 en " "diante.\n" -#: parted/parted.c:160 +#: parted/parted.c:161 msgid "LABEL-TYPE is one of: " msgstr "TIPO-ETIQUETA é un destes: " -#: parted/parted.c:161 parted/parted.c:162 +#: parted/parted.c:162 parted/parted.c:163 msgid "FLAG is one of: " msgstr "MODIF é un destes: " -#: parted/parted.c:163 +#: parted/parted.c:164 msgid "UNIT is one of: " msgstr "" -#: parted/parted.c:164 +#: parted/parted.c:165 msgid "desired alignment: minimum or optimal" msgstr "" -#: parted/parted.c:165 +#: parted/parted.c:166 msgid "PART-TYPE is one of: primary, logical, extended\n" msgstr "" "TIPO-PARTICION é: primary (primaria), logical (lóxica), extended " "(estendida)\n" -#: parted/parted.c:167 +#: parted/parted.c:168 msgid "FS-TYPE is one of: " msgstr "TIPO-SF é un destes: " -#: parted/parted.c:168 +#: parted/parted.c:169 msgid "" "START and END are disk locations, such as 4GB or 10%. Negative values count " "from the end of the disk. For example, -1s specifies exactly the last " "sector.\n" msgstr "" -#: parted/parted.c:171 +#: parted/parted.c:172 msgid "" "END is disk location, such as 4GB or 10%. Negative value counts from the " "end of the disk. For example, -1s specifies exactly the last sector.\n" msgstr "" -#: parted/parted.c:174 +#: parted/parted.c:175 msgid "STATE is one of: on, off\n" msgstr "ESTADO é un destes: on, off\n" -#: parted/parted.c:175 +#: parted/parted.c:176 msgid "DEVICE is usually /dev/hda or /dev/sda\n" msgstr "DISPOSITIVO adoita ser /dev/hda ou /dev/sda\n" -#: parted/parted.c:176 +#: parted/parted.c:177 msgid "NAME is any word you want\n" msgstr "NOME é calquera palabra que queira\n" -#: parted/parted.c:179 +#: parted/parted.c:178 +msgid "TYPE_ID is a value between 0x01 and 0xff, TYPE_UUID is a UUID\n" +msgstr "" + +#: parted/parted.c:182 msgid "" "Copyright (C) 1998 - 2006 Free Software Foundation, Inc.\n" "This program is free software, covered by the GNU General Public License.\n" @@ -2396,152 +2393,176 @@ msgstr "" "Licenza Pública Xeral de GNU para obter máis detalles.\n" "\n" -#: parted/parted.c:229 +#: parted/parted.c:232 #, c-format msgid "%0.f%%\t(time left %.2d:%.2d)" msgstr "%0.f%%\t(tempo restante %.2d:%.2d)" -#: parted/parted.c:248 +#: parted/parted.c:251 #, fuzzy, c-format msgid "Partition %s is being used. Are you sure you want to continue?" msgstr "Estase a usa-la partición %s." -#: parted/parted.c:269 +#: parted/parted.c:272 #, c-format msgid "Partition(s) on %s are being used." msgstr "Esta(n)se a usar a(s) partición(s) de %s." -#: parted/parted.c:281 +#: parted/parted.c:284 #, c-format msgid "" "The existing disk label on %s will be destroyed and all data on this disk " "will be lost. Do you want to continue?" msgstr "" -#: parted/parted.c:542 +#: parted/parted.c:545 msgid "New disk label type?" msgstr "Novo tipo de etiqueta de disco?" -#: parted/parted.c:680 +#: parted/parted.c:692 msgid "Partition type?" msgstr "Tipo de partición?" -#: parted/parted.c:698 parted/parted.c:902 +#: parted/parted.c:710 parted/parted.c:914 msgid "Partition name?" msgstr "Nome da partición?" -#: parted/parted.c:708 +#: parted/parted.c:720 msgid "File system type?" msgstr "Tipo de sistema de ficheiros?" -#: parted/parted.c:713 parted/parted.c:1683 +#: parted/parted.c:725 parted/parted.c:1815 msgid "Start?" msgstr "Inicio?" -#: parted/parted.c:715 parted/parted.c:1685 parted/parted.c:1768 +#: parted/parted.c:727 parted/parted.c:1817 parted/parted.c:1900 msgid "End?" msgstr "Fin?" -#: parted/parted.c:782 +#: parted/parted.c:794 #, c-format msgid "" "You requested a partition from %s to %s (sectors %llu..%llu).\n" "The closest location we can manage is %s to %s (sectors %llu..%llu).%s" msgstr "" -#: parted/parted.c:791 +#: parted/parted.c:803 msgid "" "\n" "Is this still acceptable to you?" msgstr "" -#: parted/parted.c:814 +#: parted/parted.c:826 #, c-format msgid "" "The resulting partition is not properly aligned for best performance: %s" msgstr "" -#: parted/parted.c:816 parted/parted.c:1925 +#: parted/parted.c:828 parted/parted.c:2057 msgid "unknown (malloc failed)" msgstr "" -#: parted/parted.c:894 +#: parted/parted.c:906 #, fuzzy, c-format msgid "%s disk labels do not support partition name." msgstr "As etiquetas de disco %s non admiten particións estendidas." -#: parted/parted.c:899 parted/parted.c:1748 parted/parted.c:1814 -#: parted/parted.c:1908 parted/parted.c:1983 +#: parted/parted.c:911 parted/parted.c:955 parted/parted.c:1880 +#: parted/parted.c:1946 parted/parted.c:2040 parted/parted.c:2115 msgid "Partition number?" msgstr "Número de partición?" -#: parted/parted.c:1050 +#: parted/parted.c:949 +#, fuzzy, c-format +msgid "%s disk labels do not support partition type." +msgstr "As etiquetas de disco %s non admiten particións estendidas." + +#: parted/parted.c:965 +#, fuzzy +msgid "Partition type-id?" +msgstr "Tipo de partición?" + +#: parted/parted.c:972 +#, fuzzy +msgid "Invalid type-id." +msgstr "Fin de intervalo non válida" + +#: parted/parted.c:986 +#, fuzzy +msgid "Partition type-uuid?" +msgstr "Tipo de partición?" + +#: parted/parted.c:993 +msgid "Invalid type-uuid." +msgstr "" + +#: parted/parted.c:1146 #, c-format msgid "BIOS cylinder,head,sector geometry: %d,%d,%d. Each cylinder is %s.\n" msgstr "" -#: parted/parted.c:1137 +#: parted/parted.c:1240 #, c-format msgid "Model: %s (%s)\n" msgstr "Modelo: %s (%s)\n" -#: parted/parted.c:1139 +#: parted/parted.c:1242 #, c-format msgid "Disk %s: %s\n" msgstr "Disco %s: %s\n" -#: parted/parted.c:1140 +#: parted/parted.c:1243 #, c-format msgid "Sector size (logical/physical): %lldB/%lldB\n" msgstr "" -#: parted/parted.c:1152 +#: parted/parted.c:1255 #, c-format msgid "Partition Table: %s\n" msgstr "Táboa de particións: %s\n" -#: parted/parted.c:1153 +#: parted/parted.c:1256 #, c-format msgid "Disk Flags: %s\n" msgstr "" -#: parted/parted.c:1279 parted/parted.c:1282 +#: parted/parted.c:1388 parted/parted.c:1391 msgid "Number" msgstr "Número" -#: parted/parted.c:1279 parted/parted.c:1282 +#: parted/parted.c:1388 parted/parted.c:1391 msgid "Start" msgstr "Inicio" -#: parted/parted.c:1280 parted/parted.c:1283 +#: parted/parted.c:1389 parted/parted.c:1392 msgid "End" msgstr "Fin" -#: parted/parted.c:1283 +#: parted/parted.c:1392 msgid "Size" msgstr "Tamaño" -#: parted/parted.c:1287 +#: parted/parted.c:1396 msgid "Type" msgstr "Tipo" -#: parted/parted.c:1289 +#: parted/parted.c:1398 msgid "File system" msgstr "Sistema de ficheiros" -#: parted/parted.c:1292 +#: parted/parted.c:1401 msgid "Name" msgstr "Nome" -#: parted/parted.c:1294 +#: parted/parted.c:1403 msgid "Flags" msgstr "Modificadores" -#: parted/parted.c:1352 +#: parted/parted.c:1461 msgid "Free Space" msgstr "Espazo libre" -#: parted/parted.c:1570 +#: parted/parted.c:1702 #, c-format msgid "" "A %s %s partition was found at %s -> %s. Do you want to add it to the " @@ -2550,78 +2571,78 @@ msgstr "" "Atopouse unha partición %s %s en %s -> %s. Quere engadila á táboa de " "particións?" -#: parted/parted.c:1613 +#: parted/parted.c:1745 msgid "searching for file systems" msgstr "buscando sistemas de ficheiros" -#: parted/parted.c:1720 +#: parted/parted.c:1852 msgid "The resize command has been removed in parted 3.0" msgstr "" -#: parted/parted.c:1782 +#: parted/parted.c:1914 msgid "" "Shrinking a partition can cause data loss, are you sure you want to continue?" msgstr "" -#: parted/parted.c:1838 +#: parted/parted.c:1970 msgid "New device?" msgstr "Novo dispositivo?" -#: parted/parted.c:1906 +#: parted/parted.c:2038 msgid "alignment type(min/opt)" msgstr "" -#: parted/parted.c:1921 +#: parted/parted.c:2053 #, c-format msgid "%d aligned\n" msgstr "" -#: parted/parted.c:1923 +#: parted/parted.c:2055 #, c-format msgid "%d not aligned: %s\n" msgstr "" -#: parted/parted.c:1948 parted/parted.c:1985 +#: parted/parted.c:2080 parted/parted.c:2117 msgid "Flag to Invert?" msgstr "" -#: parted/parted.c:1953 parted/parted.c:1990 +#: parted/parted.c:2085 parted/parted.c:2122 msgid "New state?" msgstr "Novo estado?" -#: parted/parted.c:2036 +#: parted/parted.c:2168 msgid "Unit?" msgstr "" -#: parted/parted.c:2171 +#: parted/parted.c:2303 msgid "align-check" msgstr "align-check" -#: parted/parted.c:2174 +#: parted/parted.c:2306 msgid "" "align-check TYPE N check partition N for TYPE(min|opt) " "alignment" msgstr "" -#: parted/parted.c:2182 +#: parted/parted.c:2314 msgid "help" msgstr "help" -#: parted/parted.c:2185 +#: parted/parted.c:2317 msgid "" "help [COMMAND] print general help, or help on " "COMMAND" msgstr "help [ORDE] mostrar axuda xeral, ou axuda sobre a ORDE" -#: parted/parted.c:2191 +#: parted/parted.c:2323 msgid "mklabel" msgstr "mklabel" -#: parted/parted.c:2191 +#: parted/parted.c:2323 msgid "mktable" msgstr "mktable" -#: parted/parted.c:2194 +#: parted/parted.c:2326 msgid "" "mklabel,mktable LABEL-TYPE create a new disklabel (partition " "table)" @@ -2629,15 +2650,15 @@ msgstr "" "mklabel, mktable TIPO-ETIQUETA crear unha nova etiqueta de disco " "(táboa de particións)" -#: parted/parted.c:2200 +#: parted/parted.c:2332 msgid "mkpart" msgstr "mkpart" -#: parted/parted.c:2203 +#: parted/parted.c:2335 msgid "mkpart PART-TYPE [FS-TYPE] START END make a partition" msgstr "mkpart TIPO-PARTICION [TIPO-FS] INICIO FIN crear unha partición" -#: parted/parted.c:2209 +#: parted/parted.c:2341 msgid "" "'mkpart' makes a partition without creating a new file system on the " "partition. FS-TYPE may be specified to set an appropriate partition ID.\n" @@ -2646,20 +2667,20 @@ msgstr "" "partición. Debe especificarse TIPO-SF para definir un ID de partición " "axeitado.\n" -#: parted/parted.c:2214 +#: parted/parted.c:2346 msgid "name" msgstr "name" -#: parted/parted.c:2217 +#: parted/parted.c:2349 msgid "name NUMBER NAME name partition NUMBER as NAME" msgstr "" "name NÚMERO NOME ponlle o NOME á partición NÚMERO" -#: parted/parted.c:2222 +#: parted/parted.c:2354 msgid "print" msgstr "print" -#: parted/parted.c:2225 +#: parted/parted.c:2357 #, fuzzy msgid "" "print [devices|free|list,all] display the partition table, or " @@ -2667,7 +2688,7 @@ msgid "" msgstr "" "print [MENOR] amosa-la táboa de particións ou unha partición" -#: parted/parted.c:2229 +#: parted/parted.c:2361 msgid "" "Without arguments, 'print' displays the entire partition table. However with " "the following arguments it performs various other actions.\n" @@ -2675,34 +2696,34 @@ msgstr "" "Sen argumentos, «print» mostra toda a táboa de particións. AÃnda asà cos " "seguintes argumentos realiza outras accións.\n" -#: parted/parted.c:2231 +#: parted/parted.c:2363 msgid " devices : display all active block devices\n" msgstr "" -#: parted/parted.c:2232 +#: parted/parted.c:2364 msgid "" " free : display information about free unpartitioned space on the " "current block device\n" msgstr "" -#: parted/parted.c:2234 +#: parted/parted.c:2366 msgid "" " list, all : display the partition tables of all active block devices\n" msgstr "" -#: parted/parted.c:2238 +#: parted/parted.c:2370 msgid "quit" msgstr "quit" -#: parted/parted.c:2241 +#: parted/parted.c:2373 msgid "quit exit program" msgstr "quit saÃr do programa" -#: parted/parted.c:2246 +#: parted/parted.c:2378 msgid "rescue" msgstr "rescue" -#: parted/parted.c:2249 +#: parted/parted.c:2381 msgid "" "rescue START END rescue a lost partition near START " "and END" @@ -2710,118 +2731,128 @@ msgstr "" "rescue INICIO FIN recupera unha partición perdida " "entre INICIO e FIN" -#: parted/parted.c:2255 +#: parted/parted.c:2387 msgid "resize" msgstr "resize" -#: parted/parted.c:2258 +#: parted/parted.c:2390 msgid "The resize command was removed in parted 3.0\n" msgstr "" -#: parted/parted.c:2261 +#: parted/parted.c:2393 #, fuzzy msgid "resizepart" msgstr "resize" -#: parted/parted.c:2264 +#: parted/parted.c:2396 #, fuzzy msgid "resizepart NUMBER END resize partition NUMBER" msgstr "rm NÚMERO eliminar a partición NÚMERO" -#: parted/parted.c:2269 +#: parted/parted.c:2401 msgid "rm" msgstr "rm" -#: parted/parted.c:2272 +#: parted/parted.c:2404 msgid "rm NUMBER delete partition NUMBER" msgstr "rm NÚMERO eliminar a partición NÚMERO" -#: parted/parted.c:2277 +#: parted/parted.c:2409 msgid "select" msgstr "select" -#: parted/parted.c:2280 +#: parted/parted.c:2412 msgid "select DEVICE choose the device to edit" msgstr "" "select DISPOSITIVO escoller o dispositivo a editar" -#: parted/parted.c:2285 +#: parted/parted.c:2417 msgid "disk_set" msgstr "disk_set" -#: parted/parted.c:2288 +#: parted/parted.c:2420 msgid "" "disk_set FLAG STATE change the FLAG on selected device" msgstr "" -#: parted/parted.c:2293 +#: parted/parted.c:2425 msgid "disk_toggle" msgstr "disk_toggle" -#: parted/parted.c:2296 +#: parted/parted.c:2428 msgid "" "disk_toggle [FLAG] toggle the state of FLAG on " "selected device" msgstr "" -#: parted/parted.c:2302 +#: parted/parted.c:2434 msgid "set" msgstr "set" -#: parted/parted.c:2305 +#: parted/parted.c:2437 #, fuzzy msgid "" "set NUMBER FLAG STATE change the FLAG on partition NUMBER" msgstr "set MENOR MODIF ESTADO cambiar un MODIFicador na partición MENOR" -#: parted/parted.c:2311 +#: parted/parted.c:2443 msgid "toggle" msgstr "toggle" -#: parted/parted.c:2314 +#: parted/parted.c:2446 msgid "" "toggle [NUMBER [FLAG]] toggle the state of FLAG on " "partition NUMBER" msgstr "" -#: parted/parted.c:2320 +#: parted/parted.c:2452 +msgid "type" +msgstr "" + +#: parted/parted.c:2455 +msgid "" +"type NUMBER TYPE-ID or TYPE-UUID type set TYPE-ID or TYPE-UUID of " +"partition NUMBER" +msgstr "" + +#: parted/parted.c:2460 msgid "unit" msgstr "unit" -#: parted/parted.c:2323 +#: parted/parted.c:2463 msgid "unit UNIT set the default unit to UNIT" msgstr "" -#: parted/parted.c:2328 +#: parted/parted.c:2468 msgid "version" msgstr "version" -#: parted/parted.c:2331 +#: parted/parted.c:2471 msgid "" "version display the version number and " "copyright information of GNU Parted" msgstr "" -#: parted/parted.c:2335 +#: parted/parted.c:2475 msgid "" "'version' displays copyright and version information corresponding to this " "copy of GNU Parted\n" msgstr "" -#: parted/parted.c:2405 +#: parted/parted.c:2545 #, c-format msgid "Usage: %s [-hlmsfv] [-a<align>] [DEVICE [COMMAND [PARAMETERS]]...]\n" msgstr "" -#: parted/parted.c:2449 +#: parted/parted.c:2589 msgid "No device found" msgstr "Non se atopou ningún dispositivo" -#: parted/parted.c:2486 +#: parted/parted.c:2626 msgid "WARNING: You are not superuser. Watch out for permissions.\n" msgstr "" -#: parted/parted.c:2519 +#: parted/parted.c:2659 msgid "" "You should reinstall your boot loader before rebooting. Read section 4 of " "the Parted User documentation for more information." @@ -2829,7 +2860,7 @@ msgstr "" "DeberÃa reinstalar o cargador de arranque antes de reiniciar. Lea a sección " "4 da documentación de Usuario de Parted para obter máis información." -#: parted/parted.c:2526 +#: parted/parted.c:2666 msgid "You may need to update /etc/fstab.\n" msgstr "Non esqueza actualizar /etc/fstab, se é necesario.\n" @@ -3014,69 +3045,69 @@ msgid "" "Error: A general SIGILL signal was encountered." msgstr "" -#: parted/ui.c:901 +#: parted/ui.c:904 #, c-format msgid "invalid token: %s" msgstr "" -#: parted/ui.c:1082 +#: parted/ui.c:1085 msgid "Expecting a partition number." msgstr "Espérase un número de partición." -#: parted/ui.c:1091 +#: parted/ui.c:1094 msgid "Partition doesn't exist." msgstr "A partición non existe." -#: parted/ui.c:1111 +#: parted/ui.c:1114 msgid "Expecting a file system type." msgstr "Espérase un tipo de sistema de ficheiros." -#: parted/ui.c:1118 +#: parted/ui.c:1121 #, c-format msgid "Unknown file system type \"%s\"." msgstr "Tipo de sistema de ficheiros «%s» descoñecido." -#: parted/ui.c:1139 +#: parted/ui.c:1142 msgid "Expecting a disk label type." msgstr "Espérase un tipo de etiqueta de disco." -#: parted/ui.c:1170 parted/ui.c:1206 +#: parted/ui.c:1173 parted/ui.c:1209 msgid "No flags supported" msgstr "" -#: parted/ui.c:1280 +#: parted/ui.c:1283 msgid "Can't create any more partitions." msgstr "Non é posÃbel crear máis particións." -#: parted/ui.c:1290 +#: parted/ui.c:1293 msgid "Expecting a partition type." msgstr "Espérase un tipo de partición." -#: parted/ui.c:1439 +#: parted/ui.c:1442 msgid "on" msgstr "on" -#: parted/ui.c:1440 +#: parted/ui.c:1443 msgid "off" msgstr "off" -#: parted/ui.c:1457 +#: parted/ui.c:1460 msgid "optimal" msgstr "" -#: parted/ui.c:1458 +#: parted/ui.c:1461 msgid "minimal" msgstr "" -#: parted/ui.c:1591 +#: parted/ui.c:1594 msgid "OPTIONs:" msgstr "OPCIÓNs:" -#: parted/ui.c:1596 +#: parted/ui.c:1599 msgid "COMMANDs:" msgstr "ORDEs:" -#: parted/ui.c:1599 +#: parted/ui.c:1602 #, c-format msgid "" "\n" @@ -3085,12 +3116,12 @@ msgstr "" "\n" "EnvÃe os informes de fallo a: %s\n" -#: parted/ui.c:1606 +#: parted/ui.c:1609 #, c-format msgid "Using %s\n" msgstr "Usando %s\n" -#: parted/ui.c:1686 +#: parted/ui.c:1689 msgid "This command does not make sense in non-interactive mode.\n" msgstr "Esta orde non ten sentido nun modo non interactivo.\n" @@ -3164,6 +3195,11 @@ msgstr "Esta orde non ten sentido nun modo non interactivo.\n" #~ "parted non puido volver ler a táboa de particións de %s (%s). Isto quere " #~ "dicir que Linux non sabe nada sobre as modificacións que vostede fixo. " +#~ msgid "Extended partitions cannot be hidden on msdos disk labels." +#~ msgstr "" +#~ "As particións estendidas non poden estar ocultas en etiquetas de disco " +#~ "msdos." + #, c-format #~ msgid "" #~ "%s contains GPT signatures, indicating that it has a GPT table. However, " Binary files differ@@ -8,7 +8,7 @@ msgid "" msgstr "" "Project-Id-Version: parted 3.1.90\n" "Report-Msgid-Bugs-To: bug-parted@gnu.org\n" -"POT-Creation-Date: 2022-04-18 14:44-0400\n" +"POT-Creation-Date: 2023-04-10 15:50-0700\n" "PO-Revision-Date: 2016-05-27 20:34+0200\n" "Last-Translator: Gabor Kelemen <kelemeng@gnome.hu>\n" "Language-Team: Hungarian <translation-team-hu@lists.sourceforge.net>\n" @@ -21,25 +21,25 @@ msgstr "" "X-Generator: Lokalize 1.5\n" "X-Launchpad-Export-Date: 2016-05-26 09:04+0000\n" -#: lib/argmatch.c:147 +#: lib/argmatch.c:145 #, c-format msgid "invalid argument %s for %s" msgstr "a(z) %s argumentum érvénytelen a következÅ‘höz: %s" -#: lib/argmatch.c:148 +#: lib/argmatch.c:146 #, c-format msgid "ambiguous argument %s for %s" msgstr "a(z) „%s†argumentum nem egyértelmű a következÅ‘höz: „%sâ€" -#: lib/argmatch.c:167 lib/argmatch.h:238 +#: lib/argmatch.c:165 lib/argmatch.h:237 msgid "Valid arguments are:" msgstr "Az érvényes argumentumok a következÅ‘k:" -#: lib/closeout.c:122 libparted/labels/fdasd.c:145 +#: lib/closeout.c:121 libparted/labels/fdasd.c:145 msgid "write error" msgstr "Ãráshiba" -#: lib/error.c:195 +#: lib/error.c:193 msgid "Unknown system error" msgstr "Ismeretlen rendszerhiba" @@ -99,11 +99,11 @@ msgstr "%s: a kapcsoló egy argumentumot igényel -- „%câ€\n" #. If you don't know what to put here, please see #. <https://en.wikipedia.org/wiki/Quotation_marks_in_other_languages> #. and use glyphs suitable for your language. -#: lib/quotearg.c:355 +#: lib/quotearg.c:354 msgid "`" msgstr "„" -#: lib/quotearg.c:356 +#: lib/quotearg.c:355 msgid "'" msgstr "â€" @@ -186,7 +186,7 @@ msgstr "Nincs elÅ‘zÅ‘ reguláris kifejezés" #. To enquire the regular expression that your system uses for this #. purpose, you can use the command #. locale -k LC_MESSAGES | grep '^yesexpr=' -#: lib/rpmatch.c:150 +#: lib/rpmatch.c:149 msgid "^[yY]" msgstr "^[iIyY]" @@ -196,7 +196,7 @@ msgstr "^[iIyY]" #. To enquire the regular expression that your system uses for this #. purpose, you can use the command #. locale -k LC_MESSAGES | grep '^noexpr=' -#: lib/rpmatch.c:163 +#: lib/rpmatch.c:162 msgid "^[nN]" msgstr "^[nN]" @@ -752,159 +752,163 @@ msgstr "pmbr_boot" msgid "Unknown disk flag, %d." msgstr "Ismeretlen lemezjelzÅ‘, %d." -#: libparted/disk.c:1289 +#: libparted/disk.c:1320 #, c-format msgid "%s disk labels do not support extended partitions." msgstr "%s lemez cÃmkéi nem támogatják a kiterjesztett partÃciókat." -#: libparted/disk.c:1821 +#: libparted/disk.c:1990 #, c-format msgid "%s disk labels don't support logical or extended partitions." msgstr "" "A(z) %s lemezcÃmkék nem támogatják a logikai vagy kiterjesztett partÃciókat." -#: libparted/disk.c:1834 +#: libparted/disk.c:2003 msgid "Too many primary partitions." msgstr "Túl sok elsÅ‘dleges partÃció." -#: libparted/disk.c:1843 +#: libparted/disk.c:2012 #, c-format msgid "" "Can't add a logical partition to %s, because there is no extended partition." msgstr "Kiterjesztett partÃció nélkül nem készÃthetÅ‘ logikai partÃció ide: %s." -#: libparted/disk.c:1867 +#: libparted/disk.c:2036 #, c-format msgid "Can't have more than one extended partition on %s." msgstr "Nem lehet egynél több kiterjesztett partÃció itt: %s" -#: libparted/disk.c:1877 +#: libparted/disk.c:2046 msgid "Can't have logical partitions outside of the extended partition." msgstr "Nem lehetnek logikai partÃciók a kiterjesztetten kÃvül." -#: libparted/disk.c:1902 +#: libparted/disk.c:2071 #, c-format msgid "Can't have a logical partition outside of the extended partition on %s." msgstr "Nem lehet logikai partÃció a kiterjesztetten kÃvül itt: %s." -#: libparted/disk.c:1912 +#: libparted/disk.c:2081 msgid "Can't have a primary partition inside an extended partition." msgstr "Nem lehet elsÅ‘dleges partÃció egy kiterjesztettben." -#: libparted/disk.c:1921 +#: libparted/disk.c:2090 msgid "Can't have a partition outside the disk!" msgstr "Nem lehet partÃció a lemezen kÃvül!" -#: libparted/disk.c:1972 libparted/disk.c:2150 +#: libparted/disk.c:2141 libparted/disk.c:2319 msgid "Can't have overlapping partitions." msgstr "Nem lehetnek egymást átfedÅ‘ partÃciók." -#: libparted/disk.c:2351 +#: libparted/disk.c:2520 msgid "metadata" msgstr "metaadatok" -#: libparted/disk.c:2353 +#: libparted/disk.c:2522 msgid "free" msgstr "szabad" -#: libparted/disk.c:2355 parted/ui.c:1271 parted/ui.c:1299 +#: libparted/disk.c:2524 parted/ui.c:1274 parted/ui.c:1302 msgid "extended" msgstr "extended" -#: libparted/disk.c:2357 parted/ui.c:1275 parted/ui.c:1303 +#: libparted/disk.c:2526 parted/ui.c:1278 parted/ui.c:1306 msgid "logical" msgstr "logical" -#: libparted/disk.c:2359 parted/ui.c:1267 parted/ui.c:1295 +#: libparted/disk.c:2528 parted/ui.c:1270 parted/ui.c:1298 msgid "primary" msgstr "primary" -#: libparted/disk.c:2375 +#: libparted/disk.c:2544 msgid "boot" msgstr "boot" -#: libparted/disk.c:2377 +#: libparted/disk.c:2546 msgid "bios_grub" msgstr "bios_grub" -#: libparted/disk.c:2379 +#: libparted/disk.c:2548 msgid "root" msgstr "root" -#: libparted/disk.c:2381 +#: libparted/disk.c:2550 msgid "swap" msgstr "swap" -#: libparted/disk.c:2383 +#: libparted/disk.c:2552 msgid "hidden" msgstr "hidden" -#: libparted/disk.c:2385 +#: libparted/disk.c:2554 msgid "raid" msgstr "raid" -#: libparted/disk.c:2387 +#: libparted/disk.c:2556 msgid "lvm" msgstr "lvm" -#: libparted/disk.c:2389 +#: libparted/disk.c:2558 msgid "lba" msgstr "lba" -#: libparted/disk.c:2391 +#: libparted/disk.c:2560 msgid "hp-service" msgstr "hp-service" -#: libparted/disk.c:2393 +#: libparted/disk.c:2562 msgid "palo" msgstr "palo" -#: libparted/disk.c:2395 +#: libparted/disk.c:2564 msgid "prep" msgstr "prep" -#: libparted/disk.c:2397 +#: libparted/disk.c:2566 msgid "msftres" msgstr "msftres" -#: libparted/disk.c:2399 +#: libparted/disk.c:2568 msgid "msftdata" msgstr "msftdata" -#: libparted/disk.c:2401 +#: libparted/disk.c:2570 msgid "atvrecv" msgstr "atvrecv" -#: libparted/disk.c:2403 +#: libparted/disk.c:2572 msgid "diag" msgstr "diag" -#: libparted/disk.c:2405 +#: libparted/disk.c:2574 msgid "legacy_boot" msgstr "legacy_boot" -#: libparted/disk.c:2407 +#: libparted/disk.c:2576 msgid "irst" msgstr "irst" -#: libparted/disk.c:2409 +#: libparted/disk.c:2578 msgid "esp" msgstr "esp" -#: libparted/disk.c:2411 +#: libparted/disk.c:2580 msgid "chromeos_kernel" msgstr "" -#: libparted/disk.c:2413 +#: libparted/disk.c:2582 #, fuzzy msgid "bls_boot" msgstr "pmbr_boot" -#: libparted/disk.c:2415 +#: libparted/disk.c:2584 msgid "linux-home" msgstr "" -#: libparted/disk.c:2421 +#: libparted/disk.c:2586 +msgid "no_automount" +msgstr "" + +#: libparted/disk.c:2592 #, c-format msgid "Unknown partition flag, %d." msgstr "Ismeretlen partÃciójelzÅ‘: %d." @@ -1095,8 +1099,8 @@ msgid "" msgstr "" #: libparted/labels/atari.c:1662 libparted/labels/bsd.c:563 -#: libparted/labels/dasd.c:895 libparted/labels/dos.c:2303 -#: libparted/labels/dvh.c:770 libparted/labels/gpt.c:1769 +#: libparted/labels/dasd.c:893 libparted/labels/dos.c:2294 +#: libparted/labels/dvh.c:770 libparted/labels/gpt.c:1891 #: libparted/labels/loop.c:244 libparted/labels/mac.c:1409 #: libparted/labels/pc98.c:697 libparted/labels/rdb.c:1054 #: libparted/labels/sun.c:781 @@ -1118,39 +1122,30 @@ msgstr "Nem foglalható partÃciószám." msgid "Unable to allocate a bsd disklabel slot." msgstr "Nem lehet BSD lemezcÃmke helyet foglalni." -#: libparted/labels/dasd.c:626 +#: libparted/labels/dasd.c:634 msgid "The partition table of DASD-LDL device cannot be changed.\n" msgstr "" -#: libparted/labels/dasd.c:921 +#: libparted/labels/dasd.c:919 msgid "Unable to allocate a dasd disklabel slot" msgstr "Nem lehet dasd lemezcÃmke helyet foglalni" -#: libparted/labels/dos.c:1008 +#: libparted/labels/dos.c:1159 #, c-format msgid "Invalid partition table on %s -- wrong signature %x." msgstr "Érvénytelen partÃciós tábla ezen: %s -- rossz %x aláÃrás." -#: libparted/labels/dos.c:1036 +#: libparted/labels/dos.c:1187 #, c-format msgid "Invalid partition table - recursive partition on %s." msgstr "Érvénytelen partÃciós tábla - rekurzÃv partÃció ezen: %s." -#: libparted/labels/dos.c:1567 -msgid "Extended partitions cannot be hidden on msdos disk labels." -msgstr "Kiterjesztett partÃciók nem rejthetÅ‘k el msdos lemezcÃmkéken." - -#: libparted/labels/dos.c:1579 -#, fuzzy -msgid "Extended partitions cannot be recovery partitions on msdos disk labels." -msgstr "Kiterjesztett partÃciók nem rejthetÅ‘k el msdos lemezcÃmkéken." - -#: libparted/labels/dos.c:2285 +#: libparted/labels/dos.c:2276 msgid "Parted can't resize partitions managed by Windows Dynamic Disk." msgstr "" "A Parted nem tud átméretezni Windows Dynamic Disk által kezelt partÃciókat." -#: libparted/labels/dos.c:2541 +#: libparted/labels/dos.c:2532 msgid "cannot create any more partitions" msgstr "nem lehet több partÃciót létrehozni" @@ -1293,11 +1288,11 @@ msgstr "Nem sikerült lekérni a blokkméret-információkat." msgid "Disk geometry does not match a DASD device of type 3390." msgstr "" -#: libparted/labels/gpt.c:569 +#: libparted/labels/gpt.c:589 msgid "device is too small for GPT" msgstr "az eszköz túl kicsi a GPT-hez" -#: libparted/labels/gpt.c:771 +#: libparted/labels/gpt.c:791 #, c-format msgid "" "The format of the GPT partition table is version %x, which is newer than " @@ -1306,7 +1301,7 @@ msgstr "" "A GPT partÃciós tábla formátuma %x verziójú, ami újabb a Parted által " "felismerhetÅ‘nél. Jelentse be ezt hibaként!" -#: libparted/labels/gpt.c:807 +#: libparted/labels/gpt.c:827 #, c-format msgid "" "Not all of the space available to %s appears to be used, you can fix the GPT " @@ -1317,7 +1312,7 @@ msgstr "" "a GPT-t az összes hely (további %llu blokk) felhasználásához, vagy " "folytathatja a jelenlegi beállÃtásokkal." -#: libparted/labels/gpt.c:1006 +#: libparted/labels/gpt.c:1026 msgid "" "The backup GPT table is not at the end of the disk, as it should be. Fix, " "by moving the backup to the end (and removing the old backup)?" @@ -1325,7 +1320,7 @@ msgstr "" "A tartalék GPT tábla nem a lemez végén van, ahol lennie kellene. JavÃtja a " "tartalék áthelyezésével a végére (és a régi tartalék törlésével)?" -#: libparted/labels/gpt.c:1024 +#: libparted/labels/gpt.c:1044 msgid "" "Both the primary and backup GPT tables are corrupt. Try making a fresh " "table, and using Parted's rescue feature to recover partitions." @@ -1333,7 +1328,7 @@ msgstr "" "Az elsÅ‘dleges GPT tábla és a tartalék is sérült. Próbáljon egy újat " "készÃteni, és a Parted rescue funkciójával visszaállÃtani a partÃciókat." -#: libparted/labels/gpt.c:1035 +#: libparted/labels/gpt.c:1055 msgid "" "The backup GPT table is corrupt, but the primary appears OK, so that will be " "used." @@ -1341,7 +1336,7 @@ msgstr "" "A tartalék GPT tábla sérült, de az elsÅ‘dleges jónak tűnik, Ãgy az lesz " "felhasználva." -#: libparted/labels/gpt.c:1047 +#: libparted/labels/gpt.c:1067 msgid "" "The primary GPT table is corrupt, but the backup appears OK, so that will be " "used." @@ -1349,11 +1344,11 @@ msgstr "" "Az elsÅ‘dleges GPT tábla sérült, de a tartalék jónak tűnik, Ãgy az lesz " "felhasználva." -#: libparted/labels/gpt.c:1071 +#: libparted/labels/gpt.c:1091 msgid "primary partition table array CRC mismatch" msgstr "elsÅ‘dleges partÃcióstábla-tömb CRC eltérés" -#: libparted/labels/gpt.c:1655 libparted/labels/gpt.c:1682 +#: libparted/labels/gpt.c:1722 libparted/labels/gpt.c:1749 msgid "failed to translate partition name" msgstr "a partÃciónév fordÃtása meghiúsult" @@ -2010,7 +2005,7 @@ msgstr "fat_table_alloc_cluster: nincs szabad fürt" msgid "Could not detect file system." msgstr "Nem észlelhetÅ‘ fájlrendszer." -#: libparted/fs/r/filesys.c:159 libparted/fs/r/filesys.c:284 +#: libparted/fs/r/filesys.c:159 libparted/fs/r/filesys.c:285 #, c-format msgid "resizing %s file systems is not supported" msgstr "%s fájlrendszerek átméretezése nem támogatott" @@ -2294,40 +2289,40 @@ msgid "This HFS+ volume has no extents overflow file. This is quite unusual!" msgstr "" "Ennek a HFS kötetnek nincs extenttúlcsordulási fájlja. Ez nagyon szokatlan!" -#: parted/parted.c:137 +#: parted/parted.c:138 msgid "displays this help message" msgstr "ezen súgóüzenet megjelenÃtése" -#: parted/parted.c:138 +#: parted/parted.c:139 msgid "lists partition layout on all block devices" msgstr "minden blokkos eszköz partÃcióelrendezésének kiÃrása" -#: parted/parted.c:139 +#: parted/parted.c:140 msgid "displays machine parseable output" msgstr "gépileg feldolgozható kimenet megjelenÃtése" -#: parted/parted.c:140 +#: parted/parted.c:141 #, fuzzy msgid "displays JSON output" msgstr "gépileg feldolgozható kimenet megjelenÃtése" -#: parted/parted.c:141 +#: parted/parted.c:142 msgid "never prompts for user intervention" msgstr "soha ne kérdezzen" -#: parted/parted.c:142 +#: parted/parted.c:143 msgid "in script mode, fix instead of abort when asked" msgstr "" -#: parted/parted.c:143 +#: parted/parted.c:144 msgid "displays the version" msgstr "verzió megjelenÃtése" -#: parted/parted.c:144 +#: parted/parted.c:145 msgid "alignment for new partitions" msgstr "új partÃciók igazÃtása" -#: parted/parted.c:157 +#: parted/parted.c:158 msgid "" "NUMBER is the partition number used by Linux. On MS-DOS disk labels, the " "primary partitions number from 1 to 4, logical partitions from 5 onwards.\n" @@ -2336,31 +2331,31 @@ msgstr "" "(partÃciós táblán) az elsÅ‘dleges partÃciók 1-tÅ‘l 4-ig, a logikaiak 5-tÅ‘l " "számozódnak.\n" -#: parted/parted.c:160 +#: parted/parted.c:161 msgid "LABEL-TYPE is one of: " msgstr "A CÃMKETÃPUS ezek egyike: " -#: parted/parted.c:161 parted/parted.c:162 +#: parted/parted.c:162 parted/parted.c:163 msgid "FLAG is one of: " msgstr "A JELZÅ ezek egyike: " -#: parted/parted.c:163 +#: parted/parted.c:164 msgid "UNIT is one of: " msgstr "Az EGYSÉG ezek egyike: " -#: parted/parted.c:164 +#: parted/parted.c:165 msgid "desired alignment: minimum or optimal" msgstr "kÃvánt igazÃtás: minimum vagy optimal" -#: parted/parted.c:165 +#: parted/parted.c:166 msgid "PART-TYPE is one of: primary, logical, extended\n" msgstr "A PART-TÃPUS ezek egyike: primary, logical, extended\n" -#: parted/parted.c:167 +#: parted/parted.c:168 msgid "FS-TYPE is one of: " msgstr "Az FS-TÃPUS ezek egyike: " -#: parted/parted.c:168 +#: parted/parted.c:169 msgid "" "START and END are disk locations, such as 4GB or 10%. Negative values count " "from the end of the disk. For example, -1s specifies exactly the last " @@ -2369,7 +2364,7 @@ msgstr "" "A KEZDET és VÉG lemezhelyek, pl.: 4GB vagy 10%. A negatÃv értékek a lemez " "végérÅ‘l számÃtódnak. Például a -1s az utolsó szektort adja.\n" -#: parted/parted.c:171 +#: parted/parted.c:172 msgid "" "END is disk location, such as 4GB or 10%. Negative value counts from the " "end of the disk. For example, -1s specifies exactly the last sector.\n" @@ -2377,19 +2372,23 @@ msgstr "" "A VÉG egy lemezhely, pl.: 4GB vagy 10%. A negatÃv értékek a lemez végérÅ‘l " "számÃtódnak. Például a -1s az utolsó szektort adja.\n" -#: parted/parted.c:174 +#: parted/parted.c:175 msgid "STATE is one of: on, off\n" msgstr "Az ÃLLAPOT ezek egyike: on, off\n" -#: parted/parted.c:175 +#: parted/parted.c:176 msgid "DEVICE is usually /dev/hda or /dev/sda\n" msgstr "Az ESZKÖZ általában a /dev/hda vagy /dev/sda\n" -#: parted/parted.c:176 +#: parted/parted.c:177 msgid "NAME is any word you want\n" msgstr "A NÉV tetszÅ‘leges\n" -#: parted/parted.c:179 +#: parted/parted.c:178 +msgid "TYPE_ID is a value between 0x01 and 0xff, TYPE_UUID is a UUID\n" +msgstr "" + +#: parted/parted.c:182 msgid "" "Copyright (C) 1998 - 2006 Free Software Foundation, Inc.\n" "This program is free software, covered by the GNU General Public License.\n" @@ -2410,22 +2409,22 @@ msgstr "" "További részletekért tanulmányozza a GNU GPL licencet.\n" "\n" -#: parted/parted.c:229 +#: parted/parted.c:232 #, c-format msgid "%0.f%%\t(time left %.2d:%.2d)" msgstr "%0.f%%\t(hátralévÅ‘ idÅ‘: %.2d:%.2d)" -#: parted/parted.c:248 +#: parted/parted.c:251 #, c-format msgid "Partition %s is being used. Are you sure you want to continue?" msgstr "A(z) %s partÃció használatban van. Biztos, hogy folytatni kÃvánja?" -#: parted/parted.c:269 +#: parted/parted.c:272 #, c-format msgid "Partition(s) on %s are being used." msgstr "%s partÃciói használatban vannak." -#: parted/parted.c:281 +#: parted/parted.c:284 #, c-format msgid "" "The existing disk label on %s will be destroyed and all data on this disk " @@ -2434,31 +2433,31 @@ msgstr "" "A meglévÅ‘ lemezcÃmke ezen: %s megsemmisül, és a lemezen lévÅ‘ minden adat " "elvész. Szeretné folytatni?" -#: parted/parted.c:542 +#: parted/parted.c:545 msgid "New disk label type?" msgstr "Az új lemezcÃmke tÃpusa?" -#: parted/parted.c:680 +#: parted/parted.c:692 msgid "Partition type?" msgstr "A partÃció tÃpusa?" -#: parted/parted.c:698 parted/parted.c:902 +#: parted/parted.c:710 parted/parted.c:914 msgid "Partition name?" msgstr "A partÃció neve?" -#: parted/parted.c:708 +#: parted/parted.c:720 msgid "File system type?" msgstr "A fájlrendszer tÃpusa?" -#: parted/parted.c:713 parted/parted.c:1683 +#: parted/parted.c:725 parted/parted.c:1815 msgid "Start?" msgstr "Kezdete?" -#: parted/parted.c:715 parted/parted.c:1685 parted/parted.c:1768 +#: parted/parted.c:727 parted/parted.c:1817 parted/parted.c:1900 msgid "End?" msgstr "Vége?" -#: parted/parted.c:782 +#: parted/parted.c:794 #, c-format msgid "" "You requested a partition from %s to %s (sectors %llu..%llu).\n" @@ -2467,7 +2466,7 @@ msgstr "" "Egy partÃciót kért innentÅ‘l: %s idáig: %s (szektorok: %llu..%llu).\n" "A legközelebbi használható hely ez: %s - %s (szektorok: %llu..%llu).%s" -#: parted/parted.c:791 +#: parted/parted.c:803 msgid "" "\n" "Is this still acceptable to you?" @@ -2475,7 +2474,7 @@ msgstr "" "\n" "Ez elfogadható?" -#: parted/parted.c:814 +#: parted/parted.c:826 #, fuzzy, c-format msgid "" "The resulting partition is not properly aligned for best performance: %s" @@ -2483,87 +2482,112 @@ msgstr "" "Az eredményül kapott partÃció igazÃtása nem megfelelÅ‘ a legjobb " "teljesÃtményhez." -#: parted/parted.c:816 parted/parted.c:1925 +#: parted/parted.c:828 parted/parted.c:2057 msgid "unknown (malloc failed)" msgstr "" -#: parted/parted.c:894 +#: parted/parted.c:906 #, fuzzy, c-format msgid "%s disk labels do not support partition name." msgstr "%s lemez cÃmkéi nem támogatják a kiterjesztett partÃciókat." -#: parted/parted.c:899 parted/parted.c:1748 parted/parted.c:1814 -#: parted/parted.c:1908 parted/parted.c:1983 +#: parted/parted.c:911 parted/parted.c:955 parted/parted.c:1880 +#: parted/parted.c:1946 parted/parted.c:2040 parted/parted.c:2115 msgid "Partition number?" msgstr "A partÃció száma?" -#: parted/parted.c:1050 +#: parted/parted.c:949 +#, fuzzy, c-format +msgid "%s disk labels do not support partition type." +msgstr "%s lemez cÃmkéi nem támogatják a kiterjesztett partÃciókat." + +#: parted/parted.c:965 +#, fuzzy +msgid "Partition type-id?" +msgstr "A partÃció tÃpusa?" + +#: parted/parted.c:972 +#, fuzzy +msgid "Invalid type-id." +msgstr "Érvénytelen szám." + +#: parted/parted.c:986 +#, fuzzy +msgid "Partition type-uuid?" +msgstr "A partÃció tÃpusa?" + +#: parted/parted.c:993 +#, fuzzy +msgid "Invalid type-uuid." +msgstr "Érvénytelen szám." + +#: parted/parted.c:1146 #, c-format msgid "BIOS cylinder,head,sector geometry: %d,%d,%d. Each cylinder is %s.\n" msgstr "BIOS cilinder,fej,szektor geometria: %d,%d,%d. Minden cilinder %s.\n" -#: parted/parted.c:1137 +#: parted/parted.c:1240 #, c-format msgid "Model: %s (%s)\n" msgstr "TÃpus: %s (%s)\n" -#: parted/parted.c:1139 +#: parted/parted.c:1242 #, c-format msgid "Disk %s: %s\n" msgstr "%s lemez: %s\n" -#: parted/parted.c:1140 +#: parted/parted.c:1243 #, c-format msgid "Sector size (logical/physical): %lldB/%lldB\n" msgstr "Szektorméret (logikai/fizikai): %lldB/%lldB\n" -#: parted/parted.c:1152 +#: parted/parted.c:1255 #, c-format msgid "Partition Table: %s\n" msgstr "PartÃciós tábla: %s\n" -#: parted/parted.c:1153 +#: parted/parted.c:1256 #, c-format msgid "Disk Flags: %s\n" msgstr "LemezjelzÅ‘k: %s\n" -#: parted/parted.c:1279 parted/parted.c:1282 +#: parted/parted.c:1388 parted/parted.c:1391 msgid "Number" msgstr "Szám" -#: parted/parted.c:1279 parted/parted.c:1282 +#: parted/parted.c:1388 parted/parted.c:1391 msgid "Start" msgstr "Kezdet" -#: parted/parted.c:1280 parted/parted.c:1283 +#: parted/parted.c:1389 parted/parted.c:1392 msgid "End" msgstr "Vég" -#: parted/parted.c:1283 +#: parted/parted.c:1392 msgid "Size" msgstr "Méret" -#: parted/parted.c:1287 +#: parted/parted.c:1396 msgid "Type" msgstr "TÃpus" -#: parted/parted.c:1289 +#: parted/parted.c:1398 msgid "File system" msgstr "Fájlrendszer" -#: parted/parted.c:1292 +#: parted/parted.c:1401 msgid "Name" msgstr "Név" -#: parted/parted.c:1294 +#: parted/parted.c:1403 msgid "Flags" msgstr "JelzÅ‘k" -#: parted/parted.c:1352 +#: parted/parted.c:1461 msgid "Free Space" msgstr "Szabad hely" -#: parted/parted.c:1570 +#: parted/parted.c:1702 #, c-format msgid "" "A %s %s partition was found at %s -> %s. Do you want to add it to the " @@ -2572,55 +2596,55 @@ msgstr "" "Egy %s %s partÃció található itt: %s -> %s. Szeretné hozzáadni a partÃciós " "táblához?" -#: parted/parted.c:1613 +#: parted/parted.c:1745 msgid "searching for file systems" msgstr "fájlrendszerek keresése" -#: parted/parted.c:1720 +#: parted/parted.c:1852 msgid "The resize command has been removed in parted 3.0" msgstr "A resize parancs eltávolÃtásra került a parted 3.0-ban" -#: parted/parted.c:1782 +#: parted/parted.c:1914 msgid "" "Shrinking a partition can cause data loss, are you sure you want to continue?" msgstr "" "Egy partÃció zsugorÃtása adatvesztést okozhat, biztosan folytatni szeretné?" -#: parted/parted.c:1838 +#: parted/parted.c:1970 msgid "New device?" msgstr "Új eszköz?" -#: parted/parted.c:1906 +#: parted/parted.c:2038 msgid "alignment type(min/opt)" msgstr "igazÃtás tÃpusa (min/opt)" -#: parted/parted.c:1921 +#: parted/parted.c:2053 #, c-format msgid "%d aligned\n" msgstr "%d igazÃtva\n" -#: parted/parted.c:1923 +#: parted/parted.c:2055 #, fuzzy, c-format msgid "%d not aligned: %s\n" msgstr "%d nem igazÃtott\n" -#: parted/parted.c:1948 parted/parted.c:1985 +#: parted/parted.c:2080 parted/parted.c:2117 msgid "Flag to Invert?" msgstr "A megfordÃtandó jelzÅ‘?" -#: parted/parted.c:1953 parted/parted.c:1990 +#: parted/parted.c:2085 parted/parted.c:2122 msgid "New state?" msgstr "Új állapot?" -#: parted/parted.c:2036 +#: parted/parted.c:2168 msgid "Unit?" msgstr "Egység?" -#: parted/parted.c:2171 +#: parted/parted.c:2303 msgid "align-check" msgstr "align-check" -#: parted/parted.c:2174 +#: parted/parted.c:2306 #, fuzzy msgid "" "align-check TYPE N check partition N for TYPE(min|opt) " @@ -2629,11 +2653,11 @@ msgstr "" "align-check TÃPUS N TÃPUS(min|opt) igazÃtás keresése " "az N. partÃción" -#: parted/parted.c:2182 +#: parted/parted.c:2314 msgid "help" msgstr "help" -#: parted/parted.c:2185 +#: parted/parted.c:2317 msgid "" "help [COMMAND] print general help, or help on " "COMMAND" @@ -2641,15 +2665,15 @@ msgstr "" "help [PARANCS] általános súgó vagy a PARANCS " "súgójának kiÃrása" -#: parted/parted.c:2191 +#: parted/parted.c:2323 msgid "mklabel" msgstr "mklabel" -#: parted/parted.c:2191 +#: parted/parted.c:2323 msgid "mktable" msgstr "mktable" -#: parted/parted.c:2194 +#: parted/parted.c:2326 msgid "" "mklabel,mktable LABEL-TYPE create a new disklabel (partition " "table)" @@ -2657,15 +2681,15 @@ msgstr "" "mklabel,mktable CÃMKETÃPUS új lemezcÃmke (partÃciós tábla) " "létrehozása" -#: parted/parted.c:2200 +#: parted/parted.c:2332 msgid "mkpart" msgstr "mkpart" -#: parted/parted.c:2203 +#: parted/parted.c:2335 msgid "mkpart PART-TYPE [FS-TYPE] START END make a partition" msgstr "mkpart PART-TÃPUS [FS-TÃPUS] KEZDET VÉG partÃció készÃtése" -#: parted/parted.c:2209 +#: parted/parted.c:2341 msgid "" "'mkpart' makes a partition without creating a new file system on the " "partition. FS-TYPE may be specified to set an appropriate partition ID.\n" @@ -2673,21 +2697,21 @@ msgstr "" "Az „mkpart†partÃciót hoz létre, új fájlrendszer létrehozása nélkül. Az FS-" "TÃPUS megadható megfelelÅ‘ partÃcióazonosÃtó beállÃtása érdekében.\n" -#: parted/parted.c:2214 +#: parted/parted.c:2346 msgid "name" msgstr "name" -#: parted/parted.c:2217 +#: parted/parted.c:2349 msgid "name NUMBER NAME name partition NUMBER as NAME" msgstr "" "name SZÃM NÉV a SZÃM. partÃciót elnevezése a " "NÉVVEL" -#: parted/parted.c:2222 +#: parted/parted.c:2354 msgid "print" msgstr "print" -#: parted/parted.c:2225 +#: parted/parted.c:2357 #, fuzzy msgid "" "print [devices|free|list,all] display the partition table, or " @@ -2697,7 +2721,7 @@ msgstr "" "eszközök, szabad hely, minden megtalált partÃció vagy egy adott partÃció " "megjelenÃtése" -#: parted/parted.c:2229 +#: parted/parted.c:2361 msgid "" "Without arguments, 'print' displays the entire partition table. However with " "the following arguments it performs various other actions.\n" @@ -2705,11 +2729,11 @@ msgstr "" "Argumentumok nélkül a „print†az egész partÃciós táblát megjelenÃti. Azonban " "a következÅ‘ argumentumokkal különbözÅ‘ egyéb műveleteket hajt végre.\n" -#: parted/parted.c:2231 +#: parted/parted.c:2363 msgid " devices : display all active block devices\n" msgstr " devices : az összes aktÃv blokkos eszköz megjelenÃtése\n" -#: parted/parted.c:2232 +#: parted/parted.c:2364 msgid "" " free : display information about free unpartitioned space on the " "current block device\n" @@ -2717,25 +2741,25 @@ msgstr "" " free : információk megjelenÃtése a szabad particionálatlan helyrÅ‘l az " "aktuális blokkos eszközön\n" -#: parted/parted.c:2234 +#: parted/parted.c:2366 msgid "" " list, all : display the partition tables of all active block devices\n" msgstr "" " list, all : az összes aktÃv blokkos eszköz partÃciós tábláinak kiÃrása\n" -#: parted/parted.c:2238 +#: parted/parted.c:2370 msgid "quit" msgstr "quit" -#: parted/parted.c:2241 +#: parted/parted.c:2373 msgid "quit exit program" msgstr "quit kilépés a programból" -#: parted/parted.c:2246 +#: parted/parted.c:2378 msgid "rescue" msgstr "rescue" -#: parted/parted.c:2249 +#: parted/parted.c:2381 msgid "" "rescue START END rescue a lost partition near START " "and END" @@ -2743,56 +2767,56 @@ msgstr "" "rescue KEZDET VÉG a KEZDET és VÉG környéki partÃció " "helyreállÃtása" -#: parted/parted.c:2255 +#: parted/parted.c:2387 msgid "resize" msgstr "resize" -#: parted/parted.c:2258 +#: parted/parted.c:2390 msgid "The resize command was removed in parted 3.0\n" msgstr "A resize parancs eltávolÃtásra került a parted 3.0-ban\n" -#: parted/parted.c:2261 +#: parted/parted.c:2393 msgid "resizepart" msgstr "resizepart" -#: parted/parted.c:2264 +#: parted/parted.c:2396 msgid "resizepart NUMBER END resize partition NUMBER" msgstr "" "resizepart SZÃM VÉG a SZÃM. partÃció átméretezése" -#: parted/parted.c:2269 +#: parted/parted.c:2401 msgid "rm" msgstr "rm" -#: parted/parted.c:2272 +#: parted/parted.c:2404 msgid "rm NUMBER delete partition NUMBER" msgstr "rm SZÃM a SZÃM. partÃció törlése" -#: parted/parted.c:2277 +#: parted/parted.c:2409 msgid "select" msgstr "select" -#: parted/parted.c:2280 +#: parted/parted.c:2412 msgid "select DEVICE choose the device to edit" msgstr "" "select ESZKÖZ a szerkesztendÅ‘ eszköz kiválasztása" -#: parted/parted.c:2285 +#: parted/parted.c:2417 msgid "disk_set" msgstr "disk_set" -#: parted/parted.c:2288 +#: parted/parted.c:2420 msgid "" "disk_set FLAG STATE change the FLAG on selected device" msgstr "" "disk_set JELZÅ ÃLLAPOT a JELZÅ módosÃtása a kijelölt " "eszközön" -#: parted/parted.c:2293 +#: parted/parted.c:2425 msgid "disk_toggle" msgstr "disk_toggle" -#: parted/parted.c:2296 +#: parted/parted.c:2428 msgid "" "disk_toggle [FLAG] toggle the state of FLAG on " "selected device" @@ -2800,21 +2824,21 @@ msgstr "" "disk_toggle [JELZÅ] a JELZŠállapotának átváltása a " "kijelölt eszközön" -#: parted/parted.c:2302 +#: parted/parted.c:2434 msgid "set" msgstr "set" -#: parted/parted.c:2305 +#: parted/parted.c:2437 msgid "" "set NUMBER FLAG STATE change the FLAG on partition NUMBER" msgstr "" "set SZÃM JELZÅ ÃLLAPOT a JELZŠátváltása a SZÃM. partÃción" -#: parted/parted.c:2311 +#: parted/parted.c:2443 msgid "toggle" msgstr "toggle" -#: parted/parted.c:2314 +#: parted/parted.c:2446 msgid "" "toggle [NUMBER [FLAG]] toggle the state of FLAG on " "partition NUMBER" @@ -2822,21 +2846,31 @@ msgstr "" "toggle [SZÃM [JELZÅ]] a JELZŠállapotának átváltása a " "SZÃM. partÃción" -#: parted/parted.c:2320 +#: parted/parted.c:2452 +msgid "type" +msgstr "" + +#: parted/parted.c:2455 +msgid "" +"type NUMBER TYPE-ID or TYPE-UUID type set TYPE-ID or TYPE-UUID of " +"partition NUMBER" +msgstr "" + +#: parted/parted.c:2460 msgid "unit" msgstr "unit" -#: parted/parted.c:2323 +#: parted/parted.c:2463 msgid "unit UNIT set the default unit to UNIT" msgstr "" "unit EGYSÉG az alapértelmezett egység " "beállÃtása az EGYSÉGRE" -#: parted/parted.c:2328 +#: parted/parted.c:2468 msgid "version" msgstr "version" -#: parted/parted.c:2331 +#: parted/parted.c:2471 msgid "" "version display the version number and " "copyright information of GNU Parted" @@ -2844,7 +2878,7 @@ msgstr "" "version megjelenÃti a GNU Parted " "verziószámát és a szerzÅ‘i jogi információkat" -#: parted/parted.c:2335 +#: parted/parted.c:2475 msgid "" "'version' displays copyright and version information corresponding to this " "copy of GNU Parted\n" @@ -2852,21 +2886,21 @@ msgstr "" "a „version†megjelenÃti a GNU Parted ezen példányának verzió- és szerzÅ‘i " "jogi információit\n" -#: parted/parted.c:2405 +#: parted/parted.c:2545 #, fuzzy, c-format msgid "Usage: %s [-hlmsfv] [-a<align>] [DEVICE [COMMAND [PARAMETERS]]...]\n" msgstr "" "Használat: %s [-hlmsv] [-a<igazÃtás>] [ESZKÖZ [PARANCS [PARAMÉTEREK]]...]\n" -#: parted/parted.c:2449 +#: parted/parted.c:2589 msgid "No device found" msgstr "Nem található eszköz" -#: parted/parted.c:2486 +#: parted/parted.c:2626 msgid "WARNING: You are not superuser. Watch out for permissions.\n" msgstr "FIGYELMEZTETÉS: Ön nem rendszergazda. Figyeljen a jogosultságokra.\n" -#: parted/parted.c:2519 +#: parted/parted.c:2659 msgid "" "You should reinstall your boot loader before rebooting. Read section 4 of " "the Parted User documentation for more information." @@ -2874,7 +2908,7 @@ msgstr "" "A rendszertöltÅ‘t újraindÃtás elÅ‘tt újra kell telepÃteni. További " "információkért lásd a Parted felhasználói dokumentáció 4. fejezetét." -#: parted/parted.c:2526 +#: parted/parted.c:2666 msgid "You may need to update /etc/fstab.\n" msgstr "Szükség lehet az /etc/fstab frissÃtésére.\n" @@ -3135,69 +3169,69 @@ msgstr "" "\n" "Hiba: Ãltalános SIGILL szignál érkezett." -#: parted/ui.c:901 +#: parted/ui.c:904 #, c-format msgid "invalid token: %s" msgstr "érvénytelen jelsor: %s" -#: parted/ui.c:1082 +#: parted/ui.c:1085 msgid "Expecting a partition number." msgstr "Egy partÃciószám szükséges." -#: parted/ui.c:1091 +#: parted/ui.c:1094 msgid "Partition doesn't exist." msgstr "A partÃció nem létezik." -#: parted/ui.c:1111 +#: parted/ui.c:1114 msgid "Expecting a file system type." msgstr "Egy fájlrendszertÃpus szükséges." -#: parted/ui.c:1118 +#: parted/ui.c:1121 #, c-format msgid "Unknown file system type \"%s\"." msgstr "Ismeretlen „%s†fájlrendszertÃpus." -#: parted/ui.c:1139 +#: parted/ui.c:1142 msgid "Expecting a disk label type." msgstr "Egy lemezcÃmketÃpus szükséges." -#: parted/ui.c:1170 parted/ui.c:1206 +#: parted/ui.c:1173 parted/ui.c:1209 msgid "No flags supported" msgstr "" -#: parted/ui.c:1280 +#: parted/ui.c:1283 msgid "Can't create any more partitions." msgstr "Nem lehet több partÃciót létrehozni." -#: parted/ui.c:1290 +#: parted/ui.c:1293 msgid "Expecting a partition type." msgstr "Egy partÃciótÃpus szükséges." -#: parted/ui.c:1439 +#: parted/ui.c:1442 msgid "on" msgstr "on" -#: parted/ui.c:1440 +#: parted/ui.c:1443 msgid "off" msgstr "off" -#: parted/ui.c:1457 +#: parted/ui.c:1460 msgid "optimal" msgstr "optimal" -#: parted/ui.c:1458 +#: parted/ui.c:1461 msgid "minimal" msgstr "minimal" -#: parted/ui.c:1591 +#: parted/ui.c:1594 msgid "OPTIONs:" msgstr "KAPCSOLÓK:" -#: parted/ui.c:1596 +#: parted/ui.c:1599 msgid "COMMANDs:" msgstr "PARANCSOK:" -#: parted/ui.c:1599 +#: parted/ui.c:1602 #, c-format msgid "" "\n" @@ -3206,12 +3240,12 @@ msgstr "" "\n" "A hibák a(z) %s cÃmen jelenthetÅ‘k.\n" -#: parted/ui.c:1606 +#: parted/ui.c:1609 #, c-format msgid "Using %s\n" msgstr "%s használatával\n" -#: parted/ui.c:1686 +#: parted/ui.c:1689 msgid "This command does not make sense in non-interactive mode.\n" msgstr "Ennek a parancsnak nincs értelme nem interaktÃv módban.\n" @@ -3273,6 +3307,9 @@ msgstr "Ennek a parancsnak nincs értelme nem interaktÃv módban.\n" #~ "semmit a változásokról. %s bármilyen felhasználása elÅ‘tt újra kell " #~ "indÃtani a gépet." +#~ msgid "Extended partitions cannot be hidden on msdos disk labels." +#~ msgstr "Kiterjesztett partÃciók nem rejthetÅ‘k el msdos lemezcÃmkéken." + #~ msgid "The boot region doesn't start at the start of the partition." #~ msgstr "A boot terület nem a partÃció elején kezdÅ‘dik." @@ -10,7 +10,7 @@ msgid "" msgstr "" "Project-Id-Version: GNU parted 3.4.64.2\n" "Report-Msgid-Bugs-To: bug-parted@gnu.org\n" -"POT-Creation-Date: 2022-04-18 14:44-0400\n" +"POT-Creation-Date: 2023-04-10 15:50-0700\n" "PO-Revision-Date: 2022-04-07 10:22+0700\n" "Last-Translator: Andika Triwidada <andika@gmail.com>\n" "Language-Team: Indonesian <translation-team-id@lists.sourceforge.net>\n" @@ -22,25 +22,25 @@ msgstr "" "X-Bugs: Report translation errors to the Language-Team address.\n" "X-Generator: Poedit 3.0\n" -#: lib/argmatch.c:147 +#: lib/argmatch.c:145 #, c-format msgid "invalid argument %s for %s" msgstr "argumen %s tidak valid untuk %s" -#: lib/argmatch.c:148 +#: lib/argmatch.c:146 #, c-format msgid "ambiguous argument %s for %s" msgstr "argumen %s ambigu untuk %s" -#: lib/argmatch.c:167 lib/argmatch.h:238 +#: lib/argmatch.c:165 lib/argmatch.h:237 msgid "Valid arguments are:" msgstr "Argumen yang valid adalah:" -#: lib/closeout.c:122 libparted/labels/fdasd.c:145 +#: lib/closeout.c:121 libparted/labels/fdasd.c:145 msgid "write error" msgstr "galat tulis" -#: lib/error.c:195 +#: lib/error.c:193 msgid "Unknown system error" msgstr "Galat sistem tak dikenal" @@ -100,11 +100,11 @@ msgstr "%s: opsi membutuhkan sebuah argumen -- '%c'\n" #. If you don't know what to put here, please see #. <https://en.wikipedia.org/wiki/Quotation_marks_in_other_languages> #. and use glyphs suitable for your language. -#: lib/quotearg.c:355 +#: lib/quotearg.c:354 msgid "`" msgstr "'" -#: lib/quotearg.c:356 +#: lib/quotearg.c:355 msgid "'" msgstr "'" @@ -186,7 +186,7 @@ msgstr "Tidak ada ekpresi regular sebelumnya" #. To enquire the regular expression that your system uses for this #. purpose, you can use the command #. locale -k LC_MESSAGES | grep '^yesexpr=' -#: lib/rpmatch.c:150 +#: lib/rpmatch.c:149 msgid "^[yY]" msgstr "^[yY]" @@ -196,7 +196,7 @@ msgstr "^[yY]" #. To enquire the regular expression that your system uses for this #. purpose, you can use the command #. locale -k LC_MESSAGES | grep '^noexpr=' -#: lib/rpmatch.c:163 +#: lib/rpmatch.c:162 msgid "^[nN]" msgstr "^[tT]" @@ -755,21 +755,21 @@ msgstr "pmbr_boot" msgid "Unknown disk flag, %d." msgstr "Flag diska tak dikenal, %d." -#: libparted/disk.c:1289 +#: libparted/disk.c:1320 #, c-format msgid "%s disk labels do not support extended partitions." msgstr "Label diska %s tidak mendukung partisi extended." -#: libparted/disk.c:1821 +#: libparted/disk.c:1990 #, c-format msgid "%s disk labels don't support logical or extended partitions." msgstr "Label diska %s tidak mendukung partisi logis atau extended." -#: libparted/disk.c:1834 +#: libparted/disk.c:2003 msgid "Too many primary partitions." msgstr "Terlalu banyak partisi primer." -#: libparted/disk.c:1843 +#: libparted/disk.c:2012 #, c-format msgid "" "Can't add a logical partition to %s, because there is no extended partition." @@ -777,137 +777,141 @@ msgstr "" "Tidak dapat menambahkan sebuah partisi logis pada %s, karena di sana tidak " "ada partisi extended." -#: libparted/disk.c:1867 +#: libparted/disk.c:2036 #, c-format msgid "Can't have more than one extended partition on %s." msgstr "Tidak dapat memiliki lebih dari satu partisi extended pada %s." -#: libparted/disk.c:1877 +#: libparted/disk.c:2046 msgid "Can't have logical partitions outside of the extended partition." msgstr "Tidak dapat memiliki partisi logis di luar dari partisi extended." -#: libparted/disk.c:1902 +#: libparted/disk.c:2071 #, c-format msgid "Can't have a logical partition outside of the extended partition on %s." msgstr "Tidak dapat memiliki partisi logis di luar partisi extended pada %s." -#: libparted/disk.c:1912 +#: libparted/disk.c:2081 msgid "Can't have a primary partition inside an extended partition." msgstr "Tidak dapat memiliki partisi primer di dalam sebuah partisi extended." -#: libparted/disk.c:1921 +#: libparted/disk.c:2090 msgid "Can't have a partition outside the disk!" msgstr "Tidak dapat memiliki partisi di luar dari disk!" -#: libparted/disk.c:1972 libparted/disk.c:2150 +#: libparted/disk.c:2141 libparted/disk.c:2319 msgid "Can't have overlapping partitions." msgstr "Tidak dapat memiliki partisi yang tumpang tindih." -#: libparted/disk.c:2351 +#: libparted/disk.c:2520 msgid "metadata" msgstr "metadata" -#: libparted/disk.c:2353 +#: libparted/disk.c:2522 msgid "free" msgstr "free" -#: libparted/disk.c:2355 parted/ui.c:1271 parted/ui.c:1299 +#: libparted/disk.c:2524 parted/ui.c:1274 parted/ui.c:1302 msgid "extended" msgstr "extended" -#: libparted/disk.c:2357 parted/ui.c:1275 parted/ui.c:1303 +#: libparted/disk.c:2526 parted/ui.c:1278 parted/ui.c:1306 msgid "logical" msgstr "logis" -#: libparted/disk.c:2359 parted/ui.c:1267 parted/ui.c:1295 +#: libparted/disk.c:2528 parted/ui.c:1270 parted/ui.c:1298 msgid "primary" msgstr "primer" -#: libparted/disk.c:2375 +#: libparted/disk.c:2544 msgid "boot" msgstr "boot" -#: libparted/disk.c:2377 +#: libparted/disk.c:2546 msgid "bios_grub" msgstr "bios_grub" -#: libparted/disk.c:2379 +#: libparted/disk.c:2548 msgid "root" msgstr "root" -#: libparted/disk.c:2381 +#: libparted/disk.c:2550 msgid "swap" msgstr "swap" -#: libparted/disk.c:2383 +#: libparted/disk.c:2552 msgid "hidden" msgstr "tersembunyi" -#: libparted/disk.c:2385 +#: libparted/disk.c:2554 msgid "raid" msgstr "raid" -#: libparted/disk.c:2387 +#: libparted/disk.c:2556 msgid "lvm" msgstr "lvm" -#: libparted/disk.c:2389 +#: libparted/disk.c:2558 msgid "lba" msgstr "lba" -#: libparted/disk.c:2391 +#: libparted/disk.c:2560 msgid "hp-service" msgstr "hp-service" -#: libparted/disk.c:2393 +#: libparted/disk.c:2562 msgid "palo" msgstr "palo" -#: libparted/disk.c:2395 +#: libparted/disk.c:2564 msgid "prep" msgstr "prep" -#: libparted/disk.c:2397 +#: libparted/disk.c:2566 msgid "msftres" msgstr "msftres" -#: libparted/disk.c:2399 +#: libparted/disk.c:2568 msgid "msftdata" msgstr "msftdata" -#: libparted/disk.c:2401 +#: libparted/disk.c:2570 msgid "atvrecv" msgstr "atvrecv" -#: libparted/disk.c:2403 +#: libparted/disk.c:2572 msgid "diag" msgstr "diag" -#: libparted/disk.c:2405 +#: libparted/disk.c:2574 msgid "legacy_boot" msgstr "legacy_boot" -#: libparted/disk.c:2407 +#: libparted/disk.c:2576 msgid "irst" msgstr "irst" -#: libparted/disk.c:2409 +#: libparted/disk.c:2578 msgid "esp" msgstr "esp" -#: libparted/disk.c:2411 +#: libparted/disk.c:2580 msgid "chromeos_kernel" msgstr "chromeos_kernel" -#: libparted/disk.c:2413 +#: libparted/disk.c:2582 msgid "bls_boot" msgstr "bls_boot" -#: libparted/disk.c:2415 +#: libparted/disk.c:2584 msgid "linux-home" msgstr "linux-home" -#: libparted/disk.c:2421 +#: libparted/disk.c:2586 +msgid "no_automount" +msgstr "" + +#: libparted/disk.c:2592 #, c-format msgid "Unknown partition flag, %d." msgstr "Flag partisi tak dikenal, %d." @@ -1113,8 +1117,8 @@ msgstr "" "%d partisi primer, jika XGM adalah yang pertama, itu dihitung dua)." #: libparted/labels/atari.c:1662 libparted/labels/bsd.c:563 -#: libparted/labels/dasd.c:895 libparted/labels/dos.c:2303 -#: libparted/labels/dvh.c:770 libparted/labels/gpt.c:1769 +#: libparted/labels/dasd.c:893 libparted/labels/dos.c:2294 +#: libparted/labels/dvh.c:770 libparted/labels/gpt.c:1891 #: libparted/labels/loop.c:244 libparted/labels/mac.c:1409 #: libparted/labels/pc98.c:697 libparted/labels/rdb.c:1054 #: libparted/labels/sun.c:781 @@ -1139,40 +1143,31 @@ msgstr "Tidak dapat mengalokasikan sebuah nomor partisi." msgid "Unable to allocate a bsd disklabel slot." msgstr "Tidak dapat mengalokasikan sebuah slot disklabel bsd." -#: libparted/labels/dasd.c:626 +#: libparted/labels/dasd.c:634 msgid "The partition table of DASD-LDL device cannot be changed.\n" msgstr "Tabel partisi perangkat DASD-LDL tidak dapat diubah.\n" -#: libparted/labels/dasd.c:921 +#: libparted/labels/dasd.c:919 msgid "Unable to allocate a dasd disklabel slot" msgstr "Tidak dapat mengalokasikan sebuah slot disklabel dasd" -#: libparted/labels/dos.c:1008 +#: libparted/labels/dos.c:1159 #, c-format msgid "Invalid partition table on %s -- wrong signature %x." msgstr "Table partisi tidak valid pada %s -- tanda tangan salah %x." -#: libparted/labels/dos.c:1036 +#: libparted/labels/dos.c:1187 #, c-format msgid "Invalid partition table - recursive partition on %s." msgstr "Table partisi tidak valid - partisi rekursif pada %s." -#: libparted/labels/dos.c:1567 -msgid "Extended partitions cannot be hidden on msdos disk labels." -msgstr "Partisi extended tidak dapat disembunyikan pada label disk msdos." - -#: libparted/labels/dos.c:1579 -msgid "Extended partitions cannot be recovery partitions on msdos disk labels." -msgstr "" -"Partisi extended tidak bisa berupa partisi pemulihan pada label disk msdos." - -#: libparted/labels/dos.c:2285 +#: libparted/labels/dos.c:2276 msgid "Parted can't resize partitions managed by Windows Dynamic Disk." msgstr "" "Parted tidak bisa mengubah ukuran partisi yang diatur oleh Windows Dynamic " "Disk." -#: libparted/labels/dos.c:2541 +#: libparted/labels/dos.c:2532 msgid "cannot create any more partitions" msgstr "tidak bisa membuat lebih banyak partisi lagi" @@ -1313,11 +1308,11 @@ msgstr "Tak dapat mengambil informasi ukuran blok." msgid "Disk geometry does not match a DASD device of type 3390." msgstr "Geometri disk tidak cocok dengan perangkat DASD tipe 3390." -#: libparted/labels/gpt.c:569 +#: libparted/labels/gpt.c:589 msgid "device is too small for GPT" msgstr "perangkat terlalu kecil untuk GPT" -#: libparted/labels/gpt.c:771 +#: libparted/labels/gpt.c:791 #, c-format msgid "" "The format of the GPT partition table is version %x, which is newer than " @@ -1326,7 +1321,7 @@ msgstr "" "Format tabel partisi GPT adalah versi %x, lebih baru dari format yang Parted " "dapat mengenalnya. Harap laporkan ini!" -#: libparted/labels/gpt.c:807 +#: libparted/labels/gpt.c:827 #, c-format msgid "" "Not all of the space available to %s appears to be used, you can fix the GPT " @@ -1337,7 +1332,7 @@ msgstr "" "memperbaiki GPT untuk menggunakan semua ruang kosong (tambahan %llu blok) " "atau melanjutkan dengan pengaturan saat ini? " -#: libparted/labels/gpt.c:1006 +#: libparted/labels/gpt.c:1026 msgid "" "The backup GPT table is not at the end of the disk, as it should be. Fix, " "by moving the backup to the end (and removing the old backup)?" @@ -1345,7 +1340,7 @@ msgstr "" "Tabel GPT cadangan tidak ada pada akhir dari disk, seperti yang seharusnya. " "Perbaiki, dengan memindahkan cadangan ke akhir (dan menghapus cadangan lama)?" -#: libparted/labels/gpt.c:1024 +#: libparted/labels/gpt.c:1044 msgid "" "Both the primary and backup GPT tables are corrupt. Try making a fresh " "table, and using Parted's rescue feature to recover partitions." @@ -1354,7 +1349,7 @@ msgstr "" "sebuah tabel yang baru, dan gunakan fitur penyelamatan Parted untuk " "memulihkan partisi." -#: libparted/labels/gpt.c:1035 +#: libparted/labels/gpt.c:1055 msgid "" "The backup GPT table is corrupt, but the primary appears OK, so that will be " "used." @@ -1362,7 +1357,7 @@ msgstr "" "Tabel GPT cadangan telah terkorupsi, tetapi yang primer tampak OK, jadi itu " "yang akan digunakan." -#: libparted/labels/gpt.c:1047 +#: libparted/labels/gpt.c:1067 msgid "" "The primary GPT table is corrupt, but the backup appears OK, so that will be " "used." @@ -1370,11 +1365,11 @@ msgstr "" "Tabel GPT primer telah terkorupsi, tetapi cadangannya tampak OK, jadi itu " "yang akan digunakan." -#: libparted/labels/gpt.c:1071 +#: libparted/labels/gpt.c:1091 msgid "primary partition table array CRC mismatch" msgstr "nilai CRC larik tabel partisi primer tidak cocok" -#: libparted/labels/gpt.c:1655 libparted/labels/gpt.c:1682 +#: libparted/labels/gpt.c:1722 libparted/labels/gpt.c:1749 msgid "failed to translate partition name" msgstr "gagal menerjemahkan nama partisi" @@ -2049,7 +2044,7 @@ msgstr "fat_table_alloc_cluster: tidak ada cluster bebas" msgid "Could not detect file system." msgstr "Tidak dapat mendeteksi sistem berkas." -#: libparted/fs/r/filesys.c:159 libparted/fs/r/filesys.c:284 +#: libparted/fs/r/filesys.c:159 libparted/fs/r/filesys.c:285 #, c-format msgid "resizing %s file systems is not supported" msgstr "mengubah ukuran sistem berkas %s tidak didukung" @@ -2336,39 +2331,39 @@ msgid "This HFS+ volume has no extents overflow file. This is quite unusual!" msgstr "" "Volume HFS+ ini tidak memiliki berkas overflow extent. Ini tidak biasa!" -#: parted/parted.c:137 +#: parted/parted.c:138 msgid "displays this help message" msgstr "tampilkan pesan bantuan ini" -#: parted/parted.c:138 +#: parted/parted.c:139 msgid "lists partition layout on all block devices" msgstr "tampilkan tata letak partisi di seluruh perangkat blok" -#: parted/parted.c:139 +#: parted/parted.c:140 msgid "displays machine parseable output" msgstr "tampilkan keluaran yang dapat diurai mesin" -#: parted/parted.c:140 +#: parted/parted.c:141 msgid "displays JSON output" msgstr "tampilkan keluaran JSON" -#: parted/parted.c:141 +#: parted/parted.c:142 msgid "never prompts for user intervention" msgstr "jangan pernah tanyakan untuk intervensi pengguna" -#: parted/parted.c:142 +#: parted/parted.c:143 msgid "in script mode, fix instead of abort when asked" msgstr "dalam mode skrip, perbaiki alih-alih menggugurkan saat diminta" -#: parted/parted.c:143 +#: parted/parted.c:144 msgid "displays the version" msgstr "tampilkan versi" -#: parted/parted.c:144 +#: parted/parted.c:145 msgid "alignment for new partitions" msgstr "perataan untuk partisi baru" -#: parted/parted.c:157 +#: parted/parted.c:158 msgid "" "NUMBER is the partition number used by Linux. On MS-DOS disk labels, the " "primary partitions number from 1 to 4, logical partitions from 5 onwards.\n" @@ -2377,31 +2372,31 @@ msgstr "" "MS-DOS, partisi primer bernomor dari 1 sampai 4, partisi logis dari 5 ke " "atas.\n" -#: parted/parted.c:160 +#: parted/parted.c:161 msgid "LABEL-TYPE is one of: " msgstr "TIPE-LABEL adalah salah satu dari: " -#: parted/parted.c:161 parted/parted.c:162 +#: parted/parted.c:162 parted/parted.c:163 msgid "FLAG is one of: " msgstr "FLAG adalah salah satu dari: " -#: parted/parted.c:163 +#: parted/parted.c:164 msgid "UNIT is one of: " msgstr "SATUAN adalah salah satu dari: " -#: parted/parted.c:164 +#: parted/parted.c:165 msgid "desired alignment: minimum or optimal" msgstr "perataan yang diinginkan: minimal atau optimal" -#: parted/parted.c:165 +#: parted/parted.c:166 msgid "PART-TYPE is one of: primary, logical, extended\n" msgstr "TIPE-PART adalah salah satu dari: primer, logis, extended\n" -#: parted/parted.c:167 +#: parted/parted.c:168 msgid "FS-TYPE is one of: " msgstr "TIPE-FS adalah salah satu dari: " -#: parted/parted.c:168 +#: parted/parted.c:169 msgid "" "START and END are disk locations, such as 4GB or 10%. Negative values count " "from the end of the disk. For example, -1s specifies exactly the last " @@ -2411,7 +2406,7 @@ msgstr "" "dihitung dari akhir alamat disk. Sebagai contoh, -1s menyatakan persis " "sektor terakhir.\n" -#: parted/parted.c:171 +#: parted/parted.c:172 msgid "" "END is disk location, such as 4GB or 10%. Negative value counts from the " "end of the disk. For example, -1s specifies exactly the last sector.\n" @@ -2420,19 +2415,23 @@ msgstr "" "dari akhir alamat disk. sebagai contoh, -1s menyatakan persis sektor " "terakhir.\n" -#: parted/parted.c:174 +#: parted/parted.c:175 msgid "STATE is one of: on, off\n" msgstr "KEADAAN adalah salah satu dari: on, off\n" -#: parted/parted.c:175 +#: parted/parted.c:176 msgid "DEVICE is usually /dev/hda or /dev/sda\n" msgstr "PERANGKAT biasanya adalah /dev/hda atau /dev/sda\n" -#: parted/parted.c:176 +#: parted/parted.c:177 msgid "NAME is any word you want\n" msgstr "NAMA adalah kata apapun yang Anda inginkan\n" -#: parted/parted.c:179 +#: parted/parted.c:178 +msgid "TYPE_ID is a value between 0x01 and 0xff, TYPE_UUID is a UUID\n" +msgstr "" + +#: parted/parted.c:182 msgid "" "Copyright (C) 1998 - 2006 Free Software Foundation, Inc.\n" "This program is free software, covered by the GNU General Public License.\n" @@ -2453,22 +2452,22 @@ msgstr "" "GNU General Public License untuk informasi yang lebih detail.\n" "\n" -#: parted/parted.c:229 +#: parted/parted.c:232 #, c-format msgid "%0.f%%\t(time left %.2d:%.2d)" msgstr "%0.f%%\t(sisa waktu %.2d:%.2d)" -#: parted/parted.c:248 +#: parted/parted.c:251 #, c-format msgid "Partition %s is being used. Are you sure you want to continue?" msgstr "Partisi %s sedang digunakan. Anda yakin ingin melanjutkan?" -#: parted/parted.c:269 +#: parted/parted.c:272 #, c-format msgid "Partition(s) on %s are being used." msgstr "Partisi pada %s sedang digunakan." -#: parted/parted.c:281 +#: parted/parted.c:284 #, c-format msgid "" "The existing disk label on %s will be destroyed and all data on this disk " @@ -2477,31 +2476,31 @@ msgstr "" "Disk label yang ada di %s akan dirusak dan seluruh data di disk ini akan " "hilang. Apakah Anda ingin melanjutkan?" -#: parted/parted.c:542 +#: parted/parted.c:545 msgid "New disk label type?" msgstr "Tipe label disk baru?" -#: parted/parted.c:680 +#: parted/parted.c:692 msgid "Partition type?" msgstr "Tipe partisi?" -#: parted/parted.c:698 parted/parted.c:902 +#: parted/parted.c:710 parted/parted.c:914 msgid "Partition name?" msgstr "Nama partisi?" -#: parted/parted.c:708 +#: parted/parted.c:720 msgid "File system type?" msgstr "Tipe sistem berkas?" -#: parted/parted.c:713 parted/parted.c:1683 +#: parted/parted.c:725 parted/parted.c:1815 msgid "Start?" msgstr "Awal?" -#: parted/parted.c:715 parted/parted.c:1685 parted/parted.c:1768 +#: parted/parted.c:727 parted/parted.c:1817 parted/parted.c:1900 msgid "End?" msgstr "Akhir?" -#: parted/parted.c:782 +#: parted/parted.c:794 #, c-format msgid "" "You requested a partition from %s to %s (sectors %llu..%llu).\n" @@ -2511,7 +2510,7 @@ msgstr "" "Lokasi terdekat yang dapat kami tangani adalah %s sampai %s (sektor %llu.." "%llu).%s" -#: parted/parted.c:791 +#: parted/parted.c:803 msgid "" "\n" "Is this still acceptable to you?" @@ -2519,7 +2518,7 @@ msgstr "" "\n" "Apakah ini masih dapat Anda terima?" -#: parted/parted.c:814 +#: parted/parted.c:826 #, c-format msgid "" "The resulting partition is not properly aligned for best performance: %s" @@ -2527,88 +2526,113 @@ msgstr "" "Partisi yang dihasilkan tidak diratakan dengan benar untuk kinerja terbaik: " "%s" -#: parted/parted.c:816 parted/parted.c:1925 +#: parted/parted.c:828 parted/parted.c:2057 msgid "unknown (malloc failed)" msgstr "tidak diketahui (malloc gagal)" -#: parted/parted.c:894 +#: parted/parted.c:906 #, c-format msgid "%s disk labels do not support partition name." msgstr "Label disk %s tidak mendukung partisi extended." -#: parted/parted.c:899 parted/parted.c:1748 parted/parted.c:1814 -#: parted/parted.c:1908 parted/parted.c:1983 +#: parted/parted.c:911 parted/parted.c:955 parted/parted.c:1880 +#: parted/parted.c:1946 parted/parted.c:2040 parted/parted.c:2115 msgid "Partition number?" msgstr "Nomor partisi?" -#: parted/parted.c:1050 +#: parted/parted.c:949 +#, fuzzy, c-format +msgid "%s disk labels do not support partition type." +msgstr "Label disk %s tidak mendukung partisi extended." + +#: parted/parted.c:965 +#, fuzzy +msgid "Partition type-id?" +msgstr "Tipe partisi?" + +#: parted/parted.c:972 +#, fuzzy +msgid "Invalid type-id." +msgstr "Nomor tidak valid." + +#: parted/parted.c:986 +#, fuzzy +msgid "Partition type-uuid?" +msgstr "Tipe partisi?" + +#: parted/parted.c:993 +#, fuzzy +msgid "Invalid type-uuid." +msgstr "Nomor tidak valid." + +#: parted/parted.c:1146 #, c-format msgid "BIOS cylinder,head,sector geometry: %d,%d,%d. Each cylinder is %s.\n" msgstr "" "Geometri silinder,head,sektor BIOS: %d,%d,%d. Setiap silinder adalah %s.\n" -#: parted/parted.c:1137 +#: parted/parted.c:1240 #, c-format msgid "Model: %s (%s)\n" msgstr "Model: %s (%s)\n" -#: parted/parted.c:1139 +#: parted/parted.c:1242 #, c-format msgid "Disk %s: %s\n" msgstr "Disk %s: %s\n" -#: parted/parted.c:1140 +#: parted/parted.c:1243 #, c-format msgid "Sector size (logical/physical): %lldB/%lldB\n" msgstr "Ukuran sektor (logis/fisik): %lldB/%lldB\n" -#: parted/parted.c:1152 +#: parted/parted.c:1255 #, c-format msgid "Partition Table: %s\n" msgstr "Tabel Partisi: %s\n" -#: parted/parted.c:1153 +#: parted/parted.c:1256 #, c-format msgid "Disk Flags: %s\n" msgstr "Flag Disk: %s\n" -#: parted/parted.c:1279 parted/parted.c:1282 +#: parted/parted.c:1388 parted/parted.c:1391 msgid "Number" msgstr "Nomor" -#: parted/parted.c:1279 parted/parted.c:1282 +#: parted/parted.c:1388 parted/parted.c:1391 msgid "Start" msgstr "Mulai" -#: parted/parted.c:1280 parted/parted.c:1283 +#: parted/parted.c:1389 parted/parted.c:1392 msgid "End" msgstr "Akhir" -#: parted/parted.c:1283 +#: parted/parted.c:1392 msgid "Size" msgstr "Ukuran" -#: parted/parted.c:1287 +#: parted/parted.c:1396 msgid "Type" msgstr "Tipe" -#: parted/parted.c:1289 +#: parted/parted.c:1398 msgid "File system" msgstr "Sistem berkas" -#: parted/parted.c:1292 +#: parted/parted.c:1401 msgid "Name" msgstr "Nama" -#: parted/parted.c:1294 +#: parted/parted.c:1403 msgid "Flags" msgstr "Flag" -#: parted/parted.c:1352 +#: parted/parted.c:1461 msgid "Free Space" msgstr "Ruang Kosong" -#: parted/parted.c:1570 +#: parted/parted.c:1702 #, c-format msgid "" "A %s %s partition was found at %s -> %s. Do you want to add it to the " @@ -2617,56 +2641,56 @@ msgstr "" "Sebuah partisi %s %s ditemukan pada %s -> %s. Anda ingin menambahkan ini " "pada tabel partisi?" -#: parted/parted.c:1613 +#: parted/parted.c:1745 msgid "searching for file systems" msgstr "mencari sistem berkass" -#: parted/parted.c:1720 +#: parted/parted.c:1852 msgid "The resize command has been removed in parted 3.0" msgstr "Perintah resize telah dihapus di parted 3.0" -#: parted/parted.c:1782 +#: parted/parted.c:1914 msgid "" "Shrinking a partition can cause data loss, are you sure you want to continue?" msgstr "" "Mengecilkan partisi dapat menyebabkan kehilangan data, Anda yakin ingin " "melanjutkan?" -#: parted/parted.c:1838 +#: parted/parted.c:1970 msgid "New device?" msgstr "Perangkat baru?" -#: parted/parted.c:1906 +#: parted/parted.c:2038 msgid "alignment type(min/opt)" msgstr "tipe perataan(min/opt)" -#: parted/parted.c:1921 +#: parted/parted.c:2053 #, c-format msgid "%d aligned\n" msgstr "%d diratakan\n" -#: parted/parted.c:1923 +#: parted/parted.c:2055 #, c-format msgid "%d not aligned: %s\n" msgstr "%d tidak diratakan: %s\n" -#: parted/parted.c:1948 parted/parted.c:1985 +#: parted/parted.c:2080 parted/parted.c:2117 msgid "Flag to Invert?" msgstr "Flag yang akan Dibalik?" -#: parted/parted.c:1953 parted/parted.c:1990 +#: parted/parted.c:2085 parted/parted.c:2122 msgid "New state?" msgstr "Keadaan baru?" -#: parted/parted.c:2036 +#: parted/parted.c:2168 msgid "Unit?" msgstr "Satuan?" -#: parted/parted.c:2171 +#: parted/parted.c:2303 msgid "align-check" msgstr "align-check" -#: parted/parted.c:2174 +#: parted/parted.c:2306 msgid "" "align-check TYPE N check partition N for TYPE(min|opt) " "alignment" @@ -2674,11 +2698,11 @@ msgstr "" "align-check TIPE N periksa partisi N untuk perataan " "TIPE (min|opt)" -#: parted/parted.c:2182 +#: parted/parted.c:2314 msgid "help" msgstr "help" -#: parted/parted.c:2185 +#: parted/parted.c:2317 msgid "" "help [COMMAND] print general help, or help on " "COMMAND" @@ -2686,15 +2710,15 @@ msgstr "" "help [PERINTAH] menampilkan bantuan umum, atau " "bantuan tentang PERINTAH" -#: parted/parted.c:2191 +#: parted/parted.c:2323 msgid "mklabel" msgstr "mklabel" -#: parted/parted.c:2191 +#: parted/parted.c:2323 msgid "mktable" msgstr "mktable" -#: parted/parted.c:2194 +#: parted/parted.c:2326 msgid "" "mklabel,mktable LABEL-TYPE create a new disklabel (partition " "table)" @@ -2702,15 +2726,15 @@ msgstr "" "mklabel,mktable TIPE-LABEL membuat sebuah disklabel baru " "(tabel partisi)" -#: parted/parted.c:2200 +#: parted/parted.c:2332 msgid "mkpart" msgstr "mkpart" -#: parted/parted.c:2203 +#: parted/parted.c:2335 msgid "mkpart PART-TYPE [FS-TYPE] START END make a partition" msgstr "mkpart TIPE-PART [TIPE-FS] AWAL AKHIR membuat sebuah partisi" -#: parted/parted.c:2209 +#: parted/parted.c:2341 msgid "" "'mkpart' makes a partition without creating a new file system on the " "partition. FS-TYPE may be specified to set an appropriate partition ID.\n" @@ -2718,21 +2742,21 @@ msgstr "" "'mkpart' membuat sebuah partisi tanpa membuat sebuah sistem berkas baru pada " "partisi. TIPE-FS dapat dinyatakan untuk menata ID partisi yang sesuai.\n" -#: parted/parted.c:2214 +#: parted/parted.c:2346 msgid "name" msgstr "name" -#: parted/parted.c:2217 +#: parted/parted.c:2349 msgid "name NUMBER NAME name partition NUMBER as NAME" msgstr "" "name NOMOR NAMA memberi nama partisi NOMOR dengan " "NAMA" -#: parted/parted.c:2222 +#: parted/parted.c:2354 msgid "print" msgstr "print" -#: parted/parted.c:2225 +#: parted/parted.c:2357 msgid "" "print [devices|free|list,all] display the partition table, or " "available devices, or free space, or all found partitions" @@ -2741,7 +2765,7 @@ msgstr "" "perangkat yang bisa dipakai, atau ruang kosong, atau seluruh partisi yang " "ditemukan" -#: parted/parted.c:2229 +#: parted/parted.c:2361 msgid "" "Without arguments, 'print' displays the entire partition table. However with " "the following arguments it performs various other actions.\n" @@ -2749,11 +2773,11 @@ msgstr "" "Tanpa argumen, 'print' menampilkan seluruh tabel partisi. Akan tetapi dengan " "diikuti argumen ini akan melakukan beberapa aksi yang berbeda.\n" -#: parted/parted.c:2231 +#: parted/parted.c:2363 msgid " devices : display all active block devices\n" msgstr " devices : menampilkan seluruh perangkat blok yang aktif\n" -#: parted/parted.c:2232 +#: parted/parted.c:2364 msgid "" " free : display information about free unpartitioned space on the " "current block device\n" @@ -2761,26 +2785,26 @@ msgstr "" " free : menampilkan informasi tentang ruang partisi kosong di perngkat " "blok yang sedang dipakai\n" -#: parted/parted.c:2234 +#: parted/parted.c:2366 msgid "" " list, all : display the partition tables of all active block devices\n" msgstr "" " list, all : tampilkan tabel partisi dari seluruh perangkat blok yang " "aktif\n" -#: parted/parted.c:2238 +#: parted/parted.c:2370 msgid "quit" msgstr "quit" -#: parted/parted.c:2241 +#: parted/parted.c:2373 msgid "quit exit program" msgstr "quit keluar dari program" -#: parted/parted.c:2246 +#: parted/parted.c:2378 msgid "rescue" msgstr "rescue" -#: parted/parted.c:2249 +#: parted/parted.c:2381 msgid "" "rescue START END rescue a lost partition near START " "and END" @@ -2788,55 +2812,55 @@ msgstr "" "rescue AWAL AKHIR menyelamatkan partisi yang hilang " "di dekat AWAL dan AKHIR" -#: parted/parted.c:2255 +#: parted/parted.c:2387 msgid "resize" msgstr "resize" -#: parted/parted.c:2258 +#: parted/parted.c:2390 msgid "The resize command was removed in parted 3.0\n" msgstr "Perintah resize telah dihapus di parted 3.0\n" -#: parted/parted.c:2261 +#: parted/parted.c:2393 msgid "resizepart" msgstr "resizepart" -#: parted/parted.c:2264 +#: parted/parted.c:2396 msgid "resizepart NUMBER END resize partition NUMBER" msgstr "resizepart NOMOR AKHIR mengubah ukuran partisi NOMOR" -#: parted/parted.c:2269 +#: parted/parted.c:2401 msgid "rm" msgstr "rm" -#: parted/parted.c:2272 +#: parted/parted.c:2404 msgid "rm NUMBER delete partition NUMBER" msgstr "rm NOMOR hapus partisi NOMOR" -#: parted/parted.c:2277 +#: parted/parted.c:2409 msgid "select" msgstr "select" -#: parted/parted.c:2280 +#: parted/parted.c:2412 msgid "select DEVICE choose the device to edit" msgstr "" "select PERANGKAT pilih perangkat yang akan disunting" -#: parted/parted.c:2285 +#: parted/parted.c:2417 msgid "disk_set" msgstr "disk_set" -#: parted/parted.c:2288 +#: parted/parted.c:2420 msgid "" "disk_set FLAG STATE change the FLAG on selected device" msgstr "" "disk_set FLAG STATE ubah FLAG pada perangkat yang " "dipilih" -#: parted/parted.c:2293 +#: parted/parted.c:2425 msgid "disk_toggle" msgstr "disk_toggle" -#: parted/parted.c:2296 +#: parted/parted.c:2428 msgid "" "disk_toggle [FLAG] toggle the state of FLAG on " "selected device" @@ -2844,20 +2868,20 @@ msgstr "" "disk_toggle [FLAG] jungkitkan keadaan FLAG pada " "perangkat yang dipilih" -#: parted/parted.c:2302 +#: parted/parted.c:2434 msgid "set" msgstr "set" -#: parted/parted.c:2305 +#: parted/parted.c:2437 msgid "" "set NUMBER FLAG STATE change the FLAG on partition NUMBER" msgstr "set NOMOR FLAG STATE ubah FLAG pada partisi NOMOR" -#: parted/parted.c:2311 +#: parted/parted.c:2443 msgid "toggle" msgstr "toggle" -#: parted/parted.c:2314 +#: parted/parted.c:2446 msgid "" "toggle [NUMBER [FLAG]] toggle the state of FLAG on " "partition NUMBER" @@ -2865,19 +2889,29 @@ msgstr "" "toggle [NOMOR [FLAG]] jungkitkan keadaan FLAG pada " "partisi NOMOR" -#: parted/parted.c:2320 +#: parted/parted.c:2452 +msgid "type" +msgstr "" + +#: parted/parted.c:2455 +msgid "" +"type NUMBER TYPE-ID or TYPE-UUID type set TYPE-ID or TYPE-UUID of " +"partition NUMBER" +msgstr "" + +#: parted/parted.c:2460 msgid "unit" msgstr "unit" -#: parted/parted.c:2323 +#: parted/parted.c:2463 msgid "unit UNIT set the default unit to UNIT" msgstr "unit SATUAN menata satuan baku ke SATUAN" -#: parted/parted.c:2328 +#: parted/parted.c:2468 msgid "version" msgstr "version" -#: parted/parted.c:2331 +#: parted/parted.c:2471 msgid "" "version display the version number and " "copyright information of GNU Parted" @@ -2885,7 +2919,7 @@ msgstr "" "version menampilkan versi dan informasi hak " "cipta dari GNU Parted" -#: parted/parted.c:2335 +#: parted/parted.c:2475 msgid "" "'version' displays copyright and version information corresponding to this " "copy of GNU Parted\n" @@ -2893,22 +2927,22 @@ msgstr "" "'version' menampilkan hak cipta dan informasi versi yang sesuai dengan " "salinan dari GNU Parted ini\n" -#: parted/parted.c:2405 +#: parted/parted.c:2545 #, c-format msgid "Usage: %s [-hlmsfv] [-a<align>] [DEVICE [COMMAND [PARAMETERS]]...]\n" msgstr "" "Penggunaan: %s [-hlmsfv] [-a<perataan>] [PERANGKAT [PERINTAH " "[PARAMETER]]...]\n" -#: parted/parted.c:2449 +#: parted/parted.c:2589 msgid "No device found" msgstr "Tak ada perangkat yang ditemukan" -#: parted/parted.c:2486 +#: parted/parted.c:2626 msgid "WARNING: You are not superuser. Watch out for permissions.\n" msgstr "PERINGATAN: Anda bukan superuser. Hati-hati dengan izin.\n" -#: parted/parted.c:2519 +#: parted/parted.c:2659 msgid "" "You should reinstall your boot loader before rebooting. Read section 4 of " "the Parted User documentation for more information." @@ -2916,7 +2950,7 @@ msgstr "" "Anda seharusnya memasang ulang boot loader Anda sebelum reboot. Baca bagian " "4 dari dokumentasi pengguna Parted untuk informasi lebih lanjut." -#: parted/parted.c:2526 +#: parted/parted.c:2666 msgid "You may need to update /etc/fstab.\n" msgstr "Anda mungkin perlu memperbarui /etc/fstab.\n" @@ -3176,69 +3210,69 @@ msgstr "" "\n" "Galat: Sebuah sinyal SIGILL umum telah dijumpai." -#: parted/ui.c:901 +#: parted/ui.c:904 #, c-format msgid "invalid token: %s" msgstr "token tidak valid: %s" -#: parted/ui.c:1082 +#: parted/ui.c:1085 msgid "Expecting a partition number." msgstr "Mengharapkan sebuah nomor partisi." -#: parted/ui.c:1091 +#: parted/ui.c:1094 msgid "Partition doesn't exist." msgstr "Partisi tidak ada." -#: parted/ui.c:1111 +#: parted/ui.c:1114 msgid "Expecting a file system type." msgstr "Mengharapkan sebuah tipe sistem berkas." -#: parted/ui.c:1118 +#: parted/ui.c:1121 #, c-format msgid "Unknown file system type \"%s\"." msgstr "Tipe sistem berkas tak dikenal \"%s\"." -#: parted/ui.c:1139 +#: parted/ui.c:1142 msgid "Expecting a disk label type." msgstr "Mengharapkan sebuah tipe label disk." -#: parted/ui.c:1170 parted/ui.c:1206 +#: parted/ui.c:1173 parted/ui.c:1209 msgid "No flags supported" msgstr "Tidak ada flag yang didukung" -#: parted/ui.c:1280 +#: parted/ui.c:1283 msgid "Can't create any more partitions." msgstr "Tidak dapat membuat partisi lagi." -#: parted/ui.c:1290 +#: parted/ui.c:1293 msgid "Expecting a partition type." msgstr "Mengharapkan sebuah tipe partisi." -#: parted/ui.c:1439 +#: parted/ui.c:1442 msgid "on" msgstr "nyala" -#: parted/ui.c:1440 +#: parted/ui.c:1443 msgid "off" msgstr "mati" -#: parted/ui.c:1457 +#: parted/ui.c:1460 msgid "optimal" msgstr "optimal" -#: parted/ui.c:1458 +#: parted/ui.c:1461 msgid "minimal" msgstr "minimal" -#: parted/ui.c:1591 +#: parted/ui.c:1594 msgid "OPTIONs:" msgstr "OPSI:" -#: parted/ui.c:1596 +#: parted/ui.c:1599 msgid "COMMANDs:" msgstr "PERINTAH:" -#: parted/ui.c:1599 +#: parted/ui.c:1602 #, c-format msgid "" "\n" @@ -3247,11 +3281,20 @@ msgstr "" "\n" "Laporkan bug ke: %s\n" -#: parted/ui.c:1606 +#: parted/ui.c:1609 #, c-format msgid "Using %s\n" msgstr "Menggunakan %s\n" -#: parted/ui.c:1686 +#: parted/ui.c:1689 msgid "This command does not make sense in non-interactive mode.\n" msgstr "Perintah ini tidak masuk akal dalam mode non-interaktif.\n" + +#~ msgid "Extended partitions cannot be hidden on msdos disk labels." +#~ msgstr "Partisi extended tidak dapat disembunyikan pada label disk msdos." + +#~ msgid "" +#~ "Extended partitions cannot be recovery partitions on msdos disk labels." +#~ msgstr "" +#~ "Partisi extended tidak bisa berupa partisi pemulihan pada label disk " +#~ "msdos." Binary files differ@@ -8,7 +8,7 @@ msgid "" msgstr "" "Project-Id-Version: parted 3.1.90\n" "Report-Msgid-Bugs-To: bug-parted@gnu.org\n" -"POT-Creation-Date: 2022-04-18 14:44-0400\n" +"POT-Creation-Date: 2023-04-10 15:50-0700\n" "PO-Revision-Date: 2014-07-10 09:57+0100\n" "Last-Translator: Milo Casagrande <milo@milo.name>\n" "Language-Team: Italian <tp@lists.linux.it>\n" @@ -20,25 +20,25 @@ msgstr "" "Plural-Forms: nplurals=2; plural=(n!=1);\n" "X-Generator: Poedit 1.6.6\n" -#: lib/argmatch.c:147 +#: lib/argmatch.c:145 #, c-format msgid "invalid argument %s for %s" msgstr "argomento %s per %s non valido" -#: lib/argmatch.c:148 +#: lib/argmatch.c:146 #, c-format msgid "ambiguous argument %s for %s" msgstr "argomento %s per %s ambiguo" -#: lib/argmatch.c:167 lib/argmatch.h:238 +#: lib/argmatch.c:165 lib/argmatch.h:237 msgid "Valid arguments are:" msgstr "Argomenti validi sono:" -#: lib/closeout.c:122 libparted/labels/fdasd.c:145 +#: lib/closeout.c:121 libparted/labels/fdasd.c:145 msgid "write error" msgstr "errore di scrittura" -#: lib/error.c:195 +#: lib/error.c:193 msgid "Unknown system error" msgstr "Errore di sistema sconosciuto" @@ -98,11 +98,11 @@ msgstr "%s: l'opzione richiede un argomento -- \"%c\"\n" #. If you don't know what to put here, please see #. <https://en.wikipedia.org/wiki/Quotation_marks_in_other_languages> #. and use glyphs suitable for your language. -#: lib/quotearg.c:355 +#: lib/quotearg.c:354 msgid "`" msgstr "\"" -#: lib/quotearg.c:356 +#: lib/quotearg.c:355 msgid "'" msgstr "\"" @@ -187,7 +187,7 @@ msgstr "Nessuna espressione regolare precedente" #. To enquire the regular expression that your system uses for this #. purpose, you can use the command #. locale -k LC_MESSAGES | grep '^yesexpr=' -#: lib/rpmatch.c:150 +#: lib/rpmatch.c:149 msgid "^[yY]" msgstr "^[sSyY]" @@ -197,7 +197,7 @@ msgstr "^[sSyY]" #. To enquire the regular expression that your system uses for this #. purpose, you can use the command #. locale -k LC_MESSAGES | grep '^noexpr=' -#: lib/rpmatch.c:163 +#: lib/rpmatch.c:162 msgid "^[nN]" msgstr "^[nN]" @@ -760,22 +760,22 @@ msgstr "pmbr_boot" msgid "Unknown disk flag, %d." msgstr "Flag del disco %d sconosciuto." -#: libparted/disk.c:1289 +#: libparted/disk.c:1320 #, c-format msgid "%s disk labels do not support extended partitions." msgstr "Le etichette dei dischi %s non supportano le partizioni estese." -#: libparted/disk.c:1821 +#: libparted/disk.c:1990 #, c-format msgid "%s disk labels don't support logical or extended partitions." msgstr "" "Le etichette dei dischi %s non supportano le partizioni estese o logiche." -#: libparted/disk.c:1834 +#: libparted/disk.c:2003 msgid "Too many primary partitions." msgstr "Troppe partizioni primarie." -#: libparted/disk.c:1843 +#: libparted/disk.c:2012 #, c-format msgid "" "Can't add a logical partition to %s, because there is no extended partition." @@ -783,140 +783,144 @@ msgstr "" "Impossibile aggiungere una partizione logica a %s poiché non ci sono " "partizioni estese." -#: libparted/disk.c:1867 +#: libparted/disk.c:2036 #, c-format msgid "Can't have more than one extended partition on %s." msgstr "Impossibile avere più di una partizione estesa su %s." -#: libparted/disk.c:1877 +#: libparted/disk.c:2046 msgid "Can't have logical partitions outside of the extended partition." msgstr "" "Impossibile avere partizioni logiche al di fuori della partizione estesa." -#: libparted/disk.c:1902 +#: libparted/disk.c:2071 #, c-format msgid "Can't have a logical partition outside of the extended partition on %s." msgstr "" "Impossibile avere una partizione logica esterna alla partizione estesa su %s." -#: libparted/disk.c:1912 +#: libparted/disk.c:2081 msgid "Can't have a primary partition inside an extended partition." msgstr "Impossibile avere una partizione primaria all'interno di una estesa." -#: libparted/disk.c:1921 +#: libparted/disk.c:2090 msgid "Can't have a partition outside the disk!" msgstr "Impossibile avere una partizione al di fuori del disco." -#: libparted/disk.c:1972 libparted/disk.c:2150 +#: libparted/disk.c:2141 libparted/disk.c:2319 msgid "Can't have overlapping partitions." msgstr "Impossibile avere partizioni che si sovrappongono." -#: libparted/disk.c:2351 +#: libparted/disk.c:2520 msgid "metadata" msgstr "metadati" -#: libparted/disk.c:2353 +#: libparted/disk.c:2522 msgid "free" msgstr "libero" -#: libparted/disk.c:2355 parted/ui.c:1271 parted/ui.c:1299 +#: libparted/disk.c:2524 parted/ui.c:1274 parted/ui.c:1302 msgid "extended" msgstr "estesa" -#: libparted/disk.c:2357 parted/ui.c:1275 parted/ui.c:1303 +#: libparted/disk.c:2526 parted/ui.c:1278 parted/ui.c:1306 msgid "logical" msgstr "logica" -#: libparted/disk.c:2359 parted/ui.c:1267 parted/ui.c:1295 +#: libparted/disk.c:2528 parted/ui.c:1270 parted/ui.c:1298 msgid "primary" msgstr "primaria" -#: libparted/disk.c:2375 +#: libparted/disk.c:2544 msgid "boot" msgstr "avvio" -#: libparted/disk.c:2377 +#: libparted/disk.c:2546 msgid "bios_grub" msgstr "bios_grub" -#: libparted/disk.c:2379 +#: libparted/disk.c:2548 msgid "root" msgstr "root" -#: libparted/disk.c:2381 +#: libparted/disk.c:2550 msgid "swap" msgstr "swap" -#: libparted/disk.c:2383 +#: libparted/disk.c:2552 msgid "hidden" msgstr "nascosta" -#: libparted/disk.c:2385 +#: libparted/disk.c:2554 msgid "raid" msgstr "raid" -#: libparted/disk.c:2387 +#: libparted/disk.c:2556 msgid "lvm" msgstr "lvm" -#: libparted/disk.c:2389 +#: libparted/disk.c:2558 msgid "lba" msgstr "lba" -#: libparted/disk.c:2391 +#: libparted/disk.c:2560 msgid "hp-service" msgstr "hp-service" -#: libparted/disk.c:2393 +#: libparted/disk.c:2562 msgid "palo" msgstr "palo" -#: libparted/disk.c:2395 +#: libparted/disk.c:2564 msgid "prep" msgstr "prep" -#: libparted/disk.c:2397 +#: libparted/disk.c:2566 msgid "msftres" msgstr "msftres" -#: libparted/disk.c:2399 +#: libparted/disk.c:2568 msgid "msftdata" msgstr "msftdata" -#: libparted/disk.c:2401 +#: libparted/disk.c:2570 msgid "atvrecv" msgstr "atvrecv" -#: libparted/disk.c:2403 +#: libparted/disk.c:2572 msgid "diag" msgstr "diag" -#: libparted/disk.c:2405 +#: libparted/disk.c:2574 msgid "legacy_boot" msgstr "legacy_boot" -#: libparted/disk.c:2407 +#: libparted/disk.c:2576 msgid "irst" msgstr "irst" -#: libparted/disk.c:2409 +#: libparted/disk.c:2578 msgid "esp" msgstr "esp" -#: libparted/disk.c:2411 +#: libparted/disk.c:2580 msgid "chromeos_kernel" msgstr "" -#: libparted/disk.c:2413 +#: libparted/disk.c:2582 #, fuzzy msgid "bls_boot" msgstr "pmbr_boot" -#: libparted/disk.c:2415 +#: libparted/disk.c:2584 msgid "linux-home" msgstr "" -#: libparted/disk.c:2421 +#: libparted/disk.c:2586 +msgid "no_automount" +msgstr "" + +#: libparted/disk.c:2592 #, c-format msgid "Unknown partition flag, %d." msgstr "Flag di partizione %d sconosciuto." @@ -1112,8 +1116,8 @@ msgid "" msgstr "" #: libparted/labels/atari.c:1662 libparted/labels/bsd.c:563 -#: libparted/labels/dasd.c:895 libparted/labels/dos.c:2303 -#: libparted/labels/dvh.c:770 libparted/labels/gpt.c:1769 +#: libparted/labels/dasd.c:893 libparted/labels/dos.c:2294 +#: libparted/labels/dvh.c:770 libparted/labels/gpt.c:1891 #: libparted/labels/loop.c:244 libparted/labels/mac.c:1409 #: libparted/labels/pc98.c:697 libparted/labels/rdb.c:1054 #: libparted/labels/sun.c:781 @@ -1135,38 +1139,29 @@ msgstr "Impossibile allocare un numero di partizione." msgid "Unable to allocate a bsd disklabel slot." msgstr "Impossibile allocare uno spazio per un'etichetta bsd." -#: libparted/labels/dasd.c:626 +#: libparted/labels/dasd.c:634 msgid "The partition table of DASD-LDL device cannot be changed.\n" msgstr "" -#: libparted/labels/dasd.c:921 +#: libparted/labels/dasd.c:919 msgid "Unable to allocate a dasd disklabel slot" msgstr "Impossibile allocare uno spazio per un'etichetta dasd" -#: libparted/labels/dos.c:1008 +#: libparted/labels/dos.c:1159 #, c-format msgid "Invalid partition table on %s -- wrong signature %x." msgstr "Tabella delle partizioni su %s non valida -- firma %x errata." -#: libparted/labels/dos.c:1036 +#: libparted/labels/dos.c:1187 #, c-format msgid "Invalid partition table - recursive partition on %s." msgstr "Tabella della partizioni non valida - partizione ricorsiva su %s." -#: libparted/labels/dos.c:1567 -msgid "Extended partitions cannot be hidden on msdos disk labels." -msgstr "Le partizioni estese non possono essere nascoste su etichette MS-DOS." - -#: libparted/labels/dos.c:1579 -#, fuzzy -msgid "Extended partitions cannot be recovery partitions on msdos disk labels." -msgstr "Le partizioni estese non possono essere nascoste su etichette MS-DOS." - -#: libparted/labels/dos.c:2285 +#: libparted/labels/dos.c:2276 msgid "Parted can't resize partitions managed by Windows Dynamic Disk." msgstr "Impossibile ridimensionare partizioni gestite da Windows Dynamic Disk." -#: libparted/labels/dos.c:2541 +#: libparted/labels/dos.c:2532 msgid "cannot create any more partitions" msgstr "Non è possibile creare ulteriori partizioni" @@ -1313,11 +1308,11 @@ msgstr "Impossibile recuperare informazioni sulla dimensione del blocco." msgid "Disk geometry does not match a DASD device of type 3390." msgstr "" -#: libparted/labels/gpt.c:569 +#: libparted/labels/gpt.c:589 msgid "device is too small for GPT" msgstr "il device è troppo piccolo per GPT" -#: libparted/labels/gpt.c:771 +#: libparted/labels/gpt.c:791 #, c-format msgid "" "The format of the GPT partition table is version %x, which is newer than " @@ -1326,7 +1321,7 @@ msgstr "" "La versione del formato della tabella delle partizioni GPT è %x, successiva " "a quella nota al programma. Segnalare questo problema." -#: libparted/labels/gpt.c:807 +#: libparted/labels/gpt.c:827 #, c-format msgid "" "Not all of the space available to %s appears to be used, you can fix the GPT " @@ -1337,7 +1332,7 @@ msgstr "" "affinché utilizzi tutto lo spazio (ulteriori %llu blocchi) o continuare con " "le impostazioni attuali?" -#: libparted/labels/gpt.c:1006 +#: libparted/labels/gpt.c:1026 msgid "" "The backup GPT table is not at the end of the disk, as it should be. Fix, " "by moving the backup to the end (and removing the old backup)?" @@ -1346,7 +1341,7 @@ msgstr "" "fine del disco. Correggere il problema spostando la copia alla fine (e " "rimuovendo quella vecchia)?" -#: libparted/labels/gpt.c:1024 +#: libparted/labels/gpt.c:1044 msgid "" "Both the primary and backup GPT tables are corrupt. Try making a fresh " "table, and using Parted's rescue feature to recover partitions." @@ -1355,7 +1350,7 @@ msgstr "" "a crearne una nuova e, tramite le funzionalità di ripristino del programma, " "recuperare le partizioni." -#: libparted/labels/gpt.c:1035 +#: libparted/labels/gpt.c:1055 msgid "" "The backup GPT table is corrupt, but the primary appears OK, so that will be " "used." @@ -1363,7 +1358,7 @@ msgstr "" "La tabella GPT di backup è danneggiata, ma quella principale sembra corretta " "e verrà utilizzata." -#: libparted/labels/gpt.c:1047 +#: libparted/labels/gpt.c:1067 msgid "" "The primary GPT table is corrupt, but the backup appears OK, so that will be " "used." @@ -1372,12 +1367,12 @@ msgstr "" "corretta e verrà utilizzata." # (ndt) aiuto!!! idee sul vero significato della frase? -#: libparted/labels/gpt.c:1071 +#: libparted/labels/gpt.c:1091 msgid "primary partition table array CRC mismatch" msgstr "" "CRC non corrispondente nella tabella delle partizioni primaria dell'array" -#: libparted/labels/gpt.c:1655 libparted/labels/gpt.c:1682 +#: libparted/labels/gpt.c:1722 libparted/labels/gpt.c:1749 msgid "failed to translate partition name" msgstr "traduzione nome della partizione non riuscita" @@ -2060,7 +2055,7 @@ msgstr "fat_table_alloc_cluster: cluster esauriti" msgid "Could not detect file system." msgstr "Impossibile rilevare il file system." -#: libparted/fs/r/filesys.c:159 libparted/fs/r/filesys.c:284 +#: libparted/fs/r/filesys.c:159 libparted/fs/r/filesys.c:285 #, c-format msgid "resizing %s file systems is not supported" msgstr "La ridimensione del file system %s non è supportata" @@ -2358,40 +2353,40 @@ msgstr "" "Questo volume HFS+ non possiede un \"Extent Overflow File\". Situazione " "abbastanza inusuale." -#: parted/parted.c:137 +#: parted/parted.c:138 msgid "displays this help message" msgstr "Mostra questo messaggio di aiuto" -#: parted/parted.c:138 +#: parted/parted.c:139 msgid "lists partition layout on all block devices" msgstr "Elenca la disposizione delle partizioni su tutti i device a blocchi" -#: parted/parted.c:139 +#: parted/parted.c:140 msgid "displays machine parseable output" msgstr "Mostra un output analizzabile dal computer" -#: parted/parted.c:140 +#: parted/parted.c:141 #, fuzzy msgid "displays JSON output" msgstr "Mostra un output analizzabile dal computer" -#: parted/parted.c:141 +#: parted/parted.c:142 msgid "never prompts for user intervention" msgstr "Non chiede mai l'intervento dell'utente" -#: parted/parted.c:142 +#: parted/parted.c:143 msgid "in script mode, fix instead of abort when asked" msgstr "" -#: parted/parted.c:143 +#: parted/parted.c:144 msgid "displays the version" msgstr "Stampa la versione" -#: parted/parted.c:144 +#: parted/parted.c:145 msgid "alignment for new partitions" msgstr "allineamento per le nuove partizioni" -#: parted/parted.c:157 +#: parted/parted.c:158 msgid "" "NUMBER is the partition number used by Linux. On MS-DOS disk labels, the " "primary partitions number from 1 to 4, logical partitions from 5 onwards.\n" @@ -2399,32 +2394,32 @@ msgstr "" "NUMERO è il numero di partizione usato da Linux. Su etichette del disco MS-" "DOS, le partizioni primarie hanno numeri da 1 a 4 e le logiche da 5 in poi.\n" -#: parted/parted.c:160 +#: parted/parted.c:161 msgid "LABEL-TYPE is one of: " msgstr "TIPO_ETIC è uno di: " -#: parted/parted.c:161 parted/parted.c:162 +#: parted/parted.c:162 parted/parted.c:163 msgid "FLAG is one of: " msgstr "FLAG è uno di: " -#: parted/parted.c:163 +#: parted/parted.c:164 msgid "UNIT is one of: " msgstr "UNITÀ è uno di: " # (ndt) da tradurre? -#: parted/parted.c:164 +#: parted/parted.c:165 msgid "desired alignment: minimum or optimal" msgstr "allineamento richiesto: minimo od ottimale" -#: parted/parted.c:165 +#: parted/parted.c:166 msgid "PART-TYPE is one of: primary, logical, extended\n" msgstr "TIPO_PART è uno di: primary, logical, extended\n" -#: parted/parted.c:167 +#: parted/parted.c:168 msgid "FS-TYPE is one of: " msgstr "TIPO_FS è uno di: " -#: parted/parted.c:168 +#: parted/parted.c:169 msgid "" "START and END are disk locations, such as 4GB or 10%. Negative values count " "from the end of the disk. For example, -1s specifies exactly the last " @@ -2434,7 +2429,7 @@ msgstr "" "sono relativi alla fine del disco. Per esempio, -1s indica esattamente " "l'ultimo settore.\n" -#: parted/parted.c:171 +#: parted/parted.c:172 msgid "" "END is disk location, such as 4GB or 10%. Negative value counts from the " "end of the disk. For example, -1s specifies exactly the last sector.\n" @@ -2443,19 +2438,23 @@ msgstr "" "relativi alla fine del disco. Per esempio, -1s indica esattamente l'ultimo " "settore.\n" -#: parted/parted.c:174 +#: parted/parted.c:175 msgid "STATE is one of: on, off\n" msgstr "STATO è uno di: on, off\n" -#: parted/parted.c:175 +#: parted/parted.c:176 msgid "DEVICE is usually /dev/hda or /dev/sda\n" msgstr "DEVICE è normalmente /dev/hda o /dev/sda\n" -#: parted/parted.c:176 +#: parted/parted.c:177 msgid "NAME is any word you want\n" msgstr "NOME è una qualsiasi parola\n" -#: parted/parted.c:179 +#: parted/parted.c:178 +msgid "TYPE_ID is a value between 0x01 and 0xff, TYPE_UUID is a UUID\n" +msgstr "" + +#: parted/parted.c:182 msgid "" "Copyright (C) 1998 - 2006 Free Software Foundation, Inc.\n" "This program is free software, covered by the GNU General Public License.\n" @@ -2476,23 +2475,23 @@ msgstr "" "consultare la GNU General Public License.\n" "\n" -#: parted/parted.c:229 +#: parted/parted.c:232 #, c-format msgid "%0.f%%\t(time left %.2d:%.2d)" msgstr "%0.f%%\t(tempo rimasto %.2d.%.2d)" -#: parted/parted.c:248 +#: parted/parted.c:251 #, c-format msgid "Partition %s is being used. Are you sure you want to continue?" msgstr "La partizione %s è in uso. Continuare veramente?" # (ndt) preferisco tenerla al plurale -#: parted/parted.c:269 +#: parted/parted.c:272 #, c-format msgid "Partition(s) on %s are being used." msgstr "Le partizioni su %s sono in uso." -#: parted/parted.c:281 +#: parted/parted.c:284 #, c-format msgid "" "The existing disk label on %s will be destroyed and all data on this disk " @@ -2501,31 +2500,31 @@ msgstr "" "L'etichetta del disco su %s verrà eliminata e tutti i dati su questo disco " "saranno persi. Continuare?" -#: parted/parted.c:542 +#: parted/parted.c:545 msgid "New disk label type?" msgstr "Tipo dell'etichetta del nuovo disco?" -#: parted/parted.c:680 +#: parted/parted.c:692 msgid "Partition type?" msgstr "Tipo di partizione?" -#: parted/parted.c:698 parted/parted.c:902 +#: parted/parted.c:710 parted/parted.c:914 msgid "Partition name?" msgstr "Nome della partizione?" -#: parted/parted.c:708 +#: parted/parted.c:720 msgid "File system type?" msgstr "Tipo di file system?" -#: parted/parted.c:713 parted/parted.c:1683 +#: parted/parted.c:725 parted/parted.c:1815 msgid "Start?" msgstr "Inizio?" -#: parted/parted.c:715 parted/parted.c:1685 parted/parted.c:1768 +#: parted/parted.c:727 parted/parted.c:1817 parted/parted.c:1900 msgid "End?" msgstr "Fine?" -#: parted/parted.c:782 +#: parted/parted.c:794 #, c-format msgid "" "You requested a partition from %s to %s (sectors %llu..%llu).\n" @@ -2534,7 +2533,7 @@ msgstr "" "È stata richiesta una partizione da %s a %s (settori %llu..%llu).\n" "La posizione più prossima disponibile è da %s a %s (settori %llu..%llu).%s" -#: parted/parted.c:791 +#: parted/parted.c:803 msgid "" "\n" "Is this still acceptable to you?" @@ -2542,7 +2541,7 @@ msgstr "" "\n" "È accettabile?" -#: parted/parted.c:814 +#: parted/parted.c:826 #, fuzzy, c-format msgid "" "The resulting partition is not properly aligned for best performance: %s" @@ -2550,89 +2549,114 @@ msgstr "" "La partizione risultante non è allineata correttamente per garantire " "prestazioni ottimali." -#: parted/parted.c:816 parted/parted.c:1925 +#: parted/parted.c:828 parted/parted.c:2057 msgid "unknown (malloc failed)" msgstr "" -#: parted/parted.c:894 +#: parted/parted.c:906 #, fuzzy, c-format msgid "%s disk labels do not support partition name." msgstr "Le etichette dei dischi %s non supportano le partizioni estese." -#: parted/parted.c:899 parted/parted.c:1748 parted/parted.c:1814 -#: parted/parted.c:1908 parted/parted.c:1983 +#: parted/parted.c:911 parted/parted.c:955 parted/parted.c:1880 +#: parted/parted.c:1946 parted/parted.c:2040 parted/parted.c:2115 msgid "Partition number?" msgstr "Partizione numero?" -#: parted/parted.c:1050 +#: parted/parted.c:949 +#, fuzzy, c-format +msgid "%s disk labels do not support partition type." +msgstr "Le etichette dei dischi %s non supportano le partizioni estese." + +#: parted/parted.c:965 +#, fuzzy +msgid "Partition type-id?" +msgstr "Tipo di partizione?" + +#: parted/parted.c:972 +#, fuzzy +msgid "Invalid type-id." +msgstr "Numero non valido." + +#: parted/parted.c:986 +#, fuzzy +msgid "Partition type-uuid?" +msgstr "Tipo di partizione?" + +#: parted/parted.c:993 +#, fuzzy +msgid "Invalid type-uuid." +msgstr "Numero non valido." + +#: parted/parted.c:1146 #, c-format msgid "BIOS cylinder,head,sector geometry: %d,%d,%d. Each cylinder is %s.\n" msgstr "" "Geometria cilindri, testine, settori dal BIOS: %d,%d,%d. Ogni cilindro è " "%s.\n" -#: parted/parted.c:1137 +#: parted/parted.c:1240 #, c-format msgid "Model: %s (%s)\n" msgstr "Modello: %s (%s)\n" -#: parted/parted.c:1139 +#: parted/parted.c:1242 #, c-format msgid "Disk %s: %s\n" msgstr "Disco %s: %s\n" -#: parted/parted.c:1140 +#: parted/parted.c:1243 #, c-format msgid "Sector size (logical/physical): %lldB/%lldB\n" msgstr "Dimensione del settore (logica/fisica): %lldB/%lldB\n" -#: parted/parted.c:1152 +#: parted/parted.c:1255 #, c-format msgid "Partition Table: %s\n" msgstr "Tabella delle partizioni: %s\n" -#: parted/parted.c:1153 +#: parted/parted.c:1256 #, c-format msgid "Disk Flags: %s\n" msgstr "Flag del disco: %s\n" -#: parted/parted.c:1279 parted/parted.c:1282 +#: parted/parted.c:1388 parted/parted.c:1391 msgid "Number" msgstr "Numero" -#: parted/parted.c:1279 parted/parted.c:1282 +#: parted/parted.c:1388 parted/parted.c:1391 msgid "Start" msgstr "Inizio" -#: parted/parted.c:1280 parted/parted.c:1283 +#: parted/parted.c:1389 parted/parted.c:1392 msgid "End" msgstr "Fine" -#: parted/parted.c:1283 +#: parted/parted.c:1392 msgid "Size" msgstr "Dimensione" -#: parted/parted.c:1287 +#: parted/parted.c:1396 msgid "Type" msgstr "Tipo" -#: parted/parted.c:1289 +#: parted/parted.c:1398 msgid "File system" msgstr "File system" -#: parted/parted.c:1292 +#: parted/parted.c:1401 msgid "Name" msgstr "Nome" -#: parted/parted.c:1294 +#: parted/parted.c:1403 msgid "Flags" msgstr "Flag" -#: parted/parted.c:1352 +#: parted/parted.c:1461 msgid "Free Space" msgstr "Spazio libero" -#: parted/parted.c:1570 +#: parted/parted.c:1702 #, c-format msgid "" "A %s %s partition was found at %s -> %s. Do you want to add it to the " @@ -2641,57 +2665,57 @@ msgstr "" "È stata trovata una partizione %s %s su %s -> %s. Aggiungerla alla tabella " "delle partizioni?" -#: parted/parted.c:1613 +#: parted/parted.c:1745 msgid "searching for file systems" msgstr "ricerca file system" -#: parted/parted.c:1720 +#: parted/parted.c:1852 msgid "The resize command has been removed in parted 3.0" msgstr "Il comando di ridimensionamento è stato rimosso da parted 3.0" -#: parted/parted.c:1782 +#: parted/parted.c:1914 msgid "" "Shrinking a partition can cause data loss, are you sure you want to continue?" msgstr "" "Ridurre la dimensione di una partizione può causare la perdita di dati: " "continuare veramente?" -#: parted/parted.c:1838 +#: parted/parted.c:1970 msgid "New device?" msgstr "Nuovo device?" -#: parted/parted.c:1906 +#: parted/parted.c:2038 msgid "alignment type(min/opt)" msgstr "tipo di allineamento (min/ott)" # (ndt) sembra che quel numero sia il numero della partizione -#: parted/parted.c:1921 +#: parted/parted.c:2053 #, c-format msgid "%d aligned\n" msgstr "%d allineata\n" -#: parted/parted.c:1923 +#: parted/parted.c:2055 #, fuzzy, c-format msgid "%d not aligned: %s\n" msgstr "%d non allineata\n" -#: parted/parted.c:1948 parted/parted.c:1985 +#: parted/parted.c:2080 parted/parted.c:2117 msgid "Flag to Invert?" msgstr "Flag da invertire?" -#: parted/parted.c:1953 parted/parted.c:1990 +#: parted/parted.c:2085 parted/parted.c:2122 msgid "New state?" msgstr "Nuovo stato?" -#: parted/parted.c:2036 +#: parted/parted.c:2168 msgid "Unit?" msgstr "Unità ?" -#: parted/parted.c:2171 +#: parted/parted.c:2303 msgid "align-check" msgstr "align-check" -#: parted/parted.c:2174 +#: parted/parted.c:2306 #, fuzzy msgid "" "align-check TYPE N check partition N for TYPE(min|opt) " @@ -2700,11 +2724,11 @@ msgstr "" "align-check TIPO N Controlla la partizione N per " "l'allineamento TIPO(min|ott)" -#: parted/parted.c:2182 +#: parted/parted.c:2314 msgid "help" msgstr "help" -#: parted/parted.c:2185 +#: parted/parted.c:2317 msgid "" "help [COMMAND] print general help, or help on " "COMMAND" @@ -2712,15 +2736,15 @@ msgstr "" "help [COMANDO] Mostra l'aiuto generale o sul " "COMANDO" -#: parted/parted.c:2191 +#: parted/parted.c:2323 msgid "mklabel" msgstr "mklabel" -#: parted/parted.c:2191 +#: parted/parted.c:2323 msgid "mktable" msgstr "mktable" -#: parted/parted.c:2194 +#: parted/parted.c:2326 msgid "" "mklabel,mktable LABEL-TYPE create a new disklabel (partition " "table)" @@ -2728,15 +2752,15 @@ msgstr "" "mklabel,mktable TIPO_ETIC Crea una nuova etichetta del disco " "(tabella delle partizioni)" -#: parted/parted.c:2200 +#: parted/parted.c:2332 msgid "mkpart" msgstr "mkpart" -#: parted/parted.c:2203 +#: parted/parted.c:2335 msgid "mkpart PART-TYPE [FS-TYPE] START END make a partition" msgstr "mkpart TIPO_PART [TIPO_FS] INIZIO FINE Crea una partizione" -#: parted/parted.c:2209 +#: parted/parted.c:2341 msgid "" "'mkpart' makes a partition without creating a new file system on the " "partition. FS-TYPE may be specified to set an appropriate partition ID.\n" @@ -2744,21 +2768,21 @@ msgstr "" "\"mkpart\" crea un partizione senza crearvi un file system. TIPO_FS può " "essere specificato per impostare un ID della partizione appropriato.\n" -#: parted/parted.c:2214 +#: parted/parted.c:2346 msgid "name" msgstr "name" -#: parted/parted.c:2217 +#: parted/parted.c:2349 msgid "name NUMBER NAME name partition NUMBER as NAME" msgstr "" "name NUMERO NOME Chiama la partizione NUMERO come " "NOME" -#: parted/parted.c:2222 +#: parted/parted.c:2354 msgid "print" msgstr "print" -#: parted/parted.c:2225 +#: parted/parted.c:2357 #, fuzzy msgid "" "print [devices|free|list,all] display the partition table, or " @@ -2768,7 +2792,7 @@ msgstr "" "partizioni, i device disponibili, lo spazio libero, tutte le partizioni " "trovate o una particolare partizione" -#: parted/parted.c:2229 +#: parted/parted.c:2361 msgid "" "Without arguments, 'print' displays the entire partition table. However with " "the following arguments it performs various other actions.\n" @@ -2776,11 +2800,11 @@ msgstr "" "Senza argomenti, \"print\" visualizza l'intera tabella delle partizioni. Con " "i seguenti argomenti esegue diverse altre azioni.\n" -#: parted/parted.c:2231 +#: parted/parted.c:2363 msgid " devices : display all active block devices\n" msgstr " devices : mostra tutti i device a blocchi attivi\n" -#: parted/parted.c:2232 +#: parted/parted.c:2364 msgid "" " free : display information about free unpartitioned space on the " "current block device\n" @@ -2788,26 +2812,26 @@ msgstr "" " free : visualizza informazioni riguardo lo spazio libero non " "partizionato sul device a blocchi corrente\n" -#: parted/parted.c:2234 +#: parted/parted.c:2366 msgid "" " list, all : display the partition tables of all active block devices\n" msgstr "" " list, all : visualizza le tabelle delle partizioni di tutti i device a " "blocchi attivi\n" -#: parted/parted.c:2238 +#: parted/parted.c:2370 msgid "quit" msgstr "quit" -#: parted/parted.c:2241 +#: parted/parted.c:2373 msgid "quit exit program" msgstr "quit Esce dal programma" -#: parted/parted.c:2246 +#: parted/parted.c:2378 msgid "rescue" msgstr "rescue" -#: parted/parted.c:2249 +#: parted/parted.c:2381 msgid "" "rescue START END rescue a lost partition near START " "and END" @@ -2815,56 +2839,56 @@ msgstr "" "rescue INIZIO FINE Ripristina una partizione persa " "vicino a INIZIO e FINE" -#: parted/parted.c:2255 +#: parted/parted.c:2387 msgid "resize" msgstr "resize" -#: parted/parted.c:2258 +#: parted/parted.c:2390 msgid "The resize command was removed in parted 3.0\n" msgstr "Il comando di ridimensionamento è stato rimosso da parted 3.0\n" -#: parted/parted.c:2261 +#: parted/parted.c:2393 msgid "resizepart" msgstr "resizepart" -#: parted/parted.c:2264 +#: parted/parted.c:2396 msgid "resizepart NUMBER END resize partition NUMBER" msgstr "" "resizepart NUMERO FINE Ridimensiona la partizione NUMERO" -#: parted/parted.c:2269 +#: parted/parted.c:2401 msgid "rm" msgstr "rm" -#: parted/parted.c:2272 +#: parted/parted.c:2404 msgid "rm NUMBER delete partition NUMBER" msgstr "rm NUMERO Elimina la partizione NUMERO" -#: parted/parted.c:2277 +#: parted/parted.c:2409 msgid "select" msgstr "select" -#: parted/parted.c:2280 +#: parted/parted.c:2412 msgid "select DEVICE choose the device to edit" msgstr "" "select DEVICE Sceglie il device da modificare" -#: parted/parted.c:2285 +#: parted/parted.c:2417 msgid "disk_set" msgstr "disk_set" -#: parted/parted.c:2288 +#: parted/parted.c:2420 msgid "" "disk_set FLAG STATE change the FLAG on selected device" msgstr "" "disk_set FLAG STATO Modifica il FLAG sul device " "selezionato" -#: parted/parted.c:2293 +#: parted/parted.c:2425 msgid "disk_toggle" msgstr "disk_toggle" -#: parted/parted.c:2296 +#: parted/parted.c:2428 msgid "" "disk_toggle [FLAG] toggle the state of FLAG on " "selected device" @@ -2873,22 +2897,22 @@ msgstr "" "device\n" " selezionato" -#: parted/parted.c:2302 +#: parted/parted.c:2434 msgid "set" msgstr "set" -#: parted/parted.c:2305 +#: parted/parted.c:2437 msgid "" "set NUMBER FLAG STATE change the FLAG on partition NUMBER" msgstr "" "set NUMERO FLAG STATO Modifica il FLAG sulla partizione\n" " NUMERO" -#: parted/parted.c:2311 +#: parted/parted.c:2443 msgid "toggle" msgstr "toggle" -#: parted/parted.c:2314 +#: parted/parted.c:2446 msgid "" "toggle [NUMBER [FLAG]] toggle the state of FLAG on " "partition NUMBER" @@ -2896,20 +2920,30 @@ msgstr "" "toggle [NUMERO [FLAG]] Commuta lo stato del FLAG sulla\n" " partizione NUMERO" -#: parted/parted.c:2320 +#: parted/parted.c:2452 +msgid "type" +msgstr "" + +#: parted/parted.c:2455 +msgid "" +"type NUMBER TYPE-ID or TYPE-UUID type set TYPE-ID or TYPE-UUID of " +"partition NUMBER" +msgstr "" + +#: parted/parted.c:2460 msgid "unit" msgstr "unit" -#: parted/parted.c:2323 +#: parted/parted.c:2463 msgid "unit UNIT set the default unit to UNIT" msgstr "" "unit UNITÀ Imposta l'unità predefinita a UNITÀ" -#: parted/parted.c:2328 +#: parted/parted.c:2468 msgid "version" msgstr "version" -#: parted/parted.c:2331 +#: parted/parted.c:2471 msgid "" "version display the version number and " "copyright information of GNU Parted" @@ -2918,7 +2952,7 @@ msgstr "" "informazioni\n" " sul copyright di GNU Parted" -#: parted/parted.c:2335 +#: parted/parted.c:2475 msgid "" "'version' displays copyright and version information corresponding to this " "copy of GNU Parted\n" @@ -2926,23 +2960,23 @@ msgstr "" "\"version\" visualizza informazioni sul copyright e la versione di questa " "copia di GNU Parted\n" -#: parted/parted.c:2405 +#: parted/parted.c:2545 #, fuzzy, c-format msgid "Usage: %s [-hlmsfv] [-a<align>] [DEVICE [COMMAND [PARAMETERS]]...]\n" msgstr "" "Uso: %s [-hlmsv] [-a<allineamento>] [DEVICE [COMANDO [PARAMETRI]]...]\n" -#: parted/parted.c:2449 +#: parted/parted.c:2589 msgid "No device found" msgstr "Nessun device trovato" -#: parted/parted.c:2486 +#: parted/parted.c:2626 msgid "WARNING: You are not superuser. Watch out for permissions.\n" msgstr "" "Attenzione: non è stato eseguito come super utente. Prestare attenzione ai " "permessi.\n" -#: parted/parted.c:2519 +#: parted/parted.c:2659 msgid "" "You should reinstall your boot loader before rebooting. Read section 4 of " "the Parted User documentation for more information." @@ -2950,7 +2984,7 @@ msgstr "" "Prima di riavviare è utile reinstallare il \"boot loader\". Per maggiori " "informazioni, consultare la sezione 4 della documentazione di Parted." -#: parted/parted.c:2526 +#: parted/parted.c:2666 msgid "You may need to update /etc/fstab.\n" msgstr "Potrebbe essere necessario aggiornare /etc/fstab.\n" @@ -3208,69 +3242,69 @@ msgstr "" "\n" "Errore: incontrato un segnale SIGILL generico." -#: parted/ui.c:901 +#: parted/ui.c:904 #, c-format msgid "invalid token: %s" msgstr "token non valido: %s" -#: parted/ui.c:1082 +#: parted/ui.c:1085 msgid "Expecting a partition number." msgstr "Atteso un numero di partizione." -#: parted/ui.c:1091 +#: parted/ui.c:1094 msgid "Partition doesn't exist." msgstr "La partizione non esiste." -#: parted/ui.c:1111 +#: parted/ui.c:1114 msgid "Expecting a file system type." msgstr "Atteso un tipo di file system." -#: parted/ui.c:1118 +#: parted/ui.c:1121 #, c-format msgid "Unknown file system type \"%s\"." msgstr "Tipo di file system \"%s\" sconosciuto." -#: parted/ui.c:1139 +#: parted/ui.c:1142 msgid "Expecting a disk label type." msgstr "Atteso un tipo di etichetta disco." -#: parted/ui.c:1170 parted/ui.c:1206 +#: parted/ui.c:1173 parted/ui.c:1209 msgid "No flags supported" msgstr "" -#: parted/ui.c:1280 +#: parted/ui.c:1283 msgid "Can't create any more partitions." msgstr "Non è possibile creare ulteriori partizioni." -#: parted/ui.c:1290 +#: parted/ui.c:1293 msgid "Expecting a partition type." msgstr "Atteso un tipo di partizione." -#: parted/ui.c:1439 +#: parted/ui.c:1442 msgid "on" msgstr "on" -#: parted/ui.c:1440 +#: parted/ui.c:1443 msgid "off" msgstr "off" -#: parted/ui.c:1457 +#: parted/ui.c:1460 msgid "optimal" msgstr "ottimale" -#: parted/ui.c:1458 +#: parted/ui.c:1461 msgid "minimal" msgstr "minimale" -#: parted/ui.c:1591 +#: parted/ui.c:1594 msgid "OPTIONs:" msgstr "OPZIONI:" -#: parted/ui.c:1596 +#: parted/ui.c:1599 msgid "COMMANDs:" msgstr "COMANDI:" -#: parted/ui.c:1599 +#: parted/ui.c:1602 #, c-format msgid "" "\n" @@ -3280,12 +3314,12 @@ msgstr "" "Segnalare i bug a %s\n" # '%s' = dev->path -#: parted/ui.c:1606 +#: parted/ui.c:1609 #, c-format msgid "Using %s\n" msgstr "Viene usato %s\n" -#: parted/ui.c:1686 +#: parted/ui.c:1689 msgid "This command does not make sense in non-interactive mode.\n" msgstr "Questo comando non ha senso nella modalità non interattiva.\n" @@ -3348,6 +3382,10 @@ msgstr "Questo comando non ha senso nella modalità non interattiva.\n" #~ "significa che le modifiche effettuate non saranno note a Hurd. Riavviare " #~ "il computer prima di fare qualsiasi cosa con %s." +#~ msgid "Extended partitions cannot be hidden on msdos disk labels." +#~ msgstr "" +#~ "Le partizioni estese non possono essere nascoste su etichette MS-DOS." + #~ msgid "The boot region doesn't start at the start of the partition." #~ msgstr "La regione di avvio non comincia all'inizio della partizione." @@ -7,7 +7,7 @@ msgid "" msgstr "" "Project-Id-Version: GNU parted 3.4.64.2\n" "Report-Msgid-Bugs-To: bug-parted@gnu.org\n" -"POT-Creation-Date: 2022-04-18 14:44-0400\n" +"POT-Creation-Date: 2023-04-10 15:50-0700\n" "PO-Revision-Date: 2022-04-06 18:42+0900\n" "Last-Translator: Hiroshi Takekawa <sian@big.or.jp>\n" "Language-Team: Japanese <translation-team-ja@lists.sourceforge.net>\n" @@ -17,25 +17,25 @@ msgstr "" "Content-Transfer-Encoding: 8bit\n" "X-Bugs: Report translation errors to the Language-Team address.\n" -#: lib/argmatch.c:147 +#: lib/argmatch.c:145 #, c-format msgid "invalid argument %s for %s" msgstr "%s 㯠%s ã®ä¸æ£ãªå¼•æ•°ã§ã™" -#: lib/argmatch.c:148 +#: lib/argmatch.c:146 #, c-format msgid "ambiguous argument %s for %s" msgstr "%s 㯠%s ã«ã¯æ›–昧ãªå¼•æ•°ã§ã™" -#: lib/argmatch.c:167 lib/argmatch.h:238 +#: lib/argmatch.c:165 lib/argmatch.h:237 msgid "Valid arguments are:" msgstr "利用å¯èƒ½ãªå¼•æ•°ã¯ä»¥ä¸‹ã®é€šã‚Šã§ã™ï¼š" -#: lib/closeout.c:122 libparted/labels/fdasd.c:145 +#: lib/closeout.c:121 libparted/labels/fdasd.c:145 msgid "write error" msgstr "書ãè¾¼ã¿ã‚¨ãƒ©ãƒ¼" -#: lib/error.c:195 +#: lib/error.c:193 msgid "Unknown system error" msgstr "ä¸æ˜Žãªã‚·ã‚¹ãƒ†ãƒ エラー" @@ -95,11 +95,11 @@ msgstr "%s: '%c' ã«ã¯å¼•æ•°ãŒå¿…è¦ã§ã™\n" #. If you don't know what to put here, please see #. <https://en.wikipedia.org/wiki/Quotation_marks_in_other_languages> #. and use glyphs suitable for your language. -#: lib/quotearg.c:355 +#: lib/quotearg.c:354 msgid "`" msgstr "`" -#: lib/quotearg.c:356 +#: lib/quotearg.c:355 msgid "'" msgstr "'" @@ -181,7 +181,7 @@ msgstr "ã“れよりå‰ã«æ£è¦è¡¨ç¾ãŒãªã„" #. To enquire the regular expression that your system uses for this #. purpose, you can use the command #. locale -k LC_MESSAGES | grep '^yesexpr=' -#: lib/rpmatch.c:150 +#: lib/rpmatch.c:149 msgid "^[yY]" msgstr "^[yY]" @@ -191,7 +191,7 @@ msgstr "^[yY]" #. To enquire the regular expression that your system uses for this #. purpose, you can use the command #. locale -k LC_MESSAGES | grep '^noexpr=' -#: lib/rpmatch.c:163 +#: lib/rpmatch.c:162 msgid "^[nN]" msgstr "^[nN]" @@ -752,159 +752,163 @@ msgstr "pmbr_boot" msgid "Unknown disk flag, %d." msgstr "%d ã¯ä¸æ˜Žãªãƒ‡ã‚£ã‚¹ã‚¯ãƒ•ãƒ©ã‚°ã§ã™ã€‚" -#: libparted/disk.c:1289 +#: libparted/disk.c:1320 #, c-format msgid "%s disk labels do not support extended partitions." msgstr "%s ã®ãƒ‡ã‚£ã‚¹ã‚¯ãƒ©ãƒ™ãƒ«ã¯æ‹¡å¼µãƒ‘ーティションをサãƒãƒ¼ãƒˆã—ã¦ã„ã¾ã›ã‚“。" -#: libparted/disk.c:1821 +#: libparted/disk.c:1990 #, c-format msgid "%s disk labels don't support logical or extended partitions." msgstr "" "%s ã®ãƒ‡ã‚£ã‚¹ã‚¯ãƒ©ãƒ™ãƒ«ã¯è«–ç†ãƒ‘ーティションや拡張パーティションをサãƒãƒ¼ãƒˆã—ã¦ã¾ã›" "ã‚“" -#: libparted/disk.c:1834 +#: libparted/disk.c:2003 msgid "Too many primary partitions." msgstr "プライマリパーティションãŒå¤šã™ãŽã¾ã™ã€‚" -#: libparted/disk.c:1843 +#: libparted/disk.c:2012 #, c-format msgid "" "Can't add a logical partition to %s, because there is no extended partition." msgstr "拡張パーティションãŒãªã„ã®ã§ã€è«–ç†ãƒ‘ーティションを %s ã«ä½œã‚Œã¾ã›ã‚“。" -#: libparted/disk.c:1867 +#: libparted/disk.c:2036 #, c-format msgid "Can't have more than one extended partition on %s." msgstr "%s ã«ã¯ 1 個ã—ã‹æ‹¡å¼µãƒ‘ーティションを作れã¾ã›ã‚“。" -#: libparted/disk.c:1877 +#: libparted/disk.c:2046 msgid "Can't have logical partitions outside of the extended partition." msgstr "è«–ç†ãƒ‘ーティションを拡張パーティションã®å¤–ã«ã¯æŒã¦ã¾ã›ã‚“。" -#: libparted/disk.c:1902 +#: libparted/disk.c:2071 #, c-format msgid "Can't have a logical partition outside of the extended partition on %s." msgstr "%s ã®æ‹¡å¼µãƒ‘ーティションã®å¤–ã«è«–ç†ãƒ‘ーティションã¯ä½œã‚Œã¾ã›ã‚“。" -#: libparted/disk.c:1912 +#: libparted/disk.c:2081 msgid "Can't have a primary partition inside an extended partition." msgstr "拡張パーティション内ã«ãƒ—ライマリパーティションã¯ä½œã‚Œã¾ã›ã‚“。" -#: libparted/disk.c:1921 +#: libparted/disk.c:2090 msgid "Can't have a partition outside the disk!" msgstr "ディスクã®å¤–å´ã«ãƒ‘ーティションã¯ä½œã‚Œã¾ã›ã‚“。" -#: libparted/disk.c:1972 libparted/disk.c:2150 +#: libparted/disk.c:2141 libparted/disk.c:2319 msgid "Can't have overlapping partitions." msgstr "é‡ãªã‚Šã®ã‚るパーティションã¯æŒã¦ã¾ã›ã‚“。" -#: libparted/disk.c:2351 +#: libparted/disk.c:2520 msgid "metadata" msgstr "ãƒ¡ã‚¿æƒ…å ±" -#: libparted/disk.c:2353 +#: libparted/disk.c:2522 msgid "free" msgstr "空ã" -#: libparted/disk.c:2355 parted/ui.c:1271 parted/ui.c:1299 +#: libparted/disk.c:2524 parted/ui.c:1274 parted/ui.c:1302 msgid "extended" msgstr "æ‹¡å¼µ" -#: libparted/disk.c:2357 parted/ui.c:1275 parted/ui.c:1303 +#: libparted/disk.c:2526 parted/ui.c:1278 parted/ui.c:1306 msgid "logical" msgstr "è«–ç†" -#: libparted/disk.c:2359 parted/ui.c:1267 parted/ui.c:1295 +#: libparted/disk.c:2528 parted/ui.c:1270 parted/ui.c:1298 msgid "primary" msgstr "プライマリ" -#: libparted/disk.c:2375 +#: libparted/disk.c:2544 msgid "boot" msgstr "boot" -#: libparted/disk.c:2377 +#: libparted/disk.c:2546 msgid "bios_grub" msgstr "bios_grub" -#: libparted/disk.c:2379 +#: libparted/disk.c:2548 msgid "root" msgstr "root" -#: libparted/disk.c:2381 +#: libparted/disk.c:2550 msgid "swap" msgstr "swap" -#: libparted/disk.c:2383 +#: libparted/disk.c:2552 msgid "hidden" msgstr "hidden" -#: libparted/disk.c:2385 +#: libparted/disk.c:2554 msgid "raid" msgstr "raid" -#: libparted/disk.c:2387 +#: libparted/disk.c:2556 msgid "lvm" msgstr "lvm" -#: libparted/disk.c:2389 +#: libparted/disk.c:2558 msgid "lba" msgstr "lba" -#: libparted/disk.c:2391 +#: libparted/disk.c:2560 msgid "hp-service" msgstr "hp-service" -#: libparted/disk.c:2393 +#: libparted/disk.c:2562 msgid "palo" msgstr "palo" -#: libparted/disk.c:2395 +#: libparted/disk.c:2564 msgid "prep" msgstr "prep" -#: libparted/disk.c:2397 +#: libparted/disk.c:2566 msgid "msftres" msgstr "msftres" -#: libparted/disk.c:2399 +#: libparted/disk.c:2568 msgid "msftdata" msgstr "msftdata" -#: libparted/disk.c:2401 +#: libparted/disk.c:2570 msgid "atvrecv" msgstr "atvrecv" -#: libparted/disk.c:2403 +#: libparted/disk.c:2572 msgid "diag" msgstr "diag" -#: libparted/disk.c:2405 +#: libparted/disk.c:2574 msgid "legacy_boot" msgstr "legacy_boot" -#: libparted/disk.c:2407 +#: libparted/disk.c:2576 msgid "irst" msgstr "irst" -#: libparted/disk.c:2409 +#: libparted/disk.c:2578 msgid "esp" msgstr "esp" -#: libparted/disk.c:2411 +#: libparted/disk.c:2580 msgid "chromeos_kernel" msgstr "chromeos_kernel" -#: libparted/disk.c:2413 +#: libparted/disk.c:2582 msgid "bls_boot" msgstr "bls_boot" -#: libparted/disk.c:2415 +#: libparted/disk.c:2584 msgid "linux-home" msgstr "linux-home" -#: libparted/disk.c:2421 +#: libparted/disk.c:2586 +msgid "no_automount" +msgstr "" + +#: libparted/disk.c:2592 #, c-format msgid "Unknown partition flag, %d." msgstr "%d ã¯ä¸æ˜Žãªãƒ‘ーティションフラグã§ã™ã€‚" @@ -1101,8 +1105,8 @@ msgstr "" "ンã®å ´åˆã¯2ã¤ã¨ã—ã¦æ•°ãˆã‚‰ã‚Œã€%d 以上ã®ãƒ—ライマリパーティションã¨ãªã‚Šã¾ã™)。" #: libparted/labels/atari.c:1662 libparted/labels/bsd.c:563 -#: libparted/labels/dasd.c:895 libparted/labels/dos.c:2303 -#: libparted/labels/dvh.c:770 libparted/labels/gpt.c:1769 +#: libparted/labels/dasd.c:893 libparted/labels/dos.c:2294 +#: libparted/labels/dvh.c:770 libparted/labels/gpt.c:1891 #: libparted/labels/loop.c:244 libparted/labels/mac.c:1409 #: libparted/labels/pc98.c:697 libparted/labels/rdb.c:1054 #: libparted/labels/sun.c:781 @@ -1127,43 +1131,33 @@ msgstr "パーティション番å·ã‚’割り当ã¦ã‚‰ã‚Œã¾ã›ã‚“。" msgid "Unable to allocate a bsd disklabel slot." msgstr "BSDディスクラベルã®ã‚¹ãƒãƒƒãƒˆã‚’確ä¿ã§ãã¾ã›ã‚“。" -#: libparted/labels/dasd.c:626 +#: libparted/labels/dasd.c:634 msgid "The partition table of DASD-LDL device cannot be changed.\n" msgstr "DASD-LDL パーティションテーブルã®ãƒ‡ãƒã‚¤ã‚¹ã¯å¤‰æ›´ã§ãã¾ã›ã‚“。\n" -#: libparted/labels/dasd.c:921 +#: libparted/labels/dasd.c:919 msgid "Unable to allocate a dasd disklabel slot" msgstr "dasd ディスクラベルã®ã‚¹ãƒãƒƒãƒˆã‚’確ä¿ã§ãã¾ã›ã‚“。" -#: libparted/labels/dos.c:1008 +#: libparted/labels/dos.c:1159 #, c-format msgid "Invalid partition table on %s -- wrong signature %x." msgstr "" "%s ã®ãƒ‘ーティションテーブルãŒä¸æ£ã§ã™ã€‚%x ã¨ã„ã†ã‚·ã‚°ãƒãƒãƒ£ã¯ã‚ã‚„ã¾ã‚Šã§ã™ã€‚" -#: libparted/labels/dos.c:1036 +#: libparted/labels/dos.c:1187 #, c-format msgid "Invalid partition table - recursive partition on %s." msgstr "" "パーティションテーブルãŒä¸æ£ã§ã™ã€‚å†å¸°çš„ãªãƒ‘ーティション㌠%s ã«ã‚ã‚Šã¾ã™ã€‚" -#: libparted/labels/dos.c:1567 -msgid "Extended partitions cannot be hidden on msdos disk labels." -msgstr "MSDOS ディスクラベルã§æ‹¡å¼µãƒ‘ーティションã¯éš ã›ã¾ã›ã‚“。" - -#: libparted/labels/dos.c:1579 -msgid "Extended partitions cannot be recovery partitions on msdos disk labels." -msgstr "" -"MSDOS ディスクラベルã§æ‹¡å¼µãƒ‘ーティションã¯ãƒªã‚«ãƒãƒªãƒ‘ーティションã«ã§ãã¾ã›" -"ん。" - -#: libparted/labels/dos.c:2285 +#: libparted/labels/dos.c:2276 msgid "Parted can't resize partitions managed by Windows Dynamic Disk." msgstr "" "ダイナミックディスクã«ä½¿ã‚ã‚Œã¦ã„るパーティション㯠Parted ã§ã¯ãƒªã‚µã‚¤ã‚ºã§ãã¾" "ã›ã‚“。" -#: libparted/labels/dos.c:2541 +#: libparted/labels/dos.c:2532 msgid "cannot create any more partitions" msgstr "ãƒ‘ãƒ¼ãƒ†ã‚£ã‚·ãƒ§ãƒ³ã‚’è¿½åŠ ã§ãã¾ã›ã‚“。" @@ -1307,11 +1301,11 @@ msgstr "ブãƒãƒƒã‚¯ã‚µã‚¤ã‚ºæƒ…å ±ãŒå–å¾—ã§ãã¾ã›ã‚“。" msgid "Disk geometry does not match a DASD device of type 3390." msgstr "Disk ジオメトリãŒã‚¿ã‚¤ãƒ— 3390 ã® DASDデãƒã‚¤ã‚¹ã¨ä¸€è‡´ã—ã¾ã›ã‚“。" -#: libparted/labels/gpt.c:569 +#: libparted/labels/gpt.c:589 msgid "device is too small for GPT" msgstr "デãƒã‚¤ã‚¹ã¯ GPT を使ã†ã«ã¯å°ã•ã™ãŽã¾ã™" -#: libparted/labels/gpt.c:771 +#: libparted/labels/gpt.c:791 #, c-format msgid "" "The format of the GPT partition table is version %x, which is newer than " @@ -1320,7 +1314,7 @@ msgstr "" "GPT パーティションテーブルã®ãƒ•ã‚©ãƒ¼ãƒžãƒƒãƒˆã®ãƒãƒ¼ã‚¸ãƒ§ãƒ³ãŒ %x 㧠parted ã®ç†è§£ã§" "ãã‚‹ã‚‚ã®ã‚ˆã‚Šæ–°ã—ã„ã§ã™ã€‚å ±å‘Šã—ã¦ãã ã•ã„。" -#: libparted/labels/gpt.c:807 +#: libparted/labels/gpt.c:827 #, c-format msgid "" "Not all of the space available to %s appears to be used, you can fix the GPT " @@ -1331,7 +1325,7 @@ msgstr "" "å¯èƒ½ã«ã™ã‚‹ã‹(%llu ブãƒãƒƒã‚¯å¢—ãˆã¾ã™)ã€ã“ã®ã¾ã¾ã§ç¶šè¡Œã™ã‚‹ã“ã¨ãŒã§ãã¾ã™ãŒã€ã©ã†" "ã—ã¾ã™ã‹ï¼Ÿ" -#: libparted/labels/gpt.c:1006 +#: libparted/labels/gpt.c:1026 msgid "" "The backup GPT table is not at the end of the disk, as it should be. Fix, " "by moving the backup to the end (and removing the old backup)?" @@ -1339,7 +1333,7 @@ msgstr "" "ã‚ã‚‹ã¹ã GPT テーブルã®ãƒãƒƒã‚¯ã‚¢ãƒƒãƒ—ãŒãƒ‡ã‚£ã‚¹ã‚¯ã®æœ€å¾Œã«ã‚ã‚Šã¾ã›ã‚“。ãƒãƒƒã‚¯ã‚¢ãƒƒãƒ—" "を最後ã«æŒã£ã¦ãã¦ï¼ˆå¤ã„ãƒãƒƒã‚¯ã‚¢ãƒƒãƒ—を削除ã—ã¦ï¼‰ä¿®å¾©ã—ã¾ã™ã‹ï¼Ÿ" -#: libparted/labels/gpt.c:1024 +#: libparted/labels/gpt.c:1044 msgid "" "Both the primary and backup GPT tables are corrupt. Try making a fresh " "table, and using Parted's rescue feature to recover partitions." @@ -1347,7 +1341,7 @@ msgstr "" "プライマリ GPT テーブルã¨ãƒãƒƒã‚¯ã‚¢ãƒƒãƒ—ã®ä¸¡æ–¹ãŒå£Šã‚Œã¦ã„ã¾ã™ã€‚æ–°ãŸã«ãƒ†ãƒ¼ãƒ–ルを作" "ã‚ŠãªãŠã—ã¦ã€Parted ã®ä¿®å¾©æ©Ÿèƒ½ã‚’用ã„ã¦ãƒ‘ーティションã®ä¿®å¾©ã‚’試ã¿ã¾ã™ã€‚" -#: libparted/labels/gpt.c:1035 +#: libparted/labels/gpt.c:1055 msgid "" "The backup GPT table is corrupt, but the primary appears OK, so that will be " "used." @@ -1355,7 +1349,7 @@ msgstr "" "ãƒãƒƒã‚¯ã‚¢ãƒƒãƒ— GPT テーブルã¯å£Šã‚Œã¦ã„ã¾ã™ãŒã€ãƒ—ライマリã¯å•é¡Œãªã„よã†ãªã®ã§ã€ã" "ã¡ã‚‰ã‚’使ã„ã¾ã™ã€‚" -#: libparted/labels/gpt.c:1047 +#: libparted/labels/gpt.c:1067 msgid "" "The primary GPT table is corrupt, but the backup appears OK, so that will be " "used." @@ -1363,11 +1357,11 @@ msgstr "" "プライマリ GPT テーブルã¯å£Šã‚Œã¦ã„ã¾ã™ãŒã€ãƒãƒƒã‚¯ã‚¢ãƒƒãƒ—ã¯å•é¡Œãªã„よã†ãªã®ã§ã€ã" "ã¡ã‚‰ã‚’使ã„ã¾ã™ã€‚" -#: libparted/labels/gpt.c:1071 +#: libparted/labels/gpt.c:1091 msgid "primary partition table array CRC mismatch" msgstr "プライマリパーティションテーブル㮠CRC ãŒä¸€è‡´ã—ã¾ã›ã‚“" -#: libparted/labels/gpt.c:1655 libparted/labels/gpt.c:1682 +#: libparted/labels/gpt.c:1722 libparted/labels/gpt.c:1749 msgid "failed to translate partition name" msgstr "パーティションåを変æ›ã§ãã¾ã›ã‚“" @@ -2045,7 +2039,7 @@ msgstr "fat_table_alloc_cluster: 空ãクラスタãŒã‚ã‚Šã¾ã›ã‚“" msgid "Could not detect file system." msgstr "ファイルシステムãŒè¦‹ã¤ã‘られã¾ã›ã‚“。" -#: libparted/fs/r/filesys.c:159 libparted/fs/r/filesys.c:284 +#: libparted/fs/r/filesys.c:159 libparted/fs/r/filesys.c:285 #, c-format msgid "resizing %s file systems is not supported" msgstr "ファイルシステム%s ã®ãƒªã‚µã‚¤ã‚ºã¯ã‚µãƒãƒ¼ãƒˆã—ã¦ã„ã¾ã›ã‚“" @@ -2334,39 +2328,39 @@ msgstr "" "ã“ã® HFS+ ボリュームã«ã¯ extent オーãƒãƒ¼ãƒ•ãƒãƒ¼ãƒ•ã‚¡ã‚¤ãƒ«ãŒã‚ã‚Šã¾ã›ã‚“。滅多ã«ã‚" "ã‚Šãˆãªã„ã“ã¨ã§ã™ï¼" -#: parted/parted.c:137 +#: parted/parted.c:138 msgid "displays this help message" msgstr "ã“ã®ãƒ˜ãƒ«ãƒ—を表示ã™ã‚‹" -#: parted/parted.c:138 +#: parted/parted.c:139 msgid "lists partition layout on all block devices" msgstr "全ブãƒãƒƒã‚¯ãƒ‡ãƒã‚¤ã‚¹ã®ãƒ‘ーティションレイアウトを表示" -#: parted/parted.c:139 +#: parted/parted.c:140 msgid "displays machine parseable output" msgstr "機械ãŒè§£é‡ˆå¯èƒ½ãªå‡ºåŠ›ã‚’ã™ã‚‹" -#: parted/parted.c:140 +#: parted/parted.c:141 msgid "displays JSON output" msgstr "JSON フォーマットã§å‡ºåŠ›ã‚’ã™ã‚‹" -#: parted/parted.c:141 +#: parted/parted.c:142 msgid "never prompts for user intervention" msgstr "ユーザã«ä»‹å…¥ã•ã›ãªã„" -#: parted/parted.c:142 +#: parted/parted.c:143 msgid "in script mode, fix instead of abort when asked" msgstr "スクリプトモードã§ä¸æ¢ã§ã¯ãªãä¿®æ£ã™ã‚‹" -#: parted/parted.c:143 +#: parted/parted.c:144 msgid "displays the version" msgstr "ãƒãƒ¼ã‚¸ãƒ§ãƒ³ã‚’表示ã™ã‚‹" -#: parted/parted.c:144 +#: parted/parted.c:145 msgid "alignment for new partitions" msgstr "æ–°è¦ãƒ‘ーティションã®ã‚¢ãƒ©ã‚¤ãƒ¡ãƒ³ãƒˆ" -#: parted/parted.c:157 +#: parted/parted.c:158 msgid "" "NUMBER is the partition number used by Linux. On MS-DOS disk labels, the " "primary partitions number from 1 to 4, logical partitions from 5 onwards.\n" @@ -2375,32 +2369,32 @@ msgstr "" "ディスクラベルã§ã¯ã€åŸºæœ¬ãƒ‘ーティション番å·ã¯ 1 ã‹ã‚‰ 4 ã¾ã§ã§ã€è«–ç†ãƒ‘ーティ" "ション㯠5 以é™ã¨ãªã‚Šã¾ã™ã€‚\n" -#: parted/parted.c:160 +#: parted/parted.c:161 msgid "LABEL-TYPE is one of: " msgstr "ラベルã®ç¨®é¡žã¯æ¬¡ã®ã†ã¡ã‹ã‚‰é¸ã³ã¾ã™: " -#: parted/parted.c:161 parted/parted.c:162 +#: parted/parted.c:162 parted/parted.c:163 msgid "FLAG is one of: " msgstr "フラグã¯æ¬¡ã®ã†ã¡ã‹ã‚‰é¸ã³ã¾ã™: " -#: parted/parted.c:163 +#: parted/parted.c:164 msgid "UNIT is one of: " msgstr "UNIT ã¯æ¬¡ã®ã†ã¡ã‹ã‚‰é¸ã³ã¾ã™: " -#: parted/parted.c:164 +#: parted/parted.c:165 msgid "desired alignment: minimum or optimal" msgstr "望ã¾ã—ã„アライメント: minimum(最å°) ã‹ optimal(最é©)" -#: parted/parted.c:165 +#: parted/parted.c:166 msgid "PART-TYPE is one of: primary, logical, extended\n" msgstr "" "パーティションã®ç¨®é¡žã¯æ¬¡ã®ã†ã¡ã®ã©ã‚Œã‹ã¨ãªã‚Šã¾ã™: プライマリã€è«–ç†ã€æ‹¡å¼µ\n" -#: parted/parted.c:167 +#: parted/parted.c:168 msgid "FS-TYPE is one of: " msgstr "ファイルシステムã®ç¨®é¡žã¯æ¬¡ã®ã†ã¡ã‹ã‚‰é¸ã³ã¾ã™: " -#: parted/parted.c:168 +#: parted/parted.c:169 msgid "" "START and END are disk locations, such as 4GB or 10%. Negative values count " "from the end of the disk. For example, -1s specifies exactly the last " @@ -2409,7 +2403,7 @@ msgstr "" "START 㨠END ã¯ã€ãƒ‡ã‚£ã‚¹ã‚¯ä¸Šã®ä½ç½®ã‚’ 4GB ã‚„ 10% ãªã©ã§è¡¨ã‚ã—ã¾ã™ã€‚è² ã®å€¤ã¯ãƒ‡ã‚£" "スクã®çµ‚ã‚ã‚Šã‹ã‚‰ã®å€¤ã«ãªã‚Šã¾ã™ã€‚例ãˆã°ã€-1s ã¯ã€æœ€å¾Œã®ã‚»ã‚¯ã‚¿ã‚’指ã—ã¾ã™ã€‚\n" -#: parted/parted.c:171 +#: parted/parted.c:172 msgid "" "END is disk location, such as 4GB or 10%. Negative value counts from the " "end of the disk. For example, -1s specifies exactly the last sector.\n" @@ -2417,19 +2411,23 @@ msgstr "" "END ã¯ã€ãƒ‡ã‚£ã‚¹ã‚¯ä¸Šã®ä½ç½®ã‚’ 4GB ã‚„ 10% ãªã©ã§è¡¨ã‚ã—ã¾ã™ã€‚è² ã®å€¤ã¯ãƒ‡ã‚£ã‚¹ã‚¯ã®çµ‚" "ã‚ã‚Šã‹ã‚‰ã®å€¤ã«ãªã‚Šã¾ã™ã€‚例ãˆã°ã€-1s ã¯ã€æœ€å¾Œã®ã‚»ã‚¯ã‚¿ã‚’指ã—ã¾ã™ã€‚\n" -#: parted/parted.c:174 +#: parted/parted.c:175 msgid "STATE is one of: on, off\n" msgstr "状態㯠on ã‹ off ã®ã©ã¡ã‚‰ã‹\n" -#: parted/parted.c:175 +#: parted/parted.c:176 msgid "DEVICE is usually /dev/hda or /dev/sda\n" msgstr "デãƒã‚¤ã‚¹ã¯ãŸã„ã¦ã„ /dev/hda ã‹ /dev/sda ã§ã™ã€‚\n" -#: parted/parted.c:176 +#: parted/parted.c:177 msgid "NAME is any word you want\n" msgstr "åå‰ã®éƒ¨åˆ†ã¯ä»»æ„ã®å˜èªž\n" -#: parted/parted.c:179 +#: parted/parted.c:178 +msgid "TYPE_ID is a value between 0x01 and 0xff, TYPE_UUID is a UUID\n" +msgstr "" + +#: parted/parted.c:182 msgid "" "Copyright (C) 1998 - 2006 Free Software Foundation, Inc.\n" "This program is free software, covered by the GNU General Public License.\n" @@ -2449,22 +2447,22 @@ msgstr "" "ã„ã‹ãªã‚‹ä¿è¨¼ã‚‚è¡Œãªã„ã¾ã›ã‚“。詳細ã«ã¤ã„ã¦ã¯GNU 一般公有使用許諾書をãŠèªã¿ãã " "ã•ã„。\n" -#: parted/parted.c:229 +#: parted/parted.c:232 #, c-format msgid "%0.f%%\t(time left %.2d:%.2d)" msgstr "%0.f%%\t(残り時間 %.2d:%.2d)" -#: parted/parted.c:248 +#: parted/parted.c:251 #, c-format msgid "Partition %s is being used. Are you sure you want to continue?" msgstr "パーティション %s ã¯ä½¿ç”¨ä¸ã§ã™ã€‚ãã‚Œã§ã‚‚実行ã—ã¾ã™ã‹ï¼Ÿ" -#: parted/parted.c:269 +#: parted/parted.c:272 #, c-format msgid "Partition(s) on %s are being used." msgstr "%s ã®ãƒ‘ーティションãŒä½¿ç”¨ä¸ã§ã™ã€‚" -#: parted/parted.c:281 +#: parted/parted.c:284 #, c-format msgid "" "The existing disk label on %s will be destroyed and all data on this disk " @@ -2473,31 +2471,31 @@ msgstr "" "ã„ã¾å˜åœ¨ã—ã¦ã„ã‚‹ %s ã®ãƒ‡ã‚£ã‚¹ã‚¯ãƒ©ãƒ™ãƒ«ã¯ç ´å£Šã•ã‚Œã€ã“ã®ãƒ‡ã‚£ã‚¹ã‚¯ã®å…¨ãƒ‡ãƒ¼ã‚¿ãŒå¤±ã‚" "ã‚Œã¾ã™ã€‚続行ã—ã¾ã™ã‹ï¼Ÿ" -#: parted/parted.c:542 +#: parted/parted.c:545 msgid "New disk label type?" msgstr "æ–°ã—ã„ディスクラベル?" -#: parted/parted.c:680 +#: parted/parted.c:692 msgid "Partition type?" msgstr "パーティションã®ç¨®é¡ž?" -#: parted/parted.c:698 parted/parted.c:902 +#: parted/parted.c:710 parted/parted.c:914 msgid "Partition name?" msgstr "パーティションã®åå‰?" -#: parted/parted.c:708 +#: parted/parted.c:720 msgid "File system type?" msgstr "ファイルシステムã®ç¨®é¡ž?" -#: parted/parted.c:713 parted/parted.c:1683 +#: parted/parted.c:725 parted/parted.c:1815 msgid "Start?" msgstr "開始?" -#: parted/parted.c:715 parted/parted.c:1685 parted/parted.c:1768 +#: parted/parted.c:727 parted/parted.c:1817 parted/parted.c:1900 msgid "End?" msgstr "終了?" -#: parted/parted.c:782 +#: parted/parted.c:794 #, c-format msgid "" "You requested a partition from %s to %s (sectors %llu..%llu).\n" @@ -2506,7 +2504,7 @@ msgstr "" "%s ã‹ã‚‰ %s (%llu ã‹ã‚‰ %llu セクタ)ã¾ã§ã®ãƒ‘ーティションを指定ã•ã‚Œã¾ã—ãŸã€‚\n" "å¯èƒ½ãªä¸ã§æœ€ã‚‚è¿‘ã„ã‚‚ã®ã¯ %s ã‹ã‚‰ %s (%llu ã‹ã‚‰ %llu セクタ)ã«ãªã‚Šã¾ã™ã€‚%s" -#: parted/parted.c:791 +#: parted/parted.c:803 msgid "" "\n" "Is this still acceptable to you?" @@ -2514,7 +2512,7 @@ msgstr "" "\n" "ãã‚Œã§ã‚‚ã‹ã¾ã„ã¾ã›ã‚“ã‹ï¼Ÿ" -#: parted/parted.c:814 +#: parted/parted.c:826 #, c-format msgid "" "The resulting partition is not properly aligned for best performance: %s" @@ -2522,87 +2520,112 @@ msgstr "" "æ“作ã®çµæžœã§ãるパーティションã¯ã‚¢ãƒ©ã‚¤ãƒ¡ãƒ³ãƒˆãŒæ£ã—ããªã„ãŸã‚ã«ãƒ‘フォーマンス" "ãŒã§ã¾ã›ã‚“: %s" -#: parted/parted.c:816 parted/parted.c:1925 +#: parted/parted.c:828 parted/parted.c:2057 msgid "unknown (malloc failed)" msgstr "ä¸æ˜Ž (malloc 失敗)" -#: parted/parted.c:894 +#: parted/parted.c:906 #, c-format msgid "%s disk labels do not support partition name." msgstr "%s ã®ãƒ‡ã‚£ã‚¹ã‚¯ãƒ©ãƒ™ãƒ«ã¯ãƒ‘ーティションåをサãƒãƒ¼ãƒˆã—ã¦ã„ã¾ã›ã‚“。" -#: parted/parted.c:899 parted/parted.c:1748 parted/parted.c:1814 -#: parted/parted.c:1908 parted/parted.c:1983 +#: parted/parted.c:911 parted/parted.c:955 parted/parted.c:1880 +#: parted/parted.c:1946 parted/parted.c:2040 parted/parted.c:2115 msgid "Partition number?" msgstr "パーティション番å·?" -#: parted/parted.c:1050 +#: parted/parted.c:949 +#, fuzzy, c-format +msgid "%s disk labels do not support partition type." +msgstr "%s ã®ãƒ‡ã‚£ã‚¹ã‚¯ãƒ©ãƒ™ãƒ«ã¯ãƒ‘ーティションåをサãƒãƒ¼ãƒˆã—ã¦ã„ã¾ã›ã‚“。" + +#: parted/parted.c:965 +#, fuzzy +msgid "Partition type-id?" +msgstr "パーティションã®ç¨®é¡ž?" + +#: parted/parted.c:972 +#, fuzzy +msgid "Invalid type-id." +msgstr "ä¸æ£ãªå€¤ã§ã™ã€‚" + +#: parted/parted.c:986 +#, fuzzy +msgid "Partition type-uuid?" +msgstr "パーティションã®ç¨®é¡ž?" + +#: parted/parted.c:993 +#, fuzzy +msgid "Invalid type-uuid." +msgstr "ä¸æ£ãªå€¤ã§ã™ã€‚" + +#: parted/parted.c:1146 #, c-format msgid "BIOS cylinder,head,sector geometry: %d,%d,%d. Each cylinder is %s.\n" msgstr "BIOS シリンダã€ãƒ˜ãƒƒãƒ‰ã€ã‚»ã‚¯ã‚¿ geometry: %d,%d,%d. 1シリンダ㯠%s。\n" -#: parted/parted.c:1137 +#: parted/parted.c:1240 #, c-format msgid "Model: %s (%s)\n" msgstr "モデル: %s (%s)\n" -#: parted/parted.c:1139 +#: parted/parted.c:1242 #, c-format msgid "Disk %s: %s\n" msgstr "ディスク %s: %s\n" -#: parted/parted.c:1140 +#: parted/parted.c:1243 #, c-format msgid "Sector size (logical/physical): %lldB/%lldB\n" msgstr "セクタサイズ (è«–ç†/物ç†): %lldB/%lldB\n" -#: parted/parted.c:1152 +#: parted/parted.c:1255 #, c-format msgid "Partition Table: %s\n" msgstr "パーティションテーブル: %s\n" -#: parted/parted.c:1153 +#: parted/parted.c:1256 #, c-format msgid "Disk Flags: %s\n" msgstr "ディスクフラグ: %s\n" -#: parted/parted.c:1279 parted/parted.c:1282 +#: parted/parted.c:1388 parted/parted.c:1391 msgid "Number" msgstr "番å·" -#: parted/parted.c:1279 parted/parted.c:1282 +#: parted/parted.c:1388 parted/parted.c:1391 msgid "Start" msgstr "開始" -#: parted/parted.c:1280 parted/parted.c:1283 +#: parted/parted.c:1389 parted/parted.c:1392 msgid "End" msgstr "終了" -#: parted/parted.c:1283 +#: parted/parted.c:1392 msgid "Size" msgstr "サイズ" -#: parted/parted.c:1287 +#: parted/parted.c:1396 msgid "Type" msgstr "タイプ" -#: parted/parted.c:1289 +#: parted/parted.c:1398 msgid "File system" msgstr "ファイルシステム" -#: parted/parted.c:1292 +#: parted/parted.c:1401 msgid "Name" msgstr "åå‰" -#: parted/parted.c:1294 +#: parted/parted.c:1403 msgid "Flags" msgstr "フラグ" -#: parted/parted.c:1352 +#: parted/parted.c:1461 msgid "Free Space" msgstr "空ã容é‡" -#: parted/parted.c:1570 +#: parted/parted.c:1702 #, c-format msgid "" "A %s %s partition was found at %s -> %s. Do you want to add it to the " @@ -2611,56 +2634,56 @@ msgstr "" "%s %s パーティション㌠%s → %s ã®å ´æ‰€ã«ç™ºè¦‹ã•ã‚Œã¾ã—ãŸã€‚ã“ã®ãƒ‘ーティションを" "パーティションテーブルã«è¿½åŠ ã—ã¾ã™ã‹ï¼Ÿ" -#: parted/parted.c:1613 +#: parted/parted.c:1745 msgid "searching for file systems" msgstr "ファイルシステムを探ã—ã¦ã„ã¾ã™" -#: parted/parted.c:1720 +#: parted/parted.c:1852 msgid "The resize command has been removed in parted 3.0" msgstr "resize コマンド㯠parted 3.0 ã§å‰Šé™¤ã•ã‚Œã¾ã—ãŸ" -#: parted/parted.c:1782 +#: parted/parted.c:1914 msgid "" "Shrinking a partition can cause data loss, are you sure you want to continue?" msgstr "" "パーティションを縮å°ã™ã‚‹ã¨ãƒ‡ãƒ¼ã‚¿ã‚’失ã†ã‹ã‚‚ã—ã‚Œã¾ã›ã‚“ãŒã€ãã‚Œã§ã‚‚実行ã—ã¾ã™" "ã‹ï¼Ÿ" -#: parted/parted.c:1838 +#: parted/parted.c:1970 msgid "New device?" msgstr "æ–°ã—ã„デãƒã‚¤ã‚¹?" -#: parted/parted.c:1906 +#: parted/parted.c:2038 msgid "alignment type(min/opt)" msgstr "アライメントタイプ(min/opt)" -#: parted/parted.c:1921 +#: parted/parted.c:2053 #, c-format msgid "%d aligned\n" msgstr "%d アライメント済\n" -#: parted/parted.c:1923 +#: parted/parted.c:2055 #, c-format msgid "%d not aligned: %s\n" msgstr "%d 未アライメント: %s\n" -#: parted/parted.c:1948 parted/parted.c:1985 +#: parted/parted.c:2080 parted/parted.c:2117 msgid "Flag to Invert?" msgstr "å転ã™ã‚‹ãƒ•ãƒ©ã‚°?" -#: parted/parted.c:1953 parted/parted.c:1990 +#: parted/parted.c:2085 parted/parted.c:2122 msgid "New state?" msgstr "æ–°ã—ã„状態?" -#: parted/parted.c:2036 +#: parted/parted.c:2168 msgid "Unit?" msgstr "å˜ä½ã¯?" -#: parted/parted.c:2171 +#: parted/parted.c:2303 msgid "align-check" msgstr "align-check" -#: parted/parted.c:2174 +#: parted/parted.c:2306 msgid "" "align-check TYPE N check partition N for TYPE(min|opt) " "alignment" @@ -2668,41 +2691,41 @@ msgstr "" "align-check TYPE N パーティション N ã®ã‚¢ãƒ©ã‚¤ãƒ¡ãƒ³ãƒˆ(TYPE: min|opt)" "ã‚’ãƒã‚§ãƒƒã‚¯ã™ã‚‹" -#: parted/parted.c:2182 +#: parted/parted.c:2314 msgid "help" msgstr "help" -#: parted/parted.c:2185 +#: parted/parted.c:2317 msgid "" "help [COMMAND] print general help, or help on " "COMMAND" msgstr "" "help [コマンド] ヘルプ表示。コマンド指定ã§ãã®ãƒ˜ãƒ«ãƒ—を表示" -#: parted/parted.c:2191 +#: parted/parted.c:2323 msgid "mklabel" msgstr "mklabel" -#: parted/parted.c:2191 +#: parted/parted.c:2323 msgid "mktable" msgstr "mktable" -#: parted/parted.c:2194 +#: parted/parted.c:2326 msgid "" "mklabel,mktable LABEL-TYPE create a new disklabel (partition " "table)" msgstr "" "mklabel,mktable ラベルã®ç¨®é¡ž æ–°ã—ã„ラベル(パーティションテーブル)を作る" -#: parted/parted.c:2200 +#: parted/parted.c:2332 msgid "mkpart" msgstr "mkpart" -#: parted/parted.c:2203 +#: parted/parted.c:2335 msgid "mkpart PART-TYPE [FS-TYPE] START END make a partition" msgstr "mkpart PART-TYPE [FS-TYPE] START END パーティションを作æˆ" -#: parted/parted.c:2209 +#: parted/parted.c:2341 msgid "" "'mkpart' makes a partition without creating a new file system on the " "partition. FS-TYPE may be specified to set an appropriate partition ID.\n" @@ -2710,19 +2733,19 @@ msgstr "" "mkpart ã¯ãƒ‘ーティションã ã‘作りã€æ–°ã—ã„ファイルシステムã¯ä½œã‚Šã¾ã›ã‚“。ファイル" "システムã®ç¨®é¡žã‚’指定ã™ã‚‹ã¨ã€æ£ã—ã„IDãŒè¨å®šã•ã‚Œã¾ã™ã€‚\n" -#: parted/parted.c:2214 +#: parted/parted.c:2346 msgid "name" msgstr "name" -#: parted/parted.c:2217 +#: parted/parted.c:2349 msgid "name NUMBER NAME name partition NUMBER as NAME" msgstr "name NUMBER åå‰ ãƒ‘ãƒ¼ãƒ†ã‚£ã‚·ãƒ§ãƒ³ã«åå‰ã‚’ã¤ã‘ã‚‹" -#: parted/parted.c:2222 +#: parted/parted.c:2354 msgid "print" msgstr "print" -#: parted/parted.c:2225 +#: parted/parted.c:2357 msgid "" "print [devices|free|list,all] display the partition table, or " "available devices, or free space, or all found partitions" @@ -2730,7 +2753,7 @@ msgstr "" "print [devices|free|list,all] パーティションテーブルやã€åˆ©ç”¨å¯èƒ½ãª" "デãƒã‚¤ã‚¹ã€ç©ºãé ˜åŸŸã€è¦‹ã¤ã‹ã£ãŸå…¨ã¦ã®ãƒ‘ーティションã«ã¤ã„ã¦è¡¨ç¤ºã™ã‚‹" -#: parted/parted.c:2229 +#: parted/parted.c:2361 msgid "" "Without arguments, 'print' displays the entire partition table. However with " "the following arguments it performs various other actions.\n" @@ -2738,11 +2761,11 @@ msgstr "" "引数をã¤ã‘ãªã„å ´åˆã€'print' コマンドã¯ã€å…¨ãƒ‘ーティションテーブルを表示ã—ã¾" "ã™ã€‚次ã®å¼•æ•°ã‚’ã¤ã‘ã‚‹ã“ã¨ãŒå¯èƒ½ã§ã™ã€‚\n" -#: parted/parted.c:2231 +#: parted/parted.c:2363 msgid " devices : display all active block devices\n" msgstr " devices : å…¨ã¦ã®ã‚¢ã‚¯ãƒ†ã‚£ãƒ–ãªãƒ–ãƒãƒƒã‚¯ãƒ‡ãƒã‚¤ã‚¹ã‚’表示\n" -#: parted/parted.c:2232 +#: parted/parted.c:2364 msgid "" " free : display information about free unpartitioned space on the " "current block device\n" @@ -2750,25 +2773,25 @@ msgstr "" " free : カレントブãƒãƒƒã‚¯ãƒ‡ãƒã‚¤ã‚¹ã®ãƒ‘ーティションã«å«ã¾ã‚Œã¦ã„ãªã„空ãé ˜" "åŸŸæƒ…å ±ã‚’è¡¨ç¤º\n" -#: parted/parted.c:2234 +#: parted/parted.c:2366 msgid "" " list, all : display the partition tables of all active block devices\n" msgstr "" " list, all : アクティブãªå…¨ãƒ–ãƒãƒƒã‚¯ãƒ‡ãƒã‚¤ã‚¹ã®ãƒ‘ーティションテーブルを表示\n" -#: parted/parted.c:2238 +#: parted/parted.c:2370 msgid "quit" msgstr "quit" -#: parted/parted.c:2241 +#: parted/parted.c:2373 msgid "quit exit program" msgstr "quit プãƒã‚°ãƒ©ãƒ を終了ã™ã‚‹" -#: parted/parted.c:2246 +#: parted/parted.c:2378 msgid "rescue" msgstr "rescue" -#: parted/parted.c:2249 +#: parted/parted.c:2381 msgid "" "rescue START END rescue a lost partition near START " "and END" @@ -2776,118 +2799,128 @@ msgstr "" "rescue 開始 終了 開始ã€çµ‚了ã§æŒ‡å®šã—ãŸç¯„囲付近ã«ã‚るパーティショ" "ンを復活ã•ã›ã‚‹" -#: parted/parted.c:2255 +#: parted/parted.c:2387 msgid "resize" msgstr "resize" -#: parted/parted.c:2258 +#: parted/parted.c:2390 msgid "The resize command was removed in parted 3.0\n" msgstr "resize コマンド㯠parted 3.0 ã§å‰Šé™¤ã•ã‚Œã¾ã—ãŸ\n" -#: parted/parted.c:2261 +#: parted/parted.c:2393 msgid "resizepart" msgstr "resizepart" -#: parted/parted.c:2264 +#: parted/parted.c:2396 msgid "resizepart NUMBER END resize partition NUMBER" msgstr "" "resizepart NUMBER END パーティション NUMBER ã‚’ END ã«ãƒªã‚µã‚¤ã‚ºã™ã‚‹" -#: parted/parted.c:2269 +#: parted/parted.c:2401 msgid "rm" msgstr "rm" -#: parted/parted.c:2272 +#: parted/parted.c:2404 msgid "rm NUMBER delete partition NUMBER" msgstr "rm NUMBER パーティションを削除ã™ã‚‹" -#: parted/parted.c:2277 +#: parted/parted.c:2409 msgid "select" msgstr "select" -#: parted/parted.c:2280 +#: parted/parted.c:2412 msgid "select DEVICE choose the device to edit" msgstr "select デãƒã‚¤ã‚¹ æ“作ã™ã‚‹ãƒ‡ãƒã‚¤ã‚¹ã‚’é¸æŠž" -#: parted/parted.c:2285 +#: parted/parted.c:2417 msgid "disk_set" msgstr "disk_set" -#: parted/parted.c:2288 +#: parted/parted.c:2420 msgid "" "disk_set FLAG STATE change the FLAG on selected device" msgstr "disk_set FLAG STATE é¸æŠžã—ãŸãƒ‡ãƒã‚¤ã‚¹ã® FLAG を変更" -#: parted/parted.c:2293 +#: parted/parted.c:2425 msgid "disk_toggle" msgstr "disk_toggle" -#: parted/parted.c:2296 +#: parted/parted.c:2428 msgid "" "disk_toggle [FLAG] toggle the state of FLAG on " "selected device" msgstr "disk_toggle [FLAG] é¸æŠžã—ãŸãƒ‡ãƒã‚¤ã‚¹ã® FLAG ã®çŠ¶æ…‹ã‚’トグル" -#: parted/parted.c:2302 +#: parted/parted.c:2434 msgid "set" msgstr "set" -#: parted/parted.c:2305 +#: parted/parted.c:2437 msgid "" "set NUMBER FLAG STATE change the FLAG on partition NUMBER" msgstr "set NUMBER フラグ 状態 ファイルシステムã®ãƒ•ãƒ©ã‚°ã¨çŠ¶æ…‹ã‚’è¨å®šã™ã‚‹" -#: parted/parted.c:2311 +#: parted/parted.c:2443 msgid "toggle" msgstr "toggle" -#: parted/parted.c:2314 +#: parted/parted.c:2446 msgid "" "toggle [NUMBER [FLAG]] toggle the state of FLAG on " "partition NUMBER" msgstr "toggle [NUMBER [FLAG]] パーティションã®ãƒ•ãƒ©ã‚°ã®çŠ¶æ…‹ã‚’å転ã™ã‚‹" -#: parted/parted.c:2320 +#: parted/parted.c:2452 +msgid "type" +msgstr "" + +#: parted/parted.c:2455 +msgid "" +"type NUMBER TYPE-ID or TYPE-UUID type set TYPE-ID or TYPE-UUID of " +"partition NUMBER" +msgstr "" + +#: parted/parted.c:2460 msgid "unit" msgstr "unit" -#: parted/parted.c:2323 +#: parted/parted.c:2463 msgid "unit UNIT set the default unit to UNIT" msgstr "unit UNIT デフォルトã®å˜ä½ã‚’ UNIT ã«ã™ã‚‹" -#: parted/parted.c:2328 +#: parted/parted.c:2468 msgid "version" msgstr "version" -#: parted/parted.c:2331 +#: parted/parted.c:2471 msgid "" "version display the version number and " "copyright information of GNU Parted" msgstr "" "version GNU Parted ã®ãƒãƒ¼ã‚¸ãƒ§ãƒ³ã¨è‘—ä½œæ¨©æƒ…å ±ã‚’è¡¨ç¤º" -#: parted/parted.c:2335 +#: parted/parted.c:2475 msgid "" "'version' displays copyright and version information corresponding to this " "copy of GNU Parted\n" msgstr "" "version ã¯ã€å®Ÿè¡Œä¸ã® GNU Parted ã®ãƒãƒ¼ã‚¸ãƒ§ãƒ³ã¨è‘—ä½œæ¨©æƒ…å ±ã‚’è¡¨ç¤ºã—ã¾ã™ã€‚\n" -#: parted/parted.c:2405 +#: parted/parted.c:2545 #, c-format msgid "Usage: %s [-hlmsfv] [-a<align>] [DEVICE [COMMAND [PARAMETERS]]...]\n" msgstr "" "使ã„æ–¹: %s [-hlmsfv] [-a<アライン>] [デãƒã‚¤ã‚¹ [コマンド [パラメータ]]...]\n" -#: parted/parted.c:2449 +#: parted/parted.c:2589 msgid "No device found" msgstr "デãƒã‚¤ã‚¹ãŒã¿ã¤ã‹ã‚Šã¾ã›ã‚“。" -#: parted/parted.c:2486 +#: parted/parted.c:2626 msgid "WARNING: You are not superuser. Watch out for permissions.\n" msgstr "è¦å‘Š: 管ç†è€…権é™ãŒã‚ã‚Šã¾ã›ã‚“。パーミッションã«æ³¨æ„ã—ã¦ãã ã•ã„。\n" -#: parted/parted.c:2519 +#: parted/parted.c:2659 msgid "" "You should reinstall your boot loader before rebooting. Read section 4 of " "the Parted User documentation for more information." @@ -2895,7 +2928,7 @@ msgstr "" "å†èµ·å‹•ã™ã‚‹å‰ã«ãƒ–ートãƒãƒ¼ãƒ€ã‚’ã„ã‚ŒãªãŠã™ã¹ãã§ã™ã€‚詳細㯠Parted ユーザドã‚ュメ" "ントã®4ç« ã‚’èªã‚“ã§ãã ã•ã„。" -#: parted/parted.c:2526 +#: parted/parted.c:2666 msgid "You may need to update /etc/fstab.\n" msgstr "å¿…è¦ã§ã‚れ㰠/etc/fstab ã‚’æ›´æ–°ã™ã‚‹ã®ã‚’忘れãªã„よã†ã«ã—ã¦ãã ã•ã„。\n" @@ -3156,69 +3189,69 @@ msgstr "" "\n" "エラー: SIGILL シグナルをå—ã‘ã¨ã‚Šã¾ã—ãŸã€‚" -#: parted/ui.c:901 +#: parted/ui.c:904 #, c-format msgid "invalid token: %s" msgstr "ä¸æ£ãªãƒˆãƒ¼ã‚¯ãƒ³ã§ã™: %s" -#: parted/ui.c:1082 +#: parted/ui.c:1085 msgid "Expecting a partition number." msgstr "パーティション番å·ã‚’入力ã—ã¦ãã ã•ã„。" -#: parted/ui.c:1091 +#: parted/ui.c:1094 msgid "Partition doesn't exist." msgstr "パーティションãŒã‚ã‚Šã¾ã›ã‚“。" -#: parted/ui.c:1111 +#: parted/ui.c:1114 msgid "Expecting a file system type." msgstr "ファイルシステムã®ç¨®é¡žã‚’入力ã—ã¦ãã ã•ã„。" -#: parted/ui.c:1118 +#: parted/ui.c:1121 #, c-format msgid "Unknown file system type \"%s\"." msgstr "ファイルシステムã®ç¨®é¡ž \"%s\" ã¯ä¸æ˜Žã§ã™ã€‚" -#: parted/ui.c:1139 +#: parted/ui.c:1142 msgid "Expecting a disk label type." msgstr "ディスクラベルã®ç¨®é¡žã‚’入力ã—ã¦ãã ã•ã„。" -#: parted/ui.c:1170 parted/ui.c:1206 +#: parted/ui.c:1173 parted/ui.c:1209 msgid "No flags supported" msgstr "フラグãŒã‚µãƒãƒ¼ãƒˆã•ã‚Œã¦ã„ã¾ã›ã‚“" -#: parted/ui.c:1280 +#: parted/ui.c:1283 msgid "Can't create any more partitions." msgstr "ãƒ‘ãƒ¼ãƒ†ã‚£ã‚·ãƒ§ãƒ³ã‚’è¿½åŠ ã§ãã¾ã›ã‚“。" -#: parted/ui.c:1290 +#: parted/ui.c:1293 msgid "Expecting a partition type." msgstr "パーティションã®ç¨®é¡žã‚’入力ã—ã¦ãã ã•ã„。" -#: parted/ui.c:1439 +#: parted/ui.c:1442 msgid "on" msgstr "on" -#: parted/ui.c:1440 +#: parted/ui.c:1443 msgid "off" msgstr "off" -#: parted/ui.c:1457 +#: parted/ui.c:1460 msgid "optimal" msgstr "最é©(optimal)" -#: parted/ui.c:1458 +#: parted/ui.c:1461 msgid "minimal" msgstr "最å°(minimal)" -#: parted/ui.c:1591 +#: parted/ui.c:1594 msgid "OPTIONs:" msgstr "オプション" -#: parted/ui.c:1596 +#: parted/ui.c:1599 msgid "COMMANDs:" msgstr "コマンド:" -#: parted/ui.c:1599 +#: parted/ui.c:1602 #, c-format msgid "" "\n" @@ -3227,11 +3260,20 @@ msgstr "" "\n" "ãƒã‚°ãƒ¬ãƒãƒ¼ãƒˆã¯ %s ã¸ã€‚\n" -#: parted/ui.c:1606 +#: parted/ui.c:1609 #, c-format msgid "Using %s\n" msgstr "%s を使用\n" -#: parted/ui.c:1686 +#: parted/ui.c:1689 msgid "This command does not make sense in non-interactive mode.\n" msgstr "ã“ã®ã‚³ãƒžãƒ³ãƒ‰ã¯å¯¾è©±æ“作モードã§ãªã‘ã‚Œã°æ„味ãŒã‚ã‚Šã¾ã›ã‚“。\n" + +#~ msgid "Extended partitions cannot be hidden on msdos disk labels." +#~ msgstr "MSDOS ディスクラベルã§æ‹¡å¼µãƒ‘ーティションã¯éš ã›ã¾ã›ã‚“。" + +#~ msgid "" +#~ "Extended partitions cannot be recovery partitions on msdos disk labels." +#~ msgstr "" +#~ "MSDOS ディスクラベルã§æ‹¡å¼µãƒ‘ーティションã¯ãƒªã‚«ãƒãƒªãƒ‘ーティションã«ã§ãã¾ã›" +#~ "ん。" diff --git a/po/ka.gmo b/po/ka.gmo Binary files differnew file mode 100644 index 0000000..ca62348 --- /dev/null +++ b/po/ka.gmo diff --git a/po/ka.po b/po/ka.po new file mode 100644 index 0000000..5a0992c --- /dev/null +++ b/po/ka.po @@ -0,0 +1,3135 @@ +# SOME DESCRIPTIVE TITLE. +# Copyright (C) 2022 Free Software Foundation, Inc. +# This file is distributed under the same license as the parted package. +# Temuri Doghonadze <temuri.doghonadze@gmail.com>, 2022. +# +msgid "" +msgstr "" +"Project-Id-Version: GNU parted 3.4.64.2\n" +"Report-Msgid-Bugs-To: bug-parted@gnu.org\n" +"POT-Creation-Date: 2023-04-10 15:50-0700\n" +"PO-Revision-Date: 2022-04-17 15:31+0200\n" +"Last-Translator: Temuri Doghonadze <temuri.doghonadze@gmail.com>\n" +"Language-Team: Georgian <(nothing)>\n" +"Language: ka\n" +"MIME-Version: 1.0\n" +"Content-Type: text/plain; charset=UTF-8\n" +"Content-Transfer-Encoding: 8bit\n" +"X-Bugs: Report translation errors to the Language-Team address.\n" +"Plural-Forms: nplurals=2; plural=(n != 1);\n" +"X-Generator: Poedit 3.0.1\n" + +#: lib/argmatch.c:145 +#, c-format +msgid "invalid argument %s for %s" +msgstr "%s áƒáƒ áƒáƒ¡áƒ¬áƒáƒ ი áƒáƒ გუმენტირ%s-თვის" + +#: lib/argmatch.c:146 +#, c-format +msgid "ambiguous argument %s for %s" +msgstr "%s გáƒáƒ£áƒ კვეველი áƒáƒ გუმენტირ%s-თვის" + +#: lib/argmatch.c:165 lib/argmatch.h:237 +msgid "Valid arguments are:" +msgstr "სწáƒáƒ ი áƒáƒ გუმენტებიáƒ:" + +#: lib/closeout.c:121 libparted/labels/fdasd.c:145 +msgid "write error" +msgstr "ჩáƒáƒ¬áƒ”რის შეცდáƒáƒ›áƒ" + +#: lib/error.c:193 +msgid "Unknown system error" +msgstr "სისტემის უცნáƒáƒ‘ი შეცდáƒáƒ›áƒ" + +#: lib/getopt.c:278 +#, c-format +msgid "%s: option '%s%s' is ambiguous\n" +msgstr "%s: პáƒáƒ áƒáƒ›áƒ”ტრი '%s%s' გáƒáƒ£áƒ კვეველიáƒ\n" + +#: lib/getopt.c:284 +#, c-format +msgid "%s: option '%s%s' is ambiguous; possibilities:" +msgstr "%s: პáƒáƒ áƒáƒ›áƒ”ტრი '%s%s' გáƒáƒ£áƒ კვეველიáƒ; შესáƒáƒ«áƒšáƒ ვáƒáƒ იáƒáƒœáƒ¢áƒ”ბი:" + +#: lib/getopt.c:319 +#, c-format +msgid "%s: unrecognized option '%s%s'\n" +msgstr "%s: უცნáƒáƒ‘ი პáƒáƒ áƒáƒ›áƒ”ტრი '%s'%s'\n" + +#: lib/getopt.c:345 +#, c-format +msgid "%s: option '%s%s' doesn't allow an argument\n" +msgstr "%s: პáƒáƒ áƒáƒ›áƒ”ტრს \"%s%s' áƒáƒ გუმენტი áƒáƒ სáƒáƒ˜áƒ დებáƒ\n" + +#: lib/getopt.c:360 +#, c-format +msgid "%s: option '%s%s' requires an argument\n" +msgstr "%s: პáƒáƒ áƒáƒ›áƒ”ტრს \"%s%s\" áƒáƒ გუმენტი ესáƒáƒáƒ˜áƒ áƒáƒ”ბáƒ\n" + +#: lib/getopt.c:621 +#, c-format +msgid "%s: invalid option -- '%c'\n" +msgstr "%s: áƒáƒ áƒáƒ¡áƒ¬áƒáƒ ი პáƒáƒ áƒáƒ›áƒ”ტრი -- '%c'\n" + +#: lib/getopt.c:636 lib/getopt.c:682 +#, c-format +msgid "%s: option requires an argument -- '%c'\n" +msgstr "%s: პáƒáƒ áƒáƒ›áƒ”ტრს ესáƒáƒáƒ˜áƒ áƒáƒ”ბრáƒáƒ გუმენტი -- '%c'\n" + +#. TRANSLATORS: +#. Get translations for open and closing quotation marks. +#. The message catalog should translate "`" to a left +#. quotation mark suitable for the locale, and similarly for +#. "'". For example, a French Unicode local should translate +#. these to U+00AB (LEFT-POINTING DOUBLE ANGLE +#. QUOTATION MARK), and U+00BB (RIGHT-POINTING DOUBLE ANGLE +#. QUOTATION MARK), respectively. +#. +#. If the catalog has no translation, we will try to +#. use Unicode U+2018 (LEFT SINGLE QUOTATION MARK) and +#. Unicode U+2019 (RIGHT SINGLE QUOTATION MARK). If the +#. current locale is not Unicode, locale_quoting_style +#. will quote 'like this', and clocale_quoting_style will +#. quote "like this". You should always include translations +#. for "`" and "'" even if U+2018 and U+2019 are appropriate +#. for your locale. +#. +#. If you don't know what to put here, please see +#. <https://en.wikipedia.org/wiki/Quotation_marks_in_other_languages> +#. and use glyphs suitable for your language. +#: lib/quotearg.c:354 +msgid "`" +msgstr "`" + +#: lib/quotearg.c:355 +msgid "'" +msgstr "'" + +#: lib/regcomp.c:122 +msgid "Success" +msgstr "წáƒáƒ მáƒáƒ¢áƒ”ბáƒ" + +#: lib/regcomp.c:125 +msgid "No match" +msgstr "áƒáƒ ემთხვევáƒ" + +#: lib/regcomp.c:128 +msgid "Invalid regular expression" +msgstr "áƒáƒ áƒáƒ¡áƒ¬áƒáƒ ი რეგულáƒáƒ ული გáƒáƒ›áƒáƒ¡áƒáƒ®áƒ£áƒšáƒ”ბáƒ" + +#: lib/regcomp.c:131 +msgid "Invalid collation character" +msgstr "კáƒáƒšáƒáƒªáƒ˜áƒ˜áƒ¡ áƒáƒ áƒáƒ¡áƒ¬áƒáƒ ი სიმბáƒáƒšáƒ" + +#: lib/regcomp.c:134 +msgid "Invalid character class name" +msgstr "სიმბáƒáƒšáƒáƒ”ბის áƒáƒ áƒáƒ¡áƒ¬áƒáƒ ი კლáƒáƒ¡áƒ˜" + +#: lib/regcomp.c:137 +msgid "Trailing backslash" +msgstr "ბáƒáƒšáƒ Backslash" + +#: lib/regcomp.c:140 +msgid "Invalid back reference" +msgstr "áƒáƒ áƒáƒ¡áƒ¬áƒáƒ ი უკუბმáƒ" + +#: lib/regcomp.c:143 +msgid "Unmatched [, [^, [:, [., or [=" +msgstr "áƒáƒ ემთხვევრ[, [^, [:, [., áƒáƒœ [=" + +#: lib/regcomp.c:146 +msgid "Unmatched ( or \\(" +msgstr "áƒáƒ ემთხვევრ( áƒáƒœ \\(" + +#: lib/regcomp.c:149 +msgid "Unmatched \\{" +msgstr "áƒáƒ ემთხვევრ\\{" + +#: lib/regcomp.c:152 +msgid "Invalid content of \\{\\}" +msgstr "\\{\\}-ის áƒáƒ áƒáƒ¡áƒ¬áƒáƒ ი შემცელáƒáƒ‘áƒ" + +#: lib/regcomp.c:155 +msgid "Invalid range end" +msgstr "დიáƒáƒžáƒáƒ–áƒáƒœáƒ˜áƒ¡ áƒáƒ áƒáƒ¡áƒ¬áƒáƒ ი დáƒáƒ¡áƒáƒ¡áƒ ული" + +#: lib/regcomp.c:158 +msgid "Memory exhausted" +msgstr "მეხსიერებრგáƒáƒ“áƒáƒ•áƒ¡áƒ”ბულიáƒ" + +#: lib/regcomp.c:161 +msgid "Invalid preceding regular expression" +msgstr "რეგულáƒáƒ ული გáƒáƒ›áƒáƒ¡áƒáƒ®áƒ£áƒšáƒ”ბის áƒáƒ áƒáƒ¡áƒ¬áƒáƒ ი სáƒáƒ¬áƒ§áƒ˜áƒ¡áƒ˜" + +#: lib/regcomp.c:164 +msgid "Premature end of regular expression" +msgstr "რეგულáƒáƒ ული გáƒáƒ›áƒáƒ¡áƒáƒ®áƒ£áƒšáƒ”ბის მáƒáƒ£áƒšáƒáƒ“ნელი დáƒáƒ¡áƒáƒ¡áƒ ული" + +#: lib/regcomp.c:167 +msgid "Regular expression too big" +msgstr "რეგულáƒáƒ ული გáƒáƒ›áƒáƒ¡áƒáƒ®áƒ£áƒšáƒ”ბრძáƒáƒšáƒ˜áƒáƒœ დიდიáƒ" + +#: lib/regcomp.c:170 +msgid "Unmatched ) or \\)" +msgstr "áƒáƒ ემთხვევრ) áƒáƒœ \\)" + +#: lib/regcomp.c:650 +msgid "No previous regular expression" +msgstr "წინრრეგულáƒáƒ ული გáƒáƒ›áƒáƒ¡áƒáƒ®áƒ£áƒšáƒ”ბრáƒáƒ áƒáƒ სებáƒáƒ‘ს" + +#. TRANSLATORS: A regular expression testing for an affirmative answer +#. (english: "yes"). Testing the first character may be sufficient. +#. Take care to consider upper and lower case. +#. To enquire the regular expression that your system uses for this +#. purpose, you can use the command +#. locale -k LC_MESSAGES | grep '^yesexpr=' +#: lib/rpmatch.c:149 +msgid "^[yY]" +msgstr "^[yY]" + +#. TRANSLATORS: A regular expression testing for a negative answer +#. (english: "no"). Testing the first character may be sufficient. +#. Take care to consider upper and lower case. +#. To enquire the regular expression that your system uses for this +#. purpose, you can use the command +#. locale -k LC_MESSAGES | grep '^noexpr=' +#: lib/rpmatch.c:162 +msgid "^[nN]" +msgstr "^[nN]" + +#: lib/version-etc.c:73 +#, c-format +msgid "Packaged by %s (%s)\n" +msgstr "áƒáƒ¬áƒ§áƒáƒ‘ილირ%s-ის მიერ(%s)\n" + +#: lib/version-etc.c:76 +#, c-format +msgid "Packaged by %s\n" +msgstr "áƒáƒ¬áƒ§áƒáƒ‘ილირ%s-ის მიერ\n" + +#. TRANSLATORS: Translate "(C)" to the copyright symbol +#. (C-in-a-circle), if this symbol is available in the user's +#. locale. Otherwise, do not translate "(C)"; leave it as-is. +#: lib/version-etc.c:83 +msgid "(C)" +msgstr "(C)" + +#. TRANSLATORS: The %s placeholder is the web address of the GPL license. +#: lib/version-etc.c:88 +#, c-format +msgid "" +"License GPLv3+: GNU GPL version 3 or later <%s>.\n" +"This is free software: you are free to change and redistribute it.\n" +"There is NO WARRANTY, to the extent permitted by law.\n" +msgstr "" +"License GPLv3+: GNU GPL version 3 or later <%s>.\n" +"This is free software: you are free to change and redistribute it.\n" +"There is NO WARRANTY, to the extent permitted by law.\n" + +#. TRANSLATORS: %s denotes an author name. +#: lib/version-etc.c:105 +#, c-format +msgid "Written by %s.\n" +msgstr "áƒáƒ•áƒ¢áƒáƒ ი: %s.\n" + +#. TRANSLATORS: Each %s denotes an author name. +#: lib/version-etc.c:109 +#, c-format +msgid "Written by %s and %s.\n" +msgstr "áƒáƒ•áƒ¢áƒáƒ ები: %s დრ%s.\n" + +#. TRANSLATORS: Each %s denotes an author name. +#: lib/version-etc.c:113 +#, c-format +msgid "Written by %s, %s, and %s.\n" +msgstr "áƒáƒ•áƒ¢áƒáƒ ები: %s, %s დრ%s.\n" + +#. TRANSLATORS: Each %s denotes an author name. +#. You can use line breaks, estimating that each author name occupies +#. ca. 16 screen columns and that a screen line has ca. 80 columns. +#: lib/version-etc.c:120 +#, c-format +msgid "" +"Written by %s, %s, %s,\n" +"and %s.\n" +msgstr "" +"áƒáƒ•áƒ¢áƒáƒ ები: %s, %s, %s\n" +"დრ%s.\n" + +#. TRANSLATORS: Each %s denotes an author name. +#. You can use line breaks, estimating that each author name occupies +#. ca. 16 screen columns and that a screen line has ca. 80 columns. +#: lib/version-etc.c:127 +#, c-format +msgid "" +"Written by %s, %s, %s,\n" +"%s, and %s.\n" +msgstr "" +"áƒáƒ•áƒ¢áƒáƒ ები: %s, %s, %s,\n" +"%s დრ%s.\n" + +#. TRANSLATORS: Each %s denotes an author name. +#. You can use line breaks, estimating that each author name occupies +#. ca. 16 screen columns and that a screen line has ca. 80 columns. +#: lib/version-etc.c:134 +#, c-format +msgid "" +"Written by %s, %s, %s,\n" +"%s, %s, and %s.\n" +msgstr "" +"áƒáƒ•áƒ¢áƒáƒ ები: %s, %s, %s,\n" +"%s, %s დრ%s.\n" + +#. TRANSLATORS: Each %s denotes an author name. +#. You can use line breaks, estimating that each author name occupies +#. ca. 16 screen columns and that a screen line has ca. 80 columns. +#: lib/version-etc.c:142 +#, c-format +msgid "" +"Written by %s, %s, %s,\n" +"%s, %s, %s, and %s.\n" +msgstr "" +"áƒáƒ•áƒ¢áƒáƒ ები: %s, %s, %s,\n" +"%s, %s, %s დრ%s.\n" + +#. TRANSLATORS: Each %s denotes an author name. +#. You can use line breaks, estimating that each author name occupies +#. ca. 16 screen columns and that a screen line has ca. 80 columns. +#: lib/version-etc.c:150 +#, c-format +msgid "" +"Written by %s, %s, %s,\n" +"%s, %s, %s, %s,\n" +"and %s.\n" +msgstr "" +"áƒáƒ•áƒ¢áƒáƒ ები: %s, %s, %s,\n" +"%s, %s, %s, %s\n" +"დრ%s.\n" + +#. TRANSLATORS: Each %s denotes an author name. +#. You can use line breaks, estimating that each author name occupies +#. ca. 16 screen columns and that a screen line has ca. 80 columns. +#: lib/version-etc.c:159 +#, c-format +msgid "" +"Written by %s, %s, %s,\n" +"%s, %s, %s, %s,\n" +"%s, and %s.\n" +msgstr "" +"áƒáƒ•áƒ¢áƒáƒ ები: %s, %s, %s,\n" +"%s, %s, %s, %s\n" +"%s დრ%s.\n" + +#. TRANSLATORS: Each %s denotes an author name. +#. You can use line breaks, estimating that each author name occupies +#. ca. 16 screen columns and that a screen line has ca. 80 columns. +#: lib/version-etc.c:170 +#, c-format +msgid "" +"Written by %s, %s, %s,\n" +"%s, %s, %s, %s,\n" +"%s, %s, and others.\n" +msgstr "" +"áƒáƒ•áƒ¢áƒáƒ ები: %s, %s, %s,\n" +"%s, %s, %s, %s\n" +"%s, %s დრსხვ.\n" + +#. TRANSLATORS: The placeholder indicates the bug-reporting address +#. for this package. Please add _another line_ saying +#. "Report translation bugs to <...>\n" with the address for translation +#. bugs (typically your translation team's web or email address). +#: lib/version-etc.c:249 +#, c-format +msgid "Report bugs to: %s\n" +msgstr "შეცდáƒáƒ›áƒ”ბის შესáƒáƒ®áƒ”ბ მიწერეთ: %s\n" + +#: lib/version-etc.c:251 +#, c-format +msgid "Report %s bugs to: %s\n" +msgstr "%s-ის შეცდáƒáƒ›áƒ”ბის შესáƒáƒ®áƒ”ბ მისáƒáƒ¬áƒ”რი ელფáƒáƒ¡áƒ¢áƒ: %s\n" + +#: lib/version-etc.c:255 lib/version-etc.c:257 +#, c-format +msgid "%s home page: <%s>\n" +msgstr "%s-ის სáƒáƒ¬áƒ§áƒ˜áƒ¡áƒ˜ გვერდიáƒ: <%s>\n" + +#: lib/version-etc.c:260 +#, c-format +msgid "General help using GNU software: <%s>\n" +msgstr "GNU-ის პრáƒáƒ’რáƒáƒ›áƒ£áƒšáƒ˜ უზრუნველყáƒáƒ¤áƒ˜áƒ¡ სáƒáƒ”რთრდáƒáƒ®áƒ›áƒáƒ ებáƒ: <%s >\n" + +#: lib/xalloc-die.c:34 +msgid "memory exhausted" +msgstr "მეხსიერებრგáƒáƒ“áƒáƒ•áƒ¡áƒ”ბულიáƒ" + +#: libparted/arch/beos.c:246 +msgid "Disk Image" +msgstr "დისკის გáƒáƒ›áƒáƒ¡áƒáƒ®áƒ£áƒšáƒ”ბáƒ" + +#: libparted/arch/beos.c:347 libparted/arch/gnu.c:349 +#: libparted/arch/linux.c:1732 +#, c-format +msgid "Error opening %s: %s" +msgstr "%s-ის გáƒáƒ®áƒ¡áƒœáƒ˜áƒ¡ შეცდáƒáƒ›áƒ: %s" + +#: libparted/arch/beos.c:358 libparted/arch/gnu.c:359 +#: libparted/arch/linux.c:1743 +#, c-format +msgid "Unable to open %s read-write (%s). %s has been opened read-only." +msgstr "" +"%s-ის ჩáƒáƒ¬áƒ”რისთვის გáƒáƒ®áƒ¡áƒœáƒ შეუძლებელირ(%s). %s მხáƒáƒšáƒáƒ“ კითხვისთვისáƒáƒ ღიáƒ." + +#: libparted/arch/beos.c:420 libparted/arch/linux.c:1908 +#, c-format +msgid "%s during seek for read on %s" +msgstr "%s წáƒáƒ¡áƒáƒ™áƒ˜áƒ—ხáƒáƒ•áƒáƒ“ ძებნისáƒáƒ¡ %s-ზე" + +#: libparted/arch/beos.c:453 libparted/arch/gnu.c:497 libparted/arch/gnu.c:596 +#: libparted/arch/gnu.c:724 libparted/arch/linux.c:1868 +#: libparted/arch/linux.c:1950 +#, c-format +msgid "%s during read on %s" +msgstr "%s კითხვისáƒáƒ¡ %s-ზე" + +#: libparted/arch/beos.c:489 libparted/arch/gnu.c:557 +#: libparted/arch/linux.c:2027 +#, c-format +msgid "Can't write to %s, because it is opened read-only." +msgstr "%s-ზე ჩáƒáƒ¬áƒ”რრშეუძლებელიáƒ. გáƒáƒ®áƒ¡áƒœáƒ˜áƒšáƒ˜áƒ მხáƒáƒšáƒáƒ“ კითხვის რეჟიმში." + +#: libparted/arch/beos.c:505 libparted/arch/linux.c:2052 +#, c-format +msgid "%s during seek for write on %s" +msgstr "%s ჩáƒáƒ¡áƒáƒ¬áƒ”რáƒáƒ“ ძებნისáƒáƒ¡ %s-ზე" + +#: libparted/arch/beos.c:542 libparted/arch/gnu.c:633 libparted/arch/gnu.c:678 +#: libparted/arch/gnu.c:755 libparted/arch/linux.c:2000 +#: libparted/arch/linux.c:2095 libparted/arch/linux.c:2168 +#, c-format +msgid "%s during write on %s" +msgstr "%s ჩáƒáƒ¬áƒ”რისáƒáƒ¡ %s-ზე" + +#: partprobe/partprobe.c:149 +#, c-format +msgid "Try `%s --help' for more information.\n" +msgstr "მეტი ინფáƒáƒ მáƒáƒªáƒ˜áƒ˜áƒ¡áƒ—ვის სცáƒáƒ“ეთ '%s --help'\n" + +#: partprobe/partprobe.c:153 +#, c-format +msgid "Usage: %s [OPTION] [DEVICE]...\n" +msgstr "გáƒáƒ›áƒáƒ§áƒ”ნებáƒ: %s [პáƒáƒ áƒáƒ›áƒ”ტრი].. [მáƒáƒ¬áƒ§áƒáƒ‘ილáƒáƒ‘áƒ]...\n" + +#: partprobe/partprobe.c:154 +msgid "" +"Inform the operating system about partition table changes.\n" +"\n" +" -d, --dry-run do not actually inform the operating system\n" +" -s, --summary print a summary of contents\n" +" -h, --help display this help and exit\n" +" -v, --version output version information and exit\n" +msgstr "" + +#: partprobe/partprobe.c:162 +msgid "" +"\n" +"When no DEVICE is given, probe all partitions.\n" +msgstr "" +"\n" +"რáƒáƒªáƒ მáƒáƒ¬áƒ§áƒáƒ‘ილáƒáƒ‘რმითითებული áƒáƒ áƒáƒ, ყველრდáƒáƒœáƒáƒ§áƒáƒ¤áƒ˜áƒ¡ სკáƒáƒœáƒ˜áƒ ებáƒ.\n" + +#: partprobe/partprobe.c:166 +#, c-format +msgid "" +"\n" +"Report bugs to <%s>.\n" +msgstr "" +"\n" +"შეცდáƒáƒ›áƒ”ბის შესáƒáƒ®áƒ”ბ მიწერეთ: %s\n" + +#: libparted/arch/gnu.c:110 +#, c-format +msgid "Unable to open %s." +msgstr "%s-ის გáƒáƒ®áƒ¡áƒœáƒ˜áƒ¡ შეცდáƒáƒ›áƒ." + +#: libparted/arch/gnu.c:130 +msgid "Unable to probe store." +msgstr "მáƒáƒ¦áƒáƒ–იის მáƒáƒ™áƒ•áƒšáƒ”ვის შეცდáƒáƒ›áƒ." + +#: libparted/arch/gnu.c:235 +#, c-format +msgid "" +"WARNING: the kernel failed to re-read the partition table on %s (%s). As a " +"result, it may not reflect all of your changes until after reboot." +msgstr "" +"გáƒáƒ¤áƒ თხილებáƒ: ბირთვის მáƒáƒ¬áƒ§áƒáƒ‘ილáƒáƒ‘áƒáƒ–ე (%s) დáƒáƒœáƒáƒ§áƒáƒ¤áƒ”ბის რუკის თáƒáƒ•áƒ˜áƒ“áƒáƒœ წáƒáƒ™áƒ˜áƒ—ხვის " +"შეცდáƒáƒ›áƒ (%s). შედეგáƒáƒ“ თქვენი ცვლილებები შეიძლებრგáƒáƒ“áƒáƒ¢áƒ•áƒ˜áƒ თვáƒáƒ›áƒ“ე áƒáƒ " +"გáƒáƒ›áƒáƒ©áƒœáƒ“ეს." + +#: libparted/arch/gnu.c:261 +#, c-format +msgid "" +"Warning: unable to open %s (%s). As a result, it may not reflect all of your " +"changes until after reboot." +msgstr "" +"გáƒáƒ¤áƒ თხილებáƒ: %s-ის გáƒáƒ®áƒ¡áƒœáƒ˜áƒ¡ შეცდáƒáƒ›áƒ (%s). შედეგáƒáƒ“ ცვლილებები შეიძლებრშემდეგ " +"გáƒáƒ“áƒáƒ¢áƒ•áƒ˜áƒ თვáƒáƒ›áƒ“ე áƒáƒ გáƒáƒ›áƒáƒ©áƒœáƒ“ეს." + +#: libparted/arch/gnu.c:274 +#, c-format +msgid "" +"Warning: failed to make translator go away on %s (%s). As a result, it may " +"not reflect all of your changes until after reboot." +msgstr "" +"გáƒáƒ¤áƒ თხილებáƒ: %s-ზე მთáƒáƒ გმნელის მáƒáƒªáƒ˜áƒšáƒ”ბრშეუძლებელირ(%s). შედეგáƒáƒ“ ცვლილებები " +"შეიძლებრშემდეგ გáƒáƒ“áƒáƒ¢áƒ•áƒ˜áƒ თვáƒáƒ›áƒ“ე áƒáƒ გáƒáƒ›áƒáƒ©áƒœáƒ“ეს." + +#: libparted/arch/gnu.c:820 +#, c-format +msgid "%s trying to sync %s to disk" +msgstr "%s ცდილáƒáƒ‘ს %s-ის დისკთáƒáƒœ სინქრáƒáƒœáƒ˜áƒ–áƒáƒªáƒ˜áƒáƒ¡" + +#: libparted/arch/linux.c:633 +#, c-format +msgid "Could not stat device %s - %s." +msgstr "მáƒáƒ¬áƒ§áƒáƒ‘ილáƒáƒ‘ის (%s) áƒáƒ¦áƒ›áƒáƒ©áƒ”ნის შეცდáƒáƒ›áƒ - %s." + +#: libparted/arch/linux.c:690 +#, c-format +msgid "Unable to determine the dm type of %s." +msgstr "%s-ის dm-ის ტიპის გáƒáƒ›áƒáƒªáƒœáƒáƒ‘რშეუძლებელიáƒ." + +#: libparted/arch/linux.c:774 libparted/arch/linux.c:907 +#, c-format +msgid "" +"Could not determine sector size for %s: %s.\n" +"Using the default sector size (%lld)." +msgstr "" +"%s-ის სექტáƒáƒ ის ზáƒáƒ›áƒ˜áƒ¡ გáƒáƒ›áƒáƒªáƒœáƒáƒ‘ის შეცდáƒáƒ›áƒ: %s.\n" +"გáƒáƒ›áƒáƒ˜áƒ§áƒ”ნებრსექტáƒáƒ ის ნáƒáƒ’ულისხმები ზáƒáƒ›áƒ (%lldl)." + +#: libparted/arch/linux.c:795 +#, c-format +msgid "" +"Could not determine physical sector size for %s.\n" +"Using the logical sector size (%lld)." +msgstr "" +"%s-ის სექტáƒáƒ ის ფიზიკური ზáƒáƒ›áƒ˜áƒ¡ გáƒáƒ›áƒáƒªáƒœáƒáƒ‘ის შეცდáƒáƒ›áƒ.\n" +"გáƒáƒ›áƒáƒ˜áƒ§áƒ”ნებრსექტáƒáƒ ის ფიზიკური ზáƒáƒ›áƒ (%lld)." + +#: libparted/arch/linux.c:855 +#, c-format +msgid "Unable to determine the size of %s (%s)." +msgstr "%s-ის ზáƒáƒ›áƒ˜áƒ¡ გáƒáƒœáƒ¡áƒáƒ–ღვრრშეუძლებელირ(%s)." + +#: libparted/arch/linux.c:958 libparted/arch/linux.c:973 +msgid "Generic IDE" +msgstr "ზáƒáƒ’áƒáƒ“ი IDE" + +#: libparted/arch/linux.c:963 +#, c-format +msgid "Could not get identity of device %s - %s" +msgstr "მáƒáƒ¬áƒ§áƒáƒ‘ილáƒáƒ‘ის (%s) იდენტიფიკáƒáƒªáƒ˜áƒ შეუძლებელირ- %s" + +#: libparted/arch/linux.c:994 +#, c-format +msgid "" +"Device %s has multiple (%d) logical sectors per physical sector.\n" +"GNU Parted supports this EXPERIMENTALLY for some special disk label/file " +"system combinations, e.g. GPT and ext2/3.\n" +"Please consult the web site for up-to-date information." +msgstr "" + +#: libparted/arch/linux.c:1172 +#, c-format +msgid "Error initialising SCSI device %s - %s" +msgstr "SCSI მáƒáƒ¬áƒ§áƒáƒ‘ილáƒáƒ‘ის (%s) ინიციáƒáƒšáƒ˜áƒ–áƒáƒªáƒ˜áƒ˜áƒ¡ შეცდáƒáƒ›áƒ - %s" + +#: libparted/arch/linux.c:1236 +#, c-format +msgid "" +"The device %s is so small that it cannot possibly store a file system or " +"partition table. Perhaps you selected the wrong device?" +msgstr "" +"მáƒáƒ¬áƒ§áƒáƒ‘ილáƒáƒ‘რ%s ისეთი პáƒáƒ¢áƒáƒ áƒáƒ, რáƒáƒ› ვერიტევს ფáƒáƒ˜áƒšáƒ£áƒ სისტემáƒáƒ¡ áƒáƒœ დáƒáƒœáƒáƒ§áƒáƒ¤áƒ”ბის " +"ცხრილს. გáƒáƒ“áƒáƒáƒ›áƒáƒ¬áƒ›áƒ”თ, მითითებული მáƒáƒ¬áƒ§áƒáƒ‘ილáƒáƒ‘რსწáƒáƒ იáƒ, თუ áƒáƒ áƒ?" + +#: libparted/arch/linux.c:1349 +#, c-format +msgid "" +"Unable to determine geometry of file/device %s. You should not use Parted " +"unless you REALLY know what you're doing!" +msgstr "" +"%s-ის გეáƒáƒ›áƒ”ტრიის დáƒáƒ“გენრშეუძლებáƒáƒšáƒ˜áƒ. áƒáƒ გáƒáƒ›áƒáƒ˜áƒ§áƒ”ნáƒáƒ— parted, თუ ზუსტáƒáƒ“ áƒáƒ " +"იცით, რáƒáƒ¡ áƒáƒ™áƒ”თებთ!" + +#: libparted/arch/linux.c:1409 +msgid "Generic SD/MMC Storage Card" +msgstr "ზáƒáƒ’áƒáƒ“ი SD/MMC სáƒáƒªáƒáƒ•áƒ˜áƒ¡ ბáƒáƒ áƒáƒ—ი" + +#: libparted/arch/linux.c:1423 +msgid "NVMe Device" +msgstr "NVMe მáƒáƒ¬áƒ§áƒáƒ‘ილáƒáƒ‘áƒ" + +#: libparted/arch/linux.c:1484 +msgid "DAC960 RAID controller" +msgstr "DAC960 RAID კáƒáƒœáƒ¢áƒ áƒáƒšáƒ”რი" + +#: libparted/arch/linux.c:1489 +msgid "Promise SX8 SATA Device" +msgstr "Promise SX8 SATA მáƒáƒ¬áƒ§áƒáƒ‘ილáƒáƒ‘áƒ" + +#: libparted/arch/linux.c:1494 +msgid "ATA over Ethernet Device" +msgstr "ATA over Ethernet მáƒáƒ¬áƒ§áƒáƒ‘ილáƒáƒ‘áƒ" + +#: libparted/arch/linux.c:1500 +msgid "IBM S390 DASD drive" +msgstr "IBM S390 DASD დისკი" + +#: libparted/arch/linux.c:1506 +msgid "IBM iSeries Virtual DASD" +msgstr "IBM iSeries Virtual DASD" + +#: libparted/arch/linux.c:1511 +msgid "Compaq Smart Array" +msgstr "Compaq Smart მáƒáƒ¡áƒ˜áƒ•áƒ˜" + +#: libparted/arch/linux.c:1521 +msgid "NVDIMM Device" +msgstr "NVDIMM მáƒáƒ¬áƒ§áƒáƒ‘ილáƒáƒ‘áƒ" + +#: libparted/arch/linux.c:1526 +msgid "ATARAID Controller" +msgstr "ATARAID კáƒáƒœáƒ¢áƒ áƒáƒšáƒ”რი" + +#: libparted/arch/linux.c:1531 +msgid "I2O Controller" +msgstr "I2O კáƒáƒœáƒ¢áƒ áƒáƒšáƒ”რი" + +#: libparted/arch/linux.c:1536 +msgid "User-Mode Linux UBD" +msgstr "მáƒáƒ®áƒ›áƒáƒ ებლის-რეჟიმის Linux UBD" + +#: libparted/arch/linux.c:1546 +msgid "Loopback device" +msgstr "Loopback მáƒáƒ¬áƒ§áƒáƒ‘ილáƒáƒ‘áƒ" + +#: libparted/arch/linux.c:1554 +#, c-format +msgid "Linux device-mapper (%s)" +msgstr "Linux device-mapper (%s)" + +#: libparted/arch/linux.c:1565 +msgid "Xen Virtual Block Device" +msgstr "Xen-ის ვირტუáƒáƒšáƒ£áƒ ი ბლáƒáƒ™áƒ£áƒ ი მáƒáƒ¬áƒ§áƒáƒ‘ილáƒáƒ‘áƒ" + +#: libparted/arch/linux.c:1570 +msgid "Unknown" +msgstr "უცნáƒáƒ‘იáƒ" + +#: libparted/arch/linux.c:1579 +msgid "Virtio Block Device" +msgstr "Virtio ბლáƒáƒ™áƒ£áƒ ი მáƒáƒ¬áƒ§áƒáƒ‘ილáƒáƒ‘áƒ" + +#: libparted/arch/linux.c:1584 +msgid "Linux Software RAID Array" +msgstr "Linux-ის პრáƒáƒ’რáƒáƒ›áƒ£áƒšáƒ˜ RAID მáƒáƒ¡áƒ˜áƒ•áƒ˜" + +#: libparted/arch/linux.c:1589 +msgid "RAM Drive" +msgstr "RAM დისკი" + +#: libparted/arch/linux.c:1596 +msgid "ped_device_new() Unsupported device type" +msgstr "ped_device_new() მáƒáƒ¬áƒ§áƒáƒ‘ილáƒáƒ‘ის მხáƒáƒ დáƒáƒ£áƒáƒ”რელი ტიპი" + +#: libparted/arch/linux.c:1690 libparted/arch/linux.c:1775 +#, c-format +msgid "Error fsyncing/closing %s: %s" +msgstr "Fsync-ის/დáƒáƒ®áƒ£áƒ ვის შეცდáƒáƒ›áƒ (%s): %s" + +#: libparted/arch/linux.c:1949 +#, c-format +msgid "%0.0send of file while reading %s" +msgstr "%0.0sფáƒáƒ˜áƒšáƒ˜ კითხვის დáƒáƒ¡áƒ ულებáƒáƒ›áƒ“ე დáƒáƒ›áƒ—áƒáƒ•áƒ დრ%s" + +#: libparted/arch/linux.c:2691 +#, c-format +msgid "" +"Error informing the kernel about modifications to partition %s -- %s. This " +"means Linux won't know about any changes you made to %s until you reboot -- " +"so you shouldn't mount it or use it in any way before rebooting." +msgstr "" + +#: libparted/arch/linux.c:2811 +#, c-format +msgid "Unable to determine the start and length of %s." +msgstr "%s-ის დáƒáƒ¡áƒáƒ¬áƒ§áƒ˜áƒ¡áƒ˜áƒ¡ დრსიგრძის გáƒáƒœáƒ¡áƒáƒ–ღვრის შეცდáƒáƒ›áƒ." + +#: libparted/arch/linux.c:3225 +#, c-format +msgid "" +"Partition(s) %s on %s have been written, but we have been unable to inform " +"the kernel of the change, probably because it/they are in use. As a result, " +"the old partition(s) will remain in use. You should reboot now before " +"making further changes." +msgstr "" +"დáƒáƒœáƒáƒ§áƒáƒ¤(ებ)-ი %s ჩáƒáƒ˜áƒ¬áƒ”რრ%s-ზე. მáƒáƒ’რáƒáƒ› ბირთვს áƒáƒ›áƒ˜áƒ¡ შესáƒáƒ®áƒ”ბ ვერშევáƒáƒ¢áƒ§áƒáƒ‘ინეთ. " +"áƒáƒ›áƒ˜áƒ¡ მიზეზს ძირითáƒáƒ“áƒáƒ“ წáƒáƒ მáƒáƒáƒ“გენს ის, რáƒáƒ› დისკი ჯერკიდევ გáƒáƒ›áƒáƒ˜áƒ§áƒ”ნებáƒ. მეტი " +"ცვლილების შეტáƒáƒœáƒáƒ›áƒ“ე გირჩევთ, გáƒáƒ“áƒáƒ¢áƒ•áƒ˜áƒ თáƒáƒ— კáƒáƒ›áƒžáƒ˜áƒ£áƒ¢áƒ”რი." + +#: libparted/cs/geom.c:163 +#, c-format +msgid "Can't have the end before the start! (start sector=%jd length=%jd)" +msgstr "დáƒáƒ¡áƒáƒ¡áƒ ულის დáƒáƒ¡áƒáƒ¬áƒ§áƒ˜áƒ¡áƒáƒ›áƒ“ე ქáƒáƒœáƒ შეუძლებელიáƒ! (დáƒáƒ¡áƒáƒ¬áƒ§áƒ˜áƒ¡áƒ˜=%jd სიგრძე=%jd)" + +#: libparted/cs/geom.c:379 +#, c-format +msgid "Attempt to write sectors %ld-%ld outside of partition on %s." +msgstr "სექტáƒáƒ ების (%ld-%ld) ჩáƒáƒ¬áƒ”რის მცდელáƒáƒ‘რდáƒáƒœáƒáƒ§áƒáƒ¤áƒ˜áƒ¡(%s) გáƒáƒ ეთ." + +#: libparted/cs/geom.c:419 +msgid "checking for bad blocks" +msgstr "ცუდი ბლáƒáƒ™áƒ”ბის áƒáƒ სებáƒáƒ‘áƒáƒ–ე შემáƒáƒ¬áƒ›áƒ”ბáƒ" + +#: libparted/debug.c:97 +#, c-format +msgid "Backtrace has %d calls on stack:\n" +msgstr "" + +#: libparted/debug.c:110 +#, c-format +msgid "Assertion (%s) at %s:%d in function %s() failed." +msgstr "" + +#: libparted/disk.c:194 +#, c-format +msgid "%s: unrecognised disk label" +msgstr "%s: დისკის უცნáƒáƒ‘ი áƒáƒ“ე" + +#: libparted/disk.c:487 +#, c-format +msgid "" +"This libparted doesn't have write support for %s. Perhaps it was compiled " +"read-only." +msgstr "" +"Libparted-ს %s-ზე ჩáƒáƒ¬áƒ”რის მხáƒáƒ დáƒáƒáƒ რáƒáƒ გáƒáƒáƒ©áƒœáƒ˜áƒ. შეიძლებრáƒáƒ’ებულირრáƒáƒ’áƒáƒ ც " +"მხáƒáƒšáƒáƒ“-წáƒáƒ¡áƒáƒ™áƒ˜áƒ—ხáƒáƒ“." + +#: libparted/disk.c:632 +#, c-format +msgid "Partition %d is %s, but the file system is %s." +msgstr "დáƒáƒœáƒáƒ§áƒáƒ¤áƒ˜ %d-ირ%s, მáƒáƒ’რáƒáƒ› ფáƒáƒ˜áƒšáƒ£áƒ ი სისტემრ%s-áƒ." + +#: libparted/disk.c:841 +msgid "cylinder_alignment" +msgstr "cylinder_alignment" + +#: libparted/disk.c:843 +msgid "pmbr_boot" +msgstr "pmbr_boot" + +#: libparted/disk.c:848 +#, c-format +msgid "Unknown disk flag, %d." +msgstr "დისკის უცნáƒáƒ‘ი áƒáƒšáƒáƒ›áƒ˜. %d." + +#: libparted/disk.c:1320 +#, c-format +msgid "%s disk labels do not support extended partitions." +msgstr "%s დისკის áƒáƒ“ეს áƒáƒ გáƒáƒáƒ©áƒœáƒ˜áƒ გáƒáƒ¤áƒáƒ თáƒáƒ”ბული დáƒáƒœáƒáƒ§áƒáƒ¤áƒ”ბის მხáƒáƒ დáƒáƒáƒ”რáƒ." + +#: libparted/disk.c:1990 +#, c-format +msgid "%s disk labels don't support logical or extended partitions." +msgstr "" +"%s დისკის áƒáƒ“ეს áƒáƒ გáƒáƒáƒ©áƒœáƒ˜áƒ გáƒáƒ¤áƒáƒ თáƒáƒ”ბული დრლáƒáƒ’იკური დáƒáƒœáƒáƒ§áƒáƒ¤áƒ”ბის მხáƒáƒ დáƒáƒáƒ”რáƒ." + +#: libparted/disk.c:2003 +msgid "Too many primary partitions." +msgstr "მეტისმეტáƒáƒ“ ბევრი ძირითáƒáƒ“ი დáƒáƒœáƒáƒ§áƒáƒ¤áƒ˜." + +#: libparted/disk.c:2012 +#, c-format +msgid "" +"Can't add a logical partition to %s, because there is no extended partition." +msgstr "" +"%s-ზე ლáƒáƒ’იკური დáƒáƒœáƒáƒ§áƒáƒ¤áƒ˜áƒ¡ დáƒáƒ›áƒáƒ¢áƒ”ბრგáƒáƒ¤áƒáƒ თáƒáƒ”ბული დáƒáƒœáƒáƒ§áƒáƒ¤áƒ˜áƒ¡ áƒáƒ სებáƒáƒ‘ის გáƒáƒ ეშე " +"შეუძლებელიáƒ." + +#: libparted/disk.c:2036 +#, c-format +msgid "Can't have more than one extended partition on %s." +msgstr "%s-ზე ერთზე მეტი გáƒáƒ¤áƒáƒ თáƒáƒ”ბული დáƒáƒœáƒáƒ§áƒáƒ¤áƒ˜áƒ¡ áƒáƒ სებáƒáƒ‘რშეუძლებელიáƒ." + +#: libparted/disk.c:2046 +msgid "Can't have logical partitions outside of the extended partition." +msgstr "გáƒáƒ¤áƒáƒ თáƒáƒ”ბული დáƒáƒœáƒáƒ§áƒáƒ¤áƒ˜áƒ¡ გáƒáƒ ეთ ლáƒáƒ’იკური დáƒáƒœáƒáƒ§áƒáƒ¤áƒ˜áƒ¡ ქáƒáƒœáƒ შეუძლებელიáƒ." + +#: libparted/disk.c:2071 +#, c-format +msgid "Can't have a logical partition outside of the extended partition on %s." +msgstr "%s-ზე გáƒáƒ¤áƒáƒ თáƒáƒ”ბული დáƒáƒœáƒáƒ§áƒáƒ¤áƒ˜áƒ¡ გáƒáƒ ეთ ლáƒáƒ’იკური დáƒáƒœáƒáƒ§áƒáƒ¤áƒ˜ ვერგექნებáƒáƒ—." + +#: libparted/disk.c:2081 +msgid "Can't have a primary partition inside an extended partition." +msgstr "ძირითáƒáƒ“ი დáƒáƒœáƒáƒ§áƒáƒ¤áƒ˜ გáƒáƒ¤áƒáƒ თáƒáƒ”ბული დáƒáƒœáƒáƒ§áƒáƒ¤áƒ˜áƒ¡ შიგნით ვერგექნებáƒáƒ—." + +#: libparted/disk.c:2090 +msgid "Can't have a partition outside the disk!" +msgstr "დáƒáƒœáƒáƒ§áƒáƒ¤áƒ˜ დისკის გáƒáƒ ეთ ვერიáƒáƒ სებებს!" + +#: libparted/disk.c:2141 libparted/disk.c:2319 +msgid "Can't have overlapping partitions." +msgstr "გáƒáƒ“áƒáƒ¤áƒáƒ ვáƒáƒ“ი დáƒáƒœáƒáƒ§áƒáƒ¤áƒ”ბის áƒáƒ სებáƒáƒ‘რშეუძლებელიáƒ." + +#: libparted/disk.c:2520 +msgid "metadata" +msgstr "მეტáƒáƒ›áƒáƒœáƒáƒªáƒ”მები" + +#: libparted/disk.c:2522 +msgid "free" +msgstr "თáƒáƒ•áƒ˜áƒ¡áƒ£áƒ¤áƒáƒšáƒ˜" + +#: libparted/disk.c:2524 parted/ui.c:1274 parted/ui.c:1302 +msgid "extended" +msgstr "გáƒáƒ¤áƒáƒ თáƒáƒ”ბული თვისებები" + +#: libparted/disk.c:2526 parted/ui.c:1278 parted/ui.c:1306 +msgid "logical" +msgstr "ლáƒáƒ’იკური" + +#: libparted/disk.c:2528 parted/ui.c:1270 parted/ui.c:1298 +msgid "primary" +msgstr "ძირითáƒáƒ“ი" + +#: libparted/disk.c:2544 +msgid "boot" +msgstr "ჩáƒáƒ¢áƒ•áƒ˜áƒ თვáƒáƒ“ი" + +#: libparted/disk.c:2546 +msgid "bios_grub" +msgstr "bios_grub" + +#: libparted/disk.c:2548 +msgid "root" +msgstr "root" + +#: libparted/disk.c:2550 +msgid "swap" +msgstr "სვáƒáƒžáƒ˜" + +#: libparted/disk.c:2552 +msgid "hidden" +msgstr "დáƒáƒ›áƒáƒšáƒ£áƒšáƒ˜" + +#: libparted/disk.c:2554 +msgid "raid" +msgstr "raid" + +#: libparted/disk.c:2556 +msgid "lvm" +msgstr "lvm" + +#: libparted/disk.c:2558 +msgid "lba" +msgstr "lba" + +#: libparted/disk.c:2560 +msgid "hp-service" +msgstr "hp-service" + +#: libparted/disk.c:2562 +msgid "palo" +msgstr "palo" + +#: libparted/disk.c:2564 +msgid "prep" +msgstr "prep" + +#: libparted/disk.c:2566 +msgid "msftres" +msgstr "msftres" + +#: libparted/disk.c:2568 +msgid "msftdata" +msgstr "msftdata" + +#: libparted/disk.c:2570 +msgid "atvrecv" +msgstr "atvrecv" + +#: libparted/disk.c:2572 +msgid "diag" +msgstr "diag" + +#: libparted/disk.c:2574 +msgid "legacy_boot" +msgstr "legacy_boot" + +#: libparted/disk.c:2576 +msgid "irst" +msgstr "irst" + +#: libparted/disk.c:2578 +msgid "esp" +msgstr "esp" + +#: libparted/disk.c:2580 +msgid "chromeos_kernel" +msgstr "chromeos_kernel" + +#: libparted/disk.c:2582 +msgid "bls_boot" +msgstr "bls_boot" + +#: libparted/disk.c:2584 +msgid "linux-home" +msgstr "linux-home" + +#: libparted/disk.c:2586 +msgid "no_automount" +msgstr "" + +#: libparted/disk.c:2592 +#, c-format +msgid "Unknown partition flag, %d." +msgstr "დáƒáƒœáƒáƒ§áƒáƒ¤áƒ˜áƒ¡ უცნáƒáƒ‘ი áƒáƒšáƒáƒ›áƒ˜, %d." + +#: libparted/exception.c:79 +msgid "Information" +msgstr "ინფáƒáƒ მáƒáƒªáƒ˜áƒ" + +#: libparted/exception.c:80 +msgid "Warning" +msgstr "შეტყáƒáƒ‘ინებáƒ" + +#: libparted/exception.c:81 +msgid "Error" +msgstr "შეცდáƒáƒ›áƒ" + +#: libparted/exception.c:82 +msgid "Fatal" +msgstr "ფáƒáƒ¢áƒáƒšáƒ£áƒ ი" + +#: libparted/exception.c:83 +msgid "Bug" +msgstr "შეცდáƒáƒ›áƒ" + +#: libparted/exception.c:84 +msgid "No Implementation" +msgstr "იმპლემენტáƒáƒªáƒ˜áƒ áƒáƒ áƒáƒ სებáƒáƒ‘ს" + +#: libparted/exception.c:88 +msgid "Fix" +msgstr "გáƒáƒ¡áƒ¬áƒáƒ ებáƒ" + +#: libparted/exception.c:89 +msgid "Yes" +msgstr "დიáƒáƒ®" + +#: libparted/exception.c:90 +msgid "No" +msgstr "áƒáƒ áƒ" + +#: libparted/exception.c:91 +msgid "OK" +msgstr "დიáƒáƒ®" + +#: libparted/exception.c:92 +msgid "Retry" +msgstr "თáƒáƒ•áƒ˜áƒ“áƒáƒœ ცდáƒ" + +#: libparted/exception.c:93 +msgid "Ignore" +msgstr "იგნáƒáƒ ი" + +#: libparted/exception.c:94 +msgid "Cancel" +msgstr "გáƒáƒ£áƒ¥áƒ›áƒ”ბáƒ" + +#: libparted/exception.c:134 +#, c-format +msgid "" +"A bug has been detected in GNU Parted. Refer to the web site of parted " +"http://www.gnu.org/software/parted/parted.html for more information of what " +"could be useful for bug submitting! Please email a bug report to %s " +"containing at least the version (%s) and the following message: " +msgstr "" + +#: libparted/labels/aix.c:92 +msgid "Support for reading AIX disk labels is is not implemented yet." +msgstr "AIX-ის დისკის áƒáƒ“ის წáƒáƒ™áƒ˜áƒ—ხვის იმპლემენტáƒáƒªáƒ˜áƒ ჯერáƒáƒ áƒáƒ სებáƒáƒ‘ს." + +#: libparted/labels/aix.c:103 +msgid "Support for writing AIX disk labels is is not implemented yet." +msgstr "AIX-ის დისკის áƒáƒ“ის ჩáƒáƒ¬áƒ”რის იმპლემენტáƒáƒªáƒ˜áƒ ჯერáƒáƒ áƒáƒ სებáƒáƒ‘ს." + +#: libparted/labels/aix.c:116 +msgid "" +"Support for adding partitions to AIX disk labels is not implemented yet." +msgstr "" +"AIX-ის დისკის áƒáƒ“ეზე დáƒáƒœáƒáƒ§áƒáƒ¤áƒ”ბის დáƒáƒ›áƒáƒ¢áƒ”ბის იმპლემენტáƒáƒªáƒ˜áƒ ჯერáƒáƒ áƒáƒ სებáƒáƒ‘ს." + +#: libparted/labels/aix.c:126 +msgid "" +"Support for duplicating partitions in AIX disk labels is not implemented yet." +msgstr "" +"AIX-ის დისკის áƒáƒ“ეზე დáƒáƒœáƒáƒ§áƒáƒ¤áƒ˜áƒ¡ áƒáƒ¡áƒšáƒ˜áƒ¡ შექმნის იმპლემენტáƒáƒªáƒ˜áƒ ჯერáƒáƒ áƒáƒ სებáƒáƒ‘ს." + +#: libparted/labels/aix.c:144 +msgid "" +"Support for setting system type of partitions in AIX disk labels is not " +"implemented yet." +msgstr "" +"AIX-ის დისკის áƒáƒ“ეზე დáƒáƒœáƒáƒ§áƒáƒ¤áƒ˜áƒ¡ სისტემის ტიპის დáƒáƒ§áƒ”ნების იმპლემენტáƒáƒªáƒ˜áƒ ჯერáƒáƒ " +"áƒáƒ სებáƒáƒ‘ს." + +#: libparted/labels/aix.c:154 +msgid "Support for setting flags in AIX disk labels is not implemented yet." +msgstr "" +"AIX-ის დისკის áƒáƒ“ეზე შექმნილ დáƒáƒœáƒáƒ§áƒáƒ¤áƒ–ე áƒáƒšáƒ›áƒ”ბის დáƒáƒ§áƒ”ნების იმპლემენტáƒáƒªáƒ˜áƒ ჯერáƒáƒ " +"áƒáƒ სებáƒáƒ‘ს." + +#: libparted/labels/atari.c:278 +#, c-format +msgid "" +"Can't use Atari partition tables on disks with a sector size not equal to %d " +"bytes." +msgstr "" +"Atari-ის დáƒáƒœáƒáƒ§áƒáƒ¤áƒ”ბის რუკის გáƒáƒ›áƒáƒ§áƒ”ნებრდისკებზე, რáƒáƒ›áƒšáƒ˜áƒ¡ სექტáƒáƒ ის ზáƒáƒ›áƒáƒª %d " +"ბáƒáƒ˜áƒ¢áƒ˜áƒ¡ ტáƒáƒšáƒ˜ áƒáƒ áƒáƒ, შეუძლებელიáƒ." + +#: libparted/labels/atari.c:290 +#, c-format +msgid "Can't use Atari partition tables on disks with more than %d sectors." +msgstr "" +"Atari-ის დáƒáƒœáƒáƒ§áƒáƒ¤áƒ”ბის რუკის გáƒáƒ›áƒáƒ§áƒ”ნებრდისკებზე რáƒáƒ›áƒšáƒ˜áƒ¡ სექტáƒáƒ ებიც %d-ზე " +"მეტიáƒ, შეუძლებელიáƒ." + +#: libparted/labels/atari.c:403 +msgid "" +"Too many Atari partitions detected. Maybe there is a loop in the XGM linked " +"list. Aborting." +msgstr "" +"ნáƒáƒžáƒáƒ•áƒœáƒ˜áƒ Atari-ის მეტისმეტáƒáƒ“ ბევრი დáƒáƒœáƒáƒ§áƒáƒ¤áƒ˜. შეიძლებრXGM-ის ბმულ სიáƒáƒ¨áƒ˜ " +"მáƒáƒ ყუჟიáƒ. პრáƒáƒ’რáƒáƒ›áƒ áƒáƒ›áƒ—áƒáƒ•áƒ ებს მუშáƒáƒáƒ‘áƒáƒ¡." + +#: libparted/labels/atari.c:601 +#, c-format +msgid "No data partition found in the ARS at sector %lli." +msgstr "სექტáƒáƒ ის(%lli) ARS-ში მáƒáƒœáƒáƒªáƒ”მების დáƒáƒœáƒáƒ§áƒáƒ¤áƒ˜ ნáƒáƒžáƒáƒ•áƒœáƒ˜ áƒáƒ áƒáƒ." + +#: libparted/labels/atari.c:622 +#, c-format +msgid "" +"The entry of the next logical ARS is not of type XGM in ARS at sector %lli." +msgstr "" + +#: libparted/labels/atari.c:653 +#, c-format +msgid "" +"There doesn't seem to be an Atari partition table on this disk (%s), or it " +"is corrupted." +msgstr "" + +#: libparted/labels/atari.c:883 +#, c-format +msgid "No room at sector %lli to store ARS of logical partition %d." +msgstr "სექტáƒáƒ ში %lli ლáƒáƒ’იკური დáƒáƒœáƒáƒ§áƒáƒ¤áƒ˜áƒ¡ (%d) ARS-ის შესáƒáƒœáƒáƒ®áƒ˜ áƒáƒ“გილი რდáƒáƒ ჩáƒ." + +#: libparted/labels/atari.c:890 +#, c-format +msgid "No room at sector %lli to store ARS." +msgstr "სექტáƒáƒ ში %lli ARS-ის შესáƒáƒœáƒáƒ®áƒ˜ áƒáƒ“გილი áƒáƒ დáƒáƒ ჩáƒ." + +#: libparted/labels/atari.c:967 +msgid "" +"The sector count that is stored in the partition table does not correspond " +"to the size of your device. Do you want to fix the partition table?" +msgstr "" + +#: libparted/labels/atari.c:1008 +#, c-format +msgid "No room at sector %lli to store BSL." +msgstr "სექტáƒáƒ ში %lli BSL-ის შესáƒáƒœáƒáƒ®áƒ˜ áƒáƒ“გილი áƒáƒ დáƒáƒ ჩáƒ." + +#: libparted/labels/atari.c:1116 +msgid "There were remaining partitions after filling the main AHDI table." +msgstr "" + +#: libparted/labels/atari.c:1135 +msgid "" +"The main AHDI table has been filled with all partitions but the ICD table is " +"not empty so more partitions of unknown size and position will be detected " +"by ICD compatible software. Do you want to invalidate the ICD table?" +msgstr "" + +#: libparted/labels/atari.c:1169 +msgid "ICD entries can't contain extended or logical partitions." +msgstr "" + +#: libparted/labels/atari.c:1191 +msgid "There were remaining partitions after filling the tables." +msgstr "ცხრილების შევსების შემდეგ დáƒáƒœáƒáƒ§áƒáƒ¤áƒ”ბი ჯერკიდევ დáƒáƒ ჩენილიáƒ." + +#: libparted/labels/atari.c:1231 +#, c-format +msgid "" +"You can't use an extended XGM partition in ICD mode (more than %d primary " +"partitions, if XGM is the first one it counts for two)." +msgstr "" + +#: libparted/labels/atari.c:1662 libparted/labels/bsd.c:563 +#: libparted/labels/dasd.c:893 libparted/labels/dos.c:2294 +#: libparted/labels/dvh.c:770 libparted/labels/gpt.c:1891 +#: libparted/labels/loop.c:244 libparted/labels/mac.c:1409 +#: libparted/labels/pc98.c:697 libparted/labels/rdb.c:1054 +#: libparted/labels/sun.c:781 +msgid "Unable to satisfy all constraints on the partition." +msgstr "დáƒáƒœáƒáƒ§áƒáƒ¤áƒ”ბის ყველრშეზღუდვის დáƒáƒ™áƒ›áƒáƒ§áƒáƒ¤áƒ˜áƒšáƒ”ბის შეცდáƒáƒ›áƒ." + +#: libparted/labels/atari.c:1762 +#, c-format +msgid "" +"You can't use more than %d primary partitions (ICD mode) if you use an " +"extended XGM partition. If XGM is the first partition it counts for two." +msgstr "" + +#: libparted/labels/atari.c:1828 libparted/labels/rdb.c:1082 +msgid "Unable to allocate a partition number." +msgstr "დáƒáƒœáƒáƒ§áƒáƒ¤áƒ˜áƒ¡ ნáƒáƒ›áƒ ის გáƒáƒ›áƒáƒ§áƒáƒ¤áƒ შეუძლებელიáƒ." + +#: libparted/labels/bsd.c:588 +msgid "Unable to allocate a bsd disklabel slot." +msgstr "BSD-ის დისკის áƒáƒ“ის გáƒáƒ›áƒáƒ§áƒáƒ¤áƒ შეუძლებელიáƒ." + +#: libparted/labels/dasd.c:634 +msgid "The partition table of DASD-LDL device cannot be changed.\n" +msgstr "" + +#: libparted/labels/dasd.c:919 +msgid "Unable to allocate a dasd disklabel slot" +msgstr "DASD დისკის áƒáƒ“ის გáƒáƒ›áƒáƒ§áƒáƒ¤áƒ შეუძლებელიáƒ" + +#: libparted/labels/dos.c:1159 +#, c-format +msgid "Invalid partition table on %s -- wrong signature %x." +msgstr "%s-ზე áƒáƒ áƒáƒ¡áƒ¬áƒáƒ ი დáƒáƒœáƒáƒ§áƒáƒ¤áƒ”ბის ცხრილირ-- áƒáƒ áƒáƒ¡áƒ¬áƒáƒ ი ხელმáƒáƒ¬áƒ”რრ(%x)." + +#: libparted/labels/dos.c:1187 +#, c-format +msgid "Invalid partition table - recursive partition on %s." +msgstr "დáƒáƒœáƒáƒ§áƒáƒ¤áƒ”ბის áƒáƒ áƒáƒ¡áƒ¬áƒáƒ ი ცხრილი - %s-ზე áƒáƒ სებáƒáƒ‘ს რეკურსიული დáƒáƒœáƒáƒ§áƒáƒ¤áƒ˜." + +#: libparted/labels/dos.c:2276 +msgid "Parted can't resize partitions managed by Windows Dynamic Disk." +msgstr "" +"Parted-ს áƒáƒ შეუძლირWindows Dynamic Disk-ით მáƒáƒ თული დáƒáƒœáƒáƒ§áƒáƒ¤áƒ”ბის ზáƒáƒ›áƒ˜áƒ¡ შეცვლáƒ." + +#: libparted/labels/dos.c:2532 +msgid "cannot create any more partitions" +msgstr "მეტი დáƒáƒœáƒáƒ§áƒáƒ¤áƒ˜áƒ¡ შექმნრშეუძლებელიáƒ" + +#: libparted/labels/dvh.c:183 +#, c-format +msgid "%s has no extended partition (volume header partition)." +msgstr "%s-ს გáƒáƒ¤áƒáƒ თáƒáƒ”ბული დáƒáƒœáƒáƒ§áƒáƒ¤áƒ”ბი áƒáƒ გáƒáƒáƒ©áƒœáƒ˜áƒ (ტáƒáƒ›áƒ˜áƒ¡ თáƒáƒ•áƒ¡áƒáƒ თის დáƒáƒœáƒáƒ§áƒáƒ¤áƒ˜)." + +#: libparted/labels/dvh.c:309 +msgid "Checksum is wrong, indicating the partition table is corrupt." +msgstr "" +"სáƒáƒ™áƒáƒœáƒ¢áƒ áƒáƒšáƒ რიცხვი áƒáƒ áƒáƒ¡áƒ¬áƒáƒ იáƒ, რáƒáƒª ნიშნáƒáƒ•áƒ¡, რáƒáƒ› დáƒáƒœáƒáƒ§áƒáƒ¤áƒ”ბის ცხრილი " +"დáƒáƒ–იáƒáƒœáƒ”ბულიáƒ." + +#: libparted/labels/dvh.c:614 +msgid "Only primary partitions can be root partitions." +msgstr "Root დáƒáƒœáƒáƒ§áƒáƒ¤áƒáƒ“ მხáƒáƒšáƒáƒ“ ძირითáƒáƒ“ი დáƒáƒœáƒáƒ§áƒáƒ¤áƒ˜ შეგიძლიáƒáƒ— მáƒáƒœáƒ˜áƒ¨áƒœáƒáƒ—." + +#: libparted/labels/dvh.c:628 +msgid "Only primary partitions can be swap partitions." +msgstr "სვáƒáƒžáƒ˜áƒ¡ დáƒáƒœáƒáƒ§áƒáƒ¤áƒáƒ“ მხáƒáƒšáƒáƒ“ ძირითáƒáƒ“ი დáƒáƒœáƒáƒ§áƒáƒ¤áƒ˜ შეგიძლიáƒáƒ— მáƒáƒœáƒ˜áƒ¨áƒœáƒáƒ—." + +#: libparted/labels/dvh.c:642 +msgid "Only logical partitions can be a boot file." +msgstr "ჩáƒáƒ›áƒ¢áƒ•áƒ˜áƒ თáƒáƒ•áƒ˜ ფáƒáƒ˜áƒšáƒ˜ მხáƒáƒšáƒáƒ“ ლáƒáƒ’იკური დáƒáƒœáƒáƒ§áƒáƒ¤áƒ˜ შეიძლებრიყáƒáƒ¡." + +#: libparted/labels/dvh.c:719 +#, c-format +msgid "" +"failed to set dvh partition name to %s:\n" +"Only logical partitions (boot files) have a name." +msgstr "" +"dvh დáƒáƒœáƒáƒ§áƒáƒ¤áƒ˜áƒ¡ სáƒáƒ®áƒ”ლის %s-ზე დáƒáƒ§áƒ”ნების შეცდáƒáƒ›áƒ:\n" +"სáƒáƒ®áƒ”ლები მხáƒáƒšáƒáƒ“ ლáƒáƒ’იკურდáƒáƒœáƒáƒ§áƒáƒ¤áƒ”ბს (ჩáƒáƒ›áƒ¢áƒ•áƒ˜áƒ თáƒáƒ• ფáƒáƒ˜áƒšáƒ”ბს) áƒáƒ¥áƒ•áƒ—." + +#: libparted/labels/dvh.c:812 +msgid "Too many primary partitions" +msgstr "მეტისმეტáƒáƒ“ ბევრი ძირითáƒáƒ“ი დáƒáƒœáƒáƒ§áƒáƒ¤áƒ˜" + +#: libparted/labels/fdasd.c:136 +msgid "open error" +msgstr "გáƒáƒ®áƒ¡áƒœáƒ˜áƒ¡ შეცდáƒáƒ›áƒ" + +#: libparted/labels/fdasd.c:139 +msgid "seek error" +msgstr "ძიების შეცდáƒáƒ›áƒ" + +#: libparted/labels/fdasd.c:142 +msgid "read error" +msgstr "წáƒáƒ™áƒ˜áƒ—ხვის შეცდáƒáƒ›áƒ" + +#: libparted/labels/fdasd.c:148 +msgid "ioctl() error" +msgstr "ioctl()-ის შეცდáƒáƒ›áƒ" + +#: libparted/labels/fdasd.c:152 +msgid "API version mismatch" +msgstr "API-ის ვერსირáƒáƒ ემთხვევáƒ" + +#: libparted/labels/fdasd.c:156 +msgid "Unsupported disk type" +msgstr "დისკის მხáƒáƒ დáƒáƒ£áƒáƒ”რელი ტიპი" + +#: libparted/labels/fdasd.c:160 +msgid "Unsupported disk format" +msgstr "დისკის მხáƒáƒ დáƒáƒ£áƒáƒ”რელი ფáƒáƒ მáƒáƒ¢áƒ˜" + +#: libparted/labels/fdasd.c:164 +msgid "Disk is in use" +msgstr "დისკი გáƒáƒ›áƒáƒ˜áƒ§áƒ”ნებáƒ" + +#: libparted/labels/fdasd.c:168 +msgid "Syntax error in config file" +msgstr "კáƒáƒœáƒ¤áƒ˜áƒ’ურáƒáƒªáƒ˜áƒ˜áƒ¡ ფáƒáƒ˜áƒšáƒ˜áƒ¡ სინტáƒáƒ¥áƒ¡áƒ˜áƒ¡ შეცდáƒáƒ›áƒ" + +#: libparted/labels/fdasd.c:172 +msgid "Volume label is corrupted" +msgstr "სáƒáƒªáƒáƒ•áƒ˜áƒ¡ áƒáƒ“ე დáƒáƒ–იáƒáƒœáƒ”ბულიáƒ" + +#: libparted/labels/fdasd.c:176 +msgid "A data set name is corrupted" +msgstr "მáƒáƒœáƒáƒªáƒ”მების ნáƒáƒ™áƒ ების სáƒáƒ®áƒ”ლი დáƒáƒ–იáƒáƒœáƒ”ბულიáƒ" + +#: libparted/labels/fdasd.c:180 +msgid "Memory allocation failed" +msgstr "მეხსიერების გáƒáƒ›áƒáƒ§áƒáƒ¤áƒ˜áƒ¡ შეცდáƒáƒ›áƒ" + +#: libparted/labels/fdasd.c:184 +msgid "Device verification failed" +msgstr "მáƒáƒ¬áƒ§áƒáƒ‘ილáƒáƒ‘ის შემáƒáƒ¬áƒ›áƒ”ბის შეცდáƒáƒ›áƒ" + +#: libparted/labels/fdasd.c:185 +msgid "The specified device is not a valid DASD device" +msgstr "მითითებული მáƒáƒ¬áƒ§áƒáƒ‘ილáƒáƒ‘რáƒáƒ წáƒáƒ მáƒáƒáƒ“გენს DASD სáƒáƒªáƒáƒ•áƒ¡" + +#: libparted/labels/fdasd.c:188 +msgid "VOLSER not found on device" +msgstr "მáƒáƒ¬áƒ§áƒáƒ‘ილáƒáƒ‘áƒáƒ–ე VOLSER ნáƒáƒžáƒáƒ•áƒœáƒ˜ áƒáƒ áƒáƒ" + +#: libparted/labels/fdasd.c:191 libparted/labels/vtoc.c:179 +msgid "Fatal error" +msgstr "ფáƒáƒ¢áƒáƒšáƒ£áƒ ი შეცდáƒáƒ›áƒ" + +#: libparted/labels/fdasd.c:243 +msgid "No room for volume label." +msgstr "სáƒáƒªáƒáƒ•áƒ˜áƒ¡ áƒáƒ“ისთვის áƒáƒ“გილი áƒáƒ áƒáƒ." + +#: libparted/labels/fdasd.c:251 +msgid "No room for partition info." +msgstr "დáƒáƒœáƒáƒ§áƒáƒ¤áƒ˜áƒ¡ ინფáƒáƒ მáƒáƒªáƒ˜áƒ˜áƒ¡áƒ—ვის áƒáƒ“გილი áƒáƒ áƒáƒ." + +#: libparted/labels/fdasd.c:828 +msgid "Invalid VTOC." +msgstr "áƒáƒ áƒáƒ¡áƒ¬áƒáƒ ი VTOC-ი." + +#: libparted/labels/fdasd.c:912 +msgid "Could not retrieve API version." +msgstr "API-ის ვერსიის მიღებრშეუძლებელიáƒ." + +#: libparted/labels/fdasd.c:915 +#, c-format +msgid "" +"The current API version '%d' doesn't match dasd driver API version '%d'!" +msgstr "" +"API-ის მიმდინáƒáƒ ე ვერსირ(%d) áƒáƒ ემთხვევრDASD-ის დრáƒáƒ˜áƒ•áƒ”რის API-ის ვერსიáƒáƒ¡ " +"(%d)!" + +#: libparted/labels/fdasd.c:1020 +msgid "Could not retrieve disk size." +msgstr "დისკის ზáƒáƒ›áƒ˜áƒ¡ მიღების შეცდáƒáƒ›áƒ." + +#: libparted/labels/fdasd.c:1029 +msgid "Could not retrieve disk geometry information." +msgstr "დისკის გეáƒáƒ›áƒ”ტრიის ინფáƒáƒ მáƒáƒªáƒ˜áƒ˜áƒ¡ მიღების შეცდáƒáƒ›áƒ." + +#: libparted/labels/fdasd.c:1035 +msgid "Could not retrieve blocksize information." +msgstr "ბლáƒáƒ™áƒ˜áƒ¡ ზáƒáƒ›áƒ˜áƒ¡ შესáƒáƒ®áƒ”ბ ინფáƒáƒ მáƒáƒªáƒ˜áƒ˜áƒ¡ მიღების შეცდáƒáƒ›áƒ." + +#: libparted/labels/fdasd.c:1045 +msgid "Disk geometry does not match a DASD device of type 3390." +msgstr "დისკის გეáƒáƒ›áƒ”ტრირáƒáƒ ემთხვევრDASD-ის 3390-ე ტიპს." + +#: libparted/labels/gpt.c:589 +msgid "device is too small for GPT" +msgstr "მáƒáƒ¬áƒ§áƒáƒ‘ილáƒáƒ‘რGPT-ისთვის მეტისმეტáƒáƒ“ პáƒáƒ¢áƒáƒ áƒáƒ" + +#: libparted/labels/gpt.c:791 +#, c-format +msgid "" +"The format of the GPT partition table is version %x, which is newer than " +"what Parted can recognise. Please report this!" +msgstr "" + +#: libparted/labels/gpt.c:827 +#, c-format +msgid "" +"Not all of the space available to %s appears to be used, you can fix the GPT " +"to use all of the space (an extra %llu blocks) or continue with the current " +"setting? " +msgstr "" + +#: libparted/labels/gpt.c:1026 +msgid "" +"The backup GPT table is not at the end of the disk, as it should be. Fix, " +"by moving the backup to the end (and removing the old backup)?" +msgstr "" + +#: libparted/labels/gpt.c:1044 +msgid "" +"Both the primary and backup GPT tables are corrupt. Try making a fresh " +"table, and using Parted's rescue feature to recover partitions." +msgstr "" + +#: libparted/labels/gpt.c:1055 +msgid "" +"The backup GPT table is corrupt, but the primary appears OK, so that will be " +"used." +msgstr "" + +#: libparted/labels/gpt.c:1067 +msgid "" +"The primary GPT table is corrupt, but the backup appears OK, so that will be " +"used." +msgstr "" + +#: libparted/labels/gpt.c:1091 +msgid "primary partition table array CRC mismatch" +msgstr "დáƒáƒœáƒáƒ§áƒáƒ¤áƒ”ბის ძირითáƒáƒ“ი ცხრილის CRC-ის მნიშვნელáƒáƒ‘რáƒáƒ ემთხვევáƒ" + +#: libparted/labels/gpt.c:1722 libparted/labels/gpt.c:1749 +msgid "failed to translate partition name" +msgstr "დáƒáƒœáƒáƒ§áƒáƒ¤áƒ˜áƒ¡ სáƒáƒ®áƒ”ლის თáƒáƒ გმნის შეცდáƒáƒ›áƒ" + +#: libparted/labels/mac.c:185 +#, c-format +msgid "Invalid signature %x for Mac disk labels." +msgstr "Mac-ის დისკის áƒáƒ“ეების áƒáƒ áƒáƒ¡áƒ¬áƒáƒ ი ხელმáƒáƒ¬áƒ”რáƒ: %x." + +#: libparted/labels/mac.c:232 +msgid "Partition map has no partition map entry!" +msgstr "დáƒáƒœáƒáƒ§áƒáƒ¤áƒ”ბის რუკáƒáƒ¡ სáƒáƒªáƒœáƒáƒ‘ი ნიშáƒáƒœáƒ˜ áƒáƒ გáƒáƒáƒ©áƒœáƒ˜áƒ!" + +#: libparted/labels/mac.c:280 +#, c-format +msgid "%s is too small for a Mac disk label!" +msgstr "%s Mac-ის დისკის áƒáƒ“ის დáƒáƒ¡áƒáƒ“ებáƒáƒ“ მეტისმეტáƒáƒ“ პáƒáƒ¢áƒáƒ áƒáƒ!" + +#: libparted/labels/mac.c:507 +#, c-format +msgid "Partition %d has an invalid signature %x." +msgstr "დáƒáƒœáƒáƒ§áƒáƒ¤áƒ˜áƒ¡ (%d) áƒáƒ áƒáƒ¡áƒ¬áƒáƒ ი ხელმáƒáƒ¬áƒ”რრ(%x)." + +#: libparted/labels/mac.c:524 +#, c-format +msgid "Partition %d has an invalid length of 0 bytes!" +msgstr "დáƒáƒœáƒáƒ§áƒáƒ¤áƒ¡ (%d) áƒáƒ áƒáƒ¡áƒ¬áƒáƒ ი, ნულáƒáƒ•áƒáƒœáƒ˜ ზáƒáƒ›áƒ გáƒáƒáƒ©áƒœáƒ˜áƒ!" + +#: libparted/labels/mac.c:555 +msgid "The data region doesn't start at the start of the partition." +msgstr "მáƒáƒœáƒáƒªáƒ”მების რეგიáƒáƒœáƒ˜ დáƒáƒœáƒáƒ§áƒáƒ¤áƒ˜áƒ¡ დáƒáƒ¡áƒáƒ¬áƒ§áƒ˜áƒ¡áƒ—áƒáƒœ áƒáƒ იწყებáƒ." + +#: libparted/labels/mac.c:572 +msgid "The partition's boot region doesn't occupy the entire partition." +msgstr "დáƒáƒœáƒáƒ§áƒáƒ¤áƒ˜áƒ¡ ჩáƒáƒ›áƒ¢áƒ•áƒ˜áƒ თáƒáƒ•áƒ˜ რეგიáƒáƒœáƒ˜ მთელ დáƒáƒœáƒáƒ§áƒáƒ¤áƒ¡ áƒáƒ მáƒáƒ˜áƒªáƒáƒ•áƒ¡." + +#: libparted/labels/mac.c:583 +msgid "The partition's data region doesn't occupy the entire partition." +msgstr "დáƒáƒœáƒáƒ§áƒáƒ¤áƒ˜áƒ¡ მáƒáƒœáƒáƒªáƒ”მების რეგიáƒáƒœáƒ˜ მთელ დáƒáƒœáƒáƒ§áƒáƒ¤áƒ¡ áƒáƒ მáƒáƒ˜áƒªáƒáƒ•áƒ¡." + +#: libparted/labels/mac.c:635 +#, c-format +msgid "" +"Weird block size on device descriptor: %d bytes is not divisible by 512." +msgstr "" +"მáƒáƒ¬áƒ§áƒáƒ‘ილáƒáƒ‘ის დესკრიპტáƒáƒ ში მáƒáƒ¬áƒ§áƒáƒ‘ილáƒáƒ‘ის ბლáƒáƒ™áƒ˜áƒ¡ áƒáƒ áƒáƒ¡áƒ¬áƒáƒ ი ზáƒáƒ›áƒ. %d 512-ზე áƒáƒ " +"იყáƒáƒ¤áƒ." + +#: libparted/labels/mac.c:648 +#, c-format +msgid "" +"The driver descriptor says the physical block size is %d bytes, but Linux " +"says it is %d bytes." +msgstr "" + +#: libparted/labels/mac.c:701 +msgid "No valid partition map found." +msgstr "დáƒáƒœáƒáƒ§áƒáƒ¤áƒ”ბის სწáƒáƒ ი რუკრნáƒáƒžáƒáƒ•áƒœáƒ˜ áƒáƒ áƒáƒ." + +#: libparted/labels/mac.c:775 +#, c-format +msgid "" +"Conflicting partition map entry sizes! Entry 1 says it is %d, but entry %d " +"says it is %d!" +msgstr "" + +#: libparted/labels/mac.c:806 +msgid "Weird! There are 2 partitions map entries!" +msgstr "უცნáƒáƒ£áƒ იáƒ! დისკზე დáƒáƒœáƒáƒ§áƒáƒ¤áƒ”ბის 2 რუკრáƒáƒ სებáƒáƒ‘ს!" + +#: libparted/labels/mac.c:1345 +msgid "" +"Changing the name of a root or swap partition will prevent Linux from " +"recognising it as such." +msgstr "" + +#: libparted/labels/mac.c:1444 +msgid "Can't add another partition -- the partition map is too small!" +msgstr "" +"მეტი დáƒáƒœáƒáƒ§áƒáƒ¤áƒ˜áƒ¡ დáƒáƒ›áƒáƒ¢áƒ”ბრშეუძლებელირ-- დáƒáƒœáƒáƒ§áƒáƒ¤áƒ”ბის რუკრძáƒáƒšáƒ˜áƒáƒœ პáƒáƒ¢áƒáƒ áƒáƒ!" + +#: libparted/labels/pc98.c:285 +#, c-format +msgid "Invalid partition table on %s." +msgstr "დáƒáƒœáƒáƒ§áƒáƒ¤áƒ”ბის áƒáƒ áƒáƒ¡áƒ¬áƒáƒ ი áƒáƒ“ე (%s)." + +#: libparted/labels/pc98.c:338 libparted/labels/pc98.c:416 +#, c-format +msgid "" +"Partition %d isn't aligned to cylinder boundaries. This is still " +"unsupported." +msgstr "" + +#: libparted/labels/pc98.c:729 +msgid "Can't add another partition." +msgstr "მეტი დáƒáƒœáƒáƒ§áƒáƒ¤áƒ˜áƒ¡ დáƒáƒ›áƒáƒ¢áƒ”ბრშეუძლებელიáƒ." + +#: libparted/labels/pt-tools.c:134 +#, c-format +msgid "" +"partition length of %jd sectors exceeds the %s-partition-table-imposed " +"maximum of %jd" +msgstr "" + +#: libparted/labels/pt-tools.c:147 +#, c-format +msgid "" +"starting sector number, %jd exceeds the %s-partition-table-imposed maximum " +"of %jd" +msgstr "" + +#: libparted/labels/rdb.c:170 +#, c-format +msgid "%s : Bad checksum on block %llu of type %s." +msgstr "%s : ბლáƒáƒ™áƒ–ე (%llu) áƒáƒ áƒáƒ¡áƒ¬áƒáƒ ი სáƒáƒ™áƒáƒœáƒ¢áƒ áƒáƒšáƒ ჯáƒáƒ›áƒ˜ (ტიპი: %s)." + +#: libparted/labels/rdb.c:486 +#, c-format +msgid "%s : Didn't find rdb block, should never happen." +msgstr "%s : rdb ბლáƒáƒ™áƒ˜áƒ¡ მáƒáƒ«áƒ”ბნრშეუძლებელიáƒ. ეს áƒáƒ áƒáƒ¡áƒ“რáƒáƒ¡ უნდრხდებáƒáƒ“ეს." + +#: libparted/labels/rdb.c:575 +#, c-format +msgid "%s : Loop detected at block %d." +msgstr "%s : ბლáƒáƒ™ %d-სთáƒáƒœ ნáƒáƒžáƒáƒ•áƒœáƒ˜áƒ მáƒáƒ ყუჟი." + +#: libparted/labels/rdb.c:594 +#, c-format +msgid "%s : The %s list seems bad at block %s." +msgstr "" + +#: libparted/labels/rdb.c:693 +#, c-format +msgid "%s : Failed to list bad blocks." +msgstr "%s : ცუდი ბლáƒáƒ™áƒ”ბის სიის პრáƒáƒ‘ლემáƒ." + +#: libparted/labels/rdb.c:701 +#, c-format +msgid "%s : Failed to list partition blocks." +msgstr "%s : დáƒáƒœáƒáƒ§áƒáƒ¤áƒ˜áƒ¡ ბლáƒáƒ™áƒ”ბის სიის პრáƒáƒ‘ლემáƒ." + +#: libparted/labels/rdb.c:709 +#, c-format +msgid "%s : Failed to list file system blocks." +msgstr "%s : ფáƒáƒ˜áƒšáƒ£áƒ ი სისტემის ბლáƒáƒ™áƒ”ბის სიის პრáƒáƒ‘ლემáƒ." + +#: libparted/labels/rdb.c:717 +#, c-format +msgid "%s : Failed to list boot blocks." +msgstr "%s : ჩáƒáƒ›áƒ¢áƒ•áƒ˜áƒ თáƒáƒ•áƒ˜ ბლáƒáƒ™áƒ”ბის სიის პრáƒáƒ‘ლემáƒ." + +#: libparted/labels/rdb.c:744 +#, c-format +msgid "Failed to write partition block at %d." +msgstr "%d-ში დáƒáƒœáƒáƒ§áƒáƒ¤áƒ˜áƒ¡ ბლáƒáƒ™áƒ˜áƒ¡ ჩáƒáƒ¬áƒ”რრშეუძლებელიáƒ." + +#: libparted/labels/sun.c:162 +msgid "Corrupted Sun disk label detected." +msgstr "ნáƒáƒžáƒáƒ•áƒœáƒ˜áƒ Sun-ის დისკის დáƒáƒ–იáƒáƒœáƒ”ბული áƒáƒ“ე." + +#: libparted/labels/sun.c:277 +#, c-format +msgid "" +"The disk CHS geometry (%d,%d,%d) reported by the operating system does not " +"match the geometry stored on the disk label (%d,%d,%d)." +msgstr "" +"დისკის CHS გეáƒáƒ›áƒ”ტრიáƒ(%d,%d,%d), რáƒáƒ›áƒ”ლიც მáƒáƒ’ვეწáƒáƒ“რáƒáƒžáƒ”რáƒáƒªáƒ˜áƒ£áƒšáƒ˜ სისტემიდáƒáƒœ, áƒáƒ " +"ემთხვევრდისკის áƒáƒ“ეში დáƒáƒ›áƒáƒ®áƒ¡áƒáƒ•áƒ ებულ გეáƒáƒ›áƒ”ტრიáƒáƒ¡ (%d,%d,%d)." + +#: libparted/labels/sun.c:299 +#, c-format +msgid "The disk label describes a disk bigger than %s." +msgstr "დისკის áƒáƒ“ე áƒáƒ¦áƒ¬áƒ”რს დისკს დიდს, ვიდრე %s." + +#: libparted/labels/sun.c:474 +#, c-format +msgid "The disk has %d cylinders, which is greater than the maximum of 65536." +msgstr "დისკს áƒáƒ¥áƒ•áƒ¡ %d ცილინდრი, რáƒáƒª მáƒáƒ¥áƒ¡áƒ˜áƒ›áƒáƒšáƒ£áƒ მნიშვნელáƒáƒ‘áƒáƒ–ე (65536) მეტიáƒ." + +#: libparted/labels/sun.c:813 +msgid "" +"The Whole Disk partition is the only available one left. Generally, it is " +"not a good idea to overwrite this partition with a real one. Solaris may " +"not be able to boot without it, and SILO (the sparc boot loader) appreciates " +"it as well." +msgstr "" + +#: libparted/labels/sun.c:828 +msgid "Sun disk label is full." +msgstr "Sun-ის დისკის áƒáƒ“ე სáƒáƒ•áƒ¡áƒ”áƒ." + +#: libparted/labels/vtoc.c:164 +msgid "opening of device failed" +msgstr "მáƒáƒ¬áƒ§áƒáƒ‘ილáƒáƒ‘ის გáƒáƒ®áƒ¡áƒœáƒ˜áƒ¡ შეცდáƒáƒ›áƒ" + +#: libparted/labels/vtoc.c:168 +msgid "seeking on device failed" +msgstr "მáƒáƒ¬áƒ§áƒáƒ‘ილáƒáƒ‘áƒáƒ¨áƒ˜ დáƒáƒ«áƒ”ბნის შეცდáƒáƒ›áƒ" + +#: libparted/labels/vtoc.c:172 +msgid "writing to device failed" +msgstr "მáƒáƒ¬áƒ§áƒáƒ‘ილáƒáƒ‘áƒáƒ–ე ჩáƒáƒ¬áƒ”რის შეცდáƒáƒ›áƒ" + +#: libparted/labels/vtoc.c:176 +msgid "reading from device failed" +msgstr "მáƒáƒ¬áƒ§áƒáƒ‘ილáƒáƒ‘იდáƒáƒœ წáƒáƒ™áƒ˜áƒ—ხვის შეცდáƒáƒ›áƒ" + +#: libparted/labels/vtoc.c:371 libparted/labels/vtoc.c:378 +#: libparted/labels/vtoc.c:399 libparted/labels/vtoc.c:406 +msgid "Could not read volume label." +msgstr "სáƒáƒªáƒáƒ•áƒ˜áƒ¡ áƒáƒ“ის წáƒáƒ™áƒ˜áƒ—ხვრშეუძლებელიáƒ." + +#: libparted/labels/vtoc.c:426 libparted/labels/vtoc.c:431 +msgid "Could not write volume label." +msgstr "სáƒáƒªáƒáƒ•áƒ˜áƒ¡ áƒáƒ“ის დáƒáƒ§áƒ”ნებრშეუძლებელიáƒ." + +#: libparted/labels/vtoc.c:537 +msgid "Could not read VTOC labels." +msgstr "VTOC-ის áƒáƒ“ის წáƒáƒ™áƒ˜áƒ—ხვრშეუძლებელიáƒ." + +#: libparted/labels/vtoc.c:543 +msgid "Could not read VTOC FMT1 DSCB." +msgstr "VTOC FMT1 DSCB-ის წáƒáƒ™áƒ˜áƒ—ხვის შეცდáƒáƒ›áƒ." + +#: libparted/labels/vtoc.c:550 +msgid "Could not read VTOC FMT4 DSCB." +msgstr "VTOC FMT4 DSCB-ის წáƒáƒ™áƒ˜áƒ—ხვის შეცდáƒáƒ›áƒ." + +#: libparted/labels/vtoc.c:557 +msgid "Could not read VTOC FMT5 DSCB." +msgstr "VTOC FMT5 DSCB-ის წáƒáƒ™áƒ˜áƒ—ხვის შეცდáƒáƒ›áƒ." + +#: libparted/labels/vtoc.c:564 +msgid "Could not read VTOC FMT7 DSCB." +msgstr "VTOC FMT7 DSCB-ის წáƒáƒ™áƒ˜áƒ—ხვის შეცდáƒáƒ›áƒ." + +#: libparted/labels/vtoc.c:585 +msgid "Could not write VTOC labels." +msgstr "VTOC-ის áƒáƒ“ის ჩáƒáƒ¬áƒ”რის შეცდáƒáƒ›áƒ." + +#: libparted/labels/vtoc.c:591 +msgid "Could not write VTOC FMT1 DSCB." +msgstr "VTOC FMT1 DSCB-ზე ჩáƒáƒ¬áƒ”რის შეცდáƒáƒ›áƒ." + +#: libparted/labels/vtoc.c:598 +msgid "Could not write VTOC FMT4 DSCB." +msgstr "VTOC FMT4 DSCB-ზე ჩáƒáƒ¬áƒ”რის შეცდáƒáƒ›áƒ." + +#: libparted/labels/vtoc.c:605 +msgid "Could not write VTOC FMT5 DSCB." +msgstr "VTOC FMT5 DSCB-ზე ჩáƒáƒ¬áƒ”რის შეცდáƒáƒ›áƒ." + +#: libparted/labels/vtoc.c:612 +msgid "Could not write VTOC FMT7 DSCB." +msgstr "VTOC FMT7 DSCB-ზე ჩáƒáƒ¬áƒ”რის შეცდáƒáƒ›áƒ." + +#: libparted/labels/vtoc.c:622 +msgid "Could not write VTOC FMT9 DSCB." +msgstr "VTOC FMT9 DSCB-ზე ჩáƒáƒ¬áƒ”რის შეცდáƒáƒ›áƒ." + +#: libparted/libparted.c:247 +msgid "Out of memory." +msgstr "áƒáƒ áƒáƒ¡áƒáƒ™áƒ›áƒáƒ ისი მეხსიერებáƒ." + +#: libparted/unit.c:140 +msgid "Cannot get unit size for special unit 'COMPACT'." +msgstr "" +"სპეციáƒáƒšáƒ£áƒ ი ერთეულისთვის \"კáƒáƒ›áƒžáƒáƒ¥áƒ¢áƒ£áƒ ი\" ერთეულის ზáƒáƒ›áƒ˜áƒ¡ გáƒáƒœáƒ¡áƒáƒ–ღვრის შეცდáƒáƒ›áƒ." + +#: libparted/unit.c:386 +#, c-format +msgid "\"%s\" has invalid syntax for locations." +msgstr "%s-ს თქვენი ლáƒáƒ™áƒáƒªáƒ˜áƒ˜áƒ¡áƒ—ვის áƒáƒ áƒáƒ¡áƒ¬áƒáƒ ი სინტáƒáƒ¥áƒ¡áƒ˜ გáƒáƒáƒ©áƒœáƒ˜áƒ." + +#: libparted/unit.c:394 +#, c-format +msgid "The maximum head value is %d." +msgstr "თáƒáƒ•áƒáƒ™áƒ”ბის რáƒáƒáƒ“ენáƒáƒ‘ის მáƒáƒ¥áƒ¡áƒ˜áƒ›áƒáƒšáƒ£áƒ მნიშვნელáƒáƒ‘áƒáƒ %d." + +#: libparted/unit.c:401 +#, c-format +msgid "The maximum sector value is %d." +msgstr "სექტáƒáƒ ების რáƒáƒáƒ“ენáƒáƒ‘ის მáƒáƒ¥áƒ¡áƒ˜áƒ›áƒáƒšáƒ£áƒ ი მნიშვნელáƒáƒ‘áƒáƒ %d." + +#: libparted/unit.c:413 libparted/unit.c:565 +#, c-format +msgid "The location %s is outside of the device %s." +msgstr "მდებáƒáƒ ეáƒáƒ‘რ%s მáƒáƒ¬áƒ§áƒáƒ‘ილáƒáƒ‘ის (%s) გáƒáƒ ეთáƒáƒ." + +#: libparted/unit.c:527 +msgid "Invalid number." +msgstr "áƒáƒ áƒáƒ¡áƒ¬áƒáƒ ი რიცხვი." + +#: libparted/unit.c:533 +msgid "Use a smaller unit instead of a value < 1" +msgstr "< 1 მნიშვნელáƒáƒ‘ის მáƒáƒ’იერგáƒáƒ›áƒáƒ˜áƒ§áƒ”ნეთ უფრრმცირე ერთეული" + +#: libparted/fs/amiga/affs.c:64 libparted/fs/amiga/apfs.c:58 +#: libparted/fs/amiga/asfs.c:72 +#, c-format +msgid "%s : Failed to allocate partition block\n" +msgstr "%s : დáƒáƒœáƒáƒ§áƒáƒ¤áƒ˜áƒ¡ ბლáƒáƒ™áƒ˜áƒ¡ გáƒáƒ›áƒáƒ§áƒáƒ¤áƒ˜áƒ¡ შეცდáƒáƒ›áƒ\n" + +#: libparted/fs/amiga/affs.c:78 libparted/fs/amiga/apfs.c:71 +#: libparted/fs/amiga/asfs.c:84 +#, c-format +msgid "%s : Failed to allocate block\n" +msgstr "%s : ბლáƒáƒ™áƒ˜áƒ¡ გáƒáƒ›áƒáƒ§áƒáƒ¤áƒ˜áƒ¡ შეცდáƒáƒ›áƒ\n" + +#: libparted/fs/amiga/affs.c:83 libparted/fs/amiga/apfs.c:76 +#, c-format +msgid "%s : Couldn't read boot block %llu\n" +msgstr "%s : ჩáƒáƒ¢áƒ•áƒ˜áƒ თვáƒáƒ“ი ბლáƒáƒ™áƒ˜áƒ¡ წáƒáƒ™áƒ˜áƒ—ხვრშეუძლებელირ(%llu)\n" + +#: libparted/fs/amiga/affs.c:97 libparted/fs/amiga/apfs.c:87 +#: libparted/fs/amiga/asfs.c:90 libparted/fs/amiga/asfs.c:104 +#, c-format +msgid "%s : Couldn't read root block %llu\n" +msgstr "%s : root- ბლáƒáƒ™áƒ˜áƒ¡ წáƒáƒ™áƒ˜áƒ—ხვის შეუძლებელირ(%llu)\n" + +#: libparted/fs/amiga/amiga.c:72 +#, c-format +msgid "%s : Failed to allocate id list element\n" +msgstr "%s : სიის ელემენტისთვის id-ის გáƒáƒ›áƒáƒ§áƒáƒ¤áƒ˜áƒ¡ შეცდáƒáƒ›áƒ\n" + +#: libparted/fs/amiga/amiga.c:189 +#, c-format +msgid "%s : Couldn't read block %llu\n" +msgstr "%s : ბლáƒáƒ™áƒ˜áƒ¡ წáƒáƒ™áƒ˜áƒ—ხვის შეცდáƒáƒ›áƒ %llu\n" + +#: libparted/fs/amiga/amiga.c:202 +#, c-format +msgid "%s : Bad checksum on block %llu of type %s\n" +msgstr "%s : %llu ბლáƒáƒ™áƒ˜áƒ¡ %s ტიპის áƒáƒ áƒáƒ¡áƒ¬áƒáƒ ი სáƒáƒ™áƒáƒœáƒ¢áƒ áƒáƒšáƒ ჯáƒáƒ›áƒ˜\n" + +#: libparted/fs/amiga/amiga.c:212 +#, c-format +msgid "%s : Couldn't write block %d\n" +msgstr "%s : ბლáƒáƒ™áƒ˜áƒ¡ (%d) ჩáƒáƒ¬áƒ”რრშეუძლებელიáƒ\n" + +#: libparted/fs/amiga/amiga.c:279 +#, c-format +msgid "%s : Failed to allocate disk_specific rdb block\n" +msgstr "%s : disk_specific rdb-ის ტიპის ბლáƒáƒ™áƒ˜áƒ¡ გáƒáƒ›áƒáƒ§áƒáƒ¤áƒ˜áƒ¡ შეცდáƒáƒ›áƒ\n" + +#: libparted/fs/amiga/amiga.c:290 +#, c-format +msgid "%s : Didn't find rdb block, should never happen\n" +msgstr "%s : rdb ბლáƒáƒ™áƒ˜áƒ¡ მáƒáƒ«áƒ”ბნრშეუძლებელიáƒ. ეს áƒáƒ áƒáƒ¡áƒ“რáƒáƒ¡ უნდრხდებáƒáƒ“ეს\n" + +#: libparted/fs/amiga/amiga.c:319 +#, c-format +msgid "%s : Failed to read partition block %llu\n" +msgstr "%s : დáƒáƒœáƒáƒ§áƒáƒ¤áƒ˜áƒ¡ ბლáƒáƒ™áƒ˜áƒ¡ (%llu) წáƒáƒ™áƒ˜áƒ—ხვის შეცდáƒáƒ›áƒ\n" + +#: libparted/fs/fat/fat.c:149 +msgid "" +"GNU Parted was miscompiled: the FAT boot sector should be 512 bytes. FAT " +"support will be disabled." +msgstr "" +"GNU Parted-ის áƒáƒ’ებისáƒáƒ¡ დáƒáƒ¨áƒ•áƒ”ბულირშეცდáƒáƒ›áƒ. FAT-ის ჩáƒáƒ›áƒ¢áƒ•áƒ˜áƒ თáƒáƒ•áƒ˜ სექტáƒáƒ ის ზáƒáƒ›áƒ " +"512 ბáƒáƒ˜áƒ¢áƒ˜ უნდრიყáƒáƒ¡. FAT-ის მხáƒáƒ დáƒáƒáƒ”რრგáƒáƒ—იშულიáƒ." + +#: libparted/fs/fat/bootsector.c:50 libparted/fs/r/fat/bootsector.c:49 +msgid "File system has an invalid signature for a FAT file system." +msgstr "ფáƒáƒ˜áƒšáƒ£áƒ სისტემáƒáƒ¡ FAT-ისთვის áƒáƒ áƒáƒ¡áƒ¬áƒáƒ ი ხელწერრგáƒáƒáƒ©áƒœáƒ˜áƒ." + +#: libparted/fs/fat/bootsector.c:58 libparted/fs/r/fat/bootsector.c:57 +msgid "File system has an invalid sector size for a FAT file system." +msgstr "ფáƒáƒ˜áƒšáƒ£áƒ სისტემáƒáƒ¡ FAT-ისთვის სექტáƒáƒ ის áƒáƒ áƒáƒ¡áƒ¬áƒáƒ ი ზáƒáƒ›áƒ გáƒáƒáƒ©áƒœáƒ˜áƒ." + +#: libparted/fs/fat/bootsector.c:65 libparted/fs/r/fat/bootsector.c:64 +msgid "File system has an invalid cluster size for a FAT file system." +msgstr "ფáƒáƒ˜áƒšáƒ£áƒ სისტემáƒáƒ¡ FAT-ისთვის კლáƒáƒ¡áƒ¢áƒ”რის áƒáƒ áƒáƒ¡áƒ¬áƒáƒ ი ზáƒáƒ›áƒ გáƒáƒáƒ©áƒœáƒ˜áƒ." + +#: libparted/fs/fat/bootsector.c:72 libparted/fs/r/fat/bootsector.c:71 +msgid "" +"File system has an invalid number of reserved sectors for a FAT file system." +msgstr "" +"ფáƒáƒ˜áƒšáƒ£áƒ სისტემáƒáƒ¡ FAT-ისთვის დáƒáƒ ეზერვებულირსექტáƒáƒ ების áƒáƒ áƒáƒ¡áƒ¬áƒáƒ ი რáƒáƒáƒ“ენáƒáƒ‘რ" +"გáƒáƒáƒ©áƒœáƒ˜áƒ." + +#: libparted/fs/fat/bootsector.c:79 libparted/fs/r/fat/bootsector.c:78 +msgid "File system has an invalid number of FATs." +msgstr "ფáƒáƒ˜áƒšáƒ£áƒ სისტემáƒáƒ¡ áƒáƒ áƒáƒ¡áƒ¬áƒáƒ ი რáƒáƒáƒ“ენáƒáƒ‘ის FAT-ები áƒáƒ¥áƒ•áƒ¡." + +#: libparted/fs/fat/bootsector.c:162 +#, c-format +msgid "" +"The file system's CHS geometry is (%d, %d, %d), which is invalid. The " +"partition table's CHS geometry is (%d, %d, %d)." +msgstr "" + +#: libparted/fs/fat/bootsector.c:197 libparted/fs/r/fat/bootsector.c:194 +msgid "FAT boot sector says logical sector size is 0. This is weird. " +msgstr "" +"FAT-ის ჩáƒáƒ›áƒ¢áƒ•áƒ˜áƒ თáƒáƒ•áƒ˜ სექტáƒáƒ ი იძáƒáƒ®áƒ˜áƒ¡, რáƒáƒ› ლáƒáƒ’იკური სექტáƒáƒ ის ზáƒáƒ›áƒ 0-ის ტáƒáƒšáƒ˜áƒ. " +"ეს უცნáƒáƒ£áƒ იáƒ. " + +#: libparted/fs/fat/bootsector.c:203 libparted/fs/r/fat/bootsector.c:200 +msgid "FAT boot sector says there are no FAT tables. This is weird. " +msgstr "" +"FAT-ის ჩáƒáƒ›áƒ¢áƒ•áƒ˜áƒ თáƒáƒ•áƒ˜ სექტáƒáƒ ი იძáƒáƒ®áƒ˜áƒ¡, რáƒáƒ› FAT ცხრილები áƒáƒ áƒáƒ სებáƒáƒ‘ს. ეს " +"უცნáƒáƒ£áƒ იáƒ. " + +#: libparted/fs/fat/bootsector.c:209 libparted/fs/r/fat/bootsector.c:206 +msgid "FAT boot sector says clusters are 0 sectors. This is weird. " +msgstr "" +"FAT-ის ჩáƒáƒ›áƒ¢áƒ•áƒ˜áƒ თáƒáƒ•áƒ˜ სექტáƒáƒ ი იძáƒáƒ®áƒ˜áƒ¡, რáƒáƒ› კლáƒáƒ¡áƒ¢áƒ”რში 0 სექტáƒáƒ იáƒ. ეს უცნáƒáƒ£áƒ იáƒ. " + +#: libparted/fs/fat/bootsector.c:219 libparted/fs/r/fat/bootsector.c:216 +msgid "File system is FAT12, which is unsupported." +msgstr "ფáƒáƒ˜áƒšáƒ£áƒ ი სისტემრFAT12-იáƒ, რáƒáƒ›áƒšáƒ˜áƒ¡ მხáƒáƒ დáƒáƒáƒ”რáƒáƒª áƒáƒ áƒáƒ სებáƒáƒ‘ს." + +#: libparted/fs/linux_swap/linux_swap.c:231 +#, c-format +msgid "Unrecognised old style linux swap signature '%10s'." +msgstr "ლინუქსის სვáƒáƒžáƒ˜áƒ¡ ძველი ხელმáƒáƒ¬áƒ”რის უცნáƒáƒ‘ი სტილი '%10s'." + +#: libparted/fs/linux_swap/linux_swap.c:269 +#, c-format +msgid "Unrecognised new style linux swap signature '%10s'." +msgstr "ლინუქსის სვáƒáƒžáƒ˜áƒ¡ áƒáƒ®áƒáƒšáƒ˜ ხელმáƒáƒ¬áƒ”რის უცნáƒáƒ‘ი სტილი '%10s'." + +#: libparted/fs/linux_swap/linux_swap.c:309 +#, c-format +msgid "Unrecognised swsusp linux swap signature '%9s'." +msgstr "ლინუქსის სვáƒáƒžáƒ˜áƒ¡ swsusp-ის უცნáƒáƒ‘ი ხელმáƒáƒ¬áƒ”რრ'%9s'." + +#: libparted/fs/hfs/probe.c:51 libparted/fs/r/hfs/probe.c:51 +#, c-format +msgid "" +"Parted can't use HFS file systems on disks with a sector size not equal to " +"%d bytes." +msgstr "" + +#: libparted/fs/r/fat/bootsector.c:145 +#, c-format +msgid "" +"The file system's CHS geometry is (%d, %d, %d), which is invalid. The " +"partition table's CHS geometry is (%d, %d, %d). If you select Ignore, the " +"file system's CHS geometry will be left unchanged. If you select Fix, the " +"file system's CHS geometry will be set to match the partition table's CHS " +"geometry." +msgstr "" + +#: libparted/fs/r/fat/bootsector.c:398 +#, c-format +msgid "" +"The information sector has the wrong signature (%x). Select cancel for now, " +"and send in a bug report. If you're desperate, it's probably safe to ignore." +msgstr "" + +#: libparted/fs/r/fat/calc.c:134 +#, c-format +msgid "" +"You need %s of free disk space to shrink this partition to this size. " +"Currently, only %s is free." +msgstr "" + +#: libparted/fs/r/fat/context.c:56 +#, c-format +msgid "" +"Cluster start delta = %d, which is not a multiple of the cluster size %d." +msgstr "" + +#: libparted/fs/r/fat/count.c:84 +#, c-format +msgid "Bad directory entry for %s: first cluster is the end of file marker." +msgstr "" + +#: libparted/fs/r/fat/count.c:97 +#, c-format +msgid "" +"Bad FAT: unterminated chain for %s. You should run dosfsck or scandisk." +msgstr "" + +#: libparted/fs/r/fat/count.c:106 +#, c-format +msgid "" +"Bad FAT: cluster %d outside file system in chain for %s. You should run " +"dosfsck or scandisk." +msgstr "" + +#: libparted/fs/r/fat/count.c:116 +#, c-format +msgid "" +"Bad FAT: cluster %d is cross-linked for %s. You should run dosfsck or " +"scandisk." +msgstr "" + +#: libparted/fs/r/fat/count.c:135 +#, c-format +msgid "%s is %dk, but it has %d clusters (%dk)." +msgstr "%s %dკ-áƒ, მáƒáƒ’რáƒáƒ› გáƒáƒáƒ©áƒœáƒ˜áƒ %d კლáƒáƒ¡áƒ¢áƒ”რი (%dკ)." + +#: libparted/fs/r/fat/fat.c:244 +#, c-format +msgid "Partition too big/small for a %s file system." +msgstr "დáƒáƒœáƒáƒ§áƒáƒ¤áƒ˜ %s ფáƒáƒ˜áƒšáƒ£áƒ ი სისტემისáƒáƒ—ვის ძáƒáƒšáƒ˜áƒáƒœ დიდი áƒáƒœ პáƒáƒ¢áƒáƒ áƒáƒ." + +#: libparted/fs/r/fat/fat.c:410 +msgid "" +"The FATs don't match. If you don't know what this means, then select " +"cancel, run scandisk on the file system, and then come back." +msgstr "" + +#: libparted/fs/r/fat/fat.c:450 +msgid "There are no possible configurations for this FAT type." +msgstr "FAT-ის áƒáƒ› ტიპის კáƒáƒœáƒ¤áƒ˜áƒ’ურáƒáƒªáƒ˜áƒ ხელმიუწვდáƒáƒ›áƒ”ლიáƒ." + +#: libparted/fs/r/fat/fat.c:462 +#, c-format +msgid "" +"File system doesn't have expected sizes for Windows to like it. Cluster " +"size is %dk (%dk expected); number of clusters is %d (%d expected); size of " +"FATs is %d sectors (%d expected)." +msgstr "" + +#: libparted/fs/r/fat/fat.c:485 +#, c-format +msgid "" +"File system is reporting the free space as %d clusters, not %d clusters." +msgstr "" +"ფáƒáƒ˜áƒšáƒ£áƒ ი სისტემრპáƒáƒ¡áƒ£áƒ®áƒáƒ‘ს თáƒáƒ•áƒ˜áƒ¡áƒ£áƒ¤áƒáƒš სივრცეს, რáƒáƒ’áƒáƒ ც %d კლáƒáƒ¡áƒ¢áƒ”რს, áƒáƒ რ%d " +"კლáƒáƒ¡áƒ¢áƒ”რს." + +#: libparted/fs/r/fat/resize.c:159 +msgid "" +"There's not enough room in the root directory for all of the files. Either " +"cancel, or ignore to lose the files." +msgstr "" + +#: libparted/fs/r/fat/resize.c:303 +msgid "Error writing to the root directory." +msgstr "Root სáƒáƒ¥áƒáƒ¦áƒáƒšáƒ“ეში ჩáƒáƒ¬áƒ”რის შეცდáƒáƒ›áƒ." + +#: libparted/fs/r/fat/resize.c:479 +msgid "If you leave your file system as FAT16, then you will have no problems." +msgstr "თუ დáƒáƒ¢áƒáƒ•áƒ”ბთ ფáƒáƒ˜áƒšáƒ£áƒ სისტემáƒáƒ¡, რáƒáƒ’áƒáƒ ც FAT16-ს, პრáƒáƒ‘ლემები áƒáƒ გექნებáƒáƒ—." + +#: libparted/fs/r/fat/resize.c:482 +msgid "" +"If you convert to FAT16, and MS Windows is installed on this partition, then " +"you must re-install the MS Windows boot loader. If you want to do this, you " +"should consult the Parted manual (or your distribution's manual)." +msgstr "" + +#: libparted/fs/r/fat/resize.c:490 +msgid "" +"If you leave your file system as FAT32, then you will not introduce any new " +"problems." +msgstr "" +"თუ დáƒáƒ¢áƒáƒ•áƒ”ბთ ფáƒáƒ˜áƒšáƒ£áƒ სისტემáƒáƒ¡, რáƒáƒ’áƒáƒ ც FAT32-ს, áƒáƒ®áƒáƒš პრáƒáƒ‘ლემებს áƒáƒ დáƒáƒ˜áƒ›áƒáƒ¢áƒ”ბთ." + +#: libparted/fs/r/fat/resize.c:494 +msgid "" +"If you convert to FAT32, and MS Windows is installed on this partition, then " +"you must re-install the MS Windows boot loader. If you want to do this, you " +"should consult the Parted manual (or your distribution's manual). Also, " +"converting to FAT32 will make the file system unreadable by MS DOS, MS " +"Windows 95a, and MS Windows NT." +msgstr "" + +#: libparted/fs/r/fat/resize.c:508 +#, c-format +msgid "%s %s %s" +msgstr "%s %s %s" + +#: libparted/fs/r/fat/resize.c:509 +msgid "Would you like to use FAT32?" +msgstr "გნებáƒáƒ•áƒ— გáƒáƒ›áƒáƒ˜áƒ§áƒ”ნáƒáƒ— FAT32?" + +#: libparted/fs/r/fat/resize.c:540 libparted/fs/r/fat/resize.c:556 +#, c-format +msgid "%s %s" +msgstr "%s %s" + +#: libparted/fs/r/fat/resize.c:541 +msgid "" +"The file system can only be resized to this size by converting to FAT16." +msgstr "" +"ფáƒáƒ˜áƒšáƒ£áƒ ი სისტემის მითითებულ ზáƒáƒ›áƒáƒ–ე დáƒáƒ§áƒ”ნებრმხáƒáƒšáƒáƒ“ მისი FAT16-ში გáƒáƒ დáƒáƒ¥áƒ›áƒœáƒ˜áƒ¡ " +"შემდეგáƒáƒ შესáƒáƒ«áƒšáƒ”ბელი." + +#: libparted/fs/r/fat/resize.c:557 +msgid "" +"The file system can only be resized to this size by converting to FAT32." +msgstr "" +"ფáƒáƒ˜áƒšáƒ£áƒ ი სისტემის მითითებულ ზáƒáƒ›áƒáƒ–ე დáƒáƒ§áƒ”ნებრმხáƒáƒšáƒáƒ“ მისი FAT32-ში გáƒáƒ დáƒáƒ¥áƒ›áƒœáƒ˜áƒ¡ " +"შემდეგáƒáƒ შესáƒáƒ«áƒšáƒ”ბელი." + +#: libparted/fs/r/fat/resize.c:570 +msgid "" +"GNU Parted cannot resize this partition to this size. We're working on it!" +msgstr "" +"GNU Parted-ს áƒáƒ› ზáƒáƒ›áƒ˜áƒ¡ დáƒáƒœáƒáƒ§áƒáƒ¤áƒ”ბის ზáƒáƒ›áƒ˜áƒ¡ შეცვლრáƒáƒ შეუძლიáƒ. ჩვენ ვმუშáƒáƒáƒ‘თ " +"áƒáƒ›áƒáƒ–ე!" + +#: libparted/fs/r/fat/table.c:137 +#, c-format +msgid "" +"FAT %d media %x doesn't match the boot sector's media %x. You should " +"probably run scandisk." +msgstr "" + +#: libparted/fs/r/fat/table.c:269 +#, c-format +msgid "fat_table_set: cluster %ld outside file system" +msgstr "fat_table_set: კლáƒáƒ¡áƒ¢áƒ”რი (%ld) ფáƒáƒ˜áƒšáƒ£áƒ ი სისტემის გáƒáƒ ეთáƒáƒ" + +#: libparted/fs/r/fat/table.c:301 +#, c-format +msgid "fat_table_get: cluster %ld outside file system" +msgstr "fat_table_get: კლáƒáƒ¡áƒ¢áƒ”რი (%ld) ფáƒáƒ˜áƒšáƒ£áƒ ი სისტემის გáƒáƒ ეთáƒáƒ" + +#: libparted/fs/r/fat/table.c:343 +msgid "fat_table_alloc_cluster: no free clusters" +msgstr "fat_table_alloc_cluster: თáƒáƒ•áƒ˜áƒ¡áƒ£áƒ¤áƒáƒšáƒ˜ კლáƒáƒ¡áƒ¢áƒ”რების გáƒáƒ ეშე" + +#: libparted/fs/r/filesys.c:152 +msgid "Could not detect file system." +msgstr "ფáƒáƒ˜áƒšáƒ£áƒ ი სისტემის გáƒáƒ›áƒáƒªáƒœáƒáƒ‘ის შეცდáƒáƒ›áƒ." + +#: libparted/fs/r/filesys.c:159 libparted/fs/r/filesys.c:285 +#, c-format +msgid "resizing %s file systems is not supported" +msgstr "áƒáƒ› ფáƒáƒ˜áƒšáƒ£áƒ ი სისტემის (%s) ზáƒáƒ›áƒ˜áƒ¡ შეცვლრმხáƒáƒ დáƒáƒ£áƒáƒ”რელიáƒ" + +#: libparted/fs/r/filesys.c:171 +msgid "The file system is bigger than its volume!" +msgstr "ფáƒáƒ˜áƒšáƒ£áƒ ი სისტემრტáƒáƒ›áƒ–ე დიდიáƒ!" + +#: libparted/fs/r/hfs/advfs.c:123 libparted/fs/r/hfs/advfs_plus.c:122 +#: libparted/fs/r/hfs/reloc.c:417 libparted/fs/r/hfs/reloc.c:513 +#: libparted/fs/r/hfs/reloc_plus.c:540 libparted/fs/r/hfs/reloc_plus.c:660 +#: libparted/fs/r/hfs/reloc_plus.c:774 +msgid "The file system contains errors." +msgstr "ფáƒáƒ˜áƒšáƒ£áƒ ი სისტემრშეცდáƒáƒ›áƒ”ბს შეიცáƒáƒ•áƒ¡." + +#: libparted/fs/r/hfs/advfs_plus.c:287 +msgid "Bad blocks could not be read." +msgstr "ცუდი ბლáƒáƒ™áƒ”ბის წáƒáƒ™áƒ˜áƒ—ხვრშეუძლებელიáƒ." + +#: libparted/fs/r/hfs/cache.c:137 +#, c-format +msgid "" +"Trying to register an extent starting at block 0x%X, but another one already " +"exists at this position. You should check the file system!" +msgstr "" + +#: libparted/fs/r/hfs/cache.c:214 +#, c-format +msgid "" +"Trying to move an extent from block 0x%X to block 0x%X, but another one " +"already exists at this position. This should not happen!" +msgstr "" + +#: libparted/fs/r/hfs/file.c:143 +#, c-format +msgid "Could not update the extent cache for HFS file with CNID %X." +msgstr "" + +#: libparted/fs/r/hfs/file.c:180 +#, c-format +msgid "Trying to read HFS file with CNID %X behind EOF." +msgstr "" + +#: libparted/fs/r/hfs/file.c:190 libparted/fs/r/hfs/file.c:220 +#, c-format +msgid "Could not find sector %lli of HFS file with CNID %X." +msgstr "" + +#: libparted/fs/r/hfs/file.c:210 +#, c-format +msgid "Trying to write HFS file with CNID %X behind EOF." +msgstr "" + +#: libparted/fs/r/hfs/file_plus.c:157 +#, c-format +msgid "Could not update the extent cache for HFS+ file with CNID %X." +msgstr "" + +#: libparted/fs/r/hfs/file_plus.c:202 +#, c-format +msgid "Trying to read HFS+ file with CNID %X behind EOF." +msgstr "" + +#: libparted/fs/r/hfs/file_plus.c:213 libparted/fs/r/hfs/file_plus.c:256 +#, c-format +msgid "Could not find sector %lli of HFS+ file with CNID %X." +msgstr "" + +#: libparted/fs/r/hfs/file_plus.c:245 +#, c-format +msgid "Trying to write HFS+ file with CNID %X behind EOF." +msgstr "" + +#: libparted/fs/r/hfs/hfs.c:212 +msgid "Sorry, HFS cannot be resized that way yet." +msgstr "HFS-ის ზáƒáƒ›áƒ˜áƒ¡ áƒáƒ¡áƒ” შეცვლრჯერშეუძლებელიáƒ." + +#: libparted/fs/r/hfs/hfs.c:230 libparted/fs/r/hfs/hfs.c:573 +msgid "shrinking" +msgstr "დáƒáƒžáƒáƒ¢áƒáƒ áƒáƒ•áƒ”ბáƒ" + +#: libparted/fs/r/hfs/hfs.c:242 libparted/fs/r/hfs/hfs.c:585 +msgid "Data relocation has failed." +msgstr "მáƒáƒœáƒáƒªáƒ”მების გáƒáƒ“áƒáƒáƒ“გილების შეცდáƒáƒ›áƒ." + +#: libparted/fs/r/hfs/hfs.c:261 +msgid "Data relocation left some data in the end of the volume." +msgstr "მáƒáƒœáƒáƒªáƒ”მების გáƒáƒ“áƒáƒáƒ“გილებáƒáƒ› ტáƒáƒ›áƒ˜áƒ¡ ბáƒáƒšáƒáƒ¨áƒ˜ მáƒáƒœáƒáƒªáƒ”მები მáƒáƒ˜áƒœáƒª დáƒáƒ¢áƒáƒ•áƒ." + +#: libparted/fs/r/hfs/hfs.c:300 +msgid "writing HFS Master Directory Block" +msgstr "hfs-ის მთáƒáƒ•áƒáƒ ი სáƒáƒ¥áƒáƒ¦áƒáƒšáƒ“ის ბლáƒáƒ™áƒ˜áƒ¡ ჩáƒáƒ¬áƒ”რáƒ" + +#: libparted/fs/r/hfs/hfs.c:412 +msgid "No valid HFS[+X] signature has been found while opening." +msgstr "" + +#: libparted/fs/r/hfs/hfs.c:422 +#, c-format +msgid "Version %d of HFS+ isn't supported." +msgstr "HFS+ის ვერსირმხáƒáƒ დáƒáƒ£áƒáƒ”რელიáƒ: %d." + +#: libparted/fs/r/hfs/hfs.c:433 +#, c-format +msgid "Version %d of HFSX isn't supported." +msgstr "HFSX-ის ვერსირმხáƒáƒ დáƒáƒ£áƒáƒ”რელიáƒ: %d." + +#: libparted/fs/r/hfs/hfs.c:616 +msgid "Data relocation left some data at the end of the volume." +msgstr "" + +#: libparted/fs/r/hfs/hfs.c:664 +msgid "Error while writing the allocation file." +msgstr "გáƒáƒ›áƒáƒ§áƒáƒ¤áƒ˜áƒ¡ ფáƒáƒ˜áƒšáƒ˜áƒ¡ ჩáƒáƒ¬áƒ”რის შეცდáƒáƒ›áƒ." + +#: libparted/fs/r/hfs/hfs.c:679 +msgid "Error while writing the compatibility part of the allocation file." +msgstr "" + +#: libparted/fs/r/hfs/hfs.c:694 +msgid "writing HFS+ Volume Header" +msgstr "hfs+-ის ტáƒáƒ›áƒ˜áƒ¡ თáƒáƒ•áƒ¡áƒáƒ თის ჩáƒáƒ¬áƒ”რáƒ" + +#: libparted/fs/r/hfs/hfs.c:794 +msgid "An error occurred while looking for the mandatory bad blocks file." +msgstr "" + +#: libparted/fs/r/hfs/hfs.c:847 +msgid "" +"It seems there is an error in the HFS wrapper: the bad blocks file doesn't " +"contain the embedded HFS+ volume." +msgstr "" + +#: libparted/fs/r/hfs/hfs.c:883 +msgid "Sorry, HFS+ cannot be resized that way yet." +msgstr "" + +#: libparted/fs/r/hfs/hfs.c:918 +msgid "shrinking embedded HFS+ volume" +msgstr "" + +#: libparted/fs/r/hfs/hfs.c:935 +msgid "Resizing the HFS+ volume has failed." +msgstr "" + +#: libparted/fs/r/hfs/hfs.c:942 +msgid "shrinking HFS wrapper" +msgstr "" + +#: libparted/fs/r/hfs/hfs.c:951 +msgid "Updating the HFS wrapper has failed." +msgstr "" + +#: libparted/fs/r/hfs/hfs.c:1053 libparted/fs/r/hfs/hfs.c:1138 +#, c-format +msgid "" +"This is not a real %s check. This is going to extract special low level " +"files for debugging purposes." +msgstr "" + +#: libparted/fs/r/hfs/journal.c:155 +msgid "Bad block list header checksum." +msgstr "ბლáƒáƒ™áƒ”ბის სიის გáƒáƒ¤áƒ£áƒáƒ”ბული სáƒáƒ™áƒáƒœáƒ¢áƒ áƒáƒšáƒ ჯáƒáƒ›áƒ˜." + +#: libparted/fs/r/hfs/journal.c:168 +#, c-format +msgid "" +"Invalid size of a transaction block while replaying the journal (%i bytes)." +msgstr "" + +#: libparted/fs/r/hfs/journal.c:260 +msgid "" +"Journal stored outside of the volume are not supported. Try to deactivate " +"the journal and run Parted again." +msgstr "" + +#: libparted/fs/r/hfs/journal.c:271 +msgid "Journal offset or size is not multiple of the sector size." +msgstr "" + +#: libparted/fs/r/hfs/journal.c:292 +msgid "Incorrect magic values in the journal header." +msgstr "ჟურნáƒáƒšáƒ˜áƒ¡ თáƒáƒ•áƒ¡áƒáƒ თის áƒáƒ áƒáƒ¡áƒ¬áƒáƒ ი მáƒáƒ’იური მნიშვნელáƒáƒ‘ები." + +#: libparted/fs/r/hfs/journal.c:302 +msgid "Journal size mismatch between journal info block and journal header." +msgstr "მის სáƒáƒ˜áƒœáƒ¤áƒáƒ მáƒáƒªáƒ˜áƒ ბლáƒáƒ™áƒ¡áƒ დრთáƒáƒ•áƒ¡áƒáƒ თში ჟურნáƒáƒšáƒ˜áƒ¡ ზáƒáƒ›áƒ სხვáƒáƒ“áƒáƒ¡áƒ®áƒ•áƒáƒ." + +#: libparted/fs/r/hfs/journal.c:314 +msgid "Some header fields are not multiple of the sector size." +msgstr "თáƒáƒ•áƒ¡áƒáƒ თის ზáƒáƒ’იერთი ველი სექტáƒáƒ ის ზáƒáƒ›áƒ˜áƒ¡ ნáƒáƒ›áƒ áƒáƒ•áƒšáƒ˜ áƒáƒ áƒáƒ." + +#: libparted/fs/r/hfs/journal.c:323 +msgid "" +"The sector size stored in the journal is not 512 bytes. Parted only " +"supports 512 bytes length sectors." +msgstr "" + +#: libparted/fs/r/hfs/journal.c:335 +msgid "Bad journal checksum." +msgstr "ჟურნáƒáƒšáƒ˜áƒ¡ áƒáƒ áƒáƒ¡áƒ¬áƒáƒ ი სáƒáƒ™áƒáƒœáƒ¢áƒ áƒáƒšáƒ რიცხვი." + +#: libparted/fs/r/hfs/journal.c:355 +msgid "" +"The journal is not empty. Parted must replay the transactions before " +"opening the file system. This will modify the file system." +msgstr "" + +#: libparted/fs/r/hfs/journal.c:383 +msgid "" +"The volume header or the master directory block has changed while replaying " +"the journal. You should restart Parted." +msgstr "" + +#: libparted/fs/r/hfs/reloc.c:151 libparted/fs/r/hfs/reloc_plus.c:155 +msgid "An extent has not been relocated." +msgstr "" + +#: libparted/fs/r/hfs/reloc.c:251 libparted/fs/r/hfs/reloc_plus.c:307 +msgid "" +"A reference to an extent comes from a place it should not. You should check " +"the file system!" +msgstr "" + +#: libparted/fs/r/hfs/reloc.c:382 +msgid "This HFS volume has no catalog file. This is very unusual!" +msgstr "" + +#: libparted/fs/r/hfs/reloc.c:479 +msgid "This HFS volume has no extents overflow file. This is quite unusual!" +msgstr "" + +#: libparted/fs/r/hfs/reloc.c:522 libparted/fs/r/hfs/reloc_plus.c:670 +msgid "" +"The extents overflow file should not contain its own extents! You should " +"check the file system." +msgstr "" + +#: libparted/fs/r/hfs/reloc.c:579 libparted/fs/r/hfs/reloc_plus.c:849 +msgid "Could not cache the file system in memory." +msgstr "ფáƒáƒ˜áƒšáƒ£áƒ ი სისტემის მეხსიერებáƒáƒ¨áƒ˜ დáƒáƒ¥áƒ”შვრშეუძლებელიáƒ." + +#: libparted/fs/r/hfs/reloc.c:640 libparted/fs/r/hfs/reloc_plus.c:910 +msgid "Bad blocks list could not be loaded." +msgstr "ცუდი ბლáƒáƒ™áƒ”ბის სიის ჩáƒáƒ¢áƒ•áƒ˜áƒ თვის შეცდáƒáƒ›áƒ." + +#: libparted/fs/r/hfs/reloc.c:654 libparted/fs/r/hfs/reloc_plus.c:926 +msgid "An error occurred during extent relocation." +msgstr "" + +#: libparted/fs/r/hfs/reloc_plus.c:495 +msgid "This HFS+ volume has no catalog file. This is very unusual!" +msgstr "" + +#: libparted/fs/r/hfs/reloc_plus.c:620 +msgid "This HFS+ volume has no extents overflow file. This is quite unusual!" +msgstr "" + +#: parted/parted.c:138 +msgid "displays this help message" +msgstr "დáƒáƒ®áƒ›áƒáƒ ების áƒáƒ› შეტყáƒáƒ‘ინების ჩვენებáƒ" + +#: parted/parted.c:139 +msgid "lists partition layout on all block devices" +msgstr "ყველრბლáƒáƒ™áƒ£áƒ ი მáƒáƒ¬áƒ§áƒáƒ‘ილáƒáƒ‘ის დáƒáƒœáƒáƒ§áƒáƒ¤áƒ”ბის გáƒáƒœáƒšáƒáƒ’ების ჩვენებáƒ" + +#: parted/parted.c:140 +msgid "displays machine parseable output" +msgstr "მáƒáƒœáƒ¥áƒáƒœáƒ˜áƒ¡áƒáƒ—ვის დáƒáƒ›áƒ£áƒ¨áƒáƒ•áƒ”ბáƒáƒ“ი სáƒáƒ®áƒ˜áƒ— გáƒáƒ›áƒáƒ¢áƒáƒœáƒ" + +#: parted/parted.c:141 +msgid "displays JSON output" +msgstr "json-ის გáƒáƒ›áƒáƒ¢áƒáƒœáƒ" + +#: parted/parted.c:142 +msgid "never prompts for user intervention" +msgstr "áƒáƒ áƒáƒ¡áƒ“რáƒáƒ¡ ითხáƒáƒ•áƒ¡ მáƒáƒ›áƒ®áƒ›áƒáƒ ებლის ჩáƒáƒ ევáƒáƒ¡" + +#: parted/parted.c:143 +msgid "in script mode, fix instead of abort when asked" +msgstr "სკრიპტულ რეჟიმში გáƒáƒ£áƒ¥áƒ›áƒ”ბის მáƒáƒ’იერშეგიძლიáƒáƒ— ჩáƒáƒáƒ¡áƒ¬áƒáƒ áƒáƒ— ქმედებáƒ" + +#: parted/parted.c:144 +msgid "displays the version" +msgstr "ვერსიის ჩვენებáƒ" + +#: parted/parted.c:145 +msgid "alignment for new partitions" +msgstr "áƒáƒ®áƒáƒšáƒ˜ დáƒáƒœáƒáƒ§áƒáƒ¤áƒ”ბის სწáƒáƒ ებáƒ" + +#: parted/parted.c:158 +msgid "" +"NUMBER is the partition number used by Linux. On MS-DOS disk labels, the " +"primary partitions number from 1 to 4, logical partitions from 5 onwards.\n" +msgstr "" +"რიცხვი დáƒáƒœáƒáƒ§áƒáƒ¤áƒ˜áƒ¡ ნáƒáƒ›áƒ”რს წáƒáƒ მáƒáƒáƒ“გენს, რáƒáƒ›áƒ”ლიც ლინუქსში გáƒáƒ›áƒáƒ˜áƒ§áƒ”ნებáƒ. MS-DOS-ში " +"ძირითáƒáƒ“ი დáƒáƒœáƒáƒ§áƒáƒ¤áƒ”ბის ნáƒáƒ›áƒ ებირ1-4, ლáƒáƒ’იკურების კი 5 დრზემáƒáƒ—.\n" + +#: parted/parted.c:161 +msgid "LABEL-TYPE is one of: " +msgstr "áƒáƒ“ის-ტიპი შეიძლებრიყáƒáƒ¡: " + +#: parted/parted.c:162 parted/parted.c:163 +msgid "FLAG is one of: " +msgstr "áƒáƒšáƒáƒ›áƒ˜ შეიძლებრიყáƒáƒ¡: " + +#: parted/parted.c:164 +msgid "UNIT is one of: " +msgstr "ერთეული შეიძლებრიყáƒáƒ¡: " + +#: parted/parted.c:165 +msgid "desired alignment: minimum or optimal" +msgstr "სáƒáƒ¡áƒ£áƒ ველი გáƒáƒœáƒšáƒáƒ’ებáƒ: მინიმáƒáƒšáƒ£áƒ ი áƒáƒœ áƒáƒžáƒ¢áƒ˜áƒ›áƒáƒšáƒ£áƒ ი" + +#: parted/parted.c:166 +msgid "PART-TYPE is one of: primary, logical, extended\n" +msgstr "დáƒáƒœáƒáƒ§áƒáƒ¤áƒ˜áƒ¡-ტიპი შეიძლებრიყáƒáƒ¡: ძირითáƒáƒ“ი, ლáƒáƒ’იკური áƒáƒœ გáƒáƒ¤áƒáƒ თáƒáƒ”ბული\n" + +#: parted/parted.c:168 +msgid "FS-TYPE is one of: " +msgstr "ფáƒáƒ˜áƒšáƒ£áƒ ი სისტემის ტიპი შეიძლებრიყáƒáƒ¡: " + +#: parted/parted.c:169 +msgid "" +"START and END are disk locations, such as 4GB or 10%. Negative values count " +"from the end of the disk. For example, -1s specifies exactly the last " +"sector.\n" +msgstr "" +"დáƒáƒ¡áƒáƒ¬áƒ§áƒ˜áƒ¡áƒ˜ დრდáƒáƒ¡áƒáƒ¡áƒ ული დისკის მდებáƒáƒ ეáƒáƒ‘ებიáƒ, მáƒáƒ’: 4GB áƒáƒœ 10%. უáƒáƒ ყáƒáƒ¤áƒ˜áƒ—ი " +"მნიშვნელáƒáƒ‘ები დისკის ბáƒáƒšáƒáƒ“áƒáƒœ ითვლებáƒ. მáƒáƒ’: -1s ნიშნáƒáƒ•áƒ¡ ზუსტáƒáƒ“ ბáƒáƒšáƒ " +"სექტáƒáƒ ს.\n" + +#: parted/parted.c:172 +msgid "" +"END is disk location, such as 4GB or 10%. Negative value counts from the " +"end of the disk. For example, -1s specifies exactly the last sector.\n" +msgstr "" +"დáƒáƒ¡áƒáƒ¡áƒ ული დისკის მდებáƒáƒ ეáƒáƒ‘áƒáƒ, მáƒáƒ’: 4GB áƒáƒœ 10%. უáƒáƒ ყáƒáƒ¤áƒ˜áƒ—ი მნიშვნელáƒáƒ‘ები " +"დისკის ბáƒáƒšáƒáƒ“áƒáƒœ ითვლებáƒ. მáƒáƒ’: -1s ნიშნáƒáƒ•áƒ¡ ზუსტáƒáƒ“ ბáƒáƒšáƒ სექტáƒáƒ ს.\n" + +#: parted/parted.c:175 +msgid "STATE is one of: on, off\n" +msgstr "მდგáƒáƒ›áƒáƒ ეáƒáƒ‘რშეიძლებრიყáƒáƒ¡: on, off\n" + +#: parted/parted.c:176 +msgid "DEVICE is usually /dev/hda or /dev/sda\n" +msgstr "მáƒáƒ¬áƒ§áƒáƒ‘ილáƒáƒ‘რჩვეულებრივ /dev/hda áƒáƒœ /dev/sda-áƒ\n" + +#: parted/parted.c:177 +msgid "NAME is any word you want\n" +msgstr "სáƒáƒ®áƒ”ლი თქვენის სáƒáƒ¡áƒ£áƒ ველი ნებისმიერი სიტყვáƒáƒ\n" + +#: parted/parted.c:178 +msgid "TYPE_ID is a value between 0x01 and 0xff, TYPE_UUID is a UUID\n" +msgstr "" + +#: parted/parted.c:182 +msgid "" +"Copyright (C) 1998 - 2006 Free Software Foundation, Inc.\n" +"This program is free software, covered by the GNU General Public License.\n" +"\n" +"This program is distributed in the hope that it will be useful,\n" +"but WITHOUT ANY WARRANTY; without even the implied warranty of\n" +"MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the\n" +"GNU General Public License for more details.\n" +"\n" +msgstr "" +"Copyright (C) 1998 - 2006 Free Software Foundation, Inc.\n" +"This program is free software, covered by the GNU General Public License.\n" +"\n" +"This program is distributed in the hope that it will be useful,\n" +"but WITHOUT ANY WARRANTY; without even the implied warranty of\n" +"MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the\n" +"GNU General Public License for more details.\n" +"\n" + +#: parted/parted.c:232 +#, c-format +msgid "%0.f%%\t(time left %.2d:%.2d)" +msgstr "%0.f%%\t(დáƒáƒ ჩენილი დრრ%.2d:%.2d)" + +#: parted/parted.c:251 +#, c-format +msgid "Partition %s is being used. Are you sure you want to continue?" +msgstr "" +"áƒáƒ›áƒŸáƒáƒ›áƒáƒ“ დáƒáƒœáƒáƒ§áƒáƒ¤áƒ˜ (%s) გáƒáƒ›áƒáƒ˜áƒ§áƒ”ნებáƒ. დáƒáƒ წმუნებული ბრძáƒáƒœáƒ“ებით, რáƒáƒ› გნებáƒáƒ•áƒ—, " +"გáƒáƒáƒ’რძელáƒáƒ—?" + +#: parted/parted.c:272 +#, c-format +msgid "Partition(s) on %s are being used." +msgstr "%s-ზე მდებáƒáƒ ე დáƒáƒœáƒáƒ§áƒáƒ¤(ებ)-ი áƒáƒ›áƒŸáƒáƒ›áƒáƒ“ გáƒáƒ›áƒáƒ˜áƒ§áƒ”ნებáƒ." + +#: parted/parted.c:284 +#, c-format +msgid "" +"The existing disk label on %s will be destroyed and all data on this disk " +"will be lost. Do you want to continue?" +msgstr "" +"დისკის (%s) დáƒáƒ§áƒáƒ¤áƒ˜áƒ¡ áƒáƒ სებული áƒáƒ“ე წáƒáƒ˜áƒ¨áƒšáƒ”ბრდრზედ áƒáƒ სებული მáƒáƒœáƒáƒªáƒ”მები " +"დáƒáƒ˜áƒ™áƒáƒ გებáƒ. გნებáƒáƒ•áƒ— გáƒáƒáƒ’რძელáƒáƒ—?" + +#: parted/parted.c:545 +msgid "New disk label type?" +msgstr "áƒáƒ®áƒáƒšáƒ˜ დისკის áƒáƒ“ის ტიპი?" + +#: parted/parted.c:692 +msgid "Partition type?" +msgstr "დáƒáƒœáƒáƒ§áƒáƒ¤áƒ˜áƒ¡ ტიპი?" + +#: parted/parted.c:710 parted/parted.c:914 +msgid "Partition name?" +msgstr "დáƒáƒœáƒáƒ§áƒáƒ¤áƒ˜áƒ¡ სáƒáƒ®áƒ”ლი?" + +#: parted/parted.c:720 +msgid "File system type?" +msgstr "ფáƒáƒ˜áƒšáƒ£áƒ ი სისტემის სáƒáƒ®áƒ”ლი?" + +#: parted/parted.c:725 parted/parted.c:1815 +msgid "Start?" +msgstr "დáƒáƒ¡áƒáƒ¬áƒ§áƒ˜áƒ¡áƒ˜?" + +#: parted/parted.c:727 parted/parted.c:1817 parted/parted.c:1900 +msgid "End?" +msgstr "დáƒáƒ¡áƒáƒ¡áƒ ული?" + +#: parted/parted.c:794 +#, c-format +msgid "" +"You requested a partition from %s to %s (sectors %llu..%llu).\n" +"The closest location we can manage is %s to %s (sectors %llu..%llu).%s" +msgstr "" + +#: parted/parted.c:803 +msgid "" +"\n" +"Is this still acceptable to you?" +msgstr "" +"\n" +"áƒáƒ¡áƒ” ჯერკიდევ მáƒáƒ’წáƒáƒœáƒ—?" + +#: parted/parted.c:826 +#, c-format +msgid "" +"The resulting partition is not properly aligned for best performance: %s" +msgstr "შედეგáƒáƒ“ მიღებული დáƒáƒœáƒáƒ§áƒáƒ¤áƒ˜ წáƒáƒ მáƒáƒ“áƒáƒ‘ისთვის áƒáƒ áƒáƒ¡áƒ¬áƒáƒ áƒáƒ“áƒáƒ სწáƒáƒ ებული: %s" + +#: parted/parted.c:828 parted/parted.c:2057 +msgid "unknown (malloc failed)" +msgstr "უცნáƒáƒ‘ი (malloc-ის შეცდáƒáƒ›áƒ)" + +#: parted/parted.c:906 +#, c-format +msgid "%s disk labels do not support partition name." +msgstr "%s დისკის áƒáƒ“ეებს დáƒáƒœáƒáƒ§áƒáƒ¤áƒ˜áƒ¡ სáƒáƒ®áƒ”ლის მხáƒáƒ დáƒáƒáƒ”რრáƒáƒ გáƒáƒáƒ©áƒœáƒ˜áƒ." + +#: parted/parted.c:911 parted/parted.c:955 parted/parted.c:1880 +#: parted/parted.c:1946 parted/parted.c:2040 parted/parted.c:2115 +msgid "Partition number?" +msgstr "დáƒáƒœáƒáƒ§áƒáƒ¤áƒ˜áƒ¡ ნáƒáƒ›áƒ”რი?" + +#: parted/parted.c:949 +#, fuzzy, c-format +msgid "%s disk labels do not support partition type." +msgstr "%s დისკის áƒáƒ“ეებს დáƒáƒœáƒáƒ§áƒáƒ¤áƒ˜áƒ¡ სáƒáƒ®áƒ”ლის მხáƒáƒ დáƒáƒáƒ”რრáƒáƒ გáƒáƒáƒ©áƒœáƒ˜áƒ." + +#: parted/parted.c:965 +#, fuzzy +msgid "Partition type-id?" +msgstr "დáƒáƒœáƒáƒ§áƒáƒ¤áƒ˜áƒ¡ ტიპი?" + +#: parted/parted.c:972 +#, fuzzy +msgid "Invalid type-id." +msgstr "áƒáƒ áƒáƒ¡áƒ¬áƒáƒ ი რიცხვი." + +#: parted/parted.c:986 +#, fuzzy +msgid "Partition type-uuid?" +msgstr "დáƒáƒœáƒáƒ§áƒáƒ¤áƒ˜áƒ¡ ტიპი?" + +#: parted/parted.c:993 +#, fuzzy +msgid "Invalid type-uuid." +msgstr "áƒáƒ áƒáƒ¡áƒ¬áƒáƒ ი რიცხვი." + +#: parted/parted.c:1146 +#, c-format +msgid "BIOS cylinder,head,sector geometry: %d,%d,%d. Each cylinder is %s.\n" +msgstr "" +"BIOS-ის ცილინდრებით/თáƒáƒ•áƒáƒ™áƒ”ბით/სექტáƒáƒ ებით áƒáƒ¦áƒ¬áƒ”რილი გეáƒáƒ›áƒ”ტრიáƒ: %d, %d, %d. " +"თითáƒáƒ”ული ცილინდრი %s-იáƒ.\n" + +#: parted/parted.c:1240 +#, c-format +msgid "Model: %s (%s)\n" +msgstr "მáƒáƒ“ელი: %s (%s)\n" + +#: parted/parted.c:1242 +#, c-format +msgid "Disk %s: %s\n" +msgstr "დისკი %s: %s\n" + +#: parted/parted.c:1243 +#, c-format +msgid "Sector size (logical/physical): %lldB/%lldB\n" +msgstr "სექტáƒáƒ ის ზáƒáƒ›áƒ (ლáƒáƒ’იკური/ფიზიკური): %lldბ/%lldბ\n" + +#: parted/parted.c:1255 +#, c-format +msgid "Partition Table: %s\n" +msgstr "დáƒáƒœáƒáƒ§áƒáƒ¤áƒ”ბის ცხრილი: %s\n" + +#: parted/parted.c:1256 +#, c-format +msgid "Disk Flags: %s\n" +msgstr "დისკის áƒáƒšáƒ›áƒ”ბი: %s\n" + +#: parted/parted.c:1388 parted/parted.c:1391 +msgid "Number" +msgstr "რიცხვი" + +#: parted/parted.c:1388 parted/parted.c:1391 +msgid "Start" +msgstr "დáƒáƒ¬áƒ§áƒ”ბáƒ" + +#: parted/parted.c:1389 parted/parted.c:1392 +msgid "End" +msgstr "დáƒáƒ¡áƒáƒ¡áƒ ული" + +#: parted/parted.c:1392 +msgid "Size" +msgstr "ზáƒáƒ›áƒ" + +#: parted/parted.c:1396 +msgid "Type" +msgstr "ტიპი" + +#: parted/parted.c:1398 +msgid "File system" +msgstr "ფáƒáƒ˜áƒšáƒ£áƒ ი სისტემáƒ" + +#: parted/parted.c:1401 +msgid "Name" +msgstr "სáƒáƒ®áƒ”ლი" + +#: parted/parted.c:1403 +msgid "Flags" +msgstr "áƒáƒšáƒ›áƒ”ბი" + +#: parted/parted.c:1461 +msgid "Free Space" +msgstr "თáƒáƒ•áƒ˜áƒ¡áƒ£áƒ¤áƒáƒšáƒ˜ áƒáƒ“გილი" + +#: parted/parted.c:1702 +#, c-format +msgid "" +"A %s %s partition was found at %s -> %s. Do you want to add it to the " +"partition table?" +msgstr "" +"%s %s დáƒáƒœáƒáƒ§áƒáƒ¤áƒ˜ ნáƒáƒžáƒáƒ•áƒœáƒ˜áƒ %s ->%s -ზე. გნებáƒáƒ•áƒ— მისი დáƒáƒ›áƒáƒ¢áƒ”ბრდáƒáƒœáƒáƒ§áƒáƒ¤áƒ”ბის " +"ცხრილში?" + +#: parted/parted.c:1745 +msgid "searching for file systems" +msgstr "ფáƒáƒ˜áƒšáƒ£áƒ ი სისტემების ძებნáƒ" + +#: parted/parted.c:1852 +msgid "The resize command has been removed in parted 3.0" +msgstr "ბრძáƒáƒœáƒ”ბრresize áƒáƒ›áƒáƒ¦áƒ”ბულირparted 3.0-დáƒáƒœ დრზემáƒáƒ—" + +#: parted/parted.c:1914 +msgid "" +"Shrinking a partition can cause data loss, are you sure you want to continue?" +msgstr "" +"დáƒáƒœáƒáƒ§áƒáƒ¤áƒ˜áƒ¡ დáƒáƒžáƒáƒ¢áƒáƒ áƒáƒ•áƒ”ბáƒáƒ› შეიძლებრმáƒáƒœáƒáƒªáƒ”მების კáƒáƒ გვრგáƒáƒ›áƒáƒ˜áƒ¬áƒ•áƒ˜áƒáƒ¡. მáƒáƒ˜áƒœáƒª " +"გáƒáƒáƒ’რძელებთ?" + +#: parted/parted.c:1970 +msgid "New device?" +msgstr "áƒáƒ®áƒáƒšáƒ˜ მáƒáƒ¬áƒ§áƒáƒ‘ილáƒáƒ‘áƒ?" + +#: parted/parted.c:2038 +msgid "alignment type(min/opt)" +msgstr "სწáƒáƒ ების ტიპი (მინ/áƒáƒžáƒ¢)" + +#: parted/parted.c:2053 +#, c-format +msgid "%d aligned\n" +msgstr "%d გáƒáƒ¡áƒ¬áƒáƒ ებულიáƒ\n" + +#: parted/parted.c:2055 +#, c-format +msgid "%d not aligned: %s\n" +msgstr "%d გáƒáƒ¡áƒ¬áƒáƒ ებული áƒáƒ áƒáƒ: %s\n" + +#: parted/parted.c:2080 parted/parted.c:2117 +msgid "Flag to Invert?" +msgstr "შესáƒáƒ‘რუნებელი áƒáƒšáƒáƒ›áƒ˜?" + +#: parted/parted.c:2085 parted/parted.c:2122 +msgid "New state?" +msgstr "áƒáƒ®áƒáƒšáƒ˜ მდგáƒáƒ›áƒáƒ ეáƒáƒ‘áƒ?" + +#: parted/parted.c:2168 +msgid "Unit?" +msgstr "ერთეული?" + +#: parted/parted.c:2303 +msgid "align-check" +msgstr "align-check" + +#: parted/parted.c:2306 +msgid "" +"align-check TYPE N check partition N for TYPE(min|opt) " +"alignment" +msgstr "" +"align-check ტიპი N დáƒáƒœáƒáƒ§áƒáƒ¤áƒ˜áƒ¡ N შემáƒáƒ¬áƒ›áƒ”ბრტიპის(min|" +"opt) სწáƒáƒ ებáƒáƒ–ე" + +#: parted/parted.c:2314 +msgid "help" +msgstr "დáƒáƒ®áƒ›áƒáƒ ებáƒ" + +#: parted/parted.c:2317 +msgid "" +"help [COMMAND] print general help, or help on " +"COMMAND" +msgstr "" +"help [ბრძáƒáƒœáƒ”ბáƒ] ზáƒáƒ’áƒáƒ“ი áƒáƒœ მითითებული ბრძáƒáƒœáƒ”ბის " +"დáƒáƒ®áƒ›áƒáƒ ების გáƒáƒ›áƒáƒ¢áƒáƒœáƒ" + +#: parted/parted.c:2323 +msgid "mklabel" +msgstr "mklabel" + +#: parted/parted.c:2323 +msgid "mktable" +msgstr "mktable" + +#: parted/parted.c:2326 +msgid "" +"mklabel,mktable LABEL-TYPE create a new disklabel (partition " +"table)" +msgstr "" +"mklabel,mktable áƒáƒ“ის-ტიპი დისკის áƒáƒ®áƒáƒšáƒ˜ áƒáƒ“ის(დáƒáƒœáƒáƒ§áƒáƒ¤áƒ”ბის " +"ცხრილის) შექმნáƒ" + +#: parted/parted.c:2332 +msgid "mkpart" +msgstr "mkpart" + +#: parted/parted.c:2335 +msgid "mkpart PART-TYPE [FS-TYPE] START END make a partition" +msgstr "mkpart დáƒáƒœáƒáƒ§-ტიპი [ფს-ტიპი] დáƒáƒ¡áƒáƒ¬áƒ§áƒ˜áƒ¡áƒ˜ დáƒáƒ¡áƒáƒ¡áƒ ული დáƒáƒœáƒáƒ§áƒáƒ¤áƒ˜áƒ¡ შექმნáƒ" + +#: parted/parted.c:2341 +msgid "" +"'mkpart' makes a partition without creating a new file system on the " +"partition. FS-TYPE may be specified to set an appropriate partition ID.\n" +msgstr "" + +#: parted/parted.c:2346 +msgid "name" +msgstr "name" + +#: parted/parted.c:2349 +msgid "name NUMBER NAME name partition NUMBER as NAME" +msgstr "" +"name რიცხვი სáƒáƒ®áƒ”ლი რიცხვის ნáƒáƒ›áƒ ის მქáƒáƒœáƒ” დáƒáƒœáƒáƒ§áƒáƒ¤áƒ˜áƒ¡ " +"სáƒáƒ®áƒ”ლის დáƒáƒ§áƒ”ნებáƒ" + +#: parted/parted.c:2354 +msgid "print" +msgstr "print" + +#: parted/parted.c:2357 +msgid "" +"print [devices|free|list,all] display the partition table, or " +"available devices, or free space, or all found partitions" +msgstr "" +"print [devices|free|list,all] დáƒáƒœáƒáƒ§áƒáƒ¤áƒ”ბის ცხრილის, " +"მáƒáƒ¬áƒ§áƒáƒ‘ილáƒáƒ‘ების, áƒáƒ“გილის áƒáƒœ ყველრდáƒáƒœáƒáƒ§áƒáƒ¤áƒ˜áƒ¡ ჩვენებáƒ" + +#: parted/parted.c:2361 +msgid "" +"Without arguments, 'print' displays the entire partition table. However with " +"the following arguments it performs various other actions.\n" +msgstr "" + +#: parted/parted.c:2363 +msgid " devices : display all active block devices\n" +msgstr " devices :áƒáƒ¥áƒ¢áƒ˜áƒ£áƒ ი ბლáƒáƒ™áƒ£áƒ ი მáƒáƒ¬áƒ§áƒáƒ‘ილáƒáƒ‘ების სიáƒ\n" + +#: parted/parted.c:2364 +msgid "" +" free : display information about free unpartitioned space on the " +"current block device\n" +msgstr "" +" free :მიმდინáƒáƒ ე ბლáƒáƒ™áƒ£áƒ ი მáƒáƒ¬áƒ§áƒáƒ‘ილáƒáƒ‘ის დáƒáƒ£áƒ§áƒáƒ¤áƒ”ლი áƒáƒ“გილის შესáƒáƒ®áƒ”ბ " +"ინფáƒáƒ მáƒáƒªáƒ˜áƒ˜áƒ¡ ჩვენებáƒ\n" + +#: parted/parted.c:2366 +msgid "" +" list, all : display the partition tables of all active block devices\n" +msgstr " list, all : ყველრáƒáƒ¥áƒ¢áƒ˜áƒ£áƒ ი ბლáƒáƒ™áƒ£áƒ ი მáƒáƒ¬áƒ§áƒáƒ‘ილáƒáƒ‘ის დáƒáƒœáƒáƒ§áƒáƒ¤áƒ˜áƒ¡ ჩვენებáƒ\n" + +#: parted/parted.c:2370 +msgid "quit" +msgstr "quit" + +#: parted/parted.c:2373 +msgid "quit exit program" +msgstr "quit პრáƒáƒ’რáƒáƒ›áƒ˜áƒ“áƒáƒœ გáƒáƒ¡áƒ•áƒšáƒ" + +#: parted/parted.c:2378 +msgid "rescue" +msgstr "rescue" + +#: parted/parted.c:2381 +msgid "" +"rescue START END rescue a lost partition near START " +"and END" +msgstr "" +"rescue დáƒáƒ¡áƒáƒ¬áƒ§áƒ˜áƒ¡áƒ˜ დáƒáƒ¡áƒáƒ¡áƒ ული შესáƒáƒ‘áƒáƒ›áƒ˜áƒ¡áƒáƒ“ დáƒáƒ¡áƒáƒ¬áƒ§áƒ˜áƒ¡áƒ˜áƒ¡áƒ " +"დრდáƒáƒ¡áƒáƒ¡áƒ ულის სიáƒáƒ®áƒšáƒáƒ•áƒ”ში მყáƒáƒ¤áƒ˜ დáƒáƒœáƒáƒ§áƒáƒ¤áƒ˜áƒ¡ áƒáƒ¦áƒ›áƒáƒ©áƒ”ნრდრგáƒáƒ“áƒáƒ ჩენáƒ" + +#: parted/parted.c:2387 +msgid "resize" +msgstr "resize" + +#: parted/parted.c:2390 +msgid "The resize command was removed in parted 3.0\n" +msgstr "ბრძáƒáƒœáƒ”ბრresize áƒáƒ›áƒáƒ¦áƒ”ბულირparted 3.0-დáƒáƒœ დრზემáƒáƒ—\n" + +#: parted/parted.c:2393 +msgid "resizepart" +msgstr "resizepart" + +#: parted/parted.c:2396 +msgid "resizepart NUMBER END resize partition NUMBER" +msgstr "" +"resizepart რიცხვი დáƒáƒ¡áƒáƒ¡áƒ ული მითითებული ნáƒáƒ›áƒ ის მქáƒáƒœáƒ” " +"დáƒáƒœáƒáƒ§áƒáƒ¤áƒ˜áƒ¡ ზáƒáƒ›áƒ˜áƒ¡ შეცვლáƒ" + +#: parted/parted.c:2401 +msgid "rm" +msgstr "rm" + +#: parted/parted.c:2404 +msgid "rm NUMBER delete partition NUMBER" +msgstr "" +"rm რიცხვი მითითებული ნáƒáƒ›áƒ ის მქáƒáƒœáƒ” დáƒáƒœáƒáƒ§áƒáƒ¤áƒ˜áƒ¡ " +"წáƒáƒ¨áƒšáƒ" + +#: parted/parted.c:2409 +msgid "select" +msgstr "select" + +#: parted/parted.c:2412 +msgid "select DEVICE choose the device to edit" +msgstr "" +"select მáƒáƒ¬áƒ§áƒáƒ‘ილáƒáƒ‘რáƒáƒ˜áƒ ჩიეთ ჩáƒáƒ¡áƒáƒ¡áƒ¬áƒáƒ ებელი " +"მáƒáƒ¬áƒ§áƒáƒ‘ილáƒáƒ‘áƒ" + +#: parted/parted.c:2417 +msgid "disk_set" +msgstr "disk_set" + +#: parted/parted.c:2420 +msgid "" +"disk_set FLAG STATE change the FLAG on selected device" +msgstr "" +"disk_set áƒáƒšáƒáƒ›áƒ˜ მდგáƒáƒ›áƒáƒ ეáƒáƒ‘რმáƒáƒœáƒ˜áƒ¨áƒœáƒ£áƒšáƒ˜ მáƒáƒ¬áƒ§áƒáƒ‘ილáƒáƒ‘ის " +"მითითებული áƒáƒšáƒ›áƒ˜áƒ¡ მდგáƒáƒ›áƒáƒ ეáƒáƒ‘ის შეცვლáƒ" + +#: parted/parted.c:2425 +msgid "disk_toggle" +msgstr "disk_toggle" + +#: parted/parted.c:2428 +msgid "" +"disk_toggle [FLAG] toggle the state of FLAG on " +"selected device" +msgstr "" +"disk_toggle [áƒáƒšáƒáƒ›áƒ˜] მáƒáƒœáƒ˜áƒ¨áƒœáƒ£áƒš მáƒáƒ¬áƒ§áƒáƒ‘ილáƒáƒ‘áƒáƒ–ე მითითებული " +"áƒáƒšáƒ›áƒ˜áƒ¡ გáƒáƒ“áƒáƒ თვáƒ" + +#: parted/parted.c:2434 +msgid "set" +msgstr "set" + +#: parted/parted.c:2437 +msgid "" +"set NUMBER FLAG STATE change the FLAG on partition NUMBER" +msgstr "" +"set რიცხვი áƒáƒšáƒáƒ›áƒ˜ მდგáƒáƒ›áƒáƒ ეáƒáƒ‘რმáƒáƒœáƒ˜áƒ¨áƒœáƒ£áƒš მáƒáƒ¬áƒ§áƒáƒ‘ილáƒáƒ‘áƒáƒ–ე " +"მითითებული áƒáƒšáƒ›áƒ˜áƒ¡ შეცვლáƒ" + +#: parted/parted.c:2443 +msgid "toggle" +msgstr "toggle" + +#: parted/parted.c:2446 +msgid "" +"toggle [NUMBER [FLAG]] toggle the state of FLAG on " +"partition NUMBER" +msgstr "" +"toggle [რიცხვი [áƒáƒšáƒáƒ›áƒ˜]] მáƒáƒœáƒ˜áƒ¨áƒœáƒ£áƒš მáƒáƒ¬áƒ§áƒáƒ‘ილáƒáƒ‘áƒáƒ–ე მითითებული " +"áƒáƒšáƒ›áƒ˜áƒ¡ გáƒáƒ“áƒáƒ თვáƒ" + +#: parted/parted.c:2452 +msgid "type" +msgstr "" + +#: parted/parted.c:2455 +msgid "" +"type NUMBER TYPE-ID or TYPE-UUID type set TYPE-ID or TYPE-UUID of " +"partition NUMBER" +msgstr "" + +#: parted/parted.c:2460 +msgid "unit" +msgstr "unit" + +#: parted/parted.c:2463 +msgid "unit UNIT set the default unit to UNIT" +msgstr "" +"unit ერთეული ნáƒáƒ’ულისხმები ერთეულის დáƒáƒ§áƒ”ნებáƒ" + +#: parted/parted.c:2468 +msgid "version" +msgstr "version" + +#: parted/parted.c:2471 +msgid "" +"version display the version number and " +"copyright information of GNU Parted" +msgstr "" +"version GNU Parted-ის ლიცენზიისრდრვერსიის " +"ჩვენებáƒ" + +#: parted/parted.c:2475 +msgid "" +"'version' displays copyright and version information corresponding to this " +"copy of GNU Parted\n" +msgstr "" + +#: parted/parted.c:2545 +#, c-format +msgid "Usage: %s [-hlmsfv] [-a<align>] [DEVICE [COMMAND [PARAMETERS]]...]\n" +msgstr "" +"გáƒáƒ›áƒáƒ§áƒ”ნებáƒ: %s [-hlmsfv] [-a <align>] [მáƒáƒ¬áƒ§áƒáƒ‘ილáƒáƒ‘რ[ბრძáƒáƒœáƒ”ბრ" +"[პáƒáƒ áƒáƒ›áƒ”ტრები]] ..]\n" + +#: parted/parted.c:2589 +msgid "No device found" +msgstr "მáƒáƒ¬áƒ§áƒáƒ‘ილáƒáƒ‘რნáƒáƒžáƒáƒ•áƒœáƒ˜ áƒáƒ áƒáƒ" + +#: parted/parted.c:2626 +msgid "WARNING: You are not superuser. Watch out for permissions.\n" +msgstr "გáƒáƒ¤áƒ თხილებáƒ: გáƒáƒ“áƒáƒáƒ›áƒáƒ¬áƒ›áƒ”თ, გáƒáƒ¥áƒ•áƒ— თუ áƒáƒ რroot-ის წვდáƒáƒ›áƒ”ბი.\n" + +#: parted/parted.c:2659 +msgid "" +"You should reinstall your boot loader before rebooting. Read section 4 of " +"the Parted User documentation for more information." +msgstr "" + +#: parted/parted.c:2666 +msgid "You may need to update /etc/fstab.\n" +msgstr "შეიძლებრ/etc/fstab-ის გáƒáƒœáƒáƒ®áƒšáƒ”ბრდáƒáƒ’áƒáƒ˜áƒ დეთ.\n" + +#: parted/ui.c:164 +msgid "Welcome to GNU Parted! Type 'help' to view a list of commands.\n" +msgstr "" +"მáƒáƒ’ესáƒáƒšáƒ›áƒ”ბით GNU Parted-ში! ბრძáƒáƒœáƒ”ბების სიის მისáƒáƒ¦áƒ”ბáƒáƒ“ áƒáƒ™áƒ იფეთ 'help'.\n" + +#: parted/ui.c:167 +msgid "" +"Usage: parted [OPTION]... [DEVICE [COMMAND [PARAMETERS]...]...]\n" +"Apply COMMANDs with PARAMETERS to DEVICE. If no COMMAND(s) are given, run " +"in\n" +"interactive mode.\n" +msgstr "" +"გáƒáƒ›áƒáƒ§áƒ”ნებáƒ: parted [პáƒáƒ áƒáƒ›áƒ”ტრი] .. [მáƒáƒ¬áƒ§áƒáƒ‘ილáƒáƒ‘რ[ბრძáƒáƒœáƒ”ბრ" +"[პáƒáƒ áƒáƒ›áƒ”ტრები]...]..]\n" +"ბრძáƒáƒœáƒ”ბრმითითებული პáƒáƒ áƒáƒ›áƒ”ტრებით გáƒáƒ“áƒáƒ¢áƒáƒ დებრმითითებულ მáƒáƒ¬áƒ§áƒáƒ‘ილáƒáƒ‘áƒáƒ–ე.\n" +"თუ ბრძáƒáƒœáƒ”ბრმითითებული áƒáƒ áƒáƒ, parted-ი ინტერáƒáƒ¥áƒ¢áƒ˜áƒ£áƒ რეჟიმში გáƒáƒ”შვებáƒ.\n" + +#: parted/ui.c:172 +#, c-format +msgid "" +"\n" +"\n" +"You found a bug in GNU Parted! Here's what you have to do:\n" +"\n" +"Don't panic! The bug has most likely not affected any of your data.\n" +"Help us to fix this bug by doing the following:\n" +"\n" +"Check whether the bug has already been fixed by checking\n" +"the last version of GNU Parted that you can find at:\n" +"\n" +"\thttp://ftp.gnu.org/gnu/parted/\n" +"\n" +"Please check this version prior to bug reporting.\n" +"\n" +"If this has not been fixed yet or if you don't know how to check,\n" +"please visit the GNU Parted website:\n" +"\n" +"\thttp://www.gnu.org/software/parted\n" +"\n" +"for further information.\n" +"\n" +"Your report should contain the version of this release (%s)\n" +"along with the error message below, the output of\n" +"\n" +"\tparted DEVICE unit co print unit s print\n" +"\n" +"and the following history of commands you entered.\n" +"Also include any additional information about your setup you\n" +"consider important.\n" +msgstr "" + +#: parted/ui.c:293 +msgid "" +"\n" +"Command History:\n" +msgstr "" +"\n" +"ბრძáƒáƒœáƒ”ბების ისტáƒáƒ იáƒ:\n" + +#: parted/ui.c:356 +msgid "" +"\n" +"Error: SEGV_MAPERR (Address not mapped to object)\n" +msgstr "" +"\n" +"შეცდáƒáƒ›áƒ: SEGV_MAPERR (მისáƒáƒ›áƒáƒ თი áƒáƒ‘იექტზე მიბმული áƒáƒ áƒáƒ)\n" + +#: parted/ui.c:362 +msgid "" +"\n" +"Error: SEGV_ACCERR (Invalid permissions for mapped object)\n" +msgstr "" +"\n" +"შეცდáƒáƒ›áƒ: SEGV_ACCERR (მიბმული áƒáƒ‘იექტის áƒáƒ áƒáƒ¡áƒ¬áƒáƒ ი წვდáƒáƒ›áƒ”ბი)\n" + +#: parted/ui.c:367 +msgid "" +"\n" +"Error: A general SIGSEGV signal was encountered.\n" +msgstr "" +"\n" +"შეცდáƒáƒ›áƒ: დáƒáƒ¤áƒ˜áƒ¥áƒ¡áƒ˜áƒ ებულირSIGSEGV სიგნáƒáƒšáƒ˜.\n" + +#: parted/ui.c:391 +msgid "" +"\n" +"Error: FPE_INTDIV (Integer: divide by zero)" +msgstr "" +"\n" +"შეცდáƒáƒ›áƒ: FPE_INTDIV (მთელი რიცხვები 0-ზე áƒáƒ იყáƒáƒ¤áƒ)" + +#: parted/ui.c:396 +msgid "" +"\n" +"Error: FPE_INTOVF (Integer: overflow)" +msgstr "" +"\n" +"შეცდáƒáƒ›áƒ: FPE_INTOVF (მთელი რიცხვების მáƒáƒ¥áƒ¡áƒ˜áƒ›áƒáƒšáƒ£áƒ ი მნიშვნელáƒáƒ‘ის გáƒáƒ“áƒáƒªáƒ˜áƒšáƒ”ბáƒ)" + +#: parted/ui.c:401 +msgid "" +"\n" +"Error: FPE_FLTDIV (Float: divide by zero)" +msgstr "" +"\n" +"შეცდáƒáƒ›áƒ: FPE_FLTDIV (ნულზე გáƒáƒ§áƒáƒ¤áƒ შეუძლებელიáƒ)" + +#: parted/ui.c:406 +msgid "" +"\n" +"Error: FPE_FLTOVF (Float: overflow)" +msgstr "" +"\n" +"შეცდáƒáƒ›áƒ: FPE_FLTOVF (წილáƒáƒ“ი რიცხვების მáƒáƒ¥áƒ¡áƒ˜áƒ›áƒáƒšáƒ£áƒ ი მნიშვნელáƒáƒ‘ის გáƒáƒ“áƒáƒªáƒ˜áƒšáƒ”ბáƒ)" + +#: parted/ui.c:411 +msgid "" +"\n" +"Error: FPE_FLTUND (Float: underflow)" +msgstr "" +"\n" +"შეცდáƒáƒ›áƒ: FPE_FLTUND (წილáƒáƒ“ი რიცხვების მინიმáƒáƒšáƒ£áƒ ი მნიშვნელáƒáƒ‘áƒáƒ–ე ჩáƒáƒ›áƒáƒªáƒ˜áƒšáƒ”ბáƒ)" + +#: parted/ui.c:416 +msgid "" +"\n" +"Error: FPE_FLTRES (Float: inexact result)" +msgstr "" +"\n" +"შეცდáƒáƒ›áƒ: FPE_FLTRES (áƒáƒ áƒáƒ–უსტი შედეგი)" + +#: parted/ui.c:421 +msgid "" +"\n" +"Error: FPE_FLTINV (Float: invalid operation)" +msgstr "" +"\n" +"შეცდáƒáƒ›áƒ: FPE_FLTINV (წილáƒáƒ“ი რიცხვების áƒáƒ áƒáƒ¡áƒ¬áƒáƒ ი áƒáƒžáƒ”რáƒáƒªáƒ˜áƒ)" + +#: parted/ui.c:426 +msgid "" +"\n" +"Error: FPE_FLTSUB (Float: subscript out of range)" +msgstr "" +"\n" +"შეცდáƒáƒ›áƒ: FPE_FLTSUB (წილáƒáƒ“ი რიცხვის მნიშვნელáƒáƒ‘რდიáƒáƒžáƒáƒ–áƒáƒœáƒ¡ გáƒáƒ ეთáƒáƒ)" + +#: parted/ui.c:431 +msgid "" +"\n" +"Error: A general SIGFPE signal was encountered." +msgstr "" +"\n" +"შეცდáƒáƒ›áƒ: მიღებულირზáƒáƒ’áƒáƒ“ი SIGFPE სიგნáƒáƒšáƒ˜." + +#: parted/ui.c:455 +msgid "" +"\n" +"Error: ILL_ILLOPC (Illegal Opcode)" +msgstr "" +"\n" +"შეცდáƒáƒ›áƒ: ILL_ILLOPC (áƒáƒ áƒáƒ¡áƒ¬áƒáƒ ი áƒáƒžáƒ™áƒáƒ“ი)" + +#: parted/ui.c:460 +msgid "" +"\n" +"Error: ILL_ILLOPN (Illegal Operand)" +msgstr "" +"\n" +"შეცდმáƒ: ILL_ILLOPN (áƒáƒ áƒáƒ¡áƒ¬áƒáƒ ი áƒáƒžáƒ”რáƒáƒœáƒ“ი)" + +#: parted/ui.c:465 +msgid "" +"\n" +"Error: ILL_ILLADR (Illegal addressing mode)" +msgstr "" +"\n" +"შეცდáƒáƒ›áƒ: ILL_ILLADDR (დáƒáƒ›áƒ˜áƒ¡áƒáƒ›áƒáƒ თების áƒáƒ áƒáƒ¡áƒ¬áƒáƒ ი რეჟიმი)" + +#: parted/ui.c:470 +msgid "" +"\n" +"Error: ILL_ILLTRP (Illegal Trap)" +msgstr "" +"\n" +"შეცდáƒáƒ›áƒ: ILL_ILLTRP (áƒáƒ áƒáƒ¡áƒ¬áƒáƒ ი ჩáƒáƒáƒ”რáƒ)" + +#: parted/ui.c:475 +msgid "" +"\n" +"Error: ILL_PRVOPC (Privileged Opcode)" +msgstr "" +"\n" +"შეცდáƒáƒ›áƒ: ILL_PRVOPC (პრივილეგირებული áƒáƒžáƒ™áƒáƒ“ი)" + +#: parted/ui.c:480 +msgid "" +"\n" +"Error: ILL_PRVREG (Privileged Register)" +msgstr "" +"\n" +"შეცდáƒáƒ›áƒ: ILL_PRVREG (პრივილეგირებულ რეგისტრი)" + +#: parted/ui.c:485 +msgid "" +"\n" +"Error: ILL_COPROC (Coprocessor Error)" +msgstr "" +"\n" +"შეცდáƒáƒ›áƒ: ILL_COPROC (კáƒáƒžáƒ áƒáƒªáƒ”სáƒáƒ ის შეცდáƒáƒ›áƒ)" + +#: parted/ui.c:490 +msgid "" +"\n" +"Error: ILL_BADSTK (Internal Stack Error)" +msgstr "" +"\n" +"შეცდáƒáƒ›áƒ: ILL_BADSTK (სტეკის შიდრშეცდáƒáƒ›áƒ)" + +#: parted/ui.c:495 +msgid "" +"\n" +"Error: A general SIGILL signal was encountered." +msgstr "" +"\n" +"შეცდáƒáƒ›áƒ: მიღებულირზáƒáƒ’áƒáƒ“ი SIGILL სიგნáƒáƒšáƒ˜." + +#: parted/ui.c:904 +#, c-format +msgid "invalid token: %s" +msgstr "áƒáƒ áƒáƒ¡áƒ¬áƒáƒ ი კáƒáƒ“ი: %s" + +#: parted/ui.c:1085 +msgid "Expecting a partition number." +msgstr "მáƒáƒ•áƒ”ლáƒáƒ“ი დáƒáƒœáƒáƒ§áƒáƒ¤áƒ˜áƒ¡ ნáƒáƒ›áƒ”რს." + +#: parted/ui.c:1094 +msgid "Partition doesn't exist." +msgstr "დáƒáƒœáƒáƒ§áƒáƒ¤áƒ˜ áƒáƒ áƒáƒ სებáƒáƒ‘ს." + +#: parted/ui.c:1114 +msgid "Expecting a file system type." +msgstr "მáƒáƒ¡áƒáƒšáƒáƒ“ნელირფáƒáƒ˜áƒšáƒ£áƒ ი სისტემის ტიპი." + +#: parted/ui.c:1121 +#, c-format +msgid "Unknown file system type \"%s\"." +msgstr "ფáƒáƒ˜áƒšáƒ£áƒ ი სისტემის უცნáƒáƒ‘ი ტიპი \"%s\"." + +#: parted/ui.c:1142 +msgid "Expecting a disk label type." +msgstr "მáƒáƒ•áƒ”ლáƒáƒ“ი დისკის áƒáƒ“ის ტიპს." + +#: parted/ui.c:1173 parted/ui.c:1209 +msgid "No flags supported" +msgstr "áƒáƒšáƒ›áƒ”ბს მხáƒáƒ დáƒáƒáƒ”რის გáƒáƒ ეშე" + +#: parted/ui.c:1283 +msgid "Can't create any more partitions." +msgstr "მეტი დáƒáƒœáƒáƒ§áƒáƒ¤áƒ˜áƒ¡ შექმნრშეუძლებელიáƒ." + +#: parted/ui.c:1293 +msgid "Expecting a partition type." +msgstr "მáƒáƒ•áƒ”ლáƒáƒ“ი დáƒáƒœáƒáƒ§áƒáƒ¤áƒ˜áƒ¡ ტიპს." + +#: parted/ui.c:1442 +msgid "on" +msgstr "ჩáƒáƒ თული" + +#: parted/ui.c:1443 +msgid "off" +msgstr "გáƒáƒ›áƒáƒ თული" + +#: parted/ui.c:1460 +msgid "optimal" +msgstr "áƒáƒžáƒ¢áƒ˜áƒ›áƒáƒšáƒ£áƒ ი" + +#: parted/ui.c:1461 +msgid "minimal" +msgstr "მინიმáƒáƒšáƒ£áƒ ი" + +#: parted/ui.c:1594 +msgid "OPTIONs:" +msgstr "პáƒáƒ áƒáƒ›áƒ”ტრები:" + +#: parted/ui.c:1599 +msgid "COMMANDs:" +msgstr "ბრძáƒáƒœáƒ”ბები:" + +#: parted/ui.c:1602 +#, c-format +msgid "" +"\n" +"Report bugs to %s\n" +msgstr "" +"\n" +"შეცდáƒáƒ›áƒ”ბის შესáƒáƒ®áƒ”ბ მიწერეთ: %s\n" + +#: parted/ui.c:1609 +#, c-format +msgid "Using %s\n" +msgstr "სáƒáƒ›áƒ£áƒ¨áƒáƒ მáƒáƒ¬áƒ§áƒáƒ‘ილáƒáƒ‘áƒ: %s\n" + +#: parted/ui.c:1689 +msgid "This command does not make sense in non-interactive mode.\n" +msgstr "áƒáƒ› ბრძáƒáƒœáƒ”ბáƒáƒ¡ áƒáƒ áƒáƒ˜áƒœáƒ¢áƒ”რáƒáƒ¥áƒ¢áƒ˜áƒ£áƒ რეჟიმში áƒáƒ–რი áƒáƒ áƒáƒ¥áƒ•áƒ¡.\n" + +#~ msgid "Extended partitions cannot be hidden on msdos disk labels." +#~ msgstr "" +#~ "MSDOS-ის ტიპის დისკის áƒáƒ“ეზე გáƒáƒ¤áƒáƒ თáƒáƒ”ბული დáƒáƒœáƒáƒ§áƒáƒ¤áƒ”ბი დáƒáƒ›áƒáƒšáƒ£áƒšáƒ˜ áƒáƒ შეიძლებრ" +#~ "იყáƒáƒ¡." + +#~ msgid "" +#~ "Extended partitions cannot be recovery partitions on msdos disk labels." +#~ msgstr "" +#~ "MSDOS-ის ტიპის დისკის áƒáƒ“ეზე გáƒáƒ¤áƒáƒ თáƒáƒ”ბული დáƒáƒœáƒáƒ§áƒáƒ¤áƒ”ბი áƒáƒ¦áƒ“გენის áƒáƒ შეიძლებრ" +#~ "იყáƒáƒ¡." Binary files differ@@ -6,7 +6,7 @@ msgid "" msgstr "" "Project-Id-Version: parted 3.4.64.2\n" "Report-Msgid-Bugs-To: bug-parted@gnu.org\n" -"POT-Creation-Date: 2022-04-18 14:44-0400\n" +"POT-Creation-Date: 2023-04-10 15:50-0700\n" "PO-Revision-Date: 2022-04-07 15:50+0900\n" "Last-Translator: Seong-ho Cho <darkcircle.0426@gmail.com>\n" "Language-Team: Korean <translation-team-ko@googlegroups.com>\n" @@ -18,25 +18,25 @@ msgstr "" "X-Generator: Poedit 2.3\n" "Plural-Forms: nplurals=1; plural=0;\n" -#: lib/argmatch.c:147 +#: lib/argmatch.c:145 #, c-format msgid "invalid argument %s for %s" msgstr "%2$sì˜ ìž˜ëª»ëœ %1$sì¸ìž" -#: lib/argmatch.c:148 +#: lib/argmatch.c:146 #, c-format msgid "ambiguous argument %s for %s" msgstr "%2$sì˜ ì• ë§¤í•œ ì¸ìž %1$s" -#: lib/argmatch.c:167 lib/argmatch.h:238 +#: lib/argmatch.c:165 lib/argmatch.h:237 msgid "Valid arguments are:" msgstr "ìœ íš¨í•œ ì¸ìž:" -#: lib/closeout.c:122 libparted/labels/fdasd.c:145 +#: lib/closeout.c:121 libparted/labels/fdasd.c:145 msgid "write error" msgstr "ê¸°ë¡ ì˜¤ë¥˜" -#: lib/error.c:195 +#: lib/error.c:193 msgid "Unknown system error" msgstr "ì•Œ 수 없는 시스템 오류" @@ -96,11 +96,11 @@ msgstr "%s: ì˜µì…˜ì— ì¸ìžê°€ 필요합니다 -- ‘%c’\n" #. If you don't know what to put here, please see #. <https://en.wikipedia.org/wiki/Quotation_marks_in_other_languages> #. and use glyphs suitable for your language. -#: lib/quotearg.c:355 +#: lib/quotearg.c:354 msgid "`" msgstr "`" -#: lib/quotearg.c:356 +#: lib/quotearg.c:355 msgid "'" msgstr "‘" @@ -182,7 +182,7 @@ msgstr "ì •ê·œ í‘œí˜„ì‹ ì•ž ë¶€ë¶„ì´ ì—†ìŠµë‹ˆë‹¤" #. To enquire the regular expression that your system uses for this #. purpose, you can use the command #. locale -k LC_MESSAGES | grep '^yesexpr=' -#: lib/rpmatch.c:150 +#: lib/rpmatch.c:149 msgid "^[yY]" msgstr "^[yY]" @@ -192,7 +192,7 @@ msgstr "^[yY]" #. To enquire the regular expression that your system uses for this #. purpose, you can use the command #. locale -k LC_MESSAGES | grep '^noexpr=' -#: lib/rpmatch.c:163 +#: lib/rpmatch.c:162 msgid "^[nN]" msgstr "^[nN]" @@ -747,158 +747,162 @@ msgstr "pmbr_boot" msgid "Unknown disk flag, %d." msgstr "ì•Œ 수 없는 %d ë””ìŠ¤í¬ í”Œëž˜ê·¸." -#: libparted/disk.c:1289 +#: libparted/disk.c:1320 #, c-format msgid "%s disk labels do not support extended partitions." msgstr "%s ë””ìŠ¤í¬ ë ˆì´ë¸”ì€ í™•ìž¥ ë¶„í• ì˜ì—ì„ ì§€ì›í•˜ì§€ 않습니다." -#: libparted/disk.c:1821 +#: libparted/disk.c:1990 #, c-format msgid "%s disk labels don't support logical or extended partitions." msgstr "" "%s ë””ìŠ¤í¬ ë ˆì´ë¸”ì€ ë…¼ë¦¬ ë¶„í• ì˜ì— ë˜ëŠ” 확장 ë¶„í• ì˜ì—ì„ ì§€ì›í•˜ì§€ 않습니다." -#: libparted/disk.c:1834 +#: libparted/disk.c:2003 msgid "Too many primary partitions." msgstr "주 ë¶„í• ì˜ì—ì´ ë„ˆë¬´ 많습니다." -#: libparted/disk.c:1843 +#: libparted/disk.c:2012 #, c-format msgid "" "Can't add a logical partition to %s, because there is no extended partition." msgstr "%sì— í™•ìž¥ ë¶„í• ì˜ì—ì´ ì—†ì–´ 논리 ë¶„í• ì˜ì—ì„ ì¶”ê°€í• ìˆ˜ 없습니다." -#: libparted/disk.c:1867 +#: libparted/disk.c:2036 #, c-format msgid "Can't have more than one extended partition on %s." msgstr "%sì— í•˜ë‚˜ ì´ìƒì˜ 확장 ë¶„í• ì˜ì—ì´ ì—†ìŠµë‹ˆë‹¤." -#: libparted/disk.c:1877 +#: libparted/disk.c:2046 msgid "Can't have logical partitions outside of the extended partition." msgstr "확장 ë¶„í• ì˜ì— ë°–ì— ë…¼ë¦¬ ë¶„í• ì˜ì—ì„ ë°°ì¹˜í• ìˆ˜ 없습니다." -#: libparted/disk.c:1902 +#: libparted/disk.c:2071 #, c-format msgid "Can't have a logical partition outside of the extended partition on %s." msgstr "%sì— í™•ìž¥ ë¶„í• ì˜ì— 밖으로 논리 ë¶„í• ì˜ì—ì„ ë°°ì¹˜í• ìˆ˜ 없습니다." -#: libparted/disk.c:1912 +#: libparted/disk.c:2081 msgid "Can't have a primary partition inside an extended partition." msgstr "확장 ë¶„í• ì˜ì— ì•ˆì— ì£¼ ë¶„í• ì˜ì—ì„ ë°°ì¹˜í• ìˆ˜ 없습니다." -#: libparted/disk.c:1921 +#: libparted/disk.c:2090 msgid "Can't have a partition outside the disk!" msgstr "ë””ìŠ¤í¬ ì˜ì— ë°–ì— ë¶„í• ì˜ì—ì„ ë°°ì¹˜í• ìˆ˜ 없습니다!" -#: libparted/disk.c:1972 libparted/disk.c:2150 +#: libparted/disk.c:2141 libparted/disk.c:2319 msgid "Can't have overlapping partitions." msgstr "ë¶„í• ì˜ì—ì„ ì¤‘ë³µ ì§€ì •í• ìˆ˜ 없습니다." -#: libparted/disk.c:2351 +#: libparted/disk.c:2520 msgid "metadata" msgstr "metadata" -#: libparted/disk.c:2353 +#: libparted/disk.c:2522 msgid "free" msgstr "free" -#: libparted/disk.c:2355 parted/ui.c:1271 parted/ui.c:1299 +#: libparted/disk.c:2524 parted/ui.c:1274 parted/ui.c:1302 msgid "extended" msgstr "extended" -#: libparted/disk.c:2357 parted/ui.c:1275 parted/ui.c:1303 +#: libparted/disk.c:2526 parted/ui.c:1278 parted/ui.c:1306 msgid "logical" msgstr "logical" -#: libparted/disk.c:2359 parted/ui.c:1267 parted/ui.c:1295 +#: libparted/disk.c:2528 parted/ui.c:1270 parted/ui.c:1298 msgid "primary" msgstr "primary" -#: libparted/disk.c:2375 +#: libparted/disk.c:2544 msgid "boot" msgstr "boot" -#: libparted/disk.c:2377 +#: libparted/disk.c:2546 msgid "bios_grub" msgstr "bios_grub" -#: libparted/disk.c:2379 +#: libparted/disk.c:2548 msgid "root" msgstr "root" -#: libparted/disk.c:2381 +#: libparted/disk.c:2550 msgid "swap" msgstr "swap" -#: libparted/disk.c:2383 +#: libparted/disk.c:2552 msgid "hidden" msgstr "hidden" -#: libparted/disk.c:2385 +#: libparted/disk.c:2554 msgid "raid" msgstr "RAID" -#: libparted/disk.c:2387 +#: libparted/disk.c:2556 msgid "lvm" msgstr "lvm" -#: libparted/disk.c:2389 +#: libparted/disk.c:2558 msgid "lba" msgstr "lba" -#: libparted/disk.c:2391 +#: libparted/disk.c:2560 msgid "hp-service" msgstr "hp-service" -#: libparted/disk.c:2393 +#: libparted/disk.c:2562 msgid "palo" msgstr "palo" -#: libparted/disk.c:2395 +#: libparted/disk.c:2564 msgid "prep" msgstr "prep" -#: libparted/disk.c:2397 +#: libparted/disk.c:2566 msgid "msftres" msgstr "msftres" -#: libparted/disk.c:2399 +#: libparted/disk.c:2568 msgid "msftdata" msgstr "msftdata" -#: libparted/disk.c:2401 +#: libparted/disk.c:2570 msgid "atvrecv" msgstr "atvrecv" -#: libparted/disk.c:2403 +#: libparted/disk.c:2572 msgid "diag" msgstr "diag" -#: libparted/disk.c:2405 +#: libparted/disk.c:2574 msgid "legacy_boot" msgstr "legacy_boot" -#: libparted/disk.c:2407 +#: libparted/disk.c:2576 msgid "irst" msgstr "irst" -#: libparted/disk.c:2409 +#: libparted/disk.c:2578 msgid "esp" msgstr "esp" -#: libparted/disk.c:2411 +#: libparted/disk.c:2580 msgid "chromeos_kernel" msgstr "chromeos_kernel" -#: libparted/disk.c:2413 +#: libparted/disk.c:2582 msgid "bls_boot" msgstr "bls_boot" -#: libparted/disk.c:2415 +#: libparted/disk.c:2584 msgid "linux-home" msgstr "linux-home" -#: libparted/disk.c:2421 +#: libparted/disk.c:2586 +msgid "no_automount" +msgstr "" + +#: libparted/disk.c:2592 #, c-format msgid "Unknown partition flag, %d." msgstr "ì•Œ 수 없는 ë¶„í• ì˜ì—ì˜ %d 플래그입니다." @@ -1090,8 +1094,8 @@ msgstr "" "둘 ë°°ì¹˜í–ˆì„ ë•Œ 주 ë¶„í• ì˜ì— %dê°œ ì´ìƒ)." #: libparted/labels/atari.c:1662 libparted/labels/bsd.c:563 -#: libparted/labels/dasd.c:895 libparted/labels/dos.c:2303 -#: libparted/labels/dvh.c:770 libparted/labels/gpt.c:1769 +#: libparted/labels/dasd.c:893 libparted/labels/dos.c:2294 +#: libparted/labels/dvh.c:770 libparted/labels/gpt.c:1891 #: libparted/labels/loop.c:244 libparted/labels/mac.c:1409 #: libparted/labels/pc98.c:697 libparted/labels/rdb.c:1054 #: libparted/labels/sun.c:781 @@ -1115,41 +1119,31 @@ msgstr "ë¶„í• ì˜ì— 번호를 í• ë‹¹í• ìˆ˜ 없습니다." msgid "Unable to allocate a bsd disklabel slot." msgstr "BSD ë””ìŠ¤í¬ ë ˆì´ë¸” ìŠ¬ë¡¯ì„ í• ë‹¹í• ìˆ˜ 없습니다." -#: libparted/labels/dasd.c:626 +#: libparted/labels/dasd.c:634 msgid "The partition table of DASD-LDL device cannot be changed.\n" msgstr "DASD-LDL ìž¥ì¹˜ì˜ ë¶„í• í…Œì´ë¸”ì„ ë°”ê¿€ 수 없습니다.\n" -#: libparted/labels/dasd.c:921 +#: libparted/labels/dasd.c:919 msgid "Unable to allocate a dasd disklabel slot" msgstr "DASD ë””ìŠ¤í¬ ë ˆì´ë¸” ìŠ¬ë¡¯ì„ í• ë‹¹í• ìˆ˜ 없습니다." -#: libparted/labels/dos.c:1008 +#: libparted/labels/dos.c:1159 #, c-format msgid "Invalid partition table on %s -- wrong signature %x." msgstr "%sì— ìž˜ëª»ëœ ë¶„í• ì˜ì— í…Œì´ë¸” -- ìž˜ëª»ëœ %x 서명." -#: libparted/labels/dos.c:1036 +#: libparted/labels/dos.c:1187 #, c-format msgid "Invalid partition table - recursive partition on %s." msgstr "ìž˜ëª»ëœ ë¶„í• ì˜ì— í…Œì´ë¸” - %sì— ìž¬ê·€ ë¶„í• ì˜ì—." -#: libparted/labels/dos.c:1567 -msgid "Extended partitions cannot be hidden on msdos disk labels." -msgstr "확장 ë¶„í• ì˜ì—ì€ MSDOS ë””ìŠ¤í¬ ë ˆì´ë¸”ì—ì„œ 숨길 수 없습니다." - -#: libparted/labels/dos.c:1579 -msgid "Extended partitions cannot be recovery partitions on msdos disk labels." -msgstr "" -"확장 ë¶„í• ì˜ì—ì€ MSDOS ë””ìŠ¤í¬ ë ˆì´ë¸”ì—ì„œ 복구 ë¶„í• ì˜ì—으로 ì§€ì •í• ìˆ˜ 없습니" -"다." - -#: libparted/labels/dos.c:2285 +#: libparted/labels/dos.c:2276 msgid "Parted can't resize partitions managed by Windows Dynamic Disk." msgstr "" "Partedì—서는 윈ë„ìš° ë™ì 디스í¬ì—ì„œ 관리하는 ë¶„í• ì˜ì—ì˜ í¬ê¸°ë¥¼ ì¡°ì ˆí• ìˆ˜ ì—†" "습니다." -#: libparted/labels/dos.c:2541 +#: libparted/labels/dos.c:2532 msgid "cannot create any more partitions" msgstr "ë¶„í• ì˜ì—ì„ ë” ë§Œë“¤ 수 없습니다." @@ -1290,11 +1284,11 @@ msgstr "ë¸”ë¡ í¬ê¸° ì •ë³´ë¥¼ ê°€ì ¸ì˜¬ 수 없습니다." msgid "Disk geometry does not match a DASD device of type 3390." msgstr "ë””ìŠ¤í¬ êµ¬ì¡° ì •ë³´ê°€ 3390 형ì‹ì˜ DASD ìž¥ì¹˜ì— ë§žì§€ 않습니다." -#: libparted/labels/gpt.c:569 +#: libparted/labels/gpt.c:589 msgid "device is too small for GPT" msgstr "GPT를 ì„¤ì •í•˜ê¸°ì—는 장치 ìš©ëŸ‰ì´ ë„ˆë¬´ 작습니다" -#: libparted/labels/gpt.c:771 +#: libparted/labels/gpt.c:791 #, c-format msgid "" "The format of the GPT partition table is version %x, which is newer than " @@ -1303,7 +1297,7 @@ msgstr "" "GPT ë¶„í• ì˜ì— í…Œì´ë¸” 형ì‹ì€ Partedì—ì„œ ì¸ì‹í• 수 있는 ë²„ì „ë³´ë‹¤ ë†’ì€ %x ë²„ì „" "ì„ ì§€ë‹ˆê³ ìžˆìŠµë‹ˆë‹¤. ë³´ê³ í•´ì£¼ì‹ì‹œì˜¤!" -#: libparted/labels/gpt.c:807 +#: libparted/labels/gpt.c:827 #, c-format msgid "" "Not all of the space available to %s appears to be used, you can fix the GPT " @@ -1314,7 +1308,7 @@ msgstr "" "%llu 블ë¡)ì„ ì‚¬ìš©í• ìˆ˜ 있ë„ë¡ GPT를 ìˆ˜ì •í• ìˆ˜ 있습니다. 아니면 현재 ì„¤ì • ìƒíƒœ" "ë¡œ ê³„ì† ì§„í–‰í•˜ì‹œê² ìŠµë‹ˆê¹Œ?" -#: libparted/labels/gpt.c:1006 +#: libparted/labels/gpt.c:1026 msgid "" "The backup GPT table is not at the end of the disk, as it should be. Fix, " "by moving the backup to the end (and removing the old backup)?" @@ -1323,7 +1317,7 @@ msgstr "" "다. 백업 ì˜ì—ì„ ë§ˆì§€ë§‰ìœ¼ë¡œ ì´ë™í•˜(ê³ ì´ì „ ë°±ì—…ì„ ì œê±°í•˜)ì—¬ ë¬¸ì œë¥¼ ìˆ˜ì •í•˜ì‹œê² " "습니까?" -#: libparted/labels/gpt.c:1024 +#: libparted/labels/gpt.c:1044 msgid "" "Both the primary and backup GPT tables are corrupt. Try making a fresh " "table, and using Parted's rescue feature to recover partitions." @@ -1331,7 +1325,7 @@ msgstr "" "주 GPT í…Œì´ë¸”ê³¼ 백업 GPT í…Œì´ë¸”ì´ ê¹¨ì¡ŒìŠµë‹ˆë‹¤. ë¶„í• ì˜ì—ì„ ë³µêµ¬í•˜ë ¤ë©´ í…Œì´ë¸”" "ì„ ìƒˆë¡œ ë§Œë“¤ê³ Partedì˜ ë³µêµ¬ ê¸°ëŠ¥ì„ ì‚¬ìš©í•˜ì‹ì‹œì˜¤." -#: libparted/labels/gpt.c:1035 +#: libparted/labels/gpt.c:1055 msgid "" "The backup GPT table is corrupt, but the primary appears OK, so that will be " "used." @@ -1339,7 +1333,7 @@ msgstr "" "백업 GPT í…Œì´ë¸”ì´ ê¹¨ì¡Œì§€ë§Œ, 주 GPT í…Œì´ë¸”ì€ ë¬¸ì œê°€ 없으므로 주 GPT í…Œì´ë¸”ì„ " "ì‚¬ìš©í•˜ê² ìŠµë‹ˆë‹¤." -#: libparted/labels/gpt.c:1047 +#: libparted/labels/gpt.c:1067 msgid "" "The primary GPT table is corrupt, but the backup appears OK, so that will be " "used." @@ -1347,11 +1341,11 @@ msgstr "" "주 GPT í…Œì´ë¸”ì´ ê¹¨ì¡Œì§€ë§Œ, 백업 GPT í…Œì´ë¸”ì€ ë¬¸ì œê°€ 없으므로 백업 GPT í…Œì´ë¸”" "ì„ ì‚¬ìš©í•˜ê² ìŠµë‹ˆë‹¤." -#: libparted/labels/gpt.c:1071 +#: libparted/labels/gpt.c:1091 msgid "primary partition table array CRC mismatch" msgstr "주 ë¶„í• ì˜ì— í…Œì´ë¸” ì–´ë ˆì´ CRCê°€ ì¼ì¹˜í•˜ì§€ 않습니다" -#: libparted/labels/gpt.c:1655 libparted/labels/gpt.c:1682 +#: libparted/labels/gpt.c:1722 libparted/labels/gpt.c:1749 msgid "failed to translate partition name" msgstr "ë¶„í• ì˜ì— ì´ë¦„ í•´ì„ì— ì‹¤íŒ¨í–ˆìŠµë‹ˆë‹¤." @@ -2007,7 +2001,7 @@ msgstr "fat_table_alloc_cluster: ì—¬ë¶„ì˜ í´ëŸ¬ìŠ¤í„°ê°€ 없습니다" msgid "Could not detect file system." msgstr "íŒŒì¼ ì‹œìŠ¤í…œì„ ë°œê²¬í• ìˆ˜ 없습니다." -#: libparted/fs/r/filesys.c:159 libparted/fs/r/filesys.c:284 +#: libparted/fs/r/filesys.c:159 libparted/fs/r/filesys.c:285 #, c-format msgid "resizing %s file systems is not supported" msgstr "%s íŒŒì¼ ì‹œìŠ¤í…œ í¬ê¸° ì¡°ì ˆ ê¸°ëŠ¥ì„ ì§€ì›í•˜ì§€ 않습니다" @@ -2287,39 +2281,39 @@ msgid "This HFS+ volume has no extents overflow file. This is quite unusual!" msgstr "" "HFS+ ë³¼ë¥¨ì— ë²”ìœ„ ì •ë³´ 오버플로우 파ì¼ì´ 없습니다. ìƒë‹¹ížˆ 드문 ì¼ìž…니다!" -#: parted/parted.c:137 +#: parted/parted.c:138 msgid "displays this help message" msgstr "ë„ì›€ë§ ë©”ì‹œì§€ë¥¼ 나타냅니다" -#: parted/parted.c:138 +#: parted/parted.c:139 msgid "lists partition layout on all block devices" msgstr "ëª¨ë“ ë¸”ë¡ ìž¥ì¹˜ì˜ ë¶„í• ì˜ì— 배치를 나타냅니다" -#: parted/parted.c:139 +#: parted/parted.c:140 msgid "displays machine parseable output" msgstr "기계 í•´ì„ ê°€ëŠ¥í•œ ì¶œë ¥ì„ ë‚˜íƒ€ëƒ…ë‹ˆë‹¤" -#: parted/parted.c:140 +#: parted/parted.c:141 msgid "displays JSON output" msgstr "JSON ì¶œë ¥ì„ í‘œì‹œí•©ë‹ˆë‹¤" -#: parted/parted.c:141 +#: parted/parted.c:142 msgid "never prompts for user intervention" msgstr "ì‚¬ìš©ìž ê°œìž… 여부를 묻지 ì•ŠìŒ" -#: parted/parted.c:142 +#: parted/parted.c:143 msgid "in script mode, fix instead of abort when asked" msgstr "스í¬ë¦½íŠ¸ 모드ì—서는, 물어볼 ë•Œ 멈추는 ëŒ€ì‹ ìˆ˜ì •í•©ë‹ˆë‹¤" -#: parted/parted.c:143 +#: parted/parted.c:144 msgid "displays the version" msgstr "ë²„ì „ ì •ë³´ë¥¼ 나타냅니다" -#: parted/parted.c:144 +#: parted/parted.c:145 msgid "alignment for new partitions" msgstr "새 ë¶„í• ì˜ì—ì˜ ì •ë ¬ ë°©ì‹" -#: parted/parted.c:157 +#: parted/parted.c:158 msgid "" "NUMBER is the partition number used by Linux. On MS-DOS disk labels, the " "primary partitions number from 1 to 4, logical partitions from 5 onwards.\n" @@ -2327,31 +2321,31 @@ msgstr "" "<번호>는 리눅스ì—ì„œ 사용하는 ë¶„í• ì˜ì— 번호입니다. MS-DOS ë””ìŠ¤í¬ ë ˆì´ë¸”ì—ì„œ, " "주 ë¶„í• ì˜ì— 번호는 1부터 4까지, 논리 ë¶„í• ì˜ì—ì€ 5 ì´í›„입니다.\n" -#: parted/parted.c:160 +#: parted/parted.c:161 msgid "LABEL-TYPE is one of: " msgstr "<ë ˆì´ë¸” 형ì‹>ì€ ë‹¤ìŒ ì¤‘ 하나입니다:" -#: parted/parted.c:161 parted/parted.c:162 +#: parted/parted.c:162 parted/parted.c:163 msgid "FLAG is one of: " msgstr "<플래그>는 ë‹¤ìŒ ì¤‘ 하나입니다:" -#: parted/parted.c:163 +#: parted/parted.c:164 msgid "UNIT is one of: " msgstr "<단위>는 ë‹¤ìŒ ì¤‘ 하나입니다:" -#: parted/parted.c:164 +#: parted/parted.c:165 msgid "desired alignment: minimum or optimal" msgstr "ì ì ˆí•œ ì •ë ¬ê°’: minimum ë˜ëŠ” optimal" -#: parted/parted.c:165 +#: parted/parted.c:166 msgid "PART-TYPE is one of: primary, logical, extended\n" msgstr "<ë¶„í• ì˜ì— 형ì‹>ì€ ë‹¤ìŒ ì¤‘ 하나입니다: primary, logical, extended\n" -#: parted/parted.c:167 +#: parted/parted.c:168 msgid "FS-TYPE is one of: " msgstr "<íŒŒì¼ ì‹œìŠ¤í…œ 형ì‹> ì€ ë‹¤ìŒ ì¤‘ 하나입니다:" -#: parted/parted.c:168 +#: parted/parted.c:169 msgid "" "START and END are disk locations, such as 4GB or 10%. Negative values count " "from the end of the disk. For example, -1s specifies exactly the last " @@ -2360,7 +2354,7 @@ msgstr "" "<시작>ê³¼ <ë>ì€ 4GB ë˜ëŠ” 10% ê°™ì€ ë””ìŠ¤í¬ ìœ„ì¹˜ìž…ë‹ˆë‹¤. ìŒìˆ˜ ê°’ì€ ë””ìŠ¤í¬ ë’·ë¶€ë¶„" "부터 계산한 값입니다. 예를 들면, -1ì€ ì •í™•ížˆ 마지막 섹터를 가리킵니다.\n" -#: parted/parted.c:171 +#: parted/parted.c:172 msgid "" "END is disk location, such as 4GB or 10%. Negative value counts from the " "end of the disk. For example, -1s specifies exactly the last sector.\n" @@ -2368,19 +2362,23 @@ msgstr "" "<ë>ì€ 4GB ë˜ëŠ” 10% ê°™ì€ ë””ìŠ¤í¬ ìœ„ì¹˜ìž…ë‹ˆë‹¤. ìŒìˆ˜ ê°’ì€ ë””ìŠ¤í¬ ë’·ë¶€ë¶„ë¶€í„° 계산" "í•œ 값입니다. 예를 들면, -1ì€ ì •í™•ížˆ 마지막 섹터를 가리킵니다.\n" -#: parted/parted.c:174 +#: parted/parted.c:175 msgid "STATE is one of: on, off\n" msgstr "<ìƒíƒœ>는 on, off 둘 중 하나입니다\n" -#: parted/parted.c:175 +#: parted/parted.c:176 msgid "DEVICE is usually /dev/hda or /dev/sda\n" msgstr "<장치>는 보통 /dev/hda ë˜ëŠ” /dev/sda입니다\n" -#: parted/parted.c:176 +#: parted/parted.c:177 msgid "NAME is any word you want\n" msgstr "<ì´ë¦„>ì€ ì›í•˜ëŠ” ì–´ë–¤ ë‹¨ì–´ë“ ë“¤ì–´ê°‘ë‹ˆë‹¤\n" -#: parted/parted.c:179 +#: parted/parted.c:178 +msgid "TYPE_ID is a value between 0x01 and 0xff, TYPE_UUID is a UUID\n" +msgstr "" + +#: parted/parted.c:182 msgid "" "Copyright (C) 1998 - 2006 Free Software Foundation, Inc.\n" "This program is free software, covered by the GNU General Public License.\n" @@ -2400,22 +2398,22 @@ msgstr "" "GNU General Public License for more details.\n" "\n" -#: parted/parted.c:229 +#: parted/parted.c:232 #, c-format msgid "%0.f%%\t(time left %.2d:%.2d)" msgstr "%0.f%%\t(ë‚¨ì€ ì‹œê°„: %.2d:%.2d)" -#: parted/parted.c:248 +#: parted/parted.c:251 #, c-format msgid "Partition %s is being used. Are you sure you want to continue?" msgstr "%s ë¶„í• ì˜ì—ì„ ì‚¬ìš©ì¤‘ìž…ë‹ˆë‹¤. ì •ë§ ê³„ì†í•˜ì‹œê² 습니까?" -#: parted/parted.c:269 +#: parted/parted.c:272 #, c-format msgid "Partition(s) on %s are being used." msgstr "%sì˜ ë¶„í• ê³µê°„ì„ ì‚¬ìš© 중입니다." -#: parted/parted.c:281 +#: parted/parted.c:284 #, c-format msgid "" "The existing disk label on %s will be destroyed and all data on this disk " @@ -2424,31 +2422,31 @@ msgstr "" "%sì˜ ê¸°ì¡´ ë””ìŠ¤í¬ ë ˆì´ë¸”ì„ ì—†ì• ë©° 디스í¬ì˜ ëª¨ë“ ë°ì´í„°ê°€ 사ë¼ì§‘니다. 계ì†í•˜ì‹œ" "ê² ìŠµë‹ˆê¹Œ?" -#: parted/parted.c:542 +#: parted/parted.c:545 msgid "New disk label type?" msgstr "새 ë””ìŠ¤í¬ ë ˆì´ë¸” 형ì‹?" -#: parted/parted.c:680 +#: parted/parted.c:692 msgid "Partition type?" msgstr "ë¶„í• ì˜ì— 형ì‹?" -#: parted/parted.c:698 parted/parted.c:902 +#: parted/parted.c:710 parted/parted.c:914 msgid "Partition name?" msgstr "ë¶„í• ì˜ì— ì´ë¦„?" -#: parted/parted.c:708 +#: parted/parted.c:720 msgid "File system type?" msgstr "íŒŒì¼ ì‹œìŠ¤í…œ 형ì‹?" -#: parted/parted.c:713 parted/parted.c:1683 +#: parted/parted.c:725 parted/parted.c:1815 msgid "Start?" msgstr "시작ì ?" -#: parted/parted.c:715 parted/parted.c:1685 parted/parted.c:1768 +#: parted/parted.c:727 parted/parted.c:1817 parted/parted.c:1900 msgid "End?" msgstr "ëì ?" -#: parted/parted.c:782 +#: parted/parted.c:794 #, c-format msgid "" "You requested a partition from %s to %s (sectors %llu..%llu).\n" @@ -2457,7 +2455,7 @@ msgstr "" "%s부터 %s까지(%llu..%llu 섹터) ì˜ì— ë¶„í• ì„ ìš”ì²í–ˆìŠµë‹ˆë‹¤.\n" "ê´€ë¦¬í• ìˆ˜ 있는 가까운 위치는 %s부터 %s까지(%llu..%llu 섹터)입니다.%s" -#: parted/parted.c:791 +#: parted/parted.c:803 msgid "" "\n" "Is this still acceptable to you?" @@ -2465,94 +2463,119 @@ msgstr "" "\n" "ì—¬ì „ížˆ 만족합니까?" -#: parted/parted.c:814 +#: parted/parted.c:826 #, c-format msgid "" "The resulting partition is not properly aligned for best performance: %s" msgstr "" "최ì ì„±ëŠ¥ì„ ëª©ì 으로 ë¶„í• ì˜ì— 배치 ê³¼ì •ì—ì„œ ì œëŒ€ë¡œ ì •ë ¬í•˜ì§€ 않았습니다: %s" -#: parted/parted.c:816 parted/parted.c:1925 +#: parted/parted.c:828 parted/parted.c:2057 msgid "unknown (malloc failed)" msgstr "ì•Œ 수 ì—†ìŒ(malloc 실패)" -#: parted/parted.c:894 +#: parted/parted.c:906 #, c-format msgid "%s disk labels do not support partition name." msgstr "%s ë””ìŠ¤í¬ ë ˆì´ë¸”ì€ ë¶„í• ì˜ì— ì´ë¦„ì„ ì§€ì›í•˜ì§€ 않습니다." -#: parted/parted.c:899 parted/parted.c:1748 parted/parted.c:1814 -#: parted/parted.c:1908 parted/parted.c:1983 +#: parted/parted.c:911 parted/parted.c:955 parted/parted.c:1880 +#: parted/parted.c:1946 parted/parted.c:2040 parted/parted.c:2115 msgid "Partition number?" msgstr "ë¶„í• ì˜ì— 번호?" -#: parted/parted.c:1050 +#: parted/parted.c:949 +#, fuzzy, c-format +msgid "%s disk labels do not support partition type." +msgstr "%s ë””ìŠ¤í¬ ë ˆì´ë¸”ì€ ë¶„í• ì˜ì— ì´ë¦„ì„ ì§€ì›í•˜ì§€ 않습니다." + +#: parted/parted.c:965 +#, fuzzy +msgid "Partition type-id?" +msgstr "ë¶„í• ì˜ì— 형ì‹?" + +#: parted/parted.c:972 +#, fuzzy +msgid "Invalid type-id." +msgstr "ìž˜ëª»ëœ ìˆ«ìž ê°’." + +#: parted/parted.c:986 +#, fuzzy +msgid "Partition type-uuid?" +msgstr "ë¶„í• ì˜ì— 형ì‹?" + +#: parted/parted.c:993 +#, fuzzy +msgid "Invalid type-uuid." +msgstr "ìž˜ëª»ëœ ìˆ«ìž ê°’." + +#: parted/parted.c:1146 #, c-format msgid "BIOS cylinder,head,sector geometry: %d,%d,%d. Each cylinder is %s.\n" msgstr "BIOS 실린ë”,헤드,섹터 í¬ê¸°: %d,%d,%d. ê° ì‹¤ë¦°ë”는 %s 입니다.\n" -#: parted/parted.c:1137 +#: parted/parted.c:1240 #, c-format msgid "Model: %s (%s)\n" msgstr "모ë¸: %s (%s)\n" -#: parted/parted.c:1139 +#: parted/parted.c:1242 #, c-format msgid "Disk %s: %s\n" msgstr "%s 디스í¬: %s\n" -#: parted/parted.c:1140 +#: parted/parted.c:1243 #, c-format msgid "Sector size (logical/physical): %lldB/%lldB\n" msgstr "섹터 í¬ê¸°(논리/ì‹¤ì œ): %lld/B%lldB\n" -#: parted/parted.c:1152 +#: parted/parted.c:1255 #, c-format msgid "Partition Table: %s\n" msgstr "ë¶„í• ì˜ì— í…Œì´ë¸”: %s\n" -#: parted/parted.c:1153 +#: parted/parted.c:1256 #, c-format msgid "Disk Flags: %s\n" msgstr "ë””ìŠ¤í¬ í”Œëž˜ê·¸: %s\n" -#: parted/parted.c:1279 parted/parted.c:1282 +#: parted/parted.c:1388 parted/parted.c:1391 msgid "Number" msgstr "번호" -#: parted/parted.c:1279 parted/parted.c:1282 +#: parted/parted.c:1388 parted/parted.c:1391 msgid "Start" msgstr "시작" -#: parted/parted.c:1280 parted/parted.c:1283 +#: parted/parted.c:1389 parted/parted.c:1392 msgid "End" msgstr "ë" -#: parted/parted.c:1283 +#: parted/parted.c:1392 msgid "Size" msgstr "í¬ê¸°" -#: parted/parted.c:1287 +#: parted/parted.c:1396 msgid "Type" msgstr "형ì‹" -#: parted/parted.c:1289 +#: parted/parted.c:1398 msgid "File system" msgstr "íŒŒì¼ ì‹œìŠ¤í…œ" -#: parted/parted.c:1292 +#: parted/parted.c:1401 msgid "Name" msgstr "ì´ë¦„" -#: parted/parted.c:1294 +#: parted/parted.c:1403 msgid "Flags" msgstr "플래그" -#: parted/parted.c:1352 +#: parted/parted.c:1461 msgid "Free Space" msgstr "여분 공간" -#: parted/parted.c:1570 +#: parted/parted.c:1702 #, c-format msgid "" "A %s %s partition was found at %s -> %s. Do you want to add it to the " @@ -2561,57 +2584,57 @@ msgstr "" "%s %s ë¶„í• ì˜ì—ì„ %s->%sì—ì„œ 찾았습니다. ì´ ë¶„í• ì˜ì—ì„ ë¶„í• ì˜ì— í…Œì´ë¸”ì— ì¶”" "ê°€í•˜ì‹œê² ìŠµë‹ˆê¹Œ?" -#: parted/parted.c:1613 +#: parted/parted.c:1745 msgid "searching for file systems" msgstr "íŒŒì¼ ì‹œìŠ¤í…œ 검색 중" -#: parted/parted.c:1720 +#: parted/parted.c:1852 msgid "The resize command has been removed in parted 3.0" msgstr "Parted 3.0ì—ì„œ resize ëª…ë ¹ì„ ì œê±°í–ˆìŠµë‹ˆë‹¤" -#: parted/parted.c:1782 +#: parted/parted.c:1914 msgid "" "Shrinking a partition can cause data loss, are you sure you want to continue?" msgstr "" "ë¶„í• ì˜ì— ê³µê°„ì„ ì¤„ì´ë©´ ë°ì´í„°ë¥¼ ìžƒì„ ìˆ˜ 있습니다. ì •ë§ë¡œ 계ì†í•˜ì‹œê² 습니까?" -#: parted/parted.c:1838 +#: parted/parted.c:1970 msgid "New device?" msgstr "새 장치?" -#: parted/parted.c:1906 +#: parted/parted.c:2038 msgid "alignment type(min/opt)" msgstr "ì •ë ¬ 형ì‹(min/opt)" -#: parted/parted.c:1921 +#: parted/parted.c:2053 #, c-format msgid "%d aligned\n" msgstr "ë¶„í• ì˜ì— %dì€(는) ì •ë ¬ ìƒíƒœìž„\n" -#: parted/parted.c:1923 +#: parted/parted.c:2055 #, c-format msgid "%d not aligned: %s\n" msgstr "" "%dë²ˆì„ ì •ë ¬í•˜ì§€ ì•ŠìŒ: %s\n" "\n" -#: parted/parted.c:1948 parted/parted.c:1985 +#: parted/parted.c:2080 parted/parted.c:2117 msgid "Flag to Invert?" msgstr "ë°˜ì „í• í”Œëž˜ê·¸?" -#: parted/parted.c:1953 parted/parted.c:1990 +#: parted/parted.c:2085 parted/parted.c:2122 msgid "New state?" msgstr "새 ìƒíƒœ?" -#: parted/parted.c:2036 +#: parted/parted.c:2168 msgid "Unit?" msgstr "단위?" -#: parted/parted.c:2171 +#: parted/parted.c:2303 msgid "align-check" msgstr "align-check" -#: parted/parted.c:2174 +#: parted/parted.c:2306 msgid "" "align-check TYPE N check partition N for TYPE(min|opt) " "alignment" @@ -2619,11 +2642,11 @@ msgstr "" "align-check <형ì‹> <번호> <번호> ë¶„í• ì˜ì—ì˜ ì§€ì • <형ì‹" ">(min|opt) ì •ë ¬ ìƒíƒœë¥¼ 검사합니다" -#: parted/parted.c:2182 +#: parted/parted.c:2314 msgid "help" msgstr "help" -#: parted/parted.c:2185 +#: parted/parted.c:2317 msgid "" "help [COMMAND] print general help, or help on " "COMMAND" @@ -2631,15 +2654,15 @@ msgstr "" "help [<ëª…ë ¹>] ì¼ë°˜ ë„ì›€ë§ ë˜ëŠ” <ëª…ë ¹> ë„움ë§ì„ ì¶œë ¥" "합니다" -#: parted/parted.c:2191 +#: parted/parted.c:2323 msgid "mklabel" msgstr "mklabel" -#: parted/parted.c:2191 +#: parted/parted.c:2323 msgid "mktable" msgstr "mktable" -#: parted/parted.c:2194 +#: parted/parted.c:2326 msgid "" "mklabel,mktable LABEL-TYPE create a new disklabel (partition " "table)" @@ -2647,17 +2670,17 @@ msgstr "" "mklabel,mktable <ë ˆì´ë¸” 형ì‹> 새 ë””ìŠ¤í¬ ë ˆì´ë¸”(ë¶„í• ì˜ì— í…Œì´ë¸”)" "ì„ ë§Œë“니다" -#: parted/parted.c:2200 +#: parted/parted.c:2332 msgid "mkpart" msgstr "mkpart" -#: parted/parted.c:2203 +#: parted/parted.c:2335 msgid "mkpart PART-TYPE [FS-TYPE] START END make a partition" msgstr "" "mkpart <ë¶„í• ì˜ì— 형ì‹> [<íŒŒì¼ ì‹œìŠ¤í…œ 형ì‹>] <시작> <ë> ë¶„í• ì˜ì—ì„ ë§Œë“" "니다" -#: parted/parted.c:2209 +#: parted/parted.c:2341 msgid "" "'mkpart' makes a partition without creating a new file system on the " "partition. FS-TYPE may be specified to set an appropriate partition ID.\n" @@ -2665,21 +2688,21 @@ msgstr "" "‘mkpart’는 ë¶„í• ì˜ì—ì— ìƒˆ íŒŒì¼ ì‹œìŠ¤í…œì„ ë§Œë“¤ì§€ ì•Šê³ ë¶„í• ì˜ì—ì„ ë§Œë“니다. <파" "ì¼ ì‹œìŠ¤í…œ 형ì‹>ì— ì 당한 ë¶„í• ì˜ì— ID를 ì„¤ì •í•´ì•¼ 합니다.\n" -#: parted/parted.c:2214 +#: parted/parted.c:2346 msgid "name" msgstr "name" -#: parted/parted.c:2217 +#: parted/parted.c:2349 msgid "name NUMBER NAME name partition NUMBER as NAME" msgstr "" "name <번호> <ì´ë¦„> <번호> ë¶„í• ì˜ì—ì˜ ì´ë¦„ì„ <ì´ë¦„>으" "ë¡œ ì§€ì •í•©ë‹ˆë‹¤" -#: parted/parted.c:2222 +#: parted/parted.c:2354 msgid "print" msgstr "print" -#: parted/parted.c:2225 +#: parted/parted.c:2357 msgid "" "print [devices|free|list,all] display the partition table, or " "available devices, or free space, or all found partitions" @@ -2687,7 +2710,7 @@ msgstr "" "print [devices|free|list,all] ë¶„í• ì˜ì— í…Œì´ë¸”, 존재 장치, 여분 공간, ë°œ" "견한 ëª¨ë“ ë¶„í• ì˜ì—ì„ ë‚˜íƒ€ëƒ…ë‹ˆë‹¤" -#: parted/parted.c:2229 +#: parted/parted.c:2361 msgid "" "Without arguments, 'print' displays the entire partition table. However with " "the following arguments it performs various other actions.\n" @@ -2695,11 +2718,11 @@ msgstr "" "‘print’ ëª…ë ¹ì— ì¸ìžë¥¼ 빼면 ì „ì²´ ë¶„í• ì˜ì— í…Œì´ë¸”ì„ ë‚˜íƒ€ëƒ…ë‹ˆë‹¤. 하지만 ë‹¤ìŒ ì¸" "ìž ê°’ì„ ë„£ìœ¼ë©´ 다양한 다른 ë™ìž‘ì„ ìˆ˜í–‰í•©ë‹ˆë‹¤.\n" -#: parted/parted.c:2231 +#: parted/parted.c:2363 msgid " devices : display all active block devices\n" msgstr " devices : ëª¨ë“ í™œì„± ë¸”ë¡ ìž¥ì¹˜ë¥¼ 나타냅니다\n" -#: parted/parted.c:2232 +#: parted/parted.c:2364 msgid "" " free : display information about free unpartitioned space on the " "current block device\n" @@ -2707,24 +2730,24 @@ msgstr "" " free : 현재 ë¸”ë¡ ìž¥ì¹˜ì—ì„œ ë¶„í• ì˜ì—으로 ì§€ì •í•˜ì§€ ì•Šì€ ì—¬ë¶„ì˜ ê³µê°„ ì •ë³´" "를 나타냅니다\n" -#: parted/parted.c:2234 +#: parted/parted.c:2366 msgid "" " list, all : display the partition tables of all active block devices\n" msgstr " list, all : ëª¨ë“ í™œì„± ë¸”ë¡ ìž¥ì¹˜ì˜ ë¶„í• ì˜ì— í…Œì´ë¸”ì„ ë‚˜íƒ€ëƒ…ë‹ˆë‹¤\n" -#: parted/parted.c:2238 +#: parted/parted.c:2370 msgid "quit" msgstr "quit" -#: parted/parted.c:2241 +#: parted/parted.c:2373 msgid "quit exit program" msgstr "quit í”„ë¡œê·¸ëž¨ì„ ë¹ ì ¸ 나갑니다" -#: parted/parted.c:2246 +#: parted/parted.c:2378 msgid "rescue" msgstr "rescue" -#: parted/parted.c:2249 +#: parted/parted.c:2381 msgid "" "rescue START END rescue a lost partition near START " "and END" @@ -2732,56 +2755,56 @@ msgstr "" "rescue <시작> <ë> <시작> ë° <ë> ì˜ì— ì£¼ë³€ì˜ ì†Œì‹¤ 분" "í• ì˜ì—ì„ ë³µì›í•©ë‹ˆë‹¤" -#: parted/parted.c:2255 +#: parted/parted.c:2387 msgid "resize" msgstr "resize" -#: parted/parted.c:2258 +#: parted/parted.c:2390 msgid "The resize command was removed in parted 3.0\n" msgstr "Parted 3.0ì—ì„œ resize ëª…ë ¹ì„ ì œê±°í–ˆìŠµë‹ˆë‹¤\n" -#: parted/parted.c:2261 +#: parted/parted.c:2393 msgid "resizepart" msgstr "resizepart" -#: parted/parted.c:2264 +#: parted/parted.c:2396 msgid "resizepart NUMBER END resize partition NUMBER" msgstr "" "resizepart <번호> <ë> <번호> ë¶„í• ì˜ì—ì˜ í¬ê¸°ë¥¼ ì¡°ì ˆí•©ë‹ˆ" "다" -#: parted/parted.c:2269 +#: parted/parted.c:2401 msgid "rm" msgstr "rm" -#: parted/parted.c:2272 +#: parted/parted.c:2404 msgid "rm NUMBER delete partition NUMBER" msgstr "rm <번호> <번호> ë¶„í• ì˜ì—ì„ ì‚ì œí•©ë‹ˆë‹¤" -#: parted/parted.c:2277 +#: parted/parted.c:2409 msgid "select" msgstr "select" -#: parted/parted.c:2280 +#: parted/parted.c:2412 msgid "select DEVICE choose the device to edit" msgstr "select <장치> íŽ¸ì§‘í• ìž¥ì¹˜ë¥¼ ì„ íƒí•©ë‹ˆë‹¤" -#: parted/parted.c:2285 +#: parted/parted.c:2417 msgid "disk_set" msgstr "disk_set" -#: parted/parted.c:2288 +#: parted/parted.c:2420 msgid "" "disk_set FLAG STATE change the FLAG on selected device" msgstr "" "disk_set <플래그> <ìƒíƒœ> ì„ íƒí•œ ìž¥ì¹˜ì˜ <플래그> ê°’ì„ ë°”" "꿉니다" -#: parted/parted.c:2293 +#: parted/parted.c:2425 msgid "disk_toggle" msgstr "disk_toggle" -#: parted/parted.c:2296 +#: parted/parted.c:2428 msgid "" "disk_toggle [FLAG] toggle the state of FLAG on " "selected device" @@ -2789,22 +2812,22 @@ msgstr "" "disk_toggle [<플래그>] ì„ íƒí•œ ìž¥ì¹˜ì˜ <플래그> ìƒíƒœë¥¼ ì „" "환합니다" -#: parted/parted.c:2302 +#: parted/parted.c:2434 msgid "set" msgstr "set" -#: parted/parted.c:2305 +#: parted/parted.c:2437 msgid "" "set NUMBER FLAG STATE change the FLAG on partition NUMBER" msgstr "" "set <번호> <플래그> <ìƒíƒœ> <번호> ë¶„í• ì˜ì—ì˜ <플래그> ê°’" "ì„ ë°”ê¿‰ë‹ˆë‹¤" -#: parted/parted.c:2311 +#: parted/parted.c:2443 msgid "toggle" msgstr "toggle" -#: parted/parted.c:2314 +#: parted/parted.c:2446 msgid "" "toggle [NUMBER [FLAG]] toggle the state of FLAG on " "partition NUMBER" @@ -2812,21 +2835,31 @@ msgstr "" "toggle [<번호> [<플래그>]] <번호> ë¶„í• ì˜ì—ì˜ <플래그> ìƒíƒœ" "를 ì „í™˜í•©ë‹ˆë‹¤" -#: parted/parted.c:2320 +#: parted/parted.c:2452 +msgid "type" +msgstr "" + +#: parted/parted.c:2455 +msgid "" +"type NUMBER TYPE-ID or TYPE-UUID type set TYPE-ID or TYPE-UUID of " +"partition NUMBER" +msgstr "" + +#: parted/parted.c:2460 msgid "unit" msgstr "unit" -#: parted/parted.c:2323 +#: parted/parted.c:2463 msgid "unit UNIT set the default unit to UNIT" msgstr "" "unit <단위> 기본 단위를 <단위> 값으로 ì„¤ì •í•©ë‹ˆ" "다" -#: parted/parted.c:2328 +#: parted/parted.c:2468 msgid "version" msgstr "version" -#: parted/parted.c:2331 +#: parted/parted.c:2471 msgid "" "version display the version number and " "copyright information of GNU Parted" @@ -2834,7 +2867,7 @@ msgstr "" "version GNU Partedì˜ ë²„ì „ 번호와 ì €ìž‘ ì •ë³´" "를 나타냅니다" -#: parted/parted.c:2335 +#: parted/parted.c:2475 msgid "" "'version' displays copyright and version information corresponding to this " "copy of GNU Parted\n" @@ -2842,21 +2875,21 @@ msgstr "" "‘version’ ëª…ë ¹ì€ GNU Parted 사본과 ê´€ë ¨ëœ ì €ìž‘ ì •ë³´ì™€ ë²„ì „ ì •ë³´ë¥¼ 나타냅니" "다\n" -#: parted/parted.c:2405 +#: parted/parted.c:2545 #, c-format msgid "Usage: %s [-hlmsfv] [-a<align>] [DEVICE [COMMAND [PARAMETERS]]...]\n" msgstr "" "사용법: %s [-hlmsfv] [-a<ì •ë ¬ë°©ì‹>] [<장치> [<ëª…ë ¹> [<매개변수>]]...]\n" -#: parted/parted.c:2449 +#: parted/parted.c:2589 msgid "No device found" msgstr "장치가 없습니다" -#: parted/parted.c:2486 +#: parted/parted.c:2626 msgid "WARNING: You are not superuser. Watch out for permissions.\n" msgstr "ê²½ê³ : 관리ìžê°€ 아닙니다. ê¶Œí•œì„ í™•ì¸í•˜ì‹ì‹œì˜¤.\n" -#: parted/parted.c:2519 +#: parted/parted.c:2659 msgid "" "You should reinstall your boot loader before rebooting. Read section 4 of " "the Parted User documentation for more information." @@ -2864,7 +2897,7 @@ msgstr "" "다시 부팅하기 ì „ 부트 ë¡œë”를 다시 설치해야 합니다. ìžì„¸í•œ ì •ë³´ëŠ” Parted 사용" "ìž ë¬¸ì„œ 4ìž¥ì„ ì‚´íŽ´ë³´ì‹ì‹œì˜¤." -#: parted/parted.c:2526 +#: parted/parted.c:2666 msgid "You may need to update /etc/fstab.\n" msgstr "/etc/fstab ì •ë³´ë¥¼ ì—…ë°ì´íŠ¸í•´ì•¼ 합니다.\n" @@ -3122,69 +3155,69 @@ msgstr "" "\n" "오류: ì¼ë°˜ SIGILL 시그ë„ì´ ë°œìƒí–ˆìŠµë‹ˆë‹¤." -#: parted/ui.c:901 +#: parted/ui.c:904 #, c-format msgid "invalid token: %s" msgstr "ìž˜ëª»ëœ í† í°: %s" -#: parted/ui.c:1082 +#: parted/ui.c:1085 msgid "Expecting a partition number." msgstr "ë¶„í• ì˜ì— 번호가 필요합니다." -#: parted/ui.c:1091 +#: parted/ui.c:1094 msgid "Partition doesn't exist." msgstr "ë¶„í• ì˜ì—ì´ ì—†ìŠµë‹ˆë‹¤." -#: parted/ui.c:1111 +#: parted/ui.c:1114 msgid "Expecting a file system type." msgstr "íŒŒì¼ ì‹œìŠ¤í…œ 형ì‹ì´ 필요합니다." -#: parted/ui.c:1118 +#: parted/ui.c:1121 #, c-format msgid "Unknown file system type \"%s\"." msgstr "ì•Œ 수 없는 íŒŒì¼ ì‹œìŠ¤í…œ í˜•ì‹ â€œ%sâ€." -#: parted/ui.c:1139 +#: parted/ui.c:1142 msgid "Expecting a disk label type." msgstr "ë””ìŠ¤í¬ ë ˆì´ë¸” 형ì‹ì´ 필요합니다." -#: parted/ui.c:1170 parted/ui.c:1206 +#: parted/ui.c:1173 parted/ui.c:1209 msgid "No flags supported" msgstr "지ì›í•˜ëŠ” 플래그 ì—†ìŒ" -#: parted/ui.c:1280 +#: parted/ui.c:1283 msgid "Can't create any more partitions." msgstr "ë” ì´ìƒì˜ ë¶„í• ì˜ì—ì„ ë§Œë“¤ 수 없습니다." -#: parted/ui.c:1290 +#: parted/ui.c:1293 msgid "Expecting a partition type." msgstr "ë¶„í• ì˜ì— 형ì‹ì´ 필요합니다." -#: parted/ui.c:1439 +#: parted/ui.c:1442 msgid "on" msgstr "on" -#: parted/ui.c:1440 +#: parted/ui.c:1443 msgid "off" msgstr "off" -#: parted/ui.c:1457 +#: parted/ui.c:1460 msgid "optimal" msgstr "optimal" -#: parted/ui.c:1458 +#: parted/ui.c:1461 msgid "minimal" msgstr "minimal" -#: parted/ui.c:1591 +#: parted/ui.c:1594 msgid "OPTIONs:" msgstr "옵션:" -#: parted/ui.c:1596 +#: parted/ui.c:1599 msgid "COMMANDs:" msgstr "ëª…ë ¹:" -#: parted/ui.c:1599 +#: parted/ui.c:1602 #, c-format msgid "" "\n" @@ -3193,15 +3226,24 @@ msgstr "" "\n" "%sì— ë²„ê·¸ë¥¼ ë³´ê³ í•˜ì‹ì‹œì˜¤\n" -#: parted/ui.c:1606 +#: parted/ui.c:1609 #, c-format msgid "Using %s\n" msgstr "%s 사용법\n" -#: parted/ui.c:1686 +#: parted/ui.c:1689 msgid "This command does not make sense in non-interactive mode.\n" msgstr "ì´ ëª…ë ¹ì€ ë¹„ ëŒ€í™”ì‹ ëª¨ë“œì—ì„œ ë™ìž‘하지 않습니다.\n" +#~ msgid "Extended partitions cannot be hidden on msdos disk labels." +#~ msgstr "확장 ë¶„í• ì˜ì—ì€ MSDOS ë””ìŠ¤í¬ ë ˆì´ë¸”ì—ì„œ 숨길 수 없습니다." + +#~ msgid "" +#~ "Extended partitions cannot be recovery partitions on msdos disk labels." +#~ msgstr "" +#~ "확장 ë¶„í• ì˜ì—ì€ MSDOS ë””ìŠ¤í¬ ë ˆì´ë¸”ì—ì„œ 복구 ë¶„í• ì˜ì—으로 ì§€ì •í• ìˆ˜ 없습" +#~ "니다." + #~ msgid "" #~ " NUMBER : display more detailed information about this particular " #~ "partition\n" Binary files differ@@ -11,7 +11,7 @@ msgid "" msgstr "" "Project-Id-Version: parted 3.4.64.2\n" "Report-Msgid-Bugs-To: bug-parted@gnu.org\n" -"POT-Creation-Date: 2022-04-18 14:44-0400\n" +"POT-Creation-Date: 2023-04-10 15:50-0700\n" "PO-Revision-Date: 2022-04-13 09:50+0200\n" "Last-Translator: Benno Schulenberg <vertaling@coevern.nl>\n" "Language-Team: Dutch <vertaling@vrijschrift.org>\n" @@ -22,25 +22,25 @@ msgstr "" "X-Bugs: Report translation errors to the Language-Team address.\n" "Plural-Forms: nplurals=2; plural=(n != 1);\n" -#: lib/argmatch.c:147 +#: lib/argmatch.c:145 #, c-format msgid "invalid argument %s for %s" msgstr "ongeldig argument %s van %s" -#: lib/argmatch.c:148 +#: lib/argmatch.c:146 #, c-format msgid "ambiguous argument %s for %s" msgstr "argument %s van %s is niet eenduidig" -#: lib/argmatch.c:167 lib/argmatch.h:238 +#: lib/argmatch.c:165 lib/argmatch.h:237 msgid "Valid arguments are:" msgstr "Geldige argumenten zijn:" -#: lib/closeout.c:122 libparted/labels/fdasd.c:145 +#: lib/closeout.c:121 libparted/labels/fdasd.c:145 msgid "write error" msgstr "schrijffout" -#: lib/error.c:195 +#: lib/error.c:193 msgid "Unknown system error" msgstr "Onbekende systeemfout" @@ -100,11 +100,11 @@ msgstr "%s: optie vereist een argument -- '%c'\n" #. If you don't know what to put here, please see #. <https://en.wikipedia.org/wiki/Quotation_marks_in_other_languages> #. and use glyphs suitable for your language. -#: lib/quotearg.c:355 +#: lib/quotearg.c:354 msgid "`" msgstr "‘" -#: lib/quotearg.c:356 +#: lib/quotearg.c:355 msgid "'" msgstr "’" @@ -186,7 +186,7 @@ msgstr "Geen eerdere reguliere expressie" #. To enquire the regular expression that your system uses for this #. purpose, you can use the command #. locale -k LC_MESSAGES | grep '^yesexpr=' -#: lib/rpmatch.c:150 +#: lib/rpmatch.c:149 msgid "^[yY]" msgstr "^[jJyY]" @@ -196,7 +196,7 @@ msgstr "^[jJyY]" #. To enquire the regular expression that your system uses for this #. purpose, you can use the command #. locale -k LC_MESSAGES | grep '^noexpr=' -#: lib/rpmatch.c:163 +#: lib/rpmatch.c:162 msgid "^[nN]" msgstr "^[nN]" @@ -766,21 +766,21 @@ msgstr "PMBR_boot" msgid "Unknown disk flag, %d." msgstr "Onbekende schijfvlag %d." -#: libparted/disk.c:1289 +#: libparted/disk.c:1320 #, c-format msgid "%s disk labels do not support extended partitions." msgstr "%s-schijflabels kennen geen uitgebreide partities." -#: libparted/disk.c:1821 +#: libparted/disk.c:1990 #, c-format msgid "%s disk labels don't support logical or extended partitions." msgstr "%s-schijflabels kennen geen logische of uitgebreide partities." -#: libparted/disk.c:1834 +#: libparted/disk.c:2003 msgid "Too many primary partitions." msgstr "Te veel primaire partities." -#: libparted/disk.c:1843 +#: libparted/disk.c:2012 #, c-format msgid "" "Can't add a logical partition to %s, because there is no extended partition." @@ -788,137 +788,141 @@ msgstr "" "Kan geen logische partitie aan %s toevoegen, omdat er geen uitgebreide " "partitie is." -#: libparted/disk.c:1867 +#: libparted/disk.c:2036 #, c-format msgid "Can't have more than one extended partition on %s." msgstr "Kan niet meer dan één uitgebreide partitie maken op %s." -#: libparted/disk.c:1877 +#: libparted/disk.c:2046 msgid "Can't have logical partitions outside of the extended partition." msgstr "Kan geen logische partitie buiten de uitgebreide partitie maken." -#: libparted/disk.c:1902 +#: libparted/disk.c:2071 #, c-format msgid "Can't have a logical partition outside of the extended partition on %s." msgstr "Kan geen logische partitie buiten de uitgebreide partitie op %s maken." -#: libparted/disk.c:1912 +#: libparted/disk.c:2081 msgid "Can't have a primary partition inside an extended partition." msgstr "Kan geen primaire partitie binnen een uitgebreide partitie maken." -#: libparted/disk.c:1921 +#: libparted/disk.c:2090 msgid "Can't have a partition outside the disk!" msgstr "Kan geen partitie maken buiten de schijf!" -#: libparted/disk.c:1972 libparted/disk.c:2150 +#: libparted/disk.c:2141 libparted/disk.c:2319 msgid "Can't have overlapping partitions." msgstr "Partities mogen elkaar niet overlappen." -#: libparted/disk.c:2351 +#: libparted/disk.c:2520 msgid "metadata" msgstr "metagegevens" -#: libparted/disk.c:2353 +#: libparted/disk.c:2522 msgid "free" msgstr "vrij" -#: libparted/disk.c:2355 parted/ui.c:1271 parted/ui.c:1299 +#: libparted/disk.c:2524 parted/ui.c:1274 parted/ui.c:1302 msgid "extended" msgstr "uitgebreid" -#: libparted/disk.c:2357 parted/ui.c:1275 parted/ui.c:1303 +#: libparted/disk.c:2526 parted/ui.c:1278 parted/ui.c:1306 msgid "logical" msgstr "logisch" -#: libparted/disk.c:2359 parted/ui.c:1267 parted/ui.c:1295 +#: libparted/disk.c:2528 parted/ui.c:1270 parted/ui.c:1298 msgid "primary" msgstr "primair" -#: libparted/disk.c:2375 +#: libparted/disk.c:2544 msgid "boot" msgstr "opstart" -#: libparted/disk.c:2377 +#: libparted/disk.c:2546 msgid "bios_grub" msgstr "bios_grub" -#: libparted/disk.c:2379 +#: libparted/disk.c:2548 msgid "root" msgstr "hoofdmap" -#: libparted/disk.c:2381 +#: libparted/disk.c:2550 msgid "swap" msgstr "swap" -#: libparted/disk.c:2383 +#: libparted/disk.c:2552 msgid "hidden" msgstr "verborgen" -#: libparted/disk.c:2385 +#: libparted/disk.c:2554 msgid "raid" msgstr "raid" -#: libparted/disk.c:2387 +#: libparted/disk.c:2556 msgid "lvm" msgstr "lvm" -#: libparted/disk.c:2389 +#: libparted/disk.c:2558 msgid "lba" msgstr "lba" -#: libparted/disk.c:2391 +#: libparted/disk.c:2560 msgid "hp-service" msgstr "hp-service" -#: libparted/disk.c:2393 +#: libparted/disk.c:2562 msgid "palo" msgstr "palo" -#: libparted/disk.c:2395 +#: libparted/disk.c:2564 msgid "prep" msgstr "prep" -#: libparted/disk.c:2397 +#: libparted/disk.c:2566 msgid "msftres" msgstr "msftres" -#: libparted/disk.c:2399 +#: libparted/disk.c:2568 msgid "msftdata" msgstr "msftdata" -#: libparted/disk.c:2401 +#: libparted/disk.c:2570 msgid "atvrecv" msgstr "atvrecv" -#: libparted/disk.c:2403 +#: libparted/disk.c:2572 msgid "diag" msgstr "diag" -#: libparted/disk.c:2405 +#: libparted/disk.c:2574 msgid "legacy_boot" msgstr "legacy_boot" -#: libparted/disk.c:2407 +#: libparted/disk.c:2576 msgid "irst" msgstr "irst" -#: libparted/disk.c:2409 +#: libparted/disk.c:2578 msgid "esp" msgstr "esp" -#: libparted/disk.c:2411 +#: libparted/disk.c:2580 msgid "chromeos_kernel" msgstr "chromeos_kernel" -#: libparted/disk.c:2413 +#: libparted/disk.c:2582 msgid "bls_boot" msgstr "bls_boot" -#: libparted/disk.c:2415 +#: libparted/disk.c:2584 msgid "linux-home" msgstr "linux-home" -#: libparted/disk.c:2421 +#: libparted/disk.c:2586 +msgid "no_automount" +msgstr "" + +#: libparted/disk.c:2592 #, c-format msgid "Unknown partition flag, %d." msgstr "Onbekende partitievlag %d." @@ -1107,8 +1111,8 @@ msgid "" msgstr "" #: libparted/labels/atari.c:1662 libparted/labels/bsd.c:563 -#: libparted/labels/dasd.c:895 libparted/labels/dos.c:2303 -#: libparted/labels/dvh.c:770 libparted/labels/gpt.c:1769 +#: libparted/labels/dasd.c:893 libparted/labels/dos.c:2294 +#: libparted/labels/dvh.c:770 libparted/labels/gpt.c:1891 #: libparted/labels/loop.c:244 libparted/labels/mac.c:1409 #: libparted/labels/pc98.c:697 libparted/labels/rdb.c:1054 #: libparted/labels/sun.c:781 @@ -1130,43 +1134,32 @@ msgstr "Geen partitienummer meer beschikbaar." msgid "Unable to allocate a bsd disklabel slot." msgstr "Kan in het BSD-schijflabel geen plekje meer reserveren." -#: libparted/labels/dasd.c:626 +#: libparted/labels/dasd.c:634 msgid "The partition table of DASD-LDL device cannot be changed.\n" msgstr "" "De partitietabel van een DASD-LDL-apparaat kan niet gewijzigd worden.\n" -#: libparted/labels/dasd.c:921 +#: libparted/labels/dasd.c:919 msgid "Unable to allocate a dasd disklabel slot" msgstr "Kan in het DASD-schijflabel geen plekje meer reserveren." -#: libparted/labels/dos.c:1008 +#: libparted/labels/dos.c:1159 #, c-format msgid "Invalid partition table on %s -- wrong signature %x." msgstr "Ongeldige partitietabel op %s -- onjuiste vingerafdruk %x." -#: libparted/labels/dos.c:1036 +#: libparted/labels/dos.c:1187 #, c-format msgid "Invalid partition table - recursive partition on %s." msgstr "Ongeldige partitietabel -- recursieve partitie op %s." -#: libparted/labels/dos.c:1567 -msgid "Extended partitions cannot be hidden on msdos disk labels." -msgstr "" -"Uitgebreide partities kunnen op MSDOS-schijflabels niet verborgen zijn." - -#: libparted/labels/dos.c:1579 -msgid "Extended partitions cannot be recovery partitions on msdos disk labels." -msgstr "" -"Uitgebreide partities kunnen op MSDOS-schijflabels geen herstelpartities " -"zijn." - -#: libparted/labels/dos.c:2285 +#: libparted/labels/dos.c:2276 msgid "Parted can't resize partitions managed by Windows Dynamic Disk." msgstr "" "Parted kan partitities beheerd door Windows Dynamic Disk niet van grootte " "veranderen." -#: libparted/labels/dos.c:2541 +#: libparted/labels/dos.c:2532 msgid "cannot create any more partitions" msgstr "kan geen nieuwe partities meer maken" @@ -1308,11 +1301,11 @@ msgstr "Kan blokgrootte niet verkrijgen." msgid "Disk geometry does not match a DASD device of type 3390." msgstr "Schijfgeometrie komt niet overeen met een DASD-apparaat van type 3390." -#: libparted/labels/gpt.c:569 +#: libparted/labels/gpt.c:589 msgid "device is too small for GPT" msgstr "Het apparaat is te klein voor GPT." -#: libparted/labels/gpt.c:771 +#: libparted/labels/gpt.c:791 #, c-format msgid "" "The format of the GPT partition table is version %x, which is newer than " @@ -1321,7 +1314,7 @@ msgstr "" "De indeling van de GPT-partitietabel is van versie %x. Dit is nieuwer dan " "wat deze versie van Parted kent. Rapporteer dit alstublieft aan ons." -#: libparted/labels/gpt.c:807 +#: libparted/labels/gpt.c:827 #, c-format msgid "" "Not all of the space available to %s appears to be used, you can fix the GPT " @@ -1332,7 +1325,7 @@ msgstr "" "De GPT bijwerken om alle ruimte te gebruiken (%llu extra blokken),\n" "of doorgaan en deze extra ruimte negeren? " -#: libparted/labels/gpt.c:1006 +#: libparted/labels/gpt.c:1026 msgid "" "The backup GPT table is not at the end of the disk, as it should be. Fix, " "by moving the backup to the end (and removing the old backup)?" @@ -1342,7 +1335,7 @@ msgstr "" "naar het einde te verplaatsen (en de oude reservekopie te verwijderen). " "Reparatie uitvoeren?" -#: libparted/labels/gpt.c:1024 +#: libparted/labels/gpt.c:1044 msgid "" "Both the primary and backup GPT tables are corrupt. Try making a fresh " "table, and using Parted's rescue feature to recover partitions." @@ -1351,7 +1344,7 @@ msgstr "" "een nieuw schijflabel aan, en probeer dan met de 'red'-opdracht de " "kwijtgeraakte partities te herstellen." -#: libparted/labels/gpt.c:1035 +#: libparted/labels/gpt.c:1055 msgid "" "The backup GPT table is corrupt, but the primary appears OK, so that will be " "used." @@ -1359,7 +1352,7 @@ msgstr "" "De reservekopie van de GPT-tabel is beschadigd, maar de primaire tabel lijkt " "goed. Deze laatste zal worden gebruikt." -#: libparted/labels/gpt.c:1047 +#: libparted/labels/gpt.c:1067 msgid "" "The primary GPT table is corrupt, but the backup appears OK, so that will be " "used." @@ -1367,11 +1360,11 @@ msgstr "" "De primaire GPT-tabel is beschadigd, maar de reservekopie lijkt goed. Deze " "laatste zal worden gebruikt." -#: libparted/labels/gpt.c:1071 +#: libparted/labels/gpt.c:1091 msgid "primary partition table array CRC mismatch" msgstr "CRC-verschil in hoofdpartitietabel-array" -#: libparted/labels/gpt.c:1655 libparted/labels/gpt.c:1682 +#: libparted/labels/gpt.c:1722 libparted/labels/gpt.c:1749 msgid "failed to translate partition name" msgstr "vertalen van partitienaam is mislukt" @@ -2056,7 +2049,7 @@ msgstr "fat_table_alloc_cluster(): geen beschikbare clusters" msgid "Could not detect file system." msgstr "Kan geen bestandssysteem vinden." -#: libparted/fs/r/filesys.c:159 libparted/fs/r/filesys.c:284 +#: libparted/fs/r/filesys.c:159 libparted/fs/r/filesys.c:285 #, c-format msgid "resizing %s file systems is not supported" msgstr "" @@ -2358,39 +2351,39 @@ msgstr "" "Dit HFS+-volumen heeft geen 'extents-overflow'-bestand. Dit is zeer " "ongebruikelijk!" -#: parted/parted.c:137 +#: parted/parted.c:138 msgid "displays this help message" msgstr "deze hulptekst tonen" -#: parted/parted.c:138 +#: parted/parted.c:139 msgid "lists partition layout on all block devices" msgstr "de partietabellen van alle apparaten tonen" -#: parted/parted.c:139 +#: parted/parted.c:140 msgid "displays machine parseable output" msgstr "computerverwerkbare uitvoer produceren" -#: parted/parted.c:140 +#: parted/parted.c:141 msgid "displays JSON output" msgstr "JSON-uitvoer produceren" -#: parted/parted.c:141 +#: parted/parted.c:142 msgid "never prompts for user intervention" msgstr "nooit vragen stellen" -#: parted/parted.c:142 +#: parted/parted.c:143 msgid "in script mode, fix instead of abort when asked" msgstr "(in scriptmodus) repareren i.p.v. afbreken wanneer gevraagd" -#: parted/parted.c:143 +#: parted/parted.c:144 msgid "displays the version" msgstr "de programmaversie tonen" -#: parted/parted.c:144 +#: parted/parted.c:145 msgid "alignment for new partitions" msgstr "uitlijning voor nieuwe partities" -#: parted/parted.c:157 +#: parted/parted.c:158 msgid "" "NUMBER is the partition number used by Linux. On MS-DOS disk labels, the " "primary partitions number from 1 to 4, logical partitions from 5 onwards.\n" @@ -2399,31 +2392,31 @@ msgstr "" "schijflabels zijn de primaire partities genummerd van 1 tot 4, de logische " "partities vanaf 5 en hoger.\n" -#: parted/parted.c:160 +#: parted/parted.c:161 msgid "LABEL-TYPE is one of: " msgstr "LABEL-TYPE is een van: " -#: parted/parted.c:161 parted/parted.c:162 +#: parted/parted.c:162 parted/parted.c:163 msgid "FLAG is one of: " msgstr "VLAG is een van: " -#: parted/parted.c:163 +#: parted/parted.c:164 msgid "UNIT is one of: " msgstr "EENHEID is een van: " -#: parted/parted.c:164 +#: parted/parted.c:165 msgid "desired alignment: minimum or optimal" msgstr "gewenste uitlijning: minimaal of optimaal" -#: parted/parted.c:165 +#: parted/parted.c:166 msgid "PART-TYPE is one of: primary, logical, extended\n" msgstr "PART-TYPE is een van: primair, logisch, uitgebreid\n" -#: parted/parted.c:167 +#: parted/parted.c:168 msgid "FS-TYPE is one of: " msgstr "BS-SOORT is een van: " -#: parted/parted.c:168 +#: parted/parted.c:169 msgid "" "START and END are disk locations, such as 4GB or 10%. Negative values count " "from the end of the disk. For example, -1s specifies exactly the last " @@ -2433,7 +2426,7 @@ msgstr "" "tellen vanaf het einde van de schijf. Bijvoorbeeld, -1s geeft precies de " "laatste sector aan.\n" -#: parted/parted.c:171 +#: parted/parted.c:172 msgid "" "END is disk location, such as 4GB or 10%. Negative value counts from the " "end of the disk. For example, -1s specifies exactly the last sector.\n" @@ -2442,19 +2435,23 @@ msgstr "" "vanaf het einde van de schijf. Bijvoorbeeld, -1s geeft precies de laatste " "sector aan.\n" -#: parted/parted.c:174 +#: parted/parted.c:175 msgid "STATE is one of: on, off\n" msgstr "TOESTAND is één van: aan, uit\n" -#: parted/parted.c:175 +#: parted/parted.c:176 msgid "DEVICE is usually /dev/hda or /dev/sda\n" msgstr "APPARAAT is gewoonlijk /dev/hda of /dev/sda\n" -#: parted/parted.c:176 +#: parted/parted.c:177 msgid "NAME is any word you want\n" msgstr "NAAM is elk woord dat u wilt\n" -#: parted/parted.c:179 +#: parted/parted.c:178 +msgid "TYPE_ID is a value between 0x01 and 0xff, TYPE_UUID is a UUID\n" +msgstr "" + +#: parted/parted.c:182 msgid "" "Copyright (C) 1998 - 2006 Free Software Foundation, Inc.\n" "This program is free software, covered by the GNU General Public License.\n" @@ -2474,22 +2471,22 @@ msgstr "" "van VERKOOPBAARHEID of GESCHIKTHEID VOOR EEN BEPAALD DOEL.\n" "Zie de GNU General Public License voor meer details.\n" -#: parted/parted.c:229 +#: parted/parted.c:232 #, c-format msgid "%0.f%%\t(time left %.2d:%.2d)" msgstr "%0.f%%\t(resterende tijd: %.2d:%.2d)" -#: parted/parted.c:248 +#: parted/parted.c:251 #, c-format msgid "Partition %s is being used. Are you sure you want to continue?" msgstr "Partitie %s is in gebruik. Weet u zeker dat u verder wilt gaan?" -#: parted/parted.c:269 +#: parted/parted.c:272 #, c-format msgid "Partition(s) on %s are being used." msgstr "Partitie(s) op %s zijn in gebruik." -#: parted/parted.c:281 +#: parted/parted.c:284 #, c-format msgid "" "The existing disk label on %s will be destroyed and all data on this disk " @@ -2498,31 +2495,31 @@ msgstr "" "Het bestaande label op %s zal worden vernietigd en alle gegevens op deze " "schijf zullen verloren gaan. Wilt u doorgaan?" -#: parted/parted.c:542 +#: parted/parted.c:545 msgid "New disk label type?" msgstr "Type van nieuw schijflabel?" -#: parted/parted.c:680 +#: parted/parted.c:692 msgid "Partition type?" msgstr "Partitietype?" -#: parted/parted.c:698 parted/parted.c:902 +#: parted/parted.c:710 parted/parted.c:914 msgid "Partition name?" msgstr "Naam van partitie?" -#: parted/parted.c:708 +#: parted/parted.c:720 msgid "File system type?" msgstr "Bestandssysteemsoort?" -#: parted/parted.c:713 parted/parted.c:1683 +#: parted/parted.c:725 parted/parted.c:1815 msgid "Start?" msgstr "Begin?" -#: parted/parted.c:715 parted/parted.c:1685 parted/parted.c:1768 +#: parted/parted.c:727 parted/parted.c:1817 parted/parted.c:1900 msgid "End?" msgstr "Einde?" -#: parted/parted.c:782 +#: parted/parted.c:794 #, c-format msgid "" "You requested a partition from %s to %s (sectors %llu..%llu).\n" @@ -2531,7 +2528,7 @@ msgstr "" "U verzocht om een partitie van %s tot %s (sectoren %llu..%llu).\n" "De dichtstbijzijnde mogelijkheid is van %s tot %s (sectoren %llu..%llu).%s" -#: parted/parted.c:791 +#: parted/parted.c:803 msgid "" "\n" "Is this still acceptable to you?" @@ -2539,7 +2536,7 @@ msgstr "" "\n" "Is dit nog acceptabel?" -#: parted/parted.c:814 +#: parted/parted.c:826 #, c-format msgid "" "The resulting partition is not properly aligned for best performance: %s" @@ -2547,89 +2544,114 @@ msgstr "" "De resulterende partitie is niet correct uitgelijnd voor optimale " "prestaties: %s" -#: parted/parted.c:816 parted/parted.c:1925 +#: parted/parted.c:828 parted/parted.c:2057 msgid "unknown (malloc failed)" msgstr "onbekend (onvoldoende geheugen beschikbaar)" -#: parted/parted.c:894 +#: parted/parted.c:906 #, c-format msgid "%s disk labels do not support partition name." msgstr "%s-schijflabels kennen geen partitienamen." -#: parted/parted.c:899 parted/parted.c:1748 parted/parted.c:1814 -#: parted/parted.c:1908 parted/parted.c:1983 +#: parted/parted.c:911 parted/parted.c:955 parted/parted.c:1880 +#: parted/parted.c:1946 parted/parted.c:2040 parted/parted.c:2115 msgid "Partition number?" msgstr "Nummer van partitie?" -#: parted/parted.c:1050 +#: parted/parted.c:949 +#, fuzzy, c-format +msgid "%s disk labels do not support partition type." +msgstr "%s-schijflabels kennen geen partitienamen." + +#: parted/parted.c:965 +#, fuzzy +msgid "Partition type-id?" +msgstr "Partitietype?" + +#: parted/parted.c:972 +#, fuzzy +msgid "Invalid type-id." +msgstr "Ongeldig nummer." + +#: parted/parted.c:986 +#, fuzzy +msgid "Partition type-uuid?" +msgstr "Partitietype?" + +#: parted/parted.c:993 +#, fuzzy +msgid "Invalid type-uuid." +msgstr "Ongeldig nummer." + +#: parted/parted.c:1146 #, c-format msgid "BIOS cylinder,head,sector geometry: %d,%d,%d. Each cylinder is %s.\n" msgstr "" "Logische schijfopbouw volgens BIOS: %d,%d,%d (cilinders,koppen,sectoren). " "Elke cilinder is %s.\n" -#: parted/parted.c:1137 +#: parted/parted.c:1240 #, c-format msgid "Model: %s (%s)\n" msgstr "Model: %s (%s)\n" -#: parted/parted.c:1139 +#: parted/parted.c:1242 #, c-format msgid "Disk %s: %s\n" msgstr "Schijf %s: %s\n" -#: parted/parted.c:1140 +#: parted/parted.c:1243 #, c-format msgid "Sector size (logical/physical): %lldB/%lldB\n" msgstr "Sectorgrootte (logisch/fysiek): %lldB/%lldB\n" -#: parted/parted.c:1152 +#: parted/parted.c:1255 #, c-format msgid "Partition Table: %s\n" msgstr "Partitietabel: %s\n" -#: parted/parted.c:1153 +#: parted/parted.c:1256 #, c-format msgid "Disk Flags: %s\n" msgstr "Schijfvlaggen: %s\n" -#: parted/parted.c:1279 parted/parted.c:1282 +#: parted/parted.c:1388 parted/parted.c:1391 msgid "Number" msgstr "Nummer" -#: parted/parted.c:1279 parted/parted.c:1282 +#: parted/parted.c:1388 parted/parted.c:1391 msgid "Start" msgstr "Begin" -#: parted/parted.c:1280 parted/parted.c:1283 +#: parted/parted.c:1389 parted/parted.c:1392 msgid "End" msgstr "Einde" -#: parted/parted.c:1283 +#: parted/parted.c:1392 msgid "Size" msgstr "Grootte" -#: parted/parted.c:1287 +#: parted/parted.c:1396 msgid "Type" msgstr "Type" -#: parted/parted.c:1289 +#: parted/parted.c:1398 msgid "File system" msgstr "Bestandssysteem" -#: parted/parted.c:1292 +#: parted/parted.c:1401 msgid "Name" msgstr "Naam" -#: parted/parted.c:1294 +#: parted/parted.c:1403 msgid "Flags" msgstr "Vlaggen" -#: parted/parted.c:1352 +#: parted/parted.c:1461 msgid "Free Space" msgstr "Vrije ruimte" -#: parted/parted.c:1570 +#: parted/parted.c:1702 #, c-format msgid "" "A %s %s partition was found at %s -> %s. Do you want to add it to the " @@ -2638,56 +2660,56 @@ msgstr "" "Er is een %s %s-partitie gevonden van %s tot %s. Wilt u deze aan de " "partitietabel toevoegen?" -#: parted/parted.c:1613 +#: parted/parted.c:1745 msgid "searching for file systems" msgstr "bezig met zoeken naar bestandssystemen" -#: parted/parted.c:1720 +#: parted/parted.c:1852 msgid "The resize command has been removed in parted 3.0" msgstr "De 'grootte'-opdracht is verwijderd in Parted 3.0." -#: parted/parted.c:1782 +#: parted/parted.c:1914 msgid "" "Shrinking a partition can cause data loss, are you sure you want to continue?" msgstr "" "Het krimpen van een partitie kan gegevensverlies veroorzaken.\n" "Weet u zeker dat u verder wilt gaan?" -#: parted/parted.c:1838 +#: parted/parted.c:1970 msgid "New device?" msgstr "Nieuw apparaat?" -#: parted/parted.c:1906 +#: parted/parted.c:2038 msgid "alignment type(min/opt)" msgstr "uitlijningssoort (min/opt)" -#: parted/parted.c:1921 +#: parted/parted.c:2053 #, c-format msgid "%d aligned\n" msgstr "%d is uitgelijnd\n" -#: parted/parted.c:1923 +#: parted/parted.c:2055 #, c-format msgid "%d not aligned: %s\n" msgstr "%d is niet uitgelijnd: %s\n" -#: parted/parted.c:1948 parted/parted.c:1985 +#: parted/parted.c:2080 parted/parted.c:2117 msgid "Flag to Invert?" msgstr "Om te zetten vlag?" -#: parted/parted.c:1953 parted/parted.c:1990 +#: parted/parted.c:2085 parted/parted.c:2122 msgid "New state?" msgstr "Nieuwe toestand?" -#: parted/parted.c:2036 +#: parted/parted.c:2168 msgid "Unit?" msgstr "Eenheid?" -#: parted/parted.c:2171 +#: parted/parted.c:2303 msgid "align-check" msgstr "uitlijncontrole" -#: parted/parted.c:2174 +#: parted/parted.c:2306 msgid "" "align-check TYPE N check partition N for TYPE(min|opt) " "alignment" @@ -2695,41 +2717,41 @@ msgstr "" "uitlijncontrole SOORT N partitie N controleren op SOORT(min|opt)-" "uitlijning" -#: parted/parted.c:2182 +#: parted/parted.c:2314 msgid "help" msgstr "hulp" -#: parted/parted.c:2185 +#: parted/parted.c:2317 msgid "" "help [COMMAND] print general help, or help on " "COMMAND" msgstr "" "help [OPDRACHT] enige algemene hulp geven (of hulp bij OPDRACHT)" -#: parted/parted.c:2191 +#: parted/parted.c:2323 msgid "mklabel" msgstr "maaklabel" -#: parted/parted.c:2191 +#: parted/parted.c:2323 msgid "mktable" msgstr "maaktabel" -#: parted/parted.c:2194 +#: parted/parted.c:2326 msgid "" "mklabel,mktable LABEL-TYPE create a new disklabel (partition " "table)" msgstr "" "maaklabel LABEL-TYPE nieuw schijflabel maken (met lege partitietabel)" -#: parted/parted.c:2200 +#: parted/parted.c:2332 msgid "mkpart" msgstr "maakpart" -#: parted/parted.c:2203 +#: parted/parted.c:2335 msgid "mkpart PART-TYPE [FS-TYPE] START END make a partition" msgstr "maakpart PART-TYPE [BS-SOORT] BEGIN EINDE een partitie aanmaken" -#: parted/parted.c:2209 +#: parted/parted.c:2341 msgid "" "'mkpart' makes a partition without creating a new file system on the " "partition. FS-TYPE may be specified to set an appropriate partition ID.\n" @@ -2738,19 +2760,19 @@ msgstr "" "maken. BS-SOORT mag gebruikt worden om het een geschikt partitiekenmerk te " "geven.\n" -#: parted/parted.c:2214 +#: parted/parted.c:2346 msgid "name" msgstr "noem" -#: parted/parted.c:2217 +#: parted/parted.c:2349 msgid "name NUMBER NAME name partition NUMBER as NAME" msgstr "noem NUMMER NAAM partitie NUMMER deze NAAM geven" -#: parted/parted.c:2222 +#: parted/parted.c:2354 msgid "print" msgstr "toon" -#: parted/parted.c:2225 +#: parted/parted.c:2357 msgid "" "print [devices|free|list,all] display the partition table, or " "available devices, or free space, or all found partitions" @@ -2758,7 +2780,7 @@ msgstr "" "toon [devices|free|list,all] de partitietabel weergeven (of beschikbare " "apparaten, of vrije ruimte, of alle gevonden partities)" -#: parted/parted.c:2229 +#: parted/parted.c:2361 msgid "" "Without arguments, 'print' displays the entire partition table. However with " "the following arguments it performs various other actions.\n" @@ -2766,36 +2788,36 @@ msgstr "" "Zonder argumenten toont 'toon' de volledige partitietabel, maar met\n" "de volgende argumenten wordt meer specifieke informatie getoond:\n" -#: parted/parted.c:2231 +#: parted/parted.c:2363 msgid " devices : display all active block devices\n" msgstr " devices : alle actieve blokapparaten tonen\n" -#: parted/parted.c:2232 +#: parted/parted.c:2364 msgid "" " free : display information about free unpartitioned space on the " "current block device\n" msgstr "" " free : informatie over vrije ruimte op huidige blokapparaat tonen\n" -#: parted/parted.c:2234 +#: parted/parted.c:2366 msgid "" " list, all : display the partition tables of all active block devices\n" msgstr "" " list, all : de partitietabellen van alle actieve blokapparaten tonen\n" -#: parted/parted.c:2238 +#: parted/parted.c:2370 msgid "quit" msgstr "einde" -#: parted/parted.c:2241 +#: parted/parted.c:2373 msgid "quit exit program" msgstr "einde programma afsluiten" -#: parted/parted.c:2246 +#: parted/parted.c:2378 msgid "rescue" msgstr "red" -#: parted/parted.c:2249 +#: parted/parted.c:2381 msgid "" "rescue START END rescue a lost partition near START " "and END" @@ -2803,101 +2825,111 @@ msgstr "" "red BEGIN EINDE een verloren partitie (met geschat begin en " "einde) proberen te herstellen" -#: parted/parted.c:2255 +#: parted/parted.c:2387 msgid "resize" msgstr "grootte" -#: parted/parted.c:2258 +#: parted/parted.c:2390 msgid "The resize command was removed in parted 3.0\n" msgstr "De 'grootte'-opdracht is verwijderd in Parted 3.0.\n" -#: parted/parted.c:2261 +#: parted/parted.c:2393 msgid "resizepart" msgstr "rekoptot" -#: parted/parted.c:2264 +#: parted/parted.c:2396 msgid "resizepart NUMBER END resize partition NUMBER" msgstr "" "rekoptot NUMMER EINDE partitie NUMMER krimpen/oprekken tot nieuw EINDE" -#: parted/parted.c:2269 +#: parted/parted.c:2401 msgid "rm" msgstr "verwijder" -#: parted/parted.c:2272 +#: parted/parted.c:2404 msgid "rm NUMBER delete partition NUMBER" msgstr "verwijder NUMMER partitie NUMMER verwijderen" -#: parted/parted.c:2277 +#: parted/parted.c:2409 msgid "select" msgstr "kies" -#: parted/parted.c:2280 +#: parted/parted.c:2412 msgid "select DEVICE choose the device to edit" msgstr "kies APPARAAT dit APPARAAT kiezen om te bewerken" -#: parted/parted.c:2285 +#: parted/parted.c:2417 msgid "disk_set" msgstr "schijf_zet" -#: parted/parted.c:2288 +#: parted/parted.c:2420 msgid "" "disk_set FLAG STATE change the FLAG on selected device" msgstr "" "schijf_zet VLAG TOESTAND op gekozen apparaat deze VLAG in TOESTAND zetten" -#: parted/parted.c:2293 +#: parted/parted.c:2425 msgid "disk_toggle" msgstr "schijf_zetom" -#: parted/parted.c:2296 +#: parted/parted.c:2428 msgid "" "disk_toggle [FLAG] toggle the state of FLAG on " "selected device" msgstr "" "schijf_zetom [VLAG] op gekozen apparaat de toestand van VLAG omzetten" -#: parted/parted.c:2302 +#: parted/parted.c:2434 msgid "set" msgstr "zet" -#: parted/parted.c:2305 +#: parted/parted.c:2437 msgid "" "set NUMBER FLAG STATE change the FLAG on partition NUMBER" msgstr "" "zet NUMMER VLAG TOESTAND op partitie NUMMER deze VLAG in TOESTAND zetten" -#: parted/parted.c:2311 +#: parted/parted.c:2443 msgid "toggle" msgstr "zetom" -#: parted/parted.c:2314 +#: parted/parted.c:2446 msgid "" "toggle [NUMBER [FLAG]] toggle the state of FLAG on " "partition NUMBER" msgstr "" "zetom [NUMMER [VLAG]] op partitie NUMMER de toestand van VLAG omzetten" -#: parted/parted.c:2320 +#: parted/parted.c:2452 +msgid "type" +msgstr "" + +#: parted/parted.c:2455 +msgid "" +"type NUMBER TYPE-ID or TYPE-UUID type set TYPE-ID or TYPE-UUID of " +"partition NUMBER" +msgstr "" + +#: parted/parted.c:2460 msgid "unit" msgstr "eenheid" -#: parted/parted.c:2323 +#: parted/parted.c:2463 msgid "unit UNIT set the default unit to UNIT" msgstr "eenheid EENHEID standaard deze EENHEID gebruiken" -#: parted/parted.c:2328 +#: parted/parted.c:2468 msgid "version" msgstr "versie" -#: parted/parted.c:2331 +#: parted/parted.c:2471 msgid "" "version display the version number and " "copyright information of GNU Parted" msgstr "" "versie versienummer en copyright van deze Parted tonen" -#: parted/parted.c:2335 +#: parted/parted.c:2475 msgid "" "'version' displays copyright and version information corresponding to this " "copy of GNU Parted\n" @@ -2905,23 +2937,23 @@ msgstr "" "'versie' toont informatie over het auteursrecht en de versie van deze GNU " "Parted\n" -#: parted/parted.c:2405 +#: parted/parted.c:2545 #, c-format msgid "Usage: %s [-hlmsfv] [-a<align>] [DEVICE [COMMAND [PARAMETERS]]...]\n" msgstr "" "Gebruik: %s [-hlmsfv] [-aUITLIJNING] [APPARAAT [OPDRACHT [PARAMETERS]]...]\n" -#: parted/parted.c:2449 +#: parted/parted.c:2589 msgid "No device found" msgstr "Geen apparaat gevonden" -#: parted/parted.c:2486 +#: parted/parted.c:2626 msgid "WARNING: You are not superuser. Watch out for permissions.\n" msgstr "" "WAARSCHUWING: u bent niet root.\n" "Houd rekening met ontbrekende toegangsrechten.\n" -#: parted/parted.c:2519 +#: parted/parted.c:2659 msgid "" "You should reinstall your boot loader before rebooting. Read section 4 of " "the Parted User documentation for more information." @@ -2929,7 +2961,7 @@ msgstr "" "Alvorens te herstarten dient u uw opstartlader opnieuw te installeren. Lees " "sectie 4 van de Parted-gebruikersdocumentatie voor meer informatie." -#: parted/parted.c:2526 +#: parted/parted.c:2666 msgid "You may need to update /etc/fstab.\n" msgstr "Het kan nodig zijn /etc/fstab bij te werken.\n" @@ -3186,69 +3218,69 @@ msgstr "" "\n" "Fout: een niet-specifiek SIGILL-signaal werd ontvangen." -#: parted/ui.c:901 +#: parted/ui.c:904 #, c-format msgid "invalid token: %s" msgstr "ongeldig symbool: %s" -#: parted/ui.c:1082 +#: parted/ui.c:1085 msgid "Expecting a partition number." msgstr "Een partitienummer wordt verwacht." -#: parted/ui.c:1091 +#: parted/ui.c:1094 msgid "Partition doesn't exist." msgstr "Partitie bestaat niet." -#: parted/ui.c:1111 +#: parted/ui.c:1114 msgid "Expecting a file system type." msgstr "Een bestandssysteemsoort wordt verwacht." -#: parted/ui.c:1118 +#: parted/ui.c:1121 #, c-format msgid "Unknown file system type \"%s\"." msgstr "Onbekende bestandssysteemsoort '%s'." -#: parted/ui.c:1139 +#: parted/ui.c:1142 msgid "Expecting a disk label type." msgstr "Een schijflabeltype wordt verwacht." -#: parted/ui.c:1170 parted/ui.c:1206 +#: parted/ui.c:1173 parted/ui.c:1209 msgid "No flags supported" msgstr "Vlaggen worden niet ondersteund." -#: parted/ui.c:1280 +#: parted/ui.c:1283 msgid "Can't create any more partitions." msgstr "Kan geen nieuwe partities meer maken." -#: parted/ui.c:1290 +#: parted/ui.c:1293 msgid "Expecting a partition type." msgstr "Een partitietype wordt verwacht." -#: parted/ui.c:1439 +#: parted/ui.c:1442 msgid "on" msgstr "aan" -#: parted/ui.c:1440 +#: parted/ui.c:1443 msgid "off" msgstr "uit" -#: parted/ui.c:1457 +#: parted/ui.c:1460 msgid "optimal" msgstr "optimaal" -#: parted/ui.c:1458 +#: parted/ui.c:1461 msgid "minimal" msgstr "minimaal" -#: parted/ui.c:1591 +#: parted/ui.c:1594 msgid "OPTIONs:" msgstr "OPTIEs:" -#: parted/ui.c:1596 +#: parted/ui.c:1599 msgid "COMMANDs:" msgstr "OPDRACHTen:" -#: parted/ui.c:1599 +#: parted/ui.c:1602 #, c-format msgid "" "\n" @@ -3258,15 +3290,25 @@ msgstr "" "Rapporteer gebreken in het programma aan <%s>;\n" "meld fouten in de vertaling aan <vertaling@vrijschrift.org>.\n" -#: parted/ui.c:1606 +#: parted/ui.c:1609 #, c-format msgid "Using %s\n" msgstr "Apparaat %s wordt gebruikt.\n" -#: parted/ui.c:1686 +#: parted/ui.c:1689 msgid "This command does not make sense in non-interactive mode.\n" msgstr "Deze opdracht is zonder betekenis in niet-interactieve modus.\n" +#~ msgid "Extended partitions cannot be hidden on msdos disk labels." +#~ msgstr "" +#~ "Uitgebreide partities kunnen op MSDOS-schijflabels niet verborgen zijn." + +#~ msgid "" +#~ "Extended partitions cannot be recovery partitions on msdos disk labels." +#~ msgstr "" +#~ "Uitgebreide partities kunnen op MSDOS-schijflabels geen herstelpartities " +#~ "zijn." + #~ msgid "" #~ " NUMBER : display more detailed information about this particular " #~ "partition\n" @@ -6,7 +6,7 @@ msgid "" msgstr "" "Project-Id-Version: GNU parted 1.6.6-pre2\n" "Report-Msgid-Bugs-To: bug-parted@gnu.org\n" -"POT-Creation-Date: 2022-04-18 14:44-0400\n" +"POT-Creation-Date: 2023-04-10 15:50-0700\n" "PO-Revision-Date: 2003-07-04 19:03+0200\n" "Last-Translator: Kjetil Torgrim Homme <kjetilho@ifi.uio.no>\n" "Language-Team: Norwegian Nynorsk <i18n-nn@lister.ping.uio.no>\n" @@ -16,25 +16,25 @@ msgstr "" "Content-Transfer-Encoding: 8bit\n" "X-Bugs: Report translation errors to the Language-Team address.\n" -#: lib/argmatch.c:147 +#: lib/argmatch.c:145 #, c-format msgid "invalid argument %s for %s" msgstr "" -#: lib/argmatch.c:148 +#: lib/argmatch.c:146 #, c-format msgid "ambiguous argument %s for %s" msgstr "" -#: lib/argmatch.c:167 lib/argmatch.h:238 +#: lib/argmatch.c:165 lib/argmatch.h:237 msgid "Valid arguments are:" msgstr "" -#: lib/closeout.c:122 libparted/labels/fdasd.c:145 +#: lib/closeout.c:121 libparted/labels/fdasd.c:145 msgid "write error" msgstr "" -#: lib/error.c:195 +#: lib/error.c:193 #, fuzzy msgid "Unknown system error" msgstr "Filsystemtypen «%s» er ukjend." @@ -95,11 +95,11 @@ msgstr "" #. If you don't know what to put here, please see #. <https://en.wikipedia.org/wiki/Quotation_marks_in_other_languages> #. and use glyphs suitable for your language. -#: lib/quotearg.c:355 +#: lib/quotearg.c:354 msgid "`" msgstr "" -#: lib/quotearg.c:356 +#: lib/quotearg.c:355 msgid "'" msgstr "" @@ -181,7 +181,7 @@ msgstr "" #. To enquire the regular expression that your system uses for this #. purpose, you can use the command #. locale -k LC_MESSAGES | grep '^yesexpr=' -#: lib/rpmatch.c:150 +#: lib/rpmatch.c:149 msgid "^[yY]" msgstr "" @@ -191,7 +191,7 @@ msgstr "" #. To enquire the regular expression that your system uses for this #. purpose, you can use the command #. locale -k LC_MESSAGES | grep '^noexpr=' -#: lib/rpmatch.c:163 +#: lib/rpmatch.c:162 msgid "^[nN]" msgstr "" @@ -702,22 +702,22 @@ msgstr "boot" msgid "Unknown disk flag, %d." msgstr "Ukjent partisjonsflagg, %d." -#: libparted/disk.c:1289 +#: libparted/disk.c:1320 #, c-format msgid "%s disk labels do not support extended partitions." msgstr "Ein %s-disklabel støttar ikkje utvidingspartisjonar." -#: libparted/disk.c:1821 +#: libparted/disk.c:1990 #, c-format msgid "%s disk labels don't support logical or extended partitions." msgstr "%s-disklablar støttar ikkje logiske eller utvidingspartisjonar." -#: libparted/disk.c:1834 +#: libparted/disk.c:2003 #, fuzzy msgid "Too many primary partitions." msgstr "For mange primærpartisjonar" -#: libparted/disk.c:1843 +#: libparted/disk.c:2012 #, c-format msgid "" "Can't add a logical partition to %s, because there is no extended partition." @@ -725,142 +725,146 @@ msgstr "" "Kan ikkje leggja ein logisk partisjon til %s, sidan der ikkje er nokon " "utvidingspartisjon." -#: libparted/disk.c:1867 +#: libparted/disk.c:2036 #, fuzzy, c-format msgid "Can't have more than one extended partition on %s." msgstr "Kan ikkje ha meir enn éin utvidingspartisjon på %s" -#: libparted/disk.c:1877 +#: libparted/disk.c:2046 msgid "Can't have logical partitions outside of the extended partition." msgstr "Kan ikkje ha logiske partisjonar utanfor utvidingspartisjonen." -#: libparted/disk.c:1902 +#: libparted/disk.c:2071 #, c-format msgid "Can't have a logical partition outside of the extended partition on %s." msgstr "" "Ein logisk partisjon kan ikkje liggja utanfor utvidingspartisjonen på %s." -#: libparted/disk.c:1912 +#: libparted/disk.c:2081 msgid "Can't have a primary partition inside an extended partition." msgstr "Ein primærpartisjon kan ikkje liggja inne i ein utvidingspartisjon." -#: libparted/disk.c:1921 +#: libparted/disk.c:2090 msgid "Can't have a partition outside the disk!" msgstr "Kan ikkje ha ein partisjon utanfor disken!" -#: libparted/disk.c:1972 libparted/disk.c:2150 +#: libparted/disk.c:2141 libparted/disk.c:2319 #, fuzzy msgid "Can't have overlapping partitions." msgstr "Partisjonar kan ikkje overlappa kvarandre." -#: libparted/disk.c:2351 +#: libparted/disk.c:2520 msgid "metadata" msgstr "metadata" -#: libparted/disk.c:2353 +#: libparted/disk.c:2522 msgid "free" msgstr "ledig" -#: libparted/disk.c:2355 parted/ui.c:1271 parted/ui.c:1299 +#: libparted/disk.c:2524 parted/ui.c:1274 parted/ui.c:1302 msgid "extended" msgstr "utviding" -#: libparted/disk.c:2357 parted/ui.c:1275 parted/ui.c:1303 +#: libparted/disk.c:2526 parted/ui.c:1278 parted/ui.c:1306 msgid "logical" msgstr "logisk" -#: libparted/disk.c:2359 parted/ui.c:1267 parted/ui.c:1295 +#: libparted/disk.c:2528 parted/ui.c:1270 parted/ui.c:1298 msgid "primary" msgstr "primær" -#: libparted/disk.c:2375 +#: libparted/disk.c:2544 msgid "boot" msgstr "boot" -#: libparted/disk.c:2377 +#: libparted/disk.c:2546 msgid "bios_grub" msgstr "" -#: libparted/disk.c:2379 +#: libparted/disk.c:2548 msgid "root" msgstr "rot" -#: libparted/disk.c:2381 +#: libparted/disk.c:2550 msgid "swap" msgstr "swap" -#: libparted/disk.c:2383 +#: libparted/disk.c:2552 msgid "hidden" msgstr "skjult" -#: libparted/disk.c:2385 +#: libparted/disk.c:2554 msgid "raid" msgstr "raid" -#: libparted/disk.c:2387 +#: libparted/disk.c:2556 msgid "lvm" msgstr "lvm" -#: libparted/disk.c:2389 +#: libparted/disk.c:2558 msgid "lba" msgstr "lba" -#: libparted/disk.c:2391 +#: libparted/disk.c:2560 msgid "hp-service" msgstr "hp-service" -#: libparted/disk.c:2393 +#: libparted/disk.c:2562 msgid "palo" msgstr "" -#: libparted/disk.c:2395 +#: libparted/disk.c:2564 msgid "prep" msgstr "" -#: libparted/disk.c:2397 +#: libparted/disk.c:2566 msgid "msftres" msgstr "" -#: libparted/disk.c:2399 +#: libparted/disk.c:2568 #, fuzzy msgid "msftdata" msgstr "metadata" -#: libparted/disk.c:2401 +#: libparted/disk.c:2570 msgid "atvrecv" msgstr "" -#: libparted/disk.c:2403 +#: libparted/disk.c:2572 msgid "diag" msgstr "" -#: libparted/disk.c:2405 +#: libparted/disk.c:2574 msgid "legacy_boot" msgstr "" -#: libparted/disk.c:2407 +#: libparted/disk.c:2576 msgid "irst" msgstr "" -#: libparted/disk.c:2409 +#: libparted/disk.c:2578 #, fuzzy msgid "esp" msgstr "Ja" -#: libparted/disk.c:2411 +#: libparted/disk.c:2580 msgid "chromeos_kernel" msgstr "" -#: libparted/disk.c:2413 +#: libparted/disk.c:2582 #, fuzzy msgid "bls_boot" msgstr "boot" -#: libparted/disk.c:2415 +#: libparted/disk.c:2584 msgid "linux-home" msgstr "" -#: libparted/disk.c:2421 +#: libparted/disk.c:2586 +msgid "no_automount" +msgstr "" + +#: libparted/disk.c:2592 #, fuzzy, c-format msgid "Unknown partition flag, %d." msgstr "Ukjent partisjonsflagg, %d." @@ -1045,8 +1049,8 @@ msgid "" msgstr "" #: libparted/labels/atari.c:1662 libparted/labels/bsd.c:563 -#: libparted/labels/dasd.c:895 libparted/labels/dos.c:2303 -#: libparted/labels/dvh.c:770 libparted/labels/gpt.c:1769 +#: libparted/labels/dasd.c:893 libparted/labels/dos.c:2294 +#: libparted/labels/dvh.c:770 libparted/labels/gpt.c:1891 #: libparted/labels/loop.c:244 libparted/labels/mac.c:1409 #: libparted/labels/pc98.c:697 libparted/labels/rdb.c:1054 #: libparted/labels/sun.c:781 @@ -1070,39 +1074,30 @@ msgstr "Forventa eit partisjonsnummer." msgid "Unable to allocate a bsd disklabel slot." msgstr "Kunne ikkje tilordna plass i BSD-disklabel." -#: libparted/labels/dasd.c:626 +#: libparted/labels/dasd.c:634 msgid "The partition table of DASD-LDL device cannot be changed.\n" msgstr "" -#: libparted/labels/dasd.c:921 +#: libparted/labels/dasd.c:919 #, fuzzy msgid "Unable to allocate a dasd disklabel slot" msgstr "Kunne ikkje tilordna plass i BSD-disklabel." -#: libparted/labels/dos.c:1008 +#: libparted/labels/dos.c:1159 #, fuzzy, c-format msgid "Invalid partition table on %s -- wrong signature %x." msgstr "Ugyldig partisjonstabell på %s - feil signatur %x" -#: libparted/labels/dos.c:1036 +#: libparted/labels/dos.c:1187 #, c-format msgid "Invalid partition table - recursive partition on %s." msgstr "Ugyldig partisjonstabell - rekursiv partisjon på %s." -#: libparted/labels/dos.c:1567 -msgid "Extended partitions cannot be hidden on msdos disk labels." -msgstr "" - -#: libparted/labels/dos.c:1579 -#, fuzzy -msgid "Extended partitions cannot be recovery partitions on msdos disk labels." -msgstr "Ugyldig partisjonstabell - rekursiv partisjon på %s." - -#: libparted/labels/dos.c:2285 +#: libparted/labels/dos.c:2276 msgid "Parted can't resize partitions managed by Windows Dynamic Disk." msgstr "" -#: libparted/labels/dos.c:2541 +#: libparted/labels/dos.c:2532 #, fuzzy msgid "cannot create any more partitions" msgstr "Kan ikkje laga fleire partisjonar." @@ -1251,12 +1246,12 @@ msgstr "" msgid "Disk geometry does not match a DASD device of type 3390." msgstr "" -#: libparted/labels/gpt.c:569 +#: libparted/labels/gpt.c:589 #, fuzzy msgid "device is too small for GPT" msgstr "Filsystemet er for lite for ext2." -#: libparted/labels/gpt.c:771 +#: libparted/labels/gpt.c:791 #, fuzzy, c-format msgid "" "The format of the GPT partition table is version %x, which is newer than " @@ -1266,7 +1261,7 @@ msgstr "" "Parted kan kjenna att. Ver venleg å seia i frå med ein epost til <bug-" "parted@gnu.org> (skriv helst på engelsk)" -#: libparted/labels/gpt.c:807 +#: libparted/labels/gpt.c:827 #, c-format msgid "" "Not all of the space available to %s appears to be used, you can fix the GPT " @@ -1274,7 +1269,7 @@ msgid "" "setting? " msgstr "" -#: libparted/labels/gpt.c:1006 +#: libparted/labels/gpt.c:1026 #, fuzzy msgid "" "The backup GPT table is not at the end of the disk, as it should be. Fix, " @@ -1285,7 +1280,7 @@ msgstr "" "dette rettast ved å flytta kopien til slutten av disken (og sletta den gamle " "kopien)?" -#: libparted/labels/gpt.c:1024 +#: libparted/labels/gpt.c:1044 #, fuzzy msgid "" "Both the primary and backup GPT tables are corrupt. Try making a fresh " @@ -1294,7 +1289,7 @@ msgstr "" "Både originalen og kopien av GPT-tabellen er korrupt. Prøv å laga ein ny " "tom tabell, og bruk Parteds redningsmodus til å finna partisjonane." -#: libparted/labels/gpt.c:1035 +#: libparted/labels/gpt.c:1055 #, fuzzy msgid "" "The backup GPT table is corrupt, but the primary appears OK, so that will be " @@ -1303,7 +1298,7 @@ msgstr "" "GPT-tabellen er korrupt, men sikringskopien ser frisk ut, så kopien vert " "brukt." -#: libparted/labels/gpt.c:1047 +#: libparted/labels/gpt.c:1067 #, fuzzy msgid "" "The primary GPT table is corrupt, but the backup appears OK, so that will be " @@ -1312,11 +1307,11 @@ msgstr "" "GPT-tabellen er korrupt, men sikringskopien ser frisk ut, så kopien vert " "brukt." -#: libparted/labels/gpt.c:1071 +#: libparted/labels/gpt.c:1091 msgid "primary partition table array CRC mismatch" msgstr "" -#: libparted/labels/gpt.c:1655 libparted/labels/gpt.c:1682 +#: libparted/labels/gpt.c:1722 libparted/labels/gpt.c:1749 #, fuzzy msgid "failed to translate partition name" msgstr "Kva partisjonsnummer er målet?" @@ -1989,7 +1984,7 @@ msgstr "fat_table_alloc_cluster: ingen ledige allokeringseiningar" msgid "Could not detect file system." msgstr "Kan ikkje kjenna igjen noko filsystem." -#: libparted/fs/r/filesys.c:159 libparted/fs/r/filesys.c:284 +#: libparted/fs/r/filesys.c:159 libparted/fs/r/filesys.c:285 #, fuzzy, c-format msgid "resizing %s file systems is not supported" msgstr "Støtte for å endra storleik på %s-filsystem er ikkje lagt inn enno." @@ -2259,40 +2254,40 @@ msgstr "" msgid "This HFS+ volume has no extents overflow file. This is quite unusual!" msgstr "" -#: parted/parted.c:137 +#: parted/parted.c:138 msgid "displays this help message" msgstr "vis denne hjelpeteksten" -#: parted/parted.c:138 +#: parted/parted.c:139 msgid "lists partition layout on all block devices" msgstr "" -#: parted/parted.c:139 +#: parted/parted.c:140 msgid "displays machine parseable output" msgstr "" -#: parted/parted.c:140 +#: parted/parted.c:141 msgid "displays JSON output" msgstr "" -#: parted/parted.c:141 +#: parted/parted.c:142 msgid "never prompts for user intervention" msgstr "spør aldri brukaren" -#: parted/parted.c:142 +#: parted/parted.c:143 msgid "in script mode, fix instead of abort when asked" msgstr "" -#: parted/parted.c:143 +#: parted/parted.c:144 msgid "displays the version" msgstr "vis programversjon" -#: parted/parted.c:144 +#: parted/parted.c:145 #, fuzzy msgid "alignment for new partitions" msgstr "Kan ikkje kopiera utvidingspartisjonar." -#: parted/parted.c:157 +#: parted/parted.c:158 #, fuzzy msgid "" "NUMBER is the partition number used by Linux. On MS-DOS disk labels, the " @@ -2302,32 +2297,32 @@ msgstr "" "primærpartisjonar nummerert 1-4, og logiske partisjonar går frå 5 og " "oppover.\n" -#: parted/parted.c:160 +#: parted/parted.c:161 msgid "LABEL-TYPE is one of: " msgstr "LABEL-TYPE er ein av: " -#: parted/parted.c:161 parted/parted.c:162 +#: parted/parted.c:162 parted/parted.c:163 msgid "FLAG is one of: " msgstr "FLAGG er eitt av: " -#: parted/parted.c:163 +#: parted/parted.c:164 #, fuzzy msgid "UNIT is one of: " msgstr "FLAGG er eitt av: " -#: parted/parted.c:164 +#: parted/parted.c:165 msgid "desired alignment: minimum or optimal" msgstr "" -#: parted/parted.c:165 +#: parted/parted.c:166 msgid "PART-TYPE is one of: primary, logical, extended\n" msgstr "PART-TYPE er ein av: primær, logisk, utviding\n" -#: parted/parted.c:167 +#: parted/parted.c:168 msgid "FS-TYPE is one of: " msgstr "FS-TYPE er ein av: " -#: parted/parted.c:168 +#: parted/parted.c:169 #, fuzzy msgid "" "START and END are disk locations, such as 4GB or 10%. Negative values count " @@ -2336,25 +2331,29 @@ msgid "" msgstr "" "START og SLUTT er i mebibytes. Negative verdiar tel frå slutten av disken.\n" -#: parted/parted.c:171 +#: parted/parted.c:172 msgid "" "END is disk location, such as 4GB or 10%. Negative value counts from the " "end of the disk. For example, -1s specifies exactly the last sector.\n" msgstr "" -#: parted/parted.c:174 +#: parted/parted.c:175 msgid "STATE is one of: on, off\n" msgstr "STATUS er ein av: av, på\n" -#: parted/parted.c:175 +#: parted/parted.c:176 msgid "DEVICE is usually /dev/hda or /dev/sda\n" msgstr "EINING er vanlegvis /dev/hda eller /dev/sda\n" -#: parted/parted.c:176 +#: parted/parted.c:177 msgid "NAME is any word you want\n" msgstr "NAMN er eit valfritt ord\n" -#: parted/parted.c:179 +#: parted/parted.c:178 +msgid "TYPE_ID is a value between 0x01 and 0xff, TYPE_UUID is a UUID\n" +msgstr "" + +#: parted/parted.c:182 #, fuzzy msgid "" "Copyright (C) 1998 - 2006 Free Software Foundation, Inc.\n" @@ -2377,155 +2376,178 @@ msgstr "" "eller BRUK TIL NOKO FORMÅL. Sjå GNU General Public License for detaljar.\n" "\n" -#: parted/parted.c:229 +#: parted/parted.c:232 #, c-format msgid "%0.f%%\t(time left %.2d:%.2d)" msgstr "%0.f%%\t(tid att %.2d:%.2d)" -#: parted/parted.c:248 +#: parted/parted.c:251 #, fuzzy, c-format msgid "Partition %s is being used. Are you sure you want to continue?" msgstr "Partisjonen %s er i bruk. Endringar no kan føre til alvorleg datatap." -#: parted/parted.c:269 +#: parted/parted.c:272 #, c-format msgid "Partition(s) on %s are being used." msgstr "Partisjon(ane) på %s er i bruk." -#: parted/parted.c:281 +#: parted/parted.c:284 #, c-format msgid "" "The existing disk label on %s will be destroyed and all data on this disk " "will be lost. Do you want to continue?" msgstr "" -#: parted/parted.c:542 +#: parted/parted.c:545 msgid "New disk label type?" msgstr "Ny disklabel-type?" -#: parted/parted.c:680 +#: parted/parted.c:692 msgid "Partition type?" msgstr "Partisjonstype?" -#: parted/parted.c:698 parted/parted.c:902 +#: parted/parted.c:710 parted/parted.c:914 msgid "Partition name?" msgstr "Partisjonsnamn?" -#: parted/parted.c:708 +#: parted/parted.c:720 msgid "File system type?" msgstr "Filsystemtype?" -#: parted/parted.c:713 parted/parted.c:1683 +#: parted/parted.c:725 parted/parted.c:1815 msgid "Start?" msgstr "Start?" -#: parted/parted.c:715 parted/parted.c:1685 parted/parted.c:1768 +#: parted/parted.c:727 parted/parted.c:1817 parted/parted.c:1900 msgid "End?" msgstr "Slutt?" -#: parted/parted.c:782 +#: parted/parted.c:794 #, c-format msgid "" "You requested a partition from %s to %s (sectors %llu..%llu).\n" "The closest location we can manage is %s to %s (sectors %llu..%llu).%s" msgstr "" -#: parted/parted.c:791 +#: parted/parted.c:803 msgid "" "\n" "Is this still acceptable to you?" msgstr "" -#: parted/parted.c:814 +#: parted/parted.c:826 #, c-format msgid "" "The resulting partition is not properly aligned for best performance: %s" msgstr "" -#: parted/parted.c:816 parted/parted.c:1925 +#: parted/parted.c:828 parted/parted.c:2057 msgid "unknown (malloc failed)" msgstr "" -#: parted/parted.c:894 +#: parted/parted.c:906 #, fuzzy, c-format msgid "%s disk labels do not support partition name." msgstr "Ein %s-disklabel støttar ikkje utvidingspartisjonar." -#: parted/parted.c:899 parted/parted.c:1748 parted/parted.c:1814 -#: parted/parted.c:1908 parted/parted.c:1983 +#: parted/parted.c:911 parted/parted.c:955 parted/parted.c:1880 +#: parted/parted.c:1946 parted/parted.c:2040 parted/parted.c:2115 msgid "Partition number?" msgstr "Partisjonsnummer?" -#: parted/parted.c:1050 +#: parted/parted.c:949 +#, fuzzy, c-format +msgid "%s disk labels do not support partition type." +msgstr "Ein %s-disklabel støttar ikkje utvidingspartisjonar." + +#: parted/parted.c:965 +#, fuzzy +msgid "Partition type-id?" +msgstr "Partisjonstype?" + +#: parted/parted.c:972 +msgid "Invalid type-id." +msgstr "" + +#: parted/parted.c:986 +#, fuzzy +msgid "Partition type-uuid?" +msgstr "Partisjonstype?" + +#: parted/parted.c:993 +msgid "Invalid type-uuid." +msgstr "" + +#: parted/parted.c:1146 #, c-format msgid "BIOS cylinder,head,sector geometry: %d,%d,%d. Each cylinder is %s.\n" msgstr "" -#: parted/parted.c:1137 +#: parted/parted.c:1240 #, c-format msgid "Model: %s (%s)\n" msgstr "" -#: parted/parted.c:1139 +#: parted/parted.c:1242 #, fuzzy, c-format msgid "Disk %s: %s\n" msgstr "Disklabel-type: %s\n" -#: parted/parted.c:1140 +#: parted/parted.c:1243 #, c-format msgid "Sector size (logical/physical): %lldB/%lldB\n" msgstr "" -#: parted/parted.c:1152 +#: parted/parted.c:1255 #, fuzzy, c-format msgid "Partition Table: %s\n" msgstr "Partisjonsnamn?" -#: parted/parted.c:1153 +#: parted/parted.c:1256 #, fuzzy, c-format msgid "Disk Flags: %s\n" msgstr "Disklabel-type: %s\n" -#: parted/parted.c:1279 parted/parted.c:1282 +#: parted/parted.c:1388 parted/parted.c:1391 msgid "Number" msgstr "" -#: parted/parted.c:1279 parted/parted.c:1282 +#: parted/parted.c:1388 parted/parted.c:1391 #, fuzzy msgid "Start" msgstr "Start?" -#: parted/parted.c:1280 parted/parted.c:1283 +#: parted/parted.c:1389 parted/parted.c:1392 #, fuzzy msgid "End" msgstr "Slutt?" -#: parted/parted.c:1283 +#: parted/parted.c:1392 msgid "Size" msgstr "" -#: parted/parted.c:1287 +#: parted/parted.c:1396 msgid "Type" msgstr "" -#: parted/parted.c:1289 +#: parted/parted.c:1398 #, fuzzy msgid "File system" msgstr "Filsystem?" -#: parted/parted.c:1292 +#: parted/parted.c:1401 msgid "Name" msgstr "" -#: parted/parted.c:1294 +#: parted/parted.c:1403 msgid "Flags" msgstr "Flagg" -#: parted/parted.c:1352 +#: parted/parted.c:1461 msgid "Free Space" msgstr "" -#: parted/parted.c:1570 +#: parted/parted.c:1702 #, fuzzy, c-format msgid "" "A %s %s partition was found at %s -> %s. Do you want to add it to the " @@ -2534,66 +2556,66 @@ msgstr "" "Ein %s %s-partisjon vart funnen på %.3f MiB -> %.3f MiB. Ønskjer du å " "leggja han til i partisjonstabellen?" -#: parted/parted.c:1613 +#: parted/parted.c:1745 msgid "searching for file systems" msgstr "leitar etter filsystem" -#: parted/parted.c:1720 +#: parted/parted.c:1852 msgid "The resize command has been removed in parted 3.0" msgstr "" -#: parted/parted.c:1782 +#: parted/parted.c:1914 msgid "" "Shrinking a partition can cause data loss, are you sure you want to continue?" msgstr "" -#: parted/parted.c:1838 +#: parted/parted.c:1970 msgid "New device?" msgstr "Ny eining?" -#: parted/parted.c:1906 +#: parted/parted.c:2038 msgid "alignment type(min/opt)" msgstr "" -#: parted/parted.c:1921 +#: parted/parted.c:2053 #, c-format msgid "%d aligned\n" msgstr "" -#: parted/parted.c:1923 +#: parted/parted.c:2055 #, c-format msgid "%d not aligned: %s\n" msgstr "" -#: parted/parted.c:1948 parted/parted.c:1985 +#: parted/parted.c:2080 parted/parted.c:2117 #, fuzzy msgid "Flag to Invert?" msgstr "Flagg som skal endrast?" -#: parted/parted.c:1953 parted/parted.c:1990 +#: parted/parted.c:2085 parted/parted.c:2122 msgid "New state?" msgstr "Ny status?" -#: parted/parted.c:2036 +#: parted/parted.c:2168 msgid "Unit?" msgstr "" -#: parted/parted.c:2171 +#: parted/parted.c:2303 #, fuzzy msgid "align-check" msgstr "check" -#: parted/parted.c:2174 +#: parted/parted.c:2306 msgid "" "align-check TYPE N check partition N for TYPE(min|opt) " "alignment" msgstr "" -#: parted/parted.c:2182 +#: parted/parted.c:2314 msgid "help" msgstr "help" -#: parted/parted.c:2185 +#: parted/parted.c:2317 #, fuzzy msgid "" "help [COMMAND] print general help, or help on " @@ -2601,31 +2623,31 @@ msgid "" msgstr "" "help [KOMMANDO] gjev generell hjelp, eller hjelp om KOMMANDO" -#: parted/parted.c:2191 +#: parted/parted.c:2323 msgid "mklabel" msgstr "mklabel" -#: parted/parted.c:2191 +#: parted/parted.c:2323 msgid "mktable" msgstr "" -#: parted/parted.c:2194 +#: parted/parted.c:2326 #, fuzzy msgid "" "mklabel,mktable LABEL-TYPE create a new disklabel (partition " "table)" msgstr "mklabel LABEL-TYPE lag ny disklabel (partisjonstabell)" -#: parted/parted.c:2200 +#: parted/parted.c:2332 msgid "mkpart" msgstr "mkpart" -#: parted/parted.c:2203 +#: parted/parted.c:2335 #, fuzzy msgid "mkpart PART-TYPE [FS-TYPE] START END make a partition" msgstr "mkpart PART-TYPE [FS-TYPE] START SLUTT lag ein partisjon" -#: parted/parted.c:2209 +#: parted/parted.c:2341 #, fuzzy msgid "" "'mkpart' makes a partition without creating a new file system on the " @@ -2634,20 +2656,20 @@ msgstr "" "mkpart lagar ein partisjon utan å laga eit nytt filsystem der. Du kan " "spesifisera FS-TYPE for å setja ein passande partisjons-id.\n" -#: parted/parted.c:2214 +#: parted/parted.c:2346 msgid "name" msgstr "name" -#: parted/parted.c:2217 +#: parted/parted.c:2349 #, fuzzy msgid "name NUMBER NAME name partition NUMBER as NAME" msgstr "name NR NAMN gje partisjonen NR namnet NAMN" -#: parted/parted.c:2222 +#: parted/parted.c:2354 msgid "print" msgstr "print" -#: parted/parted.c:2225 +#: parted/parted.c:2357 #, fuzzy msgid "" "print [devices|free|list,all] display the partition table, or " @@ -2655,7 +2677,7 @@ msgid "" msgstr "" "print [NR] vis partisjonstabellen eller ein partisjon" -#: parted/parted.c:2229 +#: parted/parted.c:2361 #, fuzzy msgid "" "Without arguments, 'print' displays the entire partition table. However with " @@ -2665,35 +2687,35 @@ msgstr "" "partisjonsnummer er oppgjeve, vil meir detaljert informasjon om\n" "partisjonen verta vist.\n" -#: parted/parted.c:2231 +#: parted/parted.c:2363 msgid " devices : display all active block devices\n" msgstr "" -#: parted/parted.c:2232 +#: parted/parted.c:2364 msgid "" " free : display information about free unpartitioned space on the " "current block device\n" msgstr "" -#: parted/parted.c:2234 +#: parted/parted.c:2366 msgid "" " list, all : display the partition tables of all active block devices\n" msgstr "" -#: parted/parted.c:2238 +#: parted/parted.c:2370 msgid "quit" msgstr "quit" -#: parted/parted.c:2241 +#: parted/parted.c:2373 #, fuzzy msgid "quit exit program" msgstr "quit avslutt programmet" -#: parted/parted.c:2246 +#: parted/parted.c:2378 msgid "rescue" msgstr "rescue" -#: parted/parted.c:2249 +#: parted/parted.c:2381 #, fuzzy msgid "" "rescue START END rescue a lost partition near START " @@ -2701,120 +2723,130 @@ msgid "" msgstr "" "rescue START SLUTT redd tapte partisjonar nær START og SLUTT" -#: parted/parted.c:2255 +#: parted/parted.c:2387 msgid "resize" msgstr "resize" -#: parted/parted.c:2258 +#: parted/parted.c:2390 msgid "The resize command was removed in parted 3.0\n" msgstr "" -#: parted/parted.c:2261 +#: parted/parted.c:2393 #, fuzzy msgid "resizepart" msgstr "resize" -#: parted/parted.c:2264 +#: parted/parted.c:2396 #, fuzzy msgid "resizepart NUMBER END resize partition NUMBER" msgstr "rm NR slett partisjonen NR" -#: parted/parted.c:2269 +#: parted/parted.c:2401 msgid "rm" msgstr "rm" -#: parted/parted.c:2272 +#: parted/parted.c:2404 #, fuzzy msgid "rm NUMBER delete partition NUMBER" msgstr "rm NR slett partisjonen NR" -#: parted/parted.c:2277 +#: parted/parted.c:2409 msgid "select" msgstr "select" -#: parted/parted.c:2280 +#: parted/parted.c:2412 #, fuzzy msgid "select DEVICE choose the device to edit" msgstr "select EINING vel eininga du vil gjera endringar på" -#: parted/parted.c:2285 +#: parted/parted.c:2417 msgid "disk_set" msgstr "" -#: parted/parted.c:2288 +#: parted/parted.c:2420 msgid "" "disk_set FLAG STATE change the FLAG on selected device" msgstr "" -#: parted/parted.c:2293 +#: parted/parted.c:2425 msgid "disk_toggle" msgstr "" -#: parted/parted.c:2296 +#: parted/parted.c:2428 msgid "" "disk_toggle [FLAG] toggle the state of FLAG on " "selected device" msgstr "" -#: parted/parted.c:2302 +#: parted/parted.c:2434 msgid "set" msgstr "set" -#: parted/parted.c:2305 +#: parted/parted.c:2437 #, fuzzy msgid "" "set NUMBER FLAG STATE change the FLAG on partition NUMBER" msgstr "set NR FLAGG STATUS endra eit flagg på partisjonen NR" -#: parted/parted.c:2311 +#: parted/parted.c:2443 msgid "toggle" msgstr "" -#: parted/parted.c:2314 +#: parted/parted.c:2446 msgid "" "toggle [NUMBER [FLAG]] toggle the state of FLAG on " "partition NUMBER" msgstr "" -#: parted/parted.c:2320 +#: parted/parted.c:2452 +msgid "type" +msgstr "" + +#: parted/parted.c:2455 +msgid "" +"type NUMBER TYPE-ID or TYPE-UUID type set TYPE-ID or TYPE-UUID of " +"partition NUMBER" +msgstr "" + +#: parted/parted.c:2460 msgid "unit" msgstr "" -#: parted/parted.c:2323 +#: parted/parted.c:2463 #, fuzzy msgid "unit UNIT set the default unit to UNIT" msgstr "quit avslutt programmet" -#: parted/parted.c:2328 +#: parted/parted.c:2468 msgid "version" msgstr "" -#: parted/parted.c:2331 +#: parted/parted.c:2471 msgid "" "version display the version number and " "copyright information of GNU Parted" msgstr "" -#: parted/parted.c:2335 +#: parted/parted.c:2475 msgid "" "'version' displays copyright and version information corresponding to this " "copy of GNU Parted\n" msgstr "" -#: parted/parted.c:2405 +#: parted/parted.c:2545 #, c-format msgid "Usage: %s [-hlmsfv] [-a<align>] [DEVICE [COMMAND [PARAMETERS]]...]\n" msgstr "" -#: parted/parted.c:2449 +#: parted/parted.c:2589 msgid "No device found" msgstr "Ingen diskar funne" -#: parted/parted.c:2486 +#: parted/parted.c:2626 msgid "WARNING: You are not superuser. Watch out for permissions.\n" msgstr "" -#: parted/parted.c:2519 +#: parted/parted.c:2659 msgid "" "You should reinstall your boot loader before rebooting. Read section 4 of " "the Parted User documentation for more information." @@ -2822,7 +2854,7 @@ msgstr "" "Du må installera boot-lastaren på nytt før neste omstart. Les del 4 i " "brukarhandboka for meir informasjon." -#: parted/parted.c:2526 +#: parted/parted.c:2666 #, fuzzy msgid "You may need to update /etc/fstab.\n" msgstr "Gløym ikkje å oppdatera /etc/fstab, om naudsynt.\n" @@ -3009,81 +3041,81 @@ msgid "" "Error: A general SIGILL signal was encountered." msgstr "" -#: parted/ui.c:901 +#: parted/ui.c:904 #, fuzzy, c-format msgid "invalid token: %s" msgstr "Ugyldig partisjonstabell på %s" -#: parted/ui.c:1082 +#: parted/ui.c:1085 msgid "Expecting a partition number." msgstr "Forventa eit partisjonsnummer." -#: parted/ui.c:1091 +#: parted/ui.c:1094 msgid "Partition doesn't exist." msgstr "Partisjonen finst ikkje." -#: parted/ui.c:1111 +#: parted/ui.c:1114 msgid "Expecting a file system type." msgstr "Forventa ei filsystemtype." -#: parted/ui.c:1118 +#: parted/ui.c:1121 #, c-format msgid "Unknown file system type \"%s\"." msgstr "Filsystemtypen «%s» er ukjend." -#: parted/ui.c:1139 +#: parted/ui.c:1142 msgid "Expecting a disk label type." msgstr "Forventa ein disklabel-type." -#: parted/ui.c:1170 parted/ui.c:1206 +#: parted/ui.c:1173 parted/ui.c:1209 msgid "No flags supported" msgstr "" -#: parted/ui.c:1280 +#: parted/ui.c:1283 msgid "Can't create any more partitions." msgstr "Kan ikkje laga fleire partisjonar." -#: parted/ui.c:1290 +#: parted/ui.c:1293 msgid "Expecting a partition type." msgstr "Forventa ein partisjonstype." -#: parted/ui.c:1439 +#: parted/ui.c:1442 msgid "on" msgstr "på" -#: parted/ui.c:1440 +#: parted/ui.c:1443 msgid "off" msgstr "av" -#: parted/ui.c:1457 +#: parted/ui.c:1460 msgid "optimal" msgstr "" -#: parted/ui.c:1458 +#: parted/ui.c:1461 msgid "minimal" msgstr "" -#: parted/ui.c:1591 +#: parted/ui.c:1594 msgid "OPTIONs:" msgstr "FLAGG:" -#: parted/ui.c:1596 +#: parted/ui.c:1599 msgid "COMMANDs:" msgstr "KOMMANDOar:" -#: parted/ui.c:1599 +#: parted/ui.c:1602 #, c-format msgid "" "\n" "Report bugs to %s\n" msgstr "" -#: parted/ui.c:1606 +#: parted/ui.c:1609 #, c-format msgid "Using %s\n" msgstr "Brukar %s\n" -#: parted/ui.c:1686 +#: parted/ui.c:1689 msgid "This command does not make sense in non-interactive mode.\n" msgstr "" diff --git a/po/parted.pot b/po/parted.pot index 8377e92..54f684f 100644 --- a/po/parted.pot +++ b/po/parted.pot @@ -6,9 +6,9 @@ #, fuzzy msgid "" msgstr "" -"Project-Id-Version: GNU parted 3.5\n" +"Project-Id-Version: GNU parted 3.6\n" "Report-Msgid-Bugs-To: bug-parted@gnu.org\n" -"POT-Creation-Date: 2022-04-18 14:44-0400\n" +"POT-Creation-Date: 2023-04-10 15:50-0700\n" "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n" "Language-Team: LANGUAGE <LL@li.org>\n" @@ -17,25 +17,25 @@ msgstr "" "Content-Type: text/plain; charset=CHARSET\n" "Content-Transfer-Encoding: 8bit\n" -#: lib/argmatch.c:147 +#: lib/argmatch.c:145 #, c-format msgid "invalid argument %s for %s" msgstr "" -#: lib/argmatch.c:148 +#: lib/argmatch.c:146 #, c-format msgid "ambiguous argument %s for %s" msgstr "" -#: lib/argmatch.c:167 lib/argmatch.h:238 +#: lib/argmatch.c:165 lib/argmatch.h:237 msgid "Valid arguments are:" msgstr "" -#: lib/closeout.c:122 libparted/labels/fdasd.c:145 +#: lib/closeout.c:121 libparted/labels/fdasd.c:145 msgid "write error" msgstr "" -#: lib/error.c:195 +#: lib/error.c:193 msgid "Unknown system error" msgstr "" @@ -95,11 +95,11 @@ msgstr "" #. If you don't know what to put here, please see #. <https://en.wikipedia.org/wiki/Quotation_marks_in_other_languages> #. and use glyphs suitable for your language. -#: lib/quotearg.c:355 +#: lib/quotearg.c:354 msgid "`" msgstr "" -#: lib/quotearg.c:356 +#: lib/quotearg.c:355 msgid "'" msgstr "" @@ -181,7 +181,7 @@ msgstr "" #. To enquire the regular expression that your system uses for this #. purpose, you can use the command #. locale -k LC_MESSAGES | grep '^yesexpr=' -#: lib/rpmatch.c:150 +#: lib/rpmatch.c:149 msgid "^[yY]" msgstr "" @@ -191,7 +191,7 @@ msgstr "" #. To enquire the regular expression that your system uses for this #. purpose, you can use the command #. locale -k LC_MESSAGES | grep '^noexpr=' -#: lib/rpmatch.c:163 +#: lib/rpmatch.c:162 msgid "^[nN]" msgstr "" @@ -687,157 +687,161 @@ msgstr "" msgid "Unknown disk flag, %d." msgstr "" -#: libparted/disk.c:1289 +#: libparted/disk.c:1320 #, c-format msgid "%s disk labels do not support extended partitions." msgstr "" -#: libparted/disk.c:1821 +#: libparted/disk.c:1990 #, c-format msgid "%s disk labels don't support logical or extended partitions." msgstr "" -#: libparted/disk.c:1834 +#: libparted/disk.c:2003 msgid "Too many primary partitions." msgstr "" -#: libparted/disk.c:1843 +#: libparted/disk.c:2012 #, c-format msgid "" "Can't add a logical partition to %s, because there is no extended partition." msgstr "" -#: libparted/disk.c:1867 +#: libparted/disk.c:2036 #, c-format msgid "Can't have more than one extended partition on %s." msgstr "" -#: libparted/disk.c:1877 +#: libparted/disk.c:2046 msgid "Can't have logical partitions outside of the extended partition." msgstr "" -#: libparted/disk.c:1902 +#: libparted/disk.c:2071 #, c-format msgid "Can't have a logical partition outside of the extended partition on %s." msgstr "" -#: libparted/disk.c:1912 +#: libparted/disk.c:2081 msgid "Can't have a primary partition inside an extended partition." msgstr "" -#: libparted/disk.c:1921 +#: libparted/disk.c:2090 msgid "Can't have a partition outside the disk!" msgstr "" -#: libparted/disk.c:1972 libparted/disk.c:2150 +#: libparted/disk.c:2141 libparted/disk.c:2319 msgid "Can't have overlapping partitions." msgstr "" -#: libparted/disk.c:2351 +#: libparted/disk.c:2520 msgid "metadata" msgstr "" -#: libparted/disk.c:2353 +#: libparted/disk.c:2522 msgid "free" msgstr "" -#: libparted/disk.c:2355 parted/ui.c:1271 parted/ui.c:1299 +#: libparted/disk.c:2524 parted/ui.c:1274 parted/ui.c:1302 msgid "extended" msgstr "" -#: libparted/disk.c:2357 parted/ui.c:1275 parted/ui.c:1303 +#: libparted/disk.c:2526 parted/ui.c:1278 parted/ui.c:1306 msgid "logical" msgstr "" -#: libparted/disk.c:2359 parted/ui.c:1267 parted/ui.c:1295 +#: libparted/disk.c:2528 parted/ui.c:1270 parted/ui.c:1298 msgid "primary" msgstr "" -#: libparted/disk.c:2375 +#: libparted/disk.c:2544 msgid "boot" msgstr "" -#: libparted/disk.c:2377 +#: libparted/disk.c:2546 msgid "bios_grub" msgstr "" -#: libparted/disk.c:2379 +#: libparted/disk.c:2548 msgid "root" msgstr "" -#: libparted/disk.c:2381 +#: libparted/disk.c:2550 msgid "swap" msgstr "" -#: libparted/disk.c:2383 +#: libparted/disk.c:2552 msgid "hidden" msgstr "" -#: libparted/disk.c:2385 +#: libparted/disk.c:2554 msgid "raid" msgstr "" -#: libparted/disk.c:2387 +#: libparted/disk.c:2556 msgid "lvm" msgstr "" -#: libparted/disk.c:2389 +#: libparted/disk.c:2558 msgid "lba" msgstr "" -#: libparted/disk.c:2391 +#: libparted/disk.c:2560 msgid "hp-service" msgstr "" -#: libparted/disk.c:2393 +#: libparted/disk.c:2562 msgid "palo" msgstr "" -#: libparted/disk.c:2395 +#: libparted/disk.c:2564 msgid "prep" msgstr "" -#: libparted/disk.c:2397 +#: libparted/disk.c:2566 msgid "msftres" msgstr "" -#: libparted/disk.c:2399 +#: libparted/disk.c:2568 msgid "msftdata" msgstr "" -#: libparted/disk.c:2401 +#: libparted/disk.c:2570 msgid "atvrecv" msgstr "" -#: libparted/disk.c:2403 +#: libparted/disk.c:2572 msgid "diag" msgstr "" -#: libparted/disk.c:2405 +#: libparted/disk.c:2574 msgid "legacy_boot" msgstr "" -#: libparted/disk.c:2407 +#: libparted/disk.c:2576 msgid "irst" msgstr "" -#: libparted/disk.c:2409 +#: libparted/disk.c:2578 msgid "esp" msgstr "" -#: libparted/disk.c:2411 +#: libparted/disk.c:2580 msgid "chromeos_kernel" msgstr "" -#: libparted/disk.c:2413 +#: libparted/disk.c:2582 msgid "bls_boot" msgstr "" -#: libparted/disk.c:2415 +#: libparted/disk.c:2584 msgid "linux-home" msgstr "" -#: libparted/disk.c:2421 +#: libparted/disk.c:2586 +msgid "no_automount" +msgstr "" + +#: libparted/disk.c:2592 #, c-format msgid "Unknown partition flag, %d." msgstr "" @@ -1015,8 +1019,8 @@ msgid "" msgstr "" #: libparted/labels/atari.c:1662 libparted/labels/bsd.c:563 -#: libparted/labels/dasd.c:895 libparted/labels/dos.c:2303 -#: libparted/labels/dvh.c:770 libparted/labels/gpt.c:1769 +#: libparted/labels/dasd.c:893 libparted/labels/dos.c:2294 +#: libparted/labels/dvh.c:770 libparted/labels/gpt.c:1891 #: libparted/labels/loop.c:244 libparted/labels/mac.c:1409 #: libparted/labels/pc98.c:697 libparted/labels/rdb.c:1054 #: libparted/labels/sun.c:781 @@ -1038,37 +1042,29 @@ msgstr "" msgid "Unable to allocate a bsd disklabel slot." msgstr "" -#: libparted/labels/dasd.c:626 +#: libparted/labels/dasd.c:634 msgid "The partition table of DASD-LDL device cannot be changed.\n" msgstr "" -#: libparted/labels/dasd.c:921 +#: libparted/labels/dasd.c:919 msgid "Unable to allocate a dasd disklabel slot" msgstr "" -#: libparted/labels/dos.c:1008 +#: libparted/labels/dos.c:1159 #, c-format msgid "Invalid partition table on %s -- wrong signature %x." msgstr "" -#: libparted/labels/dos.c:1036 +#: libparted/labels/dos.c:1187 #, c-format msgid "Invalid partition table - recursive partition on %s." msgstr "" -#: libparted/labels/dos.c:1567 -msgid "Extended partitions cannot be hidden on msdos disk labels." -msgstr "" - -#: libparted/labels/dos.c:1579 -msgid "Extended partitions cannot be recovery partitions on msdos disk labels." -msgstr "" - -#: libparted/labels/dos.c:2285 +#: libparted/labels/dos.c:2276 msgid "Parted can't resize partitions managed by Windows Dynamic Disk." msgstr "" -#: libparted/labels/dos.c:2541 +#: libparted/labels/dos.c:2532 msgid "cannot create any more partitions" msgstr "" @@ -1206,18 +1202,18 @@ msgstr "" msgid "Disk geometry does not match a DASD device of type 3390." msgstr "" -#: libparted/labels/gpt.c:569 +#: libparted/labels/gpt.c:589 msgid "device is too small for GPT" msgstr "" -#: libparted/labels/gpt.c:771 +#: libparted/labels/gpt.c:791 #, c-format msgid "" "The format of the GPT partition table is version %x, which is newer than " "what Parted can recognise. Please report this!" msgstr "" -#: libparted/labels/gpt.c:807 +#: libparted/labels/gpt.c:827 #, c-format msgid "" "Not all of the space available to %s appears to be used, you can fix the GPT " @@ -1225,35 +1221,35 @@ msgid "" "setting? " msgstr "" -#: libparted/labels/gpt.c:1006 +#: libparted/labels/gpt.c:1026 msgid "" "The backup GPT table is not at the end of the disk, as it should be. Fix, " "by moving the backup to the end (and removing the old backup)?" msgstr "" -#: libparted/labels/gpt.c:1024 +#: libparted/labels/gpt.c:1044 msgid "" "Both the primary and backup GPT tables are corrupt. Try making a fresh " "table, and using Parted's rescue feature to recover partitions." msgstr "" -#: libparted/labels/gpt.c:1035 +#: libparted/labels/gpt.c:1055 msgid "" "The backup GPT table is corrupt, but the primary appears OK, so that will be " "used." msgstr "" -#: libparted/labels/gpt.c:1047 +#: libparted/labels/gpt.c:1067 msgid "" "The primary GPT table is corrupt, but the backup appears OK, so that will be " "used." msgstr "" -#: libparted/labels/gpt.c:1071 +#: libparted/labels/gpt.c:1091 msgid "primary partition table array CRC mismatch" msgstr "" -#: libparted/labels/gpt.c:1655 libparted/labels/gpt.c:1682 +#: libparted/labels/gpt.c:1722 libparted/labels/gpt.c:1749 msgid "failed to translate partition name" msgstr "" @@ -1853,7 +1849,7 @@ msgstr "" msgid "Could not detect file system." msgstr "" -#: libparted/fs/r/filesys.c:159 libparted/fs/r/filesys.c:284 +#: libparted/fs/r/filesys.c:159 libparted/fs/r/filesys.c:285 #, c-format msgid "resizing %s file systems is not supported" msgstr "" @@ -2112,94 +2108,98 @@ msgstr "" msgid "This HFS+ volume has no extents overflow file. This is quite unusual!" msgstr "" -#: parted/parted.c:137 +#: parted/parted.c:138 msgid "displays this help message" msgstr "" -#: parted/parted.c:138 +#: parted/parted.c:139 msgid "lists partition layout on all block devices" msgstr "" -#: parted/parted.c:139 +#: parted/parted.c:140 msgid "displays machine parseable output" msgstr "" -#: parted/parted.c:140 +#: parted/parted.c:141 msgid "displays JSON output" msgstr "" -#: parted/parted.c:141 +#: parted/parted.c:142 msgid "never prompts for user intervention" msgstr "" -#: parted/parted.c:142 +#: parted/parted.c:143 msgid "in script mode, fix instead of abort when asked" msgstr "" -#: parted/parted.c:143 +#: parted/parted.c:144 msgid "displays the version" msgstr "" -#: parted/parted.c:144 +#: parted/parted.c:145 msgid "alignment for new partitions" msgstr "" -#: parted/parted.c:157 +#: parted/parted.c:158 msgid "" "NUMBER is the partition number used by Linux. On MS-DOS disk labels, the " "primary partitions number from 1 to 4, logical partitions from 5 onwards.\n" msgstr "" -#: parted/parted.c:160 +#: parted/parted.c:161 msgid "LABEL-TYPE is one of: " msgstr "" -#: parted/parted.c:161 parted/parted.c:162 +#: parted/parted.c:162 parted/parted.c:163 msgid "FLAG is one of: " msgstr "" -#: parted/parted.c:163 +#: parted/parted.c:164 msgid "UNIT is one of: " msgstr "" -#: parted/parted.c:164 +#: parted/parted.c:165 msgid "desired alignment: minimum or optimal" msgstr "" -#: parted/parted.c:165 +#: parted/parted.c:166 msgid "PART-TYPE is one of: primary, logical, extended\n" msgstr "" -#: parted/parted.c:167 +#: parted/parted.c:168 msgid "FS-TYPE is one of: " msgstr "" -#: parted/parted.c:168 +#: parted/parted.c:169 msgid "" "START and END are disk locations, such as 4GB or 10%. Negative values count " "from the end of the disk. For example, -1s specifies exactly the last " "sector.\n" msgstr "" -#: parted/parted.c:171 +#: parted/parted.c:172 msgid "" "END is disk location, such as 4GB or 10%. Negative value counts from the " "end of the disk. For example, -1s specifies exactly the last sector.\n" msgstr "" -#: parted/parted.c:174 +#: parted/parted.c:175 msgid "STATE is one of: on, off\n" msgstr "" -#: parted/parted.c:175 +#: parted/parted.c:176 msgid "DEVICE is usually /dev/hda or /dev/sda\n" msgstr "" -#: parted/parted.c:176 +#: parted/parted.c:177 msgid "NAME is any word you want\n" msgstr "" -#: parted/parted.c:179 +#: parted/parted.c:178 +msgid "TYPE_ID is a value between 0x01 and 0xff, TYPE_UUID is a UUID\n" +msgstr "" + +#: parted/parted.c:182 msgid "" "Copyright (C) 1998 - 2006 Free Software Foundation, Inc.\n" "This program is free software, covered by the GNU General Public License.\n" @@ -2211,420 +2211,451 @@ msgid "" "\n" msgstr "" -#: parted/parted.c:229 +#: parted/parted.c:232 #, c-format msgid "%0.f%%\t(time left %.2d:%.2d)" msgstr "" -#: parted/parted.c:248 +#: parted/parted.c:251 #, c-format msgid "Partition %s is being used. Are you sure you want to continue?" msgstr "" -#: parted/parted.c:269 +#: parted/parted.c:272 #, c-format msgid "Partition(s) on %s are being used." msgstr "" -#: parted/parted.c:281 +#: parted/parted.c:284 #, c-format msgid "" "The existing disk label on %s will be destroyed and all data on this disk " "will be lost. Do you want to continue?" msgstr "" -#: parted/parted.c:542 +#: parted/parted.c:545 msgid "New disk label type?" msgstr "" -#: parted/parted.c:680 +#: parted/parted.c:692 msgid "Partition type?" msgstr "" -#: parted/parted.c:698 parted/parted.c:902 +#: parted/parted.c:710 parted/parted.c:914 msgid "Partition name?" msgstr "" -#: parted/parted.c:708 +#: parted/parted.c:720 msgid "File system type?" msgstr "" -#: parted/parted.c:713 parted/parted.c:1683 +#: parted/parted.c:725 parted/parted.c:1815 msgid "Start?" msgstr "" -#: parted/parted.c:715 parted/parted.c:1685 parted/parted.c:1768 +#: parted/parted.c:727 parted/parted.c:1817 parted/parted.c:1900 msgid "End?" msgstr "" -#: parted/parted.c:782 +#: parted/parted.c:794 #, c-format msgid "" "You requested a partition from %s to %s (sectors %llu..%llu).\n" "The closest location we can manage is %s to %s (sectors %llu..%llu).%s" msgstr "" -#: parted/parted.c:791 +#: parted/parted.c:803 msgid "" "\n" "Is this still acceptable to you?" msgstr "" -#: parted/parted.c:814 +#: parted/parted.c:826 #, c-format msgid "" "The resulting partition is not properly aligned for best performance: %s" msgstr "" -#: parted/parted.c:816 parted/parted.c:1925 +#: parted/parted.c:828 parted/parted.c:2057 msgid "unknown (malloc failed)" msgstr "" -#: parted/parted.c:894 +#: parted/parted.c:906 #, c-format msgid "%s disk labels do not support partition name." msgstr "" -#: parted/parted.c:899 parted/parted.c:1748 parted/parted.c:1814 -#: parted/parted.c:1908 parted/parted.c:1983 +#: parted/parted.c:911 parted/parted.c:955 parted/parted.c:1880 +#: parted/parted.c:1946 parted/parted.c:2040 parted/parted.c:2115 msgid "Partition number?" msgstr "" -#: parted/parted.c:1050 +#: parted/parted.c:949 +#, c-format +msgid "%s disk labels do not support partition type." +msgstr "" + +#: parted/parted.c:965 +msgid "Partition type-id?" +msgstr "" + +#: parted/parted.c:972 +msgid "Invalid type-id." +msgstr "" + +#: parted/parted.c:986 +msgid "Partition type-uuid?" +msgstr "" + +#: parted/parted.c:993 +msgid "Invalid type-uuid." +msgstr "" + +#: parted/parted.c:1146 #, c-format msgid "BIOS cylinder,head,sector geometry: %d,%d,%d. Each cylinder is %s.\n" msgstr "" -#: parted/parted.c:1137 +#: parted/parted.c:1240 #, c-format msgid "Model: %s (%s)\n" msgstr "" -#: parted/parted.c:1139 +#: parted/parted.c:1242 #, c-format msgid "Disk %s: %s\n" msgstr "" -#: parted/parted.c:1140 +#: parted/parted.c:1243 #, c-format msgid "Sector size (logical/physical): %lldB/%lldB\n" msgstr "" -#: parted/parted.c:1152 +#: parted/parted.c:1255 #, c-format msgid "Partition Table: %s\n" msgstr "" -#: parted/parted.c:1153 +#: parted/parted.c:1256 #, c-format msgid "Disk Flags: %s\n" msgstr "" -#: parted/parted.c:1279 parted/parted.c:1282 +#: parted/parted.c:1388 parted/parted.c:1391 msgid "Number" msgstr "" -#: parted/parted.c:1279 parted/parted.c:1282 +#: parted/parted.c:1388 parted/parted.c:1391 msgid "Start" msgstr "" -#: parted/parted.c:1280 parted/parted.c:1283 +#: parted/parted.c:1389 parted/parted.c:1392 msgid "End" msgstr "" -#: parted/parted.c:1283 +#: parted/parted.c:1392 msgid "Size" msgstr "" -#: parted/parted.c:1287 +#: parted/parted.c:1396 msgid "Type" msgstr "" -#: parted/parted.c:1289 +#: parted/parted.c:1398 msgid "File system" msgstr "" -#: parted/parted.c:1292 +#: parted/parted.c:1401 msgid "Name" msgstr "" -#: parted/parted.c:1294 +#: parted/parted.c:1403 msgid "Flags" msgstr "" -#: parted/parted.c:1352 +#: parted/parted.c:1461 msgid "Free Space" msgstr "" -#: parted/parted.c:1570 +#: parted/parted.c:1702 #, c-format msgid "" "A %s %s partition was found at %s -> %s. Do you want to add it to the " "partition table?" msgstr "" -#: parted/parted.c:1613 +#: parted/parted.c:1745 msgid "searching for file systems" msgstr "" -#: parted/parted.c:1720 +#: parted/parted.c:1852 msgid "The resize command has been removed in parted 3.0" msgstr "" -#: parted/parted.c:1782 +#: parted/parted.c:1914 msgid "" "Shrinking a partition can cause data loss, are you sure you want to continue?" msgstr "" -#: parted/parted.c:1838 +#: parted/parted.c:1970 msgid "New device?" msgstr "" -#: parted/parted.c:1906 +#: parted/parted.c:2038 msgid "alignment type(min/opt)" msgstr "" -#: parted/parted.c:1921 +#: parted/parted.c:2053 #, c-format msgid "%d aligned\n" msgstr "" -#: parted/parted.c:1923 +#: parted/parted.c:2055 #, c-format msgid "%d not aligned: %s\n" msgstr "" -#: parted/parted.c:1948 parted/parted.c:1985 +#: parted/parted.c:2080 parted/parted.c:2117 msgid "Flag to Invert?" msgstr "" -#: parted/parted.c:1953 parted/parted.c:1990 +#: parted/parted.c:2085 parted/parted.c:2122 msgid "New state?" msgstr "" -#: parted/parted.c:2036 +#: parted/parted.c:2168 msgid "Unit?" msgstr "" -#: parted/parted.c:2171 +#: parted/parted.c:2303 msgid "align-check" msgstr "" -#: parted/parted.c:2174 +#: parted/parted.c:2306 msgid "" "align-check TYPE N check partition N for TYPE(min|opt) " "alignment" msgstr "" -#: parted/parted.c:2182 +#: parted/parted.c:2314 msgid "help" msgstr "" -#: parted/parted.c:2185 +#: parted/parted.c:2317 msgid "" "help [COMMAND] print general help, or help on " "COMMAND" msgstr "" -#: parted/parted.c:2191 +#: parted/parted.c:2323 msgid "mklabel" msgstr "" -#: parted/parted.c:2191 +#: parted/parted.c:2323 msgid "mktable" msgstr "" -#: parted/parted.c:2194 +#: parted/parted.c:2326 msgid "" "mklabel,mktable LABEL-TYPE create a new disklabel (partition " "table)" msgstr "" -#: parted/parted.c:2200 +#: parted/parted.c:2332 msgid "mkpart" msgstr "" -#: parted/parted.c:2203 +#: parted/parted.c:2335 msgid "mkpart PART-TYPE [FS-TYPE] START END make a partition" msgstr "" -#: parted/parted.c:2209 +#: parted/parted.c:2341 msgid "" "'mkpart' makes a partition without creating a new file system on the " "partition. FS-TYPE may be specified to set an appropriate partition ID.\n" msgstr "" -#: parted/parted.c:2214 +#: parted/parted.c:2346 msgid "name" msgstr "" -#: parted/parted.c:2217 +#: parted/parted.c:2349 msgid "name NUMBER NAME name partition NUMBER as NAME" msgstr "" -#: parted/parted.c:2222 +#: parted/parted.c:2354 msgid "print" msgstr "" -#: parted/parted.c:2225 +#: parted/parted.c:2357 msgid "" "print [devices|free|list,all] display the partition table, or " "available devices, or free space, or all found partitions" msgstr "" -#: parted/parted.c:2229 +#: parted/parted.c:2361 msgid "" "Without arguments, 'print' displays the entire partition table. However with " "the following arguments it performs various other actions.\n" msgstr "" -#: parted/parted.c:2231 +#: parted/parted.c:2363 msgid " devices : display all active block devices\n" msgstr "" -#: parted/parted.c:2232 +#: parted/parted.c:2364 msgid "" " free : display information about free unpartitioned space on the " "current block device\n" msgstr "" -#: parted/parted.c:2234 +#: parted/parted.c:2366 msgid "" " list, all : display the partition tables of all active block devices\n" msgstr "" -#: parted/parted.c:2238 +#: parted/parted.c:2370 msgid "quit" msgstr "" -#: parted/parted.c:2241 +#: parted/parted.c:2373 msgid "quit exit program" msgstr "" -#: parted/parted.c:2246 +#: parted/parted.c:2378 msgid "rescue" msgstr "" -#: parted/parted.c:2249 +#: parted/parted.c:2381 msgid "" "rescue START END rescue a lost partition near START " "and END" msgstr "" -#: parted/parted.c:2255 +#: parted/parted.c:2387 msgid "resize" msgstr "" -#: parted/parted.c:2258 +#: parted/parted.c:2390 msgid "The resize command was removed in parted 3.0\n" msgstr "" -#: parted/parted.c:2261 +#: parted/parted.c:2393 msgid "resizepart" msgstr "" -#: parted/parted.c:2264 +#: parted/parted.c:2396 msgid "resizepart NUMBER END resize partition NUMBER" msgstr "" -#: parted/parted.c:2269 +#: parted/parted.c:2401 msgid "rm" msgstr "" -#: parted/parted.c:2272 +#: parted/parted.c:2404 msgid "rm NUMBER delete partition NUMBER" msgstr "" -#: parted/parted.c:2277 +#: parted/parted.c:2409 msgid "select" msgstr "" -#: parted/parted.c:2280 +#: parted/parted.c:2412 msgid "select DEVICE choose the device to edit" msgstr "" -#: parted/parted.c:2285 +#: parted/parted.c:2417 msgid "disk_set" msgstr "" -#: parted/parted.c:2288 +#: parted/parted.c:2420 msgid "" "disk_set FLAG STATE change the FLAG on selected device" msgstr "" -#: parted/parted.c:2293 +#: parted/parted.c:2425 msgid "disk_toggle" msgstr "" -#: parted/parted.c:2296 +#: parted/parted.c:2428 msgid "" "disk_toggle [FLAG] toggle the state of FLAG on " "selected device" msgstr "" -#: parted/parted.c:2302 +#: parted/parted.c:2434 msgid "set" msgstr "" -#: parted/parted.c:2305 +#: parted/parted.c:2437 msgid "" "set NUMBER FLAG STATE change the FLAG on partition NUMBER" msgstr "" -#: parted/parted.c:2311 +#: parted/parted.c:2443 msgid "toggle" msgstr "" -#: parted/parted.c:2314 +#: parted/parted.c:2446 msgid "" "toggle [NUMBER [FLAG]] toggle the state of FLAG on " "partition NUMBER" msgstr "" -#: parted/parted.c:2320 +#: parted/parted.c:2452 +msgid "type" +msgstr "" + +#: parted/parted.c:2455 +msgid "" +"type NUMBER TYPE-ID or TYPE-UUID type set TYPE-ID or TYPE-UUID of " +"partition NUMBER" +msgstr "" + +#: parted/parted.c:2460 msgid "unit" msgstr "" -#: parted/parted.c:2323 +#: parted/parted.c:2463 msgid "unit UNIT set the default unit to UNIT" msgstr "" -#: parted/parted.c:2328 +#: parted/parted.c:2468 msgid "version" msgstr "" -#: parted/parted.c:2331 +#: parted/parted.c:2471 msgid "" "version display the version number and " "copyright information of GNU Parted" msgstr "" -#: parted/parted.c:2335 +#: parted/parted.c:2475 msgid "" "'version' displays copyright and version information corresponding to this " "copy of GNU Parted\n" msgstr "" -#: parted/parted.c:2405 +#: parted/parted.c:2545 #, c-format msgid "Usage: %s [-hlmsfv] [-a<align>] [DEVICE [COMMAND [PARAMETERS]]...]\n" msgstr "" -#: parted/parted.c:2449 +#: parted/parted.c:2589 msgid "No device found" msgstr "" -#: parted/parted.c:2486 +#: parted/parted.c:2626 msgid "WARNING: You are not superuser. Watch out for permissions.\n" msgstr "" -#: parted/parted.c:2519 +#: parted/parted.c:2659 msgid "" "You should reinstall your boot loader before rebooting. Read section 4 of " "the Parted User documentation for more information." msgstr "" -#: parted/parted.c:2526 +#: parted/parted.c:2666 msgid "You may need to update /etc/fstab.\n" msgstr "" @@ -2806,80 +2837,80 @@ msgid "" "Error: A general SIGILL signal was encountered." msgstr "" -#: parted/ui.c:901 +#: parted/ui.c:904 #, c-format msgid "invalid token: %s" msgstr "" -#: parted/ui.c:1082 +#: parted/ui.c:1085 msgid "Expecting a partition number." msgstr "" -#: parted/ui.c:1091 +#: parted/ui.c:1094 msgid "Partition doesn't exist." msgstr "" -#: parted/ui.c:1111 +#: parted/ui.c:1114 msgid "Expecting a file system type." msgstr "" -#: parted/ui.c:1118 +#: parted/ui.c:1121 #, c-format msgid "Unknown file system type \"%s\"." msgstr "" -#: parted/ui.c:1139 +#: parted/ui.c:1142 msgid "Expecting a disk label type." msgstr "" -#: parted/ui.c:1170 parted/ui.c:1206 +#: parted/ui.c:1173 parted/ui.c:1209 msgid "No flags supported" msgstr "" -#: parted/ui.c:1280 +#: parted/ui.c:1283 msgid "Can't create any more partitions." msgstr "" -#: parted/ui.c:1290 +#: parted/ui.c:1293 msgid "Expecting a partition type." msgstr "" -#: parted/ui.c:1439 +#: parted/ui.c:1442 msgid "on" msgstr "" -#: parted/ui.c:1440 +#: parted/ui.c:1443 msgid "off" msgstr "" -#: parted/ui.c:1457 +#: parted/ui.c:1460 msgid "optimal" msgstr "" -#: parted/ui.c:1458 +#: parted/ui.c:1461 msgid "minimal" msgstr "" -#: parted/ui.c:1591 +#: parted/ui.c:1594 msgid "OPTIONs:" msgstr "" -#: parted/ui.c:1596 +#: parted/ui.c:1599 msgid "COMMANDs:" msgstr "" -#: parted/ui.c:1599 +#: parted/ui.c:1602 #, c-format msgid "" "\n" "Report bugs to %s\n" msgstr "" -#: parted/ui.c:1606 +#: parted/ui.c:1609 #, c-format msgid "Using %s\n" msgstr "" -#: parted/ui.c:1686 +#: parted/ui.c:1689 msgid "This command does not make sense in non-interactive mode.\n" msgstr "" Binary files differ@@ -8,7 +8,7 @@ msgid "" msgstr "" "Project-Id-Version: parted 3.4.64.2\n" "Report-Msgid-Bugs-To: bug-parted@gnu.org\n" -"POT-Creation-Date: 2022-04-18 14:44-0400\n" +"POT-Creation-Date: 2023-04-10 15:50-0700\n" "PO-Revision-Date: 2022-04-06 17:30+0200\n" "Last-Translator: Jakub Bogusz <qboosh@pld-linux.org>\n" "Language-Team: Polish <translation-team-pl@lists.sourceforge.net>\n" @@ -20,25 +20,25 @@ msgstr "" "Plural-Forms: nplurals=3; plural=(n==1 ? 0 : n%10>=2 && n%10<=4 && (n%100<10 " "|| n%100>=20) ? 1 : 2);\n" -#: lib/argmatch.c:147 +#: lib/argmatch.c:145 #, c-format msgid "invalid argument %s for %s" msgstr "nieprawidÅ‚owy argument %s opcji %s" -#: lib/argmatch.c:148 +#: lib/argmatch.c:146 #, c-format msgid "ambiguous argument %s for %s" msgstr "niejednoznaczny argument %s opcji %s" -#: lib/argmatch.c:167 lib/argmatch.h:238 +#: lib/argmatch.c:165 lib/argmatch.h:237 msgid "Valid arguments are:" msgstr "PrawidÅ‚owe argumenty to:" -#: lib/closeout.c:122 libparted/labels/fdasd.c:145 +#: lib/closeout.c:121 libparted/labels/fdasd.c:145 msgid "write error" msgstr "bÅ‚Ä…d zapisu" -#: lib/error.c:195 +#: lib/error.c:193 msgid "Unknown system error" msgstr "Nieznany bÅ‚Ä…d systemowy" @@ -98,11 +98,11 @@ msgstr "%s: opcja musi mieć argument -- '%c'\n" #. If you don't know what to put here, please see #. <https://en.wikipedia.org/wiki/Quotation_marks_in_other_languages> #. and use glyphs suitable for your language. -#: lib/quotearg.c:355 +#: lib/quotearg.c:354 msgid "`" msgstr "`" -#: lib/quotearg.c:356 +#: lib/quotearg.c:355 msgid "'" msgstr "'" @@ -184,7 +184,7 @@ msgstr "Brak poprzedniego wyrażenia regularnego" #. To enquire the regular expression that your system uses for this #. purpose, you can use the command #. locale -k LC_MESSAGES | grep '^yesexpr=' -#: lib/rpmatch.c:150 +#: lib/rpmatch.c:149 msgid "^[yY]" msgstr "^[yYtT]" @@ -194,7 +194,7 @@ msgstr "^[yYtT]" #. To enquire the regular expression that your system uses for this #. purpose, you can use the command #. locale -k LC_MESSAGES | grep '^noexpr=' -#: lib/rpmatch.c:163 +#: lib/rpmatch.c:162 msgid "^[nN]" msgstr "^[nN]" @@ -758,21 +758,21 @@ msgstr "pmbr_boot" msgid "Unknown disk flag, %d." msgstr "Nieznana flaga dysku: %d." -#: libparted/disk.c:1289 +#: libparted/disk.c:1320 #, c-format msgid "%s disk labels do not support extended partitions." msgstr "Etykiety dysku %s nie wspierajÄ… rozszerzonych partycji." -#: libparted/disk.c:1821 +#: libparted/disk.c:1990 #, c-format msgid "%s disk labels don't support logical or extended partitions." msgstr "Etykiety dysku %s nie wspierajÄ… logicznych lub rozszerzonych partycji." -#: libparted/disk.c:1834 +#: libparted/disk.c:2003 msgid "Too many primary partitions." msgstr "Zbyt dużo partycji głównych." -#: libparted/disk.c:1843 +#: libparted/disk.c:2012 #, c-format msgid "" "Can't add a logical partition to %s, because there is no extended partition." @@ -780,137 +780,141 @@ msgstr "" "Nie można dodać logicznej partycji do %s, ponieważ nie istnieje rozszerzona " "partycja." -#: libparted/disk.c:1867 +#: libparted/disk.c:2036 #, c-format msgid "Can't have more than one extended partition on %s." msgstr "Nie można mieć wiÄ™cej niż jednÄ… rozszerzonÄ… partycjÄ™ na %s." -#: libparted/disk.c:1877 +#: libparted/disk.c:2046 msgid "Can't have logical partitions outside of the extended partition." msgstr "Nie można mieć logicznych partycji poza rozszerzonÄ… partycjÄ…." -#: libparted/disk.c:1902 +#: libparted/disk.c:2071 #, c-format msgid "Can't have a logical partition outside of the extended partition on %s." msgstr "%s nie może mieć logicznej partycji poza rozszerzonÄ… partycjÄ…." -#: libparted/disk.c:1912 +#: libparted/disk.c:2081 msgid "Can't have a primary partition inside an extended partition." msgstr "Nie można mieć głównej partycji wewnÄ…trz rozszerzonej partycji." -#: libparted/disk.c:1921 +#: libparted/disk.c:2090 msgid "Can't have a partition outside the disk!" msgstr "Nie można mieć partycji poza dyskiem!" -#: libparted/disk.c:1972 libparted/disk.c:2150 +#: libparted/disk.c:2141 libparted/disk.c:2319 msgid "Can't have overlapping partitions." msgstr "Nie można mieć nakÅ‚adajÄ…cych siÄ™ partycji." -#: libparted/disk.c:2351 +#: libparted/disk.c:2520 msgid "metadata" msgstr "metadane" -#: libparted/disk.c:2353 +#: libparted/disk.c:2522 msgid "free" msgstr "wolna" -#: libparted/disk.c:2355 parted/ui.c:1271 parted/ui.c:1299 +#: libparted/disk.c:2524 parted/ui.c:1274 parted/ui.c:1302 msgid "extended" msgstr "rozszerzona" -#: libparted/disk.c:2357 parted/ui.c:1275 parted/ui.c:1303 +#: libparted/disk.c:2526 parted/ui.c:1278 parted/ui.c:1306 msgid "logical" msgstr "logiczna" -#: libparted/disk.c:2359 parted/ui.c:1267 parted/ui.c:1295 +#: libparted/disk.c:2528 parted/ui.c:1270 parted/ui.c:1298 msgid "primary" msgstr "główna" -#: libparted/disk.c:2375 +#: libparted/disk.c:2544 msgid "boot" msgstr "Å‚adowalna" -#: libparted/disk.c:2377 +#: libparted/disk.c:2546 msgid "bios_grub" msgstr "bios_grub" -#: libparted/disk.c:2379 +#: libparted/disk.c:2548 msgid "root" msgstr "root" -#: libparted/disk.c:2381 +#: libparted/disk.c:2550 msgid "swap" msgstr "wymiany" -#: libparted/disk.c:2383 +#: libparted/disk.c:2552 msgid "hidden" msgstr "ukryta" -#: libparted/disk.c:2385 +#: libparted/disk.c:2554 msgid "raid" msgstr "raid" -#: libparted/disk.c:2387 +#: libparted/disk.c:2556 msgid "lvm" msgstr "lvm" -#: libparted/disk.c:2389 +#: libparted/disk.c:2558 msgid "lba" msgstr "lba" -#: libparted/disk.c:2391 +#: libparted/disk.c:2560 msgid "hp-service" msgstr "usÅ‚uga-hp" -#: libparted/disk.c:2393 +#: libparted/disk.c:2562 msgid "palo" msgstr "palo" -#: libparted/disk.c:2395 +#: libparted/disk.c:2564 msgid "prep" msgstr "prep" -#: libparted/disk.c:2397 +#: libparted/disk.c:2566 msgid "msftres" msgstr "msftres" -#: libparted/disk.c:2399 +#: libparted/disk.c:2568 msgid "msftdata" msgstr "msftdata" -#: libparted/disk.c:2401 +#: libparted/disk.c:2570 msgid "atvrecv" msgstr "atvrecv" -#: libparted/disk.c:2403 +#: libparted/disk.c:2572 msgid "diag" msgstr "diag" -#: libparted/disk.c:2405 +#: libparted/disk.c:2574 msgid "legacy_boot" msgstr "legacy_boot" -#: libparted/disk.c:2407 +#: libparted/disk.c:2576 msgid "irst" msgstr "irst" -#: libparted/disk.c:2409 +#: libparted/disk.c:2578 msgid "esp" msgstr "esp" -#: libparted/disk.c:2411 +#: libparted/disk.c:2580 msgid "chromeos_kernel" msgstr "chromeos_kernel" -#: libparted/disk.c:2413 +#: libparted/disk.c:2582 msgid "bls_boot" msgstr "bls_boot" -#: libparted/disk.c:2415 +#: libparted/disk.c:2584 msgid "linux-home" msgstr "linux-home" -#: libparted/disk.c:2421 +#: libparted/disk.c:2586 +msgid "no_automount" +msgstr "" + +#: libparted/disk.c:2592 #, c-format msgid "Unknown partition flag, %d." msgstr "Nieznana flaga partycji: %d." @@ -1118,8 +1122,8 @@ msgstr "" "głównych; jeÅ›li XGM jest pierwszÄ…, liczy siÄ™ jako dwie)." #: libparted/labels/atari.c:1662 libparted/labels/bsd.c:563 -#: libparted/labels/dasd.c:895 libparted/labels/dos.c:2303 -#: libparted/labels/dvh.c:770 libparted/labels/gpt.c:1769 +#: libparted/labels/dasd.c:893 libparted/labels/dos.c:2294 +#: libparted/labels/dvh.c:770 libparted/labels/gpt.c:1891 #: libparted/labels/loop.c:244 libparted/labels/mac.c:1409 #: libparted/labels/pc98.c:697 libparted/labels/rdb.c:1054 #: libparted/labels/sun.c:781 @@ -1143,41 +1147,31 @@ msgstr "Nie można przydzielić numeru partycji." msgid "Unable to allocate a bsd disklabel slot." msgstr "Nie można przydzielić miejsca na etykietÄ™ dysku bsd." -#: libparted/labels/dasd.c:626 +#: libparted/labels/dasd.c:634 msgid "The partition table of DASD-LDL device cannot be changed.\n" msgstr "Tablica partycji urzÄ…dzenia DASD-LDL nie może być zmieniona.\n" -#: libparted/labels/dasd.c:921 +#: libparted/labels/dasd.c:919 msgid "Unable to allocate a dasd disklabel slot" msgstr "Nie można przydzielić miejsca na etykiecie dysku dasd." -#: libparted/labels/dos.c:1008 +#: libparted/labels/dos.c:1159 #, c-format msgid "Invalid partition table on %s -- wrong signature %x." msgstr "NieprawidÅ‚owa tablica partycji na %s -- bÅ‚Ä™dna sygnatura %x." -#: libparted/labels/dos.c:1036 +#: libparted/labels/dos.c:1187 #, c-format msgid "Invalid partition table - recursive partition on %s." msgstr "NieprawidÅ‚owa tablica partycji - partycja rekursywna na %s." -#: libparted/labels/dos.c:1567 -msgid "Extended partitions cannot be hidden on msdos disk labels." -msgstr "Rozszerzone partycje nie mogÄ… być ukryte na etykietach dysków msdos." - -#: libparted/labels/dos.c:1579 -msgid "Extended partitions cannot be recovery partitions on msdos disk labels." -msgstr "" -"Rozszerzone partycje nie mogÄ… być partycjami odzyskiwania na etykietach " -"dysków msdos." - -#: libparted/labels/dos.c:2285 +#: libparted/labels/dos.c:2276 msgid "Parted can't resize partitions managed by Windows Dynamic Disk." msgstr "" "Parted nie może zmienić rozmiaru partycji zarzÄ…dzanych przez Windows Dynamic " "Disk." -#: libparted/labels/dos.c:2541 +#: libparted/labels/dos.c:2532 msgid "cannot create any more partitions" msgstr "nie można utworzyć wiÄ™cej partycji" @@ -1320,11 +1314,11 @@ msgstr "Nie udaÅ‚o siÄ™ odczytać informacji o rozmiarze bloku." msgid "Disk geometry does not match a DASD device of type 3390." msgstr "Geometria dysku nie pasuje do urzÄ…dzenia DASD typu 3390." -#: libparted/labels/gpt.c:569 +#: libparted/labels/gpt.c:589 msgid "device is too small for GPT" msgstr "urzÄ…dzenie jest zbyt maÅ‚e na GPT" -#: libparted/labels/gpt.c:771 +#: libparted/labels/gpt.c:791 #, c-format msgid "" "The format of the GPT partition table is version %x, which is newer than " @@ -1333,7 +1327,7 @@ msgstr "" "Format tablicy partycji GPT (wersja %x) jest nowszy niż program Parted jest " "w stanie rozpoznać. Poinformuj nas o tym!" -#: libparted/labels/gpt.c:807 +#: libparted/labels/gpt.c:827 #, c-format msgid "" "Not all of the space available to %s appears to be used, you can fix the GPT " @@ -1344,7 +1338,7 @@ msgstr "" "użyte zostaÅ‚o caÅ‚e miejsce (dodatkowe %llu bloków) czy kontynuować przy " "aktualnych ustawieniach? " -#: libparted/labels/gpt.c:1006 +#: libparted/labels/gpt.c:1026 msgid "" "The backup GPT table is not at the end of the disk, as it should be. Fix, " "by moving the backup to the end (and removing the old backup)?" @@ -1353,7 +1347,7 @@ msgstr "" "naprawić to poprzez przesuniÄ™cie kopii zapasowej na koniec (i usuniÄ™cie " "starej kopii)?" -#: libparted/labels/gpt.c:1024 +#: libparted/labels/gpt.c:1044 msgid "" "Both the primary and backup GPT tables are corrupt. Try making a fresh " "table, and using Parted's rescue feature to recover partitions." @@ -1361,7 +1355,7 @@ msgstr "" "Obie tablice GPT, główna i jej kopia zapasowa, sÄ… uszkodzone. Spróbuj " "utworzyć nowÄ… tablicÄ™ oraz użyj opcjÄ™ 'rescue', aby odzyskać partycje." -#: libparted/labels/gpt.c:1035 +#: libparted/labels/gpt.c:1055 msgid "" "The backup GPT table is corrupt, but the primary appears OK, so that will be " "used." @@ -1369,7 +1363,7 @@ msgstr "" "Zapasowa tablica GPT jest uszkodzona, ale główna wydaje siÄ™ być w porzÄ…dku i " "zostanie ona użyta." -#: libparted/labels/gpt.c:1047 +#: libparted/labels/gpt.c:1067 msgid "" "The primary GPT table is corrupt, but the backup appears OK, so that will be " "used." @@ -1377,11 +1371,11 @@ msgstr "" "Główna tablica GPT jest uszkodzona, ale jej kopia zapasowa wydaje siÄ™ być w " "porzÄ…dku i zostanie ona użyta." -#: libparted/labels/gpt.c:1071 +#: libparted/labels/gpt.c:1091 msgid "primary partition table array CRC mismatch" msgstr "niezgodność sumy CRC głównej tablicy partycji" -#: libparted/labels/gpt.c:1655 libparted/labels/gpt.c:1682 +#: libparted/labels/gpt.c:1722 libparted/labels/gpt.c:1749 msgid "failed to translate partition name" msgstr "nie udaÅ‚o siÄ™ przetÅ‚umaczyć nazwy partycji" @@ -2056,7 +2050,7 @@ msgstr "fat_table_alloc_cluster: brak wolnych klastrów" msgid "Could not detect file system." msgstr "Nie udaÅ‚o siÄ™ wykryć systemu plików." -#: libparted/fs/r/filesys.c:159 libparted/fs/r/filesys.c:284 +#: libparted/fs/r/filesys.c:159 libparted/fs/r/filesys.c:285 #, c-format msgid "resizing %s file systems is not supported" msgstr "zmiana rozmiaru systemów plików %s nie jest obsÅ‚ugiwana" @@ -2346,39 +2340,39 @@ msgid "This HFS+ volume has no extents overflow file. This is quite unusual!" msgstr "" "Ten wolumen HFS+ nie zawiera pliku przepeÅ‚nieÅ„ ekstentów. To dość niezwykÅ‚e!" -#: parted/parted.c:137 +#: parted/parted.c:138 msgid "displays this help message" msgstr "wyÅ›wietla tÄ™ oto pomoc" -#: parted/parted.c:138 +#: parted/parted.c:139 msgid "lists partition layout on all block devices" msgstr "wypisuje rozkÅ‚ad partycji na wszystkich wykrytych urzÄ…dzeniach" -#: parted/parted.c:139 +#: parted/parted.c:140 msgid "displays machine parseable output" msgstr "wyÅ›wietla dane w formacie czytelnym dla maszyny" -#: parted/parted.c:140 +#: parted/parted.c:141 msgid "displays JSON output" msgstr "wyÅ›wietla dane w formacie JSON" -#: parted/parted.c:141 +#: parted/parted.c:142 msgid "never prompts for user intervention" msgstr "nigdy nie prosi użytkownika o interwencjÄ™" -#: parted/parted.c:142 +#: parted/parted.c:143 msgid "in script mode, fix instead of abort when asked" msgstr "w trybie skryptu poprawia zamiast koÅ„czenia po zapytaniu" -#: parted/parted.c:143 +#: parted/parted.c:144 msgid "displays the version" msgstr "wyÅ›wietla numer wersji" -#: parted/parted.c:144 +#: parted/parted.c:145 msgid "alignment for new partitions" msgstr "wyrównanie dla nowych partycji" -#: parted/parted.c:157 +#: parted/parted.c:158 msgid "" "NUMBER is the partition number used by Linux. On MS-DOS disk labels, the " "primary partitions number from 1 to 4, logical partitions from 5 onwards.\n" @@ -2387,33 +2381,33 @@ msgstr "" "DOS liczba partycji głównych mieÅ›ci siÄ™ w przedziale 1-4, zaÅ› partycje " "logiczne zajmujÄ… kolejne numery poczÄ…wszy od 5.\n" -#: parted/parted.c:160 +#: parted/parted.c:161 msgid "LABEL-TYPE is one of: " msgstr "TYP-ETYKIETY stanowi jednÄ… z nastÄ™pujÄ…cych wartoÅ›ci: " -#: parted/parted.c:161 parted/parted.c:162 +#: parted/parted.c:162 parted/parted.c:163 msgid "FLAG is one of: " msgstr "FLAGA stanowi jednÄ… z nastÄ™pujÄ…cych wartoÅ›ci: " -#: parted/parted.c:163 +#: parted/parted.c:164 msgid "UNIT is one of: " msgstr "JEDNOSTKA stanowi jednÄ… z nastÄ™pujÄ…cych wartoÅ›ci: " -#: parted/parted.c:164 +#: parted/parted.c:165 msgid "desired alignment: minimum or optimal" msgstr "pożądane wyrównanie: minimalne lub optymalne" -#: parted/parted.c:165 +#: parted/parted.c:166 msgid "PART-TYPE is one of: primary, logical, extended\n" msgstr "" "TYP-PARTYCJI stanowi jednÄ… z nastÄ™pujÄ…cych wartoÅ›ci: główna, logiczna, " "rozszerzona\n" -#: parted/parted.c:167 +#: parted/parted.c:168 msgid "FS-TYPE is one of: " msgstr "SYSTEM-PLIKÓW stanowi jednÄ… z nastÄ™pujÄ…cych wartoÅ›ci: " -#: parted/parted.c:168 +#: parted/parted.c:169 msgid "" "START and END are disk locations, such as 4GB or 10%. Negative values count " "from the end of the disk. For example, -1s specifies exactly the last " @@ -2423,7 +2417,7 @@ msgstr "" "wartoÅ›ci sÄ… liczone od koÅ„ca dysku. Na przykÅ‚ad -1s oznacza dokÅ‚adnie " "ostatni sektor.\n" -#: parted/parted.c:171 +#: parted/parted.c:172 msgid "" "END is disk location, such as 4GB or 10%. Negative value counts from the " "end of the disk. For example, -1s specifies exactly the last sector.\n" @@ -2431,19 +2425,23 @@ msgstr "" "KONIEC to miejsce na dysku, np. 4GB lub 10%. Ujemne wartoÅ›ci sÄ… liczone od " "koÅ„ca dysku. Na przykÅ‚ad -1s oznacza dokÅ‚adnie ostatni sektor.\n" -#: parted/parted.c:174 +#: parted/parted.c:175 msgid "STATE is one of: on, off\n" msgstr "STAN jest reprezentowany poprzez: wÅ‚Ä…czony, wyÅ‚Ä…czony\n" -#: parted/parted.c:175 +#: parted/parted.c:176 msgid "DEVICE is usually /dev/hda or /dev/sda\n" msgstr "URZÄ„DZENIEM jest zwykle /dev/hda lub /dev/sda\n" -#: parted/parted.c:176 +#: parted/parted.c:177 msgid "NAME is any word you want\n" msgstr "NAZWA jest dowolnym sÅ‚owem jakie chcesz\n" -#: parted/parted.c:179 +#: parted/parted.c:178 +msgid "TYPE_ID is a value between 0x01 and 0xff, TYPE_UUID is a UUID\n" +msgstr "" + +#: parted/parted.c:182 msgid "" "Copyright (C) 1998 - 2006 Free Software Foundation, Inc.\n" "This program is free software, covered by the GNU General Public License.\n" @@ -2464,22 +2462,22 @@ msgstr "" "w Powszechnej Licencji Publicznej GNU.\n" "\n" -#: parted/parted.c:229 +#: parted/parted.c:232 #, c-format msgid "%0.f%%\t(time left %.2d:%.2d)" msgstr "%0.f%%\t(czas do koÅ„ca %.2d:%.2d)" -#: parted/parted.c:248 +#: parted/parted.c:251 #, c-format msgid "Partition %s is being used. Are you sure you want to continue?" msgstr "Partycja %s jest używana. Czy na pewno kontynuować?" -#: parted/parted.c:269 +#: parted/parted.c:272 #, c-format msgid "Partition(s) on %s are being used." msgstr "Partycja (partycje) na %s sÄ… używane." -#: parted/parted.c:281 +#: parted/parted.c:284 #, c-format msgid "" "The existing disk label on %s will be destroyed and all data on this disk " @@ -2488,31 +2486,31 @@ msgstr "" "IstniejÄ…ca etykieta dysku na %s zostanie zniszczona, a wszystkie dane na tym " "dysku zostanÄ… utracone. Kontynuować?" -#: parted/parted.c:542 +#: parted/parted.c:545 msgid "New disk label type?" msgstr "Nowy typ etykiety dysku?" -#: parted/parted.c:680 +#: parted/parted.c:692 msgid "Partition type?" msgstr "Typ partycji?" -#: parted/parted.c:698 parted/parted.c:902 +#: parted/parted.c:710 parted/parted.c:914 msgid "Partition name?" msgstr "Nazwa partycji?" -#: parted/parted.c:708 +#: parted/parted.c:720 msgid "File system type?" msgstr "Typ systemu plików?" -#: parted/parted.c:713 parted/parted.c:1683 +#: parted/parted.c:725 parted/parted.c:1815 msgid "Start?" msgstr "PoczÄ…tek?" -#: parted/parted.c:715 parted/parted.c:1685 parted/parted.c:1768 +#: parted/parted.c:727 parted/parted.c:1817 parted/parted.c:1900 msgid "End?" msgstr "Koniec?" -#: parted/parted.c:782 +#: parted/parted.c:794 #, c-format msgid "" "You requested a partition from %s to %s (sectors %llu..%llu).\n" @@ -2522,7 +2520,7 @@ msgstr "" "Najbliższa z jakÄ… Parted może sobie poradzić jest od %s do %s (sektorów: " "%llu..%llu).%s" -#: parted/parted.c:791 +#: parted/parted.c:803 msgid "" "\n" "Is this still acceptable to you?" @@ -2530,95 +2528,120 @@ msgstr "" "\n" "Czy jest to do przyjÄ™cia?" -#: parted/parted.c:814 +#: parted/parted.c:826 #, c-format msgid "" "The resulting partition is not properly aligned for best performance: %s" msgstr "" "Partycja wynikowa nie jest wyrównana wÅ‚aÅ›ciwie dla najlepszej wydajnoÅ›ci: %s" -#: parted/parted.c:816 parted/parted.c:1925 +#: parted/parted.c:828 parted/parted.c:2057 msgid "unknown (malloc failed)" msgstr "nieznana (malloc nie powiódÅ‚ siÄ™)" -#: parted/parted.c:894 +#: parted/parted.c:906 #, c-format msgid "%s disk labels do not support partition name." msgstr "Etykiety dysku %s nie obsÅ‚ugujÄ… nazwy partycji." -#: parted/parted.c:899 parted/parted.c:1748 parted/parted.c:1814 -#: parted/parted.c:1908 parted/parted.c:1983 +#: parted/parted.c:911 parted/parted.c:955 parted/parted.c:1880 +#: parted/parted.c:1946 parted/parted.c:2040 parted/parted.c:2115 msgid "Partition number?" msgstr "Numer partycji?" -#: parted/parted.c:1050 +#: parted/parted.c:949 +#, fuzzy, c-format +msgid "%s disk labels do not support partition type." +msgstr "Etykiety dysku %s nie obsÅ‚ugujÄ… nazwy partycji." + +#: parted/parted.c:965 +#, fuzzy +msgid "Partition type-id?" +msgstr "Typ partycji?" + +#: parted/parted.c:972 +#, fuzzy +msgid "Invalid type-id." +msgstr "NieprawidÅ‚owy numer." + +#: parted/parted.c:986 +#, fuzzy +msgid "Partition type-uuid?" +msgstr "Typ partycji?" + +#: parted/parted.c:993 +#, fuzzy +msgid "Invalid type-uuid." +msgstr "NieprawidÅ‚owy numer." + +#: parted/parted.c:1146 #, c-format msgid "BIOS cylinder,head,sector geometry: %d,%d,%d. Each cylinder is %s.\n" msgstr "" "Geometria BIOS cylinder,gÅ‚owica,sektor: %d,%d,%d. Każdy cylinder ma %s.\n" -#: parted/parted.c:1137 +#: parted/parted.c:1240 #, c-format msgid "Model: %s (%s)\n" msgstr "Model: %s (%s)\n" -#: parted/parted.c:1139 +#: parted/parted.c:1242 #, c-format msgid "Disk %s: %s\n" msgstr "Dysk %s: %s\n" -#: parted/parted.c:1140 +#: parted/parted.c:1243 #, c-format msgid "Sector size (logical/physical): %lldB/%lldB\n" msgstr "Rozmiar sektora (logiczny/fizyczny): %lldB/%lldB\n" -#: parted/parted.c:1152 +#: parted/parted.c:1255 #, c-format msgid "Partition Table: %s\n" msgstr "Tablica partycji: %s\n" -#: parted/parted.c:1153 +#: parted/parted.c:1256 #, c-format msgid "Disk Flags: %s\n" msgstr "Flagi dysku: %s\n" -#: parted/parted.c:1279 parted/parted.c:1282 +#: parted/parted.c:1388 parted/parted.c:1391 msgid "Number" msgstr "Numer" -#: parted/parted.c:1279 parted/parted.c:1282 +#: parted/parted.c:1388 parted/parted.c:1391 msgid "Start" msgstr "PoczÄ…tek" -#: parted/parted.c:1280 parted/parted.c:1283 +#: parted/parted.c:1389 parted/parted.c:1392 msgid "End" msgstr "Koniec" -#: parted/parted.c:1283 +#: parted/parted.c:1392 msgid "Size" msgstr "Rozmiar" -#: parted/parted.c:1287 +#: parted/parted.c:1396 msgid "Type" msgstr "Typ" -#: parted/parted.c:1289 +#: parted/parted.c:1398 msgid "File system" msgstr "System plików" -#: parted/parted.c:1292 +#: parted/parted.c:1401 msgid "Name" msgstr "Nazwa" -#: parted/parted.c:1294 +#: parted/parted.c:1403 msgid "Flags" msgstr "Flaga" -#: parted/parted.c:1352 +#: parted/parted.c:1461 msgid "Free Space" msgstr "Wolne miejsce" -#: parted/parted.c:1570 +#: parted/parted.c:1702 #, c-format msgid "" "A %s %s partition was found at %s -> %s. Do you want to add it to the " @@ -2627,56 +2650,56 @@ msgstr "" "Partycja %s %s zostaÅ‚a znaleziona na %s -> %s. Czy chcesz jÄ… dodać do " "tablicy partycji?" -#: parted/parted.c:1613 +#: parted/parted.c:1745 msgid "searching for file systems" msgstr "szukam systemów plików" -#: parted/parted.c:1720 +#: parted/parted.c:1852 msgid "The resize command has been removed in parted 3.0" msgstr "Polecenie zmiany rozmiaru zostaÅ‚o usuniÄ™te w partedzie 3.0" -#: parted/parted.c:1782 +#: parted/parted.c:1914 msgid "" "Shrinking a partition can cause data loss, are you sure you want to continue?" msgstr "" "Zmniejszenie rozmiaru partycji może spowodować utratÄ™ danych, czy na pewno " "kontynuować?" -#: parted/parted.c:1838 +#: parted/parted.c:1970 msgid "New device?" msgstr "Nowe urzÄ…dzenie?" -#: parted/parted.c:1906 +#: parted/parted.c:2038 msgid "alignment type(min/opt)" msgstr "rodzaj wyrównania(min/opt)" -#: parted/parted.c:1921 +#: parted/parted.c:2053 #, c-format msgid "%d aligned\n" msgstr "%d wyrównana\n" -#: parted/parted.c:1923 +#: parted/parted.c:2055 #, c-format msgid "%d not aligned: %s\n" msgstr "%d nie wyrównana: %s\n" -#: parted/parted.c:1948 parted/parted.c:1985 +#: parted/parted.c:2080 parted/parted.c:2117 msgid "Flag to Invert?" msgstr "Flaga do przestawienia?" -#: parted/parted.c:1953 parted/parted.c:1990 +#: parted/parted.c:2085 parted/parted.c:2122 msgid "New state?" msgstr "Nowy stan?" -#: parted/parted.c:2036 +#: parted/parted.c:2168 msgid "Unit?" msgstr "Jednostka?" -#: parted/parted.c:2171 +#: parted/parted.c:2303 msgid "align-check" msgstr "sprawdź-wyrównanie" -#: parted/parted.c:2174 +#: parted/parted.c:2306 msgid "" "align-check TYPE N check partition N for TYPE(min|opt) " "alignment" @@ -2684,41 +2707,41 @@ msgstr "" "sprawdź-wyrównanie TYP N sprawdzenie wyrównania TYP(min|opt) " "partycji N" -#: parted/parted.c:2182 +#: parted/parted.c:2314 msgid "help" msgstr "pomoc" -#: parted/parted.c:2185 +#: parted/parted.c:2317 msgid "" "help [COMMAND] print general help, or help on " "COMMAND" msgstr "" "pomoc [POLECENIE] wyÅ›wietla pomoc ogólnÄ… lub dotyczÄ…cÄ… POLECENIA" -#: parted/parted.c:2191 +#: parted/parted.c:2323 msgid "mklabel" msgstr "mklabel" -#: parted/parted.c:2191 +#: parted/parted.c:2323 msgid "mktable" msgstr "mktable" -#: parted/parted.c:2194 +#: parted/parted.c:2326 msgid "" "mklabel,mktable LABEL-TYPE create a new disklabel (partition " "table)" msgstr "" "mklabel,mktable TYP-ETYKIETY tworzy nowÄ… etykietÄ™ dysku (tablicÄ™ partycji)" -#: parted/parted.c:2200 +#: parted/parted.c:2332 msgid "mkpart" msgstr "mkpart" -#: parted/parted.c:2203 +#: parted/parted.c:2335 msgid "mkpart PART-TYPE [FS-TYPE] START END make a partition" msgstr "mkpart TYP-PARTYCJI [SYSTEM-PLIKÓW] POCZÄ„TEK KONIEC tworzy partycjÄ™" -#: parted/parted.c:2209 +#: parted/parted.c:2341 msgid "" "'mkpart' makes a partition without creating a new file system on the " "partition. FS-TYPE may be specified to set an appropriate partition ID.\n" @@ -2727,19 +2750,19 @@ msgstr "" "tej partycji. Opcjonalny SYSTEM-PLIKÓW może zostać podany do okreÅ›lenia " "wÅ‚aÅ›ciwego identyfikatora partycji.\n" -#: parted/parted.c:2214 +#: parted/parted.c:2346 msgid "name" msgstr "nazwa" -#: parted/parted.c:2217 +#: parted/parted.c:2349 msgid "name NUMBER NAME name partition NUMBER as NAME" msgstr "name NUMER NAZWA nadaje NAZWĘ partycji NUMER" -#: parted/parted.c:2222 +#: parted/parted.c:2354 msgid "print" msgstr "drukuj" -#: parted/parted.c:2225 +#: parted/parted.c:2357 msgid "" "print [devices|free|list,all] display the partition table, or " "available devices, or free space, or all found partitions" @@ -2747,7 +2770,7 @@ msgstr "" "print [devices|free|list,all] wyÅ›wietla tablicÄ™ partycji, " "dostÄ™pne urzÄ…dzenia, wolne miejsce lub wszystkie znalezione partycje" -#: parted/parted.c:2229 +#: parted/parted.c:2361 msgid "" "Without arguments, 'print' displays the entire partition table. However with " "the following arguments it performs various other actions.\n" @@ -2755,11 +2778,11 @@ msgstr "" "Bez argumentów 'print' wyÅ›wietla caÅ‚Ä… tablicÄ™ partycji. Jednak z " "nastÄ™pujÄ…cymi parametrami wykonuje różne inne akcje:\n" -#: parted/parted.c:2231 +#: parted/parted.c:2363 msgid " devices : display all active block devices\n" msgstr " devices : wyÅ›wietla wszystkie aktywne urzÄ…dzenia blokowe\n" -#: parted/parted.c:2232 +#: parted/parted.c:2364 msgid "" " free : display information about free unpartitioned space on the " "current block device\n" @@ -2767,26 +2790,26 @@ msgstr "" " free : wyÅ›wietla informacje o wolnym, niespartycjonowanym miejscu na " "aktualnym urzÄ…dzeniu blokowym\n" -#: parted/parted.c:2234 +#: parted/parted.c:2366 msgid "" " list, all : display the partition tables of all active block devices\n" msgstr "" " list, all : wyÅ›wietla tablice partycji wszystkich aktywnych urzÄ…dzeÅ„ " "blokowych\n" -#: parted/parted.c:2238 +#: parted/parted.c:2370 msgid "quit" msgstr "koniec" -#: parted/parted.c:2241 +#: parted/parted.c:2373 msgid "quit exit program" msgstr "quit koÅ„czy pracÄ™ programu" -#: parted/parted.c:2246 +#: parted/parted.c:2378 msgid "rescue" msgstr "uratuj" -#: parted/parted.c:2249 +#: parted/parted.c:2381 msgid "" "rescue START END rescue a lost partition near START " "and END" @@ -2794,90 +2817,100 @@ msgstr "" "rescue POCZÄ„TEK KONIEC odzyskuje utraconÄ… partycjÄ™ blisko POCZÄ„TKU i " "KOŃCA" -#: parted/parted.c:2255 +#: parted/parted.c:2387 msgid "resize" msgstr "zmieÅ„-rozmiar" -#: parted/parted.c:2258 +#: parted/parted.c:2390 msgid "The resize command was removed in parted 3.0\n" msgstr "Polecenie zmiany rozmiaru zostaÅ‚o usuniÄ™te w partedzie 3.0\n" -#: parted/parted.c:2261 +#: parted/parted.c:2393 msgid "resizepart" msgstr "resizepart" -#: parted/parted.c:2264 +#: parted/parted.c:2396 msgid "resizepart NUMBER END resize partition NUMBER" msgstr "resizepart NUMER KONIEC zmienia rozmiar partycji NUMER" -#: parted/parted.c:2269 +#: parted/parted.c:2401 msgid "rm" msgstr "usuÅ„" -#: parted/parted.c:2272 +#: parted/parted.c:2404 msgid "rm NUMBER delete partition NUMBER" msgstr "rm NUMER usuwa partycjÄ™ NUMER" -#: parted/parted.c:2277 +#: parted/parted.c:2409 msgid "select" msgstr "wybierz" -#: parted/parted.c:2280 +#: parted/parted.c:2412 msgid "select DEVICE choose the device to edit" msgstr "select URZÄ„DZENIE wybiera urzÄ…dzenie do edycji" -#: parted/parted.c:2285 +#: parted/parted.c:2417 msgid "disk_set" msgstr "ustaw_dysk" -#: parted/parted.c:2288 +#: parted/parted.c:2420 msgid "" "disk_set FLAG STATE change the FLAG on selected device" msgstr "disk_set FLAGA STAN zmienia flagÄ™ na wybranym urzÄ…dzeniu" -#: parted/parted.c:2293 +#: parted/parted.c:2425 msgid "disk_toggle" msgstr "przeÅ‚Ä…cz_dysk" -#: parted/parted.c:2296 +#: parted/parted.c:2428 msgid "" "disk_toggle [FLAG] toggle the state of FLAG on " "selected device" msgstr "" "disk_toggle [FLAGA] przestawia stan FLAGI na wybranym urzÄ…dzeniu" -#: parted/parted.c:2302 +#: parted/parted.c:2434 msgid "set" msgstr "ustaw" -#: parted/parted.c:2305 +#: parted/parted.c:2437 msgid "" "set NUMBER FLAG STATE change the FLAG on partition NUMBER" msgstr "set NUMER FLAGA STAN zmienia flagÄ™ na partycji NUMER" -#: parted/parted.c:2311 +#: parted/parted.c:2443 msgid "toggle" msgstr "przestaw" -#: parted/parted.c:2314 +#: parted/parted.c:2446 msgid "" "toggle [NUMBER [FLAG]] toggle the state of FLAG on " "partition NUMBER" msgstr "toggle [NUMER [FLAGA]] przestawia stan FLAGI na partycji NUMER" -#: parted/parted.c:2320 +#: parted/parted.c:2452 +msgid "type" +msgstr "" + +#: parted/parted.c:2455 +msgid "" +"type NUMBER TYPE-ID or TYPE-UUID type set TYPE-ID or TYPE-UUID of " +"partition NUMBER" +msgstr "" + +#: parted/parted.c:2460 msgid "unit" msgstr "jednostka" -#: parted/parted.c:2323 +#: parted/parted.c:2463 msgid "unit UNIT set the default unit to UNIT" msgstr "unit JEDNOSTKA ustawia domyÅ›lnÄ… jednostkÄ™" -#: parted/parted.c:2328 +#: parted/parted.c:2468 msgid "version" msgstr "wersja" -#: parted/parted.c:2331 +#: parted/parted.c:2471 msgid "" "version display the version number and " "copyright information of GNU Parted" @@ -2885,7 +2918,7 @@ msgstr "" "version wyÅ›wietla numer wersji GNU Parteda i " "informacje o prawach autorskich" -#: parted/parted.c:2335 +#: parted/parted.c:2475 msgid "" "'version' displays copyright and version information corresponding to this " "copy of GNU Parted\n" @@ -2893,22 +2926,22 @@ msgstr "" "'version' wyÅ›wietla informacje o prawach autorskich i wersji dla tej kopii " "GNU Parteda\n" -#: parted/parted.c:2405 +#: parted/parted.c:2545 #, c-format msgid "Usage: %s [-hlmsfv] [-a<align>] [DEVICE [COMMAND [PARAMETERS]]...]\n" msgstr "" "SkÅ‚adnia: %s [-hlmsfv] [-a<wyrównanie>] [URZÄ„DZENIE [POLECENIE " "[PARAMETRY]]...]\n" -#: parted/parted.c:2449 +#: parted/parted.c:2589 msgid "No device found" msgstr "Nie znaleziono urzÄ…dzenia" -#: parted/parted.c:2486 +#: parted/parted.c:2626 msgid "WARNING: You are not superuser. Watch out for permissions.\n" msgstr "UWAGA: Nie jesteÅ› superużytkownikiem. Uważaj na uprawnienia.\n" -#: parted/parted.c:2519 +#: parted/parted.c:2659 msgid "" "You should reinstall your boot loader before rebooting. Read section 4 of " "the Parted User documentation for more information." @@ -2917,7 +2950,7 @@ msgstr "" "uruchomieniem komputera. Przeczytaj rozdziaÅ‚ 4 dokumentacji użytkownika " "Parted, aby uzyskać wiÄ™cej informacji." -#: parted/parted.c:2526 +#: parted/parted.c:2666 msgid "You may need to update /etc/fstab.\n" msgstr "Może wystÄ…pić potrzeba aktualizacji /etc/fstab.\n" @@ -3177,69 +3210,69 @@ msgstr "" "\n" "BÅ‚Ä…d: WystÄ…piÅ‚ ogólny sygnaÅ‚ SIGILL." -#: parted/ui.c:901 +#: parted/ui.c:904 #, c-format msgid "invalid token: %s" msgstr "nieprawidÅ‚owy token: %s" -#: parted/ui.c:1082 +#: parted/ui.c:1085 msgid "Expecting a partition number." msgstr "Oczekiwany byÅ‚ numer partycji." -#: parted/ui.c:1091 +#: parted/ui.c:1094 msgid "Partition doesn't exist." msgstr "Partycja nie istnieje." -#: parted/ui.c:1111 +#: parted/ui.c:1114 msgid "Expecting a file system type." msgstr "Oczekiwany byÅ‚ typ systemu plików." -#: parted/ui.c:1118 +#: parted/ui.c:1121 #, c-format msgid "Unknown file system type \"%s\"." msgstr "Nieznany typ systemu plików \"%s\"." -#: parted/ui.c:1139 +#: parted/ui.c:1142 msgid "Expecting a disk label type." msgstr "Oczekiwany byÅ‚ typ etykiety dysku." -#: parted/ui.c:1170 parted/ui.c:1206 +#: parted/ui.c:1173 parted/ui.c:1209 msgid "No flags supported" msgstr "Brak obsÅ‚ugiwanych flag" -#: parted/ui.c:1280 +#: parted/ui.c:1283 msgid "Can't create any more partitions." msgstr "Nie można utworzyć wiÄ™cej partycji." -#: parted/ui.c:1290 +#: parted/ui.c:1293 msgid "Expecting a partition type." msgstr "Oczekiwany byÅ‚ typ partycji." -#: parted/ui.c:1439 +#: parted/ui.c:1442 msgid "on" msgstr "wÅ‚Ä…czone" -#: parted/ui.c:1440 +#: parted/ui.c:1443 msgid "off" msgstr "wyÅ‚Ä…czone" -#: parted/ui.c:1457 +#: parted/ui.c:1460 msgid "optimal" msgstr "optymalne" -#: parted/ui.c:1458 +#: parted/ui.c:1461 msgid "minimal" msgstr "minimalne" -#: parted/ui.c:1591 +#: parted/ui.c:1594 msgid "OPTIONs:" msgstr "OPCJE:" -#: parted/ui.c:1596 +#: parted/ui.c:1599 msgid "COMMANDs:" msgstr "POLECENIA:" -#: parted/ui.c:1599 +#: parted/ui.c:1602 #, c-format msgid "" "\n" @@ -3250,11 +3283,21 @@ msgstr "" "BÅ‚Ä™dy w tÅ‚umaczeniu prosimy zgÅ‚aszać na adres: <translation-team-pl@lists." "sourceforge.net>.\n" -#: parted/ui.c:1606 +#: parted/ui.c:1609 #, c-format msgid "Using %s\n" msgstr "Użycie %s\n" -#: parted/ui.c:1686 +#: parted/ui.c:1689 msgid "This command does not make sense in non-interactive mode.\n" msgstr "To polecenie nie ma sensu w trybie nieinteraktywnym.\n" + +#~ msgid "Extended partitions cannot be hidden on msdos disk labels." +#~ msgstr "" +#~ "Rozszerzone partycje nie mogÄ… być ukryte na etykietach dysków msdos." + +#~ msgid "" +#~ "Extended partitions cannot be recovery partitions on msdos disk labels." +#~ msgstr "" +#~ "Rozszerzone partycje nie mogÄ… być partycjami odzyskiwania na etykietach " +#~ "dysków msdos." @@ -7,7 +7,7 @@ msgid "" msgstr "" "Project-Id-Version: parted 1.4.20\n" "Report-Msgid-Bugs-To: bug-parted@gnu.org\n" -"POT-Creation-Date: 2022-04-18 14:44-0400\n" +"POT-Creation-Date: 2023-04-10 15:50-0700\n" "PO-Revision-Date: 2001-10-16 20:16+02:00\n" "Last-Translator: Gonçalo Silva <goncalo.silva@caixamagica.org>\n" "Language-Team: Portuguese <pt@li.org>\n" @@ -17,25 +17,25 @@ msgstr "" "Content-Transfer-Encoding: 8-bit\n" "X-Bugs: Report translation errors to the Language-Team address.\n" -#: lib/argmatch.c:147 +#: lib/argmatch.c:145 #, c-format msgid "invalid argument %s for %s" msgstr "" -#: lib/argmatch.c:148 +#: lib/argmatch.c:146 #, c-format msgid "ambiguous argument %s for %s" msgstr "" -#: lib/argmatch.c:167 lib/argmatch.h:238 +#: lib/argmatch.c:165 lib/argmatch.h:237 msgid "Valid arguments are:" msgstr "" -#: lib/closeout.c:122 libparted/labels/fdasd.c:145 +#: lib/closeout.c:121 libparted/labels/fdasd.c:145 msgid "write error" msgstr "" -#: lib/error.c:195 +#: lib/error.c:193 #, fuzzy msgid "Unknown system error" msgstr "Tipo de sistema de ficheiros desconhecido." @@ -96,11 +96,11 @@ msgstr "" #. If you don't know what to put here, please see #. <https://en.wikipedia.org/wiki/Quotation_marks_in_other_languages> #. and use glyphs suitable for your language. -#: lib/quotearg.c:355 +#: lib/quotearg.c:354 msgid "`" msgstr "" -#: lib/quotearg.c:356 +#: lib/quotearg.c:355 msgid "'" msgstr "" @@ -182,7 +182,7 @@ msgstr "" #. To enquire the regular expression that your system uses for this #. purpose, you can use the command #. locale -k LC_MESSAGES | grep '^yesexpr=' -#: lib/rpmatch.c:150 +#: lib/rpmatch.c:149 msgid "^[yY]" msgstr "" @@ -192,7 +192,7 @@ msgstr "" #. To enquire the regular expression that your system uses for this #. purpose, you can use the command #. locale -k LC_MESSAGES | grep '^noexpr=' -#: lib/rpmatch.c:163 +#: lib/rpmatch.c:162 msgid "^[nN]" msgstr "" @@ -693,22 +693,22 @@ msgstr "boot" msgid "Unknown disk flag, %d." msgstr "Sinalizador de partição desconhecido, %d." -#: libparted/disk.c:1289 +#: libparted/disk.c:1320 #, c-format msgid "%s disk labels do not support extended partitions." msgstr "Rótulos de disco %s não suportam partições extendidas." -#: libparted/disk.c:1821 +#: libparted/disk.c:1990 #, c-format msgid "%s disk labels don't support logical or extended partitions." msgstr "Rótulos de disco %s não suportam partições lógicas ou extendidas." -#: libparted/disk.c:1834 +#: libparted/disk.c:2003 #, fuzzy msgid "Too many primary partitions." msgstr "Muitas páginas inválidas." -#: libparted/disk.c:1843 +#: libparted/disk.c:2012 #, c-format msgid "" "Can't add a logical partition to %s, because there is no extended partition." @@ -716,144 +716,148 @@ msgstr "" "Não posso adicionar uma partição lógica em %s, pois não há uma partição " "extendida." -#: libparted/disk.c:1867 +#: libparted/disk.c:2036 #, fuzzy, c-format msgid "Can't have more than one extended partition on %s." msgstr "Não se pode haver mais de uma partição extendida em %s" -#: libparted/disk.c:1877 +#: libparted/disk.c:2046 #, fuzzy msgid "Can't have logical partitions outside of the extended partition." msgstr "" "Não posso adicionar uma partição lógica fora da partição extendida em %s." -#: libparted/disk.c:1902 +#: libparted/disk.c:2071 #, fuzzy, c-format msgid "Can't have a logical partition outside of the extended partition on %s." msgstr "" "Não posso adicionar uma partição lógica fora da partição extendida em %s." -#: libparted/disk.c:1912 +#: libparted/disk.c:2081 #, fuzzy msgid "Can't have a primary partition inside an extended partition." msgstr "Não posso adicionar uma partição primária dentro de uma extendida." -#: libparted/disk.c:1921 +#: libparted/disk.c:2090 msgid "Can't have a partition outside the disk!" msgstr "Não pode ter uma partição fora do disco!." -#: libparted/disk.c:1972 libparted/disk.c:2150 +#: libparted/disk.c:2141 libparted/disk.c:2319 #, fuzzy msgid "Can't have overlapping partitions." msgstr "Não posso copiar para uma partição sobreposta." -#: libparted/disk.c:2351 +#: libparted/disk.c:2520 msgid "metadata" msgstr "" -#: libparted/disk.c:2353 +#: libparted/disk.c:2522 msgid "free" msgstr "livre" -#: libparted/disk.c:2355 parted/ui.c:1271 parted/ui.c:1299 +#: libparted/disk.c:2524 parted/ui.c:1274 parted/ui.c:1302 msgid "extended" msgstr "extendida" -#: libparted/disk.c:2357 parted/ui.c:1275 parted/ui.c:1303 +#: libparted/disk.c:2526 parted/ui.c:1278 parted/ui.c:1306 msgid "logical" msgstr "lógica" -#: libparted/disk.c:2359 parted/ui.c:1267 parted/ui.c:1295 +#: libparted/disk.c:2528 parted/ui.c:1270 parted/ui.c:1298 msgid "primary" msgstr "primária" -#: libparted/disk.c:2375 +#: libparted/disk.c:2544 msgid "boot" msgstr "boot" -#: libparted/disk.c:2377 +#: libparted/disk.c:2546 msgid "bios_grub" msgstr "" -#: libparted/disk.c:2379 +#: libparted/disk.c:2548 msgid "root" msgstr "root" -#: libparted/disk.c:2381 +#: libparted/disk.c:2550 msgid "swap" msgstr "swap" -#: libparted/disk.c:2383 +#: libparted/disk.c:2552 msgid "hidden" msgstr "escondida" -#: libparted/disk.c:2385 +#: libparted/disk.c:2554 msgid "raid" msgstr "raid" -#: libparted/disk.c:2387 +#: libparted/disk.c:2556 msgid "lvm" msgstr "lvm" -#: libparted/disk.c:2389 +#: libparted/disk.c:2558 msgid "lba" msgstr "lba" -#: libparted/disk.c:2391 +#: libparted/disk.c:2560 msgid "hp-service" msgstr "" -#: libparted/disk.c:2393 +#: libparted/disk.c:2562 msgid "palo" msgstr "" -#: libparted/disk.c:2395 +#: libparted/disk.c:2564 msgid "prep" msgstr "" -#: libparted/disk.c:2397 +#: libparted/disk.c:2566 msgid "msftres" msgstr "" -#: libparted/disk.c:2399 +#: libparted/disk.c:2568 msgid "msftdata" msgstr "" -#: libparted/disk.c:2401 +#: libparted/disk.c:2570 msgid "atvrecv" msgstr "" -#: libparted/disk.c:2403 +#: libparted/disk.c:2572 msgid "diag" msgstr "" -#: libparted/disk.c:2405 +#: libparted/disk.c:2574 msgid "legacy_boot" msgstr "" -#: libparted/disk.c:2407 +#: libparted/disk.c:2576 msgid "irst" msgstr "" -#: libparted/disk.c:2409 +#: libparted/disk.c:2578 #, fuzzy msgid "esp" msgstr "Sim" -#: libparted/disk.c:2411 +#: libparted/disk.c:2580 msgid "chromeos_kernel" msgstr "" -#: libparted/disk.c:2413 +#: libparted/disk.c:2582 #, fuzzy msgid "bls_boot" msgstr "boot" -#: libparted/disk.c:2415 +#: libparted/disk.c:2584 msgid "linux-home" msgstr "" -#: libparted/disk.c:2421 +#: libparted/disk.c:2586 +msgid "no_automount" +msgstr "" + +#: libparted/disk.c:2592 #, fuzzy, c-format msgid "Unknown partition flag, %d." msgstr "Sinalizador de partição desconhecido, %d." @@ -1044,8 +1048,8 @@ msgid "" msgstr "" #: libparted/labels/atari.c:1662 libparted/labels/bsd.c:563 -#: libparted/labels/dasd.c:895 libparted/labels/dos.c:2303 -#: libparted/labels/dvh.c:770 libparted/labels/gpt.c:1769 +#: libparted/labels/dasd.c:893 libparted/labels/dos.c:2294 +#: libparted/labels/dvh.c:770 libparted/labels/gpt.c:1891 #: libparted/labels/loop.c:244 libparted/labels/mac.c:1409 #: libparted/labels/pc98.c:697 libparted/labels/rdb.c:1054 #: libparted/labels/sun.c:781 @@ -1070,40 +1074,30 @@ msgstr "Impossível alinhar a partição." msgid "Unable to allocate a bsd disklabel slot." msgstr "Impossível localizar um rotulo de disco bsd" -#: libparted/labels/dasd.c:626 +#: libparted/labels/dasd.c:634 msgid "The partition table of DASD-LDL device cannot be changed.\n" msgstr "" -#: libparted/labels/dasd.c:921 +#: libparted/labels/dasd.c:919 #, fuzzy msgid "Unable to allocate a dasd disklabel slot" msgstr "Impossível localizar um rotulo de disco bsd" -#: libparted/labels/dos.c:1008 +#: libparted/labels/dos.c:1159 #, fuzzy, c-format msgid "Invalid partition table on %s -- wrong signature %x." msgstr "Tabela de partições inválida em %s - assinatura errada %x" -#: libparted/labels/dos.c:1036 +#: libparted/labels/dos.c:1187 #, c-format msgid "Invalid partition table - recursive partition on %s." msgstr "Tabela de partições inválida - partição recursiva em %s." -#: libparted/labels/dos.c:1567 -#, fuzzy -msgid "Extended partitions cannot be hidden on msdos disk labels." -msgstr "Partições ext2 não podem ser escondidas em rótulos de disco msdos." - -#: libparted/labels/dos.c:1579 -#, fuzzy -msgid "Extended partitions cannot be recovery partitions on msdos disk labels." -msgstr "Partições ext2 não podem ser escondidas em rótulos de disco msdos." - -#: libparted/labels/dos.c:2285 +#: libparted/labels/dos.c:2276 msgid "Parted can't resize partitions managed by Windows Dynamic Disk." msgstr "" -#: libparted/labels/dos.c:2541 +#: libparted/labels/dos.c:2532 #, fuzzy msgid "cannot create any more partitions" msgstr "Não posso copiar partições extendidas." @@ -1252,18 +1246,18 @@ msgstr "" msgid "Disk geometry does not match a DASD device of type 3390." msgstr "" -#: libparted/labels/gpt.c:569 +#: libparted/labels/gpt.c:589 msgid "device is too small for GPT" msgstr "" -#: libparted/labels/gpt.c:771 +#: libparted/labels/gpt.c:791 #, c-format msgid "" "The format of the GPT partition table is version %x, which is newer than " "what Parted can recognise. Please report this!" msgstr "" -#: libparted/labels/gpt.c:807 +#: libparted/labels/gpt.c:827 #, c-format msgid "" "Not all of the space available to %s appears to be used, you can fix the GPT " @@ -1271,35 +1265,35 @@ msgid "" "setting? " msgstr "" -#: libparted/labels/gpt.c:1006 +#: libparted/labels/gpt.c:1026 msgid "" "The backup GPT table is not at the end of the disk, as it should be. Fix, " "by moving the backup to the end (and removing the old backup)?" msgstr "" -#: libparted/labels/gpt.c:1024 +#: libparted/labels/gpt.c:1044 msgid "" "Both the primary and backup GPT tables are corrupt. Try making a fresh " "table, and using Parted's rescue feature to recover partitions." msgstr "" -#: libparted/labels/gpt.c:1035 +#: libparted/labels/gpt.c:1055 msgid "" "The backup GPT table is corrupt, but the primary appears OK, so that will be " "used." msgstr "" -#: libparted/labels/gpt.c:1047 +#: libparted/labels/gpt.c:1067 msgid "" "The primary GPT table is corrupt, but the backup appears OK, so that will be " "used." msgstr "" -#: libparted/labels/gpt.c:1071 +#: libparted/labels/gpt.c:1091 msgid "primary partition table array CRC mismatch" msgstr "" -#: libparted/labels/gpt.c:1655 libparted/labels/gpt.c:1682 +#: libparted/labels/gpt.c:1722 libparted/labels/gpt.c:1749 #, fuzzy msgid "failed to translate partition name" msgstr "Impossível alinhar a partição." @@ -1970,7 +1964,7 @@ msgstr "fat_table_alloc_cluster: não há clusters livres" msgid "Could not detect file system." msgstr "Não foi possível detectar o sistema de Ficheiros." -#: libparted/fs/r/filesys.c:159 libparted/fs/r/filesys.c:284 +#: libparted/fs/r/filesys.c:159 libparted/fs/r/filesys.c:285 #, fuzzy, c-format msgid "resizing %s file systems is not supported" msgstr "" @@ -2240,40 +2234,40 @@ msgstr "" msgid "This HFS+ volume has no extents overflow file. This is quite unusual!" msgstr "" -#: parted/parted.c:137 +#: parted/parted.c:138 msgid "displays this help message" msgstr "mostra esta mensagem de ajuda" -#: parted/parted.c:138 +#: parted/parted.c:139 msgid "lists partition layout on all block devices" msgstr "" -#: parted/parted.c:139 +#: parted/parted.c:140 msgid "displays machine parseable output" msgstr "" -#: parted/parted.c:140 +#: parted/parted.c:141 msgid "displays JSON output" msgstr "" -#: parted/parted.c:141 +#: parted/parted.c:142 msgid "never prompts for user intervention" msgstr "nunca pede intervenção do utulizador" -#: parted/parted.c:142 +#: parted/parted.c:143 msgid "in script mode, fix instead of abort when asked" msgstr "" -#: parted/parted.c:143 +#: parted/parted.c:144 msgid "displays the version" msgstr "mostra a versão" -#: parted/parted.c:144 +#: parted/parted.c:145 #, fuzzy msgid "alignment for new partitions" msgstr "Não posso copiar partições extendidas." -#: parted/parted.c:157 +#: parted/parted.c:158 #, fuzzy msgid "" "NUMBER is the partition number used by Linux. On MS-DOS disk labels, the " @@ -2282,57 +2276,61 @@ msgstr "" "MINOR é o número da partição usado pelo linux. Em rótulos de disco msdos, as " "partições primárias são de 1-4, e partições lógicas de 5 adiante.\n" -#: parted/parted.c:160 +#: parted/parted.c:161 msgid "LABEL-TYPE is one of: " msgstr "TIPO_ROTULO é um de:" -#: parted/parted.c:161 parted/parted.c:162 +#: parted/parted.c:162 parted/parted.c:163 msgid "FLAG is one of: " msgstr "FLAG é um de: " -#: parted/parted.c:163 +#: parted/parted.c:164 #, fuzzy msgid "UNIT is one of: " msgstr "FLAG é um de: " -#: parted/parted.c:164 +#: parted/parted.c:165 msgid "desired alignment: minimum or optimal" msgstr "" -#: parted/parted.c:165 +#: parted/parted.c:166 msgid "PART-TYPE is one of: primary, logical, extended\n" msgstr "TIPO-PART é um de: primary, logical, extended\n" -#: parted/parted.c:167 +#: parted/parted.c:168 msgid "FS-TYPE is one of: " msgstr "TIPO-FS é um de: " -#: parted/parted.c:168 +#: parted/parted.c:169 msgid "" "START and END are disk locations, such as 4GB or 10%. Negative values count " "from the end of the disk. For example, -1s specifies exactly the last " "sector.\n" msgstr "" -#: parted/parted.c:171 +#: parted/parted.c:172 msgid "" "END is disk location, such as 4GB or 10%. Negative value counts from the " "end of the disk. For example, -1s specifies exactly the last sector.\n" msgstr "" -#: parted/parted.c:174 +#: parted/parted.c:175 msgid "STATE is one of: on, off\n" msgstr "ESTADO é um de: on, off\n" -#: parted/parted.c:175 +#: parted/parted.c:176 msgid "DEVICE is usually /dev/hda or /dev/sda\n" msgstr "DISPOSITIVO é usualmente /dev/hda ou /dev/sda\n" -#: parted/parted.c:176 +#: parted/parted.c:177 msgid "NAME is any word you want\n" msgstr "NAME é qualquer palavra que desejar\n" -#: parted/parted.c:179 +#: parted/parted.c:178 +msgid "TYPE_ID is a value between 0x01 and 0xff, TYPE_UUID is a UUID\n" +msgstr "" + +#: parted/parted.c:182 msgid "" "Copyright (C) 1998 - 2006 Free Software Foundation, Inc.\n" "This program is free software, covered by the GNU General Public License.\n" @@ -2344,240 +2342,262 @@ msgid "" "\n" msgstr "" -#: parted/parted.c:229 +#: parted/parted.c:232 #, c-format msgid "%0.f%%\t(time left %.2d:%.2d)" msgstr "" -#: parted/parted.c:248 +#: parted/parted.c:251 #, c-format msgid "Partition %s is being used. Are you sure you want to continue?" msgstr "" -#: parted/parted.c:269 +#: parted/parted.c:272 #, c-format msgid "Partition(s) on %s are being used." msgstr "Partição(ões) em %s está(ão) a ser utilizada(s)." -#: parted/parted.c:281 +#: parted/parted.c:284 #, c-format msgid "" "The existing disk label on %s will be destroyed and all data on this disk " "will be lost. Do you want to continue?" msgstr "" -#: parted/parted.c:542 +#: parted/parted.c:545 #, fuzzy msgid "New disk label type?" msgstr "Tipo de rótulo de disco: %s\n" -#: parted/parted.c:680 +#: parted/parted.c:692 #, fuzzy msgid "Partition type?" msgstr "A partição não existe." -#: parted/parted.c:698 parted/parted.c:902 +#: parted/parted.c:710 parted/parted.c:914 #, fuzzy msgid "Partition name?" msgstr "A partição não existe." -#: parted/parted.c:708 +#: parted/parted.c:720 #, fuzzy msgid "File system type?" msgstr "SistemaFich " -#: parted/parted.c:713 parted/parted.c:1683 +#: parted/parted.c:725 parted/parted.c:1815 msgid "Start?" msgstr "" -#: parted/parted.c:715 parted/parted.c:1685 parted/parted.c:1768 +#: parted/parted.c:727 parted/parted.c:1817 parted/parted.c:1900 msgid "End?" msgstr "" -#: parted/parted.c:782 +#: parted/parted.c:794 #, c-format msgid "" "You requested a partition from %s to %s (sectors %llu..%llu).\n" "The closest location we can manage is %s to %s (sectors %llu..%llu).%s" msgstr "" -#: parted/parted.c:791 +#: parted/parted.c:803 msgid "" "\n" "Is this still acceptable to you?" msgstr "" -#: parted/parted.c:814 +#: parted/parted.c:826 #, c-format msgid "" "The resulting partition is not properly aligned for best performance: %s" msgstr "" -#: parted/parted.c:816 parted/parted.c:1925 +#: parted/parted.c:828 parted/parted.c:2057 msgid "unknown (malloc failed)" msgstr "" -#: parted/parted.c:894 +#: parted/parted.c:906 #, fuzzy, c-format msgid "%s disk labels do not support partition name." msgstr "Rótulos de disco %s não suportam partições extendidas." -#: parted/parted.c:899 parted/parted.c:1748 parted/parted.c:1814 -#: parted/parted.c:1908 parted/parted.c:1983 +#: parted/parted.c:911 parted/parted.c:955 parted/parted.c:1880 +#: parted/parted.c:1946 parted/parted.c:2040 parted/parted.c:2115 #, fuzzy msgid "Partition number?" msgstr "A partição está a ser utilizada." -#: parted/parted.c:1050 +#: parted/parted.c:949 +#, fuzzy, c-format +msgid "%s disk labels do not support partition type." +msgstr "Rótulos de disco %s não suportam partições extendidas." + +#: parted/parted.c:965 +#, fuzzy +msgid "Partition type-id?" +msgstr "A partição não existe." + +#: parted/parted.c:972 +msgid "Invalid type-id." +msgstr "" + +#: parted/parted.c:986 +msgid "Partition type-uuid?" +msgstr "" + +#: parted/parted.c:993 +msgid "Invalid type-uuid." +msgstr "" + +#: parted/parted.c:1146 #, c-format msgid "BIOS cylinder,head,sector geometry: %d,%d,%d. Each cylinder is %s.\n" msgstr "" -#: parted/parted.c:1137 +#: parted/parted.c:1240 #, c-format msgid "Model: %s (%s)\n" msgstr "" -#: parted/parted.c:1139 +#: parted/parted.c:1242 #, fuzzy, c-format msgid "Disk %s: %s\n" msgstr "Tipo de rótulo de disco: %s\n" -#: parted/parted.c:1140 +#: parted/parted.c:1243 #, c-format msgid "Sector size (logical/physical): %lldB/%lldB\n" msgstr "" -#: parted/parted.c:1152 +#: parted/parted.c:1255 #, fuzzy, c-format msgid "Partition Table: %s\n" msgstr "Tabela de partições inválida em %s" -#: parted/parted.c:1153 +#: parted/parted.c:1256 #, fuzzy, c-format msgid "Disk Flags: %s\n" msgstr "Tipo de rótulo de disco: %s\n" -#: parted/parted.c:1279 parted/parted.c:1282 +#: parted/parted.c:1388 parted/parted.c:1391 msgid "Number" msgstr "" -#: parted/parted.c:1279 parted/parted.c:1282 +#: parted/parted.c:1388 parted/parted.c:1391 msgid "Start" msgstr "" -#: parted/parted.c:1280 parted/parted.c:1283 +#: parted/parted.c:1389 parted/parted.c:1392 msgid "End" msgstr "" -#: parted/parted.c:1283 +#: parted/parted.c:1392 msgid "Size" msgstr "" -#: parted/parted.c:1287 +#: parted/parted.c:1396 msgid "Type" msgstr "" -#: parted/parted.c:1289 +#: parted/parted.c:1398 #, fuzzy msgid "File system" msgstr "SistemaFich " -#: parted/parted.c:1292 +#: parted/parted.c:1401 msgid "Name" msgstr "" -#: parted/parted.c:1294 +#: parted/parted.c:1403 msgid "Flags" msgstr "Sinalizador" -#: parted/parted.c:1352 +#: parted/parted.c:1461 msgid "Free Space" msgstr "" -#: parted/parted.c:1570 +#: parted/parted.c:1702 #, c-format msgid "" "A %s %s partition was found at %s -> %s. Do you want to add it to the " "partition table?" msgstr "" -#: parted/parted.c:1613 +#: parted/parted.c:1745 msgid "searching for file systems" msgstr "" -#: parted/parted.c:1720 +#: parted/parted.c:1852 msgid "The resize command has been removed in parted 3.0" msgstr "" -#: parted/parted.c:1782 +#: parted/parted.c:1914 msgid "" "Shrinking a partition can cause data loss, are you sure you want to continue?" msgstr "" -#: parted/parted.c:1838 +#: parted/parted.c:1970 #, fuzzy msgid "New device?" msgstr "Nenhum dispositivo encontrado" -#: parted/parted.c:1906 +#: parted/parted.c:2038 msgid "alignment type(min/opt)" msgstr "" -#: parted/parted.c:1921 +#: parted/parted.c:2053 #, c-format msgid "%d aligned\n" msgstr "" -#: parted/parted.c:1923 +#: parted/parted.c:2055 #, c-format msgid "%d not aligned: %s\n" msgstr "" -#: parted/parted.c:1948 parted/parted.c:1985 +#: parted/parted.c:2080 parted/parted.c:2117 msgid "Flag to Invert?" msgstr "" -#: parted/parted.c:1953 parted/parted.c:1990 +#: parted/parted.c:2085 parted/parted.c:2122 msgid "New state?" msgstr "" -#: parted/parted.c:2036 +#: parted/parted.c:2168 msgid "Unit?" msgstr "" -#: parted/parted.c:2171 +#: parted/parted.c:2303 #, fuzzy msgid "align-check" msgstr "check" -#: parted/parted.c:2174 +#: parted/parted.c:2306 #, fuzzy msgid "" "align-check TYPE N check partition N for TYPE(min|opt) " "alignment" msgstr "print mostra a tabela de partições" -#: parted/parted.c:2182 +#: parted/parted.c:2314 msgid "help" msgstr "help" -#: parted/parted.c:2185 +#: parted/parted.c:2317 #, fuzzy msgid "" "help [COMMAND] print general help, or help on " "COMMAND" msgstr "help [COMANDO] mostra ajuda geral, ou ajuda a COMANDO" -#: parted/parted.c:2191 +#: parted/parted.c:2323 msgid "mklabel" msgstr "mklabel" -#: parted/parted.c:2191 +#: parted/parted.c:2323 msgid "mktable" msgstr "" -#: parted/parted.c:2194 +#: parted/parted.c:2326 #, fuzzy msgid "" "mklabel,mktable LABEL-TYPE create a new disklabel (partition " @@ -2585,16 +2605,16 @@ msgid "" msgstr "" "mklabel TIPO-ROTULO cria um novo rótulo (na tabela de partição)" -#: parted/parted.c:2200 +#: parted/parted.c:2332 msgid "mkpart" msgstr "mkpart" -#: parted/parted.c:2203 +#: parted/parted.c:2335 #, fuzzy msgid "mkpart PART-TYPE [FS-TYPE] START END make a partition" msgstr "mkpart TIPO-PART [FS-TYPE] INICIO FIM cria uma partição" -#: parted/parted.c:2209 +#: parted/parted.c:2341 #, fuzzy msgid "" "'mkpart' makes a partition without creating a new file system on the " @@ -2605,181 +2625,191 @@ msgstr "" "partição extendida). Este comando é útil se apagou acidentalmente uma " "partição.\n" -#: parted/parted.c:2214 +#: parted/parted.c:2346 msgid "name" msgstr "name" -#: parted/parted.c:2217 +#: parted/parted.c:2349 #, fuzzy msgid "name NUMBER NAME name partition NUMBER as NAME" msgstr "name MINOR NAME renomeia a partição MINOR para NAME" -#: parted/parted.c:2222 +#: parted/parted.c:2354 msgid "print" msgstr "print" -#: parted/parted.c:2225 +#: parted/parted.c:2357 msgid "" "print [devices|free|list,all] display the partition table, or " "available devices, or free space, or all found partitions" msgstr "" -#: parted/parted.c:2229 +#: parted/parted.c:2361 msgid "" "Without arguments, 'print' displays the entire partition table. However with " "the following arguments it performs various other actions.\n" msgstr "" -#: parted/parted.c:2231 +#: parted/parted.c:2363 msgid " devices : display all active block devices\n" msgstr "" -#: parted/parted.c:2232 +#: parted/parted.c:2364 msgid "" " free : display information about free unpartitioned space on the " "current block device\n" msgstr "" -#: parted/parted.c:2234 +#: parted/parted.c:2366 msgid "" " list, all : display the partition tables of all active block devices\n" msgstr "" -#: parted/parted.c:2238 +#: parted/parted.c:2370 msgid "quit" msgstr "quit" -#: parted/parted.c:2241 +#: parted/parted.c:2373 #, fuzzy msgid "quit exit program" msgstr "quit sair do programa" -#: parted/parted.c:2246 +#: parted/parted.c:2378 msgid "rescue" msgstr "" -#: parted/parted.c:2249 +#: parted/parted.c:2381 #, fuzzy msgid "" "rescue START END rescue a lost partition near START " "and END" msgstr "print mostra a tabela de partições" -#: parted/parted.c:2255 +#: parted/parted.c:2387 msgid "resize" msgstr "resize" -#: parted/parted.c:2258 +#: parted/parted.c:2390 msgid "The resize command was removed in parted 3.0\n" msgstr "" -#: parted/parted.c:2261 +#: parted/parted.c:2393 #, fuzzy msgid "resizepart" msgstr "resize" -#: parted/parted.c:2264 +#: parted/parted.c:2396 #, fuzzy msgid "resizepart NUMBER END resize partition NUMBER" msgstr "rm MINOR apaga a partição MINOR" -#: parted/parted.c:2269 +#: parted/parted.c:2401 msgid "rm" msgstr "rm" -#: parted/parted.c:2272 +#: parted/parted.c:2404 #, fuzzy msgid "rm NUMBER delete partition NUMBER" msgstr "rm MINOR apaga a partição MINOR" -#: parted/parted.c:2277 +#: parted/parted.c:2409 msgid "select" msgstr "select" -#: parted/parted.c:2280 +#: parted/parted.c:2412 #, fuzzy msgid "select DEVICE choose the device to edit" msgstr "select DEVICE selecciona o dispositivo a editar" -#: parted/parted.c:2285 +#: parted/parted.c:2417 msgid "disk_set" msgstr "" -#: parted/parted.c:2288 +#: parted/parted.c:2420 msgid "" "disk_set FLAG STATE change the FLAG on selected device" msgstr "" -#: parted/parted.c:2293 +#: parted/parted.c:2425 msgid "disk_toggle" msgstr "" -#: parted/parted.c:2296 +#: parted/parted.c:2428 msgid "" "disk_toggle [FLAG] toggle the state of FLAG on " "selected device" msgstr "" -#: parted/parted.c:2302 +#: parted/parted.c:2434 msgid "set" msgstr "set" -#: parted/parted.c:2305 +#: parted/parted.c:2437 #, fuzzy msgid "" "set NUMBER FLAG STATE change the FLAG on partition NUMBER" msgstr "set MINOR FLAG ESTADO muda o sinalizador na partição MINOR" -#: parted/parted.c:2311 +#: parted/parted.c:2443 msgid "toggle" msgstr "" -#: parted/parted.c:2314 +#: parted/parted.c:2446 msgid "" "toggle [NUMBER [FLAG]] toggle the state of FLAG on " "partition NUMBER" msgstr "" -#: parted/parted.c:2320 +#: parted/parted.c:2452 +msgid "type" +msgstr "" + +#: parted/parted.c:2455 +msgid "" +"type NUMBER TYPE-ID or TYPE-UUID type set TYPE-ID or TYPE-UUID of " +"partition NUMBER" +msgstr "" + +#: parted/parted.c:2460 msgid "unit" msgstr "" -#: parted/parted.c:2323 +#: parted/parted.c:2463 #, fuzzy msgid "unit UNIT set the default unit to UNIT" msgstr "print mostra a tabela de partições" -#: parted/parted.c:2328 +#: parted/parted.c:2468 msgid "version" msgstr "" -#: parted/parted.c:2331 +#: parted/parted.c:2471 #, fuzzy msgid "" "version display the version number and " "copyright information of GNU Parted" msgstr "print mostra a tabela de partições" -#: parted/parted.c:2335 +#: parted/parted.c:2475 msgid "" "'version' displays copyright and version information corresponding to this " "copy of GNU Parted\n" msgstr "" -#: parted/parted.c:2405 +#: parted/parted.c:2545 #, c-format msgid "Usage: %s [-hlmsfv] [-a<align>] [DEVICE [COMMAND [PARAMETERS]]...]\n" msgstr "" -#: parted/parted.c:2449 +#: parted/parted.c:2589 msgid "No device found" msgstr "Nenhum dispositivo encontrado" -#: parted/parted.c:2486 +#: parted/parted.c:2626 msgid "WARNING: You are not superuser. Watch out for permissions.\n" msgstr "" -#: parted/parted.c:2519 +#: parted/parted.c:2659 msgid "" "You should reinstall your boot loader before rebooting. Read section 4 of " "the Parted User documentation for more information." @@ -2787,7 +2817,7 @@ msgstr "" "Deverá reinstalar seu gestor de boot antes de reinicializar. Leia a secção 4 " "da documentação do utilizador do Parted para mais informações." -#: parted/parted.c:2526 +#: parted/parted.c:2666 msgid "You may need to update /etc/fstab.\n" msgstr "" @@ -2973,87 +3003,87 @@ msgid "" "Error: A general SIGILL signal was encountered." msgstr "" -#: parted/ui.c:901 +#: parted/ui.c:904 #, fuzzy, c-format msgid "invalid token: %s" msgstr "Tabela de partições inválida em %s" -#: parted/ui.c:1082 +#: parted/ui.c:1085 #, fuzzy msgid "Expecting a partition number." msgstr "A partição destino está a ser utilizada." -#: parted/ui.c:1091 +#: parted/ui.c:1094 msgid "Partition doesn't exist." msgstr "A partição não existe." -#: parted/ui.c:1111 +#: parted/ui.c:1114 #, fuzzy msgid "Expecting a file system type." msgstr "Tipo de sistema de ficheiros desconhecido." -#: parted/ui.c:1118 +#: parted/ui.c:1121 #, fuzzy, c-format msgid "Unknown file system type \"%s\"." msgstr "Tipo de sistema de ficheiros desconhecido." -#: parted/ui.c:1139 +#: parted/ui.c:1142 msgid "Expecting a disk label type." msgstr "" -#: parted/ui.c:1170 parted/ui.c:1206 +#: parted/ui.c:1173 parted/ui.c:1209 msgid "No flags supported" msgstr "" -#: parted/ui.c:1280 +#: parted/ui.c:1283 #, fuzzy msgid "Can't create any more partitions." msgstr "Não posso adicionar outra partição." -#: parted/ui.c:1290 +#: parted/ui.c:1293 #, fuzzy msgid "Expecting a partition type." msgstr "A partição destino não existe." -#: parted/ui.c:1439 +#: parted/ui.c:1442 msgid "on" msgstr "on" -#: parted/ui.c:1440 +#: parted/ui.c:1443 msgid "off" msgstr "" -#: parted/ui.c:1457 +#: parted/ui.c:1460 msgid "optimal" msgstr "" -#: parted/ui.c:1458 +#: parted/ui.c:1461 msgid "minimal" msgstr "" -#: parted/ui.c:1591 +#: parted/ui.c:1594 msgid "OPTIONs:" msgstr "OPÇÕES:" -#: parted/ui.c:1596 +#: parted/ui.c:1599 msgid "COMMANDs:" msgstr "COMANDOs:" -#: parted/ui.c:1599 +#: parted/ui.c:1602 #, c-format msgid "" "\n" "Report bugs to %s\n" msgstr "" -#: parted/ui.c:1606 +#: parted/ui.c:1609 #, fuzzy, c-format msgid "Using %s\n" msgstr "" "\n" "Usando %s\n" -#: parted/ui.c:1686 +#: parted/ui.c:1689 msgid "This command does not make sense in non-interactive mode.\n" msgstr "" @@ -3324,6 +3354,9 @@ msgstr "" #~ msgid "Sorry, can't move the start of ext2 partitions yet!" #~ msgstr "Desculpe, não posso mover o início de partições ext2 ainda!" +#~ msgid "Ext2 partitions can't be hidden on msdos disk labels." +#~ msgstr "Partições ext2 não podem ser escondidas em rótulos de disco msdos." + #~ msgid "Couldn't flush buffer cache!" #~ msgstr "Não foi possível esvaziar a cache temporária!" diff --git a/po/pt_BR.gmo b/po/pt_BR.gmo Binary files differindex e017d2a..d5c5646 100644 --- a/po/pt_BR.gmo +++ b/po/pt_BR.gmo diff --git a/po/pt_BR.po b/po/pt_BR.po index 94b4115..f80f8fa 100644 --- a/po/pt_BR.po +++ b/po/pt_BR.po @@ -10,7 +10,7 @@ msgid "" msgstr "" "Project-Id-Version: parted 3.3.52\n" "Report-Msgid-Bugs-To: bug-parted@gnu.org\n" -"POT-Creation-Date: 2022-04-18 14:44-0400\n" +"POT-Creation-Date: 2023-04-10 15:50-0700\n" "PO-Revision-Date: 2021-04-11 21:49-0300\n" "Last-Translator: Rafael Fontenelle <rafaelff@gnome.org>\n" "Language-Team: Brazilian Portuguese <ldpbr-translation@lists.sourceforge." @@ -23,25 +23,25 @@ msgstr "" "X-Generator: Gtranslator 40.0\n" "X-Bugs: Report translation errors to the Language-Team address.\n" -#: lib/argmatch.c:147 +#: lib/argmatch.c:145 #, c-format msgid "invalid argument %s for %s" msgstr "argumento inválido %s para %s" -#: lib/argmatch.c:148 +#: lib/argmatch.c:146 #, c-format msgid "ambiguous argument %s for %s" msgstr "argumento ambÃguo %s para %s" -#: lib/argmatch.c:167 lib/argmatch.h:238 +#: lib/argmatch.c:165 lib/argmatch.h:237 msgid "Valid arguments are:" msgstr "Argumentos válidos são:" -#: lib/closeout.c:122 libparted/labels/fdasd.c:145 +#: lib/closeout.c:121 libparted/labels/fdasd.c:145 msgid "write error" msgstr "erro de escrita" -#: lib/error.c:195 +#: lib/error.c:193 msgid "Unknown system error" msgstr "Erro desconhecido de sistema" @@ -101,11 +101,11 @@ msgstr "%s: a opção exige um argumento -- \"%c\"\n" #. If you don't know what to put here, please see #. <https://en.wikipedia.org/wiki/Quotation_marks_in_other_languages> #. and use glyphs suitable for your language. -#: lib/quotearg.c:355 +#: lib/quotearg.c:354 msgid "`" msgstr "“" -#: lib/quotearg.c:356 +#: lib/quotearg.c:355 msgid "'" msgstr "â€" @@ -187,7 +187,7 @@ msgstr "Nenhuma expressão regular anterior" #. To enquire the regular expression that your system uses for this #. purpose, you can use the command #. locale -k LC_MESSAGES | grep '^yesexpr=' -#: lib/rpmatch.c:150 +#: lib/rpmatch.c:149 msgid "^[yY]" msgstr "^[+1SsyY]" @@ -197,7 +197,7 @@ msgstr "^[+1SsyY]" #. To enquire the regular expression that your system uses for this #. purpose, you can use the command #. locale -k LC_MESSAGES | grep '^noexpr=' -#: lib/rpmatch.c:163 +#: lib/rpmatch.c:162 msgid "^[nN]" msgstr "^[-0nN]" @@ -753,21 +753,21 @@ msgstr "pmbr_boot" msgid "Unknown disk flag, %d." msgstr "Opção desconhecida de partição, %d." -#: libparted/disk.c:1289 +#: libparted/disk.c:1320 #, c-format msgid "%s disk labels do not support extended partitions." msgstr "Rótulos de disco %s não suportam partições estendidas." -#: libparted/disk.c:1821 +#: libparted/disk.c:1990 #, c-format msgid "%s disk labels don't support logical or extended partitions." msgstr "Rótulos de disco %s não suportam partições lógicas ou estendidas." -#: libparted/disk.c:1834 +#: libparted/disk.c:2003 msgid "Too many primary partitions." msgstr "Há partições primárias demais." -#: libparted/disk.c:1843 +#: libparted/disk.c:2012 #, c-format msgid "" "Can't add a logical partition to %s, because there is no extended partition." @@ -775,138 +775,142 @@ msgstr "" "Não posso adicionar uma partição lógica em %s, pois não há uma partição " "estendida." -#: libparted/disk.c:1867 +#: libparted/disk.c:2036 #, c-format msgid "Can't have more than one extended partition on %s." msgstr "Não pode existir mais de uma partição estendida em %s." -#: libparted/disk.c:1877 +#: libparted/disk.c:2046 msgid "Can't have logical partitions outside of the extended partition." msgstr "Partições lógicas não podem existir fora da partição estendida." -#: libparted/disk.c:1902 +#: libparted/disk.c:2071 #, c-format msgid "Can't have a logical partition outside of the extended partition on %s." msgstr "Uma partição lógica não pode existir fora da partição estendida em %s." -#: libparted/disk.c:1912 +#: libparted/disk.c:2081 msgid "Can't have a primary partition inside an extended partition." msgstr "" "Não é possÃvel ter uma partição primária dentro de uma partição estendida." -#: libparted/disk.c:1921 +#: libparted/disk.c:2090 msgid "Can't have a partition outside the disk!" msgstr "Não é possÃvel ter uma partição para fora do disco!" -#: libparted/disk.c:1972 libparted/disk.c:2150 +#: libparted/disk.c:2141 libparted/disk.c:2319 msgid "Can't have overlapping partitions." msgstr "Não é possÃvel ter partições que se sobrepõem." -#: libparted/disk.c:2351 +#: libparted/disk.c:2520 msgid "metadata" msgstr "metadados" -#: libparted/disk.c:2353 +#: libparted/disk.c:2522 msgid "free" msgstr "livre" -#: libparted/disk.c:2355 parted/ui.c:1271 parted/ui.c:1299 +#: libparted/disk.c:2524 parted/ui.c:1274 parted/ui.c:1302 msgid "extended" msgstr "estendida" -#: libparted/disk.c:2357 parted/ui.c:1275 parted/ui.c:1303 +#: libparted/disk.c:2526 parted/ui.c:1278 parted/ui.c:1306 msgid "logical" msgstr "lógica" -#: libparted/disk.c:2359 parted/ui.c:1267 parted/ui.c:1295 +#: libparted/disk.c:2528 parted/ui.c:1270 parted/ui.c:1298 msgid "primary" msgstr "primária" -#: libparted/disk.c:2375 +#: libparted/disk.c:2544 msgid "boot" msgstr "boot" -#: libparted/disk.c:2377 +#: libparted/disk.c:2546 msgid "bios_grub" msgstr "bios_grub" -#: libparted/disk.c:2379 +#: libparted/disk.c:2548 msgid "root" msgstr "root" -#: libparted/disk.c:2381 +#: libparted/disk.c:2550 msgid "swap" msgstr "swap" -#: libparted/disk.c:2383 +#: libparted/disk.c:2552 msgid "hidden" msgstr "escondida" -#: libparted/disk.c:2385 +#: libparted/disk.c:2554 msgid "raid" msgstr "raid" -#: libparted/disk.c:2387 +#: libparted/disk.c:2556 msgid "lvm" msgstr "lvm" -#: libparted/disk.c:2389 +#: libparted/disk.c:2558 msgid "lba" msgstr "lba" -#: libparted/disk.c:2391 +#: libparted/disk.c:2560 msgid "hp-service" msgstr "hp-service" -#: libparted/disk.c:2393 +#: libparted/disk.c:2562 msgid "palo" msgstr "palo" -#: libparted/disk.c:2395 +#: libparted/disk.c:2564 msgid "prep" msgstr "prep" -#: libparted/disk.c:2397 +#: libparted/disk.c:2566 msgid "msftres" msgstr "msftres" -#: libparted/disk.c:2399 +#: libparted/disk.c:2568 msgid "msftdata" msgstr "msftdata" -#: libparted/disk.c:2401 +#: libparted/disk.c:2570 msgid "atvrecv" msgstr "atvrecv" -#: libparted/disk.c:2403 +#: libparted/disk.c:2572 msgid "diag" msgstr "diag" -#: libparted/disk.c:2405 +#: libparted/disk.c:2574 msgid "legacy_boot" msgstr "legacy_boot" -#: libparted/disk.c:2407 +#: libparted/disk.c:2576 msgid "irst" msgstr "irst" -#: libparted/disk.c:2409 +#: libparted/disk.c:2578 msgid "esp" msgstr "esp" -#: libparted/disk.c:2411 +#: libparted/disk.c:2580 msgid "chromeos_kernel" msgstr "chromeos_kernel" -#: libparted/disk.c:2413 +#: libparted/disk.c:2582 msgid "bls_boot" msgstr "bls_boot" -#: libparted/disk.c:2415 +#: libparted/disk.c:2584 msgid "linux-home" msgstr "" -#: libparted/disk.c:2421 +#: libparted/disk.c:2586 +msgid "no_automount" +msgstr "" + +#: libparted/disk.c:2592 #, c-format msgid "Unknown partition flag, %d." msgstr "Opção de partição desconhecida, %d." @@ -1116,8 +1120,8 @@ msgstr "" "partições primárias, se XGM for o primeiro, ele conta para duas)." #: libparted/labels/atari.c:1662 libparted/labels/bsd.c:563 -#: libparted/labels/dasd.c:895 libparted/labels/dos.c:2303 -#: libparted/labels/dvh.c:770 libparted/labels/gpt.c:1769 +#: libparted/labels/dasd.c:893 libparted/labels/dos.c:2294 +#: libparted/labels/dvh.c:770 libparted/labels/gpt.c:1891 #: libparted/labels/loop.c:244 libparted/labels/mac.c:1409 #: libparted/labels/pc98.c:697 libparted/labels/rdb.c:1054 #: libparted/labels/sun.c:781 @@ -1141,43 +1145,32 @@ msgstr "Não é possÃvel alocar um número de partição." msgid "Unable to allocate a bsd disklabel slot." msgstr "Não foi possÃvel alocar uma posição para rótulo de disco bsd." -#: libparted/labels/dasd.c:626 +#: libparted/labels/dasd.c:634 msgid "The partition table of DASD-LDL device cannot be changed.\n" msgstr "A tabela de partição do dispositivo DASD-LDL não pode ser alterada.\n" # Ponto final acrescentado para seguir as demais frases em volta desta -#: libparted/labels/dasd.c:921 +#: libparted/labels/dasd.c:919 msgid "Unable to allocate a dasd disklabel slot" msgstr "Não foi possÃvel alocar uma posição para rótulo de disco dasd." -#: libparted/labels/dos.c:1008 +#: libparted/labels/dos.c:1159 #, c-format msgid "Invalid partition table on %s -- wrong signature %x." msgstr "Tabela de partições inválida em %s -- assinatura errada %x." -#: libparted/labels/dos.c:1036 +#: libparted/labels/dos.c:1187 #, c-format msgid "Invalid partition table - recursive partition on %s." msgstr "Tabela de partições inválida - partição recursiva em %s." -#: libparted/labels/dos.c:1567 -msgid "Extended partitions cannot be hidden on msdos disk labels." -msgstr "" -"Partições estendidas não podem ser escondidas em rótulos de disco msdos." - -#: libparted/labels/dos.c:1579 -msgid "Extended partitions cannot be recovery partitions on msdos disk labels." -msgstr "" -"Partições estendidas não podem ser partições recuperadas em rótulos de disco " -"msdos." - -#: libparted/labels/dos.c:2285 +#: libparted/labels/dos.c:2276 msgid "Parted can't resize partitions managed by Windows Dynamic Disk." msgstr "" "O Parted não pode redimensionar partições gerenciadas com o Disco Dinâmico " "do Windows." -#: libparted/labels/dos.c:2541 +#: libparted/labels/dos.c:2532 msgid "cannot create any more partitions" msgstr "não é possÃvel criar mais nenhuma partição" @@ -1322,11 +1315,11 @@ msgid "Disk geometry does not match a DASD device of type 3390." msgstr "" "A geometria do disco não corresponde a um dispositivo DASD do tipo 3390." -#: libparted/labels/gpt.c:569 +#: libparted/labels/gpt.c:589 msgid "device is too small for GPT" msgstr "dispositivo é muito pequeno para GPT" -#: libparted/labels/gpt.c:771 +#: libparted/labels/gpt.c:791 #, c-format msgid "" "The format of the GPT partition table is version %x, which is newer than " @@ -1335,7 +1328,7 @@ msgstr "" "A versão do formato da tabela de partição GPT é %x, que é mais recente do " "que o Parted pode reconhecer. Por favor, nos relate isso!" -#: libparted/labels/gpt.c:807 +#: libparted/labels/gpt.c:827 #, c-format msgid "" "Not all of the space available to %s appears to be used, you can fix the GPT " @@ -1346,7 +1339,7 @@ msgstr "" "corrigir a GPT para usar todo seu espaço (uns %llu blocos adicionais) ou " "continuar com a configuração atual? " -#: libparted/labels/gpt.c:1006 +#: libparted/labels/gpt.c:1026 msgid "" "The backup GPT table is not at the end of the disk, as it should be. Fix, " "by moving the backup to the end (and removing the old backup)?" @@ -1354,7 +1347,7 @@ msgstr "" "A cópia da tabela GPT não está no fim do disco, como deveria estar. Corrija-" "a, movendo a cópia para o fim do disco (e removendo a cópia antiga)?" -#: libparted/labels/gpt.c:1024 +#: libparted/labels/gpt.c:1044 msgid "" "Both the primary and backup GPT tables are corrupt. Try making a fresh " "table, and using Parted's rescue feature to recover partitions." @@ -1363,7 +1356,7 @@ msgstr "" "fazer uma nova tabela, usando os recursos de recuperação do Parted para " "recuperar partições." -#: libparted/labels/gpt.c:1035 +#: libparted/labels/gpt.c:1055 msgid "" "The backup GPT table is corrupt, but the primary appears OK, so that will be " "used." @@ -1371,7 +1364,7 @@ msgstr "" "A cópia da tabela GPT está corrompida, mas a tabela primária aparece estar " "OK, então esta será usada." -#: libparted/labels/gpt.c:1047 +#: libparted/labels/gpt.c:1067 msgid "" "The primary GPT table is corrupt, but the backup appears OK, so that will be " "used." @@ -1379,11 +1372,11 @@ msgstr "" "A tabela GPT primária está corrompida, mas a cópia da tabela aparece estar " "OK, então esta será usada." -#: libparted/labels/gpt.c:1071 +#: libparted/labels/gpt.c:1091 msgid "primary partition table array CRC mismatch" msgstr "CRC do conjunto de tabela de partição primária não coincide" -#: libparted/labels/gpt.c:1655 libparted/labels/gpt.c:1682 +#: libparted/labels/gpt.c:1722 libparted/labels/gpt.c:1749 msgid "failed to translate partition name" msgstr "falha ao traduzir nome de partição" @@ -2067,7 +2060,7 @@ msgstr "fat_table_alloc_cluster: não há clusters livres" msgid "Could not detect file system." msgstr "Não foi possÃvel detectar o sistema de arquivos." -#: libparted/fs/r/filesys.c:159 libparted/fs/r/filesys.c:284 +#: libparted/fs/r/filesys.c:159 libparted/fs/r/filesys.c:285 #, c-format msgid "resizing %s file systems is not supported" msgstr "não é suportado redimensionar sistemas de arquivos %s" @@ -2360,40 +2353,40 @@ msgstr "" "Este volume HFS+ não possui nenhum arquivo de estouro de extensões. Isto é " "bastante incomum!" -#: parted/parted.c:137 +#: parted/parted.c:138 msgid "displays this help message" msgstr "mostra esta mensagem de ajuda" -#: parted/parted.c:138 +#: parted/parted.c:139 msgid "lists partition layout on all block devices" msgstr "lista modelos de partições em todos os dispositivos de bloco" -#: parted/parted.c:139 +#: parted/parted.c:140 msgid "displays machine parseable output" msgstr "exibe saÃda analisável por máquina" -#: parted/parted.c:140 +#: parted/parted.c:141 #, fuzzy msgid "displays JSON output" msgstr "exibe saÃda analisável por máquina" -#: parted/parted.c:141 +#: parted/parted.c:142 msgid "never prompts for user intervention" msgstr "nunca pede intervenção do usuário" -#: parted/parted.c:142 +#: parted/parted.c:143 msgid "in script mode, fix instead of abort when asked" msgstr "" -#: parted/parted.c:143 +#: parted/parted.c:144 msgid "displays the version" msgstr "mostra a versão" -#: parted/parted.c:144 +#: parted/parted.c:145 msgid "alignment for new partitions" msgstr "alinhamento para novas partições" -#: parted/parted.c:157 +#: parted/parted.c:158 msgid "" "NUMBER is the partition number used by Linux. On MS-DOS disk labels, the " "primary partitions number from 1 to 4, logical partitions from 5 onwards.\n" @@ -2401,31 +2394,31 @@ msgstr "" "NÚMERO é o número da partição usado pelo Linux. Em rótulos de disco MS-DOS, " "as partições primárias são de 1 a 4 e partições lógicas de 5 adiante.\n" -#: parted/parted.c:160 +#: parted/parted.c:161 msgid "LABEL-TYPE is one of: " msgstr "TIPO_RÓTULO é um de:" -#: parted/parted.c:161 parted/parted.c:162 +#: parted/parted.c:162 parted/parted.c:163 msgid "FLAG is one of: " msgstr "OPÇÃO é um de: " -#: parted/parted.c:163 +#: parted/parted.c:164 msgid "UNIT is one of: " msgstr "UNIDADE é um de: " -#: parted/parted.c:164 +#: parted/parted.c:165 msgid "desired alignment: minimum or optimal" msgstr "alinhamento desejado: mÃnimo ou ideal" -#: parted/parted.c:165 +#: parted/parted.c:166 msgid "PART-TYPE is one of: primary, logical, extended\n" msgstr "TIPO-PART é uma: primária, lógica, estendida\n" -#: parted/parted.c:167 +#: parted/parted.c:168 msgid "FS-TYPE is one of: " msgstr "TIPO-FS é um de: " -#: parted/parted.c:168 +#: parted/parted.c:169 msgid "" "START and END are disk locations, such as 4GB or 10%. Negative values count " "from the end of the disk. For example, -1s specifies exactly the last " @@ -2435,7 +2428,7 @@ msgstr "" "negativos contam a partir do final do disco. Por exemplo, -1s especifica " "exatamente o último setor.\n" -#: parted/parted.c:171 +#: parted/parted.c:172 msgid "" "END is disk location, such as 4GB or 10%. Negative value counts from the " "end of the disk. For example, -1s specifies exactly the last sector.\n" @@ -2444,19 +2437,23 @@ msgstr "" "a partir do final do disco. Por exemplo, -1s especifica exatamente o último " "setor.\n" -#: parted/parted.c:174 +#: parted/parted.c:175 msgid "STATE is one of: on, off\n" msgstr "ESTADO é um de: on, off\n" -#: parted/parted.c:175 +#: parted/parted.c:176 msgid "DEVICE is usually /dev/hda or /dev/sda\n" msgstr "DISPOSITIVO é usualmente /dev/hda ou /dev/sda\n" -#: parted/parted.c:176 +#: parted/parted.c:177 msgid "NAME is any word you want\n" msgstr "NOME é qualquer palavra que desejar\n" -#: parted/parted.c:179 +#: parted/parted.c:178 +msgid "TYPE_ID is a value between 0x01 and 0xff, TYPE_UUID is a UUID\n" +msgstr "" + +#: parted/parted.c:182 msgid "" "Copyright (C) 1998 - 2006 Free Software Foundation, Inc.\n" "This program is free software, covered by the GNU General Public License.\n" @@ -2477,22 +2474,22 @@ msgstr "" "mais detalhes.\n" "\n" -#: parted/parted.c:229 +#: parted/parted.c:232 #, c-format msgid "%0.f%%\t(time left %.2d:%.2d)" msgstr "%0.f%%\t(tempo restante %.2d:%.2d)" -#: parted/parted.c:248 +#: parted/parted.c:251 #, c-format msgid "Partition %s is being used. Are you sure you want to continue?" msgstr "A partição %s está em uso. Você tem certeza que deseja continuar?" -#: parted/parted.c:269 +#: parted/parted.c:272 #, c-format msgid "Partition(s) on %s are being used." msgstr "Partição(ões) em %s está(ão) sendo utilizada(s)." -#: parted/parted.c:281 +#: parted/parted.c:284 #, c-format msgid "" "The existing disk label on %s will be destroyed and all data on this disk " @@ -2501,31 +2498,31 @@ msgstr "" "O rótulo de disco existente em %s será destruÃdo e todos os dados neste " "disco serão perdidos. Você deseja continuar?" -#: parted/parted.c:542 +#: parted/parted.c:545 msgid "New disk label type?" msgstr "Novo tipo de rótulo de disco?" -#: parted/parted.c:680 +#: parted/parted.c:692 msgid "Partition type?" msgstr "Tipo da partição?" -#: parted/parted.c:698 parted/parted.c:902 +#: parted/parted.c:710 parted/parted.c:914 msgid "Partition name?" msgstr "Nome da partição?" -#: parted/parted.c:708 +#: parted/parted.c:720 msgid "File system type?" msgstr "Tipo do sistema de arquivos?" -#: parted/parted.c:713 parted/parted.c:1683 +#: parted/parted.c:725 parted/parted.c:1815 msgid "Start?" msgstr "Iniciar?" -#: parted/parted.c:715 parted/parted.c:1685 parted/parted.c:1768 +#: parted/parted.c:727 parted/parted.c:1817 parted/parted.c:1900 msgid "End?" msgstr "Terminar?" -#: parted/parted.c:782 +#: parted/parted.c:794 #, c-format msgid "" "You requested a partition from %s to %s (sectors %llu..%llu).\n" @@ -2535,7 +2532,7 @@ msgstr "" "A localização mais próxima que podemos gerenciar é de %s até %s (setores " "%llu..%llu).%s" -#: parted/parted.c:791 +#: parted/parted.c:803 msgid "" "\n" "Is this still acceptable to you?" @@ -2543,7 +2540,7 @@ msgstr "" "\n" "Isto é ainda aceitável para você?" -#: parted/parted.c:814 +#: parted/parted.c:826 #, c-format msgid "" "The resulting partition is not properly aligned for best performance: %s" @@ -2551,89 +2548,114 @@ msgstr "" "A partição resultante não está propriamente alinhada para melhor " "performance: %s" -#: parted/parted.c:816 parted/parted.c:1925 +#: parted/parted.c:828 parted/parted.c:2057 msgid "unknown (malloc failed)" msgstr "desconhecido (malloc falhou)" -#: parted/parted.c:894 +#: parted/parted.c:906 #, c-format msgid "%s disk labels do not support partition name." msgstr "Rótulos de disco %s não suportam nome de partição." -#: parted/parted.c:899 parted/parted.c:1748 parted/parted.c:1814 -#: parted/parted.c:1908 parted/parted.c:1983 +#: parted/parted.c:911 parted/parted.c:955 parted/parted.c:1880 +#: parted/parted.c:1946 parted/parted.c:2040 parted/parted.c:2115 msgid "Partition number?" msgstr "Número da partição?" -#: parted/parted.c:1050 +#: parted/parted.c:949 +#, fuzzy, c-format +msgid "%s disk labels do not support partition type." +msgstr "Rótulos de disco %s não suportam nome de partição." + +#: parted/parted.c:965 +#, fuzzy +msgid "Partition type-id?" +msgstr "Tipo da partição?" + +#: parted/parted.c:972 +#, fuzzy +msgid "Invalid type-id." +msgstr "Número inválido." + +#: parted/parted.c:986 +#, fuzzy +msgid "Partition type-uuid?" +msgstr "Tipo da partição?" + +#: parted/parted.c:993 +#, fuzzy +msgid "Invalid type-uuid." +msgstr "Número inválido." + +#: parted/parted.c:1146 #, c-format msgid "BIOS cylinder,head,sector geometry: %d,%d,%d. Each cylinder is %s.\n" msgstr "" "cilindro pela BIOS,cabeça,geometria do setor: %d,%d,%d. Cada cilindro é " "%s.\n" -#: parted/parted.c:1137 +#: parted/parted.c:1240 #, c-format msgid "Model: %s (%s)\n" msgstr "Modelo: %s (%s)\n" -#: parted/parted.c:1139 +#: parted/parted.c:1242 #, c-format msgid "Disk %s: %s\n" msgstr "Disco %s: %s\n" -#: parted/parted.c:1140 +#: parted/parted.c:1243 #, c-format msgid "Sector size (logical/physical): %lldB/%lldB\n" msgstr "Tamanho do setor (lógico/fÃsico): %lldB/%lldB\n" -#: parted/parted.c:1152 +#: parted/parted.c:1255 #, c-format msgid "Partition Table: %s\n" msgstr "Tabela de partições: %s\n" -#: parted/parted.c:1153 +#: parted/parted.c:1256 #, c-format msgid "Disk Flags: %s\n" msgstr "Opções de disco: %s\n" -#: parted/parted.c:1279 parted/parted.c:1282 +#: parted/parted.c:1388 parted/parted.c:1391 msgid "Number" msgstr "Número" -#: parted/parted.c:1279 parted/parted.c:1282 +#: parted/parted.c:1388 parted/parted.c:1391 msgid "Start" msgstr "InÃcio" -#: parted/parted.c:1280 parted/parted.c:1283 +#: parted/parted.c:1389 parted/parted.c:1392 msgid "End" msgstr "Fim" -#: parted/parted.c:1283 +#: parted/parted.c:1392 msgid "Size" msgstr "Tamanho" -#: parted/parted.c:1287 +#: parted/parted.c:1396 msgid "Type" msgstr "Tipo" -#: parted/parted.c:1289 +#: parted/parted.c:1398 msgid "File system" msgstr "Sistema de arquivos" -#: parted/parted.c:1292 +#: parted/parted.c:1401 msgid "Name" msgstr "Nome" -#: parted/parted.c:1294 +#: parted/parted.c:1403 msgid "Flags" msgstr "Opções" -#: parted/parted.c:1352 +#: parted/parted.c:1461 msgid "Free Space" msgstr "Espaço livre" -#: parted/parted.c:1570 +#: parted/parted.c:1702 #, c-format msgid "" "A %s %s partition was found at %s -> %s. Do you want to add it to the " @@ -2642,56 +2664,56 @@ msgstr "" "Uma partição %s %s foi encontrada em %s -> %s. Você deseja adicioná-la a " "tabela de partições?" -#: parted/parted.c:1613 +#: parted/parted.c:1745 msgid "searching for file systems" msgstr "pesquisando por sistemas de arquivo" -#: parted/parted.c:1720 +#: parted/parted.c:1852 msgid "The resize command has been removed in parted 3.0" msgstr "O comando resize foi removido no parted 3.0" -#: parted/parted.c:1782 +#: parted/parted.c:1914 msgid "" "Shrinking a partition can cause data loss, are you sure you want to continue?" msgstr "" "Reduzir uma partição pode causar perda de dados, você tem certeza que deseja " "continuar?" -#: parted/parted.c:1838 +#: parted/parted.c:1970 msgid "New device?" msgstr "Novo dispositivo?" -#: parted/parted.c:1906 +#: parted/parted.c:2038 msgid "alignment type(min/opt)" msgstr "tipo de alinhamento(min/opt)" -#: parted/parted.c:1921 +#: parted/parted.c:2053 #, c-format msgid "%d aligned\n" msgstr "%d alinhado(s)\n" -#: parted/parted.c:1923 +#: parted/parted.c:2055 #, c-format msgid "%d not aligned: %s\n" msgstr "%d não alinhado: %s\n" -#: parted/parted.c:1948 parted/parted.c:1985 +#: parted/parted.c:2080 parted/parted.c:2117 msgid "Flag to Invert?" msgstr "Opção para inverter?" -#: parted/parted.c:1953 parted/parted.c:1990 +#: parted/parted.c:2085 parted/parted.c:2122 msgid "New state?" msgstr "Novo estado?" -#: parted/parted.c:2036 +#: parted/parted.c:2168 msgid "Unit?" msgstr "Unidade?" -#: parted/parted.c:2171 +#: parted/parted.c:2303 msgid "align-check" msgstr "align-check" -#: parted/parted.c:2174 +#: parted/parted.c:2306 msgid "" "align-check TYPE N check partition N for TYPE(min|opt) " "alignment" @@ -2699,11 +2721,11 @@ msgstr "" "align-check TIPO N verifica a partição N para " "alinhamento de TIPO(mÃnimo|ideal)" -#: parted/parted.c:2182 +#: parted/parted.c:2314 msgid "help" msgstr "help" -#: parted/parted.c:2185 +#: parted/parted.c:2317 msgid "" "help [COMMAND] print general help, or help on " "COMMAND" @@ -2711,15 +2733,15 @@ msgstr "" "help [COMANDO] exibe a ajuda geral, ou ajuda para " "o COMANDO" -#: parted/parted.c:2191 +#: parted/parted.c:2323 msgid "mklabel" msgstr "mklabel" -#: parted/parted.c:2191 +#: parted/parted.c:2323 msgid "mktable" msgstr "mktable" -#: parted/parted.c:2194 +#: parted/parted.c:2326 msgid "" "mklabel,mktable LABEL-TYPE create a new disklabel (partition " "table)" @@ -2727,15 +2749,15 @@ msgstr "" "mklabel,mktable TIPO-RÓTULO cria um novo rótulo de disco (na " "tabela de partição)" -#: parted/parted.c:2200 +#: parted/parted.c:2332 msgid "mkpart" msgstr "mkpart" -#: parted/parted.c:2203 +#: parted/parted.c:2335 msgid "mkpart PART-TYPE [FS-TYPE] START END make a partition" msgstr "mkpart TIPO-PART [TIPO-FS] INÃCIO FIM cria uma partição" -#: parted/parted.c:2209 +#: parted/parted.c:2341 msgid "" "'mkpart' makes a partition without creating a new file system on the " "partition. FS-TYPE may be specified to set an appropriate partition ID.\n" @@ -2745,20 +2767,20 @@ msgstr "" "partição estendida). Este comando é útil se você apagou acidentalmente uma " "partição.\n" -#: parted/parted.c:2214 +#: parted/parted.c:2346 msgid "name" msgstr "name" -#: parted/parted.c:2217 +#: parted/parted.c:2349 msgid "name NUMBER NAME name partition NUMBER as NAME" msgstr "" "name NÚMERO NOME renomeia a partição NÚMERO para NOME" -#: parted/parted.c:2222 +#: parted/parted.c:2354 msgid "print" msgstr "print" -#: parted/parted.c:2225 +#: parted/parted.c:2357 #, fuzzy msgid "" "print [devices|free|list,all] display the partition table, or " @@ -2768,7 +2790,7 @@ msgstr "" "dispositivos disponÃveis, espaço livre, todas as partições encontradas ou " "uma partição especÃfica" -#: parted/parted.c:2229 +#: parted/parted.c:2361 msgid "" "Without arguments, 'print' displays the entire partition table. However with " "the following arguments it performs various other actions.\n" @@ -2776,11 +2798,11 @@ msgstr "" "Sem argumentos, \"print\" exibe a tabela de partições inteira. Entretanto, " "com os argumentos a seguir, ele executa várias outras ações.\n" -#: parted/parted.c:2231 +#: parted/parted.c:2363 msgid " devices : display all active block devices\n" msgstr " devices : exibe todos os dispositivos de bloco ativos\n" -#: parted/parted.c:2232 +#: parted/parted.c:2364 msgid "" " free : display information about free unpartitioned space on the " "current block device\n" @@ -2788,26 +2810,26 @@ msgstr "" " free : exibe informações sobre espaço livre não particionado no " "dispositivo de bloco atual\n" -#: parted/parted.c:2234 +#: parted/parted.c:2366 msgid "" " list, all : display the partition tables of all active block devices\n" msgstr "" " list, all : exibe as tabelas de partições de todos os dispositivos de " "bloco ativos\n" -#: parted/parted.c:2238 +#: parted/parted.c:2370 msgid "quit" msgstr "quit" -#: parted/parted.c:2241 +#: parted/parted.c:2373 msgid "quit exit program" msgstr "quit sai do programa" -#: parted/parted.c:2246 +#: parted/parted.c:2378 msgid "rescue" msgstr "rescue" -#: parted/parted.c:2249 +#: parted/parted.c:2381 msgid "" "rescue START END rescue a lost partition near START " "and END" @@ -2815,56 +2837,56 @@ msgstr "" "rescue INÃCIO FIM recupera uma partição perdida " "próxima do INÃCIO e FIM" -#: parted/parted.c:2255 +#: parted/parted.c:2387 msgid "resize" msgstr "resize" -#: parted/parted.c:2258 +#: parted/parted.c:2390 msgid "The resize command was removed in parted 3.0\n" msgstr "O comando resize foi removido no parted 3.0\n" -#: parted/parted.c:2261 +#: parted/parted.c:2393 msgid "resizepart" msgstr "resizepart" -#: parted/parted.c:2264 +#: parted/parted.c:2396 msgid "resizepart NUMBER END resize partition NUMBER" msgstr "" "resizepart NÚMERO FIM redimensiona a partição NÚMERO" -#: parted/parted.c:2269 +#: parted/parted.c:2401 msgid "rm" msgstr "rm" -#: parted/parted.c:2272 +#: parted/parted.c:2404 msgid "rm NUMBER delete partition NUMBER" msgstr "rm NÚMERO apaga a partição NÚMERO" -#: parted/parted.c:2277 +#: parted/parted.c:2409 msgid "select" msgstr "select" -#: parted/parted.c:2280 +#: parted/parted.c:2412 msgid "select DEVICE choose the device to edit" msgstr "" "select DISPOSITIVO escolhe o dispositivo para editar" -#: parted/parted.c:2285 +#: parted/parted.c:2417 msgid "disk_set" msgstr "disk_set" -#: parted/parted.c:2288 +#: parted/parted.c:2420 msgid "" "disk_set FLAG STATE change the FLAG on selected device" msgstr "" "disk_set OPÇÃO ESTADO muda o estado de OPÇÃO no " "dispositivo selecionado" -#: parted/parted.c:2293 +#: parted/parted.c:2425 msgid "disk_toggle" msgstr "disk_toggle" -#: parted/parted.c:2296 +#: parted/parted.c:2428 msgid "" "disk_toggle [FLAG] toggle the state of FLAG on " "selected device" @@ -2872,21 +2894,21 @@ msgstr "" "disk_toggle [OPÇÃO] alterna o estado de OPÇÃO no " "dispositivo selecionado" -#: parted/parted.c:2302 +#: parted/parted.c:2434 msgid "set" msgstr "set" -#: parted/parted.c:2305 +#: parted/parted.c:2437 msgid "" "set NUMBER FLAG STATE change the FLAG on partition NUMBER" msgstr "" "set NÚMERO OPÇÃO ESTADO muda a OPÇÃO na partição NÚMERO" -#: parted/parted.c:2311 +#: parted/parted.c:2443 msgid "toggle" msgstr "toggle" -#: parted/parted.c:2314 +#: parted/parted.c:2446 msgid "" "toggle [NUMBER [FLAG]] toggle the state of FLAG on " "partition NUMBER" @@ -2894,20 +2916,30 @@ msgstr "" "toggle [NÚMERO [OPÇÃO]] alterna o estado de OPÇÃO no NÚMERO " "da partição" -#: parted/parted.c:2320 +#: parted/parted.c:2452 +msgid "type" +msgstr "" + +#: parted/parted.c:2455 +msgid "" +"type NUMBER TYPE-ID or TYPE-UUID type set TYPE-ID or TYPE-UUID of " +"partition NUMBER" +msgstr "" + +#: parted/parted.c:2460 msgid "unit" msgstr "unit" -#: parted/parted.c:2323 +#: parted/parted.c:2463 msgid "unit UNIT set the default unit to UNIT" msgstr "" "unit UNIDADE define como unidade padrão UNIDADE" -#: parted/parted.c:2328 +#: parted/parted.c:2468 msgid "version" msgstr "version" -#: parted/parted.c:2331 +#: parted/parted.c:2471 msgid "" "version display the version number and " "copyright information of GNU Parted" @@ -2915,7 +2947,7 @@ msgstr "" "version exibe o número da versão e " "informações de direitos autorais do GNU Parted" -#: parted/parted.c:2335 +#: parted/parted.c:2475 msgid "" "'version' displays copyright and version information corresponding to this " "copy of GNU Parted\n" @@ -2923,21 +2955,21 @@ msgstr "" "'version' exibe informações de versão e direitos autorais correspondentes a " "esta cópia do GNU Parted\n" -#: parted/parted.c:2405 +#: parted/parted.c:2545 #, fuzzy, c-format msgid "Usage: %s [-hlmsfv] [-a<align>] [DEVICE [COMMAND [PARAMETERS]]...]\n" msgstr "" "Uso: %s [-hlmsv] [-a<alinhamento>] [DISPOSITIVO [COMANDO [PARÂMETROS]]...]\n" -#: parted/parted.c:2449 +#: parted/parted.c:2589 msgid "No device found" msgstr "Nenhum dispositivo encontrado" -#: parted/parted.c:2486 +#: parted/parted.c:2626 msgid "WARNING: You are not superuser. Watch out for permissions.\n" msgstr "ATENÇÃO: Você não é super usuário. Tome cuidado com permissões.\n" -#: parted/parted.c:2519 +#: parted/parted.c:2659 msgid "" "You should reinstall your boot loader before rebooting. Read section 4 of " "the Parted User documentation for more information." @@ -2945,7 +2977,7 @@ msgstr "" "Você deve reinstalar seu carregador de inicialização antes de reinicializar. " "Leia a seção 4 da documentação do usuário do Parted para mais informações." -#: parted/parted.c:2526 +#: parted/parted.c:2666 msgid "You may need to update /etc/fstab.\n" msgstr "Você pode precisar atualizar /etc/fstab.\n" @@ -3204,69 +3236,69 @@ msgstr "" "\n" "Erro: Um sinal geral SIGILL foi encontrado." -#: parted/ui.c:901 +#: parted/ui.c:904 #, c-format msgid "invalid token: %s" msgstr "token inválido: %s" -#: parted/ui.c:1082 +#: parted/ui.c:1085 msgid "Expecting a partition number." msgstr "Espera-se um número de partição." -#: parted/ui.c:1091 +#: parted/ui.c:1094 msgid "Partition doesn't exist." msgstr "A partição não existe." -#: parted/ui.c:1111 +#: parted/ui.c:1114 msgid "Expecting a file system type." msgstr "Espera-se um tipo de sistema de arquivos." -#: parted/ui.c:1118 +#: parted/ui.c:1121 #, c-format msgid "Unknown file system type \"%s\"." msgstr "Tipo de sistema de arquivos \"%s\" desconhecido." -#: parted/ui.c:1139 +#: parted/ui.c:1142 msgid "Expecting a disk label type." msgstr "Espera-se um tipo de rótulo de disco." -#: parted/ui.c:1170 parted/ui.c:1206 +#: parted/ui.c:1173 parted/ui.c:1209 msgid "No flags supported" msgstr "Nenhuma opção suportada" -#: parted/ui.c:1280 +#: parted/ui.c:1283 msgid "Can't create any more partitions." msgstr "Não é possÃvel criar mais nenhuma partição." -#: parted/ui.c:1290 +#: parted/ui.c:1293 msgid "Expecting a partition type." msgstr "Espera-se um tipo de partição." -#: parted/ui.c:1439 +#: parted/ui.c:1442 msgid "on" msgstr "ligado" -#: parted/ui.c:1440 +#: parted/ui.c:1443 msgid "off" msgstr "desligado" -#: parted/ui.c:1457 +#: parted/ui.c:1460 msgid "optimal" msgstr "ideal" -#: parted/ui.c:1458 +#: parted/ui.c:1461 msgid "minimal" msgstr "mÃnimo" -#: parted/ui.c:1591 +#: parted/ui.c:1594 msgid "OPTIONs:" msgstr "OPÇÕEs:" -#: parted/ui.c:1596 +#: parted/ui.c:1599 msgid "COMMANDs:" msgstr "COMANDOs:" -#: parted/ui.c:1599 +#: parted/ui.c:1602 #, c-format msgid "" "\n" @@ -3275,15 +3307,25 @@ msgstr "" "\n" "Informe erros para %s\n" -#: parted/ui.c:1606 +#: parted/ui.c:1609 #, c-format msgid "Using %s\n" msgstr "Usando %s\n" -#: parted/ui.c:1686 +#: parted/ui.c:1689 msgid "This command does not make sense in non-interactive mode.\n" msgstr "Este comando não faz sentido em modo não interativo.\n" +#~ msgid "Extended partitions cannot be hidden on msdos disk labels." +#~ msgstr "" +#~ "Partições estendidas não podem ser escondidas em rótulos de disco msdos." + +#~ msgid "" +#~ "Extended partitions cannot be recovery partitions on msdos disk labels." +#~ msgstr "" +#~ "Partições estendidas não podem ser partições recuperadas em rótulos de " +#~ "disco msdos." + #~ msgid "" #~ " NUMBER : display more detailed information about this particular " #~ "partition\n" Binary files differ@@ -18,7 +18,7 @@ msgid "" msgstr "" "Project-Id-Version: parted 3.4.64.2\n" "Report-Msgid-Bugs-To: bug-parted@gnu.org\n" -"POT-Creation-Date: 2022-04-18 14:44-0400\n" +"POT-Creation-Date: 2023-04-10 15:50-0700\n" "PO-Revision-Date: 2022-04-07 01:11+0200\n" "Last-Translator: Remus-Gabriel Chelu <remusgabriel.chelu@disroot.org>\n" "Language-Team: Romanian <translation-team-ro@lists.sourceforge.net>\n" @@ -31,25 +31,25 @@ msgstr "" "X-Bugs: Report translation errors to the Language-Team address.\n" "X-Generator: Poedit 3.0.1\n" -#: lib/argmatch.c:147 +#: lib/argmatch.c:145 #, c-format msgid "invalid argument %s for %s" msgstr "argument nevalid %s pentru %s" -#: lib/argmatch.c:148 +#: lib/argmatch.c:146 #, c-format msgid "ambiguous argument %s for %s" msgstr "argument ambiguu %s pentru %s" -#: lib/argmatch.c:167 lib/argmatch.h:238 +#: lib/argmatch.c:165 lib/argmatch.h:237 msgid "Valid arguments are:" msgstr "Argumentele valide sunt:" -#: lib/closeout.c:122 libparted/labels/fdasd.c:145 +#: lib/closeout.c:121 libparted/labels/fdasd.c:145 msgid "write error" msgstr "eroare de scriere" -#: lib/error.c:195 +#: lib/error.c:193 msgid "Unknown system error" msgstr "Eroare de sistem necunoscută" @@ -109,11 +109,11 @@ msgstr "%s: opÈ›iunea necesită un argument -- „%câ€\n" #. If you don't know what to put here, please see #. <https://en.wikipedia.org/wiki/Quotation_marks_in_other_languages> #. and use glyphs suitable for your language. -#: lib/quotearg.c:355 +#: lib/quotearg.c:354 msgid "`" msgstr "„" -#: lib/quotearg.c:356 +#: lib/quotearg.c:355 msgid "'" msgstr "â€" @@ -208,7 +208,7 @@ msgstr "Nici o expresie regulată anterioară" #. To enquire the regular expression that your system uses for this #. purpose, you can use the command #. locale -k LC_MESSAGES | grep '^yesexpr=' -#: lib/rpmatch.c:150 +#: lib/rpmatch.c:149 msgid "^[yY]" msgstr "^[dDyY]" @@ -218,7 +218,7 @@ msgstr "^[dDyY]" #. To enquire the regular expression that your system uses for this #. purpose, you can use the command #. locale -k LC_MESSAGES | grep '^noexpr=' -#: lib/rpmatch.c:163 +#: lib/rpmatch.c:162 msgid "^[nN]" msgstr "^[nN]" @@ -837,21 +837,21 @@ msgstr "pmbr_boot" msgid "Unknown disk flag, %d." msgstr "Fanion de disc necunoscut, %d." -#: libparted/disk.c:1289 +#: libparted/disk.c:1320 #, c-format msgid "%s disk labels do not support extended partitions." msgstr "Etichetele discurilor %s nu acceptă partiÈ›ii extinse." -#: libparted/disk.c:1821 +#: libparted/disk.c:1990 #, c-format msgid "%s disk labels don't support logical or extended partitions." msgstr "Etichetele discurilor %s nu suportă partiÈ›ii logice sau extinse." -#: libparted/disk.c:1834 +#: libparted/disk.c:2003 msgid "Too many primary partitions." msgstr "Prea multe partiÈ›ii primare." -#: libparted/disk.c:1843 +#: libparted/disk.c:2012 #, c-format msgid "" "Can't add a logical partition to %s, because there is no extended partition." @@ -859,137 +859,141 @@ msgstr "" "Nu se poate adăuga o partiÈ›ie logică lui %s pentru că aceasta nu este o " "partiÈ›ie extinsă." -#: libparted/disk.c:1867 +#: libparted/disk.c:2036 #, c-format msgid "Can't have more than one extended partition on %s." msgstr "Nu puteÈ›i avea mai mult de o partiÈ›ie extinsă pe %s." -#: libparted/disk.c:1877 +#: libparted/disk.c:2046 msgid "Can't have logical partitions outside of the extended partition." msgstr "Nu puteÈ›i avea partiÈ›ii logice în afara partiÈ›iei extinse." -#: libparted/disk.c:1902 +#: libparted/disk.c:2071 #, c-format msgid "Can't have a logical partition outside of the extended partition on %s." msgstr "Nu puteÈ›i avea o partiÈ›ie logică în afara partiÈ›iei extinse pe %s." -#: libparted/disk.c:1912 +#: libparted/disk.c:2081 msgid "Can't have a primary partition inside an extended partition." msgstr "Nu puteÈ›i avea o partiÈ›ie primară într-o partiÈ›ie extinsă." -#: libparted/disk.c:1921 +#: libparted/disk.c:2090 msgid "Can't have a partition outside the disk!" msgstr "Nu se poate avea o partiÈ›ie în afara discului!" -#: libparted/disk.c:1972 libparted/disk.c:2150 +#: libparted/disk.c:2141 libparted/disk.c:2319 msgid "Can't have overlapping partitions." msgstr "Nu puteÈ›i avea partiÈ›ii care se suprapun." -#: libparted/disk.c:2351 +#: libparted/disk.c:2520 msgid "metadata" msgstr "metadata" -#: libparted/disk.c:2353 +#: libparted/disk.c:2522 msgid "free" msgstr "liber" -#: libparted/disk.c:2355 parted/ui.c:1271 parted/ui.c:1299 +#: libparted/disk.c:2524 parted/ui.c:1274 parted/ui.c:1302 msgid "extended" msgstr "extinsă" -#: libparted/disk.c:2357 parted/ui.c:1275 parted/ui.c:1303 +#: libparted/disk.c:2526 parted/ui.c:1278 parted/ui.c:1306 msgid "logical" msgstr "logică" -#: libparted/disk.c:2359 parted/ui.c:1267 parted/ui.c:1295 +#: libparted/disk.c:2528 parted/ui.c:1270 parted/ui.c:1298 msgid "primary" msgstr "primară" -#: libparted/disk.c:2375 +#: libparted/disk.c:2544 msgid "boot" msgstr "de pornire" -#: libparted/disk.c:2377 +#: libparted/disk.c:2546 msgid "bios_grub" msgstr "bios_grub" -#: libparted/disk.c:2379 +#: libparted/disk.c:2548 msgid "root" msgstr "rădăcină" -#: libparted/disk.c:2381 +#: libparted/disk.c:2550 msgid "swap" msgstr "swap" -#: libparted/disk.c:2383 +#: libparted/disk.c:2552 msgid "hidden" msgstr "ascunsă" -#: libparted/disk.c:2385 +#: libparted/disk.c:2554 msgid "raid" msgstr "raid" -#: libparted/disk.c:2387 +#: libparted/disk.c:2556 msgid "lvm" msgstr "lvm" -#: libparted/disk.c:2389 +#: libparted/disk.c:2558 msgid "lba" msgstr "lba" -#: libparted/disk.c:2391 +#: libparted/disk.c:2560 msgid "hp-service" msgstr "hp-service" -#: libparted/disk.c:2393 +#: libparted/disk.c:2562 msgid "palo" msgstr "palo" -#: libparted/disk.c:2395 +#: libparted/disk.c:2564 msgid "prep" msgstr "prep" -#: libparted/disk.c:2397 +#: libparted/disk.c:2566 msgid "msftres" msgstr "msftres" -#: libparted/disk.c:2399 +#: libparted/disk.c:2568 msgid "msftdata" msgstr "msftdata" -#: libparted/disk.c:2401 +#: libparted/disk.c:2570 msgid "atvrecv" msgstr "atvrecv" -#: libparted/disk.c:2403 +#: libparted/disk.c:2572 msgid "diag" msgstr "diag" -#: libparted/disk.c:2405 +#: libparted/disk.c:2574 msgid "legacy_boot" msgstr "legacy_boot" -#: libparted/disk.c:2407 +#: libparted/disk.c:2576 msgid "irst" msgstr "irst" -#: libparted/disk.c:2409 +#: libparted/disk.c:2578 msgid "esp" msgstr "esp" -#: libparted/disk.c:2411 +#: libparted/disk.c:2580 msgid "chromeos_kernel" msgstr "chromeos_kernel" -#: libparted/disk.c:2413 +#: libparted/disk.c:2582 msgid "bls_boot" msgstr "bls_boot" -#: libparted/disk.c:2415 +#: libparted/disk.c:2584 msgid "linux-home" msgstr "linux-home" -#: libparted/disk.c:2421 +#: libparted/disk.c:2586 +msgid "no_automount" +msgstr "" + +#: libparted/disk.c:2592 #, c-format msgid "Unknown partition flag, %d." msgstr "Fanion de partiÈ›ie necunoscut, %d." @@ -1204,8 +1208,8 @@ msgstr "" "partiÈ›ii primare, dacă XGM este prima, aceasta contează pentru două)." #: libparted/labels/atari.c:1662 libparted/labels/bsd.c:563 -#: libparted/labels/dasd.c:895 libparted/labels/dos.c:2303 -#: libparted/labels/dvh.c:770 libparted/labels/gpt.c:1769 +#: libparted/labels/dasd.c:893 libparted/labels/dos.c:2294 +#: libparted/labels/dvh.c:770 libparted/labels/gpt.c:1891 #: libparted/labels/loop.c:244 libparted/labels/mac.c:1409 #: libparted/labels/pc98.c:697 libparted/labels/rdb.c:1054 #: libparted/labels/sun.c:781 @@ -1230,41 +1234,31 @@ msgstr "Nu se poate aloca un număr de partiÈ›ie." msgid "Unable to allocate a bsd disklabel slot." msgstr "Nu se poate aloca un slot pentru etichetă de disc bsd." -#: libparted/labels/dasd.c:626 +#: libparted/labels/dasd.c:634 msgid "The partition table of DASD-LDL device cannot be changed.\n" msgstr "" "Tabelul de partiÈ›ii al dispozitivului DASD-LDL nu poate fi modificat.\n" -#: libparted/labels/dasd.c:921 +#: libparted/labels/dasd.c:919 msgid "Unable to allocate a dasd disklabel slot" msgstr "Nu se poate aloca un slot pentru etichetă de disc dasd" -#: libparted/labels/dos.c:1008 +#: libparted/labels/dos.c:1159 #, c-format msgid "Invalid partition table on %s -- wrong signature %x." msgstr "Tabel de partiÈ›ii nevalid pe %s -- semnătură greÈ™ită %x." -#: libparted/labels/dos.c:1036 +#: libparted/labels/dos.c:1187 #, c-format msgid "Invalid partition table - recursive partition on %s." msgstr "Tabel de partiÈ›ii nevalid - partiÈ›ie recursivă pe %s." -#: libparted/labels/dos.c:1567 -msgid "Extended partitions cannot be hidden on msdos disk labels." -msgstr "PartiÈ›iile extinse nu pot fi ascunse pe etichetele discurilor msdos." - -#: libparted/labels/dos.c:1579 -msgid "Extended partitions cannot be recovery partitions on msdos disk labels." -msgstr "" -"PartiÈ›iile extinse nu pot fi partiÈ›ii de recuperare pe etichetele de disc " -"msdos." - -#: libparted/labels/dos.c:2285 +#: libparted/labels/dos.c:2276 msgid "Parted can't resize partitions managed by Windows Dynamic Disk." msgstr "" "Parted nu poate redimensiona partiÈ›iile gestionate de Windows Dynamic Disk." -#: libparted/labels/dos.c:2541 +#: libparted/labels/dos.c:2532 msgid "cannot create any more partitions" msgstr "nu se mai poate crea nici o partiÈ›ie în plus" @@ -1408,11 +1402,11 @@ msgstr "Nu s-au putut obÈ›ine informaÈ›ii despre dimensiunea blocului." msgid "Disk geometry does not match a DASD device of type 3390." msgstr "Geometria discului nu corespunde unui dispozitiv DASD de tip 3390." -#: libparted/labels/gpt.c:569 +#: libparted/labels/gpt.c:589 msgid "device is too small for GPT" msgstr "dispozitivul este prea mic pentru GPT" -#: libparted/labels/gpt.c:771 +#: libparted/labels/gpt.c:791 #, c-format msgid "" "The format of the GPT partition table is version %x, which is newer than " @@ -1421,7 +1415,7 @@ msgstr "" "Formatul tabelului de partiÈ›ii GPT este versiunea %x, care este mai nouă " "decât ceea ce Parted poate recunoaÈ™te. Vă rugăm să raportaÈ›i acest lucru!" -#: libparted/labels/gpt.c:807 +#: libparted/labels/gpt.c:827 #, c-format msgid "" "Not all of the space available to %s appears to be used, you can fix the GPT " @@ -1432,7 +1426,7 @@ msgstr "" "ul pentru a utiliza tot spaÈ›iul (%llu blocuri suplimentare) sau, puteÈ›i " "continua cu setarea curentă! Ce decideÈ›i? " -#: libparted/labels/gpt.c:1006 +#: libparted/labels/gpt.c:1026 msgid "" "The backup GPT table is not at the end of the disk, as it should be. Fix, " "by moving the backup to the end (and removing the old backup)?" @@ -1441,7 +1435,7 @@ msgstr "" "să fie. RemediaÈ›i, prin mutarea copiei de rezervă la sfârÈ™itul discului (È™i " "eliminând copia de rezervă veche)?" -#: libparted/labels/gpt.c:1024 +#: libparted/labels/gpt.c:1044 msgid "" "Both the primary and backup GPT tables are corrupt. Try making a fresh " "table, and using Parted's rescue feature to recover partitions." @@ -1450,7 +1444,7 @@ msgstr "" "faceÈ›i un tabel nou È™i să utilizaÈ›i caracteristica de salvare a lui Parted " "pentru a recupera partiÈ›iile." -#: libparted/labels/gpt.c:1035 +#: libparted/labels/gpt.c:1055 msgid "" "The backup GPT table is corrupt, but the primary appears OK, so that will be " "used." @@ -1458,7 +1452,7 @@ msgstr "" "Tabelul GPT de rezervă este corupt, dar principalul pare să fie corect, aÈ™a " "că va fi folosit." -#: libparted/labels/gpt.c:1047 +#: libparted/labels/gpt.c:1067 msgid "" "The primary GPT table is corrupt, but the backup appears OK, so that will be " "used." @@ -1466,11 +1460,11 @@ msgstr "" "Tabelul GPT principal este corupt, dar copia de rezervă pare să fie corectă, " "aÈ™a că va fi folosit acesta." -#: libparted/labels/gpt.c:1071 +#: libparted/labels/gpt.c:1091 msgid "primary partition table array CRC mismatch" msgstr "nepotrivire CRC a matricei de tabel de partiÈ›ii primare" -#: libparted/labels/gpt.c:1655 libparted/labels/gpt.c:1682 +#: libparted/labels/gpt.c:1722 libparted/labels/gpt.c:1749 msgid "failed to translate partition name" msgstr "nu s-a putut traduce numele partiÈ›iei" @@ -2205,7 +2199,7 @@ msgstr "fat_table_alloc_cluster: nu există clustere libere" msgid "Could not detect file system." msgstr "Nu s-a putut detecta sistemul de fiÈ™iere." -#: libparted/fs/r/filesys.c:159 libparted/fs/r/filesys.c:284 +#: libparted/fs/r/filesys.c:159 libparted/fs/r/filesys.c:285 #, c-format msgid "resizing %s file systems is not supported" msgstr "redimensionarea sistemelor de fiÈ™iere %s nu este suportată" @@ -2536,39 +2530,39 @@ msgstr "" "Acest volum HFS+ nu are un fiÈ™ier „extents overflowâ€. Acest lucru este " "destul de neobiÈ™nuit!" -#: parted/parted.c:137 +#: parted/parted.c:138 msgid "displays this help message" msgstr "afiÈ™ează acest mesaj de ajutor" -#: parted/parted.c:138 +#: parted/parted.c:139 msgid "lists partition layout on all block devices" msgstr "enumeră etichetele partiÈ›iilor de pe toate dispozitivele bloc" -#: parted/parted.c:139 +#: parted/parted.c:140 msgid "displays machine parseable output" msgstr "afiÈ™ează ieÈ™irea analizabilă a maÈ™inii" -#: parted/parted.c:140 +#: parted/parted.c:141 msgid "displays JSON output" msgstr "afiÈ™ează ieÈ™irea JSON" -#: parted/parted.c:141 +#: parted/parted.c:142 msgid "never prompts for user intervention" msgstr "nu solicită niciodată intervenÈ›ia utilizatorului" -#: parted/parted.c:142 +#: parted/parted.c:143 msgid "in script mode, fix instead of abort when asked" msgstr "în modul script, remediaÈ›i în loc să anulaÈ›i atunci când vi se cere" -#: parted/parted.c:143 +#: parted/parted.c:144 msgid "displays the version" msgstr "afiÈ™ează versiunea" -#: parted/parted.c:144 +#: parted/parted.c:145 msgid "alignment for new partitions" msgstr "aliniere pentru partiÈ›ii noi" -#: parted/parted.c:157 +#: parted/parted.c:158 msgid "" "NUMBER is the partition number used by Linux. On MS-DOS disk labels, the " "primary partitions number from 1 to 4, logical partitions from 5 onwards.\n" @@ -2577,19 +2571,19 @@ msgstr "" "DOS, partiÈ›iile primare sunt numărate de la 1 la 4, partiÈ›iile logice de la " "5 încolo.\n" -#: parted/parted.c:160 +#: parted/parted.c:161 msgid "LABEL-TYPE is one of: " msgstr "TIP-ETICHETÄ‚ este unul dintre: " -#: parted/parted.c:161 parted/parted.c:162 +#: parted/parted.c:162 parted/parted.c:163 msgid "FLAG is one of: " msgstr "FANION este unul dintre: " -#: parted/parted.c:163 +#: parted/parted.c:164 msgid "UNIT is one of: " msgstr "UNITATEA este una dintre: " -#: parted/parted.c:164 +#: parted/parted.c:165 msgid "desired alignment: minimum or optimal" msgstr "alinierea dorită: minimă sau optimă" @@ -2602,15 +2596,15 @@ msgstr "alinierea dorită: minimă sau optimă" # partiÈ›ie extinsă†# *** # Opinii /Idei? -#: parted/parted.c:165 +#: parted/parted.c:166 msgid "PART-TYPE is one of: primary, logical, extended\n" msgstr "TIP-PARTIÈšIE este una dintre: primară, logică, extinsă\n" -#: parted/parted.c:167 +#: parted/parted.c:168 msgid "FS-TYPE is one of: " msgstr "TIP-SF este unul dintre: " -#: parted/parted.c:168 +#: parted/parted.c:169 msgid "" "START and END are disk locations, such as 4GB or 10%. Negative values count " "from the end of the disk. For example, -1s specifies exactly the last " @@ -2620,7 +2614,7 @@ msgstr "" "negative sunt calculate de la sfârÈ™itul discului. De exemplu, -1s specifică " "exact ultimul sector.\n" -#: parted/parted.c:171 +#: parted/parted.c:172 msgid "" "END is disk location, such as 4GB or 10%. Negative value counts from the " "end of the disk. For example, -1s specifies exactly the last sector.\n" @@ -2629,19 +2623,23 @@ msgstr "" "calculează de la sfârÈ™itul discului. De exemplu, -1s specifică exact ultimul " "sector.\n" -#: parted/parted.c:174 +#: parted/parted.c:175 msgid "STATE is one of: on, off\n" msgstr "STARE este una dintre: on, off\n" -#: parted/parted.c:175 +#: parted/parted.c:176 msgid "DEVICE is usually /dev/hda or /dev/sda\n" msgstr "DISPOZITIV este de obicei /dev/hda or /dev/sda\n" -#: parted/parted.c:176 +#: parted/parted.c:177 msgid "NAME is any word you want\n" msgstr "NUME este orice cuvânt pe care îl doriÈ›i\n" -#: parted/parted.c:179 +#: parted/parted.c:178 +msgid "TYPE_ID is a value between 0x01 and 0xff, TYPE_UUID is a UUID\n" +msgstr "" + +#: parted/parted.c:182 msgid "" "Copyright (C) 1998 - 2006 Free Software Foundation, Inc.\n" "This program is free software, covered by the GNU General Public License.\n" @@ -2661,22 +2659,22 @@ msgstr "" "PENTRU UN SCOP ANUME. VedeÈ›i LicenÈ›a Publică Generală GNU (GNU GPL)\n" "pentru detalii suplimentare.\n" -#: parted/parted.c:229 +#: parted/parted.c:232 #, c-format msgid "%0.f%%\t(time left %.2d:%.2d)" msgstr "%0.f%% (timpul rămas %.2d:%.2d)" -#: parted/parted.c:248 +#: parted/parted.c:251 #, c-format msgid "Partition %s is being used. Are you sure you want to continue?" msgstr "PartiÈ›ia %s este utilizată. Sigur doriÈ›i să continuaÈ›i?" -#: parted/parted.c:269 +#: parted/parted.c:272 #, c-format msgid "Partition(s) on %s are being used." msgstr "PartiÈ›ia(ile) de pe %s este(sunt) utilizată(e)." -#: parted/parted.c:281 +#: parted/parted.c:284 #, c-format msgid "" "The existing disk label on %s will be destroyed and all data on this disk " @@ -2685,31 +2683,31 @@ msgstr "" "Eticheta de disc existentă pe %s va fi distrusă È™i toate datele de pe acest " "disc se vor pierde. DoriÈ›i să continuaÈ›i?" -#: parted/parted.c:542 +#: parted/parted.c:545 msgid "New disk label type?" msgstr "Nou tip de etichetă de disc?" -#: parted/parted.c:680 +#: parted/parted.c:692 msgid "Partition type?" msgstr "Tipul partiÈ›iei?" -#: parted/parted.c:698 parted/parted.c:902 +#: parted/parted.c:710 parted/parted.c:914 msgid "Partition name?" msgstr "Numele partiÈ›iei?" -#: parted/parted.c:708 +#: parted/parted.c:720 msgid "File system type?" msgstr "Tipul sistemului de fiÈ™iere?" -#: parted/parted.c:713 parted/parted.c:1683 +#: parted/parted.c:725 parted/parted.c:1815 msgid "Start?" msgstr "ÃŽncepe(de unde)?" -#: parted/parted.c:715 parted/parted.c:1685 parted/parted.c:1768 +#: parted/parted.c:727 parted/parted.c:1817 parted/parted.c:1900 msgid "End?" msgstr "Termină(până unde)?" -#: parted/parted.c:782 +#: parted/parted.c:794 #, c-format msgid "" "You requested a partition from %s to %s (sectors %llu..%llu).\n" @@ -2719,7 +2717,7 @@ msgstr "" "Cea mai apropiată locaÈ›ie pe care o puteÈ›i utiliza este %s la %s (sectoarele " "%llu..%llu).%s" -#: parted/parted.c:791 +#: parted/parted.c:803 msgid "" "\n" "Is this still acceptable to you?" @@ -2727,96 +2725,121 @@ msgstr "" "\n" "Este aceasta acceptabil pentru tine?" -#: parted/parted.c:814 +#: parted/parted.c:826 #, c-format msgid "" "The resulting partition is not properly aligned for best performance: %s" msgstr "" "PartiÈ›ia rezultată nu este aliniată corect pentru o performanță optimă: %s" -#: parted/parted.c:816 parted/parted.c:1925 +#: parted/parted.c:828 parted/parted.c:2057 msgid "unknown (malloc failed)" msgstr "necunoscută (malloc a eÈ™uat, memorie disponibilă insuficientă)" -#: parted/parted.c:894 +#: parted/parted.c:906 #, c-format msgid "%s disk labels do not support partition name." msgstr "etichetele de disc %s nu acceptă numele partiÈ›iei." -#: parted/parted.c:899 parted/parted.c:1748 parted/parted.c:1814 -#: parted/parted.c:1908 parted/parted.c:1983 +#: parted/parted.c:911 parted/parted.c:955 parted/parted.c:1880 +#: parted/parted.c:1946 parted/parted.c:2040 parted/parted.c:2115 msgid "Partition number?" msgstr "Numărul partiÈ›iei?" -#: parted/parted.c:1050 +#: parted/parted.c:949 +#, fuzzy, c-format +msgid "%s disk labels do not support partition type." +msgstr "etichetele de disc %s nu acceptă numele partiÈ›iei." + +#: parted/parted.c:965 +#, fuzzy +msgid "Partition type-id?" +msgstr "Tipul partiÈ›iei?" + +#: parted/parted.c:972 +#, fuzzy +msgid "Invalid type-id." +msgstr "Număr nevalid." + +#: parted/parted.c:986 +#, fuzzy +msgid "Partition type-uuid?" +msgstr "Tipul partiÈ›iei?" + +#: parted/parted.c:993 +#, fuzzy +msgid "Invalid type-uuid." +msgstr "Număr nevalid." + +#: parted/parted.c:1146 #, c-format msgid "BIOS cylinder,head,sector geometry: %d,%d,%d. Each cylinder is %s.\n" msgstr "" "Dispunerea logică a discului conform BIOS: %d,%d,%d (cilindri,capete," "sectoare). Fiecare cilindru este de %s.\n" -#: parted/parted.c:1137 +#: parted/parted.c:1240 #, c-format msgid "Model: %s (%s)\n" msgstr "Model: %s (%s)\n" -#: parted/parted.c:1139 +#: parted/parted.c:1242 #, c-format msgid "Disk %s: %s\n" msgstr "Disc %s: %s\n" -#: parted/parted.c:1140 +#: parted/parted.c:1243 #, c-format msgid "Sector size (logical/physical): %lldB/%lldB\n" msgstr "Dimensiunea sectorului (logică/fizică): %lldB/%lldB\n" -#: parted/parted.c:1152 +#: parted/parted.c:1255 #, c-format msgid "Partition Table: %s\n" msgstr "Tabel de partiÈ›ii: %s\n" -#: parted/parted.c:1153 +#: parted/parted.c:1256 #, c-format msgid "Disk Flags: %s\n" msgstr "Fanioane disc: %s\n" -#: parted/parted.c:1279 parted/parted.c:1282 +#: parted/parted.c:1388 parted/parted.c:1391 msgid "Number" msgstr "Număr" -#: parted/parted.c:1279 parted/parted.c:1282 +#: parted/parted.c:1388 parted/parted.c:1391 msgid "Start" msgstr "Start" -#: parted/parted.c:1280 parted/parted.c:1283 +#: parted/parted.c:1389 parted/parted.c:1392 msgid "End" msgstr "SfârÅŸit" -#: parted/parted.c:1283 +#: parted/parted.c:1392 msgid "Size" msgstr "Dimensiune" -#: parted/parted.c:1287 +#: parted/parted.c:1396 msgid "Type" msgstr "Tip" -#: parted/parted.c:1289 +#: parted/parted.c:1398 msgid "File system" msgstr "Sistem de fiÈ™iere" -#: parted/parted.c:1292 +#: parted/parted.c:1401 msgid "Name" msgstr "Nume" -#: parted/parted.c:1294 +#: parted/parted.c:1403 msgid "Flags" msgstr "Fanioane" -#: parted/parted.c:1352 +#: parted/parted.c:1461 msgid "Free Space" msgstr "SpaÈ›iu liber" -#: parted/parted.c:1570 +#: parted/parted.c:1702 #, c-format msgid "" "A %s %s partition was found at %s -> %s. Do you want to add it to the " @@ -2825,48 +2848,48 @@ msgstr "" "O partiÈ›ie %s %s a fost găsită la %s -> %s. DoriÈ›i s-o adăugaÈ›i la tabelul " "de partiÈ›ii?" -#: parted/parted.c:1613 +#: parted/parted.c:1745 msgid "searching for file systems" msgstr "se caută după sisteme de fiÈ™iere" -#: parted/parted.c:1720 +#: parted/parted.c:1852 msgid "The resize command has been removed in parted 3.0" msgstr "Comanda „resize†a fost eliminată în parted 3.0" -#: parted/parted.c:1782 +#: parted/parted.c:1914 msgid "" "Shrinking a partition can cause data loss, are you sure you want to continue?" msgstr "" "MicÈ™orarea unei partiÈ›ii poate provoca pierderi de date; sunteÈ›i sigur că " "doriÈ›i să continuaÈ›i?" -#: parted/parted.c:1838 +#: parted/parted.c:1970 msgid "New device?" msgstr "Dispozitiv nou?" -#: parted/parted.c:1906 +#: parted/parted.c:2038 msgid "alignment type(min/opt)" msgstr "tipul de aliniere (minimă/optimă)" -#: parted/parted.c:1921 +#: parted/parted.c:2053 #, c-format msgid "%d aligned\n" msgstr "%d aliniat\n" -#: parted/parted.c:1923 +#: parted/parted.c:2055 #, c-format msgid "%d not aligned: %s\n" msgstr "%d nealiniat: %s\n" -#: parted/parted.c:1948 parted/parted.c:1985 +#: parted/parted.c:2080 parted/parted.c:2117 msgid "Flag to Invert?" msgstr "Fanion pentru inversare?" -#: parted/parted.c:1953 parted/parted.c:1990 +#: parted/parted.c:2085 parted/parted.c:2122 msgid "New state?" msgstr "Stare nouă?" -#: parted/parted.c:2036 +#: parted/parted.c:2168 msgid "Unit?" msgstr "Unitate?" @@ -2881,11 +2904,11 @@ msgstr "Unitate?" # lalte programe, folosim (--)help pentru ca să se # afiÈ™eze ajutorul pentru programul respectiv, aici # să rămînă la fel, nu tastînd «ajutor» -#: parted/parted.c:2171 +#: parted/parted.c:2303 msgid "align-check" msgstr "align-check" -#: parted/parted.c:2174 +#: parted/parted.c:2306 msgid "" "align-check TYPE N check partition N for TYPE(min|opt) " "alignment" @@ -2893,7 +2916,7 @@ msgstr "" "align-check TIP N verifică partiÈ›ia N pentru " "alinierea TIP(min|opt)" -#: parted/parted.c:2182 +#: parted/parted.c:2314 msgid "help" msgstr "help" @@ -2902,7 +2925,7 @@ msgstr "help" # acest mesaj, face parte din mesajele de ajutor, # afiÈ™ate la lansarea comenzii «parted --help», aÈ™a # că, vă rog, nu-i modificaÈ›i structura... -#: parted/parted.c:2185 +#: parted/parted.c:2317 msgid "" "help [COMMAND] print general help, or help on " "COMMAND" @@ -2910,15 +2933,15 @@ msgstr "" "help [COMANDÄ‚] afiÈ™ează informaÈ›ii de ajutor " "general, sau despre COMANDÄ‚" -#: parted/parted.c:2191 +#: parted/parted.c:2323 msgid "mklabel" msgstr "mklabel" -#: parted/parted.c:2191 +#: parted/parted.c:2323 msgid "mktable" msgstr "mktable" -#: parted/parted.c:2194 +#: parted/parted.c:2326 msgid "" "mklabel,mktable LABEL-TYPE create a new disklabel (partition " "table)" @@ -2926,15 +2949,15 @@ msgstr "" "mklabel,mktable TIP-ETICHETÄ‚ creează o nouă etichetă de disc " "(tabel de partiÈ›ii)" -#: parted/parted.c:2200 +#: parted/parted.c:2332 msgid "mkpart" msgstr "mkpart" -#: parted/parted.c:2203 +#: parted/parted.c:2335 msgid "mkpart PART-TYPE [FS-TYPE] START END make a partition" msgstr "mkpart TIP-PART [TIP-SF] START SFÂRȘIT creează o partiÈ›ie" -#: parted/parted.c:2209 +#: parted/parted.c:2341 msgid "" "'mkpart' makes a partition without creating a new file system on the " "partition. FS-TYPE may be specified to set an appropriate partition ID.\n" @@ -2943,20 +2966,20 @@ msgstr "" "partiÈ›ie. TIP-SF poate fi specificat pentru a stabili un anumit ID de " "partiÈ›ie.\n" -#: parted/parted.c:2214 +#: parted/parted.c:2346 msgid "name" msgstr "name" -#: parted/parted.c:2217 +#: parted/parted.c:2349 msgid "name NUMBER NAME name partition NUMBER as NAME" msgstr "" "name NUMÄ‚R NUME numeÈ™te partiÈ›ia NUMÄ‚R ca NUME" -#: parted/parted.c:2222 +#: parted/parted.c:2354 msgid "print" msgstr "print" -#: parted/parted.c:2225 +#: parted/parted.c:2357 msgid "" "print [devices|free|list,all] display the partition table, or " "available devices, or free space, or all found partitions" @@ -2966,7 +2989,7 @@ msgstr "" " spaÈ›iul liber " "sau toate partiÈ›iile găsite" -#: parted/parted.c:2229 +#: parted/parted.c:2361 msgid "" "Without arguments, 'print' displays the entire partition table. However with " "the following arguments it performs various other actions.\n" @@ -2974,11 +2997,11 @@ msgstr "" "Fără argumente, «print» afiÈ™ează întregul tabel de partiÅ£ii. Cu următoarele " "argumente arată informaÈ›ii mai specifice: \n" -#: parted/parted.c:2231 +#: parted/parted.c:2363 msgid " devices : display all active block devices\n" msgstr " devices : afiÈ™ează toate dispozitivele bloc active\n" -#: parted/parted.c:2232 +#: parted/parted.c:2364 msgid "" " free : display information about free unpartitioned space on the " "current block device\n" @@ -2986,26 +3009,26 @@ msgstr "" " free : afiÈ™ează informaÈ›ii despre spaÈ›iul liber nepartiÈ›ionat pe " "dispozitivul bloc curent\n" -#: parted/parted.c:2234 +#: parted/parted.c:2366 msgid "" " list, all : display the partition tables of all active block devices\n" msgstr "" " list, all : afiÈ™ează tabelele de partiÈ›ii ale tuturor dispozitivelor bloc " "active\n" -#: parted/parted.c:2238 +#: parted/parted.c:2370 msgid "quit" msgstr "quit" -#: parted/parted.c:2241 +#: parted/parted.c:2373 msgid "quit exit program" msgstr "quit ieÈ™ire din program" -#: parted/parted.c:2246 +#: parted/parted.c:2378 msgid "rescue" msgstr "rescue" -#: parted/parted.c:2249 +#: parted/parted.c:2381 msgid "" "rescue START END rescue a lost partition near START " "and END" @@ -3013,55 +3036,55 @@ msgstr "" "rescue START SFÂRȘIT recuperează o partiÈ›ie pierdută " "aflată între START È™i SFÂRȘIT" -#: parted/parted.c:2255 +#: parted/parted.c:2387 msgid "resize" msgstr "resize" -#: parted/parted.c:2258 +#: parted/parted.c:2390 msgid "The resize command was removed in parted 3.0\n" msgstr "Comanda „resize†a fost eliminată în parted 3.0\n" -#: parted/parted.c:2261 +#: parted/parted.c:2393 msgid "resizepart" msgstr "resizepart" -#: parted/parted.c:2264 +#: parted/parted.c:2396 msgid "resizepart NUMBER END resize partition NUMBER" msgstr "" "resizepart NUMÄ‚R SFÂRȘIT redimensionează partiÈ›ia NUMÄ‚R" -#: parted/parted.c:2269 +#: parted/parted.c:2401 msgid "rm" msgstr "rm" -#: parted/parted.c:2272 +#: parted/parted.c:2404 msgid "rm NUMBER delete partition NUMBER" msgstr "rm NUMÄ‚R È™terge partiÈ›ia NUMÄ‚R" -#: parted/parted.c:2277 +#: parted/parted.c:2409 msgid "select" msgstr "select" -#: parted/parted.c:2280 +#: parted/parted.c:2412 msgid "select DEVICE choose the device to edit" msgstr "select UNITATE alege unitatea de editat" -#: parted/parted.c:2285 +#: parted/parted.c:2417 msgid "disk_set" msgstr "disk_set" -#: parted/parted.c:2288 +#: parted/parted.c:2420 msgid "" "disk_set FLAG STATE change the FLAG on selected device" msgstr "" "disk_set FANION STARE schimbă FANION(ul) de pe " "dispozitivul selectat" -#: parted/parted.c:2293 +#: parted/parted.c:2425 msgid "disk_toggle" msgstr "disk_toggle" -#: parted/parted.c:2296 +#: parted/parted.c:2428 msgid "" "disk_toggle [FLAG] toggle the state of FLAG on " "selected device" @@ -3069,21 +3092,21 @@ msgstr "" "disk_toggle [FANION] comută starea FANION(ului) pe " "dispozitivul selectat" -#: parted/parted.c:2302 +#: parted/parted.c:2434 msgid "set" msgstr "set" -#: parted/parted.c:2305 +#: parted/parted.c:2437 msgid "" "set NUMBER FLAG STATE change the FLAG on partition NUMBER" msgstr "" "set NUMÄ‚R FANION STARE schimbă FANION(ul) pe partiÈ›ia NUMÄ‚R" -#: parted/parted.c:2311 +#: parted/parted.c:2443 msgid "toggle" msgstr "toggle" -#: parted/parted.c:2314 +#: parted/parted.c:2446 msgid "" "toggle [NUMBER [FLAG]] toggle the state of FLAG on " "partition NUMBER" @@ -3091,21 +3114,31 @@ msgstr "" "toggle [NUMÄ‚R [FANION]] comută starea FANION(ului) pe " "partiÈ›ia NUMÄ‚R" -#: parted/parted.c:2320 +#: parted/parted.c:2452 +msgid "type" +msgstr "" + +#: parted/parted.c:2455 +msgid "" +"type NUMBER TYPE-ID or TYPE-UUID type set TYPE-ID or TYPE-UUID of " +"partition NUMBER" +msgstr "" + +#: parted/parted.c:2460 msgid "unit" msgstr "unit" -#: parted/parted.c:2323 +#: parted/parted.c:2463 msgid "unit UNIT set the default unit to UNIT" msgstr "" "unit UNITATE setează unitatea implicită ca " "UNITATE" -#: parted/parted.c:2328 +#: parted/parted.c:2468 msgid "version" msgstr "version" -#: parted/parted.c:2331 +#: parted/parted.c:2471 msgid "" "version display the version number and " "copyright information of GNU Parted" @@ -3113,7 +3146,7 @@ msgstr "" "version afiÈ™ează numărul versiunii È™i " "informaÈ›iile despre drepturile de autor ale GNU Parted" -#: parted/parted.c:2335 +#: parted/parted.c:2475 msgid "" "'version' displays copyright and version information corresponding to this " "copy of GNU Parted\n" @@ -3121,21 +3154,21 @@ msgstr "" "„version†afiÈ™ează informaÈ›ii despre drepturile de autor È™i versiunea " "corespunzătoare a acestei copii de GNU Parted\n" -#: parted/parted.c:2405 +#: parted/parted.c:2545 #, c-format msgid "Usage: %s [-hlmsfv] [-a<align>] [DEVICE [COMMAND [PARAMETERS]]...]\n" msgstr "" "Utilizare: %s [-hlmsfv] [-a<align>] [DISPOZITIV [COMANDÄ‚ [PARAMETRII]]...]\n" -#: parted/parted.c:2449 +#: parted/parted.c:2589 msgid "No device found" msgstr "Nu a fost găsit niciun dispozitiv" -#: parted/parted.c:2486 +#: parted/parted.c:2626 msgid "WARNING: You are not superuser. Watch out for permissions.\n" msgstr "AVERTISMENT: Nu sunteÈ›i superutilizator. AtenÈ›ie la permisiuni.\n" -#: parted/parted.c:2519 +#: parted/parted.c:2659 msgid "" "You should reinstall your boot loader before rebooting. Read section 4 of " "the Parted User documentation for more information." @@ -3144,7 +3177,7 @@ msgstr "" "CitiÈ›i secÈ›iunea 4 din documentaÈ›ia utilizatorului Parted pentru mai multe " "informaÈ›ii." -#: parted/parted.c:2526 +#: parted/parted.c:2666 msgid "You may need to update /etc/fstab.\n" msgstr "Este posibil să fie nevoie să actualizaÈ›i /etc/fstab.\n" @@ -3405,69 +3438,69 @@ msgstr "" "\n" "Eroare: A fost întâlnit un semnal SIGILL general." -#: parted/ui.c:901 +#: parted/ui.c:904 #, c-format msgid "invalid token: %s" msgstr "simbol nevalid: %s" -#: parted/ui.c:1082 +#: parted/ui.c:1085 msgid "Expecting a partition number." msgstr "Se aÈ™teaptă un număr de partiÈ›ie." -#: parted/ui.c:1091 +#: parted/ui.c:1094 msgid "Partition doesn't exist." msgstr "PartiÈ›ia nu există." -#: parted/ui.c:1111 +#: parted/ui.c:1114 msgid "Expecting a file system type." msgstr "Se aÈ™teaptă un tip de sistem de fiÈ™iere." -#: parted/ui.c:1118 +#: parted/ui.c:1121 #, c-format msgid "Unknown file system type \"%s\"." msgstr "Tip de sistem de fiÈ™iere necunoscut \"%s\"." -#: parted/ui.c:1139 +#: parted/ui.c:1142 msgid "Expecting a disk label type." msgstr "Se aÈ™teaptă un tip de etichetă de disc." -#: parted/ui.c:1170 parted/ui.c:1206 +#: parted/ui.c:1173 parted/ui.c:1209 msgid "No flags supported" msgstr "Nu sunt suportate fanioane" -#: parted/ui.c:1280 +#: parted/ui.c:1283 msgid "Can't create any more partitions." msgstr "Nu se mai poate crea nici o partiÈ›ie." -#: parted/ui.c:1290 +#: parted/ui.c:1293 msgid "Expecting a partition type." msgstr "Se aÈ™teaptă un tip de partiÈ›ie." -#: parted/ui.c:1439 +#: parted/ui.c:1442 msgid "on" msgstr "pornit" -#: parted/ui.c:1440 +#: parted/ui.c:1443 msgid "off" msgstr "oprit" -#: parted/ui.c:1457 +#: parted/ui.c:1460 msgid "optimal" msgstr "optim" -#: parted/ui.c:1458 +#: parted/ui.c:1461 msgid "minimal" msgstr "minim" -#: parted/ui.c:1591 +#: parted/ui.c:1594 msgid "OPTIONs:" msgstr "OPÈšIUNI:" -#: parted/ui.c:1596 +#: parted/ui.c:1599 msgid "COMMANDs:" msgstr "COMENZI:" -#: parted/ui.c:1599 +#: parted/ui.c:1602 #, c-format msgid "" "\n" @@ -3476,15 +3509,25 @@ msgstr "" "\n" "RaportaÈ›i erorile la %s.\n" -#: parted/ui.c:1606 +#: parted/ui.c:1609 #, c-format msgid "Using %s\n" msgstr "Se utilizează %s\n" -#: parted/ui.c:1686 +#: parted/ui.c:1689 msgid "This command does not make sense in non-interactive mode.\n" msgstr "Această comandă nu are sens în modul neinteractiv.\n" +#~ msgid "Extended partitions cannot be hidden on msdos disk labels." +#~ msgstr "" +#~ "PartiÈ›iile extinse nu pot fi ascunse pe etichetele discurilor msdos." + +#~ msgid "" +#~ "Extended partitions cannot be recovery partitions on msdos disk labels." +#~ msgstr "" +#~ "PartiÈ›iile extinse nu pot fi partiÈ›ii de recuperare pe etichetele de disc " +#~ "msdos." + #~ msgid "" #~ " NUMBER : display more detailed information about this particular " #~ "partition\n" Binary files differ@@ -5,14 +5,14 @@ # Dmitry S. Sivachenko <dima@Chg.RU>, 1999. # Dimitriy Ryazantcev <DJm00n@mail.ru>, 2007, 2008. # Pavel Maryanov <acid@jack.kiev.ua>, 2014. -# Yuri Kozlov <yuray@komyakino.ru>, 2014, 2018, 2021. +# Yuri Kozlov <yuray@komyakino.ru>, 2014, 2018, 2021, 2022. # Galina Anikina <merilaga@yandex.ru>, 2018. msgid "" msgstr "" -"Project-Id-Version: parted 3.3.52\n" +"Project-Id-Version: parted 3.4.64.2\n" "Report-Msgid-Bugs-To: bug-parted@gnu.org\n" -"POT-Creation-Date: 2022-04-18 14:44-0400\n" -"PO-Revision-Date: 2021-01-22 08:15+0300\n" +"POT-Creation-Date: 2023-04-10 15:50-0700\n" +"PO-Revision-Date: 2022-04-23 07:13+0300\n" "Last-Translator: Yuri Kozlov <yuray@komyakino.ru>\n" "Language-Team: Russian <gnu@d07.ru>\n" "Language: ru\n" @@ -24,25 +24,25 @@ msgstr "" "Plural-Forms: nplurals=3; plural=(n%10==1 && n%100!=11 ? 0 : n%10>=2 && " "n%10<=4 && (n%100<10 || n%100>=20) ? 1 : 2);\n" -#: lib/argmatch.c:147 +#: lib/argmatch.c:145 #, c-format msgid "invalid argument %s for %s" msgstr "недопуÑтимый аргумент %s Ð´Ð»Ñ %s" -#: lib/argmatch.c:148 +#: lib/argmatch.c:146 #, c-format msgid "ambiguous argument %s for %s" msgstr "неоднозначный аргумент %s Ð´Ð»Ñ %s" -#: lib/argmatch.c:167 lib/argmatch.h:238 +#: lib/argmatch.c:165 lib/argmatch.h:237 msgid "Valid arguments are:" msgstr "ДопуÑтимые аргументы:" -#: lib/closeout.c:122 libparted/labels/fdasd.c:145 +#: lib/closeout.c:121 libparted/labels/fdasd.c:145 msgid "write error" msgstr "ошибка запиÑи" -#: lib/error.c:195 +#: lib/error.c:193 msgid "Unknown system error" msgstr "ÐеизвеÑÑ‚Ð½Ð°Ñ ÑиÑÑ‚ÐµÐ¼Ð½Ð°Ñ Ð¾ÑˆÐ¸Ð±ÐºÐ°" @@ -102,11 +102,11 @@ msgstr "%s: Ð´Ð»Ñ Ð¿Ð°Ñ€Ð°Ð¼ÐµÑ‚Ñ€Ð° нужен аргумент — «%c»\n" #. If you don't know what to put here, please see #. <https://en.wikipedia.org/wiki/Quotation_marks_in_other_languages> #. and use glyphs suitable for your language. -#: lib/quotearg.c:355 +#: lib/quotearg.c:354 msgid "`" msgstr "«" -#: lib/quotearg.c:356 +#: lib/quotearg.c:355 msgid "'" msgstr "»" @@ -188,7 +188,7 @@ msgstr "Ðет предыдущего регулÑрного выражениÑ" #. To enquire the regular expression that your system uses for this #. purpose, you can use the command #. locale -k LC_MESSAGES | grep '^yesexpr=' -#: lib/rpmatch.c:150 +#: lib/rpmatch.c:149 msgid "^[yY]" msgstr "^[yYдД]" @@ -198,7 +198,7 @@ msgstr "^[yYдД]" #. To enquire the regular expression that your system uses for this #. purpose, you can use the command #. locale -k LC_MESSAGES | grep '^noexpr=' -#: lib/rpmatch.c:163 +#: lib/rpmatch.c:162 msgid "^[nN]" msgstr "^[nNнÐ]" @@ -472,6 +472,8 @@ msgid "" "WARNING: the kernel failed to re-read the partition table on %s (%s). As a " "result, it may not reflect all of your changes until after reboot." msgstr "" +"ПРЕДУПРЕЖДЕÐИЕ: Ñдру не удалоÑÑŒ перечитать таблицу разделов на %s (%s). Из-" +"за Ñтого до перезагрузки машины могут отображатьÑÑ Ð½Ðµ вÑе изменениÑ." #: libparted/arch/gnu.c:261 #, c-format @@ -479,6 +481,8 @@ msgid "" "Warning: unable to open %s (%s). As a result, it may not reflect all of your " "changes until after reboot." msgstr "" +"Предупреждение: не удалоÑÑŒ открыть %s (%s). Из-за Ñтого до перезагрузки " +"машины могут отображатьÑÑ Ð½Ðµ вÑе изменениÑ." #: libparted/arch/gnu.c:274 #, c-format @@ -486,6 +490,8 @@ msgid "" "Warning: failed to make translator go away on %s (%s). As a result, it may " "not reflect all of your changes until after reboot." msgstr "" +"Предупреждение: не удалоÑÑŒ ÑброÑить транÑлÑтор Ð´Ð»Ñ %s (%s). Из-за Ñтого до " +"перезагрузки машины могут отображатьÑÑ Ð½Ðµ вÑе изменениÑ." #: libparted/arch/gnu.c:820 #, c-format @@ -749,22 +755,22 @@ msgstr "pmbr_boot" msgid "Unknown disk flag, %d." msgstr "ÐеизвеÑтный флаг диÑка, %d." -#: libparted/disk.c:1289 +#: libparted/disk.c:1320 #, c-format msgid "%s disk labels do not support extended partitions." msgstr "ПодпиÑи к диÑкам %s не поддерживают раÑширенные разделы." -#: libparted/disk.c:1821 +#: libparted/disk.c:1990 #, c-format msgid "%s disk labels don't support logical or extended partitions." msgstr "" "ПодпиÑи к диÑкам %s не поддерживают логичеÑкие или раÑширенные разделы." -#: libparted/disk.c:1834 +#: libparted/disk.c:2003 msgid "Too many primary partitions." msgstr "Слишком много оÑновных разделов." -#: libparted/disk.c:1843 +#: libparted/disk.c:2012 #, c-format msgid "" "Can't add a logical partition to %s, because there is no extended partition." @@ -772,138 +778,142 @@ msgstr "" "Ðевозможно добавить логичеÑкий раздел на %s, потому что нет раÑширенного " "раздела." -#: libparted/disk.c:1867 +#: libparted/disk.c:2036 #, c-format msgid "Can't have more than one extended partition on %s." msgstr "Ðевозможно Ñоздать больше одного раÑширенного раздела на %s." -#: libparted/disk.c:1877 +#: libparted/disk.c:2046 msgid "Can't have logical partitions outside of the extended partition." msgstr "Ðевозможно Ñоздать логичеÑкий раздел больше раÑширенного раздела." -#: libparted/disk.c:1902 +#: libparted/disk.c:2071 #, c-format msgid "Can't have a logical partition outside of the extended partition on %s." msgstr "" "Ðевозможно Ñоздать логичеÑкий раздел больше раÑширенного раздела на %s." -#: libparted/disk.c:1912 +#: libparted/disk.c:2081 msgid "Can't have a primary partition inside an extended partition." msgstr "Ðевозможно Ñоздать оÑновной раздел внутри раÑширенного." -#: libparted/disk.c:1921 +#: libparted/disk.c:2090 msgid "Can't have a partition outside the disk!" msgstr "Ðевозможно Ñоздать раздел за пределами уÑтройÑтва!" -#: libparted/disk.c:1972 libparted/disk.c:2150 +#: libparted/disk.c:2141 libparted/disk.c:2319 msgid "Can't have overlapping partitions." msgstr "Ðевозможно Ñоздавать переÑекающиеÑÑ Ñ€Ð°Ð·Ð´ÐµÐ»Ñ‹." -#: libparted/disk.c:2351 +#: libparted/disk.c:2520 msgid "metadata" msgstr "метаданные" -#: libparted/disk.c:2353 +#: libparted/disk.c:2522 msgid "free" msgstr "Ñвободно" -#: libparted/disk.c:2355 parted/ui.c:1271 parted/ui.c:1299 +#: libparted/disk.c:2524 parted/ui.c:1274 parted/ui.c:1302 msgid "extended" msgstr "раÑширенный" -#: libparted/disk.c:2357 parted/ui.c:1275 parted/ui.c:1303 +#: libparted/disk.c:2526 parted/ui.c:1278 parted/ui.c:1306 msgid "logical" msgstr "логичеÑкий" -#: libparted/disk.c:2359 parted/ui.c:1267 parted/ui.c:1295 +#: libparted/disk.c:2528 parted/ui.c:1270 parted/ui.c:1298 msgid "primary" msgstr "оÑновной" -#: libparted/disk.c:2375 +#: libparted/disk.c:2544 msgid "boot" msgstr "загрузочный" -#: libparted/disk.c:2377 +#: libparted/disk.c:2546 msgid "bios_grub" msgstr "bios_grub" -#: libparted/disk.c:2379 +#: libparted/disk.c:2548 msgid "root" msgstr "корневой" -#: libparted/disk.c:2381 +#: libparted/disk.c:2550 msgid "swap" msgstr "подкачка" -#: libparted/disk.c:2383 +#: libparted/disk.c:2552 msgid "hidden" msgstr "Ñкрытый" -#: libparted/disk.c:2385 +#: libparted/disk.c:2554 msgid "raid" msgstr "raid" -#: libparted/disk.c:2387 +#: libparted/disk.c:2556 msgid "lvm" msgstr "lvm" -#: libparted/disk.c:2389 +#: libparted/disk.c:2558 msgid "lba" msgstr "lba" -#: libparted/disk.c:2391 +#: libparted/disk.c:2560 msgid "hp-service" msgstr "hp-service" -#: libparted/disk.c:2393 +#: libparted/disk.c:2562 msgid "palo" msgstr "palo" -#: libparted/disk.c:2395 +#: libparted/disk.c:2564 msgid "prep" msgstr "prep" -#: libparted/disk.c:2397 +#: libparted/disk.c:2566 msgid "msftres" msgstr "msftres" -#: libparted/disk.c:2399 +#: libparted/disk.c:2568 msgid "msftdata" msgstr "msftdata" -#: libparted/disk.c:2401 +#: libparted/disk.c:2570 msgid "atvrecv" msgstr "atvrecv" -#: libparted/disk.c:2403 +#: libparted/disk.c:2572 msgid "diag" msgstr "diag" -#: libparted/disk.c:2405 +#: libparted/disk.c:2574 msgid "legacy_boot" msgstr "legacy_boot" -#: libparted/disk.c:2407 +#: libparted/disk.c:2576 msgid "irst" msgstr "irst" -#: libparted/disk.c:2409 +#: libparted/disk.c:2578 msgid "esp" msgstr "esp" -#: libparted/disk.c:2411 +#: libparted/disk.c:2580 msgid "chromeos_kernel" msgstr "chromeos_kernel" -#: libparted/disk.c:2413 +#: libparted/disk.c:2582 msgid "bls_boot" msgstr "bls_boot" -#: libparted/disk.c:2415 +#: libparted/disk.c:2584 msgid "linux-home" +msgstr "linux-home" + +#: libparted/disk.c:2586 +msgid "no_automount" msgstr "" -#: libparted/disk.c:2421 +#: libparted/disk.c:2592 #, c-format msgid "Unknown partition flag, %d." msgstr "ÐеизвеÑтный флаг раздела, %d." @@ -1101,8 +1111,8 @@ msgstr "" "первичных разделов, еÑли XGM Ñтоит первым, то ÑчитаетÑÑ Ð·Ð° два)." #: libparted/labels/atari.c:1662 libparted/labels/bsd.c:563 -#: libparted/labels/dasd.c:895 libparted/labels/dos.c:2303 -#: libparted/labels/dvh.c:770 libparted/labels/gpt.c:1769 +#: libparted/labels/dasd.c:893 libparted/labels/dos.c:2294 +#: libparted/labels/dvh.c:770 libparted/labels/gpt.c:1891 #: libparted/labels/loop.c:244 libparted/labels/mac.c:1409 #: libparted/labels/pc98.c:697 libparted/labels/rdb.c:1054 #: libparted/labels/sun.c:781 @@ -1127,40 +1137,30 @@ msgstr "Ðе удалоÑÑŒ назначить номер раздела." msgid "Unable to allocate a bsd disklabel slot." msgstr "Ðе удалоÑÑŒ назначить Ñлот подпиÑи к диÑку bsd." -#: libparted/labels/dasd.c:626 +#: libparted/labels/dasd.c:634 msgid "The partition table of DASD-LDL device cannot be changed.\n" msgstr "Таблицу разделов уÑтройÑтва DASD-LDL Ð½ÐµÐ»ÑŒÐ·Ñ Ð¸Ð·Ð¼ÐµÐ½Ð¸Ñ‚ÑŒ.\n" -#: libparted/labels/dasd.c:921 +#: libparted/labels/dasd.c:919 msgid "Unable to allocate a dasd disklabel slot" msgstr "Ðе удалоÑÑŒ назначить Ñлот подпиÑи к диÑку dasd" -#: libparted/labels/dos.c:1008 +#: libparted/labels/dos.c:1159 #, c-format msgid "Invalid partition table on %s -- wrong signature %x." msgstr "ÐÐµÐºÐ¾Ñ€Ñ€ÐµÐºÑ‚Ð½Ð°Ñ Ñ‚Ð°Ð±Ð»Ð¸Ñ†Ð° разделов на %s: неправильный идентификатор %x." -#: libparted/labels/dos.c:1036 +#: libparted/labels/dos.c:1187 #, c-format msgid "Invalid partition table - recursive partition on %s." msgstr "ÐÐµÐ²ÐµÑ€Ð½Ð°Ñ Ñ‚Ð°Ð±Ð»Ð¸Ñ†Ð° разделов - рекурÑивный раздел на %s." -#: libparted/labels/dos.c:1567 -msgid "Extended partitions cannot be hidden on msdos disk labels." -msgstr "РаÑширенные разделы не могут быть Ñкрыты при msdos метках диÑка." - -#: libparted/labels/dos.c:1579 -msgid "Extended partitions cannot be recovery partitions on msdos disk labels." -msgstr "" -"РаÑширенные разделы не могут быть разделами воÑÑÑ‚Ð°Ð½Ð¾Ð²Ð»ÐµÐ½Ð¸Ñ Ð¿Ñ€Ð¸ msdos метках " -"диÑка." - -#: libparted/labels/dos.c:2285 +#: libparted/labels/dos.c:2276 msgid "Parted can't resize partitions managed by Windows Dynamic Disk." msgstr "" "Parted не может изменÑÑ‚ÑŒ размер разделов управлÑемых Windows Dynamic Disk." -#: libparted/labels/dos.c:2541 +#: libparted/labels/dos.c:2532 msgid "cannot create any more partitions" msgstr "не удаётÑÑ Ñоздать дополнительные разделы" @@ -1301,11 +1301,11 @@ msgstr "Ðе удалоÑÑŒ получить информацию о Ñ€Ð°Ð·Ð¼ÐµÑ msgid "Disk geometry does not match a DASD device of type 3390." msgstr "Ð“ÐµÐ¾Ð¼ÐµÑ‚Ñ€Ð¸Ñ Ð´Ð¸Ñка не ÑоответÑтвует уÑтройÑтву DASD Ñ Ñ‚Ð¸Ð¿Ð¾Ð¼ 3390." -#: libparted/labels/gpt.c:569 +#: libparted/labels/gpt.c:589 msgid "device is too small for GPT" msgstr "уÑтройÑтво Ñлишком маленькое Ð´Ð»Ñ GPT" -#: libparted/labels/gpt.c:771 +#: libparted/labels/gpt.c:791 #, c-format msgid "" "The format of the GPT partition table is version %x, which is newer than " @@ -1314,7 +1314,7 @@ msgstr "" "Формат таблицы разделов GPT верÑии %x новее, чем Parted может раÑпознать. " "Сообщите об Ñтом!" -#: libparted/labels/gpt.c:807 +#: libparted/labels/gpt.c:827 #, c-format msgid "" "Not all of the space available to %s appears to be used, you can fix the GPT " @@ -1325,7 +1325,7 @@ msgstr "" "таблицу GPT Ð´Ð»Ñ Ð¸ÑÐ¿Ð¾Ð»ÑŒÐ·Ð¾Ð²Ð°Ð½Ð¸Ñ Ð²Ñего меÑта (дополнительно %llu блоков) или " "продолжить Ñ Ñ‚ÐµÐºÑƒÑ‰Ð¸Ð¼Ð¸ наÑтройками? " -#: libparted/labels/gpt.c:1006 +#: libparted/labels/gpt.c:1026 msgid "" "The backup GPT table is not at the end of the disk, as it should be. Fix, " "by moving the backup to the end (and removing the old backup)?" @@ -1333,7 +1333,7 @@ msgstr "" "Ð ÐµÐ·ÐµÑ€Ð²Ð½Ð°Ñ ÐºÐ¾Ð¿Ð¸Ñ Ñ‚Ð°Ð±Ð»Ð¸Ñ†Ñ‹ GPT находитÑÑ Ð½Ðµ в конце диÑка, как должно быть. " "ИÑправить Ñто, передвинув резервную копию в конец диÑка (и удалив Ñтарую)?" -#: libparted/labels/gpt.c:1024 +#: libparted/labels/gpt.c:1044 msgid "" "Both the primary and backup GPT tables are corrupt. Try making a fresh " "table, and using Parted's rescue feature to recover partitions." @@ -1341,7 +1341,7 @@ msgstr "" "Обе — и главнаÑ, и Ñ€ÐµÐ·ÐµÑ€Ð²Ð½Ð°Ñ Ñ‚Ð°Ð±Ð»Ð¸Ñ†Ñ‹ GPT — повреждены. Попробуйте Ñоздать " "новую и иÑÐ¿Ð¾Ð»ÑŒÐ·ÑƒÑ Parted Ð´Ð»Ñ Ð²Ð¾ÑÑÑ‚Ð°Ð½Ð¾Ð²Ð»ÐµÐ½Ð¸Ñ Ñ€Ð°Ð·Ð´ÐµÐ»Ð¾Ð²." -#: libparted/labels/gpt.c:1035 +#: libparted/labels/gpt.c:1055 msgid "" "The backup GPT table is corrupt, but the primary appears OK, so that will be " "used." @@ -1349,7 +1349,7 @@ msgstr "" "Ð ÐµÐ·ÐµÑ€Ð²Ð½Ð°Ñ Ñ‚Ð°Ð±Ð»Ð¸Ñ†Ð° GPT повреждена, но Ð³Ð»Ð°Ð²Ð½Ð°Ñ ÐºÐ°Ð¶ÐµÑ‚ÑÑ ÐºÐ¾Ñ€Ñ€ÐµÐºÑ‚Ð½Ð¾Ð¹, поÑтому она " "и будет иÑпользоватьÑÑ." -#: libparted/labels/gpt.c:1047 +#: libparted/labels/gpt.c:1067 msgid "" "The primary GPT table is corrupt, but the backup appears OK, so that will be " "used." @@ -1357,11 +1357,11 @@ msgstr "" "Ð“Ð»Ð°Ð²Ð½Ð°Ñ Ñ‚Ð°Ð±Ð»Ð¸Ñ†Ð° GPT повреждена, но Ñ€ÐµÐ·ÐµÑ€Ð²Ð½Ð°Ñ ÐºÐ¾Ð¿Ð¸Ñ ÐºÐ°Ð¶ÐµÑ‚ÑÑ ÐºÐ¾Ñ€Ñ€ÐµÐºÑ‚Ð½Ð¾Ð¹, " "поÑтому она и будет иÑпользоватьÑÑ." -#: libparted/labels/gpt.c:1071 +#: libparted/labels/gpt.c:1091 msgid "primary partition table array CRC mismatch" msgstr "ошибка CRC маÑÑива таблицы оÑновных разделов" -#: libparted/labels/gpt.c:1655 libparted/labels/gpt.c:1682 +#: libparted/labels/gpt.c:1722 libparted/labels/gpt.c:1749 msgid "failed to translate partition name" msgstr "ошибка при транÑлÑции имени раздела" @@ -2036,7 +2036,7 @@ msgstr "fat_table_alloc_cluster: нет Ñвободных клаÑтеров" msgid "Could not detect file system." msgstr "Ðе удаётÑÑ Ð¾Ð¿Ñ€ÐµÐ´ÐµÐ»Ð¸Ñ‚ÑŒ файловую ÑиÑтему." -#: libparted/fs/r/filesys.c:159 libparted/fs/r/filesys.c:284 +#: libparted/fs/r/filesys.c:159 libparted/fs/r/filesys.c:285 #, c-format msgid "resizing %s file systems is not supported" msgstr "изменение размера файловой ÑиÑтемы %s не реализовано" @@ -2325,40 +2325,39 @@ msgid "This HFS+ volume has no extents overflow file. This is quite unusual!" msgstr "" "Ðтот раздел HFS+ не Ñодержит файла размеров перегрузки. ДоÑтаточно необычно!" -#: parted/parted.c:137 +#: parted/parted.c:138 msgid "displays this help message" msgstr "отображает Ñто Ñправочное Ñообщение" -#: parted/parted.c:138 +#: parted/parted.c:139 msgid "lists partition layout on all block devices" msgstr "выводит раÑкладку разделов вÑех блочных уÑтройÑтв" -#: parted/parted.c:139 +#: parted/parted.c:140 msgid "displays machine parseable output" msgstr "отображает вывод Ð´Ð»Ñ Ð¾Ð±Ñ€Ð°Ð±Ð¾Ñ‚ÐºÐ¸ компьютером" -#: parted/parted.c:140 -#, fuzzy +#: parted/parted.c:141 msgid "displays JSON output" -msgstr "отображает вывод Ð´Ð»Ñ Ð¾Ð±Ñ€Ð°Ð±Ð¾Ñ‚ÐºÐ¸ компьютером" +msgstr "отображает вывод JSON" -#: parted/parted.c:141 +#: parted/parted.c:142 msgid "never prompts for user intervention" msgstr "никогда не запрашивает вмешательÑтво пользователÑ" -#: parted/parted.c:142 +#: parted/parted.c:143 msgid "in script mode, fix instead of abort when asked" -msgstr "" +msgstr "режиме ÑÑ†ÐµÐ½Ð°Ñ€Ð¸Ñ Ð·Ð°Ð¿Ñ€Ð°ÑˆÐ¸Ð²Ð°ÐµÑ‚ÑÑ Ð¸Ñправление, а не прерывание работы" -#: parted/parted.c:143 +#: parted/parted.c:144 msgid "displays the version" msgstr "отображает верÑию" -#: parted/parted.c:144 +#: parted/parted.c:145 msgid "alignment for new partitions" msgstr "выравнивание новых разделов" -#: parted/parted.c:157 +#: parted/parted.c:158 msgid "" "NUMBER is the partition number used by Linux. On MS-DOS disk labels, the " "primary partitions number from 1 to 4, logical partitions from 5 onwards.\n" @@ -2367,31 +2366,31 @@ msgstr "" "помечаютÑÑ Ñ‚Ð°Ðº: номерами первичных разделов могут быть Ñ 1 по 4, Ñ 5 и далее " "Ñледуют номера логичеÑких разделов.\n" -#: parted/parted.c:160 +#: parted/parted.c:161 msgid "LABEL-TYPE is one of: " msgstr "ТИП_МЕТКИ один из: " -#: parted/parted.c:161 parted/parted.c:162 +#: parted/parted.c:162 parted/parted.c:163 msgid "FLAG is one of: " msgstr "ФЛÐГ один из: " -#: parted/parted.c:163 +#: parted/parted.c:164 msgid "UNIT is one of: " msgstr "ЕДИÐИЦРодна из: " -#: parted/parted.c:164 +#: parted/parted.c:165 msgid "desired alignment: minimum or optimal" msgstr "предпочитаемое выравнивание: минимальное или оптимальное" -#: parted/parted.c:165 +#: parted/parted.c:166 msgid "PART-TYPE is one of: primary, logical, extended\n" msgstr "ТИП_Ð ÐЗД один из: оÑновной, логичеÑкий, раÑширенный\n" -#: parted/parted.c:167 +#: parted/parted.c:168 msgid "FS-TYPE is one of: " msgstr "ТИП_ФС один из: " -#: parted/parted.c:168 +#: parted/parted.c:169 msgid "" "START and END are disk locations, such as 4GB or 10%. Negative values count " "from the end of the disk. For example, -1s specifies exactly the last " @@ -2401,7 +2400,7 @@ msgstr "" "Отрицательные Ð·Ð½Ð°Ñ‡ÐµÐ½Ð¸Ñ Ð¾Ñ‚ÑчитываютÑÑ Ð¾Ñ‚ конца диÑка. Ðапример, -1s " "обозначает поÑледний Ñектор.\n" -#: parted/parted.c:171 +#: parted/parted.c:172 msgid "" "END is disk location, such as 4GB or 10%. Negative value counts from the " "end of the disk. For example, -1s specifies exactly the last sector.\n" @@ -2410,19 +2409,23 @@ msgstr "" "Ð·Ð½Ð°Ñ‡ÐµÐ½Ð¸Ñ Ð¾Ñ‚ÑчитываютÑÑ Ð¾Ñ‚ конца диÑка. Ðапример, -1s обозначает поÑледний " "Ñектор.\n" -#: parted/parted.c:174 +#: parted/parted.c:175 msgid "STATE is one of: on, off\n" msgstr "СОСТОЯÐИЕ одно из двух: on, off (активно, неактивно)\n" -#: parted/parted.c:175 +#: parted/parted.c:176 msgid "DEVICE is usually /dev/hda or /dev/sda\n" msgstr "УСТРОЙСТВОМ обычно ÑвлÑетÑÑ /dev/hda или /dev/sda\n" -#: parted/parted.c:176 +#: parted/parted.c:177 msgid "NAME is any word you want\n" msgstr "ИМЯ — любое Ñлово, какое захотите\n" -#: parted/parted.c:179 +#: parted/parted.c:178 +msgid "TYPE_ID is a value between 0x01 and 0xff, TYPE_UUID is a UUID\n" +msgstr "" + +#: parted/parted.c:182 msgid "" "Copyright (C) 1998 - 2006 Free Software Foundation, Inc.\n" "This program is free software, covered by the GNU General Public License.\n" @@ -2442,22 +2445,22 @@ msgstr "" "или ПРИГОДÐОСТИ ДЛЯ КОÐКРЕТÐОЙ ЦЕЛИ. Ð”Ð»Ñ Ð¿Ð¾Ð»ÑƒÑ‡ÐµÐ½Ð¸Ñ Ð±Ð¾Ð»ÐµÐµ подробной " "информации Ñмотрите УниверÑальную ОбщеÑтвенную Лицензию GNU.\n" -#: parted/parted.c:229 +#: parted/parted.c:232 #, c-format msgid "%0.f%%\t(time left %.2d:%.2d)" msgstr "%0.f%%\t(времени прошло %.2d:%.2d)" -#: parted/parted.c:248 +#: parted/parted.c:251 #, c-format msgid "Partition %s is being used. Are you sure you want to continue?" msgstr "Раздел %s иÑпользуетÑÑ. Ð’Ñ‹ уверены что хотите продолжить?" -#: parted/parted.c:269 +#: parted/parted.c:272 #, c-format msgid "Partition(s) on %s are being used." msgstr "Разделы на %s иÑпользуютÑÑ." -#: parted/parted.c:281 +#: parted/parted.c:284 #, c-format msgid "" "The existing disk label on %s will be destroyed and all data on this disk " @@ -2466,31 +2469,31 @@ msgstr "" "СущеÑÑ‚Ð²ÑƒÑŽÑ‰Ð°Ñ Ð¼ÐµÑ‚ÐºÐ° диÑка на %s будет уничтожена и вÑе данные на Ñтом диÑке " "будут потерÑны. ДейÑтвительно продолжить?" -#: parted/parted.c:542 +#: parted/parted.c:545 msgid "New disk label type?" msgstr "Ðовый тип метки диÑка?" -#: parted/parted.c:680 +#: parted/parted.c:692 msgid "Partition type?" msgstr "Тип раздела?" -#: parted/parted.c:698 parted/parted.c:902 +#: parted/parted.c:710 parted/parted.c:914 msgid "Partition name?" msgstr "Ð˜Ð¼Ñ Ñ€Ð°Ð·Ð´ÐµÐ»Ð°?" -#: parted/parted.c:708 +#: parted/parted.c:720 msgid "File system type?" msgstr "Тип файловой ÑиÑтемы?" -#: parted/parted.c:713 parted/parted.c:1683 +#: parted/parted.c:725 parted/parted.c:1815 msgid "Start?" msgstr "Ðачало?" -#: parted/parted.c:715 parted/parted.c:1685 parted/parted.c:1768 +#: parted/parted.c:727 parted/parted.c:1817 parted/parted.c:1900 msgid "End?" msgstr "Конец?" -#: parted/parted.c:782 +#: parted/parted.c:794 #, c-format msgid "" "You requested a partition from %s to %s (sectors %llu..%llu).\n" @@ -2500,7 +2503,7 @@ msgstr "" "Ближайшие точки, Ñ ÐºÐ¾Ñ‚Ð¾Ñ€Ñ‹Ð¼Ð¸ мы можем работать, от %s до %s (Ñектора %llu.." "%llu).%s" -#: parted/parted.c:791 +#: parted/parted.c:803 msgid "" "\n" "Is this still acceptable to you?" @@ -2508,151 +2511,176 @@ msgstr "" "\n" "Ðто Ð²Ð°Ñ ÑƒÑтраивает?" -#: parted/parted.c:814 +#: parted/parted.c:826 #, c-format msgid "" "The resulting partition is not properly aligned for best performance: %s" msgstr "" "Полученный раздел не выровнен Ð´Ð»Ñ Ð¾Ð±ÐµÑÐ¿ÐµÑ‡ÐµÐ½Ð¸Ñ Ð»ÑƒÑ‡ÑˆÐµÐ¹ производительноÑти: %s" -#: parted/parted.c:816 parted/parted.c:1925 +#: parted/parted.c:828 parted/parted.c:2057 msgid "unknown (malloc failed)" msgstr "неизвеÑтно (ошибка malloc)" -#: parted/parted.c:894 +#: parted/parted.c:906 #, c-format msgid "%s disk labels do not support partition name." msgstr "Метки диÑков %s не поддерживают Ð¸Ð¼Ñ Ñ€Ð°Ð·Ð´ÐµÐ»Ð°." -#: parted/parted.c:899 parted/parted.c:1748 parted/parted.c:1814 -#: parted/parted.c:1908 parted/parted.c:1983 +#: parted/parted.c:911 parted/parted.c:955 parted/parted.c:1880 +#: parted/parted.c:1946 parted/parted.c:2040 parted/parted.c:2115 msgid "Partition number?" msgstr "Ðомер раздела?" -#: parted/parted.c:1050 +#: parted/parted.c:949 +#, fuzzy, c-format +msgid "%s disk labels do not support partition type." +msgstr "Метки диÑков %s не поддерживают Ð¸Ð¼Ñ Ñ€Ð°Ð·Ð´ÐµÐ»Ð°." + +#: parted/parted.c:965 +#, fuzzy +msgid "Partition type-id?" +msgstr "Тип раздела?" + +#: parted/parted.c:972 +#, fuzzy +msgid "Invalid type-id." +msgstr "Ðеправильный номер." + +#: parted/parted.c:986 +#, fuzzy +msgid "Partition type-uuid?" +msgstr "Тип раздела?" + +#: parted/parted.c:993 +#, fuzzy +msgid "Invalid type-uuid." +msgstr "Ðеправильный номер." + +#: parted/parted.c:1146 #, c-format msgid "BIOS cylinder,head,sector geometry: %d,%d,%d. Each cylinder is %s.\n" msgstr "" "Ð“ÐµÐ¾Ð¼ÐµÑ‚Ñ€Ð¸Ñ Ñ†Ð¸Ð»Ð¸Ð½Ð´Ñ€Ð¾Ð², головок, Ñекторов BIOS: %d,%d,%d. Каждый цилиндр %s.\n" -#: parted/parted.c:1137 +#: parted/parted.c:1240 #, c-format msgid "Model: %s (%s)\n" msgstr "Модель: %s (%s)\n" -#: parted/parted.c:1139 +#: parted/parted.c:1242 #, c-format msgid "Disk %s: %s\n" msgstr "ДиÑк %s: %s\n" -#: parted/parted.c:1140 +#: parted/parted.c:1243 #, c-format msgid "Sector size (logical/physical): %lldB/%lldB\n" msgstr "Размер Ñектора (логич./физич.): %lldB/%lldB\n" -#: parted/parted.c:1152 +#: parted/parted.c:1255 #, c-format msgid "Partition Table: %s\n" msgstr "Таблица разделов: %s\n" -#: parted/parted.c:1153 +#: parted/parted.c:1256 #, c-format msgid "Disk Flags: %s\n" msgstr "Флаги диÑка: %s\n" -#: parted/parted.c:1279 parted/parted.c:1282 +#: parted/parted.c:1388 parted/parted.c:1391 msgid "Number" msgstr "Ðомер" -#: parted/parted.c:1279 parted/parted.c:1282 +#: parted/parted.c:1388 parted/parted.c:1391 msgid "Start" msgstr "Ðачало" -#: parted/parted.c:1280 parted/parted.c:1283 +#: parted/parted.c:1389 parted/parted.c:1392 msgid "End" msgstr "Конец" -#: parted/parted.c:1283 +#: parted/parted.c:1392 msgid "Size" msgstr "Размер" -#: parted/parted.c:1287 +#: parted/parted.c:1396 msgid "Type" msgstr "Тип" -#: parted/parted.c:1289 +#: parted/parted.c:1398 msgid "File system" msgstr "Ð¤Ð°Ð¹Ð»Ð¾Ð²Ð°Ñ ÑиÑтема" -#: parted/parted.c:1292 +#: parted/parted.c:1401 msgid "Name" msgstr "ИмÑ" -#: parted/parted.c:1294 +#: parted/parted.c:1403 msgid "Flags" msgstr "Флаги" -#: parted/parted.c:1352 +#: parted/parted.c:1461 msgid "Free Space" msgstr "Свободное меÑто" -#: parted/parted.c:1570 +#: parted/parted.c:1702 #, c-format msgid "" "A %s %s partition was found at %s -> %s. Do you want to add it to the " "partition table?" msgstr "Раздел %s %s найден на %s -> %s. Добавить его в таблицу разделов?" -#: parted/parted.c:1613 +#: parted/parted.c:1745 msgid "searching for file systems" msgstr "поиÑк файловых ÑиÑтем" -#: parted/parted.c:1720 +#: parted/parted.c:1852 msgid "The resize command has been removed in parted 3.0" msgstr "Команда resize была удалена в parted 3.0" -#: parted/parted.c:1782 +#: parted/parted.c:1914 msgid "" "Shrinking a partition can cause data loss, are you sure you want to continue?" msgstr "" "Уменьшение раздела может привеÑти к потере данных, вы дейÑтвительно хотите " "продолжить?" -#: parted/parted.c:1838 +#: parted/parted.c:1970 msgid "New device?" msgstr "Ðовое уÑтройÑтво?" -#: parted/parted.c:1906 +#: parted/parted.c:2038 msgid "alignment type(min/opt)" msgstr "тип Ð²Ñ‹Ñ€Ð°Ð²Ð½Ð¸Ð²Ð°Ð½Ð¸Ñ (min/opt)" -#: parted/parted.c:1921 +#: parted/parted.c:2053 #, c-format msgid "%d aligned\n" msgstr "%d выровнен\n" -#: parted/parted.c:1923 +#: parted/parted.c:2055 #, c-format msgid "%d not aligned: %s\n" msgstr "%d не выровнен: %s\n" -#: parted/parted.c:1948 parted/parted.c:1985 +#: parted/parted.c:2080 parted/parted.c:2117 msgid "Flag to Invert?" msgstr "Флаг Ð´Ð»Ñ Ð¸Ð½Ð²ÐµÑ€Ñ‚Ð°Ñ†Ð¸Ð¸?" -#: parted/parted.c:1953 parted/parted.c:1990 +#: parted/parted.c:2085 parted/parted.c:2122 msgid "New state?" msgstr "Ðовое ÑоÑтоÑние?" -#: parted/parted.c:2036 +#: parted/parted.c:2168 msgid "Unit?" msgstr "Единица?" -#: parted/parted.c:2171 +#: parted/parted.c:2303 msgid "align-check" msgstr "align-check" -#: parted/parted.c:2174 +#: parted/parted.c:2306 msgid "" "align-check TYPE N check partition N for TYPE(min|opt) " "alignment" @@ -2660,11 +2688,11 @@ msgstr "" "align-check ТИП N проверить, что раздел N выровнен ÑоглаÑно " "ТИПУ(min|opt)" -#: parted/parted.c:2182 +#: parted/parted.c:2314 msgid "help" msgstr "help" -#: parted/parted.c:2185 +#: parted/parted.c:2317 msgid "" "help [COMMAND] print general help, or help on " "COMMAND" @@ -2672,30 +2700,30 @@ msgstr "" "help [КОМÐÐДÐ] раÑпечатать общую Ñправку или Ñправку по " "КОМÐÐДЕ" -#: parted/parted.c:2191 +#: parted/parted.c:2323 msgid "mklabel" msgstr "mklabel" -#: parted/parted.c:2191 +#: parted/parted.c:2323 msgid "mktable" msgstr "mktable" -#: parted/parted.c:2194 +#: parted/parted.c:2326 msgid "" "mklabel,mktable LABEL-TYPE create a new disklabel (partition " "table)" msgstr "" "mklabel,mktable ТИП_МЕТКИ Ñоздать новую метку диÑка (таблицу раздела)" -#: parted/parted.c:2200 +#: parted/parted.c:2332 msgid "mkpart" msgstr "mkpart" -#: parted/parted.c:2203 +#: parted/parted.c:2335 msgid "mkpart PART-TYPE [FS-TYPE] START END make a partition" msgstr "mkpart ТИП_Ð ÐЗД [ТИП_ФС] ÐÐЧ КОРÑоздать раздел" -#: parted/parted.c:2209 +#: parted/parted.c:2341 msgid "" "'mkpart' makes a partition without creating a new file system on the " "partition. FS-TYPE may be specified to set an appropriate partition ID.\n" @@ -2703,29 +2731,27 @@ msgstr "" "mkpart делает раздел без ÑÐ¾Ð·Ð´Ð°Ð½Ð¸Ñ Ð½Ð° нём новой файловой ÑиÑтемы. ТИП_ФС " "должен быть указан Ð´Ð»Ñ Ð·Ð°Ð¿Ð¸Ñи идентификатора раздела\n" -#: parted/parted.c:2214 +#: parted/parted.c:2346 msgid "name" msgstr "name" -#: parted/parted.c:2217 +#: parted/parted.c:2349 msgid "name NUMBER NAME name partition NUMBER as NAME" msgstr "name ÐОМЕРИМЯ назначить ИМЯ разделу Ñ ÐОМЕРом" -#: parted/parted.c:2222 +#: parted/parted.c:2354 msgid "print" msgstr "print" -#: parted/parted.c:2225 -#, fuzzy +#: parted/parted.c:2357 msgid "" "print [devices|free|list,all] display the partition table, or " "available devices, or free space, or all found partitions" msgstr "" -"print [devices|free|list,all|ÐОМЕР] отобразить таблицу разделов, " -"доÑтупные уÑтройÑтва, Ñвободное меÑто, вÑе найденные разделы или " -"определённый раздел" +"print [devices|free|list,all] отобразить таблицу разделов, " +"доÑтупные уÑтройÑтва, Ñвободное меÑто или вÑе найденные разделы" -#: parted/parted.c:2229 +#: parted/parted.c:2361 msgid "" "Without arguments, 'print' displays the entire partition table. However with " "the following arguments it performs various other actions.\n" @@ -2733,11 +2759,11 @@ msgstr "" "Без параметров, «print» отображает вÑÑŽ таблицу разделов. Ðо Ñ Ð¿Ð°Ñ€Ð°Ð¼ÐµÑ‚Ñ€Ð°Ð¼Ð¸ " "могут выполнÑÑ‚ÑŒÑÑ Ð¸ некоторые другие дейÑтвиÑ.\n" -#: parted/parted.c:2231 +#: parted/parted.c:2363 msgid " devices : display all active block devices\n" msgstr " devices : отобразить вÑе активные блочные уÑтройÑтва\n" -#: parted/parted.c:2232 +#: parted/parted.c:2364 msgid "" " free : display information about free unpartitioned space on the " "current block device\n" @@ -2745,26 +2771,26 @@ msgstr "" " free : отображает информацию о Ñвободном, не разбитом проÑтранÑтве на " "текущем блочном уÑтройÑтве\n" -#: parted/parted.c:2234 +#: parted/parted.c:2366 msgid "" " list, all : display the partition tables of all active block devices\n" msgstr "" " list, all : отображает таблицы разделов на вÑех активных блочных " "уÑтройÑтвах\n" -#: parted/parted.c:2238 +#: parted/parted.c:2370 msgid "quit" msgstr "quit" -#: parted/parted.c:2241 +#: parted/parted.c:2373 msgid "quit exit program" msgstr "quit выйти из программы" -#: parted/parted.c:2246 +#: parted/parted.c:2378 msgid "rescue" msgstr "resize" -#: parted/parted.c:2249 +#: parted/parted.c:2381 msgid "" "rescue START END rescue a lost partition near START " "and END" @@ -2772,52 +2798,52 @@ msgstr "" "rescue ÐÐЧÐЛО КОÐЕЦ воÑÑтановить потерÑнный раздел в промежутке " "от ÐÐЧÐЛРдо КОÐЦÐ" -#: parted/parted.c:2255 +#: parted/parted.c:2387 msgid "resize" msgstr "resize" -#: parted/parted.c:2258 +#: parted/parted.c:2390 msgid "The resize command was removed in parted 3.0\n" msgstr "Команда resize была удалена в parted 3.0\n" -#: parted/parted.c:2261 +#: parted/parted.c:2393 msgid "resizepart" msgstr "resizepart" -#: parted/parted.c:2264 +#: parted/parted.c:2396 msgid "resizepart NUMBER END resize partition NUMBER" msgstr "resizepart ÐОМЕРКОÐЕЦ изменить размер раздела ÐОМЕР" -#: parted/parted.c:2269 +#: parted/parted.c:2401 msgid "rm" msgstr "rm" -#: parted/parted.c:2272 +#: parted/parted.c:2404 msgid "rm NUMBER delete partition NUMBER" msgstr "rm ÐОМЕРудалить раздел ÐОМЕР" -#: parted/parted.c:2277 +#: parted/parted.c:2409 msgid "select" msgstr "select" -#: parted/parted.c:2280 +#: parted/parted.c:2412 msgid "select DEVICE choose the device to edit" msgstr "select УСТРОЙСТВО выбор уÑтройÑтва Ð´Ð»Ñ Ñ€ÐµÐ´Ð°ÐºÑ‚Ð¸Ñ€Ð¾Ð²Ð°Ð½Ð¸Ñ" -#: parted/parted.c:2285 +#: parted/parted.c:2417 msgid "disk_set" msgstr "disk_set" -#: parted/parted.c:2288 +#: parted/parted.c:2420 msgid "" "disk_set FLAG STATE change the FLAG on selected device" msgstr "disk_set ФЛÐГ СОСТОЯÐИЕ изменить ФЛÐГ на выбранном уÑтройÑтве" -#: parted/parted.c:2293 +#: parted/parted.c:2425 msgid "disk_toggle" msgstr "disk_toggle" -#: parted/parted.c:2296 +#: parted/parted.c:2428 msgid "" "disk_toggle [FLAG] toggle the state of FLAG on " "selected device" @@ -2825,40 +2851,50 @@ msgstr "" "disk_toggle [ФЛÐГ] переключить ÑоÑтоÑние ФЛÐГРна выбранном " "уÑтройÑтве" -#: parted/parted.c:2302 +#: parted/parted.c:2434 msgid "set" msgstr "set" -#: parted/parted.c:2305 +#: parted/parted.c:2437 msgid "" "set NUMBER FLAG STATE change the FLAG on partition NUMBER" msgstr "set ÐОМЕРФЛÐГ СОСТОЯÐИЕ изменить ФЛÐГ на разделе ÐОМЕР" -#: parted/parted.c:2311 +#: parted/parted.c:2443 msgid "toggle" msgstr "toggle" -#: parted/parted.c:2314 +#: parted/parted.c:2446 msgid "" "toggle [NUMBER [FLAG]] toggle the state of FLAG on " "partition NUMBER" msgstr "" "toggle [ÐОМЕР[ФЛÐГ]] переключить ÑоÑтоÑние ФЛÐГРна разделе ÐОМЕР" -#: parted/parted.c:2320 +#: parted/parted.c:2452 +msgid "type" +msgstr "" + +#: parted/parted.c:2455 +msgid "" +"type NUMBER TYPE-ID or TYPE-UUID type set TYPE-ID or TYPE-UUID of " +"partition NUMBER" +msgstr "" + +#: parted/parted.c:2460 msgid "unit" msgstr "unit" -#: parted/parted.c:2323 +#: parted/parted.c:2463 msgid "unit UNIT set the default unit to UNIT" msgstr "" "unit ЕДИÐИЦРиÑпользовать Ð´Ð»Ñ Ð¸Ð·Ð¼ÐµÑ€ÐµÐ½Ð¸Ð¹ данную ЕДИÐИЦУ" -#: parted/parted.c:2328 +#: parted/parted.c:2468 msgid "version" msgstr "version" -#: parted/parted.c:2331 +#: parted/parted.c:2471 msgid "" "version display the version number and " "copyright information of GNU Parted" @@ -2866,28 +2902,28 @@ msgstr "" "version отображает текущую верÑию GNU " "Parted и информацию о лицензии" -#: parted/parted.c:2335 +#: parted/parted.c:2475 msgid "" "'version' displays copyright and version information corresponding to this " "copy of GNU Parted\n" msgstr "" "version отображает информацию о лицензии и верÑии Ñтой копии GNU Parted\n" -#: parted/parted.c:2405 -#, fuzzy, c-format +#: parted/parted.c:2545 +#, c-format msgid "Usage: %s [-hlmsfv] [-a<align>] [DEVICE [COMMAND [PARAMETERS]]...]\n" msgstr "" -"ИÑпользование: %s [-hlmsv] [-a<align>] [УСТРОЙСТВО [КОМÐÐДР[ПÐÐ ÐМЕТРЫ]]…]\n" +"ИÑпользование: %s [-hlmsfv] [-a<align>] [УСТРОЙСТВО [КОМÐÐДР[ПÐÐ ÐМЕТРЫ]]…]\n" -#: parted/parted.c:2449 +#: parted/parted.c:2589 msgid "No device found" msgstr "УÑтройÑтво не найдено" -#: parted/parted.c:2486 +#: parted/parted.c:2626 msgid "WARNING: You are not superuser. Watch out for permissions.\n" msgstr "Ð’ÐИМÐÐИЕ: у Ð²Ð°Ñ Ð½ÐµÑ‚ прав админиÑтратора. Могут возникнуть проблемы.\n" -#: parted/parted.c:2519 +#: parted/parted.c:2659 msgid "" "You should reinstall your boot loader before rebooting. Read section 4 of " "the Parted User documentation for more information." @@ -2895,7 +2931,7 @@ msgstr "" "Ðужно переуÑтановить загрузчик перед перезагрузкой. Прочтите раздел 4 " "РуководÑтва Ð¿Ð¾Ð»ÑŒÐ·Ð¾Ð²Ð°Ñ‚ÐµÐ»Ñ Parted Ð´Ð»Ñ Ð´Ð¾Ð¿Ð¾Ð»Ð½Ð¸Ñ‚ÐµÐ»ÑŒÐ½Ð¾Ð¹ информации." -#: parted/parted.c:2526 +#: parted/parted.c:2666 msgid "You may need to update /etc/fstab.\n" msgstr "Ðе забудьте обновить /etc/fstab.\n" @@ -3156,69 +3192,69 @@ msgstr "" "\n" "Ошибка: получен обычный Ñигнал SIGILL." -#: parted/ui.c:901 +#: parted/ui.c:904 #, c-format msgid "invalid token: %s" msgstr "недопуÑтимый ключ: %s" -#: parted/ui.c:1082 +#: parted/ui.c:1085 msgid "Expecting a partition number." msgstr "ОжидаетÑÑ Ð½Ð¾Ð¼ÐµÑ€ раздела." -#: parted/ui.c:1091 +#: parted/ui.c:1094 msgid "Partition doesn't exist." msgstr "Раздел не ÑущеÑтвует." -#: parted/ui.c:1111 +#: parted/ui.c:1114 msgid "Expecting a file system type." msgstr "ОжидаетÑÑ Ñ‚Ð¸Ð¿ файловой ÑиÑтемы." -#: parted/ui.c:1118 +#: parted/ui.c:1121 #, c-format msgid "Unknown file system type \"%s\"." msgstr "ÐеизвеÑтный тип файловой ÑиÑтемы «%s»." -#: parted/ui.c:1139 +#: parted/ui.c:1142 msgid "Expecting a disk label type." msgstr "ОжидаетÑÑ Ñ‚Ð¸Ð¿ метки диÑка." -#: parted/ui.c:1170 parted/ui.c:1206 +#: parted/ui.c:1173 parted/ui.c:1209 msgid "No flags supported" msgstr "Флаги не поддерживаютÑÑ" -#: parted/ui.c:1280 +#: parted/ui.c:1283 msgid "Can't create any more partitions." msgstr "Больше разделов Ñоздать нельзÑ." -#: parted/ui.c:1290 +#: parted/ui.c:1293 msgid "Expecting a partition type." msgstr "ОжидаетÑÑ Ñ‚Ð¸Ð¿ раздела." -#: parted/ui.c:1439 +#: parted/ui.c:1442 msgid "on" msgstr "вкл" -#: parted/ui.c:1440 +#: parted/ui.c:1443 msgid "off" msgstr "выкл" -#: parted/ui.c:1457 +#: parted/ui.c:1460 msgid "optimal" msgstr "оптимальный" -#: parted/ui.c:1458 +#: parted/ui.c:1461 msgid "minimal" msgstr "минимальный" -#: parted/ui.c:1591 +#: parted/ui.c:1594 msgid "OPTIONs:" msgstr "КЛЮЧИ:" -#: parted/ui.c:1596 +#: parted/ui.c:1599 msgid "COMMANDs:" msgstr "КОМÐÐДЫ:" -#: parted/ui.c:1599 +#: parted/ui.c:1602 #, c-format msgid "" "\n" @@ -3227,15 +3263,24 @@ msgstr "" "\n" "Об ошибках Ñообщайте по адреÑу: %s\n" -#: parted/ui.c:1606 +#: parted/ui.c:1609 #, c-format msgid "Using %s\n" msgstr "ИÑпользуетÑÑ %s\n" -#: parted/ui.c:1686 +#: parted/ui.c:1689 msgid "This command does not make sense in non-interactive mode.\n" msgstr "Ðта команда ничего не делает в не-интерактивном режиме.\n" +#~ msgid "Extended partitions cannot be hidden on msdos disk labels." +#~ msgstr "РаÑширенные разделы не могут быть Ñкрыты при msdos метках диÑка." + +#~ msgid "" +#~ "Extended partitions cannot be recovery partitions on msdos disk labels." +#~ msgstr "" +#~ "РаÑширенные разделы не могут быть разделами воÑÑÑ‚Ð°Ð½Ð¾Ð²Ð»ÐµÐ½Ð¸Ñ Ð¿Ñ€Ð¸ msdos " +#~ "метках диÑка." + #~ msgid "" #~ " NUMBER : display more detailed information about this particular " #~ "partition\n" @@ -15,7 +15,7 @@ msgid "" msgstr "" "Project-Id-Version: parted 1.6.6\n" "Report-Msgid-Bugs-To: bug-parted@gnu.org\n" -"POT-Creation-Date: 2022-04-18 14:44-0400\n" +"POT-Creation-Date: 2023-04-10 15:50-0700\n" "PO-Revision-Date: 2005-04-04 10:55-0700\n" "Last-Translator: Steven Michael Murphy <murf@e-tools.com>\n" "Language-Team: Kinyarwanda <translation-team-rw@lists.sourceforge.net>\n" @@ -25,25 +25,25 @@ msgstr "" "Content-Transfer-Encoding: 8bit\n" "X-Bugs: Report translation errors to the Language-Team address.\n" -#: lib/argmatch.c:147 +#: lib/argmatch.c:145 #, c-format msgid "invalid argument %s for %s" msgstr "" -#: lib/argmatch.c:148 +#: lib/argmatch.c:146 #, c-format msgid "ambiguous argument %s for %s" msgstr "" -#: lib/argmatch.c:167 lib/argmatch.h:238 +#: lib/argmatch.c:165 lib/argmatch.h:237 msgid "Valid arguments are:" msgstr "" -#: lib/closeout.c:122 libparted/labels/fdasd.c:145 +#: lib/closeout.c:121 libparted/labels/fdasd.c:145 msgid "write error" msgstr "" -#: lib/error.c:195 +#: lib/error.c:193 #, fuzzy msgid "Unknown system error" msgstr "IDOSIYE Sisitemu Ubwoko" @@ -104,11 +104,11 @@ msgstr "" #. If you don't know what to put here, please see #. <https://en.wikipedia.org/wiki/Quotation_marks_in_other_languages> #. and use glyphs suitable for your language. -#: lib/quotearg.c:355 +#: lib/quotearg.c:354 msgid "`" msgstr "" -#: lib/quotearg.c:356 +#: lib/quotearg.c:355 msgid "'" msgstr "" @@ -190,7 +190,7 @@ msgstr "" #. To enquire the regular expression that your system uses for this #. purpose, you can use the command #. locale -k LC_MESSAGES | grep '^yesexpr=' -#: lib/rpmatch.c:150 +#: lib/rpmatch.c:149 msgid "^[yY]" msgstr "" @@ -200,7 +200,7 @@ msgstr "" #. To enquire the regular expression that your system uses for this #. purpose, you can use the command #. locale -k LC_MESSAGES | grep '^noexpr=' -#: lib/rpmatch.c:163 +#: lib/rpmatch.c:162 msgid "^[nN]" msgstr "" @@ -705,70 +705,70 @@ msgstr "" msgid "Unknown disk flag, %d." msgstr "Ibendera Ibendera" -#: libparted/disk.c:1289 +#: libparted/disk.c:1320 #, fuzzy, c-format msgid "%s disk labels do not support extended partitions." msgstr "%sUturango... OYA Gushigikira Byongerewe..." -#: libparted/disk.c:1821 +#: libparted/disk.c:1990 #, fuzzy, c-format msgid "%s disk labels don't support logical or extended partitions." msgstr "" "%sUturango... Gushigikira Bijyanye n'inyurabwenge Cyangwa Byongerewe..." -#: libparted/disk.c:1834 +#: libparted/disk.c:2003 #, fuzzy msgid "Too many primary partitions." msgstr "Amapaji" -#: libparted/disk.c:1843 +#: libparted/disk.c:2012 #, fuzzy, c-format msgid "" "Can't add a logical partition to %s, because there is no extended partition." msgstr "Kongeramo a Bijyanye n'inyurabwenge Kuri ni Oya Byongerewe..." -#: libparted/disk.c:1867 +#: libparted/disk.c:2036 #, fuzzy, c-format msgid "Can't have more than one extended partition on %s." msgstr "Birenzeho Byongerewe... ku" -#: libparted/disk.c:1877 +#: libparted/disk.c:2046 #, fuzzy msgid "Can't have logical partitions outside of the extended partition." msgstr "Bijyanye n'inyurabwenge Hanze Bya i Byongerewe..." -#: libparted/disk.c:1902 +#: libparted/disk.c:2071 #, fuzzy, c-format msgid "Can't have a logical partition outside of the extended partition on %s." msgstr "a Bijyanye n'inyurabwenge Hanze Bya i Byongerewe... ku" -#: libparted/disk.c:1912 +#: libparted/disk.c:2081 #, fuzzy msgid "Can't have a primary partition inside an extended partition." msgstr "a Mo Imbere Byongerewe..." -#: libparted/disk.c:1921 +#: libparted/disk.c:2090 #, fuzzy msgid "Can't have a partition outside the disk!" msgstr "a Hanze i" -#: libparted/disk.c:1972 libparted/disk.c:2150 +#: libparted/disk.c:2141 libparted/disk.c:2319 #, fuzzy msgid "Can't have overlapping partitions." msgstr "iyorosa" -#: libparted/disk.c:2351 +#: libparted/disk.c:2520 msgid "metadata" msgstr "" # svx/source\dialog\labdlg.src:RID_SVXPAGE_CAPTION.LB_WINKEL.1.text -#: libparted/disk.c:2353 +#: libparted/disk.c:2522 #, fuzzy msgid "free" msgstr "Kigenga" # 2175 -#: libparted/disk.c:2355 parted/ui.c:1271 parted/ui.c:1299 +#: libparted/disk.c:2524 parted/ui.c:1274 parted/ui.c:1302 #, fuzzy msgid "extended" msgstr "cya/ byagutse" @@ -777,105 +777,109 @@ msgstr "cya/ byagutse" # sc/source\ui\formdlg\dwfunctr.src:FID_FUNCTION_BOX.CB_CAT.7.text # #-#-#-#-# sc.pot (PACKAGE VERSION) #-#-#-#-# # sc/source\ui\formdlg\formdlgs.src:RID_SCTAB_FUNCTION.LB_CATEGORY.7.text -#: libparted/disk.c:2357 parted/ui.c:1275 parted/ui.c:1303 +#: libparted/disk.c:2526 parted/ui.c:1278 parted/ui.c:1306 #, fuzzy msgid "logical" msgstr "Bijyanye n'inyurabwenge" -#: libparted/disk.c:2359 parted/ui.c:1267 parted/ui.c:1295 +#: libparted/disk.c:2528 parted/ui.c:1270 parted/ui.c:1298 msgid "primary" msgstr "" -#: libparted/disk.c:2375 +#: libparted/disk.c:2544 msgid "boot" msgstr "" -#: libparted/disk.c:2377 +#: libparted/disk.c:2546 msgid "bios_grub" msgstr "" # 5214 -#: libparted/disk.c:2379 +#: libparted/disk.c:2548 #, fuzzy msgid "root" msgstr "Imizi" -#: libparted/disk.c:2381 +#: libparted/disk.c:2550 msgid "swap" msgstr "" # sc/source\ui\navipi\navipi.src:RID_SCDLG_NAVIGATOR.STR_HIDDEN.text -#: libparted/disk.c:2383 +#: libparted/disk.c:2552 msgid "hidden" msgstr "gihishwe" -#: libparted/disk.c:2385 +#: libparted/disk.c:2554 msgid "raid" msgstr "" -#: libparted/disk.c:2387 +#: libparted/disk.c:2556 msgid "lvm" msgstr "" -#: libparted/disk.c:2389 +#: libparted/disk.c:2558 msgid "lba" msgstr "" -#: libparted/disk.c:2391 +#: libparted/disk.c:2560 #, fuzzy msgid "hp-service" msgstr "Serivisi" -#: libparted/disk.c:2393 +#: libparted/disk.c:2562 msgid "palo" msgstr "" -#: libparted/disk.c:2395 +#: libparted/disk.c:2564 msgid "prep" msgstr "" -#: libparted/disk.c:2397 +#: libparted/disk.c:2566 msgid "msftres" msgstr "" -#: libparted/disk.c:2399 +#: libparted/disk.c:2568 msgid "msftdata" msgstr "" -#: libparted/disk.c:2401 +#: libparted/disk.c:2570 msgid "atvrecv" msgstr "" -#: libparted/disk.c:2403 +#: libparted/disk.c:2572 msgid "diag" msgstr "" -#: libparted/disk.c:2405 +#: libparted/disk.c:2574 msgid "legacy_boot" msgstr "" -#: libparted/disk.c:2407 +#: libparted/disk.c:2576 msgid "irst" msgstr "" -#: libparted/disk.c:2409 +#: libparted/disk.c:2578 #, fuzzy msgid "esp" msgstr "Yego" -#: libparted/disk.c:2411 +#: libparted/disk.c:2580 msgid "chromeos_kernel" msgstr "" -#: libparted/disk.c:2413 +#: libparted/disk.c:2582 msgid "bls_boot" msgstr "" -#: libparted/disk.c:2415 +#: libparted/disk.c:2584 msgid "linux-home" msgstr "" -#: libparted/disk.c:2421 +#: libparted/disk.c:2586 +msgid "no_automount" +msgstr "" + +#: libparted/disk.c:2592 #, fuzzy, c-format msgid "Unknown partition flag, %d." msgstr "Ibendera Ibendera" @@ -1060,8 +1064,8 @@ msgid "" msgstr "" #: libparted/labels/atari.c:1662 libparted/labels/bsd.c:563 -#: libparted/labels/dasd.c:895 libparted/labels/dos.c:2303 -#: libparted/labels/dvh.c:770 libparted/labels/gpt.c:1769 +#: libparted/labels/dasd.c:893 libparted/labels/dos.c:2294 +#: libparted/labels/dvh.c:770 libparted/labels/gpt.c:1891 #: libparted/labels/loop.c:244 libparted/labels/mac.c:1409 #: libparted/labels/pc98.c:697 libparted/labels/rdb.c:1054 #: libparted/labels/sun.c:781 @@ -1086,39 +1090,30 @@ msgstr "a Umubare" msgid "Unable to allocate a bsd disklabel slot." msgstr "Kuri a" -#: libparted/labels/dasd.c:626 +#: libparted/labels/dasd.c:634 msgid "The partition table of DASD-LDL device cannot be changed.\n" msgstr "" -#: libparted/labels/dasd.c:921 +#: libparted/labels/dasd.c:919 #, fuzzy msgid "Unable to allocate a dasd disklabel slot" msgstr "Kuri a" -#: libparted/labels/dos.c:1008 +#: libparted/labels/dos.c:1159 #, fuzzy, c-format msgid "Invalid partition table on %s -- wrong signature %x." msgstr "imbonerahamwe# ku Isinya" -#: libparted/labels/dos.c:1036 +#: libparted/labels/dos.c:1187 #, fuzzy, c-format msgid "Invalid partition table - recursive partition on %s." msgstr "imbonerahamwe# ku" -#: libparted/labels/dos.c:1567 -msgid "Extended partitions cannot be hidden on msdos disk labels." -msgstr "" - -#: libparted/labels/dos.c:1579 -#, fuzzy -msgid "Extended partitions cannot be recovery partitions on msdos disk labels." -msgstr "imbonerahamwe# ku" - -#: libparted/labels/dos.c:2285 +#: libparted/labels/dos.c:2276 msgid "Parted can't resize partitions managed by Windows Dynamic Disk." msgstr "" -#: libparted/labels/dos.c:2541 +#: libparted/labels/dos.c:2532 #, fuzzy msgid "cannot create any more partitions" msgstr "Kurema Birenzeho" @@ -1264,19 +1259,19 @@ msgstr "" msgid "Disk geometry does not match a DASD device of type 3390." msgstr "" -#: libparted/labels/gpt.c:569 +#: libparted/labels/gpt.c:589 #, fuzzy msgid "device is too small for GPT" msgstr "Idosiye Sisitemu Gitoya kugirango" -#: libparted/labels/gpt.c:771 +#: libparted/labels/gpt.c:791 #, fuzzy, c-format msgid "" "The format of the GPT partition table is version %x, which is newer than " "what Parted can recognise. Please report this!" msgstr "Imiterere Bya i imbonerahamwe# ni Verisiyo ni RW org" -#: libparted/labels/gpt.c:807 +#: libparted/labels/gpt.c:827 #, c-format msgid "" "Not all of the space available to %s appears to be used, you can fix the GPT " @@ -1284,7 +1279,7 @@ msgid "" "setting? " msgstr "" -#: libparted/labels/gpt.c:1006 +#: libparted/labels/gpt.c:1026 #, fuzzy msgid "" "The backup GPT table is not at the end of the disk, as it should be. Fix, " @@ -1293,32 +1288,32 @@ msgstr "" "Inyibutsa imbonerahamwe# ni OYA ku i Impera Bya i Nka Impuzandengo- Sisitemu " "i ni Gitoya ku i Inyibutsa Kuri i Impera Na i ki/ bishaje Inyibutsa" -#: libparted/labels/gpt.c:1024 +#: libparted/labels/gpt.c:1044 #, fuzzy msgid "" "Both the primary and backup GPT tables are corrupt. Try making a fresh " "table, and using Parted's rescue feature to recover partitions." msgstr "i Na Inyibutsa Imbonerahamwe a imbonerahamwe# Na ikoresha Kuri" -#: libparted/labels/gpt.c:1035 +#: libparted/labels/gpt.c:1055 #, fuzzy msgid "" "The backup GPT table is corrupt, but the primary appears OK, so that will be " "used." msgstr "imbonerahamwe# ni i Inyibutsa YEGO" -#: libparted/labels/gpt.c:1047 +#: libparted/labels/gpt.c:1067 #, fuzzy msgid "" "The primary GPT table is corrupt, but the backup appears OK, so that will be " "used." msgstr "imbonerahamwe# ni i Inyibutsa YEGO" -#: libparted/labels/gpt.c:1071 +#: libparted/labels/gpt.c:1091 msgid "primary partition table array CRC mismatch" msgstr "" -#: libparted/labels/gpt.c:1655 libparted/labels/gpt.c:1682 +#: libparted/labels/gpt.c:1722 libparted/labels/gpt.c:1749 #, fuzzy msgid "failed to translate partition name" msgstr "Umubare" @@ -1976,7 +1971,7 @@ msgstr "Oya Kigenga" msgid "Could not detect file system." msgstr "OYA IDOSIYE Sisitemu" -#: libparted/fs/r/filesys.c:159 libparted/fs/r/filesys.c:284 +#: libparted/fs/r/filesys.c:159 libparted/fs/r/filesys.c:285 #, fuzzy, c-format msgid "resizing %s file systems is not supported" msgstr "kugirango IDOSIYE ni OYA" @@ -2241,43 +2236,43 @@ msgstr "" msgid "This HFS+ volume has no extents overflow file. This is quite unusual!" msgstr "" -#: parted/parted.c:137 +#: parted/parted.c:138 #, fuzzy msgid "displays this help message" msgstr "iyi Ifashayobora Ubutumwa" -#: parted/parted.c:138 +#: parted/parted.c:139 msgid "lists partition layout on all block devices" msgstr "" -#: parted/parted.c:139 +#: parted/parted.c:140 msgid "displays machine parseable output" msgstr "" -#: parted/parted.c:140 +#: parted/parted.c:141 msgid "displays JSON output" msgstr "" -#: parted/parted.c:141 +#: parted/parted.c:142 #, fuzzy msgid "never prompts for user intervention" msgstr "Nta narimwe kugirango Ukoresha:" -#: parted/parted.c:142 +#: parted/parted.c:143 msgid "in script mode, fix instead of abort when asked" msgstr "" -#: parted/parted.c:143 +#: parted/parted.c:144 #, fuzzy msgid "displays the version" msgstr "i Verisiyo" -#: parted/parted.c:144 +#: parted/parted.c:145 #, fuzzy msgid "alignment for new partitions" msgstr "Gukoporora Byongerewe..." -#: parted/parted.c:157 +#: parted/parted.c:158 #, fuzzy msgid "" "NUMBER is the partition number used by Linux. On MS-DOS disk labels, the " @@ -2286,36 +2281,36 @@ msgstr "" "ni i Umubare ku Uturango... i Umubare Bivuye 1. 4. Na Bijyanye " "n'inyurabwenge 5" -#: parted/parted.c:160 +#: parted/parted.c:161 #, fuzzy msgid "LABEL-TYPE is one of: " msgstr "ni Bya" -#: parted/parted.c:161 parted/parted.c:162 +#: parted/parted.c:162 parted/parted.c:163 #, fuzzy msgid "FLAG is one of: " msgstr "ni Bya" -#: parted/parted.c:163 +#: parted/parted.c:164 #, fuzzy msgid "UNIT is one of: " msgstr "ni Bya" -#: parted/parted.c:164 +#: parted/parted.c:165 msgid "desired alignment: minimum or optimal" msgstr "" -#: parted/parted.c:165 +#: parted/parted.c:166 #, fuzzy msgid "PART-TYPE is one of: primary, logical, extended\n" msgstr "ni Bya Bijyanye n'inyurabwenge" -#: parted/parted.c:167 +#: parted/parted.c:168 #, fuzzy msgid "FS-TYPE is one of: " msgstr "ni Bya" -#: parted/parted.c:168 +#: parted/parted.c:169 #, fuzzy msgid "" "START and END are disk locations, such as 4GB or 10%. Negative values count " @@ -2323,28 +2318,32 @@ msgid "" "sector.\n" msgstr "Na in Uduciro IBARA Bivuye i Impera Bya i" -#: parted/parted.c:171 +#: parted/parted.c:172 msgid "" "END is disk location, such as 4GB or 10%. Negative value counts from the " "end of the disk. For example, -1s specifies exactly the last sector.\n" msgstr "" -#: parted/parted.c:174 +#: parted/parted.c:175 #, fuzzy msgid "STATE is one of: on, off\n" msgstr "ni Bya ku" -#: parted/parted.c:175 +#: parted/parted.c:176 #, fuzzy msgid "DEVICE is usually /dev/hda or /dev/sda\n" msgstr "ni Cyangwa" -#: parted/parted.c:176 +#: parted/parted.c:177 #, fuzzy msgid "NAME is any word you want\n" msgstr "ni ijambo" -#: parted/parted.c:179 +#: parted/parted.c:178 +msgid "TYPE_ID is a value between 0x01 and 0xff, TYPE_UUID is a UUID\n" +msgstr "" + +#: parted/parted.c:182 #, fuzzy msgid "" "Copyright (C) 1998 - 2006 Free Software Foundation, Inc.\n" @@ -2359,7 +2358,7 @@ msgstr "" "C Porogaramu ni Kigenga ku i Porogaramu ni in i ATARIIGIHARWE i Bya Cyangwa " "A i kugirango Birenzeho Birambuye" -#: parted/parted.c:229 +#: parted/parted.c:232 #, fuzzy, c-format msgid "%0.f%%\t(time left %.2d:%.2d)" msgstr "" @@ -2372,39 +2371,39 @@ msgstr "" "X- Generator: KBabel 1. 0\n" ". 2D." -#: parted/parted.c:248 +#: parted/parted.c:251 #, fuzzy, c-format msgid "Partition %s is being used. Are you sure you want to continue?" msgstr "ni ni in Gukoresha" -#: parted/parted.c:269 +#: parted/parted.c:272 #, fuzzy, c-format msgid "Partition(s) on %s are being used." msgstr "S ku" -#: parted/parted.c:281 +#: parted/parted.c:284 #, c-format msgid "" "The existing disk label on %s will be destroyed and all data on this disk " "will be lost. Do you want to continue?" msgstr "" -#: parted/parted.c:542 +#: parted/parted.c:545 #, fuzzy msgid "New disk label type?" msgstr "Akarango Ubwoko" -#: parted/parted.c:680 +#: parted/parted.c:692 #, fuzzy msgid "Partition type?" msgstr "Ubwoko" -#: parted/parted.c:698 parted/parted.c:902 +#: parted/parted.c:710 parted/parted.c:914 #, fuzzy msgid "Partition name?" msgstr "Izina:" -#: parted/parted.c:708 +#: parted/parted.c:720 #, fuzzy msgid "File system type?" msgstr "Idosiye Sisitemu Ubwoko" @@ -2417,82 +2416,105 @@ msgstr "Idosiye Sisitemu Ubwoko" # sc/source\ui\src\scfuncs.src:RID_SC_FUNCTION_DESCRIPTIONS2.SC_OPCODE_BETA_DIST.8.text # #-#-#-#-# sc.pot (PACKAGE VERSION) #-#-#-#-# # sc/source\ui\src\scfuncs.src:RID_SC_FUNCTION_DESCRIPTIONS2.SC_OPCODE_BETA_INV.8.text -#: parted/parted.c:713 parted/parted.c:1683 +#: parted/parted.c:725 parted/parted.c:1815 #, fuzzy msgid "Start?" msgstr "Gutangira" # officecfg/registry\schema\org\openoffice\Office\DataAccess.xcs:....FormSearchOptions.SearchPosition..end-of-field.text -#: parted/parted.c:715 parted/parted.c:1685 parted/parted.c:1768 +#: parted/parted.c:727 parted/parted.c:1817 parted/parted.c:1900 #, fuzzy msgid "End?" msgstr "Impera" -#: parted/parted.c:782 +#: parted/parted.c:794 #, c-format msgid "" "You requested a partition from %s to %s (sectors %llu..%llu).\n" "The closest location we can manage is %s to %s (sectors %llu..%llu).%s" msgstr "" -#: parted/parted.c:791 +#: parted/parted.c:803 msgid "" "\n" "Is this still acceptable to you?" msgstr "" -#: parted/parted.c:814 +#: parted/parted.c:826 #, c-format msgid "" "The resulting partition is not properly aligned for best performance: %s" msgstr "" -#: parted/parted.c:816 parted/parted.c:1925 +#: parted/parted.c:828 parted/parted.c:2057 msgid "unknown (malloc failed)" msgstr "" -#: parted/parted.c:894 +#: parted/parted.c:906 #, fuzzy, c-format msgid "%s disk labels do not support partition name." msgstr "%sUturango... OYA Gushigikira Byongerewe..." -#: parted/parted.c:899 parted/parted.c:1748 parted/parted.c:1814 -#: parted/parted.c:1908 parted/parted.c:1983 +#: parted/parted.c:911 parted/parted.c:955 parted/parted.c:1880 +#: parted/parted.c:1946 parted/parted.c:2040 parted/parted.c:2115 #, fuzzy msgid "Partition number?" msgstr "Umubare" -#: parted/parted.c:1050 +#: parted/parted.c:949 +#, fuzzy, c-format +msgid "%s disk labels do not support partition type." +msgstr "%sUturango... OYA Gushigikira Byongerewe..." + +#: parted/parted.c:965 +#, fuzzy +msgid "Partition type-id?" +msgstr "Ubwoko" + +#: parted/parted.c:972 +msgid "Invalid type-id." +msgstr "" + +#: parted/parted.c:986 +#, fuzzy +msgid "Partition type-uuid?" +msgstr "Ubwoko" + +#: parted/parted.c:993 +msgid "Invalid type-uuid." +msgstr "" + +#: parted/parted.c:1146 #, c-format msgid "BIOS cylinder,head,sector geometry: %d,%d,%d. Each cylinder is %s.\n" msgstr "" -#: parted/parted.c:1137 +#: parted/parted.c:1240 #, c-format msgid "Model: %s (%s)\n" msgstr "" -#: parted/parted.c:1139 +#: parted/parted.c:1242 #, fuzzy, c-format msgid "Disk %s: %s\n" msgstr "Akarango Ubwoko" -#: parted/parted.c:1140 +#: parted/parted.c:1243 #, c-format msgid "Sector size (logical/physical): %lldB/%lldB\n" msgstr "" -#: parted/parted.c:1152 +#: parted/parted.c:1255 #, fuzzy, c-format msgid "Partition Table: %s\n" msgstr "Izina:" -#: parted/parted.c:1153 +#: parted/parted.c:1256 #, fuzzy, c-format msgid "Disk Flags: %s\n" msgstr "Akarango Ubwoko" -#: parted/parted.c:1279 parted/parted.c:1282 +#: parted/parted.c:1388 parted/parted.c:1391 msgid "Number" msgstr "" @@ -2504,175 +2526,175 @@ msgstr "" # sc/source\ui\src\scfuncs.src:RID_SC_FUNCTION_DESCRIPTIONS2.SC_OPCODE_BETA_DIST.8.text # #-#-#-#-# sc.pot (PACKAGE VERSION) #-#-#-#-# # sc/source\ui\src\scfuncs.src:RID_SC_FUNCTION_DESCRIPTIONS2.SC_OPCODE_BETA_INV.8.text -#: parted/parted.c:1279 parted/parted.c:1282 +#: parted/parted.c:1388 parted/parted.c:1391 #, fuzzy msgid "Start" msgstr "Gutangira" # officecfg/registry\schema\org\openoffice\Office\DataAccess.xcs:....FormSearchOptions.SearchPosition..end-of-field.text -#: parted/parted.c:1280 parted/parted.c:1283 +#: parted/parted.c:1389 parted/parted.c:1392 #, fuzzy msgid "End" msgstr "Impera" -#: parted/parted.c:1283 +#: parted/parted.c:1392 msgid "Size" msgstr "" -#: parted/parted.c:1287 +#: parted/parted.c:1396 msgid "Type" msgstr "" # officecfg/registry\schema\org\openoffice\Office\Common.xcs:....Save.URL.FileSystem.text -#: parted/parted.c:1289 +#: parted/parted.c:1398 #, fuzzy msgid "File system" msgstr "Idosiye ya sisitemu" -#: parted/parted.c:1292 +#: parted/parted.c:1401 msgid "Name" msgstr "" -#: parted/parted.c:1294 +#: parted/parted.c:1403 msgid "Flags" msgstr "Amabendera" -#: parted/parted.c:1352 +#: parted/parted.c:1461 msgid "Free Space" msgstr "" -#: parted/parted.c:1570 +#: parted/parted.c:1702 #, fuzzy, c-format msgid "" "A %s %s partition was found at %s -> %s. Do you want to add it to the " "partition table?" msgstr "A Byabonetse ku Kuri Kongeramo Kuri i imbonerahamwe#" -#: parted/parted.c:1613 +#: parted/parted.c:1745 #, fuzzy msgid "searching for file systems" msgstr "Ishakisha kugirango IDOSIYE" -#: parted/parted.c:1720 +#: parted/parted.c:1852 msgid "The resize command has been removed in parted 3.0" msgstr "" -#: parted/parted.c:1782 +#: parted/parted.c:1914 msgid "" "Shrinking a partition can cause data loss, are you sure you want to continue?" msgstr "" -#: parted/parted.c:1838 +#: parted/parted.c:1970 #, fuzzy msgid "New device?" msgstr "APAREYE" -#: parted/parted.c:1906 +#: parted/parted.c:2038 msgid "alignment type(min/opt)" msgstr "" -#: parted/parted.c:1921 +#: parted/parted.c:2053 #, c-format msgid "%d aligned\n" msgstr "" -#: parted/parted.c:1923 +#: parted/parted.c:2055 #, c-format msgid "%d not aligned: %s\n" msgstr "" -#: parted/parted.c:1948 parted/parted.c:1985 +#: parted/parted.c:2080 parted/parted.c:2117 #, fuzzy msgid "Flag to Invert?" msgstr "Kuri Guhindura>>" -#: parted/parted.c:1953 parted/parted.c:1990 +#: parted/parted.c:2085 parted/parted.c:2122 #, fuzzy msgid "New state?" msgstr "Leta" -#: parted/parted.c:2036 +#: parted/parted.c:2168 msgid "Unit?" msgstr "" -#: parted/parted.c:2171 +#: parted/parted.c:2303 #, fuzzy msgid "align-check" msgstr "genzura" -#: parted/parted.c:2174 +#: parted/parted.c:2306 msgid "" "align-check TYPE N check partition N for TYPE(min|opt) " "alignment" msgstr "" -#: parted/parted.c:2182 +#: parted/parted.c:2314 #, fuzzy msgid "help" msgstr "Ifashayobora" -#: parted/parted.c:2185 +#: parted/parted.c:2317 #, fuzzy msgid "" "help [COMMAND] print general help, or help on " "COMMAND" msgstr "Ifashayobora Rusange Ifashayobora Cyangwa Ifashayobora ku" -#: parted/parted.c:2191 +#: parted/parted.c:2323 msgid "mklabel" msgstr "" -#: parted/parted.c:2191 +#: parted/parted.c:2323 msgid "mktable" msgstr "" -#: parted/parted.c:2194 +#: parted/parted.c:2326 #, fuzzy msgid "" "mklabel,mktable LABEL-TYPE create a new disklabel (partition " "table)" msgstr "Kurema a Gishya imbonerahamwe#" -#: parted/parted.c:2200 +#: parted/parted.c:2332 msgid "mkpart" msgstr "" -#: parted/parted.c:2203 +#: parted/parted.c:2335 #, fuzzy msgid "mkpart PART-TYPE [FS-TYPE] START END make a partition" msgstr "Ubwoko a" -#: parted/parted.c:2209 +#: parted/parted.c:2341 #, fuzzy msgid "" "'mkpart' makes a partition without creating a new file system on the " "partition. FS-TYPE may be specified to set an appropriate partition ID.\n" msgstr "a a Gishya IDOSIYE Sisitemu ku i Gicurasi Kuri Gushyiraho" -#: parted/parted.c:2214 +#: parted/parted.c:2346 msgid "name" msgstr "izina" -#: parted/parted.c:2217 +#: parted/parted.c:2349 #, fuzzy msgid "name NUMBER NAME name partition NUMBER as NAME" msgstr "Izina: Izina:" # #-#-#-#-# dbaccess.pot (PACKAGE VERSION) #-#-#-#-# # #-#-#-#-# dbaccess.pot (PACKAGE VERSION) #-#-#-#-# -#: parted/parted.c:2222 +#: parted/parted.c:2354 #, fuzzy msgid "print" msgstr "Gucapa" -#: parted/parted.c:2225 +#: parted/parted.c:2357 #, fuzzy msgid "" "print [devices|free|list,all] display the partition table, or " "available devices, or free space, or all found partitions" msgstr "Gucapa Kugaragaza i imbonerahamwe# Cyangwa a" -#: parted/parted.c:2229 +#: parted/parted.c:2361 #, fuzzy msgid "" "Without arguments, 'print' displays the entire partition table. However with " @@ -2680,36 +2702,36 @@ msgid "" msgstr "" "ingingo Gucapa i imbonerahamwe# Umubare ni Hanyuma Birenzeho Ibisobanuro ni" -#: parted/parted.c:2231 +#: parted/parted.c:2363 msgid " devices : display all active block devices\n" msgstr "" -#: parted/parted.c:2232 +#: parted/parted.c:2364 msgid "" " free : display information about free unpartitioned space on the " "current block device\n" msgstr "" -#: parted/parted.c:2234 +#: parted/parted.c:2366 msgid "" " list, all : display the partition tables of all active block devices\n" msgstr "" -#: parted/parted.c:2238 +#: parted/parted.c:2370 #, fuzzy msgid "quit" msgstr "Kuvamo" -#: parted/parted.c:2241 +#: parted/parted.c:2373 #, fuzzy msgid "quit exit program" msgstr "Kuvamo Gusohoka Porogaramu" -#: parted/parted.c:2246 +#: parted/parted.c:2378 msgid "rescue" msgstr "" -#: parted/parted.c:2249 +#: parted/parted.c:2381 #, fuzzy msgid "" "rescue START END rescue a lost partition near START " @@ -2717,131 +2739,141 @@ msgid "" msgstr "a Na" # starmath/source\smres.src:RID_TOOLBOXWINDOW.6.RID_SIZEXY.text -#: parted/parted.c:2255 +#: parted/parted.c:2387 #, fuzzy msgid "resize" msgstr "Kuringaniza" -#: parted/parted.c:2258 +#: parted/parted.c:2390 msgid "The resize command was removed in parted 3.0\n" msgstr "" # starmath/source\smres.src:RID_TOOLBOXWINDOW.6.RID_SIZEXY.text -#: parted/parted.c:2261 +#: parted/parted.c:2393 #, fuzzy msgid "resizepart" msgstr "Kuringaniza" -#: parted/parted.c:2264 +#: parted/parted.c:2396 #, fuzzy msgid "resizepart NUMBER END resize partition NUMBER" msgstr "Gusiba" -#: parted/parted.c:2269 +#: parted/parted.c:2401 msgid "rm" msgstr "" -#: parted/parted.c:2272 +#: parted/parted.c:2404 #, fuzzy msgid "rm NUMBER delete partition NUMBER" msgstr "Gusiba" -#: parted/parted.c:2277 +#: parted/parted.c:2409 msgid "select" msgstr "guhitamo" -#: parted/parted.c:2280 +#: parted/parted.c:2412 #, fuzzy msgid "select DEVICE choose the device to edit" msgstr "Guhitamo Guhitamo i APAREYE Kuri Guhindura" -#: parted/parted.c:2285 +#: parted/parted.c:2417 msgid "disk_set" msgstr "" -#: parted/parted.c:2288 +#: parted/parted.c:2420 msgid "" "disk_set FLAG STATE change the FLAG on selected device" msgstr "" -#: parted/parted.c:2293 +#: parted/parted.c:2425 msgid "disk_toggle" msgstr "" -#: parted/parted.c:2296 +#: parted/parted.c:2428 msgid "" "disk_toggle [FLAG] toggle the state of FLAG on " "selected device" msgstr "" -#: parted/parted.c:2302 +#: parted/parted.c:2434 #, fuzzy msgid "set" msgstr "Gushyiraho" -#: parted/parted.c:2305 +#: parted/parted.c:2437 #, fuzzy msgid "" "set NUMBER FLAG STATE change the FLAG on partition NUMBER" msgstr "Gushyiraho Guhindura>> a Ibendera ku" -#: parted/parted.c:2311 +#: parted/parted.c:2443 msgid "toggle" msgstr "" -#: parted/parted.c:2314 +#: parted/parted.c:2446 msgid "" "toggle [NUMBER [FLAG]] toggle the state of FLAG on " "partition NUMBER" msgstr "" -#: parted/parted.c:2320 +#: parted/parted.c:2452 +msgid "type" +msgstr "" + +#: parted/parted.c:2455 +msgid "" +"type NUMBER TYPE-ID or TYPE-UUID type set TYPE-ID or TYPE-UUID of " +"partition NUMBER" +msgstr "" + +#: parted/parted.c:2460 msgid "unit" msgstr "" -#: parted/parted.c:2323 +#: parted/parted.c:2463 #, fuzzy msgid "unit UNIT set the default unit to UNIT" msgstr "Kuvamo Gusohoka Porogaramu" -#: parted/parted.c:2328 +#: parted/parted.c:2468 msgid "version" msgstr "" -#: parted/parted.c:2331 +#: parted/parted.c:2471 msgid "" "version display the version number and " "copyright information of GNU Parted" msgstr "" -#: parted/parted.c:2335 +#: parted/parted.c:2475 msgid "" "'version' displays copyright and version information corresponding to this " "copy of GNU Parted\n" msgstr "" -#: parted/parted.c:2405 +#: parted/parted.c:2545 #, c-format msgid "Usage: %s [-hlmsfv] [-a<align>] [DEVICE [COMMAND [PARAMETERS]]...]\n" msgstr "" -#: parted/parted.c:2449 +#: parted/parted.c:2589 #, fuzzy msgid "No device found" msgstr "APAREYE Byabonetse" -#: parted/parted.c:2486 +#: parted/parted.c:2626 msgid "WARNING: You are not superuser. Watch out for permissions.\n" msgstr "" -#: parted/parted.c:2519 +#: parted/parted.c:2659 #, fuzzy msgid "" "You should reinstall your boot loader before rebooting. Read section 4 of " "the Parted User documentation for more information." msgstr "Mbere Icyiciro 4. Bya i kugirango Birenzeho Ibisobanuro" -#: parted/parted.c:2526 +#: parted/parted.c:2666 #, fuzzy msgid "You may need to update /etc/fstab.\n" msgstr "Kuri Kuvugurura NIBA" @@ -3025,50 +3057,50 @@ msgid "" "Error: A general SIGILL signal was encountered." msgstr "" -#: parted/ui.c:901 +#: parted/ui.c:904 #, fuzzy, c-format msgid "invalid token: %s" msgstr "imbonerahamwe# ku" -#: parted/ui.c:1082 +#: parted/ui.c:1085 #, fuzzy msgid "Expecting a partition number." msgstr "a Umubare" -#: parted/ui.c:1091 +#: parted/ui.c:1094 msgid "Partition doesn't exist." msgstr "" -#: parted/ui.c:1111 +#: parted/ui.c:1114 #, fuzzy msgid "Expecting a file system type." msgstr "a IDOSIYE Sisitemu Ubwoko" -#: parted/ui.c:1118 +#: parted/ui.c:1121 #, fuzzy, c-format msgid "Unknown file system type \"%s\"." msgstr "IDOSIYE Sisitemu Ubwoko" -#: parted/ui.c:1139 +#: parted/ui.c:1142 #, fuzzy msgid "Expecting a disk label type." msgstr "a Akarango Ubwoko" -#: parted/ui.c:1170 parted/ui.c:1206 +#: parted/ui.c:1173 parted/ui.c:1209 msgid "No flags supported" msgstr "" -#: parted/ui.c:1280 +#: parted/ui.c:1283 #, fuzzy msgid "Can't create any more partitions." msgstr "Kurema Birenzeho" -#: parted/ui.c:1290 +#: parted/ui.c:1293 #, fuzzy msgid "Expecting a partition type." msgstr "a Ubwoko" -#: parted/ui.c:1439 +#: parted/ui.c:1442 msgid "on" msgstr "kuri" @@ -3076,43 +3108,43 @@ msgstr "kuri" # svx/source\svdraw\svdstr.src:STR_ItemValOFF.text # #-#-#-#-# svx.pot (PACKAGE VERSION) #-#-#-#-# # svx/source\svdraw\svdstr.src:STR_ItemValTEXTANI_NONE.text -#: parted/ui.c:1440 +#: parted/ui.c:1443 msgid "off" msgstr "bidakora" -#: parted/ui.c:1457 +#: parted/ui.c:1460 msgid "optimal" msgstr "" -#: parted/ui.c:1458 +#: parted/ui.c:1461 msgid "minimal" msgstr "" # crashrep/source\all\crashrep.lng:%OPTIONS_BUTTON%.text -#: parted/ui.c:1591 +#: parted/ui.c:1594 #, fuzzy msgid "OPTIONs:" msgstr "Amahitamo..." # sfx2/source\doc\docvor.src:DLG_ORGANIZE.BTN_EDIT.text -#: parted/ui.c:1596 +#: parted/ui.c:1599 #, fuzzy msgid "COMMANDs:" msgstr "Amabwiriza" -#: parted/ui.c:1599 +#: parted/ui.c:1602 #, c-format msgid "" "\n" "Report bugs to %s\n" msgstr "" -#: parted/ui.c:1606 +#: parted/ui.c:1609 #, fuzzy, c-format msgid "Using %s\n" msgstr "ikoresha" -#: parted/ui.c:1686 +#: parted/ui.c:1689 msgid "This command does not make sense in non-interactive mode.\n" msgstr "" @@ -7,7 +7,7 @@ msgid "" msgstr "" "Project-Id-Version: parted 3.0.136\n" "Report-Msgid-Bugs-To: bug-parted@gnu.org\n" -"POT-Creation-Date: 2022-04-18 14:44-0400\n" +"POT-Creation-Date: 2023-04-10 15:50-0700\n" "PO-Revision-Date: 2012-02-19 16:31+0100\n" "Last-Translator: Ivan Masár <helix84@centrum.sk>\n" "Language-Team: Slovak <sk-i18n@lists.linux.sk>\n" @@ -17,25 +17,25 @@ msgstr "" "Content-Transfer-Encoding: 8bit\n" "X-Bugs: Report translation errors to the Language-Team address.\n" -#: lib/argmatch.c:147 +#: lib/argmatch.c:145 #, c-format msgid "invalid argument %s for %s" msgstr "neplatný argument %s pre %s" -#: lib/argmatch.c:148 +#: lib/argmatch.c:146 #, c-format msgid "ambiguous argument %s for %s" msgstr "nejednoznaÄný argument %s pre %s" -#: lib/argmatch.c:167 lib/argmatch.h:238 +#: lib/argmatch.c:165 lib/argmatch.h:237 msgid "Valid arguments are:" msgstr "Platné argumenty sú:" -#: lib/closeout.c:122 libparted/labels/fdasd.c:145 +#: lib/closeout.c:121 libparted/labels/fdasd.c:145 msgid "write error" msgstr "chyba zápisu" -#: lib/error.c:195 +#: lib/error.c:193 msgid "Unknown system error" msgstr "Neznáma systémová chyba" @@ -95,11 +95,11 @@ msgstr "%s: voľba vyžaduje argument -- %c\n" #. If you don't know what to put here, please see #. <https://en.wikipedia.org/wiki/Quotation_marks_in_other_languages> #. and use glyphs suitable for your language. -#: lib/quotearg.c:355 +#: lib/quotearg.c:354 msgid "`" msgstr "„" -#: lib/quotearg.c:356 +#: lib/quotearg.c:355 msgid "'" msgstr "“" @@ -182,7 +182,7 @@ msgstr "Žiaden predchádzajúci regulárny výraz" #. To enquire the regular expression that your system uses for this #. purpose, you can use the command #. locale -k LC_MESSAGES | grep '^yesexpr=' -#: lib/rpmatch.c:150 +#: lib/rpmatch.c:149 msgid "^[yY]" msgstr "^[aAáÃyY]" @@ -192,7 +192,7 @@ msgstr "^[aAáÃyY]" #. To enquire the regular expression that your system uses for this #. purpose, you can use the command #. locale -k LC_MESSAGES | grep '^noexpr=' -#: lib/rpmatch.c:163 +#: lib/rpmatch.c:162 msgid "^[nN]" msgstr "^[nN]" @@ -757,161 +757,165 @@ msgstr "pmbr_boot" msgid "Unknown disk flag, %d." msgstr "Neznámý prÃznak disku, %d." -#: libparted/disk.c:1289 +#: libparted/disk.c:1320 #, c-format msgid "%s disk labels do not support extended partitions." msgstr "Menovky disku %s nepodporujú rozÅ¡Ãrené oblasti." -#: libparted/disk.c:1821 +#: libparted/disk.c:1990 #, c-format msgid "%s disk labels don't support logical or extended partitions." msgstr "Menovky disku %s nepodporujú logické alebo rozÅ¡Ãrené oblasti." -#: libparted/disk.c:1834 +#: libparted/disk.c:2003 msgid "Too many primary partitions." msgstr "PrÃliÅ¡ veľa primárnych oblastÃ." -#: libparted/disk.c:1843 +#: libparted/disk.c:2012 #, c-format msgid "" "Can't add a logical partition to %s, because there is no extended partition." msgstr "" "Nemožno pridaÅ¥ logickú oblasÅ¥ do %s, pretože neexistuje rozÅ¡Ãrená oblasÅ¥." -#: libparted/disk.c:1867 +#: libparted/disk.c:2036 #, c-format msgid "Can't have more than one extended partition on %s." msgstr "Nie je možné maÅ¥ na %s viac než jednu rozÅ¡Ãrenú oblasÅ¥." -#: libparted/disk.c:1877 +#: libparted/disk.c:2046 msgid "Can't have logical partitions outside of the extended partition." msgstr "Logické oblasti nemôžu byÅ¥ mimo rozÅ¡Ãrenej oblasti." -#: libparted/disk.c:1902 +#: libparted/disk.c:2071 #, c-format msgid "Can't have a logical partition outside of the extended partition on %s." msgstr "Logická oblasÅ¥ nemôže byÅ¥ mimo rozÅ¡Ãrenej oblasti na %s." -#: libparted/disk.c:1912 +#: libparted/disk.c:2081 msgid "Can't have a primary partition inside an extended partition." msgstr "Primárna oblasÅ¥ nemôže byÅ¥ vnútri rozÅ¡Ãrenej oblasti." -#: libparted/disk.c:1921 +#: libparted/disk.c:2090 msgid "Can't have a partition outside the disk!" msgstr "Nemožno maÅ¥ oblasÅ¥ mimo disku!" -#: libparted/disk.c:1972 libparted/disk.c:2150 +#: libparted/disk.c:2141 libparted/disk.c:2319 msgid "Can't have overlapping partitions." msgstr "Nie je možné maÅ¥ prekrývajúce se oblasti." -#: libparted/disk.c:2351 +#: libparted/disk.c:2520 msgid "metadata" msgstr "metadáta" -#: libparted/disk.c:2353 +#: libparted/disk.c:2522 msgid "free" msgstr "voľné" -#: libparted/disk.c:2355 parted/ui.c:1271 parted/ui.c:1299 +#: libparted/disk.c:2524 parted/ui.c:1274 parted/ui.c:1302 msgid "extended" msgstr "rozÅ¡Ãrený" -#: libparted/disk.c:2357 parted/ui.c:1275 parted/ui.c:1303 +#: libparted/disk.c:2526 parted/ui.c:1278 parted/ui.c:1306 msgid "logical" msgstr "logický" -#: libparted/disk.c:2359 parted/ui.c:1267 parted/ui.c:1295 +#: libparted/disk.c:2528 parted/ui.c:1270 parted/ui.c:1298 msgid "primary" msgstr "primárny" -#: libparted/disk.c:2375 +#: libparted/disk.c:2544 msgid "boot" msgstr "zavádzacÃ" -#: libparted/disk.c:2377 +#: libparted/disk.c:2546 msgid "bios_grub" msgstr "bios_grub" -#: libparted/disk.c:2379 +#: libparted/disk.c:2548 msgid "root" msgstr "koreňový" -#: libparted/disk.c:2381 +#: libparted/disk.c:2550 msgid "swap" msgstr "odkladacÃ" -#: libparted/disk.c:2383 +#: libparted/disk.c:2552 msgid "hidden" msgstr "skrytý" -#: libparted/disk.c:2385 +#: libparted/disk.c:2554 msgid "raid" msgstr "RAID" -#: libparted/disk.c:2387 +#: libparted/disk.c:2556 msgid "lvm" msgstr "LVM" -#: libparted/disk.c:2389 +#: libparted/disk.c:2558 msgid "lba" msgstr "LBA" -#: libparted/disk.c:2391 +#: libparted/disk.c:2560 msgid "hp-service" msgstr "hp-service" -#: libparted/disk.c:2393 +#: libparted/disk.c:2562 msgid "palo" msgstr "palo" -#: libparted/disk.c:2395 +#: libparted/disk.c:2564 msgid "prep" msgstr "prep" -#: libparted/disk.c:2397 +#: libparted/disk.c:2566 msgid "msftres" msgstr "msftres" -#: libparted/disk.c:2399 +#: libparted/disk.c:2568 #, fuzzy msgid "msftdata" msgstr "metadáta" -#: libparted/disk.c:2401 +#: libparted/disk.c:2570 msgid "atvrecv" msgstr "atvrecv" -#: libparted/disk.c:2403 +#: libparted/disk.c:2572 msgid "diag" msgstr "diag" -#: libparted/disk.c:2405 +#: libparted/disk.c:2574 msgid "legacy_boot" msgstr "zastaralé_zavádzanie" -#: libparted/disk.c:2407 +#: libparted/disk.c:2576 msgid "irst" msgstr "" -#: libparted/disk.c:2409 +#: libparted/disk.c:2578 #, fuzzy msgid "esp" msgstr "Ãno" -#: libparted/disk.c:2411 +#: libparted/disk.c:2580 msgid "chromeos_kernel" msgstr "" -#: libparted/disk.c:2413 +#: libparted/disk.c:2582 #, fuzzy msgid "bls_boot" msgstr "pmbr_boot" -#: libparted/disk.c:2415 +#: libparted/disk.c:2584 msgid "linux-home" msgstr "" -#: libparted/disk.c:2421 +#: libparted/disk.c:2586 +msgid "no_automount" +msgstr "" + +#: libparted/disk.c:2592 #, c-format msgid "Unknown partition flag, %d." msgstr "Neznámy prÃznak oblasti, %d." @@ -1102,8 +1106,8 @@ msgid "" msgstr "" #: libparted/labels/atari.c:1662 libparted/labels/bsd.c:563 -#: libparted/labels/dasd.c:895 libparted/labels/dos.c:2303 -#: libparted/labels/dvh.c:770 libparted/labels/gpt.c:1769 +#: libparted/labels/dasd.c:893 libparted/labels/dos.c:2294 +#: libparted/labels/dvh.c:770 libparted/labels/gpt.c:1891 #: libparted/labels/loop.c:244 libparted/labels/mac.c:1409 #: libparted/labels/pc98.c:697 libparted/labels/rdb.c:1054 #: libparted/labels/sun.c:781 @@ -1125,39 +1129,30 @@ msgstr "Nepodarilo sa alokovaÅ¥ ÄÃslo oblasti." msgid "Unable to allocate a bsd disklabel slot." msgstr "Nie je možné alokovaÅ¥ položku menovky disku BSD." -#: libparted/labels/dasd.c:626 +#: libparted/labels/dasd.c:634 msgid "The partition table of DASD-LDL device cannot be changed.\n" msgstr "" -#: libparted/labels/dasd.c:921 +#: libparted/labels/dasd.c:919 msgid "Unable to allocate a dasd disklabel slot" msgstr "Nie je možné alokovaÅ¥ položku menovky disku dasd." -#: libparted/labels/dos.c:1008 +#: libparted/labels/dos.c:1159 #, c-format msgid "Invalid partition table on %s -- wrong signature %x." msgstr "Neplatná tabuľka oblastà na %s - nesprávny podpis %x" -#: libparted/labels/dos.c:1036 +#: libparted/labels/dos.c:1187 #, c-format msgid "Invalid partition table - recursive partition on %s." msgstr "Neplatná tabuľka oblastà - rekurzÃvna oblasÅ¥ na %s." -#: libparted/labels/dos.c:1567 -msgid "Extended partitions cannot be hidden on msdos disk labels." -msgstr "RozÅ¡Ãrené oblasti nie je možné skryÅ¥ na Å¡tÃtkoch diskov msdos." - -#: libparted/labels/dos.c:1579 -#, fuzzy -msgid "Extended partitions cannot be recovery partitions on msdos disk labels." -msgstr "RozÅ¡Ãrené oblasti nie je možné skryÅ¥ na Å¡tÃtkoch diskov msdos." - -#: libparted/labels/dos.c:2285 +#: libparted/labels/dos.c:2276 msgid "Parted can't resize partitions managed by Windows Dynamic Disk." msgstr "" "Parted nemôže zmeniÅ¥ veľkosÅ¥ oblastÃ, ktoré spravuje Windows Dynamic Disk." -#: libparted/labels/dos.c:2541 +#: libparted/labels/dos.c:2532 msgid "cannot create any more partitions" msgstr "nie je možné vytvoriÅ¥ žiadne ÄalÅ¡ie oblasti" @@ -1298,12 +1293,12 @@ msgstr "Nebolo možné zistiÅ¥ informácie o veľkosti bloku." msgid "Disk geometry does not match a DASD device of type 3390." msgstr "" -#: libparted/labels/gpt.c:569 +#: libparted/labels/gpt.c:589 #, fuzzy msgid "device is too small for GPT" msgstr "Systém súborov je prÃliÅ¡ malý na %lu blokov." -#: libparted/labels/gpt.c:771 +#: libparted/labels/gpt.c:791 #, c-format msgid "" "The format of the GPT partition table is version %x, which is newer than " @@ -1312,7 +1307,7 @@ msgstr "" "Formát tabuľky oblastà GPT je verzie %x, Äo je novÅ¡Ã, než ktorý dokáže " "rozpoznaÅ¥ Parted. ProsÃm, poÅ¡lite nám o tom hlásenie!" -#: libparted/labels/gpt.c:807 +#: libparted/labels/gpt.c:827 #, c-format msgid "" "Not all of the space available to %s appears to be used, you can fix the GPT " @@ -1323,7 +1318,7 @@ msgstr "" "aby využÃvalo vÅ¡etok dostupný priestor (ÄalÅ¡Ãch %llu blokov) alebo " "pokraÄovaÅ¥ s aktuálnym nastavenÃm? " -#: libparted/labels/gpt.c:1006 +#: libparted/labels/gpt.c:1026 #, fuzzy msgid "" "The backup GPT table is not at the end of the disk, as it should be. Fix, " @@ -1333,7 +1328,7 @@ msgstr "" "znamená, že iný operaÄný systém si myslÃ, že disk je menÅ¡Ã. Mám to opraviÅ¥ " "presunutÃm zálohy na koniec (a odstránenÃm starej zálohy)?" -#: libparted/labels/gpt.c:1024 +#: libparted/labels/gpt.c:1044 msgid "" "Both the primary and backup GPT tables are corrupt. Try making a fresh " "table, and using Parted's rescue feature to recover partitions." @@ -1341,7 +1336,7 @@ msgstr "" "Primárna aj záložná tabuľka GPT je poÅ¡kodená. Skúste vytvoriÅ¥ novú tabuľku a " "obnoviÅ¥ oblasti pomocou možnosti Partedu rescue." -#: libparted/labels/gpt.c:1035 +#: libparted/labels/gpt.c:1055 msgid "" "The backup GPT table is corrupt, but the primary appears OK, so that will be " "used." @@ -1349,7 +1344,7 @@ msgstr "" "Záložná tabuľka GPT je poÅ¡kodená, ale primárna sa zdá byÅ¥ v poriadku, takže " "sa použije primárna." -#: libparted/labels/gpt.c:1047 +#: libparted/labels/gpt.c:1067 msgid "" "The primary GPT table is corrupt, but the backup appears OK, so that will be " "used." @@ -1357,11 +1352,11 @@ msgstr "" "Primárna tabuľka GPT je poÅ¡kodená, ale záloha sa zdá byÅ¥ v poriadku, takže " "sa použije záloha." -#: libparted/labels/gpt.c:1071 +#: libparted/labels/gpt.c:1091 msgid "primary partition table array CRC mismatch" msgstr "nezodpovedá CRC poľa primárnej tabuľky oblastÃ" -#: libparted/labels/gpt.c:1655 libparted/labels/gpt.c:1682 +#: libparted/labels/gpt.c:1722 libparted/labels/gpt.c:1749 #, fuzzy msgid "failed to translate partition name" msgstr "Nepodarilo sa alokovaÅ¥ ÄÃslo oblasti." @@ -2031,7 +2026,7 @@ msgstr "fat_table_alloc_cluster: nie sú voľné klastre" msgid "Could not detect file system." msgstr "Nebolo možné detekovaÅ¥ systém súborov." -#: libparted/fs/r/filesys.c:159 libparted/fs/r/filesys.c:284 +#: libparted/fs/r/filesys.c:159 libparted/fs/r/filesys.c:285 #, c-format msgid "resizing %s file systems is not supported" msgstr "zmena veľkosti súborových systémov %s nie je podporovaná" @@ -2316,40 +2311,40 @@ msgid "This HFS+ volume has no extents overflow file. This is quite unusual!" msgstr "" "Tento zväzok HFS+ nemá súbor preteÄenà rozsahov. To je dosÅ¥ nezvyÄajné!" -#: parted/parted.c:137 +#: parted/parted.c:138 msgid "displays this help message" msgstr "zobrazà túto správu pomocnÃka" -#: parted/parted.c:138 +#: parted/parted.c:139 msgid "lists partition layout on all block devices" msgstr "vypÃÅ¡e rozloženie oblastà na vÅ¡etkých blokových zariadeniach" -#: parted/parted.c:139 +#: parted/parted.c:140 msgid "displays machine parseable output" msgstr "zobrazà strojovo Äitateľný výstup" -#: parted/parted.c:140 +#: parted/parted.c:141 #, fuzzy msgid "displays JSON output" msgstr "zobrazà strojovo Äitateľný výstup" -#: parted/parted.c:141 +#: parted/parted.c:142 msgid "never prompts for user intervention" msgstr "nikdy nežiada o zásah použÃvateľa" -#: parted/parted.c:142 +#: parted/parted.c:143 msgid "in script mode, fix instead of abort when asked" msgstr "" -#: parted/parted.c:143 +#: parted/parted.c:144 msgid "displays the version" msgstr "zobrazà verziu" -#: parted/parted.c:144 +#: parted/parted.c:145 msgid "alignment for new partitions" msgstr "zarovnanie nových oblastÃ" -#: parted/parted.c:157 +#: parted/parted.c:158 msgid "" "NUMBER is the partition number used by Linux. On MS-DOS disk labels, the " "primary partitions number from 1 to 4, logical partitions from 5 onwards.\n" @@ -2357,31 +2352,31 @@ msgstr "" "ÄŒÃSLO je ÄÃslo oblasti, ktorú použÃva Linux. Na menovkách disku msdos majú " "primárne oblasti ÄÃsla 1-4 a logické oblasti sú od 5 Äalej.\n" -#: parted/parted.c:160 +#: parted/parted.c:161 msgid "LABEL-TYPE is one of: " msgstr "TYP-JMENOVKY je jeden z: " -#: parted/parted.c:161 parted/parted.c:162 +#: parted/parted.c:162 parted/parted.c:163 msgid "FLAG is one of: " msgstr "PREPÃNAÄŒ je jeden z: " -#: parted/parted.c:163 +#: parted/parted.c:164 msgid "UNIT is one of: " msgstr "JEDNOTKA je jedno z: " -#: parted/parted.c:164 +#: parted/parted.c:165 msgid "desired alignment: minimum or optimal" msgstr "požadovan zarovnanie: minimálne alebo optimálne" -#: parted/parted.c:165 +#: parted/parted.c:166 msgid "PART-TYPE is one of: primary, logical, extended\n" msgstr "TYP-ODDIELU je jeden z: primary, logical, extended\n" -#: parted/parted.c:167 +#: parted/parted.c:168 msgid "FS-TYPE is one of: " msgstr "TYP-FS je jeden z: " -#: parted/parted.c:168 +#: parted/parted.c:169 msgid "" "START and END are disk locations, such as 4GB or 10%. Negative values count " "from the end of the disk. For example, -1s specifies exactly the last " @@ -2390,7 +2385,7 @@ msgstr "" "ZAÄŒIATOK a KONIEC sú pozÃcie na disku, napr 4 GB alebo 10%. Záporné hodnoty " "sa poÄÃtajú od konca disku. NaprÃklad -1s znamená presne posledný sektor.\n" -#: parted/parted.c:171 +#: parted/parted.c:172 #, fuzzy msgid "" "END is disk location, such as 4GB or 10%. Negative value counts from the " @@ -2399,19 +2394,23 @@ msgstr "" "ZAÄŒIATOK a KONIEC sú pozÃcie na disku, napr 4 GB alebo 10%. Záporné hodnoty " "sa poÄÃtajú od konca disku. NaprÃklad -1s znamená presne posledný sektor.\n" -#: parted/parted.c:174 +#: parted/parted.c:175 msgid "STATE is one of: on, off\n" msgstr "STAV je jeden z: on, off\n" -#: parted/parted.c:175 +#: parted/parted.c:176 msgid "DEVICE is usually /dev/hda or /dev/sda\n" msgstr "zariadenie je obvykle /dev/hda alebo /dev/sda\n" -#: parted/parted.c:176 +#: parted/parted.c:177 msgid "NAME is any word you want\n" msgstr "NÃZEV je ľubovoľné slovo\n" -#: parted/parted.c:179 +#: parted/parted.c:178 +msgid "TYPE_ID is a value between 0x01 and 0xff, TYPE_UUID is a UUID\n" +msgstr "" + +#: parted/parted.c:182 msgid "" "Copyright (C) 1998 - 2006 Free Software Foundation, Inc.\n" "This program is free software, covered by the GNU General Public License.\n" @@ -2431,24 +2430,24 @@ msgstr "" "GNU General Public License.\n" "\n" -#: parted/parted.c:229 +#: parted/parted.c:232 #, c-format msgid "%0.f%%\t(time left %.2d:%.2d)" msgstr "%0.f%%\t(zostávajúci Äas %.2d:%.2d)" -#: parted/parted.c:248 +#: parted/parted.c:251 #, fuzzy, c-format msgid "Partition %s is being used. Are you sure you want to continue?" msgstr "" "OblasÅ¥ %s sa použÃva. Predtým, než vykonáte zmeny pomocou Parted ju musÃte " "odpojiÅ¥." -#: parted/parted.c:269 +#: parted/parted.c:272 #, c-format msgid "Partition(s) on %s are being used." msgstr "Oblasti na %s sa použÃvajú." -#: parted/parted.c:281 +#: parted/parted.c:284 #, c-format msgid "" "The existing disk label on %s will be destroyed and all data on this disk " @@ -2457,31 +2456,31 @@ msgstr "" "Existujúca menovka disku na %s sa zniÄà a vÅ¡etky dáta na oddiele sa stratia. " "Chcete pokraÄovaÅ¥?" -#: parted/parted.c:542 +#: parted/parted.c:545 msgid "New disk label type?" msgstr "Typ novej menovky disku?" -#: parted/parted.c:680 +#: parted/parted.c:692 msgid "Partition type?" msgstr "Typ oblasti?" -#: parted/parted.c:698 parted/parted.c:902 +#: parted/parted.c:710 parted/parted.c:914 msgid "Partition name?" msgstr "Názov oblasti?" -#: parted/parted.c:708 +#: parted/parted.c:720 msgid "File system type?" msgstr "Typ súborového systému?" -#: parted/parted.c:713 parted/parted.c:1683 +#: parted/parted.c:725 parted/parted.c:1815 msgid "Start?" msgstr "ZaÄiatok?" -#: parted/parted.c:715 parted/parted.c:1685 parted/parted.c:1768 +#: parted/parted.c:727 parted/parted.c:1817 parted/parted.c:1900 msgid "End?" msgstr "Koniec?" -#: parted/parted.c:782 +#: parted/parted.c:794 #, c-format msgid "" "You requested a partition from %s to %s (sectors %llu..%llu).\n" @@ -2490,7 +2489,7 @@ msgstr "" "Vyžiadali ste oblasÅ¥ od %s do %s (sektory %llu..%llu).\n" "Najbližšie možné miesto je od %s do %s (sektory %llu..%llu).%s" -#: parted/parted.c:791 +#: parted/parted.c:803 msgid "" "\n" "Is this still acceptable to you?" @@ -2498,95 +2497,120 @@ msgstr "" "\n" "Je to pre vás eÅ¡te prijateľné?" -#: parted/parted.c:814 +#: parted/parted.c:826 #, fuzzy, c-format msgid "" "The resulting partition is not properly aligned for best performance: %s" msgstr "" "Výsledná oblasÅ¥ nie je správne zarovnaná, Äo sa prejavà zhorÅ¡eným výkonom." -#: parted/parted.c:816 parted/parted.c:1925 +#: parted/parted.c:828 parted/parted.c:2057 msgid "unknown (malloc failed)" msgstr "" -#: parted/parted.c:894 +#: parted/parted.c:906 #, fuzzy, c-format msgid "%s disk labels do not support partition name." msgstr "Menovky disku %s nepodporujú rozÅ¡Ãrené oblasti." -#: parted/parted.c:899 parted/parted.c:1748 parted/parted.c:1814 -#: parted/parted.c:1908 parted/parted.c:1983 +#: parted/parted.c:911 parted/parted.c:955 parted/parted.c:1880 +#: parted/parted.c:1946 parted/parted.c:2040 parted/parted.c:2115 msgid "Partition number?" msgstr "ÄŒÃslo oblasti?" -#: parted/parted.c:1050 +#: parted/parted.c:949 +#, fuzzy, c-format +msgid "%s disk labels do not support partition type." +msgstr "Menovky disku %s nepodporujú rozÅ¡Ãrené oblasti." + +#: parted/parted.c:965 +#, fuzzy +msgid "Partition type-id?" +msgstr "Typ oblasti?" + +#: parted/parted.c:972 +#, fuzzy +msgid "Invalid type-id." +msgstr "Neplatné ÄÃslo." + +#: parted/parted.c:986 +#, fuzzy +msgid "Partition type-uuid?" +msgstr "Typ oblasti?" + +#: parted/parted.c:993 +#, fuzzy +msgid "Invalid type-uuid." +msgstr "Neplatné ÄÃslo." + +#: parted/parted.c:1146 #, c-format msgid "BIOS cylinder,head,sector geometry: %d,%d,%d. Each cylinder is %s.\n" msgstr "" "BIOS geometria cylinder,hlava,sektor: %d,%d,%d. Každý cylinder má %s.\n" -#: parted/parted.c:1137 +#: parted/parted.c:1240 #, c-format msgid "Model: %s (%s)\n" msgstr "Model: %s (%s)\n" -#: parted/parted.c:1139 +#: parted/parted.c:1242 #, c-format msgid "Disk %s: %s\n" msgstr "Disk %s: %s\n" -#: parted/parted.c:1140 +#: parted/parted.c:1243 #, c-format msgid "Sector size (logical/physical): %lldB/%lldB\n" msgstr "VeľkosÅ¥ sektora (logická/fyzická): %lldB/%lldB\n" -#: parted/parted.c:1152 +#: parted/parted.c:1255 #, c-format msgid "Partition Table: %s\n" msgstr "Tabuľka oblastÃ: %s\n" -#: parted/parted.c:1153 +#: parted/parted.c:1256 #, c-format msgid "Disk Flags: %s\n" msgstr "PrÃznaky disku: %s\n" -#: parted/parted.c:1279 parted/parted.c:1282 +#: parted/parted.c:1388 parted/parted.c:1391 msgid "Number" msgstr "ÄŒÃslo" -#: parted/parted.c:1279 parted/parted.c:1282 +#: parted/parted.c:1388 parted/parted.c:1391 msgid "Start" msgstr "ZaÄiatok" -#: parted/parted.c:1280 parted/parted.c:1283 +#: parted/parted.c:1389 parted/parted.c:1392 msgid "End" msgstr "Koniec" -#: parted/parted.c:1283 +#: parted/parted.c:1392 msgid "Size" msgstr "VeľkosÅ¥" -#: parted/parted.c:1287 +#: parted/parted.c:1396 msgid "Type" msgstr "Typ" -#: parted/parted.c:1289 +#: parted/parted.c:1398 msgid "File system" msgstr "Súborový systém" -#: parted/parted.c:1292 +#: parted/parted.c:1401 msgid "Name" msgstr "Názov" -#: parted/parted.c:1294 +#: parted/parted.c:1403 msgid "Flags" msgstr "PrepÃnaÄe" -#: parted/parted.c:1352 +#: parted/parted.c:1461 msgid "Free Space" msgstr "Voľné miesto" -#: parted/parted.c:1570 +#: parted/parted.c:1702 #, c-format msgid "" "A %s %s partition was found at %s -> %s. Do you want to add it to the " @@ -2594,54 +2618,54 @@ msgid "" msgstr "" "Bola nájdená oblasÅ¥ %s %s na %s -> %s. Chcete ju pridaÅ¥ do tabuľky oblastÃ?" -#: parted/parted.c:1613 +#: parted/parted.c:1745 msgid "searching for file systems" msgstr "hľadám systémy súborov" -#: parted/parted.c:1720 +#: parted/parted.c:1852 msgid "The resize command has been removed in parted 3.0" msgstr "" -#: parted/parted.c:1782 +#: parted/parted.c:1914 msgid "" "Shrinking a partition can cause data loss, are you sure you want to continue?" msgstr "" -#: parted/parted.c:1838 +#: parted/parted.c:1970 msgid "New device?" msgstr "Nové zariadenie?" -#: parted/parted.c:1906 +#: parted/parted.c:2038 msgid "alignment type(min/opt)" msgstr "typ zarovnania(min/opt)" -#: parted/parted.c:1921 +#: parted/parted.c:2053 #, c-format msgid "%d aligned\n" msgstr "%d zarovnané\n" -#: parted/parted.c:1923 +#: parted/parted.c:2055 #, fuzzy, c-format msgid "%d not aligned: %s\n" msgstr "%d nezarovnané\n" -#: parted/parted.c:1948 parted/parted.c:1985 +#: parted/parted.c:2080 parted/parted.c:2117 msgid "Flag to Invert?" msgstr "PrepÃnaÄ, který sa má zmeniÅ¥?" -#: parted/parted.c:1953 parted/parted.c:1990 +#: parted/parted.c:2085 parted/parted.c:2122 msgid "New state?" msgstr "Nový stav?" -#: parted/parted.c:2036 +#: parted/parted.c:2168 msgid "Unit?" msgstr "Jednotka?" -#: parted/parted.c:2171 +#: parted/parted.c:2303 msgid "align-check" msgstr "kontrola-zarovnania" -#: parted/parted.c:2174 +#: parted/parted.c:2306 #, fuzzy msgid "" "align-check TYPE N check partition N for TYPE(min|opt) " @@ -2650,11 +2674,11 @@ msgstr "" "align-check TYP N skontrolovaÅ¥ zarovnanie TYP(min|" "opt) na oblasti N" -#: parted/parted.c:2182 +#: parted/parted.c:2314 msgid "help" msgstr "help" -#: parted/parted.c:2185 +#: parted/parted.c:2317 msgid "" "help [COMMAND] print general help, or help on " "COMMAND" @@ -2662,15 +2686,15 @@ msgstr "" "help [PRÃKAZ] vypÃÅ¡e vÅ¡eobecného pomocnÃka alebo " "pomocnÃka o PRÃKAZE" -#: parted/parted.c:2191 +#: parted/parted.c:2323 msgid "mklabel" msgstr "mklabel" -#: parted/parted.c:2191 +#: parted/parted.c:2323 msgid "mktable" msgstr "mktable" -#: parted/parted.c:2194 +#: parted/parted.c:2326 msgid "" "mklabel,mktable LABEL-TYPE create a new disklabel (partition " "table)" @@ -2678,15 +2702,15 @@ msgstr "" "mklabel TYP-MENOVKY vytvorà novú menovku disku (tabuľku " "oblastÃ)" -#: parted/parted.c:2200 +#: parted/parted.c:2332 msgid "mkpart" msgstr "mkpart" -#: parted/parted.c:2203 +#: parted/parted.c:2335 msgid "mkpart PART-TYPE [FS-TYPE] START END make a partition" msgstr "mkpart TYP-ODDIELU [TYP-FS] ZAÄŒIATOK KONIEC vytvorà oblasÅ¥" -#: parted/parted.c:2209 +#: parted/parted.c:2341 msgid "" "'mkpart' makes a partition without creating a new file system on the " "partition. FS-TYPE may be specified to set an appropriate partition ID.\n" @@ -2694,19 +2718,19 @@ msgstr "" "„mkpart“ vytvorà oblasÅ¥ bez toho, aby vytvoril nový systém súborov na nej. " "TYP-FS môže Å¡pecifikovaÅ¥ zodpovedajúci ID oblasti.\n" -#: parted/parted.c:2214 +#: parted/parted.c:2346 msgid "name" msgstr "name" -#: parted/parted.c:2217 +#: parted/parted.c:2349 msgid "name NUMBER NAME name partition NUMBER as NAME" msgstr "name MINOR NÃZOV nazvaÅ¥ oblasÅ¥ MINOR NÃZVOM" -#: parted/parted.c:2222 +#: parted/parted.c:2354 msgid "print" msgstr "print" -#: parted/parted.c:2225 +#: parted/parted.c:2357 #, fuzzy msgid "" "print [devices|free|list,all] display the partition table, or " @@ -2715,7 +2739,7 @@ msgstr "" "print [devices|free|list,all|ÄŒÃSLO] zobrazà tabuľku oblastÃ, dostupné " "zariadenia, voľné miesto, vÅ¡etky nájdené oblasti alebo konkrétnu oblasÅ¥" -#: parted/parted.c:2229 +#: parted/parted.c:2361 msgid "" "Without arguments, 'print' displays the entire partition table. However with " "the following arguments it performs various other actions.\n" @@ -2723,11 +2747,11 @@ msgstr "" "„print“ bez argumentov zobrazà celú tabuľku oblastÃ. S nasledovnými " "argumentami vÅ¡ak vykoná rôzne iné Äinnosti.\n" -#: parted/parted.c:2231 +#: parted/parted.c:2363 msgid " devices : display all active block devices\n" msgstr " devices : zobrazà vÅ¡etky aktÃvne blokové zariadenia\n" -#: parted/parted.c:2232 +#: parted/parted.c:2364 msgid "" " free : display information about free unpartitioned space on the " "current block device\n" @@ -2735,26 +2759,26 @@ msgstr "" " free : zobrazà informácie o voľnom mieste nerozdelenom medzi oblasti " "na aktuálnom blokovom zariadenÃ\n" -#: parted/parted.c:2234 +#: parted/parted.c:2366 msgid "" " list, all : display the partition tables of all active block devices\n" msgstr "" " list, all : zobrazà tabuľky oblastà vÅ¡etkých aktÃvnych blokových " "zariadenÃ\n" -#: parted/parted.c:2238 +#: parted/parted.c:2370 msgid "quit" msgstr "quit" -#: parted/parted.c:2241 +#: parted/parted.c:2373 msgid "quit exit program" msgstr "quit ukonÄiÅ¥ program" -#: parted/parted.c:2246 +#: parted/parted.c:2378 msgid "rescue" msgstr "rescue" -#: parted/parted.c:2249 +#: parted/parted.c:2381 msgid "" "rescue START END rescue a lost partition near START " "and END" @@ -2762,97 +2786,108 @@ msgstr "" "rescue ZAÄŒIATOK KONIEC zachrániÅ¥ stratenú oblasÅ¥ v " "blÃzkosti ZAÄŒIATKU a KONCA" -#: parted/parted.c:2255 +#: parted/parted.c:2387 msgid "resize" msgstr "resize" -#: parted/parted.c:2258 +#: parted/parted.c:2390 msgid "The resize command was removed in parted 3.0\n" msgstr "" -#: parted/parted.c:2261 +#: parted/parted.c:2393 #, fuzzy msgid "resizepart" msgstr "resize" -#: parted/parted.c:2264 +#: parted/parted.c:2396 #, fuzzy msgid "resizepart NUMBER END resize partition NUMBER" msgstr "move ÄŒÃSLO ZAÄŒIATOK KONIEC presunúť oblasÅ¥ ÄŒÃSLO" -#: parted/parted.c:2269 +#: parted/parted.c:2401 msgid "rm" msgstr "rm" -#: parted/parted.c:2272 +#: parted/parted.c:2404 msgid "rm NUMBER delete partition NUMBER" msgstr "rm MINOR odstrániÅ¥ oblasÅ¥ MINOR" -#: parted/parted.c:2277 +#: parted/parted.c:2409 msgid "select" msgstr "select" -#: parted/parted.c:2280 +#: parted/parted.c:2412 msgid "select DEVICE choose the device to edit" msgstr "" "select zariadenie zvoliÅ¥ zariadenie, ktoré sa má " "upravovaÅ¥" -#: parted/parted.c:2285 +#: parted/parted.c:2417 msgid "disk_set" msgstr "sada_diskov" -#: parted/parted.c:2288 +#: parted/parted.c:2420 msgid "" "disk_set FLAG STATE change the FLAG on selected device" msgstr "sada_diskov PREPÃNAÄŒ STAV zmeniÅ¥ voľbu na oblasti MINOR" -#: parted/parted.c:2293 +#: parted/parted.c:2425 msgid "disk_toggle" msgstr "disk_toggle" -#: parted/parted.c:2296 +#: parted/parted.c:2428 msgid "" "disk_toggle [FLAG] toggle the state of FLAG on " "selected device" msgstr "" "disk_toggle [PRÃZNAK] prepnúť PRÃZNAK na vybranom zariadenÃ" -#: parted/parted.c:2302 +#: parted/parted.c:2434 msgid "set" msgstr "set" -#: parted/parted.c:2305 +#: parted/parted.c:2437 msgid "" "set NUMBER FLAG STATE change the FLAG on partition NUMBER" msgstr "set MINOR PREPÃNAÄŒ STAV zmeniÅ¥ voľbu na oblasti MINOR" -#: parted/parted.c:2311 +#: parted/parted.c:2443 msgid "toggle" msgstr "toggle" -#: parted/parted.c:2314 +#: parted/parted.c:2446 msgid "" "toggle [NUMBER [FLAG]] toggle the state of FLAG on " "partition NUMBER" msgstr "" "toggle [ÄŒÃSLO [PRÃZNAK]] prepnúť PRÃZNAK na oblasti ÄŒÃSLO" -#: parted/parted.c:2320 +#: parted/parted.c:2452 +msgid "type" +msgstr "" + +#: parted/parted.c:2455 +#, fuzzy +msgid "" +"type NUMBER TYPE-ID or TYPE-UUID type set TYPE-ID or TYPE-UUID of " +"partition NUMBER" +msgstr "move ÄŒÃSLO ZAÄŒIATOK KONIEC presunúť oblasÅ¥ ÄŒÃSLO" + +#: parted/parted.c:2460 msgid "unit" msgstr "unit" -#: parted/parted.c:2323 +#: parted/parted.c:2463 msgid "unit UNIT set the default unit to UNIT" msgstr "" "unit JEDNOTKA nastaviÅ¥ predvolenú jednotku na " "JEDNOTKA" -#: parted/parted.c:2328 +#: parted/parted.c:2468 msgid "version" msgstr "version" -#: parted/parted.c:2331 +#: parted/parted.c:2471 msgid "" "version display the version number and " "copyright information of GNU Parted" @@ -2860,7 +2895,7 @@ msgstr "" "version zobrazà verziu a informácie o " "autorských právach GNU Parted" -#: parted/parted.c:2335 +#: parted/parted.c:2475 msgid "" "'version' displays copyright and version information corresponding to this " "copy of GNU Parted\n" @@ -2868,21 +2903,21 @@ msgstr "" "„version“ zobrazà informácie o autorských právach a verzii tejto kópie GNU " "Parted\n" -#: parted/parted.c:2405 +#: parted/parted.c:2545 #, fuzzy, c-format msgid "Usage: %s [-hlmsfv] [-a<align>] [DEVICE [COMMAND [PARAMETERS]]...]\n" msgstr "" "Použitie: %s [-hlmsv] [-a<zarovnanie>] [ZARIADENIE [PRÃKAZ [PARAMETRE]]...]\n" -#: parted/parted.c:2449 +#: parted/parted.c:2589 msgid "No device found" msgstr "Nebolo nájdené žiadne zariadenie" -#: parted/parted.c:2486 +#: parted/parted.c:2626 msgid "WARNING: You are not superuser. Watch out for permissions.\n" msgstr "UPOZORNENIE: Nie ste superpoužÃvateľ. Dávajte pozor na oprávnenia.\n" -#: parted/parted.c:2519 +#: parted/parted.c:2659 msgid "" "You should reinstall your boot loader before rebooting. Read section 4 of " "the Parted User documentation for more information." @@ -2890,7 +2925,7 @@ msgstr "" "Pred reÅ¡tartom by ste mali reinÅ¡talovaÅ¥ svoj zavádzaÄ systému. Viac " "informáci nájdete v kapitole 4 PoužÃvateľskej dokumentácie Parted." -#: parted/parted.c:2526 +#: parted/parted.c:2666 msgid "You may need to update /etc/fstab.\n" msgstr "Môže byÅ¥ potrebné aktualizovaÅ¥ /etc/fstab.\n" @@ -3146,69 +3181,69 @@ msgstr "" "\n" "Chyba: Vyskytol sa vÅ¡eobecný signál SIGILL." -#: parted/ui.c:901 +#: parted/ui.c:904 #, c-format msgid "invalid token: %s" msgstr "neplatný token: %s" -#: parted/ui.c:1082 +#: parted/ui.c:1085 msgid "Expecting a partition number." msgstr "OÄakáva sa ÄÃslo oblasti." -#: parted/ui.c:1091 +#: parted/ui.c:1094 msgid "Partition doesn't exist." msgstr "OblasÅ¥ neexistuje." -#: parted/ui.c:1111 +#: parted/ui.c:1114 msgid "Expecting a file system type." msgstr "OÄakáva sa typ systému súborov." -#: parted/ui.c:1118 +#: parted/ui.c:1121 #, c-format msgid "Unknown file system type \"%s\"." msgstr "Neznámy typ systému súborov „%s“." -#: parted/ui.c:1139 +#: parted/ui.c:1142 msgid "Expecting a disk label type." msgstr "OÄakáva sa typ menovky disku." -#: parted/ui.c:1170 parted/ui.c:1206 +#: parted/ui.c:1173 parted/ui.c:1209 msgid "No flags supported" msgstr "" -#: parted/ui.c:1280 +#: parted/ui.c:1283 msgid "Can't create any more partitions." msgstr "Nie je možné vytvoriÅ¥ ÄalÅ¡ie oblasti." -#: parted/ui.c:1290 +#: parted/ui.c:1293 msgid "Expecting a partition type." msgstr "OÄakáva sa typ oblasti." -#: parted/ui.c:1439 +#: parted/ui.c:1442 msgid "on" msgstr "zap" -#: parted/ui.c:1440 +#: parted/ui.c:1443 msgid "off" msgstr "vyp" -#: parted/ui.c:1457 +#: parted/ui.c:1460 msgid "optimal" msgstr "optimálne" -#: parted/ui.c:1458 +#: parted/ui.c:1461 msgid "minimal" msgstr "minimálne" -#: parted/ui.c:1591 +#: parted/ui.c:1594 msgid "OPTIONs:" msgstr "VOĽBY:" -#: parted/ui.c:1596 +#: parted/ui.c:1599 msgid "COMMANDs:" msgstr "PRÃKAZy:" -#: parted/ui.c:1599 +#: parted/ui.c:1602 #, c-format msgid "" "\n" @@ -3217,12 +3252,12 @@ msgstr "" "\n" "Chyby hláste <%s>.\n" -#: parted/ui.c:1606 +#: parted/ui.c:1609 #, c-format msgid "Using %s\n" msgstr "PoužÃva sa %s\n" -#: parted/ui.c:1686 +#: parted/ui.c:1689 msgid "This command does not make sense in non-interactive mode.\n" msgstr "PrÃkaz nedáva zmysel v neinteraktÃvnom režime.\n" @@ -3296,6 +3331,9 @@ msgstr "PrÃkaz nedáva zmysel v neinteraktÃvnom režime.\n" #~ "Jádro nedokázalo znovu naÄÃtaÅ¥ tabuľku oblastà na %s (%s). To znamená, že " #~ "Linux vedieÅ¥ o zmenách, ktoré ste vykonali." +#~ msgid "Extended partitions cannot be hidden on msdos disk labels." +#~ msgstr "RozÅ¡Ãrené oblasti nie je možné skryÅ¥ na Å¡tÃtkoch diskov msdos." + #, c-format #~ msgid "" #~ "%s contains GPT signatures, indicating that it has a GPT table. However, " Binary files differ@@ -7,7 +7,7 @@ msgid "" msgstr "" "Project-Id-Version: parted 2.3\n" "Report-Msgid-Bugs-To: bug-parted@gnu.org\n" -"POT-Creation-Date: 2022-04-18 14:44-0400\n" +"POT-Creation-Date: 2023-04-10 15:50-0700\n" "PO-Revision-Date: 2010-11-11 19:44+0000\n" "Last-Translator: Andrej ŽnidarÅ¡iÄ <andrej.znidarsic@gmail.com>\n" "Language-Team: Slovenian <translation-team-sl@lists.sourceforge.net>\n" @@ -22,25 +22,25 @@ msgstr "" "X-Poedit-Country: SLOVENIA\n" "X-Poedit-SourceCharset: utf-8\n" -#: lib/argmatch.c:147 +#: lib/argmatch.c:145 #, c-format msgid "invalid argument %s for %s" msgstr "neveljaven argument %s za %s" -#: lib/argmatch.c:148 +#: lib/argmatch.c:146 #, c-format msgid "ambiguous argument %s for %s" msgstr "dvoumen argument %s za %s" -#: lib/argmatch.c:167 lib/argmatch.h:238 +#: lib/argmatch.c:165 lib/argmatch.h:237 msgid "Valid arguments are:" msgstr "Veljavni argumenti so:" -#: lib/closeout.c:122 libparted/labels/fdasd.c:145 +#: lib/closeout.c:121 libparted/labels/fdasd.c:145 msgid "write error" msgstr "napaka pisanja" -#: lib/error.c:195 +#: lib/error.c:193 msgid "Unknown system error" msgstr "Neznana sistemska napaka" @@ -100,11 +100,11 @@ msgstr "%s: možnost zahteva argument -- '%c'\n" #. If you don't know what to put here, please see #. <https://en.wikipedia.org/wiki/Quotation_marks_in_other_languages> #. and use glyphs suitable for your language. -#: lib/quotearg.c:355 +#: lib/quotearg.c:354 msgid "`" msgstr "\"" -#: lib/quotearg.c:356 +#: lib/quotearg.c:355 msgid "'" msgstr "\"" @@ -187,7 +187,7 @@ msgstr "ManjkajoÄ predhodni logiÄni izraz" #. To enquire the regular expression that your system uses for this #. purpose, you can use the command #. locale -k LC_MESSAGES | grep '^yesexpr=' -#: lib/rpmatch.c:150 +#: lib/rpmatch.c:149 msgid "^[yY]" msgstr "^[jJdD]" @@ -197,7 +197,7 @@ msgstr "^[jJdD]" #. To enquire the regular expression that your system uses for this #. purpose, you can use the command #. locale -k LC_MESSAGES | grep '^noexpr=' -#: lib/rpmatch.c:163 +#: lib/rpmatch.c:162 msgid "^[nN]" msgstr "^[nN]" @@ -753,21 +753,21 @@ msgstr "zagon" msgid "Unknown disk flag, %d." msgstr "Neznana zastavica diska, %d." -#: libparted/disk.c:1289 +#: libparted/disk.c:1320 #, c-format msgid "%s disk labels do not support extended partitions." msgstr "oznake diska %s ne podpirajo razÅ¡irjenih razdelkov." -#: libparted/disk.c:1821 +#: libparted/disk.c:1990 #, c-format msgid "%s disk labels don't support logical or extended partitions." msgstr "oznake diska %s ne podpirajo logiÄnih ali razÅ¡irjenih razdelkov." -#: libparted/disk.c:1834 +#: libparted/disk.c:2003 msgid "Too many primary partitions." msgstr "PreveÄ osnovnih razdelkov." -#: libparted/disk.c:1843 +#: libparted/disk.c:2012 #, c-format msgid "" "Can't add a logical partition to %s, because there is no extended partition." @@ -775,140 +775,144 @@ msgstr "" "Dodajanje logiÄnega razdelka na %s ni mogoÄe, ker razÅ¡irjeni razdelek ne " "obstaja." -#: libparted/disk.c:1867 +#: libparted/disk.c:2036 #, c-format msgid "Can't have more than one extended partition on %s." msgstr "Ni mogoÄe imeti veÄ kot enega razÅ¡irjenega razdelka na %s." -#: libparted/disk.c:1877 +#: libparted/disk.c:2046 msgid "Can't have logical partitions outside of the extended partition." msgstr "LogiÄni razdelek ne sme biti zunaj razÅ¡irjenega razdelka." -#: libparted/disk.c:1902 +#: libparted/disk.c:2071 #, c-format msgid "Can't have a logical partition outside of the extended partition on %s." msgstr "LogiÄni razdelek ne sme biti zunaj razÅ¡irjenega razdelka na %s." -#: libparted/disk.c:1912 +#: libparted/disk.c:2081 msgid "Can't have a primary partition inside an extended partition." msgstr "Osnovni razdelek ne more biti znotraj razÅ¡irjenega razdelka." -#: libparted/disk.c:1921 +#: libparted/disk.c:2090 msgid "Can't have a partition outside the disk!" msgstr "Razdelek izven diska ni mogoÄ!" -#: libparted/disk.c:1972 libparted/disk.c:2150 +#: libparted/disk.c:2141 libparted/disk.c:2319 msgid "Can't have overlapping partitions." msgstr "Razdelki se ne smejo prekrivati." -#: libparted/disk.c:2351 +#: libparted/disk.c:2520 msgid "metadata" msgstr "metapodatki" -#: libparted/disk.c:2353 +#: libparted/disk.c:2522 msgid "free" msgstr "prosto" -#: libparted/disk.c:2355 parted/ui.c:1271 parted/ui.c:1299 +#: libparted/disk.c:2524 parted/ui.c:1274 parted/ui.c:1302 msgid "extended" msgstr "razÅ¡irjen" -#: libparted/disk.c:2357 parted/ui.c:1275 parted/ui.c:1303 +#: libparted/disk.c:2526 parted/ui.c:1278 parted/ui.c:1306 msgid "logical" msgstr "logiÄni" -#: libparted/disk.c:2359 parted/ui.c:1267 parted/ui.c:1295 +#: libparted/disk.c:2528 parted/ui.c:1270 parted/ui.c:1298 msgid "primary" msgstr "osnovni" -#: libparted/disk.c:2375 +#: libparted/disk.c:2544 msgid "boot" msgstr "zagon" -#: libparted/disk.c:2377 +#: libparted/disk.c:2546 msgid "bios_grub" msgstr "bios_grub" -#: libparted/disk.c:2379 +#: libparted/disk.c:2548 msgid "root" msgstr "korenski" -#: libparted/disk.c:2381 +#: libparted/disk.c:2550 msgid "swap" msgstr "izmenjalni razdelek" -#: libparted/disk.c:2383 +#: libparted/disk.c:2552 msgid "hidden" msgstr "skrito" -#: libparted/disk.c:2385 +#: libparted/disk.c:2554 msgid "raid" msgstr "raid" -#: libparted/disk.c:2387 +#: libparted/disk.c:2556 msgid "lvm" msgstr "lvm" -#: libparted/disk.c:2389 +#: libparted/disk.c:2558 msgid "lba" msgstr "lba" -#: libparted/disk.c:2391 +#: libparted/disk.c:2560 msgid "hp-service" msgstr "hp-service" -#: libparted/disk.c:2393 +#: libparted/disk.c:2562 msgid "palo" msgstr "palo" -#: libparted/disk.c:2395 +#: libparted/disk.c:2564 msgid "prep" msgstr "prep" -#: libparted/disk.c:2397 +#: libparted/disk.c:2566 msgid "msftres" msgstr "msftres" -#: libparted/disk.c:2399 +#: libparted/disk.c:2568 #, fuzzy msgid "msftdata" msgstr "metapodatki" -#: libparted/disk.c:2401 +#: libparted/disk.c:2570 msgid "atvrecv" msgstr "atvrecv" -#: libparted/disk.c:2403 +#: libparted/disk.c:2572 msgid "diag" msgstr "diag" -#: libparted/disk.c:2405 +#: libparted/disk.c:2574 msgid "legacy_boot" msgstr "" -#: libparted/disk.c:2407 +#: libparted/disk.c:2576 msgid "irst" msgstr "" -#: libparted/disk.c:2409 +#: libparted/disk.c:2578 #, fuzzy msgid "esp" msgstr "Da" -#: libparted/disk.c:2411 +#: libparted/disk.c:2580 msgid "chromeos_kernel" msgstr "" -#: libparted/disk.c:2413 +#: libparted/disk.c:2582 #, fuzzy msgid "bls_boot" msgstr "zagon" -#: libparted/disk.c:2415 +#: libparted/disk.c:2584 msgid "linux-home" msgstr "" -#: libparted/disk.c:2421 +#: libparted/disk.c:2586 +msgid "no_automount" +msgstr "" + +#: libparted/disk.c:2592 #, c-format msgid "Unknown partition flag, %d." msgstr "Neznana zastavica razdelka, %d." @@ -1096,8 +1100,8 @@ msgid "" msgstr "" #: libparted/labels/atari.c:1662 libparted/labels/bsd.c:563 -#: libparted/labels/dasd.c:895 libparted/labels/dos.c:2303 -#: libparted/labels/dvh.c:770 libparted/labels/gpt.c:1769 +#: libparted/labels/dasd.c:893 libparted/labels/dos.c:2294 +#: libparted/labels/dvh.c:770 libparted/labels/gpt.c:1891 #: libparted/labels/loop.c:244 libparted/labels/mac.c:1409 #: libparted/labels/pc98.c:697 libparted/labels/rdb.c:1054 #: libparted/labels/sun.c:781 @@ -1119,40 +1123,31 @@ msgstr "Dodeljevanje Å¡tevilke razdelka ni uspelo." msgid "Unable to allocate a bsd disklabel slot." msgstr "Dodeljevanje reže bsd disklabel ni uspelo." -#: libparted/labels/dasd.c:626 +#: libparted/labels/dasd.c:634 msgid "The partition table of DASD-LDL device cannot be changed.\n" msgstr "" -#: libparted/labels/dasd.c:921 +#: libparted/labels/dasd.c:919 msgid "Unable to allocate a dasd disklabel slot" msgstr "Dodeljevanje reže dasd disklabel ni uspelo." -#: libparted/labels/dos.c:1008 +#: libparted/labels/dos.c:1159 #, c-format msgid "Invalid partition table on %s -- wrong signature %x." msgstr "Neveljavna preglednica razdelka na %s -- napaÄen podpis %x." -#: libparted/labels/dos.c:1036 +#: libparted/labels/dos.c:1187 #, c-format msgid "Invalid partition table - recursive partition on %s." msgstr "Neveljavna preglednica razdelka - rekurzivni razdelek na %s." -#: libparted/labels/dos.c:1567 -msgid "Extended partitions cannot be hidden on msdos disk labels." -msgstr "RazÅ¡irjeni razdelki ne morejo biti skriti na msdos oznakah diska." - -#: libparted/labels/dos.c:1579 -#, fuzzy -msgid "Extended partitions cannot be recovery partitions on msdos disk labels." -msgstr "RazÅ¡irjeni razdelki ne morejo biti skriti na msdos oznakah diska." - -#: libparted/labels/dos.c:2285 +#: libparted/labels/dos.c:2276 msgid "Parted can't resize partitions managed by Windows Dynamic Disk." msgstr "" "Parted ne more spremeniti velikosti razdelka, ki ga upravlja Windows Dynamic " "Disk." -#: libparted/labels/dos.c:2541 +#: libparted/labels/dos.c:2532 #, fuzzy msgid "cannot create any more partitions" msgstr "Novih razdelkov ni mogoÄe ustvariti." @@ -1295,12 +1290,12 @@ msgstr "Podrobnosti o velikosti bloka ni mogoÄe pridobiti." msgid "Disk geometry does not match a DASD device of type 3390." msgstr "" -#: libparted/labels/gpt.c:569 +#: libparted/labels/gpt.c:589 #, fuzzy msgid "device is too small for GPT" msgstr "Naprava je premajhna za %lu blokov." -#: libparted/labels/gpt.c:771 +#: libparted/labels/gpt.c:791 #, fuzzy, c-format msgid "" "The format of the GPT partition table is version %x, which is newer than " @@ -1309,7 +1304,7 @@ msgstr "" "Oblika GTP preglednice razdelkov je razliÄica %x, kar je novejÅ¡e kot lahko " "Parted prepozna. SporoÄite nam! bug-parted@gnu.org" -#: libparted/labels/gpt.c:807 +#: libparted/labels/gpt.c:827 #, c-format msgid "" "Not all of the space available to %s appears to be used, you can fix the GPT " @@ -1320,7 +1315,7 @@ msgstr "" "uporabljal ves prostor (dodatnih %llu blokov) ali pa nadaljujte s trenutnimi " "nastavitvami. " -#: libparted/labels/gpt.c:1006 +#: libparted/labels/gpt.c:1026 #, fuzzy msgid "" "The backup GPT table is not at the end of the disk, as it should be. Fix, " @@ -1331,7 +1326,7 @@ msgstr "" "diska manjÅ¡a. Ali želite to popraviti s premikom varnostne kopije na konec " "diska (in izbrisom stare varnostne kopije)?" -#: libparted/labels/gpt.c:1024 +#: libparted/labels/gpt.c:1044 msgid "" "Both the primary and backup GPT tables are corrupt. Try making a fresh " "table, and using Parted's rescue feature to recover partitions." @@ -1340,7 +1335,7 @@ msgstr "" "narediti svežo preglednico in z reÅ¡evalno možnostjo programa Parted obnoviti " "razdelke." -#: libparted/labels/gpt.c:1035 +#: libparted/labels/gpt.c:1055 msgid "" "The backup GPT table is corrupt, but the primary appears OK, so that will be " "used." @@ -1348,7 +1343,7 @@ msgstr "" "Varnostna kopija preglednice GPT je pokvarjena, vendar je osnovna videti v " "redu, zato bo uporabljena." -#: libparted/labels/gpt.c:1047 +#: libparted/labels/gpt.c:1067 msgid "" "The primary GPT table is corrupt, but the backup appears OK, so that will be " "used." @@ -1356,11 +1351,11 @@ msgstr "" "Osnovna preglednica GPT je pokvarjena, vendar je varnostna kopija v redu, " "zato bo uporabljena." -#: libparted/labels/gpt.c:1071 +#: libparted/labels/gpt.c:1091 msgid "primary partition table array CRC mismatch" msgstr "polje osnovne preglednice razdelka ima nujemajoÄ CRC" -#: libparted/labels/gpt.c:1655 libparted/labels/gpt.c:1682 +#: libparted/labels/gpt.c:1722 libparted/labels/gpt.c:1749 #, fuzzy msgid "failed to translate partition name" msgstr "Dodeljevanje Å¡tevilke razdelka ni uspelo." @@ -2031,7 +2026,7 @@ msgstr "fat_table_alloc_cluster: ni prostih gruÄ" msgid "Could not detect file system." msgstr "DatoteÄnega sistema ni mogoÄe zaznati." -#: libparted/fs/r/filesys.c:159 libparted/fs/r/filesys.c:284 +#: libparted/fs/r/filesys.c:159 libparted/fs/r/filesys.c:285 #, fuzzy, c-format msgid "resizing %s file systems is not supported" msgstr "Podpora za spremembo velikosti datoteÄnega sistem %s Å¡e ni dodana." @@ -2321,40 +2316,40 @@ msgstr "" "Ta nosilec HFS+ nima datoteke preliva segmentov extents. To je zelo " "nenavadno!" -#: parted/parted.c:137 +#: parted/parted.c:138 msgid "displays this help message" msgstr "prikaže to sporoÄilo pomoÄi" -#: parted/parted.c:138 +#: parted/parted.c:139 msgid "lists partition layout on all block devices" msgstr "prikaže postavitev razdelkov na vseh blokovnih napravah" -#: parted/parted.c:139 +#: parted/parted.c:140 msgid "displays machine parseable output" msgstr "prikaže izhodne podatke, ki s raÄunalniÅ¡ko razÄlenjivi" -#: parted/parted.c:140 +#: parted/parted.c:141 #, fuzzy msgid "displays JSON output" msgstr "prikaže izhodne podatke, ki s raÄunalniÅ¡ko razÄlenjivi" -#: parted/parted.c:141 +#: parted/parted.c:142 msgid "never prompts for user intervention" msgstr "nikoli ne pozovi za uporabniÅ¡ko posredovanje" -#: parted/parted.c:142 +#: parted/parted.c:143 msgid "in script mode, fix instead of abort when asked" msgstr "" -#: parted/parted.c:143 +#: parted/parted.c:144 msgid "displays the version" msgstr "prikaže razliÄico" -#: parted/parted.c:144 +#: parted/parted.c:145 msgid "alignment for new partitions" msgstr "poravnava novih razdelkov" -#: parted/parted.c:157 +#: parted/parted.c:158 msgid "" "NUMBER is the partition number used by Linux. On MS-DOS disk labels, the " "primary partitions number from 1 to 4, logical partitions from 5 onwards.\n" @@ -2363,31 +2358,31 @@ msgstr "" "DOS so Å¡tevilke osnovnih razdelkov od 1 do 4, logiÄnih razdelkov pa od 5 " "naprej.\n" -#: parted/parted.c:160 +#: parted/parted.c:161 msgid "LABEL-TYPE is one of: " msgstr "VRSTA_OZNAKA je ena od: " -#: parted/parted.c:161 parted/parted.c:162 +#: parted/parted.c:162 parted/parted.c:163 msgid "FLAG is one of: " msgstr "ZASTAVICA je ena od: " -#: parted/parted.c:163 +#: parted/parted.c:164 msgid "UNIT is one of: " msgstr "ENOTA je ena od: " -#: parted/parted.c:164 +#: parted/parted.c:165 msgid "desired alignment: minimum or optimal" msgstr "zaželjena poravnava: najmanjÅ¡a ali optimalna" -#: parted/parted.c:165 +#: parted/parted.c:166 msgid "PART-TYPE is one of: primary, logical, extended\n" msgstr "VRSTA-RAZDELKA je ena od: osnovna, logiÄna, razÅ¡irjena\n" -#: parted/parted.c:167 +#: parted/parted.c:168 msgid "FS-TYPE is one of: " msgstr "VRSTA-DS je ena od: " -#: parted/parted.c:168 +#: parted/parted.c:169 msgid "" "START and END are disk locations, such as 4GB or 10%. Negative values count " "from the end of the disk. For example, -1s specifies exactly the last " @@ -2397,7 +2392,7 @@ msgstr "" "vrednosti se Å¡tejejo od konca diska. Na primer, -1s doloÄa natanko zadnji " "sektor.\n" -#: parted/parted.c:171 +#: parted/parted.c:172 #, fuzzy msgid "" "END is disk location, such as 4GB or 10%. Negative value counts from the " @@ -2407,19 +2402,23 @@ msgstr "" "vrednosti se Å¡tejejo od konca diska. Na primer, -1s doloÄa natanko zadnji " "sektor.\n" -#: parted/parted.c:174 +#: parted/parted.c:175 msgid "STATE is one of: on, off\n" msgstr "Stanje je eno od: on, off\n" -#: parted/parted.c:175 +#: parted/parted.c:176 msgid "DEVICE is usually /dev/hda or /dev/sda\n" msgstr "NAPRAVA je ponavadi /dev/hda ali /dev/sda\n" -#: parted/parted.c:176 +#: parted/parted.c:177 msgid "NAME is any word you want\n" msgstr "IME je katerakoli beseda, ki jo hoÄete\n" -#: parted/parted.c:179 +#: parted/parted.c:178 +msgid "TYPE_ID is a value between 0x01 and 0xff, TYPE_UUID is a UUID\n" +msgstr "" + +#: parted/parted.c:182 msgid "" "Copyright (C) 1998 - 2006 Free Software Foundation, Inc.\n" "This program is free software, covered by the GNU General Public License.\n" @@ -2440,23 +2439,23 @@ msgstr "" "Oglejte si licenco GNU General Public License za podrobnosti.\n" "\n" -#: parted/parted.c:229 +#: parted/parted.c:232 #, c-format msgid "%0.f%%\t(time left %.2d:%.2d)" msgstr "%0.f%%\t(Äas do konca %.2d:%.2d)" -#: parted/parted.c:248 +#: parted/parted.c:251 #, fuzzy, c-format msgid "Partition %s is being used. Are you sure you want to continue?" msgstr "" "Razdelek %s je v uporabi. Pred spreminjanjem s Parted ga je treba odklopiti." -#: parted/parted.c:269 +#: parted/parted.c:272 #, c-format msgid "Partition(s) on %s are being used." msgstr "Razdel-ek(ki) na %s so v uporabi." -#: parted/parted.c:281 +#: parted/parted.c:284 #, c-format msgid "" "The existing disk label on %s will be destroyed and all data on this disk " @@ -2465,31 +2464,31 @@ msgstr "" "ObstojeÄa oznaka diska na %s bo uniÄena in vsi podatki na disku bodo " "izgubljeni. Želite nadaljevati?" -#: parted/parted.c:542 +#: parted/parted.c:545 msgid "New disk label type?" msgstr "Nova vrsta oznake diska?" -#: parted/parted.c:680 +#: parted/parted.c:692 msgid "Partition type?" msgstr "Vrsta razdelka?" -#: parted/parted.c:698 parted/parted.c:902 +#: parted/parted.c:710 parted/parted.c:914 msgid "Partition name?" msgstr "Ime razdelka?" -#: parted/parted.c:708 +#: parted/parted.c:720 msgid "File system type?" msgstr "Vrsta datoteÄnega sistema?" -#: parted/parted.c:713 parted/parted.c:1683 +#: parted/parted.c:725 parted/parted.c:1815 msgid "Start?" msgstr "ZaÄetek?" -#: parted/parted.c:715 parted/parted.c:1685 parted/parted.c:1768 +#: parted/parted.c:727 parted/parted.c:1817 parted/parted.c:1900 msgid "End?" msgstr "Konec?" -#: parted/parted.c:782 +#: parted/parted.c:794 #, fuzzy, c-format msgid "" "You requested a partition from %s to %s (sectors %llu..%llu).\n" @@ -2498,7 +2497,7 @@ msgstr "" "Zahtevali ste razdelek od %s do %s.\n" "Najbližje mogoÄe mesto je od %s do %s.%s" -#: parted/parted.c:791 +#: parted/parted.c:803 msgid "" "\n" "Is this still acceptable to you?" @@ -2506,94 +2505,119 @@ msgstr "" "\n" "Je to za vas sprejemljivo?" -#: parted/parted.c:814 +#: parted/parted.c:826 #, fuzzy, c-format msgid "" "The resulting partition is not properly aligned for best performance: %s" msgstr "Ciljni razdelek ni pravilno poravnan za najboljÅ¡o zmogljivost." -#: parted/parted.c:816 parted/parted.c:1925 +#: parted/parted.c:828 parted/parted.c:2057 msgid "unknown (malloc failed)" msgstr "" -#: parted/parted.c:894 +#: parted/parted.c:906 #, fuzzy, c-format msgid "%s disk labels do not support partition name." msgstr "oznake diska %s ne podpirajo razÅ¡irjenih razdelkov." -#: parted/parted.c:899 parted/parted.c:1748 parted/parted.c:1814 -#: parted/parted.c:1908 parted/parted.c:1983 +#: parted/parted.c:911 parted/parted.c:955 parted/parted.c:1880 +#: parted/parted.c:1946 parted/parted.c:2040 parted/parted.c:2115 msgid "Partition number?" msgstr "Å tevilka razdelka?" -#: parted/parted.c:1050 +#: parted/parted.c:949 +#, fuzzy, c-format +msgid "%s disk labels do not support partition type." +msgstr "oznake diska %s ne podpirajo razÅ¡irjenih razdelkov." + +#: parted/parted.c:965 +#, fuzzy +msgid "Partition type-id?" +msgstr "Vrsta razdelka?" + +#: parted/parted.c:972 +#, fuzzy +msgid "Invalid type-id." +msgstr "Neveljavno Å¡tevilo." + +#: parted/parted.c:986 +#, fuzzy +msgid "Partition type-uuid?" +msgstr "Vrsta razdelka?" + +#: parted/parted.c:993 +#, fuzzy +msgid "Invalid type-uuid." +msgstr "Neveljavno Å¡tevilo." + +#: parted/parted.c:1146 #, c-format msgid "BIOS cylinder,head,sector geometry: %d,%d,%d. Each cylinder is %s.\n" msgstr "" "cilinder BIOS,glava,geometrija sektorja: %d,%d,%d. Vsak cilinder je %s.\n" -#: parted/parted.c:1137 +#: parted/parted.c:1240 #, c-format msgid "Model: %s (%s)\n" msgstr "Model: %s (%s)\n" -#: parted/parted.c:1139 +#: parted/parted.c:1242 #, c-format msgid "Disk %s: %s\n" msgstr "Disk %s: %s\n" -#: parted/parted.c:1140 +#: parted/parted.c:1243 #, c-format msgid "Sector size (logical/physical): %lldB/%lldB\n" msgstr "Velikost sektorja (logiÄna/fiziÄna): %lldB/%lldB\n" -#: parted/parted.c:1152 +#: parted/parted.c:1255 #, c-format msgid "Partition Table: %s\n" msgstr "Preglednica razdelkov: %s\n" -#: parted/parted.c:1153 +#: parted/parted.c:1256 #, fuzzy, c-format msgid "Disk Flags: %s\n" msgstr "Disk %s: %s\n" -#: parted/parted.c:1279 parted/parted.c:1282 +#: parted/parted.c:1388 parted/parted.c:1391 msgid "Number" msgstr "Å tevilo" -#: parted/parted.c:1279 parted/parted.c:1282 +#: parted/parted.c:1388 parted/parted.c:1391 msgid "Start" msgstr "ZaÄetek" -#: parted/parted.c:1280 parted/parted.c:1283 +#: parted/parted.c:1389 parted/parted.c:1392 msgid "End" msgstr "Konec" -#: parted/parted.c:1283 +#: parted/parted.c:1392 msgid "Size" msgstr "Velikost" -#: parted/parted.c:1287 +#: parted/parted.c:1396 msgid "Type" msgstr "Vrsta" -#: parted/parted.c:1289 +#: parted/parted.c:1398 msgid "File system" msgstr "DatoteÄni sistem" -#: parted/parted.c:1292 +#: parted/parted.c:1401 msgid "Name" msgstr "Ime" -#: parted/parted.c:1294 +#: parted/parted.c:1403 msgid "Flags" msgstr "Zastavice" -#: parted/parted.c:1352 +#: parted/parted.c:1461 msgid "Free Space" msgstr "Nezaseden prostor" -#: parted/parted.c:1570 +#: parted/parted.c:1702 #, c-format msgid "" "A %s %s partition was found at %s -> %s. Do you want to add it to the " @@ -2602,54 +2626,54 @@ msgstr "" "razdelek %s %s je bil najden na %s -> %s. Ga želite dodati k preglednici " "razdelkov?" -#: parted/parted.c:1613 +#: parted/parted.c:1745 msgid "searching for file systems" msgstr "iskanje datoteÄnega sistema" -#: parted/parted.c:1720 +#: parted/parted.c:1852 msgid "The resize command has been removed in parted 3.0" msgstr "" -#: parted/parted.c:1782 +#: parted/parted.c:1914 msgid "" "Shrinking a partition can cause data loss, are you sure you want to continue?" msgstr "" -#: parted/parted.c:1838 +#: parted/parted.c:1970 msgid "New device?" msgstr "Nova naprava?" -#: parted/parted.c:1906 +#: parted/parted.c:2038 msgid "alignment type(min/opt)" msgstr "vrsta poravnave (min/opt)" -#: parted/parted.c:1921 +#: parted/parted.c:2053 #, c-format msgid "%d aligned\n" msgstr "%d je poravnan\n" -#: parted/parted.c:1923 +#: parted/parted.c:2055 #, fuzzy, c-format msgid "%d not aligned: %s\n" msgstr "%d ni poravnan\n" -#: parted/parted.c:1948 parted/parted.c:1985 +#: parted/parted.c:2080 parted/parted.c:2117 msgid "Flag to Invert?" msgstr "OznaÄi za obrat?" -#: parted/parted.c:1953 parted/parted.c:1990 +#: parted/parted.c:2085 parted/parted.c:2122 msgid "New state?" msgstr "Novo stanje?" -#: parted/parted.c:2036 +#: parted/parted.c:2168 msgid "Unit?" msgstr "Enota?" -#: parted/parted.c:2171 +#: parted/parted.c:2303 msgid "align-check" msgstr "align-check" -#: parted/parted.c:2174 +#: parted/parted.c:2306 #, fuzzy msgid "" "align-check TYPE N check partition N for TYPE(min|opt) " @@ -2658,11 +2682,11 @@ msgstr "" "align-check VRSTA Å TEVILKA preveri poravnanost vrste VRSTA " "(min|opt) razdelka Å TEVILKA" -#: parted/parted.c:2182 +#: parted/parted.c:2314 msgid "help" msgstr "help" -#: parted/parted.c:2185 +#: parted/parted.c:2317 msgid "" "help [COMMAND] print general help, or help on " "COMMAND" @@ -2670,15 +2694,15 @@ msgstr "" "help [UKAZ] izpiÅ¡e sploÅ¡no pomoÄ ali pomoÄ o " "ukazu UKAZ" -#: parted/parted.c:2191 +#: parted/parted.c:2323 msgid "mklabel" msgstr "mklabel" -#: parted/parted.c:2191 +#: parted/parted.c:2323 msgid "mktable" msgstr "mktable" -#: parted/parted.c:2194 +#: parted/parted.c:2326 msgid "" "mklabel,mktable LABEL-TYPE create a new disklabel (partition " "table)" @@ -2686,15 +2710,15 @@ msgstr "" "mklabel,mktable OZNAKA-VRSTA ustvari novo oznako diska " "(preglednica razdelkov)" -#: parted/parted.c:2200 +#: parted/parted.c:2332 msgid "mkpart" msgstr "mkpart" -#: parted/parted.c:2203 +#: parted/parted.c:2335 msgid "mkpart PART-TYPE [FS-TYPE] START END make a partition" msgstr "mkpart VRSTA-RAZDELKA [VRSTA-DS] ZAÄŒETEK KONEC naredi razdelek" -#: parted/parted.c:2209 +#: parted/parted.c:2341 msgid "" "'mkpart' makes a partition without creating a new file system on the " "partition. FS-TYPE may be specified to set an appropriate partition ID.\n" @@ -2703,20 +2727,20 @@ msgstr "" "razdelku. VRSTA-DS je lahko doloÄena za nastavitev primernega ID-ja " "razdelka.\n" -#: parted/parted.c:2214 +#: parted/parted.c:2346 msgid "name" msgstr "name" -#: parted/parted.c:2217 +#: parted/parted.c:2349 msgid "name NUMBER NAME name partition NUMBER as NAME" msgstr "" "name Å TEVILKA IME razdelek Å TEVILKA poimenuj z IME" -#: parted/parted.c:2222 +#: parted/parted.c:2354 msgid "print" msgstr "print" -#: parted/parted.c:2225 +#: parted/parted.c:2357 #, fuzzy msgid "" "print [devices|free|list,all] display the partition table, or " @@ -2726,7 +2750,7 @@ msgstr "" "naprave, ki so na voljo, nezaseden prostor, vse najdene razdelke ali doloÄen " "razdelek" -#: parted/parted.c:2229 +#: parted/parted.c:2361 msgid "" "Without arguments, 'print' displays the entire partition table. However with " "the following arguments it performs various other actions.\n" @@ -2734,11 +2758,11 @@ msgstr "" "Brez argumentov, 'print' prikaže celotno preglednico razdelkov. Z " "naslednjimi argumenti pa izvede razliÄna druga dejanja.\n" -#: parted/parted.c:2231 +#: parted/parted.c:2363 msgid " devices : display all active block devices\n" msgstr " devices : prikaže vse dejavne blokovne naprave\n" -#: parted/parted.c:2232 +#: parted/parted.c:2364 msgid "" " free : display information about free unpartitioned space on the " "current block device\n" @@ -2746,25 +2770,25 @@ msgstr "" " free : prikaže podatke o nezasedenem nerazdeljenem prostoru na " "trenutni blokovni napravi\n" -#: parted/parted.c:2234 +#: parted/parted.c:2366 msgid "" " list, all : display the partition tables of all active block devices\n" msgstr "" " list, all : prikaže preglednico razdelkov vseh dejavnih blokovnih naprav\n" -#: parted/parted.c:2238 +#: parted/parted.c:2370 msgid "quit" msgstr "quit" -#: parted/parted.c:2241 +#: parted/parted.c:2373 msgid "quit exit program" msgstr "quit konÄa program" -#: parted/parted.c:2246 +#: parted/parted.c:2378 msgid "rescue" msgstr "rescue" -#: parted/parted.c:2249 +#: parted/parted.c:2381 msgid "" "rescue START END rescue a lost partition near START " "and END" @@ -2772,45 +2796,45 @@ msgstr "" "rescue ZAÄŒETEK KONEC reÅ¡i izgubljen razdelek blizu " "ZAÄŒETKA in KONCA" -#: parted/parted.c:2255 +#: parted/parted.c:2387 msgid "resize" msgstr "resize" -#: parted/parted.c:2258 +#: parted/parted.c:2390 msgid "The resize command was removed in parted 3.0\n" msgstr "" -#: parted/parted.c:2261 +#: parted/parted.c:2393 #, fuzzy msgid "resizepart" msgstr "resize" -#: parted/parted.c:2264 +#: parted/parted.c:2396 #, fuzzy msgid "resizepart NUMBER END resize partition NUMBER" msgstr "move Å TEVILKA ZAÄŒETEK KONEC premakne razdelek Å TEVILKA" -#: parted/parted.c:2269 +#: parted/parted.c:2401 msgid "rm" msgstr "rm" -#: parted/parted.c:2272 +#: parted/parted.c:2404 msgid "rm NUMBER delete partition NUMBER" msgstr "rm Å TEVILKA izbriÅ¡e razdelek Å TEVILKA" -#: parted/parted.c:2277 +#: parted/parted.c:2409 msgid "select" msgstr "select" -#: parted/parted.c:2280 +#: parted/parted.c:2412 msgid "select DEVICE choose the device to edit" msgstr "select NAPRAVA izbere napravo za urejanje" -#: parted/parted.c:2285 +#: parted/parted.c:2417 msgid "disk_set" msgstr "" -#: parted/parted.c:2288 +#: parted/parted.c:2420 #, fuzzy msgid "" "disk_set FLAG STATE change the FLAG on selected device" @@ -2818,12 +2842,12 @@ msgstr "" "set Å TEVILKA ZASTAVICA STANJE spremeni ZASTAVICO na razdelku " "Å TEVILKA" -#: parted/parted.c:2293 +#: parted/parted.c:2425 #, fuzzy msgid "disk_toggle" msgstr "toggle" -#: parted/parted.c:2296 +#: parted/parted.c:2428 #, fuzzy msgid "" "disk_toggle [FLAG] toggle the state of FLAG on " @@ -2832,22 +2856,22 @@ msgstr "" "toggle [Å TEVILKA [ZASTAVICA]] preklopi stanje ZASTAVICE na " "razdelku Å TEVILKA" -#: parted/parted.c:2302 +#: parted/parted.c:2434 msgid "set" msgstr "set" -#: parted/parted.c:2305 +#: parted/parted.c:2437 msgid "" "set NUMBER FLAG STATE change the FLAG on partition NUMBER" msgstr "" "set Å TEVILKA ZASTAVICA STANJE spremeni ZASTAVICO na razdelku " "Å TEVILKA" -#: parted/parted.c:2311 +#: parted/parted.c:2443 msgid "toggle" msgstr "toggle" -#: parted/parted.c:2314 +#: parted/parted.c:2446 msgid "" "toggle [NUMBER [FLAG]] toggle the state of FLAG on " "partition NUMBER" @@ -2855,20 +2879,31 @@ msgstr "" "toggle [Å TEVILKA [ZASTAVICA]] preklopi stanje ZASTAVICE na " "razdelku Å TEVILKA" -#: parted/parted.c:2320 +#: parted/parted.c:2452 +msgid "type" +msgstr "" + +#: parted/parted.c:2455 +#, fuzzy +msgid "" +"type NUMBER TYPE-ID or TYPE-UUID type set TYPE-ID or TYPE-UUID of " +"partition NUMBER" +msgstr "move Å TEVILKA ZAÄŒETEK KONEC premakne razdelek Å TEVILKA" + +#: parted/parted.c:2460 msgid "unit" msgstr "unit" -#: parted/parted.c:2323 +#: parted/parted.c:2463 msgid "unit UNIT set the default unit to UNIT" msgstr "" "unit ENOTA nastavi privzeto enoto na ENOTA" -#: parted/parted.c:2328 +#: parted/parted.c:2468 msgid "version" msgstr "razliÄica" -#: parted/parted.c:2331 +#: parted/parted.c:2471 msgid "" "version display the version number and " "copyright information of GNU Parted" @@ -2876,7 +2911,7 @@ msgstr "" "version prikaže Å¡tevilko razliÄice in " "podrobnosti o avtorskih pravicah programa GNU Parted" -#: parted/parted.c:2335 +#: parted/parted.c:2475 msgid "" "'version' displays copyright and version information corresponding to this " "copy of GNU Parted\n" @@ -2884,22 +2919,22 @@ msgstr "" "'version' prikaže avtorske pravice in podrobnosti o razliÄici, ki ustrezajo " "tej kopiji programa GNU Parted\n" -#: parted/parted.c:2405 +#: parted/parted.c:2545 #, fuzzy, c-format msgid "Usage: %s [-hlmsfv] [-a<align>] [DEVICE [COMMAND [PARAMETERS]]...]\n" msgstr "" "Uporaba: %s [-hlmsv] [-a<poravnava>] [NAPRAVA [UKAZ [PARAMETRI]] ...]\n" -#: parted/parted.c:2449 +#: parted/parted.c:2589 msgid "No device found" msgstr "Naprave ni mogoÄe najti" -#: parted/parted.c:2486 +#: parted/parted.c:2626 #, fuzzy msgid "WARNING: You are not superuser. Watch out for permissions.\n" msgstr "OPOZORILO: Niste superuporabnik. Pazite na dovoljenja." -#: parted/parted.c:2519 +#: parted/parted.c:2659 msgid "" "You should reinstall your boot loader before rebooting. Read section 4 of " "the Parted User documentation for more information." @@ -2908,7 +2943,7 @@ msgstr "" "Za veÄ podrobnosti si preberite odstavek 4 v uporabniÅ¡ki dokumentaciji " "Parted." -#: parted/parted.c:2526 +#: parted/parted.c:2666 msgid "You may need to update /etc/fstab.\n" msgstr "Morda boste morali posodobiti /etc/fstab.\n" @@ -3166,69 +3201,69 @@ msgstr "" "\n" "Napaka: Zaznan je bil sploÅ¡ni signal SIGILL." -#: parted/ui.c:901 +#: parted/ui.c:904 #, c-format msgid "invalid token: %s" msgstr "neveljaven žeton %s" -#: parted/ui.c:1082 +#: parted/ui.c:1085 msgid "Expecting a partition number." msgstr "PriÄakovana je Å¡tevilka razdelka." -#: parted/ui.c:1091 +#: parted/ui.c:1094 msgid "Partition doesn't exist." msgstr "Razdelek ne obstaja." -#: parted/ui.c:1111 +#: parted/ui.c:1114 msgid "Expecting a file system type." msgstr "PriÄakovana je vrsta datoteÄnega sistema." -#: parted/ui.c:1118 +#: parted/ui.c:1121 #, c-format msgid "Unknown file system type \"%s\"." msgstr "Neznan datoteÄni sistem vrste \"%s\"." -#: parted/ui.c:1139 +#: parted/ui.c:1142 msgid "Expecting a disk label type." msgstr "PriÄakuje se vrsta oznake diska." -#: parted/ui.c:1170 parted/ui.c:1206 +#: parted/ui.c:1173 parted/ui.c:1209 msgid "No flags supported" msgstr "" -#: parted/ui.c:1280 +#: parted/ui.c:1283 msgid "Can't create any more partitions." msgstr "Novih razdelkov ni mogoÄe ustvariti." -#: parted/ui.c:1290 +#: parted/ui.c:1293 msgid "Expecting a partition type." msgstr "PriÄakuje se vrsta razdelka." -#: parted/ui.c:1439 +#: parted/ui.c:1442 msgid "on" msgstr "vkljuÄeno" -#: parted/ui.c:1440 +#: parted/ui.c:1443 msgid "off" msgstr "izkljuÄeno" -#: parted/ui.c:1457 +#: parted/ui.c:1460 msgid "optimal" msgstr "optimalno" -#: parted/ui.c:1458 +#: parted/ui.c:1461 msgid "minimal" msgstr "najmanjÅ¡e" -#: parted/ui.c:1591 +#: parted/ui.c:1594 msgid "OPTIONs:" msgstr "MOŽNOSTI:" -#: parted/ui.c:1596 +#: parted/ui.c:1599 msgid "COMMANDs:" msgstr "UKAZI:" -#: parted/ui.c:1599 +#: parted/ui.c:1602 #, c-format msgid "" "\n" @@ -3237,12 +3272,12 @@ msgstr "" "\n" "HroÅ¡Äe sporoÄite na %s\n" -#: parted/ui.c:1606 +#: parted/ui.c:1609 #, c-format msgid "Using %s\n" msgstr "Uporablja %s\n" -#: parted/ui.c:1686 +#: parted/ui.c:1689 msgid "This command does not make sense in non-interactive mode.\n" msgstr "Ta ukaz nima smisla v ne-vzajemnem naÄinu.\n" @@ -3453,6 +3488,9 @@ msgstr "Ta ukaz nima smisla v ne-vzajemnem naÄinu.\n" #~ "GNU Parted je zaznal neujemanje razliÄic vmesnika libreiserfs. Najdeno %d-" #~ "%d, priÄakovano %d. Podpora za ReiserFS bo onemogoÄena." +#~ msgid "Extended partitions cannot be hidden on msdos disk labels." +#~ msgstr "RazÅ¡irjeni razdelki ne morejo biti skriti na msdos oznakah diska." + #~ msgid "This is not an ECKD disk! This disk type is not supported!" #~ msgstr "To ni disk EKCD! Ta vrsta diska ni podprta!" @@ -1,13 +1,14 @@ # Serbian translations for GNU parted package. # Copyright © 2014 Free Software Foundation, Inc. # This file is distributed under the same license as the parted package. -# МироÑлав Ðиколић <miroslavnikolic@rocketmail.com>, 2011—2021. +# МироÑлав Ðиколић <miroslavnikolic@rocketmail.com>, 2011—2022. +# msgid "" msgstr "" -"Project-Id-Version: parted-3.3.52\n" +"Project-Id-Version: parted-3.4.64.2\n" "Report-Msgid-Bugs-To: bug-parted@gnu.org\n" -"POT-Creation-Date: 2022-04-18 14:44-0400\n" -"PO-Revision-Date: 2021-04-01 05:59+0200\n" +"POT-Creation-Date: 2023-04-10 15:50-0700\n" +"PO-Revision-Date: 2022-09-08 19:55+0200\n" "Last-Translator: МироÑлав Ðиколић <miroslavnikolic@rocketmail.com>\n" "Language-Team: Serbian <(nothing)>\n" "Language: sr\n" @@ -18,25 +19,25 @@ msgstr "" "n%10<=4 && (n%100<10 || n%100>=20) ? 1 : 2);\n" "X-Bugs: Report translation errors to the Language-Team address.\n" -#: lib/argmatch.c:147 +#: lib/argmatch.c:145 #, c-format msgid "invalid argument %s for %s" msgstr "неиÑправан аргумент %s за %s" -#: lib/argmatch.c:148 +#: lib/argmatch.c:146 #, c-format msgid "ambiguous argument %s for %s" msgstr "двоÑмиÑлени аргумент %s за %s" -#: lib/argmatch.c:167 lib/argmatch.h:238 +#: lib/argmatch.c:165 lib/argmatch.h:237 msgid "Valid arguments are:" msgstr "ИÑправни аргументи Ñу:" -#: lib/closeout.c:122 libparted/labels/fdasd.c:145 +#: lib/closeout.c:121 libparted/labels/fdasd.c:145 msgid "write error" msgstr "грешка у пиÑању" -#: lib/error.c:195 +#: lib/error.c:193 msgid "Unknown system error" msgstr "Ðепозната грешка ÑиÑтема" @@ -96,11 +97,11 @@ msgstr "%s: опција захтева аргумент -- „%c“\n" #. If you don't know what to put here, please see #. <https://en.wikipedia.org/wiki/Quotation_marks_in_other_languages> #. and use glyphs suitable for your language. -#: lib/quotearg.c:355 +#: lib/quotearg.c:354 msgid "`" msgstr "„" -#: lib/quotearg.c:356 +#: lib/quotearg.c:355 msgid "'" msgstr "“" @@ -182,7 +183,7 @@ msgstr "Ðема претходног регуларног израза" #. To enquire the regular expression that your system uses for this #. purpose, you can use the command #. locale -k LC_MESSAGES | grep '^yesexpr=' -#: lib/rpmatch.c:150 +#: lib/rpmatch.c:149 msgid "^[yY]" msgstr "^[yY]" @@ -192,7 +193,7 @@ msgstr "^[yY]" #. To enquire the regular expression that your system uses for this #. purpose, you can use the command #. locale -k LC_MESSAGES | grep '^noexpr=' -#: lib/rpmatch.c:163 +#: lib/rpmatch.c:162 msgid "^[nN]" msgstr "^[nN]" @@ -466,6 +467,9 @@ msgid "" "WARNING: the kernel failed to re-read the partition table on %s (%s). As a " "result, it may not reflect all of your changes until after reboot." msgstr "" +"УПОЗОРЕЊЕ: кернел није уÑпео поново да прочита партициону табелу на " +"„%s“ (%s). Као резултат, неће моћи да одрази Ñве ваше измене Ñве до " +"поновног подизања ÑиÑтема." #: libparted/arch/gnu.c:261 #, c-format @@ -473,6 +477,8 @@ msgid "" "Warning: unable to open %s (%s). As a result, it may not reflect all of your " "changes until after reboot." msgstr "" +"Упозорење: не могу да отворим „%s“ (%s). Као резултат, неће моћи да одрази " +"Ñве ваше измене Ñве до поновног подизања ÑиÑтема." #: libparted/arch/gnu.c:274 #, c-format @@ -480,6 +486,9 @@ msgid "" "Warning: failed to make translator go away on %s (%s). As a result, it may " "not reflect all of your changes until after reboot." msgstr "" +"Упозорење: ниÑам уÑпео да учиним да преводилац оде на „%s“ (%s). Као " +"резултат, неће моћи да одрази Ñве ваше измене Ñве до поновног подизања " +"ÑиÑтема." #: libparted/arch/gnu.c:820 #, c-format @@ -741,21 +750,21 @@ msgstr "пмбр_подизна" msgid "Unknown disk flag, %d." msgstr "Ðепозната заÑтавица диÑка, %d." -#: libparted/disk.c:1289 +#: libparted/disk.c:1320 #, c-format msgid "%s disk labels do not support extended partitions." msgstr "%s натпиÑи диÑка не подржавају проширене партиције." -#: libparted/disk.c:1821 +#: libparted/disk.c:1990 #, c-format msgid "%s disk labels don't support logical or extended partitions." msgstr "%s натпиÑи диÑка не подржавају логичке или проширене партиције." -#: libparted/disk.c:1834 +#: libparted/disk.c:2003 msgid "Too many primary partitions." msgstr "Превише примарних партиција." -#: libparted/disk.c:1843 +#: libparted/disk.c:2012 #, c-format msgid "" "Can't add a logical partition to %s, because there is no extended partition." @@ -763,137 +772,141 @@ msgstr "" "Ðе могу да додам логичку партицију на %s, зато што не поÑтоји проширена " "партиција." -#: libparted/disk.c:1867 +#: libparted/disk.c:2036 #, c-format msgid "Can't have more than one extended partition on %s." msgstr "Ðе можете имати више од једне проширене партиције на %s." -#: libparted/disk.c:1877 +#: libparted/disk.c:2046 msgid "Can't have logical partitions outside of the extended partition." msgstr "Ðе можете имати логичке партиције изван проширене партиције." -#: libparted/disk.c:1902 +#: libparted/disk.c:2071 #, c-format msgid "Can't have a logical partition outside of the extended partition on %s." msgstr "Ðе можете имати логичку партицију изван проширене партиције на %s." -#: libparted/disk.c:1912 +#: libparted/disk.c:2081 msgid "Can't have a primary partition inside an extended partition." msgstr "Ðе можете имати примарну партицију унутар проширене партиције." -#: libparted/disk.c:1921 +#: libparted/disk.c:2090 msgid "Can't have a partition outside the disk!" msgstr "Ðе можете имати партицију изван диÑка!" -#: libparted/disk.c:1972 libparted/disk.c:2150 +#: libparted/disk.c:2141 libparted/disk.c:2319 msgid "Can't have overlapping partitions." msgstr "Ðе можете имати партицију преко партиције." -#: libparted/disk.c:2351 +#: libparted/disk.c:2520 msgid "metadata" msgstr "метаподаци" -#: libparted/disk.c:2353 +#: libparted/disk.c:2522 msgid "free" msgstr "Ñлободно" -#: libparted/disk.c:2355 parted/ui.c:1271 parted/ui.c:1299 +#: libparted/disk.c:2524 parted/ui.c:1274 parted/ui.c:1302 msgid "extended" msgstr "проширена" -#: libparted/disk.c:2357 parted/ui.c:1275 parted/ui.c:1303 +#: libparted/disk.c:2526 parted/ui.c:1278 parted/ui.c:1306 msgid "logical" msgstr "логичка" -#: libparted/disk.c:2359 parted/ui.c:1267 parted/ui.c:1295 +#: libparted/disk.c:2528 parted/ui.c:1270 parted/ui.c:1298 msgid "primary" msgstr "примарна" -#: libparted/disk.c:2375 +#: libparted/disk.c:2544 msgid "boot" msgstr "подизна" -#: libparted/disk.c:2377 +#: libparted/disk.c:2546 msgid "bios_grub" msgstr "биоÑ_груб" -#: libparted/disk.c:2379 +#: libparted/disk.c:2548 msgid "root" msgstr "корена" -#: libparted/disk.c:2381 +#: libparted/disk.c:2550 msgid "swap" msgstr "помоћна" -#: libparted/disk.c:2383 +#: libparted/disk.c:2552 msgid "hidden" msgstr "Ñкривена" -#: libparted/disk.c:2385 +#: libparted/disk.c:2554 msgid "raid" msgstr "раид" -#: libparted/disk.c:2387 +#: libparted/disk.c:2556 msgid "lvm" msgstr "лвм" -#: libparted/disk.c:2389 +#: libparted/disk.c:2558 msgid "lba" msgstr "лба" -#: libparted/disk.c:2391 +#: libparted/disk.c:2560 msgid "hp-service" msgstr "хп-уÑлуга" -#: libparted/disk.c:2393 +#: libparted/disk.c:2562 msgid "palo" msgstr "пало" -#: libparted/disk.c:2395 +#: libparted/disk.c:2564 msgid "prep" msgstr "преп" -#: libparted/disk.c:2397 +#: libparted/disk.c:2566 msgid "msftres" msgstr "мÑфтреÑ" -#: libparted/disk.c:2399 +#: libparted/disk.c:2568 msgid "msftdata" msgstr "мÑфтподаци" -#: libparted/disk.c:2401 +#: libparted/disk.c:2570 msgid "atvrecv" msgstr "атврецв" -#: libparted/disk.c:2403 +#: libparted/disk.c:2572 msgid "diag" msgstr "диаг" -#: libparted/disk.c:2405 +#: libparted/disk.c:2574 msgid "legacy_boot" msgstr "легаÑи_подизна" -#: libparted/disk.c:2407 +#: libparted/disk.c:2576 msgid "irst" msgstr "ирÑÑ‚" -#: libparted/disk.c:2409 +#: libparted/disk.c:2578 msgid "esp" msgstr "еÑп" -#: libparted/disk.c:2411 +#: libparted/disk.c:2580 msgid "chromeos_kernel" msgstr "хромоÑ_кернел" -#: libparted/disk.c:2413 +#: libparted/disk.c:2582 msgid "bls_boot" msgstr "блÑ_подизна" -#: libparted/disk.c:2415 +#: libparted/disk.c:2584 msgid "linux-home" +msgstr "линукÑ-лична" + +#: libparted/disk.c:2586 +msgid "no_automount" msgstr "" -#: libparted/disk.c:2421 +#: libparted/disk.c:2592 #, c-format msgid "Unknown partition flag, %d." msgstr "Ðепозната заÑтавица партиције, %d." @@ -1094,8 +1107,8 @@ msgstr "" "примарне партиције, ако је ИкÑГМ прва броји Ñе као две)." #: libparted/labels/atari.c:1662 libparted/labels/bsd.c:563 -#: libparted/labels/dasd.c:895 libparted/labels/dos.c:2303 -#: libparted/labels/dvh.c:770 libparted/labels/gpt.c:1769 +#: libparted/labels/dasd.c:893 libparted/labels/dos.c:2294 +#: libparted/labels/dvh.c:770 libparted/labels/gpt.c:1891 #: libparted/labels/loop.c:244 libparted/labels/mac.c:1409 #: libparted/labels/pc98.c:697 libparted/labels/rdb.c:1054 #: libparted/labels/sun.c:781 @@ -1119,40 +1132,31 @@ msgstr "Ðе могу да доделим број партиције." msgid "Unable to allocate a bsd disklabel slot." msgstr "Ðе могу да доделим бÑд прикључак натпиÑа диÑка." -#: libparted/labels/dasd.c:626 +#: libparted/labels/dasd.c:634 msgid "The partition table of DASD-LDL device cannot be changed.\n" msgstr "Партициона табела ДÐСД_ЛДЛ уређаја Ñе не може изменити.\n" -#: libparted/labels/dasd.c:921 +#: libparted/labels/dasd.c:919 msgid "Unable to allocate a dasd disklabel slot" msgstr "Ðе могу да доделим даÑд прикључак натпиÑа диÑка" -#: libparted/labels/dos.c:1008 +#: libparted/labels/dos.c:1159 #, c-format msgid "Invalid partition table on %s -- wrong signature %x." msgstr "ÐеиÑправна табела партиција на %s —— погрешан Ð¿Ð¾Ñ‚Ð¿Ð¸Ñ %x." -#: libparted/labels/dos.c:1036 +#: libparted/labels/dos.c:1187 #, c-format msgid "Invalid partition table - recursive partition on %s." msgstr "ÐеиÑправна табела партиција — дубинÑка партиција на %s." -#: libparted/labels/dos.c:1567 -msgid "Extended partitions cannot be hidden on msdos disk labels." -msgstr "Проширене партиције не могу бити Ñкривене на натпиÑима мÑÐ´Ð¾Ñ Ð´Ð¸Ñка." - -#: libparted/labels/dos.c:1579 -msgid "Extended partitions cannot be recovery partitions on msdos disk labels." -msgstr "" -"Проширене партиције не могу бити партиције опоравка на натпиÑима мÑÐ´Ð¾Ñ Ð´Ð¸Ñка." - -#: libparted/labels/dos.c:2285 +#: libparted/labels/dos.c:2276 msgid "Parted can't resize partitions managed by Windows Dynamic Disk." msgstr "" "Партед не може да промени величину партиција којима управља Виндоузов " "динамички диÑк." -#: libparted/labels/dos.c:2541 +#: libparted/labels/dos.c:2532 msgid "cannot create any more partitions" msgstr "не могу да направим више ни једну партицију" @@ -1294,11 +1298,11 @@ msgstr "Ðе могу да добавим податке о величини дРmsgid "Disk geometry does not match a DASD device of type 3390." msgstr "Геометрија диÑка не одговара ДÐСД уређају врÑте 3390." -#: libparted/labels/gpt.c:569 +#: libparted/labels/gpt.c:589 msgid "device is too small for GPT" msgstr "уређај је премали за ГПТ" -#: libparted/labels/gpt.c:771 +#: libparted/labels/gpt.c:791 #, c-format msgid "" "The format of the GPT partition table is version %x, which is newer than " @@ -1307,7 +1311,7 @@ msgstr "" "Облик ГПТ табеле партиција је издања %x које је новије од оног које Партед " "може да препозна. Молим пријавите ово!" -#: libparted/labels/gpt.c:807 +#: libparted/labels/gpt.c:827 #, c-format msgid "" "Not all of the space available to %s appears to be used, you can fix the GPT " @@ -1318,7 +1322,7 @@ msgstr "" "иÑправите ГПТ да кориÑти Ñав проÑтор (додатних %llu блокова) или да " "наÑтавите Ñа тренутним подешавањем? " -#: libparted/labels/gpt.c:1006 +#: libparted/labels/gpt.c:1026 msgid "" "The backup GPT table is not at the end of the disk, as it should be. Fix, " "by moving the backup to the end (and removing the old backup)?" @@ -1326,7 +1330,7 @@ msgstr "" "Резервна ГПТ табела није на крају диÑка, као што би требало. Да иÑправим, " "премештајући резерву на крај (и уклањајући Ñтару резерву)?" -#: libparted/labels/gpt.c:1024 +#: libparted/labels/gpt.c:1044 msgid "" "Both the primary and backup GPT tables are corrupt. Try making a fresh " "table, and using Parted's rescue feature to recover partitions." @@ -1335,7 +1339,7 @@ msgstr "" "Ñвежу табелу, и кориÑтићу Партедову функцију Ñпашавања да бих опоравио " "партиције." -#: libparted/labels/gpt.c:1035 +#: libparted/labels/gpt.c:1055 msgid "" "The backup GPT table is corrupt, but the primary appears OK, so that will be " "used." @@ -1343,7 +1347,7 @@ msgstr "" "Резервна ГПТ табела је оштећена, али примарна изгледа у реду, тако да ће " "иÑта бити коришћена." -#: libparted/labels/gpt.c:1047 +#: libparted/labels/gpt.c:1067 msgid "" "The primary GPT table is corrupt, but the backup appears OK, so that will be " "used." @@ -1351,11 +1355,11 @@ msgstr "" "Примарна ГПТ табела је оштећена, али резервна изгледа у реду, тако да ће " "иÑта бити коришћена." -#: libparted/labels/gpt.c:1071 +#: libparted/labels/gpt.c:1091 msgid "primary partition table array CRC mismatch" msgstr "ЦРЦ низа табеле примарне партиције не одговара" -#: libparted/labels/gpt.c:1655 libparted/labels/gpt.c:1682 +#: libparted/labels/gpt.c:1722 libparted/labels/gpt.c:1749 msgid "failed to translate partition name" msgstr "ниÑам уÑпео да преведем назив партиције" @@ -2030,7 +2034,7 @@ msgstr "fat_table_alloc_cluster: нема Ñлободних клаÑтера" msgid "Could not detect file system." msgstr "Ðе могу да откријем ÑиÑтем датотека." -#: libparted/fs/r/filesys.c:159 libparted/fs/r/filesys.c:284 +#: libparted/fs/r/filesys.c:159 libparted/fs/r/filesys.c:285 #, c-format msgid "resizing %s file systems is not supported" msgstr "промена величине „%s“ ÑиÑтема датотека није подржана" @@ -2318,40 +2322,39 @@ msgstr "" "Овај ХФС+ волумен нема датотеку прекорачења опÑега. Ово је поприлично " "необично!" -#: parted/parted.c:137 +#: parted/parted.c:138 msgid "displays this help message" msgstr "приказује ову поруку помоћи" -#: parted/parted.c:138 +#: parted/parted.c:139 msgid "lists partition layout on all block devices" msgstr "иÑпиÑује раÑпоред партиције на Ñвим уређајима блока" -#: parted/parted.c:139 +#: parted/parted.c:140 msgid "displays machine parseable output" msgstr "приказује машинама обрадив излаз" -#: parted/parted.c:140 -#, fuzzy +#: parted/parted.c:141 msgid "displays JSON output" -msgstr "приказује машинама обрадив излаз" +msgstr "приказује ЈСОРизлаз" -#: parted/parted.c:141 +#: parted/parted.c:142 msgid "never prompts for user intervention" msgstr "никада не поÑтавља за кориÑничко деловање" -#: parted/parted.c:142 +#: parted/parted.c:143 msgid "in script mode, fix instead of abort when asked" -msgstr "" +msgstr "у режиму Ñкрипте, поправља умеÑто да прекида када Ñе тражи" -#: parted/parted.c:143 +#: parted/parted.c:144 msgid "displays the version" msgstr "приказује издање" -#: parted/parted.c:144 +#: parted/parted.c:145 msgid "alignment for new partitions" msgstr "поравнање за нове партиције" -#: parted/parted.c:157 +#: parted/parted.c:158 msgid "" "NUMBER is the partition number used by Linux. On MS-DOS disk labels, the " "primary partitions number from 1 to 4, logical partitions from 5 onwards.\n" @@ -2360,31 +2363,31 @@ msgstr "" "примарне партиције Ñе кориÑте бројеви од 1 до 4, за логичке партиције од 5 " "на даље.\n" -#: parted/parted.c:160 +#: parted/parted.c:161 msgid "LABEL-TYPE is one of: " msgstr "ВРСТЗÐÐТПИСРможе бити: " -#: parted/parted.c:161 parted/parted.c:162 +#: parted/parted.c:162 parted/parted.c:163 msgid "FLAG is one of: " msgstr "ЗÐСТÐВИЦРможе бити: " -#: parted/parted.c:163 +#: parted/parted.c:164 msgid "UNIT is one of: " msgstr "ЈЕДИÐИЦРможе бити: " -#: parted/parted.c:164 +#: parted/parted.c:165 msgid "desired alignment: minimum or optimal" msgstr "жељено поравнање: најмање или одговарајуће" -#: parted/parted.c:165 +#: parted/parted.c:166 msgid "PART-TYPE is one of: primary, logical, extended\n" msgstr "ВРСТЗПÐРТИЦИЈЕ може бити: примарна, логичка, проширена\n" -#: parted/parted.c:167 +#: parted/parted.c:168 msgid "FS-TYPE is one of: " msgstr "ВРСТЗС.ДÐТ. може бити: " -#: parted/parted.c:168 +#: parted/parted.c:169 msgid "" "START and END are disk locations, such as 4GB or 10%. Negative values count " "from the end of the disk. For example, -1s specifies exactly the last " @@ -2394,7 +2397,7 @@ msgstr "" "вредноÑти почињу од краја диÑка. Ðа пример, -1 означава тачно поÑледњи " "Ñектор.\n" -#: parted/parted.c:171 +#: parted/parted.c:172 msgid "" "END is disk location, such as 4GB or 10%. Negative value counts from the " "end of the disk. For example, -1s specifies exactly the last sector.\n" @@ -2402,19 +2405,23 @@ msgstr "" "КРÐЈ је меÑто на диÑку, као што је 4GB или 10%. Ðегативне вредноÑти почињу " "од краја диÑка. Ðа пример, -1 означава тачно поÑледњи Ñектор.\n" -#: parted/parted.c:174 +#: parted/parted.c:175 msgid "STATE is one of: on, off\n" msgstr "СТÐЊЕ може бити: укљ., иÑкљ.\n" -#: parted/parted.c:175 +#: parted/parted.c:176 msgid "DEVICE is usually /dev/hda or /dev/sda\n" msgstr "УРЕЂÐЈ је обично „/dev/hda“ или „/dev/sda“\n" -#: parted/parted.c:176 +#: parted/parted.c:177 msgid "NAME is any word you want\n" msgstr "ÐÐЗИВ је било која реч коју изаберете\n" -#: parted/parted.c:179 +#: parted/parted.c:178 +msgid "TYPE_ID is a value between 0x01 and 0xff, TYPE_UUID is a UUID\n" +msgstr "" + +#: parted/parted.c:182 msgid "" "Copyright (C) 1998 - 2006 Free Software Foundation, Inc.\n" "This program is free software, covered by the GNU General Public License.\n" @@ -2434,23 +2441,23 @@ msgstr "" "Погледајте Гнуову општу јавну лиценцу за више детаља.\n" "\n" -#: parted/parted.c:229 +#: parted/parted.c:232 #, c-format msgid "%0.f%%\t(time left %.2d:%.2d)" msgstr "%0.f%%\t(преоÑтало време %.2d:%.2d)" -#: parted/parted.c:248 +#: parted/parted.c:251 #, c-format msgid "Partition %s is being used. Are you sure you want to continue?" msgstr "" "Партиција „%s“ је била коришћена. Да ли Ñте Ñигурни да желите да наÑтавите?" -#: parted/parted.c:269 +#: parted/parted.c:272 #, c-format msgid "Partition(s) on %s are being used." msgstr "Партиције на „%s“ Ñу биле коришћене." -#: parted/parted.c:281 +#: parted/parted.c:284 #, c-format msgid "" "The existing disk label on %s will be destroyed and all data on this disk " @@ -2459,31 +2466,31 @@ msgstr "" "ПоÑтојећи Ð½Ð°Ñ‚Ð¿Ð¸Ñ Ð´Ð¸Ñка на %s ће бити уништен и Ñви подаци на диÑку ће бити " "изгубљени. Да ли желите да наÑтавите?" -#: parted/parted.c:542 +#: parted/parted.c:545 msgid "New disk label type?" msgstr "Ðова врÑта натпиÑа диÑка?" -#: parted/parted.c:680 +#: parted/parted.c:692 msgid "Partition type?" msgstr "Ð’Ñ€Ñта партиције?" -#: parted/parted.c:698 parted/parted.c:902 +#: parted/parted.c:710 parted/parted.c:914 msgid "Partition name?" msgstr "Ðазив партиције?" -#: parted/parted.c:708 +#: parted/parted.c:720 msgid "File system type?" msgstr "Ð’Ñ€Ñта ÑиÑтема датотека?" -#: parted/parted.c:713 parted/parted.c:1683 +#: parted/parted.c:725 parted/parted.c:1815 msgid "Start?" msgstr "Почетак?" -#: parted/parted.c:715 parted/parted.c:1685 parted/parted.c:1768 +#: parted/parted.c:727 parted/parted.c:1817 parted/parted.c:1900 msgid "End?" msgstr "Крај?" -#: parted/parted.c:782 +#: parted/parted.c:794 #, c-format msgid "" "You requested a partition from %s to %s (sectors %llu..%llu).\n" @@ -2493,7 +2500,7 @@ msgstr "" "Ðајближе меÑто којим можемо да управљамо је од %s до %s (Ñектори %llu..%llu)." "%s" -#: parted/parted.c:791 +#: parted/parted.c:803 msgid "" "\n" "Is this still acceptable to you?" @@ -2501,95 +2508,120 @@ msgstr "" "\n" "Да ли вам је ово прихватљиво?" -#: parted/parted.c:814 +#: parted/parted.c:826 #, c-format msgid "" "The resulting partition is not properly aligned for best performance: %s" msgstr "" "Резултирајућа партиција није иÑправно поравната за најбоље резултате: %s" -#: parted/parted.c:816 parted/parted.c:1925 +#: parted/parted.c:828 parted/parted.c:2057 msgid "unknown (malloc failed)" msgstr "непозната (неуÑпела додела меморије)" -#: parted/parted.c:894 +#: parted/parted.c:906 #, c-format msgid "%s disk labels do not support partition name." msgstr "ÐатпиÑи „%s“ диÑка не подржавају назив партиције." -#: parted/parted.c:899 parted/parted.c:1748 parted/parted.c:1814 -#: parted/parted.c:1908 parted/parted.c:1983 +#: parted/parted.c:911 parted/parted.c:955 parted/parted.c:1880 +#: parted/parted.c:1946 parted/parted.c:2040 parted/parted.c:2115 msgid "Partition number?" msgstr "Број партиције?" -#: parted/parted.c:1050 +#: parted/parted.c:949 +#, fuzzy, c-format +msgid "%s disk labels do not support partition type." +msgstr "ÐатпиÑи „%s“ диÑка не подржавају назив партиције." + +#: parted/parted.c:965 +#, fuzzy +msgid "Partition type-id?" +msgstr "Ð’Ñ€Ñта партиције?" + +#: parted/parted.c:972 +#, fuzzy +msgid "Invalid type-id." +msgstr "ÐеиÑправан број." + +#: parted/parted.c:986 +#, fuzzy +msgid "Partition type-uuid?" +msgstr "Ð’Ñ€Ñта партиције?" + +#: parted/parted.c:993 +#, fuzzy +msgid "Invalid type-uuid." +msgstr "ÐеиÑправан број." + +#: parted/parted.c:1146 #, c-format msgid "BIOS cylinder,head,sector geometry: %d,%d,%d. Each cylinder is %s.\n" msgstr "" "БИОС геометрија цилиндара,главе,Ñектора: %d,%d,%d. Сваки цилиндар је %s.\n" -#: parted/parted.c:1137 +#: parted/parted.c:1240 #, c-format msgid "Model: %s (%s)\n" msgstr "Модел: %s (%s)\n" -#: parted/parted.c:1139 +#: parted/parted.c:1242 #, c-format msgid "Disk %s: %s\n" msgstr "ДиÑк %s: %s\n" -#: parted/parted.c:1140 +#: parted/parted.c:1243 #, c-format msgid "Sector size (logical/physical): %lldB/%lldB\n" msgstr "Величина Ñектора (логички/физички): %lldB/%lldB\n" -#: parted/parted.c:1152 +#: parted/parted.c:1255 #, c-format msgid "Partition Table: %s\n" msgstr "Табела партиција: %s\n" -#: parted/parted.c:1153 +#: parted/parted.c:1256 #, c-format msgid "Disk Flags: %s\n" msgstr "Опције диÑка: %s\n" -#: parted/parted.c:1279 parted/parted.c:1282 +#: parted/parted.c:1388 parted/parted.c:1391 msgid "Number" msgstr "Број" -#: parted/parted.c:1279 parted/parted.c:1282 +#: parted/parted.c:1388 parted/parted.c:1391 msgid "Start" msgstr "Почетак" -#: parted/parted.c:1280 parted/parted.c:1283 +#: parted/parted.c:1389 parted/parted.c:1392 msgid "End" msgstr "Крај" -#: parted/parted.c:1283 +#: parted/parted.c:1392 msgid "Size" msgstr "Величина" -#: parted/parted.c:1287 +#: parted/parted.c:1396 msgid "Type" msgstr "Ð’Ñ€Ñта" -#: parted/parted.c:1289 +#: parted/parted.c:1398 msgid "File system" msgstr "СиÑтем датотека" -#: parted/parted.c:1292 +#: parted/parted.c:1401 msgid "Name" msgstr "Ðазив" -#: parted/parted.c:1294 +#: parted/parted.c:1403 msgid "Flags" msgstr "ЗаÑтавице" -#: parted/parted.c:1352 +#: parted/parted.c:1461 msgid "Free Space" msgstr "Слободан проÑтор" -#: parted/parted.c:1570 +#: parted/parted.c:1702 #, c-format msgid "" "A %s %s partition was found at %s -> %s. Do you want to add it to the " @@ -2598,56 +2630,56 @@ msgstr "" "%s %s партиција је пронађена на %s —> %s. Да ли желите да је додате у " "табелу партиција?" -#: parted/parted.c:1613 +#: parted/parted.c:1745 msgid "searching for file systems" msgstr "тражим ÑиÑтеме датотека" -#: parted/parted.c:1720 +#: parted/parted.c:1852 msgid "The resize command has been removed in parted 3.0" msgstr "Ðаредба промене величине је уклоњена у партеду 3.0" -#: parted/parted.c:1782 +#: parted/parted.c:1914 msgid "" "Shrinking a partition can cause data loss, are you sure you want to continue?" msgstr "" "Скупљање партиције може да доведе до губитка података, да ли Ñте Ñигурни да " "желите да наÑтавите?" -#: parted/parted.c:1838 +#: parted/parted.c:1970 msgid "New device?" msgstr "Ðови уређај?" -#: parted/parted.c:1906 +#: parted/parted.c:2038 msgid "alignment type(min/opt)" msgstr "врÑта поравнања(најм./опц.)" -#: parted/parted.c:1921 +#: parted/parted.c:2053 #, c-format msgid "%d aligned\n" msgstr "%d је поравната\n" -#: parted/parted.c:1923 +#: parted/parted.c:2055 #, c-format msgid "%d not aligned: %s\n" msgstr "%d није поравнато: %s\n" -#: parted/parted.c:1948 parted/parted.c:1985 +#: parted/parted.c:2080 parted/parted.c:2117 msgid "Flag to Invert?" msgstr "Ознака за преокренути?" -#: parted/parted.c:1953 parted/parted.c:1990 +#: parted/parted.c:2085 parted/parted.c:2122 msgid "New state?" msgstr "Ðово Ñтање?" -#: parted/parted.c:2036 +#: parted/parted.c:2168 msgid "Unit?" msgstr "Јединица?" -#: parted/parted.c:2171 +#: parted/parted.c:2303 msgid "align-check" msgstr "align-check" -#: parted/parted.c:2174 +#: parted/parted.c:2306 msgid "" "align-check TYPE N check partition N for TYPE(min|opt) " "alignment" @@ -2655,11 +2687,11 @@ msgstr "" "align-check ВРСТРN врши проверу " "партиције N за ВРСТОМ(min|opt) поравнања" -#: parted/parted.c:2182 +#: parted/parted.c:2314 msgid "help" msgstr "help" -#: parted/parted.c:2185 +#: parted/parted.c:2317 msgid "" "help [COMMAND] print general help, or help on " "COMMAND" @@ -2667,15 +2699,15 @@ msgstr "" "help [ÐÐРЕДБÐ] штампа општу помоћ, или " "помоћ при ÐÐРЕДБИ" -#: parted/parted.c:2191 +#: parted/parted.c:2323 msgid "mklabel" msgstr "mklabel" -#: parted/parted.c:2191 +#: parted/parted.c:2323 msgid "mktable" msgstr "mktable" -#: parted/parted.c:2194 +#: parted/parted.c:2326 msgid "" "mklabel,mktable LABEL-TYPE create a new disklabel (partition " "table)" @@ -2683,15 +2715,15 @@ msgstr "" "mklabel,mktable ВРСТÐ-ÐÐТПИСРÑтвара нови Ð½Ð°Ñ‚Ð¿Ð¸Ñ Ð´Ð¸Ñка " "(табелу партиција)" -#: parted/parted.c:2200 +#: parted/parted.c:2332 msgid "mkpart" msgstr "mkpart" -#: parted/parted.c:2203 +#: parted/parted.c:2335 msgid "mkpart PART-TYPE [FS-TYPE] START END make a partition" msgstr "mkpart ВРСТÐ-ПÐРТИЦ [ВРСТÐ-СИС.ДÐТ.] ПОЧЕТÐК КРÐЈ Ñтвара партицију" -#: parted/parted.c:2209 +#: parted/parted.c:2341 msgid "" "'mkpart' makes a partition without creating a new file system on the " "partition. FS-TYPE may be specified to set an appropriate partition ID.\n" @@ -2700,31 +2732,29 @@ msgstr "" "ВРСТЗСИС.ДÐТ. може бити наведена за подешавање одговарајућег ИБ-а " "партиције.\n" -#: parted/parted.c:2214 +#: parted/parted.c:2346 msgid "name" msgstr "name" -#: parted/parted.c:2217 +#: parted/parted.c:2349 msgid "name NUMBER NAME name partition NUMBER as NAME" msgstr "" "name БРОЈ ÐÐЗИВ именује партицију БРОЈ " "као ÐÐЗИВ" -#: parted/parted.c:2222 +#: parted/parted.c:2354 msgid "print" msgstr "print" -#: parted/parted.c:2225 -#, fuzzy +#: parted/parted.c:2357 msgid "" "print [devices|free|list,all] display the partition table, or " "available devices, or free space, or all found partitions" msgstr "" -"print [уређаји|Ñлободно|ÑпиÑак,Ñве|БРОЈ] приказује табелу партиција, " -"доÑтупне уређаје, Ñлободан проÑтор, Ñве пронађене партиције, или поÑебну " -"партицију" +"print [уређаји|Ñлободно|ÑпиÑак,Ñве] приказује табелу партиција, или " +"доÑтупне уређаје, или Ñлободан проÑтор, Ñве пронађене партиције" -#: parted/parted.c:2229 +#: parted/parted.c:2361 msgid "" "Without arguments, 'print' displays the entire partition table. However with " "the following arguments it performs various other actions.\n" @@ -2732,11 +2762,11 @@ msgstr "" "Без аргумената, „print“ приказује читаву табелу партиција. Међутим Ñа " "Ñледећим аргументима обавља различите друге радње.\n" -#: parted/parted.c:2231 +#: parted/parted.c:2363 msgid " devices : display all active block devices\n" msgstr " devices : приказује Ñве активне блок уређаје\n" -#: parted/parted.c:2232 +#: parted/parted.c:2364 msgid "" " free : display information about free unpartitioned space on the " "current block device\n" @@ -2744,25 +2774,25 @@ msgstr "" " free : приказује податке о Ñлободном непартициониÑаном проÑтору на " "текућем блок уређају\n" -#: parted/parted.c:2234 +#: parted/parted.c:2366 msgid "" " list, all : display the partition tables of all active block devices\n" msgstr "" " list, all : приказује табеле партиција Ñвих активних блок уређаја\n" -#: parted/parted.c:2238 +#: parted/parted.c:2370 msgid "quit" msgstr "quit" -#: parted/parted.c:2241 +#: parted/parted.c:2373 msgid "quit exit program" msgstr "quit излази из програма" -#: parted/parted.c:2246 +#: parted/parted.c:2378 msgid "rescue" msgstr "rescue" -#: parted/parted.c:2249 +#: parted/parted.c:2381 msgid "" "rescue START END rescue a lost partition near START " "and END" @@ -2770,53 +2800,53 @@ msgstr "" "rescue ПОЧЕТÐК КРÐЈ Ñпашава изгубљену партицију близу " "ПОЧЕТКРи КРÐЈÐ" -#: parted/parted.c:2255 +#: parted/parted.c:2387 msgid "resize" msgstr "resize" -#: parted/parted.c:2258 +#: parted/parted.c:2390 msgid "The resize command was removed in parted 3.0\n" msgstr "Ðаредба промене величине је уклоњена у партеду 3.0\n" -#: parted/parted.c:2261 +#: parted/parted.c:2393 msgid "resizepart" msgstr "resizepart" -#: parted/parted.c:2264 +#: parted/parted.c:2396 msgid "resizepart NUMBER END resize partition NUMBER" msgstr "resizepart БРОЈ КРÐЈ мења величину партиције БРОЈ" -#: parted/parted.c:2269 +#: parted/parted.c:2401 msgid "rm" msgstr "rm" -#: parted/parted.c:2272 +#: parted/parted.c:2404 msgid "rm NUMBER delete partition NUMBER" msgstr "rm БРОЈ брише партицију БРОЈ" -#: parted/parted.c:2277 +#: parted/parted.c:2409 msgid "select" msgstr "select" -#: parted/parted.c:2280 +#: parted/parted.c:2412 msgid "select DEVICE choose the device to edit" msgstr "select УРЕЂÐЈ бира уређај за уређивање" -#: parted/parted.c:2285 +#: parted/parted.c:2417 msgid "disk_set" msgstr "disk_set" -#: parted/parted.c:2288 +#: parted/parted.c:2420 msgid "" "disk_set FLAG STATE change the FLAG on selected device" msgstr "" "disk_set СТÐЊЕ ОПЦИЈЕ мења ОПЦИЈУ на изабраном уређају" -#: parted/parted.c:2293 +#: parted/parted.c:2425 msgid "disk_toggle" msgstr "disk_toggle" -#: parted/parted.c:2296 +#: parted/parted.c:2428 msgid "" "disk_toggle [FLAG] toggle the state of FLAG on " "selected device" @@ -2824,21 +2854,21 @@ msgstr "" "disk_toggle [ОПЦИЈÐ] пребацује Ñтање ОПЦИЈЕ на изабраном " "уређају" -#: parted/parted.c:2302 +#: parted/parted.c:2434 msgid "set" msgstr "set" -#: parted/parted.c:2305 +#: parted/parted.c:2437 msgid "" "set NUMBER FLAG STATE change the FLAG on partition NUMBER" msgstr "" "set БРОЈ ЗÐСТÐВИЦРСТÐЊЕ мења ЗÐСТÐВИЦУ на партицији БРОЈ" -#: parted/parted.c:2311 +#: parted/parted.c:2443 msgid "toggle" msgstr "toggle" -#: parted/parted.c:2314 +#: parted/parted.c:2446 msgid "" "toggle [NUMBER [FLAG]] toggle the state of FLAG on " "partition NUMBER" @@ -2846,21 +2876,31 @@ msgstr "" "toggle [БРОЈ [ЗÐСТÐВИЦÐ]] пребацује Ñтање ЗÐСТÐВИЦЕ на " "партицији БРОЈ" -#: parted/parted.c:2320 +#: parted/parted.c:2452 +msgid "type" +msgstr "" + +#: parted/parted.c:2455 +msgid "" +"type NUMBER TYPE-ID or TYPE-UUID type set TYPE-ID or TYPE-UUID of " +"partition NUMBER" +msgstr "" + +#: parted/parted.c:2460 msgid "unit" msgstr "unit" -#: parted/parted.c:2323 +#: parted/parted.c:2463 msgid "unit UNIT set the default unit to UNIT" msgstr "" "unit ЈЕДИÐИЦРпоÑтавља оÑновну јединицу на " "ЈЕДИÐИЦУ" -#: parted/parted.c:2328 +#: parted/parted.c:2468 msgid "version" msgstr "version" -#: parted/parted.c:2331 +#: parted/parted.c:2471 msgid "" "version display the version number and " "copyright information of GNU Parted" @@ -2868,7 +2908,7 @@ msgstr "" "version приказује број издања и податке о " "ауторÑким правима ГÐУ Партеда" -#: parted/parted.c:2335 +#: parted/parted.c:2475 msgid "" "'version' displays copyright and version information corresponding to this " "copy of GNU Parted\n" @@ -2876,20 +2916,21 @@ msgstr "" "„version“ приказује ауторÑка права и податке о издању које одговара овом " "примерку ГÐУ Партеда\n" -#: parted/parted.c:2405 -#, fuzzy, c-format +#: parted/parted.c:2545 +#, c-format msgid "Usage: %s [-hlmsfv] [-a<align>] [DEVICE [COMMAND [PARAMETERS]]...]\n" -msgstr "Коришћење: %s [-hlmsv] [-a<align>] [УРЕЂÐЈ [ÐÐРЕДБР[ПÐÐ ÐМЕТРИ]]...]\n" +msgstr "" +"Коришћење: %s [-hlmsfv] [-a<align>] [УРЕЂÐЈ [ÐÐРЕДБР[ПÐÐ ÐМЕТРИ]]...]\n" -#: parted/parted.c:2449 +#: parted/parted.c:2589 msgid "No device found" msgstr "ÐиÑам пронашао уређај" -#: parted/parted.c:2486 +#: parted/parted.c:2626 msgid "WARNING: You are not superuser. Watch out for permissions.\n" msgstr "УПОЗОРЕЊЕ: Ви ниÑте админиÑтратор. Затражите овлашћења.\n" -#: parted/parted.c:2519 +#: parted/parted.c:2659 msgid "" "You should reinstall your boot loader before rebooting. Read section 4 of " "the Parted User documentation for more information." @@ -2898,7 +2939,7 @@ msgstr "" "покренете. Прочитајте одељак 4 кориÑничке документације Партеда за више " "података." -#: parted/parted.c:2526 +#: parted/parted.c:2666 msgid "You may need to update /etc/fstab.\n" msgstr "Мораћете да оÑвежите /etc/fstab.\n" @@ -3157,69 +3198,69 @@ msgstr "" "\n" "Грешка: Ðаиђох на општи SIGILL Ñигнал." -#: parted/ui.c:901 +#: parted/ui.c:904 #, c-format msgid "invalid token: %s" msgstr "неиÑправан чин: %s" -#: parted/ui.c:1082 +#: parted/ui.c:1085 msgid "Expecting a partition number." msgstr "Очекујем број партиције." -#: parted/ui.c:1091 +#: parted/ui.c:1094 msgid "Partition doesn't exist." msgstr "Партиција не поÑтоји." -#: parted/ui.c:1111 +#: parted/ui.c:1114 msgid "Expecting a file system type." msgstr "Очекујем врÑту ÑиÑтема датотека." -#: parted/ui.c:1118 +#: parted/ui.c:1121 #, c-format msgid "Unknown file system type \"%s\"." msgstr "Ðепозната врÑта ÑиÑтема датотека „%s“." -#: parted/ui.c:1139 +#: parted/ui.c:1142 msgid "Expecting a disk label type." msgstr "Очекујем врÑту натпиÑа диÑка." -#: parted/ui.c:1170 parted/ui.c:1206 +#: parted/ui.c:1173 parted/ui.c:1209 msgid "No flags supported" msgstr "ЗаÑтавице ниÑу подржане" -#: parted/ui.c:1280 +#: parted/ui.c:1283 msgid "Can't create any more partitions." msgstr "Ðе могу да направим више ни једну партицију." -#: parted/ui.c:1290 +#: parted/ui.c:1293 msgid "Expecting a partition type." msgstr "Очекујем врÑту партиције." -#: parted/ui.c:1439 +#: parted/ui.c:1442 msgid "on" msgstr "укљ" -#: parted/ui.c:1440 +#: parted/ui.c:1443 msgid "off" msgstr "иÑкљ" -#: parted/ui.c:1457 +#: parted/ui.c:1460 msgid "optimal" msgstr "најбоље" -#: parted/ui.c:1458 +#: parted/ui.c:1461 msgid "minimal" msgstr "најмање" -#: parted/ui.c:1591 +#: parted/ui.c:1594 msgid "OPTIONs:" msgstr "ОПЦИЈÐ/е:" -#: parted/ui.c:1596 +#: parted/ui.c:1599 msgid "COMMANDs:" msgstr "ÐÐРЕДБÐ/е:" -#: parted/ui.c:1599 +#: parted/ui.c:1602 #, c-format msgid "" "\n" @@ -3228,15 +3269,24 @@ msgstr "" "\n" "Грешке пријавите на %s\n" -#: parted/ui.c:1606 +#: parted/ui.c:1609 #, c-format msgid "Using %s\n" msgstr "КориÑтим %s\n" -#: parted/ui.c:1686 +#: parted/ui.c:1689 msgid "This command does not make sense in non-interactive mode.\n" msgstr "Ова наредба нема ÑмиÑла у немеђудејÑтвеном режиму.\n" +#~ msgid "Extended partitions cannot be hidden on msdos disk labels." +#~ msgstr "Проширене партиције не могу бити Ñкривене на натпиÑима мÑÐ´Ð¾Ñ Ð´Ð¸Ñка." + +#~ msgid "" +#~ "Extended partitions cannot be recovery partitions on msdos disk labels." +#~ msgstr "" +#~ "Проширене партиције не могу бити партиције опоравка на натпиÑима мÑÐ´Ð¾Ñ " +#~ "диÑка." + #~ msgid "" #~ " NUMBER : display more detailed information about this particular " #~ "partition\n" Binary files differ@@ -11,8 +11,8 @@ msgid "" msgstr "" "Project-Id-Version: parted 3.4.64.2\n" "Report-Msgid-Bugs-To: bug-parted@gnu.org\n" -"POT-Creation-Date: 2022-04-18 14:44-0400\n" -"PO-Revision-Date: 2022-04-06 11:16+0200\n" +"POT-Creation-Date: 2023-04-10 15:50-0700\n" +"PO-Revision-Date: 2022-12-24 00:33+0100\n" "Last-Translator: Luna Jernberg <droidbittin@gmail.com>\n" "Language-Team: Swedish <tp-sv@listor.tp-sv.se>\n" "Language: sv\n" @@ -20,27 +20,27 @@ msgstr "" "Content-Type: text/plain; charset=utf-8\n" "Content-Transfer-Encoding: 8bit\n" "X-Bugs: Report translation errors to the Language-Team address.\n" -"X-Generator: Poedit 3.0.1\n" +"X-Generator: Poedit 3.2.2\n" -#: lib/argmatch.c:147 +#: lib/argmatch.c:145 #, c-format msgid "invalid argument %s for %s" msgstr "ogiltigt argument %s för %s" -#: lib/argmatch.c:148 +#: lib/argmatch.c:146 #, c-format msgid "ambiguous argument %s for %s" msgstr "tvetydigt argument %s för %s" -#: lib/argmatch.c:167 lib/argmatch.h:238 +#: lib/argmatch.c:165 lib/argmatch.h:237 msgid "Valid arguments are:" msgstr "Giltiga argument är:" -#: lib/closeout.c:122 libparted/labels/fdasd.c:145 +#: lib/closeout.c:121 libparted/labels/fdasd.c:145 msgid "write error" msgstr "skrivfel" -#: lib/error.c:195 +#: lib/error.c:193 msgid "Unknown system error" msgstr "Okänt systemfel" @@ -100,11 +100,11 @@ msgstr "%s: flaggan kräver ett argument -- â€%câ€\n" #. If you don't know what to put here, please see #. <https://en.wikipedia.org/wiki/Quotation_marks_in_other_languages> #. and use glyphs suitable for your language. -#: lib/quotearg.c:355 +#: lib/quotearg.c:354 msgid "`" msgstr "â€" -#: lib/quotearg.c:356 +#: lib/quotearg.c:355 msgid "'" msgstr "â€" @@ -186,7 +186,7 @@ msgstr "Inga tidigare reguljära uttryck" #. To enquire the regular expression that your system uses for this #. purpose, you can use the command #. locale -k LC_MESSAGES | grep '^yesexpr=' -#: lib/rpmatch.c:150 +#: lib/rpmatch.c:149 msgid "^[yY]" msgstr "^[jJ]" @@ -196,7 +196,7 @@ msgstr "^[jJ]" #. To enquire the regular expression that your system uses for this #. purpose, you can use the command #. locale -k LC_MESSAGES | grep '^noexpr=' -#: lib/rpmatch.c:163 +#: lib/rpmatch.c:162 msgid "^[nN]" msgstr "^[nN]" @@ -757,21 +757,21 @@ msgstr "pmbr_boot" msgid "Unknown disk flag, %d." msgstr "Okänd diskflagga, %d." -#: libparted/disk.c:1289 +#: libparted/disk.c:1320 #, c-format msgid "%s disk labels do not support extended partitions." msgstr "%s-disketiketter saknar stöd för utökade partitioner." -#: libparted/disk.c:1821 +#: libparted/disk.c:1990 #, c-format msgid "%s disk labels don't support logical or extended partitions." msgstr "%s-disketiketter saknar stöd för logiska eller utökade partitioner." -#: libparted/disk.c:1834 +#: libparted/disk.c:2003 msgid "Too many primary partitions." msgstr "För mÃ¥nga primära partitioner." -#: libparted/disk.c:1843 +#: libparted/disk.c:2012 #, c-format msgid "" "Can't add a logical partition to %s, because there is no extended partition." @@ -779,137 +779,141 @@ msgstr "" "Kan inte lägga till en logisk partition till %s, eftersom det saknas en " "utökad partition." -#: libparted/disk.c:1867 +#: libparted/disk.c:2036 #, c-format msgid "Can't have more than one extended partition on %s." msgstr "Kan inte ha fler än en utökad partition pÃ¥ %s." -#: libparted/disk.c:1877 +#: libparted/disk.c:2046 msgid "Can't have logical partitions outside of the extended partition." msgstr "Kan inte ha logiska partitioner utanför den utökade partitionen." -#: libparted/disk.c:1902 +#: libparted/disk.c:2071 #, c-format msgid "Can't have a logical partition outside of the extended partition on %s." msgstr "Kan inte ha en logisk partition utanför den utökade partitionen pÃ¥ %s." -#: libparted/disk.c:1912 +#: libparted/disk.c:2081 msgid "Can't have a primary partition inside an extended partition." msgstr "Kan inte ha en primär partition inuti en utökad partition." -#: libparted/disk.c:1921 +#: libparted/disk.c:2090 msgid "Can't have a partition outside the disk!" msgstr "Kan inte ha en partition utanför hÃ¥rddisken!" -#: libparted/disk.c:1972 libparted/disk.c:2150 +#: libparted/disk.c:2141 libparted/disk.c:2319 msgid "Can't have overlapping partitions." msgstr "Kan inte ha överlappande partitioner." -#: libparted/disk.c:2351 +#: libparted/disk.c:2520 msgid "metadata" msgstr "metadata" -#: libparted/disk.c:2353 +#: libparted/disk.c:2522 msgid "free" msgstr "ledigt" -#: libparted/disk.c:2355 parted/ui.c:1271 parted/ui.c:1299 +#: libparted/disk.c:2524 parted/ui.c:1274 parted/ui.c:1302 msgid "extended" msgstr "utökad" -#: libparted/disk.c:2357 parted/ui.c:1275 parted/ui.c:1303 +#: libparted/disk.c:2526 parted/ui.c:1278 parted/ui.c:1306 msgid "logical" msgstr "logisk" -#: libparted/disk.c:2359 parted/ui.c:1267 parted/ui.c:1295 +#: libparted/disk.c:2528 parted/ui.c:1270 parted/ui.c:1298 msgid "primary" msgstr "primär" -#: libparted/disk.c:2375 +#: libparted/disk.c:2544 msgid "boot" msgstr "startbar" -#: libparted/disk.c:2377 +#: libparted/disk.c:2546 msgid "bios_grub" msgstr "bios_grub" -#: libparted/disk.c:2379 +#: libparted/disk.c:2548 msgid "root" msgstr "rot" -#: libparted/disk.c:2381 +#: libparted/disk.c:2550 msgid "swap" msgstr "växlingsutrymme" -#: libparted/disk.c:2383 +#: libparted/disk.c:2552 msgid "hidden" msgstr "dold" -#: libparted/disk.c:2385 +#: libparted/disk.c:2554 msgid "raid" msgstr "raid" -#: libparted/disk.c:2387 +#: libparted/disk.c:2556 msgid "lvm" msgstr "lvm" -#: libparted/disk.c:2389 +#: libparted/disk.c:2558 msgid "lba" msgstr "lba" -#: libparted/disk.c:2391 +#: libparted/disk.c:2560 msgid "hp-service" msgstr "hp-service" -#: libparted/disk.c:2393 +#: libparted/disk.c:2562 msgid "palo" msgstr "palo" -#: libparted/disk.c:2395 +#: libparted/disk.c:2564 msgid "prep" msgstr "prep" -#: libparted/disk.c:2397 +#: libparted/disk.c:2566 msgid "msftres" msgstr "msftres" -#: libparted/disk.c:2399 +#: libparted/disk.c:2568 msgid "msftdata" msgstr "msftdata" -#: libparted/disk.c:2401 +#: libparted/disk.c:2570 msgid "atvrecv" msgstr "atvrecv" -#: libparted/disk.c:2403 +#: libparted/disk.c:2572 msgid "diag" msgstr "diag" -#: libparted/disk.c:2405 +#: libparted/disk.c:2574 msgid "legacy_boot" msgstr "legacy_boot" -#: libparted/disk.c:2407 +#: libparted/disk.c:2576 msgid "irst" msgstr "irst" -#: libparted/disk.c:2409 +#: libparted/disk.c:2578 msgid "esp" msgstr "esp" -#: libparted/disk.c:2411 +#: libparted/disk.c:2580 msgid "chromeos_kernel" msgstr "chromeos_kernel" -#: libparted/disk.c:2413 +#: libparted/disk.c:2582 msgid "bls_boot" msgstr "bls_boot" -#: libparted/disk.c:2415 +#: libparted/disk.c:2584 msgid "linux-home" msgstr "linux-home" -#: libparted/disk.c:2421 +#: libparted/disk.c:2586 +msgid "no_automount" +msgstr "" + +#: libparted/disk.c:2592 #, c-format msgid "Unknown partition flag, %d." msgstr "Okänd partitionsflagga, %d." @@ -1116,8 +1120,8 @@ msgstr "" "partitioner, om XGM är den första räknas den som tvÃ¥)." #: libparted/labels/atari.c:1662 libparted/labels/bsd.c:563 -#: libparted/labels/dasd.c:895 libparted/labels/dos.c:2303 -#: libparted/labels/dvh.c:770 libparted/labels/gpt.c:1769 +#: libparted/labels/dasd.c:893 libparted/labels/dos.c:2294 +#: libparted/labels/dvh.c:770 libparted/labels/gpt.c:1891 #: libparted/labels/loop.c:244 libparted/labels/mac.c:1409 #: libparted/labels/pc98.c:697 libparted/labels/rdb.c:1054 #: libparted/labels/sun.c:781 @@ -1142,41 +1146,31 @@ msgstr "Kunde inte allokera ett partitionsnummer." msgid "Unable to allocate a bsd disklabel slot." msgstr "Kunde inte allokera en plats i bsd-disketiketten." -#: libparted/labels/dasd.c:626 +#: libparted/labels/dasd.c:634 msgid "The partition table of DASD-LDL device cannot be changed.\n" msgstr "Partitionstabellen för DASD-LDL-enheten kan inte ändras.\n" -#: libparted/labels/dasd.c:921 +#: libparted/labels/dasd.c:919 msgid "Unable to allocate a dasd disklabel slot" msgstr "Kunde inte allokera en plats i dasd-disketiketten" -#: libparted/labels/dos.c:1008 +#: libparted/labels/dos.c:1159 #, c-format msgid "Invalid partition table on %s -- wrong signature %x." msgstr "Ogiltig partitionstabell pÃ¥ %s -- felaktig signatur %x." -#: libparted/labels/dos.c:1036 +#: libparted/labels/dos.c:1187 #, c-format msgid "Invalid partition table - recursive partition on %s." msgstr "Ogiltig partitionstabell - rekursiv partition pÃ¥ %s." -#: libparted/labels/dos.c:1567 -msgid "Extended partitions cannot be hidden on msdos disk labels." -msgstr "Utökade partitioner kan inte gömmas i disketiketter av typen msdos." - -#: libparted/labels/dos.c:1579 -msgid "Extended partitions cannot be recovery partitions on msdos disk labels." -msgstr "" -"Utökade partitioner kan inte vara Ã¥terställningspartitioner pÃ¥ msdos-" -"disketiketter." - -#: libparted/labels/dos.c:2285 +#: libparted/labels/dos.c:2276 msgid "Parted can't resize partitions managed by Windows Dynamic Disk." msgstr "" "Parted kan inte ändra storlek pÃ¥ partitioner som hanteras av Windows Dynamic " "Disk." -#: libparted/labels/dos.c:2541 +#: libparted/labels/dos.c:2532 msgid "cannot create any more partitions" msgstr "kan inte skapa nÃ¥gra fler partitioner" @@ -1320,11 +1314,11 @@ msgstr "Kunde inte läsa av information om blockstorlek." msgid "Disk geometry does not match a DASD device of type 3390." msgstr "Diskgeometri matchar inte en DASD-enhet av typ 3390." -#: libparted/labels/gpt.c:569 +#: libparted/labels/gpt.c:589 msgid "device is too small for GPT" msgstr "enheten är för liten för GPT" -#: libparted/labels/gpt.c:771 +#: libparted/labels/gpt.c:791 #, c-format msgid "" "The format of the GPT partition table is version %x, which is newer than " @@ -1333,7 +1327,7 @@ msgstr "" "Formatet pÃ¥ GPT-partitionstabellen är version %x vilket är nyare än vad " "Parted kan känna igen. Rapportera detta!" -#: libparted/labels/gpt.c:807 +#: libparted/labels/gpt.c:827 #, c-format msgid "" "Not all of the space available to %s appears to be used, you can fix the GPT " @@ -1344,7 +1338,7 @@ msgstr "" "sÃ¥ att allt utrymme används (%llu block extra) eller fortsätta med de " "aktuella inställningar? " -#: libparted/labels/gpt.c:1006 +#: libparted/labels/gpt.c:1026 msgid "" "The backup GPT table is not at the end of the disk, as it should be. Fix, " "by moving the backup to the end (and removing the old backup)?" @@ -1353,7 +1347,7 @@ msgstr "" "borde. Fixa detta genom att flytta säkerhetskopia till slutet (och ta bort " "den gamla säkerhetskopian)?" -#: libparted/labels/gpt.c:1024 +#: libparted/labels/gpt.c:1044 msgid "" "Both the primary and backup GPT tables are corrupt. Try making a fresh " "table, and using Parted's rescue feature to recover partitions." @@ -1362,7 +1356,7 @@ msgstr "" "en ny tabell och använd Parteds räddningsfunktion för att Ã¥terskapa " "partitioner." -#: libparted/labels/gpt.c:1035 +#: libparted/labels/gpt.c:1055 msgid "" "The backup GPT table is corrupt, but the primary appears OK, so that will be " "used." @@ -1370,7 +1364,7 @@ msgstr "" "Säkerhetskopian av GPT:n är korrupt, men den primära verkar vara OK, sÃ¥ den " "används." -#: libparted/labels/gpt.c:1047 +#: libparted/labels/gpt.c:1067 msgid "" "The primary GPT table is corrupt, but the backup appears OK, so that will be " "used." @@ -1378,11 +1372,11 @@ msgstr "" "Den primära GPT:n är korrupt, men säkerhetskopian verkar vara OK, sÃ¥ den " "används." -#: libparted/labels/gpt.c:1071 +#: libparted/labels/gpt.c:1091 msgid "primary partition table array CRC mismatch" -msgstr "primär partitionstabell array CRC stämmer inte" +msgstr "crc-fel i primär partitionstabellsvektor" -#: libparted/labels/gpt.c:1655 libparted/labels/gpt.c:1682 +#: libparted/labels/gpt.c:1722 libparted/labels/gpt.c:1749 msgid "failed to translate partition name" msgstr "kunde inte översätta partitionsnamn" @@ -2063,7 +2057,7 @@ msgstr "fat_table_alloc_cluster: inga lediga kluster" msgid "Could not detect file system." msgstr "Kunde inte hitta nÃ¥got filsystem." -#: libparted/fs/r/filesys.c:159 libparted/fs/r/filesys.c:284 +#: libparted/fs/r/filesys.c:159 libparted/fs/r/filesys.c:285 #, c-format msgid "resizing %s file systems is not supported" msgstr "storleksändring av %s-filsystem stöds inte" @@ -2352,39 +2346,39 @@ msgstr "" "Denna HFS+-volym har ingen överspillsfil för utsträckningar. Detta är " "väldigt ovanligt!" -#: parted/parted.c:137 +#: parted/parted.c:138 msgid "displays this help message" msgstr "visa den här hjälptexten" -#: parted/parted.c:138 +#: parted/parted.c:139 msgid "lists partition layout on all block devices" msgstr "listar partitionslayout för alla blockenheter" -#: parted/parted.c:139 +#: parted/parted.c:140 msgid "displays machine parseable output" msgstr "visar utskriften som maskintolkningsbar" -#: parted/parted.c:140 +#: parted/parted.c:141 msgid "displays JSON output" msgstr "visar JSON-utdata" -#: parted/parted.c:141 +#: parted/parted.c:142 msgid "never prompts for user intervention" msgstr "frÃ¥gar aldrig användaren om alternativ" -#: parted/parted.c:142 +#: parted/parted.c:143 msgid "in script mode, fix instead of abort when asked" msgstr "i skriptläge, fixa istället för att avbryta när du tillfrÃ¥gas" -#: parted/parted.c:143 +#: parted/parted.c:144 msgid "displays the version" msgstr "visar versionen" -#: parted/parted.c:144 +#: parted/parted.c:145 msgid "alignment for new partitions" msgstr "justering för nya partitioner" -#: parted/parted.c:157 +#: parted/parted.c:158 msgid "" "NUMBER is the partition number used by Linux. On MS-DOS disk labels, the " "primary partitions number from 1 to 4, logical partitions from 5 onwards.\n" @@ -2393,31 +2387,31 @@ msgstr "" "DOS är de primära partitionerna numrerade frÃ¥n 1 till 4, och de logiska " "partitionerna frÃ¥n 5 och uppÃ¥t.\n" -#: parted/parted.c:160 +#: parted/parted.c:161 msgid "LABEL-TYPE is one of: " msgstr "PART-TYP är en av: " -#: parted/parted.c:161 parted/parted.c:162 +#: parted/parted.c:162 parted/parted.c:163 msgid "FLAG is one of: " msgstr "FLAGGA är en av: " -#: parted/parted.c:163 +#: parted/parted.c:164 msgid "UNIT is one of: " msgstr "ENHET är en av: " -#: parted/parted.c:164 +#: parted/parted.c:165 msgid "desired alignment: minimum or optimal" msgstr "önskad justering: minimum eller optimal" -#: parted/parted.c:165 +#: parted/parted.c:166 msgid "PART-TYPE is one of: primary, logical, extended\n" msgstr "PART-TYP är en av: primär, logisk, utökad\n" -#: parted/parted.c:167 +#: parted/parted.c:168 msgid "FS-TYPE is one of: " msgstr "FS-TYP är en av: " -#: parted/parted.c:168 +#: parted/parted.c:169 msgid "" "START and END are disk locations, such as 4GB or 10%. Negative values count " "from the end of the disk. For example, -1s specifies exactly the last " @@ -2427,7 +2421,7 @@ msgstr "" "räknas frÃ¥n slutet pÃ¥ disken. Till exempel, -1s anger exakt den sista " "sektorn.\n" -#: parted/parted.c:171 +#: parted/parted.c:172 msgid "" "END is disk location, such as 4GB or 10%. Negative value counts from the " "end of the disk. For example, -1s specifies exactly the last sector.\n" @@ -2435,19 +2429,23 @@ msgstr "" "SLUT är en plats pÃ¥ disken, sÃ¥som 4GB eller 10%. Negativa värden räknas " "frÃ¥n slutet pÃ¥ disken. Till exempel, -1s anger exakt den sista sektorn.\n" -#: parted/parted.c:174 +#: parted/parted.c:175 msgid "STATE is one of: on, off\n" msgstr "TILLSTÃ…ND är ett av: pÃ¥, av\n" -#: parted/parted.c:175 +#: parted/parted.c:176 msgid "DEVICE is usually /dev/hda or /dev/sda\n" msgstr "ENHET är vanligen /dev/hda eller /dev/sda\n" -#: parted/parted.c:176 +#: parted/parted.c:177 msgid "NAME is any word you want\n" msgstr "NAMN är vilket ord du vill\n" -#: parted/parted.c:179 +#: parted/parted.c:178 +msgid "TYPE_ID is a value between 0x01 and 0xff, TYPE_UUID is a UUID\n" +msgstr "" + +#: parted/parted.c:182 msgid "" "Copyright (C) 1998 - 2006 Free Software Foundation, Inc.\n" "This program is free software, covered by the GNU General Public License.\n" @@ -2474,22 +2472,22 @@ msgstr "" "ytterligare information.\n" "\n" -#: parted/parted.c:229 +#: parted/parted.c:232 #, c-format msgid "%0.f%%\t(time left %.2d:%.2d)" msgstr "%0.f%%\t(tid kvar %.2d:%.2d)" -#: parted/parted.c:248 +#: parted/parted.c:251 #, c-format msgid "Partition %s is being used. Are you sure you want to continue?" msgstr "Partitionen %s används. Är du säker pÃ¥ att du vill fortsätta?" -#: parted/parted.c:269 +#: parted/parted.c:272 #, c-format msgid "Partition(s) on %s are being used." msgstr "Partitionen pÃ¥ %s är i bruk." -#: parted/parted.c:281 +#: parted/parted.c:284 #, c-format msgid "" "The existing disk label on %s will be destroyed and all data on this disk " @@ -2498,31 +2496,31 @@ msgstr "" "Den befintliga disketiketten pÃ¥ %s kommer att förstöras och all data pÃ¥ " "denna disk kommer att gÃ¥ förlorad. Vill du fortsätta?" -#: parted/parted.c:542 +#: parted/parted.c:545 msgid "New disk label type?" msgstr "Ny typ av disketikett?" -#: parted/parted.c:680 +#: parted/parted.c:692 msgid "Partition type?" msgstr "Partitionstyp?" -#: parted/parted.c:698 parted/parted.c:902 +#: parted/parted.c:710 parted/parted.c:914 msgid "Partition name?" msgstr "Partitionsnamn?" -#: parted/parted.c:708 +#: parted/parted.c:720 msgid "File system type?" msgstr "Filsystemstyp?" -#: parted/parted.c:713 parted/parted.c:1683 +#: parted/parted.c:725 parted/parted.c:1815 msgid "Start?" msgstr "Början?" -#: parted/parted.c:715 parted/parted.c:1685 parted/parted.c:1768 +#: parted/parted.c:727 parted/parted.c:1817 parted/parted.c:1900 msgid "End?" msgstr "Slut?" -#: parted/parted.c:782 +#: parted/parted.c:794 #, c-format msgid "" "You requested a partition from %s to %s (sectors %llu..%llu).\n" @@ -2531,7 +2529,7 @@ msgstr "" "Du begärde en partition frÃ¥n %s till %s (sektorerna %llu..%llu).\n" "Den närmsta platsen vi kan hantera är %s till %s (sektorerna %llu..%llu).%s" -#: parted/parted.c:791 +#: parted/parted.c:803 msgid "" "\n" "Is this still acceptable to you?" @@ -2539,95 +2537,120 @@ msgstr "" "\n" "Är detta fortfarande godtagbart för dig?" -#: parted/parted.c:814 +#: parted/parted.c:826 #, c-format msgid "" "The resulting partition is not properly aligned for best performance: %s" msgstr "" "Den resulterande partitionen är inte korrekt justerad för bästa prestanda: %s" -#: parted/parted.c:816 parted/parted.c:1925 +#: parted/parted.c:828 parted/parted.c:2057 msgid "unknown (malloc failed)" msgstr "okänd (malloc misslyckades)" -#: parted/parted.c:894 +#: parted/parted.c:906 #, c-format msgid "%s disk labels do not support partition name." msgstr "%s-disketiketter stöder inte partitionsnamn." -#: parted/parted.c:899 parted/parted.c:1748 parted/parted.c:1814 -#: parted/parted.c:1908 parted/parted.c:1983 +#: parted/parted.c:911 parted/parted.c:955 parted/parted.c:1880 +#: parted/parted.c:1946 parted/parted.c:2040 parted/parted.c:2115 msgid "Partition number?" msgstr "Partitionsnummer?" -#: parted/parted.c:1050 +#: parted/parted.c:949 +#, fuzzy, c-format +msgid "%s disk labels do not support partition type." +msgstr "%s-disketiketter stöder inte partitionsnamn." + +#: parted/parted.c:965 +#, fuzzy +msgid "Partition type-id?" +msgstr "Partitionstyp?" + +#: parted/parted.c:972 +#, fuzzy +msgid "Invalid type-id." +msgstr "Ogiltigt nummer." + +#: parted/parted.c:986 +#, fuzzy +msgid "Partition type-uuid?" +msgstr "Partitionstyp?" + +#: parted/parted.c:993 +#, fuzzy +msgid "Invalid type-uuid." +msgstr "Ogiltigt nummer." + +#: parted/parted.c:1146 #, c-format msgid "BIOS cylinder,head,sector geometry: %d,%d,%d. Each cylinder is %s.\n" msgstr "" "BIOS-geometri för cylinder,huvud,sektor: %d,%d,%d. Varje cylinder är %s.\n" -#: parted/parted.c:1137 +#: parted/parted.c:1240 #, c-format msgid "Model: %s (%s)\n" msgstr "Modell: %s (%s)\n" -#: parted/parted.c:1139 +#: parted/parted.c:1242 #, c-format msgid "Disk %s: %s\n" msgstr "Disk %s: %s\n" -#: parted/parted.c:1140 +#: parted/parted.c:1243 #, c-format msgid "Sector size (logical/physical): %lldB/%lldB\n" msgstr "Sektorstorlek (logisk/fysisk): %lldB/%lldB\n" -#: parted/parted.c:1152 +#: parted/parted.c:1255 #, c-format msgid "Partition Table: %s\n" msgstr "Partitionstabell: %s\n" -#: parted/parted.c:1153 +#: parted/parted.c:1256 #, c-format msgid "Disk Flags: %s\n" msgstr "Diskflaggor: %s\n" -#: parted/parted.c:1279 parted/parted.c:1282 +#: parted/parted.c:1388 parted/parted.c:1391 msgid "Number" msgstr "Nummer" -#: parted/parted.c:1279 parted/parted.c:1282 +#: parted/parted.c:1388 parted/parted.c:1391 msgid "Start" msgstr "Början" -#: parted/parted.c:1280 parted/parted.c:1283 +#: parted/parted.c:1389 parted/parted.c:1392 msgid "End" msgstr "Slut" -#: parted/parted.c:1283 +#: parted/parted.c:1392 msgid "Size" msgstr "Storlek" -#: parted/parted.c:1287 +#: parted/parted.c:1396 msgid "Type" msgstr "Typ" -#: parted/parted.c:1289 +#: parted/parted.c:1398 msgid "File system" msgstr "Filsystem" -#: parted/parted.c:1292 +#: parted/parted.c:1401 msgid "Name" msgstr "Namn" -#: parted/parted.c:1294 +#: parted/parted.c:1403 msgid "Flags" msgstr "Flaggor" -#: parted/parted.c:1352 +#: parted/parted.c:1461 msgid "Free Space" msgstr "Ledigt utrymme" -#: parted/parted.c:1570 +#: parted/parted.c:1702 #, c-format msgid "" "A %s %s partition was found at %s -> %s. Do you want to add it to the " @@ -2636,56 +2659,56 @@ msgstr "" "En %s %s-partition hittades pÃ¥ %s -> %s. Vill du lägga till den till " "partitionstabellen?" -#: parted/parted.c:1613 +#: parted/parted.c:1745 msgid "searching for file systems" msgstr "söker efter filsystem" -#: parted/parted.c:1720 +#: parted/parted.c:1852 msgid "The resize command has been removed in parted 3.0" msgstr "Kommandot ändra_storlek har tagits bort i parted 3.0" -#: parted/parted.c:1782 +#: parted/parted.c:1914 msgid "" "Shrinking a partition can cause data loss, are you sure you want to continue?" msgstr "" "Att minska storlek för en partition kan orsaka dataförlust, är du säker pÃ¥ " "att du vill fortsätta?" -#: parted/parted.c:1838 +#: parted/parted.c:1970 msgid "New device?" msgstr "Ny enhet?" -#: parted/parted.c:1906 +#: parted/parted.c:2038 msgid "alignment type(min/opt)" msgstr "justeringstyp(min/opt)" -#: parted/parted.c:1921 +#: parted/parted.c:2053 #, c-format msgid "%d aligned\n" msgstr "%d justerad\n" -#: parted/parted.c:1923 +#: parted/parted.c:2055 #, c-format msgid "%d not aligned: %s\n" msgstr "%d inte justerad: %s\n" -#: parted/parted.c:1948 parted/parted.c:1985 +#: parted/parted.c:2080 parted/parted.c:2117 msgid "Flag to Invert?" msgstr "Flagga att invertera?" -#: parted/parted.c:1953 parted/parted.c:1990 +#: parted/parted.c:2085 parted/parted.c:2122 msgid "New state?" msgstr "Nytt tillstÃ¥nd?" -#: parted/parted.c:2036 +#: parted/parted.c:2168 msgid "Unit?" msgstr "Enhet?" -#: parted/parted.c:2171 +#: parted/parted.c:2303 msgid "align-check" msgstr "justeringskontroll" -#: parted/parted.c:2174 +#: parted/parted.c:2306 msgid "" "align-check TYPE N check partition N for TYPE(min|opt) " "alignment" @@ -2693,11 +2716,11 @@ msgstr "" "justeringskontroll TYP N kontrollera TYP(min|opt)-justering " "för partition N" -#: parted/parted.c:2182 +#: parted/parted.c:2314 msgid "help" msgstr "hjälp" -#: parted/parted.c:2185 +#: parted/parted.c:2317 msgid "" "help [COMMAND] print general help, or help on " "COMMAND" @@ -2705,15 +2728,15 @@ msgstr "" "hjälp [KOMMANDO] skriver ut allmän hjälp eller hjälp " "för KOMMANDO" -#: parted/parted.c:2191 +#: parted/parted.c:2323 msgid "mklabel" msgstr "mklabel" -#: parted/parted.c:2191 +#: parted/parted.c:2323 msgid "mktable" msgstr "mktable" -#: parted/parted.c:2194 +#: parted/parted.c:2326 msgid "" "mklabel,mktable LABEL-TYPE create a new disklabel (partition " "table)" @@ -2721,15 +2744,15 @@ msgstr "" "mklabel,mktable ETIKETT-TYP skapa en ny disketikett " "(partitionstabell)" -#: parted/parted.c:2200 +#: parted/parted.c:2332 msgid "mkpart" msgstr "mkpart" -#: parted/parted.c:2203 +#: parted/parted.c:2335 msgid "mkpart PART-TYPE [FS-TYPE] START END make a partition" msgstr "mkpart PART-TYP [FS-TYP] BÖRJAN SLUT skapa en partition" -#: parted/parted.c:2209 +#: parted/parted.c:2341 msgid "" "'mkpart' makes a partition without creating a new file system on the " "partition. FS-TYPE may be specified to set an appropriate partition ID.\n" @@ -2738,29 +2761,29 @@ msgstr "" "partitionen. FS-TYP mÃ¥ste anges för att ställa in ett lämpligt partitions-" "id.\n" -#: parted/parted.c:2214 +#: parted/parted.c:2346 msgid "name" msgstr "namn" -#: parted/parted.c:2217 +#: parted/parted.c:2349 msgid "name NUMBER NAME name partition NUMBER as NAME" msgstr "" "namn NUMMER NAMN ge namnet NAMN till partition NUMMER" -#: parted/parted.c:2222 +#: parted/parted.c:2354 msgid "print" msgstr "visa" -#: parted/parted.c:2225 +#: parted/parted.c:2357 msgid "" "print [devices|free|list,all] display the partition table, or " "available devices, or free space, or all found partitions" msgstr "" -"visa [devices|free|list,all|] visa partitionstabellen, " +"visa [devices|free|list,all] visa partitionstabellen, " "tillgängliga enheter, ledigt utrymme, alla partitioner som hittats, eller en " "specifik partition" -#: parted/parted.c:2229 +#: parted/parted.c:2361 msgid "" "Without arguments, 'print' displays the entire partition table. However with " "the following arguments it performs various other actions.\n" @@ -2768,11 +2791,11 @@ msgstr "" "Utan argument sÃ¥ skriver \"visa\" ut hela partitionstabellen. Dock kan " "diverse andra Ã¥tgärder genomföras med följande argument.\n" -#: parted/parted.c:2231 +#: parted/parted.c:2363 msgid " devices : display all active block devices\n" msgstr " devices : visa alla aktiva blockenheter\n" -#: parted/parted.c:2232 +#: parted/parted.c:2364 msgid "" " free : display information about free unpartitioned space on the " "current block device\n" @@ -2780,24 +2803,24 @@ msgstr "" " free : visa information om ledigt, opartitionerat utrymme pÃ¥ den " "aktuella blockenheten\n" -#: parted/parted.c:2234 +#: parted/parted.c:2366 msgid "" " list, all : display the partition tables of all active block devices\n" msgstr " list, all : visa partitionstabellerna pÃ¥ alla aktiva blockenheter\n" -#: parted/parted.c:2238 +#: parted/parted.c:2370 msgid "quit" msgstr "avsluta" -#: parted/parted.c:2241 +#: parted/parted.c:2373 msgid "quit exit program" msgstr "avsluta avsluta programmet" -#: parted/parted.c:2246 +#: parted/parted.c:2378 msgid "rescue" msgstr "rädda" -#: parted/parted.c:2249 +#: parted/parted.c:2381 msgid "" "rescue START END rescue a lost partition near START " "and END" @@ -2805,53 +2828,53 @@ msgstr "" "rädda BÖRJAN SLUT rädda en förlorad partition nära " "BÖRJAN och SLUT" -#: parted/parted.c:2255 +#: parted/parted.c:2387 msgid "resize" msgstr "ändra_storlek" -#: parted/parted.c:2258 +#: parted/parted.c:2390 msgid "The resize command was removed in parted 3.0\n" msgstr "Kommandot ändra_storlek har tagits bort i parted 3.0\n" -#: parted/parted.c:2261 +#: parted/parted.c:2393 msgid "resizepart" msgstr "ändra_partstorlek" -#: parted/parted.c:2264 +#: parted/parted.c:2396 msgid "resizepart NUMBER END resize partition NUMBER" msgstr "" "ändra_partstorlek NUMMER SLUT ändra storlek för partition NUMMER" -#: parted/parted.c:2269 +#: parted/parted.c:2401 msgid "rm" msgstr "ta_bort" -#: parted/parted.c:2272 +#: parted/parted.c:2404 msgid "rm NUMBER delete partition NUMBER" msgstr "ta_bort NUMMER ta bort partition NUMMER" -#: parted/parted.c:2277 +#: parted/parted.c:2409 msgid "select" msgstr "välj" -#: parted/parted.c:2280 +#: parted/parted.c:2412 msgid "select DEVICE choose the device to edit" msgstr "välj ENHET välj enheten att redigera" -#: parted/parted.c:2285 +#: parted/parted.c:2417 msgid "disk_set" msgstr "disk_inställning" -#: parted/parted.c:2288 +#: parted/parted.c:2420 msgid "" "disk_set FLAG STATE change the FLAG on selected device" msgstr "disk_inställning FLAGGA TILLSTÃ…ND ändra FLAGGA för vald enhet" -#: parted/parted.c:2293 +#: parted/parted.c:2425 msgid "disk_toggle" msgstr "disk_växla" -#: parted/parted.c:2296 +#: parted/parted.c:2428 msgid "" "disk_toggle [FLAG] toggle the state of FLAG on " "selected device" @@ -2859,21 +2882,21 @@ msgstr "" "disk_växla [FLAGGA] växla tillstÃ¥ndet för FLAGGA pÃ¥ " "vald enhet" -#: parted/parted.c:2302 +#: parted/parted.c:2434 msgid "set" msgstr "ställ_in" -#: parted/parted.c:2305 +#: parted/parted.c:2437 msgid "" "set NUMBER FLAG STATE change the FLAG on partition NUMBER" msgstr "" "ställ_in NUMMER FLAGGA TILLSTÃ…ND ändra FLAGGAn pÃ¥ partition NUMMER" -#: parted/parted.c:2311 +#: parted/parted.c:2443 msgid "toggle" msgstr "växla" -#: parted/parted.c:2314 +#: parted/parted.c:2446 msgid "" "toggle [NUMBER [FLAG]] toggle the state of FLAG on " "partition NUMBER" @@ -2881,20 +2904,30 @@ msgstr "" "växla [NUMMER [FLAGGA]] växla tillstÃ¥ndet för FLAGGA pÃ¥ " "partition NUMMER" -#: parted/parted.c:2320 +#: parted/parted.c:2452 +msgid "type" +msgstr "" + +#: parted/parted.c:2455 +msgid "" +"type NUMBER TYPE-ID or TYPE-UUID type set TYPE-ID or TYPE-UUID of " +"partition NUMBER" +msgstr "" + +#: parted/parted.c:2460 msgid "unit" msgstr "enhet" -#: parted/parted.c:2323 +#: parted/parted.c:2463 msgid "unit UNIT set the default unit to UNIT" msgstr "" "enhet ENHET ställ in standardenheten till ENHET" -#: parted/parted.c:2328 +#: parted/parted.c:2468 msgid "version" msgstr "version" -#: parted/parted.c:2331 +#: parted/parted.c:2471 msgid "" "version display the version number and " "copyright information of GNU Parted" @@ -2902,7 +2935,7 @@ msgstr "" "version visa versionsnumret och " "upphovsrättslig information om GNU Parted" -#: parted/parted.c:2335 +#: parted/parted.c:2475 msgid "" "'version' displays copyright and version information corresponding to this " "copy of GNU Parted\n" @@ -2910,21 +2943,21 @@ msgstr "" "\"version\" visar information om version och upphovsrätt för denna kopia av " "GNU Parted\n" -#: parted/parted.c:2405 +#: parted/parted.c:2545 #, c-format msgid "Usage: %s [-hlmsfv] [-a<align>] [DEVICE [COMMAND [PARAMETERS]]...]\n" msgstr "" "Användning: %s [-hlmsfv] [-a<justering>] [ENHET [KOMMANDO [PARAMETRAR]]…]\n" -#: parted/parted.c:2449 +#: parted/parted.c:2589 msgid "No device found" msgstr "Ingen enhet hittades" -#: parted/parted.c:2486 +#: parted/parted.c:2626 msgid "WARNING: You are not superuser. Watch out for permissions.\n" msgstr "VARNING: Du är inte superanvändare. Se upp för rättighetsproblem.\n" -#: parted/parted.c:2519 +#: parted/parted.c:2659 msgid "" "You should reinstall your boot loader before rebooting. Read section 4 of " "the Parted User documentation for more information." @@ -2932,7 +2965,7 @@ msgstr "" "Du bör installera om startprogrammet innan du startar om. Läs avsnitt fyra " "i Parteds användardokumentation för mer information." -#: parted/parted.c:2526 +#: parted/parted.c:2666 msgid "You may need to update /etc/fstab.\n" msgstr "Du kan behöva att uppdatera /etc/fstab.\n" @@ -3192,69 +3225,69 @@ msgstr "" "\n" "Fel: En allmän SIGILL-signal pÃ¥träffades." -#: parted/ui.c:901 +#: parted/ui.c:904 #, c-format msgid "invalid token: %s" msgstr "ogiltigt token: %s" -#: parted/ui.c:1082 +#: parted/ui.c:1085 msgid "Expecting a partition number." msgstr "Förväntade ett partitionsnummer." -#: parted/ui.c:1091 +#: parted/ui.c:1094 msgid "Partition doesn't exist." msgstr "Partitionen finns inte." -#: parted/ui.c:1111 +#: parted/ui.c:1114 msgid "Expecting a file system type." msgstr "Förväntade en filsystemstyp." -#: parted/ui.c:1118 +#: parted/ui.c:1121 #, c-format msgid "Unknown file system type \"%s\"." msgstr "Okänd filsystemstyp â€%sâ€." -#: parted/ui.c:1139 +#: parted/ui.c:1142 msgid "Expecting a disk label type." msgstr "Förväntade en typ av disketikett." -#: parted/ui.c:1170 parted/ui.c:1206 +#: parted/ui.c:1173 parted/ui.c:1209 msgid "No flags supported" msgstr "Inga flaggor stöds" -#: parted/ui.c:1280 +#: parted/ui.c:1283 msgid "Can't create any more partitions." msgstr "Kan inte skapa nÃ¥gra fler partitioner." -#: parted/ui.c:1290 +#: parted/ui.c:1293 msgid "Expecting a partition type." msgstr "Förväntade en partitionstyp." -#: parted/ui.c:1439 +#: parted/ui.c:1442 msgid "on" msgstr "pÃ¥" -#: parted/ui.c:1440 +#: parted/ui.c:1443 msgid "off" msgstr "av" -#: parted/ui.c:1457 +#: parted/ui.c:1460 msgid "optimal" msgstr "optimal" -#: parted/ui.c:1458 +#: parted/ui.c:1461 msgid "minimal" msgstr "minimal" -#: parted/ui.c:1591 +#: parted/ui.c:1594 msgid "OPTIONs:" msgstr "FLAGGOR:" -#: parted/ui.c:1596 +#: parted/ui.c:1599 msgid "COMMANDs:" msgstr "KOMMANDON:" -#: parted/ui.c:1599 +#: parted/ui.c:1602 #, c-format msgid "" "\n" @@ -3264,15 +3297,24 @@ msgstr "" "Rapportera fel till: %s\n" "Skicka synpunkter pÃ¥ översättningen till <tp-sv@listor.tp-sv.se>\n" -#: parted/ui.c:1606 +#: parted/ui.c:1609 #, c-format msgid "Using %s\n" msgstr "Använder %s\n" -#: parted/ui.c:1686 +#: parted/ui.c:1689 msgid "This command does not make sense in non-interactive mode.\n" msgstr "Detta kommando är meningslöst i icke-interaktivt läge.\n" +#~ msgid "Extended partitions cannot be hidden on msdos disk labels." +#~ msgstr "Utökade partitioner kan inte gömmas i disketiketter av typen msdos." + +#~ msgid "" +#~ "Extended partitions cannot be recovery partitions on msdos disk labels." +#~ msgstr "" +#~ "Utökade partitioner kan inte vara Ã¥terställningspartitioner pÃ¥ msdos-" +#~ "disketiketter." + #~ msgid "" #~ " NUMBER : display more detailed information about this particular " #~ "partition\n" Binary files differ@@ -8,7 +8,7 @@ msgid "" msgstr "" "Project-Id-Version: parted-3.1.90\n" "Report-Msgid-Bugs-To: bug-parted@gnu.org\n" -"POT-Creation-Date: 2022-04-18 14:44-0400\n" +"POT-Creation-Date: 2023-04-10 15:50-0700\n" "PO-Revision-Date: 2017-04-03 15:08+0100\n" "Last-Translator: Volkan Gezer <volkangezer@gmail.com>\n" "Language-Team: Turkish <gnu-tr-u12a@lists.sourceforge.net>\n" @@ -20,25 +20,25 @@ msgstr "" "X-Generator: Lokalize 2.0\n" "Plural-Forms: nplurals=1; plural=0;\n" -#: lib/argmatch.c:147 +#: lib/argmatch.c:145 #, c-format msgid "invalid argument %s for %s" msgstr "%2$s için geçersiz argüman %1$s" -#: lib/argmatch.c:148 +#: lib/argmatch.c:146 #, c-format msgid "ambiguous argument %s for %s" msgstr "%2$s için belirsiz argüman %1$s" -#: lib/argmatch.c:167 lib/argmatch.h:238 +#: lib/argmatch.c:165 lib/argmatch.h:237 msgid "Valid arguments are:" msgstr "Geçerli argümanlar ÅŸunlardır:" -#: lib/closeout.c:122 libparted/labels/fdasd.c:145 +#: lib/closeout.c:121 libparted/labels/fdasd.c:145 msgid "write error" msgstr "yazma hatası" -#: lib/error.c:195 +#: lib/error.c:193 msgid "Unknown system error" msgstr "Bilinmeyen sistem hatası" @@ -98,11 +98,11 @@ msgstr "%s: seçenek için bir argüman gerekli -- '%c'\n" #. If you don't know what to put here, please see #. <https://en.wikipedia.org/wiki/Quotation_marks_in_other_languages> #. and use glyphs suitable for your language. -#: lib/quotearg.c:355 +#: lib/quotearg.c:354 msgid "`" msgstr "`" -#: lib/quotearg.c:356 +#: lib/quotearg.c:355 msgid "'" msgstr "'" @@ -185,7 +185,7 @@ msgstr "Daha önce düzenli ifade yok" #. To enquire the regular expression that your system uses for this #. purpose, you can use the command #. locale -k LC_MESSAGES | grep '^yesexpr=' -#: lib/rpmatch.c:150 +#: lib/rpmatch.c:149 msgid "^[yY]" msgstr "^[eE]" @@ -195,7 +195,7 @@ msgstr "^[eE]" #. To enquire the regular expression that your system uses for this #. purpose, you can use the command #. locale -k LC_MESSAGES | grep '^noexpr=' -#: lib/rpmatch.c:163 +#: lib/rpmatch.c:162 msgid "^[nN]" msgstr "^[hH]" @@ -761,158 +761,162 @@ msgstr "pmbr_boot" msgid "Unknown disk flag, %d." msgstr "Bilinmeyen disk bayrağı, %d." -#: libparted/disk.c:1289 +#: libparted/disk.c:1320 #, c-format msgid "%s disk labels do not support extended partitions." msgstr "%s disk etiketleri ek disk bölümlerini desteklemiyor." -#: libparted/disk.c:1821 +#: libparted/disk.c:1990 #, c-format msgid "%s disk labels don't support logical or extended partitions." msgstr "%s disk etiketleri mantıksal ya da ek disk bölümlerini desteklemiyor." -#: libparted/disk.c:1834 +#: libparted/disk.c:2003 msgid "Too many primary partitions." msgstr "Çok fazla birincil disk bölümü" -#: libparted/disk.c:1843 +#: libparted/disk.c:2012 #, c-format msgid "" "Can't add a logical partition to %s, because there is no extended partition." msgstr "%s'e mantıksal disk bölümü eklenemez, çünkü ek disk bölümü yok." -#: libparted/disk.c:1867 +#: libparted/disk.c:2036 #, c-format msgid "Can't have more than one extended partition on %s." msgstr "%s üzerinde birden fazla ek disk bölümü olamaz" -#: libparted/disk.c:1877 +#: libparted/disk.c:2046 msgid "Can't have logical partitions outside of the extended partition." msgstr "Ek disk bölümü dışında mantıksal disk bölümleri olamaz." -#: libparted/disk.c:1902 +#: libparted/disk.c:2071 #, c-format msgid "Can't have a logical partition outside of the extended partition on %s." msgstr "%s üzerinde ek disk bölümü dışında mantıksal disk bölümleri olamaz." -#: libparted/disk.c:1912 +#: libparted/disk.c:2081 msgid "Can't have a primary partition inside an extended partition." msgstr "Bir ek disk bölümü içinde birincil disk bölümü bulunamaz." -#: libparted/disk.c:1921 +#: libparted/disk.c:2090 msgid "Can't have a partition outside the disk!" msgstr "Disk bölümü disk dışında bulunamaz!" -#: libparted/disk.c:1972 libparted/disk.c:2150 +#: libparted/disk.c:2141 libparted/disk.c:2319 msgid "Can't have overlapping partitions." msgstr "Örtüşen disk bölümleri olamaz" -#: libparted/disk.c:2351 +#: libparted/disk.c:2520 msgid "metadata" msgstr "metaverisi" -#: libparted/disk.c:2353 +#: libparted/disk.c:2522 msgid "free" msgstr "kullanılmamış" -#: libparted/disk.c:2355 parted/ui.c:1271 parted/ui.c:1299 +#: libparted/disk.c:2524 parted/ui.c:1274 parted/ui.c:1302 msgid "extended" msgstr "ek" -#: libparted/disk.c:2357 parted/ui.c:1275 parted/ui.c:1303 +#: libparted/disk.c:2526 parted/ui.c:1278 parted/ui.c:1306 msgid "logical" msgstr "mantıksal" -#: libparted/disk.c:2359 parted/ui.c:1267 parted/ui.c:1295 +#: libparted/disk.c:2528 parted/ui.c:1270 parted/ui.c:1298 msgid "primary" msgstr "birincil" -#: libparted/disk.c:2375 +#: libparted/disk.c:2544 msgid "boot" msgstr "önyükleme" -#: libparted/disk.c:2377 +#: libparted/disk.c:2546 msgid "bios_grub" msgstr "bios_grub" -#: libparted/disk.c:2379 +#: libparted/disk.c:2548 msgid "root" msgstr "kök" -#: libparted/disk.c:2381 +#: libparted/disk.c:2550 msgid "swap" msgstr "takas" -#: libparted/disk.c:2383 +#: libparted/disk.c:2552 msgid "hidden" msgstr "gizli" -#: libparted/disk.c:2385 +#: libparted/disk.c:2554 msgid "raid" msgstr "raid" -#: libparted/disk.c:2387 +#: libparted/disk.c:2556 msgid "lvm" msgstr "lvm" -#: libparted/disk.c:2389 +#: libparted/disk.c:2558 msgid "lba" msgstr "lba" -#: libparted/disk.c:2391 +#: libparted/disk.c:2560 msgid "hp-service" msgstr "hp-servisi" -#: libparted/disk.c:2393 +#: libparted/disk.c:2562 msgid "palo" msgstr "palo" -#: libparted/disk.c:2395 +#: libparted/disk.c:2564 msgid "prep" msgstr "prep" -#: libparted/disk.c:2397 +#: libparted/disk.c:2566 msgid "msftres" msgstr "msftres" -#: libparted/disk.c:2399 +#: libparted/disk.c:2568 msgid "msftdata" msgstr "msftdata" -#: libparted/disk.c:2401 +#: libparted/disk.c:2570 msgid "atvrecv" msgstr "atvrecv" -#: libparted/disk.c:2403 +#: libparted/disk.c:2572 msgid "diag" msgstr "diag" -#: libparted/disk.c:2405 +#: libparted/disk.c:2574 msgid "legacy_boot" msgstr "kalıtılmış yeniden baÅŸlatma" -#: libparted/disk.c:2407 +#: libparted/disk.c:2576 msgid "irst" msgstr "irst" -#: libparted/disk.c:2409 +#: libparted/disk.c:2578 msgid "esp" msgstr "esp" -#: libparted/disk.c:2411 +#: libparted/disk.c:2580 msgid "chromeos_kernel" msgstr "" -#: libparted/disk.c:2413 +#: libparted/disk.c:2582 #, fuzzy msgid "bls_boot" msgstr "pmbr_boot" -#: libparted/disk.c:2415 +#: libparted/disk.c:2584 msgid "linux-home" msgstr "" -#: libparted/disk.c:2421 +#: libparted/disk.c:2586 +msgid "no_automount" +msgstr "" + +#: libparted/disk.c:2592 #, c-format msgid "Unknown partition flag, %d." msgstr "Bilinmeyen.disk bölümü bayrağı, %d." @@ -1100,8 +1104,8 @@ msgid "" msgstr "" #: libparted/labels/atari.c:1662 libparted/labels/bsd.c:563 -#: libparted/labels/dasd.c:895 libparted/labels/dos.c:2303 -#: libparted/labels/dvh.c:770 libparted/labels/gpt.c:1769 +#: libparted/labels/dasd.c:893 libparted/labels/dos.c:2294 +#: libparted/labels/dvh.c:770 libparted/labels/gpt.c:1891 #: libparted/labels/loop.c:244 libparted/labels/mac.c:1409 #: libparted/labels/pc98.c:697 libparted/labels/rdb.c:1054 #: libparted/labels/sun.c:781 @@ -1123,41 +1127,32 @@ msgstr "Bir disk bölümü numarası atanamadı." msgid "Unable to allocate a bsd disklabel slot." msgstr "Bir bsd disk etiketi yuvası tahsis edilemedi" -#: libparted/labels/dasd.c:626 +#: libparted/labels/dasd.c:634 msgid "The partition table of DASD-LDL device cannot be changed.\n" msgstr "" -#: libparted/labels/dasd.c:921 +#: libparted/labels/dasd.c:919 msgid "Unable to allocate a dasd disklabel slot" msgstr "Bir dasd disk etiketi yuvası tahsis edilemedi" -#: libparted/labels/dos.c:1008 +#: libparted/labels/dos.c:1159 #, c-format msgid "Invalid partition table on %s -- wrong signature %x." msgstr "%1$s üzerinde geçersiz disk bölümleme tablosu - yanlış imza %2$x" -#: libparted/labels/dos.c:1036 +#: libparted/labels/dos.c:1187 #, c-format msgid "Invalid partition table - recursive partition on %s." msgstr "" "Geçersiz disk bölümleme tablosu - %s üzerinde özyinelemeli disk bölümü." -#: libparted/labels/dos.c:1567 -msgid "Extended partitions cannot be hidden on msdos disk labels." -msgstr "Msdos disk etiketlerinde ek disk bölümleri gizli olamaz." - -#: libparted/labels/dos.c:1579 -#, fuzzy -msgid "Extended partitions cannot be recovery partitions on msdos disk labels." -msgstr "Msdos disk etiketlerinde ek disk bölümleri gizli olamaz." - -#: libparted/labels/dos.c:2285 +#: libparted/labels/dos.c:2276 msgid "Parted can't resize partitions managed by Windows Dynamic Disk." msgstr "" "Parted, Windows Dinamik Disk tarafından yönetilen bölümleri yeniden " "boyutlayamaz." -#: libparted/labels/dos.c:2541 +#: libparted/labels/dos.c:2532 msgid "cannot create any more partitions" msgstr "BaÅŸka disk bölümü oluÅŸturulamıyor" @@ -1300,11 +1295,11 @@ msgstr "Blok boyutu bilgisi alınamıyor." msgid "Disk geometry does not match a DASD device of type 3390." msgstr "" -#: libparted/labels/gpt.c:569 +#: libparted/labels/gpt.c:589 msgid "device is too small for GPT" msgstr "GPT için aygıt çok küçük." -#: libparted/labels/gpt.c:771 +#: libparted/labels/gpt.c:791 #, c-format msgid "" "The format of the GPT partition table is version %x, which is newer than " @@ -1313,7 +1308,7 @@ msgstr "" "GPT disk bölümleme tablosu biçemi sürüm %x olup, Parted'ın " "tanıyabileceÄŸinden daha yenidir. Lütfen bize bildirin!" -#: libparted/labels/gpt.c:807 +#: libparted/labels/gpt.c:827 #, c-format msgid "" "Not all of the space available to %s appears to be used, you can fix the GPT " @@ -1324,7 +1319,7 @@ msgstr "" "ayarlayıp tüm mevcut boÅŸluÄŸu (%llu ek blok) kullanabilir ya da mevcut ayarla " "devam edebilirsiniz?" -#: libparted/labels/gpt.c:1006 +#: libparted/labels/gpt.c:1026 msgid "" "The backup GPT table is not at the end of the disk, as it should be. Fix, " "by moving the backup to the end (and removing the old backup)?" @@ -1332,7 +1327,7 @@ msgstr "" "GPT tablosunun yedeÄŸi, olması gerektiÄŸi gibi diskin sonunda deÄŸil. YedeÄŸi " "sona taşıyarak (ve eski yedeÄŸi silerek) onar?" -#: libparted/labels/gpt.c:1024 +#: libparted/labels/gpt.c:1044 msgid "" "Both the primary and backup GPT tables are corrupt. Try making a fresh " "table, and using Parted's rescue feature to recover partitions." @@ -1340,7 +1335,7 @@ msgstr "" "Hem birincil, hem de yedek GPT tablosu bozuk. Yeni bir tablo oluÅŸturmayı ve " "Parted'ın kurtarma özelliÄŸini kullanarak disk bölümlerini kurtarmayı deneyin." -#: libparted/labels/gpt.c:1035 +#: libparted/labels/gpt.c:1055 msgid "" "The backup GPT table is corrupt, but the primary appears OK, so that will be " "used." @@ -1348,7 +1343,7 @@ msgstr "" "Yedek GPT tablosu bozuk, ama birincil tamam görünüyor, dolayısıyla o " "kullanılacak." -#: libparted/labels/gpt.c:1047 +#: libparted/labels/gpt.c:1067 msgid "" "The primary GPT table is corrupt, but the backup appears OK, so that will be " "used." @@ -1356,11 +1351,11 @@ msgstr "" "Birincil GPT tablosu bozuk, ama yedek tamam görünüyor, dolayısıyla yedek " "kullanılacak." -#: libparted/labels/gpt.c:1071 +#: libparted/labels/gpt.c:1091 msgid "primary partition table array CRC mismatch" msgstr "birincil bölümleme tablosu dizisi CRC uyumsuzluÄŸu" -#: libparted/labels/gpt.c:1655 libparted/labels/gpt.c:1682 +#: libparted/labels/gpt.c:1722 libparted/labels/gpt.c:1749 msgid "failed to translate partition name" msgstr "disk bölümü adı çevrilemedi" @@ -2030,7 +2025,7 @@ msgstr "fat_table_alloc_cluster: boÅŸ küme yok" msgid "Could not detect file system." msgstr "Dosya sistemi saptanamıyor." -#: libparted/fs/r/filesys.c:159 libparted/fs/r/filesys.c:284 +#: libparted/fs/r/filesys.c:159 libparted/fs/r/filesys.c:285 #, c-format msgid "resizing %s file systems is not supported" msgstr "%s dosya sistemlerini yeniden boyutlandırma desteklenmemektedir" @@ -2310,40 +2305,40 @@ msgstr "Bu HFS+ oylumunun katalog dosyası yok. Bu çok sıradışı!" msgid "This HFS+ volume has no extents overflow file. This is quite unusual!" msgstr "Bu HFS+ oylumunun aralık taÅŸması dosyası yok. Bu oldukça sıradışı!" -#: parted/parted.c:137 +#: parted/parted.c:138 msgid "displays this help message" msgstr "bu yardım mesajını görüntüler" -#: parted/parted.c:138 +#: parted/parted.c:139 msgid "lists partition layout on all block devices" msgstr "tüm blok aygıtların bölümleme yerleÅŸimlerini listeler" -#: parted/parted.c:139 +#: parted/parted.c:140 msgid "displays machine parseable output" msgstr "makinece ayrıştırılabilir çıktıyı gösterir" -#: parted/parted.c:140 +#: parted/parted.c:141 #, fuzzy msgid "displays JSON output" msgstr "makinece ayrıştırılabilir çıktıyı gösterir" -#: parted/parted.c:141 +#: parted/parted.c:142 msgid "never prompts for user intervention" msgstr "kullanıcı müdahalesi için asla istemde bulunmaz" -#: parted/parted.c:142 +#: parted/parted.c:143 msgid "in script mode, fix instead of abort when asked" msgstr "" -#: parted/parted.c:143 +#: parted/parted.c:144 msgid "displays the version" msgstr "sürümü görüntüler" -#: parted/parted.c:144 +#: parted/parted.c:145 msgid "alignment for new partitions" msgstr "yeni disk bölümleri için hizalama" -#: parted/parted.c:157 +#: parted/parted.c:158 msgid "" "NUMBER is the partition number used by Linux. On MS-DOS disk labels, the " "primary partitions number from 1 to 4, logical partitions from 5 onwards.\n" @@ -2352,31 +2347,31 @@ msgstr "" "etiketlerinde birincil disk bölümü numarası 1-4 arası, mantıksal disk " "bölümleri de 5 ve üstüdür.\n" -#: parted/parted.c:160 +#: parted/parted.c:161 msgid "LABEL-TYPE is one of: " msgstr "LABEL-TYPE ÅŸunlardan biridir: " -#: parted/parted.c:161 parted/parted.c:162 +#: parted/parted.c:162 parted/parted.c:163 msgid "FLAG is one of: " msgstr "FLAG ÅŸunlardan biridir: " -#: parted/parted.c:163 +#: parted/parted.c:164 msgid "UNIT is one of: " msgstr "UNIT ÅŸunlardan biridir: " -#: parted/parted.c:164 +#: parted/parted.c:165 msgid "desired alignment: minimum or optimal" msgstr "arzulanan hizalama: minimum ya da optimal" -#: parted/parted.c:165 +#: parted/parted.c:166 msgid "PART-TYPE is one of: primary, logical, extended\n" msgstr "PART-TYPE ÅŸunlardan biridir: birincil, mantıksal, ek\n" -#: parted/parted.c:167 +#: parted/parted.c:168 msgid "FS-TYPE is one of: " msgstr "FS-TYPE ÅŸunlardan biridir: " -#: parted/parted.c:168 +#: parted/parted.c:169 msgid "" "START and END are disk locations, such as 4GB or 10%. Negative values count " "from the end of the disk. For example, -1s specifies exactly the last " @@ -2385,7 +2380,7 @@ msgstr "" "START ve END disk konumlarıdır, 4GB ya da %10 gibi. Eksi deÄŸerler, diskin " "sonuna uzaklığı belirtir. ÖrneÄŸin -1s tam olarak son sektörü belirtir.\n" -#: parted/parted.c:171 +#: parted/parted.c:172 msgid "" "END is disk location, such as 4GB or 10%. Negative value counts from the " "end of the disk. For example, -1s specifies exactly the last sector.\n" @@ -2393,19 +2388,23 @@ msgstr "" "SON disk konumudur, 4GB ya da %10 gibi. Eksi deÄŸerler, diskin sonuna " "uzaklığı belirtir. ÖrneÄŸin -1s tam olarak son sektörü belirtir.\n" -#: parted/parted.c:174 +#: parted/parted.c:175 msgid "STATE is one of: on, off\n" msgstr "STATE ÅŸunlardan biridir: açık, kapalı\n" -#: parted/parted.c:175 +#: parted/parted.c:176 msgid "DEVICE is usually /dev/hda or /dev/sda\n" msgstr "DEVICE sıklıkla /dev/hda ya da /dev/sda'dır\n" -#: parted/parted.c:176 +#: parted/parted.c:177 msgid "NAME is any word you want\n" msgstr "NAME istediÄŸiniz herhangi bir sözcüktür\n" -#: parted/parted.c:179 +#: parted/parted.c:178 +msgid "TYPE_ID is a value between 0x01 and 0xff, TYPE_UUID is a UUID\n" +msgstr "" + +#: parted/parted.c:182 msgid "" "Copyright (C) 1998 - 2006 Free Software Foundation, Inc.\n" "This program is free software, covered by the GNU General Public License.\n" @@ -2425,22 +2424,22 @@ msgstr "" "GNU Genel Kamu Lisansı'na bakınız.\n" "\n" -#: parted/parted.c:229 +#: parted/parted.c:232 #, c-format msgid "%0.f%%\t(time left %.2d:%.2d)" msgstr "%0.f%%\t(kalan süre %.2d:%.2d)" -#: parted/parted.c:248 +#: parted/parted.c:251 #, c-format msgid "Partition %s is being used. Are you sure you want to continue?" msgstr "%s disk bölümü kullanılıyor. Devam etmek istediÄŸinizden emin misiniz?" -#: parted/parted.c:269 +#: parted/parted.c:272 #, c-format msgid "Partition(s) on %s are being used." msgstr "%s üzerindeki disk bölümü(leri) kullanılıyor." -#: parted/parted.c:281 +#: parted/parted.c:284 #, c-format msgid "" "The existing disk label on %s will be destroyed and all data on this disk " @@ -2449,31 +2448,31 @@ msgstr "" "%s üzerindeki mevcut disk etiketi silinecek ve bu disk üzerindeki tüm veri " "kaybolacak. Devam etmek istiyor musunuz?" -#: parted/parted.c:542 +#: parted/parted.c:545 msgid "New disk label type?" msgstr "Yeni disk etiketi türü?" -#: parted/parted.c:680 +#: parted/parted.c:692 msgid "Partition type?" msgstr "Disk bölümü türü?" -#: parted/parted.c:698 parted/parted.c:902 +#: parted/parted.c:710 parted/parted.c:914 msgid "Partition name?" msgstr "Disk bölümü adı?" -#: parted/parted.c:708 +#: parted/parted.c:720 msgid "File system type?" msgstr "Dosya sistemi türü?" -#: parted/parted.c:713 parted/parted.c:1683 +#: parted/parted.c:725 parted/parted.c:1815 msgid "Start?" msgstr "BaÅŸlangıç?" -#: parted/parted.c:715 parted/parted.c:1685 parted/parted.c:1768 +#: parted/parted.c:727 parted/parted.c:1817 parted/parted.c:1900 msgid "End?" msgstr "BitiÅŸ?" -#: parted/parted.c:782 +#: parted/parted.c:794 #, c-format msgid "" "You requested a partition from %s to %s (sectors %llu..%llu).\n" @@ -2483,7 +2482,7 @@ msgstr "" "BecerebildiÄŸimiz buna en yakın konum %5$s'den %6$s'e (sektör %7$llu..%8$llu)." "%9$s" -#: parted/parted.c:791 +#: parted/parted.c:803 msgid "" "\n" "Is this still acceptable to you?" @@ -2491,95 +2490,120 @@ msgstr "" "\n" "Bu sizin için hala kabul edilebilir mi?" -#: parted/parted.c:814 +#: parted/parted.c:826 #, fuzzy, c-format msgid "" "The resulting partition is not properly aligned for best performance: %s" msgstr "" "Ortaya çıkan disk bölümü en iyi performansı elde etmek için ayarlanmamış." -#: parted/parted.c:816 parted/parted.c:1925 +#: parted/parted.c:828 parted/parted.c:2057 msgid "unknown (malloc failed)" msgstr "" -#: parted/parted.c:894 +#: parted/parted.c:906 #, fuzzy, c-format msgid "%s disk labels do not support partition name." msgstr "%s disk etiketleri ek disk bölümlerini desteklemiyor." -#: parted/parted.c:899 parted/parted.c:1748 parted/parted.c:1814 -#: parted/parted.c:1908 parted/parted.c:1983 +#: parted/parted.c:911 parted/parted.c:955 parted/parted.c:1880 +#: parted/parted.c:1946 parted/parted.c:2040 parted/parted.c:2115 msgid "Partition number?" msgstr "Disk bölümü numarası?" -#: parted/parted.c:1050 +#: parted/parted.c:949 +#, fuzzy, c-format +msgid "%s disk labels do not support partition type." +msgstr "%s disk etiketleri ek disk bölümlerini desteklemiyor." + +#: parted/parted.c:965 +#, fuzzy +msgid "Partition type-id?" +msgstr "Disk bölümü türü?" + +#: parted/parted.c:972 +#, fuzzy +msgid "Invalid type-id." +msgstr "Geçersiz numara." + +#: parted/parted.c:986 +#, fuzzy +msgid "Partition type-uuid?" +msgstr "Disk bölümü türü?" + +#: parted/parted.c:993 +#, fuzzy +msgid "Invalid type-uuid." +msgstr "Geçersiz numara." + +#: parted/parted.c:1146 #, c-format msgid "BIOS cylinder,head,sector geometry: %d,%d,%d. Each cylinder is %s.\n" msgstr "" "BIOS silindiri, kafa, sektör geometrisi: %d,%d,%d. Herbir silindir %s'tir.\n" -#: parted/parted.c:1137 +#: parted/parted.c:1240 #, c-format msgid "Model: %s (%s)\n" msgstr "Model: %s (%s)\n" -#: parted/parted.c:1139 +#: parted/parted.c:1242 #, c-format msgid "Disk %s: %s\n" msgstr "Disk %1$s: %2$s\n" -#: parted/parted.c:1140 +#: parted/parted.c:1243 #, c-format msgid "Sector size (logical/physical): %lldB/%lldB\n" msgstr "Sektör boyutu (mantıksal/fiziksel): %lldB/%lldB\n" -#: parted/parted.c:1152 +#: parted/parted.c:1255 #, c-format msgid "Partition Table: %s\n" msgstr "Disk bölümü Tablosu: %s\n" -#: parted/parted.c:1153 +#: parted/parted.c:1256 #, c-format msgid "Disk Flags: %s\n" msgstr "Disk Bayrakları: %s\n" -#: parted/parted.c:1279 parted/parted.c:1282 +#: parted/parted.c:1388 parted/parted.c:1391 msgid "Number" msgstr "Numara" -#: parted/parted.c:1279 parted/parted.c:1282 +#: parted/parted.c:1388 parted/parted.c:1391 msgid "Start" msgstr "BaÅŸlangıç" -#: parted/parted.c:1280 parted/parted.c:1283 +#: parted/parted.c:1389 parted/parted.c:1392 msgid "End" msgstr "Son" -#: parted/parted.c:1283 +#: parted/parted.c:1392 msgid "Size" msgstr "Boyut" -#: parted/parted.c:1287 +#: parted/parted.c:1396 msgid "Type" msgstr "Tür" -#: parted/parted.c:1289 +#: parted/parted.c:1398 msgid "File system" msgstr "Dosya sistemi" -#: parted/parted.c:1292 +#: parted/parted.c:1401 msgid "Name" msgstr "Ä°sim" -#: parted/parted.c:1294 +#: parted/parted.c:1403 msgid "Flags" msgstr "Bayraklar" -#: parted/parted.c:1352 +#: parted/parted.c:1461 msgid "Free Space" msgstr "BoÅŸ Alan" -#: parted/parted.c:1570 +#: parted/parted.c:1702 #, c-format msgid "" "A %s %s partition was found at %s -> %s. Do you want to add it to the " @@ -2588,56 +2612,56 @@ msgstr "" "%3$s -> %4$s'de bir %1$s %2$s disk bölümü bulundu. Bunu disk bölümü " "tablosuna eklemeyi ister misiniz?" -#: parted/parted.c:1613 +#: parted/parted.c:1745 msgid "searching for file systems" msgstr "dosya" -#: parted/parted.c:1720 +#: parted/parted.c:1852 msgid "The resize command has been removed in parted 3.0" msgstr "resize komutu parted 3.0'da kaldırıldı" -#: parted/parted.c:1782 +#: parted/parted.c:1914 msgid "" "Shrinking a partition can cause data loss, are you sure you want to continue?" msgstr "" "Bir birimi sıkıştırmak veri kaybına yol açabilir, devam etmek istiyor " "musunuz?" -#: parted/parted.c:1838 +#: parted/parted.c:1970 msgid "New device?" msgstr "Yeni aygıt?" -#: parted/parted.c:1906 +#: parted/parted.c:2038 msgid "alignment type(min/opt)" msgstr "hizalama türü(min/opt)" -#: parted/parted.c:1921 +#: parted/parted.c:2053 #, c-format msgid "%d aligned\n" msgstr "%d hizalandı\n" -#: parted/parted.c:1923 +#: parted/parted.c:2055 #, fuzzy, c-format msgid "%d not aligned: %s\n" msgstr "%d hizalanmadı\n" -#: parted/parted.c:1948 parted/parted.c:1985 +#: parted/parted.c:2080 parted/parted.c:2117 msgid "Flag to Invert?" msgstr "Tersine çevirmek üzere bayrakla?" -#: parted/parted.c:1953 parted/parted.c:1990 +#: parted/parted.c:2085 parted/parted.c:2122 msgid "New state?" msgstr "Yeni durum?" -#: parted/parted.c:2036 +#: parted/parted.c:2168 msgid "Unit?" msgstr "Birim?" -#: parted/parted.c:2171 +#: parted/parted.c:2303 msgid "align-check" msgstr "align-check" -#: parted/parted.c:2174 +#: parted/parted.c:2306 #, fuzzy msgid "" "align-check TYPE N check partition N for TYPE(min|opt) " @@ -2646,11 +2670,11 @@ msgstr "" "align-check TÃœR N disk bölümü N'yi hiza TÃœRü(min|opt) " "için kontrol et" -#: parted/parted.c:2182 +#: parted/parted.c:2314 msgid "help" msgstr "help" -#: parted/parted.c:2185 +#: parted/parted.c:2317 msgid "" "help [COMMAND] print general help, or help on " "COMMAND" @@ -2658,15 +2682,15 @@ msgstr "" "help [COMMAND] genel yardımı ya da KOMUT yardımını " "yazdırır" -#: parted/parted.c:2191 +#: parted/parted.c:2323 msgid "mklabel" msgstr "mklabel" -#: parted/parted.c:2191 +#: parted/parted.c:2323 msgid "mktable" msgstr "mktable" -#: parted/parted.c:2194 +#: parted/parted.c:2326 msgid "" "mklabel,mktable LABEL-TYPE create a new disklabel (partition " "table)" @@ -2674,15 +2698,15 @@ msgstr "" "mklabel,mktable LABEL-TYPE yeni bir disk etiketi (disk bölümü " "tablosu) oluÅŸtur" -#: parted/parted.c:2200 +#: parted/parted.c:2332 msgid "mkpart" msgstr "mkpart" -#: parted/parted.c:2203 +#: parted/parted.c:2335 msgid "mkpart PART-TYPE [FS-TYPE] START END make a partition" msgstr "mkpart PART-TYPE [FS-TYPE] START END bir disk bölümü yap" -#: parted/parted.c:2209 +#: parted/parted.c:2341 msgid "" "'mkpart' makes a partition without creating a new file system on the " "partition. FS-TYPE may be specified to set an appropriate partition ID.\n" @@ -2692,20 +2716,20 @@ msgstr "" "belirtilebilir.\n" "\n" -#: parted/parted.c:2214 +#: parted/parted.c:2346 msgid "name" msgstr "name" -#: parted/parted.c:2217 +#: parted/parted.c:2349 msgid "name NUMBER NAME name partition NUMBER as NAME" msgstr "" "name NUMBER NAME NUMBER. disk bölümünü NAME'le adlandır" -#: parted/parted.c:2222 +#: parted/parted.c:2354 msgid "print" msgstr "print" -#: parted/parted.c:2225 +#: parted/parted.c:2357 #, fuzzy msgid "" "print [devices|free|list,all] display the partition table, or " @@ -2714,7 +2738,7 @@ msgstr "" "print [aygıtlar|boÅŸluk|liste,tümü|NUMARA] bölümleme tablosu, mevcut " "aygıtlar, boÅŸluk, tüm bulunan bölümler ya da belli bir bölümü gösterir" -#: parted/parted.c:2229 +#: parted/parted.c:2361 msgid "" "Without arguments, 'print' displays the entire partition table. However with " "the following arguments it performs various other actions.\n" @@ -2722,11 +2746,11 @@ msgstr "" "Argümansız olduÄŸunda print tüm bölümleme tablosunnu gösterir. AÅŸağıdaki " "argümanlarla kullanıldığında diÄŸer çeÅŸitli eylemleri uygular.\n" -#: parted/parted.c:2231 +#: parted/parted.c:2363 msgid " devices : display all active block devices\n" msgstr " devices : tüm aktif blok aygıtları gösterir\n" -#: parted/parted.c:2232 +#: parted/parted.c:2364 msgid "" " free : display information about free unpartitioned space on the " "current block device\n" @@ -2734,25 +2758,25 @@ msgstr "" " free : mevcut blok aygıt üzerindeki boÅŸ bölümlenmemiÅŸ alan bilgisini " "gösterir\n" -#: parted/parted.c:2234 +#: parted/parted.c:2366 msgid "" " list, all : display the partition tables of all active block devices\n" msgstr "" " list, all : tüm aktif blok aygıtların bölümleme tablolarını gösterir\n" -#: parted/parted.c:2238 +#: parted/parted.c:2370 msgid "quit" msgstr "quit" -#: parted/parted.c:2241 +#: parted/parted.c:2373 msgid "quit exit program" msgstr "quit programdan çık" -#: parted/parted.c:2246 +#: parted/parted.c:2378 msgid "rescue" msgstr "rescue" -#: parted/parted.c:2249 +#: parted/parted.c:2381 msgid "" "rescue START END rescue a lost partition near START " "and END" @@ -2760,54 +2784,54 @@ msgstr "" "rescue START END START ve END arasındaki kayıp disk " "bölümlerini kurtar" -#: parted/parted.c:2255 +#: parted/parted.c:2387 msgid "resize" msgstr "resize" -#: parted/parted.c:2258 +#: parted/parted.c:2390 msgid "The resize command was removed in parted 3.0\n" msgstr "resize komutu parted 3.0'da kaldırıldı\n" -#: parted/parted.c:2261 +#: parted/parted.c:2393 msgid "resizepart" msgstr "resizepart" -#: parted/parted.c:2264 +#: parted/parted.c:2396 msgid "resizepart NUMBER END resize partition NUMBER" msgstr "resizepart SAYI SON SAYI disk bölümünü taşı" -#: parted/parted.c:2269 +#: parted/parted.c:2401 msgid "rm" msgstr "rm" -#: parted/parted.c:2272 +#: parted/parted.c:2404 msgid "rm NUMBER delete partition NUMBER" msgstr "rm NUMBER NUMBER. disk bölümünü sil" -#: parted/parted.c:2277 +#: parted/parted.c:2409 msgid "select" msgstr "select" -#: parted/parted.c:2280 +#: parted/parted.c:2412 msgid "select DEVICE choose the device to edit" msgstr "select DEVICE düzenlenecek aygıtı seç" -#: parted/parted.c:2285 +#: parted/parted.c:2417 msgid "disk_set" msgstr "disk_set" -#: parted/parted.c:2288 +#: parted/parted.c:2420 msgid "" "disk_set FLAG STATE change the FLAG on selected device" msgstr "" "disk_set FLAG STATE seçili aygıt üzerindeki bayrağı " "deÄŸiÅŸtir" -#: parted/parted.c:2293 +#: parted/parted.c:2425 msgid "disk_toggle" msgstr "disk_toggle" -#: parted/parted.c:2296 +#: parted/parted.c:2428 msgid "" "disk_toggle [FLAG] toggle the state of FLAG on " "selected device" @@ -2815,22 +2839,22 @@ msgstr "" "disk_toggle [FLAG] seçili aygıt üzerindeki BAYRAK " "durumunu deÄŸiÅŸtir" -#: parted/parted.c:2302 +#: parted/parted.c:2434 msgid "set" msgstr "set" -#: parted/parted.c:2305 +#: parted/parted.c:2437 msgid "" "set NUMBER FLAG STATE change the FLAG on partition NUMBER" msgstr "" "set NUMBER FLAG STATE NUMBER. disk bölümü üzerindeki bayrağı " "deÄŸiÅŸtir" -#: parted/parted.c:2311 +#: parted/parted.c:2443 msgid "toggle" msgstr "seçmece / deÄŸiÅŸtir" -#: parted/parted.c:2314 +#: parted/parted.c:2446 msgid "" "toggle [NUMBER [FLAG]] toggle the state of FLAG on " "partition NUMBER" @@ -2838,19 +2862,29 @@ msgstr "" "toggle [NUMBER [FLAG] NUMBER. disk bölümü üzerindeki " "BAYRAK durumunu deÄŸiÅŸtir" -#: parted/parted.c:2320 +#: parted/parted.c:2452 +msgid "type" +msgstr "" + +#: parted/parted.c:2455 +msgid "" +"type NUMBER TYPE-ID or TYPE-UUID type set TYPE-ID or TYPE-UUID of " +"partition NUMBER" +msgstr "" + +#: parted/parted.c:2460 msgid "unit" msgstr "birim" -#: parted/parted.c:2323 +#: parted/parted.c:2463 msgid "unit UNIT set the default unit to UNIT" msgstr "birim UNIT öntanımlı birimi UNIT'e ayarla" -#: parted/parted.c:2328 +#: parted/parted.c:2468 msgid "version" msgstr "sürüm" -#: parted/parted.c:2331 +#: parted/parted.c:2471 msgid "" "version display the version number and " "copyright information of GNU Parted" @@ -2858,7 +2892,7 @@ msgstr "" "version GNU Parted'in sürüm numarasını ve " "telif hakkı bilgisini görüntüler" -#: parted/parted.c:2335 +#: parted/parted.c:2475 msgid "" "'version' displays copyright and version information corresponding to this " "copy of GNU Parted\n" @@ -2866,20 +2900,20 @@ msgstr "" "sürüm, GNU Parted'in bu kopyasının telif hakkı ve sürüm bilgisini " "görüntüler\n" -#: parted/parted.c:2405 +#: parted/parted.c:2545 #, fuzzy, c-format msgid "Usage: %s [-hlmsfv] [-a<align>] [DEVICE [COMMAND [PARAMETERS]]...]\n" msgstr "Kullanım: %s [-hlmsv] [-a<align>] [AYGIT [KOMUT [PARAMETRELER]]...]\n" -#: parted/parted.c:2449 +#: parted/parted.c:2589 msgid "No device found" msgstr "Aygıt bulunamadı" -#: parted/parted.c:2486 +#: parted/parted.c:2626 msgid "WARNING: You are not superuser. Watch out for permissions.\n" msgstr "UYARI: Süper kullanıcı deÄŸilsiniz. Ä°zinlere dikkat edin.\n" -#: parted/parted.c:2519 +#: parted/parted.c:2659 msgid "" "You should reinstall your boot loader before rebooting. Read section 4 of " "the Parted User documentation for more information." @@ -2887,7 +2921,7 @@ msgstr "" "Yeniden açmadan önce önyükleyicinizi yeniden kurmalısınız. Daha fazla bilgi " "için Parted Kullanıcı belgesinin 4. bölümünü okuyunuz." -#: parted/parted.c:2526 +#: parted/parted.c:2666 msgid "You may need to update /etc/fstab.\n" msgstr "/etc/fstab'i güncellemeniz gerekebilir.\n" @@ -3145,69 +3179,69 @@ msgstr "" "\n" "Hata: Genel bir SIGILL sinyaliyle karşılaşıldı." -#: parted/ui.c:901 +#: parted/ui.c:904 #, c-format msgid "invalid token: %s" msgstr "geçersiz andaç: %s" -#: parted/ui.c:1082 +#: parted/ui.c:1085 msgid "Expecting a partition number." msgstr "Bir disk bölümü numarası bekleniyor." -#: parted/ui.c:1091 +#: parted/ui.c:1094 msgid "Partition doesn't exist." msgstr "Disk bölümü yok." -#: parted/ui.c:1111 +#: parted/ui.c:1114 msgid "Expecting a file system type." msgstr "Bir dosya sistemi türü bekleniyor." -#: parted/ui.c:1118 +#: parted/ui.c:1121 #, c-format msgid "Unknown file system type \"%s\"." msgstr "Bilinmeyen dosya sistemi türü \"%s\"." -#: parted/ui.c:1139 +#: parted/ui.c:1142 msgid "Expecting a disk label type." msgstr "Bir disk etiketi türü bekleniyor." -#: parted/ui.c:1170 parted/ui.c:1206 +#: parted/ui.c:1173 parted/ui.c:1209 msgid "No flags supported" msgstr "" -#: parted/ui.c:1280 +#: parted/ui.c:1283 msgid "Can't create any more partitions." msgstr "BaÅŸka disk bölümü oluÅŸturulamıyor." -#: parted/ui.c:1290 +#: parted/ui.c:1293 msgid "Expecting a partition type." msgstr "Bir disk bölümü türü bekleniyor." -#: parted/ui.c:1439 +#: parted/ui.c:1442 msgid "on" msgstr "açık" -#: parted/ui.c:1440 +#: parted/ui.c:1443 msgid "off" msgstr "kapalı" -#: parted/ui.c:1457 +#: parted/ui.c:1460 msgid "optimal" msgstr "optimal" -#: parted/ui.c:1458 +#: parted/ui.c:1461 msgid "minimal" msgstr "minimal" -#: parted/ui.c:1591 +#: parted/ui.c:1594 msgid "OPTIONs:" msgstr "SEÇENEKler:" -#: parted/ui.c:1596 +#: parted/ui.c:1599 msgid "COMMANDs:" msgstr "KOMUTlar:" -#: parted/ui.c:1599 +#: parted/ui.c:1602 #, c-format msgid "" "\n" @@ -3216,12 +3250,12 @@ msgstr "" "\n" "Yazılım hatalarını %s'e bildirin\n" -#: parted/ui.c:1606 +#: parted/ui.c:1609 #, c-format msgid "Using %s\n" msgstr "%s kullanılıyor\n" -#: parted/ui.c:1686 +#: parted/ui.c:1689 msgid "This command does not make sense in non-interactive mode.\n" msgstr "Bu komut etkileÅŸimsiz kipte anlamsız.\n" @@ -3283,6 +3317,9 @@ msgstr "Bu komut etkileÅŸimsiz kipte anlamsız.\n" #~ "deÄŸiÅŸiklikleri Hurd bilmiyor anlamına gelir. %3$s ile ilgili hiçbir ÅŸey " #~ "yapmadan önce bilgisayarınızı yeniden açmalısınız." +#~ msgid "Extended partitions cannot be hidden on msdos disk labels." +#~ msgstr "Msdos disk etiketlerinde ek disk bölümleri gizli olamaz." + #~ msgid "The boot region doesn't start at the start of the partition." #~ msgstr "Önyükleme bölgesi, disk bölümünün başından baÅŸlamıyor" @@ -8,7 +8,7 @@ msgid "" msgstr "" "Project-Id-Version: parted 3.4.64.2\n" "Report-Msgid-Bugs-To: bug-parted@gnu.org\n" -"POT-Creation-Date: 2022-04-18 14:44-0400\n" +"POT-Creation-Date: 2023-04-10 15:50-0700\n" "PO-Revision-Date: 2022-04-06 12:12+0300\n" "Last-Translator: Yuri Chornoivan <yurchor@ukr.net>\n" "Language-Team: Ukrainian <trans-uk@lists.fedoraproject.org>\n" @@ -20,25 +20,25 @@ msgstr "" "X-Generator: Lokalize 20.12.0\n" "Plural-Forms: nplurals=1; plural=0;\n" -#: lib/argmatch.c:147 +#: lib/argmatch.c:145 #, c-format msgid "invalid argument %s for %s" msgstr "неправильний аргумент %s Ð´Ð»Ñ %s" -#: lib/argmatch.c:148 +#: lib/argmatch.c:146 #, c-format msgid "ambiguous argument %s for %s" msgstr "неоднозначний аргумент %s Ð´Ð»Ñ %s" -#: lib/argmatch.c:167 lib/argmatch.h:238 +#: lib/argmatch.c:165 lib/argmatch.h:237 msgid "Valid arguments are:" msgstr "СпиÑок коректних аргументів:" -#: lib/closeout.c:122 libparted/labels/fdasd.c:145 +#: lib/closeout.c:121 libparted/labels/fdasd.c:145 msgid "write error" msgstr "помилка запиÑу" -#: lib/error.c:195 +#: lib/error.c:193 msgid "Unknown system error" msgstr "Ðевідома ÑиÑтемна помилка" @@ -98,11 +98,11 @@ msgstr "%s: до параметра Ñлід додати аргумент —  #. If you don't know what to put here, please see #. <https://en.wikipedia.org/wiki/Quotation_marks_in_other_languages> #. and use glyphs suitable for your language. -#: lib/quotearg.c:355 +#: lib/quotearg.c:354 msgid "`" msgstr "`" -#: lib/quotearg.c:356 +#: lib/quotearg.c:355 msgid "'" msgstr "'" @@ -184,7 +184,7 @@ msgstr "ВідÑутній попередній регулÑрний вираз" #. To enquire the regular expression that your system uses for this #. purpose, you can use the command #. locale -k LC_MESSAGES | grep '^yesexpr=' -#: lib/rpmatch.c:150 +#: lib/rpmatch.c:149 msgid "^[yY]" msgstr "^[yYТт]" @@ -194,7 +194,7 @@ msgstr "^[yYТт]" #. To enquire the regular expression that your system uses for this #. purpose, you can use the command #. locale -k LC_MESSAGES | grep '^noexpr=' -#: lib/rpmatch.c:163 +#: lib/rpmatch.c:162 msgid "^[nN]" msgstr "^[nNÐн]" @@ -758,160 +758,164 @@ msgstr "pmbr_boot" msgid "Unknown disk flag, %d." msgstr "Ðевідомий прапорець диÑка, %d." -#: libparted/disk.c:1289 +#: libparted/disk.c:1320 #, c-format msgid "%s disk labels do not support extended partitions." msgstr "%s етикетки диÑків Ð´Ð»Ñ Ñ€Ð¾Ð·ÑˆÐ¸Ñ€ÐµÐ½Ð¸Ñ… розділів не підтримуютьÑÑ." -#: libparted/disk.c:1821 +#: libparted/disk.c:1990 #, c-format msgid "%s disk labels don't support logical or extended partitions." msgstr "" "%s етикетки диÑків Ð´Ð»Ñ Ð»Ð¾Ð³Ñ–Ñ‡Ð½Ð¸Ñ… або розширених розділів не підтримуютьÑÑ." -#: libparted/disk.c:1834 +#: libparted/disk.c:2003 msgid "Too many primary partitions." msgstr "Занадто багато оÑновних розділів." -#: libparted/disk.c:1843 +#: libparted/disk.c:2012 #, c-format msgid "" "Can't add a logical partition to %s, because there is no extended partition." msgstr "" "Ðе вдаєтьÑÑ Ð´Ð¾Ð´Ð°Ñ‚Ð¸ логічний розділ до %s, тому що немає розширеного розділу." -#: libparted/disk.c:1867 +#: libparted/disk.c:2036 #, c-format msgid "Can't have more than one extended partition on %s." msgstr "Ðе можна мати більше одного розширеного розділу на %s." -#: libparted/disk.c:1877 +#: libparted/disk.c:2046 msgid "Can't have logical partitions outside of the extended partition." msgstr "Ðе вдаєтьÑÑ Ñ€Ð¾Ð·ÑˆÐ¸Ñ€Ð¸Ñ‚Ð¸ логічний розділ за межі розширеного розділу." -#: libparted/disk.c:1902 +#: libparted/disk.c:2071 #, c-format msgid "Can't have a logical partition outside of the extended partition on %s." msgstr "" "Ðе вдаєтьÑÑ Ñ€Ð¾Ð·ÑˆÐ¸Ñ€Ð¸Ñ‚Ð¸ логічний розділ за межі розширеного розділу на %s." -#: libparted/disk.c:1912 +#: libparted/disk.c:2081 msgid "Can't have a primary partition inside an extended partition." msgstr "Ðе можна додавати оÑновний розділ у розширений розділ." -#: libparted/disk.c:1921 +#: libparted/disk.c:2090 msgid "Can't have a partition outside the disk!" msgstr "ÐеприпуÑтимо, щоб розділ виходив за межі диÑка!" -#: libparted/disk.c:1972 libparted/disk.c:2150 +#: libparted/disk.c:2141 libparted/disk.c:2319 msgid "Can't have overlapping partitions." msgstr "Ðе можна мати розділи, Ñкі перекриваютьÑÑ." -#: libparted/disk.c:2351 +#: libparted/disk.c:2520 msgid "metadata" msgstr "метадані" -#: libparted/disk.c:2353 +#: libparted/disk.c:2522 msgid "free" msgstr "вільно" -#: libparted/disk.c:2355 parted/ui.c:1271 parted/ui.c:1299 +#: libparted/disk.c:2524 parted/ui.c:1274 parted/ui.c:1302 msgid "extended" msgstr "розширений" -#: libparted/disk.c:2357 parted/ui.c:1275 parted/ui.c:1303 +#: libparted/disk.c:2526 parted/ui.c:1278 parted/ui.c:1306 msgid "logical" msgstr "логічний" -#: libparted/disk.c:2359 parted/ui.c:1267 parted/ui.c:1295 +#: libparted/disk.c:2528 parted/ui.c:1270 parted/ui.c:1298 msgid "primary" msgstr "оÑновний" -#: libparted/disk.c:2375 +#: libparted/disk.c:2544 msgid "boot" msgstr "boot" -#: libparted/disk.c:2377 +#: libparted/disk.c:2546 msgid "bios_grub" msgstr "bios_grub" -#: libparted/disk.c:2379 +#: libparted/disk.c:2548 msgid "root" msgstr "кореневий" -#: libparted/disk.c:2381 +#: libparted/disk.c:2550 msgid "swap" msgstr "swap" -#: libparted/disk.c:2383 +#: libparted/disk.c:2552 msgid "hidden" msgstr "Ñхований" -#: libparted/disk.c:2385 +#: libparted/disk.c:2554 msgid "raid" msgstr "raid" -#: libparted/disk.c:2387 +#: libparted/disk.c:2556 msgid "lvm" msgstr "lvm" -#: libparted/disk.c:2389 +#: libparted/disk.c:2558 msgid "lba" msgstr "lba" -#: libparted/disk.c:2391 +#: libparted/disk.c:2560 msgid "hp-service" msgstr "hp-ÑервіÑ" -#: libparted/disk.c:2393 +#: libparted/disk.c:2562 msgid "palo" msgstr "palo" -#: libparted/disk.c:2395 +#: libparted/disk.c:2564 msgid "prep" msgstr "prep" -#: libparted/disk.c:2397 +#: libparted/disk.c:2566 msgid "msftres" msgstr "msftres" -#: libparted/disk.c:2399 +#: libparted/disk.c:2568 msgid "msftdata" msgstr "msftdata" -#: libparted/disk.c:2401 +#: libparted/disk.c:2570 msgid "atvrecv" msgstr "atvrecv" -#: libparted/disk.c:2403 +#: libparted/disk.c:2572 msgid "diag" msgstr "diag" -#: libparted/disk.c:2405 +#: libparted/disk.c:2574 msgid "legacy_boot" msgstr "заÑтарілий_завантажувальний" -#: libparted/disk.c:2407 +#: libparted/disk.c:2576 msgid "irst" msgstr "irst" -#: libparted/disk.c:2409 +#: libparted/disk.c:2578 msgid "esp" msgstr "esp" -#: libparted/disk.c:2411 +#: libparted/disk.c:2580 msgid "chromeos_kernel" msgstr "chromeos_kernel" -#: libparted/disk.c:2413 +#: libparted/disk.c:2582 msgid "bls_boot" msgstr "bls_boot" -#: libparted/disk.c:2415 +#: libparted/disk.c:2584 msgid "linux-home" msgstr "linux-home" -#: libparted/disk.c:2421 +#: libparted/disk.c:2586 +msgid "no_automount" +msgstr "" + +#: libparted/disk.c:2592 #, c-format msgid "Unknown partition flag, %d." msgstr "Ðевідома ознака розділу, %d." @@ -1119,8 +1123,8 @@ msgstr "" "оÑновних розділів; Ñкщо XGM Ñ” першим, його буде пораховано Ñк два)." #: libparted/labels/atari.c:1662 libparted/labels/bsd.c:563 -#: libparted/labels/dasd.c:895 libparted/labels/dos.c:2303 -#: libparted/labels/dvh.c:770 libparted/labels/gpt.c:1769 +#: libparted/labels/dasd.c:893 libparted/labels/dos.c:2294 +#: libparted/labels/dvh.c:770 libparted/labels/gpt.c:1891 #: libparted/labels/loop.c:244 libparted/labels/mac.c:1409 #: libparted/labels/pc98.c:697 libparted/labels/rdb.c:1054 #: libparted/labels/sun.c:781 @@ -1145,39 +1149,29 @@ msgstr "ОчікуєтьÑÑ Ð½Ð¾Ð¼ÐµÑ€ розділу." msgid "Unable to allocate a bsd disklabel slot." msgstr "Ðе вдаєтьÑÑ Ñ€Ð¾Ð·Ð¿Ð¾Ð´Ñ–Ð»Ð¸Ñ‚Ð¸ Ñлот bsd етикетки диÑка." -#: libparted/labels/dasd.c:626 +#: libparted/labels/dasd.c:634 msgid "The partition table of DASD-LDL device cannot be changed.\n" msgstr "Ðе можна змінювати таблицю розділів приÑтрою DASD-LDL.\n" -#: libparted/labels/dasd.c:921 +#: libparted/labels/dasd.c:919 msgid "Unable to allocate a dasd disklabel slot" msgstr "Ðе вдаєтьÑÑ Ñ€Ð¾Ð·Ð¿Ð¾Ð´Ñ–Ð»Ð¸Ñ‚Ð¸ Ñлот етикетки диÑка dasd" -#: libparted/labels/dos.c:1008 +#: libparted/labels/dos.c:1159 #, c-format msgid "Invalid partition table on %s -- wrong signature %x." msgstr "Ðеправильна Ñ‚Ð°Ð±Ð»Ð¸Ñ†Ñ Ñ€Ð¾Ð·Ð´Ñ–Ð»Ñ–Ð² на %s - неправильна Ñигнатура %x." -#: libparted/labels/dos.c:1036 +#: libparted/labels/dos.c:1187 #, c-format msgid "Invalid partition table - recursive partition on %s." msgstr "Ðеправильна Ñ‚Ð°Ð±Ð»Ð¸Ñ†Ñ Ñ€Ð¾Ð·Ð´Ñ–Ð»Ñ–Ð² - рекурÑивні розділи на %s." -#: libparted/labels/dos.c:1567 -msgid "Extended partitions cannot be hidden on msdos disk labels." -msgstr "Розширені розділи не можуть бути на диÑкових етикетках msdos." - -#: libparted/labels/dos.c:1579 -msgid "Extended partitions cannot be recovery partitions on msdos disk labels." -msgstr "" -"Розширені розділи не можуть бути розділами Ð²Ñ–Ð´Ð½Ð¾Ð²Ð»ÐµÐ½Ð½Ñ Ð½Ð° диÑкових мітках " -"msdos." - -#: libparted/labels/dos.c:2285 +#: libparted/labels/dos.c:2276 msgid "Parted can't resize partitions managed by Windows Dynamic Disk." msgstr "Parted не може змінювати розділи, Ñкі Ñтворені Windows Dynamic Disk." -#: libparted/labels/dos.c:2541 +#: libparted/labels/dos.c:2532 msgid "cannot create any more partitions" msgstr "Ñтворити додаткові розділи неможливо" @@ -1320,11 +1314,11 @@ msgstr "Ðе вдалоÑÑ Ð¾Ñ‚Ñ€Ð¸Ð¼Ð°Ñ‚Ð¸ дані щодо розміру б msgid "Disk geometry does not match a DASD device of type 3390." msgstr "Ð“ÐµÐ¾Ð¼ÐµÑ‚Ñ€Ñ–Ñ Ð´Ð¸Ñка не відповідає приÑтрою DASD типу 3390." -#: libparted/labels/gpt.c:569 +#: libparted/labels/gpt.c:589 msgid "device is too small for GPT" msgstr "приÑтрій Ñ” замалим Ð´Ð»Ñ GPT" -#: libparted/labels/gpt.c:771 +#: libparted/labels/gpt.c:791 #, c-format msgid "" "The format of the GPT partition table is version %x, which is newer than " @@ -1334,7 +1328,7 @@ msgstr "" "підтримку Ñкої передбачено у Parted. Будь лаÑка, повідомте нам про цю " "помилку!" -#: libparted/labels/gpt.c:807 +#: libparted/labels/gpt.c:827 #, c-format msgid "" "Not all of the space available to %s appears to be used, you can fix the GPT " @@ -1345,7 +1339,7 @@ msgstr "" "викориÑтовувавÑÑ Ð²ÐµÑÑŒ проÑÑ‚Ñ–Ñ€ (додатково %llu блоків) або продовжити з " "вказаними параметрами?." -#: libparted/labels/gpt.c:1006 +#: libparted/labels/gpt.c:1026 msgid "" "The backup GPT table is not at the end of the disk, as it should be. Fix, " "by moving the backup to the end (and removing the old backup)?" @@ -1354,7 +1348,7 @@ msgstr "" "знаходитиÑÑŒ. Виправити це шлÑхом Ð¿ÐµÑ€ÐµÐ¼Ñ–Ñ‰ÐµÐ½Ð½Ñ ÐºÐ¾Ð¿Ñ–Ñ— таблиці у кінець (та " "видалити Ñтару копію)?" -#: libparted/labels/gpt.c:1024 +#: libparted/labels/gpt.c:1044 msgid "" "Both the primary and backup GPT tables are corrupt. Try making a fresh " "table, and using Parted's rescue feature to recover partitions." @@ -1363,7 +1357,7 @@ msgstr "" "таблицю, та викориÑтовуйте функцію Ð²Ñ–Ð´Ð½Ð¾Ð²Ð»ÐµÐ½Ð½Ñ Ð¿Ñ€Ð¾Ð³Ñ€Ð°Ð¼Ð¸ Parted, щоб " "повернути розділи." -#: libparted/labels/gpt.c:1035 +#: libparted/labels/gpt.c:1055 msgid "" "The backup GPT table is corrupt, but the primary appears OK, so that will be " "used." @@ -1371,7 +1365,7 @@ msgstr "" "Резервну таблицю GPT пошкоджено, оÑновна, здаєтьÑÑ Ñ” правильною, тому буде " "викориÑтано оÑновну таблицю." -#: libparted/labels/gpt.c:1047 +#: libparted/labels/gpt.c:1067 msgid "" "The primary GPT table is corrupt, but the backup appears OK, so that will be " "used." @@ -1379,11 +1373,11 @@ msgstr "" "ОÑновна GPT-Ñ‚Ð°Ð±Ð»Ð¸Ñ†Ñ Ð¿Ð¾ÑˆÐºÐ¾Ð´Ð¶ÐµÐ½Ð°, але резервна виглÑдає правильною, тому буде " "викориÑтовуватиÑÑŒ Ñаме вона." -#: libparted/labels/gpt.c:1071 +#: libparted/labels/gpt.c:1091 msgid "primary partition table array CRC mismatch" msgstr "невідповідніÑÑ‚ÑŒ контрольних Ñум (CRC) маÑивів оÑновної таблиці" -#: libparted/labels/gpt.c:1655 libparted/labels/gpt.c:1682 +#: libparted/labels/gpt.c:1722 libparted/labels/gpt.c:1749 msgid "failed to translate partition name" msgstr "не вдалоÑÑ Ð¿ÐµÑ€ÐµÐ½ÐµÑти назву розділу" @@ -2061,7 +2055,7 @@ msgstr "fat_table_alloc_cluster: немає вільних клаÑтерів" msgid "Could not detect file system." msgstr "Ðе вдаєтьÑÑ Ð²Ð¸Ñвити файлову ÑиÑтему." -#: libparted/fs/r/filesys.c:159 libparted/fs/r/filesys.c:284 +#: libparted/fs/r/filesys.c:159 libparted/fs/r/filesys.c:285 #, c-format msgid "resizing %s file systems is not supported" msgstr "підтримки зміни розмірів файлових ÑиÑтем %s не передбачено" @@ -2344,39 +2338,39 @@ msgstr "Цей том HFS+ не міÑтить файлу каталогу. ДРmsgid "This HFS+ volume has no extents overflow file. This is quite unusual!" msgstr "Цей том HFS+ не міÑтить файлу Ð¿ÐµÑ€ÐµÐºÑ€Ð¸Ð²Ð°Ð½Ð½Ñ ÐµÐºÑтентів. ДоÑить дивно!" -#: parted/parted.c:137 +#: parted/parted.c:138 msgid "displays this help message" msgstr "відображає це повідомленнÑ" -#: parted/parted.c:138 +#: parted/parted.c:139 msgid "lists partition layout on all block devices" msgstr "вивеÑти ÑпиÑок таблиць розділів на уÑÑ–Ñ… приÑтроÑÑ…" -#: parted/parted.c:139 +#: parted/parted.c:140 msgid "displays machine parseable output" msgstr "відображає вивід у форматі Ð´Ð»Ñ Ð¼Ð°ÑˆÐ¸Ð½Ð½Ð¾Ð³Ð¾ розбору" -#: parted/parted.c:140 +#: parted/parted.c:141 msgid "displays JSON output" msgstr "показує Ð²Ð¸Ð²ÐµÐ´ÐµÐ½Ð½Ñ Ñƒ форматі JSON" -#: parted/parted.c:141 +#: parted/parted.c:142 msgid "never prompts for user intervention" msgstr "ніколи не запитувати Ð²Ñ‚Ñ€ÑƒÑ‡Ð°Ð½Ð½Ñ ÐºÐ¾Ñ€Ð¸Ñтувача" -#: parted/parted.c:142 +#: parted/parted.c:143 msgid "in script mode, fix instead of abort when asked" msgstr "у режимі Ñкрипту, виправити заміÑÑ‚ÑŒ Ð¿ÐµÑ€ÐµÑ€Ð¸Ð²Ð°Ð½Ð½Ñ Ð½Ð° запит" -#: parted/parted.c:143 +#: parted/parted.c:144 msgid "displays the version" msgstr "відображає верÑÑ–ÑŽ" -#: parted/parted.c:144 +#: parted/parted.c:145 msgid "alignment for new partitions" msgstr "Ð²Ð¸Ñ€Ñ–Ð²Ð½ÑŽÐ²Ð°Ð½Ð½Ñ Ð´Ð»Ñ Ð½Ð¾Ð²Ð¸Ñ… розділів" -#: parted/parted.c:157 +#: parted/parted.c:158 msgid "" "NUMBER is the partition number used by Linux. On MS-DOS disk labels, the " "primary partitions number from 1 to 4, logical partitions from 5 onwards.\n" @@ -2384,31 +2378,31 @@ msgstr "" "ÐОМЕР- це номер розділу, що викориÑтовуєтьÑÑ Linux. У етикетках диÑка MS-" "DOS, оÑновні розділи мають номери 1-4, а логічні - 5 та далі.\n" -#: parted/parted.c:160 +#: parted/parted.c:161 msgid "LABEL-TYPE is one of: " msgstr "ТИП-ЕТИКЕТКИ один з: " -#: parted/parted.c:161 parted/parted.c:162 +#: parted/parted.c:162 parted/parted.c:163 msgid "FLAG is one of: " msgstr "ОЗÐÐКРодне з: " -#: parted/parted.c:163 +#: parted/parted.c:164 msgid "UNIT is one of: " msgstr "БЛОК одне з: " -#: parted/parted.c:164 +#: parted/parted.c:165 msgid "desired alignment: minimum or optimal" msgstr "бажане вирівнюваннÑ: minimum або optimal" -#: parted/parted.c:165 +#: parted/parted.c:166 msgid "PART-TYPE is one of: primary, logical, extended\n" msgstr "ТИП-РОЗДІЛУ один з: оÑновний, логічний, розширений\n" -#: parted/parted.c:167 +#: parted/parted.c:168 msgid "FS-TYPE is one of: " msgstr "ТИП-ФС один з: " -#: parted/parted.c:168 +#: parted/parted.c:169 msgid "" "START and END are disk locations, such as 4GB or 10%. Negative values count " "from the end of the disk. For example, -1s specifies exactly the last " @@ -2418,7 +2412,7 @@ msgstr "" "Ð·Ð½Ð°Ñ‡ÐµÐ½Ð½Ñ Ð²Ñ–Ð´Ñ€Ð°Ñ…Ð¾Ð²ÑƒÑŽÑ‚ÑŒÑÑ Ð²Ñ–Ð´ ÐºÑ–Ð½Ñ†Ñ Ð´Ð¸Ñка. Ðаприклад, -1s вказує на оÑтанній " "Ñектор диÑка.\n" -#: parted/parted.c:171 +#: parted/parted.c:172 msgid "" "END is disk location, such as 4GB or 10%. Negative value counts from the " "end of the disk. For example, -1s specifies exactly the last sector.\n" @@ -2427,19 +2421,23 @@ msgstr "" "відраховуютьÑÑ Ð²Ñ–Ð´ ÐºÑ–Ð½Ñ†Ñ Ð´Ð¸Ñка. Ðаприклад, -1s вказує на оÑтанній Ñектор " "диÑка.\n" -#: parted/parted.c:174 +#: parted/parted.c:175 msgid "STATE is one of: on, off\n" msgstr "СТÐРодин з: on, off\n" -#: parted/parted.c:175 +#: parted/parted.c:176 msgid "DEVICE is usually /dev/hda or /dev/sda\n" msgstr "ПРИСТРІЙ - зазвичай /dev/hda чи /dev/sda\n" -#: parted/parted.c:176 +#: parted/parted.c:177 msgid "NAME is any word you want\n" msgstr "ÐÐЗВР- будь-Ñке Ñлово на ваш вибір\n" -#: parted/parted.c:179 +#: parted/parted.c:178 +msgid "TYPE_ID is a value between 0x01 and 0xff, TYPE_UUID is a UUID\n" +msgstr "" + +#: parted/parted.c:182 msgid "" "Copyright (C) 1998 - 2006 Free Software Foundation, Inc.\n" "This program is free software, covered by the GNU General Public License.\n" @@ -2458,22 +2456,22 @@ msgstr "" "ЦІÐÐОСТІ чи ПРИДÐТÐОСТІ ДЛЯ ПЕВÐОЇ МЕТИ. Докладнішу інформацію про це\n" "дивітьÑÑ Ñƒ УніверÑальній Публічній Ліцензії GNU.\n" -#: parted/parted.c:229 +#: parted/parted.c:232 #, c-format msgid "%0.f%%\t(time left %.2d:%.2d)" msgstr "%0.f%%\t(залишилоÑÑŒ чаÑу %.2d:%.2d)" -#: parted/parted.c:248 +#: parted/parted.c:251 #, c-format msgid "Partition %s is being used. Are you sure you want to continue?" msgstr "Розділ %s наразі викориÑтовуєтьÑÑ. Ви Ñправді хочете виконати цю дію?" -#: parted/parted.c:269 +#: parted/parted.c:272 #, c-format msgid "Partition(s) on %s are being used." msgstr "Розділи на %s наразі зайнÑÑ‚Ñ–." -#: parted/parted.c:281 +#: parted/parted.c:284 #, c-format msgid "" "The existing disk label on %s will be destroyed and all data on this disk " @@ -2482,31 +2480,31 @@ msgstr "" "ІÑнуюча позначка диÑка на %s буде знищена разом з уÑіма даними на ній. " "Продовжити?" -#: parted/parted.c:542 +#: parted/parted.c:545 msgid "New disk label type?" msgstr "Ðова етикетка диÑка?" -#: parted/parted.c:680 +#: parted/parted.c:692 msgid "Partition type?" msgstr "Тип розділу?" -#: parted/parted.c:698 parted/parted.c:902 +#: parted/parted.c:710 parted/parted.c:914 msgid "Partition name?" msgstr "Ðазва розділу?" -#: parted/parted.c:708 +#: parted/parted.c:720 msgid "File system type?" msgstr "Тип файлової ÑиÑтеми?" -#: parted/parted.c:713 parted/parted.c:1683 +#: parted/parted.c:725 parted/parted.c:1815 msgid "Start?" msgstr "Початок?" -#: parted/parted.c:715 parted/parted.c:1685 parted/parted.c:1768 +#: parted/parted.c:727 parted/parted.c:1817 parted/parted.c:1900 msgid "End?" msgstr "Кінець?" -#: parted/parted.c:782 +#: parted/parted.c:794 #, c-format msgid "" "You requested a partition from %s to %s (sectors %llu..%llu).\n" @@ -2516,7 +2514,7 @@ msgstr "" "Ðайближчим придатним відповідником вказаних значень можуть бути межі від %s " "до %s (Ñектори від %llu до %llu).%s" -#: parted/parted.c:791 +#: parted/parted.c:803 msgid "" "\n" "Is this still acceptable to you?" @@ -2524,7 +2522,7 @@ msgstr "" "\n" "Чи Ñ” це Ð´Ð»Ñ Ð²Ð°Ñ Ð¿Ñ€Ð¸Ð¹Ð½Ñтним?" -#: parted/parted.c:814 +#: parted/parted.c:826 #, c-format msgid "" "The resulting partition is not properly aligned for best performance: %s" @@ -2532,87 +2530,112 @@ msgstr "" "Отриманий у результаті розділ не буде вирівнÑно з метою Ð¿Ñ–Ð´Ð²Ð¸Ñ‰ÐµÐ½Ð½Ñ " "швидкодії: %s" -#: parted/parted.c:816 parted/parted.c:1925 +#: parted/parted.c:828 parted/parted.c:2057 msgid "unknown (malloc failed)" msgstr "невідомий (помилка malloc)" -#: parted/parted.c:894 +#: parted/parted.c:906 #, c-format msgid "%s disk labels do not support partition name." msgstr "У мітках диÑків %s не передбачено підтримки назв розділів." -#: parted/parted.c:899 parted/parted.c:1748 parted/parted.c:1814 -#: parted/parted.c:1908 parted/parted.c:1983 +#: parted/parted.c:911 parted/parted.c:955 parted/parted.c:1880 +#: parted/parted.c:1946 parted/parted.c:2040 parted/parted.c:2115 msgid "Partition number?" msgstr "Ðомер розділу?" -#: parted/parted.c:1050 +#: parted/parted.c:949 +#, fuzzy, c-format +msgid "%s disk labels do not support partition type." +msgstr "У мітках диÑків %s не передбачено підтримки назв розділів." + +#: parted/parted.c:965 +#, fuzzy +msgid "Partition type-id?" +msgstr "Тип розділу?" + +#: parted/parted.c:972 +#, fuzzy +msgid "Invalid type-id." +msgstr "Ðеправильне чиÑло." + +#: parted/parted.c:986 +#, fuzzy +msgid "Partition type-uuid?" +msgstr "Тип розділу?" + +#: parted/parted.c:993 +#, fuzzy +msgid "Invalid type-uuid." +msgstr "Ðеправильне чиÑло." + +#: parted/parted.c:1146 #, c-format msgid "BIOS cylinder,head,sector geometry: %d,%d,%d. Each cylinder is %s.\n" msgstr "BIOS циліндр,головка,Ñектор геометріÑ: %d,%d,%d. Кожен циліндр %s.\n" -#: parted/parted.c:1137 +#: parted/parted.c:1240 #, c-format msgid "Model: %s (%s)\n" msgstr "Модель: %s (%s)\n" -#: parted/parted.c:1139 +#: parted/parted.c:1242 #, c-format msgid "Disk %s: %s\n" msgstr "ДиÑк %s: %s\n" -#: parted/parted.c:1140 +#: parted/parted.c:1243 #, c-format msgid "Sector size (logical/physical): %lldB/%lldB\n" msgstr "Розмір Ñектора (логічний/фізичний): %lldБ/%lldБ\n" -#: parted/parted.c:1152 +#: parted/parted.c:1255 #, c-format msgid "Partition Table: %s\n" msgstr "Ñ‚Ð°Ð±Ð»Ð¸Ñ†Ñ Ñ€Ð¾Ð·Ð´Ñ–Ð»Ñ–Ð²: %s\n" -#: parted/parted.c:1153 +#: parted/parted.c:1256 #, c-format msgid "Disk Flags: %s\n" msgstr "Прапорці диÑка: %s\n" -#: parted/parted.c:1279 parted/parted.c:1282 +#: parted/parted.c:1388 parted/parted.c:1391 msgid "Number" msgstr "Ðомер" -#: parted/parted.c:1279 parted/parted.c:1282 +#: parted/parted.c:1388 parted/parted.c:1391 msgid "Start" msgstr "Початок" -#: parted/parted.c:1280 parted/parted.c:1283 +#: parted/parted.c:1389 parted/parted.c:1392 msgid "End" msgstr "Кінець" -#: parted/parted.c:1283 +#: parted/parted.c:1392 msgid "Size" msgstr "Розмір" -#: parted/parted.c:1287 +#: parted/parted.c:1396 msgid "Type" msgstr "Тип" -#: parted/parted.c:1289 +#: parted/parted.c:1398 msgid "File system" msgstr "Файлова ÑиÑтема" -#: parted/parted.c:1292 +#: parted/parted.c:1401 msgid "Name" msgstr "Ðазва" -#: parted/parted.c:1294 +#: parted/parted.c:1403 msgid "Flags" msgstr "Ознаки" -#: parted/parted.c:1352 +#: parted/parted.c:1461 msgid "Free Space" msgstr "Вільний проÑÑ‚Ñ–Ñ€" -#: parted/parted.c:1570 +#: parted/parted.c:1702 #, c-format msgid "" "A %s %s partition was found at %s -> %s. Do you want to add it to the " @@ -2621,56 +2644,56 @@ msgstr "" "Знайдено розділ %s %s у межах від %s -> %s. Бажаєте додати його до таблиці " "розділів?" -#: parted/parted.c:1613 +#: parted/parted.c:1745 msgid "searching for file systems" msgstr "пошук файлових ÑиÑтем" -#: parted/parted.c:1720 +#: parted/parted.c:1852 msgid "The resize command has been removed in parted 3.0" msgstr "Команду resize було уÑунуто починаючи з верÑÑ–Ñ— parted 3.0" -#: parted/parted.c:1782 +#: parted/parted.c:1914 msgid "" "Shrinking a partition can cause data loss, are you sure you want to continue?" msgstr "" "Ð—Ð¼ÐµÐ½ÑˆÐµÐ½Ð½Ñ Ñ€Ð¾Ð·Ð¼Ñ–Ñ€Ñ–Ð² розділу може призвеÑти до втрат даних. Ви Ñправді хочете " "виконати цю дію?" -#: parted/parted.c:1838 +#: parted/parted.c:1970 msgid "New device?" msgstr "Ðовий приÑтрій?" -#: parted/parted.c:1906 +#: parted/parted.c:2038 msgid "alignment type(min/opt)" msgstr "тип Ð²Ð¸Ñ€Ñ–Ð²Ð½ÑŽÐ²Ð°Ð½Ð½Ñ type(min/opt)" -#: parted/parted.c:1921 +#: parted/parted.c:2053 #, c-format msgid "%d aligned\n" msgstr "%d вирівнÑно\n" -#: parted/parted.c:1923 +#: parted/parted.c:2055 #, c-format msgid "%d not aligned: %s\n" msgstr "%d не вирівнÑно: %s\n" -#: parted/parted.c:1948 parted/parted.c:1985 +#: parted/parted.c:2080 parted/parted.c:2117 msgid "Flag to Invert?" msgstr "Ознака, Ñку інвертувати?" -#: parted/parted.c:1953 parted/parted.c:1990 +#: parted/parted.c:2085 parted/parted.c:2122 msgid "New state?" msgstr "Ðове значеннÑ?" -#: parted/parted.c:2036 +#: parted/parted.c:2168 msgid "Unit?" msgstr "Блок?" -#: parted/parted.c:2171 +#: parted/parted.c:2303 msgid "align-check" msgstr "align-check" -#: parted/parted.c:2174 +#: parted/parted.c:2306 msgid "" "align-check TYPE N check partition N for TYPE(min|opt) " "alignment" @@ -2678,11 +2701,11 @@ msgstr "" "align-check ТИП N перевірити розділ N щодо ТИПу(min|" "opt) вирівнюваннÑ" -#: parted/parted.c:2182 +#: parted/parted.c:2314 msgid "help" msgstr "help" -#: parted/parted.c:2185 +#: parted/parted.c:2317 msgid "" "help [COMMAND] print general help, or help on " "COMMAND" @@ -2690,30 +2713,30 @@ msgstr "" "help [КОМÐÐДÐ] вивеÑти загальну довідку, або довідку про " "КОМÐÐДÐ" -#: parted/parted.c:2191 +#: parted/parted.c:2323 msgid "mklabel" msgstr "mklabel" -#: parted/parted.c:2191 +#: parted/parted.c:2323 msgid "mktable" msgstr "mktable" -#: parted/parted.c:2194 +#: parted/parted.c:2326 msgid "" "mklabel,mktable LABEL-TYPE create a new disklabel (partition " "table)" msgstr "" "mklabel,mktable ТИП_ЕТИКЕТКИ Ñтворити нову позначку диÑка (таблицю розділів)" -#: parted/parted.c:2200 +#: parted/parted.c:2332 msgid "mkpart" msgstr "mkpart" -#: parted/parted.c:2203 +#: parted/parted.c:2335 msgid "mkpart PART-TYPE [FS-TYPE] START END make a partition" msgstr "mkpart ТИП-РОЗДІЛУ [ТИП-ФС] ПОЧÐТОК КІÐЕЦЬ Ñтворити розділ" -#: parted/parted.c:2209 +#: parted/parted.c:2341 msgid "" "'mkpart' makes a partition without creating a new file system on the " "partition. FS-TYPE may be specified to set an appropriate partition ID.\n" @@ -2721,19 +2744,19 @@ msgstr "" "'mkpart' Ñтворити розділ без ÑÑ‚Ð²Ð¾Ñ€ÐµÐ½Ð½Ñ Ð½Ð¾Ð²Ð¾Ñ— файлової ÑиÑтеми у ньому. Можна " "вказати ТИП-ФС Ð´Ð»Ñ Ð²ÑÑ‚Ð°Ð½Ð¾Ð²Ð»ÐµÐ½Ð½Ñ Ð²Ñ–Ð´Ð¿Ð¾Ð²Ñ–Ð´Ð½Ð¾Ð³Ð¾ ідентифікатора розділу.\n" -#: parted/parted.c:2214 +#: parted/parted.c:2346 msgid "name" msgstr "name" -#: parted/parted.c:2217 +#: parted/parted.c:2349 msgid "name NUMBER NAME name partition NUMBER as NAME" msgstr "name ÐОМЕРÐÐЗВРпризначити назву ÐÐЗВРрозділу ÐОМЕР" -#: parted/parted.c:2222 +#: parted/parted.c:2354 msgid "print" msgstr "print" -#: parted/parted.c:2225 +#: parted/parted.c:2357 msgid "" "print [devices|free|list,all] display the partition table, or " "available devices, or free space, or all found partitions" @@ -2741,7 +2764,7 @@ msgstr "" "print [devices|free|list,all] показати таблицю розділів, доÑтупні " "приÑтрої, вільне міÑце або вÑÑ– знайдені розділи" -#: parted/parted.c:2229 +#: parted/parted.c:2361 msgid "" "Without arguments, 'print' displays the entire partition table. However with " "the following arguments it performs various other actions.\n" @@ -2749,11 +2772,11 @@ msgstr "" "Без аргументів, 'print' відображає вÑÑŽ таблицю розділів. Проте, з наÑтупними " "аргументами виконуютьÑÑ Ñ–Ð½ÑˆÑ– дії.\n" -#: parted/parted.c:2231 +#: parted/parted.c:2363 msgid " devices : display all active block devices\n" msgstr " devices : відображаютьÑÑ Ð²ÑÑ– активні блочні приÑтрої\n" -#: parted/parted.c:2232 +#: parted/parted.c:2364 msgid "" " free : display information about free unpartitioned space on the " "current block device\n" @@ -2761,82 +2784,82 @@ msgstr "" " free : відображаєтьÑÑ Ñ–Ð½Ñ„Ð¾Ñ€Ð¼Ð°Ñ†Ñ–Ñ Ð¿Ñ€Ð¾ нерозподілений проÑÑ‚Ñ–Ñ€ на " "поточному блочному приÑтрої\n" -#: parted/parted.c:2234 +#: parted/parted.c:2366 msgid "" " list, all : display the partition tables of all active block devices\n" msgstr "" " list, all : відображаютьÑÑ Ñ‚Ð°Ð±Ð»Ð¸Ñ†Ñ– розділів на вÑÑ–Ñ… активних блочних " "приÑтроÑÑ…\n" -#: parted/parted.c:2238 +#: parted/parted.c:2370 msgid "quit" msgstr "quit" -#: parted/parted.c:2241 +#: parted/parted.c:2373 msgid "quit exit program" msgstr "quit вихід з програми" -#: parted/parted.c:2246 +#: parted/parted.c:2378 msgid "rescue" msgstr "rescue" -#: parted/parted.c:2249 +#: parted/parted.c:2381 msgid "" "rescue START END rescue a lost partition near START " "and END" msgstr "" "rescue ПОЧÐТОК КІÐЕЦЬ знайти втрачені розділи між ПОЧÐТОК та КІÐЕЦЬ" -#: parted/parted.c:2255 +#: parted/parted.c:2387 msgid "resize" msgstr "resize" -#: parted/parted.c:2258 +#: parted/parted.c:2390 msgid "The resize command was removed in parted 3.0\n" msgstr "Команду resize було уÑунуто починаючи з верÑÑ–Ñ— parted 3.0\n" -#: parted/parted.c:2261 +#: parted/parted.c:2393 msgid "resizepart" msgstr "resizepart" -#: parted/parted.c:2264 +#: parted/parted.c:2396 msgid "resizepart NUMBER END resize partition NUMBER" msgstr "" "resizepart ÐОМЕРКІÐЕЦЬ змінити розмір розділу з номером " "ÐОМЕР" -#: parted/parted.c:2269 +#: parted/parted.c:2401 msgid "rm" msgstr "rm" -#: parted/parted.c:2272 +#: parted/parted.c:2404 msgid "rm NUMBER delete partition NUMBER" msgstr "rm ÐОМЕРвидалити розділ з номером ÐОМЕР" -#: parted/parted.c:2277 +#: parted/parted.c:2409 msgid "select" msgstr "select" -#: parted/parted.c:2280 +#: parted/parted.c:2412 msgid "select DEVICE choose the device to edit" msgstr "select ПРИСТРІЙ вибирати приÑтрій Ð´Ð»Ñ Ñ€Ð¾Ð±Ð¾Ñ‚Ð¸" -#: parted/parted.c:2285 +#: parted/parted.c:2417 msgid "disk_set" msgstr "набір_диÑків" -#: parted/parted.c:2288 +#: parted/parted.c:2420 msgid "" "disk_set FLAG STATE change the FLAG on selected device" msgstr "" "disk_set ПРÐПОРЕЦЬ СТÐРзмінити Ð·Ð½Ð°Ñ‡ÐµÐ½Ð½Ñ ÐŸÐ ÐПОРЦЯ Ð´Ð»Ñ " "вибраного приÑтрою" -#: parted/parted.c:2293 +#: parted/parted.c:2425 msgid "disk_toggle" msgstr "disk_toggle" -#: parted/parted.c:2296 +#: parted/parted.c:2428 msgid "" "disk_toggle [FLAG] toggle the state of FLAG on " "selected device" @@ -2844,20 +2867,20 @@ msgstr "" "disk_toggle [ПРÐПОРЕЦЬ] перемкнути Ñтан ПРÐПОРЦЯ на " "вибраному приÑтрої" -#: parted/parted.c:2302 +#: parted/parted.c:2434 msgid "set" msgstr "set" -#: parted/parted.c:2305 +#: parted/parted.c:2437 msgid "" "set NUMBER FLAG STATE change the FLAG on partition NUMBER" msgstr "set ÐОМЕРОЗÐÐКРСТÐРзмінити ознаку розділу з номером ÐОМЕР" -#: parted/parted.c:2311 +#: parted/parted.c:2443 msgid "toggle" msgstr "toggle" -#: parted/parted.c:2314 +#: parted/parted.c:2446 msgid "" "toggle [NUMBER [FLAG]] toggle the state of FLAG on " "partition NUMBER" @@ -2865,20 +2888,30 @@ msgstr "" "toggle [ÐОМЕР[ОЗÐÐКÐ]] перемикнути ознаку ОЗÐÐКРрозділу з номером " "ÐОМЕР" -#: parted/parted.c:2320 +#: parted/parted.c:2452 +msgid "type" +msgstr "" + +#: parted/parted.c:2455 +msgid "" +"type NUMBER TYPE-ID or TYPE-UUID type set TYPE-ID or TYPE-UUID of " +"partition NUMBER" +msgstr "" + +#: parted/parted.c:2460 msgid "unit" msgstr "unit" -#: parted/parted.c:2323 +#: parted/parted.c:2463 msgid "unit UNIT set the default unit to UNIT" msgstr "" "unit БЛОК вÑтановити Ð´Ð»Ñ Ñ‚Ð¸Ð¿Ð¾Ð²Ð¾Ð³Ð¾ блоку Ð·Ð½Ð°Ñ‡ÐµÐ½Ð½Ñ Ð‘Ð›ÐžÐš" -#: parted/parted.c:2328 +#: parted/parted.c:2468 msgid "version" msgstr "version" -#: parted/parted.c:2331 +#: parted/parted.c:2471 msgid "" "version display the version number and " "copyright information of GNU Parted" @@ -2886,31 +2919,31 @@ msgstr "" "version вивеÑти поточну верÑÑ–ÑŽ GNU Parted та " "інформацію про авторÑьке право" -#: parted/parted.c:2335 +#: parted/parted.c:2475 msgid "" "'version' displays copyright and version information corresponding to this " "copy of GNU Parted\n" msgstr "" "команда version виводить інформацію про верÑÑ–ÑŽ цієї програми GNU Parted\n" -#: parted/parted.c:2405 +#: parted/parted.c:2545 #, c-format msgid "Usage: %s [-hlmsfv] [-a<align>] [DEVICE [COMMAND [PARAMETERS]]...]\n" msgstr "" "КориÑтуваннÑ: %s [-hlmsfv] [-a<вирівнюваннÑ>] [ПРИСТРІЙ [КОМÐÐДР" "[ПÐÐ ÐМЕТРИ]]...]\n" -#: parted/parted.c:2449 +#: parted/parted.c:2589 msgid "No device found" msgstr "ПриÑтрій не знайдено" -#: parted/parted.c:2486 +#: parted/parted.c:2626 msgid "WARNING: You are not superuser. Watch out for permissions.\n" msgstr "" "ПОПЕРЕДЖЕÐÐЯ: у Ð²Ð°Ñ Ð½ÐµÐ¼Ð°Ñ” адмініÑтративних прав доÑтупу. Спочатку вам Ñлід " "отримати ці права.\n" -#: parted/parted.c:2519 +#: parted/parted.c:2659 msgid "" "You should reinstall your boot loader before rebooting. Read section 4 of " "the Parted User documentation for more information." @@ -2918,7 +2951,7 @@ msgstr "" "Ðеобхідно перевÑтановити ваш завантажувач перед перезавантаженнÑм. Додаткову " "інформацію знайдете у розділі 4 документації з Parted." -#: parted/parted.c:2526 +#: parted/parted.c:2666 msgid "You may need to update /etc/fstab.\n" msgstr "Ðе забудьте оновити /etc/fstab, Ñкщо це необхідно.\n" @@ -3174,69 +3207,69 @@ msgstr "" "\n" "Помилка: ВиÑвлено загальний Ñигнал SIGILL." -#: parted/ui.c:901 +#: parted/ui.c:904 #, c-format msgid "invalid token: %s" msgstr "некоректний елемент: %s" -#: parted/ui.c:1082 +#: parted/ui.c:1085 msgid "Expecting a partition number." msgstr "ОчікуєтьÑÑ Ð½Ð¾Ð¼ÐµÑ€ розділу." -#: parted/ui.c:1091 +#: parted/ui.c:1094 msgid "Partition doesn't exist." msgstr "Розділ не Ñ–Ñнує." -#: parted/ui.c:1111 +#: parted/ui.c:1114 msgid "Expecting a file system type." msgstr "ОчікуєтьÑÑ Ñ‚Ð¸Ð¿ файлова ÑиÑтема." -#: parted/ui.c:1118 +#: parted/ui.c:1121 #, c-format msgid "Unknown file system type \"%s\"." msgstr "Ðевідомий тип файлової ÑиÑтеми \"%s\"." -#: parted/ui.c:1139 +#: parted/ui.c:1142 msgid "Expecting a disk label type." msgstr "ОчікуєтьÑÑ Ñ‚Ð¸Ð¿ диÑкової етикетки." -#: parted/ui.c:1170 parted/ui.c:1206 +#: parted/ui.c:1173 parted/ui.c:1209 msgid "No flags supported" msgstr "Підтримки прапорців не передбачено" -#: parted/ui.c:1280 +#: parted/ui.c:1283 msgid "Can't create any more partitions." msgstr "Ðе вдаєтьÑÑ Ð´Ð¾Ð´Ð°Ñ‚ÐºÐ¾Ð²Ð¾ Ñтворити розділи." -#: parted/ui.c:1290 +#: parted/ui.c:1293 msgid "Expecting a partition type." msgstr "ОчікуєтьÑÑ Ñ‚Ð¸Ð¿ розділу." -#: parted/ui.c:1439 +#: parted/ui.c:1442 msgid "on" msgstr "on" -#: parted/ui.c:1440 +#: parted/ui.c:1443 msgid "off" msgstr "off" -#: parted/ui.c:1457 +#: parted/ui.c:1460 msgid "optimal" msgstr "optimal" -#: parted/ui.c:1458 +#: parted/ui.c:1461 msgid "minimal" msgstr "minimal" -#: parted/ui.c:1591 +#: parted/ui.c:1594 msgid "OPTIONs:" msgstr "КЛЮЧІ:" -#: parted/ui.c:1596 +#: parted/ui.c:1599 msgid "COMMANDs:" msgstr "КОМÐÐДИ:" -#: parted/ui.c:1599 +#: parted/ui.c:1602 #, c-format msgid "" "\n" @@ -3245,15 +3278,24 @@ msgstr "" "\n" "Про вади повідомлÑйте на цю адреÑу: %s\n" -#: parted/ui.c:1606 +#: parted/ui.c:1609 #, c-format msgid "Using %s\n" msgstr "ВикориÑтовуєтьÑÑ %s\n" -#: parted/ui.c:1686 +#: parted/ui.c:1689 msgid "This command does not make sense in non-interactive mode.\n" msgstr "Ð¦Ñ ÐºÐ¾Ð¼Ð°Ð½Ð´Ð° не має ÑенÑу у неінтерактивному режимі.\n" +#~ msgid "Extended partitions cannot be hidden on msdos disk labels." +#~ msgstr "Розширені розділи не можуть бути на диÑкових етикетках msdos." + +#~ msgid "" +#~ "Extended partitions cannot be recovery partitions on msdos disk labels." +#~ msgstr "" +#~ "Розширені розділи не можуть бути розділами Ð²Ñ–Ð´Ð½Ð¾Ð²Ð»ÐµÐ½Ð½Ñ Ð½Ð° диÑкових мітках " +#~ "msdos." + #~ msgid "" #~ " NUMBER : display more detailed information about this particular " #~ "partition\n" Binary files differ@@ -4,14 +4,14 @@ # This file is distributed under the same license as the parted package. # Trần Thị Hoà ng Quyá»n <banhdauxanhhaiduong@gmail.com>, 2005. # Clytie Siddall <clytie@riverland.net.au>, 2009, 2010. -# Trần Ngá»c Quân <vnwildman@gmail.com>, 2012-2014. +# Trần Ngá»c Quân <vnwildman@gmail.com>, 2012-2014, 2022. # msgid "" msgstr "" -"Project-Id-Version: parted 3.1.90\n" +"Project-Id-Version: parted 3.4.64.2\n" "Report-Msgid-Bugs-To: bug-parted@gnu.org\n" -"POT-Creation-Date: 2022-04-18 14:44-0400\n" -"PO-Revision-Date: 2014-07-04 14:20+0700\n" +"POT-Creation-Date: 2023-04-10 15:50-0700\n" +"PO-Revision-Date: 2022-04-18 07:41+0700\n" "Last-Translator: Trần Ngá»c Quân <vnwildman@gmail.com>\n" "Language-Team: Vietnamese <translation-team-vi@lists.sourceforge.net>\n" "Language: vi\n" @@ -20,55 +20,54 @@ msgstr "" "Content-Transfer-Encoding: 8bit\n" "X-Bugs: Report translation errors to the Language-Team address.\n" "Plural-Forms: nplurals=1; plural=0;\n" -"X-Generator: Poedit 1.5.5\n" -"X-Poedit-SourceCharset: utf-8\n" +"X-Generator: Poedit 3.0.1\n" -#: lib/argmatch.c:147 +#: lib/argmatch.c:145 #, c-format msgid "invalid argument %s for %s" msgstr "đối số không hợp lệ %s cho %s" -#: lib/argmatch.c:148 +#: lib/argmatch.c:146 #, c-format msgid "ambiguous argument %s for %s" msgstr "đối số không rõ rà ng %s cho %s" -#: lib/argmatch.c:167 lib/argmatch.h:238 +#: lib/argmatch.c:165 lib/argmatch.h:237 msgid "Valid arguments are:" msgstr "Các đối số hợp lệ là :" -#: lib/closeout.c:122 libparted/labels/fdasd.c:145 +#: lib/closeout.c:121 libparted/labels/fdasd.c:145 msgid "write error" msgstr "lá»—i ghi nhá»›" -#: lib/error.c:195 +#: lib/error.c:193 msgid "Unknown system error" msgstr "Gặp lá»—i hệ thống không rõ" #: lib/getopt.c:278 -#, fuzzy, c-format +#, c-format msgid "%s: option '%s%s' is ambiguous\n" -msgstr "%s: tùy chá»n “-W %s†chÆ°a rõ rà ng\n" +msgstr "%s: tùy chá»n “-%s%s†chÆ°a rõ rà ng\n" #: lib/getopt.c:284 -#, fuzzy, c-format +#, c-format msgid "%s: option '%s%s' is ambiguous; possibilities:" -msgstr "%s: tùy chá»n “%s†chÆ°a rõ rà ng; khả năng là :" +msgstr "%s: tùy chá»n “%s%s†chÆ°a rõ rà ng; khả năng là :" #: lib/getopt.c:319 -#, fuzzy, c-format +#, c-format msgid "%s: unrecognized option '%s%s'\n" -msgstr "%s: không nháºn ra tùy chá»n “%c%sâ€\n" +msgstr "%s: không nháºn ra tùy chá»n “%s%sâ€\n" #: lib/getopt.c:345 -#, fuzzy, c-format +#, c-format msgid "%s: option '%s%s' doesn't allow an argument\n" -msgstr "%s: tùy chá»n “%c%s†không cho phép đối số\n" +msgstr "%s: tùy chá»n “%s%s†không không cho phép má»™t đối số\n" #: lib/getopt.c:360 -#, fuzzy, c-format +#, c-format msgid "%s: option '%s%s' requires an argument\n" -msgstr "%s: tùy chá»n “--%s†yêu cầu má»™t đối số\n" +msgstr "%s: tùy chá»n “%s%s†cần má»™t đối số\n" #: lib/getopt.c:621 #, c-format @@ -101,11 +100,11 @@ msgstr "%s: tùy chá»n yêu cầu má»™t đối số -- “%câ€\n" #. If you don't know what to put here, please see #. <https://en.wikipedia.org/wiki/Quotation_marks_in_other_languages> #. and use glyphs suitable for your language. -#: lib/quotearg.c:355 +#: lib/quotearg.c:354 msgid "`" msgstr "“" -#: lib/quotearg.c:356 +#: lib/quotearg.c:355 msgid "'" msgstr "â€" @@ -138,9 +137,8 @@ msgid "Invalid back reference" msgstr "Sai đặt tham chiếu ngược" #: lib/regcomp.c:143 -#, fuzzy msgid "Unmatched [, [^, [:, [., or [=" -msgstr "Có má»™t ký tá»± “[†hay “[^†lẻ đôi" +msgstr "ChÆ°a khá»›p cặp [, [^, [:, [., hoặc [=" #: lib/regcomp.c:146 msgid "Unmatched ( or \\(" @@ -188,7 +186,7 @@ msgstr "Không có biểu thức chÃnh quy Ä‘i trÆ°á»›c" #. To enquire the regular expression that your system uses for this #. purpose, you can use the command #. locale -k LC_MESSAGES | grep '^yesexpr=' -#: lib/rpmatch.c:150 +#: lib/rpmatch.c:149 msgid "^[yY]" msgstr "^[cCyY]" @@ -198,7 +196,7 @@ msgstr "^[cCyY]" #. To enquire the regular expression that your system uses for this #. purpose, you can use the command #. locale -k LC_MESSAGES | grep '^noexpr=' -#: lib/rpmatch.c:163 +#: lib/rpmatch.c:162 msgid "^[nN]" msgstr "^[kKnN]" @@ -221,18 +219,16 @@ msgstr "©" #. TRANSLATORS: The %s placeholder is the web address of the GPL license. #: lib/version-etc.c:88 -#, fuzzy, c-format +#, c-format msgid "" "License GPLv3+: GNU GPL version 3 or later <%s>.\n" "This is free software: you are free to change and redistribute it.\n" "There is NO WARRANTY, to the extent permitted by law.\n" msgstr "" -"\n" "Giấy phép GPL pb3+: Giấy phép Công cá»™ng GNU phiên bản 3 hay sau\n" -"<http://gnu.org/licenses/gpl.html>\n" +"<%s>\n" "Äây là phần má»m tá»± do: bạn có quyá»n sá»a đổi và phát hà nh lại nó.\n" "KHÔNG CÓ BẢO HÀNH GÃŒ CẢ, vá»›i Ä‘iá»u khiển được pháp luáºt cho phép.\n" -"\n" #. TRANSLATORS: %s denotes an author name. #: lib/version-etc.c:105 @@ -347,10 +343,9 @@ msgstr "" #. "Report translation bugs to <...>\n" with the address for translation #. bugs (typically your translation team's web or email address). #: lib/version-etc.c:249 -#, fuzzy, c-format +#, c-format msgid "Report bugs to: %s\n" msgstr "" -"\n" "Gá»i báo cáo lá»—i tá»›i: <%s>\n" "Thông báo lá»—i dịch cho: <http://translationproject.org/team/vi.html>.\n" @@ -365,10 +360,9 @@ msgid "%s home page: <%s>\n" msgstr "Trang chủ %s: <%s>\n" #: lib/version-etc.c:260 -#, fuzzy, c-format +#, c-format msgid "General help using GNU software: <%s>\n" -msgstr "" -"Trợ giúp chung vá» sá» dụng phần má»m GNU: <http://www.gnu.org/gethelp/>\n" +msgstr "Trợ giúp chung vá» cách sá» dụng phần má»m GNU: <%s>\n" #: lib/xalloc-die.c:34 msgid "memory exhausted" @@ -483,22 +477,22 @@ msgstr "" "là bạn có thể cần phải khởi Ä‘á»™ng lại để má»i thay đổi có tác dụng." #: libparted/arch/gnu.c:261 -#, fuzzy, c-format +#, c-format msgid "" "Warning: unable to open %s (%s). As a result, it may not reflect all of your " "changes until after reboot." msgstr "" -"CẢNH BÃO: hạt nhân không Ä‘á»c lại được bảng phân vùng trên %s (%s). Kết quả " -"là bạn có thể cần phải khởi Ä‘á»™ng lại để má»i thay đổi có tác dụng." +"CẢNH BÃO: không thể mở %s (%s). Kết quả là bạn có thể cần phải khởi Ä‘á»™ng lại " +"để má»i thay đổi có tác dụng." #: libparted/arch/gnu.c:274 -#, fuzzy, c-format +#, c-format msgid "" "Warning: failed to make translator go away on %s (%s). As a result, it may " "not reflect all of your changes until after reboot." msgstr "" -"CẢNH BÃO: hạt nhân không Ä‘á»c lại được bảng phân vùng trên %s (%s). Kết quả " -"là bạn có thể cần phải khởi Ä‘á»™ng lại để má»i thay đổi có tác dụng." +"CẢNH BÃO: gặp lá»—i khi là m cho bá»™ dịch ra Ä‘i trên %s (%s). Kết quả là bạn có " +"thể cần phải khởi Ä‘á»™ng lại để má»i thay đổi có tác dụng." #: libparted/arch/gnu.c:820 #, c-format @@ -521,8 +515,8 @@ msgid "" "Could not determine sector size for %s: %s.\n" "Using the default sector size (%lld)." msgstr "" -"Không thể quyết định kÃch cỡ rãnh ghi đối vá»›i %s: %s\n" -"nên dùng kÃch cỡ rãnh ghi mặc định (%lld)." +"Không thể quyết định kÃch cỡ cung từ đối vá»›i %s: %s\n" +"nên dùng kÃch cỡ cung từ mặc định (%lld)." #: libparted/arch/linux.c:795 #, c-format @@ -530,8 +524,8 @@ msgid "" "Could not determine physical sector size for %s.\n" "Using the logical sector size (%lld)." msgstr "" -"Không thể quyết định kÃch cỡ rãnh ghi váºt lý đối vá»›i %s\n" -"nên dùng kÃch cỡ rãnh ghi lô-gÃc (%lld)." +"Không thể quyết định kÃch cỡ cung từ váºt lý đối vá»›i %s\n" +"nên dùng kÃch cỡ cung từ lô-gÃc (%lld)." #: libparted/arch/linux.c:855 #, c-format @@ -555,7 +549,7 @@ msgid "" "system combinations, e.g. GPT and ext2/3.\n" "Please consult the web site for up-to-date information." msgstr "" -"Thiết bị %s có nhiá»u (%d) rãnh ghi lô-gÃc trên má»—i rãnh ghi váºt lý.\n" +"Thiết bị %s có nhiá»u (%d) cung từ lô-gÃc trên má»—i cung từ váºt lý.\n" "ChÆ°Æ¡ng trình GNU Parted há»— trợ trÆ°á»ng hợp nà y má»™t cách VẪN THá»°C NGHIỆM\n" "đối vá»›i má»™t số tổ hợp nhãn Ä‘Ä©a/hệ thống táºp tin, v.d. GPT và ext2/3.\n" "Hãy thăm trang chủ Web để tìm thông tin đã cáºp nháºt." @@ -588,9 +582,8 @@ msgid "Generic SD/MMC Storage Card" msgstr "Bo mạch lÆ°u trữ SD/MMC giống loà i" #: libparted/arch/linux.c:1423 -#, fuzzy msgid "NVMe Device" -msgstr "Thiết bị má»›i?" +msgstr "Thiết bị NVMe" #: libparted/arch/linux.c:1484 msgid "DAC960 RAID controller" @@ -618,7 +611,7 @@ msgstr "Mảng Khéo Compaq" #: libparted/arch/linux.c:1521 msgid "NVDIMM Device" -msgstr "" +msgstr "Thiết bị NVDIMM" #: libparted/arch/linux.c:1526 msgid "ATARAID Controller" @@ -659,7 +652,7 @@ msgstr "Mảng RAID phần má»m Linux" #: libparted/arch/linux.c:1589 msgid "RAM Drive" -msgstr "" +msgstr "ÄÄ©a RAM" #: libparted/arch/linux.c:1596 msgid "ped_device_new() Unsupported device type" @@ -715,7 +708,7 @@ msgstr "" #: libparted/cs/geom.c:379 #, c-format msgid "Attempt to write sectors %ld-%ld outside of partition on %s." -msgstr "Cố ghi các rãnh ghi %ld-%ld nằm ngoà i phân vùng trên %s." +msgstr "Cố ghi các cung từ %ld-%ld nằm ngoà i phân vùng trên %s." #: libparted/cs/geom.c:419 msgid "checking for bad blocks" @@ -724,7 +717,7 @@ msgstr "Ä‘ang kiểm tra tìm khối há»ng" #: libparted/debug.c:97 #, c-format msgid "Backtrace has %d calls on stack:\n" -msgstr "Truy ngược có %d lá»i gá»i trên đống:\n" +msgstr "Truy ngược có %d lá»i gá»i trên ngăn xếp:\n" #: libparted/debug.c:110 #, c-format @@ -763,159 +756,162 @@ msgstr "pmbr_boot" msgid "Unknown disk flag, %d." msgstr "Không nháºn ra cá» Ä‘Ä©a, %d." -#: libparted/disk.c:1289 +#: libparted/disk.c:1320 #, c-format msgid "%s disk labels do not support extended partitions." msgstr "Nhãn Ä‘Ä©a %s không há»— trợ phiên bản mở rá»™ng." -#: libparted/disk.c:1821 +#: libparted/disk.c:1990 #, c-format msgid "%s disk labels don't support logical or extended partitions." msgstr "Nhãn Ä‘Ä©a %s không há»— trợ phiên bản kiểu mở rá»™ng hay lô-gÃc." -#: libparted/disk.c:1834 +#: libparted/disk.c:2003 msgid "Too many primary partitions." msgstr "Quá nhiá»u phân vùng chÃnh." -#: libparted/disk.c:1843 +#: libparted/disk.c:2012 #, c-format msgid "" "Can't add a logical partition to %s, because there is no extended partition." msgstr "" "Không thể thêm và o %s má»™t phân vùng lô-gÃc, vì không có phân vùng mở rá»™ng." -#: libparted/disk.c:1867 +#: libparted/disk.c:2036 #, c-format msgid "Can't have more than one extended partition on %s." msgstr "Không cho phép nhiá»u hÆ¡n má»™t phân vùng mở rá»™ng trên %s." -#: libparted/disk.c:1877 +#: libparted/disk.c:2046 msgid "Can't have logical partitions outside of the extended partition." msgstr "Không cho phép phân vùng lô-gÃc nằm ngoà i phân vùng mở rá»™ng." -#: libparted/disk.c:1902 +#: libparted/disk.c:2071 #, c-format msgid "Can't have a logical partition outside of the extended partition on %s." msgstr "Không cho phép phân vùng lô-gÃc nằm ngoà i phân vùng mở rá»™ng trên %s." -#: libparted/disk.c:1912 +#: libparted/disk.c:2081 msgid "Can't have a primary partition inside an extended partition." msgstr "Không cho phép phân vùng chÃnh nằm trong phân vùng mở rá»™ng." -#: libparted/disk.c:1921 +#: libparted/disk.c:2090 msgid "Can't have a partition outside the disk!" msgstr "Không thể có phân vùng nằm ngoà i Ä‘Ä©a!" -#: libparted/disk.c:1972 libparted/disk.c:2150 +#: libparted/disk.c:2141 libparted/disk.c:2319 msgid "Can't have overlapping partitions." msgstr "Không cho phép các phân vùng chồng chéo lên nhau." -#: libparted/disk.c:2351 +#: libparted/disk.c:2520 msgid "metadata" msgstr "siêu dữ liệu" -#: libparted/disk.c:2353 +#: libparted/disk.c:2522 msgid "free" msgstr "trống" -#: libparted/disk.c:2355 parted/ui.c:1271 parted/ui.c:1299 +#: libparted/disk.c:2524 parted/ui.c:1274 parted/ui.c:1302 msgid "extended" msgstr "mở rá»™ng" -#: libparted/disk.c:2357 parted/ui.c:1275 parted/ui.c:1303 +#: libparted/disk.c:2526 parted/ui.c:1278 parted/ui.c:1306 msgid "logical" msgstr "lô-g" -#: libparted/disk.c:2359 parted/ui.c:1267 parted/ui.c:1295 +#: libparted/disk.c:2528 parted/ui.c:1270 parted/ui.c:1298 msgid "primary" msgstr "chÃnh" -#: libparted/disk.c:2375 +#: libparted/disk.c:2544 msgid "boot" msgstr "khởi Ä‘á»™ng" -#: libparted/disk.c:2377 +#: libparted/disk.c:2546 msgid "bios_grub" msgstr "bios_grub" -#: libparted/disk.c:2379 +#: libparted/disk.c:2548 msgid "root" msgstr "gốc" -#: libparted/disk.c:2381 +#: libparted/disk.c:2550 msgid "swap" msgstr "trao đổi" -#: libparted/disk.c:2383 +#: libparted/disk.c:2552 msgid "hidden" msgstr "ẩn" -#: libparted/disk.c:2385 +#: libparted/disk.c:2554 msgid "raid" msgstr "raid" -#: libparted/disk.c:2387 +#: libparted/disk.c:2556 msgid "lvm" msgstr "lvm" -#: libparted/disk.c:2389 +#: libparted/disk.c:2558 msgid "lba" msgstr "lba" -#: libparted/disk.c:2391 +#: libparted/disk.c:2560 msgid "hp-service" msgstr "dịch vụ HP" -#: libparted/disk.c:2393 +#: libparted/disk.c:2562 msgid "palo" msgstr "palo" -#: libparted/disk.c:2395 +#: libparted/disk.c:2564 msgid "prep" msgstr "chuẩn bị" -#: libparted/disk.c:2397 +#: libparted/disk.c:2566 msgid "msftres" msgstr "msftres" -#: libparted/disk.c:2399 +#: libparted/disk.c:2568 msgid "msftdata" msgstr "msftdata" -#: libparted/disk.c:2401 +#: libparted/disk.c:2570 msgid "atvrecv" msgstr "atvrecv" -#: libparted/disk.c:2403 +#: libparted/disk.c:2572 msgid "diag" msgstr "diag" -#: libparted/disk.c:2405 +#: libparted/disk.c:2574 msgid "legacy_boot" msgstr "legacy_boot" -#: libparted/disk.c:2407 +#: libparted/disk.c:2576 msgid "irst" msgstr "irst" -#: libparted/disk.c:2409 +#: libparted/disk.c:2578 msgid "esp" msgstr "esp" -#: libparted/disk.c:2411 +#: libparted/disk.c:2580 msgid "chromeos_kernel" -msgstr "" +msgstr "chromeos_kernel" -#: libparted/disk.c:2413 -#, fuzzy +#: libparted/disk.c:2582 msgid "bls_boot" -msgstr "pmbr_boot" +msgstr "bls_boot" -#: libparted/disk.c:2415 +#: libparted/disk.c:2584 msgid "linux-home" +msgstr "linux-home" + +#: libparted/disk.c:2586 +msgid "no_automount" msgstr "" -#: libparted/disk.c:2421 +#: libparted/disk.c:2592 #, c-format msgid "Unknown partition flag, %d." msgstr "Không nháºn ra cá» phân vùng, %d." @@ -983,7 +979,7 @@ msgstr "" "Phát hiện ra má»™t lá»—i trong GNU parted. Hãy thăm trang chủ Web của parted " "(http://www.gnu.org/software/parted/parted.html) để biết thêm vá» thông tin " "thÃch hợp vá»›i báo cáo lá»—i! Xin hãy gá»i thÆ° thông báo tá»›i %s kèm theo Ãt " -"nhất là số phiên bản (%s) và thông tin sau đây:" +"nhất là số phiên bản (%s) và thông tin sau đây: " #: libparted/labels/aix.c:92 msgid "Support for reading AIX disk labels is is not implemented yet." @@ -1015,35 +1011,40 @@ msgid "Support for setting flags in AIX disk labels is not implemented yet." msgstr "ChÆ°a thá»±c hiện há»— trợ đặt cá» trong nhãn Ä‘Ä©a AIX." #: libparted/labels/atari.c:278 -#, fuzzy, c-format +#, c-format msgid "" "Can't use Atari partition tables on disks with a sector size not equal to %d " "bytes." msgstr "" -"Parted không dùng được hệ thống táºp tin HFS trên Ä‘Ä©a có kÃch cỡ rãnh ghi " -"khác %d byte." +"Không thể dùng bảng phân Atari vùng trên Ä‘Ä©a vá»›i cỡ cung từ không bằng %d " +"byte." #: libparted/labels/atari.c:290 #, c-format msgid "Can't use Atari partition tables on disks with more than %d sectors." msgstr "" +"Không thể sá» dụng bảng phân vùng Atari trên Ä‘Ä©a nếu nhiá»u hÆ¡n %d cung từ." #: libparted/labels/atari.c:403 msgid "" "Too many Atari partitions detected. Maybe there is a loop in the XGM linked " "list. Aborting." msgstr "" +"Dò tìm thấy quá nhiá»u phân vùng Atari. Cói lẽ ở đây có lẽ lặp quẩn tròn " +"trong danh sách liên kết XGM. Nên bãi bá»." #: libparted/labels/atari.c:601 #, c-format msgid "No data partition found in the ARS at sector %lli." -msgstr "" +msgstr "Không tìm thấy dữ liệu phân vùng trong ARS tại cung từ %lli." #: libparted/labels/atari.c:622 #, c-format msgid "" "The entry of the next logical ARS is not of type XGM in ARS at sector %lli." msgstr "" +"Mục tin của ARS lôgÃc kế tiếp không phải là kiểu XGM trong ARS tại cung từ " +"%lli." #: libparted/labels/atari.c:653 #, c-format @@ -1051,31 +1052,35 @@ msgid "" "There doesn't seem to be an Atari partition table on this disk (%s), or it " "is corrupted." msgstr "" +"Äây có vẻ không phải là má»™t bảng phân vùng Atari trên Ä‘Ä©a nà y (%s), hoặc là " +"nó bị há»ng." #: libparted/labels/atari.c:883 #, c-format msgid "No room at sector %lli to store ARS of logical partition %d." -msgstr "" +msgstr "Không có chá»— ở cung từ %lli để lÆ°u ARS của phân vùng lôgÃc %d." #: libparted/labels/atari.c:890 #, c-format msgid "No room at sector %lli to store ARS." -msgstr "" +msgstr "Không có chá»— ở cung từ %lli để lÆ°u ARS." #: libparted/labels/atari.c:967 msgid "" "The sector count that is stored in the partition table does not correspond " "to the size of your device. Do you want to fix the partition table?" msgstr "" +"Số lượng cung từ cái mà được lÆ°u trong bảng phân vùng không tÆ°Æ¡ng ứng vá»›i " +"kÃch thÆ°á»›c của thiết bị của bạn. Bạn có muốn sá»a bảng phân vùng?" #: libparted/labels/atari.c:1008 #, c-format msgid "No room at sector %lli to store BSL." -msgstr "" +msgstr "Không có chá»— ở cung từ %lli để lÆ°u BSL." #: libparted/labels/atari.c:1116 msgid "There were remaining partitions after filling the main AHDI table." -msgstr "" +msgstr "Ở đây vẫn còn các phân vùng sau khi Ä‘iá»n đầy bảng AHDI chÃnh." #: libparted/labels/atari.c:1135 msgid "" @@ -1083,15 +1088,17 @@ msgid "" "not empty so more partitions of unknown size and position will be detected " "by ICD compatible software. Do you want to invalidate the ICD table?" msgstr "" +"Bảng DHDI chÃnh được lá»c ra vá»›i má»i phân vùng nhÆ°ng bảng ICD không trống váºy " +"có các phân vùng khác không biết cỡ và vị trà sẽ được dò tìm ra bởi phần má»m " +"tÆ°Æ¡ng thÃch ICD. Bạn có muốn bất hoạt bảng ICD?" #: libparted/labels/atari.c:1169 -#, fuzzy msgid "ICD entries can't contain extended or logical partitions." -msgstr "Không thể sao chép phân vùng mở rá»™ng." +msgstr "Mục tin ICD không thể chứa phân vùng mở rá»™ng hay lôgÃc." #: libparted/labels/atari.c:1191 msgid "There were remaining partitions after filling the tables." -msgstr "" +msgstr "Ở đây vẫn còn các phân vùng sau khi Ä‘iá»n đầy bảng." #: libparted/labels/atari.c:1231 #, c-format @@ -1099,10 +1106,12 @@ msgid "" "You can't use an extended XGM partition in ICD mode (more than %d primary " "partitions, if XGM is the first one it counts for two)." msgstr "" +"Bạn không thể sá» dụng má»™t phân vùng XGM mở rá»™ng trong chế Ä‘á»™ ICD (nhiá»u hÆ¡n " +"%d phân vùng chÃnh, nếu XGM là phân vùng đầu nó sẽ đếm là hai)." #: libparted/labels/atari.c:1662 libparted/labels/bsd.c:563 -#: libparted/labels/dasd.c:895 libparted/labels/dos.c:2303 -#: libparted/labels/dvh.c:770 libparted/labels/gpt.c:1769 +#: libparted/labels/dasd.c:893 libparted/labels/dos.c:2294 +#: libparted/labels/dvh.c:770 libparted/labels/gpt.c:1891 #: libparted/labels/loop.c:244 libparted/labels/mac.c:1409 #: libparted/labels/pc98.c:697 libparted/labels/rdb.c:1054 #: libparted/labels/sun.c:781 @@ -1115,6 +1124,8 @@ msgid "" "You can't use more than %d primary partitions (ICD mode) if you use an " "extended XGM partition. If XGM is the first partition it counts for two." msgstr "" +"Bạn không thể sá» dụng nhiá»u hÆ¡n %d phân vùng chÃnh (chế Ä‘á»™ ICD) nếu bạn sá» " +"dụng phân vùng XGM mở rá»™ng. Nếu XGM là phân vùng đầu tiên nó đếm thà nh hai." #: libparted/labels/atari.c:1828 libparted/labels/rdb.c:1082 msgid "Unable to allocate a partition number." @@ -1124,42 +1135,33 @@ msgstr "Không thể cấp phát má»™t số thứ tá»± phân vùng." msgid "Unable to allocate a bsd disklabel slot." msgstr "Không thể cấp phát má»™t khe nhãn Ä‘Ä©a sai." -#: libparted/labels/dasd.c:626 +#: libparted/labels/dasd.c:634 msgid "The partition table of DASD-LDL device cannot be changed.\n" -msgstr "" +msgstr "Bảng phân vùng của thiết bị DASD-LDL không thể thay đổi.\n" -#: libparted/labels/dasd.c:921 +#: libparted/labels/dasd.c:919 msgid "Unable to allocate a dasd disklabel slot" msgstr "Không thể cấp phát má»™t khe nhãn Ä‘Ä©a DASD" -#: libparted/labels/dos.c:1008 +#: libparted/labels/dos.c:1159 #, c-format msgid "Invalid partition table on %s -- wrong signature %x." msgstr "Gặp bảng phân vùng sai trên %s -- chữ ký không đúng %x." -#: libparted/labels/dos.c:1036 +#: libparted/labels/dos.c:1187 #, c-format msgid "Invalid partition table - recursive partition on %s." msgstr "Bảng phân vùng sai -- phiên bản đệ quy trên %s." -#: libparted/labels/dos.c:1567 -msgid "Extended partitions cannot be hidden on msdos disk labels." -msgstr "Phân vùng mở rá»™ng không thể bị ẩn trên nhãn Ä‘Ä©a MSDOS." - -#: libparted/labels/dos.c:1579 -#, fuzzy -msgid "Extended partitions cannot be recovery partitions on msdos disk labels." -msgstr "Phân vùng mở rá»™ng không thể bị ẩn trên nhãn Ä‘Ä©a MSDOS." - -#: libparted/labels/dos.c:2285 +#: libparted/labels/dos.c:2276 msgid "Parted can't resize partitions managed by Windows Dynamic Disk." msgstr "" "Parted không thể thay đổi kÃch cỡ của phân vùng bị Windows Dynamic Disk quản " "lý." -#: libparted/labels/dos.c:2541 +#: libparted/labels/dos.c:2532 msgid "cannot create any more partitions" -msgstr "không thể tạo phân vùng thêm nữa." +msgstr "không thể tạo phân vùng thêm nữa" #: libparted/labels/dvh.c:183 #, c-format @@ -1253,7 +1255,7 @@ msgstr "Thiết bị đã ghi rõ không phải là má»™t thiết bị DASD hợ #: libparted/labels/fdasd.c:188 msgid "VOLSER not found on device" -msgstr "" +msgstr "VOLSER không tìm thấy trên thiết bị" #: libparted/labels/fdasd.c:191 libparted/labels/vtoc.c:179 msgid "Fatal error" @@ -1265,7 +1267,7 @@ msgstr "Không còn chá»— trống cho nhãn khối tin." #: libparted/labels/fdasd.c:251 msgid "No room for partition info." -msgstr "không có chá»— trống cho thông tin vá» phiên bản." +msgstr "Không có chá»— trống cho thông tin vá» phân vùng." #: libparted/labels/fdasd.c:828 msgid "Invalid VTOC." @@ -1284,9 +1286,8 @@ msgstr "" "khiển DASD “%dâ€!" #: libparted/labels/fdasd.c:1020 -#, fuzzy msgid "Could not retrieve disk size." -msgstr "Không thể lấy thông tin vá» Ä‘Ä©a." +msgstr "Không thể lấy kÃch cỡ Ä‘Ä©a." #: libparted/labels/fdasd.c:1029 msgid "Could not retrieve disk geometry information." @@ -1298,13 +1299,13 @@ msgstr "Không thể lấy thông tin vá» kÃch cỡ khối." #: libparted/labels/fdasd.c:1045 msgid "Disk geometry does not match a DASD device of type 3390." -msgstr "" +msgstr "Cấu trúc hình thể Ä‘Ä©a không khá»›p vá»›i thiết bị DASD của kiểu 3390." -#: libparted/labels/gpt.c:569 +#: libparted/labels/gpt.c:589 msgid "device is too small for GPT" msgstr "thiết bị quá nhá» cho GPT" -#: libparted/labels/gpt.c:771 +#: libparted/labels/gpt.c:791 #, c-format msgid "" "The format of the GPT partition table is version %x, which is newer than " @@ -1313,18 +1314,18 @@ msgstr "" "Äịnh dạng của bảng phân vùng GPT có phiên bản %x, má»›i hÆ¡n so vá»›i phiên bản " "Parted có thể nháºn ra. Xin hãy báo cáo Ä‘iá»u nà y cho chúng tôi biết!" -#: libparted/labels/gpt.c:807 +#: libparted/labels/gpt.c:827 #, c-format msgid "" "Not all of the space available to %s appears to be used, you can fix the GPT " "to use all of the space (an extra %llu blocks) or continue with the current " "setting? " msgstr "" -"Không phải toà n bá»™ sức chứa sẵn sà ng cho %s hình nhÆ° được sá» dụng. NgÆ°á»i " -"dùng có thể sá»a GPT để sá» dụng toà n bá»™ sức chứa (%llu khối bổ sung) hoặc " -"tiếp tục vá»›i thiết láºp hiện thá»i." +"Không phải toà n bá»™ sức chứa sẵn sà ng cho %s hình nhÆ° được sá» dụng, bạn có " +"thể sá»a GPT để sá» dụng toà n bá»™ sức chứa (%llu khối bổ sung) hoặc tiếp tục " +"vá»›i cà i đặt hiện tại? " -#: libparted/labels/gpt.c:1006 +#: libparted/labels/gpt.c:1026 msgid "" "The backup GPT table is not at the end of the disk, as it should be. Fix, " "by moving the backup to the end (and removing the old backup)?" @@ -1332,7 +1333,7 @@ msgstr "" "Bảng GPT sao lÆ°u không nằm tại cuối Ä‘Ä©a nhÆ° yêu cầu. Sá»a bằng cách di chuyển " "phần sao lÆ°u tá»›i cuối (và xóa bá» sao lÆ°u cÅ©)?" -#: libparted/labels/gpt.c:1024 +#: libparted/labels/gpt.c:1044 msgid "" "Both the primary and backup GPT tables are corrupt. Try making a fresh " "table, and using Parted's rescue feature to recover partitions." @@ -1340,7 +1341,7 @@ msgstr "" "Cả bảng GPT chÃnh và sao lÆ°u Ä‘á»u há»ng. Hãy thá» tạo má»™t bảng má»›i, và sá» dụng " "tÃnh năng cứu nguy của Parted để phục hồi các phân vùng." -#: libparted/labels/gpt.c:1035 +#: libparted/labels/gpt.c:1055 msgid "" "The backup GPT table is corrupt, but the primary appears OK, so that will be " "used." @@ -1348,7 +1349,7 @@ msgstr "" "Bảng GPT sao lÆ°u bị há»ng, nhÆ°ng bảng chÃnh hình nhÆ° vẫn tốt, vì thế sẽ sá» " "dụng bảng chÃnh." -#: libparted/labels/gpt.c:1047 +#: libparted/labels/gpt.c:1067 msgid "" "The primary GPT table is corrupt, but the backup appears OK, so that will be " "used." @@ -1356,11 +1357,11 @@ msgstr "" "Bảng GPT chÃnh bị há»ng, nhÆ°ng sao lÆ°u hình nhÆ° vẫn tốt, vì thế sẽ sá» dụng " "sao lÆ°u." -#: libparted/labels/gpt.c:1071 +#: libparted/labels/gpt.c:1091 msgid "primary partition table array CRC mismatch" msgstr "sai khá»›p CRC mảng bảng phân vùng chÃnh" -#: libparted/labels/gpt.c:1655 libparted/labels/gpt.c:1682 +#: libparted/labels/gpt.c:1722 libparted/labels/gpt.c:1749 msgid "failed to translate partition name" msgstr "gặp lá»—i khi dịch tên phân vùng" @@ -1456,7 +1457,7 @@ msgid "" "Partition %d isn't aligned to cylinder boundaries. This is still " "unsupported." msgstr "" -"Phân vùng %d không sắp hà ng vá»›i biên trụ. TrÆ°á»ng hợp nà y vẫn còn không được " +"Phân vùng %d không căn hà ng vá»›i biên trụ. TrÆ°á»ng hợp nà y vẫn còn không được " "há»— trợ." #: libparted/labels/pc98.c:729 @@ -1478,7 +1479,7 @@ msgid "" "starting sector number, %jd exceeds the %s-partition-table-imposed maximum " "of %jd" msgstr "" -"bắt đầu ở số thứ tá»± rãnh ghi, %1$jd vượt quá chiá»u dà i tối Ä‘a %3$jd bị bảng " +"bắt đầu ở số thứ tá»± cung từ, %1$jd vượt quá chiá»u dà i tối Ä‘a %3$jd bị bảng " "phân vùng %2$s ép buá»™c" #: libparted/labels/rdb.c:170 @@ -1655,7 +1656,7 @@ msgstr "Giá trị đầu tối Ä‘a là %d." #: libparted/unit.c:401 #, c-format msgid "The maximum sector value is %d." -msgstr "Giá trị rãnh ghi tối Ä‘a là %d." +msgstr "Giá trị cung từ tối Ä‘a là %d." #: libparted/unit.c:413 libparted/unit.c:565 #, c-format @@ -1733,7 +1734,7 @@ msgid "" "GNU Parted was miscompiled: the FAT boot sector should be 512 bytes. FAT " "support will be disabled." msgstr "" -"GNU Parted bị biên dịch sai: rãnh ghi khởi Ä‘á»™ng FAT nên là 512 byte. Vì thế " +"GNU Parted bị biên dịch sai: cung từ khởi Ä‘á»™ng FAT nên là 512 byte. Vì thế " "tắt há»— trợ FAT." #: libparted/fs/fat/bootsector.c:50 libparted/fs/r/fat/bootsector.c:49 @@ -1743,7 +1744,7 @@ msgstr "Hệ thống táºp tin có chữ ký sai cho hệ thống táºp tin kiá» #: libparted/fs/fat/bootsector.c:58 libparted/fs/r/fat/bootsector.c:57 msgid "File system has an invalid sector size for a FAT file system." msgstr "" -"Hệ thống táºp tin có kÃch thÆ°á»›c rãnh ghi sai cho hệ thống táºp tin kiểu FAT." +"Hệ thống táºp tin có kÃch thÆ°á»›c cung từ sai cho hệ thống táºp tin kiểu FAT." #: libparted/fs/fat/bootsector.c:65 libparted/fs/r/fat/bootsector.c:64 msgid "File system has an invalid cluster size for a FAT file system." @@ -1754,7 +1755,7 @@ msgstr "" msgid "" "File system has an invalid number of reserved sectors for a FAT file system." msgstr "" -"Hệ thống táºp tin có số rãnh ghi dá»± trữ sai cho hệ thống táºp tin kiểu FAT." +"Hệ thống táºp tin có số cung từ dá»± trữ sai cho hệ thống táºp tin kiểu FAT." #: libparted/fs/fat/bootsector.c:79 libparted/fs/r/fat/bootsector.c:78 msgid "File system has an invalid number of FATs." @@ -1771,15 +1772,15 @@ msgstr "" #: libparted/fs/fat/bootsector.c:197 libparted/fs/r/fat/bootsector.c:194 msgid "FAT boot sector says logical sector size is 0. This is weird. " -msgstr "Rãnh ghi khởi Ä‘á»™ng FAT nói kÃch thÆ°á»›c rãnh ghi lô-gÃc là 0. Kỳ lạ. " +msgstr "Cung từ khởi Ä‘á»™ng FAT nói kÃch thÆ°á»›c cung từ lô-gÃc là 0. Kỳ lạ. " #: libparted/fs/fat/bootsector.c:203 libparted/fs/r/fat/bootsector.c:200 msgid "FAT boot sector says there are no FAT tables. This is weird. " -msgstr "Rãnh ghi khởi Ä‘á»™ng FAT nói không có bảng FAT. Kỳ lạ. " +msgstr "Cung từ khởi Ä‘á»™ng FAT nói không có bảng FAT. Kỳ lạ. " #: libparted/fs/fat/bootsector.c:209 libparted/fs/r/fat/bootsector.c:206 msgid "FAT boot sector says clusters are 0 sectors. This is weird. " -msgstr "Rãnh ghi khởi Ä‘á»™ng FAT nói liên cung là 0 rãnh ghi. Kỳ lạ. " +msgstr "Cung từ khởi Ä‘á»™ng FAT nói liên cung là 0 cung từ. Kỳ lạ. " #: libparted/fs/fat/bootsector.c:219 libparted/fs/r/fat/bootsector.c:216 msgid "File system is FAT12, which is unsupported." @@ -1806,8 +1807,8 @@ msgid "" "Parted can't use HFS file systems on disks with a sector size not equal to " "%d bytes." msgstr "" -"Parted không dùng được hệ thống táºp tin HFS trên Ä‘Ä©a có kÃch cỡ rãnh ghi " -"khác %d byte." +"Parted không dùng được hệ thống táºp tin HFS trên Ä‘Ä©a có kÃch cỡ cung từ khác " +"%d byte." #: libparted/fs/r/fat/bootsector.c:145 #, c-format @@ -1830,7 +1831,7 @@ msgid "" "The information sector has the wrong signature (%x). Select cancel for now, " "and send in a bug report. If you're desperate, it's probably safe to ignore." msgstr "" -"Rãnh ghi thông tin có chữ ký sai (%x). Hãy chá»n “Thôiâ€, và gá»i má»™t báo cáo " +"Cung từ thông tin có chữ ký sai (%x). Hãy chá»n “Thôiâ€, và gá»i má»™t báo cáo " "lá»—i. Nếu liá»u lÄ©nh, thì có thể lá» Ä‘i." #: libparted/fs/r/fat/calc.c:134 @@ -1911,7 +1912,7 @@ msgid "" msgstr "" "Hệ thống táºp tin không có kÃch thÆ°á»›c Windows mong đợi. KÃch thÆ°á»›c liên cung " "là %dk (mong đợi %dk); số liên cung là %d (mong đợi %d); kÃch thÆ°á»›c FAT là " -"%d rãnh ghi (mong đợi %d)." +"%d cung từ (mong đợi %d)." #: libparted/fs/r/fat/fat.c:485 #, c-format @@ -2007,7 +2008,7 @@ msgid "" "FAT %d media %x doesn't match the boot sector's media %x. You should " "probably run scandisk." msgstr "" -"FAT %d váºt chứa %x không tÆ°Æ¡ng ứng váºt chứa rãnh ghi khởi Ä‘á»™ng %x. Có thể " +"FAT %d váºt chứa %x không tÆ°Æ¡ng ứng váºt chứa cung từ khởi Ä‘á»™ng %x. Có thể " "cần chạy scandisk." #: libparted/fs/r/fat/table.c:269 @@ -2028,7 +2029,7 @@ msgstr "fat_table_alloc_cluster: không còn liên cung trống" msgid "Could not detect file system." msgstr "Không thể phát hiện hệ thống táºp tin." -#: libparted/fs/r/filesys.c:159 libparted/fs/r/filesys.c:284 +#: libparted/fs/r/filesys.c:159 libparted/fs/r/filesys.c:285 #, c-format msgid "resizing %s file systems is not supported" msgstr "" @@ -2055,17 +2056,17 @@ msgid "" "Trying to register an extent starting at block 0x%X, but another one already " "exists at this position. You should check the file system!" msgstr "" -"Äang cố đăng ký má»™t tầm bắt đầu tại khối 0x%X, nhÆ°ng má»™t tầm khác đã có tại " -"vị trà nà y. NgÆ°á»i dùng cần kiểm tra hệ thống táºp tin." +"Äang cố đăng ký má»™t khu vá»±c bắt đầu tại khối 0x%X, nhÆ°ng má»™t khu vá»±c khác đã " +"có tại vị trà nà y. NgÆ°á»i dùng cần kiểm tra hệ thống táºp tin!" #: libparted/fs/r/hfs/cache.c:214 -#, fuzzy, c-format +#, c-format msgid "" "Trying to move an extent from block 0x%X to block 0x%X, but another one " "already exists at this position. This should not happen!" msgstr "" -"Äang cố di chuyển má»™t tầm từ khối Ox%X sang khối Ox%X, nhÆ°ng má»™t tầm khác đã " -"có tại vị trà nà y. TrÆ°á»ng hợp nà y không nên xảy ra." +"Äang cố di chuyển má»™t khu vá»±c từ khối 0x%X sang khối 0x%X, nhÆ°ng má»™t khu vá»±c " +"khác đã có tại vị trà nà y. TrÆ°á»ng hợp nà y không nên xảy ra!" #: libparted/fs/r/hfs/file.c:143 #, c-format @@ -2080,7 +2081,7 @@ msgstr "Äang thá» Ä‘á»c táºp tin HFS vá»›i CNID %X đằng sau EOF." #: libparted/fs/r/hfs/file.c:190 libparted/fs/r/hfs/file.c:220 #, c-format msgid "Could not find sector %lli of HFS file with CNID %X." -msgstr "Không tìm thấy rãnh ghi %lli của táºp tin HFS vá»›i CNID %X." +msgstr "Không tìm thấy cung từ %lli của táºp tin HFS vá»›i CNID %X." #: libparted/fs/r/hfs/file.c:210 #, c-format @@ -2100,7 +2101,7 @@ msgstr "Äang thá» Ä‘á»c táºp tin HFS+ vá»›i CNID %X đằng sau EOF." #: libparted/fs/r/hfs/file_plus.c:213 libparted/fs/r/hfs/file_plus.c:256 #, c-format msgid "Could not find sector %lli of HFS+ file with CNID %X." -msgstr "Không tìm thấy rãnh ghi %lli của táºp tin HFS+ vá»›i CNID %X." +msgstr "Không tìm thấy cung từ %lli của táºp tin HFS+ vá»›i CNID %X." #: libparted/fs/r/hfs/file_plus.c:245 #, c-format @@ -2135,12 +2136,12 @@ msgstr "Không tìm thấy chữ ký HFS[+X] đúng trong khi mở." #: libparted/fs/r/hfs/hfs.c:422 #, c-format msgid "Version %d of HFS+ isn't supported." -msgstr "Phiên bản %d của HFS+ vẫn không được há»— trợ." +msgstr "Phiên bản %d của HFS+ vẫn chÆ°a được há»— trợ." #: libparted/fs/r/hfs/hfs.c:433 #, c-format msgid "Version %d of HFSX isn't supported." -msgstr "Phiên bản %d của HFSX vẫn không được há»— trợ." +msgstr "Phiên bản %d của HFSX vẫn chÆ°a được há»— trợ." #: libparted/fs/r/hfs/hfs.c:616 msgid "Data relocation left some data at the end of the volume." @@ -2212,7 +2213,6 @@ msgstr "" "Gặp kÃch cỡ sai của khối giao dịch trong khi phát lại nháºt ký (%i byte)." #: libparted/fs/r/hfs/journal.c:260 -#, fuzzy msgid "" "Journal stored outside of the volume are not supported. Try to deactivate " "the journal and run Parted again." @@ -2222,8 +2222,7 @@ msgstr "" #: libparted/fs/r/hfs/journal.c:271 msgid "Journal offset or size is not multiple of the sector size." -msgstr "" -"Hiệu hay kÃch cỡ của nhất ký không phải là bá»™i số cho kÃch cỡ rãnh ghi." +msgstr "Hiệu hay kÃch cỡ của nhất ký không phải là bá»™i số cho kÃch cỡ cung từ." #: libparted/fs/r/hfs/journal.c:292 msgid "Incorrect magic values in the journal header." @@ -2237,15 +2236,15 @@ msgstr "" #: libparted/fs/r/hfs/journal.c:314 msgid "Some header fields are not multiple of the sector size." -msgstr "Má»™t số trÆ°á»ng phần đầu không phải là bá»™i số cho kÃch cỡ rãnh ghi." +msgstr "Má»™t số trÆ°á»ng phần đầu không phải là bá»™i số cho kÃch cỡ cung từ." #: libparted/fs/r/hfs/journal.c:323 msgid "" "The sector size stored in the journal is not 512 bytes. Parted only " "supports 512 bytes length sectors." msgstr "" -"KÃch cỡ rãnh ghi được cất giữ trong nháºt ký không phải là 512 byte. Parted " -"chỉ há»— trợ rãnh ghi có chiá»u dà i 512 byte." +"KÃch cỡ cung từ được cất giữ trong nháºt ký không phải là 512 byte. Parted " +"chỉ há»— trợ cung từ có chiá»u dà i 512 byte." #: libparted/fs/r/hfs/journal.c:335 msgid "Bad journal checksum." @@ -2285,7 +2284,7 @@ msgstr "Khối tin HFS không có táºp tin phân loại. Rất lạ!" #: libparted/fs/r/hfs/reloc.c:479 msgid "This HFS volume has no extents overflow file. This is quite unusual!" -msgstr "Khối tin HFS không có táºp tin trà n tầm. HÆ¡i lạ." +msgstr "Khối tin HFS không có táºp tin trà n mở rá»™ng. HÆ¡i lạ!" #: libparted/fs/r/hfs/reloc.c:522 libparted/fs/r/hfs/reloc_plus.c:670 msgid "" @@ -2313,42 +2312,41 @@ msgstr "Khối tin HFS+ không có táºp tin phần loại. Rất lạ!" #: libparted/fs/r/hfs/reloc_plus.c:620 msgid "This HFS+ volume has no extents overflow file. This is quite unusual!" -msgstr "Khối tin HFS+ không có táºp tin trà n tầm. HÆ¡i lạ." +msgstr "Khối tin HFS+ không có táºp tin trà n mở rá»™ng. HÆ¡i lạ!" -#: parted/parted.c:137 +#: parted/parted.c:138 msgid "displays this help message" msgstr "hiển thị trợ giúp nà y" -#: parted/parted.c:138 +#: parted/parted.c:139 msgid "lists partition layout on all block devices" msgstr "liệt kê bố trà phân vùng trên má»i thiết bị khối" -#: parted/parted.c:139 +#: parted/parted.c:140 msgid "displays machine parseable output" msgstr "hiển thị kết xuất cho máy phân tÃch được" -#: parted/parted.c:140 -#, fuzzy +#: parted/parted.c:141 msgid "displays JSON output" -msgstr "hiển thị kết xuất cho máy phân tÃch được" +msgstr "hiển thị kết xuất JSON" -#: parted/parted.c:141 +#: parted/parted.c:142 msgid "never prompts for user intervention" msgstr "không bao giá» nhắc ngÆ°á»i dùng là m gì" -#: parted/parted.c:142 +#: parted/parted.c:143 msgid "in script mode, fix instead of abort when asked" -msgstr "" +msgstr "trong chế Ä‘á»™ kịch bản, sá»a thay cho bãi bá» khi được há»i" -#: parted/parted.c:143 +#: parted/parted.c:144 msgid "displays the version" msgstr "hiển thị phiên bản" -#: parted/parted.c:144 +#: parted/parted.c:145 msgid "alignment for new partitions" -msgstr "sắp hà ng các phân vùng má»›i" +msgstr "căn hà ng các phân vùng má»›i" -#: parted/parted.c:157 +#: parted/parted.c:158 msgid "" "NUMBER is the partition number used by Linux. On MS-DOS disk labels, the " "primary partitions number from 1 to 4, logical partitions from 5 onwards.\n" @@ -2356,23 +2354,23 @@ msgstr "" "Sá» là số thứ tá»± phân vùng sá» dụng bởi Linux. Trên nhãn Ä‘Ä©a MS-DOS, các phân " "vùng chÃnh có số từ 1 đến 4, và phân vùng lô-gÃc từ 5 trở Ä‘i.\n" -#: parted/parted.c:160 +#: parted/parted.c:161 msgid "LABEL-TYPE is one of: " msgstr "KIỂU_NHÃN là má»™t trong số : " -#: parted/parted.c:161 parted/parted.c:162 +#: parted/parted.c:162 parted/parted.c:163 msgid "FLAG is one of: " msgstr "CỜ là má»™t trong số : " -#: parted/parted.c:163 +#: parted/parted.c:164 msgid "UNIT is one of: " msgstr "ÄÆ N_VỊ là má»™t trong số: " -#: parted/parted.c:164 +#: parted/parted.c:165 msgid "desired alignment: minimum or optimal" -msgstr "sắp hà ng đã muốn: tối thiểu hay quang" +msgstr "căn hà ng đã muốn: tối thiểu hay quang" -#: parted/parted.c:165 +#: parted/parted.c:166 msgid "PART-TYPE is one of: primary, logical, extended\n" msgstr "" "KIỂU_PHẦN là má»™t trong số:\n" @@ -2380,43 +2378,47 @@ msgstr "" " • logical\t\tlô-gÃc\n" " • extended\tmở rá»™ng\n" -#: parted/parted.c:167 +#: parted/parted.c:168 msgid "FS-TYPE is one of: " msgstr "KIỂU_HTTT là má»™t trong số: " -#: parted/parted.c:168 +#: parted/parted.c:169 msgid "" "START and END are disk locations, such as 4GB or 10%. Negative values count " "from the end of the disk. For example, -1s specifies exactly the last " "sector.\n" msgstr "" "ÄẦU và CUá»I là vị trà trên Ä‘Ä©a, v.d. 4GB hay 10%. Giá trị âm đếm từ cuối " -"Ä‘Ä©a. Và dụ, “-1s†chỉ ra chÃnh xác rãnh ghi cuối cùng.\n" +"Ä‘Ä©a. Và dụ, “-1s†chỉ ra chÃnh xác cung từ cuối cùng.\n" -#: parted/parted.c:171 +#: parted/parted.c:172 msgid "" "END is disk location, such as 4GB or 10%. Negative value counts from the " "end of the disk. For example, -1s specifies exactly the last sector.\n" msgstr "" "CUá»I là vị trà trên Ä‘Ä©a, v.d. 4GB hay 10%. Giá trị âm đếm từ cuối Ä‘Ä©a. Và " -"dụ, “-1s†chỉ ra chÃnh xác rãnh ghi cuối cùng.\n" +"dụ, “-1s†chỉ ra chÃnh xác cung từ cuối cùng.\n" -#: parted/parted.c:174 +#: parted/parted.c:175 msgid "STATE is one of: on, off\n" msgstr "" "TÃŒNH_TRẠNG là má»™t trong số:\n" " • on\t\tbáºt\n" " • off\t\ttắt\n" -#: parted/parted.c:175 +#: parted/parted.c:176 msgid "DEVICE is usually /dev/hda or /dev/sda\n" msgstr "THIẾT_BỊ thÆ°á»ng là /dev/hda hoặc /dev/sda\n" -#: parted/parted.c:176 +#: parted/parted.c:177 msgid "NAME is any word you want\n" msgstr "TÊN là bất kỳ từ gì theo ý muốn\n" -#: parted/parted.c:179 +#: parted/parted.c:178 +msgid "TYPE_ID is a value between 0x01 and 0xff, TYPE_UUID is a UUID\n" +msgstr "" + +#: parted/parted.c:182 msgid "" "Copyright (C) 1998 - 2006 Free Software Foundation, Inc.\n" "This program is free software, covered by the GNU General Public License.\n" @@ -2437,22 +2439,22 @@ msgstr "" "Xem Giấy Phép Công Cá»™ng GNU để biết thêm chi tiết.\n" "\n" -#: parted/parted.c:229 +#: parted/parted.c:232 #, c-format msgid "%0.f%%\t(time left %.2d:%.2d)" msgstr "%0.f%%\t(còn lại %.2d:%.2d)" -#: parted/parted.c:248 +#: parted/parted.c:251 #, c-format msgid "Partition %s is being used. Are you sure you want to continue?" msgstr "Phân vùng %s Ä‘ang được dùng. Bạn có thá»±c sá»± muốn tiếp tục không?" -#: parted/parted.c:269 +#: parted/parted.c:272 #, c-format msgid "Partition(s) on %s are being used." msgstr "Phân vùng trên %s Ä‘ang được dùng." -#: parted/parted.c:281 +#: parted/parted.c:284 #, c-format msgid "" "The existing disk label on %s will be destroyed and all data on this disk " @@ -2461,40 +2463,40 @@ msgstr "" "Nhãn Ä‘Ä©a đã tồn tại trên %s sẽ bị hủy và tắt cả các dữ liệu trên Ä‘Ä©a nà y sẽ " "bị mất hoà n toà n. Bạn vẫn còn muốn tiếp tục không?" -#: parted/parted.c:542 +#: parted/parted.c:545 msgid "New disk label type?" msgstr "Kiểu nhãn Ä‘Ä©a má»›i?" -#: parted/parted.c:680 +#: parted/parted.c:692 msgid "Partition type?" msgstr "Kiểu phân vùng?" -#: parted/parted.c:698 parted/parted.c:902 +#: parted/parted.c:710 parted/parted.c:914 msgid "Partition name?" msgstr "Tên phân vùng?" -#: parted/parted.c:708 +#: parted/parted.c:720 msgid "File system type?" msgstr "Kiểu hệ thống táºp tin?" -#: parted/parted.c:713 parted/parted.c:1683 +#: parted/parted.c:725 parted/parted.c:1815 msgid "Start?" msgstr "Äầu?" -#: parted/parted.c:715 parted/parted.c:1685 parted/parted.c:1768 +#: parted/parted.c:727 parted/parted.c:1817 parted/parted.c:1900 msgid "End?" msgstr "Cuối?" -#: parted/parted.c:782 +#: parted/parted.c:794 #, c-format msgid "" "You requested a partition from %s to %s (sectors %llu..%llu).\n" "The closest location we can manage is %s to %s (sectors %llu..%llu).%s" msgstr "" -"NgÆ°á»i dùng đã yêu cầu má»™t phân vùng từ %s đến %s (rãnh ghi %llu..%llu).\n" -"Vùng gần nhất có thể quản lý là %s đến %s (rãnh ghi %llu..%llu).%s" +"NgÆ°á»i dùng đã yêu cầu má»™t phân vùng từ %s đến %s (cung từ %llu..%llu).\n" +"Vùng gần nhất có thể quản lý là %s đến %s (cung từ %llu..%llu).%s" -#: parted/parted.c:791 +#: parted/parted.c:803 msgid "" "\n" "Is this still acceptable to you?" @@ -2502,93 +2504,118 @@ msgstr "" "\n" "Vẫn tốt?" -#: parted/parted.c:814 -#, fuzzy, c-format +#: parted/parted.c:826 +#, c-format msgid "" "The resulting partition is not properly aligned for best performance: %s" -msgstr "Phân vùng kết quả chÆ°a được sắp hà ng cho hiệu suất tốt nhất." +msgstr "Phân vùng kết quả chÆ°a được căn hà ng cho hiệu suất tốt nhất: %s" -#: parted/parted.c:816 parted/parted.c:1925 +#: parted/parted.c:828 parted/parted.c:2057 msgid "unknown (malloc failed)" -msgstr "" +msgstr "chÆ°a biết (malloc gặp lá»—i)" -#: parted/parted.c:894 -#, fuzzy, c-format +#: parted/parted.c:906 +#, c-format msgid "%s disk labels do not support partition name." -msgstr "Nhãn Ä‘Ä©a %s không há»— trợ phiên bản mở rá»™ng." +msgstr "Nhãn Ä‘Ä©a %s không há»— trợ tên phân vùng." -#: parted/parted.c:899 parted/parted.c:1748 parted/parted.c:1814 -#: parted/parted.c:1908 parted/parted.c:1983 +#: parted/parted.c:911 parted/parted.c:955 parted/parted.c:1880 +#: parted/parted.c:1946 parted/parted.c:2040 parted/parted.c:2115 msgid "Partition number?" msgstr "Số thứ tá»± phân vùng?" -#: parted/parted.c:1050 +#: parted/parted.c:949 +#, fuzzy, c-format +msgid "%s disk labels do not support partition type." +msgstr "Nhãn Ä‘Ä©a %s không há»— trợ tên phân vùng." + +#: parted/parted.c:965 +#, fuzzy +msgid "Partition type-id?" +msgstr "Kiểu phân vùng?" + +#: parted/parted.c:972 +#, fuzzy +msgid "Invalid type-id." +msgstr "Con số không hợp lệ." + +#: parted/parted.c:986 +#, fuzzy +msgid "Partition type-uuid?" +msgstr "Kiểu phân vùng?" + +#: parted/parted.c:993 +#, fuzzy +msgid "Invalid type-uuid." +msgstr "Con số không hợp lệ." + +#: parted/parted.c:1146 #, c-format msgid "BIOS cylinder,head,sector geometry: %d,%d,%d. Each cylinder is %s.\n" -msgstr "Dạng hình trụ,đầu,rãnh ghi BIOS: %d,%d,%d. Má»—i trụ là %s.\n" +msgstr "Dạng hình trụ,đầu,cung từ BIOS: %d,%d,%d. Má»—i trụ là %s.\n" -#: parted/parted.c:1137 +#: parted/parted.c:1240 #, c-format msgid "Model: %s (%s)\n" msgstr "Mô hình: %s (%s)\n" -#: parted/parted.c:1139 +#: parted/parted.c:1242 #, c-format msgid "Disk %s: %s\n" msgstr "ÄÄ©a %s: %s\n" -#: parted/parted.c:1140 +#: parted/parted.c:1243 #, c-format msgid "Sector size (logical/physical): %lldB/%lldB\n" -msgstr "KÃch cỡ rãnh ghi (lô-gÃc/váºt lý): %lldB/%lldB\n" +msgstr "KÃch cỡ cung từ (lô-gÃc/váºt lý): %lldB/%lldB\n" -#: parted/parted.c:1152 +#: parted/parted.c:1255 #, c-format msgid "Partition Table: %s\n" msgstr "Bảng Phân Vùng: %s\n" -#: parted/parted.c:1153 +#: parted/parted.c:1256 #, c-format msgid "Disk Flags: %s\n" msgstr "Các cá» của Ä‘Ä©a: %s\n" -#: parted/parted.c:1279 parted/parted.c:1282 +#: parted/parted.c:1388 parted/parted.c:1391 msgid "Number" msgstr "Số" -#: parted/parted.c:1279 parted/parted.c:1282 +#: parted/parted.c:1388 parted/parted.c:1391 msgid "Start" msgstr "Äầu" -#: parted/parted.c:1280 parted/parted.c:1283 +#: parted/parted.c:1389 parted/parted.c:1392 msgid "End" msgstr "Cuối" -#: parted/parted.c:1283 +#: parted/parted.c:1392 msgid "Size" msgstr "KÃch cỡ" -#: parted/parted.c:1287 +#: parted/parted.c:1396 msgid "Type" msgstr "Kiểu" -#: parted/parted.c:1289 +#: parted/parted.c:1398 msgid "File system" msgstr "Hê thống táºp tin" -#: parted/parted.c:1292 +#: parted/parted.c:1401 msgid "Name" msgstr "Tên" -#: parted/parted.c:1294 +#: parted/parted.c:1403 msgid "Flags" msgstr "Cá»" -#: parted/parted.c:1352 +#: parted/parted.c:1461 msgid "Free Space" msgstr "Chá»— trống" -#: parted/parted.c:1570 +#: parted/parted.c:1702 #, c-format msgid "" "A %s %s partition was found at %s -> %s. Do you want to add it to the " @@ -2596,69 +2623,68 @@ msgid "" msgstr "" "Tìm thấy má»™t phân vùng %s %s tại %s -> %s. Thêm nó và o bảng phân vùng?" -#: parted/parted.c:1613 +#: parted/parted.c:1745 msgid "searching for file systems" msgstr "Ä‘ang tìm kiếm hệ thống táºp tin" -#: parted/parted.c:1720 +#: parted/parted.c:1852 msgid "The resize command has been removed in parted 3.0" msgstr "Lệnh resize đã bị gỡ bá» trong parted 3.0" -#: parted/parted.c:1782 +#: parted/parted.c:1914 msgid "" "Shrinking a partition can cause data loss, are you sure you want to continue?" msgstr "" "Co nhá» má»™t phân vùng có thể là m dữ liệu bị mất, bạn có thá»±c sá»± muốn tiếp tục " "không?" -#: parted/parted.c:1838 +#: parted/parted.c:1970 msgid "New device?" msgstr "Thiết bị má»›i?" -#: parted/parted.c:1906 +#: parted/parted.c:2038 msgid "alignment type(min/opt)" -msgstr "cách sắp hà ng (tiểu/quang)" +msgstr "cách căn hà ng (tiểu/quang)" -#: parted/parted.c:1921 +#: parted/parted.c:2053 #, c-format msgid "%d aligned\n" -msgstr "%d đã xếp hà ng\n" +msgstr "%d đã căn chỉnh\n" -#: parted/parted.c:1923 -#, fuzzy, c-format +#: parted/parted.c:2055 +#, c-format msgid "%d not aligned: %s\n" -msgstr "%d chÆ°a xếp hà ng\n" +msgstr "%d chÆ°a căn chỉnh: %s\n" -#: parted/parted.c:1948 parted/parted.c:1985 +#: parted/parted.c:2080 parted/parted.c:2117 msgid "Flag to Invert?" msgstr "Cá» cần đảo ngược?" -#: parted/parted.c:1953 parted/parted.c:1990 +#: parted/parted.c:2085 parted/parted.c:2122 msgid "New state?" msgstr "Tình trạng má»›i?" -#: parted/parted.c:2036 +#: parted/parted.c:2168 msgid "Unit?" msgstr "ÄÆ¡n vị?" -#: parted/parted.c:2171 +#: parted/parted.c:2303 msgid "align-check" msgstr "align-check" -#: parted/parted.c:2174 -#, fuzzy +#: parted/parted.c:2306 msgid "" "align-check TYPE N check partition N for TYPE(min|opt) " "alignment" msgstr "" -"align-check KIỂU N kiểm tra phân vùng Sá» có sắp hà ng " +"align-check KIỂU N kiểm tra phân vùng Sá» có căn hà ng " "KIỂU (min|opt)" -#: parted/parted.c:2182 +#: parted/parted.c:2314 msgid "help" msgstr "trợ giúp" -#: parted/parted.c:2185 +#: parted/parted.c:2317 msgid "" "help [COMMAND] print general help, or help on " "COMMAND" @@ -2666,15 +2692,15 @@ msgstr "" "help [LỆNH] in trợ giúp chung, hoặc trợ giúp " "trên câu LỆNH" -#: parted/parted.c:2191 +#: parted/parted.c:2323 msgid "mklabel" msgstr "tạo nhãn" -#: parted/parted.c:2191 +#: parted/parted.c:2323 msgid "mktable" msgstr "tạo bảng" -#: parted/parted.c:2194 +#: parted/parted.c:2326 msgid "" "mklabel,mktable LABEL-TYPE create a new disklabel (partition " "table)" @@ -2682,15 +2708,15 @@ msgstr "" "mklabel,mktable KIỂU_NHÃN tạo má»™t nhãn Ä‘Ä©a má»›i (bảng phân " "vùng)" -#: parted/parted.c:2200 +#: parted/parted.c:2332 msgid "mkpart" msgstr "tạo phân vùng" -#: parted/parted.c:2203 +#: parted/parted.c:2335 msgid "mkpart PART-TYPE [FS-TYPE] START END make a partition" msgstr "mkpart KIỂU_PV [KIỂU_HTTT] ÄẦU CUá»I tạo má»™t phân vùng" -#: parted/parted.c:2209 +#: parted/parted.c:2341 msgid "" "'mkpart' makes a partition without creating a new file system on the " "partition. FS-TYPE may be specified to set an appropriate partition ID.\n" @@ -2699,31 +2725,30 @@ msgstr "" "vùng đó. Có thể chỉ ra KIỂU_HTTT (kiểu hệ thống táºp tin) để đặt má»™t mã số " "phân vùng thÃch hợp.\n" -#: parted/parted.c:2214 +#: parted/parted.c:2346 msgid "name" msgstr "tên" -#: parted/parted.c:2217 +#: parted/parted.c:2349 msgid "name NUMBER NAME name partition NUMBER as NAME" msgstr "name Sá» TÊN đặt tên phân vùng Sá» là TÊN" -#: parted/parted.c:2222 +#: parted/parted.c:2354 msgid "print" msgstr "in" -#: parted/parted.c:2225 -#, fuzzy +#: parted/parted.c:2357 msgid "" "print [devices|free|list,all] display the partition table, or " "available devices, or free space, or all found partitions" msgstr "" -"print [devices|free|list,all|Sá»] hiển thị phân vùng và :\n" +"print [devices|free|list,all] hiển thị bảng phân vùng, thiết bị sẵn " +"có, hoặc không gian còn trống hoặc là tất cả các phân vùng tìm thấy.\n" " • devices các thiết bị sẵn sà ng\n" " • free chá»— còn trống\n" -" • list,all tất cả các phân vùng tìm thấy\n" -" • Sá» má»™t phân vùng cụ thể" +" • list,all tất cả các phân vùng tìm thấy" -#: parted/parted.c:2229 +#: parted/parted.c:2361 msgid "" "Without arguments, 'print' displays the entire partition table. However with " "the following arguments it performs various other actions.\n" @@ -2731,11 +2756,11 @@ msgstr "" "Khi không có đối số, “print†hiển thị toà n bá»™ bảng phân vùng. Nếu Ä‘Æ°a ra " "các đối số theo sau, thì nó là m má»™t số hà nh vi khác.\n" -#: parted/parted.c:2231 +#: parted/parted.c:2363 msgid " devices : display all active block devices\n" msgstr " devices : hiển thị tất cả các thiết bị khối vẫn hoạt Ä‘á»™ng\n" -#: parted/parted.c:2232 +#: parted/parted.c:2364 msgid "" " free : display information about free unpartitioned space on the " "current block device\n" @@ -2743,26 +2768,26 @@ msgstr "" " free : hiển thị thông tin vá» chá»— còn trống chÆ°a phân vùng trên thiết " "bị khối hiện thá»i\n" -#: parted/parted.c:2234 +#: parted/parted.c:2366 msgid "" " list, all : display the partition tables of all active block devices\n" msgstr "" " list, all : hiển thị các bảng phân vùng của má»i thiết bị khối vẫn hoạt " "Ä‘á»™ng\n" -#: parted/parted.c:2238 +#: parted/parted.c:2370 msgid "quit" msgstr "thoát" -#: parted/parted.c:2241 +#: parted/parted.c:2373 msgid "quit exit program" msgstr "quit thoát khá»i chÆ°Æ¡ng trình" -#: parted/parted.c:2246 +#: parted/parted.c:2378 msgid "rescue" msgstr "cứu" -#: parted/parted.c:2249 +#: parted/parted.c:2381 msgid "" "rescue START END rescue a lost partition near START " "and END" @@ -2770,53 +2795,53 @@ msgstr "" "rescue ÄẦU CUá»I phục hồi má»™t phân vùng đã mất cạnh " "ÄẦU và CUá»I" -#: parted/parted.c:2255 +#: parted/parted.c:2387 msgid "resize" msgstr "đổi cỡ" -#: parted/parted.c:2258 +#: parted/parted.c:2390 msgid "The resize command was removed in parted 3.0\n" msgstr "Lệnh resize đã bị gỡ bá» trong parted 3.0\n" -#: parted/parted.c:2261 +#: parted/parted.c:2393 msgid "resizepart" msgstr "resizepart" -#: parted/parted.c:2264 +#: parted/parted.c:2396 msgid "resizepart NUMBER END resize partition NUMBER" msgstr "resizepart Sá» CUá»I đổi cỡ phân vùng Sá»" -#: parted/parted.c:2269 +#: parted/parted.c:2401 msgid "rm" msgstr "bá»" -#: parted/parted.c:2272 +#: parted/parted.c:2404 msgid "rm NUMBER delete partition NUMBER" msgstr "rm Sá» xóa bá» phân vùng Sá»" -#: parted/parted.c:2277 +#: parted/parted.c:2409 msgid "select" msgstr "chá»n" -#: parted/parted.c:2280 +#: parted/parted.c:2412 msgid "select DEVICE choose the device to edit" msgstr "select THIẾT_BỊ chá»n thiết bị cần sá»a" -#: parted/parted.c:2285 +#: parted/parted.c:2417 msgid "disk_set" msgstr "disk_set" -#: parted/parted.c:2288 +#: parted/parted.c:2420 msgid "" "disk_set FLAG STATE change the FLAG on selected device" msgstr "" "disk_set TRẠNG_THÃI_CỜ thay đổi CỜ trên thiết bị đã chá»n" -#: parted/parted.c:2293 +#: parted/parted.c:2425 msgid "disk_toggle" msgstr "disk_toggle" -#: parted/parted.c:2296 +#: parted/parted.c:2428 msgid "" "disk_toggle [FLAG] toggle the state of FLAG on " "selected device" @@ -2824,20 +2849,20 @@ msgstr "" "disk_toggle [CỜ] báºt/tắt tình trạng của CỜ trên " "thiết bị đã chá»n" -#: parted/parted.c:2302 +#: parted/parted.c:2434 msgid "set" msgstr "đặt" -#: parted/parted.c:2305 +#: parted/parted.c:2437 msgid "" "set NUMBER FLAG STATE change the FLAG on partition NUMBER" msgstr "set Sá» CỜ TÃŒNH TRẠNG thay đổi CỜ trên phân vùng Sá»" -#: parted/parted.c:2311 +#: parted/parted.c:2443 msgid "toggle" msgstr "báºt/tắt" -#: parted/parted.c:2314 +#: parted/parted.c:2446 msgid "" "toggle [NUMBER [FLAG]] toggle the state of FLAG on " "partition NUMBER" @@ -2845,20 +2870,30 @@ msgstr "" "toggle [Sá» [CỜ]] báºt/tắt tình trạng của CỜ trên phân " "vùng Sá»" -#: parted/parted.c:2320 +#: parted/parted.c:2452 +msgid "type" +msgstr "" + +#: parted/parted.c:2455 +msgid "" +"type NUMBER TYPE-ID or TYPE-UUID type set TYPE-ID or TYPE-UUID of " +"partition NUMBER" +msgstr "" + +#: parted/parted.c:2460 msgid "unit" msgstr "Ä‘Æ¡n vị" -#: parted/parted.c:2323 +#: parted/parted.c:2463 msgid "unit UNIT set the default unit to UNIT" msgstr "" "unit ÄÆ N_VỊ đặt Ä‘Æ¡n vị mặc định thà nh ÄÆ N_VỊ" -#: parted/parted.c:2328 +#: parted/parted.c:2468 msgid "version" msgstr "phiên bản" -#: parted/parted.c:2331 +#: parted/parted.c:2471 msgid "" "version display the version number and " "copyright information of GNU Parted" @@ -2866,7 +2901,7 @@ msgstr "" "version hiển thị số thứ tá»± phiên bản và " "thông tin tác quyá»n vá» GNU Parted" -#: parted/parted.c:2335 +#: parted/parted.c:2475 msgid "" "'version' displays copyright and version information corresponding to this " "copy of GNU Parted\n" @@ -2874,22 +2909,23 @@ msgstr "" "“version†hiển thị thông tin vá» tác quyá»n và phiên bản tÆ°Æ¡ng ứng vá»›i bản sao " "GNU Parted nà y\n" -#: parted/parted.c:2405 -#, fuzzy, c-format +#: parted/parted.c:2545 +#, c-format msgid "Usage: %s [-hlmsfv] [-a<align>] [DEVICE [COMMAND [PARAMETERS]]...]\n" -msgstr "Cách dùng: %s [-hlmsv] [-a<sắp_hà ng>] [THIẾT_BỊ [LỆNH [THAM_Sá»]]...]\n" +msgstr "" +"Cách dùng: %s [-hlmsfv] [-a<sắp_hà ng>] [THIẾT_BỊ [LỆNH [THAM_Sá»]]...]\n" -#: parted/parted.c:2449 +#: parted/parted.c:2589 msgid "No device found" msgstr "Không tìm thấy thiết bị" -#: parted/parted.c:2486 +#: parted/parted.c:2626 msgid "WARNING: You are not superuser. Watch out for permissions.\n" msgstr "" "CẢNH BÃO: bạn không phải là siêu ngÆ°á»i dùng. Hãy để ý đến các quyá»n truy " "cáºp.\n" -#: parted/parted.c:2519 +#: parted/parted.c:2659 msgid "" "You should reinstall your boot loader before rebooting. Read section 4 of " "the Parted User documentation for more information." @@ -2897,7 +2933,7 @@ msgstr "" "Cần cà i đặt lại trình khởi Ä‘á»™ng trÆ°á»›c khi khởi Ä‘á»™ng lại. Hãy Ä‘á»c phần 4 của " "tà i liệu hÆ°á»›ng dẫn NgÆ°á»i dùng Parted để biết thêm chi tiết." -#: parted/parted.c:2526 +#: parted/parted.c:2666 msgid "You may need to update /etc/fstab.\n" msgstr "Có thể cần cáºp nháºt táºp tin “/etc/fstabâ€.\n" @@ -3147,7 +3183,7 @@ msgid "" "Error: ILL_BADSTK (Internal Stack Error)" msgstr "" "\n" -"Lá»—i: ILL_BADSTK (Lá»—i đống ná»™i bá»™)" +"Lá»—i: ILL_BADSTK (Lá»—i ngăn xếp ná»™i bá»™)" #: parted/ui.c:495 msgid "" @@ -3157,69 +3193,69 @@ msgstr "" "\n" "Lá»—i: gặp má»™t tÃn hiệu SIGILL chung." -#: parted/ui.c:901 +#: parted/ui.c:904 #, c-format msgid "invalid token: %s" msgstr "hiệu bà i sai: %s" -#: parted/ui.c:1082 +#: parted/ui.c:1085 msgid "Expecting a partition number." msgstr "Mong đợi số thứ tá»± phân vùng." -#: parted/ui.c:1091 +#: parted/ui.c:1094 msgid "Partition doesn't exist." msgstr "Phân vùng không tồn tại." -#: parted/ui.c:1111 +#: parted/ui.c:1114 msgid "Expecting a file system type." msgstr "Cần kiểu hệ thống táºp tin." -#: parted/ui.c:1118 +#: parted/ui.c:1121 #, c-format msgid "Unknown file system type \"%s\"." msgstr "Không rõ kiểu hệ thống táºp tin “%sâ€." -#: parted/ui.c:1139 +#: parted/ui.c:1142 msgid "Expecting a disk label type." msgstr "Mong đợi kiểu nhãn Ä‘Ä©a." -#: parted/ui.c:1170 parted/ui.c:1206 +#: parted/ui.c:1173 parted/ui.c:1209 msgid "No flags supported" -msgstr "" +msgstr "Không há»— trợ cá» nà o" -#: parted/ui.c:1280 +#: parted/ui.c:1283 msgid "Can't create any more partitions." msgstr "Không thể tạo phân vùng thêm nữa." -#: parted/ui.c:1290 +#: parted/ui.c:1293 msgid "Expecting a partition type." msgstr "Cần má»™t kiểu phân vùng." -#: parted/ui.c:1439 +#: parted/ui.c:1442 msgid "on" msgstr "báºt" -#: parted/ui.c:1440 +#: parted/ui.c:1443 msgid "off" msgstr "tắt" -#: parted/ui.c:1457 +#: parted/ui.c:1460 msgid "optimal" msgstr "tối Æ°u" -#: parted/ui.c:1458 +#: parted/ui.c:1461 msgid "minimal" msgstr "tối thiểu" -#: parted/ui.c:1591 +#: parted/ui.c:1594 msgid "OPTIONs:" msgstr "TÙY CHỌN:" -#: parted/ui.c:1596 +#: parted/ui.c:1599 msgid "COMMANDs:" msgstr "LỆNH:" -#: parted/ui.c:1599 +#: parted/ui.c:1602 #, c-format msgid "" "\n" @@ -3227,46 +3263,47 @@ msgid "" msgstr "" "\n" "Gá»i báo cáo lá»—i tá»›i %s\n" -"Thông báo lá»—i dịch cho: <http://translationproject.org/team/vi.html>.\n" +"Thông báo lá»—i dịch cho: <https://translationproject.org/team/vi.html>.\n" -#: parted/ui.c:1606 +#: parted/ui.c:1609 #, c-format msgid "Using %s\n" msgstr "Dùng %s\n" -#: parted/ui.c:1686 +#: parted/ui.c:1689 msgid "This command does not make sense in non-interactive mode.\n" msgstr "Câu lệnh nà y không có ý nghÄ©a trong chế Ä‘á»™ không tÆ°Æ¡ng tác.\n" -#, c-format +#~ msgid "Extended partitions cannot be hidden on msdos disk labels." +#~ msgstr "Phân vùng mở rá»™ng không thể bị ẩn trên nhãn Ä‘Ä©a MSDOS." + +#~ msgid "" +#~ "Extended partitions cannot be recovery partitions on msdos disk labels." +#~ msgstr "" +#~ "Phân vùng mở rá»™ng không thể được khôi phục các phân vùng trên nhãn Ä‘Ä©a " +#~ "MSDOS." + #~ msgid "%s: option '--%s' doesn't allow an argument\n" #~ msgstr "%s: tùy chá»n “--%s†không cho phép đối số\n" -#, c-format #~ msgid "%s: unrecognized option '--%s'\n" #~ msgstr "%s: không nháºn ra tùy chá»n “--%sâ€\n" -#, c-format #~ msgid "%s: option '-W %s' doesn't allow an argument\n" #~ msgstr "%s: tùy chá»n “-W %s†không cho phép đối số\n" -#, c-format #~ msgid "%s: option '-W %s' requires an argument\n" #~ msgstr "%s: tùy chá»n “-W %s†yêu cầu má»™t đối số\n" -#, c-format #~ msgid "%s home page: <http://www.gnu.org/software/%s/>\n" #~ msgstr "Trang chủ %s: <http://www.gnu.org/software/%s/>\n" -#, c-format #~ msgid "invalid %s%s argument '%s'" #~ msgstr "đối số %s%s không hợp lệ “%sâ€" -#, c-format #~ msgid "invalid suffix in %s%s argument '%s'" #~ msgstr "gặp háºu tố không hợp lệ trong %s%s đối số “%sâ€" -#, c-format #~ msgid "%s%s argument '%s' too large" #~ msgstr "%s%s đối số “%s†quá lá»›n" @@ -3286,7 +3323,6 @@ msgstr "Câu lệnh nà y không có ý nghÄ©a trong chế Ä‘á»™ không tÆ°Æ¡ng t #~ "khởi Ä‘á»™ng từ đó. Hãy Ä‘á»c phần 4 của tà i liệu hÆ°á»›ng dẫn NgÆ°á»i dùng Parted " #~ "để biết thêm chi tiết." -#, c-format #~ msgid "" #~ "The partition table on %s cannot be re-read (%s). This means the Hurd " #~ "knows nothing about any modifications you made. You should reboot your " @@ -3299,7 +3335,6 @@ msgstr "Câu lệnh nà y không có ý nghÄ©a trong chế Ä‘á»™ không tÆ°Æ¡ng t #~ msgid "The boot region doesn't start at the start of the partition." #~ msgstr "Vùng khởi Ä‘á»™ng không bắt đầu ở đầu của phân vùng." -#, c-format #~ msgid "" #~ "This file system has a logical sector size of %d. GNU Parted is known " #~ "not to work properly with sector sizes other than 512 bytes." @@ -3307,7 +3342,6 @@ msgstr "Câu lệnh nà y không có ý nghÄ©a trong chế Ä‘á»™ không tÆ°Æ¡ng t #~ "Hệ thống táºp tin có kÃch thÆ°á»›c rãnh ghi lô-gÃc là %d. GNU Parted không " #~ "là m việc chÃnh xác vá»›i kÃch thÆ°á»›c rãnh ghi khác 512 byte." -#, c-format #~ msgid "" #~ "The file %s is marked as a system file. This means moving it could cause " #~ "some programs to stop working." diff --git a/po/zh_CN.gmo b/po/zh_CN.gmo Binary files differindex d8c7cad..4f5498d 100644 --- a/po/zh_CN.gmo +++ b/po/zh_CN.gmo diff --git a/po/zh_CN.po b/po/zh_CN.po index da4b1de..52e69ac 100644 --- a/po/zh_CN.po +++ b/po/zh_CN.po @@ -12,7 +12,7 @@ msgid "" msgstr "" "Project-Id-Version: parted 3.4.64.2\n" "Report-Msgid-Bugs-To: bug-parted@gnu.org\n" -"POT-Creation-Date: 2022-04-18 14:44-0400\n" +"POT-Creation-Date: 2023-04-10 15:50-0700\n" "PO-Revision-Date: 2022-04-11 14:14+0800\n" "Last-Translator: Wenbin Lv <wenbin816@gmail.com>\n" "Language-Team: Chinese (simplified) <i18n-zh@googlegroups.com>\n" @@ -23,25 +23,25 @@ msgstr "" "X-Bugs: Report translation errors to the Language-Team address.\n" "X-Generator: Poedit 3.0.1\n" -#: lib/argmatch.c:147 +#: lib/argmatch.c:145 #, c-format msgid "invalid argument %s for %s" msgstr "æ— æ•ˆçš„å‚æ•° %s 被用于 %s" -#: lib/argmatch.c:148 +#: lib/argmatch.c:146 #, c-format msgid "ambiguous argument %s for %s" msgstr "模糊的å‚æ•° %s 被用于 %s" -#: lib/argmatch.c:167 lib/argmatch.h:238 +#: lib/argmatch.c:165 lib/argmatch.h:237 msgid "Valid arguments are:" msgstr "有效的å‚数是：" -#: lib/closeout.c:122 libparted/labels/fdasd.c:145 +#: lib/closeout.c:121 libparted/labels/fdasd.c:145 msgid "write error" msgstr "写入错误" -#: lib/error.c:195 +#: lib/error.c:193 msgid "Unknown system error" msgstr "未知的系统错误" @@ -101,11 +101,11 @@ msgstr "%s：选项需è¦ä¸€ä¸ªå‚æ•° --“%câ€\n" #. If you don't know what to put here, please see #. <https://en.wikipedia.org/wiki/Quotation_marks_in_other_languages> #. and use glyphs suitable for your language. -#: lib/quotearg.c:355 +#: lib/quotearg.c:354 msgid "`" msgstr "“" -#: lib/quotearg.c:356 +#: lib/quotearg.c:355 msgid "'" msgstr "â€" @@ -187,7 +187,7 @@ msgstr "æ— å‰ä¸€ä¸ªæ£åˆ™è¡¨è¾¾å¼" #. To enquire the regular expression that your system uses for this #. purpose, you can use the command #. locale -k LC_MESSAGES | grep '^yesexpr=' -#: lib/rpmatch.c:150 +#: lib/rpmatch.c:149 msgid "^[yY]" msgstr "^[yY是]" @@ -198,7 +198,7 @@ msgstr "^[yY是]" #. To enquire the regular expression that your system uses for this #. purpose, you can use the command #. locale -k LC_MESSAGES | grep '^noexpr=' -#: lib/rpmatch.c:163 +#: lib/rpmatch.c:162 msgid "^[nN]" msgstr "^[nNä¸å¦]" @@ -742,157 +742,161 @@ msgstr "pmbr_boot" msgid "Unknown disk flag, %d." msgstr "未知的ç£ç›˜æ——æ ‡ï¼Œ%d。" -#: libparted/disk.c:1289 +#: libparted/disk.c:1320 #, c-format msgid "%s disk labels do not support extended partitions." msgstr "%s ç£ç›˜å·æ ‡ä¸æ”¯æŒæ‰©å±•åˆ†åŒºã€‚" -#: libparted/disk.c:1821 +#: libparted/disk.c:1990 #, c-format msgid "%s disk labels don't support logical or extended partitions." msgstr "%s ç£ç›˜å·æ ‡ä¸æ”¯æŒé€»è¾‘或扩展分区。" -#: libparted/disk.c:1834 +#: libparted/disk.c:2003 msgid "Too many primary partitions." msgstr "主分区过多。" -#: libparted/disk.c:1843 +#: libparted/disk.c:2012 #, c-format msgid "" "Can't add a logical partition to %s, because there is no extended partition." msgstr "ç”±äºŽæ²¡æœ‰æ‰©å±•åˆ†åŒºï¼Œæ— æ³•å°†é€»è¾‘åˆ†åŒºæ·»åŠ åˆ° %s。" -#: libparted/disk.c:1867 +#: libparted/disk.c:2036 #, c-format msgid "Can't have more than one extended partition on %s." msgstr "%s 上ä¸èƒ½å«æœ‰å¤šäºŽä¸€ä¸ªçš„拓展分区。" -#: libparted/disk.c:1877 +#: libparted/disk.c:2046 msgid "Can't have logical partitions outside of the extended partition." msgstr "逻辑分区ä¸èƒ½å¤„于扩展分区之外。" -#: libparted/disk.c:1902 +#: libparted/disk.c:2071 #, c-format msgid "Can't have a logical partition outside of the extended partition on %s." msgstr "%s 上的逻辑分区ä¸èƒ½å¤„于扩展分区之外。" -#: libparted/disk.c:1912 +#: libparted/disk.c:2081 msgid "Can't have a primary partition inside an extended partition." msgstr "扩展分区ä¸ä¸èƒ½å«æœ‰ä¸»åˆ†åŒºã€‚" -#: libparted/disk.c:1921 +#: libparted/disk.c:2090 msgid "Can't have a partition outside the disk!" msgstr "æ— æ³•è®©åˆ†åŒºè¶…å‡ºç£ç›˜ï¼" -#: libparted/disk.c:1972 libparted/disk.c:2150 +#: libparted/disk.c:2141 libparted/disk.c:2319 msgid "Can't have overlapping partitions." msgstr "分区ä¸èƒ½é‡å 。" -#: libparted/disk.c:2351 +#: libparted/disk.c:2520 msgid "metadata" msgstr "元数æ®" -#: libparted/disk.c:2353 +#: libparted/disk.c:2522 msgid "free" msgstr "空闲" -#: libparted/disk.c:2355 parted/ui.c:1271 parted/ui.c:1299 +#: libparted/disk.c:2524 parted/ui.c:1274 parted/ui.c:1302 msgid "extended" msgstr "扩展" -#: libparted/disk.c:2357 parted/ui.c:1275 parted/ui.c:1303 +#: libparted/disk.c:2526 parted/ui.c:1278 parted/ui.c:1306 msgid "logical" msgstr "逻辑" -#: libparted/disk.c:2359 parted/ui.c:1267 parted/ui.c:1295 +#: libparted/disk.c:2528 parted/ui.c:1270 parted/ui.c:1298 msgid "primary" msgstr "主分区" -#: libparted/disk.c:2375 +#: libparted/disk.c:2544 msgid "boot" msgstr "å¯åŠ¨" -#: libparted/disk.c:2377 +#: libparted/disk.c:2546 msgid "bios_grub" msgstr "bios_grub" -#: libparted/disk.c:2379 +#: libparted/disk.c:2548 msgid "root" msgstr "æ ¹" -#: libparted/disk.c:2381 +#: libparted/disk.c:2550 msgid "swap" msgstr "交æ¢" -#: libparted/disk.c:2383 +#: libparted/disk.c:2552 msgid "hidden" msgstr "éšè—" -#: libparted/disk.c:2385 +#: libparted/disk.c:2554 msgid "raid" msgstr "raid" -#: libparted/disk.c:2387 +#: libparted/disk.c:2556 msgid "lvm" msgstr "lvm" -#: libparted/disk.c:2389 +#: libparted/disk.c:2558 msgid "lba" msgstr "lba" -#: libparted/disk.c:2391 +#: libparted/disk.c:2560 msgid "hp-service" msgstr "hp-æœåŠ¡" -#: libparted/disk.c:2393 +#: libparted/disk.c:2562 msgid "palo" msgstr "palo" -#: libparted/disk.c:2395 +#: libparted/disk.c:2564 msgid "prep" msgstr "prep" -#: libparted/disk.c:2397 +#: libparted/disk.c:2566 msgid "msftres" msgstr "msftres" -#: libparted/disk.c:2399 +#: libparted/disk.c:2568 msgid "msftdata" msgstr "msftdata" -#: libparted/disk.c:2401 +#: libparted/disk.c:2570 msgid "atvrecv" msgstr "atvrecv" -#: libparted/disk.c:2403 +#: libparted/disk.c:2572 msgid "diag" msgstr "诊æ–" -#: libparted/disk.c:2405 +#: libparted/disk.c:2574 msgid "legacy_boot" msgstr "旧版å¯åŠ¨" -#: libparted/disk.c:2407 +#: libparted/disk.c:2576 msgid "irst" msgstr "irst" -#: libparted/disk.c:2409 +#: libparted/disk.c:2578 msgid "esp" msgstr "esp" -#: libparted/disk.c:2411 +#: libparted/disk.c:2580 msgid "chromeos_kernel" msgstr "chromeos_kernel" -#: libparted/disk.c:2413 +#: libparted/disk.c:2582 msgid "bls_boot" msgstr "bls_boot" -#: libparted/disk.c:2415 +#: libparted/disk.c:2584 msgid "linux-home" msgstr "linux-home" -#: libparted/disk.c:2421 +#: libparted/disk.c:2586 +msgid "no_automount" +msgstr "" + +#: libparted/disk.c:2592 #, c-format msgid "Unknown partition flag, %d." msgstr "æœªçŸ¥çš„åˆ†åŒºæ——æ ‡ï¼Œ%d。" @@ -1077,8 +1081,8 @@ msgstr "" "则为 2）。" #: libparted/labels/atari.c:1662 libparted/labels/bsd.c:563 -#: libparted/labels/dasd.c:895 libparted/labels/dos.c:2303 -#: libparted/labels/dvh.c:770 libparted/labels/gpt.c:1769 +#: libparted/labels/dasd.c:893 libparted/labels/dos.c:2294 +#: libparted/labels/dvh.c:770 libparted/labels/gpt.c:1891 #: libparted/labels/loop.c:244 libparted/labels/mac.c:1409 #: libparted/labels/pc98.c:697 libparted/labels/rdb.c:1054 #: libparted/labels/sun.c:781 @@ -1102,37 +1106,29 @@ msgstr "æ— æ³•åˆ†é…分区编å·ã€‚" msgid "Unable to allocate a bsd disklabel slot." msgstr "æ— æ³•å®šä½ bsd ç£ç›˜å·æ ‡æ§½ã€‚" -#: libparted/labels/dasd.c:626 +#: libparted/labels/dasd.c:634 msgid "The partition table of DASD-LDL device cannot be changed.\n" msgstr "æ— æ³•æ›´æ”¹ DASD-LDL 设备的分区表。\n" -#: libparted/labels/dasd.c:921 +#: libparted/labels/dasd.c:919 msgid "Unable to allocate a dasd disklabel slot" msgstr "æ— æ³•åˆ†é… dasd ç£ç›˜å·æ ‡æ§½" -#: libparted/labels/dos.c:1008 +#: libparted/labels/dos.c:1159 #, c-format msgid "Invalid partition table on %s -- wrong signature %x." msgstr "%s ä¸Šçš„åˆ†åŒºè¡¨æ— æ•ˆ - 错误的ç¾å %x。" -#: libparted/labels/dos.c:1036 +#: libparted/labels/dos.c:1187 #, c-format msgid "Invalid partition table - recursive partition on %s." msgstr "æ— æ•ˆçš„åˆ†åŒºè¡¨ - %s 出现递归分区。" -#: libparted/labels/dos.c:1567 -msgid "Extended partitions cannot be hidden on msdos disk labels." -msgstr "æ‹“å±•åˆ†åŒºæ— æ³•éšè—且使用 msdos ç£ç›˜å·æ ‡ã€‚" - -#: libparted/labels/dos.c:1579 -msgid "Extended partitions cannot be recovery partitions on msdos disk labels." -msgstr "拓展分区ä¸èƒ½æ˜¯ä½¿ç”¨ msdos ç£ç›˜å·æ ‡çš„æ¢å¤åˆ†åŒºã€‚" - -#: libparted/labels/dos.c:2285 +#: libparted/labels/dos.c:2276 msgid "Parted can't resize partitions managed by Windows Dynamic Disk." msgstr "Parted æ— æ³•æ”¹å˜ç”±â€œWindows 动æ€ç£ç›˜â€æ‰€ç®¡ç†çš„分区大å°ã€‚" -#: libparted/labels/dos.c:2541 +#: libparted/labels/dos.c:2532 msgid "cannot create any more partitions" msgstr "æ— æ³•å†åˆ›å»ºä»»ä½•åˆ†åŒº" @@ -1272,11 +1268,11 @@ msgstr "æ— æ³•èŽ·å–区å—大å°ä¿¡æ¯ã€‚" msgid "Disk geometry does not match a DASD device of type 3390." msgstr "ç£ç›˜å‡ 何ä½ç½®ä¿¡æ¯ä¸Žç±»åž‹ä¸º 3390 çš„ DASD 设备ä¸åŒ¹é…。" -#: libparted/labels/gpt.c:569 +#: libparted/labels/gpt.c:589 msgid "device is too small for GPT" msgstr "设备对 GPT æ¥è¯´å¤ªå°" -#: libparted/labels/gpt.c:771 +#: libparted/labels/gpt.c:791 #, c-format msgid "" "The format of the GPT partition table is version %x, which is newer than " @@ -1284,7 +1280,7 @@ msgid "" msgstr "" "GPT åˆ†åŒºè¡¨çš„æ ¼å¼ç‰ˆæœ¬ä¸º %x，它比 Parted 所能辨识的版本è¦æ–°ã€‚请报告这个状况ï¼" -#: libparted/labels/gpt.c:807 +#: libparted/labels/gpt.c:827 #, c-format msgid "" "Not all of the space available to %s appears to be used, you can fix the GPT " @@ -1294,7 +1290,7 @@ msgstr "" "并éžæ‰€æœ‰å¯ç”¨äºŽ %s 的空间都被用到了，您å¯ä»¥ä¿®æ£ GPT 以使用所有的空间 (é¢å¤–çš„ " "%llu 个区å—)，还是说è¦ç»§ç»ä½¿ç”¨ç›®å‰çš„设置？" -#: libparted/labels/gpt.c:1006 +#: libparted/labels/gpt.c:1026 msgid "" "The backup GPT table is not at the end of the disk, as it should be. Fix, " "by moving the backup to the end (and removing the old backup)?" @@ -1302,7 +1298,7 @@ msgstr "" "备份 GPT 分区表ä¸å¦‚å®ƒåº”å½“çš„é‚£æ ·åœ¨ç£ç›˜æœ«ç«¯ã€‚è¦é€šè¿‡ç§»åŠ¨è¿‡åŽ»ï¼ˆå¹¶ä¸”åˆ é™¤æ—§å¤‡ä»½ï¼‰çš„" "æ–¹å¼ä¿®å¤å—？" -#: libparted/labels/gpt.c:1024 +#: libparted/labels/gpt.c:1044 msgid "" "Both the primary and backup GPT tables are corrupt. Try making a fresh " "table, and using Parted's rescue feature to recover partitions." @@ -1310,23 +1306,23 @@ msgstr "" "主 GPT 和备份 GPT 都æŸå了。试ç€åˆ›å»ºæ–°è¡¨ï¼Œç„¶åŽä½¿ç”¨ Parted 的急救功能以修å¤åˆ†" "区表。" -#: libparted/labels/gpt.c:1035 +#: libparted/labels/gpt.c:1055 msgid "" "The backup GPT table is corrupt, but the primary appears OK, so that will be " "used." msgstr "备份 GPT 表æŸå，但主表似乎是æ£ç¡®çš„，所以使用备份。" -#: libparted/labels/gpt.c:1047 +#: libparted/labels/gpt.c:1067 msgid "" "The primary GPT table is corrupt, but the backup appears OK, so that will be " "used." msgstr "主 GPT 表æŸå，但备份似乎是æ£ç¡®çš„，所以使用备份。" -#: libparted/labels/gpt.c:1071 +#: libparted/labels/gpt.c:1091 msgid "primary partition table array CRC mismatch" msgstr "主分区表的数组循环冗余检查 (CRC) 值ä¸åŒ¹é…" -#: libparted/labels/gpt.c:1655 libparted/labels/gpt.c:1682 +#: libparted/labels/gpt.c:1722 libparted/labels/gpt.c:1749 msgid "failed to translate partition name" msgstr "未能转æ¢åˆ†åŒºå称" @@ -1953,7 +1949,7 @@ msgstr "fat_table_alloc_cluster：没有空闲簇" msgid "Could not detect file system." msgstr "æ— æ³•æ£€æµ‹æ–‡ä»¶ç³»ç»Ÿã€‚" -#: libparted/fs/r/filesys.c:159 libparted/fs/r/filesys.c:284 +#: libparted/fs/r/filesys.c:159 libparted/fs/r/filesys.c:285 #, c-format msgid "resizing %s file systems is not supported" msgstr "ä¸æ”¯æŒè°ƒæ•´ %s 文件系统大å°" @@ -2218,39 +2214,39 @@ msgstr "这个 HFS+ å·æ²¡æœ‰ä»»ä½•ç±»åˆ«æ–‡ä»¶ã€‚这是很ä¸å¯»å¸¸çš„ï¼" msgid "This HFS+ volume has no extents overflow file. This is quite unusual!" msgstr "这个 HFS+ å·æ²¡æœ‰ä»»ä½•å»¶ä¼¸æº¢å‡ºæ–‡ä»¶ã€‚这是相当ä¸å¯»å¸¸çš„ï¼" -#: parted/parted.c:137 +#: parted/parted.c:138 msgid "displays this help message" msgstr "显示æ¤æ±‚助信æ¯" -#: parted/parted.c:138 +#: parted/parted.c:139 msgid "lists partition layout on all block devices" msgstr "列出所有å—设备的分区é…ç½®" -#: parted/parted.c:139 +#: parted/parted.c:140 msgid "displays machine parseable output" msgstr "显示机器å¯è§£æžçš„输出" -#: parted/parted.c:140 +#: parted/parted.c:141 msgid "displays JSON output" msgstr "显示 JSON 输出" -#: parted/parted.c:141 +#: parted/parted.c:142 msgid "never prompts for user intervention" msgstr "从ä¸æ示用户" -#: parted/parted.c:142 +#: parted/parted.c:143 msgid "in script mode, fix instead of abort when asked" msgstr "处于脚本模å¼æ—¶ï¼Œéœ€è¦è¯¢é—®æ—¶å°è¯•ä¿®å¤è€Œéžä¸æ¢æ‰§è¡Œ" -#: parted/parted.c:143 +#: parted/parted.c:144 msgid "displays the version" msgstr "显示版本" -#: parted/parted.c:144 +#: parted/parted.c:145 msgid "alignment for new partitions" msgstr "新分区的对é½" -#: parted/parted.c:157 +#: parted/parted.c:158 msgid "" "NUMBER is the partition number used by Linux. On MS-DOS disk labels, the " "primary partitions number from 1 to 4, logical partitions from 5 onwards.\n" @@ -2258,31 +2254,31 @@ msgstr "" "NUMBER 是 Linux 使用的分区编å·ã€‚在 MS-DOS ç£ç›˜å·æ ‡ä¸ï¼Œä¸»åˆ†åŒºç¼–å·ä¸º 1 - 4，逻" "辑分区从 5 开始。\n" -#: parted/parted.c:160 +#: parted/parted.c:161 msgid "LABEL-TYPE is one of: " msgstr "“å·æ ‡ç±»åž‹â€æ˜¯ä»¥ä¸‹ä»»æ„一项：" -#: parted/parted.c:161 parted/parted.c:162 +#: parted/parted.c:162 parted/parted.c:163 msgid "FLAG is one of: " msgstr "â€œæ ‡å¿—â€æ˜¯ä»¥ä¸‹ä»»æ„一项：" -#: parted/parted.c:163 +#: parted/parted.c:164 msgid "UNIT is one of: " msgstr "UNIT 是以下任æ„一项：" -#: parted/parted.c:164 +#: parted/parted.c:165 msgid "desired alignment: minimum or optimal" msgstr "预想获得的对é½ï¼šæœ€å°æˆ–最佳化" -#: parted/parted.c:165 +#: parted/parted.c:166 msgid "PART-TYPE is one of: primary, logical, extended\n" msgstr "“分区类型â€æ˜¯ä¸»åˆ†åŒºã€é€»è¾‘分区ã€æ‰©å±•åˆ†åŒºä¹‹ä¸€\n" -#: parted/parted.c:167 +#: parted/parted.c:168 msgid "FS-TYPE is one of: " msgstr "“文件系统类型â€æ˜¯ä»¥ä¸‹ä»»æ„一项：" -#: parted/parted.c:168 +#: parted/parted.c:169 msgid "" "START and END are disk locations, such as 4GB or 10%. Negative values count " "from the end of the disk. For example, -1s specifies exactly the last " @@ -2291,7 +2287,7 @@ msgstr "" "START å’Œ END 都是ç£ç›˜ä½ç½®ï¼Œå¦‚ 4 GB 或 10%。负值从ç£ç›˜çš„末尾数起。例如，-1s 指" "定确切的最åŽçŽ¯èŠ‚。\n" -#: parted/parted.c:171 +#: parted/parted.c:172 msgid "" "END is disk location, such as 4GB or 10%. Negative value counts from the " "end of the disk. For example, -1s specifies exactly the last sector.\n" @@ -2299,19 +2295,23 @@ msgstr "" "END 指的是ç£ç›˜ä½ç½®ï¼Œä¾‹å¦‚ 4GB 或 10%。负数值将从ç£ç›˜æœ«ç«¯å€’数过æ¥ã€‚例如，-1s 指" "定最åŽä¸€ä¸ªæ‰‡åŒºã€‚\n" -#: parted/parted.c:174 +#: parted/parted.c:175 msgid "STATE is one of: on, off\n" msgstr "状æ€ä¸ºï¼šå¼€ã€å…³\n" -#: parted/parted.c:175 +#: parted/parted.c:176 msgid "DEVICE is usually /dev/hda or /dev/sda\n" msgstr "DEVICE 通常为 /dev/hda 或 /dev/sda\n" -#: parted/parted.c:176 +#: parted/parted.c:177 msgid "NAME is any word you want\n" msgstr "NAME 是您需è¦çš„任何å•è¯\n" -#: parted/parted.c:179 +#: parted/parted.c:178 +msgid "TYPE_ID is a value between 0x01 and 0xff, TYPE_UUID is a UUID\n" +msgstr "" + +#: parted/parted.c:182 msgid "" "Copyright (C) 1998 - 2006 Free Software Foundation, Inc.\n" "This program is free software, covered by the GNU General Public License.\n" @@ -2330,22 +2330,22 @@ msgstr "" "详情请å‚è§ GNU 通用公共许å¯è¯ã€‚\n" "\n" -#: parted/parted.c:229 +#: parted/parted.c:232 #, c-format msgid "%0.f%%\t(time left %.2d:%.2d)" msgstr "%0.f%%\t(剩余时间 %.2d:%.2d)" -#: parted/parted.c:248 +#: parted/parted.c:251 #, c-format msgid "Partition %s is being used. Are you sure you want to continue?" msgstr "分区 %s æ£è¢«ä½¿ç”¨ã€‚ä½ ç¡®å®šè¦ç»§ç»å—?" -#: parted/parted.c:269 +#: parted/parted.c:272 #, c-format msgid "Partition(s) on %s are being used." msgstr "æ£åœ¨ä½¿ç”¨ %s 上的分区。" -#: parted/parted.c:281 +#: parted/parted.c:284 #, c-format msgid "" "The existing disk label on %s will be destroyed and all data on this disk " @@ -2353,31 +2353,31 @@ msgid "" msgstr "" "现有 %s 上的ç£ç›˜å·æ ‡å°†è¢«é”€æ¯ï¼Œè€Œæ‰€æœ‰åœ¨è¿™ä¸ªç£ç›˜ä¸Šçš„æ•°æ®å°†ä¼šä¸¢å¤±ã€‚您è¦ç»§ç»å—？" -#: parted/parted.c:542 +#: parted/parted.c:545 msgid "New disk label type?" msgstr "æ–°çš„ç£ç›˜å·æ ‡ç±»åž‹ï¼Ÿ" -#: parted/parted.c:680 +#: parted/parted.c:692 msgid "Partition type?" msgstr "分区类型？" -#: parted/parted.c:698 parted/parted.c:902 +#: parted/parted.c:710 parted/parted.c:914 msgid "Partition name?" msgstr "分区å称？" -#: parted/parted.c:708 +#: parted/parted.c:720 msgid "File system type?" msgstr "文件系统类型？" -#: parted/parted.c:713 parted/parted.c:1683 +#: parted/parted.c:725 parted/parted.c:1815 msgid "Start?" msgstr "起始点？" -#: parted/parted.c:715 parted/parted.c:1685 parted/parted.c:1768 +#: parted/parted.c:727 parted/parted.c:1817 parted/parted.c:1900 msgid "End?" msgstr "结æŸç‚¹ï¼Ÿ" -#: parted/parted.c:782 +#: parted/parted.c:794 #, c-format msgid "" "You requested a partition from %s to %s (sectors %llu..%llu).\n" @@ -2386,7 +2386,7 @@ msgstr "" "您è¦æ±‚将分区从 %s 移动到 %s (扇区 %llu..%llu)。\n" "我们å¯ä»¥ç®¡ç†çš„最近的分区是从 %s 到 %s (扇区 %llu..%llu).%s" -#: parted/parted.c:791 +#: parted/parted.c:803 msgid "" "\n" "Is this still acceptable to you?" @@ -2394,93 +2394,118 @@ msgstr "" "\n" "è¿™æ ·æ‚¨è¿˜å¯ä»¥æŽ¥å—å—？" -#: parted/parted.c:814 +#: parted/parted.c:826 #, c-format msgid "" "The resulting partition is not properly aligned for best performance: %s" msgstr "所产生的分区没有适当为获得最佳性能而对é½ï¼š%s" -#: parted/parted.c:816 parted/parted.c:1925 +#: parted/parted.c:828 parted/parted.c:2057 msgid "unknown (malloc failed)" msgstr "未知（malloc 失败）" -#: parted/parted.c:894 +#: parted/parted.c:906 #, c-format msgid "%s disk labels do not support partition name." msgstr "%s ç£ç›˜å·æ ‡ä¸æ”¯æŒåˆ†åŒºå称。" -#: parted/parted.c:899 parted/parted.c:1748 parted/parted.c:1814 -#: parted/parted.c:1908 parted/parted.c:1983 +#: parted/parted.c:911 parted/parted.c:955 parted/parted.c:1880 +#: parted/parted.c:1946 parted/parted.c:2040 parted/parted.c:2115 msgid "Partition number?" msgstr "分区编å·ï¼Ÿ" -#: parted/parted.c:1050 +#: parted/parted.c:949 +#, fuzzy, c-format +msgid "%s disk labels do not support partition type." +msgstr "%s ç£ç›˜å·æ ‡ä¸æ”¯æŒåˆ†åŒºå称。" + +#: parted/parted.c:965 +#, fuzzy +msgid "Partition type-id?" +msgstr "分区类型？" + +#: parted/parted.c:972 +#, fuzzy +msgid "Invalid type-id." +msgstr "æ— æ•ˆçš„æ•°å—。" + +#: parted/parted.c:986 +#, fuzzy +msgid "Partition type-uuid?" +msgstr "分区类型？" + +#: parted/parted.c:993 +#, fuzzy +msgid "Invalid type-uuid." +msgstr "æ— æ•ˆçš„æ•°å—。" + +#: parted/parted.c:1146 #, c-format msgid "BIOS cylinder,head,sector geometry: %d,%d,%d. Each cylinder is %s.\n" msgstr "BIOS 的柱é¢ã€ç£å¤´ã€æ‰‡åŒºå‡ 何结构：%d,%d,%d。æ¯åœˆæŸ±é¢æ˜¯ %s。\n" -#: parted/parted.c:1137 +#: parted/parted.c:1240 #, c-format msgid "Model: %s (%s)\n" msgstr "åž‹å·ï¼š%s (%s)\n" -#: parted/parted.c:1139 +#: parted/parted.c:1242 #, c-format msgid "Disk %s: %s\n" msgstr "ç£ç›˜ %s：%s\n" -#: parted/parted.c:1140 +#: parted/parted.c:1243 #, c-format msgid "Sector size (logical/physical): %lldB/%lldB\n" msgstr "æ‰‡åŒºå¤§å° (逻辑/物ç†)：%lldB/%lldB\n" -#: parted/parted.c:1152 +#: parted/parted.c:1255 #, c-format msgid "Partition Table: %s\n" msgstr "分区表：%s\n" -#: parted/parted.c:1153 +#: parted/parted.c:1256 #, c-format msgid "Disk Flags: %s\n" msgstr "ç£ç›˜æ ‡å¿—：%s\n" -#: parted/parted.c:1279 parted/parted.c:1282 +#: parted/parted.c:1388 parted/parted.c:1391 msgid "Number" msgstr "ç¼–å·" -#: parted/parted.c:1279 parted/parted.c:1282 +#: parted/parted.c:1388 parted/parted.c:1391 msgid "Start" msgstr "起始点" -#: parted/parted.c:1280 parted/parted.c:1283 +#: parted/parted.c:1389 parted/parted.c:1392 msgid "End" msgstr "结æŸç‚¹" -#: parted/parted.c:1283 +#: parted/parted.c:1392 msgid "Size" msgstr "大å°" -#: parted/parted.c:1287 +#: parted/parted.c:1396 msgid "Type" msgstr "类型" -#: parted/parted.c:1289 +#: parted/parted.c:1398 msgid "File system" msgstr "文件系统" -#: parted/parted.c:1292 +#: parted/parted.c:1401 msgid "Name" msgstr "å称" -#: parted/parted.c:1294 +#: parted/parted.c:1403 msgid "Flags" msgstr "æ ‡å¿—" -#: parted/parted.c:1352 +#: parted/parted.c:1461 msgid "Free Space" msgstr "å¯ç”¨ç©ºé—´" -#: parted/parted.c:1570 +#: parted/parted.c:1702 #, c-format msgid "" "A %s %s partition was found at %s -> %s. Do you want to add it to the " @@ -2488,54 +2513,54 @@ msgid "" msgstr "" "在 %3$s -> %4$s 处找到一个 %1$s %2$s åˆ†åŒºã€‚æ‚¨å¸Œæœ›å°†å…¶æ·»åŠ åˆ°åˆ†åŒºè¡¨ä¸å—？" -#: parted/parted.c:1613 +#: parted/parted.c:1745 msgid "searching for file systems" msgstr "æ£åœ¨æœç´¢æ–‡ä»¶ç³»ç»Ÿ" -#: parted/parted.c:1720 +#: parted/parted.c:1852 msgid "The resize command has been removed in parted 3.0" msgstr "resize 命令已在 parted 3.0 移除" -#: parted/parted.c:1782 +#: parted/parted.c:1914 msgid "" "Shrinking a partition can cause data loss, are you sure you want to continue?" msgstr "缩å°åˆ†åŒºå¯å¯¼è‡´æ•°æ®ä¸¢å¤±ï¼Œä½ 确定è¦ç»§ç»å—？" -#: parted/parted.c:1838 +#: parted/parted.c:1970 msgid "New device?" msgstr "新设备？" -#: parted/parted.c:1906 +#: parted/parted.c:2038 msgid "alignment type(min/opt)" msgstr "对é½ç±»åž‹ (最å°/最佳)" -#: parted/parted.c:1921 +#: parted/parted.c:2053 #, c-format msgid "%d aligned\n" msgstr "%d 已对é½\n" -#: parted/parted.c:1923 +#: parted/parted.c:2055 #, c-format msgid "%d not aligned: %s\n" msgstr "%d 未对é½ï¼š%s\n" -#: parted/parted.c:1948 parted/parted.c:1985 +#: parted/parted.c:2080 parted/parted.c:2117 msgid "Flag to Invert?" msgstr "è¦åè½¬çš„æ ‡å¿—ï¼Ÿ" -#: parted/parted.c:1953 parted/parted.c:1990 +#: parted/parted.c:2085 parted/parted.c:2122 msgid "New state?" msgstr "新状æ€ï¼Ÿ" -#: parted/parted.c:2036 +#: parted/parted.c:2168 msgid "Unit?" msgstr "å•ä½ï¼Ÿ" -#: parted/parted.c:2171 +#: parted/parted.c:2303 msgid "align-check" msgstr "对é½æ£€æŸ¥" -#: parted/parted.c:2174 +#: parted/parted.c:2306 msgid "" "align-check TYPE N check partition N for TYPE(min|opt) " "alignment" @@ -2543,40 +2568,40 @@ msgstr "" "align-check 类型 N 检查分区 N 是å¦ä¸º (最å°=min|最佳" "=opt) 对é½ç±»åž‹" -#: parted/parted.c:2182 +#: parted/parted.c:2314 msgid "help" msgstr "help" -#: parted/parted.c:2185 +#: parted/parted.c:2317 msgid "" "help [COMMAND] print general help, or help on " "COMMAND" msgstr "" "help [COMMAND] 打å°é€šç”¨æ±‚助信æ¯ï¼Œæˆ– COMMAND 的帮助" -#: parted/parted.c:2191 +#: parted/parted.c:2323 msgid "mklabel" msgstr "mklabel" -#: parted/parted.c:2191 +#: parted/parted.c:2323 msgid "mktable" msgstr "mktable" -#: parted/parted.c:2194 +#: parted/parted.c:2326 msgid "" "mklabel,mktable LABEL-TYPE create a new disklabel (partition " "table)" msgstr "mklabel,mktable LABEL-TYPE 创建新的ç£ç›˜å·æ ‡ (分区表)" -#: parted/parted.c:2200 +#: parted/parted.c:2332 msgid "mkpart" msgstr "mkpart" -#: parted/parted.c:2203 +#: parted/parted.c:2335 msgid "mkpart PART-TYPE [FS-TYPE] START END make a partition" msgstr "mkpart 分区类型 [文件系统类型] 起始点 结æŸç‚¹ 创建一个分区" -#: parted/parted.c:2209 +#: parted/parted.c:2341 msgid "" "'mkpart' makes a partition without creating a new file system on the " "partition. FS-TYPE may be specified to set an appropriate partition ID.\n" @@ -2584,20 +2609,20 @@ msgstr "" "“mkpartâ€åˆ›å»ºåˆ†åŒºè€Œä¸åœ¨åˆ†åŒºä¸Šåˆ›å»ºæ–°æ–‡ä»¶ç³»ç»Ÿã€‚“文件系统类型â€å¯ä»¥ç”¨äºŽè®¾ç½®é€‚当的" "分区辨识å·ã€‚\n" -#: parted/parted.c:2214 +#: parted/parted.c:2346 msgid "name" msgstr "name" -#: parted/parted.c:2217 +#: parted/parted.c:2349 msgid "name NUMBER NAME name partition NUMBER as NAME" msgstr "" "name ç¼–å· å称 将指定“编å·â€çš„分区命å为“å称â€" -#: parted/parted.c:2222 +#: parted/parted.c:2354 msgid "print" msgstr "print" -#: parted/parted.c:2225 +#: parted/parted.c:2357 msgid "" "print [devices|free|list,all] display the partition table, or " "available devices, or free space, or all found partitions" @@ -2605,41 +2630,41 @@ msgstr "" "print [devices|free|list,all] 显示分区表ã€å¯ç”¨è®¾å¤‡ã€å‰©ä½™ç©ºé—´æˆ–所有" "分区" -#: parted/parted.c:2229 +#: parted/parted.c:2361 msgid "" "Without arguments, 'print' displays the entire partition table. However with " "the following arguments it performs various other actions.\n" msgstr "" "“printâ€ä¸åŠ å‚æ•°å¯æ˜¾ç¤ºæ•´ä¸ªåˆ†åŒºè¡¨ã€‚然而借由下列å‚数它能è¿è¡Œå„ç§å…¶ä»–动作。\n" -#: parted/parted.c:2231 +#: parted/parted.c:2363 msgid " devices : display all active block devices\n" msgstr " devices ：显示所有作用ä¸çš„å—设备\n" -#: parted/parted.c:2232 +#: parted/parted.c:2364 msgid "" " free : display information about free unpartitioned space on the " "current block device\n" msgstr " free ：显示在目å‰å—设备上未分区的å¯ç”¨ç©ºé—´ä¿¡æ¯\n" -#: parted/parted.c:2234 +#: parted/parted.c:2366 msgid "" " list, all : display the partition tables of all active block devices\n" msgstr " list, all : 显示所有作用ä¸å—设备的分区表\n" -#: parted/parted.c:2238 +#: parted/parted.c:2370 msgid "quit" msgstr "quit" -#: parted/parted.c:2241 +#: parted/parted.c:2373 msgid "quit exit program" msgstr "quit 退出程åº" -#: parted/parted.c:2246 +#: parted/parted.c:2378 msgid "rescue" msgstr "rescue" -#: parted/parted.c:2249 +#: parted/parted.c:2381 msgid "" "rescue START END rescue a lost partition near START " "and END" @@ -2647,115 +2672,125 @@ msgstr "" "rescue 起始点 终æ¢ç‚¹ 挽救临近“起始点â€ã€â€œç»ˆæ¢ç‚¹â€çš„é—失的" "分区" -#: parted/parted.c:2255 +#: parted/parted.c:2387 msgid "resize" msgstr "resize" -#: parted/parted.c:2258 +#: parted/parted.c:2390 msgid "The resize command was removed in parted 3.0\n" msgstr "resize 命令已在 parted 3.0 移除\n" -#: parted/parted.c:2261 +#: parted/parted.c:2393 msgid "resizepart" msgstr "resizepart" -#: parted/parted.c:2264 +#: parted/parted.c:2396 msgid "resizepart NUMBER END resize partition NUMBER" msgstr "resizepart NUMBER END æ”¹å˜ NUMBER 的大å°" -#: parted/parted.c:2269 +#: parted/parted.c:2401 msgid "rm" msgstr "rm" -#: parted/parted.c:2272 +#: parted/parted.c:2404 msgid "rm NUMBER delete partition NUMBER" msgstr "rm NUMBER åˆ é™¤ç¼–å·ä¸º NUMBER 的分区" -#: parted/parted.c:2277 +#: parted/parted.c:2409 msgid "select" msgstr "select" -#: parted/parted.c:2280 +#: parted/parted.c:2412 msgid "select DEVICE choose the device to edit" msgstr "select 设备 选择è¦ç¼–辑的设备" -#: parted/parted.c:2285 +#: parted/parted.c:2417 msgid "disk_set" msgstr "disk_set" -#: parted/parted.c:2288 +#: parted/parted.c:2420 msgid "" "disk_set FLAG STATE change the FLAG on selected device" msgstr "disk_set æ——æ ‡ çŠ¶æ€ å˜æ›´å·²é€‰è®¾å¤‡ä¸Šçš„æ——æ ‡" -#: parted/parted.c:2293 +#: parted/parted.c:2425 msgid "disk_toggle" msgstr "disk_toggle" -#: parted/parted.c:2296 +#: parted/parted.c:2428 msgid "" "disk_toggle [FLAG] toggle the state of FLAG on " "selected device" msgstr "disk_toggle [æ——æ ‡] 切æ¢å·²é€‰è®¾å¤‡ä¸Šçš„æ——æ ‡çŠ¶æ€" -#: parted/parted.c:2302 +#: parted/parted.c:2434 msgid "set" msgstr "set" -#: parted/parted.c:2305 +#: parted/parted.c:2437 msgid "" "set NUMBER FLAG STATE change the FLAG on partition NUMBER" msgstr "set ç¼–å· æ——æ ‡ çŠ¶æ€ æ”¹å˜æŒ‡å®šâ€œç¼–å·â€åˆ†åŒºçš„æ——æ ‡" -#: parted/parted.c:2311 +#: parted/parted.c:2443 msgid "toggle" msgstr "toggle" -#: parted/parted.c:2314 +#: parted/parted.c:2446 msgid "" "toggle [NUMBER [FLAG]] toggle the state of FLAG on " "partition NUMBER" msgstr "toggle [ç¼–å· [æ——æ ‡]] 切æ¢â€œç¼–å·â€åˆ†åŒºä¸Šçš„â€œæ——æ ‡â€çŠ¶æ€" -#: parted/parted.c:2320 +#: parted/parted.c:2452 +msgid "type" +msgstr "" + +#: parted/parted.c:2455 +msgid "" +"type NUMBER TYPE-ID or TYPE-UUID type set TYPE-ID or TYPE-UUID of " +"partition NUMBER" +msgstr "" + +#: parted/parted.c:2460 msgid "unit" msgstr "unit" -#: parted/parted.c:2323 +#: parted/parted.c:2463 msgid "unit UNIT set the default unit to UNIT" msgstr "unit å•ä½ 设置缺çœçš„“å•ä½â€" -#: parted/parted.c:2328 +#: parted/parted.c:2468 msgid "version" msgstr "version" -#: parted/parted.c:2331 +#: parted/parted.c:2471 msgid "" "version display the version number and " "copyright information of GNU Parted" msgstr "" "version æ˜¾ç¤ºç›®å‰ GNU Parted 的版本与版æƒä¿¡æ¯" -#: parted/parted.c:2335 +#: parted/parted.c:2475 msgid "" "'version' displays copyright and version information corresponding to this " "copy of GNU Parted\n" msgstr "'version' 显示æ¤ä»½ GNU Parted 的版æƒä¸Žç‰ˆæœ¬ä¿¡æ¯\n" -#: parted/parted.c:2405 +#: parted/parted.c:2545 #, c-format msgid "Usage: %s [-hlmsfv] [-a<align>] [DEVICE [COMMAND [PARAMETERS]]...]\n" msgstr "用法：%s [-hlmsfv] [-a<align>] [设备 [命令 [å‚æ•°]]...]\n" -#: parted/parted.c:2449 +#: parted/parted.c:2589 msgid "No device found" msgstr "未找到设备" -#: parted/parted.c:2486 +#: parted/parted.c:2626 msgid "WARNING: You are not superuser. Watch out for permissions.\n" msgstr "è¦å‘Šï¼šæ‚¨ä¸æ˜¯è¶…级用户。注æ„æƒé™é—®é¢˜ã€‚\n" -#: parted/parted.c:2519 +#: parted/parted.c:2659 msgid "" "You should reinstall your boot loader before rebooting. Read section 4 of " "the Parted User documentation for more information." @@ -2763,7 +2798,7 @@ msgstr "" "您应该在é‡æ–°å¯åŠ¨ä¹‹å‰é‡æ–°å®‰è£…您的å¯åŠ¨ç®¡ç†å™¨ã€‚详情请阅读 Parted 用户文档的第四" "节。" -#: parted/parted.c:2526 +#: parted/parted.c:2666 msgid "You may need to update /etc/fstab.\n" msgstr "ä½ å¯èƒ½éœ€è¦ /etc/fstab。\n" @@ -3018,69 +3053,69 @@ msgstr "" "\n" "错误: é‡åˆ°ä¸€èˆ¬çš„ SIGILL ä¿¡å·ã€‚" -#: parted/ui.c:901 +#: parted/ui.c:904 #, c-format msgid "invalid token: %s" msgstr "æ— æ•ˆçš„å—组：%s" -#: parted/ui.c:1082 +#: parted/ui.c:1085 msgid "Expecting a partition number." msgstr "需è¦åˆ†åŒºç¼–å·ã€‚" -#: parted/ui.c:1091 +#: parted/ui.c:1094 msgid "Partition doesn't exist." msgstr "分区ä¸å˜åœ¨ã€‚" -#: parted/ui.c:1111 +#: parted/ui.c:1114 msgid "Expecting a file system type." msgstr "需è¦æ–‡ä»¶ç³»ç»Ÿç±»åž‹ã€‚" -#: parted/ui.c:1118 +#: parted/ui.c:1121 #, c-format msgid "Unknown file system type \"%s\"." msgstr "未知的文件系统类型“%sâ€ã€‚" -#: parted/ui.c:1139 +#: parted/ui.c:1142 msgid "Expecting a disk label type." msgstr "需è¦ç£ç›˜å·æ ‡ç±»åž‹ã€‚" -#: parted/ui.c:1170 parted/ui.c:1206 +#: parted/ui.c:1173 parted/ui.c:1209 msgid "No flags supported" msgstr "ä¸æ”¯æŒæ——æ ‡" -#: parted/ui.c:1280 +#: parted/ui.c:1283 msgid "Can't create any more partitions." msgstr "æ— æ³•åˆ›å»ºæ›´å¤šåˆ†åŒºã€‚" -#: parted/ui.c:1290 +#: parted/ui.c:1293 msgid "Expecting a partition type." msgstr "需è¦åˆ†åŒºç±»åž‹ã€‚" -#: parted/ui.c:1439 +#: parted/ui.c:1442 msgid "on" msgstr "å¼€" -#: parted/ui.c:1440 +#: parted/ui.c:1443 msgid "off" msgstr "å…³" -#: parted/ui.c:1457 +#: parted/ui.c:1460 msgid "optimal" msgstr "最佳" -#: parted/ui.c:1458 +#: parted/ui.c:1461 msgid "minimal" msgstr "最å°" -#: parted/ui.c:1591 +#: parted/ui.c:1594 msgid "OPTIONs:" msgstr "选项：" -#: parted/ui.c:1596 +#: parted/ui.c:1599 msgid "COMMANDs:" msgstr "命令：" -#: parted/ui.c:1599 +#: parted/ui.c:1602 #, c-format msgid "" "\n" @@ -3089,15 +3124,22 @@ msgstr "" "\n" "将错误报告给 %s\n" -#: parted/ui.c:1606 +#: parted/ui.c:1609 #, c-format msgid "Using %s\n" msgstr "使用 %s\n" -#: parted/ui.c:1686 +#: parted/ui.c:1689 msgid "This command does not make sense in non-interactive mode.\n" msgstr "这个命令在éžäº¤äº’模å¼ä¸ä¸å…·ä»»ä½•æ„义。\n" +#~ msgid "Extended partitions cannot be hidden on msdos disk labels." +#~ msgstr "æ‹“å±•åˆ†åŒºæ— æ³•éšè—且使用 msdos ç£ç›˜å·æ ‡ã€‚" + +#~ msgid "" +#~ "Extended partitions cannot be recovery partitions on msdos disk labels." +#~ msgstr "拓展分区ä¸èƒ½æ˜¯ä½¿ç”¨ msdos ç£ç›˜å·æ ‡çš„æ¢å¤åˆ†åŒºã€‚" + #~ msgid "" #~ " NUMBER : display more detailed information about this particular " #~ "partition\n" diff --git a/po/zh_TW.gmo b/po/zh_TW.gmo Binary files differindex 9e164d5..85d4233 100644 --- a/po/zh_TW.gmo +++ b/po/zh_TW.gmo diff --git a/po/zh_TW.po b/po/zh_TW.po index a279040..a093820 100644 --- a/po/zh_TW.po +++ b/po/zh_TW.po @@ -9,7 +9,7 @@ msgid "" msgstr "" "Project-Id-Version: parted 3.4.64.2\n" "Report-Msgid-Bugs-To: bug-parted@gnu.org\n" -"POT-Creation-Date: 2022-04-18 14:44-0400\n" +"POT-Creation-Date: 2023-04-10 15:50-0700\n" "PO-Revision-Date: 2022-04-07 11:46+0800\n" "Last-Translator: Yi-Jyun Pan <pan93412@gmail.com>\n" "Language-Team: Chinese (traditional) <zh-l10n@lists.linux.org.tw>\n" @@ -21,25 +21,25 @@ msgstr "" "X-Bugs: Report translation errors to the Language-Team address.\n" "X-Generator: Poedit 3.0.1\n" -#: lib/argmatch.c:147 +#: lib/argmatch.c:145 #, c-format msgid "invalid argument %s for %s" msgstr "傳入 %2$s 之åƒæ•¸ %1$s 無效" -#: lib/argmatch.c:148 +#: lib/argmatch.c:146 #, c-format msgid "ambiguous argument %s for %s" msgstr "傳入 %2$s 之åƒæ•¸ %1$s ä¸æ˜Žç¢º" -#: lib/argmatch.c:167 lib/argmatch.h:238 +#: lib/argmatch.c:165 lib/argmatch.h:237 msgid "Valid arguments are:" msgstr "有效的åƒæ•¸ç‚ºï¼š" -#: lib/closeout.c:122 libparted/labels/fdasd.c:145 +#: lib/closeout.c:121 libparted/labels/fdasd.c:145 msgid "write error" msgstr "寫入時發生錯誤" -#: lib/error.c:195 +#: lib/error.c:193 msgid "Unknown system error" msgstr "未知系統錯誤" @@ -99,11 +99,11 @@ msgstr "%s：é¸é …需è¦åƒæ•¸ -- '%c'\n" #. If you don't know what to put here, please see #. <https://en.wikipedia.org/wiki/Quotation_marks_in_other_languages> #. and use glyphs suitable for your language. -#: lib/quotearg.c:355 +#: lib/quotearg.c:354 msgid "`" msgstr "「" -#: lib/quotearg.c:356 +#: lib/quotearg.c:355 msgid "'" msgstr "ã€" @@ -185,7 +185,7 @@ msgstr "沒有上一個æ£è¦è¡¨ç¤ºå¼" #. To enquire the regular expression that your system uses for this #. purpose, you can use the command #. locale -k LC_MESSAGES | grep '^yesexpr=' -#: lib/rpmatch.c:150 +#: lib/rpmatch.c:149 msgid "^[yY]" msgstr "^[yY]" @@ -195,7 +195,7 @@ msgstr "^[yY]" #. To enquire the regular expression that your system uses for this #. purpose, you can use the command #. locale -k LC_MESSAGES | grep '^noexpr=' -#: lib/rpmatch.c:163 +#: lib/rpmatch.c:162 msgid "^[nN]" msgstr "^[nN]" @@ -740,157 +740,161 @@ msgstr "pmbr_boot" msgid "Unknown disk flag, %d." msgstr "ä¸æ˜Žçš„ç£ç¢Ÿæ——標，%d。" -#: libparted/disk.c:1289 +#: libparted/disk.c:1320 #, c-format msgid "%s disk labels do not support extended partitions." msgstr "%s ç£ç¢Ÿæ¨™ç±¤ä¸æ”¯æ´æ“´å……分割å€ã€‚" -#: libparted/disk.c:1821 +#: libparted/disk.c:1990 #, c-format msgid "%s disk labels don't support logical or extended partitions." msgstr "%s ç£ç¢Ÿæ¨™ç±¤ä¸æ”¯æ´é‚輯或擴充分割å€ã€‚" -#: libparted/disk.c:1834 +#: libparted/disk.c:2003 msgid "Too many primary partitions." msgstr "éŽå¤šçš„主分割å€ã€‚" -#: libparted/disk.c:1843 +#: libparted/disk.c:2012 #, c-format msgid "" "Can't add a logical partition to %s, because there is no extended partition." msgstr "由於沒有擴充分割å€ï¼Œç„¡æ³•å°‡é‚輯分割å€æ–°å¢žåˆ° %s。" -#: libparted/disk.c:1867 +#: libparted/disk.c:2036 #, c-format msgid "Can't have more than one extended partition on %s." msgstr "%s 上ä¸èƒ½å«æœ‰å¤šæ–¼ä¸€å€‹çš„擴充分割å€ã€‚" -#: libparted/disk.c:1877 +#: libparted/disk.c:2046 msgid "Can't have logical partitions outside of the extended partition." msgstr "é‚輯分割å€ä¸èƒ½ä½æ–¼æ“´å……分割å€ä¹‹å¤–。" -#: libparted/disk.c:1902 +#: libparted/disk.c:2071 #, c-format msgid "Can't have a logical partition outside of the extended partition on %s." msgstr "%s 上的é‚輯分割å€ä¸èƒ½ä½æ–¼æ“´å……分割å€ä¹‹å¤–。" -#: libparted/disk.c:1912 +#: libparted/disk.c:2081 msgid "Can't have a primary partition inside an extended partition." msgstr "擴充分割å€ä¸ä¸èƒ½å«æœ‰ä¸»åˆ†å‰²å€ã€‚" -#: libparted/disk.c:1921 +#: libparted/disk.c:2090 msgid "Can't have a partition outside the disk!" msgstr "無法讓分割å€è¶…出ç£ç¢Ÿï¼" -#: libparted/disk.c:1972 libparted/disk.c:2150 +#: libparted/disk.c:2141 libparted/disk.c:2319 msgid "Can't have overlapping partitions." msgstr "分割å€ä¸èƒ½é‡ç–Šã€‚" -#: libparted/disk.c:2351 +#: libparted/disk.c:2520 msgid "metadata" msgstr "ä¸ç¹¼è³‡æ–™" -#: libparted/disk.c:2353 +#: libparted/disk.c:2522 msgid "free" msgstr "自由空間" -#: libparted/disk.c:2355 parted/ui.c:1271 parted/ui.c:1299 +#: libparted/disk.c:2524 parted/ui.c:1274 parted/ui.c:1302 msgid "extended" msgstr "擴充分割å€" -#: libparted/disk.c:2357 parted/ui.c:1275 parted/ui.c:1303 +#: libparted/disk.c:2526 parted/ui.c:1278 parted/ui.c:1306 msgid "logical" msgstr "é‚輯分割å€" -#: libparted/disk.c:2359 parted/ui.c:1267 parted/ui.c:1295 +#: libparted/disk.c:2528 parted/ui.c:1270 parted/ui.c:1298 msgid "primary" msgstr "主分割å€" -#: libparted/disk.c:2375 +#: libparted/disk.c:2544 msgid "boot" msgstr "å•Ÿå‹•" -#: libparted/disk.c:2377 +#: libparted/disk.c:2546 msgid "bios_grub" msgstr "bios_grub" -#: libparted/disk.c:2379 +#: libparted/disk.c:2548 msgid "root" msgstr "æ ¹" -#: libparted/disk.c:2381 +#: libparted/disk.c:2550 msgid "swap" msgstr "交æ›åˆ†å‰²å€" -#: libparted/disk.c:2383 +#: libparted/disk.c:2552 msgid "hidden" msgstr "éš±è—分割å€" -#: libparted/disk.c:2385 +#: libparted/disk.c:2554 msgid "raid" msgstr "raid" -#: libparted/disk.c:2387 +#: libparted/disk.c:2556 msgid "lvm" msgstr "lvm" -#: libparted/disk.c:2389 +#: libparted/disk.c:2558 msgid "lba" msgstr "lba" -#: libparted/disk.c:2391 +#: libparted/disk.c:2560 msgid "hp-service" msgstr "hp-æœå‹™" -#: libparted/disk.c:2393 +#: libparted/disk.c:2562 msgid "palo" msgstr "palo" -#: libparted/disk.c:2395 +#: libparted/disk.c:2564 msgid "prep" msgstr "prep" -#: libparted/disk.c:2397 +#: libparted/disk.c:2566 msgid "msftres" msgstr "msftres" -#: libparted/disk.c:2399 +#: libparted/disk.c:2568 msgid "msftdata" msgstr "msftdata" -#: libparted/disk.c:2401 +#: libparted/disk.c:2570 msgid "atvrecv" msgstr "atvrecv" -#: libparted/disk.c:2403 +#: libparted/disk.c:2572 msgid "diag" msgstr "diag" -#: libparted/disk.c:2405 +#: libparted/disk.c:2574 msgid "legacy_boot" msgstr "legacy_boot" -#: libparted/disk.c:2407 +#: libparted/disk.c:2576 msgid "irst" msgstr "irst" -#: libparted/disk.c:2409 +#: libparted/disk.c:2578 msgid "esp" msgstr "esp" -#: libparted/disk.c:2411 +#: libparted/disk.c:2580 msgid "chromeos_kernel" msgstr "chromeos_kernel" -#: libparted/disk.c:2413 +#: libparted/disk.c:2582 msgid "bls_boot" msgstr "bls_boot" -#: libparted/disk.c:2415 +#: libparted/disk.c:2584 msgid "linux-home" msgstr "linux-home" -#: libparted/disk.c:2421 +#: libparted/disk.c:2586 +msgid "no_automount" +msgstr "" + +#: libparted/disk.c:2592 #, c-format msgid "Unknown partition flag, %d." msgstr "ä¸æ˜Žçš„分割å€æ——標，%d。" @@ -1075,8 +1079,8 @@ msgstr "" "å€ï¼‰ä½¿ç”¨æ“´å…… XGM 分割å€" #: libparted/labels/atari.c:1662 libparted/labels/bsd.c:563 -#: libparted/labels/dasd.c:895 libparted/labels/dos.c:2303 -#: libparted/labels/dvh.c:770 libparted/labels/gpt.c:1769 +#: libparted/labels/dasd.c:893 libparted/labels/dos.c:2294 +#: libparted/labels/dvh.c:770 libparted/labels/gpt.c:1891 #: libparted/labels/loop.c:244 libparted/labels/mac.c:1409 #: libparted/labels/pc98.c:697 libparted/labels/rdb.c:1054 #: libparted/labels/sun.c:781 @@ -1100,37 +1104,29 @@ msgstr "無法定ä½åˆ†å‰²å€ç·¨è™Ÿã€‚" msgid "Unable to allocate a bsd disklabel slot." msgstr "ç„¡æ³•å®šä½ bsd ç£ç¢Ÿæ¨™ç±¤æ§½ã€‚" -#: libparted/labels/dasd.c:626 +#: libparted/labels/dasd.c:634 msgid "The partition table of DASD-LDL device cannot be changed.\n" msgstr "ä¸èƒ½æ›´æ”¹ DASD-LDL è£ç½®çš„分割表。\n" -#: libparted/labels/dasd.c:921 +#: libparted/labels/dasd.c:919 msgid "Unable to allocate a dasd disklabel slot" msgstr "無法é…ç½® dasd ç£ç¢Ÿæ¨™ç±¤æ§½" -#: libparted/labels/dos.c:1008 +#: libparted/labels/dos.c:1159 #, c-format msgid "Invalid partition table on %s -- wrong signature %x." msgstr "%s 上的分割å€è¡¨ç„¡æ•ˆ - 錯誤的簽å %x。" -#: libparted/labels/dos.c:1036 +#: libparted/labels/dos.c:1187 #, c-format msgid "Invalid partition table - recursive partition on %s." msgstr "無效的分割å€è¡¨ - %s 出ç¾éžè¿´åˆ†å‰²å€ã€‚" -#: libparted/labels/dos.c:1567 -msgid "Extended partitions cannot be hidden on msdos disk labels." -msgstr "擴充分割å€ç„¡æ³•éš±è—æ–¼ msdos ç£ç¢Ÿæ¨™ç±¤ä¹‹ä¸Šã€‚" - -#: libparted/labels/dos.c:1579 -msgid "Extended partitions cannot be recovery partitions on msdos disk labels." -msgstr "擴充分割å€ä¸èƒ½æ˜¯ msdos ç£ç¢Ÿæ¨™ç±¤ä¸Šçš„æ•‘æ´åˆ†å‰²å€ã€‚" - -#: libparted/labels/dos.c:2285 +#: libparted/labels/dos.c:2276 msgid "Parted can't resize partitions managed by Windows Dynamic Disk." msgstr "Parted 無法改變由「視窗動態ç£ç¢Ÿã€æ‰€ç®¡ç†çš„分割å€å¤§å°ã€‚" -#: libparted/labels/dos.c:2541 +#: libparted/labels/dos.c:2532 msgid "cannot create any more partitions" msgstr "無法å†å»ºç«‹ä»»ä½•åˆ†å‰²å€" @@ -1270,11 +1266,11 @@ msgstr "無法å–回å€å¡Šå¤§å°è³‡è¨Šã€‚" msgid "Disk geometry does not match a DASD device of type 3390." msgstr "ç£ç¢Ÿç‰ˆé¢ä¸ç¬¦ 3390 é¡žåž‹çš„ DASD è£ç½®ã€‚" -#: libparted/labels/gpt.c:569 +#: libparted/labels/gpt.c:589 msgid "device is too small for GPT" msgstr "è£ç½®å¤ªå°ä¸é©ç”¨ GPT" -#: libparted/labels/gpt.c:771 +#: libparted/labels/gpt.c:791 #, c-format msgid "" "The format of the GPT partition table is version %x, which is newer than " @@ -1282,7 +1278,7 @@ msgid "" msgstr "" "GPT 分割å€è¡¨çš„æ ¼å¼ç‰ˆæœ¬ç‚º %x，它比 Parted 所能辨è˜çš„版本è¦æ–°ã€‚è«‹å›žå ±é€™å€‹ç‹€æ³ï¼" -#: libparted/labels/gpt.c:807 +#: libparted/labels/gpt.c:827 #, c-format msgid "" "Not all of the space available to %s appears to be used, you can fix the GPT " @@ -1292,7 +1288,7 @@ msgstr "" "並éžä½¿ç”¨äº†æ‰€æœ‰å¯ç”¨æ–¼ %s 的空間，您å¯ä»¥ä¿®æ£ GPT 以使用所有的空間 (é¡å¤–çš„ %llu " "å€å¡Š)，或是繼續使用目å‰çš„è¨å®šï¼Ÿ" -#: libparted/labels/gpt.c:1006 +#: libparted/labels/gpt.c:1026 msgid "" "The backup GPT table is not at the end of the disk, as it should be. Fix, " "by moving the backup to the end (and removing the old backup)?" @@ -1300,7 +1296,7 @@ msgstr "" "備份 GPT 表ä¸åƒæ‡‰è©²çš„那樣出ç¾åœ¨ç£ç¢Ÿçš„末尾。經由將備份移動到末尾 (並刪除舊備" "份) 來修æ£å®ƒï¼Ÿ" -#: libparted/labels/gpt.c:1024 +#: libparted/labels/gpt.c:1044 msgid "" "Both the primary and backup GPT tables are corrupt. Try making a fresh " "table, and using Parted's rescue feature to recover partitions." @@ -1308,23 +1304,23 @@ msgstr "" "主 GPT 和備份 GPT 都æ壞了。ç¾åœ¨è©¦åœ–建立新表，並使用 Parted 的回覆功能以é‡å»º" "分割å€è¡¨ã€‚" -#: libparted/labels/gpt.c:1035 +#: libparted/labels/gpt.c:1055 msgid "" "The backup GPT table is corrupt, but the primary appears OK, so that will be " "used." msgstr "GPT 備份表æ壞，但是主表似乎是æ£ç¢ºçš„，所以將會使用它。" -#: libparted/labels/gpt.c:1047 +#: libparted/labels/gpt.c:1067 msgid "" "The primary GPT table is corrupt, but the backup appears OK, so that will be " "used." msgstr "主 GPT 表æ壞，但備份似乎是æ£ç¢ºçš„，所以將會使用它。" -#: libparted/labels/gpt.c:1071 +#: libparted/labels/gpt.c:1091 msgid "primary partition table array CRC mismatch" msgstr "主分割表的陣列循環冗餘檢查ä¸ç¬¦åˆ" -#: libparted/labels/gpt.c:1655 libparted/labels/gpt.c:1682 +#: libparted/labels/gpt.c:1722 libparted/labels/gpt.c:1749 msgid "failed to translate partition name" msgstr "無法翻è¯åˆ†å‰²å€å稱。" @@ -1955,7 +1951,7 @@ msgstr "fat_table_alloc_cluster：沒有å¯ç”¨çš„ç£ç°‡" msgid "Could not detect file system." msgstr "無法åµæ¸¬æª”案系統。" -#: libparted/fs/r/filesys.c:159 libparted/fs/r/filesys.c:284 +#: libparted/fs/r/filesys.c:159 libparted/fs/r/filesys.c:285 #, c-format msgid "resizing %s file systems is not supported" msgstr "ä¸æ”¯æ´èª¿æ•´ %s 檔案系統大å°" @@ -2221,39 +2217,39 @@ msgstr "這個 HFS+ ç£ç¢Ÿå€æ²’有任何類別檔。 這是很ä¸å°‹å¸¸çš„ï¼" msgid "This HFS+ volume has no extents overflow file. This is quite unusual!" msgstr "這個 HFS+ ç£ç¢Ÿå€æ²’有任何延伸溢ä½æª”案。 這是相當ä¸å°‹å¸¸çš„ï¼" -#: parted/parted.c:137 +#: parted/parted.c:138 msgid "displays this help message" msgstr "顯示æ¤æ±‚助資訊" -#: parted/parted.c:138 +#: parted/parted.c:139 msgid "lists partition layout on all block devices" msgstr "列出所有å€æ®µè£ç½®çš„分割å€é…ç½®" -#: parted/parted.c:139 +#: parted/parted.c:140 msgid "displays machine parseable output" msgstr "顯示機器å¯è§£æžçš„輸出" -#: parted/parted.c:140 +#: parted/parted.c:141 msgid "displays JSON output" msgstr "顯示 JSON 輸出" -#: parted/parted.c:141 +#: parted/parted.c:142 msgid "never prompts for user intervention" msgstr "從ä¸æ示使用者介入" -#: parted/parted.c:142 +#: parted/parted.c:143 msgid "in script mode, fix instead of abort when asked" msgstr "在指令碼模å¼ï¼Œè©¢å•æ™‚直接修æ£è€Œéžä¸æ¢" -#: parted/parted.c:143 +#: parted/parted.c:144 msgid "displays the version" msgstr "顯示版本" -#: parted/parted.c:144 +#: parted/parted.c:145 msgid "alignment for new partitions" msgstr "新分割å€çš„å°é½Šé¡žåž‹" -#: parted/parted.c:157 +#: parted/parted.c:158 msgid "" "NUMBER is the partition number used by Linux. On MS-DOS disk labels, the " "primary partitions number from 1 to 4, logical partitions from 5 onwards.\n" @@ -2261,31 +2257,31 @@ msgstr "" "NUMBER 是 Linux 使用的分割å€ç·¨è™Ÿã€‚在 MS-DOS ç£ç¢Ÿæ¨™ç±¤ä¸ï¼Œä¸»åˆ†å‰²å€ç·¨è™Ÿç‚º 1 - " "4，é‚輯分割å€å¾ž 5 開始。\n" -#: parted/parted.c:160 +#: parted/parted.c:161 msgid "LABEL-TYPE is one of: " msgstr "LABEL-TYPE 是以下任æ„ä¸€é …ï¼š" -#: parted/parted.c:161 parted/parted.c:162 +#: parted/parted.c:162 parted/parted.c:163 msgid "FLAG is one of: " msgstr "FLAG 是以下任æ„ä¸€é …ï¼š" -#: parted/parted.c:163 +#: parted/parted.c:164 msgid "UNIT is one of: " msgstr "UNIT 是以下任æ„ä¸€é …ï¼š" -#: parted/parted.c:164 +#: parted/parted.c:165 msgid "desired alignment: minimum or optimal" msgstr "è¨æƒ³çš„å°é½Šï¼šæœ€å°æˆ–最佳化" -#: parted/parted.c:165 +#: parted/parted.c:166 msgid "PART-TYPE is one of: primary, logical, extended\n" msgstr "PART-TYPE 是主分割å€ã€é‚輯分割å€ã€æ“´å……分割å€ä¹‹ä¸€\n" -#: parted/parted.c:167 +#: parted/parted.c:168 msgid "FS-TYPE is one of: " msgstr "FS-TYPE 是以下任æ„ä¸€é …ï¼š" -#: parted/parted.c:168 +#: parted/parted.c:169 msgid "" "START and END are disk locations, such as 4GB or 10%. Negative values count " "from the end of the disk. For example, -1s specifies exactly the last " @@ -2294,7 +2290,7 @@ msgstr "" "START å’Œ END 是ç£ç¢Ÿç”¨é‡ï¼Œåƒæ˜¯ 4GB 或 10%ã€‚è² æ•¸å€¼å‰‡æ˜¯å¾žç£ç¢Ÿæœ«ç«¯èµ·ç®—。例" "如，-1s 指定最後一個ç£å€ã€‚\n" -#: parted/parted.c:171 +#: parted/parted.c:172 msgid "" "END is disk location, such as 4GB or 10%. Negative value counts from the " "end of the disk. For example, -1s specifies exactly the last sector.\n" @@ -2302,19 +2298,23 @@ msgstr "" "END 是ç£ç¢Ÿç”¨é‡ï¼Œåƒæ˜¯ 4GB 或 10%ã€‚è² æ•¸å€¼å‰‡æ˜¯å¾žç£ç¢Ÿæœ«ç«¯èµ·ç®—。例如，-1s 指定最後" "一個ç£å€ã€‚\n" -#: parted/parted.c:174 +#: parted/parted.c:175 msgid "STATE is one of: on, off\n" msgstr "STATE 為：開ã€é—œ\n" -#: parted/parted.c:175 +#: parted/parted.c:176 msgid "DEVICE is usually /dev/hda or /dev/sda\n" msgstr "DEVICE 通常為 /dev/hda 或 /dev/sda\n" -#: parted/parted.c:176 +#: parted/parted.c:177 msgid "NAME is any word you want\n" msgstr "NAME 是您需è¦çš„任何單詞\n" -#: parted/parted.c:179 +#: parted/parted.c:178 +msgid "TYPE_ID is a value between 0x01 and 0xff, TYPE_UUID is a UUID\n" +msgstr "" + +#: parted/parted.c:182 msgid "" "Copyright (C) 1998 - 2006 Free Software Foundation, Inc.\n" "This program is free software, covered by the GNU General Public License.\n" @@ -2334,22 +2334,22 @@ msgstr "" "GNU 通用公共授權。\n" "\n" -#: parted/parted.c:229 +#: parted/parted.c:232 #, c-format msgid "%0.f%%\t(time left %.2d:%.2d)" msgstr "%0.f%%\t(剩餘時間 %.2d:%.2d)" -#: parted/parted.c:248 +#: parted/parted.c:251 #, c-format msgid "Partition %s is being used. Are you sure you want to continue?" msgstr "æ£åœ¨ä½¿ç”¨åˆ†å‰²å€ %s。您確定è¦ç¹¼çºŒå—Žï¼Ÿ" -#: parted/parted.c:269 +#: parted/parted.c:272 #, c-format msgid "Partition(s) on %s are being used." msgstr "æ£åœ¨ä½¿ç”¨ %s 上的分割å€ã€‚" -#: parted/parted.c:281 +#: parted/parted.c:284 #, c-format msgid "" "The existing disk label on %s will be destroyed and all data on this disk " @@ -2357,31 +2357,31 @@ msgid "" msgstr "" "ç¾æœ‰ %s 上的ç£ç¢Ÿæ¨™ç±¤å°‡è¢«éŠ·æ¯€ï¼Œè€Œæ‰€æœ‰åœ¨é€™å€‹ç£ç¢Ÿä¸Šçš„資料將會失去。您è¦ç¹¼çºŒå—Žï¼Ÿ" -#: parted/parted.c:542 +#: parted/parted.c:545 msgid "New disk label type?" msgstr "æ–°çš„ç£ç¢Ÿæ¨™ç±¤é¡žåž‹ï¼Ÿ" -#: parted/parted.c:680 +#: parted/parted.c:692 msgid "Partition type?" msgstr "分割å€é¡žåž‹ï¼Ÿ" -#: parted/parted.c:698 parted/parted.c:902 +#: parted/parted.c:710 parted/parted.c:914 msgid "Partition name?" msgstr "分割å€å稱？" -#: parted/parted.c:708 +#: parted/parted.c:720 msgid "File system type?" msgstr "檔案系統類型？" -#: parted/parted.c:713 parted/parted.c:1683 +#: parted/parted.c:725 parted/parted.c:1815 msgid "Start?" msgstr "起點？" -#: parted/parted.c:715 parted/parted.c:1685 parted/parted.c:1768 +#: parted/parted.c:727 parted/parted.c:1817 parted/parted.c:1900 msgid "End?" msgstr "終點？" -#: parted/parted.c:782 +#: parted/parted.c:794 #, c-format msgid "" "You requested a partition from %s to %s (sectors %llu..%llu).\n" @@ -2390,7 +2390,7 @@ msgstr "" "您è¦æ±‚將分割å€å¾ž %s 移動到 %s (ç£å€ %llu..%llu)。\n" "我們å¯ä»¥ç®¡ç†çš„最接近分割å€æ˜¯å¾ž %s 到 %s (ç£å€ %llu..%llu).%s" -#: parted/parted.c:791 +#: parted/parted.c:803 msgid "" "\n" "Is this still acceptable to you?" @@ -2398,93 +2398,118 @@ msgstr "" "\n" "這樣您還å¯ä»¥æŽ¥å—嗎？" -#: parted/parted.c:814 +#: parted/parted.c:826 #, c-format msgid "" "The resulting partition is not properly aligned for best performance: %s" msgstr "產生的分割å€ä¸¦æœªç‚ºæœ€å¤§åŒ–效能進行é©ç•¶å°é½Šï¼š%s" -#: parted/parted.c:816 parted/parted.c:1925 +#: parted/parted.c:828 parted/parted.c:2057 msgid "unknown (malloc failed)" msgstr "未知 (malloc 失敗)" -#: parted/parted.c:894 +#: parted/parted.c:906 #, c-format msgid "%s disk labels do not support partition name." msgstr "%s ç£ç¢Ÿæ¨™ç±¤ä¸æ”¯æ´åˆ†å‰²å€å稱。" -#: parted/parted.c:899 parted/parted.c:1748 parted/parted.c:1814 -#: parted/parted.c:1908 parted/parted.c:1983 +#: parted/parted.c:911 parted/parted.c:955 parted/parted.c:1880 +#: parted/parted.c:1946 parted/parted.c:2040 parted/parted.c:2115 msgid "Partition number?" msgstr "分割å€ç·¨è™Ÿï¼Ÿ" -#: parted/parted.c:1050 +#: parted/parted.c:949 +#, fuzzy, c-format +msgid "%s disk labels do not support partition type." +msgstr "%s ç£ç¢Ÿæ¨™ç±¤ä¸æ”¯æ´åˆ†å‰²å€å稱。" + +#: parted/parted.c:965 +#, fuzzy +msgid "Partition type-id?" +msgstr "分割å€é¡žåž‹ï¼Ÿ" + +#: parted/parted.c:972 +#, fuzzy +msgid "Invalid type-id." +msgstr "無效的編號。" + +#: parted/parted.c:986 +#, fuzzy +msgid "Partition type-uuid?" +msgstr "分割å€é¡žåž‹ï¼Ÿ" + +#: parted/parted.c:993 +#, fuzzy +msgid "Invalid type-uuid." +msgstr "無效的編號。" + +#: parted/parted.c:1146 #, c-format msgid "BIOS cylinder,head,sector geometry: %d,%d,%d. Each cylinder is %s.\n" msgstr "BIOS çš„ç£æŸ±ã€ç£é ã€ç£å€å¹¾ä½•çµæ§‹ï¼š%d,%d,%d。æ¯åœˆç£æŸ±æ˜¯ %s。\n" -#: parted/parted.c:1137 +#: parted/parted.c:1240 #, c-format msgid "Model: %s (%s)\n" msgstr "型號：%s (%s)\n" -#: parted/parted.c:1139 +#: parted/parted.c:1242 #, c-format msgid "Disk %s: %s\n" msgstr "ç£ç¢Ÿ %s：%s\n" -#: parted/parted.c:1140 +#: parted/parted.c:1243 #, c-format msgid "Sector size (logical/physical): %lldB/%lldB\n" msgstr "ç£å€å¤§å° (é‚輯/物ç†)：%lldB/%lldB\n" -#: parted/parted.c:1152 +#: parted/parted.c:1255 #, c-format msgid "Partition Table: %s\n" msgstr "分割å€ï¼š%s\n" -#: parted/parted.c:1153 +#: parted/parted.c:1256 #, c-format msgid "Disk Flags: %s\n" msgstr "ç£ç¢Ÿæ——標：%s\n" -#: parted/parted.c:1279 parted/parted.c:1282 +#: parted/parted.c:1388 parted/parted.c:1391 msgid "Number" msgstr "編號" -#: parted/parted.c:1279 parted/parted.c:1282 +#: parted/parted.c:1388 parted/parted.c:1391 msgid "Start" msgstr "起點" -#: parted/parted.c:1280 parted/parted.c:1283 +#: parted/parted.c:1389 parted/parted.c:1392 msgid "End" msgstr "終點" -#: parted/parted.c:1283 +#: parted/parted.c:1392 msgid "Size" msgstr "大å°" -#: parted/parted.c:1287 +#: parted/parted.c:1396 msgid "Type" msgstr "é¡žåž‹" -#: parted/parted.c:1289 +#: parted/parted.c:1398 msgid "File system" msgstr "檔案系統" -#: parted/parted.c:1292 +#: parted/parted.c:1401 msgid "Name" msgstr "å稱" -#: parted/parted.c:1294 +#: parted/parted.c:1403 msgid "Flags" msgstr "旗標" -#: parted/parted.c:1352 +#: parted/parted.c:1461 msgid "Free Space" msgstr "å¯ç”¨ç©ºé–“" -#: parted/parted.c:1570 +#: parted/parted.c:1702 #, c-format msgid "" "A %s %s partition was found at %s -> %s. Do you want to add it to the " @@ -2492,54 +2517,54 @@ msgid "" msgstr "" "在 %3$s -> %4$s 處找到一個 %1$s %2$s 分割å€ã€‚您希望將其新增到分割表ä¸å—Žï¼Ÿ" -#: parted/parted.c:1613 +#: parted/parted.c:1745 msgid "searching for file systems" msgstr "æ£åœ¨æœå°‹æª”案系統" -#: parted/parted.c:1720 +#: parted/parted.c:1852 msgid "The resize command has been removed in parted 3.0" msgstr "resize 指令已自 parted 3.0 ä¸ç§»é™¤" -#: parted/parted.c:1782 +#: parted/parted.c:1914 msgid "" "Shrinking a partition can cause data loss, are you sure you want to continue?" msgstr "收縮分割å€å¯èƒ½æœƒé€ æˆè³‡æ–™æ¼å¤±ï¼Œæ‚¨ç¢ºå®šè¦ç¹¼çºŒå—Žï¼Ÿ" -#: parted/parted.c:1838 +#: parted/parted.c:1970 msgid "New device?" msgstr "æ–°è£ç½®ï¼Ÿ" -#: parted/parted.c:1906 +#: parted/parted.c:2038 msgid "alignment type(min/opt)" msgstr "å°é½Šåž‹æ…‹ (最å°/最佳)" -#: parted/parted.c:1921 +#: parted/parted.c:2053 #, c-format msgid "%d aligned\n" msgstr "%d å·²å°é½Š\n" -#: parted/parted.c:1923 +#: parted/parted.c:2055 #, c-format msgid "%d not aligned: %s\n" msgstr "%d 未å°é½Šï¼š%s\n" -#: parted/parted.c:1948 parted/parted.c:1985 +#: parted/parted.c:2080 parted/parted.c:2117 msgid "Flag to Invert?" msgstr "è¦åå‘的旗標？" -#: parted/parted.c:1953 parted/parted.c:1990 +#: parted/parted.c:2085 parted/parted.c:2122 msgid "New state?" msgstr "新狀態？" -#: parted/parted.c:2036 +#: parted/parted.c:2168 msgid "Unit?" msgstr "å–®ä½ï¼Ÿ" -#: parted/parted.c:2171 +#: parted/parted.c:2303 msgid "align-check" msgstr "align-check" -#: parted/parted.c:2174 +#: parted/parted.c:2306 msgid "" "align-check TYPE N check partition N for TYPE(min|opt) " "alignment" @@ -2547,40 +2572,40 @@ msgstr "" "align-check TYPE N æª¢æŸ¥åˆ†å‰²å€ N 是å¦ç‚º TYPE(min|opt) å°" "齊模å¼" -#: parted/parted.c:2182 +#: parted/parted.c:2314 msgid "help" msgstr "help" -#: parted/parted.c:2185 +#: parted/parted.c:2317 msgid "" "help [COMMAND] print general help, or help on " "COMMAND" msgstr "" "help [COMMAND] 輸出一般性或 COMMAND 的求助訊æ¯" -#: parted/parted.c:2191 +#: parted/parted.c:2323 msgid "mklabel" msgstr "mklabel" -#: parted/parted.c:2191 +#: parted/parted.c:2323 msgid "mktable" msgstr "mktable" -#: parted/parted.c:2194 +#: parted/parted.c:2326 msgid "" "mklabel,mktable LABEL-TYPE create a new disklabel (partition " "table)" msgstr "mklabel,mktable LABEL-TYPE 建立新的ç£ç¢Ÿæ¨™ç±¤ï¼ˆåˆ†å‰²è¡¨ï¼‰" -#: parted/parted.c:2200 +#: parted/parted.c:2332 msgid "mkpart" msgstr "mkpart" -#: parted/parted.c:2203 +#: parted/parted.c:2335 msgid "mkpart PART-TYPE [FS-TYPE] START END make a partition" msgstr "mkpart PART-TYPE [FS-TYPE] START END 建立分割å€" -#: parted/parted.c:2209 +#: parted/parted.c:2341 msgid "" "'mkpart' makes a partition without creating a new file system on the " "partition. FS-TYPE may be specified to set an appropriate partition ID.\n" @@ -2588,19 +2613,19 @@ msgstr "" "「mkpartã€åªå»ºç«‹åˆ†å‰²å€ï¼Œè€Œä¸åœ¨åˆ†å‰²å€ä¸Šå»ºç«‹æ–°æª”案系統。å¯ä»¥æŒ‡å®šã€ŒFS-TYPEã€ï¼Œä¾†" "è¨å®šé©ç•¶çš„分割å€è˜åˆ¥ ID。\n" -#: parted/parted.c:2214 +#: parted/parted.c:2346 msgid "name" msgstr "name" -#: parted/parted.c:2217 +#: parted/parted.c:2349 msgid "name NUMBER NAME name partition NUMBER as NAME" msgstr "name NUMBER NAME å°‡åˆ†å‰²å€ NUMBER 命å為 NAME" -#: parted/parted.c:2222 +#: parted/parted.c:2354 msgid "print" msgstr "print" -#: parted/parted.c:2225 +#: parted/parted.c:2357 msgid "" "print [devices|free|list,all] display the partition table, or " "available devices, or free space, or all found partitions" @@ -2608,133 +2633,143 @@ msgstr "" "print [devices|free|list,all] 顯示分割表ã€å¯ç”¨è£ç½®ã€å‰©é¤˜ç©ºé–“，或找" "到的所有分割å€" -#: parted/parted.c:2229 +#: parted/parted.c:2361 msgid "" "Without arguments, 'print' displays the entire partition table. However with " "the following arguments it performs various other actions.\n" msgstr "" "「printã€ä¸åŠ 引數å¯é¡¯ç¤ºæ•´å€‹åˆ†å‰²è¡¨ã€‚然而傳入下列引數，它能執行å„種其他動作。\n" -#: parted/parted.c:2231 +#: parted/parted.c:2363 msgid " devices : display all active block devices\n" msgstr " devices : 顯示所有作用ä¸å€å¡Šè£ç½®\n" -#: parted/parted.c:2232 +#: parted/parted.c:2364 msgid "" " free : display information about free unpartitioned space on the " "current block device\n" msgstr " free : 顯示在目å‰å€å¡Šè£ç½®ä¸Šæœªåˆ†å‰²å¯ç”¨ç©ºé–“的資訊\n" -#: parted/parted.c:2234 +#: parted/parted.c:2366 msgid "" " list, all : display the partition tables of all active block devices\n" msgstr "" " list, all : 顯示所有作用ä¸å€å¡Šè£ç½®çš„分割表\n" "\n" -#: parted/parted.c:2238 +#: parted/parted.c:2370 msgid "quit" msgstr "quit" -#: parted/parted.c:2241 +#: parted/parted.c:2373 msgid "quit exit program" msgstr "quit 離開程å¼" -#: parted/parted.c:2246 +#: parted/parted.c:2378 msgid "rescue" msgstr "rescue" -#: parted/parted.c:2249 +#: parted/parted.c:2381 msgid "" "rescue START END rescue a lost partition near START " "and END" msgstr "" "rescue START END æ•‘æ´ START 到 END 附近的éºå¤±åˆ†å‰²è¡¨" -#: parted/parted.c:2255 +#: parted/parted.c:2387 msgid "resize" msgstr "resize" -#: parted/parted.c:2258 +#: parted/parted.c:2390 msgid "The resize command was removed in parted 3.0\n" msgstr "resize 指令已自 parted 3.0 ä¸ç§»é™¤\n" -#: parted/parted.c:2261 +#: parted/parted.c:2393 msgid "resizepart" msgstr "resizepart" -#: parted/parted.c:2264 +#: parted/parted.c:2396 msgid "resizepart NUMBER END resize partition NUMBER" msgstr "resizepart NUMBER END è®Šæ›´åˆ†å‰²å€ NUMBER 的大å°" -#: parted/parted.c:2269 +#: parted/parted.c:2401 msgid "rm" msgstr "rm" -#: parted/parted.c:2272 +#: parted/parted.c:2404 msgid "rm NUMBER delete partition NUMBER" msgstr "rm NUMBER åˆªé™¤åˆ†å‰²å€ NUMBER" -#: parted/parted.c:2277 +#: parted/parted.c:2409 msgid "select" msgstr "select" -#: parted/parted.c:2280 +#: parted/parted.c:2412 msgid "select DEVICE choose the device to edit" msgstr "select DEVICE é¸æ“‡è¦ç·¨è¼¯çš„è£ç½®" -#: parted/parted.c:2285 +#: parted/parted.c:2417 msgid "disk_set" msgstr "disk_set" -#: parted/parted.c:2288 +#: parted/parted.c:2420 msgid "" "disk_set FLAG STATE change the FLAG on selected device" msgstr "disk_set FLAG STATE 變更é¸å–è£ç½®çš„ FLAG" -#: parted/parted.c:2293 +#: parted/parted.c:2425 msgid "disk_toggle" msgstr "disk_toggle" -#: parted/parted.c:2296 +#: parted/parted.c:2428 msgid "" "disk_toggle [FLAG] toggle the state of FLAG on " "selected device" msgstr "disk_toggle [FLAG] 切æ›é¸å–è£ç½®ä¸Š FLAG 的狀態" -#: parted/parted.c:2302 +#: parted/parted.c:2434 msgid "set" msgstr "set" -#: parted/parted.c:2305 +#: parted/parted.c:2437 msgid "" "set NUMBER FLAG STATE change the FLAG on partition NUMBER" msgstr "set NUMBER FLAG STATE è®Šæ›´åˆ†å‰²å€ NUMBER 上的 FLAG" -#: parted/parted.c:2311 +#: parted/parted.c:2443 msgid "toggle" msgstr "toggle" -#: parted/parted.c:2314 +#: parted/parted.c:2446 msgid "" "toggle [NUMBER [FLAG]] toggle the state of FLAG on " "partition NUMBER" msgstr "" "toggle [NUMBER [FLAG]] è®Šæ›´åˆ†å‰²å€ NUMBER 上的 FLAG 狀態" -#: parted/parted.c:2320 +#: parted/parted.c:2452 +msgid "type" +msgstr "" + +#: parted/parted.c:2455 +msgid "" +"type NUMBER TYPE-ID or TYPE-UUID type set TYPE-ID or TYPE-UUID of " +"partition NUMBER" +msgstr "" + +#: parted/parted.c:2460 msgid "unit" msgstr "unit" -#: parted/parted.c:2323 +#: parted/parted.c:2463 msgid "unit UNIT set the default unit to UNIT" msgstr "unit UNIT å°‡é è¨å–®ä½è¨å®šç‚º UNIT" -#: parted/parted.c:2328 +#: parted/parted.c:2468 msgid "version" msgstr "version" -#: parted/parted.c:2331 +#: parted/parted.c:2471 msgid "" "version display the version number and " "copyright information of GNU Parted" @@ -2742,7 +2777,7 @@ msgstr "" "version é¡¯ç¤ºç›®å‰ GNU Parted 的版本號碼åŠç‰ˆæ¬Š" "資訊" -#: parted/parted.c:2335 +#: parted/parted.c:2475 msgid "" "'version' displays copyright and version information corresponding to this " "copy of GNU Parted\n" @@ -2750,20 +2785,20 @@ msgstr "" "「versionã€é¡¯ç¤ºå°æ‡‰æœ¬ GNU Parted 複本之版權åŠç‰ˆæœ¬è³‡è¨Š\n" "\n" -#: parted/parted.c:2405 +#: parted/parted.c:2545 #, c-format msgid "Usage: %s [-hlmsfv] [-a<align>] [DEVICE [COMMAND [PARAMETERS]]...]\n" msgstr "用法：%s [-hlmsfv] [-a<align>] [DEVICE [COMMAND [PARAMETERS]]…]\n" -#: parted/parted.c:2449 +#: parted/parted.c:2589 msgid "No device found" msgstr "找ä¸åˆ°è£ç½®" -#: parted/parted.c:2486 +#: parted/parted.c:2626 msgid "WARNING: You are not superuser. Watch out for permissions.\n" msgstr "è¦å‘Šï¼šæ‚¨ä¸æ˜¯ç³»çµ±ç®¡ç†è€…。 當心權é™ã€‚\n" -#: parted/parted.c:2519 +#: parted/parted.c:2659 msgid "" "You should reinstall your boot loader before rebooting. Read section 4 of " "the Parted User documentation for more information." @@ -2771,7 +2806,7 @@ msgstr "" "您應該在é‡æ–°å•Ÿå‹•ä¹‹å‰é‡æ–°å®‰è£æ‚¨çš„開機載入程å¼ã€‚詳情請閱讀 Parted 使用者文件的" "第四節。" -#: parted/parted.c:2526 +#: parted/parted.c:2666 msgid "You may need to update /etc/fstab.\n" msgstr "您也許會需è¦æ›´æ–° /etc/fstab。\n" @@ -3027,69 +3062,69 @@ msgstr "" "\n" "錯誤: é‡åˆ°ä¸€èˆ¬çš„ SIGILL 訊號。" -#: parted/ui.c:901 +#: parted/ui.c:904 #, c-format msgid "invalid token: %s" msgstr "無效的å—組：%s" -#: parted/ui.c:1082 +#: parted/ui.c:1085 msgid "Expecting a partition number." msgstr "需è¦åˆ†å‰²å€ç·¨è™Ÿã€‚" -#: parted/ui.c:1091 +#: parted/ui.c:1094 msgid "Partition doesn't exist." msgstr "分割å€ä¸å˜åœ¨ã€‚" -#: parted/ui.c:1111 +#: parted/ui.c:1114 msgid "Expecting a file system type." msgstr "需è¦æª”案系統類型。" -#: parted/ui.c:1118 +#: parted/ui.c:1121 #, c-format msgid "Unknown file system type \"%s\"." msgstr "ä¸æ˜Žçš„檔案系統類型「%sã€ã€‚" -#: parted/ui.c:1139 +#: parted/ui.c:1142 msgid "Expecting a disk label type." msgstr "需è¦ç£ç¢Ÿæ¨™ç±¤é¡žåž‹ã€‚" -#: parted/ui.c:1170 parted/ui.c:1206 +#: parted/ui.c:1173 parted/ui.c:1209 msgid "No flags supported" msgstr "沒有支æ´çš„旗標" -#: parted/ui.c:1280 +#: parted/ui.c:1283 msgid "Can't create any more partitions." msgstr "無法建立更多分割å€ã€‚" -#: parted/ui.c:1290 +#: parted/ui.c:1293 msgid "Expecting a partition type." msgstr "需è¦åˆ†å‰²å€é¡žåž‹ã€‚" -#: parted/ui.c:1439 +#: parted/ui.c:1442 msgid "on" msgstr "é–‹" -#: parted/ui.c:1440 +#: parted/ui.c:1443 msgid "off" msgstr "é—œ" -#: parted/ui.c:1457 +#: parted/ui.c:1460 msgid "optimal" msgstr "最佳" -#: parted/ui.c:1458 +#: parted/ui.c:1461 msgid "minimal" msgstr "最å°" -#: parted/ui.c:1591 +#: parted/ui.c:1594 msgid "OPTIONs:" msgstr "é¸é …：" -#: parted/ui.c:1596 +#: parted/ui.c:1599 msgid "COMMANDs:" msgstr "指令：" -#: parted/ui.c:1599 +#: parted/ui.c:1602 #, c-format msgid "" "\n" @@ -3098,15 +3133,22 @@ msgstr "" "\n" "å°‡éŒ¯èª¤å›žå ±çµ¦ %s\n" -#: parted/ui.c:1606 +#: parted/ui.c:1609 #, c-format msgid "Using %s\n" msgstr "使用 %s\n" -#: parted/ui.c:1686 +#: parted/ui.c:1689 msgid "This command does not make sense in non-interactive mode.\n" msgstr "這個指令在éžäº¤è«‡æ¨¡å¼ä¸ä¸å…·ä»»ä½•æ„義。\n" +#~ msgid "Extended partitions cannot be hidden on msdos disk labels." +#~ msgstr "擴充分割å€ç„¡æ³•éš±è—æ–¼ msdos ç£ç¢Ÿæ¨™ç±¤ä¹‹ä¸Šã€‚" + +#~ msgid "" +#~ "Extended partitions cannot be recovery partitions on msdos disk labels." +#~ msgstr "擴充分割å€ä¸èƒ½æ˜¯ msdos ç£ç¢Ÿæ¨™ç±¤ä¸Šçš„æ•‘æ´åˆ†å‰²å€ã€‚" + #~ msgid "%s: option '--%s' doesn't allow an argument\n" #~ msgstr "%s：é¸é …「--%sã€ä¸å…許有引數\n" diff --git a/scripts/extract_symvers b/scripts/extract_symvers index 0c030e2..7e87baa 100755 --- a/scripts/extract_symvers +++ b/scripts/extract_symvers @@ -1,6 +1,6 @@ #!/bin/sh -# Copyright (C) 2002-2003, 2007, 2009-2014, 2019-2022 Free Software Foundation, +# Copyright (C) 2002-2003, 2007, 2009-2014, 2019-2023 Free Software Foundation, # Inc. # # This file is part of the GNU ISO C++ Library. This library is free diff --git a/tests/Makefile.am b/tests/Makefile.am index 5cb7aa3..fa27b44 100644 --- a/tests/Makefile.am +++ b/tests/Makefile.am @@ -1,6 +1,3 @@ -XFAIL_TESTS = \ - t3200-type-change.sh - TEST_EXTENSIONS = .sh SH_LOG_COMPILER = $(SHELL) @@ -43,6 +40,10 @@ TESTS = \ t0501-duplicate.sh \ t0800-json-gpt.sh \ t0801-json-msdos.sh \ + t0900-type-gpt.sh \ + t0901-type-gpt-invalid.sh \ + t0910-type-dos.sh \ + t0911-type-dos-invalid.sh \ t1100-busy-label.sh \ t1101-busy-partition.sh \ t1102-loop-label.sh \ @@ -90,6 +91,8 @@ TESTS = \ t9021-maxima.sh \ t9022-one-unit-snap.sh \ t9023-value-lt-one.sh \ + t9024-msdos-1s-partition.sh \ + t9025-gpt-1s-partition.sh \ t9030-align-check.sh \ t9040-many-partitions.sh \ t9041-undetected-in-use-16th-partition.sh \ diff --git a/tests/Makefile.in b/tests/Makefile.in index 5bdc71c..d8546d2 100644 --- a/tests/Makefile.in +++ b/tests/Makefile.in @@ -69,9 +69,6 @@ am__make_running_with_option = \ test $$has_opt = yes am__make_dryrun = (target_option=n; $(am__make_running_with_option)) am__make_keepgoing = (target_option=k; $(am__make_running_with_option)) -pkgdatadir = $(datadir)/@PACKAGE@ -pkgincludedir = $(includedir)/@PACKAGE@ -pkglibdir = $(libdir)/@PACKAGE@ am__cd = CDPATH="$${ZSH_VERSION+.}$(PATH_SEPARATOR)" && cd install_sh_DATA = $(install_sh) -c -m 644 install_sh_PROGRAM = $(install_sh) -c @@ -95,7 +92,9 @@ am__aclocal_m4_deps = $(top_srcdir)/m4/00gnulib.m4 \ $(top_srcdir)/m4/__inline.m4 \ $(top_srcdir)/m4/absolute-header.m4 $(top_srcdir)/m4/alloca.m4 \ $(top_srcdir)/m4/arpa_inet_h.m4 $(top_srcdir)/m4/assert.m4 \ - $(top_srcdir)/m4/btowc.m4 $(top_srcdir)/m4/builtin-expect.m4 \ + $(top_srcdir)/m4/assert_h.m4 $(top_srcdir)/m4/btowc.m4 \ + $(top_srcdir)/m4/build-to-host.m4 \ + $(top_srcdir)/m4/builtin-expect.m4 $(top_srcdir)/m4/c-bool.m4 \ $(top_srcdir)/m4/calloc.m4 $(top_srcdir)/m4/canonicalize.m4 \ $(top_srcdir)/m4/clock_time.m4 $(top_srcdir)/m4/close.m4 \ $(top_srcdir)/m4/codeset.m4 $(top_srcdir)/m4/config-h.m4 \ @@ -103,7 +102,7 @@ am__aclocal_m4_deps = $(top_srcdir)/m4/00gnulib.m4 \ $(top_srcdir)/m4/double-slash-root.m4 $(top_srcdir)/m4/dup2.m4 \ $(top_srcdir)/m4/eealloc.m4 $(top_srcdir)/m4/environ.m4 \ $(top_srcdir)/m4/errno_h.m4 $(top_srcdir)/m4/error.m4 \ - $(top_srcdir)/m4/extensions.m4 \ + $(top_srcdir)/m4/error_h.m4 $(top_srcdir)/m4/extensions.m4 \ $(top_srcdir)/m4/extern-inline.m4 $(top_srcdir)/m4/fcntl-o.m4 \ $(top_srcdir)/m4/fcntl.m4 $(top_srcdir)/m4/fcntl_h.m4 \ $(top_srcdir)/m4/fdopen.m4 $(top_srcdir)/m4/flexmember.m4 \ @@ -135,10 +134,11 @@ am__aclocal_m4_deps = $(top_srcdir)/m4/00gnulib.m4 \ $(top_srcdir)/m4/malloc.m4 $(top_srcdir)/m4/malloca.m4 \ $(top_srcdir)/m4/manywarnings.m4 $(top_srcdir)/m4/mbrtowc.m4 \ $(top_srcdir)/m4/mbsinit.m4 $(top_srcdir)/m4/mbstate_t.m4 \ - $(top_srcdir)/m4/mbtowc.m4 $(top_srcdir)/m4/mempcpy.m4 \ - $(top_srcdir)/m4/minmax.m4 $(top_srcdir)/m4/mkdir.m4 \ - $(top_srcdir)/m4/mkstemp.m4 $(top_srcdir)/m4/mmap-anon.m4 \ - $(top_srcdir)/m4/mode_t.m4 $(top_srcdir)/m4/msvc-inval.m4 \ + $(top_srcdir)/m4/mbtowc.m4 $(top_srcdir)/m4/memchr.m4 \ + $(top_srcdir)/m4/mempcpy.m4 $(top_srcdir)/m4/minmax.m4 \ + $(top_srcdir)/m4/mkdir.m4 $(top_srcdir)/m4/mkstemp.m4 \ + $(top_srcdir)/m4/mmap-anon.m4 $(top_srcdir)/m4/mode_t.m4 \ + $(top_srcdir)/m4/msvc-inval.m4 \ $(top_srcdir)/m4/msvc-nothrow.m4 $(top_srcdir)/m4/multiarch.m4 \ $(top_srcdir)/m4/musl.m4 $(top_srcdir)/m4/nanosleep.m4 \ $(top_srcdir)/m4/netinet_in_h.m4 \ @@ -169,29 +169,29 @@ am__aclocal_m4_deps = $(top_srcdir)/m4/00gnulib.m4 \ $(top_srcdir)/m4/socklen.m4 $(top_srcdir)/m4/sockpfaf.m4 \ $(top_srcdir)/m4/ssize_t.m4 $(top_srcdir)/m4/stat-time.m4 \ $(top_srcdir)/m4/stat.m4 $(top_srcdir)/m4/stdalign.m4 \ - $(top_srcdir)/m4/stdarg.m4 $(top_srcdir)/m4/stdbool.m4 \ - $(top_srcdir)/m4/stddef_h.m4 $(top_srcdir)/m4/stdint.m4 \ - $(top_srcdir)/m4/stdio_h.m4 $(top_srcdir)/m4/stdlib_h.m4 \ - $(top_srcdir)/m4/strdup.m4 $(top_srcdir)/m4/strerror.m4 \ - $(top_srcdir)/m4/strerror_r.m4 $(top_srcdir)/m4/string_h.m4 \ - $(top_srcdir)/m4/strtoll.m4 $(top_srcdir)/m4/strtoull.m4 \ - $(top_srcdir)/m4/symlink.m4 $(top_srcdir)/m4/sys_ioctl_h.m4 \ + $(top_srcdir)/m4/stdarg.m4 $(top_srcdir)/m4/stddef_h.m4 \ + $(top_srcdir)/m4/stdint.m4 $(top_srcdir)/m4/stdio_h.m4 \ + $(top_srcdir)/m4/stdlib_h.m4 $(top_srcdir)/m4/strdup.m4 \ + $(top_srcdir)/m4/strerror.m4 $(top_srcdir)/m4/strerror_r.m4 \ + $(top_srcdir)/m4/string_h.m4 $(top_srcdir)/m4/strtoll.m4 \ + $(top_srcdir)/m4/strtoull.m4 $(top_srcdir)/m4/symlink.m4 \ + $(top_srcdir)/m4/sys_ioctl_h.m4 \ $(top_srcdir)/m4/sys_random_h.m4 \ $(top_srcdir)/m4/sys_select_h.m4 \ $(top_srcdir)/m4/sys_socket_h.m4 \ $(top_srcdir)/m4/sys_stat_h.m4 $(top_srcdir)/m4/sys_time_h.m4 \ $(top_srcdir)/m4/sys_types_h.m4 $(top_srcdir)/m4/sys_uio_h.m4 \ $(top_srcdir)/m4/tempname.m4 $(top_srcdir)/m4/thread.m4 \ - $(top_srcdir)/m4/threadlib.m4 $(top_srcdir)/m4/time_h.m4 \ - $(top_srcdir)/m4/unistd_h.m4 $(top_srcdir)/m4/unlink.m4 \ - $(top_srcdir)/m4/unlinkdir.m4 $(top_srcdir)/m4/usleep.m4 \ - $(top_srcdir)/m4/version-etc.m4 $(top_srcdir)/m4/visibility.m4 \ - $(top_srcdir)/m4/warn-on-use.m4 $(top_srcdir)/m4/warnings.m4 \ - $(top_srcdir)/m4/wchar_h.m4 $(top_srcdir)/m4/wchar_t.m4 \ - $(top_srcdir)/m4/wcrtomb.m4 $(top_srcdir)/m4/wctob.m4 \ - $(top_srcdir)/m4/wctomb.m4 $(top_srcdir)/m4/wctype_h.m4 \ - $(top_srcdir)/m4/wint_t.m4 $(top_srcdir)/m4/xalloc.m4 \ - $(top_srcdir)/m4/xstrtol.m4 $(top_srcdir)/m4/year2038.m4 \ + $(top_srcdir)/m4/threadlib.m4 $(top_srcdir)/m4/time.m4 \ + $(top_srcdir)/m4/time_h.m4 $(top_srcdir)/m4/unistd_h.m4 \ + $(top_srcdir)/m4/unlink.m4 $(top_srcdir)/m4/unlinkdir.m4 \ + $(top_srcdir)/m4/usleep.m4 $(top_srcdir)/m4/version-etc.m4 \ + $(top_srcdir)/m4/visibility.m4 $(top_srcdir)/m4/warn-on-use.m4 \ + $(top_srcdir)/m4/warnings.m4 $(top_srcdir)/m4/wchar_h.m4 \ + $(top_srcdir)/m4/wchar_t.m4 $(top_srcdir)/m4/wcrtomb.m4 \ + $(top_srcdir)/m4/wctob.m4 $(top_srcdir)/m4/wctomb.m4 \ + $(top_srcdir)/m4/wctype_h.m4 $(top_srcdir)/m4/wint_t.m4 \ + $(top_srcdir)/m4/xalloc.m4 $(top_srcdir)/m4/xstrtol.m4 \ $(top_srcdir)/m4/yield.m4 $(top_srcdir)/m4/zzgnulib.m4 \ $(top_srcdir)/configure.ac am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \ @@ -499,6 +499,9 @@ am__DIST_COMMON = $(srcdir)/Makefile.in \ $(top_srcdir)/build-aux/depcomp \ $(top_srcdir)/build-aux/test-driver DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST) +pkgdatadir = @pkgdatadir@ +pkgincludedir = @pkgincludedir@ +pkglibdir = @pkglibdir@ pkglibexecdir = @pkglibexecdir@ ACLOCAL = @ACLOCAL@ ALLOCA = @ALLOCA@ @@ -508,6 +511,7 @@ AM_DEFAULT_VERBOSITY = @AM_DEFAULT_VERBOSITY@ APPLE_UNIVERSAL_BUILD = @APPLE_UNIVERSAL_BUILD@ AR = @AR@ ARFLAGS = @ARFLAGS@ +ASSERT_H = @ASSERT_H@ AUTOCONF = @AUTOCONF@ AUTOHEADER = @AUTOHEADER@ AUTOMAKE = @AUTOMAKE@ @@ -524,6 +528,7 @@ CFLAGS = @CFLAGS@ CFLAG_VISIBILITY = @CFLAG_VISIBILITY@ CHECK_CFLAGS = @CHECK_CFLAGS@ CHECK_LIBS = @CHECK_LIBS@ +CLOCK_TIME_LIB = @CLOCK_TIME_LIB@ CONFIG_INCLUDE = @CONFIG_INCLUDE@ CPP = @CPP@ CPPFLAGS = @CPPFLAGS@ @@ -548,12 +553,14 @@ ENOLINK_VALUE = @ENOLINK_VALUE@ EOVERFLOW_HIDDEN = @EOVERFLOW_HIDDEN@ EOVERFLOW_VALUE = @EOVERFLOW_VALUE@ ERRNO_H = @ERRNO_H@ +ERROR_H = @ERROR_H@ ETAGS = @ETAGS@ EXEEXT = @EXEEXT@ FGREP = @FGREP@ FILECMD = @FILECMD@ GETOPT_CDEFS_H = @GETOPT_CDEFS_H@ GETOPT_H = @GETOPT_H@ +GETRANDOM_LIB = @GETRANDOM_LIB@ GETTEXT_MACRO_VERSION = @GETTEXT_MACRO_VERSION@ GL_CFLAG_ALLOW_WARNINGS = @GL_CFLAG_ALLOW_WARNINGS@ GL_CFLAG_GNULIB_WARNINGS = @GL_CFLAG_GNULIB_WARNINGS@ @@ -569,6 +576,7 @@ GL_GNULIB_CALLOC_GNU = @GL_GNULIB_CALLOC_GNU@ GL_GNULIB_CALLOC_POSIX = @GL_GNULIB_CALLOC_POSIX@ GL_GNULIB_CANONICALIZE_FILE_NAME = @GL_GNULIB_CANONICALIZE_FILE_NAME@ GL_GNULIB_CHDIR = @GL_GNULIB_CHDIR@ +GL_GNULIB_CHMOD = @GL_GNULIB_CHMOD@ GL_GNULIB_CHOWN = @GL_GNULIB_CHOWN@ GL_GNULIB_CLOSE = @GL_GNULIB_CLOSE@ GL_GNULIB_CONNECT = @GL_GNULIB_CONNECT@ @@ -642,6 +650,7 @@ GL_GNULIB_GETPAGESIZE = @GL_GNULIB_GETPAGESIZE@ GL_GNULIB_GETPASS = @GL_GNULIB_GETPASS@ GL_GNULIB_GETPASS_GNU = @GL_GNULIB_GETPASS_GNU@ GL_GNULIB_GETPEERNAME = @GL_GNULIB_GETPEERNAME@ +GL_GNULIB_GETPROGNAME = @GL_GNULIB_GETPROGNAME@ GL_GNULIB_GETRANDOM = @GL_GNULIB_GETRANDOM@ GL_GNULIB_GETSOCKNAME = @GL_GNULIB_GETSOCKNAME@ GL_GNULIB_GETSOCKOPT = @GL_GNULIB_GETSOCKOPT@ @@ -739,6 +748,7 @@ GL_GNULIB_MEMCHR = @GL_GNULIB_MEMCHR@ GL_GNULIB_MEMMEM = @GL_GNULIB_MEMMEM@ GL_GNULIB_MEMPCPY = @GL_GNULIB_MEMPCPY@ GL_GNULIB_MEMRCHR = @GL_GNULIB_MEMRCHR@ +GL_GNULIB_MEMSET_EXPLICIT = @GL_GNULIB_MEMSET_EXPLICIT@ GL_GNULIB_MKDIR = @GL_GNULIB_MKDIR@ GL_GNULIB_MKDIRAT = @GL_GNULIB_MKDIRAT@ GL_GNULIB_MKDTEMP = @GL_GNULIB_MKDTEMP@ @@ -859,6 +869,7 @@ GL_GNULIB_STRVERSCMP = @GL_GNULIB_STRVERSCMP@ GL_GNULIB_SYMLINK = @GL_GNULIB_SYMLINK@ GL_GNULIB_SYMLINKAT = @GL_GNULIB_SYMLINKAT@ GL_GNULIB_SYSTEM_POSIX = @GL_GNULIB_SYSTEM_POSIX@ +GL_GNULIB_TIME = @GL_GNULIB_TIME@ GL_GNULIB_TIMEGM = @GL_GNULIB_TIMEGM@ GL_GNULIB_TIMESPEC_GET = @GL_GNULIB_TIMESPEC_GET@ GL_GNULIB_TIMESPEC_GETRES = @GL_GNULIB_TIMESPEC_GETRES@ @@ -933,6 +944,7 @@ GMSGFMT_015 = @GMSGFMT_015@ GNULIBHEADERS_OVERRIDE_WINT_T = @GNULIBHEADERS_OVERRIDE_WINT_T@ GNULIB_GETTIMEOFDAY = @GNULIB_GETTIMEOFDAY@ GREP = @GREP@ +HARD_LOCALE_LIB = @HARD_LOCALE_LIB@ HAVE_ACCEPT4 = @HAVE_ACCEPT4@ HAVE_ALIGNED_ALLOC = @HAVE_ALIGNED_ALLOC@ HAVE_ALLOCA_H = @HAVE_ALLOCA_H@ @@ -963,6 +975,7 @@ HAVE_DECL_GETLOGIN = @HAVE_DECL_GETLOGIN@ HAVE_DECL_GETLOGIN_R = @HAVE_DECL_GETLOGIN_R@ HAVE_DECL_GETPAGESIZE = @HAVE_DECL_GETPAGESIZE@ HAVE_DECL_GETUSERSHELL = @HAVE_DECL_GETUSERSHELL@ +HAVE_DECL_GETW = @HAVE_DECL_GETW@ HAVE_DECL_IMAXABS = @HAVE_DECL_IMAXABS@ HAVE_DECL_IMAXDIV = @HAVE_DECL_IMAXDIV@ HAVE_DECL_INET_NTOP = @HAVE_DECL_INET_NTOP@ @@ -972,6 +985,7 @@ HAVE_DECL_LOCALTIME_R = @HAVE_DECL_LOCALTIME_R@ HAVE_DECL_MEMMEM = @HAVE_DECL_MEMMEM@ HAVE_DECL_MEMRCHR = @HAVE_DECL_MEMRCHR@ HAVE_DECL_OBSTACK_PRINTF = @HAVE_DECL_OBSTACK_PRINTF@ +HAVE_DECL_PUTW = @HAVE_DECL_PUTW@ HAVE_DECL_SETENV = @HAVE_DECL_SETENV@ HAVE_DECL_SETHOSTNAME = @HAVE_DECL_SETHOSTNAME@ HAVE_DECL_SETSTATE = @HAVE_DECL_SETSTATE@ @@ -994,6 +1008,9 @@ HAVE_DECL_WCWIDTH = @HAVE_DECL_WCWIDTH@ HAVE_DPRINTF = @HAVE_DPRINTF@ HAVE_DUP3 = @HAVE_DUP3@ HAVE_DUPLOCALE = @HAVE_DUPLOCALE@ +HAVE_ERROR = @HAVE_ERROR@ +HAVE_ERROR_AT_LINE = @HAVE_ERROR_AT_LINE@ +HAVE_ERROR_H = @HAVE_ERROR_H@ HAVE_EUIDACCESS = @HAVE_EUIDACCESS@ HAVE_EXECVPE = @HAVE_EXECVPE@ HAVE_EXPLICIT_BZERO = @HAVE_EXPLICIT_BZERO@ @@ -1021,12 +1038,15 @@ HAVE_GETLOGIN = @HAVE_GETLOGIN@ HAVE_GETOPT_H = @HAVE_GETOPT_H@ HAVE_GETPAGESIZE = @HAVE_GETPAGESIZE@ HAVE_GETPASS = @HAVE_GETPASS@ +HAVE_GETPROGNAME = @HAVE_GETPROGNAME@ HAVE_GETRANDOM = @HAVE_GETRANDOM@ HAVE_GETSUBOPT = @HAVE_GETSUBOPT@ HAVE_GETTIMEOFDAY = @HAVE_GETTIMEOFDAY@ HAVE_GETUMASK = @HAVE_GETUMASK@ HAVE_GRANTPT = @HAVE_GRANTPT@ HAVE_GROUP_MEMBER = @HAVE_GROUP_MEMBER@ +HAVE_IMAXABS = @HAVE_IMAXABS@ +HAVE_IMAXDIV = @HAVE_IMAXDIV@ HAVE_IMAXDIV_T = @HAVE_IMAXDIV_T@ HAVE_INITSTATE = @HAVE_INITSTATE@ HAVE_INTTYPES_H = @HAVE_INTTYPES_H@ @@ -1053,6 +1073,7 @@ HAVE_MBSNRTOWCS = @HAVE_MBSNRTOWCS@ HAVE_MBSRTOWCS = @HAVE_MBSRTOWCS@ HAVE_MBTOWC = @HAVE_MBTOWC@ HAVE_MEMPCPY = @HAVE_MEMPCPY@ +HAVE_MEMSET_EXPLICIT = @HAVE_MEMSET_EXPLICIT@ HAVE_MKDIRAT = @HAVE_MKDIRAT@ HAVE_MKDTEMP = @HAVE_MKDTEMP@ HAVE_MKFIFO = @HAVE_MKFIFO@ @@ -1261,7 +1282,6 @@ HAVE_WMEMPCPY = @HAVE_WMEMPCPY@ HAVE_WMEMSET = @HAVE_WMEMSET@ HAVE_WS2TCPIP_H = @HAVE_WS2TCPIP_H@ HAVE_XLOCALE_H = @HAVE_XLOCALE_H@ -HAVE__BOOL = @HAVE__BOOL@ HAVE__EXIT = @HAVE__EXIT@ IGNORE_UNUSED_LIBRARIES_CFLAGS = @IGNORE_UNUSED_LIBRARIES_CFLAGS@ INCLUDE_NEXT = @INCLUDE_NEXT@ @@ -1328,15 +1348,20 @@ LT_REVISION = @LT_REVISION@ LT_SYS_LIBRARY_PATH = @LT_SYS_LIBRARY_PATH@ MAKEINFO = @MAKEINFO@ MANIFEST_TOOL = @MANIFEST_TOOL@ +MBRTOWC_LIB = @MBRTOWC_LIB@ MKDIR_P = @MKDIR_P@ MSGFMT = @MSGFMT@ MSGFMT_015 = @MSGFMT_015@ MSGMERGE = @MSGMERGE@ +NANOSLEEP_LIB = @NANOSLEEP_LIB@ NETINET_IN_H = @NETINET_IN_H@ NEXT_ARPA_INET_H = @NEXT_ARPA_INET_H@ +NEXT_ASSERT_H = @NEXT_ASSERT_H@ NEXT_AS_FIRST_DIRECTIVE_ARPA_INET_H = @NEXT_AS_FIRST_DIRECTIVE_ARPA_INET_H@ +NEXT_AS_FIRST_DIRECTIVE_ASSERT_H = @NEXT_AS_FIRST_DIRECTIVE_ASSERT_H@ NEXT_AS_FIRST_DIRECTIVE_CTYPE_H = @NEXT_AS_FIRST_DIRECTIVE_CTYPE_H@ NEXT_AS_FIRST_DIRECTIVE_ERRNO_H = @NEXT_AS_FIRST_DIRECTIVE_ERRNO_H@ +NEXT_AS_FIRST_DIRECTIVE_ERROR_H = @NEXT_AS_FIRST_DIRECTIVE_ERROR_H@ NEXT_AS_FIRST_DIRECTIVE_FCNTL_H = @NEXT_AS_FIRST_DIRECTIVE_FCNTL_H@ NEXT_AS_FIRST_DIRECTIVE_GETOPT_H = @NEXT_AS_FIRST_DIRECTIVE_GETOPT_H@ NEXT_AS_FIRST_DIRECTIVE_INTTYPES_H = @NEXT_AS_FIRST_DIRECTIVE_INTTYPES_H@ @@ -1367,6 +1392,7 @@ NEXT_AS_FIRST_DIRECTIVE_WCHAR_H = @NEXT_AS_FIRST_DIRECTIVE_WCHAR_H@ NEXT_AS_FIRST_DIRECTIVE_WCTYPE_H = @NEXT_AS_FIRST_DIRECTIVE_WCTYPE_H@ NEXT_CTYPE_H = @NEXT_CTYPE_H@ NEXT_ERRNO_H = @NEXT_ERRNO_H@ +NEXT_ERROR_H = @NEXT_ERROR_H@ NEXT_FCNTL_H = @NEXT_FCNTL_H@ NEXT_GETOPT_H = @NEXT_GETOPT_H@ NEXT_INTTYPES_H = @NEXT_INTTYPES_H@ @@ -1422,6 +1448,7 @@ PRAGMA_COLUMNS = @PRAGMA_COLUMNS@ PRAGMA_SYSTEM_HEADER = @PRAGMA_SYSTEM_HEADER@ PRIPTR_PREFIX = @PRIPTR_PREFIX@ PTHREAD_H_DEFINES_STRUCT_TIMESPEC = @PTHREAD_H_DEFINES_STRUCT_TIMESPEC@ +PTHREAD_SIGMASK_LIB = @PTHREAD_SIGMASK_LIB@ PTRDIFF_T_SUFFIX = @PTRDIFF_T_SUFFIX@ RANLIB = @RANLIB@ REPLACE_ACCESS = @REPLACE_ACCESS@ @@ -1430,6 +1457,7 @@ REPLACE_BTOWC = @REPLACE_BTOWC@ REPLACE_CALLOC_FOR_CALLOC_GNU = @REPLACE_CALLOC_FOR_CALLOC_GNU@ REPLACE_CALLOC_FOR_CALLOC_POSIX = @REPLACE_CALLOC_FOR_CALLOC_POSIX@ REPLACE_CANONICALIZE_FILE_NAME = @REPLACE_CANONICALIZE_FILE_NAME@ +REPLACE_CHMOD = @REPLACE_CHMOD@ REPLACE_CHOWN = @REPLACE_CHOWN@ REPLACE_CLOSE = @REPLACE_CLOSE@ REPLACE_COPY_FILE_RANGE = @REPLACE_COPY_FILE_RANGE@ @@ -1438,7 +1466,10 @@ REPLACE_CTIME = @REPLACE_CTIME@ REPLACE_DPRINTF = @REPLACE_DPRINTF@ REPLACE_DUP = @REPLACE_DUP@ REPLACE_DUP2 = @REPLACE_DUP2@ +REPLACE_DUP3 = @REPLACE_DUP3@ REPLACE_DUPLOCALE = @REPLACE_DUPLOCALE@ +REPLACE_ERROR = @REPLACE_ERROR@ +REPLACE_ERROR_AT_LINE = @REPLACE_ERROR_AT_LINE@ REPLACE_EXECL = @REPLACE_EXECL@ REPLACE_EXECLE = @REPLACE_EXECLE@ REPLACE_EXECLP = @REPLACE_EXECLP@ @@ -1451,6 +1482,7 @@ REPLACE_FCHMODAT = @REPLACE_FCHMODAT@ REPLACE_FCHOWNAT = @REPLACE_FCHOWNAT@ REPLACE_FCLOSE = @REPLACE_FCLOSE@ REPLACE_FCNTL = @REPLACE_FCNTL@ +REPLACE_FDATASYNC = @REPLACE_FDATASYNC@ REPLACE_FDOPEN = @REPLACE_FDOPEN@ REPLACE_FFLUSH = @REPLACE_FFLUSH@ REPLACE_FFSLL = @REPLACE_FFSLL@ @@ -1473,15 +1505,21 @@ REPLACE_GETCWD = @REPLACE_GETCWD@ REPLACE_GETDELIM = @REPLACE_GETDELIM@ REPLACE_GETDOMAINNAME = @REPLACE_GETDOMAINNAME@ REPLACE_GETDTABLESIZE = @REPLACE_GETDTABLESIZE@ +REPLACE_GETENTROPY = @REPLACE_GETENTROPY@ REPLACE_GETGROUPS = @REPLACE_GETGROUPS@ REPLACE_GETLINE = @REPLACE_GETLINE@ +REPLACE_GETLOADAVG = @REPLACE_GETLOADAVG@ REPLACE_GETLOGIN_R = @REPLACE_GETLOGIN_R@ REPLACE_GETPAGESIZE = @REPLACE_GETPAGESIZE@ REPLACE_GETPASS = @REPLACE_GETPASS@ REPLACE_GETPASS_FOR_GETPASS_GNU = @REPLACE_GETPASS_FOR_GETPASS_GNU@ +REPLACE_GETPROGNAME = @REPLACE_GETPROGNAME@ REPLACE_GETRANDOM = @REPLACE_GETRANDOM@ +REPLACE_GETSUBOPT = @REPLACE_GETSUBOPT@ REPLACE_GETTIMEOFDAY = @REPLACE_GETTIMEOFDAY@ REPLACE_GMTIME = @REPLACE_GMTIME@ +REPLACE_IMAXABS = @REPLACE_IMAXABS@ +REPLACE_IMAXDIV = @REPLACE_IMAXDIV@ REPLACE_INET_NTOP = @REPLACE_INET_NTOP@ REPLACE_INET_PTON = @REPLACE_INET_PTON@ REPLACE_INITSTATE = @REPLACE_INITSTATE@ @@ -1510,11 +1548,14 @@ REPLACE_MBSTATE_T = @REPLACE_MBSTATE_T@ REPLACE_MBTOWC = @REPLACE_MBTOWC@ REPLACE_MEMCHR = @REPLACE_MEMCHR@ REPLACE_MEMMEM = @REPLACE_MEMMEM@ +REPLACE_MEMPCPY = @REPLACE_MEMPCPY@ REPLACE_MKDIR = @REPLACE_MKDIR@ REPLACE_MKFIFO = @REPLACE_MKFIFO@ REPLACE_MKFIFOAT = @REPLACE_MKFIFOAT@ REPLACE_MKNOD = @REPLACE_MKNOD@ REPLACE_MKNODAT = @REPLACE_MKNODAT@ +REPLACE_MKOSTEMP = @REPLACE_MKOSTEMP@ +REPLACE_MKOSTEMPS = @REPLACE_MKOSTEMPS@ REPLACE_MKSTEMP = @REPLACE_MKSTEMP@ REPLACE_MKTIME = @REPLACE_MKTIME@ REPLACE_NANOSLEEP = @REPLACE_NANOSLEEP@ @@ -1525,8 +1566,10 @@ REPLACE_OBSTACK_PRINTF = @REPLACE_OBSTACK_PRINTF@ REPLACE_OPEN = @REPLACE_OPEN@ REPLACE_OPENAT = @REPLACE_OPENAT@ REPLACE_PERROR = @REPLACE_PERROR@ +REPLACE_PIPE2 = @REPLACE_PIPE2@ REPLACE_POPEN = @REPLACE_POPEN@ REPLACE_POSIX_MEMALIGN = @REPLACE_POSIX_MEMALIGN@ +REPLACE_POSIX_OPENPT = @REPLACE_POSIX_OPENPT@ REPLACE_PREAD = @REPLACE_PREAD@ REPLACE_PRINTF = @REPLACE_PRINTF@ REPLACE_PSELECT = @REPLACE_PSELECT@ @@ -1604,6 +1647,7 @@ REPLACE_RMDIR = @REPLACE_RMDIR@ REPLACE_SCHED_YIELD = @REPLACE_SCHED_YIELD@ REPLACE_SELECT = @REPLACE_SELECT@ REPLACE_SETENV = @REPLACE_SETENV@ +REPLACE_SETHOSTNAME = @REPLACE_SETHOSTNAME@ REPLACE_SETLOCALE = @REPLACE_SETLOCALE@ REPLACE_SETSTATE = @REPLACE_SETSTATE@ REPLACE_SLEEP = @REPLACE_SLEEP@ @@ -1612,6 +1656,7 @@ REPLACE_SPRINTF = @REPLACE_SPRINTF@ REPLACE_STAT = @REPLACE_STAT@ REPLACE_STDIO_READ_FUNCS = @REPLACE_STDIO_READ_FUNCS@ REPLACE_STDIO_WRITE_FUNCS = @REPLACE_STDIO_WRITE_FUNCS@ +REPLACE_STPCPY = @REPLACE_STPCPY@ REPLACE_STPNCPY = @REPLACE_STPNCPY@ REPLACE_STRCASESTR = @REPLACE_STRCASESTR@ REPLACE_STRCHRNUL = @REPLACE_STRCHRNUL@ @@ -1638,7 +1683,9 @@ REPLACE_STRUCT_LCONV = @REPLACE_STRUCT_LCONV@ REPLACE_STRUCT_TIMEVAL = @REPLACE_STRUCT_TIMEVAL@ REPLACE_SYMLINK = @REPLACE_SYMLINK@ REPLACE_SYMLINKAT = @REPLACE_SYMLINKAT@ +REPLACE_TIME = @REPLACE_TIME@ REPLACE_TIMEGM = @REPLACE_TIMEGM@ +REPLACE_TIMESPEC_GET = @REPLACE_TIMESPEC_GET@ REPLACE_TMPFILE = @REPLACE_TMPFILE@ REPLACE_TOWLOWER = @REPLACE_TOWLOWER@ REPLACE_TRUNCATE = @REPLACE_TRUNCATE@ @@ -1664,15 +1711,20 @@ REPLACE_WCSWIDTH = @REPLACE_WCSWIDTH@ REPLACE_WCTOB = @REPLACE_WCTOB@ REPLACE_WCTOMB = @REPLACE_WCTOMB@ REPLACE_WCWIDTH = @REPLACE_WCWIDTH@ +REPLACE_WMEMPCPY = @REPLACE_WMEMPCPY@ REPLACE_WRITE = @REPLACE_WRITE@ +REPLACE__EXIT = @REPLACE__EXIT@ +SCHED_YIELD_LIB = @SCHED_YIELD_LIB@ SED = @SED@ +SELECT_LIB = @SELECT_LIB@ +SETLOCALE_LIB = @SETLOCALE_LIB@ +SETLOCALE_NULL_LIB = @SETLOCALE_NULL_LIB@ SET_MAKE = @SET_MAKE@ SHELL = @SHELL@ SIG_ATOMIC_T_SUFFIX = @SIG_ATOMIC_T_SUFFIX@ SIZE_T_SUFFIX = @SIZE_T_SUFFIX@ -STDALIGN_H = @STDALIGN_H@ STDARG_H = @STDARG_H@ -STDBOOL_H = @STDBOOL_H@ +STDCKDINT_H = @STDCKDINT_H@ STDDEF_H = @STDDEF_H@ STDINT_H = @STDINT_H@ STRIP = @STRIP@ @@ -1716,6 +1768,8 @@ am__quote = @am__quote@ am__tar = @am__tar@ am__untar = @am__untar@ bindir = @bindir@ +bindir_c = @bindir_c@ +bindir_c_make = @bindir_c_make@ build = @build@ build_alias = @build_alias@ build_cpu = @build_cpu@ @@ -1723,10 +1777,20 @@ build_os = @build_os@ build_vendor = @build_vendor@ builddir = @builddir@ datadir = @datadir@ +datadir_c = @datadir_c@ +datadir_c_make = @datadir_c_make@ datarootdir = @datarootdir@ +datarootdir_c = @datarootdir_c@ +datarootdir_c_make = @datarootdir_c_make@ docdir = @docdir@ +docdir_c = @docdir_c@ +docdir_c_make = @docdir_c_make@ dvidir = @dvidir@ +dvidir_c = @dvidir_c@ +dvidir_c_make = @dvidir_c_make@ exec_prefix = @exec_prefix@ +exec_prefix_c = @exec_prefix_c@ +exec_prefix_c_make = @exec_prefix_c_make@ gl_LIBOBJDEPS = @gl_LIBOBJDEPS@ gl_LIBOBJS = @gl_LIBOBJS@ gl_LTLIBOBJS = @gl_LTLIBOBJS@ @@ -1740,33 +1804,72 @@ host_cpu = @host_cpu@ host_os = @host_os@ host_vendor = @host_vendor@ htmldir = @htmldir@ +htmldir_c = @htmldir_c@ +htmldir_c_make = @htmldir_c_make@ includedir = @includedir@ +includedir_c = @includedir_c@ +includedir_c_make = @includedir_c_make@ infodir = @infodir@ +infodir_c = @infodir_c@ +infodir_c_make = @infodir_c_make@ install_sh = @install_sh@ libdir = @libdir@ +libdir_c = @libdir_c@ +libdir_c_make = @libdir_c_make@ libexecdir = @libexecdir@ +libexecdir_c = @libexecdir_c@ +libexecdir_c_make = @libexecdir_c_make@ lispdir = @lispdir@ +lispdir_c = @lispdir_c@ +lispdir_c_make = @lispdir_c_make@ localedir = @localedir@ +localedir_c = @localedir_c@ +localedir_c_make = @localedir_c_make@ localstatedir = @localstatedir@ +localstatedir_c = @localstatedir_c@ +localstatedir_c_make = @localstatedir_c_make@ mandir = @mandir@ +mandir_c = @mandir_c@ +mandir_c_make = @mandir_c_make@ mkdir_p = @mkdir_p@ oldincludedir = @oldincludedir@ +oldincludedir_c = @oldincludedir_c@ +oldincludedir_c_make = @oldincludedir_c_make@ pdfdir = @pdfdir@ +pdfdir_c = @pdfdir_c@ +pdfdir_c_make = @pdfdir_c_make@ +pkgdatadir_c = @pkgdatadir_c@ +pkgdatadir_c_make = @pkgdatadir_c_make@ +pkgincludedir_c = @pkgincludedir_c@ +pkgincludedir_c_make = @pkgincludedir_c_make@ +pkglibdir_c = @pkglibdir_c@ +pkglibdir_c_make = @pkglibdir_c_make@ +pkglibexecdir_c = @pkglibexecdir_c@ +pkglibexecdir_c_make = @pkglibexecdir_c_make@ prefix = @prefix@ +prefix_c = @prefix_c@ +prefix_c_make = @prefix_c_make@ program_transform_name = @program_transform_name@ psdir = @psdir@ +psdir_c = @psdir_c@ +psdir_c_make = @psdir_c_make@ runstatedir = @runstatedir@ +runstatedir_c = @runstatedir_c@ +runstatedir_c_make = @runstatedir_c_make@ sbindir = @sbindir@ +sbindir_c = @sbindir_c@ +sbindir_c_make = @sbindir_c_make@ sharedstatedir = @sharedstatedir@ +sharedstatedir_c = @sharedstatedir_c@ +sharedstatedir_c_make = @sharedstatedir_c_make@ srcdir = @srcdir@ sysconfdir = @sysconfdir@ +sysconfdir_c = @sysconfdir_c@ +sysconfdir_c_make = @sysconfdir_c_make@ target_alias = @target_alias@ top_build_prefix = @top_build_prefix@ top_builddir = @top_builddir@ top_srcdir = @top_srcdir@ -XFAIL_TESTS = \ - t3200-type-change.sh - TEST_EXTENSIONS = .sh SH_LOG_COMPILER = $(SHELL) TESTS = \ @@ -1808,6 +1911,10 @@ TESTS = \ t0501-duplicate.sh \ t0800-json-gpt.sh \ t0801-json-msdos.sh \ + t0900-type-gpt.sh \ + t0901-type-gpt-invalid.sh \ + t0910-type-dos.sh \ + t0911-type-dos-invalid.sh \ t1100-busy-label.sh \ t1101-busy-partition.sh \ t1102-loop-label.sh \ @@ -1855,6 +1962,8 @@ TESTS = \ t9021-maxima.sh \ t9022-one-unit-snap.sh \ t9023-value-lt-one.sh \ + t9024-msdos-1s-partition.sh \ + t9025-gpt-1s-partition.sh \ t9030-align-check.sh \ t9040-many-partitions.sh \ t9041-undetected-in-use-16th-partition.sh \ diff --git a/tests/help-version.sh b/tests/help-version.sh index a00499a..e88cd13 100755 --- a/tests/help-version.sh +++ b/tests/help-version.sh @@ -2,7 +2,7 @@ # Make sure all these programs work properly # when invoked with --help or --version. -# Copyright (C) 2000-2014, 2019-2022 Free Software Foundation, Inc. +# Copyright (C) 2000-2014, 2019-2023 Free Software Foundation, Inc. # This program is free software: you can redistribute it and/or modify # it under the terms of the GNU General Public License as published by diff --git a/tests/init.sh b/tests/init.sh index 31a75e5..e857272 100644 --- a/tests/init.sh +++ b/tests/init.sh @@ -1,6 +1,6 @@ # source this file; set up for tests -# Copyright (C) 2009-2014, 2019-2022 Free Software Foundation, Inc. +# Copyright (C) 2009-2014, 2019-2023 Free Software Foundation, Inc. # This program is free software: you can redistribute it and/or modify # it under the terms of the GNU General Public License as published by diff --git a/tests/t-lib-helpers.sh b/tests/t-lib-helpers.sh index 33151bb..a1d3c30 100644 --- a/tests/t-lib-helpers.sh +++ b/tests/t-lib-helpers.sh @@ -425,6 +425,6 @@ require_64bit_() # Ruturns 0 if the filesystem is available, otherwise skips the test require_filesystem_() { - grep -q $1 /proc/filesystems && return 0 + grep $1 /proc/filesystems >/dev/null && return 0 modprobe --quiet --dry-run $1 || skip_ "this test requires kernel support for $1" } diff --git a/tests/t0000-basic.sh b/tests/t0000-basic.sh index c03be33..d81dd0c 100755 --- a/tests/t0000-basic.sh +++ b/tests/t0000-basic.sh @@ -1,7 +1,7 @@ #!/bin/sh # Ensure that a simple command using -s succeeds with no prompt -# Copyright (C) 2007, 2009-2014, 2019-2022 Free Software Foundation, Inc. +# Copyright (C) 2007, 2009-2014, 2019-2023 Free Software Foundation, Inc. # This program is free software; you can redistribute it and/or modify # it under the terms of the GNU General Public License as published by diff --git a/tests/t0001-tiny.sh b/tests/t0001-tiny.sh index badbc46..6a78de4 100755 --- a/tests/t0001-tiny.sh +++ b/tests/t0001-tiny.sh @@ -1,7 +1,7 @@ #!/bin/sh # operate on a very small (1-sector) "disk" -# Copyright (C) 2009-2014, 2019-2022 Free Software Foundation, Inc. +# Copyright (C) 2009-2014, 2019-2023 Free Software Foundation, Inc. # This program is free software; you can redistribute it and/or modify # it under the terms of the GNU General Public License as published by diff --git a/tests/t0010-script-no-ctrl-chars.sh b/tests/t0010-script-no-ctrl-chars.sh index 92b7e91..c62e15e 100755 --- a/tests/t0010-script-no-ctrl-chars.sh +++ b/tests/t0010-script-no-ctrl-chars.sh @@ -1,7 +1,7 @@ #!/bin/sh # Ensure that printing with -s outputs no readline control chars -# Copyright (C) 2009-2014, 2019-2022 Free Software Foundation, Inc. +# Copyright (C) 2009-2014, 2019-2023 Free Software Foundation, Inc. # This program is free software; you can redistribute it and/or modify # it under the terms of the GNU General Public License as published by diff --git a/tests/t0100-print.sh b/tests/t0100-print.sh index 8d27d22..a69daa9 100755 --- a/tests/t0100-print.sh +++ b/tests/t0100-print.sh @@ -1,6 +1,6 @@ #!/bin/sh # the most basic 'print' test -# Copyright (C) 2007, 2009-2014, 2019-2022 Free Software Foundation, Inc. +# Copyright (C) 2007, 2009-2014, 2019-2023 Free Software Foundation, Inc. # This program is free software; you can redistribute it and/or modify # it under the terms of the GNU General Public License as published by diff --git a/tests/t0101-print-empty.sh b/tests/t0101-print-empty.sh index 6190d12..bd328e3 100755 --- a/tests/t0101-print-empty.sh +++ b/tests/t0101-print-empty.sh @@ -1,6 +1,6 @@ #!/bin/sh # test 'parted $dev print' on empty device (without label) -# Copyright (C) 2011-2014, 2019-2022 Free Software Foundation, Inc. +# Copyright (C) 2011-2014, 2019-2023 Free Software Foundation, Inc. # This program is free software; you can redistribute it and/or modify # it under the terms of the GNU General Public License as published by diff --git a/tests/t0200-gpt.sh b/tests/t0200-gpt.sh index bddee3c..cc0daaa 100755 --- a/tests/t0200-gpt.sh +++ b/tests/t0200-gpt.sh @@ -1,7 +1,7 @@ #!/bin/sh # Ensure that printing a GPT partition table does not modify it. -# Copyright (C) 2009-2014, 2019-2022 Free Software Foundation, Inc. +# Copyright (C) 2009-2014, 2019-2023 Free Software Foundation, Inc. # This program is free software; you can redistribute it and/or modify # it under the terms of the GNU General Public License as published by diff --git a/tests/t0201-gpt.sh b/tests/t0201-gpt.sh index bbf0251..1a90d40 100755 --- a/tests/t0201-gpt.sh +++ b/tests/t0201-gpt.sh @@ -2,7 +2,7 @@ # avoid failed assertion when creating a GPT on top of an old one for a # larger device -# Copyright (C) 2009-2014, 2019-2022 Free Software Foundation, Inc. +# Copyright (C) 2009-2014, 2019-2023 Free Software Foundation, Inc. # This program is free software; you can redistribute it and/or modify # it under the terms of the GNU General Public License as published by diff --git a/tests/t0202-gpt-pmbr.sh b/tests/t0202-gpt-pmbr.sh index 03e4572..1b475bf 100755 --- a/tests/t0202-gpt-pmbr.sh +++ b/tests/t0202-gpt-pmbr.sh @@ -1,7 +1,7 @@ #!/bin/sh # Preserve first 446B of the Protected MBR for gpt partitions. -# Copyright (C) 2009-2014, 2019-2022 Free Software Foundation, Inc. +# Copyright (C) 2009-2014, 2019-2023 Free Software Foundation, Inc. # This program is free software; you can redistribute it and/or modify # it under the terms of the GNU General Public License as published by diff --git a/tests/t0203-gpt-create-on-min-sized-device.sh b/tests/t0203-gpt-create-on-min-sized-device.sh index be95ae0..82b2a89 100644 --- a/tests/t0203-gpt-create-on-min-sized-device.sh +++ b/tests/t0203-gpt-create-on-min-sized-device.sh @@ -2,7 +2,7 @@ # parted 3.1 and prior would exit with no diagnostic when failing # to create a GPT partition table on a device that was too small. -# Copyright (C) 2012-2014, 2019-2022 Free Software Foundation, Inc. +# Copyright (C) 2012-2014, 2019-2023 Free Software Foundation, Inc. # This program is free software; you can redistribute it and/or modify # it under the terms of the GNU General Public License as published by diff --git a/tests/t0203-gpt-shortened-device-primary-valid.sh b/tests/t0203-gpt-shortened-device-primary-valid.sh index 40a8161..91e52ed 100755 --- a/tests/t0203-gpt-shortened-device-primary-valid.sh +++ b/tests/t0203-gpt-shortened-device-primary-valid.sh @@ -2,7 +2,7 @@ # Demonstrate that placing a valid gpt-labeled image on a shorter device # does not invalidate the primary GPT header. -# Copyright (C) 2012-2014, 2019-2022 Free Software Foundation, Inc. +# Copyright (C) 2012-2014, 2019-2023 Free Software Foundation, Inc. # This program is free software; you can redistribute it and/or modify # it under the terms of the GNU General Public License as published by diff --git a/tests/t0203-gpt-tiny-device-abort.sh b/tests/t0203-gpt-tiny-device-abort.sh index 0d66f8f..e1aae12 100644 --- a/tests/t0203-gpt-tiny-device-abort.sh +++ b/tests/t0203-gpt-tiny-device-abort.sh @@ -2,7 +2,7 @@ # parted before 3.1 could abort while reading a pathologically small device # with a valid primary GPT header but no room for the backup header. -# Copyright (C) 2009-2014, 2019-2022 Free Software Foundation, Inc. +# Copyright (C) 2009-2014, 2019-2023 Free Software Foundation, Inc. # This program is free software; you can redistribute it and/or modify # it under the terms of the GNU General Public License as published by diff --git a/tests/t0205-gpt-list-clobbers-pmbr.sh b/tests/t0205-gpt-list-clobbers-pmbr.sh index 307c754..7bb79f9 100644 --- a/tests/t0205-gpt-list-clobbers-pmbr.sh +++ b/tests/t0205-gpt-list-clobbers-pmbr.sh @@ -5,7 +5,7 @@ # GPT/MBR table, merely listing the table with Parted-2.1 would clobber # the MBR part. -# Copyright (C) 2010-2014, 2019-2022 Free Software Foundation, Inc. +# Copyright (C) 2010-2014, 2019-2023 Free Software Foundation, Inc. # This program is free software; you can redistribute it and/or modify # it under the terms of the GNU General Public License as published by diff --git a/tests/t0206-gpt-print-with-corrupt-primary-clobbers-pmbr.sh b/tests/t0206-gpt-print-with-corrupt-primary-clobbers-pmbr.sh index 3c034c5..6611158 100755 --- a/tests/t0206-gpt-print-with-corrupt-primary-clobbers-pmbr.sh +++ b/tests/t0206-gpt-print-with-corrupt-primary-clobbers-pmbr.sh @@ -3,7 +3,7 @@ # Much like t0205, but with the addition of a corrupt PTE in primary table, # "parted $device print" would modify $device. -# Copyright (C) 2010-2014, 2019-2022 Free Software Foundation, Inc. +# Copyright (C) 2010-2014, 2019-2023 Free Software Foundation, Inc. # This program is free software; you can redistribute it and/or modify # it under the terms of the GNU General Public License as published by diff --git a/tests/t0207-IEC-binary-notation.sh b/tests/t0207-IEC-binary-notation.sh index d9bbad6..9d18ae8 100644 --- a/tests/t0207-IEC-binary-notation.sh +++ b/tests/t0207-IEC-binary-notation.sh @@ -1,7 +1,7 @@ #!/bin/sh # Show how parted treats a starting or ending sector number w/IEC units. -# Copyright (C) 2011-2014, 2019-2022 Free Software Foundation, Inc. +# Copyright (C) 2011-2014, 2019-2023 Free Software Foundation, Inc. # This program is free software; you can redistribute it and/or modify # it under the terms of the GNU General Public License as published by @@ -28,6 +28,7 @@ parted --align=none -s $dev mklabel gpt mkpart p1 $((64*1024))B $((1024*1024-$ss compare /dev/null err || fail=1 parted -m -s $dev u s p > exp || fail=1 +# Test using MiB rm $dev dd if=/dev/null of=$dev bs=$ss seek=$n_sectors || fail=1 parted --align=none -s $dev mklabel gpt mkpart p1 64KiB 1MiB \ @@ -37,4 +38,34 @@ parted -m -s $dev u s p > out || fail=1 compare exp out || fail=1 +# Test using lower case kib and mib +rm $dev +dd if=/dev/null of=$dev bs=$ss seek=$n_sectors || fail=1 +parted --align=none -s $dev mklabel gpt mkpart p1 64kib 1mib \ + > err 2>&1 || fail=1 +compare /dev/null err || fail=1 +parted -m -s $dev u s p > out || fail=1 + +compare exp out || fail=1 + +# Test using KiB +rm $dev +dd if=/dev/null of=$dev bs=$ss seek=$n_sectors || fail=1 +parted --align=none -s $dev mklabel gpt mkpart p1 64KiB 1024KiB \ + > err 2>&1 || fail=1 +compare /dev/null err || fail=1 +parted -m -s $dev u s p > out || fail=1 + +compare exp out || fail=1 + +# Test using kiB +rm $dev +dd if=/dev/null of=$dev bs=$ss seek=$n_sectors || fail=1 +parted --align=none -s $dev mklabel gpt mkpart p1 64kiB 1024kiB \ + > err 2>&1 || fail=1 +compare /dev/null err || fail=1 +parted -m -s $dev u s p > out || fail=1 + +compare exp out || fail=1 + Exit $fail diff --git a/tests/t0208-mkpart-end-in-IEC.sh b/tests/t0208-mkpart-end-in-IEC.sh index 118ec72..198cccb 100644 --- a/tests/t0208-mkpart-end-in-IEC.sh +++ b/tests/t0208-mkpart-end-in-IEC.sh @@ -2,7 +2,7 @@ # Make sure parted mkpart ends the partition one sector before the specified # value if end is specified with IEC units. -# Copyright (C) 2011-2014, 2019-2022 Free Software Foundation, Inc. +# Copyright (C) 2011-2014, 2019-2023 Free Software Foundation, Inc. # This program is free software; you can redistribute it and/or modify # it under the terms of the GNU General Public License as published by @@ -25,7 +25,7 @@ dev=dev-file dd if=/dev/null of=$dev bs=1M seek=$n_mbs || fail=1 # create 1st partition -parted --align=none -s $dev mklabel gpt mkpart p1 1MiB 2MiB > err 2>&1 || fail=1 +parted --align=none -s $dev mklabel gpt mkpart p1 1MiB 2048KiB > err 2>&1 || fail=1 compare /dev/null err || fail=1 # expect no output #parted -m -s $dev u s p > exp || fail=1 diff --git a/tests/t0209-gpt-pmbr_boot.sh b/tests/t0209-gpt-pmbr_boot.sh index 64520b1..ceecf33 100755 --- a/tests/t0209-gpt-pmbr_boot.sh +++ b/tests/t0209-gpt-pmbr_boot.sh @@ -1,7 +1,7 @@ #!/bin/sh # Ensure that pmbr_boot flag can be set -# Copyright (C) 2012-2014, 2019-2022 Free Software Foundation, Inc. +# Copyright (C) 2012-2014, 2019-2023 Free Software Foundation, Inc. # This program is free software; you can redistribute it and/or modify # it under the terms of the GNU General Public License as published by diff --git a/tests/t0210-gpt-resized-partition-entry-array.sh b/tests/t0210-gpt-resized-partition-entry-array.sh index ea6fb7d..4d85f77 100755 --- a/tests/t0210-gpt-resized-partition-entry-array.sh +++ b/tests/t0210-gpt-resized-partition-entry-array.sh @@ -1,7 +1,7 @@ #!/bin/sh # exercise GPT handling of n_partition_array_entries != 128 -# Copyright (C) 2009-2014, 2019-2022 Free Software Foundation, Inc. +# Copyright (C) 2009-2014, 2019-2023 Free Software Foundation, Inc. # This program is free software; you can redistribute it and/or modify # it under the terms of the GNU General Public License as published by diff --git a/tests/t0211-gpt-rewrite-header.sh b/tests/t0211-gpt-rewrite-header.sh index 48de957..d0f286f 100644 --- a/tests/t0211-gpt-rewrite-header.sh +++ b/tests/t0211-gpt-rewrite-header.sh @@ -5,7 +5,7 @@ # header to the end of the device. Before parted-3.1, when it attempted # to do that, starting with a 9-PTE array, it would render the result invalid. -# Copyright (C) 2012-2014, 2019-2022 Free Software Foundation, Inc. +# Copyright (C) 2012-2014, 2019-2023 Free Software Foundation, Inc. # This program is free software; you can redistribute it and/or modify # it under the terms of the GNU General Public License as published by diff --git a/tests/t0212-gpt-many-partitions.sh b/tests/t0212-gpt-many-partitions.sh index 95b43a4..2fead57 100644 --- a/tests/t0212-gpt-many-partitions.sh +++ b/tests/t0212-gpt-many-partitions.sh @@ -2,7 +2,7 @@ # gpt: create many partitions # Before parted-3.1, this would provoke an invalid free. -# Copyright (C) 2012-2014, 2019-2022 Free Software Foundation, Inc. +# Copyright (C) 2012-2014, 2019-2023 Free Software Foundation, Inc. # This program is free software; you can redistribute it and/or modify # it under the terms of the GNU General Public License as published by diff --git a/tests/t0213-mkpart-start-negative.sh b/tests/t0213-mkpart-start-negative.sh index da221ab..27f21dd 100755 --- a/tests/t0213-mkpart-start-negative.sh +++ b/tests/t0213-mkpart-start-negative.sh @@ -2,7 +2,7 @@ # Make sure parted mkpart ends the partition one sector before the specified # value if end is specified with IEC units. -# Copyright (C) 2011-2022 Free Software Foundation, Inc. +# Copyright (C) 2011-2023 Free Software Foundation, Inc. # This program is free software; you can redistribute it and/or modify # it under the terms of the GNU General Public License as published by diff --git a/tests/t0220-gpt-msftres.sh b/tests/t0220-gpt-msftres.sh index b2dbac1..160ae0f 100755 --- a/tests/t0220-gpt-msftres.sh +++ b/tests/t0220-gpt-msftres.sh @@ -1,7 +1,7 @@ #!/bin/sh # gpt default "flag" for a partition must not be msftres -# Copyright (C) 2009-2014, 2019-2022 Free Software Foundation, Inc. +# Copyright (C) 2009-2014, 2019-2023 Free Software Foundation, Inc. # This program is free software; you can redistribute it and/or modify # it under the terms of the GNU General Public License as published by diff --git a/tests/t0250-gpt.sh b/tests/t0250-gpt.sh index d5482ac..3390ca8 100755 --- a/tests/t0250-gpt.sh +++ b/tests/t0250-gpt.sh @@ -1,6 +1,6 @@ #!/bin/sh # very basic GPT table -# Copyright (C) 2008-2014, 2019-2022 Free Software Foundation, Inc. +# Copyright (C) 2008-2014, 2019-2023 Free Software Foundation, Inc. # This program is free software; you can redistribute it and/or modify # it under the terms of the GNU General Public License as published by diff --git a/tests/t0251-gpt-unicode.sh b/tests/t0251-gpt-unicode.sh index 05907ef..a87cd36 100755 --- a/tests/t0251-gpt-unicode.sh +++ b/tests/t0251-gpt-unicode.sh @@ -1,6 +1,6 @@ #!/bin/sh # Test unicode partition names -# Copyright (C) 2013-2014, 2019-2022 Free Software Foundation, Inc. +# Copyright (C) 2013-2014, 2019-2023 Free Software Foundation, Inc. # This program is free software; you can redistribute it and/or modify # it under the terms of the GNU General Public License as published by diff --git a/tests/t0280-gpt-corrupt.sh b/tests/t0280-gpt-corrupt.sh index 678b5a3..376de2f 100755 --- a/tests/t0280-gpt-corrupt.sh +++ b/tests/t0280-gpt-corrupt.sh @@ -1,7 +1,7 @@ #!/bin/sh # corrupt a GPT table; ensure parted takes notice -# Copyright (C) 2009-2014, 2019-2022 Free Software Foundation, Inc. +# Copyright (C) 2009-2014, 2019-2023 Free Software Foundation, Inc. # This program is free software; you can redistribute it and/or modify # it under the terms of the GNU General Public License as published by diff --git a/tests/t0281-gpt-grow.sh b/tests/t0281-gpt-grow.sh index 6748585..03b8486 100644 --- a/tests/t0281-gpt-grow.sh +++ b/tests/t0281-gpt-grow.sh @@ -1,7 +1,7 @@ #!/bin/sh # grow a gpt disk, ensure that parted offers to update the gpt size -# Copyright (C) 2009-2012, 2014, 2019-2022 Free Software Foundation, Inc. +# Copyright (C) 2009-2012, 2014, 2019-2023 Free Software Foundation, Inc. # This program is free software; you can redistribute it and/or modify # it under the terms of the GNU General Public License as published by diff --git a/tests/t0282-gpt-move-backup.sh b/tests/t0282-gpt-move-backup.sh index 684041f..56bd0d4 100644 --- a/tests/t0282-gpt-move-backup.sh +++ b/tests/t0282-gpt-move-backup.sh @@ -2,7 +2,7 @@ # put backup copy gpt in the wrong place, ensure that # parted offers to fix -# Copyright (C) 2009-2012, 2014, 2019-2022 Free Software Foundation, Inc. +# Copyright (C) 2009-2012, 2014, 2019-2023 Free Software Foundation, Inc. # This program is free software; you can redistribute it and/or modify # it under the terms of the GNU General Public License as published by diff --git a/tests/t0283-overlap-partitions.sh b/tests/t0283-overlap-partitions.sh index faa7eb8..dc98203 100644 --- a/tests/t0283-overlap-partitions.sh +++ b/tests/t0283-overlap-partitions.sh @@ -2,7 +2,7 @@ # ensure parted can ignore partitions that overlap or are # longer than the disk and remove them -# Copyright (C) 2009-2012, 2014, 2019-2022 Free Software Foundation, Inc. +# Copyright (C) 2009-2012, 2014, 2019-2023 Free Software Foundation, Inc. # This program is free software; you can redistribute it and/or modify # it under the terms of the GNU General Public License as published by diff --git a/tests/t0300-dos-on-gpt.sh b/tests/t0300-dos-on-gpt.sh index 6001359..001af23 100755 --- a/tests/t0300-dos-on-gpt.sh +++ b/tests/t0300-dos-on-gpt.sh @@ -1,7 +1,7 @@ #!/bin/sh # avoid segfault creating a dos PT on top of a gpt one -# Copyright (C) 2009-2014, 2019-2022 Free Software Foundation, Inc. +# Copyright (C) 2009-2014, 2019-2023 Free Software Foundation, Inc. # This program is free software; you can redistribute it and/or modify # it under the terms of the GNU General Public License as published by diff --git a/tests/t0301-overwrite-gpt-pmbr.sh b/tests/t0301-overwrite-gpt-pmbr.sh index bab551c..90b318d 100755 --- a/tests/t0301-overwrite-gpt-pmbr.sh +++ b/tests/t0301-overwrite-gpt-pmbr.sh @@ -2,7 +2,7 @@ # Test creating a msdos partition over a GPT partition with # fdisk which doesn't remove the GPT partitions, only the PMBR -# Copyright (C) 2009-2014, 2019-2022 Free Software Foundation, Inc. +# Copyright (C) 2009-2014, 2019-2023 Free Software Foundation, Inc. # This program is free software; you can redistribute it and/or modify # it under the terms of the GNU General Public License as published by diff --git a/tests/t0350-mac-PT-increases-sector-size.sh b/tests/t0350-mac-PT-increases-sector-size.sh index a2d0244..b065728 100644 --- a/tests/t0350-mac-PT-increases-sector-size.sh +++ b/tests/t0350-mac-PT-increases-sector-size.sh @@ -3,7 +3,7 @@ # larger than what the kernel told us (SS) would cause parted to read B # bytes into a smaller, SS-byte buffer, clobbering heap storage. -# Copyright (C) 2012-2014, 2019-2022 Free Software Foundation, Inc. +# Copyright (C) 2012-2014, 2019-2023 Free Software Foundation, Inc. # This program is free software; you can redistribute it and/or modify # it under the terms of the GNU General Public License as published by diff --git a/tests/t0400-loop-clobber-infloop.sh b/tests/t0400-loop-clobber-infloop.sh index bcf11c1..6f6dbc6 100644 --- a/tests/t0400-loop-clobber-infloop.sh +++ b/tests/t0400-loop-clobber-infloop.sh @@ -1,7 +1,7 @@ #!/bin/sh # do not infloop in loop_clobber -# Copyright (C) 2009-2014, 2019-2022 Free Software Foundation, Inc. +# Copyright (C) 2009-2014, 2019-2023 Free Software Foundation, Inc. # This program is free software; you can redistribute it and/or modify # it under the terms of the GNU General Public License as published by diff --git a/tests/t0500-dup-clobber.sh b/tests/t0500-dup-clobber.sh index 258883b..cd9081c 100644 --- a/tests/t0500-dup-clobber.sh +++ b/tests/t0500-dup-clobber.sh @@ -1,7 +1,7 @@ #!/bin/sh # Drive the dup-clobber program. -# Copyright (C) 2009-2014, 2019-2022 Free Software Foundation, Inc. +# Copyright (C) 2009-2014, 2019-2023 Free Software Foundation, Inc. # This program is free software; you can redistribute it and/or modify # it under the terms of the GNU General Public License as published by diff --git a/tests/t0501-duplicate.sh b/tests/t0501-duplicate.sh index fd22a75..1beb345 100644 --- a/tests/t0501-duplicate.sh +++ b/tests/t0501-duplicate.sh @@ -1,7 +1,7 @@ #!/bin/sh # Drive the dup-clobber program. -# Copyright (C) 2011-2014, 2019-2022 Free Software Foundation, Inc. +# Copyright (C) 2011-2014, 2019-2023 Free Software Foundation, Inc. # This program is free software; you can redistribute it and/or modify # it under the terms of the GNU General Public License as published by diff --git a/tests/t0800-json-gpt.sh b/tests/t0800-json-gpt.sh index 8dd1862..f6a3fb9 100755 --- a/tests/t0800-json-gpt.sh +++ b/tests/t0800-json-gpt.sh @@ -32,8 +32,8 @@ parted --script "$dev" mkpart "test1" ext4 10% 20% > out 2>&1 || fail=1 parted --script "$dev" mkpart "test2" xfs 20% 60% > out 2>&1 || fail=1 parted --script "$dev" set 2 raid on > out 2>&1 || fail=1 -# print with json format -parted --script --json "$dev" unit s print free > out 2>&1 || fail=1 +# print with json format, replace non-deterministic uuids +parted --script --json "$dev" unit s print free | sed -E 's/"uuid": "[0-9a-f-]{36}"/"uuid": "<uuid>"/' > out 2>&1 || fail=1 cat <<EOF > exp || fail=1 { @@ -45,6 +45,7 @@ cat <<EOF > exp || fail=1 "logical-sector-size": 512, "physical-sector-size": 512, "label": "gpt", + "uuid": "<uuid>", "max-partitions": 128, "flags": [ "pmbr_boot" @@ -62,6 +63,8 @@ cat <<EOF > exp || fail=1 "end": "20479s", "size": "10240s", "type": "primary", + "type-uuid": "0fc63daf-8483-4772-8e79-3d69d8477de4", + "uuid": "<uuid>", "name": "test1" },{ "number": 2, @@ -69,6 +72,8 @@ cat <<EOF > exp || fail=1 "end": "61439s", "size": "40960s", "type": "primary", + "type-uuid": "a19d880f-05fc-4d3b-a006-743f0f84911e", + "uuid": "<uuid>", "name": "test2", "flags": [ "raid" diff --git a/tests/t0801-json-msdos.sh b/tests/t0801-json-msdos.sh index a14a5af..c5446d8 100755 --- a/tests/t0801-json-msdos.sh +++ b/tests/t0801-json-msdos.sh @@ -52,13 +52,15 @@ cat <<EOF > exp || fail=1 "start": "5.00MiB", "end": "10.0MiB", "size": "5.00MiB", - "type": "primary" + "type": "primary", + "type-id": "0x83" },{ "number": 2, "start": "10.0MiB", "end": "30.0MiB", "size": "20.0MiB", "type": "extended", + "type-id": "0x0f", "flags": [ "lba" ] @@ -68,6 +70,7 @@ cat <<EOF > exp || fail=1 "end": "20.0MiB", "size": "10.0MiB", "type": "logical", + "type-id": "0x8e", "flags": [ "lvm" ] diff --git a/tests/t0900-type-gpt.sh b/tests/t0900-type-gpt.sh new file mode 100755 index 0000000..03febba --- /dev/null +++ b/tests/t0900-type-gpt.sh @@ -0,0 +1,71 @@ +#!/bin/sh + +# Test type command with GPT label + +# Copyright (C) 2022 SUSE LLC + +# This program is free software; you can redistribute it and/or modify +# it under the terms of the GNU General Public License as published by +# the Free Software Foundation; either version 3 of the License, or +# (at your option) any later version. + +# This program is distributed in the hope that it will be useful, +# but WITHOUT ANY WARRANTY; without even the implied warranty of +# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +# GNU General Public License for more details. + +# You should have received a copy of the GNU General Public License +# along with this program. If not, see <http://www.gnu.org/licenses/>. + +. "${srcdir=.}/init.sh"; path_prepend_ ../parted +require_512_byte_sector_size_ + +dev=loop-file + +# create device +truncate --size 50MiB "$dev" || fail=1 + +# create gpt label and one partition +parted --script "$dev" mklabel gpt > out 2>&1 || fail=1 +parted --script "$dev" mkpart "''" "linux-swap" 10% 20% > out 2>&1 || fail=1 + +# set type-uuid +parted --script "$dev" type 1 "deadfd6d-a4ab-43c4-84e5-0933c84b4f4f" || fail=1 + +# print with json format, replace non-deterministic uuids +parted --script --json "$dev" unit s print | sed -E 's/"uuid": "[0-9a-f-]{36}"/"uuid": "<uuid>"/' > out 2>&1 || fail=1 + +cat <<EOF > exp || fail=1 +{ + "disk": { + "path": "loop-file", + "size": "102400s", + "model": "", + "transport": "file", + "logical-sector-size": 512, + "physical-sector-size": 512, + "label": "gpt", + "uuid": "<uuid>", + "max-partitions": 128, + "partitions": [ + { + "number": 1, + "start": "10240s", + "end": "20479s", + "size": "10240s", + "type": "primary", + "type-uuid": "deadfd6d-a4ab-43c4-84e5-0933c84b4f4f", + "uuid": "<uuid>" + } + ] + } +} +EOF + +# remove full path of device from actual output +mv out o2 && sed "s,\"/.*/$dev\",\"$dev\"," o2 > out || fail=1 + +# check for expected output +compare exp out || fail=1 + +Exit $fail diff --git a/tests/t0901-type-gpt-invalid.sh b/tests/t0901-type-gpt-invalid.sh new file mode 100755 index 0000000..681df3a --- /dev/null +++ b/tests/t0901-type-gpt-invalid.sh @@ -0,0 +1,35 @@ +#!/bin/sh + +# Test type command with GPT label + +# Copyright (C) 2022 SUSE LLC + +# This program is free software; you can redistribute it and/or modify +# it under the terms of the GNU General Public License as published by +# the Free Software Foundation; either version 3 of the License, or +# (at your option) any later version. + +# This program is distributed in the hope that it will be useful, +# but WITHOUT ANY WARRANTY; without even the implied warranty of +# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +# GNU General Public License for more details. + +# You should have received a copy of the GNU General Public License +# along with this program. If not, see <http://www.gnu.org/licenses/>. + +. "${srcdir=.}/init.sh"; path_prepend_ ../parted +require_512_byte_sector_size_ + +dev=loop-file + +# create device +truncate --size 50MiB "$dev" || fail=1 + +# create gpt label and one partition +parted --script "$dev" mklabel gpt > out 2>&1 || fail=1 +parted --script "$dev" mkpart "''" "linux-swap" 10% 20% > out 2>&1 || fail=1 + +# set type-uuid +parted --script "$dev" type 1 "invalidd-a4ab-43c4-84e5-0933c84b4f4f" && fail=1 + +Exit $fail diff --git a/tests/t0910-type-dos.sh b/tests/t0910-type-dos.sh new file mode 100755 index 0000000..d7cc37f --- /dev/null +++ b/tests/t0910-type-dos.sh @@ -0,0 +1,69 @@ +#!/bin/sh + +# Test type command with MS-DOS label + +# Copyright (C) 2022 SUSE LLC + +# This program is free software; you can redistribute it and/or modify +# it under the terms of the GNU General Public License as published by +# the Free Software Foundation; either version 3 of the License, or +# (at your option) any later version. + +# This program is distributed in the hope that it will be useful, +# but WITHOUT ANY WARRANTY; without even the implied warranty of +# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +# GNU General Public License for more details. + +# You should have received a copy of the GNU General Public License +# along with this program. If not, see <http://www.gnu.org/licenses/>. + +. "${srcdir=.}/init.sh"; path_prepend_ ../parted +require_512_byte_sector_size_ + +dev=loop-file + +# create device +truncate --size 50MiB "$dev" || fail=1 + +# create msdos label and one partition +parted --script "$dev" mklabel msdos > out 2>&1 || fail=1 +parted --script "$dev" mkpart primary "linux-swap" 10% 20% > out 2>&1 || fail=1 + +# set type-id +parted --script "$dev" type 1 "0x83" || fail=1 + +# print with json format +parted --script --json "$dev" unit s print > out 2>&1 || fail=1 + +cat <<EOF > exp || fail=1 +{ + "disk": { + "path": "loop-file", + "size": "102400s", + "model": "", + "transport": "file", + "logical-sector-size": 512, + "physical-sector-size": 512, + "label": "msdos", + "max-partitions": 4, + "partitions": [ + { + "number": 1, + "start": "10240s", + "end": "20479s", + "size": "10240s", + "type": "primary", + "type-id": "0x83" + } + ] + } +} +EOF + +# remove full path of device from actual output +mv out o2 && sed "s,\"/.*/$dev\",\"$dev\"," o2 > out || fail=1 + +# check for expected output +compare exp out || fail=1 + +Exit $fail diff --git a/tests/t0911-type-dos-invalid.sh b/tests/t0911-type-dos-invalid.sh new file mode 100755 index 0000000..f1036d1 --- /dev/null +++ b/tests/t0911-type-dos-invalid.sh @@ -0,0 +1,35 @@ +#!/bin/sh + +# Test type command with MS-DOS label + +# Copyright (C) 2022 SUSE LLC + +# This program is free software; you can redistribute it and/or modify +# it under the terms of the GNU General Public License as published by +# the Free Software Foundation; either version 3 of the License, or +# (at your option) any later version. + +# This program is distributed in the hope that it will be useful, +# but WITHOUT ANY WARRANTY; without even the implied warranty of +# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +# GNU General Public License for more details. + +# You should have received a copy of the GNU General Public License +# along with this program. If not, see <http://www.gnu.org/licenses/>. + +. "${srcdir=.}/init.sh"; path_prepend_ ../parted +require_512_byte_sector_size_ + +dev=loop-file + +# create device +truncate --size 50MiB "$dev" || fail=1 + +# create msdos label and one partition +parted --script "$dev" mklabel msdos > out 2>&1 || fail=1 +parted --script "$dev" mkpart primary "linux-swap" 10% 20% > out 2>&1 || fail=1 + +# set type-id +parted --script "$dev" type 1 "0x101" && fail=1 + +Exit $fail diff --git a/tests/t1100-busy-label.sh b/tests/t1100-busy-label.sh index 95e8dd5..e1a8bb9 100755 --- a/tests/t1100-busy-label.sh +++ b/tests/t1100-busy-label.sh @@ -1,7 +1,7 @@ #!/bin/sh # partitioning (parted -s DEV mklabel) a busy disk must fail. -# Copyright (C) 2007-2014, 2019-2022 Free Software Foundation, Inc. +# Copyright (C) 2007-2014, 2019-2023 Free Software Foundation, Inc. # This program is free software; you can redistribute it and/or modify # it under the terms of the GNU General Public License as published by diff --git a/tests/t1101-busy-partition.sh b/tests/t1101-busy-partition.sh index 94add13..cb66b4a 100755 --- a/tests/t1101-busy-partition.sh +++ b/tests/t1101-busy-partition.sh @@ -2,7 +2,7 @@ # test for Debian bug #582818 (http://bugs.debian.org/582818); forbid # the removal of a mounted partition. -# Copyright (C) 2010-2014, 2019-2022 Free Software Foundation, Inc. +# Copyright (C) 2010-2014, 2019-2023 Free Software Foundation, Inc. # This program is free software; you can redistribute it and/or modify # it under the terms of the GNU General Public License as published by diff --git a/tests/t1102-loop-label.sh b/tests/t1102-loop-label.sh index 3f426f4..1ad4ccd 100644 --- a/tests/t1102-loop-label.sh +++ b/tests/t1102-loop-label.sh @@ -2,7 +2,7 @@ # make sure that loop labels work correctly # create an actual partition -# Copyright (C) 2013-2014, 2019-2022 Free Software Foundation, Inc. +# Copyright (C) 2013-2014, 2019-2023 Free Software Foundation, Inc. # This program is free software; you can redistribute it and/or modify # it under the terms of the GNU General Public License as published by diff --git a/tests/t1104-remove-and-add-partition.sh b/tests/t1104-remove-and-add-partition.sh index 492dc0e..657b180 100644 --- a/tests/t1104-remove-and-add-partition.sh +++ b/tests/t1104-remove-and-add-partition.sh @@ -2,7 +2,7 @@ # make sure that removing a higher numbered partition and adding a lower # one using that space at the same time works -# Copyright (C) 2014, 2019-2022 Free Software Foundation, Inc. +# Copyright (C) 2014, 2019-2023 Free Software Foundation, Inc. # This program is free software; you can redistribute it and/or modify # it under the terms of the GNU General Public License as published by diff --git a/tests/t1700-probe-fs.sh b/tests/t1700-probe-fs.sh index d33606e..7557f92 100755 --- a/tests/t1700-probe-fs.sh +++ b/tests/t1700-probe-fs.sh @@ -1,7 +1,7 @@ #!/bin/sh # Probe Ext2, Ext3 and Ext4 file systems -# Copyright (C) 2008-2014, 2019-2022 Free Software Foundation, Inc. +# Copyright (C) 2008-2014, 2019-2023 Free Software Foundation, Inc. # This program is free software; you can redistribute it and/or modify # it under the terms of the GNU General Public License as published by @@ -42,7 +42,8 @@ for type in ext2 ext3 ext4 btrfs xfs nilfs2 ntfs vfat hfsplus udf f2fs; do # create an $type file system, creation failures are not parted bugs, # skip the filesystem instead of failing the test. if [ "$type" = "xfs" ]; then - mkfs.xfs -ssize=$ss -dfile,name=$dev,size=${n_sectors}s || { warn_ "$ME: mkfs.$type failed, skipping"; continue; } + # XFS requires at least 300M which is > 1024 sectors with 8192b sector size + mkfs.xfs -ssize=$ss -dfile,name=$dev,size=300m || { warn_ "$ME: mkfs.$type failed, skipping"; continue; } else dd if=/dev/null of=$dev bs=$ss seek=$n_sectors >/dev/null || { warn_ "$ME: dd failed, skipping $type"; continue; } mkfs.$type $force $dev || { warn_ "$ME: mkfs.$type failed skipping"; continue; } diff --git a/tests/t1701-rescue-fs.sh b/tests/t1701-rescue-fs.sh index efb04c4..90ec684 100644 --- a/tests/t1701-rescue-fs.sh +++ b/tests/t1701-rescue-fs.sh @@ -1,7 +1,7 @@ #!/bin/sh # rescue ext4 file system -# Copyright (C) 2008-2014, 2019-2022 Free Software Foundation, Inc. +# Copyright (C) 2008-2014, 2019-2023 Free Software Foundation, Inc. # This program is free software; you can redistribute it and/or modify # it under the terms of the GNU General Public License as published by diff --git a/tests/t2200-dos-label-recog.sh b/tests/t2200-dos-label-recog.sh index 8adf790..92b8a5e 100755 --- a/tests/t2200-dos-label-recog.sh +++ b/tests/t2200-dos-label-recog.sh @@ -1,7 +1,7 @@ #!/bin/sh # improved MSDOS partition-table recognition -# Copyright (C) 2008-2014, 2019-2022 Free Software Foundation, Inc. +# Copyright (C) 2008-2014, 2019-2023 Free Software Foundation, Inc. # This program is free software; you can redistribute it and/or modify # it under the terms of the GNU General Public License as published by diff --git a/tests/t2201-pc98-label-recog.sh b/tests/t2201-pc98-label-recog.sh index 0ab8098..be44952 100755 --- a/tests/t2201-pc98-label-recog.sh +++ b/tests/t2201-pc98-label-recog.sh @@ -1,7 +1,7 @@ #!/bin/sh # Recognize PC98 labeled disks -# Copyright (C) 2011-2014, 2019-2022 Free Software Foundation, Inc. +# Copyright (C) 2011-2014, 2019-2023 Free Software Foundation, Inc. # This program is free software; you can redistribute it and/or modify # it under the terms of the GNU General Public License as published by diff --git a/tests/t2300-dos-label-extended-bootcode.sh b/tests/t2300-dos-label-extended-bootcode.sh index 3f77f3f..e3dfaf7 100755 --- a/tests/t2300-dos-label-extended-bootcode.sh +++ b/tests/t2300-dos-label-extended-bootcode.sh @@ -1,7 +1,7 @@ #!/bin/sh # Ensure parted preserves bootcode in extended partition. -# Copyright (C) 2009-2014, 2019-2022 Free Software Foundation, Inc. +# Copyright (C) 2009-2014, 2019-2023 Free Software Foundation, Inc. # This program is free software; you can redistribute it and/or modify # it under the terms of the GNU General Public License as published by diff --git a/tests/t2310-dos-extended-2-sector-min-offset.sh b/tests/t2310-dos-extended-2-sector-min-offset.sh index ae239ab..b86dadc 100644 --- a/tests/t2310-dos-extended-2-sector-min-offset.sh +++ b/tests/t2310-dos-extended-2-sector-min-offset.sh @@ -2,7 +2,7 @@ # Ensure that parted allows a single sector between the beginning # of an extended partition and the first logical partition. -# Copyright (C) 2010-2014, 2019-2022 Free Software Foundation, Inc. +# Copyright (C) 2010-2014, 2019-2023 Free Software Foundation, Inc. # This program is free software; you can redistribute it and/or modify # it under the terms of the GNU General Public License as published by diff --git a/tests/t2320-dos-extended-noclobber.sh b/tests/t2320-dos-extended-noclobber.sh index e4c8299..ac84cd5 100644 --- a/tests/t2320-dos-extended-noclobber.sh +++ b/tests/t2320-dos-extended-noclobber.sh @@ -2,7 +2,7 @@ # Ensure that the extended partition reports the correct length # after adding another partition. -# Copyright (C) 2015, 2019-2022 Free Software Foundation, Inc. +# Copyright (C) 2015, 2019-2023 Free Software Foundation, Inc. # This program is free software; you can redistribute it and/or modify # it under the terms of the GNU General Public License as published by diff --git a/tests/t2400-dos-hfs-partition-type.sh b/tests/t2400-dos-hfs-partition-type.sh index 6733683..6b0a9a4 100644 --- a/tests/t2400-dos-hfs-partition-type.sh +++ b/tests/t2400-dos-hfs-partition-type.sh @@ -1,7 +1,7 @@ #!/bin/sh # Ensure that an HFS partition in a dos table gets the right ID -# Copyright (C) 2010-2014, 2019-2022 Free Software Foundation, Inc. +# Copyright (C) 2010-2014, 2019-2023 Free Software Foundation, Inc. # This program is free software; you can redistribute it and/or modify # it under the terms of the GNU General Public License as published by @@ -24,7 +24,7 @@ n_sectors=8000 dd if=/dev/null of=$dev bs=$ss seek=$n_sectors || framework_failure -# create a GPT partition table +# create a MS-DOS partition table parted -s $dev mklabel msdos \ mkpart pri hfs 2048s 4095s \ mkpart pri hfs+ 4096s 6143s > out 2>&1 || fail=1 diff --git a/tests/t2410-dos-udf-partition-type.sh b/tests/t2410-dos-udf-partition-type.sh index 80a2c6c..fa10d72 100644 --- a/tests/t2410-dos-udf-partition-type.sh +++ b/tests/t2410-dos-udf-partition-type.sh @@ -1,7 +1,7 @@ #!/bin/sh # Ensure that an UDF partition in a dos table gets the right ID -# Copyright (C) 2018-2022 Free Software Foundation, Inc. +# Copyright (C) 2018-2023 Free Software Foundation, Inc. # This program is free software; you can redistribute it and/or modify # it under the terms of the GNU General Public License as published by diff --git a/tests/t2500-probe-corrupt-hfs.sh b/tests/t2500-probe-corrupt-hfs.sh index bcc3526..5d64d90 100755 --- a/tests/t2500-probe-corrupt-hfs.sh +++ b/tests/t2500-probe-corrupt-hfs.sh @@ -1,7 +1,7 @@ #!/bin/sh # Do not misbehave when probing a corrupt HFS partition. -# Copyright (C) 2011-2014, 2019-2022 Free Software Foundation, Inc. +# Copyright (C) 2011-2014, 2019-2023 Free Software Foundation, Inc. # This program is free software; you can redistribute it and/or modify # it under the terms of the GNU General Public License as published by diff --git a/tests/t3000-resize-fs.sh b/tests/t3000-resize-fs.sh index 2bcaf62..5939eeb 100755 --- a/tests/t3000-resize-fs.sh +++ b/tests/t3000-resize-fs.sh @@ -1,7 +1,7 @@ #!/bin/sh # exercise the resize library; FAT and HFS+ only -# Copyright (C) 2009-2014, 2019-2022 Free Software Foundation, Inc. +# Copyright (C) 2009-2014, 2019-2023 Free Software Foundation, Inc. # This program is free software; you can redistribute it and/or modify # it under the terms of the GNU General Public License as published by diff --git a/tests/t3200-resize-partition.sh b/tests/t3200-resize-partition.sh index 0852515..846fbc3 100755 --- a/tests/t3200-resize-partition.sh +++ b/tests/t3200-resize-partition.sh @@ -2,7 +2,7 @@ # exercise the resize sub-command # based on t3000-resize-fs.sh test -# Copyright (C) 2009-2022 Free Software Foundation, Inc. +# Copyright (C) 2009-2023 Free Software Foundation, Inc. # This program is free software; you can redistribute it and/or modify # it under the terms of the GNU General Public License as published by diff --git a/tests/t3200-type-change.sh b/tests/t3200-type-change.sh index 4c6860c..a57ad70 100755 --- a/tests/t3200-type-change.sh +++ b/tests/t3200-type-change.sh @@ -1,7 +1,7 @@ #!/bin/sh # Ensure parted doesn't change the type of a partition to match its FS. -# Copyright (C) 2009-2014, 2019-2022 Free Software Foundation, Inc. +# Copyright (C) 2009-2014, 2019-2023 Free Software Foundation, Inc. # This program is free software; you can redistribute it and/or modify # it under the terms of the GNU General Public License as published by diff --git a/tests/t3210-gpt-type-change.sh b/tests/t3210-gpt-type-change.sh index 8e64d87..46d6cc2 100755 --- a/tests/t3210-gpt-type-change.sh +++ b/tests/t3210-gpt-type-change.sh @@ -1,7 +1,7 @@ #!/bin/sh # Ensure parted changes GUID back to match its FS. -# Copyright (C) 2021-2022 Free Software Foundation, Inc. +# Copyright (C) 2021-2023 Free Software Foundation, Inc. # This program is free software; you can redistribute it and/or modify # it under the terms of the GNU General Public License as published by diff --git a/tests/t3300-palo-prep.sh b/tests/t3300-palo-prep.sh index 5005e0e..fc9e8f6 100755 --- a/tests/t3300-palo-prep.sh +++ b/tests/t3300-palo-prep.sh @@ -1,7 +1,7 @@ #!/bin/sh # Ensure that palo and prep types work properly. -# Copyright (C) 2010-2014, 2019-2022 Free Software Foundation, Inc. +# Copyright (C) 2010-2014, 2019-2023 Free Software Foundation, Inc. # This program is free software; you can redistribute it and/or modify # it under the terms of the GNU General Public License as published by @@ -20,9 +20,9 @@ ss=$sector_size_ cat > exp <<EOF || framework_failure -1:2048s:4095s:2048s:ext2::lba, palo; -1:2048s:4095s:2048s:ext2::lba, prep; -1:2048s:4095s:2048s:ext2::lba, palo; +1:2048s:4095s:2048s:ext2::palo; +1:2048s:4095s:2048s:ext2::prep; +1:2048s:4095s:2048s:ext2::palo; EOF dev=dev-file @@ -37,7 +37,7 @@ parted -m -s $dev mklabel msdos \ set 1 palo on u s print \ > out 2> err || fail=1 -grep -E '^1:2048s:4095s:2048s:ext2::lba, p...;$' out > k; mv k out +grep -E '^1:2048s:4095s:2048s:ext2::p...;$' out > k; mv k out compare exp out || fail=1 diff --git a/tests/t3310-flags.sh b/tests/t3310-flags.sh index f2001c5..8614c32 100644 --- a/tests/t3310-flags.sh +++ b/tests/t3310-flags.sh @@ -1,7 +1,7 @@ #!/bin/sh # Exercise partition flags. -# Copyright (C) 2010-2014, 2019-2022 Free Software Foundation, Inc. +# Copyright (C) 2010-2014, 2019-2023 Free Software Foundation, Inc. # This program is free software; you can redistribute it and/or modify # it under the terms of the GNU General Public License as published by @@ -91,6 +91,10 @@ for table_type in aix amiga atari bsd dvh gpt mac msdos pc98 sun loop; do # test to fail. flags=`echo "$flags" | egrep -v 'lvm|raid'` ;; + msdos) # FIXME: Exclude flags that can only be set in combination + # with certain other flags. + flags=`echo "$flags" | egrep -v 'hidden|lba'` + ;; esac for mode in on_only on_and_off ; do diff --git a/tests/t3400-whole-disk-FAT-partition.sh b/tests/t3400-whole-disk-FAT-partition.sh index 626355b..e65894a 100755 --- a/tests/t3400-whole-disk-FAT-partition.sh +++ b/tests/t3400-whole-disk-FAT-partition.sh @@ -1,7 +1,7 @@ #!/bin/sh # Ensure that a whole-disk FAT partition is detected. -# Copyright (C) 2010-2014, 2019-2022 Free Software Foundation, Inc. +# Copyright (C) 2010-2014, 2019-2023 Free Software Foundation, Inc. # This program is free software: you can redistribute it and/or modify # it under the terms of the GNU General Public License as published by diff --git a/tests/t4000-sun-raid-type.sh b/tests/t4000-sun-raid-type.sh index 2def577..94e0edd 100755 --- a/tests/t4000-sun-raid-type.sh +++ b/tests/t4000-sun-raid-type.sh @@ -1,7 +1,7 @@ #!/bin/sh # RAID support on sun disk type -# Copyright (C) 2008-2014, 2019-2022 Free Software Foundation, Inc. +# Copyright (C) 2008-2014, 2019-2023 Free Software Foundation, Inc. # This program is free software; you can redistribute it and/or modify # it under the terms of the GNU General Public License as published by diff --git a/tests/t4001-sun-vtoc.sh b/tests/t4001-sun-vtoc.sh index 059788c..acd8099 100755 --- a/tests/t4001-sun-vtoc.sh +++ b/tests/t4001-sun-vtoc.sh @@ -1,7 +1,7 @@ #!/bin/sh # Ensure that Sun VTOC is properly initialized. -# Copyright (C) 2009-2014, 2019-2022 Free Software Foundation, Inc. +# Copyright (C) 2009-2014, 2019-2023 Free Software Foundation, Inc. # This program is free software; you can redistribute it and/or modify # it under the terms of the GNU General Public License as published by diff --git a/tests/t4100-dvh-partition-limits.sh b/tests/t4100-dvh-partition-limits.sh index d3798d2..fec7576 100755 --- a/tests/t4100-dvh-partition-limits.sh +++ b/tests/t4100-dvh-partition-limits.sh @@ -1,7 +1,7 @@ #!/bin/sh # enforce limits on partition start sector and length -# Copyright (C) 2008-2014, 2019-2022 Free Software Foundation, Inc. +# Copyright (C) 2008-2014, 2019-2023 Free Software Foundation, Inc. # This program is free software; you can redistribute it and/or modify # it under the terms of the GNU General Public License as published by @@ -37,7 +37,7 @@ mp=`pwd`/mount-point n=4096 # create an XFS file system -mkfs.xfs -dfile,name=$fs,size=100m || fail=1 +mkfs.xfs -dfile,name=$fs,size=300m || fail=1 mkdir "$mp" || fail=1 # Unmount upon interrupt, failure, etc., as well as upon normal completion. diff --git a/tests/t4100-msdos-partition-limits.sh b/tests/t4100-msdos-partition-limits.sh index b591123..2bebfb9 100755 --- a/tests/t4100-msdos-partition-limits.sh +++ b/tests/t4100-msdos-partition-limits.sh @@ -1,7 +1,7 @@ #!/bin/sh # enforce limits on partition start sector and length -# Copyright (C) 2008-2014, 2019-2022 Free Software Foundation, Inc. +# Copyright (C) 2008-2014, 2019-2023 Free Software Foundation, Inc. # This program is free software; you can redistribute it and/or modify # it under the terms of the GNU General Public License as published by @@ -37,7 +37,7 @@ mp=`pwd`/mount-point n=4096 # create an XFS file system -mkfs.xfs -dfile,name=$fs,size=100m || fail=1 +mkfs.xfs -dfile,name=$fs,size=300m || fail=1 mkdir "$mp" || fail=1 # Unmount upon interrupt, failure, etc., as well as upon normal completion. diff --git a/tests/t4100-msdos-starting-sector.sh b/tests/t4100-msdos-starting-sector.sh index 4d2c050..e933060 100755 --- a/tests/t4100-msdos-starting-sector.sh +++ b/tests/t4100-msdos-starting-sector.sh @@ -1,7 +1,7 @@ #!/bin/sh # Consistency in msdos free space starting sector. -# Copyright (C) 2008-2014, 2019-2022 Free Software Foundation, Inc. +# Copyright (C) 2008-2014, 2019-2023 Free Software Foundation, Inc. # This program is free software; you can redistribute it and/or modify # it under the terms of the GNU General Public License as published by diff --git a/tests/t4200-partprobe.sh b/tests/t4200-partprobe.sh index 8b93f27..a2731f2 100755 --- a/tests/t4200-partprobe.sh +++ b/tests/t4200-partprobe.sh @@ -1,7 +1,7 @@ #!/bin/sh # partprobe must not examine more than 16 partitions -# Copyright (C) 2008-2014, 2019-2022 Free Software Foundation, Inc. +# Copyright (C) 2008-2014, 2019-2023 Free Software Foundation, Inc. # This program is free software; you can redistribute it and/or modify # it under the terms of the GNU General Public License as published by diff --git a/tests/t4300-nilfs2-tiny.sh b/tests/t4300-nilfs2-tiny.sh index d88c652..28ccb7e 100755 --- a/tests/t4300-nilfs2-tiny.sh +++ b/tests/t4300-nilfs2-tiny.sh @@ -1,7 +1,7 @@ #!/bin/sh # Trigger a nilfs2-related bug. -# Copyright (C) 2011-2014, 2019-2022 Free Software Foundation, Inc. +# Copyright (C) 2011-2014, 2019-2023 Free Software Foundation, Inc. # This program is free software; you can redistribute it and/or modify # it under the terms of the GNU General Public License as published by diff --git a/tests/t4301-nilfs2-badsb2.sh b/tests/t4301-nilfs2-badsb2.sh index 72784b2..2a1205b 100755 --- a/tests/t4301-nilfs2-badsb2.sh +++ b/tests/t4301-nilfs2-badsb2.sh @@ -1,7 +1,7 @@ #!/bin/sh # Trigger a nilfs2-related bug. -# Copyright (C) 2011-2014, 2019-2022 Free Software Foundation, Inc. +# Copyright (C) 2011-2014, 2019-2023 Free Software Foundation, Inc. # This program is free software; you can redistribute it and/or modify # it under the terms of the GNU General Public License as published by diff --git a/tests/t4302-nilfs2-lessbadsb2.sh b/tests/t4302-nilfs2-lessbadsb2.sh index c3dfea3..1857b29 100755 --- a/tests/t4302-nilfs2-lessbadsb2.sh +++ b/tests/t4302-nilfs2-lessbadsb2.sh @@ -1,7 +1,7 @@ #!/bin/sh # Trigger a nilfs2-related bug. -# Copyright (C) 2011-2014, 2019-2022 Free Software Foundation, Inc. +# Copyright (C) 2011-2014, 2019-2023 Free Software Foundation, Inc. # This program is free software; you can redistribute it and/or modify # it under the terms of the GNU General Public License as published by diff --git a/tests/t5000-tags.sh b/tests/t5000-tags.sh index defe7fa..6291657 100755 --- a/tests/t5000-tags.sh +++ b/tests/t5000-tags.sh @@ -1,7 +1,7 @@ #!/bin/sh # test bios_grub flag in gpt labels -# Copyright (C) 2007-2014, 2019-2022 Free Software Foundation, Inc. +# Copyright (C) 2007-2014, 2019-2023 Free Software Foundation, Inc. # This program is free software; you can redistribute it and/or modify # it under the terms of the GNU General Public License as published by diff --git a/tests/t6000-dm.sh b/tests/t6000-dm.sh index 28b5dc5..980094d 100755 --- a/tests/t6000-dm.sh +++ b/tests/t6000-dm.sh @@ -1,7 +1,7 @@ #!/bin/sh # ensure that parted can distinguish device map types: linear, multipath -# Copyright (C) 2008-2014, 2019-2022 Free Software Foundation, Inc. +# Copyright (C) 2008-2014, 2019-2023 Free Software Foundation, Inc. # This program is free software; you can redistribute it and/or modify # it under the terms of the GNU General Public License as published by diff --git a/tests/t6001-psep.sh b/tests/t6001-psep.sh index bea0c69..be0b7ee 100644 --- a/tests/t6001-psep.sh +++ b/tests/t6001-psep.sh @@ -1,7 +1,7 @@ #!/bin/sh # ensure that parted names partitions on dm disks correctly -# Copyright (C) 2011-2014, 2019-2022 Free Software Foundation, Inc. +# Copyright (C) 2011-2014, 2019-2023 Free Software Foundation, Inc. # This program is free software; you can redistribute it and/or modify # it under the terms of the GNU General Public License as published by diff --git a/tests/t6002-dm-busy.sh b/tests/t6002-dm-busy.sh index 3770bd4..27b462d 100644 --- a/tests/t6002-dm-busy.sh +++ b/tests/t6002-dm-busy.sh @@ -2,7 +2,7 @@ # ensure that parted can alter a partition on a dmraid disk # while another one is mounted -# Copyright (C) 2008-2014, 2019-2022 Free Software Foundation, Inc. +# Copyright (C) 2008-2014, 2019-2023 Free Software Foundation, Inc. # This program is free software; you can redistribute it and/or modify # it under the terms of the GNU General Public License as published by diff --git a/tests/t6003-dm-hide.sh b/tests/t6003-dm-hide.sh index da6a51c..6e03622 100644 --- a/tests/t6003-dm-hide.sh +++ b/tests/t6003-dm-hide.sh @@ -1,7 +1,7 @@ #!/bin/sh # ensure that parted -l only shows dmraid device-mapper devices -# Copyright (C) 2008-2014, 2019-2022 Free Software Foundation, Inc. +# Copyright (C) 2008-2014, 2019-2023 Free Software Foundation, Inc. # This program is free software; you can redistribute it and/or modify # it under the terms of the GNU General Public License as published by diff --git a/tests/t6004-dm-many-partitions.sh b/tests/t6004-dm-many-partitions.sh index 8e46856..d9a3012 100755 --- a/tests/t6004-dm-many-partitions.sh +++ b/tests/t6004-dm-many-partitions.sh @@ -2,7 +2,7 @@ # device-mapper: create many partitions # This would not create partitions > 16 when using device-mapper -# Copyright (C) 2012, 2014, 2019-2022 Free Software Foundation, Inc. +# Copyright (C) 2012, 2014, 2019-2023 Free Software Foundation, Inc. # This program is free software; you can redistribute it and/or modify # it under the terms of the GNU General Public License as published by diff --git a/tests/t6005-dm-uuid.sh b/tests/t6005-dm-uuid.sh index 810823c..caa992c 100755 --- a/tests/t6005-dm-uuid.sh +++ b/tests/t6005-dm-uuid.sh @@ -2,7 +2,7 @@ # device-mapper: preserve uuid # The dm's partitions uuid would be removed when creating new partitions -# Copyright (C) 2012, 2014, 2019-2022 Free Software Foundation, Inc. +# Copyright (C) 2012, 2014, 2019-2023 Free Software Foundation, Inc. # This program is free software; you can redistribute it and/or modify # it under the terms of the GNU General Public License as published by diff --git a/tests/t6006-dm-512b-sectors.sh b/tests/t6006-dm-512b-sectors.sh index fb982f2..5f2f291 100644 --- a/tests/t6006-dm-512b-sectors.sh +++ b/tests/t6006-dm-512b-sectors.sh @@ -2,7 +2,7 @@ # device-mapper sector sizes are 512b, make sure partitions are the correct # size when using larger sector sizes and a linear dm table. -# Copyright (C) 2015, 2019-2022 Free Software Foundation, Inc. +# Copyright (C) 2015, 2019-2023 Free Software Foundation, Inc. # This program is free software; you can redistribute it and/or modify # it under the terms of the GNU General Public License as published by diff --git a/tests/t6100-mdraid-partitions.sh b/tests/t6100-mdraid-partitions.sh index 836ed7e..824a4ce 100755 --- a/tests/t6100-mdraid-partitions.sh +++ b/tests/t6100-mdraid-partitions.sh @@ -1,7 +1,7 @@ #!/bin/sh # verify that new kernel is informed about partitions on mdraid devices -# Copyright (C) 2011-2014, 2019-2022 Free Software Foundation, Inc. +# Copyright (C) 2011-2014, 2019-2023 Free Software Foundation, Inc. # This program is free software; you can redistribute it and/or modify # it under the terms of the GNU General Public License as published by diff --git a/tests/t7000-scripting.sh b/tests/t7000-scripting.sh index 0545152..cc7b3ee 100755 --- a/tests/t7000-scripting.sh +++ b/tests/t7000-scripting.sh @@ -1,7 +1,7 @@ #!/bin/sh # Make sure the scripting option works (-s) properly. -# Copyright (C) 2008-2014, 2019-2022 Free Software Foundation, Inc. +# Copyright (C) 2008-2014, 2019-2023 Free Software Foundation, Inc. # This program is free software; you can redistribute it and/or modify # it under the terms of the GNU General Public License as published by diff --git a/tests/t8000-loop.sh b/tests/t8000-loop.sh index ff1af42..793e279 100755 --- a/tests/t8000-loop.sh +++ b/tests/t8000-loop.sh @@ -1,7 +1,7 @@ #!/bin/sh # Test usage of loop devices -# Copyright (C) 2008-2014, 2019-2022 Free Software Foundation, Inc. +# Copyright (C) 2008-2014, 2019-2023 Free Software Foundation, Inc. # This program is free software; you can redistribute it and/or modify # it under the terms of the GNU General Public License as published by diff --git a/tests/t8001-loop-blkpg.sh b/tests/t8001-loop-blkpg.sh index 0f87808..5b7b891 100755 --- a/tests/t8001-loop-blkpg.sh +++ b/tests/t8001-loop-blkpg.sh @@ -1,7 +1,7 @@ #!/bin/sh # Test support for partitions on loop devices -# Copyright (C) 2008-2014, 2019-2022 Free Software Foundation, Inc. +# Copyright (C) 2008-2014, 2019-2023 Free Software Foundation, Inc. # This program is free software; you can redistribute it and/or modify # it under the terms of the GNU General Public License as published by diff --git a/tests/t9010-big-sector.sh b/tests/t9010-big-sector.sh index d6bd271..4f53533 100755 --- a/tests/t9010-big-sector.sh +++ b/tests/t9010-big-sector.sh @@ -1,7 +1,7 @@ #!/bin/sh # check physical sector size as reported by 'print' -# Copyright (C) 2009-2014, 2019-2022 Free Software Foundation, Inc. +# Copyright (C) 2009-2014, 2019-2023 Free Software Foundation, Inc. # This program is free software; you can redistribute it and/or modify # it under the terms of the GNU General Public License as published by diff --git a/tests/t9020-alignment.sh b/tests/t9020-alignment.sh index e6c9cf4..85f6ba8 100755 --- a/tests/t9020-alignment.sh +++ b/tests/t9020-alignment.sh @@ -1,7 +1,7 @@ #!/bin/sh # verify that new alignment-querying functions work -# Copyright (C) 2009-2014, 2019-2022 Free Software Foundation, Inc. +# Copyright (C) 2009-2014, 2019-2023 Free Software Foundation, Inc. # This program is free software; you can redistribute it and/or modify # it under the terms of the GNU General Public License as published by diff --git a/tests/t9021-maxima.sh b/tests/t9021-maxima.sh index 702641e..499af8a 100755 --- a/tests/t9021-maxima.sh +++ b/tests/t9021-maxima.sh @@ -1,7 +1,7 @@ #!/bin/sh # verify that partition maxima-querying functions work -# Copyright (C) 2009-2014, 2019-2022 Free Software Foundation, Inc. +# Copyright (C) 2009-2014, 2019-2023 Free Software Foundation, Inc. # This program is free software; you can redistribute it and/or modify # it under the terms of the GNU General Public License as published by diff --git a/tests/t9022-one-unit-snap.sh b/tests/t9022-one-unit-snap.sh index 777fe9b..decd41f 100644 --- a/tests/t9022-one-unit-snap.sh +++ b/tests/t9022-one-unit-snap.sh @@ -1,7 +1,7 @@ #!/bin/sh # Confirm that specifying 1 unit snaps to the correct value -# Copyright (C) 2011-2014, 2019-2022 Free Software Foundation, Inc. +# Copyright (C) 2011-2014, 2019-2023 Free Software Foundation, Inc. # This program is free software; you can redistribute it and/or modify # it under the terms of the GNU General Public License as published by diff --git a/tests/t9023-value-lt-one.sh b/tests/t9023-value-lt-one.sh index 18ea1d3..567f2ba 100644 --- a/tests/t9023-value-lt-one.sh +++ b/tests/t9023-value-lt-one.sh @@ -1,7 +1,7 @@ #!/bin/sh # Confirm that a value between 0 and 1 throws an error -# Copyright (C) 2011-2014, 2019-2022 Free Software Foundation, Inc. +# Copyright (C) 2011-2014, 2019-2023 Free Software Foundation, Inc. # This program is free software; you can redistribute it and/or modify # it under the terms of the GNU General Public License as published by diff --git a/tests/t9024-msdos-1s-partition.sh b/tests/t9024-msdos-1s-partition.sh new file mode 100644 index 0000000..cc63476 --- /dev/null +++ b/tests/t9024-msdos-1s-partition.sh @@ -0,0 +1,36 @@ +#!/bin/sh +# Test creating 1s partitions in 1s free space + +# Copyright (C) 2022-2023 Free Software Foundation, Inc. + +# This program is free software; you can redistribute it and/or modify +# it under the terms of the GNU General Public License as published by +# the Free Software Foundation; either version 3 of the License, or +# (at your option) any later version. + +# This program is distributed in the hope that it will be useful, +# but WITHOUT ANY WARRANTY; without even the implied warranty of +# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +# GNU General Public License for more details. + +# You should have received a copy of the GNU General Public License +# along with this program. If not, see <http://www.gnu.org/licenses/>. + +. "${srcdir=.}/init.sh"; path_prepend_ ../parted + +dev=loop-file + +# create device +truncate --size 10MiB "$dev" || fail=1 + +# create msdos label and some partitions with 1s free space between +parted --script "$dev" mklabel msdos > out 2>&1 || fail=1 +parted --script "$dev" mkpart primary ext4 64s 128s > out 2>&1 || fail=1 +parted --script "$dev" mkpart primary ext4 130s 200s > out 2>&1 || fail=1 +parted --script "$dev" u s p free + +# Free space is at 129s +parted --script "$dev" mkpart primary ext4 129s 129s > out 2>&1 || fail=1 +parted --script "$dev" u s p free + +Exit $fail diff --git a/tests/t9025-gpt-1s-partition.sh b/tests/t9025-gpt-1s-partition.sh new file mode 100644 index 0000000..04a3e4e --- /dev/null +++ b/tests/t9025-gpt-1s-partition.sh @@ -0,0 +1,36 @@ +#!/bin/sh +# Test creating 1s partitions in 1s free space + +# Copyright (C) 2022-2023 Free Software Foundation, Inc. + +# This program is free software; you can redistribute it and/or modify +# it under the terms of the GNU General Public License as published by +# the Free Software Foundation; either version 3 of the License, or +# (at your option) any later version. + +# This program is distributed in the hope that it will be useful, +# but WITHOUT ANY WARRANTY; without even the implied warranty of +# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +# GNU General Public License for more details. + +# You should have received a copy of the GNU General Public License +# along with this program. If not, see <http://www.gnu.org/licenses/>. + +. "${srcdir=.}/init.sh"; path_prepend_ ../parted + +dev=loop-file + +# create device +truncate --size 10MiB "$dev" || fail=1 + +# create msdos label and some partitions with 1s free space between +parted --script "$dev" mklabel gpt > out 2>&1 || fail=1 +parted --script "$dev" mkpart p1 ext4 64s 128s > out 2>&1 || fail=1 +parted --script "$dev" mkpart p2 ext4 130s 200s > out 2>&1 || fail=1 +parted --script "$dev" u s p free + +# Free space is at 129s +parted --script "$dev" mkpart p3 ext4 129s 129s > out 2>&1 || fail=1 +parted --script "$dev" u s p free + +Exit $fail diff --git a/tests/t9030-align-check.sh b/tests/t9030-align-check.sh index 0cb6464..4954f44 100644 --- a/tests/t9030-align-check.sh +++ b/tests/t9030-align-check.sh @@ -1,7 +1,7 @@ #!/bin/sh # exercise the align-check command -# Copyright (C) 2009-2014, 2019-2022 Free Software Foundation, Inc. +# Copyright (C) 2009-2014, 2019-2023 Free Software Foundation, Inc. # This program is free software; you can redistribute it and/or modify # it under the terms of the GNU General Public License as published by diff --git a/tests/t9040-many-partitions.sh b/tests/t9040-many-partitions.sh index 7efcada..31b6030 100644 --- a/tests/t9040-many-partitions.sh +++ b/tests/t9040-many-partitions.sh @@ -1,7 +1,7 @@ #!/bin/sh # Ensure that creating many partitions works. -# Copyright (C) 2010-2014, 2019-2022 Free Software Foundation, Inc. +# Copyright (C) 2010-2014, 2019-2023 Free Software Foundation, Inc. # This program is free software; you can redistribute it and/or modify # it under the terms of the GNU General Public License as published by diff --git a/tests/t9041-undetected-in-use-16th-partition.sh b/tests/t9041-undetected-in-use-16th-partition.sh index c0efa38..a16f14d 100644 --- a/tests/t9041-undetected-in-use-16th-partition.sh +++ b/tests/t9041-undetected-in-use-16th-partition.sh @@ -1,7 +1,7 @@ #!/bin/sh # Ensure that parted knows when N'th (N>=16) partition is mounted -# Copyright (C) 2010-2014, 2019-2022 Free Software Foundation, Inc. +# Copyright (C) 2010-2014, 2019-2023 Free Software Foundation, Inc. # This program is free software; you can redistribute it and/or modify # it under the terms of the GNU General Public License as published by diff --git a/tests/t9042-dos-partition-limit.sh b/tests/t9042-dos-partition-limit.sh index 2f155ff..459cb6b 100644 --- a/tests/t9042-dos-partition-limit.sh +++ b/tests/t9042-dos-partition-limit.sh @@ -1,7 +1,7 @@ #!/bin/sh # Ensure that parted enforces msdos partition limit -# Copyright (C) 2010-2014, 2019-2022 Free Software Foundation, Inc. +# Copyright (C) 2010-2014, 2019-2023 Free Software Foundation, Inc. # This program is free software; you can redistribute it and/or modify # it under the terms of the GNU General Public License as published by diff --git a/tests/t9050-partition-table-types.sh b/tests/t9050-partition-table-types.sh index 9a0b549..0c2dbe7 100755 --- a/tests/t9050-partition-table-types.sh +++ b/tests/t9050-partition-table-types.sh @@ -3,7 +3,7 @@ # I.e., write a partition table of type T, and then overwrite it # with one of type V, for every permutation of T and V. -# Copyright (C) 2011-2014, 2019-2022 Free Software Foundation, Inc. +# Copyright (C) 2011-2014, 2019-2023 Free Software Foundation, Inc. # This program is free software; you can redistribute it and/or modify # it under the terms of the GNU General Public License as published by diff --git a/tests/t9060-gpt-grow-script-fix.sh b/tests/t9060-gpt-grow-script-fix.sh index f3d6a96..efdb1e4 100755 --- a/tests/t9060-gpt-grow-script-fix.sh +++ b/tests/t9060-gpt-grow-script-fix.sh @@ -2,7 +2,7 @@ # grow a gpt disk, ensure that parted offers to update the gpt size # do this in script mode with fix -# Copyright (C) 2009-2012, 2014, 2019, 2022 Free Software Foundation, Inc. +# Copyright (C) 2009-2012, 2014, 2019, 2022-2023 Free Software Foundation, Inc. # This program is free software; you can redistribute it and/or modify # it under the terms of the GNU General Public License as published by |