From c3aba5c0a022632f1ed3cfc6b329c92bc610b942 Mon Sep 17 00:00:00 2001 From: DongHun Kwak Date: Tue, 18 Jan 2022 15:22:28 +0900 Subject: [PATCH] Imported Upstream version 3.4 --- .prev-version | 2 +- .tarball-version | 2 +- .version | 2 +- ChangeLog | 290 + GNUmakefile | 4 +- Makefile.in | 127 +- NEWS | 20 +- aclocal.m4 | 15 +- build-aux/announce-gen | 12 +- build-aux/config.guess | 272 +- build-aux/config.rpath | 120 +- build-aux/config.sub | 635 +- build-aux/depcomp | 2 +- build-aux/do-release-commit-and-tag | 2 +- build-aux/gendocs.sh | 6 +- build-aux/git-version-gen | 8 +- build-aux/gitlog-to-changelog | 6 +- build-aux/gnu-web-doc-update | 2 +- build-aux/gnupload | 2 +- build-aux/install-sh | 161 +- build-aux/mdate-sh | 2 +- build-aux/mktempd | 2 +- build-aux/texinfo.tex | 707 +- build-aux/update-copyright | 22 +- build-aux/useless-if-before-free | 6 +- build-aux/vc-list-files | 4 +- cfg.mk | 8 +- configure | 7850 +++++++++++------ configure.ac | 17 +- debug/Makefile.in | 127 +- debug/test/HOWTO | 2 +- debug/test/Makefile.in | 127 +- doc/C/Makefile.in | 127 +- doc/C/parted.8 | 2 +- doc/Makefile.in | 127 +- doc/fdl.texi | 2 +- doc/parted-pt_BR.texi | 2 +- doc/parted.info | 90 +- doc/parted.texi | 10 +- doc/pt_BR/Makefile.in | 127 +- doc/stamp-vti | 8 +- doc/version.texi | 8 +- include/Makefile.in | 127 +- include/parted/Makefile.in | 127 +- include/parted/constraint.h | 4 +- include/parted/constraint.in.h | 4 +- include/parted/crc32.h | 4 +- include/parted/crc32.in.h | 4 +- include/parted/debug.h | 2 +- include/parted/debug.in.h | 2 +- include/parted/device.h | 4 +- include/parted/device.in.h | 4 +- include/parted/disk.h | 9 +- include/parted/disk.in.h | 9 +- include/parted/endian.h | 4 +- include/parted/endian.in.h | 4 +- include/parted/exception.h | 4 +- include/parted/exception.in.h | 4 +- include/parted/filesys.h | 2 +- include/parted/filesys.in.h | 2 +- include/parted/geom.h | 2 +- include/parted/geom.in.h | 2 +- include/parted/natmath.h | 2 +- include/parted/natmath.in.h | 2 +- include/parted/parted.h | 4 +- include/parted/parted.in.h | 4 +- include/parted/timer.h | 4 +- include/parted/timer.in.h | 4 +- include/parted/unit.h | 3 +- include/parted/unit.in.h | 3 +- lib/Makefile.in | 464 +- lib/_Noreturn.h | 16 +- lib/alloca.c | 286 +- lib/alloca.in.h | 19 +- lib/arg-nonnull.h | 4 +- lib/argmatch.c | 2 +- lib/argmatch.h | 2 +- lib/assure.h | 26 +- lib/attribute.h | 218 + lib/basename-lgpl.c | 22 +- lib/basename-lgpl.h | 78 + lib/basename.c | 2 +- lib/btowc.c | 2 +- lib/c++defs.h | 29 +- lib/c-ctype.h | 2 +- lib/c-strcase.h | 2 +- lib/c-strcasecmp.c | 4 +- lib/c-strcaseeq.h | 4 +- lib/c-strncasecmp.c | 4 +- lib/calloc.c | 2 +- lib/canonicalize-lgpl.c | 82 +- lib/cdefs.h | 118 +- lib/cloexec.c | 83 + lib/cloexec.h | 38 + lib/close-stream.c | 2 +- lib/close.c | 10 +- lib/closeout.c | 2 +- lib/closeout.h | 2 +- lib/config.h.in | 481 +- lib/dirname-lgpl.c | 2 +- lib/dirname.c | 2 +- lib/dirname.h | 11 +- lib/dosname.h | 52 - lib/dup2.c | 189 + lib/errno.in.h | 2 +- lib/error.c | 6 +- lib/error.h | 39 +- lib/exitfail.c | 2 +- lib/exitfail.h | 2 +- lib/fcntl.c | 629 ++ lib/fcntl.in.h | 89 +- lib/fd-hook.c | 2 +- lib/fd-hook.h | 2 +- lib/filename.h | 90 +- lib/fpending.c | 9 +- lib/fpending.h | 2 +- lib/fstat.c | 2 +- lib/fsync.c | 2 +- lib/getdtablesize.c | 124 + lib/getopt-cdefs.in.h | 4 +- lib/getopt-core.h | 2 +- lib/getopt-ext.h | 2 +- lib/getopt-pfx-core.h | 10 +- lib/getopt-pfx-ext.h | 2 +- lib/getopt.c | 2 +- lib/getopt.in.h | 2 +- lib/getopt1.c | 2 +- lib/getopt_int.h | 2 +- lib/getprogname.c | 47 +- lib/getprogname.h | 2 +- lib/getrandom.c | 187 + lib/gettext.h | 2 +- lib/gettimeofday.c | 150 - lib/glthread/lock.c | 247 +- lib/glthread/lock.h | 141 +- lib/glthread/threadlib.c | 39 +- lib/gnulib.mk | 269 +- lib/hard-locale.c | 47 +- lib/hard-locale.h | 7 +- lib/idx.h | 118 + lib/intprops.h | 274 +- lib/inttypes.in.h | 506 +- lib/langinfo.in.h | 4 +- lib/lc-charset-dispatch.c | 82 + lib/lc-charset-dispatch.h | 40 + lib/libc-config.h | 18 +- lib/limits.in.h | 25 +- lib/localcharset.c | 91 +- lib/localcharset.h | 31 +- lib/locale.in.h | 41 +- lib/localeconv.c | 2 +- lib/localtime-buffer.c | 60 - lib/localtime-buffer.h | 27 - lib/long-options.c | 2 +- lib/long-options.h | 2 +- lib/lseek.c | 4 +- lib/lstat.c | 2 +- lib/malloc.c | 2 +- lib/malloca.c | 2 +- lib/malloca.h | 8 +- lib/mbrtowc-impl-utf8.h | 138 + lib/mbrtowc-impl.h | 262 + lib/mbrtowc.c | 450 +- lib/mbsinit.c | 11 +- lib/mbtowc-impl.h | 2 +- lib/mbtowc-lock.c | 150 + lib/mbtowc-lock.h | 115 + lib/mbtowc.c | 2 +- lib/minmax.h | 2 +- lib/mkdir.c | 2 +- lib/mkstemp.c | 2 +- lib/msvc-inval.c | 2 +- lib/msvc-inval.h | 2 +- lib/msvc-nothrow.c | 2 +- lib/msvc-nothrow.h | 2 +- lib/nl_langinfo-lock.c | 150 + lib/nl_langinfo.c | 272 +- lib/open.c | 209 + lib/pathmax.h | 4 +- lib/progname.c | 2 +- lib/progname.h | 2 +- lib/quote.h | 2 +- lib/quotearg.c | 11 +- lib/quotearg.h | 4 +- lib/read.c | 10 +- lib/readlink.c | 2 +- lib/realloc.c | 2 +- lib/regcomp.c | 39 +- lib/regex.c | 4 +- lib/regex.h | 21 +- lib/regex_internal.c | 45 +- lib/regex_internal.h | 101 +- lib/regexec.c | 92 +- lib/rpmatch.c | 2 +- lib/safe-read.c | 2 +- lib/safe-read.h | 2 +- lib/setlocale-lock.c | 150 + lib/setlocale_null.c | 411 + lib/setlocale_null.h | 82 + lib/sleep.c | 2 +- lib/stat-time.h | 2 +- lib/stat-w32.c | 58 +- lib/stat-w32.h | 2 +- lib/stat.c | 15 +- lib/stdalign.in.h | 126 + lib/stdarg.in.h | 2 +- lib/stdbool.in.h | 2 +- lib/stddef.in.h | 33 +- lib/stdint.in.h | 79 +- lib/stdio-impl.h | 17 +- lib/stdio.in.h | 533 +- lib/stdlib.in.h | 294 +- lib/strdup.c | 2 +- lib/streq.h | 4 +- lib/strerror-override.c | 2 +- lib/strerror-override.h | 2 +- lib/strerror.c | 2 +- lib/string.in.h | 167 +- lib/stripslash.c | 2 +- lib/strndup.c | 2 +- lib/strnlen.c | 2 +- lib/strtol.c | 2 +- lib/strtoll.c | 2 +- lib/strtoul.c | 2 +- lib/strtoull.c | 2 +- lib/sys-limits.h | 2 +- lib/sys_random.in.h | 96 + lib/sys_stat.in.h | 124 +- lib/sys_time.in.h | 220 - lib/sys_types.in.h | 2 +- lib/tempname.c | 291 +- lib/tempname.h | 9 +- lib/time.in.h | 80 +- lib/unistd.in.h | 572 +- lib/unlink.c | 12 +- lib/usleep.c | 2 +- lib/verify.h | 110 +- lib/version-etc-fsf.c | 2 +- lib/version-etc.c | 4 +- lib/version-etc.h | 13 +- lib/warn-on-use.h | 46 +- lib/wchar.in.h | 386 +- lib/wcrtomb.c | 26 +- lib/wctype.in.h | 388 +- lib/windows-initguard.h | 2 +- lib/windows-mutex.c | 2 +- lib/windows-mutex.h | 2 +- lib/windows-once.c | 2 +- lib/windows-once.h | 2 +- lib/windows-recmutex.c | 2 +- lib/windows-recmutex.h | 2 +- lib/windows-rwlock.c | 6 +- lib/windows-rwlock.h | 2 +- lib/xalloc-die.c | 2 +- lib/xalloc-oversized.h | 4 +- lib/xalloc.h | 38 +- lib/xmalloc.c | 39 +- lib/xstrndup.c | 2 +- lib/xstrndup.h | 2 +- lib/xstrtol-error.c | 98 - lib/xstrtol.c | 2 +- lib/xstrtol.h | 29 +- libparted/Makefile.am | 6 +- libparted/Makefile.in | 136 +- libparted/arch/beos.c | 3 +- libparted/arch/gnu.c | 42 +- libparted/arch/linux.c | 10 +- libparted/arch/linux.h | 2 +- libparted/architecture.c | 2 +- libparted/architecture.h | 2 +- libparted/cs/constraint.c | 4 +- libparted/cs/geom.c | 4 +- libparted/cs/natmath.c | 2 +- libparted/debug.c | 6 +- libparted/disk.c | 12 +- libparted/exception.c | 3 +- libparted/filesys.c | 3 +- libparted/fs/Makefile.am | 9 +- libparted/fs/Makefile.in | 162 +- libparted/fs/amiga/a-interface.c | 4 +- libparted/fs/amiga/affs.c | 9 +- libparted/fs/amiga/affs.h | 4 +- libparted/fs/amiga/amiga.c | 5 +- libparted/fs/amiga/amiga.h | 4 +- libparted/fs/amiga/apfs.c | 4 +- libparted/fs/amiga/apfs.h | 4 +- libparted/fs/amiga/asfs.c | 4 +- libparted/fs/amiga/asfs.h | 4 +- libparted/fs/btrfs/btrfs.c | 2 +- libparted/fs/ext2/ext2.h | 4 +- libparted/fs/ext2/ext2_fs.h | 4 +- libparted/fs/ext2/interface.c | 10 +- libparted/fs/f2fs/f2fs.c | 60 + libparted/fs/f2fs/f2fs.h | 57 + libparted/fs/fat/bootsector.c | 6 +- libparted/fs/fat/bootsector.h | 4 +- libparted/fs/fat/count.h | 3 +- libparted/fs/fat/fat.c | 3 +- libparted/fs/fat/fat.h | 4 +- libparted/fs/hfs/hfs.c | 2 +- libparted/fs/hfs/hfs.h | 6 +- libparted/fs/hfs/probe.c | 4 +- libparted/fs/hfs/probe.h | 4 +- libparted/fs/jfs/jfs.c | 3 +- libparted/fs/linux_swap/linux_swap.c | 4 +- libparted/fs/nilfs2/nilfs2.c | 13 +- libparted/fs/ntfs/ntfs.c | 14 +- libparted/fs/r/fat/bootsector.c | 11 +- libparted/fs/r/fat/bootsector.h | 6 +- libparted/fs/r/fat/calc.c | 32 +- libparted/fs/r/fat/calc.h | 4 +- libparted/fs/r/fat/clstdup.c | 8 +- libparted/fs/r/fat/clstdup.h | 3 +- libparted/fs/r/fat/context.c | 8 +- libparted/fs/r/fat/context.h | 4 +- libparted/fs/r/fat/count.c | 91 +- libparted/fs/r/fat/count.h | 3 +- libparted/fs/r/fat/fat.c | 178 +- libparted/fs/r/fat/fat.h | 4 +- libparted/fs/r/fat/fatio.c | 4 +- libparted/fs/r/fat/fatio.h | 4 +- libparted/fs/r/fat/resize.c | 20 +- libparted/fs/r/fat/table.c | 7 +- libparted/fs/r/fat/table.h | 4 +- libparted/fs/r/fat/traverse.c | 18 +- libparted/fs/r/fat/traverse.h | 3 +- libparted/fs/r/filesys.c | 5 +- libparted/fs/r/hfs/advfs.c | 33 +- libparted/fs/r/hfs/advfs.h | 3 +- libparted/fs/r/hfs/advfs_plus.c | 30 +- libparted/fs/r/hfs/advfs_plus.h | 3 +- libparted/fs/r/hfs/cache.c | 6 +- libparted/fs/r/hfs/cache.h | 4 +- libparted/fs/r/hfs/file.c | 4 +- libparted/fs/r/hfs/file.h | 3 +- libparted/fs/r/hfs/file_plus.c | 4 +- libparted/fs/r/hfs/file_plus.h | 3 +- libparted/fs/r/hfs/hfs.c | 201 +- libparted/fs/r/hfs/hfs.h | 6 +- libparted/fs/r/hfs/journal.c | 4 +- libparted/fs/r/hfs/journal.h | 3 +- libparted/fs/r/hfs/probe.c | 4 +- libparted/fs/r/hfs/probe.h | 4 +- libparted/fs/r/hfs/reloc.c | 40 +- libparted/fs/r/hfs/reloc.h | 3 +- libparted/fs/r/hfs/reloc_plus.c | 37 +- libparted/fs/r/hfs/reloc_plus.h | 3 +- libparted/fs/reiserfs/reiserfs.c | 4 +- libparted/fs/reiserfs/reiserfs.h | 3 +- libparted/fs/udf/udf.c | 2 +- libparted/fs/ufs/ufs.c | 11 +- libparted/fs/xfs/xfs.c | 2 +- libparted/labels/Makefile.am | 2 +- libparted/labels/Makefile.in | 129 +- libparted/labels/aix.c | 3 +- libparted/labels/atari.c | 4 +- libparted/labels/bsd.c | 18 +- libparted/labels/dasd.c | 3 +- libparted/labels/dos.c | 37 +- libparted/labels/dvh.c | 4 +- libparted/labels/gpt.c | 90 + libparted/labels/loop.c | 3 +- libparted/labels/mac.c | 18 +- libparted/labels/misc.h | 2 +- libparted/labels/pc98.c | 8 +- libparted/labels/pt-tools.c | 2 +- libparted/labels/pt-tools.h | 2 +- libparted/labels/rdb.c | 4 +- libparted/labels/sun.c | 4 +- libparted/libparted.c | 7 +- libparted/mbr.s | 4 +- libparted/tests/Makefile.am | 2 +- libparted/tests/Makefile.in | 129 +- libparted/tests/t1000-label.sh | 2 +- libparted/tests/t2000-disk.sh | 2 +- libparted/tests/t2100-zerolen.sh | 2 +- libparted/tests/t3000-symlink.sh | 2 +- libparted/timer.c | 3 +- libparted/unit.c | 3 +- m4/00gnulib.m4 | 107 +- m4/__inline.m4 | 2 +- m4/absolute-header.m4 | 12 +- m4/alloca.m4 | 40 +- m4/arpa_inet_h.m4 | 2 +- m4/assert.m4 | 2 +- m4/btowc.m4 | 2 +- m4/builtin-expect.m4 | 2 +- m4/calloc.m4 | 84 +- m4/canonicalize.m4 | 20 +- m4/clock_time.m4 | 31 + m4/close.m4 | 2 +- m4/codeset.m4 | 2 +- m4/config-h.m4 | 2 +- m4/configmake.m4 | 6 +- m4/ctype.m4 | 2 +- m4/dirname.m4 | 19 - m4/double-slash-root.m4 | 2 +- m4/dup2.m4 | 184 +- m4/eealloc.m4 | 2 +- m4/environ.m4 | 2 +- m4/errno_h.m4 | 2 +- m4/error.m4 | 2 +- m4/extensions.m4 | 12 +- m4/extern-inline.m4 | 4 +- m4/fcntl-o.m4 | 5 +- m4/fcntl.m4 | 55 +- m4/fcntl_h.m4 | 6 +- m4/fdopen.m4 | 5 +- m4/flexmember.m4 | 2 +- m4/fpending.m4 | 6 +- m4/fstat.m4 | 5 +- m4/fsync.m4 | 2 +- m4/ftruncate.m4 | 10 +- m4/getcwd.m4 | 20 +- m4/getdtablesize.m4 | 21 +- m4/getopt.m4 | 10 +- m4/getpagesize.m4 | 2 +- m4/getprogname.m4 | 2 +- m4/getrandom.m4 | 68 + m4/gettimeofday.m4 | 63 +- m4/glibc21.m4 | 2 +- m4/gnulib-common.m4 | 439 +- m4/gnulib-comp.m4 | 209 +- m4/host-cpu-c-abi.m4 | 644 -- m4/include_next.m4 | 36 +- m4/inet_pton.m4 | 2 +- m4/intl-thread-locale.m4 | 45 +- m4/intlmacosx.m4 | 8 +- m4/inttypes-pri.m4 | 42 - m4/inttypes.m4 | 26 +- m4/ioctl.m4 | 2 +- m4/isblank.m4 | 2 +- m4/langinfo_h.m4 | 10 +- m4/largefile.m4 | 37 +- m4/lcmessage.m4 | 10 +- m4/lib-ignore.m4 | 2 +- m4/lib-ld.m4 | 208 +- m4/lib-link.m4 | 58 +- m4/lib-prefix.m4 | 135 +- m4/limits-h.m4 | 2 +- m4/localcharset.m4 | 2 +- m4/locale-fr.m4 | 16 +- m4/locale-ja.m4 | 10 +- m4/locale-tr.m4 | 11 +- m4/locale-zh.m4 | 10 +- m4/locale_h.m4 | 101 +- m4/localeconv.m4 | 2 +- m4/localename.m4 | 24 +- m4/localtime-buffer.m4 | 21 - m4/lock.m4 | 2 +- m4/longlong.m4 | 113 - m4/lseek.m4 | 7 +- m4/lstat.m4 | 8 +- m4/malloc.m4 | 20 +- m4/malloca.m4 | 5 +- m4/manywarnings.m4 | 194 +- m4/mbrtowc.m4 | 219 +- m4/mbsinit.m4 | 2 +- m4/mbstate_t.m4 | 2 +- m4/mbtowc.m4 | 2 +- m4/minmax.m4 | 2 +- m4/mkdir.m4 | 91 +- m4/mkstemp.m4 | 11 +- m4/mmap-anon.m4 | 6 +- m4/mode_t.m4 | 2 +- m4/msvc-inval.m4 | 2 +- m4/msvc-nothrow.m4 | 2 +- m4/multiarch.m4 | 69 +- m4/musl.m4 | 18 + m4/nanosleep.m4 | 8 +- m4/netinet_in_h.m4 | 2 +- m4/nl_langinfo.m4 | 32 +- m4/nocrash.m4 | 6 +- m4/o-direct.m4 | 2 +- m4/off_t.m4 | 2 +- m4/open-cloexec.m4 | 2 +- m4/open-slash.m4 | 60 + m4/open.m4 | 43 +- m4/pathmax.m4 | 2 +- m4/perror.m4 | 8 +- m4/pid_t.m4 | 38 + m4/pipe.m4 | 2 +- m4/priv-set.m4 | 2 +- m4/pthread-thread.m4 | 6 +- m4/pthread_h.m4 | 22 +- m4/pthread_rwlock_rdlock.m4 | 30 +- m4/pthread_sigmask.m4 | 5 +- m4/putenv.m4 | 64 +- m4/quote.m4 | 2 +- m4/quotearg.m4 | 5 +- m4/raise.m4 | 2 +- m4/read.m4 | 2 +- m4/readlink.m4 | 8 +- m4/realloc.m4 | 20 +- m4/regex.m4 | 98 +- m4/rpmatch.m4 | 2 +- m4/safe-read.m4 | 2 +- m4/sched_h.m4 | 2 +- m4/select.m4 | 11 +- m4/semaphore.m4 | 45 + m4/setenv.m4 | 70 +- m4/setlocale.m4 | 37 +- m4/setlocale_null.m4 | 98 + m4/sigaction.m4 | 2 +- m4/signal_h.m4 | 6 +- m4/signalblocking.m4 | 12 +- m4/sleep.m4 | 8 +- m4/socketlib.m4 | 34 +- m4/sockets.m4 | 2 +- m4/socklen.m4 | 2 +- m4/sockpfaf.m4 | 2 +- m4/ssize_t.m4 | 2 +- m4/stat-time.m4 | 2 +- m4/stat.m4 | 19 +- m4/std-gnu11.m4 | 11 +- m4/stdalign.m4 | 2 +- m4/stdarg.m4 | 2 +- m4/stdbool.m4 | 24 +- m4/stddef_h.m4 | 6 +- m4/stdint.m4 | 43 +- m4/stdio_h.m4 | 12 +- m4/stdlib_h.m4 | 38 +- m4/strdup.m4 | 12 +- m4/strerror.m4 | 12 +- m4/strerror_r.m4 | 6 +- m4/string_h.m4 | 95 +- m4/strndup.m4 | 2 +- m4/strnlen.m4 | 2 +- m4/strtoll.m4 | 15 +- m4/strtoull.m4 | 15 +- m4/symlink.m4 | 8 +- m4/sys_ioctl_h.m4 | 8 +- m4/sys_random_h.m4 | 53 + m4/sys_select_h.m4 | 2 +- m4/sys_socket_h.m4 | 6 +- m4/sys_stat_h.m4 | 15 +- m4/sys_time_h.m4 | 2 +- m4/sys_types_h.m4 | 6 +- m4/sys_uio_h.m4 | 2 +- m4/tempname.m4 | 2 +- m4/thread.m4 | 2 +- m4/threadlib.m4 | 535 +- m4/time_h.m4 | 9 +- m4/unistd_h.m4 | 26 +- m4/unlink.m4 | 15 +- m4/unlinkdir.m4 | 2 +- m4/usleep.m4 | 8 +- m4/version-etc.m4 | 2 +- m4/visibility.m4 | 77 + m4/warn-on-use.m4 | 16 +- m4/warnings.m4 | 23 +- m4/wchar_h.m4 | 84 +- m4/wchar_t.m4 | 2 +- m4/wcrtomb.m4 | 37 +- m4/wctob.m4 | 5 +- m4/wctomb.m4 | 2 +- m4/wctype_h.m4 | 22 +- m4/wint_t.m4 | 20 +- m4/xalloc.m4 | 2 +- m4/xstrndup.m4 | 2 +- m4/xstrtol.m4 | 2 +- m4/yield.m4 | 15 +- m4/zzgnulib.m4 | 23 + maint.mk | 8 +- parted.spec | 17 +- parted.spec.in | 15 +- parted/Makefile.in | 127 +- parted/command.c | 4 +- parted/command.h | 4 +- parted/parted.c | 20 +- parted/strlist.c | 4 +- parted/strlist.h | 4 +- parted/table.c | 2 +- parted/table.h | 3 +- parted/ui.c | 9 +- parted/ui.h | 3 +- partprobe/Makefile.in | 127 +- partprobe/partprobe.c | 3 +- po/POTFILES.in | 3 +- po/ca.gmo | Bin 16428 -> 16135 bytes po/ca.po | 771 +- po/cs.gmo | Bin 56212 -> 54439 bytes po/cs.po | 761 +- po/da.gmo | Bin 48587 -> 47131 bytes po/da.po | 747 +- po/de.gmo | Bin 69360 -> 74227 bytes po/de.po | 876 +- po/es.gmo | Bin 26515 -> 24704 bytes po/es.po | 765 +- po/fr.gmo | Bin 71570 -> 69405 bytes po/fr.po | 758 +- po/fur.gmo | Bin 68553 -> 66432 bytes po/fur.po | 755 +- po/gl.gmo | Bin 38572 -> 36492 bytes po/gl.po | 757 +- po/hu.gmo | Bin 67250 -> 65215 bytes po/hu.po | 753 +- po/id.gmo | Bin 60410 -> 58581 bytes po/id.po | 781 +- po/it.gmo | Bin 68046 -> 65990 bytes po/it.po | 755 +- po/ja.gmo | Bin 76818 -> 82246 bytes po/ja.po | 841 +- po/ko.gmo | Bin 71518 -> 76463 bytes po/ko.po | 880 +- po/nl.gmo | Bin 67785 -> 69102 bytes po/nl.po | 848 +- po/nn.gmo | Bin 16277 -> 16003 bytes po/nn.po | 767 +- po/parted.pot | 684 +- po/pl.gmo | Bin 68638 -> 73098 bytes po/pl.po | 852 +- po/pt.gmo | Bin 12211 -> 12170 bytes po/pt.po | 758 +- po/pt_BR.gmo | Bin 68860 -> 66787 bytes po/pt_BR.po | 839 +- po/ro.gmo | Bin 11466 -> 9928 bytes po/ro.po | 734 +- po/ru.gmo | Bin 86168 -> 91671 bytes po/ru.po | 882 +- po/rw.gmo | Bin 1068 -> 1027 bytes po/rw.po | 776 +- po/sk.gmo | Bin 65044 -> 62962 bytes po/sk.po | 757 +- po/sl.gmo | Bin 60910 -> 59180 bytes po/sl.po | 779 +- po/sr.gmo | Bin 86131 -> 83363 bytes po/sr.po | 756 +- po/sv.gmo | Bin 66739 -> 64761 bytes po/sv.po | 753 +- po/tr.gmo | Bin 67231 -> 65118 bytes po/tr.po | 754 +- po/uk.gmo | Bin 86413 -> 92577 bytes po/uk.po | 876 +- po/vi.gmo | Bin 72409 -> 70085 bytes po/vi.po | 754 +- po/zh_CN.gmo | Bin 62644 -> 60782 bytes po/zh_CN.po | 742 +- po/zh_TW.gmo | Bin 63522 -> 61643 bytes po/zh_TW.po | 742 +- scripts/extract_symvers | 3 +- tests/Makefile.in | 127 +- tests/duplicate.c | 2 +- tests/gpt-header-move | 2 +- tests/help-version.sh | 2 +- tests/init.sh | 2 +- tests/msdos-overlap | 2 +- tests/t0000-basic.sh | 2 +- tests/t0001-tiny.sh | 2 +- tests/t0010-script-no-ctrl-chars.sh | 2 +- tests/t0100-print.sh | 2 +- tests/t0101-print-empty.sh | 2 +- tests/t0200-gpt.sh | 2 +- tests/t0201-gpt.sh | 2 +- tests/t0202-gpt-pmbr.sh | 2 +- tests/t0203-gpt-create-on-min-sized-device.sh | 2 +- ...0203-gpt-shortened-device-primary-valid.sh | 2 +- tests/t0203-gpt-tiny-device-abort.sh | 2 +- tests/t0205-gpt-list-clobbers-pmbr.sh | 2 +- ...rint-with-corrupt-primary-clobbers-pmbr.sh | 2 +- tests/t0207-IEC-binary-notation.sh | 2 +- tests/t0208-mkpart-end-in-IEC.sh | 2 +- tests/t0209-gpt-pmbr_boot.sh | 2 +- ...t0210-gpt-resized-partition-entry-array.sh | 2 +- tests/t0211-gpt-rewrite-header.sh | 2 +- tests/t0212-gpt-many-partitions.sh | 2 +- tests/t0213-mkpart-start-negative.sh | 2 +- tests/t0220-gpt-msftres.sh | 2 +- tests/t0250-gpt.sh | 2 +- tests/t0251-gpt-unicode.sh | 2 +- tests/t0280-gpt-corrupt.sh | 2 +- tests/t0281-gpt-grow.sh | 2 +- tests/t0282-gpt-move-backup.sh | 2 +- tests/t0283-overlap-partitions.sh | 2 +- tests/t0300-dos-on-gpt.sh | 2 +- tests/t0301-overwrite-gpt-pmbr.sh | 2 +- tests/t0350-mac-PT-increases-sector-size.sh | 2 +- tests/t0400-loop-clobber-infloop.sh | 2 +- tests/t0500-dup-clobber.sh | 2 +- tests/t0501-duplicate.sh | 2 +- tests/t1100-busy-label.sh | 2 +- tests/t1101-busy-partition.sh | 2 +- tests/t1102-loop-label.sh | 2 +- tests/t1104-remove-and-add-partition.sh | 2 +- tests/t1700-probe-fs.sh | 4 +- tests/t1701-rescue-fs.sh | 2 +- tests/t2200-dos-label-recog.sh | 2 +- tests/t2201-pc98-label-recog.sh | 2 +- tests/t2300-dos-label-extended-bootcode.sh | 2 +- .../t2310-dos-extended-2-sector-min-offset.sh | 2 +- tests/t2320-dos-extended-noclobber.sh | 2 +- tests/t2400-dos-hfs-partition-type.sh | 2 +- tests/t2410-dos-udf-partition-type.sh | 2 +- tests/t2500-probe-corrupt-hfs.sh | 2 +- tests/t3000-resize-fs.sh | 2 +- tests/t3200-resize-partition.sh | 46 +- tests/t3200-type-change.sh | 2 +- tests/t3300-palo-prep.sh | 2 +- tests/t3310-flags.sh | 2 +- tests/t3400-whole-disk-FAT-partition.sh | 2 +- tests/t4000-sun-raid-type.sh | 2 +- tests/t4001-sun-vtoc.sh | 2 +- tests/t4100-dvh-partition-limits.sh | 2 +- tests/t4100-msdos-partition-limits.sh | 2 +- tests/t4100-msdos-starting-sector.sh | 2 +- tests/t4200-partprobe.sh | 2 +- tests/t4300-nilfs2-tiny.sh | 2 +- tests/t4301-nilfs2-badsb2.sh | 2 +- tests/t4302-nilfs2-lessbadsb2.sh | 2 +- tests/t5000-tags.sh | 2 +- tests/t6000-dm.sh | 2 +- tests/t6001-psep.sh | 5 +- tests/t6002-dm-busy.sh | 2 +- tests/t6003-dm-hide.sh | 2 +- tests/t6004-dm-many-partitions.sh | 6 +- tests/t6005-dm-uuid.sh | 6 +- tests/t6006-dm-512b-sectors.sh | 5 +- tests/t6100-mdraid-partitions.sh | 2 +- tests/t7000-scripting.sh | 2 +- tests/t8000-loop.sh | 2 +- tests/t8001-loop-blkpg.sh | 2 +- tests/t9010-big-sector.sh | 2 +- tests/t9020-alignment.sh | 2 +- tests/t9021-maxima.sh | 2 +- tests/t9022-one-unit-snap.sh | 2 +- tests/t9023-value-lt-one.sh | 2 +- tests/t9030-align-check.sh | 2 +- tests/t9040-many-partitions.sh | 2 +- .../t9041-undetected-in-use-16th-partition.sh | 2 +- tests/t9042-dos-partition-limit.sh | 2 +- tests/t9050-partition-table-types.sh | 2 +- 731 files changed, 33132 insertions(+), 23644 deletions(-) create mode 100644 lib/attribute.h create mode 100644 lib/basename-lgpl.h create mode 100644 lib/cloexec.c create mode 100644 lib/cloexec.h delete mode 100644 lib/dosname.h create mode 100644 lib/dup2.c create mode 100644 lib/fcntl.c create mode 100644 lib/getdtablesize.c create mode 100644 lib/getrandom.c delete mode 100644 lib/gettimeofday.c create mode 100644 lib/idx.h create mode 100644 lib/lc-charset-dispatch.c create mode 100644 lib/lc-charset-dispatch.h delete mode 100644 lib/localtime-buffer.c delete mode 100644 lib/localtime-buffer.h create mode 100644 lib/mbrtowc-impl-utf8.h create mode 100644 lib/mbrtowc-impl.h create mode 100644 lib/mbtowc-lock.c create mode 100644 lib/mbtowc-lock.h create mode 100644 lib/nl_langinfo-lock.c create mode 100644 lib/open.c create mode 100644 lib/setlocale-lock.c create mode 100644 lib/setlocale_null.c create mode 100644 lib/setlocale_null.h create mode 100644 lib/stdalign.in.h create mode 100644 lib/sys_random.in.h delete mode 100644 lib/sys_time.in.h delete mode 100644 lib/xstrtol-error.c create mode 100644 libparted/fs/f2fs/f2fs.c create mode 100644 libparted/fs/f2fs/f2fs.h create mode 100644 m4/clock_time.m4 delete mode 100644 m4/dirname.m4 create mode 100644 m4/getrandom.m4 delete mode 100644 m4/host-cpu-c-abi.m4 delete mode 100644 m4/inttypes-pri.m4 delete mode 100644 m4/localtime-buffer.m4 delete mode 100644 m4/longlong.m4 create mode 100644 m4/musl.m4 create mode 100644 m4/open-slash.m4 create mode 100644 m4/pid_t.m4 create mode 100644 m4/semaphore.m4 create mode 100644 m4/setlocale_null.m4 create mode 100644 m4/sys_random_h.m4 create mode 100644 m4/visibility.m4 create mode 100644 m4/zzgnulib.m4 diff --git a/.prev-version b/.prev-version index 24da24d..7799049 100644 --- a/.prev-version +++ b/.prev-version @@ -1 +1 @@ -3.2.153 +3.3.52 diff --git a/.tarball-version b/.tarball-version index eb39e53..2f4b607 100644 --- a/.tarball-version +++ b/.tarball-version @@ -1 +1 @@ -3.3 +3.4 diff --git a/.version b/.version index eb39e53..2f4b607 100644 --- a/.version +++ b/.version @@ -1 +1 @@ -3.3 +3.4 diff --git a/ChangeLog b/ChangeLog index 0c6bd20..d20b8df 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,5 +1,295 @@ +2021-01-27 Brian C. Lane + + version 3.4 + * NEWS: Record release date. + + NEWS: Mention the non-public gnulib commit + +2021-01-26 Brian C. Lane + + cfg.mk: disable submodule checks to work around broken upstream gnulib + + Include local gnulib change to version-etc.c date + +2021-01-18 Brian C. Lane + + maint: Update copyright statements to 2021 + By running make update-copyright + + README-release: Add information for updating the Translation Project + +2020-12-14 Brian C. Lane + + 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.3.52 + * NEWS: Record release date. + +2020-12-11 Brian C. Lane + + libparted/fs: Add ./lib to include search path + + libparted: Check for NULL flag_name in ped_partition_flag_get_by_name + strcasecmp parameters cannot be NULL according to gcc -Wanalyzer-null-argument + + po/POTFILES.in: Remove xstrtol-error.c + Appears to no longer be needed, results in an error when running make + check syntax-check. + + maint: Update copyright statements to 2020 + By running make update-copyright + + configure.ac (AC_PREREQ): Require 2.64 + + maint: Bump library REVISION number for release + + maint: Update bootstrap script from latest gnulib + + maint: Update to latest gnulib + +2020-12-04 Brian C. Lane + + labels/bsd.c: Drop alpha_bootblock_checksum from bsd_probe + Thanks to Alpine Linux for catching this. In commit + a5f69f396713ab8ac1e57458cbb9af552d2c1659 I change label to actually + point to the label and failed to pass the new s0 to + alpha_bootblock_checksum() instead of label. So it was writing the + so-called checksum off the end of the 512b sector buffer. + + bug: https://gitlab.alpinelinux.org/alpine/aports/-/issues/12161 + upstream report: https://debbugs.gnu.org/cgi/bugreport.cgi?bug=45026 + +2020-11-20 Brian C. Lane + + libparted/fs: Fix GCC warnings suggesting pure for PED_ASSERT functions + There was some question about whether or not pure should be used for + functions with PED_ASSERT (or exit) in them. It should be fine, since + the values checked by the ASSERT are passed to the function directly. + Behavior should be exactly the same for the same inputs. + + libparted: Remove disabled code + + fs/r/hfs: Remove disabled code + + fs/r/fat: Remove disabled code + + hfs/reloc_plus: Fix gcc 10 warnings about cast alignment + + hfs/reloc: Fix gcc 10 warnings about cast alignment + + ui: Fix gcc 10 warning about snprintf truncating an int + Double the storage to 20 bytes. + + ui: Fix command_line_get_disk_flag + It was using PedPartitionFlag instead of PedDiskFlag when walking the + available flags. + + ped_assert: Fix incorrect exception option + PED_EXCEPTION_FATAL is a type, not an option. A PED_EXCEPTION_BUG should + always select CANCEL. + + ufs: Fix gcc 10 warnings about cast alignment + + ntfs: Fix gcc 10 warnings about cast alignment + + nilfs2: Fix gcc 10 warnings about cast alignment + + ext2: Fix gcc 10 warnings about cast alignment + + hfs/hfs: Fix gcc 10 warnings about cast alignment + + hfs/advfs_plus: Fix gcc 10 warnings about cast alignment + + hfs/advfs: Fix gcc 10 warnings about cast alignment + + hfs: Fix gcc 10 bounds check warning + binfo is actually a list of structs that cannot be known until runtime, + so use a variable length array. + + tests: Fix unsigned warning in duplicate.c + + linux: Fix gcc complains about signed sccanf variables + + dos: Fix gcc complaints when using boot_code pointer + + bsd: Fix gcc complaints when using boot_code pointer + +2020-11-20 Shin'ichiro Kawasaki + + libparted: Fix warnings from GCC 8 -Wsuggest-attribute=const + As GCC 8 suggests, add 'const' attribute to six functions. After adding + const attributes, GCC suggested two more functions to add const + attributes. Add const attributes to those functions also. In total, add + const attributes to 8 functions. + + I read code of the functions and confirmed they are const: they examine + only their arguments and have no effect other than return value. + +2020-11-20 Shin'ichiro Kawasaki + + libparted: Fix warnings from GCC 8 -Wsuggest-attribute=pure + As GCC 8 suggests, add 'pure' attribute to 17 functions. After adding + pure attributes, GCC suggested three more functions to add pure + attributes. Add pure attribute to those functions also. In total, add + pure attributes to 20 functions. + + I read code of the functions and confirmed the 20 functions are pure: + they have no effect except the return value, and their return value + depend only on the parameters and/or global variables. + +2020-11-05 Shin'ichiro Kawasaki + + libparted: Avoid a GCC warning for unused functions + libparted/fs/r/hfs/hfs.c has a '#if 0' block. The block refers two + functions hfsplus_clobber() and hfs_clobber(). It have GCC report a + warning below. + + CC r/hfs/hfs.lo + r/hfs/hfs.c:343:1: warning: 'hfsplus_clobber' defined but not used [-Wunused-function] + 343 | hfsplus_clobber (PedGeometry* geom) + | ^~~~~~~~~~~~~~~ + + To avoid the warning, add two more '#if 0' to disable the two functions. + +2020-11-05 Shin'ichiro Kawasaki + + libparted: Fix warnings from GCC's -Wimplicit-fallthrough + Two case statements have intentional fall-throughs but do not have + comments to note it. GCC detects and warns those case statements. To + avoid the warning, add fall-through comments. + +2020-11-05 Shin'ichiro Kawasaki + + libparted: Fix warnings from GCC 8 -Wunused-variable and -Warray-bounds + GCC 8 reports two warnings as follows. + + r/fat/bootsector.c: In function 'fat_boot_sector_set_boot_code': + r/fat/bootsector.c:274:15: warning: unused variable 'fs_info' [-Wunused-variable] + FatSpecific* fs_info = FAT_SPECIFIC (fs); + ^~~~~~~ + In function 'memcpy', + inlined from 'fat_boot_sector_set_boot_code' at r/fat/bootsector.c:283:2: + /usr/include/bits/string_fortified.h:34:10: warning: '__builtin_memcpy' forming offset [126, 128] is out of the bounds [0, 125] [-Warray-bounds] + return __builtin___memcpy_chk (__dest, __src, __len, __bos0 (__dest)); + ^~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ + + To avoid the warnings, remove the unused variable. Use strcpy in place of + memcpy checking copy length. + +2020-11-05 Shin'ichiro Kawasaki + + libparted: Fix a GCC warning -Wunused-but-set-variable + GCC warns that a variable 'prealloc' defined for _generic_affs_probe() in + fs/amiga/affs.c is set but its value is never used. + + CC amiga/affs.lo + amiga/affs.c: In function '_generic_affs_probe': + amiga/affs.c:54:35: warning: variable 'prealloc' set but not used [-Wunused-but-set-variable] + 54 | int blocksize = 1, reserved = 2, prealloc = 0; + | ^~~~~~~~ + Remove the variable for simplicity and to avoid the warning. + +2020-11-05 Brian C. Lane + + tests: Update all the dmsetup tests to use ENABLE_DEVICE_MAPPER + +2020-11-05 Joe Slater + + t6001-psep: modify device manage support detection + Use the method other tests use -- test an environment variable. + +2020-11-05 Petr Lautrbach + + Do not link to libsepol or libselinux + Given that there's no code which would use it there's no reason to link + to libsepol or libselinux even when they are available. + +2020-09-01 Brian C. Lane + + tests: Add a test for resizepart on a busy partition + This makes sure that the resizepart on a busy partition with the size on + the cmdline will work. + +2020-08-31 Brian C. Lane + + parted: Preserve resizepart End when prompted for busy partition + Resizing busy partitions is allowed, but the user is prompted, which + erases the cmdline. It is annoying to have to re-end the ending location + after answering Yes. This saves the word and pushes it back onto the + cmdline after the user agrees to resize the busy partition. + +2020-05-04 Romain Perier + + tests: Add f2fs to the fs probe test + + Add support for the F2FS filesystem + This adds a basic support for the Flash-Friendly File System. So + we can manipulate the file system by using the PedFileSystem API and we + can do basic device probing for autodetecting the current fs. + +2020-03-09 Max Campbell + + Removed reference to ped_file_system_create + Removed a reference to the removed function ped_file_system_create in + the docs for ped_file_system_clobber. + +2019-12-20 Brian C. Lane + + NEWS: Add bls_boot to new features + + libparted: Add support for bls_boot to GPT disks + This sets the partition GUID to bc13c2ff-59e6-4262-a352-b275fd6f7172 to + indicate that the partition is a Boot Loader Specification compatible + /boot partition. + + libparted: Add support for MSDOS partition type bls_boot (0xea) + This type is used by the Boot Loader Specification to identify a + compatible /boot boot partition. + +2019-12-20 Alper Nebi Yasak + + libparted: Add ChromeOS Kernel partition flag + This adds a GPT-only partition type flag, chromeos_kernel, for use on + Chrome OS machines, with GUID FE3A2A5D-4F32-41A7-B725-ACCC3285A309. + + The firmware/bootloader in these machines relies on special images being + written to partitions of this type. Among multiple such partitions, it + decides which one it will boot from based on the GUID-specific partition + attributes. This patch is not intended to and does not manipulate these + bits. + + Google refers to these partitions as "ChromeOS kernel" partitions. They + also define partitions for rootfs, firmware, and a reserved one; but + these are not necessary for the boot flow and are not included here. + + Relevant ChromiumOS documentation: + https://www.chromium.org/chromium-os/chromiumos-design-docs/disk-format + +2019-12-16 Brian C. Lane + + Fix end_input usage in do_resizepart + It needs to be set to NULL, since it may not get set by the call to + command_line_get_sector + + tests: Test incomplete resizepart command + +2019-10-11 Brian C. Lane + + maint: Add note about gpg key selection for gnupload + + Switch gpt-header-move and msdos-overlap to python3 + python2 is EOL on January 1, 2020 so it is time to switch to python3. + 2019-10-10 Brian C. Lane + 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.3 * NEWS: Record release date. diff --git a/GNUmakefile b/GNUmakefile index da25113..770923b 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-2019 Free Software Foundation, Inc. +# Copyright (C) 2001, 2003, 2006-2020 Free Software Foundation, Inc. # This program is free software: you can redistribute it and/or modify # it under the terms of the GNU General Public License as published by @@ -104,7 +104,7 @@ endif abort-due-to-no-makefile: @echo There seems to be no Makefile in this directory. 1>&2 - @echo "You must run ./configure before running 'make'." 1>&2 + @echo "You must run ./configure before running '$(MAKE)'." 1>&2 @exit 1 endif diff --git a/Makefile.in b/Makefile.in index 2dfe7f3..d671e0b 100644 --- a/Makefile.in +++ b/Makefile.in @@ -95,9 +95,9 @@ am__aclocal_m4_deps = $(top_srcdir)/m4/00gnulib.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/calloc.m4 $(top_srcdir)/m4/canonicalize.m4 \ - $(top_srcdir)/m4/close.m4 $(top_srcdir)/m4/codeset.m4 \ - $(top_srcdir)/m4/config-h.m4 $(top_srcdir)/m4/configmake.m4 \ - $(top_srcdir)/m4/ctype.m4 $(top_srcdir)/m4/dirname.m4 \ + $(top_srcdir)/m4/clock_time.m4 $(top_srcdir)/m4/close.m4 \ + $(top_srcdir)/m4/codeset.m4 $(top_srcdir)/m4/config-h.m4 \ + $(top_srcdir)/m4/configmake.m4 $(top_srcdir)/m4/ctype.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 \ @@ -109,15 +109,13 @@ am__aclocal_m4_deps = $(top_srcdir)/m4/00gnulib.m4 \ $(top_srcdir)/m4/fsync.m4 $(top_srcdir)/m4/ftruncate.m4 \ $(top_srcdir)/m4/getcwd.m4 $(top_srcdir)/m4/getdtablesize.m4 \ $(top_srcdir)/m4/getopt.m4 $(top_srcdir)/m4/getpagesize.m4 \ - $(top_srcdir)/m4/getprogname.m4 $(top_srcdir)/m4/gettext.m4 \ - $(top_srcdir)/m4/gettimeofday.m4 $(top_srcdir)/m4/glibc21.m4 \ - $(top_srcdir)/m4/gnulib-common.m4 \ - $(top_srcdir)/m4/gnulib-comp.m4 \ - $(top_srcdir)/m4/host-cpu-c-abi.m4 $(top_srcdir)/m4/iconv.m4 \ + $(top_srcdir)/m4/getprogname.m4 $(top_srcdir)/m4/getrandom.m4 \ + $(top_srcdir)/m4/gettext.m4 $(top_srcdir)/m4/gettimeofday.m4 \ + $(top_srcdir)/m4/glibc21.m4 $(top_srcdir)/m4/gnulib-common.m4 \ + $(top_srcdir)/m4/gnulib-comp.m4 $(top_srcdir)/m4/iconv.m4 \ $(top_srcdir)/m4/include_next.m4 $(top_srcdir)/m4/inet_pton.m4 \ $(top_srcdir)/m4/intl-thread-locale.m4 \ - $(top_srcdir)/m4/intlmacosx.m4 \ - $(top_srcdir)/m4/inttypes-pri.m4 $(top_srcdir)/m4/inttypes.m4 \ + $(top_srcdir)/m4/intlmacosx.m4 $(top_srcdir)/m4/inttypes.m4 \ $(top_srcdir)/m4/ioctl.m4 $(top_srcdir)/m4/isblank.m4 \ $(top_srcdir)/m4/langinfo_h.m4 $(top_srcdir)/m4/largefile.m4 \ $(top_srcdir)/m4/lcmessage.m4 $(top_srcdir)/m4/lib-ignore.m4 \ @@ -127,25 +125,26 @@ am__aclocal_m4_deps = $(top_srcdir)/m4/00gnulib.m4 \ $(top_srcdir)/m4/locale-fr.m4 $(top_srcdir)/m4/locale-ja.m4 \ $(top_srcdir)/m4/locale-tr.m4 $(top_srcdir)/m4/locale-zh.m4 \ $(top_srcdir)/m4/locale_h.m4 $(top_srcdir)/m4/localeconv.m4 \ - $(top_srcdir)/m4/localename.m4 \ - $(top_srcdir)/m4/localtime-buffer.m4 $(top_srcdir)/m4/lock.m4 \ - $(top_srcdir)/m4/longlong.m4 $(top_srcdir)/m4/lseek.m4 \ - $(top_srcdir)/m4/lstat.m4 $(top_srcdir)/m4/ltoptions.m4 \ - $(top_srcdir)/m4/ltsugar.m4 $(top_srcdir)/m4/ltversion.m4 \ - $(top_srcdir)/m4/lt~obsolete.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/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/localename.m4 $(top_srcdir)/m4/lock.m4 \ + $(top_srcdir)/m4/lseek.m4 $(top_srcdir)/m4/lstat.m4 \ + $(top_srcdir)/m4/ltoptions.m4 $(top_srcdir)/m4/ltsugar.m4 \ + $(top_srcdir)/m4/ltversion.m4 $(top_srcdir)/m4/lt~obsolete.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/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/nanosleep.m4 $(top_srcdir)/m4/netinet_in_h.m4 \ + $(top_srcdir)/m4/musl.m4 $(top_srcdir)/m4/nanosleep.m4 \ + $(top_srcdir)/m4/netinet_in_h.m4 \ $(top_srcdir)/m4/nl_langinfo.m4 $(top_srcdir)/m4/nls.m4 \ $(top_srcdir)/m4/nocrash.m4 $(top_srcdir)/m4/o-direct.m4 \ $(top_srcdir)/m4/off_t.m4 $(top_srcdir)/m4/open-cloexec.m4 \ - $(top_srcdir)/m4/open.m4 $(top_srcdir)/m4/pathmax.m4 \ - $(top_srcdir)/m4/perror.m4 $(top_srcdir)/m4/pipe.m4 \ + $(top_srcdir)/m4/open-slash.m4 $(top_srcdir)/m4/open.m4 \ + $(top_srcdir)/m4/pathmax.m4 $(top_srcdir)/m4/perror.m4 \ + $(top_srcdir)/m4/pid_t.m4 $(top_srcdir)/m4/pipe.m4 \ $(top_srcdir)/m4/po.m4 $(top_srcdir)/m4/priv-set.m4 \ $(top_srcdir)/m4/progtest.m4 \ $(top_srcdir)/m4/pthread-thread.m4 \ @@ -157,9 +156,10 @@ am__aclocal_m4_deps = $(top_srcdir)/m4/00gnulib.m4 \ $(top_srcdir)/m4/readlink.m4 $(top_srcdir)/m4/realloc.m4 \ $(top_srcdir)/m4/regex.m4 $(top_srcdir)/m4/rpmatch.m4 \ $(top_srcdir)/m4/safe-read.m4 $(top_srcdir)/m4/sched_h.m4 \ - $(top_srcdir)/m4/select.m4 $(top_srcdir)/m4/setenv.m4 \ - $(top_srcdir)/m4/setlocale.m4 $(top_srcdir)/m4/sigaction.m4 \ - $(top_srcdir)/m4/signal_h.m4 \ + $(top_srcdir)/m4/select.m4 $(top_srcdir)/m4/semaphore.m4 \ + $(top_srcdir)/m4/setenv.m4 $(top_srcdir)/m4/setlocale.m4 \ + $(top_srcdir)/m4/setlocale_null.m4 \ + $(top_srcdir)/m4/sigaction.m4 $(top_srcdir)/m4/signal_h.m4 \ $(top_srcdir)/m4/signalblocking.m4 $(top_srcdir)/m4/sleep.m4 \ $(top_srcdir)/m4/socketlib.m4 $(top_srcdir)/m4/sockets.m4 \ $(top_srcdir)/m4/socklen.m4 $(top_srcdir)/m4/sockpfaf.m4 \ @@ -174,6 +174,7 @@ am__aclocal_m4_deps = $(top_srcdir)/m4/00gnulib.m4 \ $(top_srcdir)/m4/strnlen.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 \ @@ -182,14 +183,15 @@ am__aclocal_m4_deps = $(top_srcdir)/m4/00gnulib.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/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/xstrndup.m4 $(top_srcdir)/m4/xstrtol.m4 \ - $(top_srcdir)/m4/yield.m4 $(top_srcdir)/configure.ac + $(top_srcdir)/m4/yield.m4 $(top_srcdir)/m4/zzgnulib.m4 \ + $(top_srcdir)/configure.ac am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \ $(ACLOCAL_M4) DIST_COMMON = $(srcdir)/Makefile.am $(top_srcdir)/configure \ @@ -362,6 +364,7 @@ BUILDINFO = @BUILDINFO@ CC = @CC@ CCDEPMODE = @CCDEPMODE@ CFLAGS = @CFLAGS@ +CFLAG_VISIBILITY = @CFLAG_VISIBILITY@ CHECK_CFLAGS = @CHECK_CFLAGS@ CHECK_LIBS = @CHECK_LIBS@ CONFIG_INCLUDE = @CONFIG_INCLUDE@ @@ -396,6 +399,8 @@ GMSGFMT = @GMSGFMT@ GMSGFMT_015 = @GMSGFMT_015@ GNULIB_ACCEPT = @GNULIB_ACCEPT@ GNULIB_ACCEPT4 = @GNULIB_ACCEPT4@ +GNULIB_ACCESS = @GNULIB_ACCESS@ +GNULIB_ALIGNED_ALLOC = @GNULIB_ALIGNED_ALLOC@ GNULIB_ATOLL = @GNULIB_ATOLL@ GNULIB_BIND = @GNULIB_BIND@ GNULIB_BTOWC = @GNULIB_BTOWC@ @@ -406,6 +411,7 @@ GNULIB_CHOWN = @GNULIB_CHOWN@ GNULIB_CLOSE = @GNULIB_CLOSE@ GNULIB_CONNECT = @GNULIB_CONNECT@ GNULIB_COPY_FILE_RANGE = @GNULIB_COPY_FILE_RANGE@ +GNULIB_CREAT = @GNULIB_CREAT@ GNULIB_CTIME = @GNULIB_CTIME@ GNULIB_DPRINTF = @GNULIB_DPRINTF@ GNULIB_DUP = @GNULIB_DUP@ @@ -453,19 +459,23 @@ GNULIB_GETCWD = @GNULIB_GETCWD@ GNULIB_GETDELIM = @GNULIB_GETDELIM@ GNULIB_GETDOMAINNAME = @GNULIB_GETDOMAINNAME@ GNULIB_GETDTABLESIZE = @GNULIB_GETDTABLESIZE@ +GNULIB_GETENTROPY = @GNULIB_GETENTROPY@ GNULIB_GETGROUPS = @GNULIB_GETGROUPS@ GNULIB_GETHOSTNAME = @GNULIB_GETHOSTNAME@ GNULIB_GETLINE = @GNULIB_GETLINE@ GNULIB_GETLOADAVG = @GNULIB_GETLOADAVG@ GNULIB_GETLOGIN = @GNULIB_GETLOGIN@ GNULIB_GETLOGIN_R = @GNULIB_GETLOGIN_R@ +GNULIB_GETOPT_POSIX = @GNULIB_GETOPT_POSIX@ GNULIB_GETPAGESIZE = @GNULIB_GETPAGESIZE@ GNULIB_GETPASS = @GNULIB_GETPASS@ GNULIB_GETPEERNAME = @GNULIB_GETPEERNAME@ +GNULIB_GETRANDOM = @GNULIB_GETRANDOM@ GNULIB_GETSOCKNAME = @GNULIB_GETSOCKNAME@ GNULIB_GETSOCKOPT = @GNULIB_GETSOCKOPT@ GNULIB_GETSUBOPT = @GNULIB_GETSUBOPT@ GNULIB_GETTIMEOFDAY = @GNULIB_GETTIMEOFDAY@ +GNULIB_GETUMASK = @GNULIB_GETUMASK@ GNULIB_GETUSERSHELL = @GNULIB_GETUSERSHELL@ GNULIB_GL_UNISTD_H_GETOPT = @GNULIB_GL_UNISTD_H_GETOPT@ GNULIB_GRANTPT = @GNULIB_GRANTPT@ @@ -479,6 +489,8 @@ GNULIB_ISATTY = @GNULIB_ISATTY@ GNULIB_ISBLANK = @GNULIB_ISBLANK@ GNULIB_ISWBLANK = @GNULIB_ISWBLANK@ GNULIB_ISWCTYPE = @GNULIB_ISWCTYPE@ +GNULIB_ISWDIGIT = @GNULIB_ISWDIGIT@ +GNULIB_ISWXDIGIT = @GNULIB_ISWXDIGIT@ GNULIB_LCHMOD = @GNULIB_LCHMOD@ GNULIB_LCHOWN = @GNULIB_LCHOWN@ GNULIB_LINK = @GNULIB_LINK@ @@ -539,6 +551,7 @@ GNULIB_PERROR = @GNULIB_PERROR@ GNULIB_PIPE = @GNULIB_PIPE@ GNULIB_PIPE2 = @GNULIB_PIPE2@ GNULIB_POPEN = @GNULIB_POPEN@ +GNULIB_POSIX_MEMALIGN = @GNULIB_POSIX_MEMALIGN@ GNULIB_POSIX_OPENPT = @GNULIB_POSIX_OPENPT@ GNULIB_PREAD = @GNULIB_PREAD@ GNULIB_PRINTF = @GNULIB_PRINTF@ @@ -587,9 +600,12 @@ GNULIB_SENDTO = @GNULIB_SENDTO@ GNULIB_SETENV = @GNULIB_SETENV@ GNULIB_SETHOSTNAME = @GNULIB_SETHOSTNAME@ GNULIB_SETLOCALE = @GNULIB_SETLOCALE@ +GNULIB_SETLOCALE_NULL = @GNULIB_SETLOCALE_NULL@ GNULIB_SETSOCKOPT = @GNULIB_SETSOCKOPT@ GNULIB_SHUTDOWN = @GNULIB_SHUTDOWN@ +GNULIB_SIGABBREV_NP = @GNULIB_SIGABBREV_NP@ GNULIB_SIGACTION = @GNULIB_SIGACTION@ +GNULIB_SIGDESCR_NP = @GNULIB_SIGDESCR_NP@ GNULIB_SIGNAL_H_SIGPIPE = @GNULIB_SIGNAL_H_SIGPIPE@ GNULIB_SIGPROCMASK = @GNULIB_SIGPROCMASK@ GNULIB_SLEEP = @GNULIB_SLEEP@ @@ -605,6 +621,7 @@ GNULIB_STRCASESTR = @GNULIB_STRCASESTR@ GNULIB_STRCHRNUL = @GNULIB_STRCHRNUL@ GNULIB_STRDUP = @GNULIB_STRDUP@ GNULIB_STRERROR = @GNULIB_STRERROR@ +GNULIB_STRERRORNAME_NP = @GNULIB_STRERRORNAME_NP@ GNULIB_STRERROR_R = @GNULIB_STRERROR_R@ GNULIB_STRFTIME = @GNULIB_STRFTIME@ GNULIB_STRNCAT = @GNULIB_STRNCAT@ @@ -688,11 +705,13 @@ GNULIB_WMEMCHR = @GNULIB_WMEMCHR@ GNULIB_WMEMCMP = @GNULIB_WMEMCMP@ GNULIB_WMEMCPY = @GNULIB_WMEMCPY@ GNULIB_WMEMMOVE = @GNULIB_WMEMMOVE@ +GNULIB_WMEMPCPY = @GNULIB_WMEMPCPY@ GNULIB_WMEMSET = @GNULIB_WMEMSET@ GNULIB_WRITE = @GNULIB_WRITE@ GNULIB__EXIT = @GNULIB__EXIT@ GREP = @GREP@ HAVE_ACCEPT4 = @HAVE_ACCEPT4@ +HAVE_ALIGNED_ALLOC = @HAVE_ALIGNED_ALLOC@ HAVE_ALLOCA_H = @HAVE_ALLOCA_H@ HAVE_ARPA_INET_H = @HAVE_ARPA_INET_H@ HAVE_ATOLL = @HAVE_ATOLL@ @@ -702,12 +721,17 @@ HAVE_CANONICALIZE_FILE_NAME = @HAVE_CANONICALIZE_FILE_NAME@ HAVE_CHOWN = @HAVE_CHOWN@ HAVE_COPY_FILE_RANGE = @HAVE_COPY_FILE_RANGE@ HAVE_CRTDEFS_H = @HAVE_CRTDEFS_H@ +HAVE_DECL_ECVT = @HAVE_DECL_ECVT@ HAVE_DECL_ENVIRON = @HAVE_DECL_ENVIRON@ +HAVE_DECL_EXECVPE = @HAVE_DECL_EXECVPE@ HAVE_DECL_FCHDIR = @HAVE_DECL_FCHDIR@ +HAVE_DECL_FCLOSEALL = @HAVE_DECL_FCLOSEALL@ +HAVE_DECL_FCVT = @HAVE_DECL_FCVT@ HAVE_DECL_FDATASYNC = @HAVE_DECL_FDATASYNC@ HAVE_DECL_FPURGE = @HAVE_DECL_FPURGE@ HAVE_DECL_FSEEKO = @HAVE_DECL_FSEEKO@ HAVE_DECL_FTELLO = @HAVE_DECL_FTELLO@ +HAVE_DECL_GCVT = @HAVE_DECL_GCVT@ HAVE_DECL_GETDELIM = @HAVE_DECL_GETDELIM@ HAVE_DECL_GETDOMAINNAME = @HAVE_DECL_GETDOMAINNAME@ HAVE_DECL_GETLINE = @HAVE_DECL_GETLINE@ @@ -741,10 +765,10 @@ HAVE_DECL_TRUNCATE = @HAVE_DECL_TRUNCATE@ HAVE_DECL_TTYNAME_R = @HAVE_DECL_TTYNAME_R@ HAVE_DECL_UNSETENV = @HAVE_DECL_UNSETENV@ HAVE_DECL_VSNPRINTF = @HAVE_DECL_VSNPRINTF@ +HAVE_DECL_WCSDUP = @HAVE_DECL_WCSDUP@ HAVE_DECL_WCTOB = @HAVE_DECL_WCTOB@ HAVE_DECL_WCWIDTH = @HAVE_DECL_WCWIDTH@ HAVE_DPRINTF = @HAVE_DPRINTF@ -HAVE_DUP2 = @HAVE_DUP2@ HAVE_DUP3 = @HAVE_DUP3@ HAVE_DUPLOCALE = @HAVE_DUPLOCALE@ HAVE_EUIDACCESS = @HAVE_EUIDACCESS@ @@ -766,14 +790,17 @@ HAVE_FTELLO = @HAVE_FTELLO@ HAVE_FTRUNCATE = @HAVE_FTRUNCATE@ HAVE_FUTIMENS = @HAVE_FUTIMENS@ HAVE_GETDTABLESIZE = @HAVE_GETDTABLESIZE@ +HAVE_GETENTROPY = @HAVE_GETENTROPY@ HAVE_GETGROUPS = @HAVE_GETGROUPS@ HAVE_GETHOSTNAME = @HAVE_GETHOSTNAME@ HAVE_GETLOGIN = @HAVE_GETLOGIN@ HAVE_GETOPT_H = @HAVE_GETOPT_H@ HAVE_GETPAGESIZE = @HAVE_GETPAGESIZE@ HAVE_GETPASS = @HAVE_GETPASS@ +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_IMAXDIV_T = @HAVE_IMAXDIV_T@ @@ -792,7 +819,6 @@ HAVE_LCHMOD = @HAVE_LCHMOD@ HAVE_LCHOWN = @HAVE_LCHOWN@ HAVE_LINK = @HAVE_LINK@ HAVE_LINKAT = @HAVE_LINKAT@ -HAVE_LONG_LONG_INT = @HAVE_LONG_LONG_INT@ HAVE_LSTAT = @HAVE_LSTAT@ HAVE_MAX_ALIGN_T = @HAVE_MAX_ALIGN_T@ HAVE_MBRLEN = @HAVE_MBRLEN@ @@ -802,7 +828,6 @@ HAVE_MBSLEN = @HAVE_MBSLEN@ HAVE_MBSNRTOWCS = @HAVE_MBSNRTOWCS@ HAVE_MBSRTOWCS = @HAVE_MBSRTOWCS@ HAVE_MBTOWC = @HAVE_MBTOWC@ -HAVE_MEMCHR = @HAVE_MEMCHR@ HAVE_MEMPCPY = @HAVE_MEMPCPY@ HAVE_MKDIRAT = @HAVE_MKDIRAT@ HAVE_MKDTEMP = @HAVE_MKDTEMP@ @@ -825,6 +850,7 @@ HAVE_PCLOSE = @HAVE_PCLOSE@ HAVE_PIPE = @HAVE_PIPE@ HAVE_PIPE2 = @HAVE_PIPE2@ HAVE_POPEN = @HAVE_POPEN@ +HAVE_POSIX_MEMALIGN = @HAVE_POSIX_MEMALIGN@ HAVE_POSIX_OPENPT = @HAVE_POSIX_OPENPT@ HAVE_POSIX_SIGNALBLOCKING = @HAVE_POSIX_SIGNALBLOCKING@ HAVE_PREAD = @HAVE_PREAD@ @@ -910,7 +936,9 @@ HAVE_SECURE_GETENV = @HAVE_SECURE_GETENV@ HAVE_SETENV = @HAVE_SETENV@ HAVE_SETHOSTNAME = @HAVE_SETHOSTNAME@ HAVE_SETSTATE = @HAVE_SETSTATE@ +HAVE_SIGABBREV_NP = @HAVE_SIGABBREV_NP@ HAVE_SIGACTION = @HAVE_SIGACTION@ +HAVE_SIGDESCR_NP = @HAVE_SIGDESCR_NP@ HAVE_SIGHANDLER_T = @HAVE_SIGHANDLER_T@ HAVE_SIGINFO_T = @HAVE_SIGINFO_T@ HAVE_SIGNED_SIG_ATOMIC_T = @HAVE_SIGNED_SIG_ATOMIC_T@ @@ -923,6 +951,7 @@ HAVE_STPCPY = @HAVE_STPCPY@ HAVE_STPNCPY = @HAVE_STPNCPY@ HAVE_STRCASESTR = @HAVE_STRCASESTR@ HAVE_STRCHRNUL = @HAVE_STRCHRNUL@ +HAVE_STRERRORNAME_NP = @HAVE_STRERRORNAME_NP@ HAVE_STRPBRK = @HAVE_STRPBRK@ HAVE_STRPTIME = @HAVE_STRPTIME@ HAVE_STRSEP = @HAVE_STRSEP@ @@ -945,6 +974,7 @@ HAVE_SYS_INTTYPES_H = @HAVE_SYS_INTTYPES_H@ HAVE_SYS_IOCTL_H = @HAVE_SYS_IOCTL_H@ HAVE_SYS_LOADAVG_H = @HAVE_SYS_LOADAVG_H@ HAVE_SYS_PARAM_H = @HAVE_SYS_PARAM_H@ +HAVE_SYS_RANDOM_H = @HAVE_SYS_RANDOM_H@ HAVE_SYS_SELECT_H = @HAVE_SYS_SELECT_H@ HAVE_SYS_SOCKET_H = @HAVE_SYS_SOCKET_H@ HAVE_SYS_TIME_H = @HAVE_SYS_TIME_H@ @@ -953,15 +983,14 @@ HAVE_SYS_UIO_H = @HAVE_SYS_UIO_H@ HAVE_TIMEGM = @HAVE_TIMEGM@ HAVE_TIMEZONE_T = @HAVE_TIMEZONE_T@ HAVE_TYPE_VOLATILE_SIG_ATOMIC_T = @HAVE_TYPE_VOLATILE_SIG_ATOMIC_T@ -HAVE_TZSET = @HAVE_TZSET@ HAVE_UNISTD_H = @HAVE_UNISTD_H@ HAVE_UNLINKAT = @HAVE_UNLINKAT@ HAVE_UNLOCKPT = @HAVE_UNLOCKPT@ -HAVE_UNSIGNED_LONG_LONG_INT = @HAVE_UNSIGNED_LONG_LONG_INT@ HAVE_USLEEP = @HAVE_USLEEP@ HAVE_UTIMENSAT = @HAVE_UTIMENSAT@ HAVE_VASPRINTF = @HAVE_VASPRINTF@ HAVE_VDPRINTF = @HAVE_VDPRINTF@ +HAVE_VISIBILITY = @HAVE_VISIBILITY@ HAVE_WCHAR_H = @HAVE_WCHAR_H@ HAVE_WCHAR_T = @HAVE_WCHAR_T@ HAVE_WCPCPY = @HAVE_WCPCPY@ @@ -1000,6 +1029,7 @@ HAVE_WMEMCHR = @HAVE_WMEMCHR@ HAVE_WMEMCMP = @HAVE_WMEMCMP@ HAVE_WMEMCPY = @HAVE_WMEMCPY@ HAVE_WMEMMOVE = @HAVE_WMEMMOVE@ +HAVE_WMEMPCPY = @HAVE_WMEMPCPY@ HAVE_WMEMSET = @HAVE_WMEMSET@ HAVE_WS2TCPIP_H = @HAVE_WS2TCPIP_H@ HAVE_XLOCALE_H = @HAVE_XLOCALE_H@ @@ -1025,16 +1055,28 @@ LIBICONV = @LIBICONV@ LIBINTL = @LIBINTL@ LIBMULTITHREAD = @LIBMULTITHREAD@ LIBOBJS = @LIBOBJS@ +LIBPMULTITHREAD = @LIBPMULTITHREAD@ +LIBPTHREAD = @LIBPTHREAD@ LIBS = @LIBS@ LIBSOCKET = @LIBSOCKET@ +LIBSTDTHREAD = @LIBSTDTHREAD@ LIBTESTS_LIBDEPS = @LIBTESTS_LIBDEPS@ LIBTHREAD = @LIBTHREAD@ LIBTOOL = @LIBTOOL@ LIB_BLKID = @LIB_BLKID@ +LIB_CLOCK_GETTIME = @LIB_CLOCK_GETTIME@ +LIB_GETRANDOM = @LIB_GETRANDOM@ +LIB_HARD_LOCALE = @LIB_HARD_LOCALE@ +LIB_MBRTOWC = @LIB_MBRTOWC@ LIB_NANOSLEEP = @LIB_NANOSLEEP@ +LIB_NL_LANGINFO = @LIB_NL_LANGINFO@ LIB_PTHREAD = @LIB_PTHREAD@ LIB_PTHREAD_SIGMASK = @LIB_PTHREAD_SIGMASK@ +LIB_SCHED_YIELD = @LIB_SCHED_YIELD@ LIB_SELECT = @LIB_SELECT@ +LIB_SEMAPHORE = @LIB_SEMAPHORE@ +LIB_SETLOCALE = @LIB_SETLOCALE@ +LIB_SETLOCALE_NULL = @LIB_SETLOCALE_NULL@ LIMITS_H = @LIMITS_H@ LIPO = @LIPO@ LN_S = @LN_S@ @@ -1083,6 +1125,7 @@ NEXT_AS_FIRST_DIRECTIVE_STDIO_H = @NEXT_AS_FIRST_DIRECTIVE_STDIO_H@ NEXT_AS_FIRST_DIRECTIVE_STDLIB_H = @NEXT_AS_FIRST_DIRECTIVE_STDLIB_H@ NEXT_AS_FIRST_DIRECTIVE_STRING_H = @NEXT_AS_FIRST_DIRECTIVE_STRING_H@ NEXT_AS_FIRST_DIRECTIVE_SYS_IOCTL_H = @NEXT_AS_FIRST_DIRECTIVE_SYS_IOCTL_H@ +NEXT_AS_FIRST_DIRECTIVE_SYS_RANDOM_H = @NEXT_AS_FIRST_DIRECTIVE_SYS_RANDOM_H@ NEXT_AS_FIRST_DIRECTIVE_SYS_SELECT_H = @NEXT_AS_FIRST_DIRECTIVE_SYS_SELECT_H@ NEXT_AS_FIRST_DIRECTIVE_SYS_SOCKET_H = @NEXT_AS_FIRST_DIRECTIVE_SYS_SOCKET_H@ NEXT_AS_FIRST_DIRECTIVE_SYS_STAT_H = @NEXT_AS_FIRST_DIRECTIVE_SYS_STAT_H@ @@ -1112,6 +1155,7 @@ NEXT_STDIO_H = @NEXT_STDIO_H@ NEXT_STDLIB_H = @NEXT_STDLIB_H@ NEXT_STRING_H = @NEXT_STRING_H@ NEXT_SYS_IOCTL_H = @NEXT_SYS_IOCTL_H@ +NEXT_SYS_RANDOM_H = @NEXT_SYS_RANDOM_H@ NEXT_SYS_SELECT_H = @NEXT_SYS_SELECT_H@ NEXT_SYS_SOCKET_H = @NEXT_SYS_SOCKET_H@ NEXT_SYS_STAT_H = @NEXT_SYS_STAT_H@ @@ -1148,21 +1192,24 @@ POSUB = @POSUB@ PRAGMA_COLUMNS = @PRAGMA_COLUMNS@ PRAGMA_SYSTEM_HEADER = @PRAGMA_SYSTEM_HEADER@ PRIPTR_PREFIX = @PRIPTR_PREFIX@ -PRI_MACROS_BROKEN = @PRI_MACROS_BROKEN@ PTHREAD_H_DEFINES_STRUCT_TIMESPEC = @PTHREAD_H_DEFINES_STRUCT_TIMESPEC@ PTRDIFF_T_SUFFIX = @PTRDIFF_T_SUFFIX@ RANLIB = @RANLIB@ +REPLACE_ACCESS = @REPLACE_ACCESS@ +REPLACE_ALIGNED_ALLOC = @REPLACE_ALIGNED_ALLOC@ REPLACE_BTOWC = @REPLACE_BTOWC@ REPLACE_CALLOC = @REPLACE_CALLOC@ REPLACE_CANONICALIZE_FILE_NAME = @REPLACE_CANONICALIZE_FILE_NAME@ REPLACE_CHOWN = @REPLACE_CHOWN@ REPLACE_CLOSE = @REPLACE_CLOSE@ +REPLACE_CREAT = @REPLACE_CREAT@ REPLACE_CTIME = @REPLACE_CTIME@ REPLACE_DPRINTF = @REPLACE_DPRINTF@ REPLACE_DUP = @REPLACE_DUP@ REPLACE_DUP2 = @REPLACE_DUP2@ REPLACE_DUPLOCALE = @REPLACE_DUPLOCALE@ REPLACE_FACCESSAT = @REPLACE_FACCESSAT@ +REPLACE_FCHMODAT = @REPLACE_FCHMODAT@ REPLACE_FCHOWNAT = @REPLACE_FCHOWNAT@ REPLACE_FCLOSE = @REPLACE_FCLOSE@ REPLACE_FCNTL = @REPLACE_FCNTL@ @@ -1190,6 +1237,7 @@ REPLACE_GETLINE = @REPLACE_GETLINE@ REPLACE_GETLOGIN_R = @REPLACE_GETLOGIN_R@ REPLACE_GETPAGESIZE = @REPLACE_GETPAGESIZE@ REPLACE_GETPASS = @REPLACE_GETPASS@ +REPLACE_GETRANDOM = @REPLACE_GETRANDOM@ REPLACE_GETTIMEOFDAY = @REPLACE_GETTIMEOFDAY@ REPLACE_GMTIME = @REPLACE_GMTIME@ REPLACE_INET_NTOP = @REPLACE_INET_NTOP@ @@ -1199,6 +1247,8 @@ REPLACE_IOCTL = @REPLACE_IOCTL@ REPLACE_ISATTY = @REPLACE_ISATTY@ REPLACE_ISWBLANK = @REPLACE_ISWBLANK@ REPLACE_ISWCNTRL = @REPLACE_ISWCNTRL@ +REPLACE_ISWDIGIT = @REPLACE_ISWDIGIT@ +REPLACE_ISWXDIGIT = @REPLACE_ISWXDIGIT@ REPLACE_LCHOWN = @REPLACE_LCHOWN@ REPLACE_LINK = @REPLACE_LINK@ REPLACE_LINKAT = @REPLACE_LINKAT@ @@ -1231,6 +1281,7 @@ REPLACE_OPEN = @REPLACE_OPEN@ REPLACE_OPENAT = @REPLACE_OPENAT@ REPLACE_PERROR = @REPLACE_PERROR@ REPLACE_POPEN = @REPLACE_POPEN@ +REPLACE_POSIX_MEMALIGN = @REPLACE_POSIX_MEMALIGN@ REPLACE_PREAD = @REPLACE_PREAD@ REPLACE_PRINTF = @REPLACE_PRINTF@ REPLACE_PSELECT = @REPLACE_PSELECT@ @@ -1319,6 +1370,7 @@ REPLACE_STRCASESTR = @REPLACE_STRCASESTR@ REPLACE_STRCHRNUL = @REPLACE_STRCHRNUL@ REPLACE_STRDUP = @REPLACE_STRDUP@ REPLACE_STRERROR = @REPLACE_STRERROR@ +REPLACE_STRERRORNAME_NP = @REPLACE_STRERRORNAME_NP@ REPLACE_STRERROR_R = @REPLACE_STRERROR_R@ REPLACE_STRFTIME = @REPLACE_STRFTIME@ REPLACE_STRNCAT = @REPLACE_STRNCAT@ @@ -1356,13 +1408,13 @@ REPLACE_WCRTOMB = @REPLACE_WCRTOMB@ REPLACE_WCSFTIME = @REPLACE_WCSFTIME@ REPLACE_WCSNRTOMBS = @REPLACE_WCSNRTOMBS@ REPLACE_WCSRTOMBS = @REPLACE_WCSRTOMBS@ +REPLACE_WCSTOK = @REPLACE_WCSTOK@ REPLACE_WCSWIDTH = @REPLACE_WCSWIDTH@ REPLACE_WCTOB = @REPLACE_WCTOB@ REPLACE_WCTOMB = @REPLACE_WCTOMB@ REPLACE_WCWIDTH = @REPLACE_WCWIDTH@ REPLACE_WRITE = @REPLACE_WRITE@ SED = @SED@ -SELINUX_LIBS = @SELINUX_LIBS@ SET_MAKE = @SET_MAKE@ SHELL = @SHELL@ SIG_ATOMIC_T_SUFFIX = @SIG_ATOMIC_T_SUFFIX@ @@ -1381,6 +1433,7 @@ UINT32_MAX_LT_UINTMAX_MAX = @UINT32_MAX_LT_UINTMAX_MAX@ UINT64_MAX_EQ_ULONG_MAX = @UINT64_MAX_EQ_ULONG_MAX@ UNDEFINE_STRTOK_R = @UNDEFINE_STRTOK_R@ UNISTD_H_DEFINES_STRUCT_TIMESPEC = @UNISTD_H_DEFINES_STRUCT_TIMESPEC@ +UNISTD_H_HAVE_SYS_RANDOM_H = @UNISTD_H_HAVE_SYS_RANDOM_H@ UNISTD_H_HAVE_WINSOCK2_H = @UNISTD_H_HAVE_WINSOCK2_H@ UNISTD_H_HAVE_WINSOCK2_H_AND_USE_SOCKETS = @UNISTD_H_HAVE_WINSOCK2_H_AND_USE_SOCKETS@ USE_NLS = @USE_NLS@ diff --git a/NEWS b/NEWS index 2630146..c081eb0 100644 --- a/NEWS +++ b/NEWS @@ -1,5 +1,23 @@ GNU parted NEWS -*- outline -*- +* Noteworthy changes in release 3.4 (2021-01-27) [stable] + + Include local gnulib change to version-etc.c date. + This means including a non-public gnulib commit in this release. + cfg.mk: disable submodule checks to work around broken upstream gnulib + +* Noteworthy changes in release 3.3.52 (2020-12-14) [alpha] + +** New Features + + Add a new partition type flag, chromeos_kernel, for use with ChromeOS + machines. This is a GPT-only flag and sets the type GUID to + FE3A2A5D-4F32-41A7-B725-ACCC3285A309. + + Add a new partition flag for Linux Boot Loader Specification /boot + partitions. The bls_boot flag will set the msdos partition type to 0xea + and the GPT partition type GUID to bc13c2ff-59e6-4262-a352-b275fd6f7172. + * Noteworthy changes in release 3.3 (2019-10-10) [stable] ** Bug Fixes @@ -914,7 +932,7 @@ GNU parted NEWS -*- outline -*- ======================================================================== -Copyright (C) 2001-2014, 2019 Free Software Foundation, Inc. +Copyright (C) 2001-2014, 2019-2021 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/aclocal.m4 b/aclocal.m4 index fef217e..fa00b1d 100644 --- a/aclocal.m4 +++ b/aclocal.m4 @@ -1519,12 +1519,12 @@ m4_include([m4/btowc.m4]) m4_include([m4/builtin-expect.m4]) m4_include([m4/calloc.m4]) m4_include([m4/canonicalize.m4]) +m4_include([m4/clock_time.m4]) m4_include([m4/close.m4]) m4_include([m4/codeset.m4]) m4_include([m4/config-h.m4]) m4_include([m4/configmake.m4]) m4_include([m4/ctype.m4]) -m4_include([m4/dirname.m4]) m4_include([m4/double-slash-root.m4]) m4_include([m4/dup2.m4]) m4_include([m4/eealloc.m4]) @@ -1547,18 +1547,17 @@ m4_include([m4/getdtablesize.m4]) m4_include([m4/getopt.m4]) m4_include([m4/getpagesize.m4]) m4_include([m4/getprogname.m4]) +m4_include([m4/getrandom.m4]) m4_include([m4/gettext.m4]) m4_include([m4/gettimeofday.m4]) m4_include([m4/glibc21.m4]) m4_include([m4/gnulib-common.m4]) m4_include([m4/gnulib-comp.m4]) -m4_include([m4/host-cpu-c-abi.m4]) m4_include([m4/iconv.m4]) m4_include([m4/include_next.m4]) m4_include([m4/inet_pton.m4]) m4_include([m4/intl-thread-locale.m4]) m4_include([m4/intlmacosx.m4]) -m4_include([m4/inttypes-pri.m4]) m4_include([m4/inttypes.m4]) m4_include([m4/ioctl.m4]) m4_include([m4/isblank.m4]) @@ -1579,9 +1578,7 @@ m4_include([m4/locale-zh.m4]) m4_include([m4/locale_h.m4]) m4_include([m4/localeconv.m4]) m4_include([m4/localename.m4]) -m4_include([m4/localtime-buffer.m4]) m4_include([m4/lock.m4]) -m4_include([m4/longlong.m4]) m4_include([m4/lseek.m4]) m4_include([m4/lstat.m4]) m4_include([m4/ltoptions.m4]) @@ -1603,6 +1600,7 @@ m4_include([m4/mode_t.m4]) m4_include([m4/msvc-inval.m4]) m4_include([m4/msvc-nothrow.m4]) m4_include([m4/multiarch.m4]) +m4_include([m4/musl.m4]) m4_include([m4/nanosleep.m4]) m4_include([m4/netinet_in_h.m4]) m4_include([m4/nl_langinfo.m4]) @@ -1611,9 +1609,11 @@ m4_include([m4/nocrash.m4]) m4_include([m4/o-direct.m4]) m4_include([m4/off_t.m4]) m4_include([m4/open-cloexec.m4]) +m4_include([m4/open-slash.m4]) m4_include([m4/open.m4]) m4_include([m4/pathmax.m4]) m4_include([m4/perror.m4]) +m4_include([m4/pid_t.m4]) m4_include([m4/pipe.m4]) m4_include([m4/po.m4]) m4_include([m4/priv-set.m4]) @@ -1634,8 +1634,10 @@ m4_include([m4/rpmatch.m4]) m4_include([m4/safe-read.m4]) m4_include([m4/sched_h.m4]) m4_include([m4/select.m4]) +m4_include([m4/semaphore.m4]) m4_include([m4/setenv.m4]) m4_include([m4/setlocale.m4]) +m4_include([m4/setlocale_null.m4]) m4_include([m4/sigaction.m4]) m4_include([m4/signal_h.m4]) m4_include([m4/signalblocking.m4]) @@ -1665,6 +1667,7 @@ m4_include([m4/strtoll.m4]) m4_include([m4/strtoull.m4]) m4_include([m4/symlink.m4]) m4_include([m4/sys_ioctl_h.m4]) +m4_include([m4/sys_random_h.m4]) m4_include([m4/sys_select_h.m4]) m4_include([m4/sys_socket_h.m4]) m4_include([m4/sys_stat_h.m4]) @@ -1680,6 +1683,7 @@ m4_include([m4/unlink.m4]) m4_include([m4/unlinkdir.m4]) m4_include([m4/usleep.m4]) m4_include([m4/version-etc.m4]) +m4_include([m4/visibility.m4]) m4_include([m4/warn-on-use.m4]) m4_include([m4/warnings.m4]) m4_include([m4/wchar_h.m4]) @@ -1693,3 +1697,4 @@ m4_include([m4/xalloc.m4]) m4_include([m4/xstrndup.m4]) m4_include([m4/xstrtol.m4]) m4_include([m4/yield.m4]) +m4_include([m4/zzgnulib.m4]) diff --git a/build-aux/announce-gen b/build-aux/announce-gen index 8fe0cc8..ff8d450 100755 --- a/build-aux/announce-gen +++ b/build-aux/announce-gen @@ -3,7 +3,7 @@ # Generate a release announcement message. -# Copyright (C) 2002-2019 Free Software Foundation, Inc. +# Copyright (C) 2002-2020 Free Software Foundation, Inc. # # This program is free software: you can redistribute it and/or modify # it under the terms of the GNU General Public License as published by @@ -31,11 +31,11 @@ # are valid code in both sh and perl. When executed by sh, they re-execute # the script through the perl program found in $PATH. The '-x' option # is essential as well; without it, perl would re-execute the script -# through /bin/sh. When executed by perl, the next two lines are a no-op. +# through /bin/sh. When executed by perl, the next two lines are a no-op. eval 'exec perl -wSx "$0" "$@"' if 0; -my $VERSION = '2018-03-07 03:46'; # UTC +my $VERSION = '2020-05-10 16:13'; # 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 @@ -48,7 +48,7 @@ use POSIX qw(strftime); (my $ME = $0) =~ s|.*/||; my %valid_release_types = map {$_ => 1} qw (alpha beta stable); -my @archive_suffixes = ('tar.gz', 'tar.bz2', 'tar.lzma', 'tar.xz'); +my @archive_suffixes = qw (tar.gz tar.bz2 tar.lz tar.lzma tar.xz); my %digest_classes = ( 'md5' => (eval { require Digest::MD5; } and 'Digest::MD5'), @@ -371,8 +371,8 @@ sub get_tool_versions ($$) } { - # Neutralize the locale, so that, for instance, "du" does not - # issue "1,2" instead of "1.2", what confuses our regexps. + # Use the C locale so that, for instance, "du" does not + # print "1,2" instead of "1.2", which would confuse our regexps. $ENV{LC_ALL} = "C"; my $mail_headers; diff --git a/build-aux/config.guess b/build-aux/config.guess index 97ad073..699b3a1 100755 --- a/build-aux/config.guess +++ b/build-aux/config.guess @@ -1,8 +1,8 @@ #! /bin/sh # Attempt to guess a canonical system name. -# Copyright 1992-2019 Free Software Foundation, Inc. +# Copyright 1992-2020 Free Software Foundation, Inc. -timestamp='2019-07-24' +timestamp='2020-11-19' # 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 @@ -27,12 +27,12 @@ timestamp='2019-07-24' # Originally written by Per Bothner; maintained since 2000 by Ben Elliston. # # You can get the latest version of this script from: -# https://git.savannah.gnu.org/gitweb/?p=config.git;a=blob_plain;f=config.guess +# https://git.savannah.gnu.org/cgit/config.git/plain/config.guess # # Please send patches to . -me=`echo "$0" | sed -e 's,.*/,,'` +me=$(echo "$0" | sed -e 's,.*/,,') usage="\ Usage: $0 [OPTION] @@ -50,7 +50,7 @@ version="\ GNU config.guess ($timestamp) Originally written by Per Bothner. -Copyright 1992-2019 Free Software Foundation, Inc. +Copyright 1992-2020 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." @@ -99,9 +99,11 @@ tmp= trap 'test -z "$tmp" || rm -fr "$tmp"' 0 1 2 13 15 set_cc_for_build() { + # prevent multiple calls if $tmp is already set + test "$tmp" && return 0 : "${TMPDIR=/tmp}" # shellcheck disable=SC2039 - { tmp=`(umask 077 && mktemp -d "$TMPDIR/cgXXXXXX") 2>/dev/null` && test -n "$tmp" && test -d "$tmp" ; } || + { tmp=$( (umask 077 && mktemp -d "$TMPDIR/cgXXXXXX") 2>/dev/null) && test -n "$tmp" && test -d "$tmp" ; } || { test -n "$RANDOM" && tmp=$TMPDIR/cg$$-$RANDOM && (umask 077 && mkdir "$tmp" 2>/dev/null) ; } || { tmp=$TMPDIR/cg-$$ && (umask 077 && mkdir "$tmp" 2>/dev/null) && echo "Warning: creating insecure temp directory" >&2 ; } || { echo "$me: cannot create a temporary directory in $TMPDIR" >&2 ; exit 1 ; } @@ -129,16 +131,14 @@ if test -f /.attbin/uname ; then PATH=$PATH:/.attbin ; export PATH fi -UNAME_MACHINE=`(uname -m) 2>/dev/null` || UNAME_MACHINE=unknown -UNAME_RELEASE=`(uname -r) 2>/dev/null` || UNAME_RELEASE=unknown -UNAME_SYSTEM=`(uname -s) 2>/dev/null` || UNAME_SYSTEM=unknown -UNAME_VERSION=`(uname -v) 2>/dev/null` || UNAME_VERSION=unknown +UNAME_MACHINE=$( (uname -m) 2>/dev/null) || UNAME_MACHINE=unknown +UNAME_RELEASE=$( (uname -r) 2>/dev/null) || UNAME_RELEASE=unknown +UNAME_SYSTEM=$( (uname -s) 2>/dev/null) || UNAME_SYSTEM=unknown +UNAME_VERSION=$( (uname -v) 2>/dev/null) || UNAME_VERSION=unknown case "$UNAME_SYSTEM" in Linux|GNU|GNU/*) - # If the system lacks a compiler, then just pick glibc. - # We could probably try harder. - LIBC=gnu + LIBC=unknown set_cc_for_build cat <<-EOF > "$dummy.c" @@ -147,17 +147,29 @@ Linux|GNU|GNU/*) LIBC=uclibc #elif defined(__dietlibc__) LIBC=dietlibc - #else + #elif defined(__GLIBC__) LIBC=gnu + #else + #include + /* First heuristic to detect musl libc. */ + #ifdef __DEFINED_va_list + LIBC=musl + #endif #endif EOF - eval "`$CC_FOR_BUILD -E "$dummy.c" 2>/dev/null | grep '^LIBC' | sed 's, ,,g'`" + eval "$($CC_FOR_BUILD -E "$dummy.c" 2>/dev/null | grep '^LIBC' | sed 's, ,,g')" - # If ldd exists, use it to detect musl libc. - if command -v ldd >/dev/null && \ - ldd --version 2>&1 | grep -q ^musl - then - LIBC=musl + # Second heuristic to detect musl libc. + if [ "$LIBC" = unknown ] && + command -v ldd >/dev/null && + ldd --version 2>&1 | grep -q ^musl; then + LIBC=musl + fi + + # If the system lacks a compiler, then just pick glibc. + # We could probably try harder. + if [ "$LIBC" = unknown ]; then + LIBC=gnu fi ;; esac @@ -177,19 +189,20 @@ case "$UNAME_MACHINE:$UNAME_SYSTEM:$UNAME_RELEASE:$UNAME_VERSION" in # Note: NetBSD doesn't particularly care about the vendor # portion of the name. We always set it to "unknown". sysctl="sysctl -n hw.machine_arch" - UNAME_MACHINE_ARCH=`(uname -p 2>/dev/null || \ + UNAME_MACHINE_ARCH=$( (uname -p 2>/dev/null || \ "/sbin/$sysctl" 2>/dev/null || \ "/usr/sbin/$sysctl" 2>/dev/null || \ - echo unknown)` + echo unknown)) case "$UNAME_MACHINE_ARCH" in + aarch64eb) machine=aarch64_be-unknown ;; armeb) machine=armeb-unknown ;; arm*) machine=arm-unknown ;; sh3el) machine=shl-unknown ;; sh3eb) machine=sh-unknown ;; sh5el) machine=sh5le-unknown ;; earmv*) - arch=`echo "$UNAME_MACHINE_ARCH" | sed -e 's,^e\(armv[0-9]\).*$,\1,'` - endian=`echo "$UNAME_MACHINE_ARCH" | sed -ne 's,^.*\(eb\)$,\1,p'` + arch=$(echo "$UNAME_MACHINE_ARCH" | sed -e 's,^e\(armv[0-9]\).*$,\1,') + endian=$(echo "$UNAME_MACHINE_ARCH" | sed -ne 's,^.*\(eb\)$,\1,p') machine="${arch}${endian}"-unknown ;; *) machine="$UNAME_MACHINE_ARCH"-unknown ;; @@ -220,7 +233,7 @@ case "$UNAME_MACHINE:$UNAME_SYSTEM:$UNAME_RELEASE:$UNAME_VERSION" in case "$UNAME_MACHINE_ARCH" in earm*) expr='s/^earmv[0-9]/-eabi/;s/eb$//' - abi=`echo "$UNAME_MACHINE_ARCH" | sed -e "$expr"` + abi=$(echo "$UNAME_MACHINE_ARCH" | sed -e "$expr") ;; esac # The OS release @@ -233,7 +246,7 @@ case "$UNAME_MACHINE:$UNAME_SYSTEM:$UNAME_RELEASE:$UNAME_VERSION" in release='-gnu' ;; *) - release=`echo "$UNAME_RELEASE" | sed -e 's/[-_].*//' | cut -d. -f1,2` + release=$(echo "$UNAME_RELEASE" | sed -e 's/[-_].*//' | cut -d. -f1,2) ;; esac # Since CPU_TYPE-MANUFACTURER-KERNEL-OPERATING_SYSTEM: @@ -242,15 +255,15 @@ case "$UNAME_MACHINE:$UNAME_SYSTEM:$UNAME_RELEASE:$UNAME_VERSION" in echo "$machine-${os}${release}${abi-}" exit ;; *:Bitrig:*:*) - UNAME_MACHINE_ARCH=`arch | sed 's/Bitrig.//'` + UNAME_MACHINE_ARCH=$(arch | sed 's/Bitrig.//') echo "$UNAME_MACHINE_ARCH"-unknown-bitrig"$UNAME_RELEASE" exit ;; *:OpenBSD:*:*) - UNAME_MACHINE_ARCH=`arch | sed 's/OpenBSD.//'` + UNAME_MACHINE_ARCH=$(arch | sed 's/OpenBSD.//') echo "$UNAME_MACHINE_ARCH"-unknown-openbsd"$UNAME_RELEASE" exit ;; *:LibertyBSD:*:*) - UNAME_MACHINE_ARCH=`arch | sed 's/^.*BSD\.//'` + UNAME_MACHINE_ARCH=$(arch | sed 's/^.*BSD\.//') echo "$UNAME_MACHINE_ARCH"-unknown-libertybsd"$UNAME_RELEASE" exit ;; *:MidnightBSD:*:*) @@ -274,6 +287,9 @@ case "$UNAME_MACHINE:$UNAME_SYSTEM:$UNAME_RELEASE:$UNAME_VERSION" in *:Sortix:*:*) echo "$UNAME_MACHINE"-unknown-sortix exit ;; + *:Twizzler:*:*) + echo "$UNAME_MACHINE"-unknown-twizzler + exit ;; *:Redox:*:*) echo "$UNAME_MACHINE"-unknown-redox exit ;; @@ -283,17 +299,17 @@ case "$UNAME_MACHINE:$UNAME_SYSTEM:$UNAME_RELEASE:$UNAME_VERSION" in alpha:OSF1:*:*) case $UNAME_RELEASE in *4.0) - UNAME_RELEASE=`/usr/sbin/sizer -v | awk '{print $3}'` + UNAME_RELEASE=$(/usr/sbin/sizer -v | awk '{print $3}') ;; *5.*) - UNAME_RELEASE=`/usr/sbin/sizer -v | awk '{print $4}'` + UNAME_RELEASE=$(/usr/sbin/sizer -v | awk '{print $4}') ;; esac # According to Compaq, /usr/sbin/psrinfo has been available on # OSF/1 and Tru64 systems produced since 1995. I hope that # covers most systems running today. This code pipes the CPU # types through head -n 1, so we only detect the type of CPU 0. - ALPHA_CPU_TYPE=`/usr/sbin/psrinfo -v | sed -n -e 's/^ The alpha \(.*\) processor.*$/\1/p' | head -n 1` + ALPHA_CPU_TYPE=$(/usr/sbin/psrinfo -v | sed -n -e 's/^ The alpha \(.*\) processor.*$/\1/p' | head -n 1) case "$ALPHA_CPU_TYPE" in "EV4 (21064)") UNAME_MACHINE=alpha ;; @@ -331,7 +347,7 @@ case "$UNAME_MACHINE:$UNAME_SYSTEM:$UNAME_RELEASE:$UNAME_VERSION" in # A Tn.n version is a released field test version. # A Xn.n version is an unreleased experimental baselevel. # 1.2 uses "1.2" for uname -r. - echo "$UNAME_MACHINE"-dec-osf"`echo "$UNAME_RELEASE" | sed -e 's/^[PVTX]//' | tr ABCDEFGHIJKLMNOPQRSTUVWXYZ abcdefghijklmnopqrstuvwxyz`" + echo "$UNAME_MACHINE"-dec-osf"$(echo "$UNAME_RELEASE" | sed -e 's/^[PVTX]//' | tr ABCDEFGHIJKLMNOPQRSTUVWXYZ abcdefghijklmnopqrstuvwxyz)" # Reset EXIT trap before exiting to avoid spurious non-zero exit code. exitcode=$? trap '' 0 @@ -365,7 +381,7 @@ case "$UNAME_MACHINE:$UNAME_SYSTEM:$UNAME_RELEASE:$UNAME_VERSION" in exit ;; Pyramid*:OSx*:*:* | MIS*:OSx*:*:* | MIS*:SMP_DC-OSx*:*:*) # akee@wpdis03.wpafb.af.mil (Earle F. Ake) contributed MIS and NILE. - if test "`(/bin/universe) 2>/dev/null`" = att ; then + if test "$( (/bin/universe) 2>/dev/null)" = att ; then echo pyramid-pyramid-sysv3 else echo pyramid-pyramid-bsd @@ -378,17 +394,17 @@ case "$UNAME_MACHINE:$UNAME_SYSTEM:$UNAME_RELEASE:$UNAME_VERSION" in echo sparc-icl-nx6 exit ;; DRS?6000:UNIX_SV:4.2*:7* | DRS?6000:isis:4.2*:7*) - case `/usr/bin/uname -p` in + case $(/usr/bin/uname -p) in sparc) echo sparc-icl-nx7; exit ;; esac ;; s390x:SunOS:*:*) - echo "$UNAME_MACHINE"-ibm-solaris2"`echo "$UNAME_RELEASE" | sed -e 's/[^.]*//'`" + echo "$UNAME_MACHINE"-ibm-solaris2"$(echo "$UNAME_RELEASE" | sed -e 's/[^.]*//')" exit ;; sun4H:SunOS:5.*:*) - echo sparc-hal-solaris2"`echo "$UNAME_RELEASE"|sed -e 's/[^.]*//'`" + echo sparc-hal-solaris2"$(echo "$UNAME_RELEASE"|sed -e 's/[^.]*//')" exit ;; sun4*:SunOS:5.*:* | tadpole*:SunOS:5.*:*) - echo sparc-sun-solaris2"`echo "$UNAME_RELEASE" | sed -e 's/[^.]*//'`" + echo sparc-sun-solaris2"$(echo "$UNAME_RELEASE" | sed -e 's/[^.]*//')" exit ;; i86pc:AuroraUX:5.*:* | i86xen:AuroraUX:5.*:*) echo i386-pc-auroraux"$UNAME_RELEASE" @@ -399,7 +415,7 @@ case "$UNAME_MACHINE:$UNAME_SYSTEM:$UNAME_RELEASE:$UNAME_VERSION" in # If there is a compiler, see if it is configured for 64-bit objects. # Note that the Sun cc does not turn __LP64__ into 1 like gcc does. # This test works for both compilers. - if [ "$CC_FOR_BUILD" != no_compiler_found ]; then + if test "$CC_FOR_BUILD" != no_compiler_found; then if (echo '#ifdef __amd64'; echo IS_64BIT_ARCH; echo '#endif') | \ (CCOPTS="" $CC_FOR_BUILD -E - 2>/dev/null) | \ grep IS_64BIT_ARCH >/dev/null @@ -407,30 +423,30 @@ case "$UNAME_MACHINE:$UNAME_SYSTEM:$UNAME_RELEASE:$UNAME_VERSION" in SUN_ARCH=x86_64 fi fi - echo "$SUN_ARCH"-pc-solaris2"`echo "$UNAME_RELEASE"|sed -e 's/[^.]*//'`" + echo "$SUN_ARCH"-pc-solaris2"$(echo "$UNAME_RELEASE"|sed -e 's/[^.]*//')" exit ;; sun4*:SunOS:6*:*) # According to config.sub, this is the proper way to canonicalize # SunOS6. Hard to guess exactly what SunOS6 will be like, but # it's likely to be more like Solaris than SunOS4. - echo sparc-sun-solaris3"`echo "$UNAME_RELEASE"|sed -e 's/[^.]*//'`" + echo sparc-sun-solaris3"$(echo "$UNAME_RELEASE"|sed -e 's/[^.]*//')" exit ;; sun4*:SunOS:*:*) - case "`/usr/bin/arch -k`" in + case "$(/usr/bin/arch -k)" in Series*|S4*) - UNAME_RELEASE=`uname -v` + UNAME_RELEASE=$(uname -v) ;; esac # Japanese Language versions have a version number like `4.1.3-JL'. - echo sparc-sun-sunos"`echo "$UNAME_RELEASE"|sed -e 's/-/_/'`" + echo sparc-sun-sunos"$(echo "$UNAME_RELEASE"|sed -e 's/-/_/')" exit ;; sun3*:SunOS:*:*) echo m68k-sun-sunos"$UNAME_RELEASE" exit ;; sun*:*:4.2BSD:*) - UNAME_RELEASE=`(sed 1q /etc/motd | awk '{print substr($5,1,3)}') 2>/dev/null` + UNAME_RELEASE=$( (sed 1q /etc/motd | awk '{print substr($5,1,3)}') 2>/dev/null) test "x$UNAME_RELEASE" = x && UNAME_RELEASE=3 - case "`/bin/arch`" in + case "$(/bin/arch)" in sun3) echo m68k-sun-sunos"$UNAME_RELEASE" ;; @@ -510,8 +526,8 @@ case "$UNAME_MACHINE:$UNAME_SYSTEM:$UNAME_RELEASE:$UNAME_VERSION" in } EOF $CC_FOR_BUILD -o "$dummy" "$dummy.c" && - dummyarg=`echo "$UNAME_RELEASE" | sed -n 's/\([0-9]*\).*/\1/p'` && - SYSTEM_NAME=`"$dummy" "$dummyarg"` && + dummyarg=$(echo "$UNAME_RELEASE" | sed -n 's/\([0-9]*\).*/\1/p') && + SYSTEM_NAME=$("$dummy" "$dummyarg") && { echo "$SYSTEM_NAME"; exit; } echo mips-mips-riscos"$UNAME_RELEASE" exit ;; @@ -538,11 +554,11 @@ EOF exit ;; AViiON:dgux:*:*) # DG/UX returns AViiON for all architectures - UNAME_PROCESSOR=`/usr/bin/uname -p` - if [ "$UNAME_PROCESSOR" = mc88100 ] || [ "$UNAME_PROCESSOR" = mc88110 ] + UNAME_PROCESSOR=$(/usr/bin/uname -p) + if test "$UNAME_PROCESSOR" = mc88100 || test "$UNAME_PROCESSOR" = mc88110 then - if [ "$TARGET_BINARY_INTERFACE"x = m88kdguxelfx ] || \ - [ "$TARGET_BINARY_INTERFACE"x = x ] + if test "$TARGET_BINARY_INTERFACE"x = m88kdguxelfx || \ + test "$TARGET_BINARY_INTERFACE"x = x then echo m88k-dg-dgux"$UNAME_RELEASE" else @@ -566,17 +582,17 @@ EOF echo m68k-tektronix-bsd exit ;; *:IRIX*:*:*) - echo mips-sgi-irix"`echo "$UNAME_RELEASE"|sed -e 's/-/_/g'`" + echo mips-sgi-irix"$(echo "$UNAME_RELEASE"|sed -e 's/-/_/g')" exit ;; ????????:AIX?:[12].1:2) # AIX 2.2.1 or AIX 2.1.1 is RT/PC AIX. echo romp-ibm-aix # uname -m gives an 8 hex-code CPU id - exit ;; # Note that: echo "'`uname -s`'" gives 'AIX ' + exit ;; # Note that: echo "'$(uname -s)'" gives 'AIX ' i*86:AIX:*:*) echo i386-ibm-aix exit ;; ia64:AIX:*:*) - if [ -x /usr/bin/oslevel ] ; then - IBM_REV=`/usr/bin/oslevel` + if test -x /usr/bin/oslevel ; then + IBM_REV=$(/usr/bin/oslevel) else IBM_REV="$UNAME_VERSION.$UNAME_RELEASE" fi @@ -596,7 +612,7 @@ EOF exit(0); } EOF - if $CC_FOR_BUILD -o "$dummy" "$dummy.c" && SYSTEM_NAME=`"$dummy"` + if $CC_FOR_BUILD -o "$dummy" "$dummy.c" && SYSTEM_NAME=$("$dummy") then echo "$SYSTEM_NAME" else @@ -609,15 +625,15 @@ EOF fi exit ;; *:AIX:*:[4567]) - IBM_CPU_ID=`/usr/sbin/lsdev -C -c processor -S available | sed 1q | awk '{ print $1 }'` + IBM_CPU_ID=$(/usr/sbin/lsdev -C -c processor -S available | sed 1q | awk '{ print $1 }') if /usr/sbin/lsattr -El "$IBM_CPU_ID" | grep ' POWER' >/dev/null 2>&1; then IBM_ARCH=rs6000 else IBM_ARCH=powerpc fi - if [ -x /usr/bin/lslpp ] ; then - IBM_REV=`/usr/bin/lslpp -Lqc bos.rte.libc | - awk -F: '{ print $3 }' | sed s/[0-9]*$/0/` + if test -x /usr/bin/lslpp ; then + IBM_REV=$(/usr/bin/lslpp -Lqc bos.rte.libc | + awk -F: '{ print $3 }' | sed s/[0-9]*$/0/) else IBM_REV="$UNAME_VERSION.$UNAME_RELEASE" fi @@ -645,14 +661,14 @@ EOF echo m68k-hp-bsd4.4 exit ;; 9000/[34678]??:HP-UX:*:*) - HPUX_REV=`echo "$UNAME_RELEASE"|sed -e 's/[^.]*.[0B]*//'` + HPUX_REV=$(echo "$UNAME_RELEASE"|sed -e 's/[^.]*.[0B]*//') case "$UNAME_MACHINE" in 9000/31?) HP_ARCH=m68000 ;; 9000/[34]??) HP_ARCH=m68k ;; 9000/[678][0-9][0-9]) - if [ -x /usr/bin/getconf ]; then - sc_cpu_version=`/usr/bin/getconf SC_CPU_VERSION 2>/dev/null` - sc_kernel_bits=`/usr/bin/getconf SC_KERNEL_BITS 2>/dev/null` + if test -x /usr/bin/getconf; then + sc_cpu_version=$(/usr/bin/getconf SC_CPU_VERSION 2>/dev/null) + sc_kernel_bits=$(/usr/bin/getconf SC_KERNEL_BITS 2>/dev/null) case "$sc_cpu_version" in 523) HP_ARCH=hppa1.0 ;; # CPU_PA_RISC1_0 528) HP_ARCH=hppa1.1 ;; # CPU_PA_RISC1_1 @@ -664,7 +680,7 @@ EOF esac ;; esac fi - if [ "$HP_ARCH" = "" ]; then + if test "$HP_ARCH" = ""; then set_cc_for_build sed 's/^ //' << EOF > "$dummy.c" @@ -699,11 +715,11 @@ EOF exit (0); } EOF - (CCOPTS="" $CC_FOR_BUILD -o "$dummy" "$dummy.c" 2>/dev/null) && HP_ARCH=`"$dummy"` + (CCOPTS="" $CC_FOR_BUILD -o "$dummy" "$dummy.c" 2>/dev/null) && HP_ARCH=$("$dummy") test -z "$HP_ARCH" && HP_ARCH=hppa fi ;; esac - if [ "$HP_ARCH" = hppa2.0w ] + if test "$HP_ARCH" = hppa2.0w then set_cc_for_build @@ -727,7 +743,7 @@ EOF echo "$HP_ARCH"-hp-hpux"$HPUX_REV" exit ;; ia64:HP-UX:*:*) - HPUX_REV=`echo "$UNAME_RELEASE"|sed -e 's/[^.]*.[0B]*//'` + HPUX_REV=$(echo "$UNAME_RELEASE"|sed -e 's/[^.]*.[0B]*//') echo ia64-hp-hpux"$HPUX_REV" exit ;; 3050*:HI-UX:*:*) @@ -757,7 +773,7 @@ EOF exit (0); } EOF - $CC_FOR_BUILD -o "$dummy" "$dummy.c" && SYSTEM_NAME=`"$dummy"` && + $CC_FOR_BUILD -o "$dummy" "$dummy.c" && SYSTEM_NAME=$("$dummy") && { echo "$SYSTEM_NAME"; exit; } echo unknown-hitachi-hiuxwe2 exit ;; @@ -777,7 +793,7 @@ EOF echo hppa1.0-hp-osf exit ;; i*86:OSF1:*:*) - if [ -x /usr/sbin/sysversion ] ; then + if test -x /usr/sbin/sysversion ; then echo "$UNAME_MACHINE"-unknown-osf1mk else echo "$UNAME_MACHINE"-unknown-osf1 @@ -826,14 +842,14 @@ EOF echo craynv-cray-unicosmp"$UNAME_RELEASE" | sed -e 's/\.[^.]*$/.X/' exit ;; F30[01]:UNIX_System_V:*:* | F700:UNIX_System_V:*:*) - FUJITSU_PROC=`uname -m | tr ABCDEFGHIJKLMNOPQRSTUVWXYZ abcdefghijklmnopqrstuvwxyz` - FUJITSU_SYS=`uname -p | tr ABCDEFGHIJKLMNOPQRSTUVWXYZ abcdefghijklmnopqrstuvwxyz | sed -e 's/\///'` - FUJITSU_REL=`echo "$UNAME_RELEASE" | sed -e 's/ /_/'` + FUJITSU_PROC=$(uname -m | tr ABCDEFGHIJKLMNOPQRSTUVWXYZ abcdefghijklmnopqrstuvwxyz) + FUJITSU_SYS=$(uname -p | tr ABCDEFGHIJKLMNOPQRSTUVWXYZ abcdefghijklmnopqrstuvwxyz | sed -e 's/\///') + FUJITSU_REL=$(echo "$UNAME_RELEASE" | sed -e 's/ /_/') echo "${FUJITSU_PROC}-fujitsu-${FUJITSU_SYS}${FUJITSU_REL}" exit ;; 5000:UNIX_System_V:4.*:*) - FUJITSU_SYS=`uname -p | tr ABCDEFGHIJKLMNOPQRSTUVWXYZ abcdefghijklmnopqrstuvwxyz | sed -e 's/\///'` - FUJITSU_REL=`echo "$UNAME_RELEASE" | tr ABCDEFGHIJKLMNOPQRSTUVWXYZ abcdefghijklmnopqrstuvwxyz | sed -e 's/ /_/'` + FUJITSU_SYS=$(uname -p | tr ABCDEFGHIJKLMNOPQRSTUVWXYZ abcdefghijklmnopqrstuvwxyz | sed -e 's/\///') + FUJITSU_REL=$(echo "$UNAME_RELEASE" | tr ABCDEFGHIJKLMNOPQRSTUVWXYZ abcdefghijklmnopqrstuvwxyz | sed -e 's/ /_/') echo "sparc-fujitsu-${FUJITSU_SYS}${FUJITSU_REL}" exit ;; i*86:BSD/386:*:* | i*86:BSD/OS:*:* | *:Ascend\ Embedded/OS:*:*) @@ -846,25 +862,25 @@ EOF echo "$UNAME_MACHINE"-unknown-bsdi"$UNAME_RELEASE" exit ;; arm:FreeBSD:*:*) - UNAME_PROCESSOR=`uname -p` + UNAME_PROCESSOR=$(uname -p) set_cc_for_build if echo __ARM_PCS_VFP | $CC_FOR_BUILD -E - 2>/dev/null \ | grep -q __ARM_PCS_VFP then - echo "${UNAME_PROCESSOR}"-unknown-freebsd"`echo ${UNAME_RELEASE}|sed -e 's/[-(].*//'`"-gnueabi + echo "${UNAME_PROCESSOR}"-unknown-freebsd"$(echo ${UNAME_RELEASE}|sed -e 's/[-(].*//')"-gnueabi else - echo "${UNAME_PROCESSOR}"-unknown-freebsd"`echo ${UNAME_RELEASE}|sed -e 's/[-(].*//'`"-gnueabihf + echo "${UNAME_PROCESSOR}"-unknown-freebsd"$(echo ${UNAME_RELEASE}|sed -e 's/[-(].*//')"-gnueabihf fi exit ;; *:FreeBSD:*:*) - UNAME_PROCESSOR=`/usr/bin/uname -p` + UNAME_PROCESSOR=$(/usr/bin/uname -p) case "$UNAME_PROCESSOR" in amd64) UNAME_PROCESSOR=x86_64 ;; i386) UNAME_PROCESSOR=i586 ;; esac - echo "$UNAME_PROCESSOR"-unknown-freebsd"`echo "$UNAME_RELEASE"|sed -e 's/[-(].*//'`" + echo "$UNAME_PROCESSOR"-unknown-freebsd"$(echo "$UNAME_RELEASE"|sed -e 's/[-(].*//')" exit ;; i*:CYGWIN*:*) echo "$UNAME_MACHINE"-pc-cygwin @@ -900,15 +916,15 @@ EOF echo x86_64-pc-cygwin exit ;; prep*:SunOS:5.*:*) - echo powerpcle-unknown-solaris2"`echo "$UNAME_RELEASE"|sed -e 's/[^.]*//'`" + echo powerpcle-unknown-solaris2"$(echo "$UNAME_RELEASE"|sed -e 's/[^.]*//')" exit ;; *:GNU:*:*) # the GNU system - echo "`echo "$UNAME_MACHINE"|sed -e 's,[-/].*$,,'`-unknown-$LIBC`echo "$UNAME_RELEASE"|sed -e 's,/.*$,,'`" + echo "$(echo "$UNAME_MACHINE"|sed -e 's,[-/].*$,,')-unknown-$LIBC$(echo "$UNAME_RELEASE"|sed -e 's,/.*$,,')" exit ;; *:GNU/*:*:*) # other systems with GNU libc and userland - echo "$UNAME_MACHINE-unknown-`echo "$UNAME_SYSTEM" | sed 's,^[^/]*/,,' | tr "[:upper:]" "[:lower:]"``echo "$UNAME_RELEASE"|sed -e 's/[-(].*//'`-$LIBC" + echo "$UNAME_MACHINE-unknown-$(echo "$UNAME_SYSTEM" | sed 's,^[^/]*/,,' | tr "[:upper:]" "[:lower:]")$(echo "$UNAME_RELEASE"|sed -e 's/[-(].*//')-$LIBC" exit ;; *:Minix:*:*) echo "$UNAME_MACHINE"-unknown-minix @@ -921,7 +937,7 @@ EOF echo "$UNAME_MACHINE"-unknown-linux-"$LIBC" exit ;; alpha:Linux:*:*) - case `sed -n '/^cpu model/s/^.*: \(.*\)/\1/p' < /proc/cpuinfo` in + case $(sed -n '/^cpu model/s/^.*: \(.*\)/\1/p' /proc/cpuinfo 2>/dev/null) in EV5) UNAME_MACHINE=alphaev5 ;; EV56) UNAME_MACHINE=alphaev56 ;; PCA56) UNAME_MACHINE=alphapca56 ;; @@ -1030,7 +1046,7 @@ EOF #endif #endif EOF - eval "`$CC_FOR_BUILD -E "$dummy.c" 2>/dev/null | grep '^CPU\|^MIPS_ENDIAN\|^LIBCABI'`" + eval "$($CC_FOR_BUILD -E "$dummy.c" 2>/dev/null | grep '^CPU\|^MIPS_ENDIAN\|^LIBCABI')" test "x$CPU" != x && { echo "$CPU${MIPS_ENDIAN}-unknown-linux-$LIBCABI"; exit; } ;; mips64el:Linux:*:*) @@ -1050,7 +1066,7 @@ EOF exit ;; parisc:Linux:*:* | hppa:Linux:*:*) # Look for CPU level - case `grep '^cpu[^a-z]*:' /proc/cpuinfo 2>/dev/null | cut -d' ' -f2` in + case $(grep '^cpu[^a-z]*:' /proc/cpuinfo 2>/dev/null | cut -d' ' -f2) in PA7*) echo hppa1.1-unknown-linux-"$LIBC" ;; PA8*) echo hppa2.0-unknown-linux-"$LIBC" ;; *) echo hppa-unknown-linux-"$LIBC" ;; @@ -1090,7 +1106,17 @@ EOF echo "$UNAME_MACHINE"-dec-linux-"$LIBC" exit ;; x86_64:Linux:*:*) - echo "$UNAME_MACHINE"-pc-linux-"$LIBC" + set_cc_for_build + 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 + fi + echo "$UNAME_MACHINE"-pc-linux-"$LIBCABI" exit ;; xtensa*:Linux:*:*) echo "$UNAME_MACHINE"-unknown-linux-"$LIBC" @@ -1130,7 +1156,7 @@ EOF echo "$UNAME_MACHINE"-pc-msdosdjgpp exit ;; i*86:*:4.*:*) - UNAME_REL=`echo "$UNAME_RELEASE" | sed 's/\/MP$//'` + UNAME_REL=$(echo "$UNAME_RELEASE" | sed 's/\/MP$//') if grep Novell /usr/include/link.h >/dev/null 2>/dev/null; then echo "$UNAME_MACHINE"-univel-sysv"$UNAME_REL" else @@ -1139,7 +1165,7 @@ EOF exit ;; i*86:*:5:[678]*) # UnixWare 7.x, OpenUNIX and OpenServer 6. - case `/bin/uname -X | grep "^Machine"` in + case $(/bin/uname -X | grep "^Machine") in *486*) UNAME_MACHINE=i486 ;; *Pentium) UNAME_MACHINE=i586 ;; *Pent*|*Celeron) UNAME_MACHINE=i686 ;; @@ -1148,10 +1174,10 @@ EOF exit ;; i*86:*:3.2:*) if test -f /usr/options/cb.name; then - UNAME_REL=`sed -n 's/.*Version //p' /dev/null >/dev/null ; then - UNAME_REL=`(/bin/uname -X|grep Release|sed -e 's/.*= //')` + UNAME_REL=$( (/bin/uname -X|grep Release|sed -e 's/.*= //')) (/bin/uname -X|grep i80486 >/dev/null) && UNAME_MACHINE=i486 (/bin/uname -X|grep '^Machine.*Pentium' >/dev/null) \ && UNAME_MACHINE=i586 @@ -1201,7 +1227,7 @@ EOF 3[345]??:*:4.0:3.0 | 3[34]??A:*:4.0:3.0 | 3[34]??,*:*:4.0:3.0 | 3[34]??/*:*:4.0:3.0 | 4400:*:4.0:3.0 | 4850:*:4.0:3.0 | SKA40:*:4.0:3.0 | SDS2:*:4.0:3.0 | SHG2:*:4.0:3.0 | S7501*:*:4.0:3.0) OS_REL='' test -r /etc/.relid \ - && OS_REL=.`sed -n 's/[^ ]* [^ ]* \([0-9][0-9]\).*/\1/p' < /etc/.relid` + && OS_REL=.$(sed -n 's/[^ ]* [^ ]* \([0-9][0-9]\).*/\1/p' < /etc/.relid) /bin/uname -p 2>/dev/null | grep 86 >/dev/null \ && { echo i486-ncr-sysv4.3"$OS_REL"; exit; } /bin/uname -p 2>/dev/null | /bin/grep entium >/dev/null \ @@ -1212,7 +1238,7 @@ EOF NCR*:*:4.2:* | MPRAS*:*:4.2:*) OS_REL='.3' test -r /etc/.relid \ - && OS_REL=.`sed -n 's/[^ ]* [^ ]* \([0-9][0-9]\).*/\1/p' < /etc/.relid` + && OS_REL=.$(sed -n 's/[^ ]* [^ ]* \([0-9][0-9]\).*/\1/p' < /etc/.relid) /bin/uname -p 2>/dev/null | grep 86 >/dev/null \ && { echo i486-ncr-sysv4.3"$OS_REL"; exit; } /bin/uname -p 2>/dev/null | /bin/grep entium >/dev/null \ @@ -1245,7 +1271,7 @@ EOF exit ;; *:SINIX-*:*:*) if uname -p 2>/dev/null >/dev/null ; then - UNAME_MACHINE=`(uname -p) 2>/dev/null` + UNAME_MACHINE=$( (uname -p) 2>/dev/null) echo "$UNAME_MACHINE"-sni-sysv4 else echo ns32k-sni-sysv @@ -1279,7 +1305,7 @@ EOF echo mips-sony-newsos6 exit ;; R[34]000:*System_V*:*:* | R4000:UNIX_SYSV:*:* | R*000:UNIX_SV:*:*) - if [ -d /usr/nec ]; then + if test -d /usr/nec; then echo mips-nec-sysv"$UNAME_RELEASE" else echo mips-unknown-sysv"$UNAME_RELEASE" @@ -1327,8 +1353,11 @@ EOF *:Rhapsody:*:*) echo "$UNAME_MACHINE"-apple-rhapsody"$UNAME_RELEASE" exit ;; + arm64:Darwin:*:*) + echo aarch64-apple-darwin"$UNAME_RELEASE" + exit ;; *:Darwin:*:*) - UNAME_PROCESSOR=`uname -p` + UNAME_PROCESSOR=$(uname -p) case $UNAME_PROCESSOR in unknown) UNAME_PROCESSOR=powerpc ;; esac @@ -1341,7 +1370,7 @@ EOF else set_cc_for_build fi - if [ "$CC_FOR_BUILD" != no_compiler_found ]; then + if test "$CC_FOR_BUILD" != no_compiler_found; then if (echo '#ifdef __LP64__'; echo IS_64BIT_ARCH; echo '#endif') | \ (CCOPTS="" $CC_FOR_BUILD -E - 2>/dev/null) | \ grep IS_64BIT_ARCH >/dev/null @@ -1365,7 +1394,7 @@ EOF echo "$UNAME_PROCESSOR"-apple-darwin"$UNAME_RELEASE" exit ;; *:procnto*:*:* | *:QNX:[0123456789]*:*) - UNAME_PROCESSOR=`uname -p` + UNAME_PROCESSOR=$(uname -p) if test "$UNAME_PROCESSOR" = x86; then UNAME_PROCESSOR=i386 UNAME_MACHINE=pc @@ -1433,10 +1462,10 @@ EOF echo mips-sei-seiux"$UNAME_RELEASE" exit ;; *:DragonFly:*:*) - echo "$UNAME_MACHINE"-unknown-dragonfly"`echo "$UNAME_RELEASE"|sed -e 's/[-(].*//'`" + echo "$UNAME_MACHINE"-unknown-dragonfly"$(echo "$UNAME_RELEASE"|sed -e 's/[-(].*//')" exit ;; *:*VMS:*:*) - UNAME_MACHINE=`(uname -p) 2>/dev/null` + UNAME_MACHINE=$( (uname -p) 2>/dev/null) case "$UNAME_MACHINE" in A*) echo alpha-dec-vms ; exit ;; I*) echo ia64-dec-vms ; exit ;; @@ -1446,7 +1475,7 @@ EOF echo i386-pc-xenix exit ;; i*86:skyos:*:*) - echo "$UNAME_MACHINE"-pc-skyos"`echo "$UNAME_RELEASE" | sed -e 's/ .*$//'`" + echo "$UNAME_MACHINE"-pc-skyos"$(echo "$UNAME_RELEASE" | sed -e 's/ .*$//')" exit ;; i*86:rdos:*:*) echo "$UNAME_MACHINE"-pc-rdos @@ -1504,7 +1533,7 @@ main () #define __ARCHITECTURE__ "m68k" #endif int version; - version=`(hostinfo | sed -n 's/.*NeXT Mach \([0-9]*\).*/\1/p') 2>/dev/null`; + version=$( (hostinfo | sed -n 's/.*NeXT Mach \([0-9]*\).*/\1/p') 2>/dev/null); if (version < 4) printf ("%s-next-nextstep%d\n", __ARCHITECTURE__, version); else @@ -1596,7 +1625,7 @@ main () } EOF -$CC_FOR_BUILD -o "$dummy" "$dummy.c" 2>/dev/null && SYSTEM_NAME=`$dummy` && +$CC_FOR_BUILD -o "$dummy" "$dummy.c" 2>/dev/null && SYSTEM_NAME=$($dummy) && { echo "$SYSTEM_NAME"; exit; } # Apollos put the system type in the environment. @@ -1621,9 +1650,15 @@ This script (version $timestamp), has failed to recognize the operating system you are using. If your script is old, overwrite *all* copies of config.guess and config.sub with the latest versions from: - https://git.savannah.gnu.org/gitweb/?p=config.git;a=blob_plain;f=config.guess + https://git.savannah.gnu.org/cgit/config.git/plain/config.guess and - https://git.savannah.gnu.org/gitweb/?p=config.git;a=blob_plain;f=config.sub + https://git.savannah.gnu.org/cgit/config.git/plain/config.sub +EOF + +year=$(echo $timestamp | sed 's,-.*,,') +# shellcheck disable=SC2003 +if test "$(expr "$(date +%Y)" - "$year")" -lt 3 ; then + cat >&2 </dev/null || echo unknown` -uname -r = `(uname -r) 2>/dev/null || echo unknown` -uname -s = `(uname -s) 2>/dev/null || echo unknown` -uname -v = `(uname -v) 2>/dev/null || echo unknown` +uname -m = $( (uname -m) 2>/dev/null || echo unknown) +uname -r = $( (uname -r) 2>/dev/null || echo unknown) +uname -s = $( (uname -s) 2>/dev/null || echo unknown) +uname -v = $( (uname -v) 2>/dev/null || echo unknown) -/usr/bin/uname -p = `(/usr/bin/uname -p) 2>/dev/null` -/bin/uname -X = `(/bin/uname -X) 2>/dev/null` +/usr/bin/uname -p = $( (/usr/bin/uname -p) 2>/dev/null) +/bin/uname -X = $( (/bin/uname -X) 2>/dev/null) -hostinfo = `(hostinfo) 2>/dev/null` -/bin/universe = `(/bin/universe) 2>/dev/null` -/usr/bin/arch -k = `(/usr/bin/arch -k) 2>/dev/null` -/bin/arch = `(/bin/arch) 2>/dev/null` -/usr/bin/oslevel = `(/usr/bin/oslevel) 2>/dev/null` -/usr/convex/getsysinfo = `(/usr/convex/getsysinfo) 2>/dev/null` +hostinfo = $( (hostinfo) 2>/dev/null) +/bin/universe = $( (/bin/universe) 2>/dev/null) +/usr/bin/arch -k = $( (/usr/bin/arch -k) 2>/dev/null) +/bin/arch = $( (/bin/arch) 2>/dev/null) +/usr/bin/oslevel = $( (/usr/bin/oslevel) 2>/dev/null) +/usr/convex/getsysinfo = $( (/usr/convex/getsysinfo) 2>/dev/null) UNAME_MACHINE = "$UNAME_MACHINE" UNAME_RELEASE = "$UNAME_RELEASE" UNAME_SYSTEM = "$UNAME_SYSTEM" UNAME_VERSION = "$UNAME_VERSION" EOF +fi exit 1 diff --git a/build-aux/config.rpath b/build-aux/config.rpath index be202c1..17298f2 100755 --- a/build-aux/config.rpath +++ b/build-aux/config.rpath @@ -2,7 +2,7 @@ # Output a system dependent set of variables, describing how to set the # run time search path of shared libraries in an executable. # -# Copyright 1996-2019 Free Software Foundation, Inc. +# Copyright 1996-2010 Free Software Foundation, Inc. # Taken from GNU libtool, 2001 # Originally by Gordon Matzigkeit , 1996 # @@ -25,7 +25,7 @@ # known workaround is to choose shorter directory names for the build # directory and/or the installation directory. -# All known linkers require a '.a' archive for static linking (except MSVC, +# All known linkers require a `.a' archive for static linking (except MSVC, # which needs '.lib'). libext=a shrext=.so @@ -57,6 +57,13 @@ else aix*) wl='-Wl,' ;; + darwin*) + case $cc_basename in + xlc*) + wl='-Wl,' + ;; + esac + ;; mingw* | cygwin* | pw32* | os2* | cegcc*) ;; hpux9* | hpux10* | hpux11*) @@ -65,7 +72,9 @@ else irix5* | irix6* | nonstopux*) wl='-Wl,' ;; - linux* | k*bsd*-gnu | kopensolaris*-gnu) + newsos6) + ;; + linux* | k*bsd*-gnu) case $cc_basename in ecc*) wl='-Wl,' @@ -76,26 +85,17 @@ else lf95*) wl='-Wl,' ;; - nagfor*) - wl='-Wl,-Wl,,' - ;; - pgcc* | pgf77* | pgf90* | pgf95* | pgfortran*) + pgcc | pgf77 | pgf90) wl='-Wl,' ;; ccc*) wl='-Wl,' ;; - xl* | bgxl* | bgf* | mpixl*) - wl='-Wl,' - ;; como) wl='-lopt=' ;; *) case `$CC -V 2>&1 | sed 5q` in - *Sun\ F* | *Sun*Fortran*) - wl= - ;; *Sun\ C*) wl='-Wl,' ;; @@ -103,24 +103,13 @@ else ;; esac ;; - newsos6) - ;; - *nto* | *qnx*) - ;; osf3* | osf4* | osf5*) wl='-Wl,' ;; rdos*) ;; solaris*) - case $cc_basename in - f77* | f90* | f95* | sunf77* | sunf90* | sunf95*) - wl='-Qoption ld ' - ;; - *) - wl='-Wl,' - ;; - esac + wl='-Wl,' ;; sunos4*) wl='-Qoption ld ' @@ -182,14 +171,15 @@ if test "$with_gnu_ld" = yes; then fi ;; amigaos*) - case "$host_cpu" in - powerpc) - ;; - m68k) - hardcode_libdir_flag_spec='-L$libdir' - hardcode_minus_L=yes - ;; - esac + hardcode_libdir_flag_spec='-L$libdir' + hardcode_minus_L=yes + # Samuel A. Falvo II reports + # that the semantics of dynamic libraries on AmigaOS, at least up + # to version 4, is to share data among multiple programs linked + # with the same dynamic library. Since this doesn't match the + # behavior of shared libraries on other platforms, we cannot use + # them. + ld_shlibs=no ;; beos*) if $LD --help 2>&1 | grep ': supported targets:.* elf' > /dev/null; then @@ -208,13 +198,11 @@ if test "$with_gnu_ld" = yes; then ld_shlibs=no fi ;; - haiku*) - ;; interix[3-9]*) hardcode_direct=no hardcode_libdir_flag_spec='${wl}-rpath,$libdir' ;; - gnu* | linux* | tpf* | k*bsd*-gnu | kopensolaris*-gnu) + gnu* | linux* | k*bsd*-gnu) if $LD --help 2>&1 | grep ': supported targets:.* elf' > /dev/null; then : else @@ -337,14 +325,10 @@ else fi ;; amigaos*) - case "$host_cpu" in - powerpc) - ;; - m68k) - hardcode_libdir_flag_spec='-L$libdir' - hardcode_minus_L=yes - ;; - esac + hardcode_libdir_flag_spec='-L$libdir' + hardcode_minus_L=yes + # see comment about different semantics on the GNU ld section + ld_shlibs=no ;; bsdi[45]*) ;; @@ -358,16 +342,29 @@ else ;; darwin* | rhapsody*) hardcode_direct=no - if { case $cc_basename in ifort*) true;; *) test "$GCC" = yes;; esac; }; then + if test "$GCC" = yes ; then : else - ld_shlibs=no + case $cc_basename in + xlc*) + ;; + *) + ld_shlibs=no + ;; + esac fi ;; dgux*) hardcode_libdir_flag_spec='-L$libdir' ;; - freebsd2.[01]*) + freebsd1*) + ld_shlibs=no + ;; + freebsd2.2*) + hardcode_libdir_flag_spec='-R$libdir' + hardcode_direct=yes + ;; + freebsd2*) hardcode_direct=yes hardcode_minus_L=yes ;; @@ -423,8 +420,6 @@ else hardcode_libdir_flag_spec='${wl}-rpath ${wl}$libdir' hardcode_libdir_separator=: ;; - *nto* | *qnx*) - ;; openbsd*) if test -f /usr/libexec/ld.so; then hardcode_direct=yes @@ -520,12 +515,7 @@ case "$host_os" in library_names_spec='$libname$shrext' ;; amigaos*) - case "$host_cpu" in - powerpc*) - library_names_spec='$libname$shrext' ;; - m68k) - library_names_spec='$libname.a' ;; - esac + library_names_spec='$libname.a' ;; beos*) library_names_spec='$libname$shrext' @@ -544,18 +534,19 @@ case "$host_os" in dgux*) library_names_spec='$libname$shrext' ;; - freebsd[23].*) - library_names_spec='$libname$shrext$versuffix' + freebsd1*) ;; freebsd* | dragonfly*) - library_names_spec='$libname$shrext' + case "$host_os" in + freebsd[123]*) + library_names_spec='$libname$shrext$versuffix' ;; + *) + library_names_spec='$libname$shrext' ;; + esac ;; gnu*) library_names_spec='$libname$shrext' ;; - haiku*) - library_names_spec='$libname$shrext' - ;; hpux9* | hpux10* | hpux11*) case $host_cpu in ia64*) @@ -591,7 +582,7 @@ case "$host_os" in ;; linux*oldld* | linux*aout* | linux*coff*) ;; - linux* | k*bsd*-gnu | kopensolaris*-gnu) + linux* | k*bsd*-gnu) library_names_spec='$libname$shrext' ;; knetbsd*-gnu) @@ -603,7 +594,7 @@ case "$host_os" in newsos6) library_names_spec='$libname$shrext' ;; - *nto* | *qnx*) + nto-qnx*) library_names_spec='$libname$shrext' ;; openbsd*) @@ -634,9 +625,6 @@ case "$host_os" in sysv5* | sco3.2v5* | sco5v6* | unixware* | OpenUNIX* | sysv4*uw2*) library_names_spec='$libname$shrext' ;; - tpf*) - library_names_spec='$libname$shrext' - ;; uts4*) library_names_spec='$libname$shrext' ;; diff --git a/build-aux/config.sub b/build-aux/config.sub index a318a46..19c9553 100755 --- a/build-aux/config.sub +++ b/build-aux/config.sub @@ -1,8 +1,8 @@ #! /bin/sh # Configuration validation subroutine script. -# Copyright 1992-2019 Free Software Foundation, Inc. +# Copyright 1992-2020 Free Software Foundation, Inc. -timestamp='2019-06-30' +timestamp='2020-12-02' # 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 @@ -33,7 +33,7 @@ timestamp='2019-06-30' # Otherwise, we print the canonical config type on stdout and succeed. # You can get the latest version of this script from: -# https://git.savannah.gnu.org/gitweb/?p=config.git;a=blob_plain;f=config.sub +# https://git.savannah.gnu.org/cgit/config.git/plain/config.sub # This file is supposed to be the same for all GNU packages # and recognize all the CPU types, system types and aliases @@ -50,7 +50,7 @@ timestamp='2019-06-30' # CPU_TYPE-MANUFACTURER-KERNEL-OPERATING_SYSTEM # It is wrong to echo any other type of specification. -me=`echo "$0" | sed -e 's,.*/,,'` +me=$(echo "$0" | sed -e 's,.*/,,') usage="\ Usage: $0 [OPTION] CPU-MFR-OPSYS or ALIAS @@ -67,7 +67,7 @@ Report bugs and patches to ." version="\ GNU config.sub ($timestamp) -Copyright 1992-2019 Free Software Foundation, Inc. +Copyright 1992-2020 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." @@ -124,28 +124,27 @@ case $1 in ;; *-*-*-*) basic_machine=$field1-$field2 - os=$field3-$field4 + basic_os=$field3-$field4 ;; *-*-*) # Ambiguous whether COMPANY is present, or skipped and KERNEL-OS is two # parts maybe_os=$field2-$field3 case $maybe_os in - nto-qnx* | linux-gnu* | linux-android* | linux-dietlibc \ - | linux-newlib* | linux-musl* | linux-uclibc* | uclinux-uclibc* \ + 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*) basic_machine=$field1 - os=$maybe_os + basic_os=$maybe_os ;; android-linux) basic_machine=$field1-unknown - os=linux-android + basic_os=linux-android ;; *) basic_machine=$field1-$field2 - os=$field3 + basic_os=$field3 ;; esac ;; @@ -154,7 +153,7 @@ case $1 in case $field1-$field2 in decstation-3100) basic_machine=mips-dec - os= + basic_os= ;; *-*) # Second component is usually, but not always the OS @@ -162,7 +161,7 @@ case $1 in # Prevent following clause from handling this valid os sun*os*) basic_machine=$field1 - os=$field2 + basic_os=$field2 ;; # Manufacturers dec* | mips* | sequent* | encore* | pc533* | sgi* | sony* \ @@ -175,11 +174,11 @@ case $1 in | microblaze* | sim | cisco \ | oki | wec | wrs | winbond) basic_machine=$field1-$field2 - os= + basic_os= ;; *) basic_machine=$field1 - os=$field2 + basic_os=$field2 ;; esac ;; @@ -191,447 +190,451 @@ case $1 in case $field1 in 386bsd) basic_machine=i386-pc - os=bsd + basic_os=bsd ;; a29khif) basic_machine=a29k-amd - os=udi + basic_os=udi ;; adobe68k) basic_machine=m68010-adobe - os=scout + basic_os=scout ;; alliant) basic_machine=fx80-alliant - os= + basic_os= ;; altos | altos3068) basic_machine=m68k-altos - os= + basic_os= ;; am29k) basic_machine=a29k-none - os=bsd + basic_os=bsd ;; amdahl) basic_machine=580-amdahl - os=sysv + basic_os=sysv ;; amiga) basic_machine=m68k-unknown - os= + basic_os= ;; amigaos | amigados) basic_machine=m68k-unknown - os=amigaos + basic_os=amigaos ;; amigaunix | amix) basic_machine=m68k-unknown - os=sysv4 + basic_os=sysv4 ;; apollo68) basic_machine=m68k-apollo - os=sysv + basic_os=sysv ;; apollo68bsd) basic_machine=m68k-apollo - os=bsd + basic_os=bsd ;; aros) basic_machine=i386-pc - os=aros + basic_os=aros ;; aux) basic_machine=m68k-apple - os=aux + basic_os=aux ;; balance) basic_machine=ns32k-sequent - os=dynix + basic_os=dynix ;; blackfin) basic_machine=bfin-unknown - os=linux + basic_os=linux ;; cegcc) basic_machine=arm-unknown - os=cegcc + basic_os=cegcc ;; convex-c1) basic_machine=c1-convex - os=bsd + basic_os=bsd ;; convex-c2) basic_machine=c2-convex - os=bsd + basic_os=bsd ;; convex-c32) basic_machine=c32-convex - os=bsd + basic_os=bsd ;; convex-c34) basic_machine=c34-convex - os=bsd + basic_os=bsd ;; convex-c38) basic_machine=c38-convex - os=bsd + basic_os=bsd ;; cray) basic_machine=j90-cray - os=unicos + basic_os=unicos ;; crds | unos) basic_machine=m68k-crds - os= + basic_os= ;; da30) basic_machine=m68k-da30 - os= + basic_os= ;; decstation | pmax | pmin | dec3100 | decstatn) basic_machine=mips-dec - os= + basic_os= ;; delta88) basic_machine=m88k-motorola - os=sysv3 + basic_os=sysv3 ;; dicos) basic_machine=i686-pc - os=dicos + basic_os=dicos ;; djgpp) basic_machine=i586-pc - os=msdosdjgpp + basic_os=msdosdjgpp ;; ebmon29k) basic_machine=a29k-amd - os=ebmon + basic_os=ebmon ;; es1800 | OSE68k | ose68k | ose | OSE) basic_machine=m68k-ericsson - os=ose + basic_os=ose ;; gmicro) basic_machine=tron-gmicro - os=sysv + basic_os=sysv ;; go32) basic_machine=i386-pc - os=go32 + basic_os=go32 ;; h8300hms) basic_machine=h8300-hitachi - os=hms + basic_os=hms ;; h8300xray) basic_machine=h8300-hitachi - os=xray + basic_os=xray ;; h8500hms) basic_machine=h8500-hitachi - os=hms + basic_os=hms ;; harris) basic_machine=m88k-harris - os=sysv3 + basic_os=sysv3 ;; hp300 | hp300hpux) basic_machine=m68k-hp - os=hpux + basic_os=hpux ;; hp300bsd) basic_machine=m68k-hp - os=bsd + basic_os=bsd ;; hppaosf) basic_machine=hppa1.1-hp - os=osf + basic_os=osf ;; hppro) basic_machine=hppa1.1-hp - os=proelf + basic_os=proelf ;; i386mach) basic_machine=i386-mach - os=mach + basic_os=mach ;; isi68 | isi) basic_machine=m68k-isi - os=sysv + basic_os=sysv ;; m68knommu) basic_machine=m68k-unknown - os=linux + basic_os=linux ;; magnum | m3230) basic_machine=mips-mips - os=sysv + basic_os=sysv ;; merlin) basic_machine=ns32k-utek - os=sysv + basic_os=sysv ;; mingw64) basic_machine=x86_64-pc - os=mingw64 + basic_os=mingw64 ;; mingw32) basic_machine=i686-pc - os=mingw32 + basic_os=mingw32 ;; mingw32ce) basic_machine=arm-unknown - os=mingw32ce + basic_os=mingw32ce ;; monitor) basic_machine=m68k-rom68k - os=coff + basic_os=coff ;; morphos) basic_machine=powerpc-unknown - os=morphos + basic_os=morphos ;; moxiebox) basic_machine=moxie-unknown - os=moxiebox + basic_os=moxiebox ;; msdos) basic_machine=i386-pc - os=msdos + basic_os=msdos ;; msys) basic_machine=i686-pc - os=msys + basic_os=msys ;; mvs) basic_machine=i370-ibm - os=mvs + basic_os=mvs ;; nacl) basic_machine=le32-unknown - os=nacl + basic_os=nacl ;; ncr3000) basic_machine=i486-ncr - os=sysv4 + basic_os=sysv4 ;; netbsd386) basic_machine=i386-pc - os=netbsd + basic_os=netbsd ;; netwinder) basic_machine=armv4l-rebel - os=linux + basic_os=linux ;; news | news700 | news800 | news900) basic_machine=m68k-sony - os=newsos + basic_os=newsos ;; news1000) basic_machine=m68030-sony - os=newsos + basic_os=newsos ;; necv70) basic_machine=v70-nec - os=sysv + basic_os=sysv ;; nh3000) basic_machine=m68k-harris - os=cxux + basic_os=cxux ;; nh[45]000) basic_machine=m88k-harris - os=cxux + basic_os=cxux ;; nindy960) basic_machine=i960-intel - os=nindy + basic_os=nindy ;; mon960) basic_machine=i960-intel - os=mon960 + basic_os=mon960 ;; nonstopux) basic_machine=mips-compaq - os=nonstopux + basic_os=nonstopux ;; os400) basic_machine=powerpc-ibm - os=os400 + basic_os=os400 ;; OSE68000 | ose68000) basic_machine=m68000-ericsson - os=ose + basic_os=ose ;; os68k) basic_machine=m68k-none - os=os68k + basic_os=os68k ;; paragon) basic_machine=i860-intel - os=osf + basic_os=osf ;; parisc) basic_machine=hppa-unknown - os=linux + basic_os=linux + ;; + psp) + basic_machine=mipsallegrexel-sony + basic_os=psp ;; pw32) basic_machine=i586-unknown - os=pw32 + basic_os=pw32 ;; rdos | rdos64) basic_machine=x86_64-pc - os=rdos + basic_os=rdos ;; rdos32) basic_machine=i386-pc - os=rdos + basic_os=rdos ;; rom68k) basic_machine=m68k-rom68k - os=coff + basic_os=coff ;; sa29200) basic_machine=a29k-amd - os=udi + basic_os=udi ;; sei) basic_machine=mips-sei - os=seiux + basic_os=seiux ;; sequent) basic_machine=i386-sequent - os= + basic_os= ;; sps7) basic_machine=m68k-bull - os=sysv2 + basic_os=sysv2 ;; st2000) basic_machine=m68k-tandem - os= + basic_os= ;; stratus) basic_machine=i860-stratus - os=sysv4 + basic_os=sysv4 ;; sun2) basic_machine=m68000-sun - os= + basic_os= ;; sun2os3) basic_machine=m68000-sun - os=sunos3 + basic_os=sunos3 ;; sun2os4) basic_machine=m68000-sun - os=sunos4 + basic_os=sunos4 ;; sun3) basic_machine=m68k-sun - os= + basic_os= ;; sun3os3) basic_machine=m68k-sun - os=sunos3 + basic_os=sunos3 ;; sun3os4) basic_machine=m68k-sun - os=sunos4 + basic_os=sunos4 ;; sun4) basic_machine=sparc-sun - os= + basic_os= ;; sun4os3) basic_machine=sparc-sun - os=sunos3 + basic_os=sunos3 ;; sun4os4) basic_machine=sparc-sun - os=sunos4 + basic_os=sunos4 ;; sun4sol2) basic_machine=sparc-sun - os=solaris2 + basic_os=solaris2 ;; sun386 | sun386i | roadrunner) basic_machine=i386-sun - os= + basic_os= ;; sv1) basic_machine=sv1-cray - os=unicos + basic_os=unicos ;; symmetry) basic_machine=i386-sequent - os=dynix + basic_os=dynix ;; t3e) basic_machine=alphaev5-cray - os=unicos + basic_os=unicos ;; t90) basic_machine=t90-cray - os=unicos + basic_os=unicos ;; toad1) basic_machine=pdp10-xkl - os=tops20 + basic_os=tops20 ;; tpf) basic_machine=s390x-ibm - os=tpf + basic_os=tpf ;; udi29k) basic_machine=a29k-amd - os=udi + basic_os=udi ;; ultra3) basic_machine=a29k-nyu - os=sym1 + basic_os=sym1 ;; v810 | necv810) basic_machine=v810-nec - os=none + basic_os=none ;; vaxv) basic_machine=vax-dec - os=sysv + basic_os=sysv ;; vms) basic_machine=vax-dec - os=vms + basic_os=vms ;; vsta) basic_machine=i386-pc - os=vsta + basic_os=vsta ;; vxworks960) basic_machine=i960-wrs - os=vxworks + basic_os=vxworks ;; vxworks68) basic_machine=m68k-wrs - os=vxworks + basic_os=vxworks ;; vxworks29k) basic_machine=a29k-wrs - os=vxworks + basic_os=vxworks ;; xbox) basic_machine=i686-pc - os=mingw32 + basic_os=mingw32 ;; ymp) basic_machine=ymp-cray - os=unicos + basic_os=unicos ;; *) basic_machine=$1 - os= + basic_os= ;; esac ;; @@ -683,17 +686,17 @@ case $basic_machine in bluegene*) cpu=powerpc vendor=ibm - os=cnk + basic_os=cnk ;; decsystem10* | dec10*) cpu=pdp10 vendor=dec - os=tops10 + basic_os=tops10 ;; decsystem20* | dec20*) cpu=pdp10 vendor=dec - os=tops20 + basic_os=tops20 ;; delta | 3300 | motorola-3300 | motorola-delta \ | 3300-motorola | delta-motorola) @@ -703,7 +706,7 @@ case $basic_machine in dpx2*) cpu=m68k vendor=bull - os=sysv3 + basic_os=sysv3 ;; encore | umax | mmax) cpu=ns32k @@ -712,7 +715,7 @@ case $basic_machine in elxsi) cpu=elxsi vendor=elxsi - os=${os:-bsd} + basic_os=${basic_os:-bsd} ;; fx2800) cpu=i860 @@ -725,7 +728,7 @@ case $basic_machine in h3050r* | hiux*) cpu=hppa1.1 vendor=hitachi - os=hiuxwe2 + basic_os=hiuxwe2 ;; hp3k9[0-9][0-9] | hp9[0-9][0-9]) cpu=hppa1.0 @@ -766,38 +769,38 @@ case $basic_machine in vendor=hp ;; i*86v32) - cpu=`echo "$1" | sed -e 's/86.*/86/'` + cpu=$(echo "$1" | sed -e 's/86.*/86/') vendor=pc - os=sysv32 + basic_os=sysv32 ;; i*86v4*) - cpu=`echo "$1" | sed -e 's/86.*/86/'` + cpu=$(echo "$1" | sed -e 's/86.*/86/') vendor=pc - os=sysv4 + basic_os=sysv4 ;; i*86v) - cpu=`echo "$1" | sed -e 's/86.*/86/'` + cpu=$(echo "$1" | sed -e 's/86.*/86/') vendor=pc - os=sysv + basic_os=sysv ;; i*86sol2) - cpu=`echo "$1" | sed -e 's/86.*/86/'` + cpu=$(echo "$1" | sed -e 's/86.*/86/') vendor=pc - os=solaris2 + basic_os=solaris2 ;; j90 | j90-cray) cpu=j90 vendor=cray - os=${os:-unicos} + basic_os=${basic_os:-unicos} ;; iris | iris4d) cpu=mips vendor=sgi - case $os in + case $basic_os in irix*) ;; *) - os=irix4 + basic_os=irix4 ;; esac ;; @@ -808,26 +811,26 @@ case $basic_machine in *mint | mint[0-9]* | *MiNT | *MiNT[0-9]*) cpu=m68k vendor=atari - os=mint + basic_os=mint ;; news-3600 | risc-news) cpu=mips vendor=sony - os=newsos + basic_os=newsos ;; next | m*-next) cpu=m68k vendor=next - case $os in + case $basic_os in openstep*) ;; nextstep*) ;; ns2*) - os=nextstep2 + basic_os=nextstep2 ;; *) - os=nextstep3 + basic_os=nextstep3 ;; esac ;; @@ -838,12 +841,12 @@ case $basic_machine in op50n-* | op60c-*) cpu=hppa1.1 vendor=oki - os=proelf + basic_os=proelf ;; pa-hitachi) cpu=hppa1.1 vendor=hitachi - os=hiuxwe2 + basic_os=hiuxwe2 ;; pbd) cpu=sparc @@ -880,12 +883,12 @@ case $basic_machine in sde) cpu=mipsisa32 vendor=sde - os=${os:-elf} + basic_os=${basic_os:-elf} ;; simso-wrs) cpu=sparclite vendor=wrs - os=vxworks + basic_os=vxworks ;; tower | tower-32) cpu=m68k @@ -902,7 +905,7 @@ case $basic_machine in w89k-*) cpu=hppa1.1 vendor=winbond - os=proelf + basic_os=proelf ;; none) cpu=none @@ -914,7 +917,7 @@ case $basic_machine in ;; leon-*|leon[3-9]-*) cpu=sparc - vendor=`echo "$basic_machine" | sed 's/-.*//'` + vendor=$(echo "$basic_machine" | sed 's/-.*//') ;; *-*) @@ -955,11 +958,11 @@ case $cpu-$vendor in # some cases the only manufacturer, in others, it is the most popular. craynv-unknown) vendor=cray - os=${os:-unicosmp} + basic_os=${basic_os:-unicosmp} ;; c90-unknown | c90-cray) vendor=cray - os=${os:-unicos} + basic_os=${Basic_os:-unicos} ;; fx80-unknown) vendor=alliant @@ -1003,7 +1006,7 @@ case $cpu-$vendor in dpx20-unknown | dpx20-bull) cpu=rs6000 vendor=bull - os=${os:-bosx} + basic_os=${basic_os:-bosx} ;; # Here we normalize CPU types irrespective of the vendor @@ -1012,7 +1015,7 @@ case $cpu-$vendor in ;; blackfin-*) cpu=bfin - os=linux + basic_os=linux ;; c54x-*) cpu=tic54x @@ -1025,7 +1028,7 @@ case $cpu-$vendor in ;; e500v[12]-*) cpu=powerpc - os=$os"spe" + basic_os=${basic_os}"spe" ;; mips3*-*) cpu=mips64 @@ -1035,7 +1038,7 @@ case $cpu-$vendor in ;; m68knommu-*) cpu=m68k - os=linux + basic_os=linux ;; m9s12z-* | m68hcs12z-* | hcs12z-* | s12z-*) cpu=s12z @@ -1045,7 +1048,7 @@ case $cpu-$vendor in ;; parisc-*) cpu=hppa - os=linux + basic_os=linux ;; pentium-* | p5-* | k5-* | k6-* | nexgen-* | viac3-*) cpu=i586 @@ -1081,7 +1084,7 @@ case $cpu-$vendor in cpu=mipsisa64sb1el ;; sh5e[lb]-*) - cpu=`echo "$cpu" | sed 's/^\(sh.\)e\(.\)$/\1\2e/'` + cpu=$(echo "$cpu" | sed 's/^\(sh.\)e\(.\)$/\1\2e/') ;; spur-*) cpu=spur @@ -1099,13 +1102,16 @@ case $cpu-$vendor in cpu=x86_64 ;; xscale-* | xscalee[bl]-*) - cpu=`echo "$cpu" | sed 's/^xscale/arm/'` + cpu=$(echo "$cpu" | sed 's/^xscale/arm/') + ;; + arm64-*) + cpu=aarch64 ;; # Recognize the canonical CPU Types that limit and/or modify the # company names they are paired with. cr16-*) - os=${os:-elf} + basic_os=${basic_os:-elf} ;; crisv32-* | etraxfs*-*) cpu=crisv32 @@ -1116,7 +1122,7 @@ case $cpu-$vendor in vendor=axis ;; crx-*) - os=${os:-elf} + basic_os=${basic_os:-elf} ;; neo-tandem) cpu=neo @@ -1138,16 +1144,12 @@ case $cpu-$vendor in cpu=nsx vendor=tandem ;; - s390-*) - cpu=s390 - vendor=ibm - ;; - s390x-*) - cpu=s390x - vendor=ibm + mipsallegrexel-sony) + cpu=mipsallegrexel + vendor=sony ;; tile*-*) - os=${os:-linux-gnu} + basic_os=${basic_os:-linux-gnu} ;; *) @@ -1164,7 +1166,7 @@ case $cpu-$vendor in | am33_2.0 \ | amdgcn \ | arc | arceb \ - | arm | arm[lb]e | arme[lb] | armv* \ + | arm | arm[lb]e | arme[lb] | armv* \ | avr | avr32 \ | asmjs \ | ba \ @@ -1229,6 +1231,7 @@ case $cpu-$vendor in | pyramid \ | riscv | riscv32 | riscv64 \ | rl78 | romp | rs6000 | rx \ + | s390 | s390x \ | score \ | sh | shl \ | sh[1234] | sh[24]a | sh[24]ae[lb] | sh[23]e | she[lb] | sh[lb]e \ @@ -1238,6 +1241,7 @@ case $cpu-$vendor in | sparcv8 | sparcv9 | sparcv9b | sparcv9v | sv1 | sx* \ | spu \ | tahoe \ + | thumbv7* \ | tic30 | tic4x | tic54x | tic55x | tic6x | tic80 \ | tron \ | ubicom32 \ @@ -1275,8 +1279,47 @@ esac # Decode manufacturer-specific aliases for certain operating systems. -if [ x$os != x ] +if test x$basic_os != x then + +# First recognize some ad-hoc caes, or perhaps split kernel-os, or else just +# set os. +case $basic_os in + gnu/linux*) + kernel=linux + os=$(echo $basic_os | sed -e 's|gnu/linux|gnu|') + ;; + os2-emx) + kernel=os2 + os=$(echo $basic_os | sed -e 's|os2-emx|emx|') + ;; + nto-qnx*) + kernel=nto + os=$(echo $basic_os | sed -e 's|nto-qnx|qnx|') + ;; + *-*) + # shellcheck disable=SC2162 + IFS="-" read kernel os <&2 - exit 1 + # No normalization, but not necessarily accepted, that comes below. ;; esac + else # Here we handle the default operating systems that come with various machines. @@ -1528,6 +1498,7 @@ else # will signal an error saying that MANUFACTURER isn't an operating # system, and we'll never get to this point. +kernel= case $cpu-$vendor in score-*) os=elf @@ -1539,7 +1510,8 @@ case $cpu-$vendor in os=riscix1.2 ;; arm*-rebel) - os=linux + kernel=linux + os=gnu ;; arm*-semi) os=aout @@ -1705,84 +1677,173 @@ case $cpu-$vendor in os=none ;; esac + fi +# Now, validate our (potentially fixed-up) OS. +case $os in + # Sometimes we do "kernel-abi", so those need to count as OSes. + musl* | newlib* | uclibc*) + ;; + # Likewise for "kernel-libc" + eabi | eabihf | gnueabi | gnueabihf) + ;; + # Now accept the basic system types. + # The portable systems comes first. + # Each alternative MUST end in a * to match a version number. + gnu* | android* | bsd* | mach* | minix* | genix* | ultrix* | irix* \ + | *vms* | esix* | aix* | cnk* | sunos | sunos[34]* \ + | hpux* | unos* | osf* | luna* | dgux* | auroraux* | solaris* \ + | sym* | plan9* | psp* | sim* | xray* | os68k* | v88r* \ + | hiux* | abug | nacl* | netware* | windows* \ + | os9* | macos* | osx* | ios* \ + | mpw* | magic* | mmixware* | mon960* | lnews* \ + | amigaos* | amigados* | msdos* | newsos* | unicos* | aof* \ + | aos* | aros* | cloudabi* | sortix* | twizzler* \ + | nindy* | vxsim* | vxworks* | ebmon* | hms* | mvs* \ + | clix* | riscos* | uniplus* | iris* | isc* | rtu* | xenix* \ + | mirbsd* | netbsd* | dicos* | openedition* | ose* \ + | bitrig* | openbsd* | solidbsd* | libertybsd* | os108* \ + | ekkobsd* | freebsd* | riscix* | lynxos* | os400* \ + | bosx* | nextstep* | cxux* | aout* | elf* | oabi* \ + | ptx* | coff* | ecoff* | winnt* | domain* | vsta* \ + | udi* | lites* | ieee* | go32* | aux* | hcos* \ + | chorusrdb* | cegcc* | glidix* \ + | cygwin* | msys* | pe* | moss* | proelf* | rtems* \ + | midipix* | mingw32* | mingw64* | mint* \ + | uxpv* | beos* | mpeix* | udk* | moxiebox* \ + | interix* | uwin* | mks* | rhapsody* | darwin* \ + | openstep* | oskit* | conix* | pw32* | nonstopux* \ + | storm-chaos* | tops10* | tenex* | tops20* | its* \ + | os2* | vos* | palmos* | uclinux* | nucleus* | morphos* \ + | scout* | superux* | sysv* | rtmk* | tpf* | windiss* \ + | powermax* | dnix* | nx6 | nx7 | sei* | dragonfly* \ + | skyos* | haiku* | rdos* | toppers* | drops* | es* \ + | onefs* | tirtos* | phoenix* | fuchsia* | redox* | bme* \ + | midnightbsd* | amdhsa* | unleashed* | emscripten* | wasi* \ + | nsk* | powerunix* | genode* | zvmoe* | qnx* | emx*) + ;; + # This one is extra strict with allowed versions + sco3.2v2 | sco3.2v[4-9]* | sco5v6*) + # Don't forget version if it is 3.2v4 or newer. + ;; + none) + ;; + *) + echo Invalid configuration \`"$1"\': OS \`"$os"\' not recognized 1>&2 + exit 1 + ;; +esac + +# As a final step for OS-related things, validate the OS-kernel combination +# (given a valid OS), if there is a kernel. +case $kernel-$os in + linux-gnu* | linux-dietlibc* | linux-android* | linux-newlib* | linux-musl* | linux-uclibc* ) + ;; + uclinux-uclibc* ) + ;; + -dietlibc* | -newlib* | -musl* | -uclibc* ) + # 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 + ;; + kfreebsd*-gnu* | kopensolaris*-gnu*) + ;; + nto-qnx*) + ;; + os2-emx) + ;; + *-eabi* | *-gnueabi*) + ;; + -*) + # Blank kernel with real OS is always fine. + ;; + *-*) + echo "Invalid configuration \`$1': Kernel \`$kernel' not known to work with OS \`$os'." 1>&2 + exit 1 + ;; +esac + # Here we handle the case where we know the os, and the CPU type, but not the # manufacturer. We pick the logical manufacturer. case $vendor in unknown) - case $os in - riscix*) + case $cpu-$os in + *-riscix*) vendor=acorn ;; - sunos*) + *-sunos*) vendor=sun ;; - cnk*|-aix*) + *-cnk* | *-aix*) vendor=ibm ;; - beos*) + *-beos*) vendor=be ;; - hpux*) + *-hpux*) vendor=hp ;; - mpeix*) + *-mpeix*) vendor=hp ;; - hiux*) + *-hiux*) vendor=hitachi ;; - unos*) + *-unos*) vendor=crds ;; - dgux*) + *-dgux*) vendor=dg ;; - luna*) + *-luna*) vendor=omron ;; - genix*) + *-genix*) vendor=ns ;; - clix*) + *-clix*) vendor=intergraph ;; - mvs* | opened*) + *-mvs* | *-opened*) + vendor=ibm + ;; + *-os400*) vendor=ibm ;; - os400*) + s390-* | s390x-*) vendor=ibm ;; - ptx*) + *-ptx*) vendor=sequent ;; - tpf*) + *-tpf*) vendor=ibm ;; - vxsim* | vxworks* | windiss*) + *-vxsim* | *-vxworks* | *-windiss*) vendor=wrs ;; - aux*) + *-aux*) vendor=apple ;; - hms*) + *-hms*) vendor=hitachi ;; - mpw* | macos*) + *-mpw* | *-macos*) vendor=apple ;; - *mint | mint[0-9]* | *MiNT | MiNT[0-9]*) + *-*mint | *-mint[0-9]* | *-*MiNT | *-MiNT[0-9]*) vendor=atari ;; - vos*) + *-vos*) vendor=stratus ;; esac ;; esac -echo "$cpu-$vendor-$os" +echo "$cpu-$vendor-${kernel:+$kernel-}$os" exit # Local variables: diff --git a/build-aux/depcomp b/build-aux/depcomp index 65cbf70..6b39162 100755 --- a/build-aux/depcomp +++ b/build-aux/depcomp @@ -3,7 +3,7 @@ scriptversion=2018-03-07.03; # UTC -# Copyright (C) 1999-2018 Free Software Foundation, Inc. +# Copyright (C) 1999-2020 Free Software Foundation, Inc. # This 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/do-release-commit-and-tag b/build-aux/do-release-commit-and-tag index 339c5df..f4ec1b1 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-2019 Free Software Foundation, Inc. +# Copyright (C) 2009-2020 Free Software Foundation, Inc. # This 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/gendocs.sh b/build-aux/gendocs.sh index fd6a4b8..dec8eb9 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=2019-01-01.00 +scriptversion=2020-01-01.00 -# Copyright 2003-2019 Free Software Foundation, Inc. +# Copyright 2003-2020 Free Software Foundation, Inc. # # This program is free software: you can redistribute it and/or modify # it under the terms of the GNU General Public License as published by @@ -73,7 +73,7 @@ texarg="-t @finalout" version="gendocs.sh $scriptversion -Copyright 2019 Free Software Foundation, Inc. +Copyright 2020 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." diff --git a/build-aux/git-version-gen b/build-aux/git-version-gen index 45b5656..f4e8592 100755 --- a/build-aux/git-version-gen +++ b/build-aux/git-version-gen @@ -1,8 +1,8 @@ #!/bin/sh # Print a version string. -scriptversion=2018-03-07.03; # UTC +scriptversion=2019-10-13.15; # UTC -# Copyright (C) 2007-2019 Free Software Foundation, Inc. +# Copyright (C) 2007-2020 Free Software Foundation, Inc. # # This program is free software: you can redistribute it and/or modify # it under the terms of the GNU General Public License as published by @@ -142,11 +142,9 @@ then v=`cat $tarball_version_file` || v= case $v in *$nl*) v= ;; # reject multi-line output - [0-9]*) ;; - *) v= ;; esac test "x$v" = x \ - && echo "$0: WARNING: $tarball_version_file is missing or damaged" 1>&2 + && echo "$0: WARNING: $tarball_version_file is damaged" 1>&2 fi if test "x$v" != x diff --git a/build-aux/gitlog-to-changelog b/build-aux/gitlog-to-changelog index 163c48c..be8082e 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-2019 Free Software Foundation, Inc. +# Copyright (C) 2008-2020 Free Software Foundation, Inc. # # This program is free software: you can redistribute it and/or modify # it under the terms of the GNU General Public License as published by @@ -31,11 +31,11 @@ # are valid code in both sh and perl. When executed by sh, they re-execute # the script through the perl program found in $PATH. The '-x' option # is essential as well; without it, perl would re-execute the script -# through /bin/sh. When executed by perl, the next two lines are a no-op. +# through /bin/sh. When executed by perl, the next two lines are a no-op. eval 'exec perl -wSx "$0" "$@"' if 0; -my $VERSION = '2018-03-07 03:47'; # UTC +my $VERSION = '2020-04-04 15:07'; # 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 diff --git a/build-aux/gnu-web-doc-update b/build-aux/gnu-web-doc-update index 0d52171..ff48cf7 100755 --- a/build-aux/gnu-web-doc-update +++ b/build-aux/gnu-web-doc-update @@ -4,7 +4,7 @@ VERSION=2018-03-07.03; # UTC -# Copyright (C) 2009-2019 Free Software Foundation, Inc. +# Copyright (C) 2009-2020 Free Software Foundation, Inc. # This 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/gnupload b/build-aux/gnupload index afbafa9..e4ea542 100755 --- a/build-aux/gnupload +++ b/build-aux/gnupload @@ -3,7 +3,7 @@ scriptversion=2018-05-19.18; # UTC -# Copyright (C) 2004-2019 Free Software Foundation, Inc. +# Copyright (C) 2004-2020 Free Software Foundation, Inc. # # This 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/install-sh b/build-aux/install-sh index 8175c64..ec298b5 100755 --- a/build-aux/install-sh +++ b/build-aux/install-sh @@ -1,7 +1,7 @@ #!/bin/sh # install - install a program, script, or datafile -scriptversion=2018-03-11.20; # UTC +scriptversion=2020-11-14.01; # UTC # This originates from X11R5 (mit/util/scripts/install.sh), which was # later released in X11R6 (xc/config/util/install.sh) with the @@ -69,6 +69,11 @@ posix_mkdir= # Desired mode of installed file. mode=0755 +# Create dirs (including intermediate dirs) using mode 755. +# This is like GNU 'install' as of coreutils 8.32 (2020). +mkdir_umask=22 + +backupsuffix= chgrpcmd= chmodcmd=$chmodprog chowncmd= @@ -99,18 +104,28 @@ Options: --version display version info and exit. -c (ignored) - -C install only if different (preserve the last data modification time) + -C install only if different (preserve data modification time) -d create directories instead of installing files. -g GROUP $chgrpprog installed files to GROUP. -m MODE $chmodprog installed files to MODE. -o USER $chownprog installed files to USER. + -p pass -p to $cpprog. -s $stripprog installed files. + -S SUFFIX attempt to back up existing files, with suffix SUFFIX. -t DIRECTORY install into DIRECTORY. -T report an error if DSTFILE is a directory. Environment variables override the default commands: CHGRPPROG CHMODPROG CHOWNPROG CMPPROG CPPROG MKDIRPROG MVPROG RMPROG STRIPPROG + +By default, rm is invoked with -f; when overridden with RMPROG, +it's up to you to specify -f if you want it. + +If -S is not specified, no backups are attempted. + +Email bug reports to bug-automake@gnu.org. +Automake home page: https://www.gnu.org/software/automake/ " while test $# -ne 0; do @@ -137,8 +152,13 @@ while test $# -ne 0; do -o) chowncmd="$chownprog $2" shift;; + -p) cpprog="$cpprog -p";; + -s) stripcmd=$stripprog;; + -S) backupsuffix="$2" + shift;; + -t) is_target_a_directory=always dst_arg=$2 @@ -255,6 +275,10 @@ do dstdir=$dst test -d "$dstdir" dstdir_status=$? + # Don't chown directories that already exist. + if test $dstdir_status = 0; then + chowncmd="" + fi else # Waiting for this to be detected by the "$cpprog $src $dsttmp" command @@ -301,22 +325,6 @@ do if test $dstdir_status != 0; then case $posix_mkdir in '') - # Create intermediate dirs using mode 755 as modified by the umask. - # This is like FreeBSD 'install' as of 1997-10-28. - umask=`umask` - case $stripcmd.$umask in - # Optimize common cases. - *[2367][2367]) mkdir_umask=$umask;; - .*0[02][02] | .[02][02] | .[02]) mkdir_umask=22;; - - *[0-7]) - mkdir_umask=`expr $umask + 22 \ - - $umask % 100 % 40 + $umask % 20 \ - - $umask % 10 % 4 + $umask % 2 - `;; - *) mkdir_umask=$umask,go-w;; - esac - # With -d, create the new directory with the user-specified mode. # Otherwise, rely on $mkdir_umask. if test -n "$dir_arg"; then @@ -326,52 +334,49 @@ do fi posix_mkdir=false - case $umask in - *[123567][0-7][0-7]) - # POSIX mkdir -p sets u+wx bits regardless of umask, which - # is incompatible with FreeBSD 'install' when (umask & 300) != 0. - ;; - *) - # Note that $RANDOM variable is not portable (e.g. dash); Use it - # here however when possible just to lower collision chance. - tmpdir=${TMPDIR-/tmp}/ins$RANDOM-$$ - - trap 'ret=$?; rmdir "$tmpdir/a/b" "$tmpdir/a" "$tmpdir" 2>/dev/null; exit $ret' 0 - - # Because "mkdir -p" follows existing symlinks and we likely work - # directly in world-writeable /tmp, make sure that the '$tmpdir' - # directory is successfully created first before we actually test - # 'mkdir -p' feature. - if (umask $mkdir_umask && - $mkdirprog $mkdir_mode "$tmpdir" && - exec $mkdirprog $mkdir_mode -p -- "$tmpdir/a/b") >/dev/null 2>&1 - then - if test -z "$dir_arg" || { - # Check for POSIX incompatibilities with -m. - # HP-UX 11.23 and IRIX 6.5 mkdir -m -p sets group- or - # other-writable bit of parent directory when it shouldn't. - # FreeBSD 6.1 mkdir -m -p sets mode of existing directory. - test_tmpdir="$tmpdir/a" - ls_ld_tmpdir=`ls -ld "$test_tmpdir"` - case $ls_ld_tmpdir in - d????-?r-*) different_mode=700;; - d????-?--*) different_mode=755;; - *) false;; - esac && - $mkdirprog -m$different_mode -p -- "$test_tmpdir" && { - ls_ld_tmpdir_1=`ls -ld "$test_tmpdir"` - test "$ls_ld_tmpdir" = "$ls_ld_tmpdir_1" - } - } - then posix_mkdir=: - fi - rmdir "$tmpdir/a/b" "$tmpdir/a" "$tmpdir" - else - # Remove any dirs left behind by ancient mkdir implementations. - rmdir ./$mkdir_mode ./-p ./-- "$tmpdir" 2>/dev/null - fi - trap '' 0;; - esac;; + # The $RANDOM variable is not portable (e.g., dash). Use it + # here however when possible just to lower collision chance. + tmpdir=${TMPDIR-/tmp}/ins$RANDOM-$$ + + trap ' + ret=$? + rmdir "$tmpdir/a/b" "$tmpdir/a" "$tmpdir" 2>/dev/null + exit $ret + ' 0 + + # Because "mkdir -p" follows existing symlinks and we likely work + # directly in world-writeable /tmp, make sure that the '$tmpdir' + # directory is successfully created first before we actually test + # 'mkdir -p'. + if (umask $mkdir_umask && + $mkdirprog $mkdir_mode "$tmpdir" && + exec $mkdirprog $mkdir_mode -p -- "$tmpdir/a/b") >/dev/null 2>&1 + then + if test -z "$dir_arg" || { + # Check for POSIX incompatibilities with -m. + # HP-UX 11.23 and IRIX 6.5 mkdir -m -p sets group- or + # other-writable bit of parent directory when it shouldn't. + # FreeBSD 6.1 mkdir -m -p sets mode of existing directory. + test_tmpdir="$tmpdir/a" + ls_ld_tmpdir=`ls -ld "$test_tmpdir"` + case $ls_ld_tmpdir in + d????-?r-*) different_mode=700;; + d????-?--*) different_mode=755;; + *) false;; + esac && + $mkdirprog -m$different_mode -p -- "$test_tmpdir" && { + ls_ld_tmpdir_1=`ls -ld "$test_tmpdir"` + test "$ls_ld_tmpdir" = "$ls_ld_tmpdir_1" + } + } + then posix_mkdir=: + fi + rmdir "$tmpdir/a/b" "$tmpdir/a" "$tmpdir" + else + # Remove any dirs left behind by ancient mkdir implementations. + rmdir ./$mkdir_mode ./-p ./-- "$tmpdir" 2>/dev/null + fi + trap '' 0;; esac if @@ -382,7 +387,7 @@ do then : else - # The umask is ridiculous, or mkdir does not conform to POSIX, + # mkdir does not conform to POSIX, # or it failed possibly due to a race condition. Create the # directory the slow way, step by step, checking for races as we go. @@ -411,7 +416,7 @@ do prefixes= else if $posix_mkdir; then - (umask=$mkdir_umask && + (umask $mkdir_umask && $doit_exec $mkdirprog $mkdir_mode -p -- "$dstdir") && break # Don't fail if two instances are running concurrently. test -d "$prefix" || exit 1 @@ -451,7 +456,18 @@ do trap 'ret=$?; rm -f "$dsttmp" "$rmtmp" && exit $ret' 0 # Copy the file name to the temp name. - (umask $cp_umask && $doit_exec $cpprog "$src" "$dsttmp") && + (umask $cp_umask && + { test -z "$stripcmd" || { + # Create $dsttmp read-write so that cp doesn't create it read-only, + # which would cause strip to fail. + if test -z "$doit"; then + : >"$dsttmp" # No need to fork-exec 'touch'. + else + $doit touch "$dsttmp" + fi + } + } && + $doit_exec $cpprog "$src" "$dsttmp") && # and set any options; do chmod last to preserve setuid bits. # @@ -477,6 +493,13 @@ do then rm -f "$dsttmp" else + # If $backupsuffix is set, and the file being installed + # already exists, attempt a backup. Don't worry if it fails, + # e.g., if mv doesn't support -f. + if test -n "$backupsuffix" && test -f "$dst"; then + $doit $mvcmd -f "$dst" "$dst$backupsuffix" 2>/dev/null + fi + # Rename the file to the real destination. $doit $mvcmd -f "$dsttmp" "$dst" 2>/dev/null || @@ -491,9 +514,9 @@ do # file should still install successfully. { test ! -f "$dst" || - $doit $rmcmd -f "$dst" 2>/dev/null || + $doit $rmcmd "$dst" 2>/dev/null || { $doit $mvcmd -f "$dst" "$rmtmp" 2>/dev/null && - { $doit $rmcmd -f "$rmtmp" 2>/dev/null; :; } + { $doit $rmcmd "$rmtmp" 2>/dev/null; :; } } || { echo "$0: cannot unlink or rename $dst" >&2 (exit 1); exit 1 diff --git a/build-aux/mdate-sh b/build-aux/mdate-sh index 8c7a590..6a6a4bc 100755 --- a/build-aux/mdate-sh +++ b/build-aux/mdate-sh @@ -3,7 +3,7 @@ scriptversion=2018-03-07.03; # UTC -# Copyright (C) 1995-2018 Free Software Foundation, Inc. +# Copyright (C) 1995-2020 Free Software Foundation, Inc. # written by Ulrich Drepper , 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 2e7fd52..8bbef0e 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-2019 Free Software Foundation, Inc. +# Copyright (C) 2007-2020 Free Software Foundation, Inc. # This 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 ed3f0ee..3c7051d 100644 --- a/build-aux/texinfo.tex +++ b/build-aux/texinfo.tex @@ -1,11 +1,11 @@ % texinfo.tex -- TeX macros to handle Texinfo files. -% +% % Load plain if necessary, i.e., if running under initex. \expandafter\ifx\csname fmtname\endcsname\relax\input plain\fi % -\def\texinfoversion{2019-06-01.23} +\def\texinfoversion{2020-10-24.12} % -% Copyright 1985, 1986, 1988, 1990-2019 Free Software Foundation, Inc. +% Copyright 1985, 1986, 1988, 1990-2020 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 @@ -33,7 +33,7 @@ % The texinfo.tex in any given distribution could well be out % of date, so if that's what you're using, please check. % -% Send bug reports to bug-texinfo@gnu.org. Please include including a +% Send bug reports to bug-texinfo@gnu.org. Please include a % complete document in each bug report with which we can reproduce the % problem. Patches are, of course, greatly appreciated. % @@ -218,7 +218,7 @@ % @errormsg{MSG}. Do the index-like expansions on MSG, but if things % aren't perfect, it's not the end of the world, being an error message, % after all. -% +% \def\errormsg{\begingroup \indexnofonts \doerrormsg} \def\doerrormsg#1{\errmessage{#1}} @@ -323,9 +323,9 @@ % 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 +% (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.) % \newtoks\savedtopmark @@ -349,36 +349,21 @@ \ifodd\pageno \advance\hoffset by \bindingoffset \else \advance\hoffset by -\bindingoffset\fi % + \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. % - % This is used to check if we are on the first page of a chapter. - \ifcase1\the\savedtopmark\fi - \let\prevchaptername\thischaptername - \ifcase0\firstmark\fi - \let\curchaptername\thischaptername - % - \ifodd\pageno \getoddheadingmarks \else \getevenheadingmarks \fi - % - \ifx\curchaptername\prevchaptername - \let\thischapterheading\thischapter - \else - % \thischapterheading is the same as \thischapter except it is blank - % for the first page of a chapter. This is to prevent the chapter name - % being shown twice. - \def\thischapterheading{}% - \fi - % % 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). - \def\commmonheadfootline{\let\hsize=\txipagewidth \texinfochars} - % - \global\setbox\headlinebox = \vbox{\commmonheadfootline \makeheadline}% + \def\commonheadfootline{\let\hsize=\txipagewidth \texinfochars} % + \ifodd\pageno \getoddheadingmarks \else \getevenheadingmarks \fi + \global\setbox\headlinebox = \vbox{\commonheadfootline \makeheadline}% \ifodd\pageno \getoddfootingmarks \else \getevenfootingmarks \fi - \global\setbox\footlinebox = \vbox{\commmonheadfootline \makefootline}% + \global\setbox\footlinebox = \vbox{\commonheadfootline \makefootline}% % {% % Set context for writing to auxiliary files like index files. @@ -423,6 +408,22 @@ \ifr@ggedbottom \kern-\dimen@ \vfil \fi} } +% Check if we are on the first page of a chapter. Used for printing headings. +\newif\ifchapterpage +\def\checkchapterpage{% + % Get the chapter that was current at the end of the last page + \ifcase1\the\savedtopmark\fi + \let\prevchaptername\thischaptername + % + \ifodd\pageno \getoddheadingmarks \else \getevenheadingmarks \fi + \let\curchaptername\thischaptername + % + \ifx\curchaptername\prevchaptername + \chapterpagefalse + \else + \chapterpagetrue + \fi +} % Argument parsing @@ -448,7 +449,7 @@ }% } -% First remove any @comment, then any @c comment. Pass the result on to +% First remove any @comment, then any @c comment. Pass the result on to % \argcheckspaces. \def\argremovecomment#1\comment#2\ArgTerm{\argremovec #1\c\ArgTerm} \def\argremovec#1\c#2\ArgTerm{\argcheckspaces#1\^^M\ArgTerm} @@ -1010,7 +1011,7 @@ where each line of input produces a line of output.} \let\setfilename=\comment % @bye. -\outer\def\bye{\pagealignmacro\tracingstats=1\ptexend} +\outer\def\bye{\chappager\pagelabels\tracingstats=1\ptexend} \message{pdf,} @@ -1052,7 +1053,7 @@ where each line of input produces a line of output.} tex.sprint( string.format(string.char(0x5c) .. string.char(0x25) .. '03o' .. string.char(0x5c) .. string.char(0x25) .. '03o', - (c / 256), (c % 256))) + math.floor(c / 256), math.floor(c % 256))) else c = c - 0x10000 local c_hi = c / 1024 + 0xd800 @@ -1062,8 +1063,8 @@ where each line of input produces a line of output.} string.char(0x5c) .. string.char(0x25) .. '03o' .. string.char(0x5c) .. string.char(0x25) .. '03o' .. string.char(0x5c) .. string.char(0x25) .. '03o', - (c_hi / 256), (c_hi % 256), - (c_lo / 256), (c_lo % 256))) + math.floor(c_hi / 256), math.floor(c_hi % 256), + math.floor(c_lo / 256), math.floor(c_lo % 256))) end end end @@ -1076,15 +1077,19 @@ where each line of input produces a line of output.} function PDFescstr(str) for c in string.bytes(str) do if c <= 0x20 or c >= 0x80 or c == 0x28 or c == 0x29 or c == 0x5c then - tex.sprint( + tex.sprint(-2, string.format(string.char(0x5c) .. string.char(0x25) .. '03o', c)) else - tex.sprint(string.char(c)) + tex.sprint(-2, string.char(c)) end end end } + % The -2 in the arguments here gives all the input to TeX catcode 12 + % (other) or 10 (space), preventing undefined control sequence errors. See + % https://lists.gnu.org/archive/html/bug-texinfo/2019-08/msg00031.html + % \endgroup \def\pdfescapestring#1{\directlua{PDFescstr('\luaescapestring{#1}')}} \ifnum\luatexversion>84 @@ -1133,11 +1138,50 @@ where each line of input produces a line of output.} \fi +% Output page labels information. +% See PDF reference v.1.7 p.594, section 8.3.1. +\ifpdf +\def\pagelabels{% + \def\title{0 << /P (T-) /S /D >>}% + \edef\roman{\the\romancount << /S /r >>}% + \edef\arabic{\the\arabiccount << /S /D >>}% + % + % Page label ranges must be increasing. Remove any duplicates. + % (There is a slight chance of this being wrong if e.g. there is + % a @contents but no @titlepage, etc.) + % + \ifnum\romancount=0 \def\roman{}\fi + \ifnum\arabiccount=0 \def\title{}% + \else + \ifnum\romancount=\arabiccount \def\roman{}\fi + \fi + % + \ifnum\romancount<\arabiccount + \pdfcatalog{/PageLabels << /Nums [\title \roman \arabic ] >> }\relax + \else + \pdfcatalog{/PageLabels << /Nums [\title \arabic \roman ] >> }\relax + \fi +} +\else + \let\pagelabels\relax +\fi + +\newcount\pagecount \pagecount=0 +\newcount\romancount \romancount=0 +\newcount\arabiccount \arabiccount=0 +\ifpdf + \let\ptxadvancepageno\advancepageno + \def\advancepageno{% + \ptxadvancepageno\global\advance\pagecount by 1 + } +\fi + + % PDF uses PostScript string constants for the names of xref targets, % for display in the outlines, and in other places. Thus, we have to % double any backslashes. Otherwise, a name like "\node" will be % interpreted as a newline (\n), followed by o, d, e. Not good. -% +% % See http://www.ntg.nl/pipermail/ntg-pdftex/2004-July/000654.html and % related messages. The final outcome is that it is up to the TeX user % to double the backslashes and otherwise make the string valid, so @@ -1423,7 +1467,13 @@ output) for that.)} % subentries, which we calculated on our first read of the .toc above. % % We use the node names as the destinations. + % + % Currently we prefix the section name with the section number + % for chapter and appendix headings only in order to avoid too much + % horizontal space being required in the PDF viewer. \def\numchapentry##1##2##3##4{% + \dopdfoutline{##2 ##1}{count-\expnumber{chap##2}}{##3}{##4}}% + \def\unnchapentry##1##2##3##4{% \dopdfoutline{##1}{count-\expnumber{chap##2}}{##3}{##4}}% \def\numsecentry##1##2##3##4{% \dopdfoutline{##1}{count-\expnumber{sec##2}}{##3}{##4}}% @@ -1442,7 +1492,7 @@ output) for that.)} % their "best" equivalent, based on the @documentencoding. Too % much work for too little return. Just use the ASCII equivalents % we use for the index sort strings. - % + % \indexnofonts \setupdatafile % We can have normal brace characters in the PDF outlines, unlike @@ -1665,9 +1715,13 @@ output) for that.)} % Therefore, we read toc only once. % % We use node names as destinations. + % + % Currently we prefix the section name with the section number + % for chapter and appendix headings only in order to avoid too much + % horizontal space being required in the PDF viewer. \def\partentry##1##2##3##4{}% ignore parts in the outlines \def\numchapentry##1##2##3##4{% - \dopdfoutline{##1}{1}{##3}{##4}}% + \dopdfoutline{##2 ##1}{1}{##3}{##4}}% \def\numsecentry##1##2##3##4{% \dopdfoutline{##1}{2}{##3}{##4}}% \def\numsubsecentry##1##2##3##4{% @@ -1679,7 +1733,8 @@ output) for that.)} \let\appsecentry\numsecentry% \let\appsubsecentry\numsubsecentry% \let\appsubsubsecentry\numsubsubsecentry% - \let\unnchapentry\numchapentry% + \def\unnchapentry##1##2##3##4{% + \dopdfoutline{##1}{1}{##3}{##4}}% \let\unnsecentry\numsecentry% \let\unnsubsecentry\numsubsecentry% \let\unnsubsubsecentry\numsubsubsecentry% @@ -2492,7 +2547,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\tt{\fam=\ttfam \setfontstyle{tt}}\def\ttstylename{tt} % Texinfo sort of supports the sans serif font style, which plain TeX does not. % So we set up a \sf. @@ -2726,7 +2781,7 @@ end } % Commands to set the quote options. -% +% \parseargdef\codequoteundirected{% \def\temp{#1}% \ifx\temp\onword @@ -2767,7 +2822,7 @@ end % If we are in a monospaced environment, however, 1) always use \ttsl, % and 2) do not add an italic correction. \def\dosmartslant#1#2{% - \ifusingtt + \ifusingtt {{\ttsl #2}\let\next=\relax}% {\def\next{{#1#2}\futurelet\next\smartitaliccorrection}}% \next @@ -2914,14 +2969,14 @@ end \gdef\codedash{\futurelet\next\codedashfinish} \gdef\codedashfinish{% \normaldash % always output the dash character itself. - % + % % Now, output a discretionary to allow a line break, unless % (a) the next character is a -, or % (b) the preceding character is a -. % 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\codedashprev\codedash \else \discretionary{}{}{}\fi \fi % we need the space after the = for the case when \next itself is a @@ -2983,10 +3038,18 @@ end % arg (if given), and not the url (which is then just the link target). \newif\ifurefurlonlylink +% The default \pretolerance setting stops the penalty inserted in +% \urefallowbreak being a discouragement to line breaking. Set it to +% a negative value for this paragraph only. Hopefully this does not +% conflict with redefinitions of \par done elsewhere. +\def\nopretolerance{% +\pretolerance=-1 +\def\par{\endgraf\pretolerance=100 \let\par\endgraf}% +} + % The main macro is \urefbreak, which allows breaking at expected -% places within the url. (There used to be another version, which -% didn't support automatic breaking.) -\def\urefbreak{\begingroup \urefcatcodes \dourefbreak} +% places within the url. +\def\urefbreak{\nopretolerance \begingroup \urefcatcodes \dourefbreak} \let\uref=\urefbreak % \def\dourefbreak#1{\urefbreakfinish #1,,,\finish} @@ -3003,7 +3066,7 @@ end % For pdfTeX and LuaTeX \ifurefurlonlylink % PDF plus option to not display url, show just arg - \unhbox0 + \unhbox0 \else % PDF, normally display both arg and url for consistency, % visibility, if the pdf is eventually used to print, etc. @@ -3016,7 +3079,7 @@ end % For XeTeX \ifurefurlonlylink % PDF plus option to not display url, show just arg - \unhbox0 + \unhbox0 \else % PDF, normally display both arg and url for consistency, % visibility, if the pdf is eventually used to print, etc. @@ -3074,10 +3137,10 @@ end } } -% By default we'll break after the special characters, but some people like to -% break before the special chars, so allow that. Also allow no breaking at +% By default we'll break after the special characters, but some people like to +% break before the special chars, so allow that. Also allow no breaking at % all, for manual control. -% +% \parseargdef\urefbreakstyle{% \def\txiarg{#1}% \ifx\txiarg\wordnone @@ -3095,12 +3158,17 @@ end \def\wordbefore{before} \def\wordnone{none} -% Allow a ragged right output to aid breaking long URL's. Putting stretch in -% between characters of the URL doesn't look good. +% Allow a ragged right output to aid breaking long URL's. There can +% be a break at the \allowbreak with no extra glue (if the existing stretch in +% the line is sufficient), a break at the \penalty with extra glue added +% at the end of the line, or no break at all here. +% Changing the value of the penalty and/or the amount of stretch affects how +% preferable one choice is over the other. \def\urefallowbreak{% - \hskip 0pt plus 4 em\relax - \allowbreak - \hskip 0pt plus -4 em\relax + \penalty0\relax + \hskip 0pt plus 2 em\relax + \penalty1000\relax + \hskip 0pt plus -2 em\relax } \urefbreakstyle after @@ -3296,10 +3364,29 @@ end \def\sup{\ifmmode \expandafter\ptexsp \else \expandafter\finishsup\fi} \def\finishsup#1{$\ptexsp{\hbox{\switchtolllsize #1}}$}% +% provide this command from LaTeX as it is very common +\def\frac#1#2{{{#1}\over{#2}}} + +% @displaymath. +% \globaldefs is needed to recognize the end lines in \tex and +% \end tex. Set \thisenv as @end displaymath is seen before @end tex. +{\obeylines +\globaldefs=1 +\envdef\displaymath{% +\tex +\def\thisenv{\displaymath}% +$$% +} + +\def\Edisplaymath{$$ +\def\thisenv{\tex}% +\end tex +}} + % @inlinefmt{FMTNAME,PROCESSED-TEXT} and @inlineraw{FMTNAME,RAW-TEXT}. % Ignore unless FMTNAME == tex; then it is like @iftex and @tex, % except specified as a normal braced arg, so no newlines to worry about. -% +% \def\outfmtnametex{tex} % \long\def\inlinefmt#1{\doinlinefmt #1,\finish} @@ -3307,7 +3394,7 @@ end \def\inlinefmtname{#1}% \ifx\inlinefmtname\outfmtnametex \ignorespaces #2\fi } -% +% % @inlinefmtifelse{FMTNAME,THEN-TEXT,ELSE-TEXT} expands THEN-TEXT if % FMTNAME is tex, else ELSE-TEXT. \long\def\inlinefmtifelse#1{\doinlinefmtifelse #1,,,\finish} @@ -3323,7 +3410,7 @@ end % *right* brace they would have to use a command anyway, so they may as % well use a command to get a left brace too. We could re-use the % delimiter character idea from \verb, but it seems like overkill. -% +% \long\def\inlineraw{\tex \doinlineraw} \long\def\doinlineraw#1{\doinlinerawtwo #1,\finish} \def\doinlinerawtwo#1,#2,\finish{% @@ -3500,7 +3587,7 @@ end % @pounds{} is a sterling sign, which Knuth put in the CM italic font. % -\def\pounds{{\it\$}} +\def\pounds{\ifmonospace{\ecfont\char"BF}\else{\it\$}\fi} % @euro{} comes from a separate font, depending on the current style. % We use the free feym* fonts from the eurosym package by Henrik @@ -3600,7 +3687,7 @@ end % for non-CM glyphs. That is ec* for regular text and tc* for the text % companion symbols (LaTeX TS1 encoding). Both are part of the ec % package and follow the same conventions. -% +% \def\ecfont{\etcfont{e}} \def\tcfont{\etcfont{t}} % @@ -3649,11 +3736,19 @@ end \fi % Quotes. -\chardef\quotedblleft="5C -\chardef\quotedblright=`\" \chardef\quoteleft=`\` \chardef\quoteright=`\' +% 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 +} + +\def\quotedblright{% + \ifmonospace{\ecfont\char"11}\else{\char`\"}\fi +} + \message{page headings,} @@ -3672,7 +3767,7 @@ end after the title page.}}% \def\setshortcontentsaftertitlepage{% \errmessage{@setshortcontentsaftertitlepage has been removed as a Texinfo - command; move your @shortcontents and @contents commands if you + command; move your @shortcontents and @contents commands if you want the contents after the title page.}}% \parseargdef\shorttitlepage{% @@ -3727,7 +3822,7 @@ end % don't worry much about spacing, ragged right. This should be used % inside a \vbox, and fonts need to be set appropriately first. \par should % be specified before the end of the \vbox, since a vbox is a group. -% +% \def\raggedtitlesettings{% \rm \hyphenpenalty=10000 @@ -3775,12 +3870,19 @@ end \newtoks\evenheadline % headline on even pages \newtoks\oddheadline % headline on odd pages +\newtoks\evenchapheadline% headline on even pages with a new chapter +\newtoks\oddchapheadline % headline on odd pages with a new chapter \newtoks\evenfootline % footline on even pages \newtoks\oddfootline % footline on odd pages % Now make \makeheadline and \makefootline in Plain TeX use those variables -\headline={{\textfonts\rm \ifodd\pageno \the\oddheadline - \else \the\evenheadline \fi}} +\headline={{\textfonts\rm + \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} \let\HEADINGShook=\relax @@ -3796,12 +3898,14 @@ end \def\evenheading{\parsearg\evenheadingxxx} \def\evenheadingxxx #1{\evenheadingyyy #1\|\|\|\|\finish} \def\evenheadingyyy #1\|#2\|#3\|#4\finish{% -\global\evenheadline={\rlap{\centerline{#2}}\line{#1\hfil#3}}} + \global\evenheadline={\rlap{\centerline{#2}}\line{#1\hfil#3}} + \global\evenchapheadline=\evenheadline} \def\oddheading{\parsearg\oddheadingxxx} \def\oddheadingxxx #1{\oddheadingyyy #1\|\|\|\|\finish} \def\oddheadingyyy #1\|#2\|#3\|#4\finish{% -\global\oddheadline={\rlap{\centerline{#2}}\line{#1\hfil#3}}} + \global\oddheadline={\rlap{\centerline{#2}}\line{#1\hfil#3}}% + \global\oddchapheadline=\oddheadline} \parseargdef\everyheading{\oddheadingxxx{#1}\evenheadingxxx{#1}}% @@ -3868,37 +3972,34 @@ end \parseargdef\headings{\csname HEADINGS#1\endcsname} \def\headingsoff{% non-global headings elimination - \evenheadline={\hfil}\evenfootline={\hfil}% - \oddheadline={\hfil}\oddfootline={\hfil}% + \evenheadline={\hfil}\evenfootline={\hfil}\evenchapheadline={\hfil}% + \oddheadline={\hfil}\oddfootline={\hfil}\oddchapheadline={\hfil}% } \def\HEADINGSoff{{\globaldefs=1 \headingsoff}} % global setting \HEADINGSoff % it's the default % When we turn headings on, set the page number to 1. +\def\pageone{ + \global\pageno=1 + \global\arabiccount = \pagecount +} + % 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{% -\global\pageno=1 -\global\evenfootline={\hfil} -\global\oddfootline={\hfil} -\global\evenheadline={\line{\folio\hfil\thistitle}} -\global\oddheadline={\line{\thischapterheading\hfil\folio}} -\global\let\contentsalignmacro = \chapoddpage +\pageone +\HEADINGSdoublex } \let\contentsalignmacro = \chappager % For single-sided printing, chapter title goes across top left of page, % page number on top right. \def\HEADINGSsingle{% -\global\pageno=1 -\global\evenfootline={\hfil} -\global\oddfootline={\hfil} -\global\evenheadline={\line{\thischapterheading\hfil\folio}} -\global\oddheadline={\line{\thischapterheading\hfil\folio}} -\global\let\contentsalignmacro = \chappager +\pageone +\HEADINGSsinglex } \def\HEADINGSon{\HEADINGSdouble} @@ -3908,7 +4009,9 @@ end \global\evenfootline={\hfil} \global\oddfootline={\hfil} \global\evenheadline={\line{\folio\hfil\thistitle}} -\global\oddheadline={\line{\thischapterheading\hfil\folio}} +\global\oddheadline={\line{\thischapter\hfil\folio}} +\global\evenchapheadline={\line{\folio\hfil}} +\global\oddchapheadline={\line{\hfil\folio}} \global\let\contentsalignmacro = \chapoddpage } @@ -3916,8 +4019,22 @@ end \def\HEADINGSsinglex{% \global\evenfootline={\hfil} \global\oddfootline={\hfil} -\global\evenheadline={\line{\thischapterheading\hfil\folio}} -\global\oddheadline={\line{\thischapterheading\hfil\folio}} +\global\evenheadline={\line{\thischapter\hfil\folio}} +\global\oddheadline={\line{\thischapter\hfil\folio}} +\global\evenchapheadline={\line{\hfil\folio}} +\global\oddchapheadline={\line{\hfil\folio}} +\global\let\contentsalignmacro = \chappager +} + +% for @setchapternewpage off +\def\HEADINGSsinglechapoff{% +\pageone +\global\evenfootline={\hfil} +\global\oddfootline={\hfil} +\global\evenheadline={\line{\thischapter\hfil\folio}} +\global\oddheadline={\line{\thischapter\hfil\folio}} +\global\evenchapheadline=\evenheadline +\global\oddchapheadline=\oddheadline \global\let\contentsalignmacro = \chappager } @@ -4350,7 +4467,7 @@ end } % multitable-only commands. -% +% % @headitem starts a heading row, which we typeset in bold. Assignments % have to be global since we are inside the implicit group of an % alignment entry. \everycr below resets \everytab so we don't have to @@ -4669,13 +4786,13 @@ end % Like \expandablevalue, but completely expandable (the \message in the % definition above operates at the execution level of TeX). Used when % writing to auxiliary files, due to the expansion that \write does. -% If flag is undefined, pass through an unexpanded @value command: maybe it +% If flag is undefined, pass through an unexpanded @value command: maybe it % will be set by the time it is read back in. % % NB flag names containing - or _ may not work here. \def\dummyvalue#1{% \expandafter\ifx\csname SET#1\endcsname\relax - \noexpand\value{#1}% + \string\value{#1}% \else \csname SET#1\endcsname \fi @@ -4693,7 +4810,7 @@ end % @ifset VAR ... @end ifset reads the `...' iff VAR has been defined % with @set. -% +% % To get the special treatment we need for `@end ifset,' we call % \makecond and then redefine. % @@ -4726,7 +4843,7 @@ end % without the @) is in fact defined. We can only feasibly check at the % TeX level, so something like `mathcode' is going to considered % defined even though it is not a Texinfo command. -% +% \makecond{ifcommanddefined} \def\ifcommanddefined{\parsearg{\doifcmddefined{\let\next=\ifcmddefinedfail}}} % @@ -4832,10 +4949,10 @@ end % like the previous two, but they put @code around the argument. \def\docodeindex#1{\edef\indexname{#1}\parsearg\docodeindexxxx} -\def\docodeindexxxx #1{\doind{\indexname}{\code{#1}}} +\def\docodeindexxxx #1{\docind{\indexname}{#1}} - -% Used for the aux, toc and index files to prevent expansion of Texinfo + +% Used for the aux, toc and index files to prevent expansion of Texinfo % commands. % \def\atdummies{% @@ -4843,6 +4960,7 @@ end \definedummyletter\ % \definedummyletter\{% \definedummyletter\}% + \definedummyletter\&% % % Do the redefinitions. \definedummies @@ -4913,6 +5031,7 @@ end \definedummyword\TeX % % Assorted special characters. + \definedummyword\ampchar \definedummyword\atchar \definedummyword\arrow \definedummyword\backslashchar @@ -5106,64 +5225,66 @@ end \let\lbracechar\{% \let\rbracechar\}% % + % + \let\do\indexnofontsdef + % % 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}% - % - \def\LaTeX{LaTeX}% - \def\TeX{TeX}% - % - % Assorted special characters. \defglyph gives the control sequence a - % definition that removes the {} that follows its use. - \defglyph\atchar{@}% - \defglyph\arrow{->}% - \defglyph\bullet{bullet}% - \defglyph\comma{,}% - \defglyph\copyright{copyright}% - \defglyph\dots{...}% - \defglyph\enddots{...}% - \defglyph\equiv{==}% - \defglyph\error{error}% - \defglyph\euro{euro}% - \defglyph\expansion{==>}% - \defglyph\geq{>=}% - \defglyph\guillemetleft{<<}% - \defglyph\guillemetright{>>}% - \defglyph\guilsinglleft{<}% - \defglyph\guilsinglright{>}% - \defglyph\leq{<=}% - \defglyph\lbracechar{\{}% - \defglyph\minus{-}% - \defglyph\point{.}% - \defglyph\pounds{pounds}% - \defglyph\print{-|}% - \defglyph\quotedblbase{"}% - \defglyph\quotedblleft{"}% - \defglyph\quotedblright{"}% - \defglyph\quoteleft{`}% - \defglyph\quoteright{'}% - \defglyph\quotesinglbase{,}% - \defglyph\rbracechar{\}}% - \defglyph\registeredsymbol{R}% - \defglyph\result{=>}% - \defglyph\textdegree{o}% + \do\AA{AA}% + \do\AE{AE}% + \do\DH{DZZ}% + \do\L{L}% + \do\OE{OE}% + \do\O{O}% + \do\TH{TH}% + \do\aa{aa}% + \do\ae{ae}% + \do\dh{dzz}% + \do\exclamdown{!}% + \do\l{l}% + \do\oe{oe}% + \do\ordf{a}% + \do\ordm{o}% + \do\o{o}% + \do\questiondown{?}% + \do\ss{ss}% + \do\th{th}% + % + \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. @@ -5178,9 +5299,12 @@ end \macrolist \let\value\indexnofontsvalue } -\def\defglyph#1#2{\def#1##1{#2}} % see above - +% 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}}% + + % #1 is the index name, #2 is the entry text. @@ -5197,6 +5321,20 @@ end \fi } +% Same as \doind, but for code indices +\def\docind#1#2{% + \iflinks + {% + % + \requireopenindexfile{#1}% + \edef\writeto{\csname#1indfile\endcsname}% + % + \def\indextext{#2}% + \safewhatsit\docindwrite + }% + \fi +} + % Check if an index file has been opened, and if not, open it. \def\requireopenindexfile#1{% \ifnum\csname #1indfile\endcsname=0 @@ -5207,7 +5345,7 @@ end \ifx\suffix\indexisfl\def\suffix{f1}\fi % Open the file \immediate\openout\csname#1indfile\endcsname \jobname.\suffix - % Using \immediate above here prevents an object entering into the current + % Using \immediate above here prevents an object entering into the current % box, which could confound checks such as those in \safewhatsit for % preceding skips. \typeout{Writing index file \jobname.\suffix}% @@ -5259,10 +5397,13 @@ end \ifx\segment\isfinish \else % - % Fully expand the segment, throwing away any @sortas directives, and + % Fully expand the segment, throwing away any @sortas directives, and % trim spaces. \edef\trimmed{\segment}% \edef\trimmed{\expandafter\eatspaces\expandafter{\trimmed}}% + \ifincodeindex + \edef\trimmed{\noexpand\code{\trimmed}}% + \fi % \xdef\bracedtext{\bracedtext{\trimmed}}% % @@ -5317,18 +5458,23 @@ end % the current value of \escapechar. \def\escapeisbackslash{\escapechar=`\\} -% Use \ in index files by default. texi2dvi didn't support @ as the escape -% character (as it checked for "\entry" in the files, and not "@entry"). When -% the new version of texi2dvi has had a chance to become more prevalent, then -% the escape character can change back to @ again. This should be an easy -% change to make now because both @ and \ are only used as escape characters in -% index files, never standing for themselves. +% Use \ in index files by default. texi2dvi didn't support @ as the escape +% character (as it checked for "\entry" in the files, and not "@entry"). When +% the new version of texi2dvi has had a chance to become more prevalent, then +% the escape character can change back to @ again. This should be an easy +% change to make now because both @ and \ are only used as escape characters in +% index files, never standing for themselves. % \set txiindexescapeisbackslash % Write the entry in \indextext to the index file. % -\def\doindwrite{% + +\newif\ifincodeindex +\def\doindwrite{\incodeindexfalse\doindwritex} +\def\docindwrite{\incodeindextrue\doindwritex} + +\def\doindwritex{% \maybemarginindex % \atdummies @@ -5342,7 +5488,7 @@ end \def\}{\rbracechar{}}% \uccode`\~=`\\ \uppercase{\def~{\backslashchar{}}}% % - % Split the entry into primary entry and any subentries, and get the index + % Split the entry into primary entry and any subentries, and get the index % sort key. \splitindexentry\indextext % @@ -5523,18 +5669,18 @@ end \uccode`\~=`\\ \uppercase{\if\noexpand~}\noexpand#1 \expandafter\ifx\csname SETtxiskipindexfileswithbackslash\endcsname\relax \errmessage{% -ERROR: A sorted index file in an obsolete format was skipped. +ERROR: A sorted index file in an obsolete format was skipped. To fix this problem, please upgrade your version of 'texi2dvi' or 'texi2pdf' to that at . -If you are using an old version of 'texindex' (part of the Texinfo +If you are using an old version of 'texindex' (part of the Texinfo distribution), you may also need to upgrade to a newer version (at least 6.0). You may be able to typeset the index if you run 'texindex \jobname.\indexname' yourself. -You could also try setting the 'txiindexescapeisbackslash' flag by +You could also try setting the 'txiindexescapeisbackslash' flag by running a command like -'texi2dvi -t "@set txiindexescapeisbackslash" \jobname.texi'. If you do +'texi2dvi -t "@set txiindexescapeisbackslash" \jobname.texi'. If you do 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 +If you continue to have problems, deleting the index files and starting again might help (with 'rm \jobname.?? \jobname.??s')% }% \else @@ -5548,7 +5694,11 @@ might help (with 'rm \jobname.?? \jobname.??s')% \else \begindoublecolumns \catcode`\\=0\relax - \catcode`\@=12\relax + % + % Make @ an escape character to give macros a chance to work. This + % should work because we (hopefully) don't otherwise use @ in index files. + %\catcode`\@=12\relax + \catcode`\@=0\relax \input \jobname.\indexname s \enddoublecolumns \fi @@ -5603,7 +5753,7 @@ might help (with 'rm \jobname.?? \jobname.??s')% % bottom of a column to reduce an increase in inter-line spacing. \nobreak \vskip 0pt plus 5\baselineskip - \penalty -300 + \penalty -300 \vskip 0pt plus -5\baselineskip % % Typeset the initial. Making this add up to a whole number of @@ -5719,7 +5869,7 @@ might help (with 'rm \jobname.?? \jobname.??s')% \advance\dimen@ii by 1\dimen@i \ifdim\wd\boxA > \dimen@ii % If the entry doesn't fit in one line \ifdim\dimen@ > 0.8\dimen@ii % due to long index text - % Try to split the text roughly evenly. \dimen@ will be the length of + % Try to split the text roughly evenly. \dimen@ will be the length of % the first line. \dimen@ = 0.7\dimen@ \dimen@ii = \hsize @@ -5927,7 +6077,7 @@ might help (with 'rm \jobname.?? \jobname.??s')% \newbox\balancedcolumns \setbox\balancedcolumns=\vbox{shouldnt see this}% % -% Only called for the last of the double column material. \doublecolumnout +% Only called for the last of the double column material. \doublecolumnout % does the others. \def\balancecolumns{% \setbox0 = \vbox{\unvbox\PAGE}% like \box255 but more efficient, see p.120. @@ -5955,7 +6105,7 @@ might help (with 'rm \jobname.?? \jobname.??s')% }% % Now the left column is in box 1, and the right column in box 3. % - % Check whether the left column has come out higher than the page itself. + % Check whether the left column has come out higher than the page itself. % (Note that we have doubled \vsize for the double columns, so % the actual height of the page is 0.5\vsize). \ifdim2\ht1>\vsize @@ -6252,7 +6402,7 @@ might help (with 'rm \jobname.?? \jobname.??s')% \let\top\unnumbered % Sections. -% +% \outer\parseargdef\numberedsec{\numhead1{#1}} % normally calls seczzz \def\seczzz#1{% \global\subsecno=0 \global\subsubsecno=0 \global\advance\secno by 1 @@ -6275,7 +6425,7 @@ might help (with 'rm \jobname.?? \jobname.??s')% } % Subsections. -% +% % normally calls numberedsubseczzz: \outer\parseargdef\numberedsubsec{\numhead2{#1}} \def\numberedsubseczzz#1{% @@ -6300,7 +6450,7 @@ might help (with 'rm \jobname.?? \jobname.??s')% } % Subsubsections. -% +% % normally numberedsubsubseczzz: \outer\parseargdef\numberedsubsubsec{\numhead3{#1}} \def\numberedsubsubseczzz#1{% @@ -6390,18 +6540,16 @@ might help (with 'rm \jobname.?? \jobname.??s')% \def\CHAPPAGoff{% \global\let\contentsalignmacro = \chappager \global\let\pchapsepmacro=\chapbreak -\global\let\pagealignmacro=\chappager} +\global\def\HEADINGSon{\HEADINGSsinglechapoff}} \def\CHAPPAGon{% \global\let\contentsalignmacro = \chappager \global\let\pchapsepmacro=\chappager -\global\let\pagealignmacro=\chappager \global\def\HEADINGSon{\HEADINGSsingle}} \def\CHAPPAGodd{% \global\let\contentsalignmacro = \chapoddpage \global\let\pchapsepmacro=\chapoddpage -\global\let\pagealignmacro=\chapoddpage \global\def\HEADINGSon{\HEADINGSdouble}} \CHAPPAGon @@ -6766,9 +6914,7 @@ might help (with 'rm \jobname.?? \jobname.??s')% % \def\startcontents#1{% % If @setchapternewpage on, and @headings double, the contents should - % start on an odd page, unlike chapters. Thus, we maintain - % \contentsalignmacro in parallel with \pagealignmacro. - % From: Torbjorn Granlund + % start on an odd page, unlike chapters. \contentsalignmacro \immediate\closeout\tocfile % @@ -6783,6 +6929,9 @@ might help (with 'rm \jobname.?? \jobname.??s')% % % Roman numerals for page numbers. \ifnum \pageno>0 \global\pageno = \lastnegativepageno \fi + \def\thistitle{}% no title in double-sided headings + % Record where the Roman numerals started. + \ifnum\romancount=0 \global\romancount=\pagecount \fi } % redefined for the two-volume lispref. We always output on @@ -6805,8 +6954,7 @@ might help (with 'rm \jobname.?? \jobname.??s')% \fi \closein 1 \endgroup - \lastnegativepageno = \pageno - \global\pageno = \savepageno + \contentsendroman } % And just the chapters. @@ -6841,10 +6989,20 @@ might help (with 'rm \jobname.?? \jobname.??s')% \vfill \eject \contentsalignmacro % in case @setchapternewpage odd is in effect \endgroup + \contentsendroman +} +\let\shortcontents = \summarycontents + +% Get ready to use Arabic numerals again +\def\contentsendroman{% \lastnegativepageno = \pageno \global\pageno = \savepageno + % + % If \romancount > \arabiccount, the contents are at the end of the + % document. Otherwise, advance where the Arabic numerals start for + % the page numbers. + \ifnum\romancount>\arabiccount\else\global\arabiccount=\pagecount\fi } -\let\shortcontents = \summarycontents % Typeset the label for a chapter or appendix for the short contents. % The arg is, e.g., `A' for an appendix, or `3' for a chapter. @@ -7358,7 +7516,7 @@ might help (with 'rm \jobname.?? \jobname.??s')% % @indentedblock is like @quotation, but indents only on the left and % has no optional argument. -% +% \makedispenvdef{indentedblock}{\indentedblockstart} % \def\indentedblockstart{% @@ -7433,13 +7591,9 @@ might help (with 'rm \jobname.?? \jobname.??s')% \newdimen\tabw \setbox0=\hbox{\tt\space} \tabw=8\wd0 % tab amount % % We typeset each line of the verbatim in an \hbox, so we can handle -% tabs. The \global is in case the verbatim line starts with an accent, -% or some other command that starts with a begin-group. Otherwise, the -% entire \verbbox would disappear at the corresponding end-group, before -% it is typeset. Meanwhile, we can't have nested verbatim commands -% (can we?), so the \global won't be overwriting itself. +% tabs. \newbox\verbbox -\def\starttabbox{\global\setbox\verbbox=\hbox\bgroup} +\def\starttabbox{\setbox\verbbox=\hbox\bgroup} % \begingroup \catcode`\^^I=\active @@ -7450,7 +7604,8 @@ might help (with 'rm \jobname.?? \jobname.??s')% \divide\dimen\verbbox by\tabw \multiply\dimen\verbbox by\tabw % compute previous multiple of \tabw \advance\dimen\verbbox by\tabw % advance to next multiple of \tabw - \wd\verbbox=\dimen\verbbox \box\verbbox \starttabbox + \wd\verbbox=\dimen\verbbox + \leavevmode\box\verbbox \starttabbox }% } \endgroup @@ -7460,9 +7615,7 @@ might help (with 'rm \jobname.?? \jobname.??s')% \let\nonarrowing = t% \nonfillstart \tt % easiest (and conventionally used) font for verbatim - % The \leavevmode here is for blank lines. Otherwise, we would - % never \starttabbox and the \egroup would end verbatim mode. - \def\par{\leavevmode\egroup\box\verbbox\endgraf}% + \def\par{\egroup\leavevmode\box\verbbox\endgraf\starttabbox}% \tabexpand \setupmarkupstyle{verbatim}% % Respect line breaks, @@ -7470,7 +7623,6 @@ might help (with 'rm \jobname.?? \jobname.??s')% % make each space count. % Must do in this order: \obeylines \uncatcodespecials \sepspaces - \everypar{\starttabbox}% } % Do the @verb magic: verbatim text is quoted by unique @@ -7505,13 +7657,16 @@ might help (with 'rm \jobname.?? \jobname.??s')% % ignore everything up to the first ^^M, that's the newline at the end % of the @verbatim input line itself. Otherwise we get an extra blank % line in the output. - \xdef\doverbatim#1^^M#2@end verbatim{#2\noexpand\end\gobble verbatim}% + \xdef\doverbatim#1^^M#2@end verbatim{% + \starttabbox#2\egroup\noexpand\end\gobble verbatim}% % We really want {...\end verbatim} in the body of the macro, but % without the active space; thus we have to use \xdef and \gobble. + % The \egroup ends the \verbbox started at the end of the last line in + % the block. \endgroup % \envdef\verbatim{% - \setupverbatim\doverbatim + \setnormaldispenv\setupverbatim\doverbatim } \let\Everbatim = \afterenvbreak @@ -7529,7 +7684,7 @@ might help (with 'rm \jobname.?? \jobname.??s')% \wlog{texinfo.tex: doing @verbatiminclude of #1^^J}% \edef\tmp{\noexpand\input #1 } \expandafter - }\tmp + }\expandafter\starttabbox\tmp\egroup \afterenvbreak }% } @@ -7658,7 +7813,7 @@ might help (with 'rm \jobname.?? \jobname.??s')% % @deftypefnnewline on|off says whether the return type of typed functions % are printed on their own line. This affects @deftypefn, @deftypefun, % @deftypeop, and @deftypemethod. -% +% \parseargdef\deftypefnnewline{% \def\temp{#1}% \ifx\temp\onword @@ -7677,8 +7832,8 @@ might help (with 'rm \jobname.?? \jobname.??s')% % \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 +% (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}% @@ -7853,7 +8008,7 @@ might help (with 'rm \jobname.?? \jobname.??s')% \tclose{\temp}% typeset the return type \ifrettypeownline % put return type on its own line; prohibit line break following: - \hfil\vadjust{\nobreak}\break + \hfil\vadjust{\nobreak}\break \else \space % type on same line, so just followed by a space \fi @@ -8000,7 +8155,7 @@ might help (with 'rm \jobname.?? \jobname.??s')% \scantokens{#1@comment}% % % The \comment is to remove the \newlinechar added by \scantokens, and - % can be noticed by \parsearg. Note \c isn't used because this means cedilla + % can be noticed by \parsearg. Note \c isn't used because this means cedilla % in math mode. } @@ -8201,7 +8356,7 @@ might help (with 'rm \jobname.?? \jobname.??s')% % list to some hook where the argument is to be expanded. If there are % less than 10 arguments that hook is to be replaced by ##N where N % is the position in that list, that is to say the macro arguments are to be -% defined `a la TeX in the macro body. +% defined `a la TeX in the macro body. % % That gets used by \mbodybackslash (above). % @@ -8232,8 +8387,8 @@ might help (with 'rm \jobname.?? \jobname.??s')% % % Read recursive and nonrecursive macro bodies. (They're different since % rec and nonrec macros end differently.) -% -% We are in \macrobodyctxt, and the \xdef causes backslashshes in the macro +% +% 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. % @@ -8267,7 +8422,7 @@ might help (with 'rm \jobname.?? \jobname.??s')% % twice the \macarg.BLAH macros does not cost too much processing power. \def\parsemmanyargdef@@#1,{% \if#1;\let\next=\relax - \else + \else \let\next=\parsemmanyargdef@@ \edef\tempb{\eatspaces{#1}}% \expandafter\def\expandafter\tempa @@ -8352,7 +8507,7 @@ might help (with 'rm \jobname.?? \jobname.??s')% % Replace arguments by their values in the macro body, and place the result % in macro \@tempa. -% +% \def\macvalstoargs@{% % To do this we use the property that token registers that are \the'ed % within an \edef expand only once. So we are going to place all argument @@ -8376,9 +8531,9 @@ might help (with 'rm \jobname.?? \jobname.??s')% \expandafter\def\expandafter\@tempa\expandafter{\@tempc}% } -% Define the named-macro outside of this group and then close this group. -% -\def\macargexpandinbody@{% +% Define the named-macro outside of this group and then close this group. +% +\def\macargexpandinbody@{% \expandafter \endgroup \macargdeflist@ @@ -8416,7 +8571,7 @@ might help (with 'rm \jobname.?? \jobname.??s')% } % Trailing missing arguments are set to empty. -% +% \def\setemptyargvalues@{% \ifx\paramlist\nilm@ \let\next\macargexpandinbody@ @@ -8493,7 +8648,7 @@ might help (with 'rm \jobname.?? \jobname.??s')% \else % at most 9 \ifnum\paramno<10\relax % @MACNAME sets the context for reading the macro argument - % @MACNAME@@ gets the argument, processes backslashes and appends a + % @MACNAME@@ gets the argument, processes backslashes and appends a % comma. % @MACNAME@@@ removes braces surrounding the argument list. % @MACNAME@@@@ scans the macro body with arguments substituted. @@ -8537,11 +8692,11 @@ might help (with 'rm \jobname.?? \jobname.??s')% % Call #1 with a list of tokens #2, with any doubled backslashes in #2 % compressed to one. % -% This implementation works by expansion, and not execution (so we cannot use -% \def or similar). This reduces the risk of this failing in contexts where -% complete expansion is done with no execution (for example, in writing out to +% This implementation works by expansion, and not execution (so we cannot use +% \def or similar). This reduces the risk of this failing in contexts where +% complete expansion is done with no execution (for example, in writing out to % an auxiliary file for an index entry). -% +% % State is kept in the input stream: the argument passed to % @look_ahead, @gobble_and_check_finish and @add_segment is % @@ -8563,11 +8718,11 @@ might help (with 'rm \jobname.?? \jobname.??s')% % #3 - NEXT_TOKEN % #4 used to look ahead % -% If the next token is not a backslash, process the rest of the argument; +% If the next token is not a backslash, process the rest of the argument; % otherwise, remove the next token. @gdef@look_ahead#1!#2#3#4{% @ifx#4\% - @expandafter@gobble_and_check_finish + @expandafter@gobble_and_check_finish @else @expandafter@add_segment @fi#1!{#2}#4#4% @@ -8591,9 +8746,9 @@ might help (with 'rm \jobname.?? \jobname.??s')% % #3 - NEXT_TOKEN % #4 is input stream until next backslash % -% Input stream is either at the start of the argument, or just after a -% backslash sequence, either a lone backslash, or a doubled backslash. -% NEXT_TOKEN contains the first token in the input stream: if it is \finish, +% Input stream is either at the start of the argument, or just after a +% backslash sequence, either a lone backslash, or a doubled backslash. +% NEXT_TOKEN contains the first token in the input stream: if it is \finish, % finish; otherwise, append to ARG_RESULT the segment of the argument up until % the next backslash. PENDING_BACKSLASH contains a backslash to represent % a backslash just before the start of the input stream that has not been @@ -8605,13 +8760,13 @@ might help (with 'rm \jobname.?? \jobname.??s')% % append the pending backslash to the result, followed by the next segment @expandafter@is_fi@look_ahead#1#2#4!{\}@fi % this @fi is discarded by @look_ahead. - % we can't get rid of it with \expandafter because we don't know how + % we can't get rid of it with \expandafter because we don't know how % long #4 is. } % #1 - THE_MACRO % #2 - ARG_RESULT -% #3 discards the res of the conditional in @add_segment, and @is_fi ends the +% #3 discards the res of the conditional in @add_segment, and @is_fi ends the % conditional. @gdef@call_the_macro#1#2!#3@fi{@is_fi #1{#2}} @@ -8623,7 +8778,7 @@ might help (with 'rm \jobname.?? \jobname.??s')% % for reading the argument (slightly different in the two cases). Then, % to read the argument, in the whole-line case, it then calls the regular % \parsearg MAC; in the lbrace case, it calls \passargtomacro MAC. -% +% \def\braceorline#1{\let\macnamexxx=#1\futurelet\nchar\braceorlinexxx} \def\braceorlinexxx{% \ifx\nchar\bgroup @@ -8677,7 +8832,7 @@ might help (with 'rm \jobname.?? \jobname.??s')% % Used so that the @top node doesn't have to be wrapped in an @ifnottex % conditional. -% \doignore goes to more effort to skip nested conditionals but we don't need +% \doignore goes to more effort to skip nested conditionals but we don't need % that here. \def\omittopnode{% \ifx\lastnode\wordTop @@ -8685,7 +8840,7 @@ might help (with 'rm \jobname.?? \jobname.??s')% } \def\wordTop{Top} -% Until the next @node or @bye command, divert output to a box that is not +% Until the next @node or @bye command, divert output to a box that is not % output. \def\ignorenode{\setbox\dummybox\vbox\bgroup\def\node{\egroup\node}% \ignorenodebye @@ -8752,7 +8907,7 @@ might help (with 'rm \jobname.?? \jobname.??s')% % automatically in xrefs, if the third arg is not explicitly specified. % This was provided as a "secret" @set xref-automatic-section-title % variable, now it's official. -% +% \parseargdef\xrefautomaticsectiontitle{% \def\temp{#1}% \ifx\temp\onword @@ -8768,7 +8923,7 @@ might help (with 'rm \jobname.?? \jobname.??s')% \fi\fi } -% +% % @xref, @pxref, and @ref generate cross-references. For \xrefX, #1 is % the node name, #2 the name of the Info cross-reference, #3 the printed % node name, #4 the name of the Info file, #5 the name of the printed @@ -8921,40 +9076,34 @@ might help (with 'rm \jobname.?? \jobname.??s')% \fi \else % node/anchor (non-float) references. - % + % % If we use \unhbox to print the node names, TeX does not insert % empty discretionaries after hyphens, which means that it will not % find a line break at a hyphen in a node names. Since some manuals % are best written with fairly long node names, containing hyphens, % this is a loss. Therefore, we give the text of the node name % again, so it is as if TeX is seeing it for the first time. - % + % \ifdim \wd\printedmanualbox > 0pt % Cross-manual reference with a printed manual name. - % + % \crossmanualxref{\cite{\printedmanual\unskip}}% % \else\ifdim \wd\infofilenamebox > 0pt % Cross-manual reference with only an info filename (arg 4), no % printed manual name (arg 5). This is essentially the same as % the case above; we output the filename, since we have nothing else. - % + % \crossmanualxref{\code{\infofilename\unskip}}% % \else % Reference within this manual. % - % _ (for example) has to be the character _ for the purposes of the - % control sequence corresponding to the node, but it has to expand - % into the usual \leavevmode...\vrule stuff for purposes of - % printing. So we \turnoffactive for the \refx-snt, back on for the - % printing, back off for the \refx-pg. - {\turnoffactive - % Only output a following space if the -snt ref is nonempty; for - % @unnumbered and @anchor, it won't be. - \setbox2 = \hbox{\ignorespaces \refx{#1-snt}{}}% - \ifdim \wd2 > 0pt \refx{#1-snt}\space\fi - }% + % Only output a following space if the -snt ref is nonempty; for + % @unnumbered and @anchor, it won't be. + \setbox2 = \hbox{\ignorespaces \refx{#1-snt}{}}% + \ifdim \wd2 > 0pt \refx{#1-snt}\space\fi + % % output the `[mynode]' via the macro below so it can be overridden. \xrefprintnodename\printedrefname % @@ -8978,20 +9127,20 @@ might help (with 'rm \jobname.?? \jobname.??s')% \endgroup} % Output a cross-manual xref to #1. Used just above (twice). -% +% % Only include the text "Section ``foo'' in" if the foo is neither % missing or Top. Thus, @xref{,,,foo,The Foo Manual} outputs simply % "see The Foo Manual", the idea being to refer to the whole manual. -% +% % But, this being TeX, we can't easily compare our node name against the % string "Top" while ignoring the possible spaces before and after in % the input. By adding the arbitrary 7sp below, we make it much less % likely that a real node name would have the same width as "Top" (e.g., % in a monospaced font). Hopefully it will never happen in practice. -% +% % For the same basic reason, we retypeset the "Top" at every % reference, since the current font is indeterminate. -% +% \def\crossmanualxref#1{% \setbox\toprefbox = \hbox{Top\kern7sp}% \setbox2 = \hbox{\ignorespaces \printedrefname \unskip \kern7sp}% @@ -9038,13 +9187,13 @@ might help (with 'rm \jobname.?? \jobname.??s')% \fi\fi\fi } -% \refx{NAME}{SUFFIX} - reference a cross-reference string named NAME. SUFFIX +% \refx{NAME}{SUFFIX} - reference a cross-reference string named NAME. SUFFIX % is output afterwards if non-empty. \def\refx#1#2{% \requireauxfile {% \indexnofonts - \otherbackslash + \turnoffactive \def\value##1{##1}% \expandafter\global\expandafter\let\expandafter\thisrefX \csname XR#1\endcsname @@ -9070,9 +9219,9 @@ might help (with 'rm \jobname.?? \jobname.??s')% #2% Output the suffix in any case. } -% This is the macro invoked by entries in the aux file. Define a control -% sequence for a cross-reference target (we prepend XR to the control sequence -% name to avoid collisions). The value is the page number. If this is a float +% This is the macro invoked by entries in the aux file. Define a control +% sequence for a cross-reference target (we prepend XR to the control sequence +% name to avoid collisions). The value is the page number. If this is a float % type, we have more work to do. % \def\xrdef#1#2{% @@ -9088,10 +9237,10 @@ might help (with 'rm \jobname.?? \jobname.??s')% \bgroup \expandafter\gdef\csname XR\safexrefname\endcsname{#2}% \egroup - % We put the \gdef inside a group to avoid the definitions building up on - % TeX's save stack, which can cause it to run out of space for aux files with + % We put the \gdef inside a group to avoid the definitions building up on + % TeX's save stack, which can cause it to run out of space for aux files with % thousands of lines. \gdef doesn't use the save stack, but \csname does - % when it defines an unknown control sequence as \relax. + % when it defines an unknown control sequence as \relax. % % Was that xref control sequence that we just defined for a float? \expandafter\iffloat\csname XR\safexrefname\endcsname @@ -9450,7 +9599,7 @@ might help (with 'rm \jobname.?? \jobname.??s')% % \ifimagevmode \medskip % space after a standalone image - \fi + \fi \ifx\centersub\centerV \egroup \fi \endgroup} @@ -10281,7 +10430,7 @@ directory should work if nowhere else does.} \uppercase{.} \endgroup \else - \errhelp = \EMsimple + \errhelp = \EMsimple \errmessage{Unicode character U+#1 not supported, sorry}% \fi \else @@ -10314,7 +10463,7 @@ directory should work if nowhere else does.} \countUTFz = "#1\relax \begingroup \parseXMLCharref - + % Give \u8:... its definition. The sequence of seven \expandafter's % expands after the \gdef three times, e.g. % @@ -10326,7 +10475,7 @@ directory should work if nowhere else does.} \expandafter\expandafter \expandafter\expandafter \expandafter\gdef \UTFviiiTmp{#2}% - % + % \expandafter\ifx\csname uni:#1\endcsname \relax \else \message{Internal error, already defined: #1}% \fi @@ -10365,7 +10514,7 @@ directory should work if nowhere else does.} \divide\countUTFz by 64 \countUTFy = \countUTFz % Save to be the future value of \countUTFz. \multiply\countUTFz by 64 - + % \countUTFz is now \countUTFx with the last 5 bits cleared. Subtract % in order to get the last five bits. \advance\countUTFx by -\countUTFz @@ -10400,7 +10549,7 @@ directory should work if nowhere else does.} % U+0080..U+00FF = https://en.wikipedia.org/wiki/Latin-1_Supplement_(Unicode_block) % U+0100..U+017F = https://en.wikipedia.org/wiki/Latin_Extended-A % U+0180..U+024F = https://en.wikipedia.org/wiki/Latin_Extended-B -% +% % Many of our renditions are less than wonderful, and all the missing % characters are available somewhere. Loading the necessary fonts % awaits user request. We can't truly support Unicode without @@ -10701,6 +10850,8 @@ directory should work if nowhere else does.} \DeclareUnicodeCharacter{0233}{\=y}% \DeclareUnicodeCharacter{0237}{\dotless{j}}% % + \DeclareUnicodeCharacter{02BC}{'}% + % \DeclareUnicodeCharacter{02DB}{\ogonek{ }}% % % Greek letters upper case @@ -11335,6 +11486,18 @@ directory should work if nowhere else does.} \globaldefs = 0 }} +\def\bsixpaper{{\globaldefs = 1 + \afourpaper + \internalpagesizes{140mm}{100mm}% + {-6.35mm}{-12.7mm}% + {\bindingoffset}{14pt}% + {176mm}{125mm}% + \let\SETdispenvsize=\smallword + \lispnarrowing = 0.2in + \globaldefs = 0 +}} + + % @pagesizes TEXTHEIGHT[,TEXTWIDTH] % Perhaps we should allow setting the margins, \topskip, \parskip, % and/or leading, also. Or perhaps we should compute them somehow. @@ -11348,12 +11511,12 @@ directory should work if nowhere else does.} \setleading{\textleading}% % \dimen0 = #1\relax - \advance\dimen0 by \voffset - \advance\dimen0 by 1in % reference point for DVI is 1 inch from top of page + \advance\dimen0 by 2.5in % default 1in margin above heading line + % and 1.5in to include heading, footing and + % bottom margin % \dimen2 = \hsize - \advance\dimen2 by \normaloffset - \advance\dimen2 by 1in % reference point is 1 inch from left edge of page + \advance\dimen2 by 2in % default to 1 inch margin on each side % \internalpagesizes{#1}{\hsize}% {\voffset}{\normaloffset}% @@ -11438,9 +11601,9 @@ directory should work if nowhere else does.} \def\texinfochars{% \let< = \activeless \let> = \activegtr - \let~ = \activetilde + \let~ = \activetilde \let^ = \activehat - \markupsetuplqdefault \markupsetuprqdefault + \markupsetuplqdefault \markupsetuprqdefault \let\b = \strong \let\i = \smartitalic % in principle, all other definitions in \tex have to be undone too. diff --git a/build-aux/update-copyright b/build-aux/update-copyright index b3f6b29..d9b7f68 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-2019 Free Software Foundation, Inc. +# Copyright (C) 2009-2020 Free Software Foundation, Inc. # # This program is free software: you can redistribute it and/or modify # it under the terms of the GNU General Public License as published by @@ -98,7 +98,7 @@ # 6. Blank lines, even if preceded by the prefix, do not appear # within the FSF copyright statement. # 7. Each copyright year is 2 or 4 digits, and years are separated by -# commas or dashes. Whitespace may appear after commas. +# commas, "-", or "--". Whitespace may appear after commas. # # Environment variables: # @@ -133,11 +133,11 @@ # are valid code in both sh and perl. When executed by sh, they re-execute # the script through the perl program found in $PATH. The '-x' option # is essential as well; without it, perl would re-execute the script -# through /bin/sh. When executed by perl, the next two lines are a no-op. +# through /bin/sh. When executed by perl, the next two lines are a no-op. eval 'exec perl -wSx -0777 -pi "$0" "$@"' if 0; -my $VERSION = '2018-03-07.03:47'; # UTC +my $VERSION = '2020-04-04.15:07'; # 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 @@ -192,7 +192,7 @@ while (/(^|\n)(.{0,$prefix_max})$copyright_re/g) $holder_re =~ s/\s/$ws_re/g; my $stmt_remainder_re = "(?:$ws_re$circle_c_re)?" - . "$ws_re(?:(?:\\d\\d)?\\d\\d(?:,$ws_re?|-))*" + . "$ws_re(?:(?:\\d\\d)?\\d\\d(?:,$ws_re?|--?))*" . "((?:\\d\\d)?\\d\\d)$ws_re$holder_re"; if (/\G$stmt_remainder_re/) { @@ -231,26 +231,28 @@ if (defined $stmt_re) # Make the use of intervals consistent. if (!$ENV{UPDATE_COPYRIGHT_USE_INTERVALS}) { - $stmt =~ s/(\d{4})-(\d{4})/join(', ', $1..$2)/eg; + $stmt =~ s/(\d{4})--?(\d{4})/join(', ', $1..$2)/eg; } else { + my $ndash = $ARGV =~ /\.tex(i(nfo)?)?$/ ? "--" : "-"; + $stmt =~ s/ (\d{4}) (?: - (,\ |-) + (,\ |--?) ((??{ - if ($2 eq '-') { '\d{4}'; } + if ($2 ne ', ') { '\d{4}'; } elsif (!$3) { $1 + 1; } else { $3 + 1; } })) )+ - /$1-$3/gx; + /$1$ndash$3/gx; # When it's 2, emit a single range encompassing all year numbers. $ENV{UPDATE_COPYRIGHT_USE_INTERVALS} == 2 - and $stmt =~ s/\b(\d{4})\b.*\b(\d{4})\b/$1-$2/; + and $stmt =~ s/\b(\d{4})\b.*\b(\d{4})\b/$1$ndash$2/; } # Format within margin. diff --git a/build-aux/useless-if-before-free b/build-aux/useless-if-before-free index 6ac8aa9..c9a168f 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-2019 Free Software Foundation, Inc. +# Copyright (C) 2008-2020 Free Software Foundation, Inc. # # This program is free software: you can redistribute it and/or modify # it under the terms of the GNU General Public License as published by @@ -32,11 +32,11 @@ # are valid code in both sh and perl. When executed by sh, they re-execute # the script through the perl program found in $PATH. The '-x' option # is essential as well; without it, perl would re-execute the script -# through /bin/sh. When executed by perl, the next two lines are a no-op. +# through /bin/sh. When executed by perl, the next two lines are a no-op. eval 'exec perl -wSx "$0" "$@"' if 0; -my $VERSION = '2018-03-07 03:47'; # UTC +my $VERSION = '2020-04-04 15:07'; # 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 diff --git a/build-aux/vc-list-files b/build-aux/vc-list-files index af6b1c0..a8b8d9a 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-2019 Free Software Foundation, Inc. +# Copyright (C) 2006-2020 Free Software Foundation, Inc. # This 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 @@ scriptversion=2018-03-07.03; # UTC # list the version-controlled files in that directory. # If there's an argument, it must be a single, "."-relative directory name. -# cvsu is part of the cvsutils package: http://www.red-bean.com/cvsutils/ +# cvsu is part of the cvsutils package: https://www.red-bean.com/cvsutils/ postprocess= case $1 in diff --git a/cfg.mk b/cfg.mk index 62f84fe..8ad45e4 100644 --- a/cfg.mk +++ b/cfg.mk @@ -1,5 +1,5 @@ # Customize maint.mk -*- makefile -*- -# Copyright (C) 2003-2014, 2019 Free Software Foundation, Inc. +# Copyright (C) 2003-2014, 2019-2021 Free Software Foundation, Inc. # This 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 = 662c01eb5a757da59d219a79c06d6495 +old_NEWS_hash = 048e0facc662623870b9eea4e160c3ad include $(srcdir)/dist-check.mk @@ -59,6 +59,10 @@ update-copyright-env = \ UPDATE_COPYRIGHT_USE_INTERVALS=1 \ UPDATE_COPYRIGHT_MAX_LINE_LENGTH=79 +# Override submodule check to allow workaround for broken gnulib upstream +submodule-checks = no-submodule-changes +gl_public_submodule_commit= + #==> .j/.x-sc_GPL_version <== #build-aux/vc-list-files diff --git a/configure b/configure index d6a2521..214dbaa 100755 --- a/configure +++ b/configure @@ -1,6 +1,6 @@ #! /bin/sh # Guess values for system-dependent variables and create Makefiles. -# Generated by GNU Autoconf 2.69 for GNU parted 3.3. +# Generated by GNU Autoconf 2.69 for GNU parted 3.4. # # Report bugs to . # @@ -590,8 +590,8 @@ MAKEFLAGS= # Identity of this package. PACKAGE_NAME='GNU parted' PACKAGE_TARNAME='parted' -PACKAGE_VERSION='3.3' -PACKAGE_STRING='GNU parted 3.3' +PACKAGE_VERSION='3.4' +PACKAGE_STRING='GNU parted 3.4' PACKAGE_BUGREPORT='bug-parted@gnu.org' PACKAGE_URL='http://www.gnu.org/software/parted/' @@ -661,7 +661,6 @@ COMPILE_FOR_S390_TRUE INTLINCS OS_LIBS PARTED_LIBS -SELINUX_LIBS DM_LIBS UUID_LIBS POSUB @@ -705,11 +704,9 @@ NEXT_SYS_UIO_H NEXT_AS_FIRST_DIRECTIVE_SYS_IOCTL_H NEXT_SYS_IOCTL_H HAVE_SYS_IOCTL_H -GL_GENERATE_STDALIGN_H_FALSE -GL_GENERATE_STDALIGN_H_TRUE -STDALIGN_H NEXT_AS_FIRST_DIRECTIVE_SIGNAL_H NEXT_SIGNAL_H +LIB_SETLOCALE HAVE_STRUCT_SCHED_PARAM HAVE_SCHED_H NEXT_AS_FIRST_DIRECTIVE_SCHED_H @@ -871,8 +868,16 @@ REPLACE_PSELECT HAVE_PSELECT GNULIB_SELECT GNULIB_PSELECT +LIB_SEMAPHORE INTL_MACOSX_LIBS INET_PTON_LIB +NEXT_AS_FIRST_DIRECTIVE_SYS_TIME_H +NEXT_SYS_TIME_H +REPLACE_STRUCT_TIMEVAL +REPLACE_GETTIMEOFDAY +HAVE_SYS_TIME_H +HAVE_STRUCT_TIMEVAL +HAVE_GETTIMEOFDAY NEXT_AS_FIRST_DIRECTIVE_CTYPE_H NEXT_CTYPE_H HAVE_ISBLANK @@ -917,6 +922,8 @@ HAVE_WCTYPE_H NEXT_AS_FIRST_DIRECTIVE_WCTYPE_H NEXT_WCTYPE_H HAVE_ISWCNTRL +REPLACE_ISWXDIGIT +REPLACE_ISWDIGIT REPLACE_ISWBLANK HAVE_WCTRANS_T HAVE_WCTYPE_T @@ -925,6 +932,8 @@ GNULIB_TOWCTRANS GNULIB_WCTRANS GNULIB_ISWCTYPE GNULIB_WCTYPE +GNULIB_ISWXDIGIT +GNULIB_ISWDIGIT GNULIB_ISWBLANK HAVE_CRTDEFS_H HAVE_WINT_T @@ -940,10 +949,39 @@ SYS_TIME_H_DEFINES_STRUCT_TIMESPEC TIME_H_DEFINES_STRUCT_TIMESPEC NEXT_AS_FIRST_DIRECTIVE_TIME_H NEXT_TIME_H +REPLACE_LOCALTIME +REPLACE_GMTIME +GNULIB_GETTIMEOFDAY +REPLACE_TZSET +REPLACE_TIMEGM +REPLACE_STRFTIME +REPLACE_NANOSLEEP +REPLACE_MKTIME +REPLACE_LOCALTIME_R +REPLACE_CTIME +HAVE_TIMEZONE_T +HAVE_TIMEGM +HAVE_STRPTIME +HAVE_NANOSLEEP +HAVE_DECL_LOCALTIME_R +GNULIB_TZSET +GNULIB_TIME_RZ +GNULIB_TIME_R +GNULIB_TIMEGM +GNULIB_STRPTIME +GNULIB_STRFTIME +GNULIB_NANOSLEEP +GNULIB_LOCALTIME +GNULIB_MKTIME +GNULIB_CTIME +HAVE_SYS_RANDOM_H +NEXT_AS_FIRST_DIRECTIVE_SYS_RANDOM_H +NEXT_SYS_RANDOM_H NEXT_AS_FIRST_DIRECTIVE_STRING_H NEXT_STRING_H UNDEFINE_STRTOK_R REPLACE_STRSIGNAL +REPLACE_STRERRORNAME_NP REPLACE_STRERROR_R REPLACE_STRERROR REPLACE_STRTOK_R @@ -959,6 +997,9 @@ REPLACE_MEMMEM REPLACE_MEMCHR HAVE_STRVERSCMP HAVE_DECL_STRSIGNAL +HAVE_SIGDESCR_NP +HAVE_SIGABBREV_NP +HAVE_STRERRORNAME_NP HAVE_DECL_STRERROR_R HAVE_DECL_STRTOK_R HAVE_STRCASESTR @@ -974,13 +1015,15 @@ HAVE_RAWMEMCHR HAVE_DECL_MEMRCHR HAVE_MEMPCPY HAVE_DECL_MEMMEM -HAVE_MEMCHR HAVE_FFSLL HAVE_FFSL HAVE_EXPLICIT_BZERO HAVE_MBSLEN GNULIB_STRVERSCMP GNULIB_STRSIGNAL +GNULIB_SIGDESCR_NP +GNULIB_SIGABBREV_NP +GNULIB_STRERRORNAME_NP GNULIB_STRERROR_R GNULIB_STRERROR GNULIB_MBSTOK_R @@ -1069,6 +1112,7 @@ HAVE_DECL_GETDELIM HAVE_DECL_FTELLO HAVE_DECL_FSEEKO HAVE_DECL_FPURGE +HAVE_DECL_FCLOSEALL GNULIB_VSPRINTF_POSIX GNULIB_VSNPRINTF GNULIB_VPRINTF_POSIX @@ -1131,9 +1175,16 @@ 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 GLIBC21 -LOCALE_FR_UTF8 +LIB_NL_LANGINFO +HAVE_VISIBILITY +CFLAG_VISIBILITY +LIB_MBRTOWC LOCALE_ZH_CN +LOCALE_FR_UTF8 LOCALE_JA SED WINDOWS_STAT_INODES @@ -1144,6 +1195,7 @@ LTLIBMULTITHREAD LIBMULTITHREAD LTLIBTHREAD LIBTHREAD +LIBSTDTHREAD NEXT_AS_FIRST_DIRECTIVE_LOCALE_H NEXT_LOCALE_H HAVE_XLOCALE_H @@ -1166,6 +1218,7 @@ HAVE_DUPLOCALE HAVE_NEWLOCALE GNULIB_LOCALENAME GNULIB_DUPLOCALE +GNULIB_SETLOCALE_NULL GNULIB_SETLOCALE GNULIB_LOCALECONV LOCALCHARSET_TESTS_ENVIRONMENT @@ -1186,7 +1239,6 @@ NEXT_INTTYPES_H UINT64_MAX_EQ_ULONG_MAX UINT32_MAX_LT_UINTMAX_MAX PRIPTR_PREFIX -PRI_MACROS_BROKEN INT64_MAX_EQ_LONG_MAX INT32_MAX_LT_INTMAX_MAX REPLACE_STRTOUMAX @@ -1226,49 +1278,23 @@ NEXT_STDINT_H HAVE_SYS_TYPES_H HAVE_INTTYPES_H HAVE_WCHAR_H -HAVE_UNSIGNED_LONG_LONG_INT -HAVE_LONG_LONG_INT GNULIB_OVERRIDES_WINT_T GL_GENERATE_LIMITS_H_FALSE GL_GENERATE_LIMITS_H_TRUE LIMITS_H NEXT_AS_FIRST_DIRECTIVE_LIMITS_H NEXT_LIMITS_H -REPLACE_LOCALTIME -REPLACE_GMTIME -REPLACE_TZSET -REPLACE_TIMEGM -REPLACE_STRFTIME -REPLACE_NANOSLEEP -REPLACE_MKTIME -REPLACE_LOCALTIME_R -REPLACE_CTIME -HAVE_TIMEZONE_T -HAVE_TZSET -HAVE_TIMEGM -HAVE_STRPTIME -HAVE_NANOSLEEP -HAVE_DECL_LOCALTIME_R -GNULIB_TZSET -GNULIB_TIME_RZ -GNULIB_TIME_R -GNULIB_TIMEGM -GNULIB_STRPTIME -GNULIB_STRFTIME -GNULIB_NANOSLEEP -GNULIB_LOCALTIME -GNULIB_MKTIME -GNULIB_CTIME -NEXT_AS_FIRST_DIRECTIVE_SYS_TIME_H -NEXT_SYS_TIME_H -REPLACE_STRUCT_TIMEVAL -REPLACE_GETTIMEOFDAY -HAVE_SYS_TIME_H -HAVE_STRUCT_TIMEVAL -HAVE_GETTIMEOFDAY -GNULIB_GETTIMEOFDAY +LIB_HARD_LOCALE +LIB_SETLOCALE_NULL +LIB_SCHED_YIELD +LIBPMULTITHREAD +LIBPTHREAD LTLIBINTL LIBINTL +LIB_GETRANDOM +REPLACE_GETRANDOM +HAVE_GETRANDOM +GNULIB_GETRANDOM GNULIB_GL_UNISTD_H_GETOPT GETOPT_CDEFS_H GETOPT_H @@ -1289,6 +1315,7 @@ REPLACE_LSTAT REPLACE_FUTIMENS REPLACE_FSTATAT REPLACE_FSTAT +REPLACE_FCHMODAT HAVE_UTIMENSAT HAVE_MKNODAT HAVE_MKNOD @@ -1297,6 +1324,7 @@ HAVE_MKFIFO HAVE_MKDIRAT HAVE_LSTAT HAVE_LCHMOD +HAVE_GETUMASK HAVE_FUTIMENS HAVE_FSTATAT HAVE_FCHMODAT @@ -1310,6 +1338,7 @@ GNULIB_MKFIFO GNULIB_MKDIRAT GNULIB_LSTAT GNULIB_LCHMOD +GNULIB_GETUMASK GNULIB_FUTIMENS GNULIB_FSTATAT GNULIB_FSTAT @@ -1319,12 +1348,14 @@ NEXT_FCNTL_H REPLACE_OPENAT REPLACE_OPEN REPLACE_FCNTL +REPLACE_CREAT HAVE_OPENAT HAVE_FCNTL GNULIB_OPENAT GNULIB_OPEN GNULIB_NONBLOCKING GNULIB_FCNTL +GNULIB_CREAT EOVERFLOW_VALUE EOVERFLOW_HIDDEN ENOLINK_VALUE @@ -1351,6 +1382,7 @@ GNULIB_IOCTL HAVE_MSVC_INVALID_PARAMETER_HANDLER UNISTD_H_HAVE_WINSOCK2_H_AND_USE_SOCKETS UNISTD_H_HAVE_WINSOCK2_H +UNISTD_H_HAVE_SYS_RANDOM_H REPLACE_WRITE REPLACE_USLEEP REPLACE_UNLINKAT @@ -1385,6 +1417,7 @@ REPLACE_DUP2 REPLACE_DUP REPLACE_CLOSE REPLACE_CHOWN +REPLACE_ACCESS HAVE_SYS_PARAM_H HAVE_OS_H HAVE_DECL_TTYNAME_R @@ -1397,6 +1430,7 @@ HAVE_DECL_GETLOGIN HAVE_DECL_GETDOMAINNAME HAVE_DECL_FDATASYNC HAVE_DECL_FCHDIR +HAVE_DECL_EXECVPE HAVE_DECL_ENVIRON HAVE_USLEEP HAVE_UNLINKAT @@ -1419,6 +1453,7 @@ HAVE_GETPAGESIZE HAVE_GETLOGIN HAVE_GETHOSTNAME HAVE_GETGROUPS +HAVE_GETENTROPY HAVE_GETDTABLESIZE HAVE_FTRUNCATE HAVE_FSYNC @@ -1428,7 +1463,6 @@ HAVE_FCHDIR HAVE_FACCESSAT HAVE_EUIDACCESS HAVE_DUP3 -HAVE_DUP2 HAVE_COPY_FILE_RANGE HAVE_CHOWN GNULIB_WRITE @@ -1460,10 +1494,12 @@ GNULIB_GROUP_MEMBER GNULIB_GETUSERSHELL GNULIB_GETPASS GNULIB_GETPAGESIZE +GNULIB_GETOPT_POSIX GNULIB_GETLOGIN_R GNULIB_GETLOGIN GNULIB_GETHOSTNAME GNULIB_GETGROUPS +GNULIB_GETENTROPY GNULIB_GETDTABLESIZE GNULIB_GETDOMAINNAME GNULIB_GETCWD @@ -1482,6 +1518,8 @@ GNULIB_COPY_FILE_RANGE GNULIB_CLOSE GNULIB_CHOWN GNULIB_CHDIR +GNULIB_ACCESS +LIB_CLOCK_GETTIME REPLACE_WCTOMB REPLACE_UNSETENV REPLACE_STRTOLD @@ -1496,12 +1534,14 @@ REPLACE_QSORT_R REPLACE_PUTENV REPLACE_PTSNAME_R REPLACE_PTSNAME +REPLACE_POSIX_MEMALIGN REPLACE_MKSTEMP REPLACE_MBTOWC REPLACE_MALLOC REPLACE_INITSTATE REPLACE_CANONICALIZE_FILE_NAME REPLACE_CALLOC +REPLACE_ALIGNED_ALLOC HAVE_DECL_UNSETENV HAVE_UNLOCKPT HAVE_SYS_LOADAVG_H @@ -1525,6 +1565,7 @@ HAVE_QSORT_R HAVE_PTSNAME_R HAVE_PTSNAME HAVE_POSIX_OPENPT +HAVE_POSIX_MEMALIGN HAVE_MKSTEMPS HAVE_MKSTEMP HAVE_MKOSTEMPS @@ -1536,8 +1577,12 @@ HAVE_INITSTATE HAVE_GRANTPT HAVE_GETSUBOPT HAVE_DECL_GETLOADAVG +HAVE_DECL_GCVT +HAVE_DECL_FCVT +HAVE_DECL_ECVT HAVE_CANONICALIZE_FILE_NAME HAVE_ATOLL +HAVE_ALIGNED_ALLOC HAVE__EXIT GNULIB_WCTOMB GNULIB_UNSETENV @@ -1560,6 +1605,7 @@ GNULIB_PUTENV GNULIB_PTSNAME_R GNULIB_PTSNAME GNULIB_POSIX_OPENPT +GNULIB_POSIX_MEMALIGN GNULIB_MKSTEMPS GNULIB_MKSTEMP GNULIB_MKOSTEMPS @@ -1573,8 +1619,10 @@ GNULIB_GETLOADAVG GNULIB_CANONICALIZE_FILE_NAME GNULIB_CALLOC_POSIX GNULIB_ATOLL +GNULIB_ALIGNED_ALLOC GNULIB__EXIT LOCALE_FR +REPLACE_WCSTOK REPLACE_WCSFTIME REPLACE_WCSWIDTH REPLACE_WCWIDTH @@ -1590,6 +1638,7 @@ REPLACE_WCTOB REPLACE_BTOWC REPLACE_MBSTATE_T HAVE_DECL_WCWIDTH +HAVE_DECL_WCSDUP HAVE_DECL_WCTOB HAVE_WCSFTIME HAVE_WCSWIDTH @@ -1616,6 +1665,7 @@ HAVE_WCSCPY HAVE_WCSNLEN HAVE_WCSLEN HAVE_WMEMSET +HAVE_WMEMPCPY HAVE_WMEMMOVE HAVE_WMEMCPY HAVE_WMEMCMP @@ -1654,6 +1704,7 @@ GNULIB_WCSCPY GNULIB_WCSNLEN GNULIB_WCSLEN GNULIB_WMEMSET +GNULIB_WMEMPCPY GNULIB_WMEMMOVE GNULIB_WMEMCPY GNULIB_WMEMCMP @@ -1788,7 +1839,6 @@ enable_silent_rules with_readline enable_mtrace enable_device_mapper -enable_selinux enable_discover_only enable_debug enable_read_only @@ -1797,6 +1847,7 @@ enable_hfs_extract_fs enable_dependency_tracking enable_largefile enable_threads +enable_cross_guesses enable_assert with_included_regex with_packager @@ -2371,7 +2422,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.3 to adapt to many kinds of systems. +\`configure' configures GNU parted 3.4 to adapt to many kinds of systems. Usage: $0 [OPTION]... [VAR=VALUE]... @@ -2441,7 +2492,7 @@ fi if test -n "$ac_init_help"; then case $ac_init_help in - short | recursive ) echo "Configuration of GNU parted 3.3:";; + short | recursive ) echo "Configuration of GNU parted 3.4:";; esac cat <<\_ACEOF @@ -2453,7 +2504,6 @@ Optional Features: --disable-silent-rules verbose build output (undo: "make V=0") --enable-mtrace enable malloc() debugging --enable-device-mapper enable device mapper support default=yes - --enable-selinux enable SELinux support default=no --enable-discover-only support only reading/probing default=no --enable-debug compile in assertions default=yes --enable-read-only disable writing (for debugging) default=no @@ -2465,9 +2515,11 @@ Optional Features: --disable-dependency-tracking speeds up one-time build --disable-largefile omit support for large files - --enable-threads={posix|windows} + --enable-threads={isoc|posix|isoc+posix|windows} specify multithreading API --disable-threads build without multithread safety + --enable-cross-guesses={conservative|risky} + specify policy for cross-compilation guesses --disable-assert turn off assertions --enable-gcc-warnings turn on lots of GCC warnings (for developers) --enable-shared[=PKGS] build shared libraries [default=yes] @@ -2498,7 +2550,7 @@ Optional Packages: --with-gnu-ld assume the C compiler uses GNU ld [default=no] --with-sysroot[=DIR] Search for dependent libraries within DIR (or the compiler's sysroot if not specified). - --with-gnu-ld assume the C compiler uses GNU ld [default=no] + --with-gnu-ld assume the C compiler uses GNU ld default=no --with-libiconv-prefix[=DIR] search for libiconv in DIR/include and DIR/lib --without-libiconv-prefix don't search for libiconv in includedir and libdir --with-libintl-prefix[=DIR] search for libintl in DIR/include and DIR/lib @@ -2592,7 +2644,7 @@ fi test -n "$ac_init_help" && exit $ac_status if $ac_init_version; then cat <<\_ACEOF -GNU parted configure 3.3 +GNU parted configure 3.4 generated by GNU Autoconf 2.69 Copyright (C) 2012 Free Software Foundation, Inc. @@ -3201,6 +3253,10 @@ rm -f conftest.val # accordingly. ac_fn_c_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/ *(.*//'` as_decl_use=`echo $2|sed -e 's/(/((/' -e 's/)/) 0&/' -e 's/,/) 0& (/g'` @@ -3238,6 +3294,7 @@ eval ac_res=\$$3 { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_res" >&5 $as_echo "$ac_res" >&6; } eval $as_lineno_stack; ${as_lineno_stack:+:} unset as_lineno + ac_compile="$ac_save_ac_compile" } # ac_fn_c_check_decl @@ -3301,7 +3358,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.3, which was +It was created by GNU parted $as_me 3.4, which was generated by GNU Autoconf 2.69. Invocation command line was $ $0 $@ @@ -3583,31 +3640,31 @@ fi as_fn_append ac_func_list " btowc" as_fn_append ac_func_list " canonicalize_file_name" -as_fn_append ac_func_list " getcwd" as_fn_append ac_func_list " readlink" as_fn_append ac_func_list " realpath" as_fn_append ac_header_list " sys/param.h" as_fn_append ac_func_list " _set_invalid_parameter_handler" as_fn_append ac_header_list " sys/socket.h" +as_fn_append ac_func_list " fcntl" as_fn_append ac_header_list " unistd.h" as_fn_append ac_func_list " symlink" as_fn_append ac_header_list " stdio_ext.h" as_fn_append ac_header_list " sys/stat.h" as_fn_append ac_func_list " fsync" +as_fn_append ac_func_list " getdtablesize" gl_getopt_required=GNU as_fn_append ac_header_list " getopt.h" as_fn_append ac_header_list " sys/cdefs.h" as_fn_append ac_func_list " getprogname" as_fn_append ac_func_list " getexecname" -as_fn_append ac_header_list " sys/time.h" -as_fn_append ac_func_list " gettimeofday" +as_fn_append ac_func_list " getrandom" +as_fn_append ac_header_list " threads.h" as_fn_append ac_header_list " limits.h" as_fn_append ac_header_list " wchar.h" as_fn_append ac_header_list " stdint.h" as_fn_append ac_header_list " inttypes.h" as_fn_append ac_header_list " langinfo.h" as_fn_append ac_header_list " xlocale.h" -as_fn_append ac_header_list " threads.h" as_fn_append ac_func_list " lstat" as_fn_append ac_func_list " mbsinit" as_fn_append ac_func_list " mbrtowc" @@ -3617,10 +3674,11 @@ as_fn_append ac_header_list " malloc.h" as_fn_append ac_func_list " isblank" as_fn_append ac_func_list " iswctype" as_fn_append ac_func_list " sleep" -as_fn_append ac_func_list " strdup" +as_fn_append ac_header_list " sys/time.h" as_fn_append ac_func_list " strerror_r" as_fn_append ac_func_list " __xpg_strerror_r" as_fn_append ac_func_list " strndup" +as_fn_append ac_header_list " sys/random.h" as_fn_append ac_func_list " usleep" as_fn_append ac_header_list " features.h" as_fn_append ac_header_list " crtdefs.h" @@ -3628,14 +3686,13 @@ as_fn_append ac_func_list " wcrtomb" as_fn_append ac_func_list " iswcntrl" as_fn_append ac_header_list " wctype.h" as_fn_append ac_header_list " arpa/inet.h" -as_fn_append ac_func_list " fcntl" as_fn_append ac_func_list " ftruncate" -as_fn_append ac_func_list " getdtablesize" +as_fn_append ac_func_list " gettimeofday" +as_fn_append ac_func_list " duplocale" as_fn_append ac_header_list " netdb.h" as_fn_append ac_header_list " netinet/in.h" as_fn_append ac_func_list " newlocale" as_fn_append ac_func_list " uselocale" -as_fn_append ac_func_list " duplocale" as_fn_append ac_func_list " freelocale" as_fn_append ac_header_list " semaphore.h" as_fn_append ac_header_list " sys/select.h" @@ -4277,7 +4334,7 @@ fi # Define the identity of the package. PACKAGE='parted' - VERSION='3.3' + VERSION='3.4' cat >>confdefs.h <<_ACEOF @@ -4526,15 +4583,6 @@ $as_echo "#define ENABLE_DEVICE_MAPPER 1" >>confdefs.h fi -# Check whether --enable-selinux was given. -if test "${enable_selinux+set}" = set; then : - enableval=$enable_selinux; -else - enable_selinux=no - -fi - - # Check whether --enable-discover-only was given. if test "${enable_discover_only+set}" = set; then : enableval=$enable_discover_only; @@ -5981,6 +6029,80 @@ ac_compile='$CC -c $CFLAGS $CPPFLAGS conftest.$ac_ext >&5' ac_link='$CC -o conftest$ac_exeext $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5' ac_compiler_gnu=$ac_cv_c_compiler_gnu + + { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether the compiler is clang" >&5 +$as_echo_n "checking whether the compiler is clang... " >&6; } +if ${gl_cv_compiler_clang+:} false; then : + $as_echo_n "(cached) " >&6 +else + cat confdefs.h - <<_ACEOF >conftest.$ac_ext +/* end confdefs.h. */ + + #ifdef __clang__ + barfbarf + #endif + +int +main () +{ + + ; + return 0; +} + +_ACEOF +if ac_fn_c_try_compile "$LINENO"; then : + gl_cv_compiler_clang=no +else + gl_cv_compiler_clang=yes +fi +rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext + +fi +{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $gl_cv_compiler_clang" >&5 +$as_echo "$gl_cv_compiler_clang" >&6; } + + + { $as_echo "$as_me:${as_lineno-$LINENO}: checking for compiler option needed when checking for declarations" >&5 +$as_echo_n "checking for compiler option needed when checking for declarations... " >&6; } +if ${gl_cv_compiler_check_decl_option+:} false; then : + $as_echo_n "(cached) " >&6 +else + if test $gl_cv_compiler_clang = yes; then + save_ac_compile="$ac_compile" + ac_compile="$ac_compile -Werror=implicit-function-declaration" + cat confdefs.h - <<_ACEOF >conftest.$ac_ext +/* end confdefs.h. */ + +int +main () +{ + + ; + return 0; +} +_ACEOF +if ac_fn_c_try_compile "$LINENO"; then : + gl_cv_compiler_check_decl_option='-Werror=implicit-function-declaration' +else + gl_cv_compiler_check_decl_option=none +fi +rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext + ac_compile="$save_ac_compile" + else + gl_cv_compiler_check_decl_option=none + fi + +fi +{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $gl_cv_compiler_check_decl_option" >&5 +$as_echo "$gl_cv_compiler_check_decl_option" >&6; } + if test "x$gl_cv_compiler_check_decl_option" != xnone; then + ac_compile_for_check_decl="$ac_compile $gl_cv_compiler_check_decl_option" + else + ac_compile_for_check_decl="$ac_compile" + fi + + depcc="$CC" am_compiler_list= { $as_echo "$as_me:${as_lineno-$LINENO}: checking dependency style of $depcc" >&5 @@ -6748,9 +6870,6 @@ $as_echo "$ac_cv_should_define__xopen_source" >&6; } - - - { $as_echo "$as_me:${as_lineno-$LINENO}: checking for Minix Amsterdam compiler" >&5 $as_echo_n "checking for Minix Amsterdam compiler... " >&6; } if ${gl_cv_c_amsterdam_compiler+:} false; then : @@ -7012,7 +7131,7 @@ else 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 << 62) - 1 + ((off_t) 1 << 62)) +#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]; @@ -7058,7 +7177,7 @@ else 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 << 62) - 1 + ((off_t) 1 << 62)) +#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]; @@ -7082,7 +7201,7 @@ rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext 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 << 62) - 1 + ((off_t) 1 << 62)) +#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]; @@ -7127,7 +7246,7 @@ else 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 << 62) - 1 + ((off_t) 1 << 62)) +#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]; @@ -7151,7 +7270,7 @@ rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext 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 << 62) - 1 + ((off_t) 1 << 62)) +#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]; @@ -7183,10 +7302,6 @@ _ACEOF esac rm -rf conftest* fi - - -$as_echo "#define _DARWIN_USE_64_BIT_INODE 1" >>confdefs.h - fi @@ -7224,8 +7339,14 @@ else fi - if test "$gl_use_threads" = yes || test "$gl_use_threads" = posix; then - # For using : + if test "$gl_use_threads" = yes \ + || test "$gl_use_threads" = isoc \ + || test "$gl_use_threads" = posix \ + || test "$gl_use_threads" = isoc+posix; then + # For using or : + + + if test -z "$gl_anythreadlib_early_done"; then case "$host_os" in osf*) # On OSF/1, the compiler needs the flag -D_REENTRANT so that it @@ -7244,6 +7365,9 @@ fi aix* | freebsd*) CPPFLAGS="$CPPFLAGS -D_THREAD_SAFE" ;; solaris*) CPPFLAGS="$CPPFLAGS -D_REENTRANT" ;; esac + gl_anythreadlib_early_done=done + fi + fi @@ -7266,6 +7390,8 @@ fi # Code from module arpa_inet-tests: # Code from module assert: # Code from module assure: + # Code from module attribute: + # Code from module basename-lgpl: # Code from module binary-io: # Code from module binary-io-tests: # Code from module bind: @@ -7284,6 +7410,7 @@ fi # Code from module calloc-posix: # Code from module canonicalize-lgpl: # Code from module canonicalize-lgpl-tests: + # Code from module clock-time: # Code from module cloexec: # Code from module cloexec-tests: # Code from module close: @@ -7300,7 +7427,6 @@ fi # Code from module dirname-lgpl: # Code from module dirname-tests: # Code from module do-release-commit-and-tag: - # Code from module dosname: # Code from module double-slash-root: # Code from module dup2: # Code from module dup2-tests: @@ -7346,6 +7472,8 @@ fi # Code from module getpagesize: # Code from module getprogname: # Code from module getprogname-tests: + # Code from module getrandom: + # Code from module getrandom-tests: # Code from module gettext-h: # Code from module gettimeofday: # Code from module gettimeofday-tests: @@ -7355,7 +7483,8 @@ fi # Code from module gnumakefile: # Code from module gnupload: # Code from module hard-locale: - # Code from module havelib: + # Code from module hard-locale-tests: + # Code from module idx: # Code from module ignore-value: # Code from module ignore-value-tests: # Code from module include_next: @@ -7388,7 +7517,6 @@ fi # Code from module localeconv-tests: # Code from module localename: # Code from module localename-tests: - # Code from module localtime-buffer: # Code from module lock: # Code from module lock-tests: # Code from module long-options: @@ -7436,10 +7564,28 @@ fi # Code from module progname: # Code from module pthread-h: -$as_echo "#define _REENTRANT 1" >>confdefs.h - -$as_echo "#define _THREAD_SAFE 1" >>confdefs.h + if test -z "$gl_anythreadlib_early_done"; then + case "$host_os" in + osf*) + # On OSF/1, the compiler needs the flag -D_REENTRANT so that it + # groks . cc also understands the flag -pthread, but + # we don't use it because 1. gcc-2.95 doesn't understand -pthread, + # 2. putting a flag into CPPFLAGS that has an effect on the linker + # causes the AC_LINK_IFELSE test below to succeed unexpectedly, + # leading to wrong values of LIBTHREAD and LTLIBTHREAD. + CPPFLAGS="$CPPFLAGS -D_REENTRANT" + ;; + esac + # Some systems optimize for single-threaded programs by default, and + # need special flags to disable these optimizations. For example, the + # definition of 'errno' in . + case "$host_os" in + aix* | freebsd*) CPPFLAGS="$CPPFLAGS -D_THREAD_SAFE" ;; + solaris*) CPPFLAGS="$CPPFLAGS -D_REENTRANT" ;; + esac + gl_anythreadlib_early_done=done + fi # Code from module pthread-h-tests: # Code from module pthread-thread: @@ -7473,6 +7619,8 @@ $as_echo "#define _THREAD_SAFE 1" >>confdefs.h # Code from module setenv: # Code from module setenv-tests: # Code from module setlocale: + # Code from module setlocale-null: + # Code from module setlocale-null-tests: # Code from module setlocale-tests: # Code from module setsockopt: # Code from module setsockopt-tests: @@ -7505,6 +7653,7 @@ $as_echo "#define _THREAD_SAFE 1" >>confdefs.h + # Code from module stdarg-tests: # Code from module stdbool: # Code from module stdbool-tests: # Code from module stddef: @@ -7535,6 +7684,8 @@ $as_echo "#define _THREAD_SAFE 1" >>confdefs.h # Code from module symlink-tests: # Code from module sys_ioctl: # Code from module sys_ioctl-tests: + # Code from module sys_random: + # Code from module sys_random-tests: # Code from module sys_select: # Code from module sys_select-tests: # Code from module sys_socket: @@ -7551,6 +7702,7 @@ $as_echo "#define _THREAD_SAFE 1" >>confdefs.h # Code from module test-framework-sh: # Code from module test-framework-sh-tests: # Code from module thread: + # Code from module thread-optim: # Code from module thread-tests: # Code from module threadlib: @@ -7598,6 +7750,7 @@ $as_echo "#define _THREAD_SAFE 1" >>confdefs.h # Code from module xalloc-oversized: # Code from module xstrndup: # Code from module xstrtol: + # Code from module xstrtol-error: # Code from module xstrtol-tests: # Code from module xstrtoll: # Code from module xstrtoll-tests: @@ -7878,7 +8031,7 @@ else 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 << 62) - 1 + ((off_t) 1 << 62)) +#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]; @@ -7924,7 +8077,7 @@ else 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 << 62) - 1 + ((off_t) 1 << 62)) +#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]; @@ -7948,7 +8101,7 @@ rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext 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 << 62) - 1 + ((off_t) 1 << 62)) +#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]; @@ -7993,7 +8146,7 @@ else 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 << 62) - 1 + ((off_t) 1 << 62)) +#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]; @@ -8017,7 +8170,7 @@ rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext 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 << 62) - 1 + ((off_t) 1 << 62)) +#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]; @@ -8049,11 +8202,10 @@ _ACEOF esac rm -rf conftest* fi +fi -$as_echo "#define _DARWIN_USE_64_BIT_INODE 1" >>confdefs.h -fi @@ -8061,10 +8213,29 @@ fi + # Check whether --enable-cross-guesses was given. +if test "${enable_cross_guesses+set}" = set; then : + enableval=$enable_cross_guesses; if test "x$enableval" != xconservative && test "x$enableval" != xrisky; then + { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: invalid argument supplied to --enable-cross-guesses" >&5 +$as_echo "$as_me: WARNING: invalid argument supplied to --enable-cross-guesses" >&2;} + enableval=conservative + fi + gl_cross_guesses="$enableval" +else + gl_cross_guesses=conservative +fi + if test $gl_cross_guesses = risky; then + gl_cross_guess_normal="guessing yes" + gl_cross_guess_inverted="guessing no" + else + gl_cross_guess_normal="guessing no" + gl_cross_guess_inverted="guessing yes" + fi LIBC_FATAL_STDERR_=1 export LIBC_FATAL_STDERR_ + ac_fn_c_check_type "$LINENO" "size_t" "ac_cv_type_size_t" "$ac_includes_default" if test "x$ac_cv_type_size_t" = xyes; then : @@ -8178,47 +8349,6 @@ ALLOCA=\${LIBOBJDIR}alloca.$ac_objext $as_echo "#define C_ALLOCA 1" >>confdefs.h -{ $as_echo "$as_me:${as_lineno-$LINENO}: checking whether \`alloca.c' needs Cray hooks" >&5 -$as_echo_n "checking whether \`alloca.c' needs Cray hooks... " >&6; } -if ${ac_cv_os_cray+:} false; then : - $as_echo_n "(cached) " >&6 -else - cat confdefs.h - <<_ACEOF >conftest.$ac_ext -/* end confdefs.h. */ -#if defined CRAY && ! defined CRAY2 -webecray -#else -wenotbecray -#endif - -_ACEOF -if (eval "$ac_cpp conftest.$ac_ext") 2>&5 | - $EGREP "webecray" >/dev/null 2>&1; then : - ac_cv_os_cray=yes -else - ac_cv_os_cray=no -fi -rm -f conftest* - -fi -{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_os_cray" >&5 -$as_echo "$ac_cv_os_cray" >&6; } -if test $ac_cv_os_cray = yes; then - for ac_func in _getb67 GETB67 getb67; do - as_ac_var=`$as_echo "ac_cv_func_$ac_func" | $as_tr_sh` -ac_fn_c_check_func "$LINENO" "$ac_func" "$as_ac_var" -if eval test \"x\$"$as_ac_var"\" = x"yes"; then : - -cat >>confdefs.h <<_ACEOF -#define CRAY_STACKSEG_END $ac_func -_ACEOF - - break -fi - - done -fi - { $as_echo "$as_me:${as_lineno-$LINENO}: checking stack direction for C alloca" >&5 $as_echo_n "checking stack direction for C alloca... " >&6; } if ${ac_cv_c_stack_direction+:} false; then : @@ -8282,6 +8412,7 @@ fi GNULIB_WMEMCMP=0; GNULIB_WMEMCPY=0; GNULIB_WMEMMOVE=0; + GNULIB_WMEMPCPY=0; GNULIB_WMEMSET=0; GNULIB_WCSLEN=0; GNULIB_WCSNLEN=0; @@ -8320,6 +8451,7 @@ fi HAVE_WMEMCMP=1; HAVE_WMEMCPY=1; HAVE_WMEMMOVE=1; + HAVE_WMEMPCPY=1; HAVE_WMEMSET=1; HAVE_WCSLEN=1; HAVE_WCSNLEN=1; @@ -8346,6 +8478,7 @@ fi HAVE_WCSWIDTH=1; HAVE_WCSFTIME=1; HAVE_DECL_WCTOB=1; + HAVE_DECL_WCSDUP=1; HAVE_DECL_WCWIDTH=1; REPLACE_MBSTATE_T=0; REPLACE_BTOWC=0; @@ -8361,18 +8494,22 @@ fi REPLACE_WCWIDTH=0; REPLACE_WCSWIDTH=0; REPLACE_WCSFTIME=0; + REPLACE_WCSTOK=0; + - { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether uses 'inline' correctly" >&5 + { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether uses 'inline' correctly" >&5 $as_echo_n "checking whether uses 'inline' correctly... " >&6; } if ${gl_cv_header_wchar_h_correct_inline+:} false; then : $as_echo_n "(cached) " >&6 else gl_cv_header_wchar_h_correct_inline=yes - cat confdefs.h - <<_ACEOF >conftest.$ac_ext + case "$host_os" in + *-gnu* | gnu*) + cat confdefs.h - <<_ACEOF >conftest.$ac_ext /* end confdefs.h. */ - #define wcstod renamed_wcstod + #define wcstod renamed_wcstod /* Tru64 with Desktop Toolkit C has a bug: must be included before . BSD/OS 4.0.1 has a bug: , and must be @@ -8385,18 +8522,18 @@ extern int zero (void); int main () { return zero(); } _ACEOF - save_ac_compile="$ac_compile" - ac_compile=`echo "$save_ac_compile" | sed s/conftest/conftest1/` - if echo '#include "conftest.c"' >conftest1.c && - { { eval echo "\"\$as_me\":${as_lineno-$LINENO}: \"$ac_compile\""; } >&5 + save_ac_compile="$ac_compile" + ac_compile=`echo "$save_ac_compile" | sed s/conftest/conftest1/` + if echo '#include "conftest.c"' >conftest1.c \ + && { { eval echo "\"\$as_me\":${as_lineno-$LINENO}: \"$ac_compile\""; } >&5 (eval $ac_compile) 2>&5 ac_status=$? $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 test $ac_status = 0; }; then - cat confdefs.h - <<_ACEOF >conftest.$ac_ext + cat confdefs.h - <<_ACEOF >conftest.$ac_ext /* end confdefs.h. */ - #define wcstod renamed_wcstod + #define wcstod renamed_wcstod /* Tru64 with Desktop Toolkit C has a bug: must be included before . BSD/OS 4.0.1 has a bug: , and must be @@ -8408,22 +8545,24 @@ _ACEOF int zero (void) { return 0; } _ACEOF - ac_compile=`echo "$save_ac_compile" | sed s/conftest/conftest2/` - if echo '#include "conftest.c"' >conftest2.c && - { { eval echo "\"\$as_me\":${as_lineno-$LINENO}: \"$ac_compile\""; } >&5 + ac_compile=`echo "$save_ac_compile" | sed s/conftest/conftest2/` + if echo '#include "conftest.c"' >conftest2.c \ + && { { eval echo "\"\$as_me\":${as_lineno-$LINENO}: \"$ac_compile\""; } >&5 (eval $ac_compile) 2>&5 ac_status=$? $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 test $ac_status = 0; }; then - if $CC -o conftest$ac_exeext $CFLAGS $LDFLAGS conftest1.$ac_objext conftest2.$ac_objext $LIBS >&5 2>&1; then - : - else - gl_cv_header_wchar_h_correct_inline=no + if $CC -o conftest$ac_exeext $CFLAGS $LDFLAGS conftest1.$ac_objext conftest2.$ac_objext $LIBS >&5 2>&1; then + : + else + gl_cv_header_wchar_h_correct_inline=no + fi + fi fi - fi - fi - ac_compile="$save_ac_compile" - rm -f conftest12.c conftest12.$ac_objext conftest$ac_exeext + ac_compile="$save_ac_compile" + rm -f conftest12.c conftest12.$ac_objext conftest$ac_exeext + ;; + esac fi { $as_echo "$as_me:${as_lineno-$LINENO}: result: $gl_cv_header_wchar_h_correct_inline" >&5 @@ -8635,6 +8774,7 @@ $as_echo "$gt_cv_locale_fr" >&6; } GNULIB__EXIT=0; + GNULIB_ALIGNED_ALLOC=0; GNULIB_ATOLL=0; GNULIB_CALLOC_POSIX=0; GNULIB_CANONICALIZE_FILE_NAME=0; @@ -8648,6 +8788,7 @@ $as_echo "$gt_cv_locale_fr" >&6; } GNULIB_MKOSTEMPS=0; GNULIB_MKSTEMP=0; GNULIB_MKSTEMPS=0; + GNULIB_POSIX_MEMALIGN=0; GNULIB_POSIX_OPENPT=0; GNULIB_PTSNAME=0; GNULIB_PTSNAME_R=0; @@ -8670,8 +8811,12 @@ $as_echo "$gt_cv_locale_fr" >&6; } GNULIB_UNSETENV=0; GNULIB_WCTOMB=0; HAVE__EXIT=1; + HAVE_ALIGNED_ALLOC=1; HAVE_ATOLL=1; HAVE_CANONICALIZE_FILE_NAME=1; + HAVE_DECL_ECVT=1; + HAVE_DECL_FCVT=1; + HAVE_DECL_GCVT=1; HAVE_DECL_GETLOADAVG=1; HAVE_GETSUBOPT=1; HAVE_GRANTPT=1; @@ -8683,6 +8828,7 @@ $as_echo "$gt_cv_locale_fr" >&6; } HAVE_MKOSTEMPS=1; HAVE_MKSTEMP=1; HAVE_MKSTEMPS=1; + HAVE_POSIX_MEMALIGN=1; HAVE_POSIX_OPENPT=1; HAVE_PTSNAME=1; HAVE_PTSNAME_R=1; @@ -8706,12 +8852,14 @@ $as_echo "$gt_cv_locale_fr" >&6; } HAVE_SYS_LOADAVG_H=0; HAVE_UNLOCKPT=1; HAVE_DECL_UNSETENV=1; + REPLACE_ALIGNED_ALLOC=0; REPLACE_CALLOC=0; REPLACE_CANONICALIZE_FILE_NAME=0; REPLACE_INITSTATE=0; REPLACE_MALLOC=0; REPLACE_MBTOWC=0; REPLACE_MKSTEMP=0; + REPLACE_POSIX_MEMALIGN=0; REPLACE_PTSNAME=0; REPLACE_PTSNAME_R=0; REPLACE_PUTENV=0; @@ -8765,8 +8913,6 @@ $as_echo "$gl_cv_func_malloc_posix" >&6; } - - { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether // is distinct from /" >&5 $as_echo_n "checking whether // is distinct from /... " >&6; } if ${gl_cv_double_slash_root+:} false; then : @@ -8814,6 +8960,7 @@ if ${gl_cv_func_realpath_works+:} false; then : $as_echo_n "(cached) " >&6 else + rm -rf conftest.a conftest.d touch conftest.a mkdir conftest.d if test "$cross_compiling" = yes; then : @@ -8824,8 +8971,8 @@ else *-musl*) gl_cv_func_realpath_works="guessing yes" ;; # Guess no on native Windows. mingw*) gl_cv_func_realpath_works="guessing no" ;; - # If we don't know, assume the worst. - *) gl_cv_func_realpath_works="guessing no" ;; + # If we don't know, obey --enable-cross-guesses. + *) gl_cv_func_realpath_works="$gl_cross_guess_normal" ;; esac else @@ -8871,7 +9018,7 @@ nocrash_init (void) /* Allocate a port on which the thread shall listen for exceptions. */ if (mach_port_allocate (self, MACH_PORT_RIGHT_RECEIVE, &our_exception_port) == KERN_SUCCESS) { - /* See http://web.mit.edu/darwin/src/modules/xnu/osfmk/man/mach_port_insert_right.html. */ + /* See https://web.mit.edu/darwin/src/modules/xnu/osfmk/man/mach_port_insert_right.html. */ if (mach_port_insert_right (self, our_exception_port, our_exception_port, MACH_MSG_TYPE_MAKE_SEND) == KERN_SUCCESS) { @@ -8890,7 +9037,7 @@ nocrash_init (void) for a particular thread. This has the effect that when our exception port gets the message, the thread specific exception port has already been asked, and we don't need to bother about it. - See http://web.mit.edu/darwin/src/modules/xnu/osfmk/man/task_set_exception_ports.html. */ + See https://web.mit.edu/darwin/src/modules/xnu/osfmk/man/task_set_exception_ports.html. */ task_set_exception_ports (self, mask, our_exception_port, EXCEPTION_DEFAULT, MACHINE_THREAD_STATE); } @@ -9034,9 +9181,27 @@ done + case "$host_os" in + mingw*) ;; + *) for ac_func in getcwd +do : + ac_fn_c_check_func "$LINENO" "getcwd" "ac_cv_func_getcwd" +if test "x$ac_cv_func_getcwd" = xyes; then : + cat >>confdefs.h <<_ACEOF +#define HAVE_GETCWD 1 +_ACEOF + +fi +done + ;; + esac + + + + GNULIB_ACCESS=0; GNULIB_CHDIR=0; GNULIB_CHOWN=0; GNULIB_CLOSE=0; @@ -9055,10 +9220,12 @@ done GNULIB_GETCWD=0; GNULIB_GETDOMAINNAME=0; GNULIB_GETDTABLESIZE=0; + GNULIB_GETENTROPY=0; GNULIB_GETGROUPS=0; GNULIB_GETHOSTNAME=0; GNULIB_GETLOGIN=0; GNULIB_GETLOGIN_R=0; + GNULIB_GETOPT_POSIX=0; GNULIB_GETPAGESIZE=0; GNULIB_GETPASS=0; GNULIB_GETUSERSHELL=0; @@ -9090,7 +9257,6 @@ done GNULIB_WRITE=0; HAVE_CHOWN=1; HAVE_COPY_FILE_RANGE=1; - HAVE_DUP2=1; HAVE_DUP3=1; HAVE_EUIDACCESS=1; HAVE_FACCESSAT=1; @@ -9100,6 +9266,7 @@ done HAVE_FSYNC=1; HAVE_FTRUNCATE=1; HAVE_GETDTABLESIZE=1; + HAVE_GETENTROPY=1; HAVE_GETGROUPS=1; HAVE_GETHOSTNAME=1; HAVE_GETLOGIN=1; @@ -9122,6 +9289,7 @@ done HAVE_UNLINKAT=1; HAVE_USLEEP=1; HAVE_DECL_ENVIRON=1; + HAVE_DECL_EXECVPE=1; HAVE_DECL_FCHDIR=1; HAVE_DECL_FDATASYNC=1; HAVE_DECL_GETDOMAINNAME=1; @@ -9134,6 +9302,7 @@ done HAVE_DECL_TTYNAME_R=1; HAVE_OS_H=0; HAVE_SYS_PARAM_H=0; + REPLACE_ACCESS=0; REPLACE_CHOWN=0; REPLACE_CLOSE=0; REPLACE_DUP=0; @@ -9168,6 +9337,7 @@ done REPLACE_UNLINKAT=0; REPLACE_USLEEP=0; REPLACE_WRITE=0; + UNISTD_H_HAVE_SYS_RANDOM_H=0; UNISTD_H_HAVE_WINSOCK2_H=0; UNISTD_H_HAVE_WINSOCK2_H_AND_USE_SOCKETS=0; @@ -9195,9 +9365,60 @@ $as_echo "#define HAVE_MSVC_INVALID_PARAMETER_HANDLER 1" >>confdefs.h - - - +gl_mda_defines=' +#if defined _WIN32 && !defined __CYGWIN__ +#define access _access +#define chdir _chdir +#define chmod _chmod +#define close _close +#define creat _creat +#define dup _dup +#define dup2 _dup2 +#define ecvt _ecvt +#define execl _execl +#define execle _execle +#define execlp _execlp +#define execv _execv +#define execve _execve +#define execvp _execvp +#define execvpe _execvpe +#define fcloseall _fcloseall +#define fcvt _fcvt +#define fdopen _fdopen +#define fileno _fileno +#define gcvt _gcvt +#define getcwd _getcwd +#define getpid _getpid +#define getw _getw +#define isatty _isatty +#define j0 _j0 +#define j1 _j1 +#define jn _jn +#define lfind _lfind +#define lsearch _lsearch +#define lseek _lseek +#define memccpy _memccpy +#define mkdir _mkdir +#define mktemp _mktemp +#define open _open +#define putenv _putenv +#define putw _putw +#define read _read +#define rmdir _rmdir +#define strdup _strdup +#define swab _swab +#define tempnam _tempnam +#define tzset _tzset +#define umask _umask +#define unlink _unlink +#define utime _utime +#define wcsdup _wcsdup +#define write _write +#define y0 _y0 +#define y1 _y1 +#define yn _yn +#endif +' @@ -9281,12 +9502,13 @@ $as_echo "$gl_cv_have_include_next" >&6; } - { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether system header files limit the line length" >&5 -$as_echo_n "checking whether system header files limit the line length... " >&6; } -if ${gl_cv_pragma_columns+:} false; then : + + { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether source code line length is unlimited" >&5 +$as_echo_n "checking whether source code line length is unlimited... " >&6; } +if ${gl_cv_source_line_length_unlimited+:} false; then : $as_echo_n "(cached) " >&6 else - cat confdefs.h - <<_ACEOF >conftest.$ac_ext + cat confdefs.h - <<_ACEOF >conftest.$ac_ext /* end confdefs.h. */ #ifdef __TANDEM @@ -9296,17 +9518,17 @@ choke me _ACEOF if (eval "$ac_cpp conftest.$ac_ext") 2>&5 | $EGREP "choke me" >/dev/null 2>&1; then : - gl_cv_pragma_columns=yes + gl_cv_source_line_length_unlimited=no else - gl_cv_pragma_columns=no + gl_cv_source_line_length_unlimited=yes fi rm -f conftest* fi -{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $gl_cv_pragma_columns" >&5 -$as_echo "$gl_cv_pragma_columns" >&6; } - if test $gl_cv_pragma_columns = yes; then +{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $gl_cv_source_line_length_unlimited" >&5 +$as_echo "$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= @@ -9788,12 +10010,14 @@ fi + GNULIB_CREAT=0; GNULIB_FCNTL=0; GNULIB_NONBLOCKING=0; GNULIB_OPEN=0; GNULIB_OPENAT=0; HAVE_FCNTL=1; HAVE_OPENAT=1; + REPLACE_CREAT=0; REPLACE_FCNTL=0; REPLACE_OPEN=0; REPLACE_OPENAT=0; @@ -9807,6 +10031,8 @@ fi + + { $as_echo "$as_me:${as_lineno-$LINENO}: checking for working fcntl.h" >&5 $as_echo_n "checking for working fcntl.h... " >&6; } if ${gl_cv_header_working_fcntl_h+:} false; then : @@ -9832,6 +10058,10 @@ else # defined sleep(n) _sleep ((n) * 1000) #endif #include + + +$gl_mda_defines + #ifndef O_NOATIME #define O_NOATIME 0 #endif @@ -9954,17 +10184,43 @@ cat >>confdefs.h <<_ACEOF _ACEOF -ac_fn_c_check_type "$LINENO" "pid_t" "ac_cv_type_pid_t" "$ac_includes_default" + + ac_fn_c_check_type "$LINENO" "pid_t" "ac_cv_type_pid_t" "$ac_includes_default +" if test "x$ac_cv_type_pid_t" = xyes; then : else + cat confdefs.h - <<_ACEOF >conftest.$ac_ext +/* end confdefs.h. */ + + #if defined _WIN64 && !defined __CYGWIN__ + LLP64 + #endif + +int +main () +{ + + ; + return 0; +} + +_ACEOF +if ac_fn_c_try_compile "$LINENO"; then : + gl_pid_type='int' +else + gl_pid_type='__int64' +fi +rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext cat >>confdefs.h <<_ACEOF -#define pid_t int +#define pid_t $gl_pid_type _ACEOF + fi + ac_fn_c_check_type "$LINENO" "mode_t" "ac_cv_type_mode_t" "$ac_includes_default" if test "x$ac_cv_type_mode_t" = xyes; then : @@ -9983,6 +10239,7 @@ fi GNULIB_FSTAT=0; GNULIB_FSTATAT=0; GNULIB_FUTIMENS=0; + GNULIB_GETUMASK=0; GNULIB_LCHMOD=0; GNULIB_LSTAT=0; GNULIB_MKDIRAT=0; @@ -9996,6 +10253,7 @@ fi HAVE_FCHMODAT=1; HAVE_FSTATAT=1; HAVE_FUTIMENS=1; + HAVE_GETUMASK=1; HAVE_LCHMOD=1; HAVE_LSTAT=1; HAVE_MKDIRAT=1; @@ -10004,6 +10262,7 @@ fi HAVE_MKNOD=1; HAVE_MKNODAT=1; HAVE_UTIMENSAT=1; + REPLACE_FCHMODAT=0; REPLACE_FSTAT=0; REPLACE_FSTATAT=0; REPLACE_FUTIMENS=0; @@ -10136,6 +10395,54 @@ $as_echo "$gl_cv_member_st_size_64" >&6; } ;; esac +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for C/C++ restrict keyword" >&5 +$as_echo_n "checking for C/C++ restrict keyword... " >&6; } +if ${ac_cv_c_restrict+:} false; then : + $as_echo_n "(cached) " >&6 +else + ac_cv_c_restrict=no + # The order here caters to the fact that C++ does not require restrict. + for ac_kw in __restrict __restrict__ _Restrict restrict; do + cat confdefs.h - <<_ACEOF >conftest.$ac_ext +/* end confdefs.h. */ +typedef int *int_ptr; + int foo (int_ptr $ac_kw ip) { return ip[0]; } + int bar (int [$ac_kw]); /* Catch GCC bug 14050. */ + int bar (int ip[$ac_kw]) { return ip[0]; } + +int +main () +{ +int s[1]; + int *$ac_kw t = s; + t[0] = 0; + return foo (t) + bar (t); + + ; + return 0; +} +_ACEOF +if ac_fn_c_try_compile "$LINENO"; then : + ac_cv_c_restrict=$ac_kw +fi +rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext + test "$ac_cv_c_restrict" != no && break + done + +fi +{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_c_restrict" >&5 +$as_echo "$ac_cv_c_restrict" >&6; } + + case $ac_cv_c_restrict in + restrict) ;; + no) $as_echo "#define restrict /**/" >>confdefs.h + ;; + *) cat >>confdefs.h <<_ACEOF +#define restrict $ac_cv_c_restrict +_ACEOF + ;; + esac + @@ -10252,6 +10559,40 @@ fi + case "$host_os" in + mingw*) + for ac_header in sdkddkver.h +do : + ac_fn_c_check_header_mongrel "$LINENO" "sdkddkver.h" "ac_cv_header_sdkddkver_h" "$ac_includes_default" +if test "x$ac_cv_header_sdkddkver_h" = xyes; then : + cat >>confdefs.h <<_ACEOF +#define HAVE_SDKDDKVER_H 1 +_ACEOF + +fi + +done + + ;; + esac + + + + + +ac_fn_c_check_decl "$LINENO" "getdtablesize" "ac_cv_have_decl_getdtablesize" "$ac_includes_default" +if test "x$ac_cv_have_decl_getdtablesize" = xyes; then : + ac_have_decl=1 +else + ac_have_decl=0 +fi + +cat >>confdefs.h <<_ACEOF +#define HAVE_DECL_GETDTABLESIZE $ac_have_decl +_ACEOF + + + @@ -10566,7 +10907,7 @@ else POSIXLY_CORRECT=1 export POSIXLY_CORRECT if test "$cross_compiling" = yes; then : - gl_cv_func_getopt_gnu="guessing no" + gl_cv_func_getopt_gnu="$gl_cross_guess_normal" else cat confdefs.h - <<_ACEOF >conftest.$ac_ext @@ -10612,7 +10953,7 @@ nocrash_init (void) /* Allocate a port on which the thread shall listen for exceptions. */ if (mach_port_allocate (self, MACH_PORT_RIGHT_RECEIVE, &our_exception_port) == KERN_SUCCESS) { - /* See http://web.mit.edu/darwin/src/modules/xnu/osfmk/man/mach_port_insert_right.html. */ + /* See https://web.mit.edu/darwin/src/modules/xnu/osfmk/man/mach_port_insert_right.html. */ if (mach_port_insert_right (self, our_exception_port, our_exception_port, MACH_MSG_TYPE_MAKE_SEND) == KERN_SUCCESS) { @@ -10631,7 +10972,7 @@ nocrash_init (void) for a particular thread. This has the effect that when our exception port gets the message, the thread specific exception port has already been asked, and we don't need to bother about it. - See http://web.mit.edu/darwin/src/modules/xnu/osfmk/man/task_set_exception_ports.html. */ + See https://web.mit.edu/darwin/src/modules/xnu/osfmk/man/task_set_exception_ports.html. */ task_set_exception_ports (self, mask, our_exception_port, EXCEPTION_DEFAULT, MACHINE_THREAD_STATE); } @@ -10861,295 +11202,534 @@ $as_echo "$gl_cv_func_getopt_long_gnu" >&6; } - GNULIB_GETTIMEOFDAY=0; - HAVE_GETTIMEOFDAY=1; - HAVE_STRUCT_TIMEVAL=1; - HAVE_SYS_TIME_H=1; - REPLACE_GETTIMEOFDAY=0; - REPLACE_STRUCT_TIMEVAL=0; + GNULIB_GETRANDOM=0; + HAVE_GETRANDOM=1; + REPLACE_GETRANDOM=0; -{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for C/C++ restrict keyword" >&5 -$as_echo_n "checking for C/C++ restrict keyword... " >&6; } -if ${ac_cv_c_restrict+:} false; then : - $as_echo_n "(cached) " >&6 + + + + + + + if test -z "$gl_pthreadlib_body_done"; then + gl_pthread_api=no + LIBPTHREAD= + LIBPMULTITHREAD= + # On OSF/1, the compiler needs the flag -pthread or -D_REENTRANT so that + # it groks . It's added above, in gl_ANYTHREADLIB_EARLY. + ac_fn_c_check_header_mongrel "$LINENO" "pthread.h" "ac_cv_header_pthread_h" "$ac_includes_default" +if test "x$ac_cv_header_pthread_h" = xyes; then : + gl_have_pthread_h=yes else - ac_cv_c_restrict=no - # The order here caters to the fact that C++ does not require restrict. - for ac_kw in __restrict __restrict__ _Restrict restrict; do - cat confdefs.h - <<_ACEOF >conftest.$ac_ext + gl_have_pthread_h=no +fi + + + if test "$gl_have_pthread_h" = yes; then + # Other possible tests: + # -lpthreads (FSU threads, PCthreads) + # -lgthreads + # Test whether both pthread_mutex_lock and pthread_mutexattr_init exist + # in libc. IRIX 6.5 has the first one in both libc and libpthread, but + # the second one only in libpthread, and lock.c needs it. + # + # If -pthread works, prefer it to -lpthread, since Ubuntu 14.04 + # needs -pthread for some reason. See: + # https://lists.gnu.org/r/bug-gnulib/2014-09/msg00023.html + save_LIBS=$LIBS + for gl_pthread in '' '-pthread'; do + LIBS="$LIBS $gl_pthread" + cat confdefs.h - <<_ACEOF >conftest.$ac_ext /* end confdefs.h. */ -typedef int *int_ptr; - int foo (int_ptr $ac_kw ip) { return ip[0]; } - int bar (int [$ac_kw]); /* Catch GCC bug 14050. */ - int bar (int ip[$ac_kw]) { return ip[0]; } +#include + pthread_mutex_t m; + pthread_mutexattr_t ma; int main () { -int s[1]; - int *$ac_kw t = s; - t[0] = 0; - return foo (t) + bar (t); - +pthread_mutex_lock (&m); + pthread_mutexattr_init (&ma); ; return 0; } _ACEOF -if ac_fn_c_try_compile "$LINENO"; then : - ac_cv_c_restrict=$ac_kw +if ac_fn_c_try_link "$LINENO"; then : + gl_pthread_api=yes + LIBPTHREAD=$gl_pthread + LIBPMULTITHREAD=$gl_pthread fi -rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext - test "$ac_cv_c_restrict" != no && break - done +rm -f core conftest.err conftest.$ac_objext \ + conftest$ac_exeext conftest.$ac_ext + LIBS=$save_LIBS + test $gl_pthread_api = yes && break + done -fi -{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_c_restrict" >&5 -$as_echo "$ac_cv_c_restrict" >&6; } + # Test for libpthread by looking for pthread_kill. (Not pthread_self, + # since it is defined as a macro on OSF/1.) + if test $gl_pthread_api = yes && test -z "$LIBPTHREAD"; then + # The program links fine without libpthread. But it may actually + # need to link with libpthread in order to create multiple threads. + { $as_echo "$as_me:${as_lineno-$LINENO}: checking for pthread_kill in -lpthread" >&5 +$as_echo_n "checking for pthread_kill in -lpthread... " >&6; } +if ${ac_cv_lib_pthread_pthread_kill+:} false; then : + $as_echo_n "(cached) " >&6 +else + ac_check_lib_save_LIBS=$LIBS +LIBS="-lpthread $LIBS" +cat confdefs.h - <<_ACEOF >conftest.$ac_ext +/* end confdefs.h. */ - case $ac_cv_c_restrict in - restrict) ;; - no) $as_echo "#define restrict /**/" >>confdefs.h - ;; - *) cat >>confdefs.h <<_ACEOF -#define restrict $ac_cv_c_restrict +/* Override any GCC internal prototype to avoid an error. + Use char because int might match the return type of a GCC + builtin and then its argument prototype would still apply. */ +#ifdef __cplusplus +extern "C" +#endif +char pthread_kill (); +int +main () +{ +return pthread_kill (); + ; + return 0; +} _ACEOF - ;; - esac - - - - - - - - - - - - +if ac_fn_c_try_link "$LINENO"; then : + ac_cv_lib_pthread_pthread_kill=yes +else + ac_cv_lib_pthread_pthread_kill=no +fi +rm -f core conftest.err conftest.$ac_objext \ + conftest$ac_exeext conftest.$ac_ext +LIBS=$ac_check_lib_save_LIBS +fi +{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_pthread_pthread_kill" >&5 +$as_echo "$ac_cv_lib_pthread_pthread_kill" >&6; } +if test "x$ac_cv_lib_pthread_pthread_kill" = xyes; then : + LIBPMULTITHREAD=-lpthread + # On Solaris and HP-UX, most pthread functions exist also in libc. + # Therefore pthread_in_use() needs to actually try to create a + # thread: pthread_create from libc will fail, whereas + # pthread_create will actually create a thread. + # 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*) +$as_echo "#define PTHREAD_IN_USE_DETECTION_HARD 1" >>confdefs.h + esac +fi - if test $gl_cv_have_include_next = yes; then - gl_cv_next_sys_time_h='<'sys/time.h'>' - else - { $as_echo "$as_me:${as_lineno-$LINENO}: checking absolute name of " >&5 -$as_echo_n "checking absolute name of ... " >&6; } -if ${gl_cv_next_sys_time_h+:} false; then : + elif test $gl_pthread_api != yes; then + # Some library is needed. Try libpthread and libc_r. + { $as_echo "$as_me:${as_lineno-$LINENO}: checking for pthread_kill in -lpthread" >&5 +$as_echo_n "checking for pthread_kill in -lpthread... " >&6; } +if ${ac_cv_lib_pthread_pthread_kill+:} false; then : $as_echo_n "(cached) " >&6 else - - if test $ac_cv_header_sys_time_h = yes; then - - - - - cat confdefs.h - <<_ACEOF >conftest.$ac_ext + ac_check_lib_save_LIBS=$LIBS +LIBS="-lpthread $LIBS" +cat confdefs.h - <<_ACEOF >conftest.$ac_ext /* end confdefs.h. */ -#include -_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 'sys/time.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_sys_time_h=`(eval "$gl_absname_cpp conftest.$ac_ext") 2>&5 | - sed -n "$gl_absolute_header_sed"` - - gl_header=$gl_cv_absolute_sys_time_h - gl_cv_next_sys_time_h='"'$gl_header'"' - else - gl_cv_next_sys_time_h='<'sys/time.h'>' - fi - +/* Override any GCC internal prototype to avoid an error. + Use char because int might match the return type of a GCC + builtin and then its argument prototype would still apply. */ +#ifdef __cplusplus +extern "C" +#endif +char pthread_kill (); +int +main () +{ +return pthread_kill (); + ; + return 0; +} +_ACEOF +if ac_fn_c_try_link "$LINENO"; then : + ac_cv_lib_pthread_pthread_kill=yes +else + ac_cv_lib_pthread_pthread_kill=no +fi +rm -f core conftest.err conftest.$ac_objext \ + conftest$ac_exeext conftest.$ac_ext +LIBS=$ac_check_lib_save_LIBS +fi +{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_pthread_pthread_kill" >&5 +$as_echo "$ac_cv_lib_pthread_pthread_kill" >&6; } +if test "x$ac_cv_lib_pthread_pthread_kill" = xyes; then : + gl_pthread_api=yes + LIBPTHREAD=-lpthread + LIBPMULTITHREAD=-lpthread fi -{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $gl_cv_next_sys_time_h" >&5 -$as_echo "$gl_cv_next_sys_time_h" >&6; } - fi - NEXT_SYS_TIME_H=$gl_cv_next_sys_time_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='<'sys/time.h'>' - else - # INCLUDE_NEXT_AS_FIRST_DIRECTIVE='include' - gl_next_as_first_directive=$gl_cv_next_sys_time_h - fi - NEXT_AS_FIRST_DIRECTIVE_SYS_TIME_H=$gl_next_as_first_directive - - + if test $gl_pthread_api != yes; then + # For FreeBSD 4. + { $as_echo "$as_me:${as_lineno-$LINENO}: checking for pthread_kill in -lc_r" >&5 +$as_echo_n "checking for pthread_kill in -lc_r... " >&6; } +if ${ac_cv_lib_c_r_pthread_kill+:} false; then : + $as_echo_n "(cached) " >&6 +else + ac_check_lib_save_LIBS=$LIBS +LIBS="-lc_r $LIBS" +cat confdefs.h - <<_ACEOF >conftest.$ac_ext +/* end confdefs.h. */ +/* Override any GCC internal prototype to avoid an error. + Use char because int might match the return type of a GCC + builtin and then its argument prototype would still apply. */ +#ifdef __cplusplus +extern "C" +#endif +char pthread_kill (); +int +main () +{ +return pthread_kill (); + ; + return 0; +} +_ACEOF +if ac_fn_c_try_link "$LINENO"; then : + ac_cv_lib_c_r_pthread_kill=yes +else + ac_cv_lib_c_r_pthread_kill=no +fi +rm -f core conftest.err conftest.$ac_objext \ + conftest$ac_exeext conftest.$ac_ext +LIBS=$ac_check_lib_save_LIBS +fi +{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_c_r_pthread_kill" >&5 +$as_echo "$ac_cv_lib_c_r_pthread_kill" >&6; } +if test "x$ac_cv_lib_c_r_pthread_kill" = xyes; then : + gl_pthread_api=yes + LIBPTHREAD=-lc_r + LIBPMULTITHREAD=-lc_r +fi - if test $ac_cv_header_sys_time_h != yes; then - HAVE_SYS_TIME_H=0 - fi + fi + fi + fi + { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether POSIX threads API is available" >&5 +$as_echo_n "checking whether POSIX threads API is available... " >&6; } + { $as_echo "$as_me:${as_lineno-$LINENO}: result: $gl_pthread_api" >&5 +$as_echo "$gl_pthread_api" >&6; } + if test $gl_pthread_api = yes; then +$as_echo "#define HAVE_PTHREAD_API 1" >>confdefs.h + fi - if test $ac_cv_header_sys_socket_h != yes; then - for ac_header in winsock2.h -do : - ac_fn_c_check_header_mongrel "$LINENO" "winsock2.h" "ac_cv_header_winsock2_h" "$ac_includes_default" -if test "x$ac_cv_header_winsock2_h" = xyes; then : - cat >>confdefs.h <<_ACEOF -#define HAVE_WINSOCK2_H 1 + cat confdefs.h - <<_ACEOF >conftest.$ac_ext +/* end confdefs.h. */ +#include +int +main () +{ +sched_yield (); + ; + return 0; +} _ACEOF +if ac_fn_c_try_link "$LINENO"; then : + LIB_SCHED_YIELD= -fi - -done - - fi - if test "$ac_cv_header_winsock2_h" = yes; then - HAVE_WINSOCK2_H=1 - UNISTD_H_HAVE_WINSOCK2_H=1 - SYS_IOCTL_H_HAVE_WINSOCK2_H=1 - else - HAVE_WINSOCK2_H=0 - fi - - - { $as_echo "$as_me:${as_lineno-$LINENO}: checking for struct timeval" >&5 -$as_echo_n "checking for struct timeval... " >&6; } -if ${gl_cv_sys_struct_timeval+:} false; then : +else + { $as_echo "$as_me:${as_lineno-$LINENO}: checking for sched_yield in -lrt" >&5 +$as_echo_n "checking for sched_yield in -lrt... " >&6; } +if ${ac_cv_lib_rt_sched_yield+:} false; then : $as_echo_n "(cached) " >&6 else - cat confdefs.h - <<_ACEOF >conftest.$ac_ext + ac_check_lib_save_LIBS=$LIBS +LIBS="-lrt $LIBS" +cat confdefs.h - <<_ACEOF >conftest.$ac_ext /* end confdefs.h. */ -#if HAVE_SYS_TIME_H - #include - #endif - #include - #if HAVE_WINSOCK2_H - # include - #endif +/* Override any GCC internal prototype to avoid an error. + Use char because int might match the return type of a GCC + builtin and then its argument prototype would still apply. */ +#ifdef __cplusplus +extern "C" +#endif +char sched_yield (); int main () { -static struct timeval x; x.tv_sec = x.tv_usec; +return sched_yield (); ; return 0; } _ACEOF -if ac_fn_c_try_compile "$LINENO"; then : - gl_cv_sys_struct_timeval=yes +if ac_fn_c_try_link "$LINENO"; then : + ac_cv_lib_rt_sched_yield=yes else - gl_cv_sys_struct_timeval=no + ac_cv_lib_rt_sched_yield=no fi -rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext - +rm -f core conftest.err conftest.$ac_objext \ + conftest$ac_exeext conftest.$ac_ext +LIBS=$ac_check_lib_save_LIBS fi -{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $gl_cv_sys_struct_timeval" >&5 -$as_echo "$gl_cv_sys_struct_timeval" >&6; } - if test $gl_cv_sys_struct_timeval != yes; then - HAVE_STRUCT_TIMEVAL=0 - else - { $as_echo "$as_me:${as_lineno-$LINENO}: checking for wide-enough struct timeval.tv_sec member" >&5 -$as_echo_n "checking for wide-enough struct timeval.tv_sec member... " >&6; } -if ${gl_cv_sys_struct_timeval_tv_sec+:} false; then : +{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_rt_sched_yield" >&5 +$as_echo "$ac_cv_lib_rt_sched_yield" >&6; } +if test "x$ac_cv_lib_rt_sched_yield" = xyes; then : + LIB_SCHED_YIELD=-lrt +else + { $as_echo "$as_me:${as_lineno-$LINENO}: checking for sched_yield in -lposix4" >&5 +$as_echo_n "checking for sched_yield in -lposix4... " >&6; } +if ${ac_cv_lib_posix4_sched_yield+:} false; then : $as_echo_n "(cached) " >&6 else - cat confdefs.h - <<_ACEOF >conftest.$ac_ext + ac_check_lib_save_LIBS=$LIBS +LIBS="-lposix4 $LIBS" +cat confdefs.h - <<_ACEOF >conftest.$ac_ext /* end confdefs.h. */ -#if HAVE_SYS_TIME_H - #include - #endif - #include - #if HAVE_WINSOCK2_H - # include - #endif +/* Override any GCC internal prototype to avoid an error. + Use char because int might match the return type of a GCC + builtin and then its argument prototype would still apply. */ +#ifdef __cplusplus +extern "C" +#endif +char sched_yield (); int main () { -static struct timeval x; - typedef int verify_tv_sec_type[ - sizeof (time_t) <= sizeof x.tv_sec ? 1 : -1 - ]; - +return sched_yield (); ; return 0; } _ACEOF -if ac_fn_c_try_compile "$LINENO"; then : - gl_cv_sys_struct_timeval_tv_sec=yes +if ac_fn_c_try_link "$LINENO"; then : + ac_cv_lib_posix4_sched_yield=yes else - gl_cv_sys_struct_timeval_tv_sec=no + ac_cv_lib_posix4_sched_yield=no fi -rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext - +rm -f core conftest.err conftest.$ac_objext \ + conftest$ac_exeext conftest.$ac_ext +LIBS=$ac_check_lib_save_LIBS +fi +{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_posix4_sched_yield" >&5 +$as_echo "$ac_cv_lib_posix4_sched_yield" >&6; } +if test "x$ac_cv_lib_posix4_sched_yield" = xyes; then : + LIB_SCHED_YIELD=-lposix4 fi -{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $gl_cv_sys_struct_timeval_tv_sec" >&5 -$as_echo "$gl_cv_sys_struct_timeval_tv_sec" >&6; } - if test $gl_cv_sys_struct_timeval_tv_sec != yes; then - REPLACE_STRUCT_TIMEVAL=1 - fi - fi - - +fi +fi +rm -f core conftest.err conftest.$ac_objext \ + conftest$ac_exeext conftest.$ac_ext + gl_pthreadlib_body_done=done + fi - NEED_LOCALTIME_BUFFER=0 - GNULIB_CTIME=0; - GNULIB_MKTIME=0; - GNULIB_LOCALTIME=0; - GNULIB_NANOSLEEP=0; - GNULIB_STRFTIME=0; - GNULIB_STRPTIME=0; - GNULIB_TIMEGM=0; - GNULIB_TIME_R=0; - GNULIB_TIME_RZ=0; - GNULIB_TZSET=0; - HAVE_DECL_LOCALTIME_R=1; - HAVE_NANOSLEEP=1; - HAVE_STRPTIME=1; - HAVE_TIMEGM=1; - HAVE_TZSET=1; - HAVE_TIMEZONE_T=0; - REPLACE_CTIME=GNULIB_PORTCHECK; - REPLACE_LOCALTIME_R=GNULIB_PORTCHECK; - REPLACE_MKTIME=GNULIB_PORTCHECK; - REPLACE_NANOSLEEP=GNULIB_PORTCHECK; - REPLACE_STRFTIME=GNULIB_PORTCHECK; - REPLACE_TIMEGM=GNULIB_PORTCHECK; - REPLACE_TZSET=GNULIB_PORTCHECK; - : ${GNULIB_GETTIMEOFDAY=0}; - REPLACE_GMTIME=0; - REPLACE_LOCALTIME=0; + + + { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether setlocale (LC_ALL, NULL) is multithread-safe" >&5 +$as_echo_n "checking whether setlocale (LC_ALL, NULL) is multithread-safe... " >&6; } +if ${gl_cv_func_setlocale_null_all_mtsafe+:} false; then : + $as_echo_n "(cached) " >&6 +else + case "$host_os" in + # Guess no on musl libc, macOS, FreeBSD, NetBSD, OpenBSD, AIX, Haiku, Cygwin. + *-musl* | darwin* | freebsd* | netbsd* | openbsd* | aix* | haiku* | cygwin*) + 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 ;; + # If we don't know, obey --enable-cross-guesses. + *) + gl_cv_func_setlocale_null_all_mtsafe="$gl_cross_guess_normal" ;; + esac + +fi +{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $gl_cv_func_setlocale_null_all_mtsafe" >&5 +$as_echo "$gl_cv_func_setlocale_null_all_mtsafe" >&6; } + case "$host_os" in + mingw*) ;; + *) + if test $gl_pthread_api = no && test $ac_cv_header_threads_h = no; then + gl_cv_func_setlocale_null_all_mtsafe="trivially yes" + fi + ;; + esac + case "$gl_cv_func_setlocale_null_all_mtsafe" in + *yes) SETLOCALE_NULL_ALL_MTSAFE=1 ;; + *) SETLOCALE_NULL_ALL_MTSAFE=0 ;; + esac + +cat >>confdefs.h <<_ACEOF +#define SETLOCALE_NULL_ALL_MTSAFE $SETLOCALE_NULL_ALL_MTSAFE +_ACEOF + + + { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether setlocale (category, NULL) is multithread-safe" >&5 +$as_echo_n "checking whether setlocale (category, NULL) is multithread-safe... " >&6; } +if ${gl_cv_func_setlocale_null_one_mtsafe+:} false; then : + $as_echo_n "(cached) " >&6 +else + case "$host_os" in + # Guess no on OpenBSD, AIX. + 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* | netbsd* | hpux* | irix* | solaris* | haiku* | cygwin* | mingw*) + gl_cv_func_setlocale_null_one_mtsafe=yes ;; + # If we don't know, obey --enable-cross-guesses. + *) + gl_cv_func_setlocale_null_one_mtsafe="$gl_cross_guess_normal" ;; + esac + +fi +{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $gl_cv_func_setlocale_null_one_mtsafe" >&5 +$as_echo "$gl_cv_func_setlocale_null_one_mtsafe" >&6; } + case "$host_os" in + mingw*) ;; + *) + if test $gl_pthread_api = no && test $ac_cv_header_threads_h = no; then + gl_cv_func_setlocale_null_one_mtsafe="trivially yes" + fi + ;; + esac + case "$gl_cv_func_setlocale_null_one_mtsafe" in + *yes) SETLOCALE_NULL_ONE_MTSAFE=1 ;; + *) SETLOCALE_NULL_ONE_MTSAFE=0 ;; + esac + +cat >>confdefs.h <<_ACEOF +#define SETLOCALE_NULL_ONE_MTSAFE $SETLOCALE_NULL_ONE_MTSAFE +_ACEOF + + + if test $SETLOCALE_NULL_ALL_MTSAFE = 0 || test $SETLOCALE_NULL_ONE_MTSAFE = 0; then + case "$host_os" in + mingw*) LIB_SETLOCALE_NULL= ;; + *) + + + { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether imported symbols can be declared weak" >&5 +$as_echo_n "checking whether imported symbols can be declared weak... " >&6; } +if ${gl_cv_have_weak+:} false; then : + $as_echo_n "(cached) " >&6 +else + gl_cv_have_weak=no + cat confdefs.h - <<_ACEOF >conftest.$ac_ext +/* end confdefs.h. */ +extern void xyzzy (); +#pragma weak xyzzy +int +main () +{ +xyzzy(); + ; + return 0; +} +_ACEOF +if ac_fn_c_try_link "$LINENO"; then : + gl_cv_have_weak=maybe +fi +rm -f core conftest.err conftest.$ac_objext \ + conftest$ac_exeext conftest.$ac_ext + if test $gl_cv_have_weak = maybe; then + if test "$cross_compiling" = yes; then : + cat confdefs.h - <<_ACEOF >conftest.$ac_ext +/* end confdefs.h. */ +#ifdef __ELF__ + Extensible Linking Format + #endif + +_ACEOF +if (eval "$ac_cpp conftest.$ac_ext") 2>&5 | + $EGREP "Extensible Linking Format" >/dev/null 2>&1; then : + gl_cv_have_weak="guessing yes" +else + gl_cv_have_weak="guessing no" +fi +rm -f conftest* + + +else + cat confdefs.h - <<_ACEOF >conftest.$ac_ext +/* end confdefs.h. */ + +#include +#pragma weak fputs +int main () +{ + return (fputs == NULL); +} +_ACEOF +if ac_fn_c_try_run "$LINENO"; then : + gl_cv_have_weak=yes +else + gl_cv_have_weak=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 + case " $LDFLAGS " in + *" -static "*) gl_cv_have_weak=no ;; + esac + case "$gl_cv_have_weak" in + *yes) + case "$host_os" in + freebsd* | dragonfly*) + : > conftest1.c + $CC $CPPFLAGS $CFLAGS $LDFLAGS -fPIC -shared -o libempty.so conftest1.c -lpthread >&5 2>&1 + cat < conftest2.c +#include +#pragma weak pthread_mutexattr_gettype +int main () +{ + return (pthread_mutexattr_gettype != NULL); +} +EOF + $CC $CPPFLAGS $CFLAGS $LDFLAGS -o conftest conftest2.c libempty.so >&5 2>&1 \ + || gl_cv_have_weak=no + rm -f conftest1.c libempty.so conftest2.c conftest + ;; + esac + ;; + esac + +fi +{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $gl_cv_have_weak" >&5 +$as_echo "$gl_cv_have_weak" >&6; } + case "$gl_cv_have_weak" in + *yes) + +$as_echo "#define HAVE_WEAK_SYMBOLS 1" >>confdefs.h + + ;; + esac + + case "$gl_cv_have_weak" in + *yes) LIB_SETLOCALE_NULL= ;; + *) LIB_SETLOCALE_NULL="$LIBPTHREAD" ;; + esac + ;; + esac + else + LIB_SETLOCALE_NULL= + fi + @@ -11320,9 +11900,9 @@ $as_echo "$gt_cv_c_wint_t" >&6; } $as_echo "#define HAVE_WINT_T 1" >>confdefs.h - { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether wint_t is too small" >&5 -$as_echo_n "checking whether wint_t is too small... " >&6; } -if ${gl_cv_type_wint_t_too_small+:} false; then : + { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether wint_t is large enough" >&5 +$as_echo_n "checking whether wint_t is large enough... " >&6; } +if ${gl_cv_type_wint_t_large_enough+:} false; then : $as_echo_n "(cached) " >&6 else cat confdefs.h - <<_ACEOF >conftest.$ac_ext @@ -11338,7 +11918,7 @@ else # include #endif #include - int verify[sizeof (wint_t) < sizeof (int) ? -1 : 1]; + int verify[sizeof (wint_t) < sizeof (int) ? -1 : 1]; int main () @@ -11349,15 +11929,15 @@ main () } _ACEOF if ac_fn_c_try_compile "$LINENO"; then : - gl_cv_type_wint_t_too_small=no + gl_cv_type_wint_t_large_enough=yes else - gl_cv_type_wint_t_too_small=yes + gl_cv_type_wint_t_large_enough=no fi rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext fi -{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $gl_cv_type_wint_t_too_small" >&5 -$as_echo "$gl_cv_type_wint_t_too_small" >&6; } - if test $gl_cv_type_wint_t_too_small = yes; then +{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $gl_cv_type_wint_t_large_enough" >&5 +$as_echo "$gl_cv_type_wint_t_large_enough" >&6; } + if test $gl_cv_type_wint_t_large_enough = no; then GNULIB_OVERRIDES_WINT_T=1 else GNULIB_OVERRIDES_WINT_T=0 @@ -11368,161 +11948,53 @@ $as_echo "$gl_cv_type_wint_t_too_small" >&6; } - { $as_echo "$as_me:${as_lineno-$LINENO}: checking for unsigned long long int" >&5 -$as_echo_n "checking for unsigned long long int... " >&6; } -if ${ac_cv_type_unsigned_long_long_int+:} false; then : - $as_echo_n "(cached) " >&6 -else - ac_cv_type_unsigned_long_long_int=yes - if test "x${ac_cv_prog_cc_c99-no}" = xno; then - cat confdefs.h - <<_ACEOF >conftest.$ac_ext -/* end confdefs.h. */ - - /* For now, do not test the preprocessor; as of 2007 there are too many - implementations with broken preprocessors. Perhaps this can - be revisited in 2012. In the meantime, code should not expect - #if to work with literals wider than 32 bits. */ - /* Test literals. */ - long long int ll = 9223372036854775807ll; - long long int nll = -9223372036854775807LL; - unsigned long long int ull = 18446744073709551615ULL; - /* Test constant expressions. */ - typedef int a[((-9223372036854775807LL < 0 && 0 < 9223372036854775807ll) - ? 1 : -1)]; - typedef int b[(18446744073709551615ULL <= (unsigned long long int) -1 - ? 1 : -1)]; - int i = 63; -int -main () -{ -/* Test availability of runtime routines for shift and division. */ - long long int llmax = 9223372036854775807ll; - unsigned long long int ullmax = 18446744073709551615ull; - return ((ll << 63) | (ll >> 63) | (ll < i) | (ll > i) - | (llmax / ll) | (llmax % ll) - | (ull << 63) | (ull >> 63) | (ull << i) | (ull >> i) - | (ullmax / ull) | (ullmax % ull)); - ; - return 0; -} - -_ACEOF -if ac_fn_c_try_link "$LINENO"; then : - -else - ac_cv_type_unsigned_long_long_int=no -fi -rm -f core conftest.err conftest.$ac_objext \ - conftest$ac_exeext conftest.$ac_ext - fi -fi -{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_type_unsigned_long_long_int" >&5 -$as_echo "$ac_cv_type_unsigned_long_long_int" >&6; } - if test $ac_cv_type_unsigned_long_long_int = yes; then - -$as_echo "#define HAVE_UNSIGNED_LONG_LONG_INT 1" >>confdefs.h - fi - { $as_echo "$as_me:${as_lineno-$LINENO}: checking for long long int" >&5 -$as_echo_n "checking for long long int... " >&6; } -if ${ac_cv_type_long_long_int+:} false; then : + { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether the compiler produces multi-arch binaries" >&5 +$as_echo_n "checking whether the compiler produces multi-arch binaries... " >&6; } +if ${gl_cv_c_multiarch+:} false; then : $as_echo_n "(cached) " >&6 else - ac_cv_type_long_long_int=yes - if test "x${ac_cv_prog_cc_c99-no}" = xno; then - ac_cv_type_long_long_int=$ac_cv_type_unsigned_long_long_int - if test $ac_cv_type_long_long_int = yes; then - if test "$cross_compiling" = yes; then : - : -else - cat confdefs.h - <<_ACEOF >conftest.$ac_ext -/* end confdefs.h. */ -#include - #ifndef LLONG_MAX - # define HALF \ - (1LL << (sizeof (long long int) * CHAR_BIT - 2)) - # define LLONG_MAX (HALF - 1 + HALF) - #endif -int -main () -{ -long long int n = 1; - int i; - for (i = 0; ; i++) - { - long long int m = n << i; - if (m >> i != n) - return 1; - if (LLONG_MAX / 2 < m) - break; - } - return 0; - ; - return 0; -} -_ACEOF -if ac_fn_c_try_run "$LINENO"; then : - -else - ac_cv_type_long_long_int=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 - fi -fi -{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_type_long_long_int" >&5 -$as_echo "$ac_cv_type_long_long_int" >&6; } - if test $ac_cv_type_long_long_int = yes; then - -$as_echo "#define HAVE_LONG_LONG_INT 1" >>confdefs.h - - fi - - - - - - - gl_cv_c_multiarch=no - cat confdefs.h - <<_ACEOF >conftest.$ac_ext + gl_cv_c_multiarch=no + cat confdefs.h - <<_ACEOF >conftest.$ac_ext /* end confdefs.h. */ #ifndef __APPLE_CC__ - not a universal capable compiler - #endif - typedef int dummy; + not a universal capable compiler + #endif + typedef int dummy; _ACEOF if ac_fn_c_try_compile "$LINENO"; then : - arch= - prev= - for word in ${CC} ${CFLAGS} ${CPPFLAGS} ${LDFLAGS}; do - if test -n "$prev"; then - case $word in - i?86 | x86_64 | ppc | ppc64) - if test -z "$arch" || test "$arch" = "$word"; then - arch="$word" - else - gl_cv_c_multiarch=yes - fi - ;; - esac - prev= - else - if test "x$word" = "x-arch"; then - prev=arch - fi - fi - done + arch= + prev= + for word in ${CC} ${CFLAGS} ${CPPFLAGS} ${LDFLAGS}; do + if test -n "$prev"; then + case $word in + i?86 | x86_64 | ppc | ppc64 | arm | arm64) + if test -z "$arch" || test "$arch" = "$word"; then + arch="$word" + else + gl_cv_c_multiarch=yes + fi + ;; + esac + prev= + else + if test "x$word" = "x-arch"; then + prev=arch + fi + fi + done fi rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext + +fi +{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $gl_cv_c_multiarch" >&5 +$as_echo "$gl_cv_c_multiarch" >&6; } if test $gl_cv_c_multiarch = yes; then APPLE_UNIVERSAL_BUILD=1 else @@ -11536,18 +12008,10 @@ rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext - if test $ac_cv_type_long_long_int = yes; then - HAVE_LONG_LONG_INT=1 - else - HAVE_LONG_LONG_INT=0 - fi +$as_echo "#define HAVE_LONG_LONG_INT 1" >>confdefs.h - if test $ac_cv_type_unsigned_long_long_int = yes; then - HAVE_UNSIGNED_LONG_LONG_INT=1 - else - HAVE_UNSIGNED_LONG_LONG_INT=0 - fi +$as_echo "#define HAVE_UNSIGNED_LONG_LONG_INT 1" >>confdefs.h @@ -11764,7 +12228,7 @@ uintmax_t j = UINTMAX_MAX; /* Check that SIZE_MAX has the correct type, if possible. */ #if 201112 <= __STDC_VERSION__ int k = _Generic (SIZE_MAX, size_t: 0); -#elif (2 <= __GNUC__ || defined __IBM__TYPEOF__ \ +#elif (2 <= __GNUC__ || 4 <= __clang_major__ || defined __IBM__TYPEOF__ \ || (0x5110 <= __SUNPRO_C && !__STDC__)) extern size_t k; extern __typeof__ (SIZE_MAX) k; @@ -11948,12 +12412,12 @@ $as_echo "$gl_cv_header_working_stdint_h" >&6; } case "$gl_cv_header_working_stdint_h" in *yes) HAVE_C99_STDINT_H=1 - { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether stdint.h predates C++11" >&5 -$as_echo_n "checking whether stdint.h predates C++11... " >&6; } -if ${gl_cv_header_stdint_predates_cxx11_h+:} false; then : + { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether stdint.h works without ISO C predefines" >&5 +$as_echo_n "checking whether stdint.h works without ISO C predefines... " >&6; } +if ${gl_cv_header_stdint_without_STDC_macros+:} false; then : $as_echo_n "(cached) " >&6 else - gl_cv_header_stdint_predates_cxx11_h=yes + gl_cv_header_stdint_without_STDC_macros=no cat confdefs.h - <<_ACEOF >conftest.$ac_ext /* end confdefs.h. */ @@ -11985,14 +12449,15 @@ main () } _ACEOF if ac_fn_c_try_compile "$LINENO"; then : - gl_cv_header_stdint_predates_cxx11_h=no + gl_cv_header_stdint_without_STDC_macros=yes fi rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext + fi -{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $gl_cv_header_stdint_predates_cxx11_h" >&5 -$as_echo "$gl_cv_header_stdint_predates_cxx11_h" >&6; } +{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $gl_cv_header_stdint_without_STDC_macros" >&5 +$as_echo "$gl_cv_header_stdint_without_STDC_macros" >&6; } - if test "$gl_cv_header_stdint_predates_cxx11_h" = yes; then + if test $gl_cv_header_stdint_without_STDC_macros = no; then $as_echo "#define __STDC_CONSTANT_MACROS 1" >>confdefs.h @@ -12411,7 +12876,6 @@ fi REPLACE_STRTOUMAX=0; INT32_MAX_LT_INTMAX_MAX=1; INT64_MAX_EQ_LONG_MAX='defined _LP64'; - PRI_MACROS_BROKEN=0; PRIPTR_PREFIX=__PRIPTR_PREFIX; UINT32_MAX_LT_UINTMAX_MAX=1; UINT64_MAX_EQ_ULONG_MAX='defined _LP64'; @@ -12507,63 +12971,6 @@ $as_echo "$gl_cv_next_inttypes_h" >&6; } - for ac_header in inttypes.h -do : - ac_fn_c_check_header_mongrel "$LINENO" "inttypes.h" "ac_cv_header_inttypes_h" "$ac_includes_default" -if test "x$ac_cv_header_inttypes_h" = xyes; then : - cat >>confdefs.h <<_ACEOF -#define HAVE_INTTYPES_H 1 -_ACEOF - -fi - -done - - if test $ac_cv_header_inttypes_h = yes; then - { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether the inttypes.h PRIxNN macros are broken" >&5 -$as_echo_n "checking whether the inttypes.h PRIxNN macros are broken... " >&6; } -if ${gt_cv_inttypes_pri_broken+:} false; then : - $as_echo_n "(cached) " >&6 -else - - cat confdefs.h - <<_ACEOF >conftest.$ac_ext -/* end confdefs.h. */ - -#include -#ifdef PRId32 -char *p = PRId32; -#endif - -int -main () -{ - - ; - return 0; -} -_ACEOF -if ac_fn_c_try_compile "$LINENO"; then : - gt_cv_inttypes_pri_broken=no -else - gt_cv_inttypes_pri_broken=yes -fi -rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext - -fi -{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $gt_cv_inttypes_pri_broken" >&5 -$as_echo "$gt_cv_inttypes_pri_broken" >&6; } - fi - if test "$gt_cv_inttypes_pri_broken" = yes; then - -cat >>confdefs.h <<_ACEOF -#define PRI_MACROS_BROKEN 1 -_ACEOF - - PRI_MACROS_BROKEN=1 - else - PRI_MACROS_BROKEN=0 - fi - GNULIB_NL_LANGINFO=0; @@ -12575,6 +12982,7 @@ _ACEOF GNULIB_LOCALECONV=0; GNULIB_SETLOCALE=0; + GNULIB_SETLOCALE_NULL=0; GNULIB_DUPLOCALE=0; GNULIB_LOCALENAME=0; HAVE_NEWLOCALE=1; @@ -12639,7 +13047,7 @@ else /* end confdefs.h. */ #include unsigned int s = sizeof (max_align_t); - #if defined __GNUC__ || defined __IBM__ALIGNOF__ + #if defined __GNUC__ || defined __clang__ || defined __IBM__ALIGNOF__ int check1[2 * (__alignof__ (double) <= __alignof__ (max_align_t)) - 1]; int check2[2 * (__alignof__ (long double) <= __alignof__ (max_align_t)) - 1]; #endif @@ -12792,6 +13200,55 @@ $as_echo "$gl_cv_next_stddef_h" >&6; } + { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether locale.h defines locale_t" >&5 +$as_echo_n "checking whether locale.h defines locale_t... " >&6; } +if ${gl_cv_header_locale_has_locale_t+:} false; then : + $as_echo_n "(cached) " >&6 +else + cat confdefs.h - <<_ACEOF >conftest.$ac_ext +/* end confdefs.h. */ +#include + locale_t x; +int +main () +{ + + ; + return 0; +} +_ACEOF +if ac_fn_c_try_compile "$LINENO"; then : + gl_cv_header_locale_has_locale_t=yes +else + gl_cv_header_locale_has_locale_t=no +fi +rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext + +fi +{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $gl_cv_header_locale_has_locale_t" >&5 +$as_echo "$gl_cv_header_locale_has_locale_t" >&6; } + + + if test $ac_cv_header_xlocale_h = yes; then + HAVE_XLOCALE_H=1 + if test $gl_cv_header_locale_has_locale_t = yes; then + gl_cv_header_locale_h_needs_xlocale_h=no + else + gl_cv_header_locale_h_needs_xlocale_h=yes + fi + HAVE_LOCALE_T=1 + else + HAVE_XLOCALE_H=0 + gl_cv_header_locale_h_needs_xlocale_h=no + if test $gl_cv_header_locale_has_locale_t = yes; then + HAVE_LOCALE_T=1 + else + HAVE_LOCALE_T=0 + fi + fi + + + gl_threads_api=none LIBTHREAD= @@ -12799,13 +13256,15 @@ $as_echo "$gl_cv_next_stddef_h" >&6; } LIBMULTITHREAD= LTLIBMULTITHREAD= if test "$gl_use_threads" != no; then - { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether imported symbols can be declared weak" >&5 + + + { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether imported symbols can be declared weak" >&5 $as_echo_n "checking whether imported symbols can be declared weak... " >&6; } if ${gl_cv_have_weak+:} false; then : $as_echo_n "(cached) " >&6 else gl_cv_have_weak=no - cat confdefs.h - <<_ACEOF >conftest.$ac_ext + cat confdefs.h - <<_ACEOF >conftest.$ac_ext /* end confdefs.h. */ extern void xyzzy (); #pragma weak xyzzy @@ -12822,13 +13281,13 @@ if ac_fn_c_try_link "$LINENO"; then : fi rm -f core conftest.err conftest.$ac_objext \ conftest$ac_exeext conftest.$ac_ext - if test $gl_cv_have_weak = maybe; then - if test "$cross_compiling" = yes; then : - cat confdefs.h - <<_ACEOF >conftest.$ac_ext + if test $gl_cv_have_weak = maybe; then + if test "$cross_compiling" = yes; then : + cat confdefs.h - <<_ACEOF >conftest.$ac_ext /* end confdefs.h. */ #ifdef __ELF__ - Extensible Linking Format - #endif + Extensible Linking Format + #endif _ACEOF if (eval "$ac_cpp conftest.$ac_ext") 2>&5 | @@ -12860,22 +13319,63 @@ rm -f core *.core core.conftest.* gmon.out bb.out conftest$ac_exeext \ conftest.$ac_objext conftest.beam conftest.$ac_ext fi - fi - case " $LDFLAGS " in - *" -static "*) gl_cv_have_weak=no ;; - esac + fi + case " $LDFLAGS " in + *" -static "*) gl_cv_have_weak=no ;; + esac + case "$gl_cv_have_weak" in + *yes) + case "$host_os" in + freebsd* | dragonfly*) + : > conftest1.c + $CC $CPPFLAGS $CFLAGS $LDFLAGS -fPIC -shared -o libempty.so conftest1.c -lpthread >&5 2>&1 + cat < conftest2.c +#include +#pragma weak pthread_mutexattr_gettype +int main () +{ + return (pthread_mutexattr_gettype != NULL); +} +EOF + $CC $CPPFLAGS $CFLAGS $LDFLAGS -o conftest conftest2.c libempty.so >&5 2>&1 \ + || gl_cv_have_weak=no + rm -f conftest1.c libempty.so conftest2.c conftest + ;; + esac + ;; + esac fi { $as_echo "$as_me:${as_lineno-$LINENO}: result: $gl_cv_have_weak" >&5 $as_echo "$gl_cv_have_weak" >&6; } + case "$gl_cv_have_weak" in + *yes) + +$as_echo "#define HAVE_WEAK_SYMBOLS 1" >>confdefs.h + + ;; + esac + if case "$gl_cv_have_weak" in *yes) true;; *) false;; esac; then : fi - if test "$gl_use_threads" = yes || test "$gl_use_threads" = posix; then - # On OSF/1, the compiler needs the flag -pthread or -D_REENTRANT so that - # it groks . It's added above, in gl_THREADLIB_EARLY_BODY. - ac_fn_c_check_header_mongrel "$LINENO" "pthread.h" "ac_cv_header_pthread_h" "$ac_includes_default" + if test "$gl_use_threads" = isoc || test "$gl_use_threads" = isoc+posix; then + + gl_have_isoc_threads="$ac_cv_header_threads_h" + fi + if test "$gl_use_threads" = yes \ + || test "$gl_use_threads" = posix \ + || test "$gl_use_threads" = isoc+posix; then + + + if test -z "$gl_pthreadlib_body_done"; then + gl_pthread_api=no + LIBPTHREAD= + LIBPMULTITHREAD= + # On OSF/1, the compiler needs the flag -pthread or -D_REENTRANT so that + # it groks . It's added above, in gl_ANYTHREADLIB_EARLY. + ac_fn_c_check_header_mongrel "$LINENO" "pthread.h" "ac_cv_header_pthread_h" "$ac_includes_default" if test "x$ac_cv_header_pthread_h" = xyes; then : gl_have_pthread_h=yes else @@ -12883,53 +13383,52 @@ else fi - if test "$gl_have_pthread_h" = yes; then - # Other possible tests: - # -lpthreads (FSU threads, PCthreads) - # -lgthreads - gl_have_pthread= - # Test whether both pthread_mutex_lock and pthread_mutexattr_init exist - # in libc. IRIX 6.5 has the first one in both libc and libpthread, but - # the second one only in libpthread, and lock.c needs it. - # - # If -pthread works, prefer it to -lpthread, since Ubuntu 14.04 - # needs -pthread for some reason. See: - # https://lists.gnu.org/r/bug-gnulib/2014-09/msg00023.html - save_LIBS=$LIBS - for gl_pthread in '' '-pthread'; do - LIBS="$LIBS $gl_pthread" - cat confdefs.h - <<_ACEOF >conftest.$ac_ext + if test "$gl_have_pthread_h" = yes; then + # Other possible tests: + # -lpthreads (FSU threads, PCthreads) + # -lgthreads + # Test whether both pthread_mutex_lock and pthread_mutexattr_init exist + # in libc. IRIX 6.5 has the first one in both libc and libpthread, but + # the second one only in libpthread, and lock.c needs it. + # + # If -pthread works, prefer it to -lpthread, since Ubuntu 14.04 + # needs -pthread for some reason. See: + # https://lists.gnu.org/r/bug-gnulib/2014-09/msg00023.html + save_LIBS=$LIBS + for gl_pthread in '' '-pthread'; do + LIBS="$LIBS $gl_pthread" + cat confdefs.h - <<_ACEOF >conftest.$ac_ext /* end confdefs.h. */ #include - pthread_mutex_t m; - pthread_mutexattr_t ma; + pthread_mutex_t m; + pthread_mutexattr_t ma; int main () { pthread_mutex_lock (&m); - pthread_mutexattr_init (&ma); + pthread_mutexattr_init (&ma); ; return 0; } _ACEOF if ac_fn_c_try_link "$LINENO"; then : - gl_have_pthread=yes - LIBTHREAD=$gl_pthread LTLIBTHREAD=$gl_pthread - LIBMULTITHREAD=$gl_pthread LTLIBMULTITHREAD=$gl_pthread + gl_pthread_api=yes + LIBPTHREAD=$gl_pthread + LIBPMULTITHREAD=$gl_pthread fi rm -f core conftest.err conftest.$ac_objext \ conftest$ac_exeext conftest.$ac_ext - LIBS=$save_LIBS - test -n "$gl_have_pthread" && break - done + LIBS=$save_LIBS + test $gl_pthread_api = yes && break + done - # Test for libpthread by looking for pthread_kill. (Not pthread_self, - # since it is defined as a macro on OSF/1.) - if test -n "$gl_have_pthread" && test -z "$LIBTHREAD"; then - # The program links fine without libpthread. But it may actually - # need to link with libpthread in order to create multiple threads. - { $as_echo "$as_me:${as_lineno-$LINENO}: checking for pthread_kill in -lpthread" >&5 + # Test for libpthread by looking for pthread_kill. (Not pthread_self, + # since it is defined as a macro on OSF/1.) + if test $gl_pthread_api = yes && test -z "$LIBPTHREAD"; then + # The program links fine without libpthread. But it may actually + # need to link with libpthread in order to create multiple threads. + { $as_echo "$as_me:${as_lineno-$LINENO}: checking for pthread_kill in -lpthread" >&5 $as_echo_n "checking for pthread_kill in -lpthread... " >&6; } if ${ac_cv_lib_pthread_pthread_kill+:} false; then : $as_echo_n "(cached) " >&6 @@ -12966,25 +13465,25 @@ fi { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_pthread_pthread_kill" >&5 $as_echo "$ac_cv_lib_pthread_pthread_kill" >&6; } if test "x$ac_cv_lib_pthread_pthread_kill" = xyes; then : - LIBMULTITHREAD=-lpthread LTLIBMULTITHREAD=-lpthread - # On Solaris and HP-UX, most pthread functions exist also in libc. - # Therefore pthread_in_use() needs to actually try to create a - # thread: pthread_create from libc will fail, whereas - # pthread_create will actually create a thread. - # 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*) + LIBPMULTITHREAD=-lpthread + # On Solaris and HP-UX, most pthread functions exist also in libc. + # Therefore pthread_in_use() needs to actually try to create a + # thread: pthread_create from libc will fail, whereas + # pthread_create will actually create a thread. + # 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*) $as_echo "#define PTHREAD_IN_USE_DETECTION_HARD 1" >>confdefs.h - esac + esac fi - elif test -z "$gl_have_pthread"; then - # Some library is needed. Try libpthread and libc_r. - { $as_echo "$as_me:${as_lineno-$LINENO}: checking for pthread_kill in -lpthread" >&5 + elif test $gl_pthread_api != yes; then + # Some library is needed. Try libpthread and libc_r. + { $as_echo "$as_me:${as_lineno-$LINENO}: checking for pthread_kill in -lpthread" >&5 $as_echo_n "checking for pthread_kill in -lpthread... " >&6; } if ${ac_cv_lib_pthread_pthread_kill+:} false; then : $as_echo_n "(cached) " >&6 @@ -13021,14 +13520,14 @@ fi { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_pthread_pthread_kill" >&5 $as_echo "$ac_cv_lib_pthread_pthread_kill" >&6; } if test "x$ac_cv_lib_pthread_pthread_kill" = xyes; then : - gl_have_pthread=yes - LIBTHREAD=-lpthread LTLIBTHREAD=-lpthread - LIBMULTITHREAD=-lpthread LTLIBMULTITHREAD=-lpthread + gl_pthread_api=yes + LIBPTHREAD=-lpthread + LIBPMULTITHREAD=-lpthread fi - if test -z "$gl_have_pthread"; then - # For FreeBSD 4. - { $as_echo "$as_me:${as_lineno-$LINENO}: checking for pthread_kill in -lc_r" >&5 + if test $gl_pthread_api != yes; then + # For FreeBSD 4. + { $as_echo "$as_me:${as_lineno-$LINENO}: checking for pthread_kill in -lc_r" >&5 $as_echo_n "checking for pthread_kill in -lc_r... " >&6; } if ${ac_cv_lib_c_r_pthread_kill+:} false; then : $as_echo_n "(cached) " >&6 @@ -13065,14 +13564,141 @@ fi { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_c_r_pthread_kill" >&5 $as_echo "$ac_cv_lib_c_r_pthread_kill" >&6; } if test "x$ac_cv_lib_c_r_pthread_kill" = xyes; then : - gl_have_pthread=yes - LIBTHREAD=-lc_r LTLIBTHREAD=-lc_r - LIBMULTITHREAD=-lc_r LTLIBMULTITHREAD=-lc_r + gl_pthread_api=yes + LIBPTHREAD=-lc_r + LIBPMULTITHREAD=-lc_r fi - fi fi - if test -n "$gl_have_pthread"; then + fi + fi + { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether POSIX threads API is available" >&5 +$as_echo_n "checking whether POSIX threads API is available... " >&6; } + { $as_echo "$as_me:${as_lineno-$LINENO}: result: $gl_pthread_api" >&5 +$as_echo "$gl_pthread_api" >&6; } + + + if test $gl_pthread_api = yes; then + +$as_echo "#define HAVE_PTHREAD_API 1" >>confdefs.h + + fi + + cat confdefs.h - <<_ACEOF >conftest.$ac_ext +/* end confdefs.h. */ +#include +int +main () +{ +sched_yield (); + ; + return 0; +} +_ACEOF +if ac_fn_c_try_link "$LINENO"; then : + LIB_SCHED_YIELD= + +else + { $as_echo "$as_me:${as_lineno-$LINENO}: checking for sched_yield in -lrt" >&5 +$as_echo_n "checking for sched_yield in -lrt... " >&6; } +if ${ac_cv_lib_rt_sched_yield+:} false; then : + $as_echo_n "(cached) " >&6 +else + ac_check_lib_save_LIBS=$LIBS +LIBS="-lrt $LIBS" +cat confdefs.h - <<_ACEOF >conftest.$ac_ext +/* end confdefs.h. */ + +/* Override any GCC internal prototype to avoid an error. + Use char because int might match the return type of a GCC + builtin and then its argument prototype would still apply. */ +#ifdef __cplusplus +extern "C" +#endif +char sched_yield (); +int +main () +{ +return sched_yield (); + ; + return 0; +} +_ACEOF +if ac_fn_c_try_link "$LINENO"; then : + ac_cv_lib_rt_sched_yield=yes +else + ac_cv_lib_rt_sched_yield=no +fi +rm -f core conftest.err conftest.$ac_objext \ + conftest$ac_exeext conftest.$ac_ext +LIBS=$ac_check_lib_save_LIBS +fi +{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_rt_sched_yield" >&5 +$as_echo "$ac_cv_lib_rt_sched_yield" >&6; } +if test "x$ac_cv_lib_rt_sched_yield" = xyes; then : + LIB_SCHED_YIELD=-lrt +else + { $as_echo "$as_me:${as_lineno-$LINENO}: checking for sched_yield in -lposix4" >&5 +$as_echo_n "checking for sched_yield in -lposix4... " >&6; } +if ${ac_cv_lib_posix4_sched_yield+:} false; then : + $as_echo_n "(cached) " >&6 +else + ac_check_lib_save_LIBS=$LIBS +LIBS="-lposix4 $LIBS" +cat confdefs.h - <<_ACEOF >conftest.$ac_ext +/* end confdefs.h. */ + +/* Override any GCC internal prototype to avoid an error. + Use char because int might match the return type of a GCC + builtin and then its argument prototype would still apply. */ +#ifdef __cplusplus +extern "C" +#endif +char sched_yield (); +int +main () +{ +return sched_yield (); + ; + return 0; +} +_ACEOF +if ac_fn_c_try_link "$LINENO"; then : + ac_cv_lib_posix4_sched_yield=yes +else + ac_cv_lib_posix4_sched_yield=no +fi +rm -f core conftest.err conftest.$ac_objext \ + conftest$ac_exeext conftest.$ac_ext +LIBS=$ac_check_lib_save_LIBS +fi +{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_posix4_sched_yield" >&5 +$as_echo "$ac_cv_lib_posix4_sched_yield" >&6; } +if test "x$ac_cv_lib_posix4_sched_yield" = xyes; then : + LIB_SCHED_YIELD=-lposix4 +fi + +fi + + +fi +rm -f core conftest.err conftest.$ac_objext \ + conftest$ac_exeext conftest.$ac_ext + + + gl_pthreadlib_body_done=done + fi + + LIBTHREAD=$LIBPTHREAD LTLIBTHREAD=$LIBPTHREAD + LIBMULTITHREAD=$LIBPMULTITHREAD LTLIBMULTITHREAD=$LIBPMULTITHREAD + if test $gl_pthread_api = yes; then + if test "$gl_use_threads" = isoc+posix && test "$gl_have_isoc_threads" = yes; then + gl_threads_api='isoc+posix' + +$as_echo "#define USE_ISOC_AND_POSIX_THREADS 1" >>confdefs.h + + LIBTHREAD= LTLIBTHREAD= + else gl_threads_api=posix $as_echo "#define USE_POSIX_THREADS 1" >>confdefs.h @@ -13082,14 +13708,442 @@ $as_echo "#define USE_POSIX_THREADS 1" >>confdefs.h $as_echo "#define USE_POSIX_THREADS_WEAK 1" >>confdefs.h - LIBTHREAD= - LTLIBTHREAD= + LIBTHREAD= LTLIBTHREAD= + else + case "$host_os" in + freebsd* | dragonfly*) + if test "x$LIBTHREAD" != "x$LIBMULTITHREAD"; then + +$as_echo "#define PTHREAD_IN_USE_DETECTION_HARD 1" >>confdefs.h + + fi + ;; + esac fi fi fi fi fi - if test -z "$gl_have_pthread"; then + if test $gl_threads_api = none; then + if test "$gl_use_threads" = isoc && test "$gl_have_isoc_threads" = yes; then + + + + if test -z "$gl_stdthreadlib_body_done"; then + + + case "$host_os" in + mingw*) + LIBSTDTHREAD= + ;; + *) + + + if test -z "$gl_pthreadlib_body_done"; then + gl_pthread_api=no + LIBPTHREAD= + LIBPMULTITHREAD= + # On OSF/1, the compiler needs the flag -pthread or -D_REENTRANT so that + # it groks . It's added above, in gl_ANYTHREADLIB_EARLY. + ac_fn_c_check_header_mongrel "$LINENO" "pthread.h" "ac_cv_header_pthread_h" "$ac_includes_default" +if test "x$ac_cv_header_pthread_h" = xyes; then : + gl_have_pthread_h=yes +else + gl_have_pthread_h=no +fi + + + if test "$gl_have_pthread_h" = yes; then + # Other possible tests: + # -lpthreads (FSU threads, PCthreads) + # -lgthreads + # Test whether both pthread_mutex_lock and pthread_mutexattr_init exist + # in libc. IRIX 6.5 has the first one in both libc and libpthread, but + # the second one only in libpthread, and lock.c needs it. + # + # If -pthread works, prefer it to -lpthread, since Ubuntu 14.04 + # needs -pthread for some reason. See: + # https://lists.gnu.org/r/bug-gnulib/2014-09/msg00023.html + save_LIBS=$LIBS + for gl_pthread in '' '-pthread'; do + LIBS="$LIBS $gl_pthread" + cat confdefs.h - <<_ACEOF >conftest.$ac_ext +/* end confdefs.h. */ +#include + pthread_mutex_t m; + pthread_mutexattr_t ma; + +int +main () +{ +pthread_mutex_lock (&m); + pthread_mutexattr_init (&ma); + ; + return 0; +} +_ACEOF +if ac_fn_c_try_link "$LINENO"; then : + gl_pthread_api=yes + LIBPTHREAD=$gl_pthread + LIBPMULTITHREAD=$gl_pthread +fi +rm -f core conftest.err conftest.$ac_objext \ + conftest$ac_exeext conftest.$ac_ext + LIBS=$save_LIBS + test $gl_pthread_api = yes && break + done + + # Test for libpthread by looking for pthread_kill. (Not pthread_self, + # since it is defined as a macro on OSF/1.) + if test $gl_pthread_api = yes && test -z "$LIBPTHREAD"; then + # The program links fine without libpthread. But it may actually + # need to link with libpthread in order to create multiple threads. + { $as_echo "$as_me:${as_lineno-$LINENO}: checking for pthread_kill in -lpthread" >&5 +$as_echo_n "checking for pthread_kill in -lpthread... " >&6; } +if ${ac_cv_lib_pthread_pthread_kill+:} false; then : + $as_echo_n "(cached) " >&6 +else + ac_check_lib_save_LIBS=$LIBS +LIBS="-lpthread $LIBS" +cat confdefs.h - <<_ACEOF >conftest.$ac_ext +/* end confdefs.h. */ + +/* Override any GCC internal prototype to avoid an error. + Use char because int might match the return type of a GCC + builtin and then its argument prototype would still apply. */ +#ifdef __cplusplus +extern "C" +#endif +char pthread_kill (); +int +main () +{ +return pthread_kill (); + ; + return 0; +} +_ACEOF +if ac_fn_c_try_link "$LINENO"; then : + ac_cv_lib_pthread_pthread_kill=yes +else + ac_cv_lib_pthread_pthread_kill=no +fi +rm -f core conftest.err conftest.$ac_objext \ + conftest$ac_exeext conftest.$ac_ext +LIBS=$ac_check_lib_save_LIBS +fi +{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_pthread_pthread_kill" >&5 +$as_echo "$ac_cv_lib_pthread_pthread_kill" >&6; } +if test "x$ac_cv_lib_pthread_pthread_kill" = xyes; then : + LIBPMULTITHREAD=-lpthread + # On Solaris and HP-UX, most pthread functions exist also in libc. + # Therefore pthread_in_use() needs to actually try to create a + # thread: pthread_create from libc will fail, whereas + # pthread_create will actually create a thread. + # 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*) + +$as_echo "#define PTHREAD_IN_USE_DETECTION_HARD 1" >>confdefs.h + + esac + +fi + + elif test $gl_pthread_api != yes; then + # Some library is needed. Try libpthread and libc_r. + { $as_echo "$as_me:${as_lineno-$LINENO}: checking for pthread_kill in -lpthread" >&5 +$as_echo_n "checking for pthread_kill in -lpthread... " >&6; } +if ${ac_cv_lib_pthread_pthread_kill+:} false; then : + $as_echo_n "(cached) " >&6 +else + ac_check_lib_save_LIBS=$LIBS +LIBS="-lpthread $LIBS" +cat confdefs.h - <<_ACEOF >conftest.$ac_ext +/* end confdefs.h. */ + +/* Override any GCC internal prototype to avoid an error. + Use char because int might match the return type of a GCC + builtin and then its argument prototype would still apply. */ +#ifdef __cplusplus +extern "C" +#endif +char pthread_kill (); +int +main () +{ +return pthread_kill (); + ; + return 0; +} +_ACEOF +if ac_fn_c_try_link "$LINENO"; then : + ac_cv_lib_pthread_pthread_kill=yes +else + ac_cv_lib_pthread_pthread_kill=no +fi +rm -f core conftest.err conftest.$ac_objext \ + conftest$ac_exeext conftest.$ac_ext +LIBS=$ac_check_lib_save_LIBS +fi +{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_pthread_pthread_kill" >&5 +$as_echo "$ac_cv_lib_pthread_pthread_kill" >&6; } +if test "x$ac_cv_lib_pthread_pthread_kill" = xyes; then : + gl_pthread_api=yes + LIBPTHREAD=-lpthread + LIBPMULTITHREAD=-lpthread +fi + + if test $gl_pthread_api != yes; then + # For FreeBSD 4. + { $as_echo "$as_me:${as_lineno-$LINENO}: checking for pthread_kill in -lc_r" >&5 +$as_echo_n "checking for pthread_kill in -lc_r... " >&6; } +if ${ac_cv_lib_c_r_pthread_kill+:} false; then : + $as_echo_n "(cached) " >&6 +else + ac_check_lib_save_LIBS=$LIBS +LIBS="-lc_r $LIBS" +cat confdefs.h - <<_ACEOF >conftest.$ac_ext +/* end confdefs.h. */ + +/* Override any GCC internal prototype to avoid an error. + Use char because int might match the return type of a GCC + builtin and then its argument prototype would still apply. */ +#ifdef __cplusplus +extern "C" +#endif +char pthread_kill (); +int +main () +{ +return pthread_kill (); + ; + return 0; +} +_ACEOF +if ac_fn_c_try_link "$LINENO"; then : + ac_cv_lib_c_r_pthread_kill=yes +else + ac_cv_lib_c_r_pthread_kill=no +fi +rm -f core conftest.err conftest.$ac_objext \ + conftest$ac_exeext conftest.$ac_ext +LIBS=$ac_check_lib_save_LIBS +fi +{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_c_r_pthread_kill" >&5 +$as_echo "$ac_cv_lib_c_r_pthread_kill" >&6; } +if test "x$ac_cv_lib_c_r_pthread_kill" = xyes; then : + gl_pthread_api=yes + LIBPTHREAD=-lc_r + LIBPMULTITHREAD=-lc_r +fi + + fi + fi + fi + { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether POSIX threads API is available" >&5 +$as_echo_n "checking whether POSIX threads API is available... " >&6; } + { $as_echo "$as_me:${as_lineno-$LINENO}: result: $gl_pthread_api" >&5 +$as_echo "$gl_pthread_api" >&6; } + + + if test $gl_pthread_api = yes; then + +$as_echo "#define HAVE_PTHREAD_API 1" >>confdefs.h + + fi + + cat confdefs.h - <<_ACEOF >conftest.$ac_ext +/* end confdefs.h. */ +#include +int +main () +{ +sched_yield (); + ; + return 0; +} +_ACEOF +if ac_fn_c_try_link "$LINENO"; then : + LIB_SCHED_YIELD= + +else + { $as_echo "$as_me:${as_lineno-$LINENO}: checking for sched_yield in -lrt" >&5 +$as_echo_n "checking for sched_yield in -lrt... " >&6; } +if ${ac_cv_lib_rt_sched_yield+:} false; then : + $as_echo_n "(cached) " >&6 +else + ac_check_lib_save_LIBS=$LIBS +LIBS="-lrt $LIBS" +cat confdefs.h - <<_ACEOF >conftest.$ac_ext +/* end confdefs.h. */ + +/* Override any GCC internal prototype to avoid an error. + Use char because int might match the return type of a GCC + builtin and then its argument prototype would still apply. */ +#ifdef __cplusplus +extern "C" +#endif +char sched_yield (); +int +main () +{ +return sched_yield (); + ; + return 0; +} +_ACEOF +if ac_fn_c_try_link "$LINENO"; then : + ac_cv_lib_rt_sched_yield=yes +else + ac_cv_lib_rt_sched_yield=no +fi +rm -f core conftest.err conftest.$ac_objext \ + conftest$ac_exeext conftest.$ac_ext +LIBS=$ac_check_lib_save_LIBS +fi +{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_rt_sched_yield" >&5 +$as_echo "$ac_cv_lib_rt_sched_yield" >&6; } +if test "x$ac_cv_lib_rt_sched_yield" = xyes; then : + LIB_SCHED_YIELD=-lrt +else + { $as_echo "$as_me:${as_lineno-$LINENO}: checking for sched_yield in -lposix4" >&5 +$as_echo_n "checking for sched_yield in -lposix4... " >&6; } +if ${ac_cv_lib_posix4_sched_yield+:} false; then : + $as_echo_n "(cached) " >&6 +else + ac_check_lib_save_LIBS=$LIBS +LIBS="-lposix4 $LIBS" +cat confdefs.h - <<_ACEOF >conftest.$ac_ext +/* end confdefs.h. */ + +/* Override any GCC internal prototype to avoid an error. + Use char because int might match the return type of a GCC + builtin and then its argument prototype would still apply. */ +#ifdef __cplusplus +extern "C" +#endif +char sched_yield (); +int +main () +{ +return sched_yield (); + ; + return 0; +} +_ACEOF +if ac_fn_c_try_link "$LINENO"; then : + ac_cv_lib_posix4_sched_yield=yes +else + ac_cv_lib_posix4_sched_yield=no +fi +rm -f core conftest.err conftest.$ac_objext \ + conftest$ac_exeext conftest.$ac_ext +LIBS=$ac_check_lib_save_LIBS +fi +{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_posix4_sched_yield" >&5 +$as_echo "$ac_cv_lib_posix4_sched_yield" >&6; } +if test "x$ac_cv_lib_posix4_sched_yield" = xyes; then : + LIB_SCHED_YIELD=-lposix4 +fi + +fi + + +fi +rm -f core conftest.err conftest.$ac_objext \ + conftest$ac_exeext conftest.$ac_ext + + + gl_pthreadlib_body_done=done + fi + + if test $ac_cv_header_threads_h = yes; then + for ac_func in thrd_create +do : + ac_fn_c_check_func "$LINENO" "thrd_create" "ac_cv_func_thrd_create" +if test "x$ac_cv_func_thrd_create" = xyes; then : + cat >>confdefs.h <<_ACEOF +#define HAVE_THRD_CREATE 1 +_ACEOF + +fi +done + + if test $ac_cv_func_thrd_create = yes; then + LIBSTDTHREAD= + else + { $as_echo "$as_me:${as_lineno-$LINENO}: checking for thrd_create in -lstdthreads" >&5 +$as_echo_n "checking for thrd_create in -lstdthreads... " >&6; } +if ${ac_cv_lib_stdthreads_thrd_create+:} false; then : + $as_echo_n "(cached) " >&6 +else + ac_check_lib_save_LIBS=$LIBS +LIBS="-lstdthreads $LIBS" +cat confdefs.h - <<_ACEOF >conftest.$ac_ext +/* end confdefs.h. */ + +/* Override any GCC internal prototype to avoid an error. + Use char because int might match the return type of a GCC + builtin and then its argument prototype would still apply. */ +#ifdef __cplusplus +extern "C" +#endif +char thrd_create (); +int +main () +{ +return thrd_create (); + ; + return 0; +} +_ACEOF +if ac_fn_c_try_link "$LINENO"; then : + ac_cv_lib_stdthreads_thrd_create=yes +else + ac_cv_lib_stdthreads_thrd_create=no +fi +rm -f core conftest.err conftest.$ac_objext \ + conftest$ac_exeext conftest.$ac_ext +LIBS=$ac_check_lib_save_LIBS +fi +{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_stdthreads_thrd_create" >&5 +$as_echo "$ac_cv_lib_stdthreads_thrd_create" >&6; } +if test "x$ac_cv_lib_stdthreads_thrd_create" = xyes; then : + + LIBSTDTHREAD='-lstdthreads -lpthread' + +else + + LIBSTDTHREAD="$LIBPMULTITHREAD" + +fi + + fi + else + LIBSTDTHREAD="$LIBPMULTITHREAD $LIB_SCHED_YIELD" + fi + ;; + esac + + + { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether ISO C threads API is available" >&5 +$as_echo_n "checking whether ISO C threads API is available... " >&6; } + { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_header_threads_h" >&5 +$as_echo "$ac_cv_header_threads_h" >&6; } + gl_stdthreadlib_body_done=done + fi + + LIBTHREAD=$LIBSTDTHREAD LTLIBTHREAD=$LIBSTDTHREAD + LIBMULTITHREAD=$LIBSTDTHREAD LTLIBMULTITHREAD=$LIBSTDTHREAD + gl_threads_api=isoc + +$as_echo "#define USE_ISOC_THREADS 1" >>confdefs.h + + fi + fi + if test $gl_threads_api = none; then case "$gl_use_threads" in yes | windows | win32) # The 'win32' is for backward compatibility. if { case "$host_os" in @@ -13238,8 +14292,8 @@ else # Guess no on native Windows. gl_cv_func_lstat_dereferences_slashed_symlink="guessing no" ;; *) - # If we don't know, assume the worst. - gl_cv_func_lstat_dereferences_slashed_symlink="guessing no" ;; + # If we don't know, obey --enable-cross-guesses. + gl_cv_func_lstat_dereferences_slashed_symlink="$gl_cross_guess_normal" ;; esac else @@ -13356,19 +14410,7 @@ $as_echo "$ac_cv_path_SED" >&6; } - for ac_header in stdlib.h -do : - ac_fn_c_check_header_mongrel "$LINENO" "stdlib.h" "ac_cv_header_stdlib_h" "$ac_includes_default" -if test "x$ac_cv_header_stdlib_h" = xyes; then : - cat >>confdefs.h <<_ACEOF -#define HAVE_STDLIB_H 1 -_ACEOF - -fi - -done - - { $as_echo "$as_me:${as_lineno-$LINENO}: checking for GNU libc compatible malloc" >&5 + { $as_echo "$as_me:${as_lineno-$LINENO}: checking for GNU libc compatible malloc" >&5 $as_echo_n "checking for GNU libc compatible malloc... " >&6; } if ${ac_cv_func_malloc_0_nonnull+:} false; then : $as_echo_n "(cached) " >&6 @@ -13379,18 +14421,14 @@ else *-gnu* | gnu* | *-musl* | freebsd* | netbsd* | openbsd* \ | hpux* | solaris* | cygwin* | mingw*) ac_cv_func_malloc_0_nonnull="guessing yes" ;; - # If we don't know, assume the worst. - *) ac_cv_func_malloc_0_nonnull="guessing no" ;; + # If we don't know, obey --enable-cross-guesses. + *) ac_cv_func_malloc_0_nonnull="$gl_cross_guess_normal" ;; esac else cat confdefs.h - <<_ACEOF >conftest.$ac_ext /* end confdefs.h. */ -#if defined STDC_HEADERS || defined HAVE_STDLIB_H - # include - #else - char *malloc (); - #endif +#include int main () @@ -13631,10 +14669,9 @@ $as_echo "$gt_cv_locale_ja" >&6; } - - { $as_echo "$as_me:${as_lineno-$LINENO}: checking for a transitional chinese locale" >&5 -$as_echo_n "checking for a transitional chinese locale... " >&6; } -if ${gt_cv_locale_zh_CN+:} false; then : + { $as_echo "$as_me:${as_lineno-$LINENO}: checking for a french Unicode locale" >&5 +$as_echo_n "checking for a french Unicode locale... " >&6; } +if ${gt_cv_locale_fr_utf8+:} false; then : $as_echo_n "(cached) " >&6 else @@ -13642,7 +14679,6 @@ else /* end confdefs.h. */ #include -#include #include #if HAVE_LANGINFO_CODESET # include @@ -13651,14 +14687,11 @@ else #include struct tm t; char buf[16]; -int main () -{ +int main () { /* On BeOS and Haiku, locales are not implemented in libc. Rather, libintl imitates locale dependent behaviour by looking at the environment variables, and all locales use the UTF-8 encoding. */ -#if defined __BEOS__ || defined __HAIKU__ - return 1; -#else +#if !(defined __BEOS__ || defined __HAIKU__) /* Check whether the given locale name is recognized by the system. */ # if defined _WIN32 && !defined __CYGWIN__ /* On native Windows, setlocale(category, "") looks at the system settings, @@ -13676,14 +14709,11 @@ int main () is empty, and the behaviour of Tcl 8.4 in this locale is not useful. On OpenBSD 4.0, when an unsupported locale is specified, setlocale() succeeds but then nl_langinfo(CODESET) is "646". In this situation, - some unit tests fail. - On MirBSD 10, when an unsupported locale is specified, setlocale() - succeeds but then nl_langinfo(CODESET) is "UTF-8". */ + some unit tests fail. */ # if HAVE_LANGINFO_CODESET { const char *cs = nl_langinfo (CODESET); - if (cs[0] == '\0' || strcmp (cs, "ASCII") == 0 || strcmp (cs, "646") == 0 - || strcmp (cs, "UTF-8") == 0) + if (cs[0] == '\0' || strcmp (cs, "ASCII") == 0 || strcmp (cs, "646") == 0) return 1; } # endif @@ -13693,22 +14723,21 @@ int main () LC_ALL is set on the command line. */ if (strchr (getenv ("LC_ALL"), '.') == NULL) return 1; # endif - /* Check whether in a month name, no byte in the range 0x80..0x9F occurs. - This excludes the UTF-8 encoding (except on MirBSD). */ - { - const char *p; - t.tm_year = 1975 - 1900; t.tm_mon = 2 - 1; t.tm_mday = 4; - if (strftime (buf, sizeof (buf), "%B", &t) < 2) return 1; - for (p = buf; *p != '\0'; p++) - if ((unsigned char) *p >= 0x80 && (unsigned char) *p < 0xa0) - return 1; - } - /* Check whether a typical GB18030 multibyte sequence is recognized as a - single wide character. This excludes the GB2312 and GBK encodings. */ - if (mblen ("\203\062\332\066", 5) != 4) - return 1; - return 0; + /* Check whether in the abbreviation of the second month, the second + character (should be U+00E9: LATIN SMALL LETTER E WITH ACUTE) is + two bytes long, with UTF-8 encoding. */ + t.tm_year = 1975 - 1900; t.tm_mon = 2 - 1; t.tm_mday = 4; + if (strftime (buf, sizeof (buf), "%b", &t) < 4 + || buf[1] != (char) 0xc3 || buf[2] != (char) 0xa9 || buf[3] != 'v') + return 1; +#endif +#if !defined __BIONIC__ /* Bionic libc's 'struct lconv' is just a dummy. */ + /* Check whether the decimal separator is a comma. + On NetBSD 3.0 in the fr_FR.ISO8859-1 locale, localeconv()->decimal_point + are nl_langinfo(RADIXCHAR) are both ".". */ + if (localeconv () ->decimal_point[0] != ',') return 1; #endif + return 0; } _ACEOF @@ -13726,56 +14755,52 @@ _ACEOF # and similar. mingw*) # Test for the hypothetical native Windows locale name. - if (LC_ALL=Chinese_China.54936 LC_TIME= LC_CTYPE= ./conftest; exit) 2>/dev/null; then - gt_cv_locale_zh_CN=Chinese_China.54936 + if (LC_ALL=French_France.65001 LC_TIME= LC_CTYPE= ./conftest; exit) 2>/dev/null; then + gt_cv_locale_fr_utf8=French_France.65001 else # None found. - gt_cv_locale_zh_CN=none + gt_cv_locale_fr_utf8=none fi ;; - solaris2.8) - # On Solaris 8, the locales zh_CN.GB18030, zh_CN.GBK, zh.GBK are - # broken. One witness is the test case in gl_MBRTOWC_SANITYCHECK. - # Another witness is that "LC_ALL=zh_CN.GB18030 bash -c true" dumps core. - gt_cv_locale_zh_CN=none - ;; *) # Setting LC_ALL is not enough. Need to set LC_TIME to empty, because # otherwise on Mac OS X 10.3.5 the LC_TIME=C from the beginning of the # configure script would override the LC_ALL setting. Likewise for # LC_CTYPE, which is also set at the beginning of the configure script. - # Test for the locale name without encoding suffix. - if (LC_ALL=zh_CN LC_TIME= LC_CTYPE= ./conftest; exit) 2>/dev/null; then - gt_cv_locale_zh_CN=zh_CN + # Test for the usual locale name. + if (LC_ALL=fr_FR LC_TIME= LC_CTYPE= ./conftest; exit) 2>/dev/null; then + gt_cv_locale_fr_utf8=fr_FR else # Test for the locale name with explicit encoding suffix. - if (LC_ALL=zh_CN.GB18030 LC_TIME= LC_CTYPE= ./conftest; exit) 2>/dev/null; then - gt_cv_locale_zh_CN=zh_CN.GB18030 + if (LC_ALL=fr_FR.UTF-8 LC_TIME= LC_CTYPE= ./conftest; exit) 2>/dev/null; then + gt_cv_locale_fr_utf8=fr_FR.UTF-8 else - # None found. - gt_cv_locale_zh_CN=none + # Test for the Solaris 7 locale name. + if (LC_ALL=fr.UTF-8 LC_TIME= LC_CTYPE= ./conftest; exit) 2>/dev/null; then + gt_cv_locale_fr_utf8=fr.UTF-8 + else + # None found. + gt_cv_locale_fr_utf8=none + fi fi fi ;; esac - else - # If there was a link error, due to mblen(), the system is so old that - # it certainly doesn't have a chinese locale. - gt_cv_locale_zh_CN=none fi rm -fr conftest* fi -{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $gt_cv_locale_zh_CN" >&5 -$as_echo "$gt_cv_locale_zh_CN" >&6; } - LOCALE_ZH_CN=$gt_cv_locale_zh_CN +{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $gt_cv_locale_fr_utf8" >&5 +$as_echo "$gt_cv_locale_fr_utf8" >&6; } + LOCALE_FR_UTF8=$gt_cv_locale_fr_utf8 - { $as_echo "$as_me:${as_lineno-$LINENO}: checking for a french Unicode locale" >&5 -$as_echo_n "checking for a french Unicode locale... " >&6; } -if ${gt_cv_locale_fr_utf8+:} false; then : + + { $as_echo "$as_me:${as_lineno-$LINENO}: checking for a transitional chinese locale" >&5 +$as_echo_n "checking for a transitional chinese locale... " >&6; } +if ${gt_cv_locale_zh_CN+:} false; then : $as_echo_n "(cached) " >&6 else @@ -13783,6 +14808,7 @@ else /* end confdefs.h. */ #include +#include #include #if HAVE_LANGINFO_CODESET # include @@ -13791,11 +14817,14 @@ else #include struct tm t; char buf[16]; -int main () { +int main () +{ /* On BeOS and Haiku, locales are not implemented in libc. Rather, libintl imitates locale dependent behaviour by looking at the environment variables, and all locales use the UTF-8 encoding. */ -#if !(defined __BEOS__ || defined __HAIKU__) +#if defined __BEOS__ || defined __HAIKU__ + return 1; +#else /* Check whether the given locale name is recognized by the system. */ # if defined _WIN32 && !defined __CYGWIN__ /* On native Windows, setlocale(category, "") looks at the system settings, @@ -13813,11 +14842,14 @@ int main () { is empty, and the behaviour of Tcl 8.4 in this locale is not useful. On OpenBSD 4.0, when an unsupported locale is specified, setlocale() succeeds but then nl_langinfo(CODESET) is "646". In this situation, - some unit tests fail. */ + some unit tests fail. + On MirBSD 10, when an unsupported locale is specified, setlocale() + succeeds but then nl_langinfo(CODESET) is "UTF-8". */ # if HAVE_LANGINFO_CODESET { const char *cs = nl_langinfo (CODESET); - if (cs[0] == '\0' || strcmp (cs, "ASCII") == 0 || strcmp (cs, "646") == 0) + if (cs[0] == '\0' || strcmp (cs, "ASCII") == 0 || strcmp (cs, "646") == 0 + || strcmp (cs, "UTF-8") == 0) return 1; } # endif @@ -13827,21 +14859,22 @@ int main () { LC_ALL is set on the command line. */ if (strchr (getenv ("LC_ALL"), '.') == NULL) return 1; # endif - /* Check whether in the abbreviation of the second month, the second - character (should be U+00E9: LATIN SMALL LETTER E WITH ACUTE) is - two bytes long, with UTF-8 encoding. */ - t.tm_year = 1975 - 1900; t.tm_mon = 2 - 1; t.tm_mday = 4; - if (strftime (buf, sizeof (buf), "%b", &t) < 4 - || buf[1] != (char) 0xc3 || buf[2] != (char) 0xa9 || buf[3] != 'v') + /* Check whether in a month name, no byte in the range 0x80..0x9F occurs. + This excludes the UTF-8 encoding (except on MirBSD). */ + { + const char *p; + t.tm_year = 1975 - 1900; t.tm_mon = 2 - 1; t.tm_mday = 4; + if (strftime (buf, sizeof (buf), "%B", &t) < 2) return 1; + for (p = buf; *p != '\0'; p++) + if ((unsigned char) *p >= 0x80 && (unsigned char) *p < 0xa0) + return 1; + } + /* Check whether a typical GB18030 multibyte sequence is recognized as a + single wide character. This excludes the GB2312 and GBK encodings. */ + if (mblen ("\203\062\332\066", 5) != 4) return 1; -#endif -#if !defined __BIONIC__ /* Bionic libc's 'struct lconv' is just a dummy. */ - /* Check whether the decimal separator is a comma. - On NetBSD 3.0 in the fr_FR.ISO8859-1 locale, localeconv()->decimal_point - are nl_langinfo(RADIXCHAR) are both ".". */ - if (localeconv () ->decimal_point[0] != ',') return 1; -#endif return 0; +#endif } _ACEOF @@ -13859,44 +14892,49 @@ _ACEOF # and similar. mingw*) # Test for the hypothetical native Windows locale name. - if (LC_ALL=French_France.65001 LC_TIME= LC_CTYPE= ./conftest; exit) 2>/dev/null; then - gt_cv_locale_fr_utf8=French_France.65001 + if (LC_ALL=Chinese_China.54936 LC_TIME= LC_CTYPE= ./conftest; exit) 2>/dev/null; then + gt_cv_locale_zh_CN=Chinese_China.54936 else # None found. - gt_cv_locale_fr_utf8=none + gt_cv_locale_zh_CN=none fi ;; + solaris2.8) + # On Solaris 8, the locales zh_CN.GB18030, zh_CN.GBK, zh.GBK are + # broken. One witness is the test case in gl_MBRTOWC_SANITYCHECK. + # Another witness is that "LC_ALL=zh_CN.GB18030 bash -c true" dumps core. + gt_cv_locale_zh_CN=none + ;; *) # Setting LC_ALL is not enough. Need to set LC_TIME to empty, because # otherwise on Mac OS X 10.3.5 the LC_TIME=C from the beginning of the # configure script would override the LC_ALL setting. Likewise for # LC_CTYPE, which is also set at the beginning of the configure script. - # Test for the usual locale name. - if (LC_ALL=fr_FR LC_TIME= LC_CTYPE= ./conftest; exit) 2>/dev/null; then - gt_cv_locale_fr_utf8=fr_FR + # Test for the locale name without encoding suffix. + if (LC_ALL=zh_CN LC_TIME= LC_CTYPE= ./conftest; exit) 2>/dev/null; then + gt_cv_locale_zh_CN=zh_CN else # Test for the locale name with explicit encoding suffix. - if (LC_ALL=fr_FR.UTF-8 LC_TIME= LC_CTYPE= ./conftest; exit) 2>/dev/null; then - gt_cv_locale_fr_utf8=fr_FR.UTF-8 + if (LC_ALL=zh_CN.GB18030 LC_TIME= LC_CTYPE= ./conftest; exit) 2>/dev/null; then + gt_cv_locale_zh_CN=zh_CN.GB18030 else - # Test for the Solaris 7 locale name. - if (LC_ALL=fr.UTF-8 LC_TIME= LC_CTYPE= ./conftest; exit) 2>/dev/null; then - gt_cv_locale_fr_utf8=fr.UTF-8 - else - # None found. - gt_cv_locale_fr_utf8=none - fi + # None found. + gt_cv_locale_zh_CN=none fi fi ;; esac + else + # If there was a link error, due to mblen(), the system is so old that + # it certainly doesn't have a chinese locale. + gt_cv_locale_zh_CN=none fi rm -fr conftest* fi -{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $gt_cv_locale_fr_utf8" >&5 -$as_echo "$gt_cv_locale_fr_utf8" >&6; } - LOCALE_FR_UTF8=$gt_cv_locale_fr_utf8 +{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $gt_cv_locale_zh_CN" >&5 +$as_echo "$gt_cv_locale_zh_CN" >&6; } + LOCALE_ZH_CN=$gt_cv_locale_zh_CN { $as_echo "$as_me:${as_lineno-$LINENO}: checking for inline" >&5 @@ -14024,6 +15062,72 @@ $as_echo "#define HAVE_MINMAX_IN_SYS_PARAM_H 1" >>confdefs.h + + { $as_echo "$as_me:${as_lineno-$LINENO}: checking for O_CLOEXEC" >&5 +$as_echo_n "checking for O_CLOEXEC... " >&6; } +if ${gl_cv_macro_O_CLOEXEC+:} false; then : + $as_echo_n "(cached) " >&6 +else + cat confdefs.h - <<_ACEOF >conftest.$ac_ext +/* end confdefs.h. */ +#include + #ifndef O_CLOEXEC + choke me; + #endif + +int +main () +{ +return O_CLOEXEC; + ; + return 0; +} +_ACEOF +if ac_fn_c_try_compile "$LINENO"; then : + gl_cv_macro_O_CLOEXEC=yes +else + gl_cv_macro_O_CLOEXEC=no +fi +rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext +fi +{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $gl_cv_macro_O_CLOEXEC" >&5 +$as_echo "$gl_cv_macro_O_CLOEXEC" >&6; } + + + + { $as_echo "$as_me:${as_lineno-$LINENO}: checking for promoted mode_t type" >&5 +$as_echo_n "checking for promoted mode_t type... " >&6; } +if ${gl_cv_promoted_mode_t+:} false; then : + $as_echo_n "(cached) " >&6 +else + + cat confdefs.h - <<_ACEOF >conftest.$ac_ext +/* end confdefs.h. */ +#include +int +main () +{ +typedef int array[2 * (sizeof (mode_t) < sizeof (int)) - 1]; + ; + return 0; +} +_ACEOF +if ac_fn_c_try_compile "$LINENO"; then : + gl_cv_promoted_mode_t='int' +else + gl_cv_promoted_mode_t='mode_t' +fi +rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext + +fi +{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $gl_cv_promoted_mode_t" >&5 +$as_echo "$gl_cv_promoted_mode_t" >&6; } + +cat >>confdefs.h <<_ACEOF +#define PROMOTED_MODE_T $gl_cv_promoted_mode_t +_ACEOF + + ac_fn_c_check_decl "$LINENO" "alarm" "ac_cv_have_decl_alarm" "$ac_includes_default" if test "x$ac_cv_have_decl_alarm" = xyes; then : ac_have_decl=1 @@ -14113,6 +15217,8 @@ $as_echo "#define ssize_t int" >>confdefs.h + + { $as_echo "$as_me:${as_lineno-$LINENO}: checking for stdbool.h that conforms to C99" >&5 $as_echo_n "checking for stdbool.h that conforms to C99... " >&6; } if ${ac_cv_header_stdbool_h+:} false; then : @@ -14262,7 +15368,8 @@ fi GNULIB_VPRINTF_POSIX=0; GNULIB_VSNPRINTF=0; GNULIB_VSPRINTF_POSIX=0; - HAVE_DECL_FPURGE=1; + HAVE_DECL_FCLOSEALL=1; + HAVE_DECL_FPURGE=1; HAVE_DECL_FSEEKO=1; HAVE_DECL_FTELLO=1; HAVE_DECL_GETDELIM=1; @@ -14311,6 +15418,50 @@ fi REPLACE_VSNPRINTF=0; REPLACE_VSPRINTF=0; +ac_fn_c_check_decl "$LINENO" "fcloseall" "ac_cv_have_decl_fcloseall" "$ac_includes_default" +if test "x$ac_cv_have_decl_fcloseall" = xyes; then : + ac_have_decl=1 +else + ac_have_decl=0 +fi + +cat >>confdefs.h <<_ACEOF +#define HAVE_DECL_FCLOSEALL $ac_have_decl +_ACEOF + +ac_fn_c_check_decl "$LINENO" "ecvt" "ac_cv_have_decl_ecvt" "$ac_includes_default" +if test "x$ac_cv_have_decl_ecvt" = xyes; then : + ac_have_decl=1 +else + ac_have_decl=0 +fi + +cat >>confdefs.h <<_ACEOF +#define HAVE_DECL_ECVT $ac_have_decl +_ACEOF + +ac_fn_c_check_decl "$LINENO" "fcvt" "ac_cv_have_decl_fcvt" "$ac_includes_default" +if test "x$ac_cv_have_decl_fcvt" = xyes; then : + ac_have_decl=1 +else + ac_have_decl=0 +fi + +cat >>confdefs.h <<_ACEOF +#define HAVE_DECL_FCVT $ac_have_decl +_ACEOF + +ac_fn_c_check_decl "$LINENO" "gcvt" "ac_cv_have_decl_gcvt" "$ac_includes_default" +if test "x$ac_cv_have_decl_gcvt" = xyes; then : + ac_have_decl=1 +else + ac_have_decl=0 +fi + +cat >>confdefs.h <<_ACEOF +#define HAVE_DECL_GCVT $ac_have_decl +_ACEOF + GNULIB_EXPLICIT_BZERO=0; GNULIB_FFSL=0; @@ -14348,13 +15499,15 @@ fi GNULIB_MBSTOK_R=0; GNULIB_STRERROR=0; GNULIB_STRERROR_R=0; + GNULIB_STRERRORNAME_NP=0; + GNULIB_SIGABBREV_NP=0; + GNULIB_SIGDESCR_NP=0; GNULIB_STRSIGNAL=0; GNULIB_STRVERSCMP=0; HAVE_MBSLEN=0; HAVE_EXPLICIT_BZERO=1; HAVE_FFSL=1; HAVE_FFSLL=1; - HAVE_MEMCHR=1; HAVE_DECL_MEMMEM=1; HAVE_MEMPCPY=1; HAVE_DECL_MEMRCHR=1; @@ -14370,6 +15523,9 @@ fi HAVE_STRCASESTR=1; HAVE_DECL_STRTOK_R=1; HAVE_DECL_STRERROR_R=1; + HAVE_STRERRORNAME_NP=1; + HAVE_SIGABBREV_NP=1; + HAVE_SIGDESCR_NP=1; HAVE_DECL_STRSIGNAL=1; HAVE_STRVERSCMP=1; REPLACE_MEMCHR=0; @@ -14385,11 +15541,10 @@ fi REPLACE_STRTOK_R=0; REPLACE_STRERROR=0; REPLACE_STRERROR_R=0; + REPLACE_STRERRORNAME_NP=0; REPLACE_STRSIGNAL=0; UNDEFINE_STRTOK_R=0; - - ac_fn_c_check_decl "$LINENO" "strdup" "ac_cv_have_decl_strdup" "$ac_includes_default" if test "x$ac_cv_have_decl_strdup" = xyes; then : ac_have_decl=1 @@ -14416,8 +15571,8 @@ else *-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, assume the worst. - *) gl_cv_func_strerror_0_works="guessing no" ;; + # If we don't know, obey --enable-cross-guesses. + *) gl_cv_func_strerror_0_works="$gl_cross_guess_normal" ;; esac else @@ -14582,7 +15737,7 @@ if ${gl_cv_func_strerror_r_works+:} false; then : $as_echo_n "(cached) " >&6 else if test "$cross_compiling" = yes; then : - gl_cv_func_strerror_r_works="guessing no" + gl_cv_func_strerror_r_works="$gl_cross_guess_normal" else cat confdefs.h - <<_ACEOF >conftest.$ac_ext @@ -14644,7 +15799,6 @@ $as_echo "$gl_cv_func_strerror_r_works" >&6; } - if test $gl_cv_have_include_next = yes; then gl_cv_next_string_h='<'string.h'>' else @@ -14713,6 +15867,8 @@ $as_echo "$gl_cv_next_string_h" >&6; } + + ac_fn_c_check_decl "$LINENO" "strndup" "ac_cv_have_decl_strndup" "$ac_includes_default" if test "x$ac_cv_have_decl_strndup" = xyes; then : ac_have_decl=1 @@ -14739,6 +15895,36 @@ _ACEOF + + GNULIB_CTIME=0; + GNULIB_MKTIME=0; + GNULIB_LOCALTIME=0; + GNULIB_NANOSLEEP=0; + GNULIB_STRFTIME=0; + GNULIB_STRPTIME=0; + GNULIB_TIMEGM=0; + GNULIB_TIME_R=0; + GNULIB_TIME_RZ=0; + GNULIB_TZSET=0; + HAVE_DECL_LOCALTIME_R=1; + HAVE_NANOSLEEP=1; + HAVE_STRPTIME=1; + HAVE_TIMEGM=1; + HAVE_TIMEZONE_T=0; + REPLACE_CTIME=GNULIB_PORTCHECK; + REPLACE_LOCALTIME_R=GNULIB_PORTCHECK; + REPLACE_MKTIME=GNULIB_PORTCHECK; + REPLACE_NANOSLEEP=GNULIB_PORTCHECK; + REPLACE_STRFTIME=GNULIB_PORTCHECK; + REPLACE_TIMEGM=GNULIB_PORTCHECK; + REPLACE_TZSET=GNULIB_PORTCHECK; + + : ${GNULIB_GETTIMEOFDAY=0}; + REPLACE_GMTIME=0; + REPLACE_LOCALTIME=0; + + + { $as_echo "$as_me:${as_lineno-$LINENO}: checking for struct timespec in " >&5 $as_echo_n "checking for struct timespec in ... " >&6; } if ${gl_cv_sys_struct_timespec_in_time_h+:} false; then : @@ -14946,6 +16132,19 @@ $as_echo "$gl_cv_next_time_h" >&6; } +ac_fn_c_check_decl "$LINENO" "execvpe" "ac_cv_have_decl_execvpe" "$ac_includes_default" +if test "x$ac_cv_have_decl_execvpe" = xyes; then : + ac_have_decl=1 +else + ac_have_decl=0 +fi + +cat >>confdefs.h <<_ACEOF +#define HAVE_DECL_EXECVPE $ac_have_decl +_ACEOF + + + @@ -14972,6 +16171,8 @@ $as_echo "$gl_cv_next_time_h" >&6; } GNULIB_ISWBLANK=0; + GNULIB_ISWDIGIT=0; + GNULIB_ISWXDIGIT=0; GNULIB_WCTYPE=0; GNULIB_ISWCTYPE=0; GNULIB_WCTRANS=0; @@ -14980,6 +16181,8 @@ $as_echo "$gl_cv_next_time_h" >&6; } HAVE_WCTYPE_T=1; HAVE_WCTRANS_T=1; REPLACE_ISWBLANK=0; + REPLACE_ISWDIGIT=0; + REPLACE_ISWXDIGIT=0; @@ -15316,6 +16519,8 @@ done + + GNULIB_INET_NTOP=0; GNULIB_INET_PTON=0; HAVE_DECL_INET_NTOP=1; @@ -15382,8 +16587,6 @@ $as_echo "#define HAVE_ENVIRON_DECL 1" >>confdefs.h - - { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether getcwd (NULL, 0) allocates memory for result" >&5 $as_echo_n "checking whether getcwd (NULL, 0) allocates memory for result... " >&6; } if ${gl_cv_func_getcwd_null+:} false; then : @@ -15397,8 +16600,8 @@ else *-musl*) gl_cv_func_getcwd_null="guessing yes";; # Guess yes on Cygwin. cygwin*) gl_cv_func_getcwd_null="guessing yes";; - # If we don't know, assume the worst. - *) gl_cv_func_getcwd_null="guessing no";; + # If we don't know, obey --enable-cross-guesses. + *) gl_cv_func_getcwd_null="$gl_cross_guess_normal";; esac else @@ -15411,6 +16614,10 @@ else # else /* on Windows with MSVC */ # include # endif + + +$gl_mda_defines + # ifndef getcwd char *getcwd (); # endif @@ -15420,7 +16627,7 @@ main () { #if defined _WIN32 && ! defined __CYGWIN__ -/* mingw cwd does not start with '/', but getcwd does allocate. +/* mingw cwd does not start with '/', but _getcwd does allocate. However, mingw fails to honor non-zero size. */ #else if (chdir ("/") != 0) @@ -15465,6 +16672,10 @@ else cat confdefs.h - <<_ACEOF >conftest.$ac_ext /* end confdefs.h. */ #include + + +$gl_mda_defines + int main () { @@ -15491,17 +16702,223 @@ fi $as_echo "$gl_cv_func_getcwd_posix_signature" >&6; } + GNULIB_GETTIMEOFDAY=0; + HAVE_GETTIMEOFDAY=1; + HAVE_STRUCT_TIMEVAL=1; + HAVE_SYS_TIME_H=1; + REPLACE_GETTIMEOFDAY=0; + REPLACE_STRUCT_TIMEVAL=0; -ac_fn_c_check_decl "$LINENO" "getdtablesize" "ac_cv_have_decl_getdtablesize" "$ac_includes_default" -if test "x$ac_cv_have_decl_getdtablesize" = xyes; then : - ac_have_decl=1 + + + + + + + + + + + + + + if test $gl_cv_have_include_next = yes; then + gl_cv_next_sys_time_h='<'sys/time.h'>' + else + { $as_echo "$as_me:${as_lineno-$LINENO}: checking absolute name of " >&5 +$as_echo_n "checking absolute name of ... " >&6; } +if ${gl_cv_next_sys_time_h+:} false; then : + $as_echo_n "(cached) " >&6 else - ac_have_decl=0 + + if test $ac_cv_header_sys_time_h = yes; then + + + + + cat confdefs.h - <<_ACEOF >conftest.$ac_ext +/* end confdefs.h. */ +#include +_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 'sys/time.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_sys_time_h=`(eval "$gl_absname_cpp conftest.$ac_ext") 2>&5 | + sed -n "$gl_absolute_header_sed"` + + gl_header=$gl_cv_absolute_sys_time_h + gl_cv_next_sys_time_h='"'$gl_header'"' + else + gl_cv_next_sys_time_h='<'sys/time.h'>' + fi + + fi +{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $gl_cv_next_sys_time_h" >&5 +$as_echo "$gl_cv_next_sys_time_h" >&6; } + fi + NEXT_SYS_TIME_H=$gl_cv_next_sys_time_h -cat >>confdefs.h <<_ACEOF -#define HAVE_DECL_GETDTABLESIZE $ac_have_decl + 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='<'sys/time.h'>' + else + # INCLUDE_NEXT_AS_FIRST_DIRECTIVE='include' + gl_next_as_first_directive=$gl_cv_next_sys_time_h + fi + NEXT_AS_FIRST_DIRECTIVE_SYS_TIME_H=$gl_next_as_first_directive + + + + + + if test $ac_cv_header_sys_time_h != yes; then + HAVE_SYS_TIME_H=0 + fi + + + + + + if test $ac_cv_header_sys_socket_h != yes; then + for ac_header in winsock2.h +do : + ac_fn_c_check_header_mongrel "$LINENO" "winsock2.h" "ac_cv_header_winsock2_h" "$ac_includes_default" +if test "x$ac_cv_header_winsock2_h" = xyes; then : + cat >>confdefs.h <<_ACEOF +#define HAVE_WINSOCK2_H 1 +_ACEOF + +fi + +done + + fi + if test "$ac_cv_header_winsock2_h" = yes; then + HAVE_WINSOCK2_H=1 + UNISTD_H_HAVE_WINSOCK2_H=1 + SYS_IOCTL_H_HAVE_WINSOCK2_H=1 + else + HAVE_WINSOCK2_H=0 + fi + + + { $as_echo "$as_me:${as_lineno-$LINENO}: checking for struct timeval" >&5 +$as_echo_n "checking for struct timeval... " >&6; } +if ${gl_cv_sys_struct_timeval+:} false; then : + $as_echo_n "(cached) " >&6 +else + cat confdefs.h - <<_ACEOF >conftest.$ac_ext +/* end confdefs.h. */ +#if HAVE_SYS_TIME_H + #include + #endif + #include + #if HAVE_WINSOCK2_H + # include + #endif + +int +main () +{ +static struct timeval x; x.tv_sec = x.tv_usec; + ; + return 0; +} _ACEOF +if ac_fn_c_try_compile "$LINENO"; then : + gl_cv_sys_struct_timeval=yes +else + gl_cv_sys_struct_timeval=no +fi +rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext + +fi +{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $gl_cv_sys_struct_timeval" >&5 +$as_echo "$gl_cv_sys_struct_timeval" >&6; } + if test $gl_cv_sys_struct_timeval != yes; then + HAVE_STRUCT_TIMEVAL=0 + else + { $as_echo "$as_me:${as_lineno-$LINENO}: checking for wide-enough struct timeval.tv_sec member" >&5 +$as_echo_n "checking for wide-enough struct timeval.tv_sec member... " >&6; } +if ${gl_cv_sys_struct_timeval_tv_sec+:} false; then : + $as_echo_n "(cached) " >&6 +else + cat confdefs.h - <<_ACEOF >conftest.$ac_ext +/* end confdefs.h. */ +#if HAVE_SYS_TIME_H + #include + #endif + #include + #if HAVE_WINSOCK2_H + # include + #endif + +int +main () +{ +static struct timeval x; + typedef int verify_tv_sec_type[ + sizeof (time_t) <= sizeof x.tv_sec ? 1 : -1 + ]; + + ; + return 0; +} +_ACEOF +if ac_fn_c_try_compile "$LINENO"; then : + gl_cv_sys_struct_timeval_tv_sec=yes +else + gl_cv_sys_struct_timeval_tv_sec=no +fi +rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext + +fi +{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $gl_cv_sys_struct_timeval_tv_sec" >&5 +$as_echo "$gl_cv_sys_struct_timeval_tv_sec" >&6; } + if test $gl_cv_sys_struct_timeval_tv_sec != yes; then + REPLACE_STRUCT_TIMEVAL=1 + fi + fi + + + + + + + + + + + + + case "$host_os" in + *-musl*) +$as_echo "#define MUSL_LIBC 1" >>confdefs.h + ;; + esac + + @@ -15643,7 +17060,8 @@ $as_echo "#define HAVE_LC_MESSAGES 1" >>confdefs.h - if test $ac_cv_func_uselocale = yes; then + + if test $ac_cv_func_uselocale = yes; then { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether uselocale works" >&5 $as_echo_n "checking whether uselocale works... " >&6; } @@ -15651,10 +17069,10 @@ if ${gt_cv_func_uselocale_works+:} false; then : $as_echo_n "(cached) " >&6 else if test "$cross_compiling" = yes; then : - # Guess no on AIX, yes otherwise. + # Guess no on AIX and z/OS, yes otherwise. case "$host_os" in - aix*) gt_cv_func_uselocale_works="guessing no" ;; - *) gt_cv_func_uselocale_works="guessing yes" ;; + aix* | openedition*) gt_cv_func_uselocale_works="guessing no" ;; + *) gt_cv_func_uselocale_works="guessing yes" ;; esac else @@ -15665,6 +17083,7 @@ else #if HAVE_XLOCALE_H # include #endif +locale_t loc1; int main () { uselocale (NULL); @@ -15815,13 +17234,15 @@ done ;; esac - gt_nameless_locales=no - if false; then - gt_nameless_locales=yes + gt_nameless_locales=no + case "$host_os" in + aix*) + gt_nameless_locales=yes $as_echo "#define HAVE_NAMELESS_LOCALES 1" >>confdefs.h - fi + ;; + esac { $as_echo "$as_me:${as_lineno-$LINENO}: checking for CFPreferencesCopyAppValue" >&5 @@ -15905,6 +17326,62 @@ $as_echo "#define HAVE_CFLOCALECOPYPREFERREDLANGUAGES 1" >>confdefs.h + { $as_echo "$as_me:${as_lineno-$LINENO}: checking for library needed for semaphore functions" >&5 +$as_echo_n "checking for library needed for semaphore functions... " >&6; } +if ${gl_cv_semaphore_lib+:} false; then : + $as_echo_n "(cached) " >&6 +else + save_LIBS="$LIBS" + LIBS="$LIBS $LIBMULTITHREAD" + cat confdefs.h - <<_ACEOF >conftest.$ac_ext +/* end confdefs.h. */ +#include +int +main () +{ +sem_post ((sem_t *)0); + ; + return 0; +} +_ACEOF +if ac_fn_c_try_link "$LINENO"; then : + gl_cv_semaphore_lib=none +else + LIBS="$LIBS -lrt" + cat confdefs.h - <<_ACEOF >conftest.$ac_ext +/* end confdefs.h. */ +#include +int +main () +{ +sem_post ((sem_t *)0); + ; + return 0; +} +_ACEOF +if ac_fn_c_try_link "$LINENO"; then : + gl_cv_semaphore_lib='-lrt' +else + gl_cv_semaphore_lib=none +fi +rm -f core conftest.err conftest.$ac_objext \ + conftest$ac_exeext conftest.$ac_ext + +fi +rm -f core conftest.err conftest.$ac_objext \ + conftest$ac_exeext conftest.$ac_ext + LIBS="$save_LIBS" + +fi +{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $gl_cv_semaphore_lib" >&5 +$as_echo "$gl_cv_semaphore_lib" >&6; } + if test "x$gl_cv_semaphore_lib" = xnone; then + LIB_SEMAPHORE= + else + LIB_SEMAPHORE="$gl_cv_semaphore_lib" + fi + + GNULIB_PSELECT=0; GNULIB_SELECT=0; @@ -16143,15 +17620,15 @@ done LIBSOCKET= if test $HAVE_WINSOCK2_H = 1; then - { $as_echo "$as_me:${as_lineno-$LINENO}: checking if we need to call WSAStartup in winsock2.h and -lws2_32" >&5 -$as_echo_n "checking if we need to call WSAStartup in winsock2.h and -lws2_32... " >&6; } + { $as_echo "$as_me:${as_lineno-$LINENO}: checking for WSAStartup" >&5 +$as_echo_n "checking for WSAStartup... " >&6; } if ${gl_cv_func_wsastartup+:} false; then : $as_echo_n "(cached) " >&6 else - gl_save_LIBS="$LIBS" - LIBS="$LIBS -lws2_32" - cat confdefs.h - <<_ACEOF >conftest.$ac_ext + gl_save_LIBS="$LIBS" + LIBS="$LIBS -lws2_32" + cat confdefs.h - <<_ACEOF >conftest.$ac_ext /* end confdefs.h. */ #ifdef HAVE_WINSOCK2_H @@ -16161,13 +17638,15 @@ int main () { - WORD wVersionRequested = MAKEWORD(1, 1); - WSADATA wsaData; - int err = WSAStartup(wVersionRequested, &wsaData); - WSACleanup (); + WORD wVersionRequested = MAKEWORD(1, 1); + WSADATA wsaData; + int err = WSAStartup(wVersionRequested, &wsaData); + WSACleanup (); + ; return 0; } + _ACEOF if ac_fn_c_try_link "$LINENO"; then : gl_cv_func_wsastartup=yes @@ -16176,7 +17655,7 @@ else fi rm -f core conftest.err conftest.$ac_objext \ conftest$ac_exeext conftest.$ac_ext - LIBS="$gl_save_LIBS" + LIBS="$gl_save_LIBS" fi { $as_echo "$as_me:${as_lineno-$LINENO}: result: $gl_cv_func_wsastartup" >&5 @@ -16377,8 +17856,8 @@ else linux-* | linux) 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, assume the worst. - *) gl_cv_func_select_detects_ebadf="guessing no" ;; + # If we don't know, obey --enable-cross-guesses. + *) gl_cv_func_select_detects_ebadf="$gl_cross_guess_normal" ;; esac else @@ -16393,6 +17872,9 @@ else #include #include + +$gl_mda_defines + int main () { @@ -16458,72 +17940,6 @@ rm -f core conftest.err conftest.$ac_objext \ fi - - { $as_echo "$as_me:${as_lineno-$LINENO}: checking for O_CLOEXEC" >&5 -$as_echo_n "checking for O_CLOEXEC... " >&6; } -if ${gl_cv_macro_O_CLOEXEC+:} false; then : - $as_echo_n "(cached) " >&6 -else - cat confdefs.h - <<_ACEOF >conftest.$ac_ext -/* end confdefs.h. */ -#include - #ifndef O_CLOEXEC - choke me; - #endif - -int -main () -{ -return O_CLOEXEC; - ; - return 0; -} -_ACEOF -if ac_fn_c_try_compile "$LINENO"; then : - gl_cv_macro_O_CLOEXEC=yes -else - gl_cv_macro_O_CLOEXEC=no -fi -rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext -fi -{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $gl_cv_macro_O_CLOEXEC" >&5 -$as_echo "$gl_cv_macro_O_CLOEXEC" >&6; } - - - - { $as_echo "$as_me:${as_lineno-$LINENO}: checking for promoted mode_t type" >&5 -$as_echo_n "checking for promoted mode_t type... " >&6; } -if ${gl_cv_promoted_mode_t+:} false; then : - $as_echo_n "(cached) " >&6 -else - - cat confdefs.h - <<_ACEOF >conftest.$ac_ext -/* end confdefs.h. */ -#include -int -main () -{ -typedef int array[2 * (sizeof (mode_t) < sizeof (int)) - 1]; - ; - return 0; -} -_ACEOF -if ac_fn_c_try_compile "$LINENO"; then : - gl_cv_promoted_mode_t='int' -else - gl_cv_promoted_mode_t='mode_t' -fi -rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext - -fi -{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $gl_cv_promoted_mode_t" >&5 -$as_echo "$gl_cv_promoted_mode_t" >&6; } - -cat >>confdefs.h <<_ACEOF -#define PROMOTED_MODE_T $gl_cv_promoted_mode_t -_ACEOF - - ac_fn_c_check_decl "$LINENO" "strerror_r" "ac_cv_have_decl_strerror_r" "$ac_includes_default" if test "x$ac_cv_have_decl_strerror_r" = xyes; then : ac_have_decl=1 @@ -16851,89 +18267,12 @@ _ACEOF - YIELD_LIB= - if test $gl_threads_api = posix; then - { $as_echo "$as_me:${as_lineno-$LINENO}: checking for sched_yield in -lrt" >&5 -$as_echo_n "checking for sched_yield in -lrt... " >&6; } -if ${ac_cv_lib_rt_sched_yield+:} false; then : - $as_echo_n "(cached) " >&6 -else - ac_check_lib_save_LIBS=$LIBS -LIBS="-lrt $LIBS" -cat confdefs.h - <<_ACEOF >conftest.$ac_ext -/* end confdefs.h. */ - -/* Override any GCC internal prototype to avoid an error. - Use char because int might match the return type of a GCC - builtin and then its argument prototype would still apply. */ -#ifdef __cplusplus -extern "C" -#endif -char sched_yield (); -int -main () -{ -return sched_yield (); - ; - return 0; -} -_ACEOF -if ac_fn_c_try_link "$LINENO"; then : - ac_cv_lib_rt_sched_yield=yes -else - ac_cv_lib_rt_sched_yield=no -fi -rm -f core conftest.err conftest.$ac_objext \ - conftest$ac_exeext conftest.$ac_ext -LIBS=$ac_check_lib_save_LIBS -fi -{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_rt_sched_yield" >&5 -$as_echo "$ac_cv_lib_rt_sched_yield" >&6; } -if test "x$ac_cv_lib_rt_sched_yield" = xyes; then : - YIELD_LIB=-lrt -else - { $as_echo "$as_me:${as_lineno-$LINENO}: checking for sched_yield in -lposix4" >&5 -$as_echo_n "checking for sched_yield in -lposix4... " >&6; } -if ${ac_cv_lib_posix4_sched_yield+:} false; then : - $as_echo_n "(cached) " >&6 -else - ac_check_lib_save_LIBS=$LIBS -LIBS="-lposix4 $LIBS" -cat confdefs.h - <<_ACEOF >conftest.$ac_ext -/* end confdefs.h. */ - -/* Override any GCC internal prototype to avoid an error. - Use char because int might match the return type of a GCC - builtin and then its argument prototype would still apply. */ -#ifdef __cplusplus -extern "C" -#endif -char sched_yield (); -int -main () -{ -return sched_yield (); - ; - return 0; -} -_ACEOF -if ac_fn_c_try_link "$LINENO"; then : - ac_cv_lib_posix4_sched_yield=yes -else - ac_cv_lib_posix4_sched_yield=no -fi -rm -f core conftest.err conftest.$ac_objext \ - conftest$ac_exeext conftest.$ac_ext -LIBS=$ac_check_lib_save_LIBS -fi -{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_posix4_sched_yield" >&5 -$as_echo "$ac_cv_lib_posix4_sched_yield" >&6; } -if test "x$ac_cv_lib_posix4_sched_yield" = xyes; then : - YIELD_LIB=-lposix4 -fi -fi + if test $gl_threads_api = posix; then + YIELD_LIB="$LIB_SCHED_YIELD" + else + YIELD_LIB= fi @@ -16957,6 +18296,7 @@ fi + gl_source_base='lib' LTALLOCA=`echo "$ALLOCA" | sed -e 's/\.[^.]* /.lo /g;s/\.[^.]*$/.lo/'` @@ -17263,18 +18603,13 @@ $as_echo_n "checking for GNU libc compatible calloc... " >&6; } if ${ac_cv_func_calloc_0_nonnull+:} false; then : $as_echo_n "(cached) " >&6 else - if test "$cross_compiling" = yes; then : - 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, assume the worst. - *) ac_cv_func_calloc_0_nonnull="guessing no" ;; - esac - + if test $cross_compiling != yes; then + ac_cv_func_calloc_0_nonnull=yes + if test "$cross_compiling" = yes; then : + { { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5 +$as_echo "$as_me: error: in \`$ac_pwd':" >&2;} +as_fn_error $? "cannot run test program while cross compiling +See \`config.log' for more details" "$LINENO" 5; } else cat confdefs.h - <<_ACEOF >conftest.$ac_ext /* end confdefs.h. */ @@ -17283,22 +18618,18 @@ int main () { int result = 0; - char *p = calloc (0, 0); - if (!p) - result |= 1; - free (p); - p = calloc ((size_t) -1 / 8 + 1, 8); - if (p) - result |= 2; - free (p); - return result; + char * volatile p = calloc (0, 0); + if (!p) + result |= 1; + free (p); + return result; ; return 0; } _ACEOF if ac_fn_c_try_run "$LINENO"; then : - ac_cv_func_calloc_0_nonnull=yes + else ac_cv_func_calloc_0_nonnull=no fi @@ -17306,6 +18637,59 @@ rm -f core *.core core.conftest.* gmon.out bb.out conftest$ac_exeext \ conftest.$ac_objext conftest.beam conftest.$ac_ext fi + if test "$cross_compiling" = yes; then : + { { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5 +$as_echo "$as_me: error: in \`$ac_pwd':" >&2;} +as_fn_error $? "cannot run test program while cross compiling +See \`config.log' for more details" "$LINENO" 5; } +else + cat confdefs.h - <<_ACEOF >conftest.$ac_ext +/* end confdefs.h. */ +$ac_includes_default +int +main () +{ +int result; + typedef struct { char c[8]; } S8; + size_t n = (size_t) -1 / sizeof (S8) + 2; + S8 * volatile s = calloc (n, sizeof (S8)); + if (s) + { + s[0].c[0] = 1; + if (s[n - 1].c[0]) + result = 0; + else + result = 2; + } + else + result = 3; + free (s); + return result; + + ; + return 0; +} +_ACEOF +if ac_fn_c_try_run "$LINENO"; then : + ac_cv_func_calloc_0_nonnull=no +fi +rm -f core *.core core.conftest.* gmon.out bb.out conftest$ac_exeext \ + conftest.$ac_objext conftest.beam conftest.$ac_ext +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" ;; + esac + fi + fi { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_func_calloc_0_nonnull" >&5 $as_echo "$ac_cv_func_calloc_0_nonnull" >&6; } @@ -17457,6 +18841,94 @@ $as_echo "#define GNULIB_TEST_REALPATH 1" >>confdefs.h + # Solaris 2.5.1 needs -lposix4 to get the clock_gettime function. + # Solaris 7 prefers the library name -lrt to the obsolescent name -lposix4. + + # 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= + + gl_saved_libs=$LIBS + { $as_echo "$as_me:${as_lineno-$LINENO}: checking for library containing clock_gettime" >&5 +$as_echo_n "checking for library containing clock_gettime... " >&6; } +if ${ac_cv_search_clock_gettime+:} false; then : + $as_echo_n "(cached) " >&6 +else + ac_func_search_save_LIBS=$LIBS +cat confdefs.h - <<_ACEOF >conftest.$ac_ext +/* end confdefs.h. */ + +/* Override any GCC internal prototype to avoid an error. + Use char because int might match the return type of a GCC + builtin and then its argument prototype would still apply. */ +#ifdef __cplusplus +extern "C" +#endif +char clock_gettime (); +int +main () +{ +return clock_gettime (); + ; + return 0; +} +_ACEOF +for ac_lib in '' rt posix4; do + if test -z "$ac_lib"; then + ac_res="none required" + else + ac_res=-l$ac_lib + LIBS="-l$ac_lib $ac_func_search_save_LIBS" + fi + if ac_fn_c_try_link "$LINENO"; then : + ac_cv_search_clock_gettime=$ac_res +fi +rm -f core conftest.err conftest.$ac_objext \ + conftest$ac_exeext + if ${ac_cv_search_clock_gettime+:} false; then : + break +fi +done +if ${ac_cv_search_clock_gettime+:} false; then : + +else + ac_cv_search_clock_gettime=no +fi +rm conftest.$ac_ext +LIBS=$ac_func_search_save_LIBS +fi +{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_search_clock_gettime" >&5 +$as_echo "$ac_cv_search_clock_gettime" >&6; } +ac_res=$ac_cv_search_clock_gettime +if test "$ac_res" != no; then : + test "$ac_res" = "none required" || LIBS="$ac_res $LIBS" + test "$ac_cv_search_clock_gettime" = "none required" || + LIB_CLOCK_GETTIME=$ac_cv_search_clock_gettime +fi + + for ac_func in clock_gettime clock_settime +do : + as_ac_var=`$as_echo "ac_cv_func_$ac_func" | $as_tr_sh` +ac_fn_c_check_func "$LINENO" "$ac_func" "$as_ac_var" +if eval test \"x\$"$as_ac_var"\" = x"yes"; then : + cat >>confdefs.h <<_ACEOF +#define `$as_echo "HAVE_$ac_func" | $as_tr_cpp` 1 +_ACEOF + +fi +done + + LIBS=$gl_saved_libs + + + +$as_echo "#define GNULIB_TEST_CLOEXEC 1" >>confdefs.h + + + + + if test $HAVE_MSVC_INVALID_PARAMETER_HANDLER = 1; then REPLACE_CLOSE=1 @@ -17546,9 +19018,6 @@ _ACEOF - - - cat >>confdefs.h <<_ACEOF #define GNULIB_DIRNAME 1 _ACEOF @@ -17556,10 +19025,6 @@ _ACEOF - - - - { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether // is distinct from /" >&5 $as_echo_n "checking whether // is distinct from /... " >&6; } if ${gl_cv_double_slash_root+:} false; then : @@ -17599,6 +19064,160 @@ $as_echo "#define DOUBLE_SLASH_IS_DISTINCT_ROOT 1" >>confdefs.h + + { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether dup2 works" >&5 +$as_echo_n "checking whether dup2 works... " >&6; } +if ${gl_cv_func_dup2_works+:} false; then : + $as_echo_n "(cached) " >&6 +else + if test "$cross_compiling" = yes; then : + case "$host_os" in + mingw*) # on this platform, dup2 always returns 0 for success + gl_cv_func_dup2_works="guessing no" ;; + cygwin*) # on cygwin 1.5.x, dup2(1,1) returns 0 + gl_cv_func_dup2_works="guessing no" ;; + aix* | freebsd*) + # on AIX 7.1 and FreeBSD 6.1, dup2 (1,toobig) gives EMFILE, + # not EBADF. + gl_cv_func_dup2_works="guessing no" ;; + haiku*) # on Haiku alpha 2, dup2(1, 1) resets FD_CLOEXEC. + gl_cv_func_dup2_works="guessing no" ;; + *-android*) # implemented using dup3(), which fails if oldfd == newfd + gl_cv_func_dup2_works="guessing no" ;; + os2*) # on OS/2 kLIBC, dup2() does not work on a directory fd. + gl_cv_func_dup2_works="guessing no" ;; + *) gl_cv_func_dup2_works="guessing yes" ;; + esac +else + cat confdefs.h - <<_ACEOF >conftest.$ac_ext +/* end confdefs.h. */ + + #include + #include + #include + #include + #include + + +$gl_mda_defines + + #ifndef RLIM_SAVED_CUR + # define RLIM_SAVED_CUR RLIM_INFINITY + #endif + #ifndef RLIM_SAVED_MAX + # define RLIM_SAVED_MAX RLIM_INFINITY + #endif + +int +main () +{ +int result = 0; + int bad_fd = INT_MAX; + struct rlimit rlim; + if (getrlimit (RLIMIT_NOFILE, &rlim) == 0 + && 0 <= rlim.rlim_cur && rlim.rlim_cur <= INT_MAX + && rlim.rlim_cur != RLIM_INFINITY + && rlim.rlim_cur != RLIM_SAVED_MAX + && rlim.rlim_cur != RLIM_SAVED_CUR) + bad_fd = rlim.rlim_cur; + #ifdef FD_CLOEXEC + if (fcntl (1, F_SETFD, FD_CLOEXEC) == -1) + result |= 1; + #endif + if (dup2 (1, 1) != 1) + result |= 2; + #ifdef FD_CLOEXEC + if (fcntl (1, F_GETFD) != FD_CLOEXEC) + result |= 4; + #endif + close (0); + if (dup2 (0, 0) != -1) + result |= 8; + /* Many gnulib modules require POSIX conformance of EBADF. */ + if (dup2 (2, bad_fd) == -1 && errno != EBADF) + result |= 16; + /* Flush out some cygwin core dumps. */ + if (dup2 (2, -1) != -1 || errno != EBADF) + result |= 32; + dup2 (2, 255); + dup2 (2, 256); + /* On OS/2 kLIBC, dup2() does not work on a directory fd. */ + { + int fd = open (".", O_RDONLY); + if (fd == -1) + result |= 64; + else if (dup2 (fd, fd + 1) == -1) + result |= 128; + close (fd); + } + return result; + ; + return 0; +} + +_ACEOF +if ac_fn_c_try_run "$LINENO"; then : + gl_cv_func_dup2_works=yes +else + gl_cv_func_dup2_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 +{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $gl_cv_func_dup2_works" >&5 +$as_echo "$gl_cv_func_dup2_works" >&6; } + case "$gl_cv_func_dup2_works" in + *yes) ;; + *) + REPLACE_DUP2=1 + for ac_func in setdtablesize +do : + ac_fn_c_check_func "$LINENO" "setdtablesize" "ac_cv_func_setdtablesize" +if test "x$ac_cv_func_setdtablesize" = xyes; then : + cat >>confdefs.h <<_ACEOF +#define HAVE_SETDTABLESIZE 1 +_ACEOF + +fi +done + + ;; + esac + + + if test $REPLACE_DUP2 = 1; then + + + + + + + + + gl_LIBOBJS="$gl_LIBOBJS dup2.$ac_objext" + + + fi + + + + + + GNULIB_DUP2=1 + + + + + +$as_echo "#define GNULIB_TEST_DUP2 1" >>confdefs.h + + + + + { $as_echo "$as_me:${as_lineno-$LINENO}: checking for error_at_line" >&5 $as_echo_n "checking for error_at_line... " >&6; } if ${ac_cv_lib_error_at_line+:} false; then : @@ -17656,6 +19275,224 @@ $as_echo "$ac_cv_lib_error_at_line" >&6; } + if test $ac_cv_func_fcntl = no; then + + + + if test $ac_cv_func_fcntl = no; then + HAVE_FCNTL=0 + else + REPLACE_FCNTL=1 + fi + + else + { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether fcntl handles F_DUPFD correctly" >&5 +$as_echo_n "checking whether fcntl handles F_DUPFD correctly... " >&6; } +if ${gl_cv_func_fcntl_f_dupfd_works+:} false; then : + $as_echo_n "(cached) " >&6 +else + if test "$cross_compiling" = yes; then : + case $host_os in + aix* | cygwin* | haiku*) + gl_cv_func_fcntl_f_dupfd_works="guessing no" ;; + *) gl_cv_func_fcntl_f_dupfd_works="guessing yes" ;; + esac +else + cat confdefs.h - <<_ACEOF >conftest.$ac_ext +/* end confdefs.h. */ +#include + #include + #include + #include + #include + + +$gl_mda_defines + + #ifndef RLIM_SAVED_CUR + # define RLIM_SAVED_CUR RLIM_INFINITY + #endif + #ifndef RLIM_SAVED_MAX + # define RLIM_SAVED_MAX RLIM_INFINITY + #endif + +int +main () +{ +int result = 0; + int bad_fd = INT_MAX; + struct rlimit rlim; + if (getrlimit (RLIMIT_NOFILE, &rlim) == 0 + && 0 <= rlim.rlim_cur && rlim.rlim_cur <= INT_MAX + && rlim.rlim_cur != RLIM_INFINITY + && rlim.rlim_cur != RLIM_SAVED_MAX + && rlim.rlim_cur != RLIM_SAVED_CUR) + bad_fd = rlim.rlim_cur; + if (fcntl (0, F_DUPFD, -1) != -1) result |= 1; + if (errno != EINVAL) result |= 2; + if (fcntl (0, F_DUPFD, bad_fd) != -1) result |= 4; + if (errno != EINVAL) result |= 8; + /* On OS/2 kLIBC, F_DUPFD does not work on a directory fd */ + { + int fd; + fd = open (".", O_RDONLY); + if (fd == -1) + result |= 16; + else if (fcntl (fd, F_DUPFD, STDERR_FILENO + 1) == -1) + result |= 32; + + close (fd); + } + return result; + ; + return 0; +} +_ACEOF +if ac_fn_c_try_run "$LINENO"; then : + gl_cv_func_fcntl_f_dupfd_works=yes +else + gl_cv_func_fcntl_f_dupfd_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 +{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $gl_cv_func_fcntl_f_dupfd_works" >&5 +$as_echo "$gl_cv_func_fcntl_f_dupfd_works" >&6; } + case $gl_cv_func_fcntl_f_dupfd_works in + *yes) ;; + *) + + + if test $ac_cv_func_fcntl = no; then + HAVE_FCNTL=0 + else + REPLACE_FCNTL=1 + fi + + +$as_echo "#define FCNTL_DUPFD_BUGGY 1" >>confdefs.h + ;; + esac + + { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether fcntl understands F_DUPFD_CLOEXEC" >&5 +$as_echo_n "checking whether fcntl understands F_DUPFD_CLOEXEC... " >&6; } +if ${gl_cv_func_fcntl_f_dupfd_cloexec+:} false; then : + $as_echo_n "(cached) " >&6 +else + if test "$cross_compiling" = yes; then : + case "$host_os" in + # Guess no on NetBSD. + netbsd*) gl_cv_func_fcntl_f_dupfd_cloexec="guessing no" ;; + *) gl_cv_func_fcntl_f_dupfd_cloexec="$gl_cross_guess_normal" ;; + esac + +else + cat confdefs.h - <<_ACEOF >conftest.$ac_ext +/* end confdefs.h. */ +#include + #include + int main (int argc, char *argv[]) + { + if (argc == 1) + /* parent process */ + { + if (fcntl (1, F_DUPFD_CLOEXEC, 10) < 0) + return 1; + return execl ("./conftest", "./conftest", "child", NULL); + } + else + /* child process */ + return (fcntl (10, F_GETFL) < 0 ? 0 : 42); + } + + +_ACEOF +if ac_fn_c_try_run "$LINENO"; then : + cat confdefs.h - <<_ACEOF >conftest.$ac_ext +/* end confdefs.h. */ + +#ifdef __linux__ +/* The Linux kernel only added F_DUPFD_CLOEXEC in 2.6.24, so we always replace + it to support the semantics on older kernels that failed with EINVAL. */ +choke me +#endif + +int +main () +{ + + ; + return 0; +} +_ACEOF +if ac_fn_c_try_compile "$LINENO"; then : + gl_cv_func_fcntl_f_dupfd_cloexec=yes +else + gl_cv_func_fcntl_f_dupfd_cloexec="needs runtime check" +fi +rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext + +else + gl_cv_func_fcntl_f_dupfd_cloexec=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 +{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $gl_cv_func_fcntl_f_dupfd_cloexec" >&5 +$as_echo "$gl_cv_func_fcntl_f_dupfd_cloexec" >&6; } + case "$gl_cv_func_fcntl_f_dupfd_cloexec" in + *yes) ;; + *) + + + if test $ac_cv_func_fcntl = no; then + HAVE_FCNTL=0 + else + REPLACE_FCNTL=1 + fi + + ;; + esac + fi + + + if test $HAVE_FCNTL = 0 || test $REPLACE_FCNTL = 1; then + + + + + + + + + gl_LIBOBJS="$gl_LIBOBJS fcntl.$ac_objext" + + fi + + + + + + GNULIB_FCNTL=1 + + + + + +$as_echo "#define GNULIB_TEST_FCNTL 1" >>confdefs.h + + + + + + + + @@ -17836,6 +19673,7 @@ _ACEOF esac + : fi @@ -17894,6 +19732,102 @@ $as_echo "#define GNULIB_TEST_FSYNC 1" >>confdefs.h + if test $ac_cv_func_getdtablesize = yes && + test $ac_cv_have_decl_getdtablesize = yes; then + { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether getdtablesize works" >&5 +$as_echo_n "checking whether getdtablesize works... " >&6; } +if ${gl_cv_func_getdtablesize_works+:} false; then : + $as_echo_n "(cached) " >&6 +else + case "$host_os" in + vms*) gl_cv_func_getdtablesize_works="no (limitation)" ;; + *) + if test "$cross_compiling" = yes; then : + case "$host_os" in + cygwin*) # on cygwin 1.5.25, getdtablesize() automatically grows + gl_cv_func_getdtablesize_works="guessing no" ;; + *) gl_cv_func_getdtablesize_works="guessing yes" ;; + esac + +else + cat confdefs.h - <<_ACEOF >conftest.$ac_ext +/* end confdefs.h. */ + + #include + + +$gl_mda_defines + + +int +main () +{ +int size = getdtablesize(); + if (dup2 (0, getdtablesize()) != -1) + return 1; + if (size != getdtablesize()) + return 2; + + ; + return 0; +} +_ACEOF +if ac_fn_c_try_run "$LINENO"; then : + gl_cv_func_getdtablesize_works=yes +else + gl_cv_func_getdtablesize_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 + + ;; + esac + +fi +{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $gl_cv_func_getdtablesize_works" >&5 +$as_echo "$gl_cv_func_getdtablesize_works" >&6; } + case "$gl_cv_func_getdtablesize_works" in + *yes | "no (limitation)") ;; + *) REPLACE_GETDTABLESIZE=1 ;; + esac + else + HAVE_GETDTABLESIZE=0 + fi + + if test $HAVE_GETDTABLESIZE = 0 || test $REPLACE_GETDTABLESIZE = 1; then + + + + + + + + + gl_LIBOBJS="$gl_LIBOBJS getdtablesize.$ac_objext" + + : + fi + + + + + + GNULIB_GETDTABLESIZE=1 + + + + + +$as_echo "#define GNULIB_TEST_GETDTABLESIZE 1" >>confdefs.h + + + + + + + + @@ -17950,6 +19884,21 @@ $as_echo "#define __GETOPT_PREFIX rpl_" >>confdefs.h + + + GNULIB_GETOPT_POSIX=1 + + + + + +$as_echo "#define GNULIB_TEST_GETOPT_POSIX 1" >>confdefs.h + + + + + + ac_found=0 ac_fn_c_check_decl "$LINENO" "program_invocation_name" "ac_cv_have_decl_program_invocation_name" "#include " @@ -18042,166 +19991,108 @@ $as_echo "#define HAVE_VAR___PROGNAME 1" >>confdefs.h - - - - - - gl_gettimeofday_timezone=void - if test $ac_cv_func_gettimeofday != yes; then - HAVE_GETTIMEOFDAY=0 + if test "$ac_cv_func_getrandom" != yes; then + HAVE_GETRANDOM=0 else - - - - - { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether gettimeofday clobbers localtime buffer" >&5 -$as_echo_n "checking whether gettimeofday clobbers localtime buffer... " >&6; } -if ${gl_cv_func_gettimeofday_clobber+:} false; then : + { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether getrandom is compatible with its GNU+BSD signature" >&5 +$as_echo_n "checking whether getrandom is compatible with its GNU+BSD signature... " >&6; } +if ${gl_cv_func_getrandom_ok+:} false; then : $as_echo_n "(cached) " >&6 -else - if test "$cross_compiling" = yes; then : - # When cross-compiling: - case "$host_os" in - # Guess all is fine on glibc systems. - *-gnu* | gnu*) gl_cv_func_gettimeofday_clobber="guessing no" ;; - # Guess all is fine on musl systems. - *-musl*) gl_cv_func_gettimeofday_clobber="guessing no" ;; - # Guess no on native Windows. - mingw*) gl_cv_func_gettimeofday_clobber="guessing no" ;; - # If we don't know, assume the worst. - *) gl_cv_func_gettimeofday_clobber="guessing yes" ;; - esac - else cat confdefs.h - <<_ACEOF >conftest.$ac_ext /* end confdefs.h. */ -#include - #include - #include - #include +/* Additional includes are needed before on uClibc + and Mac OS X. */ + #include + #include + #include + ssize_t getrandom (void *, size_t, unsigned int); int main () { - time_t t = 0; - struct tm *lt; - struct tm saved_lt; - struct timeval tv; - lt = localtime (&t); - saved_lt = *lt; - gettimeofday (&tv, NULL); - return memcmp (lt, &saved_lt, sizeof (struct tm)) != 0; - ; return 0; } + _ACEOF -if ac_fn_c_try_run "$LINENO"; then : - gl_cv_func_gettimeofday_clobber=no +if ac_fn_c_try_compile "$LINENO"; then : + gl_cv_func_getrandom_ok=yes else - gl_cv_func_gettimeofday_clobber=yes -fi -rm -f core *.core core.conftest.* gmon.out bb.out conftest$ac_exeext \ - conftest.$ac_objext conftest.beam conftest.$ac_ext + gl_cv_func_getrandom_ok=no fi +rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext fi -{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $gl_cv_func_gettimeofday_clobber" >&5 -$as_echo "$gl_cv_func_gettimeofday_clobber" >&6; } - - case "$gl_cv_func_gettimeofday_clobber" in - *yes) - REPLACE_GETTIMEOFDAY=1 - -$as_echo "#define GETTIMEOFDAY_CLOBBERS_LOCALTIME 1" >>confdefs.h - +{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $gl_cv_func_getrandom_ok" >&5 +$as_echo "$gl_cv_func_getrandom_ok" >&6; } + if test $gl_cv_func_getrandom_ok = no; then + REPLACE_GETRANDOM=1 + fi + fi + case "$host_os" in + mingw*) + for ac_header in bcrypt.h +do : + ac_fn_c_check_header_compile "$LINENO" "bcrypt.h" "ac_cv_header_bcrypt_h" "#include +" +if test "x$ac_cv_header_bcrypt_h" = xyes; then : + cat >>confdefs.h <<_ACEOF +#define HAVE_BCRYPT_H 1 +_ACEOF - NEED_LOCALTIME_BUFFER=1 - REPLACE_GMTIME=1 - REPLACE_LOCALTIME=1 +fi - ;; - esac +done - { $as_echo "$as_me:${as_lineno-$LINENO}: checking for gettimeofday with POSIX signature" >&5 -$as_echo_n "checking for gettimeofday with POSIX signature... " >&6; } -if ${gl_cv_func_gettimeofday_posix_signature+:} false; then : + { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether the bcrypt library is guaranteed to be present" >&5 +$as_echo_n "checking whether the bcrypt library is guaranteed to be present... " >&6; } +if ${gl_cv_lib_assume_bcrypt+:} false; then : $as_echo_n "(cached) " >&6 else cat confdefs.h - <<_ACEOF >conftest.$ac_ext /* end confdefs.h. */ -#include - struct timeval c; - int gettimeofday (struct timeval *restrict, void *restrict); - +#include int main () { -/* glibc uses struct timezone * rather than the POSIX void * - if _GNU_SOURCE is defined. However, since the only portable - use of gettimeofday uses NULL as the second parameter, and - since the glibc definition is actually more typesafe, it is - not worth wrapping this to get a compliant signature. */ - int (*f) (struct timeval *restrict, void *restrict) - = gettimeofday; - int x = f (&c, 0); - return !(x | c.tv_sec | c.tv_usec); +#if !(_WIN32_WINNT >= _WIN32_WINNT_WIN7) + cannot assume it + #endif ; return 0; } -_ACEOF -if ac_fn_c_try_compile "$LINENO"; then : - gl_cv_func_gettimeofday_posix_signature=yes -else - cat confdefs.h - <<_ACEOF >conftest.$ac_ext -/* end confdefs.h. */ -#include -int gettimeofday (struct timeval *restrict, struct timezone *restrict); -int -main () -{ - - ; - return 0; -} _ACEOF if ac_fn_c_try_compile "$LINENO"; then : - gl_cv_func_gettimeofday_posix_signature=almost + gl_cv_lib_assume_bcrypt=yes else - gl_cv_func_gettimeofday_posix_signature=no -fi -rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext + gl_cv_lib_assume_bcrypt=no fi rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext + fi -{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $gl_cv_func_gettimeofday_posix_signature" >&5 -$as_echo "$gl_cv_func_gettimeofday_posix_signature" >&6; } - if test $gl_cv_func_gettimeofday_posix_signature = almost; then - gl_gettimeofday_timezone='struct timezone' - elif test $gl_cv_func_gettimeofday_posix_signature != yes; then - REPLACE_GETTIMEOFDAY=1 - fi - if test $REPLACE_STRUCT_TIMEVAL = 1; then - REPLACE_GETTIMEOFDAY=1 - fi - case "$host_os" in - mingw*) REPLACE_GETTIMEOFDAY=1 ;; - esac - fi +{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $gl_cv_lib_assume_bcrypt" >&5 +$as_echo "$gl_cv_lib_assume_bcrypt" >&6; } + if test $gl_cv_lib_assume_bcrypt = yes; then -cat >>confdefs.h <<_ACEOF -#define GETTIMEOFDAY_TIMEZONE $gl_gettimeofday_timezone -_ACEOF +$as_echo "#define HAVE_LIB_BCRYPT 1" >>confdefs.h + LIB_GETRANDOM='-lbcrypt' + else + LIB_GETRANDOM='-ladvapi32' + fi + ;; + *) + LIB_GETRANDOM= ;; + esac - if test $HAVE_GETTIMEOFDAY = 0 || test $REPLACE_GETTIMEOFDAY = 1; then + if test $HAVE_GETRANDOM = 0 || test $REPLACE_GETRANDOM = 1; then @@ -18209,22 +20100,24 @@ _ACEOF - gl_LIBOBJS="$gl_LIBOBJS gettimeofday.$ac_objext" - : + gl_LIBOBJS="$gl_LIBOBJS getrandom.$ac_objext" + fi - GNULIB_GETTIMEOFDAY=1 + GNULIB_GETRANDOM=1 -$as_echo "#define GNULIB_TEST_GETTIMEOFDAY 1" >>confdefs.h +$as_echo "#define GNULIB_TEST_GETRANDOM 1" >>confdefs.h + + @@ -18237,13 +20130,35 @@ $as_echo "#define GNULIB_TEST_GETTIMEOFDAY 1" >>confdefs.h ac_config_links="$ac_config_links $GNUmakefile:$GNUmakefile" + LIB_HARD_LOCALE="$LIB_SETLOCALE_NULL" PRIPTR_PREFIX= if test -n "$STDINT_H"; then - PRIPTR_PREFIX='"l"' + cat confdefs.h - <<_ACEOF >conftest.$ac_ext +/* end confdefs.h. */ + + #ifdef _WIN64 + LLP64 + #endif + +int +main () +{ + + ; + return 0; +} + +_ACEOF +if ac_fn_c_try_compile "$LINENO"; then : + PRIPTR_PREFIX='"l"' +else + PRIPTR_PREFIX='"ll"' +fi +rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext else for glpfx in '' l ll I64; do case $glpfx in @@ -18295,10 +20210,8 @@ else #if defined INT32_MAX && defined INTMAX_MAX #define CONDITION (INT32_MAX < INTMAX_MAX) - #elif HAVE_LONG_LONG_INT - #define CONDITION (sizeof (int) < sizeof (long long int)) #else - #define CONDITION 0 + #define CONDITION (sizeof (int) < sizeof (long long int)) #endif int test[CONDITION ? 1 : -1]; int @@ -18347,10 +20260,8 @@ else #if defined INT64_MAX #define CONDITION (INT64_MAX == LONG_MAX) - #elif HAVE_LONG_LONG_INT - #define CONDITION (sizeof (long long int) == sizeof (long int)) #else - #define CONDITION 0 + #define CONDITION (sizeof (long long int) == sizeof (long int)) #endif int test[CONDITION ? 1 : -1]; int @@ -18401,10 +20312,8 @@ else #if defined UINT32_MAX && defined UINTMAX_MAX #define CONDITION (UINT32_MAX < UINTMAX_MAX) - #elif HAVE_LONG_LONG_INT - #define CONDITION (sizeof (unsigned int) < sizeof (unsigned long long int)) #else - #define CONDITION 0 + #define CONDITION (sizeof (unsigned int) < sizeof (unsigned long long int)) #endif int test[CONDITION ? 1 : -1]; int @@ -18453,10 +20362,8 @@ else #if defined UINT64_MAX #define CONDITION (UINT64_MAX == ULONG_MAX) - #elif HAVE_LONG_LONG_INT - #define CONDITION (sizeof (unsigned long long int) == sizeof (unsigned long int)) #else - #define CONDITION 0 + #define CONDITION (sizeof (unsigned long long int) == sizeof (unsigned long int)) #endif int test[CONDITION ? 1 : -1]; int @@ -18581,7 +20488,7 @@ $as_echo "$gl_cv_next_langinfo_h" >&6; } if test $ac_cv_header_langinfo_h = yes; then HAVE_LANGINFO_H=1 - { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether langinfo.h defines CODESET" >&5 + { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether langinfo.h defines CODESET" >&5 $as_echo_n "checking whether langinfo.h defines CODESET... " >&6; } if ${gl_cv_header_langinfo_codeset+:} false; then : $as_echo_n "(cached) " >&6 @@ -18855,6 +20762,8 @@ $as_echo "#define HAVE___INLINE 1" >>confdefs.h + + case "$host_os" in solaris*) @@ -18891,47 +20800,6 @@ fi { $as_echo "$as_me:${as_lineno-$LINENO}: result: $gl_cv_header_locale_h_posix2001" >&5 $as_echo "$gl_cv_header_locale_h_posix2001" >&6; } - - if test $ac_cv_header_xlocale_h = yes; then - HAVE_XLOCALE_H=1 - { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether locale.h defines locale_t" >&5 -$as_echo_n "checking whether locale.h defines locale_t... " >&6; } -if ${gl_cv_header_locale_has_locale_t+:} false; then : - $as_echo_n "(cached) " >&6 -else - cat confdefs.h - <<_ACEOF >conftest.$ac_ext -/* end confdefs.h. */ -#include - locale_t x; -int -main () -{ - - ; - return 0; -} -_ACEOF -if ac_fn_c_try_compile "$LINENO"; then : - gl_cv_header_locale_has_locale_t=yes -else - gl_cv_header_locale_has_locale_t=no -fi -rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext - -fi -{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $gl_cv_header_locale_has_locale_t" >&5 -$as_echo "$gl_cv_header_locale_has_locale_t" >&6; } - if test $gl_cv_header_locale_has_locale_t = yes; then - gl_cv_header_locale_h_needs_xlocale_h=no - else - gl_cv_header_locale_h_needs_xlocale_h=yes - fi - else - HAVE_XLOCALE_H=0 - gl_cv_header_locale_h_needs_xlocale_h=no - fi - - { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether struct lconv is properly defined" >&5 $as_echo_n "checking whether struct lconv is properly defined... " >&6; } if ${gl_cv_sys_struct_lconv_ok+:} false; then : @@ -18962,7 +20830,27 @@ fi { $as_echo "$as_me:${as_lineno-$LINENO}: result: $gl_cv_sys_struct_lconv_ok" >&5 $as_echo "$gl_cv_sys_struct_lconv_ok" >&6; } if test $gl_cv_sys_struct_lconv_ok = no; then - REPLACE_STRUCT_LCONV=1 + case "$host_os" in + mingw*) + cat confdefs.h - <<_ACEOF >conftest.$ac_ext +/* end confdefs.h. */ + +#ifdef _MSC_VER + Special +#endif + +_ACEOF +if (eval "$ac_cpp conftest.$ac_ext") 2>&5 | + $EGREP "Special" >/dev/null 2>&1; then : + +else + REPLACE_STRUCT_LCONV=1 +fi +rm -f conftest* + + ;; + *) REPLACE_STRUCT_LCONV=1 ;; + esac fi @@ -19091,17 +20979,6 @@ $as_echo "#define GNULIB_TEST_LOCALECONV 1" >>confdefs.h - - - - - - - - gl_LIBOBJS="$gl_LIBOBJS localtime-buffer.$ac_objext" - - - if test "$gl_threads_api" = posix; then # OSF/1 4.0 and Mac OS X 10.1 lack the pthread_rwlock_t type and the # pthread_rwlock_* functions. @@ -19118,7 +20995,7 @@ fi if $has_rwlock; then - { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether pthread_rwlock_rdlock prefers a writer to a reader" >&5 + { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether pthread_rwlock_rdlock prefers a writer to a reader" >&5 $as_echo_n "checking whether pthread_rwlock_rdlock prefers a writer to a reader... " >&6; } if ${gl_cv_pthread_rwlock_rdlock_prefer_writer+:} false; then : $as_echo_n "(cached) " >&6 @@ -19126,7 +21003,25 @@ else save_LIBS="$LIBS" LIBS="$LIBS $LIBMULTITHREAD" if test "$cross_compiling" = yes; then : - gl_cv_pthread_rwlock_rdlock_prefer_writer="guessing yes" + 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" ;; + esac + else cat confdefs.h - <<_ACEOF >conftest.$ac_ext /* end confdefs.h. */ @@ -19333,6 +21228,9 @@ else # include #endif + +$gl_mda_defines + int main () { @@ -19469,19 +21367,7 @@ $as_echo "#define GNULIB_TEST_LSTAT 1" >>confdefs.h - for ac_header in stdlib.h -do : - ac_fn_c_check_header_mongrel "$LINENO" "stdlib.h" "ac_cv_header_stdlib_h" "$ac_includes_default" -if test "x$ac_cv_header_stdlib_h" = xyes; then : - cat >>confdefs.h <<_ACEOF -#define HAVE_STDLIB_H 1 -_ACEOF - -fi - -done - - { $as_echo "$as_me:${as_lineno-$LINENO}: checking for GNU libc compatible malloc" >&5 + { $as_echo "$as_me:${as_lineno-$LINENO}: checking for GNU libc compatible malloc" >&5 $as_echo_n "checking for GNU libc compatible malloc... " >&6; } if ${ac_cv_func_malloc_0_nonnull+:} false; then : $as_echo_n "(cached) " >&6 @@ -19492,18 +21378,14 @@ else *-gnu* | gnu* | *-musl* | freebsd* | netbsd* | openbsd* \ | hpux* | solaris* | cygwin* | mingw*) ac_cv_func_malloc_0_nonnull="guessing yes" ;; - # If we don't know, assume the worst. - *) ac_cv_func_malloc_0_nonnull="guessing no" ;; + # If we don't know, obey --enable-cross-guesses. + *) ac_cv_func_malloc_0_nonnull="$gl_cross_guess_normal" ;; esac else cat confdefs.h - <<_ACEOF >conftest.$ac_ext /* end confdefs.h. */ -#if defined STDC_HEADERS || defined HAVE_STDLIB_H - # include - #else - char *malloc (); - #endif +#include int main () @@ -19616,7 +21498,14 @@ $as_echo "#define GNULIB_TEST_MALLOC_POSIX 1" >>confdefs.h - if test $ac_cv_func_mbsinit = yes && test $ac_cv_func_mbrtowc = yes; then + + + if case "$host_os" in + mingw*) true ;; + *) test $ac_cv_func_mbsinit = yes ;; + esac \ + && test $ac_cv_func_mbrtowc = yes; then + @@ -19674,6 +21563,50 @@ rm -f core *.core core.conftest.* gmon.out bb.out conftest$ac_exeext \ conftest.$ac_objext conftest.beam conftest.$ac_ext fi + else + if test $LOCALE_FR_UTF8 != none; then + if test "$cross_compiling" = yes; then : + : +else + cat confdefs.h - <<_ACEOF >conftest.$ac_ext +/* end confdefs.h. */ + +#include +#include +/* Tru64 with Desktop Toolkit C has a bug: must be included before + . + BSD/OS 4.0.1 has a bug: , and must be + included before . */ +#include +#include +#include +#include +int main () +{ + if (setlocale (LC_ALL, "$LOCALE_FR_UTF8") != NULL) + { + const char input[] = "B\303\274\303\237er"; /* "Büßer" */ + mbstate_t state; + wchar_t wc; + + memset (&state, '\0', sizeof (mbstate_t)); + if (mbrtowc (&wc, input + 1, 1, &state) == (size_t)(-2)) + if (mbsinit (&state)) + return 2; + } + return 0; +} +_ACEOF +if ac_fn_c_try_run "$LINENO"; then : + gl_cv_func_mbrtowc_incomplete_state=yes +else + gl_cv_func_mbrtowc_incomplete_state=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 fi fi @@ -20136,6 +22069,144 @@ $as_echo "$gl_cv_func_mbrtowc_nul_retval" >&6; } + { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether mbrtowc stores incomplete characters" >&5 +$as_echo_n "checking whether mbrtowc stores incomplete characters... " >&6; } +if ${gl_cv_func_mbrtowc_stores_incomplete+:} false; then : + $as_echo_n "(cached) " >&6 +else + + case "$host_os" in + # Guess yes on native Windows. + mingw*) gl_cv_func_mbrtowc_stores_incomplete="guessing yes" ;; + *) gl_cv_func_mbrtowc_stores_incomplete="guessing no" ;; + esac + case "$host_os" in + mingw*) + if test "$cross_compiling" = yes; then : + : +else + cat confdefs.h - <<_ACEOF >conftest.$ac_ext +/* end confdefs.h. */ + +#include +#include +/* Tru64 with Desktop Toolkit C has a bug: must be included before + . + BSD/OS 4.0.1 has a bug: , and must be + included before . */ +#include +#include +#include +#include +int main () +{ + int result = 0; + if (setlocale (LC_ALL, "French_France.65001") != NULL) + { + wchar_t wc = (wchar_t) 0xBADFACE; + mbstate_t state; + + memset (&state, '\0', sizeof (mbstate_t)); + if (mbrtowc (&wc, "\303", 1, &state) == (size_t)(-2) + && wc != (wchar_t) 0xBADFACE) + result |= 1; + } + if (setlocale (LC_ALL, "Japanese_Japan.932") != NULL) + { + wchar_t wc = (wchar_t) 0xBADFACE; + mbstate_t state; + + memset (&state, '\0', sizeof (mbstate_t)); + if (mbrtowc (&wc, "\226", 1, &state) == (size_t)(-2) + && wc != (wchar_t) 0xBADFACE) + result |= 2; + } + if (setlocale (LC_ALL, "Chinese_Taiwan.950") != NULL) + { + wchar_t wc = (wchar_t) 0xBADFACE; + mbstate_t state; + + memset (&state, '\0', sizeof (mbstate_t)); + if (mbrtowc (&wc, "\245", 1, &state) == (size_t)(-2) + && wc != (wchar_t) 0xBADFACE) + result |= 4; + } + if (setlocale (LC_ALL, "Chinese_China.936") != NULL) + { + wchar_t wc = (wchar_t) 0xBADFACE; + mbstate_t state; + + memset (&state, '\0', sizeof (mbstate_t)); + if (mbrtowc (&wc, "\261", 1, &state) == (size_t)(-2) + && wc != (wchar_t) 0xBADFACE) + result |= 8; + } + return result; +} +_ACEOF +if ac_fn_c_try_run "$LINENO"; then : + gl_cv_func_mbrtowc_stores_incomplete=no +else + gl_cv_func_mbrtowc_stores_incomplete=yes +fi +rm -f core *.core core.conftest.* gmon.out bb.out conftest$ac_exeext \ + conftest.$ac_objext conftest.beam conftest.$ac_ext +fi + + ;; + *) + + if test $LOCALE_FR_UTF8 != none; then + if test "$cross_compiling" = yes; then : + : +else + cat confdefs.h - <<_ACEOF >conftest.$ac_ext +/* end confdefs.h. */ + +#include +#include +/* Tru64 with Desktop Toolkit C has a bug: must be included before + . + BSD/OS 4.0.1 has a bug: , and must be + included before . */ +#include +#include +#include +#include +int main () +{ + if (setlocale (LC_ALL, "$LOCALE_FR_UTF8") != NULL) + { + wchar_t wc = (wchar_t) 0xBADFACE; + mbstate_t state; + + memset (&state, '\0', sizeof (mbstate_t)); + if (mbrtowc (&wc, "\303", 1, &state) == (size_t)(-2) + && wc != (wchar_t) 0xBADFACE) + return 1; + } + return 0; +} +_ACEOF +if ac_fn_c_try_run "$LINENO"; then : + gl_cv_func_mbrtowc_stores_incomplete=no +else + gl_cv_func_mbrtowc_stores_incomplete=yes +fi +rm -f core *.core core.conftest.* gmon.out bb.out conftest$ac_exeext \ + conftest.$ac_objext conftest.beam conftest.$ac_ext +fi + + fi + ;; + esac + +fi +{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $gl_cv_func_mbrtowc_stores_incomplete" >&5 +$as_echo "$gl_cv_func_mbrtowc_stores_incomplete" >&6; } + + + { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether mbrtowc works on empty input" >&5 $as_echo_n "checking whether mbrtowc works on empty input... " >&6; } if ${gl_cv_func_mbrtowc_empty_input+:} false; then : @@ -20181,16 +22252,16 @@ $as_echo "$gl_cv_func_mbrtowc_empty_input" >&6; } { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether the C locale is free of encoding errors" >&5 $as_echo_n "checking whether the C locale is free of encoding errors... " >&6; } -if ${gl_cv_C_locale_sans_EILSEQ+:} false; then : +if ${gl_cv_func_mbrtowc_C_locale_sans_EILSEQ+:} false; then : $as_echo_n "(cached) " >&6 else - gl_cv_C_locale_sans_EILSEQ="guessing no" + gl_cv_func_mbrtowc_C_locale_sans_EILSEQ="$gl_cross_guess_normal" if test "$cross_compiling" = yes; then : case "$host_os" in # Guess yes on native Windows. - mingw*) gl_cv_C_locale_sans_EILSEQ="guessing yes" ;; + mingw*) gl_cv_func_mbrtowc_C_locale_sans_EILSEQ="guessing yes" ;; esac else @@ -20224,9 +22295,9 @@ main () } _ACEOF if ac_fn_c_try_run "$LINENO"; then : - gl_cv_C_locale_sans_EILSEQ=yes + gl_cv_func_mbrtowc_C_locale_sans_EILSEQ=yes else - gl_cv_C_locale_sans_EILSEQ=no + gl_cv_func_mbrtowc_C_locale_sans_EILSEQ=no fi rm -f core *.core core.conftest.* gmon.out bb.out conftest$ac_exeext \ conftest.$ac_objext conftest.beam conftest.$ac_ext @@ -20234,8 +22305,8 @@ fi fi -{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $gl_cv_C_locale_sans_EILSEQ" >&5 -$as_echo "$gl_cv_C_locale_sans_EILSEQ" >&6; } +{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $gl_cv_func_mbrtowc_C_locale_sans_EILSEQ" >&5 +$as_echo "$gl_cv_func_mbrtowc_C_locale_sans_EILSEQ" >&6; } case "$gl_cv_func_mbrtowc_null_arg1" in *yes) ;; @@ -20269,6 +22340,14 @@ $as_echo "#define MBRTOWC_NUL_RETVAL_BUG 1" >>confdefs.h REPLACE_MBRTOWC=1 ;; esac + case "$gl_cv_func_mbrtowc_stores_incomplete" in + *no) ;; + *) +$as_echo "#define MBRTOWC_STORES_INCOMPLETE_BUG 1" >>confdefs.h + + REPLACE_MBRTOWC=1 + ;; + esac case "$gl_cv_func_mbrtowc_empty_input" in *yes) ;; *) @@ -20277,16 +22356,130 @@ $as_echo "#define MBRTOWC_EMPTY_INPUT_BUG 1" >>confdefs.h REPLACE_MBRTOWC=1 ;; esac - case $gl_cv_C_locale_sans_EILSEQ in + case "$gl_cv_func_mbrtowc_C_locale_sans_EILSEQ" in *yes) ;; *) -$as_echo "#define C_LOCALE_MAYBE_EILSEQ 1" >>confdefs.h +$as_echo "#define MBRTOWC_IN_C_LOCALE_MAYBE_EILSEQ 1" >>confdefs.h REPLACE_MBRTOWC=1 ;; esac fi fi + if test $REPLACE_MBSTATE_T = 1; then + case "$host_os" in + mingw*) LIB_MBRTOWC= ;; + *) + + + { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether imported symbols can be declared weak" >&5 +$as_echo_n "checking whether imported symbols can be declared weak... " >&6; } +if ${gl_cv_have_weak+:} false; then : + $as_echo_n "(cached) " >&6 +else + gl_cv_have_weak=no + cat confdefs.h - <<_ACEOF >conftest.$ac_ext +/* end confdefs.h. */ +extern void xyzzy (); +#pragma weak xyzzy +int +main () +{ +xyzzy(); + ; + return 0; +} +_ACEOF +if ac_fn_c_try_link "$LINENO"; then : + gl_cv_have_weak=maybe +fi +rm -f core conftest.err conftest.$ac_objext \ + conftest$ac_exeext conftest.$ac_ext + if test $gl_cv_have_weak = maybe; then + if test "$cross_compiling" = yes; then : + cat confdefs.h - <<_ACEOF >conftest.$ac_ext +/* end confdefs.h. */ +#ifdef __ELF__ + Extensible Linking Format + #endif + +_ACEOF +if (eval "$ac_cpp conftest.$ac_ext") 2>&5 | + $EGREP "Extensible Linking Format" >/dev/null 2>&1; then : + gl_cv_have_weak="guessing yes" +else + gl_cv_have_weak="guessing no" +fi +rm -f conftest* + + +else + cat confdefs.h - <<_ACEOF >conftest.$ac_ext +/* end confdefs.h. */ + +#include +#pragma weak fputs +int main () +{ + return (fputs == NULL); +} +_ACEOF +if ac_fn_c_try_run "$LINENO"; then : + gl_cv_have_weak=yes +else + gl_cv_have_weak=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 + case " $LDFLAGS " in + *" -static "*) gl_cv_have_weak=no ;; + esac + case "$gl_cv_have_weak" in + *yes) + case "$host_os" in + freebsd* | dragonfly*) + : > conftest1.c + $CC $CPPFLAGS $CFLAGS $LDFLAGS -fPIC -shared -o libempty.so conftest1.c -lpthread >&5 2>&1 + cat < conftest2.c +#include +#pragma weak pthread_mutexattr_gettype +int main () +{ + return (pthread_mutexattr_gettype != NULL); +} +EOF + $CC $CPPFLAGS $CFLAGS $LDFLAGS -o conftest conftest2.c libempty.so >&5 2>&1 \ + || gl_cv_have_weak=no + rm -f conftest1.c libempty.so conftest2.c conftest + ;; + esac + ;; + esac + +fi +{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $gl_cv_have_weak" >&5 +$as_echo "$gl_cv_have_weak" >&6; } + case "$gl_cv_have_weak" in + *yes) + +$as_echo "#define HAVE_WEAK_SYMBOLS 1" >>confdefs.h + + ;; + esac + + case "$gl_cv_have_weak" in + *yes) LIB_MBRTOWC= ;; + *) LIB_MBRTOWC="$LIBPTHREAD" ;; + esac + ;; + esac + else + LIB_MBRTOWC= + fi + if test $HAVE_MBRTOWC = 0 || test $REPLACE_MBRTOWC = 1; then @@ -20299,6 +22492,114 @@ $as_echo "#define C_LOCALE_MAYBE_EILSEQ 1" >>confdefs.h gl_LIBOBJS="$gl_LIBOBJS mbrtowc.$ac_objext" + if test $REPLACE_MBSTATE_T = 1; then + + + + + + + + + gl_LIBOBJS="$gl_LIBOBJS lc-charset-dispatch.$ac_objext" + + + + + + + + + + gl_LIBOBJS="$gl_LIBOBJS mbtowc-lock.$ac_objext" + + + + + CFLAG_VISIBILITY= + HAVE_VISIBILITY=0 + if test -n "$GCC"; then + { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether the -Werror option is usable" >&5 +$as_echo_n "checking whether the -Werror option is usable... " >&6; } +if ${gl_cv_cc_vis_werror+:} false; then : + $as_echo_n "(cached) " >&6 +else + gl_save_CFLAGS="$CFLAGS" + CFLAGS="$CFLAGS -Werror" + cat confdefs.h - <<_ACEOF >conftest.$ac_ext +/* end confdefs.h. */ + +int +main () +{ + + ; + return 0; +} +_ACEOF +if ac_fn_c_try_compile "$LINENO"; then : + gl_cv_cc_vis_werror=yes +else + gl_cv_cc_vis_werror=no +fi +rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext + CFLAGS="$gl_save_CFLAGS" + +fi +{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $gl_cv_cc_vis_werror" >&5 +$as_echo "$gl_cv_cc_vis_werror" >&6; } + { $as_echo "$as_me:${as_lineno-$LINENO}: checking for simple visibility declarations" >&5 +$as_echo_n "checking for simple visibility declarations... " >&6; } +if ${gl_cv_cc_visibility+:} false; then : + $as_echo_n "(cached) " >&6 +else + gl_save_CFLAGS="$CFLAGS" + CFLAGS="$CFLAGS -fvisibility=hidden" + if test $gl_cv_cc_vis_werror = yes; then + CFLAGS="$CFLAGS -Werror" + fi + cat confdefs.h - <<_ACEOF >conftest.$ac_ext +/* end confdefs.h. */ +extern __attribute__((__visibility__("hidden"))) int hiddenvar; + extern __attribute__((__visibility__("default"))) int exportedvar; + extern __attribute__((__visibility__("hidden"))) int hiddenfunc (void); + extern __attribute__((__visibility__("default"))) int exportedfunc (void); + void dummyfunc (void) {} + +int +main () +{ + + ; + return 0; +} +_ACEOF +if ac_fn_c_try_compile "$LINENO"; then : + gl_cv_cc_visibility=yes +else + gl_cv_cc_visibility=no +fi +rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext + CFLAGS="$gl_save_CFLAGS" + +fi +{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $gl_cv_cc_visibility" >&5 +$as_echo "$gl_cv_cc_visibility" >&6; } + if test $gl_cv_cc_visibility = yes; then + CFLAG_VISIBILITY="-fvisibility=hidden" + HAVE_VISIBILITY=1 + fi + fi + + + +cat >>confdefs.h <<_ACEOF +#define HAVE_VISIBILITY $HAVE_VISIBILITY +_ACEOF + + + + fi : @@ -20330,7 +22631,13 @@ $as_echo "#define GNULIB_TEST_MBRTOWC 1" >>confdefs.h - if test $ac_cv_func_mbsinit = yes && test $ac_cv_func_mbrtowc = yes; then + + if case "$host_os" in + mingw*) true ;; + *) test $ac_cv_func_mbsinit = yes ;; + esac \ + && test $ac_cv_func_mbrtowc = yes; then + @@ -20388,6 +22695,50 @@ rm -f core *.core core.conftest.* gmon.out bb.out conftest$ac_exeext \ conftest.$ac_objext conftest.beam conftest.$ac_ext fi + else + if test $LOCALE_FR_UTF8 != none; then + if test "$cross_compiling" = yes; then : + : +else + cat confdefs.h - <<_ACEOF >conftest.$ac_ext +/* end confdefs.h. */ + +#include +#include +/* Tru64 with Desktop Toolkit C has a bug: must be included before + . + BSD/OS 4.0.1 has a bug: , and must be + included before . */ +#include +#include +#include +#include +int main () +{ + if (setlocale (LC_ALL, "$LOCALE_FR_UTF8") != NULL) + { + const char input[] = "B\303\274\303\237er"; /* "Büßer" */ + mbstate_t state; + wchar_t wc; + + memset (&state, '\0', sizeof (mbstate_t)); + if (mbrtowc (&wc, input + 1, 1, &state) == (size_t)(-2)) + if (mbsinit (&state)) + return 2; + } + return 0; +} +_ACEOF +if ac_fn_c_try_run "$LINENO"; then : + gl_cv_func_mbrtowc_incomplete_state=yes +else + gl_cv_func_mbrtowc_incomplete_state=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 fi fi @@ -20605,14 +22956,14 @@ if ${gl_cv_func_mkdir_trailing_slash_works+:} false; then : $as_echo_n "(cached) " >&6 else rm -rf conftest.dir - if test "$cross_compiling" = yes; then : + if test "$cross_compiling" = yes; then : case "$host_os" in - # Guess yes on Linux systems. - linux-* | linux) gl_cv_func_mkdir_trailing_slash_works="guessing yes" ;; - # Guess yes on glibc systems. - *-gnu* | gnu*) gl_cv_func_mkdir_trailing_slash_works="guessing yes" ;; - # Guess yes on MSVC, no on mingw. - mingw*) cat confdefs.h - <<_ACEOF >conftest.$ac_ext + # Guess yes on Linux systems. + linux-* | linux) gl_cv_func_mkdir_trailing_slash_works="guessing yes" ;; + # Guess yes on glibc systems. + *-gnu* | gnu*) gl_cv_func_mkdir_trailing_slash_works="guessing yes" ;; + # Guess yes on MSVC, no on mingw. + mingw*) cat confdefs.h - <<_ACEOF >conftest.$ac_ext /* end confdefs.h. */ #ifdef _MSC_VER @@ -20628,17 +22979,20 @@ else fi rm -f conftest* - ;; - # If we don't know, assume the worst. - *) gl_cv_func_mkdir_trailing_slash_works="guessing no" ;; - esac + ;; + # If we don't know, obey --enable-cross-guesses. + *) gl_cv_func_mkdir_trailing_slash_works="$gl_cross_guess_normal" ;; + esac else cat confdefs.h - <<_ACEOF >conftest.$ac_ext /* end confdefs.h. */ -# include -# include + #include + #include + + +$gl_mda_defines int main () @@ -20657,8 +23011,7 @@ rm -f core *.core core.conftest.* gmon.out bb.out conftest$ac_exeext \ conftest.$ac_objext conftest.beam conftest.$ac_ext fi - rm -rf conftest.dir - + rm -rf conftest.dir fi { $as_echo "$as_me:${as_lineno-$LINENO}: result: $gl_cv_func_mkdir_trailing_slash_works" >&5 @@ -20676,24 +23029,27 @@ if ${gl_cv_func_mkdir_trailing_dot_works+:} false; then : $as_echo_n "(cached) " >&6 else rm -rf conftest.dir - if test "$cross_compiling" = yes; then : + if test "$cross_compiling" = yes; then : case "$host_os" in - # Guess yes on glibc systems. - *-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 no on native Windows. - mingw*) gl_cv_func_mkdir_trailing_dot_works="guessing no" ;; - # If we don't know, assume the worst. - *) gl_cv_func_mkdir_trailing_dot_works="guessing no" ;; - esac + # Guess yes on glibc systems. + *-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 no on native Windows. + mingw*) gl_cv_func_mkdir_trailing_dot_works="guessing no" ;; + # If we don't know, obey --enable-cross-guesses. + *) gl_cv_func_mkdir_trailing_dot_works="$gl_cross_guess_normal" ;; + esac else cat confdefs.h - <<_ACEOF >conftest.$ac_ext /* end confdefs.h. */ -# include -# include + #include + #include + + +$gl_mda_defines int main () @@ -20712,7 +23068,7 @@ rm -f core *.core core.conftest.* gmon.out bb.out conftest$ac_exeext \ conftest.$ac_objext conftest.beam conftest.$ac_ext fi - rm -rf conftest.dir + rm -rf conftest.dir fi @@ -20760,14 +23116,18 @@ else *-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, assume the worst. - *) 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 cat confdefs.h - <<_ACEOF >conftest.$ac_ext /* end confdefs.h. */ $ac_includes_default + + +$gl_mda_defines + int main () { @@ -20893,7 +23253,11 @@ _ACEOF - if test $ac_cv_func_nl_langinfo = yes; then + + + + + if test $ac_cv_func_nl_langinfo = yes; then # On Irix 6.5, YESEXPR is defined, but nl_langinfo(YESEXPR) is broken. { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether YESEXPR works" >&5 $as_echo_n "checking whether YESEXPR works... " >&6; } @@ -20943,13 +23307,24 @@ $as_echo "$gl_cv_func_nl_langinfo_yesexpr_works" >&6; } cat >>confdefs.h <<_ACEOF #define FUNC_NL_LANGINFO_YESEXPR_WORKS $FUNC_NL_LANGINFO_YESEXPR_WORKS +_ACEOF + + # On Solaris 10 and Solaris 11.3, nl_langinfo is not multithread-safe. + case "$host_os" in + solaris*) NL_LANGINFO_MTSAFE=0 ;; + *) NL_LANGINFO_MTSAFE=1 ;; + esac + +cat >>confdefs.h <<_ACEOF +#define NL_LANGINFO_MTSAFE $NL_LANGINFO_MTSAFE _ACEOF if test $HAVE_LANGINFO_CODESET = 1 \ && test $HAVE_LANGINFO_T_FMT_AMPM = 1 \ && test $HAVE_LANGINFO_ALTMON = 1 \ && test $HAVE_LANGINFO_ERA = 1 \ - && test $FUNC_NL_LANGINFO_YESEXPR_WORKS = 1; then + && test $FUNC_NL_LANGINFO_YESEXPR_WORKS = 1 \ + && test $NL_LANGINFO_MTSAFE = 1; then : else REPLACE_NL_LANGINFO=1 @@ -20960,6 +23335,12 @@ $as_echo "#define REPLACE_NL_LANGINFO 1" >>confdefs.h else HAVE_NL_LANGINFO=0 fi + if test $HAVE_NL_LANGINFO = 0 || test $HAVE_LANGINFO_CODESET = 0; then + LIB_NL_LANGINFO="$LIB_SETLOCALE_NULL" + else + LIB_NL_LANGINFO= + fi + if test $HAVE_NL_LANGINFO = 0 || test $REPLACE_NL_LANGINFO = 1; then @@ -20972,6 +23353,104 @@ $as_echo "#define REPLACE_NL_LANGINFO 1" >>confdefs.h gl_LIBOBJS="$gl_LIBOBJS nl_langinfo.$ac_objext" + fi + if test $REPLACE_NL_LANGINFO = 1 && test $NL_LANGINFO_MTSAFE = 0; then + + + + + + + + + gl_LIBOBJS="$gl_LIBOBJS nl_langinfo-lock.$ac_objext" + + + + + CFLAG_VISIBILITY= + HAVE_VISIBILITY=0 + if test -n "$GCC"; then + { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether the -Werror option is usable" >&5 +$as_echo_n "checking whether the -Werror option is usable... " >&6; } +if ${gl_cv_cc_vis_werror+:} false; then : + $as_echo_n "(cached) " >&6 +else + gl_save_CFLAGS="$CFLAGS" + CFLAGS="$CFLAGS -Werror" + cat confdefs.h - <<_ACEOF >conftest.$ac_ext +/* end confdefs.h. */ + +int +main () +{ + + ; + return 0; +} +_ACEOF +if ac_fn_c_try_compile "$LINENO"; then : + gl_cv_cc_vis_werror=yes +else + gl_cv_cc_vis_werror=no +fi +rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext + CFLAGS="$gl_save_CFLAGS" + +fi +{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $gl_cv_cc_vis_werror" >&5 +$as_echo "$gl_cv_cc_vis_werror" >&6; } + { $as_echo "$as_me:${as_lineno-$LINENO}: checking for simple visibility declarations" >&5 +$as_echo_n "checking for simple visibility declarations... " >&6; } +if ${gl_cv_cc_visibility+:} false; then : + $as_echo_n "(cached) " >&6 +else + gl_save_CFLAGS="$CFLAGS" + CFLAGS="$CFLAGS -fvisibility=hidden" + if test $gl_cv_cc_vis_werror = yes; then + CFLAGS="$CFLAGS -Werror" + fi + cat confdefs.h - <<_ACEOF >conftest.$ac_ext +/* end confdefs.h. */ +extern __attribute__((__visibility__("hidden"))) int hiddenvar; + extern __attribute__((__visibility__("default"))) int exportedvar; + extern __attribute__((__visibility__("hidden"))) int hiddenfunc (void); + extern __attribute__((__visibility__("default"))) int exportedfunc (void); + void dummyfunc (void) {} + +int +main () +{ + + ; + return 0; +} +_ACEOF +if ac_fn_c_try_compile "$LINENO"; then : + gl_cv_cc_visibility=yes +else + gl_cv_cc_visibility=no +fi +rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext + CFLAGS="$gl_save_CFLAGS" + +fi +{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $gl_cv_cc_visibility" >&5 +$as_echo "$gl_cv_cc_visibility" >&6; } + if test $gl_cv_cc_visibility = yes; then + CFLAG_VISIBILITY="-fvisibility=hidden" + HAVE_VISIBILITY=1 + fi + fi + + + +cat >>confdefs.h <<_ACEOF +#define HAVE_VISIBILITY $HAVE_VISIBILITY +_ACEOF + + + fi @@ -20991,6 +23470,126 @@ $as_echo "#define GNULIB_TEST_NL_LANGINFO 1" >>confdefs.h + case "$host_os" in + mingw* | pw*) + REPLACE_OPEN=1 + ;; + *) + + if test "$gl_cv_macro_O_CLOEXEC" != yes; then + REPLACE_OPEN=1 + fi + + + { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether open recognizes a trailing slash" >&5 +$as_echo_n "checking whether open recognizes a trailing slash... " >&6; } +if ${gl_cv_func_open_slash+:} false; then : + $as_echo_n "(cached) " >&6 +else + # Assume that if we have lstat, we can also check symlinks. + if test $ac_cv_func_lstat = yes; then + touch conftest.tmp + ln -s conftest.tmp conftest.lnk + fi + if test "$cross_compiling" = yes; then : + + case "$host_os" in + freebsd* | aix* | hpux* | solaris2.[0-9] | solaris2.[0-9].*) + gl_cv_func_open_slash="guessing no" ;; + *) + gl_cv_func_open_slash="guessing yes" ;; + esac + +else + cat confdefs.h - <<_ACEOF >conftest.$ac_ext +/* end confdefs.h. */ + +#include +#if HAVE_UNISTD_H +# include +#endif + + +$gl_mda_defines + +int main () +{ + int result = 0; +#if HAVE_LSTAT + if (open ("conftest.lnk/", O_RDONLY) != -1) + result |= 1; +#endif + if (open ("conftest.sl/", O_CREAT, 0600) >= 0) + result |= 2; + return result; +} +_ACEOF +if ac_fn_c_try_run "$LINENO"; then : + gl_cv_func_open_slash=yes +else + gl_cv_func_open_slash=no +fi +rm -f core *.core core.conftest.* gmon.out bb.out conftest$ac_exeext \ + conftest.$ac_objext conftest.beam conftest.$ac_ext +fi + + rm -f conftest.sl conftest.tmp conftest.lnk + +fi +{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $gl_cv_func_open_slash" >&5 +$as_echo "$gl_cv_func_open_slash" >&6; } + case "$gl_cv_func_open_slash" in + *no) + +$as_echo "#define OPEN_TRAILING_SLASH_BUG 1" >>confdefs.h + + ;; + esac + + case "$gl_cv_func_open_slash" in + *no) + REPLACE_OPEN=1 + ;; + esac + ;; + esac + + + + if test $REPLACE_OPEN = 1; then + + + + + + + + + gl_LIBOBJS="$gl_LIBOBJS open.$ac_objext" + + + + : + + fi + + + + + + GNULIB_OPEN=1 + + + + + +$as_echo "#define GNULIB_TEST_OPEN 1" >>confdefs.h + + + + + + ac_fn_c_check_decl "$LINENO" "program_invocation_name" "ac_cv_have_decl_program_invocation_name" "#include " if test "x$ac_cv_have_decl_program_invocation_name" = xyes; then : @@ -21019,6 +23618,7 @@ _ACEOF : + : @@ -21106,8 +23706,8 @@ else linux-* | linux) gl_cv_func_readlink_works="guessing yes" ;; # Guess yes on glibc systems. *-gnu* | gnu*) gl_cv_func_readlink_works="guessing yes" ;; - # If we don't know, assume the worst. - *) gl_cv_func_readlink_works="guessing no" ;; + # If we don't know, obey --enable-cross-guesses. + *) gl_cv_func_readlink_works="$gl_cross_guess_normal" ;; esac else @@ -21185,19 +23785,7 @@ $as_echo "#define GNULIB_TEST_READLINK 1" >>confdefs.h - for ac_header in stdlib.h -do : - ac_fn_c_check_header_mongrel "$LINENO" "stdlib.h" "ac_cv_header_stdlib_h" "$ac_includes_default" -if test "x$ac_cv_header_stdlib_h" = xyes; then : - cat >>confdefs.h <<_ACEOF -#define HAVE_STDLIB_H 1 -_ACEOF - -fi - -done - - { $as_echo "$as_me:${as_lineno-$LINENO}: checking for GNU libc compatible realloc" >&5 + { $as_echo "$as_me:${as_lineno-$LINENO}: checking for GNU libc compatible realloc" >&5 $as_echo_n "checking for GNU libc compatible realloc... " >&6; } if ${ac_cv_func_realloc_0_nonnull+:} false; then : $as_echo_n "(cached) " >&6 @@ -21208,18 +23796,14 @@ else *-gnu* | gnu* | *-musl* | freebsd* | netbsd* | openbsd* \ | hpux* | solaris* | cygwin* | mingw*) ac_cv_func_realloc_0_nonnull="guessing yes" ;; - # If we don't know, assume the worst. - *) ac_cv_func_realloc_0_nonnull="guessing no" ;; + # If we don't know, obey --enable-cross-guesses. + *) ac_cv_func_realloc_0_nonnull="$gl_cross_guess_normal" ;; esac else cat confdefs.h - <<_ACEOF >conftest.$ac_ext /* end confdefs.h. */ -#if defined STDC_HEADERS || defined HAVE_STDLIB_H - # include - #else - char *realloc (); - #endif +#include int main () @@ -21345,8 +23929,8 @@ else case "$host_os" in # Guess no on native Windows. mingw*) gl_cv_func_re_compile_pattern_working="guessing no" ;; - # Otherwise, assume it is not working. - *) gl_cv_func_re_compile_pattern_working="guessing no" ;; + # Otherwise obey --enable-cross-guesses. + *) gl_cv_func_re_compile_pattern_working="$gl_cross_guess_normal" ;; esac else @@ -21411,11 +23995,14 @@ int result = 0; s = re_compile_pattern (pat, sizeof pat - 1, ®ex); if (s) result |= 1; - else if (re_search (®ex, data, sizeof data - 1, - 0, sizeof data - 1, ®s) - != -1) - result |= 1; - regfree (®ex); + else + { + if (re_search (®ex, data, sizeof data - 1, + 0, sizeof data - 1, ®s) + != -1) + result |= 1; + regfree (®ex); + } } { @@ -21446,8 +24033,8 @@ int result = 0; 0, sizeof data - 1, 0); if (i != 0 && i != 21) result |= 1; + regfree (®ex); } - regfree (®ex); } if (! setlocale (LC_ALL, "C")) @@ -21460,9 +24047,13 @@ int result = 0; s = re_compile_pattern ("a[^x]b", 6, ®ex); if (s) result |= 2; - /* This should fail, but succeeds for glibc-2.5. */ - else if (re_search (®ex, "a\nb", 3, 0, 3, ®s) != -1) - result |= 2; + else + { + /* This should fail, but succeeds for glibc-2.5. */ + if (re_search (®ex, "a\nb", 3, 0, 3, ®s) != -1) + result |= 2; + regfree (®ex); + } /* This regular expression is from Spencer ere test number 75 in grep-2.3. */ @@ -21474,7 +24065,10 @@ int result = 0; s = re_compile_pattern ("a[[:]:]]b\n", 11, ®ex); /* This should fail with _Invalid character class name_ error. */ if (!s) - result |= 4; + { + result |= 4; + regfree (®ex); + } /* Ensure that [b-a] is diagnosed as invalid, when using RE_NO_EMPTY_RANGES. */ @@ -21482,13 +24076,18 @@ int result = 0; memset (®ex, 0, sizeof regex); s = re_compile_pattern ("a[b-a]", 6, ®ex); if (s == 0) - result |= 8; + { + result |= 8; + regfree (®ex); + } /* This should succeed, but does not for glibc-2.1.3. */ memset (®ex, 0, sizeof regex); s = re_compile_pattern ("{1", 2, ®ex); if (s) result |= 8; + else + regfree (®ex); /* The following example is derived from a problem report against gawk from Jorge Stolfi . */ @@ -21496,17 +24095,35 @@ int result = 0; s = re_compile_pattern ("[an\371]*n", 7, ®ex); if (s) result |= 8; - /* This should match, but does not for glibc-2.2.1. */ - else if (re_match (®ex, "an", 2, 0, ®s) != 2) - result |= 8; + else + { + /* This should match, but does not for glibc-2.2.1. */ + if (re_match (®ex, "an", 2, 0, ®s) != 2) + result |= 8; + else + { + free (regs.start); + free (regs.end); + } + regfree (®ex); + } memset (®ex, 0, sizeof regex); s = re_compile_pattern ("x", 1, ®ex); if (s) result |= 8; - /* glibc-2.2.93 does not work with a negative RANGE argument. */ - else if (re_search (®ex, "wxy", 3, 2, -2, ®s) != 1) - result |= 8; + else + { + /* glibc-2.2.93 does not work with a negative RANGE argument. */ + if (re_search (®ex, "wxy", 3, 2, -2, ®s) != 1) + result |= 8; + else + { + free (regs.start); + free (regs.end); + } + regfree (®ex); + } /* The version of regex.c in older versions of gnulib ignored RE_ICASE. Detect that problem too. */ @@ -21515,8 +24132,17 @@ int result = 0; s = re_compile_pattern ("x", 1, ®ex); if (s) result |= 16; - else if (re_search (®ex, "WXY", 3, 0, 3, ®s) < 0) - result |= 16; + else + { + if (re_search (®ex, "WXY", 3, 0, 3, ®s) < 0) + result |= 16; + else + { + free (regs.start); + free (regs.end); + } + regfree (®ex); + } /* Catch a bug reported by Vin Shelton in https://lists.gnu.org/r/bug-coreutils/2007-06/msg00089.html @@ -21528,6 +24154,8 @@ int result = 0; s = re_compile_pattern ("[[:alnum:]_-]\\\\+$", 16, ®ex); if (s) result |= 32; + else + regfree (®ex); /* REG_STARTEND was added to glibc on 2004-01-15. Reject older versions. */ @@ -21542,8 +24170,14 @@ int result = 0; re_set_syntax (RE_SYNTAX_POSIX_EGREP); memset (®ex, 0, sizeof regex); s = re_compile_pattern ("0|()0|\\1|0", 10, ®ex); - if (!s || strcmp (s, "Invalid back reference")) + if (!s) result |= 64; + else + { + if (strcmp (s, "Invalid back reference")) + result |= 64; + regfree (®ex); + } #if 0 /* It would be nice to reject hosts whose regoff_t values are too @@ -21769,6 +24403,315 @@ $as_echo "#define GNULIB_TEST_RPMATCH 1" >>confdefs.h + + + + { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether setlocale (LC_ALL, NULL) is multithread-safe" >&5 +$as_echo_n "checking whether setlocale (LC_ALL, NULL) is multithread-safe... " >&6; } +if ${gl_cv_func_setlocale_null_all_mtsafe+:} false; then : + $as_echo_n "(cached) " >&6 +else + case "$host_os" in + # Guess no on musl libc, macOS, FreeBSD, NetBSD, OpenBSD, AIX, Haiku, Cygwin. + *-musl* | darwin* | freebsd* | netbsd* | openbsd* | aix* | haiku* | cygwin*) + 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 ;; + # If we don't know, obey --enable-cross-guesses. + *) + gl_cv_func_setlocale_null_all_mtsafe="$gl_cross_guess_normal" ;; + esac + +fi +{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $gl_cv_func_setlocale_null_all_mtsafe" >&5 +$as_echo "$gl_cv_func_setlocale_null_all_mtsafe" >&6; } + case "$host_os" in + mingw*) ;; + *) + if test $gl_pthread_api = no && test $ac_cv_header_threads_h = no; then + gl_cv_func_setlocale_null_all_mtsafe="trivially yes" + fi + ;; + esac + case "$gl_cv_func_setlocale_null_all_mtsafe" in + *yes) SETLOCALE_NULL_ALL_MTSAFE=1 ;; + *) SETLOCALE_NULL_ALL_MTSAFE=0 ;; + esac + +cat >>confdefs.h <<_ACEOF +#define SETLOCALE_NULL_ALL_MTSAFE $SETLOCALE_NULL_ALL_MTSAFE +_ACEOF + + + { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether setlocale (category, NULL) is multithread-safe" >&5 +$as_echo_n "checking whether setlocale (category, NULL) is multithread-safe... " >&6; } +if ${gl_cv_func_setlocale_null_one_mtsafe+:} false; then : + $as_echo_n "(cached) " >&6 +else + case "$host_os" in + # Guess no on OpenBSD, AIX. + 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* | netbsd* | hpux* | irix* | solaris* | haiku* | cygwin* | mingw*) + gl_cv_func_setlocale_null_one_mtsafe=yes ;; + # If we don't know, obey --enable-cross-guesses. + *) + gl_cv_func_setlocale_null_one_mtsafe="$gl_cross_guess_normal" ;; + esac + +fi +{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $gl_cv_func_setlocale_null_one_mtsafe" >&5 +$as_echo "$gl_cv_func_setlocale_null_one_mtsafe" >&6; } + case "$host_os" in + mingw*) ;; + *) + if test $gl_pthread_api = no && test $ac_cv_header_threads_h = no; then + gl_cv_func_setlocale_null_one_mtsafe="trivially yes" + fi + ;; + esac + case "$gl_cv_func_setlocale_null_one_mtsafe" in + *yes) SETLOCALE_NULL_ONE_MTSAFE=1 ;; + *) SETLOCALE_NULL_ONE_MTSAFE=0 ;; + esac + +cat >>confdefs.h <<_ACEOF +#define SETLOCALE_NULL_ONE_MTSAFE $SETLOCALE_NULL_ONE_MTSAFE +_ACEOF + + + if test $SETLOCALE_NULL_ALL_MTSAFE = 0 || test $SETLOCALE_NULL_ONE_MTSAFE = 0; then + case "$host_os" in + mingw*) LIB_SETLOCALE_NULL= ;; + *) + + + { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether imported symbols can be declared weak" >&5 +$as_echo_n "checking whether imported symbols can be declared weak... " >&6; } +if ${gl_cv_have_weak+:} false; then : + $as_echo_n "(cached) " >&6 +else + gl_cv_have_weak=no + cat confdefs.h - <<_ACEOF >conftest.$ac_ext +/* end confdefs.h. */ +extern void xyzzy (); +#pragma weak xyzzy +int +main () +{ +xyzzy(); + ; + return 0; +} +_ACEOF +if ac_fn_c_try_link "$LINENO"; then : + gl_cv_have_weak=maybe +fi +rm -f core conftest.err conftest.$ac_objext \ + conftest$ac_exeext conftest.$ac_ext + if test $gl_cv_have_weak = maybe; then + if test "$cross_compiling" = yes; then : + cat confdefs.h - <<_ACEOF >conftest.$ac_ext +/* end confdefs.h. */ +#ifdef __ELF__ + Extensible Linking Format + #endif + +_ACEOF +if (eval "$ac_cpp conftest.$ac_ext") 2>&5 | + $EGREP "Extensible Linking Format" >/dev/null 2>&1; then : + gl_cv_have_weak="guessing yes" +else + gl_cv_have_weak="guessing no" +fi +rm -f conftest* + + +else + cat confdefs.h - <<_ACEOF >conftest.$ac_ext +/* end confdefs.h. */ + +#include +#pragma weak fputs +int main () +{ + return (fputs == NULL); +} +_ACEOF +if ac_fn_c_try_run "$LINENO"; then : + gl_cv_have_weak=yes +else + gl_cv_have_weak=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 + case " $LDFLAGS " in + *" -static "*) gl_cv_have_weak=no ;; + esac + case "$gl_cv_have_weak" in + *yes) + case "$host_os" in + freebsd* | dragonfly*) + : > conftest1.c + $CC $CPPFLAGS $CFLAGS $LDFLAGS -fPIC -shared -o libempty.so conftest1.c -lpthread >&5 2>&1 + cat < conftest2.c +#include +#pragma weak pthread_mutexattr_gettype +int main () +{ + return (pthread_mutexattr_gettype != NULL); +} +EOF + $CC $CPPFLAGS $CFLAGS $LDFLAGS -o conftest conftest2.c libempty.so >&5 2>&1 \ + || gl_cv_have_weak=no + rm -f conftest1.c libempty.so conftest2.c conftest + ;; + esac + ;; + esac + +fi +{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $gl_cv_have_weak" >&5 +$as_echo "$gl_cv_have_weak" >&6; } + case "$gl_cv_have_weak" in + *yes) + +$as_echo "#define HAVE_WEAK_SYMBOLS 1" >>confdefs.h + + ;; + esac + + case "$gl_cv_have_weak" in + *yes) LIB_SETLOCALE_NULL= ;; + *) LIB_SETLOCALE_NULL="$LIBPTHREAD" ;; + esac + ;; + esac + else + LIB_SETLOCALE_NULL= + fi + + + if test $SETLOCALE_NULL_ALL_MTSAFE = 0 || test $SETLOCALE_NULL_ONE_MTSAFE = 0; then + + + + + + + + + gl_LIBOBJS="$gl_LIBOBJS setlocale-lock.$ac_objext" + + + + + CFLAG_VISIBILITY= + HAVE_VISIBILITY=0 + if test -n "$GCC"; then + { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether the -Werror option is usable" >&5 +$as_echo_n "checking whether the -Werror option is usable... " >&6; } +if ${gl_cv_cc_vis_werror+:} false; then : + $as_echo_n "(cached) " >&6 +else + gl_save_CFLAGS="$CFLAGS" + CFLAGS="$CFLAGS -Werror" + cat confdefs.h - <<_ACEOF >conftest.$ac_ext +/* end confdefs.h. */ + +int +main () +{ + + ; + return 0; +} +_ACEOF +if ac_fn_c_try_compile "$LINENO"; then : + gl_cv_cc_vis_werror=yes +else + gl_cv_cc_vis_werror=no +fi +rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext + CFLAGS="$gl_save_CFLAGS" + +fi +{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $gl_cv_cc_vis_werror" >&5 +$as_echo "$gl_cv_cc_vis_werror" >&6; } + { $as_echo "$as_me:${as_lineno-$LINENO}: checking for simple visibility declarations" >&5 +$as_echo_n "checking for simple visibility declarations... " >&6; } +if ${gl_cv_cc_visibility+:} false; then : + $as_echo_n "(cached) " >&6 +else + gl_save_CFLAGS="$CFLAGS" + CFLAGS="$CFLAGS -fvisibility=hidden" + if test $gl_cv_cc_vis_werror = yes; then + CFLAGS="$CFLAGS -Werror" + fi + cat confdefs.h - <<_ACEOF >conftest.$ac_ext +/* end confdefs.h. */ +extern __attribute__((__visibility__("hidden"))) int hiddenvar; + extern __attribute__((__visibility__("default"))) int exportedvar; + extern __attribute__((__visibility__("hidden"))) int hiddenfunc (void); + extern __attribute__((__visibility__("default"))) int exportedfunc (void); + void dummyfunc (void) {} + +int +main () +{ + + ; + return 0; +} +_ACEOF +if ac_fn_c_try_compile "$LINENO"; then : + gl_cv_cc_visibility=yes +else + gl_cv_cc_visibility=no +fi +rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext + CFLAGS="$gl_save_CFLAGS" + +fi +{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $gl_cv_cc_visibility" >&5 +$as_echo "$gl_cv_cc_visibility" >&6; } + if test $gl_cv_cc_visibility = yes; then + CFLAG_VISIBILITY="-fvisibility=hidden" + HAVE_VISIBILITY=1 + fi + fi + + + +cat >>confdefs.h <<_ACEOF +#define HAVE_VISIBILITY $HAVE_VISIBILITY +_ACEOF + + + + fi + + + + + + GNULIB_SETLOCALE_NULL=1 + + + + + +$as_echo "#define GNULIB_TEST_SETLOCALE_NULL 1" >>confdefs.h + + + + + ac_fn_c_check_decl "$LINENO" "sleep" "ac_cv_have_decl_sleep" "#include " if test "x$ac_cv_have_decl_sleep" = xyes; then : @@ -21798,8 +24741,8 @@ else *-musl*) gl_cv_func_sleep_works="guessing yes" ;; # Guess no on native Windows. mingw*) gl_cv_func_sleep_works="guessing no" ;; - # If we don't know, assume the worst. - *) gl_cv_func_sleep_works="guessing no" ;; + # If we don't know, obey --enable-cross-guesses. + *) gl_cv_func_sleep_works="$gl_cross_guess_normal" ;; esac else @@ -21942,8 +24885,8 @@ else linux-* | linux) gl_cv_func_stat_file_slash="guessing yes" ;; # Guess yes on glibc systems. *-gnu* | gnu*) gl_cv_func_stat_file_slash="guessing yes" ;; - # If we don't know, assume the worst. - *) gl_cv_func_stat_file_slash="guessing no" ;; + # If we don't know, obey --enable-cross-guesses. + *) gl_cv_func_stat_file_slash="$gl_cross_guess_normal" ;; esac else @@ -22022,6 +24965,7 @@ $as_echo "#define REPLACE_FUNC_STAT_FILE 1" >>confdefs.h esac + : fi @@ -22179,6 +25123,78 @@ fi + { $as_echo "$as_me:${as_lineno-$LINENO}: checking for working stdalign.h" >&5 +$as_echo_n "checking for working stdalign.h... " >&6; } +if ${gl_cv_header_working_stdalign_h+:} false; then : + $as_echo_n "(cached) " >&6 +else + cat confdefs.h - <<_ACEOF >conftest.$ac_ext +/* end confdefs.h. */ +#include + #include + + /* Test that alignof yields a result consistent with offsetof. + This catches GCC bug 52023 + . */ + #ifdef __cplusplus + template struct alignof_helper { char a; t b; }; + # define ao(type) offsetof (alignof_helper, 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) \ + || (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 () +{ + + ; + return 0; +} +_ACEOF +if ac_fn_c_try_compile "$LINENO"; then : + gl_cv_header_working_stdalign_h=yes +else + gl_cv_header_working_stdalign_h=no +fi +rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext +fi +{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $gl_cv_header_working_stdalign_h" >&5 +$as_echo "$gl_cv_header_working_stdalign_h" >&6; } + + if test $gl_cv_header_working_stdalign_h = yes; then + STDALIGN_H='' + else + STDALIGN_H='stdalign.h' + fi + + + if test -n "$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 + + + STDARG_H='' NEXT_STDARG_H='' { $as_echo "$as_me:${as_lineno-$LINENO}: checking for va_copy" >&5 @@ -22306,9 +25322,10 @@ $as_echo "$gl_cv_next_stdarg_h" >&6; } fi else - saved_as_echo_n="$as_echo_n" - as_echo_n=':' - if ${gl_cv_func___va_copy+:} false; then : + + exec 9>&6 6>/dev/null + + if ${gl_cv_func___va_copy+:} false; then : $as_echo_n "(cached) " >&6 else @@ -22335,7 +25352,9 @@ fi rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext fi - as_echo_n="$saved_as_echo_n" + + exec 6>&9 9>&- + if test $gl_cv_func___va_copy = yes; then @@ -22363,10 +25382,20 @@ fi - # Define two additional variables used in the Makefile substitution. - if test "$ac_cv_header_stdbool_h" = yes; then - STDBOOL_H='' + if test "$ac_cv_header_stdbool_h" = yes; then + case "$host_os" in + solaris*) + if test -z "$GCC"; then + STDBOOL_H='stdbool.h' + else + STDBOOL_H='' + fi + ;; + *) + STDBOOL_H='' + ;; + esac else STDBOOL_H='stdbool.h' fi @@ -22401,7 +25430,7 @@ else /* end confdefs.h. */ #include unsigned int s = sizeof (max_align_t); - #if defined __GNUC__ || defined __IBM__ALIGNOF__ + #if defined __GNUC__ || defined __clang__ || defined __IBM__ALIGNOF__ int check1[2 * (__alignof__ (double) <= __alignof__ (max_align_t)) - 1]; int check2[2 * (__alignof__ (long double) <= __alignof__ (max_align_t)) - 1]; #endif @@ -22712,6 +25741,13 @@ _ACEOF + if test $ac_cv_have_decl_fcloseall = no; then + HAVE_DECL_FCLOSEALL=0 + fi + + + + @@ -22790,18 +25826,30 @@ $as_echo "$gl_cv_next_stdlib_h" >&6; } + if test $ac_cv_have_decl_ecvt = no; then + HAVE_DECL_ECVT=0 + fi - if test $ac_cv_func_strdup = yes; then - if test $gl_cv_func_malloc_posix != yes; then - REPLACE_STRDUP=1 - fi + if test $ac_cv_have_decl_fcvt = no; then + HAVE_DECL_FCVT=0 + fi + + if test $ac_cv_have_decl_gcvt = no; then + HAVE_DECL_GCVT=0 + fi + + + + + if test $gl_cv_func_malloc_posix != yes; then + REPLACE_STRDUP=1 fi if test $ac_cv_have_decl_strdup = no; then HAVE_DECL_STRDUP=0 fi - if test $ac_cv_func_strdup = no || test $REPLACE_STRDUP = 1; then + if test $REPLACE_STRDUP = 1; then @@ -22848,8 +25896,8 @@ else *-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, assume the worst. - *) gl_cv_func_working_strerror="guessing no" ;; + # If we don't know, obey --enable-cross-guesses. + *) gl_cv_func_working_strerror="$gl_cross_guess_normal" ;; esac else @@ -23169,9 +26217,7 @@ $as_echo "#define GNULIB_TEST_STRNLEN 1" >>confdefs.h - - if test "$ac_cv_type_long_long_int" = yes; then - for ac_func in strtoll + for ac_func in strtoll do : ac_fn_c_check_func "$LINENO" "strtoll" "ac_cv_func_strtoll" if test "x$ac_cv_func_strtoll" = xyes; then : @@ -23182,9 +26228,8 @@ _ACEOF fi done - if test $ac_cv_func_strtoll = no; then - HAVE_STRTOLL=0 - fi + if test $ac_cv_func_strtoll = no; then + HAVE_STRTOLL=0 fi if test $HAVE_STRTOLL = 0; then @@ -23219,9 +26264,7 @@ $as_echo "#define GNULIB_TEST_STRTOLL 1" >>confdefs.h - - if test "$ac_cv_type_unsigned_long_long_int" = yes; then - for ac_func in strtoull + for ac_func in strtoull do : ac_fn_c_check_func "$LINENO" "strtoull" "ac_cv_func_strtoull" if test "x$ac_cv_func_strtoull" = xyes; then : @@ -23232,9 +26275,8 @@ _ACEOF fi done - if test $ac_cv_func_strtoull = no; then - HAVE_STRTOULL=0 - fi + if test $ac_cv_func_strtoull = no; then + HAVE_STRTOULL=0 fi if test $HAVE_STRTOULL = 0; then @@ -23278,6 +26320,103 @@ $as_echo "#define GNULIB_TEST_STRTOULL 1" >>confdefs.h + if test $gl_cv_have_include_next = yes; then + gl_cv_next_sys_random_h='<'sys/random.h'>' + else + { $as_echo "$as_me:${as_lineno-$LINENO}: checking absolute name of " >&5 +$as_echo_n "checking absolute name of ... " >&6; } +if ${gl_cv_next_sys_random_h+:} false; then : + $as_echo_n "(cached) " >&6 +else + + if test $ac_cv_header_sys_random_h = yes; then + + + + + cat confdefs.h - <<_ACEOF >conftest.$ac_ext +/* end confdefs.h. */ +#include +_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 'sys/random.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_sys_random_h=`(eval "$gl_absname_cpp conftest.$ac_ext") 2>&5 | + sed -n "$gl_absolute_header_sed"` + + gl_header=$gl_cv_absolute_sys_random_h + gl_cv_next_sys_random_h='"'$gl_header'"' + else + gl_cv_next_sys_random_h='<'sys/random.h'>' + fi + + +fi +{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $gl_cv_next_sys_random_h" >&5 +$as_echo "$gl_cv_next_sys_random_h" >&6; } + fi + NEXT_SYS_RANDOM_H=$gl_cv_next_sys_random_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='<'sys/random.h'>' + else + # INCLUDE_NEXT_AS_FIRST_DIRECTIVE='include' + gl_next_as_first_directive=$gl_cv_next_sys_random_h + fi + NEXT_AS_FIRST_DIRECTIVE_SYS_RANDOM_H=$gl_next_as_first_directive + + + + + if test $ac_cv_header_sys_random_h = yes; then + HAVE_SYS_RANDOM_H=1 + else + HAVE_SYS_RANDOM_H=0 + fi + + + + if test $ac_cv_header_sys_random_h = yes; then + UNISTD_H_HAVE_SYS_RANDOM_H=1 + fi + + + + + + + + + + + + + + + + + @@ -23386,9 +26525,14 @@ fi + : - : + + +cat >>confdefs.h <<_ACEOF +#define GNULIB_TEMPNAME 1 +_ACEOF @@ -23494,6 +26638,13 @@ $as_echo "$gl_cv_next_unistd_h" >&6; } + if test $ac_cv_have_decl_execvpe = no; then + HAVE_DECL_EXECVPE=0 + fi + + + + { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether unlink honors trailing slashes" >&5 @@ -23514,8 +26665,8 @@ else *-gnu*) gl_cv_func_unlink_honors_slashes="guessing yes" ;; # Guess no on native Windows. mingw*) gl_cv_func_unlink_honors_slashes="guessing no" ;; - # If we don't know, assume the worst. - *) gl_cv_func_unlink_honors_slashes="guessing no" ;; + # If we don't know, obey --enable-cross-guesses. + *) gl_cv_func_unlink_honors_slashes="$gl_cross_guess_normal" ;; esac else @@ -23528,6 +26679,9 @@ else #endif #include + +$gl_mda_defines + int main () { @@ -23593,8 +26747,8 @@ else GL_SUBDIR_FOR_UNLINK="$tmp/subdir" export GL_SUBDIR_FOR_UNLINK if test "$cross_compiling" = yes; then : - # If we don't know, assume the worst. - gl_cv_func_unlink_parent_fails="guessing no" + # If we don't know, obey --enable-cross-guesses. + gl_cv_func_unlink_parent_fails="$gl_cross_guess_normal" else cat confdefs.h - <<_ACEOF >conftest.$ac_ext @@ -23607,6 +26761,10 @@ else # include # include #endif + + +$gl_mda_defines + int main () { int result = 0; @@ -23706,8 +26864,8 @@ else *-musl*) 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, assume the worst. - *) gl_cv_func_usleep_works="guessing no" ;; + # If we don't know, obey --enable-cross-guesses. + *) gl_cv_func_usleep_works="$gl_cross_guess_normal" ;; esac else @@ -23928,6 +27086,37 @@ $as_echo "$gl_cv_next_wchar_h" >&6; } + ac_fn_c_check_decl "$LINENO" "wcsdup" "ac_cv_have_decl_wcsdup" " +/* Tru64 with Desktop Toolkit C has a bug: must be included before + . + BSD/OS 4.0.1 has a bug: , and must be + included before . */ +#if !(defined __GLIBC__ && !defined __UCLIBC__) +# include +# include +# include +#endif +#include + +" +if test "x$ac_cv_have_decl_wcsdup" = xyes; then : + ac_have_decl=1 +else + ac_have_decl=0 +fi + +cat >>confdefs.h <<_ACEOF +#define HAVE_DECL_WCSDUP $ac_have_decl +_ACEOF + + if test $ac_cv_have_decl_wcsdup = no; then + HAVE_DECL_WCSDUP=0 + fi + + + + + @@ -23935,8 +27124,12 @@ $as_echo "$gl_cv_next_wchar_h" >&6; } + if case "$host_os" in + mingw*) true ;; + *) test $ac_cv_func_mbsinit = yes ;; + esac \ + && test $ac_cv_func_mbrtowc = yes; then - if test $ac_cv_func_mbsinit = yes && test $ac_cv_func_mbrtowc = yes; then @@ -23994,6 +27187,50 @@ rm -f core *.core core.conftest.* gmon.out bb.out conftest$ac_exeext \ conftest.$ac_objext conftest.beam conftest.$ac_ext fi + else + if test $LOCALE_FR_UTF8 != none; then + if test "$cross_compiling" = yes; then : + : +else + cat confdefs.h - <<_ACEOF >conftest.$ac_ext +/* end confdefs.h. */ + +#include +#include +/* Tru64 with Desktop Toolkit C has a bug: must be included before + . + BSD/OS 4.0.1 has a bug: , and must be + included before . */ +#include +#include +#include +#include +int main () +{ + if (setlocale (LC_ALL, "$LOCALE_FR_UTF8") != NULL) + { + const char input[] = "B\303\274\303\237er"; /* "Büßer" */ + mbstate_t state; + wchar_t wc; + + memset (&state, '\0', sizeof (mbstate_t)); + if (mbrtowc (&wc, input + 1, 1, &state) == (size_t)(-2)) + if (mbsinit (&state)) + return 2; + } + return 0; +} +_ACEOF +if ac_fn_c_try_run "$LINENO"; then : + gl_cv_func_mbrtowc_incomplete_state=yes +else + gl_cv_func_mbrtowc_incomplete_state=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 fi fi @@ -24109,10 +27346,7 @@ _ACEOF REPLACE_WCRTOMB=1 fi else - if test $REPLACE_MBSTATE_T = 1; then - REPLACE_WCRTOMB=1 - fi - if test $REPLACE_WCRTOMB = 0; then + if test $REPLACE_WCRTOMB = 0; then @@ -24170,7 +27404,10 @@ fi $as_echo "$gl_cv_func_wcrtomb_works" >&6; } case "$gl_cv_func_wcrtomb_works" in *yes) ;; - *) REPLACE_WCRTOMB=1 ;; + *) +$as_echo "#define WCRTOMB_C_LOCALE_BUG 1" >>confdefs.h + + REPLACE_WCRTOMB=1 ;; esac fi if test $REPLACE_WCRTOMB = 0; then @@ -24181,12 +27418,10 @@ if ${gl_cv_func_wcrtomb_retval+:} false; then : else case "$host_os" in - # Guess no on AIX 4, OSF/1 and Solaris. - aix4* | osf* | solaris*) gl_cv_func_wcrtomb_retval="guessing no" ;; - # Guess yes on native Windows. - mingw*) gl_cv_func_wcrtomb_retval="guessing yes" ;; - # Guess yes otherwise. - *) gl_cv_func_wcrtomb_retval="guessing yes" ;; + # Guess no on AIX 4, OSF/1, Solaris, native Windows. + aix4* | osf* | solaris* | mingw*) gl_cv_func_wcrtomb_retval="guessing no" ;; + # Guess yes otherwise. + *) gl_cv_func_wcrtomb_retval="guessing yes" ;; esac if test $LOCALE_FR != none || test $LOCALE_FR_UTF8 != none || test $LOCALE_JA != none || test $LOCALE_ZH_CN != none; then if test "$cross_compiling" = yes; then : @@ -24205,6 +27440,7 @@ else #include #include #include +#include int main () { int result = 0; @@ -24217,6 +27453,12 @@ int main () { if (wcrtomb (NULL, 0, NULL) != 1) result |= 2; + { + wchar_t wc = (wchar_t) 0xBADFACE; + if (mbtowc (&wc, "\303\274", 2) == 2) + if (wcrtomb (NULL, wc, NULL) != 1) + result |= 2; + } } if (setlocale (LC_ALL, "$LOCALE_JA") != NULL) { @@ -24247,7 +27489,10 @@ fi $as_echo "$gl_cv_func_wcrtomb_retval" >&6; } case "$gl_cv_func_wcrtomb_retval" in *yes) ;; - *) REPLACE_WCRTOMB=1 ;; + *) +$as_echo "#define WCRTOMB_RETVAL_BUG 1" >>confdefs.h + + REPLACE_WCRTOMB=1 ;; esac fi fi @@ -24448,10 +27693,14 @@ $as_echo "$gl_cv_func_iswcntrl_works" >&6; } fi - case "$gl_cv_func_iswcntrl_works" in - *yes) REPLACE_ISWCNTRL=0 ;; - *) REPLACE_ISWCNTRL=1 ;; - esac + if test $GNULIB_OVERRIDES_WINT_T = 1; then + REPLACE_ISWCNTRL=1 + else + case "$gl_cv_func_iswcntrl_works" in + *yes) REPLACE_ISWCNTRL=0 ;; + *) REPLACE_ISWCNTRL=1 ;; + esac + fi if test $HAVE_ISWCNTRL = 0 || test $REPLACE_ISWCNTRL = 1; then @@ -24660,94 +27909,26 @@ $as_echo "$gl_cv_type_wctrans_t" >&6; } : - : - - - - : - - - - - - - - - - gl_LIBOBJS="$gl_LIBOBJS xstrtoll.$ac_objext" - - - - +cat >>confdefs.h <<_ACEOF +#define GNULIB_XALLOC 1 +_ACEOF +cat >>confdefs.h <<_ACEOF +#define GNULIB_XALLOC_DIE 1 +_ACEOF - gl_LIBOBJS="$gl_LIBOBJS xstrtoull.$ac_objext" - { $as_echo "$as_me:${as_lineno-$LINENO}: checking for long long int" >&5 -$as_echo_n "checking for long long int... " >&6; } -if ${ac_cv_type_long_long_int+:} false; then : - $as_echo_n "(cached) " >&6 -else - ac_cv_type_long_long_int=yes - if test "x${ac_cv_prog_cc_c99-no}" = xno; then - ac_cv_type_long_long_int=$ac_cv_type_unsigned_long_long_int - if test $ac_cv_type_long_long_int = yes; then - if test "$cross_compiling" = yes; then : : -else - cat confdefs.h - <<_ACEOF >conftest.$ac_ext -/* end confdefs.h. */ -#include - #ifndef LLONG_MAX - # define HALF \ - (1LL << (sizeof (long long int) * CHAR_BIT - 2)) - # define LLONG_MAX (HALF - 1 + HALF) - #endif -int -main () -{ -long long int n = 1; - int i; - for (i = 0; ; i++) - { - long long int m = n << i; - if (m >> i != n) - return 1; - if (LLONG_MAX / 2 < m) - break; - } - return 0; - ; - return 0; -} -_ACEOF -if ac_fn_c_try_run "$LINENO"; then : - -else - ac_cv_type_long_long_int=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 - fi -fi -{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_type_long_long_int" >&5 -$as_echo "$ac_cv_type_long_long_int" >&6; } - if test $ac_cv_type_long_long_int = yes; then -$as_echo "#define HAVE_LONG_LONG_INT 1" >>confdefs.h - fi + : - test $ac_cv_type_long_long_int = no \ - && as_fn_error $? "you lack long long support; required by gnulib's xstrtoll module" "$LINENO" 5 # End of code from modules @@ -24769,6 +27950,7 @@ $as_echo "#define HAVE_LONG_LONG_INT 1" >>confdefs.h + gl_source_base='gnulib-tests' gltests_WITNESS=IN_`echo "${PACKAGE-$PACKAGE_TARNAME}" | LC_ALL=C tr abcdefghijklmnopqrstuvwxyz ABCDEFGHIJKLMNOPQRSTUVWXYZ | LC_ALL=C sed -e 's/[^A-Z0-9_]/_/g'`_GNULIB_TESTS @@ -25383,6 +28565,7 @@ else #endif #include #include +#include struct tm t; char buf[16]; int main () { @@ -25495,11 +28678,6 @@ $as_echo "$gt_cv_locale_tr_utf8" >&6; } - -$as_echo "#define GNULIB_TEST_CLOEXEC 1" >>confdefs.h - - - if test "$ac_cv_header_winsock2_h" = yes; then @@ -25617,170 +28795,6 @@ $as_echo "$gl_cv_next_ctype_h" >&6; } -$as_echo "#define HAVE_DUP2 1" >>confdefs.h - - - if test $HAVE_DUP2 = 1; then - { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether dup2 works" >&5 -$as_echo_n "checking whether dup2 works... " >&6; } -if ${gl_cv_func_dup2_works+:} false; then : - $as_echo_n "(cached) " >&6 -else - if test "$cross_compiling" = yes; then : - case "$host_os" in - mingw*) # on this platform, dup2 always returns 0 for success - gl_cv_func_dup2_works="guessing no" ;; - cygwin*) # on cygwin 1.5.x, dup2(1,1) returns 0 - gl_cv_func_dup2_works="guessing no" ;; - aix* | freebsd*) - # on AIX 7.1 and FreeBSD 6.1, dup2 (1,toobig) gives EMFILE, - # not EBADF. - gl_cv_func_dup2_works="guessing no" ;; - haiku*) # on Haiku alpha 2, dup2(1, 1) resets FD_CLOEXEC. - gl_cv_func_dup2_works="guessing no" ;; - *-android*) # implemented using dup3(), which fails if oldfd == newfd - gl_cv_func_dup2_works="guessing no" ;; - os2*) # on OS/2 kLIBC, dup2() does not work on a directory fd. - gl_cv_func_dup2_works="guessing no" ;; - *) gl_cv_func_dup2_works="guessing yes" ;; - esac -else - cat confdefs.h - <<_ACEOF >conftest.$ac_ext -/* end confdefs.h. */ - - #include - #include - #include - #include - #include - #ifndef RLIM_SAVED_CUR - # define RLIM_SAVED_CUR RLIM_INFINITY - #endif - #ifndef RLIM_SAVED_MAX - # define RLIM_SAVED_MAX RLIM_INFINITY - #endif - -int -main () -{ -int result = 0; - int bad_fd = INT_MAX; - struct rlimit rlim; - if (getrlimit (RLIMIT_NOFILE, &rlim) == 0 - && 0 <= rlim.rlim_cur && rlim.rlim_cur <= INT_MAX - && rlim.rlim_cur != RLIM_INFINITY - && rlim.rlim_cur != RLIM_SAVED_MAX - && rlim.rlim_cur != RLIM_SAVED_CUR) - bad_fd = rlim.rlim_cur; - #ifdef FD_CLOEXEC - if (fcntl (1, F_SETFD, FD_CLOEXEC) == -1) - result |= 1; - #endif - if (dup2 (1, 1) != 1) - result |= 2; - #ifdef FD_CLOEXEC - if (fcntl (1, F_GETFD) != FD_CLOEXEC) - result |= 4; - #endif - close (0); - if (dup2 (0, 0) != -1) - result |= 8; - /* Many gnulib modules require POSIX conformance of EBADF. */ - if (dup2 (2, bad_fd) == -1 && errno != EBADF) - result |= 16; - /* Flush out some cygwin core dumps. */ - if (dup2 (2, -1) != -1 || errno != EBADF) - result |= 32; - dup2 (2, 255); - dup2 (2, 256); - /* On OS/2 kLIBC, dup2() does not work on a directory fd. */ - { - int fd = open (".", O_RDONLY); - if (fd == -1) - result |= 64; - else if (dup2 (fd, fd + 1) == -1) - result |= 128; - - close (fd); - } - return result; - ; - return 0; -} - -_ACEOF -if ac_fn_c_try_run "$LINENO"; then : - gl_cv_func_dup2_works=yes -else - gl_cv_func_dup2_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 -{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $gl_cv_func_dup2_works" >&5 -$as_echo "$gl_cv_func_dup2_works" >&6; } - case "$gl_cv_func_dup2_works" in - *yes) ;; - *) - REPLACE_DUP2=1 - for ac_func in setdtablesize -do : - ac_fn_c_check_func "$LINENO" "setdtablesize" "ac_cv_func_setdtablesize" -if test "x$ac_cv_func_setdtablesize" = xyes; then : - cat >>confdefs.h <<_ACEOF -#define HAVE_SETDTABLESIZE 1 -_ACEOF - -fi -done - - ;; - esac - fi - - - if test $HAVE_DUP2 = 0 || test $REPLACE_DUP2 = 1; then - - - - - - - - - gltests_LIBOBJS="$gltests_LIBOBJS dup2.$ac_objext" - - - fi - - - - - - if test "$GNULIB_DUP2" != 1; then - if test "$GNULIB_DUP2" = 0; then - GNULIB_DUP2=$gl_module_indicator_condition - else - GNULIB_DUP2="($GNULIB_DUP2 || $gl_module_indicator_condition)" - fi - fi - - - - - -$as_echo "#define GNULIB_TEST_DUP2 1" >>confdefs.h - - - - - - - - if test "$GNULIB_ENVIRON" != 1; then if test "$GNULIB_ENVIRON" = 0; then @@ -25802,207 +28816,6 @@ $as_echo "#define GNULIB_TEST_ENVIRON 1" >>confdefs.h - - if test $ac_cv_func_fcntl = no; then - - - - if test $ac_cv_func_fcntl = no; then - HAVE_FCNTL=0 - else - REPLACE_FCNTL=1 - fi - - else - { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether fcntl handles F_DUPFD correctly" >&5 -$as_echo_n "checking whether fcntl handles F_DUPFD correctly... " >&6; } -if ${gl_cv_func_fcntl_f_dupfd_works+:} false; then : - $as_echo_n "(cached) " >&6 -else - if test "$cross_compiling" = yes; then : - case $host_os in - aix* | cygwin* | haiku*) - gl_cv_func_fcntl_f_dupfd_works="guessing no" ;; - *) gl_cv_func_fcntl_f_dupfd_works="guessing yes" ;; - esac -else - cat confdefs.h - <<_ACEOF >conftest.$ac_ext -/* end confdefs.h. */ -#include - #include - #include - #include - #include - #ifndef RLIM_SAVED_CUR - # define RLIM_SAVED_CUR RLIM_INFINITY - #endif - #ifndef RLIM_SAVED_MAX - # define RLIM_SAVED_MAX RLIM_INFINITY - #endif - -int -main () -{ -int result = 0; - int bad_fd = INT_MAX; - struct rlimit rlim; - if (getrlimit (RLIMIT_NOFILE, &rlim) == 0 - && 0 <= rlim.rlim_cur && rlim.rlim_cur <= INT_MAX - && rlim.rlim_cur != RLIM_INFINITY - && rlim.rlim_cur != RLIM_SAVED_MAX - && rlim.rlim_cur != RLIM_SAVED_CUR) - bad_fd = rlim.rlim_cur; - if (fcntl (0, F_DUPFD, -1) != -1) result |= 1; - if (errno != EINVAL) result |= 2; - if (fcntl (0, F_DUPFD, bad_fd) != -1) result |= 4; - if (errno != EINVAL) result |= 8; - /* On OS/2 kLIBC, F_DUPFD does not work on a directory fd */ - { - int fd; - fd = open (".", O_RDONLY); - if (fd == -1) - result |= 16; - else if (fcntl (fd, F_DUPFD, STDERR_FILENO + 1) == -1) - result |= 32; - - close (fd); - } - return result; - ; - return 0; -} -_ACEOF -if ac_fn_c_try_run "$LINENO"; then : - gl_cv_func_fcntl_f_dupfd_works=yes -else - gl_cv_func_fcntl_f_dupfd_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 -{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $gl_cv_func_fcntl_f_dupfd_works" >&5 -$as_echo "$gl_cv_func_fcntl_f_dupfd_works" >&6; } - case $gl_cv_func_fcntl_f_dupfd_works in - *yes) ;; - *) - - - if test $ac_cv_func_fcntl = no; then - HAVE_FCNTL=0 - else - REPLACE_FCNTL=1 - fi - - -$as_echo "#define FCNTL_DUPFD_BUGGY 1" >>confdefs.h - ;; - esac - - { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether fcntl understands F_DUPFD_CLOEXEC" >&5 -$as_echo_n "checking whether fcntl understands F_DUPFD_CLOEXEC... " >&6; } -if ${gl_cv_func_fcntl_f_dupfd_cloexec+:} false; then : - $as_echo_n "(cached) " >&6 -else - cat confdefs.h - <<_ACEOF >conftest.$ac_ext -/* end confdefs.h. */ - -#include -#ifndef F_DUPFD_CLOEXEC -choke me -#endif - -int -main () -{ - - ; - return 0; -} -_ACEOF -if ac_fn_c_try_compile "$LINENO"; then : - cat confdefs.h - <<_ACEOF >conftest.$ac_ext -/* end confdefs.h. */ - -#ifdef __linux__ -/* The Linux kernel only added F_DUPFD_CLOEXEC in 2.6.24, so we always replace - it to support the semantics on older kernels that failed with EINVAL. */ -choke me -#endif - -int -main () -{ - - ; - return 0; -} -_ACEOF -if ac_fn_c_try_compile "$LINENO"; then : - gl_cv_func_fcntl_f_dupfd_cloexec=yes -else - gl_cv_func_fcntl_f_dupfd_cloexec="needs runtime check" -fi -rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext -else - gl_cv_func_fcntl_f_dupfd_cloexec=no -fi -rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext -fi -{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $gl_cv_func_fcntl_f_dupfd_cloexec" >&5 -$as_echo "$gl_cv_func_fcntl_f_dupfd_cloexec" >&6; } - if test "$gl_cv_func_fcntl_f_dupfd_cloexec" != yes; then - - - - if test $ac_cv_func_fcntl = no; then - HAVE_FCNTL=0 - else - REPLACE_FCNTL=1 - fi - - fi - fi - - - if test $HAVE_FCNTL = 0 || test $REPLACE_FCNTL = 1; then - - - - - - - - - gltests_LIBOBJS="$gltests_LIBOBJS fcntl.$ac_objext" - - fi - - - - - - if test "$GNULIB_FCNTL" != 1; then - if test "$GNULIB_FCNTL" = 0; then - GNULIB_FCNTL=$gl_module_indicator_condition - else - GNULIB_FCNTL="($GNULIB_FCNTL || $gl_module_indicator_condition)" - fi - fi - - - - - -$as_echo "#define GNULIB_TEST_FCNTL 1" >>confdefs.h - - - - - - - if test $HAVE_MSVC_INVALID_PARAMETER_HANDLER = 1; then REPLACE_FDOPEN=1 fi @@ -26026,6 +28839,10 @@ else #include #include + + +$gl_mda_defines + int main (void) { @@ -26164,12 +28981,12 @@ $as_echo "#define FLEXIBLE_ARRAY_MEMBER /**/" >>confdefs.h gltests_LIBOBJS="$gltests_LIBOBJS ftruncate.$ac_objext" - for ac_func in chsize + for ac_func in _chsize do : - ac_fn_c_check_func "$LINENO" "chsize" "ac_cv_func_chsize" -if test "x$ac_cv_func_chsize" = xyes; then : + ac_fn_c_check_func "$LINENO" "_chsize" "ac_cv_func__chsize" +if test "x$ac_cv_func__chsize" = xyes; then : cat >>confdefs.h <<_ACEOF -#define HAVE_CHSIZE 1 +#define HAVE__CHSIZE 1 _ACEOF fi @@ -26247,103 +29064,6 @@ $as_echo "#define GNULIB_TEST_GETCWD 1" >>confdefs.h - - if test $ac_cv_func_getdtablesize = yes && - test $ac_cv_have_decl_getdtablesize = yes; then - { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether getdtablesize works" >&5 -$as_echo_n "checking whether getdtablesize works... " >&6; } -if ${gl_cv_func_getdtablesize_works+:} false; then : - $as_echo_n "(cached) " >&6 -else - case "$host_os" in - vms*) gl_cv_func_getdtablesize_works="no (limitation)" ;; - *) - if test "$cross_compiling" = yes; then : - case "$host_os" in - cygwin*) # on cygwin 1.5.25, getdtablesize() automatically grows - gl_cv_func_getdtablesize_works="guessing no" ;; - *) gl_cv_func_getdtablesize_works="guessing yes" ;; - esac - -else - cat confdefs.h - <<_ACEOF >conftest.$ac_ext -/* end confdefs.h. */ - - #include -int -main () -{ -int size = getdtablesize(); - if (dup2 (0, getdtablesize()) != -1) - return 1; - if (size != getdtablesize()) - return 2; - - ; - return 0; -} -_ACEOF -if ac_fn_c_try_run "$LINENO"; then : - gl_cv_func_getdtablesize_works=yes -else - gl_cv_func_getdtablesize_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 - - ;; - esac - -fi -{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $gl_cv_func_getdtablesize_works" >&5 -$as_echo "$gl_cv_func_getdtablesize_works" >&6; } - case "$gl_cv_func_getdtablesize_works" in - *yes | "no (limitation)") ;; - *) REPLACE_GETDTABLESIZE=1 ;; - esac - else - HAVE_GETDTABLESIZE=0 - fi - - if test $HAVE_GETDTABLESIZE = 0 || test $REPLACE_GETDTABLESIZE = 1; then - - - - - - - - - gltests_LIBOBJS="$gltests_LIBOBJS getdtablesize.$ac_objext" - - : - fi - - - - - - if test "$GNULIB_GETDTABLESIZE" != 1; then - if test "$GNULIB_GETDTABLESIZE" = 0; then - GNULIB_GETDTABLESIZE=$gl_module_indicator_condition - else - GNULIB_GETDTABLESIZE="($GNULIB_GETDTABLESIZE || $gl_module_indicator_condition)" - fi - fi - - - - - -$as_echo "#define GNULIB_TEST_GETDTABLESIZE 1" >>confdefs.h - - - - - - - { $as_echo "$as_me:${as_lineno-$LINENO}: checking for getpagesize" >&5 $as_echo_n "checking for getpagesize... " >&6; } if ${gl_cv_func_getpagesize+:} false; then : @@ -26459,6 +29179,126 @@ $as_echo "#define GNULIB_TEST_GETPAGESIZE 1" >>confdefs.h + gl_gettimeofday_timezone=void + if test $ac_cv_func_gettimeofday != yes; then + HAVE_GETTIMEOFDAY=0 + else + { $as_echo "$as_me:${as_lineno-$LINENO}: checking for gettimeofday with POSIX signature" >&5 +$as_echo_n "checking for gettimeofday with POSIX signature... " >&6; } +if ${gl_cv_func_gettimeofday_posix_signature+:} false; then : + $as_echo_n "(cached) " >&6 +else + cat confdefs.h - <<_ACEOF >conftest.$ac_ext +/* end confdefs.h. */ +#include + struct timeval c; + int gettimeofday (struct timeval *restrict, void *restrict); + +int +main () +{ +/* glibc uses struct timezone * rather than the POSIX void * + if _GNU_SOURCE is defined. However, since the only portable + use of gettimeofday uses NULL as the second parameter, and + since the glibc definition is actually more typesafe, it is + not worth wrapping this to get a compliant signature. */ + int (*f) (struct timeval *restrict, void *restrict) + = gettimeofday; + int x = f (&c, 0); + return !(x | c.tv_sec | c.tv_usec); + + ; + return 0; +} +_ACEOF +if ac_fn_c_try_compile "$LINENO"; then : + gl_cv_func_gettimeofday_posix_signature=yes +else + cat confdefs.h - <<_ACEOF >conftest.$ac_ext +/* end confdefs.h. */ +#include +int gettimeofday (struct timeval *restrict, struct timezone *restrict); + +int +main () +{ + + ; + return 0; +} +_ACEOF +if ac_fn_c_try_compile "$LINENO"; then : + gl_cv_func_gettimeofday_posix_signature=almost +else + gl_cv_func_gettimeofday_posix_signature=no +fi +rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext +fi +rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext +fi +{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $gl_cv_func_gettimeofday_posix_signature" >&5 +$as_echo "$gl_cv_func_gettimeofday_posix_signature" >&6; } + if test $gl_cv_func_gettimeofday_posix_signature = almost; then + gl_gettimeofday_timezone='struct timezone' + elif test $gl_cv_func_gettimeofday_posix_signature != yes; then + REPLACE_GETTIMEOFDAY=1 + fi + if test $REPLACE_STRUCT_TIMEVAL = 1; then + REPLACE_GETTIMEOFDAY=1 + fi + case "$host_os" in + mingw*) REPLACE_GETTIMEOFDAY=1 ;; + esac + fi + +cat >>confdefs.h <<_ACEOF +#define GETTIMEOFDAY_TIMEZONE $gl_gettimeofday_timezone +_ACEOF + + + if test $HAVE_GETTIMEOFDAY = 0 || test $REPLACE_GETTIMEOFDAY = 1; then + + + + + + + + + gltests_LIBOBJS="$gltests_LIBOBJS gettimeofday.$ac_objext" + + : + fi + + + + + + if test "$GNULIB_GETTIMEOFDAY" != 1; then + if test "$GNULIB_GETTIMEOFDAY" = 0; then + GNULIB_GETTIMEOFDAY=$gl_module_indicator_condition + else + GNULIB_GETTIMEOFDAY="($GNULIB_GETTIMEOFDAY || $gl_module_indicator_condition)" + fi + fi + + + + + +$as_echo "#define GNULIB_TEST_GETTIMEOFDAY 1" >>confdefs.h + + + + + + + + + + + + HAVE_INET_PTON=1 INET_PTON_LIB= @@ -26980,6 +29820,13 @@ $as_echo "#define GNULIB_TEST_IOCTL 1" >>confdefs.h fi +cat >>confdefs.h <<_ACEOF +#define GNULIB_ISBLANK $gl_module_indicator_condition +_ACEOF + + + + @@ -27036,13 +29883,23 @@ $as_echo "#define GNULIB_TEST_LISTEN 1" >>confdefs.h - if test $ac_cv_func_newlocale != yes; then + if test $HAVE_LOCALE_T = 1; then + + 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_func_duplocale=no + gl_func_freelocale=no + fi + if test $gl_func_newlocale != yes; then HAVE_NEWLOCALE=0 fi - if test $ac_cv_func_duplocale != yes; then + if test $gl_func_duplocale != yes; then HAVE_DUPLOCALE=0 fi - if test $ac_cv_func_freelocale != yes; then + if test $gl_func_freelocale != yes; then HAVE_FREELOCALE=0 fi if test $gt_nameless_locales = yes; then @@ -27078,6 +29935,7 @@ $as_echo "#define GNULIB_TEST_LOCALENAME 1" >>confdefs.h + { $as_echo "$as_me:${as_lineno-$LINENO}: checking for a traditional french locale" >&5 $as_echo_n "checking for a traditional french locale... " >&6; } if ${gt_cv_locale_fr+:} false; then : @@ -27858,8 +30716,8 @@ else gl_cv_func_nanosleep='guessing no (mishandles large arguments)' ;; mingw*) # Guess no on native Windows. gl_cv_func_nanosleep='guessing no' ;; - *) # If we don't know, assume the worst. - gl_cv_func_nanosleep='guessing no' ;; + *) # If we don't know, obey --enable-cross-guesses. + gl_cv_func_nanosleep="$gl_cross_guess_normal" ;; esac else @@ -28420,121 +31278,6 @@ $as_echo "$gt_cv_locale_fr_utf8" >&6; } - case "$host_os" in - mingw* | pw*) - REPLACE_OPEN=1 - ;; - *) - - if test "$gl_cv_macro_O_CLOEXEC" != yes; then - REPLACE_OPEN=1 - fi - { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether open recognizes a trailing slash" >&5 -$as_echo_n "checking whether open recognizes a trailing slash... " >&6; } -if ${gl_cv_func_open_slash+:} false; then : - $as_echo_n "(cached) " >&6 -else - # Assume that if we have lstat, we can also check symlinks. - if test $ac_cv_func_lstat = yes; then - touch conftest.tmp - ln -s conftest.tmp conftest.lnk - fi - if test "$cross_compiling" = yes; then : - - case "$host_os" in - freebsd* | aix* | hpux* | solaris2.[0-9] | solaris2.[0-9].*) - gl_cv_func_open_slash="guessing no" ;; - *) - gl_cv_func_open_slash="guessing yes" ;; - esac - -else - cat confdefs.h - <<_ACEOF >conftest.$ac_ext -/* end confdefs.h. */ - -#include -#if HAVE_UNISTD_H -# include -#endif -int main () -{ - int result = 0; -#if HAVE_LSTAT - if (open ("conftest.lnk/", O_RDONLY) != -1) - result |= 1; -#endif - if (open ("conftest.sl/", O_CREAT, 0600) >= 0) - result |= 2; - return result; -} -_ACEOF -if ac_fn_c_try_run "$LINENO"; then : - gl_cv_func_open_slash=yes -else - gl_cv_func_open_slash=no -fi -rm -f core *.core core.conftest.* gmon.out bb.out conftest$ac_exeext \ - conftest.$ac_objext conftest.beam conftest.$ac_ext -fi - - rm -f conftest.sl conftest.tmp conftest.lnk - -fi -{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $gl_cv_func_open_slash" >&5 -$as_echo "$gl_cv_func_open_slash" >&6; } - case "$gl_cv_func_open_slash" in - *no) - -$as_echo "#define OPEN_TRAILING_SLASH_BUG 1" >>confdefs.h - - REPLACE_OPEN=1 - ;; - esac - ;; - esac - - - - if test $REPLACE_OPEN = 1; then - - - - - - - - - gltests_LIBOBJS="$gltests_LIBOBJS open.$ac_objext" - - - - : - - fi - - - - - - if test "$GNULIB_OPEN" != 1; then - if test "$GNULIB_OPEN" = 0; then - GNULIB_OPEN=$gl_module_indicator_condition - else - GNULIB_OPEN="($GNULIB_OPEN || $gl_module_indicator_condition)" - fi - fi - - - - - -$as_echo "#define GNULIB_TEST_OPEN 1" >>confdefs.h - - - - - - if test "$ERRNO_H:$REPLACE_STRERROR_0" != :0; then @@ -28553,8 +31296,8 @@ else *-musl*) gl_cv_func_perror_works="guessing yes" ;; # Guess yes on native Windows. mingw*) gl_cv_func_perror_works="guessing yes" ;; - # Otherwise guess no. - *) gl_cv_func_perror_works="guessing no" ;; + # Otherwise obey --enable-cross-guesses. + *) gl_cv_func_perror_works="$gl_cross_guess_normal" ;; esac else @@ -28711,6 +31454,7 @@ done + if test $gl_cv_have_include_next = yes; then gl_cv_next_pthread_h='<'pthread.h'>' else @@ -28780,8 +31524,15 @@ $as_echo "$gl_cv_next_pthread_h" >&6; } - if test $ac_cv_header_pthread_h = yes && test $gl_threads_api != windows; then + if test $ac_cv_header_pthread_h = yes; then HAVE_PTHREAD_H=1 + + + if { case "$host_os" in mingw*) true;; *) false;; esac; } \ + && test $gl_threads_api = windows; then + HAVE_PTHREAD_H=0 + fi + else HAVE_PTHREAD_H=0 fi @@ -28956,7 +31707,7 @@ $as_echo "$gl_cv_const_PTHREAD_PROCESS_SHARED" >&6; } - LIB_PTHREAD="$LIBMULTITHREAD" + LIB_PTHREAD="$LIBPMULTITHREAD" @@ -28994,7 +31745,7 @@ if ${gl_cv_func_pthread_create+:} false; then : $as_echo_n "(cached) " >&6 else saved_LIBS="$LIBS" - LIBS="$LIBS $LIBMULTITHREAD" + LIBS="$LIBS $LIBPMULTITHREAD" cat confdefs.h - <<_ACEOF >conftest.$ac_ext /* end confdefs.h. */ extern @@ -29304,6 +32055,10 @@ else #include #include #include + + +$gl_mda_defines + static volatile int sigint_occurred; static void sigint_handler (int sig) @@ -29405,38 +32160,42 @@ if ${gl_cv_func_svid_putenv+:} false; then : $as_echo_n "(cached) " >&6 else 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, assume the worst. - *) gl_cv_func_svid_putenv="guessing no" ;; - esac + 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" ;; + esac else cat confdefs.h - <<_ACEOF >conftest.$ac_ext /* end confdefs.h. */ $ac_includes_default + + +$gl_mda_defines + int main () { - /* Put it in env. */ - if (putenv ("CONFTEST_putenv=val")) - return 1; + /* Put it in env. */ + if (putenv ("CONFTEST_putenv=val")) + return 1; - /* Try to remove it. */ - if (putenv ("CONFTEST_putenv")) - return 2; + /* Try to remove it. */ + if (putenv ("CONFTEST_putenv")) + return 2; - /* Make sure it was deleted. */ - if (getenv ("CONFTEST_putenv") != 0) - return 3; + /* Make sure it was deleted. */ + if (getenv ("CONFTEST_putenv") != 0) + return 3; - return 0; + return 0; ; return 0; @@ -29600,15 +32359,13 @@ done - if test $gl_cv_type_sigset_t = yes; then + HAVE_POSIX_SIGNALBLOCKING=0 + if test "$gl_cv_type_sigset_t" = yes; then ac_fn_c_check_func "$LINENO" "sigprocmask" "ac_cv_func_sigprocmask" if test "x$ac_cv_func_sigprocmask" = xyes; then : - gl_cv_func_sigprocmask=1 + HAVE_POSIX_SIGNALBLOCKING=1 fi - fi - if test -z "$gl_cv_func_sigprocmask"; then - HAVE_POSIX_SIGNALBLOCKING=0 fi if test $HAVE_POSIX_SIGNALBLOCKING = 0; then @@ -29872,8 +32629,8 @@ else linux-* | linux) 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, assume the worst. - *) gl_cv_func_select_detects_ebadf="guessing no" ;; + # If we don't know, obey --enable-cross-guesses. + *) gl_cv_func_select_detects_ebadf="$gl_cross_guess_normal" ;; esac else @@ -29888,6 +32645,9 @@ else #include #include + +$gl_mda_defines + int main () { @@ -30003,8 +32763,8 @@ else *-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, assume the worst. - *) gl_cv_func_setenv_works="guessing no" ;; + # If we don't know, obey --enable-cross-guesses. + *) gl_cv_func_setenv_works="$gl_cross_guess_normal" ;; esac else @@ -30094,11 +32854,14 @@ $as_echo "#define GNULIB_TEST_SETENV 1" >>confdefs.h + + + NEED_SETLOCALE_IMPROVED=0 case "$host_os" in - mingw*) REPLACE_SETLOCALE=1 ;; + mingw*) NEED_SETLOCALE_IMPROVED=1 ;; cygwin*) case `uname -r` in - 1.5.*) REPLACE_SETLOCALE=1 ;; + 1.5.*) NEED_SETLOCALE_IMPROVED=1 ;; esac ;; *) @@ -30140,11 +32903,37 @@ fi $as_echo "$gl_cv_func_setlocale_works" >&6; } case "$gl_cv_func_setlocale_works" in *yes) ;; - *) REPLACE_SETLOCALE=1 ;; + *) NEED_SETLOCALE_IMPROVED=1 ;; esac ;; esac +cat >>confdefs.h <<_ACEOF +#define NEED_SETLOCALE_IMPROVED $NEED_SETLOCALE_IMPROVED +_ACEOF + + + NEED_SETLOCALE_MTSAFE=0 + if test $SETLOCALE_NULL_ALL_MTSAFE = 0 || test $SETLOCALE_NULL_ONE_MTSAFE = 0; then + NEED_SETLOCALE_MTSAFE=1 + fi + +cat >>confdefs.h <<_ACEOF +#define NEED_SETLOCALE_MTSAFE $NEED_SETLOCALE_MTSAFE +_ACEOF + + + if test $NEED_SETLOCALE_IMPROVED = 1 || test $NEED_SETLOCALE_MTSAFE = 1; then + REPLACE_SETLOCALE=1 + fi + + if test $NEED_SETLOCALE_MTSAFE = 1; then + LIB_SETLOCALE="$LIB_SETLOCALE_NULL" + else + LIB_SETLOCALE= + fi + + if test $REPLACE_SETLOCALE = 1; then @@ -30964,16 +33753,16 @@ fi - if test $gl_cv_type_sigset_t = yes; then + + + HAVE_POSIX_SIGNALBLOCKING=0 + if test "$gl_cv_type_sigset_t" = yes; then ac_fn_c_check_func "$LINENO" "sigprocmask" "ac_cv_func_sigprocmask" if test "x$ac_cv_func_sigprocmask" = xyes; then : - gl_cv_func_sigprocmask=1 + HAVE_POSIX_SIGNALBLOCKING=1 fi fi - if test -z "$gl_cv_func_sigprocmask"; then - HAVE_POSIX_SIGNALBLOCKING=0 - fi if test $HAVE_POSIX_SIGNALBLOCKING = 0; then @@ -31118,78 +33907,6 @@ _ACEOF fi - { $as_echo "$as_me:${as_lineno-$LINENO}: checking for working stdalign.h" >&5 -$as_echo_n "checking for working stdalign.h... " >&6; } -if ${gl_cv_header_working_stdalign_h+:} false; then : - $as_echo_n "(cached) " >&6 -else - cat confdefs.h - <<_ACEOF >conftest.$ac_ext -/* end confdefs.h. */ -#include - #include - - /* Test that alignof yields a result consistent with offsetof. - This catches GCC bug 52023 - . */ - #ifdef __cplusplus - template struct alignof_helper { char a; t b; }; - # define ao(type) offsetof (alignof_helper, 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) \ - || (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 () -{ - - ; - return 0; -} -_ACEOF -if ac_fn_c_try_compile "$LINENO"; then : - gl_cv_header_working_stdalign_h=yes -else - gl_cv_header_working_stdalign_h=no -fi -rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext -fi -{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $gl_cv_header_working_stdalign_h" >&5 -$as_echo "$gl_cv_header_working_stdalign_h" >&6; } - - if test $gl_cv_header_working_stdalign_h = yes; then - STDALIGN_H='' - else - STDALIGN_H='stdalign.h' - fi - - - if test -n "$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 - - - @@ -31343,8 +34060,8 @@ else linux-* | linux) gl_cv_func_symlink_works="guessing yes" ;; # Guess yes on glibc systems. *-gnu* | gnu*) gl_cv_func_symlink_works="guessing yes" ;; - # If we don't know, assume the worst. - *) gl_cv_func_symlink_works="guessing no" ;; + # If we don't know, obey --enable-cross-guesses. + *) gl_cv_func_symlink_works="$gl_cross_guess_normal" ;; esac else @@ -31436,7 +34153,6 @@ else cat confdefs.h - <<_ACEOF >conftest.$ac_ext /* end confdefs.h. */ #include - int main () { @@ -31554,6 +34270,10 @@ $as_echo "$gl_cv_next_sys_ioctl_h" >&6; } + + + + @@ -31656,6 +34376,18 @@ done LIBS="$gl_save_LIBS" fi + for ac_header in sys/single_threaded.h +do : + ac_fn_c_check_header_mongrel "$LINENO" "sys/single_threaded.h" "ac_cv_header_sys_single_threaded_h" "$ac_includes_default" +if test "x$ac_cv_header_sys_single_threaded_h" = xyes; then : + cat >>confdefs.h <<_ACEOF +#define HAVE_SYS_SINGLE_THREADED_H 1 +_ACEOF + +fi + +done + @@ -31747,39 +34479,42 @@ if ${gl_cv_func_unsetenv_works+:} false; then : else if test "$cross_compiling" = yes; then : case "$host_os" in - # Guess yes on glibc systems. - *-gnu*) gl_cv_func_unsetenv_works="guessing yes" ;; - # If we don't know, assume the worst. - *) gl_cv_func_unsetenv_works="guessing no" ;; - esac + # Guess yes on glibc systems. + *-gnu*) gl_cv_func_unsetenv_works="guessing yes" ;; + # If we don't know, obey --enable-cross-guesses. + *) gl_cv_func_unsetenv_works="$gl_cross_guess_normal" ;; + esac else cat confdefs.h - <<_ACEOF >conftest.$ac_ext /* end confdefs.h. */ - #include - #include - extern char **environ; + #include + #include + extern char **environ; + + +$gl_mda_defines int main () { - char entry1[] = "a=1"; - char entry2[] = "b=2"; - char *env[] = { entry1, entry2, NULL }; - if (putenv ((char *) "a=1")) return 1; - if (putenv (entry2)) return 2; - entry2[0] = 'a'; - unsetenv ("a"); - if (getenv ("a")) return 3; - if (!unsetenv ("") || errno != EINVAL) return 4; - entry2[0] = 'b'; - environ = env; - if (!getenv ("a")) return 5; - entry2[0] = 'a'; - unsetenv ("a"); - if (getenv ("a")) return 6; + char entry1[] = "a=1"; + char entry2[] = "b=2"; + char *env[] = { entry1, entry2, NULL }; + if (putenv ((char *) "a=1")) return 1; + if (putenv (entry2)) return 2; + entry2[0] = 'a'; + unsetenv ("a"); + if (getenv ("a")) return 3; + if (!unsetenv ("") || errno != EINVAL) return 4; + entry2[0] = 'b'; + environ = env; + if (!getenv ("a")) return 5; + entry2[0] = 'a'; + unsetenv ("a"); + if (getenv ("a")) return 6; ; return 0; @@ -31794,6 +34529,7 @@ rm -f core *.core core.conftest.* gmon.out bb.out conftest$ac_exeext \ conftest.$ac_objext conftest.beam conftest.$ac_ext fi + fi { $as_echo "$as_me:${as_lineno-$LINENO}: result: $gl_cv_func_unsetenv_works" >&5 $as_echo "$gl_cv_func_unsetenv_works" >&6; } @@ -32485,6 +35221,7 @@ else /* end confdefs.h. */ #include +#include #include /* Tru64 with Desktop Toolkit C has a bug: must be included before . @@ -32752,7 +35489,7 @@ if ${gl_cv_cc_nomfi_supported+:} false; then : $as_echo_n "(cached) " >&6 else gl_save_CFLAGS="$CFLAGS" - CFLAGS="$CFLAGS -W -Werror -Wno-missing-field-initializers" + CFLAGS="$CFLAGS -Wextra -Werror -Wno-missing-field-initializers" cat confdefs.h - <<_ACEOF >conftest.$ac_ext /* end confdefs.h. */ @@ -32783,7 +35520,7 @@ if ${gl_cv_cc_nomfi_needed+:} false; then : $as_echo_n "(cached) " >&6 else gl_save_CFLAGS="$CFLAGS" - CFLAGS="$CFLAGS -W -Werror" + CFLAGS="$CFLAGS -Wextra -Werror" cat confdefs.h - <<_ACEOF >conftest.$ac_ext /* end confdefs.h. */ int f (void) @@ -32850,133 +35587,41 @@ $as_echo "$gl_cv_cc_uninitialized_supported" >&6; } # To compare this list to your installed GCC's, run this Bash command: # # comm -3 \ - # <((sed -n 's/^ *\(-[^ 0-9][^ ]*\) .*/\1/p' manywarnings.m4; \ + # <((sed -n 's/^ *\(-[^ 0-9][^ ]*\).*/\1/p' manywarnings.m4; \ # awk '/^[^#]/ {print ws}' ../build-aux/gcc-warning.spec) | sort) \ # <(LC_ALL=C gcc --help=warnings | sed -n 's/^ \(-[^ ]*\) .*/\1/p' | sort) - gl_manywarn_set= - for gl_manywarn_item in -fno-common \ - -W \ - -Wabsolute-value \ - -Waddress \ - -Waddress-of-packed-member \ - -Waggressive-loop-optimizations \ + ws= + for gl_manywarn_item in -fanalyzer -fno-common \ -Wall \ - -Wattribute-warning \ - -Wattributes \ + -Warith-conversion \ -Wbad-function-cast \ - -Wbool-compare \ - -Wbool-operation \ - -Wbuiltin-declaration-mismatch \ - -Wbuiltin-macro-redefined \ - -Wcannot-profile \ - -Wcast-align \ -Wcast-align=strict \ - -Wcast-function-type \ - -Wchar-subscripts \ - -Wclobbered \ - -Wcomment \ - -Wcomments \ - -Wcoverage-mismatch \ - -Wcpp \ - -Wdangling-else \ -Wdate-time \ - -Wdeprecated \ - -Wdeprecated-declarations \ - -Wdesignated-init \ -Wdisabled-optimization \ - -Wdiscarded-array-qualifiers \ - -Wdiscarded-qualifiers \ - -Wdiv-by-zero \ -Wdouble-promotion \ -Wduplicated-branches \ -Wduplicated-cond \ - -Wduplicate-decl-specifier \ - -Wempty-body \ - -Wendif-labels \ - -Wenum-compare \ - -Wexpansion-to-defined \ -Wextra \ - -Wformat-contains-nul \ - -Wformat-extra-args \ - -Wformat-nonliteral \ - -Wformat-security \ -Wformat-signedness \ - -Wformat-y2k \ - -Wformat-zero-length \ - -Wframe-address \ - -Wfree-nonheap-object \ - -Whsa \ - -Wif-not-aligned \ - -Wignored-attributes \ - -Wignored-qualifiers \ - -Wimplicit \ - -Wimplicit-function-declaration \ - -Wimplicit-int \ - -Wincompatible-pointer-types \ -Winit-self \ -Winline \ - -Wint-conversion \ - -Wint-in-bool-context \ - -Wint-to-pointer-cast \ - -Winvalid-memory-model \ -Winvalid-pch \ - -Wlogical-not-parentheses \ -Wlogical-op \ - -Wmain \ - -Wmaybe-uninitialized \ - -Wmemset-elt-size \ - -Wmemset-transposed-args \ - -Wmisleading-indentation \ - -Wmissing-attributes \ - -Wmissing-braces \ -Wmissing-declarations \ - -Wmissing-field-initializers \ -Wmissing-include-dirs \ - -Wmissing-parameter-type \ - -Wmissing-profile \ -Wmissing-prototypes \ - -Wmultichar \ - -Wmultistatement-macros \ - -Wnarrowing \ -Wnested-externs \ - -Wnonnull \ - -Wnonnull-compare \ -Wnull-dereference \ - -Wodr \ - -Wold-style-declaration \ -Wold-style-definition \ -Wopenmp-simd \ - -Woverflow \ -Woverlength-strings \ - -Woverride-init \ -Wpacked \ - -Wpacked-bitfield-compat \ - -Wpacked-not-aligned \ - -Wparentheses \ -Wpointer-arith \ - -Wpointer-compare \ - -Wpointer-sign \ - -Wpointer-to-int-cast \ - -Wpragmas \ - -Wpsabi \ - -Wrestrict \ - -Wreturn-local-addr \ - -Wreturn-type \ - -Wscalar-storage-order \ - -Wsequence-point \ -Wshadow \ - -Wshift-count-negative \ - -Wshift-count-overflow \ - -Wshift-negative-value \ - -Wsizeof-array-argument \ - -Wsizeof-pointer-div \ - -Wsizeof-pointer-memaccess \ -Wstack-protector \ - -Wstrict-aliasing \ -Wstrict-overflow \ -Wstrict-prototypes \ - -Wstringop-truncation \ -Wsuggest-attribute=cold \ -Wsuggest-attribute=const \ -Wsuggest-attribute=format \ @@ -32985,97 +35630,63 @@ $as_echo "$gl_cv_cc_uninitialized_supported" >&6; } -Wsuggest-attribute=pure \ -Wsuggest-final-methods \ -Wsuggest-final-types \ - -Wswitch \ - -Wswitch-bool \ - -Wswitch-unreachable \ -Wsync-nand \ -Wsystem-headers \ - -Wtautological-compare \ -Wtrampolines \ - -Wtrigraphs \ - -Wtype-limits \ -Wuninitialized \ -Wunknown-pragmas \ -Wunsafe-loop-optimizations \ - -Wunused \ - -Wunused-but-set-parameter \ - -Wunused-but-set-variable \ - -Wunused-function \ - -Wunused-label \ - -Wunused-local-typedefs \ -Wunused-macros \ - -Wunused-parameter \ - -Wunused-result \ - -Wunused-value \ - -Wunused-variable \ - -Wvarargs \ -Wvariadic-macros \ -Wvector-operation-performance \ -Wvla \ - -Wvolatile-register-var \ -Wwrite-strings \ \ ; do - gl_manywarn_set="$gl_manywarn_set $gl_manywarn_item" + as_fn_append ws " $gl_manywarn_item" done # gcc --help=warnings outputs an unusual form for these options; list # them here so that the above 'comm' command doesn't report a false match. - # Would prefer "min (PTRDIFF_MAX, SIZE_MAX)", but it must be a literal. - # Also, AC_COMPUTE_INT requires it to fit in a long; it is 2**63 on - # the only platforms where it does not fit in a long, so make that - # a special case. - { $as_echo "$as_me:${as_lineno-$LINENO}: checking max safe object size" >&5 -$as_echo_n "checking max safe object size... " >&6; } - if ac_fn_c_compute_int "$LINENO" "LONG_MAX < (PTRDIFF_MAX < (size_t) -1 ? PTRDIFF_MAX : (size_t) -1) - ? -1 - : PTRDIFF_MAX < (size_t) -1 ? (long) PTRDIFF_MAX : (long) (size_t) -1" "gl_alloc_max" "#include - #include - #include - "; then : - -else - gl_alloc_max=2147483647 -fi - - case $gl_alloc_max in - -1) gl_alloc_max=9223372036854775807;; - esac - { $as_echo "$as_me:${as_lineno-$LINENO}: result: $gl_alloc_max" >&5 -$as_echo "$gl_alloc_max" >&6; } - gl_manywarn_set="$gl_manywarn_set -Walloc-size-larger-than=$gl_alloc_max" - gl_manywarn_set="$gl_manywarn_set -Warray-bounds=2" - gl_manywarn_set="$gl_manywarn_set -Wattribute-alias=2" - gl_manywarn_set="$gl_manywarn_set -Wformat-overflow=2" - gl_manywarn_set="$gl_manywarn_set -Wformat-truncation=2" - gl_manywarn_set="$gl_manywarn_set -Wimplicit-fallthrough=5" - gl_manywarn_set="$gl_manywarn_set -Wnormalized=nfc" - gl_manywarn_set="$gl_manywarn_set -Wshift-overflow=2" - gl_manywarn_set="$gl_manywarn_set -Wstringop-overflow=2" - gl_manywarn_set="$gl_manywarn_set -Wunused-const-variable=2" - gl_manywarn_set="$gl_manywarn_set -Wvla-larger-than=4031" + as_fn_append ws ' -Warray-bounds=2' + as_fn_append ws ' -Wattribute-alias=2' + 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 ' -Wunused-const-variable=2' + as_fn_append ws ' -Wvla-larger-than=4031' # These are needed for older GCC versions. if test -n "$GCC"; then case `($CC --version) 2>/dev/null` in 'gcc (GCC) '[0-3].* | \ 'gcc (GCC) '4.[0-7].*) - gl_manywarn_set="$gl_manywarn_set -fdiagnostics-show-option" - gl_manywarn_set="$gl_manywarn_set -funit-at-a-time" + as_fn_append ws ' -fdiagnostics-show-option' + as_fn_append ws ' -funit-at-a-time' ;; esac fi # Disable specific options as needed. if test "$gl_cv_cc_nomfi_needed" = yes; then - gl_manywarn_set="$gl_manywarn_set -Wno-missing-field-initializers" + as_fn_append ws ' -Wno-missing-field-initializers' fi if test "$gl_cv_cc_uninitialized_supported" = no; then - gl_manywarn_set="$gl_manywarn_set -Wno-uninitialized" + as_fn_append ws ' -Wno-uninitialized' fi - ws=$gl_manywarn_set + # Some warnings have too many false alarms in GCC 10.1. + # https://gcc.gnu.org/bugzilla/show_bug.cgi?id=93695 + as_fn_append ws ' -Wno-analyzer-double-free' + # https://gcc.gnu.org/bugzilla/show_bug.cgi?id=94458 + as_fn_append ws ' -Wno-analyzer-malloc-leak' + # https://gcc.gnu.org/bugzilla/show_bug.cgi?id=94851 + as_fn_append ws ' -Wno-analyzer-null-dereference' + # https://gcc.gnu.org/bugzilla/show_bug.cgi?id=95758 + as_fn_append ws ' -Wno-analyzer-use-after-free' ac_ext=c ac_cpp='$CPP $CPPFLAGS' @@ -33093,7 +35704,7 @@ ac_compiler_gnu=$ac_cv_c_compiler_gnu *" $gl_warn_item "*) ;; *) - gl_warn_set="$gl_warn_set $gl_warn_item" + as_fn_append gl_warn_set " $gl_warn_item" ;; esac done @@ -41333,7 +43944,6 @@ CC=$lt_save_CC prefix="$acl_save_prefix" - # Check whether --with-gnu-ld was given. if test "${with_gnu_ld+set}" = set; then : withval=$with_gnu_ld; test "$withval" = no || with_gnu_ld=yes @@ -41344,22 +43954,48 @@ fi # Prepare PATH_SEPARATOR. # The user is always right. if test "${PATH_SEPARATOR+set}" != set; then - # Determine PATH_SEPARATOR by trying to find /bin/sh in a PATH which - # contains only /bin. Note that ksh looks also at the FPATH variable, - # so we have to set that as well for the test. - PATH_SEPARATOR=: - (PATH='/bin;/bin'; FPATH=$PATH; sh -c :) >/dev/null 2>&1 \ - && { (PATH='/bin:/bin'; FPATH=$PATH; sh -c :) >/dev/null 2>&1 \ - || PATH_SEPARATOR=';' - } + echo "#! /bin/sh" >conf$$.sh + echo "exit 0" >>conf$$.sh + chmod +x conf$$.sh + if (PATH="/nonexistent;."; conf$$.sh) >/dev/null 2>&1; then + PATH_SEPARATOR=';' + else + PATH_SEPARATOR=: + fi + rm -f conf$$.sh fi - -if test -n "$LD"; then - { $as_echo "$as_me:${as_lineno-$LINENO}: checking for ld" >&5 -$as_echo_n "checking for ld... " >&6; } -elif test "$GCC" = yes; then - { $as_echo "$as_me:${as_lineno-$LINENO}: checking for ld used by $CC" >&5 -$as_echo_n "checking for ld used by $CC... " >&6; } +ac_prog=ld +if test "$GCC" = yes; then + # Check if gcc -print-prog-name=ld gives a path. + { $as_echo "$as_me:${as_lineno-$LINENO}: checking for ld used by GCC" >&5 +$as_echo_n "checking for ld used by GCC... " >&6; } + case $host in + *-*-mingw*) + # gcc leaves a trailing carriage return which upsets mingw + ac_prog=`($CC -print-prog-name=ld) 2>&5 | tr -d '\015'` ;; + *) + ac_prog=`($CC -print-prog-name=ld) 2>&5` ;; + esac + case $ac_prog in + # Accept absolute paths. + [\\/]* | [A-Za-z]:[\\/]*) + re_direlt='/[^/][^/]*/\.\./' + # Canonicalize the path of ld + ac_prog=`echo $ac_prog| sed 's%\\\\%/%g'` + while echo $ac_prog | grep "$re_direlt" > /dev/null 2>&1; do + ac_prog=`echo $ac_prog| sed "s%$re_direlt%/%"` + done + test -z "$LD" && LD="$ac_prog" + ;; + "") + # If it fails, then pretend we aren't using GCC. + ac_prog=ld + ;; + *) + # If it is relative, then search for the first ld in PATH. + with_gnu_ld=unknown + ;; + esac elif test "$with_gnu_ld" = yes; then { $as_echo "$as_me:${as_lineno-$LINENO}: checking for GNU ld" >&5 $as_echo_n "checking for GNU ld... " >&6; } @@ -41367,142 +44003,52 @@ else { $as_echo "$as_me:${as_lineno-$LINENO}: checking for non-GNU ld" >&5 $as_echo_n "checking for non-GNU ld... " >&6; } fi -if test -n "$LD"; then - # Let the user override the test with a path. - : -else - if ${acl_cv_path_LD+:} false; then : +if ${acl_cv_path_LD+:} false; then : $as_echo_n "(cached) " >&6 else - - acl_cv_path_LD= # Final result of this test - ac_prog=ld # Program to search in $PATH - if test "$GCC" = yes; then - # Check if gcc -print-prog-name=ld gives a path. - case $host in - *-*-mingw*) - # gcc leaves a trailing carriage return which upsets mingw - acl_output=`($CC -print-prog-name=ld) 2>&5 | tr -d '\015'` ;; - *) - acl_output=`($CC -print-prog-name=ld) 2>&5` ;; - esac - case $acl_output in - # Accept absolute paths. - [\\/]* | ?:[\\/]*) - re_direlt='/[^/][^/]*/\.\./' - # Canonicalize the pathname of ld - acl_output=`echo "$acl_output" | sed 's%\\\\%/%g'` - while echo "$acl_output" | grep "$re_direlt" > /dev/null 2>&1; do - acl_output=`echo $acl_output | sed "s%$re_direlt%/%"` - done - # Got the pathname. No search in PATH is needed. - acl_cv_path_LD="$acl_output" - ac_prog= - ;; - "") - # If it fails, then pretend we aren't using GCC. - ;; - *) - # If it is relative, then search for the first ld in PATH. - with_gnu_ld=unknown - ;; + if test -z "$LD"; then + IFS="${IFS= }"; ac_save_ifs="$IFS"; IFS="${IFS}${PATH_SEPARATOR-:}" + for ac_dir in $PATH; do + test -z "$ac_dir" && ac_dir=. + if test -f "$ac_dir/$ac_prog" || test -f "$ac_dir/$ac_prog$ac_exeext"; then + acl_cv_path_LD="$ac_dir/$ac_prog" + # Check to see if the program is GNU ld. I'd rather use --version, + # but apparently some GNU ld's only accept -v. + # Break only if it was the GNU/non-GNU ld that we prefer. + case `"$acl_cv_path_LD" -v 2>&1 < /dev/null` in + *GNU* | *'with BFD'*) + test "$with_gnu_ld" != no && break ;; + *) + test "$with_gnu_ld" != yes && break ;; esac fi - if test -n "$ac_prog"; then - # Search for $ac_prog in $PATH. - acl_save_ifs="$IFS"; IFS=$PATH_SEPARATOR - for ac_dir in $PATH; do - IFS="$acl_save_ifs" - test -z "$ac_dir" && ac_dir=. - if test -f "$ac_dir/$ac_prog" || test -f "$ac_dir/$ac_prog$ac_exeext"; then - acl_cv_path_LD="$ac_dir/$ac_prog" - # Check to see if the program is GNU ld. I'd rather use --version, - # but apparently some variants of GNU ld only accept -v. - # Break only if it was the GNU/non-GNU ld that we prefer. - case `"$acl_cv_path_LD" -v 2>&1 conftest.$ac_ext -/* end confdefs.h. */ -#if defined __powerpc64__ || defined _ARCH_PPC64 - int ok; - #else - error fail - #endif - -_ACEOF -if ac_fn_c_try_compile "$LINENO"; then : - # The compiler produces 64-bit code. Add option '-b64' so that the - # linker groks 64-bit object files. - case "$acl_cv_path_LD " in - *" -b64 "*) ;; - *) acl_cv_path_LD="$acl_cv_path_LD -b64" ;; - esac - -fi -rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext - ;; - sparc64-*-netbsd*) - cat confdefs.h - <<_ACEOF >conftest.$ac_ext -/* end confdefs.h. */ -#if defined __sparcv9 || defined __arch64__ - int ok; - #else - error fail - #endif - -_ACEOF -if ac_fn_c_try_compile "$LINENO"; then : - + done + IFS="$ac_save_ifs" else - # The compiler produces 32-bit code. Add option '-m elf32_sparc' - # so that the linker groks 32-bit object files. - case "$acl_cv_path_LD " in - *" -m elf32_sparc "*) ;; - *) acl_cv_path_LD="$acl_cv_path_LD -m elf32_sparc" ;; - esac - + acl_cv_path_LD="$LD" # Let the user override the test with a path. fi -rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext - ;; - esac - fi - LD="$acl_cv_path_LD" -fi +LD="$acl_cv_path_LD" if test -n "$LD"; then { $as_echo "$as_me:${as_lineno-$LINENO}: result: $LD" >&5 $as_echo "$LD" >&6; } else { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 $as_echo "no" >&6; } - as_fn_error $? "no acceptable ld found in \$PATH" "$LINENO" 5 fi +test -z "$LD" && as_fn_error $? "no acceptable ld found in \$PATH" "$LINENO" 5 { $as_echo "$as_me:${as_lineno-$LINENO}: checking if the linker ($LD) is GNU ld" >&5 $as_echo_n "checking if the linker ($LD) is GNU ld... " >&6; } if ${acl_cv_prog_gnu_ld+:} false; then : $as_echo_n "(cached) " >&6 else - # I'd rather use --version here, but apparently some GNU lds only accept -v. + # I'd rather use --version here, but apparently some GNU ld's only accept -v. case `$LD -v 2>&1 &5 @@ -41546,324 +44092,67 @@ fi - { $as_echo "$as_me:${as_lineno-$LINENO}: checking 32-bit host C ABI" >&5 -$as_echo_n "checking 32-bit host C ABI... " >&6; } -if ${gl_cv_host_cpu_c_abi_32bit+:} false; then : - $as_echo_n "(cached) " >&6 -else - if test -n "$gl_cv_host_cpu_c_abi"; then - case "$gl_cv_host_cpu_c_abi" in - i386 | x86_64-x32 | arm | armhf | arm64-ilp32 | hppa | ia64-ilp32 | mips | mipsn32 | powerpc | riscv*-ilp32* | s390 | sparc) - gl_cv_host_cpu_c_abi_32bit=yes ;; - *) - gl_cv_host_cpu_c_abi_32bit=no ;; - esac - else - case "$host_cpu" in - - i[4567]86 ) - gl_cv_host_cpu_c_abi_32bit=yes - ;; - - x86_64 ) - # On x86_64 systems, the C compiler may be generating code in one of - # these ABIs: - # - 64-bit instruction set, 64-bit pointers, 64-bit 'long': x86_64. - # - 64-bit instruction set, 64-bit pointers, 32-bit 'long': x86_64 - # with native Windows (mingw, MSVC). - # - 64-bit instruction set, 32-bit pointers, 32-bit 'long': x86_64-x32. - # - 32-bit instruction set, 32-bit pointers, 32-bit 'long': i386. - cat confdefs.h - <<_ACEOF >conftest.$ac_ext -/* end confdefs.h. */ -#if (defined __x86_64__ || defined __amd64__ \ - || defined _M_X64 || defined _M_AMD64) \ - && !(defined __ILP32__ || defined _ILP32) - int ok; - #else - error fail - #endif - -_ACEOF -if ac_fn_c_try_compile "$LINENO"; then : - gl_cv_host_cpu_c_abi_32bit=no -else - gl_cv_host_cpu_c_abi_32bit=yes -fi -rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext - ;; - - arm* | aarch64 ) - # Assume arm with EABI. - # On arm64 systems, the C compiler may be generating code in one of - # these ABIs: - # - aarch64 instruction set, 64-bit pointers, 64-bit 'long': arm64. - # - aarch64 instruction set, 32-bit pointers, 32-bit 'long': arm64-ilp32. - # - 32-bit instruction set, 32-bit pointers, 32-bit 'long': arm or armhf. - cat confdefs.h - <<_ACEOF >conftest.$ac_ext -/* end confdefs.h. */ -#if defined __aarch64__ && !(defined __ILP32__ || defined _ILP32) - int ok; - #else - error fail - #endif - -_ACEOF -if ac_fn_c_try_compile "$LINENO"; then : - gl_cv_host_cpu_c_abi_32bit=no -else - gl_cv_host_cpu_c_abi_32bit=yes -fi -rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext - ;; - - hppa1.0 | hppa1.1 | hppa2.0* | hppa64 ) - # On hppa, the C compiler may be generating 32-bit code or 64-bit - # code. In the latter case, it defines _LP64 and __LP64__. - cat confdefs.h - <<_ACEOF >conftest.$ac_ext -/* end confdefs.h. */ -#ifdef __LP64__ - int ok; - #else - error fail - #endif - -_ACEOF -if ac_fn_c_try_compile "$LINENO"; then : - gl_cv_host_cpu_c_abi_32bit=no -else - gl_cv_host_cpu_c_abi_32bit=yes -fi -rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext - ;; - - ia64* ) - # On ia64 on HP-UX, the C compiler may be generating 64-bit code or - # 32-bit code. In the latter case, it defines _ILP32. - cat confdefs.h - <<_ACEOF >conftest.$ac_ext -/* end confdefs.h. */ -#ifdef _ILP32 - int ok; - #else - error fail - #endif - -_ACEOF -if ac_fn_c_try_compile "$LINENO"; then : - gl_cv_host_cpu_c_abi_32bit=yes -else - gl_cv_host_cpu_c_abi_32bit=no -fi -rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext - ;; - - mips* ) - # We should also check for (_MIPS_SZPTR == 64), but gcc keeps this - # at 32. - cat confdefs.h - <<_ACEOF >conftest.$ac_ext -/* end confdefs.h. */ -#if defined _MIPS_SZLONG && (_MIPS_SZLONG == 64) - int ok; - #else - error fail - #endif - -_ACEOF -if ac_fn_c_try_compile "$LINENO"; then : - gl_cv_host_cpu_c_abi_32bit=no -else - gl_cv_host_cpu_c_abi_32bit=yes -fi -rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext - ;; - - powerpc* ) - # Different ABIs are in use on AIX vs. Mac OS X vs. Linux,*BSD. - # No need to distinguish them here; the caller may distinguish - # them based on the OS. - # On powerpc64 systems, the C compiler may still be generating - # 32-bit code. And on powerpc-ibm-aix systems, the C compiler may - # be generating 64-bit code. - cat confdefs.h - <<_ACEOF >conftest.$ac_ext -/* end confdefs.h. */ -#if defined __powerpc64__ || defined _ARCH_PPC64 - int ok; - #else - error fail - #endif - -_ACEOF -if ac_fn_c_try_compile "$LINENO"; then : - gl_cv_host_cpu_c_abi_32bit=no -else - gl_cv_host_cpu_c_abi_32bit=yes -fi -rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext - ;; - - rs6000 ) - gl_cv_host_cpu_c_abi_32bit=yes - ;; - - riscv32 | riscv64 ) - # There are 6 ABIs: ilp32, ilp32f, ilp32d, lp64, lp64f, lp64d. - # Size of 'long' and 'void *': - cat confdefs.h - <<_ACEOF >conftest.$ac_ext -/* end confdefs.h. */ -#if defined __LP64__ - int ok; - #else - error fail - #endif - -_ACEOF -if ac_fn_c_try_compile "$LINENO"; then : - gl_cv_host_cpu_c_abi_32bit=no -else - gl_cv_host_cpu_c_abi_32bit=yes -fi -rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext - ;; - - s390* ) - # On s390x, the C compiler may be generating 64-bit (= s390x) code - # or 31-bit (= s390) code. - cat confdefs.h - <<_ACEOF >conftest.$ac_ext -/* end confdefs.h. */ -#if defined __LP64__ || defined __s390x__ - int ok; - #else - error fail - #endif - -_ACEOF -if ac_fn_c_try_compile "$LINENO"; then : - gl_cv_host_cpu_c_abi_32bit=no -else - gl_cv_host_cpu_c_abi_32bit=yes -fi -rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext - ;; - - sparc | sparc64 ) - # UltraSPARCs running Linux have `uname -m` = "sparc64", but the - # C compiler still generates 32-bit code. - cat confdefs.h - <<_ACEOF >conftest.$ac_ext -/* end confdefs.h. */ -#if defined __sparcv9 || defined __arch64__ - int ok; - #else - error fail - #endif - -_ACEOF -if ac_fn_c_try_compile "$LINENO"; then : - gl_cv_host_cpu_c_abi_32bit=no -else - gl_cv_host_cpu_c_abi_32bit=yes -fi -rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext - ;; - - *) - gl_cv_host_cpu_c_abi_32bit=no - ;; - esac - fi - -fi -{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $gl_cv_host_cpu_c_abi_32bit" >&5 -$as_echo "$gl_cv_host_cpu_c_abi_32bit" >&6; } - - HOST_CPU_C_ABI_32BIT="$gl_cv_host_cpu_c_abi_32bit" - - - - - + acl_libdirstem=lib + acl_libdirstem2= case "$host_os" in solaris*) - { $as_echo "$as_me:${as_lineno-$LINENO}: checking for 64-bit host" >&5 + { $as_echo "$as_me:${as_lineno-$LINENO}: checking for 64-bit host" >&5 $as_echo_n "checking for 64-bit host... " >&6; } if ${gl_cv_solaris_64bit+:} false; then : $as_echo_n "(cached) " >&6 else cat confdefs.h - <<_ACEOF >conftest.$ac_ext /* end confdefs.h. */ + #ifdef _LP64 - int ok; - #else - error fail - #endif +sixtyfour bits +#endif _ACEOF -if ac_fn_c_try_compile "$LINENO"; then : +if (eval "$ac_cpp conftest.$ac_ext") 2>&5 | + $EGREP "sixtyfour bits" >/dev/null 2>&1; then : gl_cv_solaris_64bit=yes else gl_cv_solaris_64bit=no fi -rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext +rm -f conftest* + fi { $as_echo "$as_me:${as_lineno-$LINENO}: result: $gl_cv_solaris_64bit" >&5 -$as_echo "$gl_cv_solaris_64bit" >&6; };; - esac - - { $as_echo "$as_me:${as_lineno-$LINENO}: checking for the common suffixes of directories in the library search path" >&5 -$as_echo_n "checking for the common suffixes of directories in the library search path... " >&6; } -if ${acl_cv_libdirstems+:} false; then : - $as_echo_n "(cached) " >&6 -else - acl_libdirstem=lib - acl_libdirstem2= - case "$host_os" in - solaris*) - if test $gl_cv_solaris_64bit = yes; then - acl_libdirstem=lib/64 - case "$host_cpu" in - sparc*) acl_libdirstem2=lib/sparcv9 ;; - i*86 | x86_64) acl_libdirstem2=lib/amd64 ;; - esac - fi - ;; - *) - if test "$HOST_CPU_C_ABI_32BIT" != yes; then - searchpath=`(if test -f /usr/bin/gcc \ - && LC_ALL=C /usr/bin/gcc -print-search-dirs >/dev/null 2>/dev/null; then \ - LC_ALL=C /usr/bin/gcc -print-search-dirs; \ - else \ - LC_ALL=C $CC -print-search-dirs; \ - fi) 2>/dev/null \ - | sed -n -e 's,^libraries: ,,p' | sed -e 's,^=,,'` - if test -n "$searchpath"; then - acl_save_IFS="${IFS= }"; IFS=":" - for searchdir in $searchpath; do - if test -d "$searchdir"; then +$as_echo "$gl_cv_solaris_64bit" >&6; } + if test $gl_cv_solaris_64bit = yes; then + acl_libdirstem=lib/64 + case "$host_cpu" in + sparc*) acl_libdirstem2=lib/sparcv9 ;; + i*86 | x86_64) acl_libdirstem2=lib/amd64 ;; + esac + fi + ;; + *) + searchpath=`(LC_ALL=C $CC -print-search-dirs) 2>/dev/null | sed -n -e 's,^libraries: ,,p' | sed -e 's,^=,,'` + if test -n "$searchpath"; then + acl_save_IFS="${IFS= }"; IFS=":" + for searchdir in $searchpath; do + if test -d "$searchdir"; then + case "$searchdir" in + */lib64/ | */lib64 ) acl_libdirstem=lib64 ;; + */../ | */.. ) + # Better ignore directories of this form. They are misleading. + ;; + *) searchdir=`cd "$searchdir" && pwd` case "$searchdir" in - */lib64/ | */lib64 ) acl_libdirstem=lib64 ;; - */../ | */.. ) - # Better ignore directories of this form. They are misleading. - ;; - *) searchdir=`cd "$searchdir" && pwd` - case "$searchdir" in - */lib64 ) acl_libdirstem=lib64 ;; - esac ;; - esac - fi - done - IFS="$acl_save_IFS" - fi - fi - ;; - esac - test -n "$acl_libdirstem2" || acl_libdirstem2="$acl_libdirstem" - acl_cv_libdirstems="$acl_libdirstem,$acl_libdirstem2" + */lib64 ) acl_libdirstem=lib64 ;; + esac ;; + esac + fi + done + IFS="$acl_save_IFS" + fi + ;; + esac + test -n "$acl_libdirstem2" || acl_libdirstem2="$acl_libdirstem" -fi -{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $acl_cv_libdirstems" >&5 -$as_echo "$acl_cv_libdirstems" >&6; } - # Decompose acl_cv_libdirstems into acl_libdirstem and acl_libdirstem2. - acl_libdirstem=`echo "$acl_cv_libdirstems" | sed -e 's/,.*//'` - acl_libdirstem2=`echo "$acl_cv_libdirstems" | sed -e '/,/s/.*,//'` @@ -41912,7 +44201,7 @@ if test "${with_libiconv_prefix+set}" = set; then : additional_includedir="$withval/include" additional_libdir="$withval/$acl_libdirstem" if test "$acl_libdirstem2" != "$acl_libdirstem" \ - && test ! -d "$withval/$acl_libdirstem"; then + && ! test -d "$withval/$acl_libdirstem"; then additional_libdir="$withval/$acl_libdirstem2" fi fi @@ -41942,7 +44231,7 @@ fi done if test -z "$already_handled"; then names_already_handled="$names_already_handled $name" - uppername=`echo "$name" | sed -e 'y|abcdefghijklmnopqrstuvwxyz./+-|ABCDEFGHIJKLMNOPQRSTUVWXYZ____|'` + uppername=`echo "$name" | sed -e 'y|abcdefghijklmnopqrstuvwxyz./-|ABCDEFGHIJKLMNOPQRSTUVWXYZ___|'` eval value=\"\$HAVE_LIB$uppername\" if test -n "$value"; then if test "$value" = yes; then @@ -42334,6 +44623,7 @@ fi + am_save_CPPFLAGS="$CPPFLAGS" for element in $INCICONV; do @@ -43306,6 +45596,7 @@ $as_echo "$LIBICONV" >&6; } + use_additional=yes acl_save_prefix="$prefix" @@ -43343,7 +45634,7 @@ if test "${with_libintl_prefix+set}" = set; then : additional_includedir="$withval/include" additional_libdir="$withval/$acl_libdirstem" if test "$acl_libdirstem2" != "$acl_libdirstem" \ - && test ! -d "$withval/$acl_libdirstem"; then + && ! test -d "$withval/$acl_libdirstem"; then additional_libdir="$withval/$acl_libdirstem2" fi fi @@ -43373,7 +45664,7 @@ fi done if test -z "$already_handled"; then names_already_handled="$names_already_handled $name" - uppername=`echo "$name" | sed -e 'y|abcdefghijklmnopqrstuvwxyz./+-|ABCDEFGHIJKLMNOPQRSTUVWXYZ____|'` + uppername=`echo "$name" | sed -e 'y|abcdefghijklmnopqrstuvwxyz./-|ABCDEFGHIJKLMNOPQRSTUVWXYZ___|'` eval value=\"\$HAVE_LIB$uppername\" if test -n "$value"; then if test "$value" = yes; then @@ -43759,6 +46050,7 @@ fi + { $as_echo "$as_me:${as_lineno-$LINENO}: checking for GNU gettext in libintl" >&5 $as_echo_n "checking for GNU gettext in libintl... " >&6; } if eval \${$gt_func_gnugettext_libintl+:} false; then : @@ -44052,12 +46344,6 @@ fi fi -SELINUX_LIBS="" -if test "$enable_selinux" = yes; then - SELINUX_LIBS="-lselinux -lsepol" -fi - - if test "$with_readline" = yes; then OLD_LIBS="$LIBS" LIBS="" @@ -45604,6 +47890,10 @@ Usually this means the macro was only invoked conditionally." "$LINENO" 5 fi CONFIG_INCLUDE=lib/config.h +if test -z "${GL_GENERATE_STDALIGN_H_TRUE}" && test -z "${GL_GENERATE_STDALIGN_H_FALSE}"; then + as_fn_error $? "conditional \"GL_GENERATE_STDALIGN_H\" was never defined. +Usually this means the macro was only invoked conditionally." "$LINENO" 5 +fi if test -z "${GL_GENERATE_STDARG_H_TRUE}" && test -z "${GL_GENERATE_STDARG_H_FALSE}"; then as_fn_error $? "conditional \"GL_GENERATE_STDARG_H\" was never defined. Usually this means the macro was only invoked conditionally." "$LINENO" 5 @@ -45636,10 +47926,6 @@ fi if test -z "${GL_GENERATE_NETINET_IN_H_TRUE}" && test -z "${GL_GENERATE_NETINET_IN_H_FALSE}"; then as_fn_error $? "conditional \"GL_GENERATE_NETINET_IN_H\" was never defined. Usually this means the macro was only invoked conditionally." "$LINENO" 5 -fi -if test -z "${GL_GENERATE_STDALIGN_H_TRUE}" && test -z "${GL_GENERATE_STDALIGN_H_FALSE}"; then - as_fn_error $? "conditional \"GL_GENERATE_STDALIGN_H\" was never defined. -Usually this means the macro was only invoked conditionally." "$LINENO" 5 fi gltests_libobjs= @@ -46063,7 +48349,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.3, which was +This file was extended by GNU parted $as_me 3.4, which was generated by GNU Autoconf 2.69. Invocation command line was CONFIG_FILES = $CONFIG_FILES @@ -46135,7 +48421,7 @@ _ACEOF cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1 ac_cs_config="`$as_echo "$ac_configure_args" | sed 's/^ //; s/[\\""\`\$]/\\\\&/g'`" ac_cs_version="\\ -GNU parted config.status 3.3 +GNU parted config.status 3.4 configured by $0, generated by GNU Autoconf 2.69, with options \\"\$ac_cs_config\\" diff --git a/configure.ac b/configure.ac index c46a3ff..d034064 100644 --- a/configure.ac +++ b/configure.ac @@ -1,9 +1,10 @@ dnl GNU Parted - a library and front end for manipulation hard disk partitions -dnl Copyright (C) 1998-2002, 2005-2014, 2019 Free Software Foundation, Inc. +dnl Copyright (C) 1998-2002, 2005-2014, 2019-2021 Free Software Foundation, +dnl Inc. dnl dnl This file may be modified and/or distributed without restriction. -AC_PREREQ([2.63]) +AC_PREREQ([2.64]) AC_INIT([GNU parted], m4_esyscmd([build-aux/git-version-gen .version]), [bug-parted@gnu.org]) @@ -89,11 +90,6 @@ if test $ENABLE_DEVICE_MAPPER = yes; then 1, [device mapper (libdevmapper) support]) fi -AC_ARG_ENABLE([selinux], - [ --enable-selinux enable SELinux support [default=no]], , - enable_selinux=no -) - AC_ARG_ENABLE([discover-only], [ --enable-discover-only support only reading/probing [default=no]], , enable_discover_only=no @@ -320,13 +316,6 @@ package as well (it may be called device-mapper-devel or something similar).] fi AC_SUBST([DM_LIBS]) -dnl Check for SELinux -SELINUX_LIBS="" -if test "$enable_selinux" = yes; then - SELINUX_LIBS="-lselinux -lsepol" -fi -AC_SUBST([SELINUX_LIBS]) - dnl Check for termcap if test "$with_readline" = yes; then OLD_LIBS="$LIBS" diff --git a/debug/Makefile.in b/debug/Makefile.in index 3f65425..a3b1751 100644 --- a/debug/Makefile.in +++ b/debug/Makefile.in @@ -94,9 +94,9 @@ am__aclocal_m4_deps = $(top_srcdir)/m4/00gnulib.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/calloc.m4 $(top_srcdir)/m4/canonicalize.m4 \ - $(top_srcdir)/m4/close.m4 $(top_srcdir)/m4/codeset.m4 \ - $(top_srcdir)/m4/config-h.m4 $(top_srcdir)/m4/configmake.m4 \ - $(top_srcdir)/m4/ctype.m4 $(top_srcdir)/m4/dirname.m4 \ + $(top_srcdir)/m4/clock_time.m4 $(top_srcdir)/m4/close.m4 \ + $(top_srcdir)/m4/codeset.m4 $(top_srcdir)/m4/config-h.m4 \ + $(top_srcdir)/m4/configmake.m4 $(top_srcdir)/m4/ctype.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 \ @@ -108,15 +108,13 @@ am__aclocal_m4_deps = $(top_srcdir)/m4/00gnulib.m4 \ $(top_srcdir)/m4/fsync.m4 $(top_srcdir)/m4/ftruncate.m4 \ $(top_srcdir)/m4/getcwd.m4 $(top_srcdir)/m4/getdtablesize.m4 \ $(top_srcdir)/m4/getopt.m4 $(top_srcdir)/m4/getpagesize.m4 \ - $(top_srcdir)/m4/getprogname.m4 $(top_srcdir)/m4/gettext.m4 \ - $(top_srcdir)/m4/gettimeofday.m4 $(top_srcdir)/m4/glibc21.m4 \ - $(top_srcdir)/m4/gnulib-common.m4 \ - $(top_srcdir)/m4/gnulib-comp.m4 \ - $(top_srcdir)/m4/host-cpu-c-abi.m4 $(top_srcdir)/m4/iconv.m4 \ + $(top_srcdir)/m4/getprogname.m4 $(top_srcdir)/m4/getrandom.m4 \ + $(top_srcdir)/m4/gettext.m4 $(top_srcdir)/m4/gettimeofday.m4 \ + $(top_srcdir)/m4/glibc21.m4 $(top_srcdir)/m4/gnulib-common.m4 \ + $(top_srcdir)/m4/gnulib-comp.m4 $(top_srcdir)/m4/iconv.m4 \ $(top_srcdir)/m4/include_next.m4 $(top_srcdir)/m4/inet_pton.m4 \ $(top_srcdir)/m4/intl-thread-locale.m4 \ - $(top_srcdir)/m4/intlmacosx.m4 \ - $(top_srcdir)/m4/inttypes-pri.m4 $(top_srcdir)/m4/inttypes.m4 \ + $(top_srcdir)/m4/intlmacosx.m4 $(top_srcdir)/m4/inttypes.m4 \ $(top_srcdir)/m4/ioctl.m4 $(top_srcdir)/m4/isblank.m4 \ $(top_srcdir)/m4/langinfo_h.m4 $(top_srcdir)/m4/largefile.m4 \ $(top_srcdir)/m4/lcmessage.m4 $(top_srcdir)/m4/lib-ignore.m4 \ @@ -126,25 +124,26 @@ am__aclocal_m4_deps = $(top_srcdir)/m4/00gnulib.m4 \ $(top_srcdir)/m4/locale-fr.m4 $(top_srcdir)/m4/locale-ja.m4 \ $(top_srcdir)/m4/locale-tr.m4 $(top_srcdir)/m4/locale-zh.m4 \ $(top_srcdir)/m4/locale_h.m4 $(top_srcdir)/m4/localeconv.m4 \ - $(top_srcdir)/m4/localename.m4 \ - $(top_srcdir)/m4/localtime-buffer.m4 $(top_srcdir)/m4/lock.m4 \ - $(top_srcdir)/m4/longlong.m4 $(top_srcdir)/m4/lseek.m4 \ - $(top_srcdir)/m4/lstat.m4 $(top_srcdir)/m4/ltoptions.m4 \ - $(top_srcdir)/m4/ltsugar.m4 $(top_srcdir)/m4/ltversion.m4 \ - $(top_srcdir)/m4/lt~obsolete.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/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/localename.m4 $(top_srcdir)/m4/lock.m4 \ + $(top_srcdir)/m4/lseek.m4 $(top_srcdir)/m4/lstat.m4 \ + $(top_srcdir)/m4/ltoptions.m4 $(top_srcdir)/m4/ltsugar.m4 \ + $(top_srcdir)/m4/ltversion.m4 $(top_srcdir)/m4/lt~obsolete.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/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/nanosleep.m4 $(top_srcdir)/m4/netinet_in_h.m4 \ + $(top_srcdir)/m4/musl.m4 $(top_srcdir)/m4/nanosleep.m4 \ + $(top_srcdir)/m4/netinet_in_h.m4 \ $(top_srcdir)/m4/nl_langinfo.m4 $(top_srcdir)/m4/nls.m4 \ $(top_srcdir)/m4/nocrash.m4 $(top_srcdir)/m4/o-direct.m4 \ $(top_srcdir)/m4/off_t.m4 $(top_srcdir)/m4/open-cloexec.m4 \ - $(top_srcdir)/m4/open.m4 $(top_srcdir)/m4/pathmax.m4 \ - $(top_srcdir)/m4/perror.m4 $(top_srcdir)/m4/pipe.m4 \ + $(top_srcdir)/m4/open-slash.m4 $(top_srcdir)/m4/open.m4 \ + $(top_srcdir)/m4/pathmax.m4 $(top_srcdir)/m4/perror.m4 \ + $(top_srcdir)/m4/pid_t.m4 $(top_srcdir)/m4/pipe.m4 \ $(top_srcdir)/m4/po.m4 $(top_srcdir)/m4/priv-set.m4 \ $(top_srcdir)/m4/progtest.m4 \ $(top_srcdir)/m4/pthread-thread.m4 \ @@ -156,9 +155,10 @@ am__aclocal_m4_deps = $(top_srcdir)/m4/00gnulib.m4 \ $(top_srcdir)/m4/readlink.m4 $(top_srcdir)/m4/realloc.m4 \ $(top_srcdir)/m4/regex.m4 $(top_srcdir)/m4/rpmatch.m4 \ $(top_srcdir)/m4/safe-read.m4 $(top_srcdir)/m4/sched_h.m4 \ - $(top_srcdir)/m4/select.m4 $(top_srcdir)/m4/setenv.m4 \ - $(top_srcdir)/m4/setlocale.m4 $(top_srcdir)/m4/sigaction.m4 \ - $(top_srcdir)/m4/signal_h.m4 \ + $(top_srcdir)/m4/select.m4 $(top_srcdir)/m4/semaphore.m4 \ + $(top_srcdir)/m4/setenv.m4 $(top_srcdir)/m4/setlocale.m4 \ + $(top_srcdir)/m4/setlocale_null.m4 \ + $(top_srcdir)/m4/sigaction.m4 $(top_srcdir)/m4/signal_h.m4 \ $(top_srcdir)/m4/signalblocking.m4 $(top_srcdir)/m4/sleep.m4 \ $(top_srcdir)/m4/socketlib.m4 $(top_srcdir)/m4/sockets.m4 \ $(top_srcdir)/m4/socklen.m4 $(top_srcdir)/m4/sockpfaf.m4 \ @@ -173,6 +173,7 @@ am__aclocal_m4_deps = $(top_srcdir)/m4/00gnulib.m4 \ $(top_srcdir)/m4/strnlen.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 \ @@ -181,14 +182,15 @@ am__aclocal_m4_deps = $(top_srcdir)/m4/00gnulib.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/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/xstrndup.m4 $(top_srcdir)/m4/xstrtol.m4 \ - $(top_srcdir)/m4/yield.m4 $(top_srcdir)/configure.ac + $(top_srcdir)/m4/yield.m4 $(top_srcdir)/m4/zzgnulib.m4 \ + $(top_srcdir)/configure.ac am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \ $(ACLOCAL_M4) DIST_COMMON = $(srcdir)/Makefile.am $(am__DIST_COMMON) @@ -300,6 +302,7 @@ BUILDINFO = @BUILDINFO@ CC = @CC@ CCDEPMODE = @CCDEPMODE@ CFLAGS = @CFLAGS@ +CFLAG_VISIBILITY = @CFLAG_VISIBILITY@ CHECK_CFLAGS = @CHECK_CFLAGS@ CHECK_LIBS = @CHECK_LIBS@ CONFIG_INCLUDE = @CONFIG_INCLUDE@ @@ -334,6 +337,8 @@ GMSGFMT = @GMSGFMT@ GMSGFMT_015 = @GMSGFMT_015@ GNULIB_ACCEPT = @GNULIB_ACCEPT@ GNULIB_ACCEPT4 = @GNULIB_ACCEPT4@ +GNULIB_ACCESS = @GNULIB_ACCESS@ +GNULIB_ALIGNED_ALLOC = @GNULIB_ALIGNED_ALLOC@ GNULIB_ATOLL = @GNULIB_ATOLL@ GNULIB_BIND = @GNULIB_BIND@ GNULIB_BTOWC = @GNULIB_BTOWC@ @@ -344,6 +349,7 @@ GNULIB_CHOWN = @GNULIB_CHOWN@ GNULIB_CLOSE = @GNULIB_CLOSE@ GNULIB_CONNECT = @GNULIB_CONNECT@ GNULIB_COPY_FILE_RANGE = @GNULIB_COPY_FILE_RANGE@ +GNULIB_CREAT = @GNULIB_CREAT@ GNULIB_CTIME = @GNULIB_CTIME@ GNULIB_DPRINTF = @GNULIB_DPRINTF@ GNULIB_DUP = @GNULIB_DUP@ @@ -391,19 +397,23 @@ GNULIB_GETCWD = @GNULIB_GETCWD@ GNULIB_GETDELIM = @GNULIB_GETDELIM@ GNULIB_GETDOMAINNAME = @GNULIB_GETDOMAINNAME@ GNULIB_GETDTABLESIZE = @GNULIB_GETDTABLESIZE@ +GNULIB_GETENTROPY = @GNULIB_GETENTROPY@ GNULIB_GETGROUPS = @GNULIB_GETGROUPS@ GNULIB_GETHOSTNAME = @GNULIB_GETHOSTNAME@ GNULIB_GETLINE = @GNULIB_GETLINE@ GNULIB_GETLOADAVG = @GNULIB_GETLOADAVG@ GNULIB_GETLOGIN = @GNULIB_GETLOGIN@ GNULIB_GETLOGIN_R = @GNULIB_GETLOGIN_R@ +GNULIB_GETOPT_POSIX = @GNULIB_GETOPT_POSIX@ GNULIB_GETPAGESIZE = @GNULIB_GETPAGESIZE@ GNULIB_GETPASS = @GNULIB_GETPASS@ GNULIB_GETPEERNAME = @GNULIB_GETPEERNAME@ +GNULIB_GETRANDOM = @GNULIB_GETRANDOM@ GNULIB_GETSOCKNAME = @GNULIB_GETSOCKNAME@ GNULIB_GETSOCKOPT = @GNULIB_GETSOCKOPT@ GNULIB_GETSUBOPT = @GNULIB_GETSUBOPT@ GNULIB_GETTIMEOFDAY = @GNULIB_GETTIMEOFDAY@ +GNULIB_GETUMASK = @GNULIB_GETUMASK@ GNULIB_GETUSERSHELL = @GNULIB_GETUSERSHELL@ GNULIB_GL_UNISTD_H_GETOPT = @GNULIB_GL_UNISTD_H_GETOPT@ GNULIB_GRANTPT = @GNULIB_GRANTPT@ @@ -417,6 +427,8 @@ GNULIB_ISATTY = @GNULIB_ISATTY@ GNULIB_ISBLANK = @GNULIB_ISBLANK@ GNULIB_ISWBLANK = @GNULIB_ISWBLANK@ GNULIB_ISWCTYPE = @GNULIB_ISWCTYPE@ +GNULIB_ISWDIGIT = @GNULIB_ISWDIGIT@ +GNULIB_ISWXDIGIT = @GNULIB_ISWXDIGIT@ GNULIB_LCHMOD = @GNULIB_LCHMOD@ GNULIB_LCHOWN = @GNULIB_LCHOWN@ GNULIB_LINK = @GNULIB_LINK@ @@ -477,6 +489,7 @@ GNULIB_PERROR = @GNULIB_PERROR@ GNULIB_PIPE = @GNULIB_PIPE@ GNULIB_PIPE2 = @GNULIB_PIPE2@ GNULIB_POPEN = @GNULIB_POPEN@ +GNULIB_POSIX_MEMALIGN = @GNULIB_POSIX_MEMALIGN@ GNULIB_POSIX_OPENPT = @GNULIB_POSIX_OPENPT@ GNULIB_PREAD = @GNULIB_PREAD@ GNULIB_PRINTF = @GNULIB_PRINTF@ @@ -525,9 +538,12 @@ GNULIB_SENDTO = @GNULIB_SENDTO@ GNULIB_SETENV = @GNULIB_SETENV@ GNULIB_SETHOSTNAME = @GNULIB_SETHOSTNAME@ GNULIB_SETLOCALE = @GNULIB_SETLOCALE@ +GNULIB_SETLOCALE_NULL = @GNULIB_SETLOCALE_NULL@ GNULIB_SETSOCKOPT = @GNULIB_SETSOCKOPT@ GNULIB_SHUTDOWN = @GNULIB_SHUTDOWN@ +GNULIB_SIGABBREV_NP = @GNULIB_SIGABBREV_NP@ GNULIB_SIGACTION = @GNULIB_SIGACTION@ +GNULIB_SIGDESCR_NP = @GNULIB_SIGDESCR_NP@ GNULIB_SIGNAL_H_SIGPIPE = @GNULIB_SIGNAL_H_SIGPIPE@ GNULIB_SIGPROCMASK = @GNULIB_SIGPROCMASK@ GNULIB_SLEEP = @GNULIB_SLEEP@ @@ -543,6 +559,7 @@ GNULIB_STRCASESTR = @GNULIB_STRCASESTR@ GNULIB_STRCHRNUL = @GNULIB_STRCHRNUL@ GNULIB_STRDUP = @GNULIB_STRDUP@ GNULIB_STRERROR = @GNULIB_STRERROR@ +GNULIB_STRERRORNAME_NP = @GNULIB_STRERRORNAME_NP@ GNULIB_STRERROR_R = @GNULIB_STRERROR_R@ GNULIB_STRFTIME = @GNULIB_STRFTIME@ GNULIB_STRNCAT = @GNULIB_STRNCAT@ @@ -626,11 +643,13 @@ GNULIB_WMEMCHR = @GNULIB_WMEMCHR@ GNULIB_WMEMCMP = @GNULIB_WMEMCMP@ GNULIB_WMEMCPY = @GNULIB_WMEMCPY@ GNULIB_WMEMMOVE = @GNULIB_WMEMMOVE@ +GNULIB_WMEMPCPY = @GNULIB_WMEMPCPY@ GNULIB_WMEMSET = @GNULIB_WMEMSET@ GNULIB_WRITE = @GNULIB_WRITE@ GNULIB__EXIT = @GNULIB__EXIT@ GREP = @GREP@ HAVE_ACCEPT4 = @HAVE_ACCEPT4@ +HAVE_ALIGNED_ALLOC = @HAVE_ALIGNED_ALLOC@ HAVE_ALLOCA_H = @HAVE_ALLOCA_H@ HAVE_ARPA_INET_H = @HAVE_ARPA_INET_H@ HAVE_ATOLL = @HAVE_ATOLL@ @@ -640,12 +659,17 @@ HAVE_CANONICALIZE_FILE_NAME = @HAVE_CANONICALIZE_FILE_NAME@ HAVE_CHOWN = @HAVE_CHOWN@ HAVE_COPY_FILE_RANGE = @HAVE_COPY_FILE_RANGE@ HAVE_CRTDEFS_H = @HAVE_CRTDEFS_H@ +HAVE_DECL_ECVT = @HAVE_DECL_ECVT@ HAVE_DECL_ENVIRON = @HAVE_DECL_ENVIRON@ +HAVE_DECL_EXECVPE = @HAVE_DECL_EXECVPE@ HAVE_DECL_FCHDIR = @HAVE_DECL_FCHDIR@ +HAVE_DECL_FCLOSEALL = @HAVE_DECL_FCLOSEALL@ +HAVE_DECL_FCVT = @HAVE_DECL_FCVT@ HAVE_DECL_FDATASYNC = @HAVE_DECL_FDATASYNC@ HAVE_DECL_FPURGE = @HAVE_DECL_FPURGE@ HAVE_DECL_FSEEKO = @HAVE_DECL_FSEEKO@ HAVE_DECL_FTELLO = @HAVE_DECL_FTELLO@ +HAVE_DECL_GCVT = @HAVE_DECL_GCVT@ HAVE_DECL_GETDELIM = @HAVE_DECL_GETDELIM@ HAVE_DECL_GETDOMAINNAME = @HAVE_DECL_GETDOMAINNAME@ HAVE_DECL_GETLINE = @HAVE_DECL_GETLINE@ @@ -679,10 +703,10 @@ HAVE_DECL_TRUNCATE = @HAVE_DECL_TRUNCATE@ HAVE_DECL_TTYNAME_R = @HAVE_DECL_TTYNAME_R@ HAVE_DECL_UNSETENV = @HAVE_DECL_UNSETENV@ HAVE_DECL_VSNPRINTF = @HAVE_DECL_VSNPRINTF@ +HAVE_DECL_WCSDUP = @HAVE_DECL_WCSDUP@ HAVE_DECL_WCTOB = @HAVE_DECL_WCTOB@ HAVE_DECL_WCWIDTH = @HAVE_DECL_WCWIDTH@ HAVE_DPRINTF = @HAVE_DPRINTF@ -HAVE_DUP2 = @HAVE_DUP2@ HAVE_DUP3 = @HAVE_DUP3@ HAVE_DUPLOCALE = @HAVE_DUPLOCALE@ HAVE_EUIDACCESS = @HAVE_EUIDACCESS@ @@ -704,14 +728,17 @@ HAVE_FTELLO = @HAVE_FTELLO@ HAVE_FTRUNCATE = @HAVE_FTRUNCATE@ HAVE_FUTIMENS = @HAVE_FUTIMENS@ HAVE_GETDTABLESIZE = @HAVE_GETDTABLESIZE@ +HAVE_GETENTROPY = @HAVE_GETENTROPY@ HAVE_GETGROUPS = @HAVE_GETGROUPS@ HAVE_GETHOSTNAME = @HAVE_GETHOSTNAME@ HAVE_GETLOGIN = @HAVE_GETLOGIN@ HAVE_GETOPT_H = @HAVE_GETOPT_H@ HAVE_GETPAGESIZE = @HAVE_GETPAGESIZE@ HAVE_GETPASS = @HAVE_GETPASS@ +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_IMAXDIV_T = @HAVE_IMAXDIV_T@ @@ -730,7 +757,6 @@ HAVE_LCHMOD = @HAVE_LCHMOD@ HAVE_LCHOWN = @HAVE_LCHOWN@ HAVE_LINK = @HAVE_LINK@ HAVE_LINKAT = @HAVE_LINKAT@ -HAVE_LONG_LONG_INT = @HAVE_LONG_LONG_INT@ HAVE_LSTAT = @HAVE_LSTAT@ HAVE_MAX_ALIGN_T = @HAVE_MAX_ALIGN_T@ HAVE_MBRLEN = @HAVE_MBRLEN@ @@ -740,7 +766,6 @@ HAVE_MBSLEN = @HAVE_MBSLEN@ HAVE_MBSNRTOWCS = @HAVE_MBSNRTOWCS@ HAVE_MBSRTOWCS = @HAVE_MBSRTOWCS@ HAVE_MBTOWC = @HAVE_MBTOWC@ -HAVE_MEMCHR = @HAVE_MEMCHR@ HAVE_MEMPCPY = @HAVE_MEMPCPY@ HAVE_MKDIRAT = @HAVE_MKDIRAT@ HAVE_MKDTEMP = @HAVE_MKDTEMP@ @@ -763,6 +788,7 @@ HAVE_PCLOSE = @HAVE_PCLOSE@ HAVE_PIPE = @HAVE_PIPE@ HAVE_PIPE2 = @HAVE_PIPE2@ HAVE_POPEN = @HAVE_POPEN@ +HAVE_POSIX_MEMALIGN = @HAVE_POSIX_MEMALIGN@ HAVE_POSIX_OPENPT = @HAVE_POSIX_OPENPT@ HAVE_POSIX_SIGNALBLOCKING = @HAVE_POSIX_SIGNALBLOCKING@ HAVE_PREAD = @HAVE_PREAD@ @@ -848,7 +874,9 @@ HAVE_SECURE_GETENV = @HAVE_SECURE_GETENV@ HAVE_SETENV = @HAVE_SETENV@ HAVE_SETHOSTNAME = @HAVE_SETHOSTNAME@ HAVE_SETSTATE = @HAVE_SETSTATE@ +HAVE_SIGABBREV_NP = @HAVE_SIGABBREV_NP@ HAVE_SIGACTION = @HAVE_SIGACTION@ +HAVE_SIGDESCR_NP = @HAVE_SIGDESCR_NP@ HAVE_SIGHANDLER_T = @HAVE_SIGHANDLER_T@ HAVE_SIGINFO_T = @HAVE_SIGINFO_T@ HAVE_SIGNED_SIG_ATOMIC_T = @HAVE_SIGNED_SIG_ATOMIC_T@ @@ -861,6 +889,7 @@ HAVE_STPCPY = @HAVE_STPCPY@ HAVE_STPNCPY = @HAVE_STPNCPY@ HAVE_STRCASESTR = @HAVE_STRCASESTR@ HAVE_STRCHRNUL = @HAVE_STRCHRNUL@ +HAVE_STRERRORNAME_NP = @HAVE_STRERRORNAME_NP@ HAVE_STRPBRK = @HAVE_STRPBRK@ HAVE_STRPTIME = @HAVE_STRPTIME@ HAVE_STRSEP = @HAVE_STRSEP@ @@ -883,6 +912,7 @@ HAVE_SYS_INTTYPES_H = @HAVE_SYS_INTTYPES_H@ HAVE_SYS_IOCTL_H = @HAVE_SYS_IOCTL_H@ HAVE_SYS_LOADAVG_H = @HAVE_SYS_LOADAVG_H@ HAVE_SYS_PARAM_H = @HAVE_SYS_PARAM_H@ +HAVE_SYS_RANDOM_H = @HAVE_SYS_RANDOM_H@ HAVE_SYS_SELECT_H = @HAVE_SYS_SELECT_H@ HAVE_SYS_SOCKET_H = @HAVE_SYS_SOCKET_H@ HAVE_SYS_TIME_H = @HAVE_SYS_TIME_H@ @@ -891,15 +921,14 @@ HAVE_SYS_UIO_H = @HAVE_SYS_UIO_H@ HAVE_TIMEGM = @HAVE_TIMEGM@ HAVE_TIMEZONE_T = @HAVE_TIMEZONE_T@ HAVE_TYPE_VOLATILE_SIG_ATOMIC_T = @HAVE_TYPE_VOLATILE_SIG_ATOMIC_T@ -HAVE_TZSET = @HAVE_TZSET@ HAVE_UNISTD_H = @HAVE_UNISTD_H@ HAVE_UNLINKAT = @HAVE_UNLINKAT@ HAVE_UNLOCKPT = @HAVE_UNLOCKPT@ -HAVE_UNSIGNED_LONG_LONG_INT = @HAVE_UNSIGNED_LONG_LONG_INT@ HAVE_USLEEP = @HAVE_USLEEP@ HAVE_UTIMENSAT = @HAVE_UTIMENSAT@ HAVE_VASPRINTF = @HAVE_VASPRINTF@ HAVE_VDPRINTF = @HAVE_VDPRINTF@ +HAVE_VISIBILITY = @HAVE_VISIBILITY@ HAVE_WCHAR_H = @HAVE_WCHAR_H@ HAVE_WCHAR_T = @HAVE_WCHAR_T@ HAVE_WCPCPY = @HAVE_WCPCPY@ @@ -938,6 +967,7 @@ HAVE_WMEMCHR = @HAVE_WMEMCHR@ HAVE_WMEMCMP = @HAVE_WMEMCMP@ HAVE_WMEMCPY = @HAVE_WMEMCPY@ HAVE_WMEMMOVE = @HAVE_WMEMMOVE@ +HAVE_WMEMPCPY = @HAVE_WMEMPCPY@ HAVE_WMEMSET = @HAVE_WMEMSET@ HAVE_WS2TCPIP_H = @HAVE_WS2TCPIP_H@ HAVE_XLOCALE_H = @HAVE_XLOCALE_H@ @@ -963,16 +993,28 @@ LIBICONV = @LIBICONV@ LIBINTL = @LIBINTL@ LIBMULTITHREAD = @LIBMULTITHREAD@ LIBOBJS = @LIBOBJS@ +LIBPMULTITHREAD = @LIBPMULTITHREAD@ +LIBPTHREAD = @LIBPTHREAD@ LIBS = @LIBS@ LIBSOCKET = @LIBSOCKET@ +LIBSTDTHREAD = @LIBSTDTHREAD@ LIBTESTS_LIBDEPS = @LIBTESTS_LIBDEPS@ LIBTHREAD = @LIBTHREAD@ LIBTOOL = @LIBTOOL@ LIB_BLKID = @LIB_BLKID@ +LIB_CLOCK_GETTIME = @LIB_CLOCK_GETTIME@ +LIB_GETRANDOM = @LIB_GETRANDOM@ +LIB_HARD_LOCALE = @LIB_HARD_LOCALE@ +LIB_MBRTOWC = @LIB_MBRTOWC@ LIB_NANOSLEEP = @LIB_NANOSLEEP@ +LIB_NL_LANGINFO = @LIB_NL_LANGINFO@ LIB_PTHREAD = @LIB_PTHREAD@ LIB_PTHREAD_SIGMASK = @LIB_PTHREAD_SIGMASK@ +LIB_SCHED_YIELD = @LIB_SCHED_YIELD@ LIB_SELECT = @LIB_SELECT@ +LIB_SEMAPHORE = @LIB_SEMAPHORE@ +LIB_SETLOCALE = @LIB_SETLOCALE@ +LIB_SETLOCALE_NULL = @LIB_SETLOCALE_NULL@ LIMITS_H = @LIMITS_H@ LIPO = @LIPO@ LN_S = @LN_S@ @@ -1021,6 +1063,7 @@ NEXT_AS_FIRST_DIRECTIVE_STDIO_H = @NEXT_AS_FIRST_DIRECTIVE_STDIO_H@ NEXT_AS_FIRST_DIRECTIVE_STDLIB_H = @NEXT_AS_FIRST_DIRECTIVE_STDLIB_H@ NEXT_AS_FIRST_DIRECTIVE_STRING_H = @NEXT_AS_FIRST_DIRECTIVE_STRING_H@ NEXT_AS_FIRST_DIRECTIVE_SYS_IOCTL_H = @NEXT_AS_FIRST_DIRECTIVE_SYS_IOCTL_H@ +NEXT_AS_FIRST_DIRECTIVE_SYS_RANDOM_H = @NEXT_AS_FIRST_DIRECTIVE_SYS_RANDOM_H@ NEXT_AS_FIRST_DIRECTIVE_SYS_SELECT_H = @NEXT_AS_FIRST_DIRECTIVE_SYS_SELECT_H@ NEXT_AS_FIRST_DIRECTIVE_SYS_SOCKET_H = @NEXT_AS_FIRST_DIRECTIVE_SYS_SOCKET_H@ NEXT_AS_FIRST_DIRECTIVE_SYS_STAT_H = @NEXT_AS_FIRST_DIRECTIVE_SYS_STAT_H@ @@ -1050,6 +1093,7 @@ NEXT_STDIO_H = @NEXT_STDIO_H@ NEXT_STDLIB_H = @NEXT_STDLIB_H@ NEXT_STRING_H = @NEXT_STRING_H@ NEXT_SYS_IOCTL_H = @NEXT_SYS_IOCTL_H@ +NEXT_SYS_RANDOM_H = @NEXT_SYS_RANDOM_H@ NEXT_SYS_SELECT_H = @NEXT_SYS_SELECT_H@ NEXT_SYS_SOCKET_H = @NEXT_SYS_SOCKET_H@ NEXT_SYS_STAT_H = @NEXT_SYS_STAT_H@ @@ -1086,21 +1130,24 @@ POSUB = @POSUB@ PRAGMA_COLUMNS = @PRAGMA_COLUMNS@ PRAGMA_SYSTEM_HEADER = @PRAGMA_SYSTEM_HEADER@ PRIPTR_PREFIX = @PRIPTR_PREFIX@ -PRI_MACROS_BROKEN = @PRI_MACROS_BROKEN@ PTHREAD_H_DEFINES_STRUCT_TIMESPEC = @PTHREAD_H_DEFINES_STRUCT_TIMESPEC@ PTRDIFF_T_SUFFIX = @PTRDIFF_T_SUFFIX@ RANLIB = @RANLIB@ +REPLACE_ACCESS = @REPLACE_ACCESS@ +REPLACE_ALIGNED_ALLOC = @REPLACE_ALIGNED_ALLOC@ REPLACE_BTOWC = @REPLACE_BTOWC@ REPLACE_CALLOC = @REPLACE_CALLOC@ REPLACE_CANONICALIZE_FILE_NAME = @REPLACE_CANONICALIZE_FILE_NAME@ REPLACE_CHOWN = @REPLACE_CHOWN@ REPLACE_CLOSE = @REPLACE_CLOSE@ +REPLACE_CREAT = @REPLACE_CREAT@ REPLACE_CTIME = @REPLACE_CTIME@ REPLACE_DPRINTF = @REPLACE_DPRINTF@ REPLACE_DUP = @REPLACE_DUP@ REPLACE_DUP2 = @REPLACE_DUP2@ REPLACE_DUPLOCALE = @REPLACE_DUPLOCALE@ REPLACE_FACCESSAT = @REPLACE_FACCESSAT@ +REPLACE_FCHMODAT = @REPLACE_FCHMODAT@ REPLACE_FCHOWNAT = @REPLACE_FCHOWNAT@ REPLACE_FCLOSE = @REPLACE_FCLOSE@ REPLACE_FCNTL = @REPLACE_FCNTL@ @@ -1128,6 +1175,7 @@ REPLACE_GETLINE = @REPLACE_GETLINE@ REPLACE_GETLOGIN_R = @REPLACE_GETLOGIN_R@ REPLACE_GETPAGESIZE = @REPLACE_GETPAGESIZE@ REPLACE_GETPASS = @REPLACE_GETPASS@ +REPLACE_GETRANDOM = @REPLACE_GETRANDOM@ REPLACE_GETTIMEOFDAY = @REPLACE_GETTIMEOFDAY@ REPLACE_GMTIME = @REPLACE_GMTIME@ REPLACE_INET_NTOP = @REPLACE_INET_NTOP@ @@ -1137,6 +1185,8 @@ REPLACE_IOCTL = @REPLACE_IOCTL@ REPLACE_ISATTY = @REPLACE_ISATTY@ REPLACE_ISWBLANK = @REPLACE_ISWBLANK@ REPLACE_ISWCNTRL = @REPLACE_ISWCNTRL@ +REPLACE_ISWDIGIT = @REPLACE_ISWDIGIT@ +REPLACE_ISWXDIGIT = @REPLACE_ISWXDIGIT@ REPLACE_LCHOWN = @REPLACE_LCHOWN@ REPLACE_LINK = @REPLACE_LINK@ REPLACE_LINKAT = @REPLACE_LINKAT@ @@ -1169,6 +1219,7 @@ REPLACE_OPEN = @REPLACE_OPEN@ REPLACE_OPENAT = @REPLACE_OPENAT@ REPLACE_PERROR = @REPLACE_PERROR@ REPLACE_POPEN = @REPLACE_POPEN@ +REPLACE_POSIX_MEMALIGN = @REPLACE_POSIX_MEMALIGN@ REPLACE_PREAD = @REPLACE_PREAD@ REPLACE_PRINTF = @REPLACE_PRINTF@ REPLACE_PSELECT = @REPLACE_PSELECT@ @@ -1257,6 +1308,7 @@ REPLACE_STRCASESTR = @REPLACE_STRCASESTR@ REPLACE_STRCHRNUL = @REPLACE_STRCHRNUL@ REPLACE_STRDUP = @REPLACE_STRDUP@ REPLACE_STRERROR = @REPLACE_STRERROR@ +REPLACE_STRERRORNAME_NP = @REPLACE_STRERRORNAME_NP@ REPLACE_STRERROR_R = @REPLACE_STRERROR_R@ REPLACE_STRFTIME = @REPLACE_STRFTIME@ REPLACE_STRNCAT = @REPLACE_STRNCAT@ @@ -1294,13 +1346,13 @@ REPLACE_WCRTOMB = @REPLACE_WCRTOMB@ REPLACE_WCSFTIME = @REPLACE_WCSFTIME@ REPLACE_WCSNRTOMBS = @REPLACE_WCSNRTOMBS@ REPLACE_WCSRTOMBS = @REPLACE_WCSRTOMBS@ +REPLACE_WCSTOK = @REPLACE_WCSTOK@ REPLACE_WCSWIDTH = @REPLACE_WCSWIDTH@ REPLACE_WCTOB = @REPLACE_WCTOB@ REPLACE_WCTOMB = @REPLACE_WCTOMB@ REPLACE_WCWIDTH = @REPLACE_WCWIDTH@ REPLACE_WRITE = @REPLACE_WRITE@ SED = @SED@ -SELINUX_LIBS = @SELINUX_LIBS@ SET_MAKE = @SET_MAKE@ SHELL = @SHELL@ SIG_ATOMIC_T_SUFFIX = @SIG_ATOMIC_T_SUFFIX@ @@ -1319,6 +1371,7 @@ UINT32_MAX_LT_UINTMAX_MAX = @UINT32_MAX_LT_UINTMAX_MAX@ UINT64_MAX_EQ_ULONG_MAX = @UINT64_MAX_EQ_ULONG_MAX@ UNDEFINE_STRTOK_R = @UNDEFINE_STRTOK_R@ UNISTD_H_DEFINES_STRUCT_TIMESPEC = @UNISTD_H_DEFINES_STRUCT_TIMESPEC@ +UNISTD_H_HAVE_SYS_RANDOM_H = @UNISTD_H_HAVE_SYS_RANDOM_H@ UNISTD_H_HAVE_WINSOCK2_H = @UNISTD_H_HAVE_WINSOCK2_H@ UNISTD_H_HAVE_WINSOCK2_H_AND_USE_SOCKETS = @UNISTD_H_HAVE_WINSOCK2_H_AND_USE_SOCKETS@ USE_NLS = @USE_NLS@ diff --git a/debug/test/HOWTO b/debug/test/HOWTO index 20ad61d..07fbdbd 100644 --- a/debug/test/HOWTO +++ b/debug/test/HOWTO @@ -4,7 +4,7 @@ by Andrew Clausen - Copyright (C) 2002, 2009-2014, 2019 Free Software Foundation, Inc. + Copyright (C) 2002, 2009-2014, 2019-2021 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 836c950..2319781 100644 --- a/debug/test/Makefile.in +++ b/debug/test/Makefile.in @@ -95,9 +95,9 @@ am__aclocal_m4_deps = $(top_srcdir)/m4/00gnulib.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/calloc.m4 $(top_srcdir)/m4/canonicalize.m4 \ - $(top_srcdir)/m4/close.m4 $(top_srcdir)/m4/codeset.m4 \ - $(top_srcdir)/m4/config-h.m4 $(top_srcdir)/m4/configmake.m4 \ - $(top_srcdir)/m4/ctype.m4 $(top_srcdir)/m4/dirname.m4 \ + $(top_srcdir)/m4/clock_time.m4 $(top_srcdir)/m4/close.m4 \ + $(top_srcdir)/m4/codeset.m4 $(top_srcdir)/m4/config-h.m4 \ + $(top_srcdir)/m4/configmake.m4 $(top_srcdir)/m4/ctype.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 \ @@ -109,15 +109,13 @@ am__aclocal_m4_deps = $(top_srcdir)/m4/00gnulib.m4 \ $(top_srcdir)/m4/fsync.m4 $(top_srcdir)/m4/ftruncate.m4 \ $(top_srcdir)/m4/getcwd.m4 $(top_srcdir)/m4/getdtablesize.m4 \ $(top_srcdir)/m4/getopt.m4 $(top_srcdir)/m4/getpagesize.m4 \ - $(top_srcdir)/m4/getprogname.m4 $(top_srcdir)/m4/gettext.m4 \ - $(top_srcdir)/m4/gettimeofday.m4 $(top_srcdir)/m4/glibc21.m4 \ - $(top_srcdir)/m4/gnulib-common.m4 \ - $(top_srcdir)/m4/gnulib-comp.m4 \ - $(top_srcdir)/m4/host-cpu-c-abi.m4 $(top_srcdir)/m4/iconv.m4 \ + $(top_srcdir)/m4/getprogname.m4 $(top_srcdir)/m4/getrandom.m4 \ + $(top_srcdir)/m4/gettext.m4 $(top_srcdir)/m4/gettimeofday.m4 \ + $(top_srcdir)/m4/glibc21.m4 $(top_srcdir)/m4/gnulib-common.m4 \ + $(top_srcdir)/m4/gnulib-comp.m4 $(top_srcdir)/m4/iconv.m4 \ $(top_srcdir)/m4/include_next.m4 $(top_srcdir)/m4/inet_pton.m4 \ $(top_srcdir)/m4/intl-thread-locale.m4 \ - $(top_srcdir)/m4/intlmacosx.m4 \ - $(top_srcdir)/m4/inttypes-pri.m4 $(top_srcdir)/m4/inttypes.m4 \ + $(top_srcdir)/m4/intlmacosx.m4 $(top_srcdir)/m4/inttypes.m4 \ $(top_srcdir)/m4/ioctl.m4 $(top_srcdir)/m4/isblank.m4 \ $(top_srcdir)/m4/langinfo_h.m4 $(top_srcdir)/m4/largefile.m4 \ $(top_srcdir)/m4/lcmessage.m4 $(top_srcdir)/m4/lib-ignore.m4 \ @@ -127,25 +125,26 @@ am__aclocal_m4_deps = $(top_srcdir)/m4/00gnulib.m4 \ $(top_srcdir)/m4/locale-fr.m4 $(top_srcdir)/m4/locale-ja.m4 \ $(top_srcdir)/m4/locale-tr.m4 $(top_srcdir)/m4/locale-zh.m4 \ $(top_srcdir)/m4/locale_h.m4 $(top_srcdir)/m4/localeconv.m4 \ - $(top_srcdir)/m4/localename.m4 \ - $(top_srcdir)/m4/localtime-buffer.m4 $(top_srcdir)/m4/lock.m4 \ - $(top_srcdir)/m4/longlong.m4 $(top_srcdir)/m4/lseek.m4 \ - $(top_srcdir)/m4/lstat.m4 $(top_srcdir)/m4/ltoptions.m4 \ - $(top_srcdir)/m4/ltsugar.m4 $(top_srcdir)/m4/ltversion.m4 \ - $(top_srcdir)/m4/lt~obsolete.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/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/localename.m4 $(top_srcdir)/m4/lock.m4 \ + $(top_srcdir)/m4/lseek.m4 $(top_srcdir)/m4/lstat.m4 \ + $(top_srcdir)/m4/ltoptions.m4 $(top_srcdir)/m4/ltsugar.m4 \ + $(top_srcdir)/m4/ltversion.m4 $(top_srcdir)/m4/lt~obsolete.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/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/nanosleep.m4 $(top_srcdir)/m4/netinet_in_h.m4 \ + $(top_srcdir)/m4/musl.m4 $(top_srcdir)/m4/nanosleep.m4 \ + $(top_srcdir)/m4/netinet_in_h.m4 \ $(top_srcdir)/m4/nl_langinfo.m4 $(top_srcdir)/m4/nls.m4 \ $(top_srcdir)/m4/nocrash.m4 $(top_srcdir)/m4/o-direct.m4 \ $(top_srcdir)/m4/off_t.m4 $(top_srcdir)/m4/open-cloexec.m4 \ - $(top_srcdir)/m4/open.m4 $(top_srcdir)/m4/pathmax.m4 \ - $(top_srcdir)/m4/perror.m4 $(top_srcdir)/m4/pipe.m4 \ + $(top_srcdir)/m4/open-slash.m4 $(top_srcdir)/m4/open.m4 \ + $(top_srcdir)/m4/pathmax.m4 $(top_srcdir)/m4/perror.m4 \ + $(top_srcdir)/m4/pid_t.m4 $(top_srcdir)/m4/pipe.m4 \ $(top_srcdir)/m4/po.m4 $(top_srcdir)/m4/priv-set.m4 \ $(top_srcdir)/m4/progtest.m4 \ $(top_srcdir)/m4/pthread-thread.m4 \ @@ -157,9 +156,10 @@ am__aclocal_m4_deps = $(top_srcdir)/m4/00gnulib.m4 \ $(top_srcdir)/m4/readlink.m4 $(top_srcdir)/m4/realloc.m4 \ $(top_srcdir)/m4/regex.m4 $(top_srcdir)/m4/rpmatch.m4 \ $(top_srcdir)/m4/safe-read.m4 $(top_srcdir)/m4/sched_h.m4 \ - $(top_srcdir)/m4/select.m4 $(top_srcdir)/m4/setenv.m4 \ - $(top_srcdir)/m4/setlocale.m4 $(top_srcdir)/m4/sigaction.m4 \ - $(top_srcdir)/m4/signal_h.m4 \ + $(top_srcdir)/m4/select.m4 $(top_srcdir)/m4/semaphore.m4 \ + $(top_srcdir)/m4/setenv.m4 $(top_srcdir)/m4/setlocale.m4 \ + $(top_srcdir)/m4/setlocale_null.m4 \ + $(top_srcdir)/m4/sigaction.m4 $(top_srcdir)/m4/signal_h.m4 \ $(top_srcdir)/m4/signalblocking.m4 $(top_srcdir)/m4/sleep.m4 \ $(top_srcdir)/m4/socketlib.m4 $(top_srcdir)/m4/sockets.m4 \ $(top_srcdir)/m4/socklen.m4 $(top_srcdir)/m4/sockpfaf.m4 \ @@ -174,6 +174,7 @@ am__aclocal_m4_deps = $(top_srcdir)/m4/00gnulib.m4 \ $(top_srcdir)/m4/strnlen.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 \ @@ -182,14 +183,15 @@ am__aclocal_m4_deps = $(top_srcdir)/m4/00gnulib.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/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/xstrndup.m4 $(top_srcdir)/m4/xstrtol.m4 \ - $(top_srcdir)/m4/yield.m4 $(top_srcdir)/configure.ac + $(top_srcdir)/m4/yield.m4 $(top_srcdir)/m4/zzgnulib.m4 \ + $(top_srcdir)/configure.ac am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \ $(ACLOCAL_M4) DIST_COMMON = $(srcdir)/Makefile.am $(am__DIST_COMMON) @@ -242,6 +244,7 @@ BUILDINFO = @BUILDINFO@ CC = @CC@ CCDEPMODE = @CCDEPMODE@ CFLAGS = @CFLAGS@ +CFLAG_VISIBILITY = @CFLAG_VISIBILITY@ CHECK_CFLAGS = @CHECK_CFLAGS@ CHECK_LIBS = @CHECK_LIBS@ CONFIG_INCLUDE = @CONFIG_INCLUDE@ @@ -276,6 +279,8 @@ GMSGFMT = @GMSGFMT@ GMSGFMT_015 = @GMSGFMT_015@ GNULIB_ACCEPT = @GNULIB_ACCEPT@ GNULIB_ACCEPT4 = @GNULIB_ACCEPT4@ +GNULIB_ACCESS = @GNULIB_ACCESS@ +GNULIB_ALIGNED_ALLOC = @GNULIB_ALIGNED_ALLOC@ GNULIB_ATOLL = @GNULIB_ATOLL@ GNULIB_BIND = @GNULIB_BIND@ GNULIB_BTOWC = @GNULIB_BTOWC@ @@ -286,6 +291,7 @@ GNULIB_CHOWN = @GNULIB_CHOWN@ GNULIB_CLOSE = @GNULIB_CLOSE@ GNULIB_CONNECT = @GNULIB_CONNECT@ GNULIB_COPY_FILE_RANGE = @GNULIB_COPY_FILE_RANGE@ +GNULIB_CREAT = @GNULIB_CREAT@ GNULIB_CTIME = @GNULIB_CTIME@ GNULIB_DPRINTF = @GNULIB_DPRINTF@ GNULIB_DUP = @GNULIB_DUP@ @@ -333,19 +339,23 @@ GNULIB_GETCWD = @GNULIB_GETCWD@ GNULIB_GETDELIM = @GNULIB_GETDELIM@ GNULIB_GETDOMAINNAME = @GNULIB_GETDOMAINNAME@ GNULIB_GETDTABLESIZE = @GNULIB_GETDTABLESIZE@ +GNULIB_GETENTROPY = @GNULIB_GETENTROPY@ GNULIB_GETGROUPS = @GNULIB_GETGROUPS@ GNULIB_GETHOSTNAME = @GNULIB_GETHOSTNAME@ GNULIB_GETLINE = @GNULIB_GETLINE@ GNULIB_GETLOADAVG = @GNULIB_GETLOADAVG@ GNULIB_GETLOGIN = @GNULIB_GETLOGIN@ GNULIB_GETLOGIN_R = @GNULIB_GETLOGIN_R@ +GNULIB_GETOPT_POSIX = @GNULIB_GETOPT_POSIX@ GNULIB_GETPAGESIZE = @GNULIB_GETPAGESIZE@ GNULIB_GETPASS = @GNULIB_GETPASS@ GNULIB_GETPEERNAME = @GNULIB_GETPEERNAME@ +GNULIB_GETRANDOM = @GNULIB_GETRANDOM@ GNULIB_GETSOCKNAME = @GNULIB_GETSOCKNAME@ GNULIB_GETSOCKOPT = @GNULIB_GETSOCKOPT@ GNULIB_GETSUBOPT = @GNULIB_GETSUBOPT@ GNULIB_GETTIMEOFDAY = @GNULIB_GETTIMEOFDAY@ +GNULIB_GETUMASK = @GNULIB_GETUMASK@ GNULIB_GETUSERSHELL = @GNULIB_GETUSERSHELL@ GNULIB_GL_UNISTD_H_GETOPT = @GNULIB_GL_UNISTD_H_GETOPT@ GNULIB_GRANTPT = @GNULIB_GRANTPT@ @@ -359,6 +369,8 @@ GNULIB_ISATTY = @GNULIB_ISATTY@ GNULIB_ISBLANK = @GNULIB_ISBLANK@ GNULIB_ISWBLANK = @GNULIB_ISWBLANK@ GNULIB_ISWCTYPE = @GNULIB_ISWCTYPE@ +GNULIB_ISWDIGIT = @GNULIB_ISWDIGIT@ +GNULIB_ISWXDIGIT = @GNULIB_ISWXDIGIT@ GNULIB_LCHMOD = @GNULIB_LCHMOD@ GNULIB_LCHOWN = @GNULIB_LCHOWN@ GNULIB_LINK = @GNULIB_LINK@ @@ -419,6 +431,7 @@ GNULIB_PERROR = @GNULIB_PERROR@ GNULIB_PIPE = @GNULIB_PIPE@ GNULIB_PIPE2 = @GNULIB_PIPE2@ GNULIB_POPEN = @GNULIB_POPEN@ +GNULIB_POSIX_MEMALIGN = @GNULIB_POSIX_MEMALIGN@ GNULIB_POSIX_OPENPT = @GNULIB_POSIX_OPENPT@ GNULIB_PREAD = @GNULIB_PREAD@ GNULIB_PRINTF = @GNULIB_PRINTF@ @@ -467,9 +480,12 @@ GNULIB_SENDTO = @GNULIB_SENDTO@ GNULIB_SETENV = @GNULIB_SETENV@ GNULIB_SETHOSTNAME = @GNULIB_SETHOSTNAME@ GNULIB_SETLOCALE = @GNULIB_SETLOCALE@ +GNULIB_SETLOCALE_NULL = @GNULIB_SETLOCALE_NULL@ GNULIB_SETSOCKOPT = @GNULIB_SETSOCKOPT@ GNULIB_SHUTDOWN = @GNULIB_SHUTDOWN@ +GNULIB_SIGABBREV_NP = @GNULIB_SIGABBREV_NP@ GNULIB_SIGACTION = @GNULIB_SIGACTION@ +GNULIB_SIGDESCR_NP = @GNULIB_SIGDESCR_NP@ GNULIB_SIGNAL_H_SIGPIPE = @GNULIB_SIGNAL_H_SIGPIPE@ GNULIB_SIGPROCMASK = @GNULIB_SIGPROCMASK@ GNULIB_SLEEP = @GNULIB_SLEEP@ @@ -485,6 +501,7 @@ GNULIB_STRCASESTR = @GNULIB_STRCASESTR@ GNULIB_STRCHRNUL = @GNULIB_STRCHRNUL@ GNULIB_STRDUP = @GNULIB_STRDUP@ GNULIB_STRERROR = @GNULIB_STRERROR@ +GNULIB_STRERRORNAME_NP = @GNULIB_STRERRORNAME_NP@ GNULIB_STRERROR_R = @GNULIB_STRERROR_R@ GNULIB_STRFTIME = @GNULIB_STRFTIME@ GNULIB_STRNCAT = @GNULIB_STRNCAT@ @@ -568,11 +585,13 @@ GNULIB_WMEMCHR = @GNULIB_WMEMCHR@ GNULIB_WMEMCMP = @GNULIB_WMEMCMP@ GNULIB_WMEMCPY = @GNULIB_WMEMCPY@ GNULIB_WMEMMOVE = @GNULIB_WMEMMOVE@ +GNULIB_WMEMPCPY = @GNULIB_WMEMPCPY@ GNULIB_WMEMSET = @GNULIB_WMEMSET@ GNULIB_WRITE = @GNULIB_WRITE@ GNULIB__EXIT = @GNULIB__EXIT@ GREP = @GREP@ HAVE_ACCEPT4 = @HAVE_ACCEPT4@ +HAVE_ALIGNED_ALLOC = @HAVE_ALIGNED_ALLOC@ HAVE_ALLOCA_H = @HAVE_ALLOCA_H@ HAVE_ARPA_INET_H = @HAVE_ARPA_INET_H@ HAVE_ATOLL = @HAVE_ATOLL@ @@ -582,12 +601,17 @@ HAVE_CANONICALIZE_FILE_NAME = @HAVE_CANONICALIZE_FILE_NAME@ HAVE_CHOWN = @HAVE_CHOWN@ HAVE_COPY_FILE_RANGE = @HAVE_COPY_FILE_RANGE@ HAVE_CRTDEFS_H = @HAVE_CRTDEFS_H@ +HAVE_DECL_ECVT = @HAVE_DECL_ECVT@ HAVE_DECL_ENVIRON = @HAVE_DECL_ENVIRON@ +HAVE_DECL_EXECVPE = @HAVE_DECL_EXECVPE@ HAVE_DECL_FCHDIR = @HAVE_DECL_FCHDIR@ +HAVE_DECL_FCLOSEALL = @HAVE_DECL_FCLOSEALL@ +HAVE_DECL_FCVT = @HAVE_DECL_FCVT@ HAVE_DECL_FDATASYNC = @HAVE_DECL_FDATASYNC@ HAVE_DECL_FPURGE = @HAVE_DECL_FPURGE@ HAVE_DECL_FSEEKO = @HAVE_DECL_FSEEKO@ HAVE_DECL_FTELLO = @HAVE_DECL_FTELLO@ +HAVE_DECL_GCVT = @HAVE_DECL_GCVT@ HAVE_DECL_GETDELIM = @HAVE_DECL_GETDELIM@ HAVE_DECL_GETDOMAINNAME = @HAVE_DECL_GETDOMAINNAME@ HAVE_DECL_GETLINE = @HAVE_DECL_GETLINE@ @@ -621,10 +645,10 @@ HAVE_DECL_TRUNCATE = @HAVE_DECL_TRUNCATE@ HAVE_DECL_TTYNAME_R = @HAVE_DECL_TTYNAME_R@ HAVE_DECL_UNSETENV = @HAVE_DECL_UNSETENV@ HAVE_DECL_VSNPRINTF = @HAVE_DECL_VSNPRINTF@ +HAVE_DECL_WCSDUP = @HAVE_DECL_WCSDUP@ HAVE_DECL_WCTOB = @HAVE_DECL_WCTOB@ HAVE_DECL_WCWIDTH = @HAVE_DECL_WCWIDTH@ HAVE_DPRINTF = @HAVE_DPRINTF@ -HAVE_DUP2 = @HAVE_DUP2@ HAVE_DUP3 = @HAVE_DUP3@ HAVE_DUPLOCALE = @HAVE_DUPLOCALE@ HAVE_EUIDACCESS = @HAVE_EUIDACCESS@ @@ -646,14 +670,17 @@ HAVE_FTELLO = @HAVE_FTELLO@ HAVE_FTRUNCATE = @HAVE_FTRUNCATE@ HAVE_FUTIMENS = @HAVE_FUTIMENS@ HAVE_GETDTABLESIZE = @HAVE_GETDTABLESIZE@ +HAVE_GETENTROPY = @HAVE_GETENTROPY@ HAVE_GETGROUPS = @HAVE_GETGROUPS@ HAVE_GETHOSTNAME = @HAVE_GETHOSTNAME@ HAVE_GETLOGIN = @HAVE_GETLOGIN@ HAVE_GETOPT_H = @HAVE_GETOPT_H@ HAVE_GETPAGESIZE = @HAVE_GETPAGESIZE@ HAVE_GETPASS = @HAVE_GETPASS@ +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_IMAXDIV_T = @HAVE_IMAXDIV_T@ @@ -672,7 +699,6 @@ HAVE_LCHMOD = @HAVE_LCHMOD@ HAVE_LCHOWN = @HAVE_LCHOWN@ HAVE_LINK = @HAVE_LINK@ HAVE_LINKAT = @HAVE_LINKAT@ -HAVE_LONG_LONG_INT = @HAVE_LONG_LONG_INT@ HAVE_LSTAT = @HAVE_LSTAT@ HAVE_MAX_ALIGN_T = @HAVE_MAX_ALIGN_T@ HAVE_MBRLEN = @HAVE_MBRLEN@ @@ -682,7 +708,6 @@ HAVE_MBSLEN = @HAVE_MBSLEN@ HAVE_MBSNRTOWCS = @HAVE_MBSNRTOWCS@ HAVE_MBSRTOWCS = @HAVE_MBSRTOWCS@ HAVE_MBTOWC = @HAVE_MBTOWC@ -HAVE_MEMCHR = @HAVE_MEMCHR@ HAVE_MEMPCPY = @HAVE_MEMPCPY@ HAVE_MKDIRAT = @HAVE_MKDIRAT@ HAVE_MKDTEMP = @HAVE_MKDTEMP@ @@ -705,6 +730,7 @@ HAVE_PCLOSE = @HAVE_PCLOSE@ HAVE_PIPE = @HAVE_PIPE@ HAVE_PIPE2 = @HAVE_PIPE2@ HAVE_POPEN = @HAVE_POPEN@ +HAVE_POSIX_MEMALIGN = @HAVE_POSIX_MEMALIGN@ HAVE_POSIX_OPENPT = @HAVE_POSIX_OPENPT@ HAVE_POSIX_SIGNALBLOCKING = @HAVE_POSIX_SIGNALBLOCKING@ HAVE_PREAD = @HAVE_PREAD@ @@ -790,7 +816,9 @@ HAVE_SECURE_GETENV = @HAVE_SECURE_GETENV@ HAVE_SETENV = @HAVE_SETENV@ HAVE_SETHOSTNAME = @HAVE_SETHOSTNAME@ HAVE_SETSTATE = @HAVE_SETSTATE@ +HAVE_SIGABBREV_NP = @HAVE_SIGABBREV_NP@ HAVE_SIGACTION = @HAVE_SIGACTION@ +HAVE_SIGDESCR_NP = @HAVE_SIGDESCR_NP@ HAVE_SIGHANDLER_T = @HAVE_SIGHANDLER_T@ HAVE_SIGINFO_T = @HAVE_SIGINFO_T@ HAVE_SIGNED_SIG_ATOMIC_T = @HAVE_SIGNED_SIG_ATOMIC_T@ @@ -803,6 +831,7 @@ HAVE_STPCPY = @HAVE_STPCPY@ HAVE_STPNCPY = @HAVE_STPNCPY@ HAVE_STRCASESTR = @HAVE_STRCASESTR@ HAVE_STRCHRNUL = @HAVE_STRCHRNUL@ +HAVE_STRERRORNAME_NP = @HAVE_STRERRORNAME_NP@ HAVE_STRPBRK = @HAVE_STRPBRK@ HAVE_STRPTIME = @HAVE_STRPTIME@ HAVE_STRSEP = @HAVE_STRSEP@ @@ -825,6 +854,7 @@ HAVE_SYS_INTTYPES_H = @HAVE_SYS_INTTYPES_H@ HAVE_SYS_IOCTL_H = @HAVE_SYS_IOCTL_H@ HAVE_SYS_LOADAVG_H = @HAVE_SYS_LOADAVG_H@ HAVE_SYS_PARAM_H = @HAVE_SYS_PARAM_H@ +HAVE_SYS_RANDOM_H = @HAVE_SYS_RANDOM_H@ HAVE_SYS_SELECT_H = @HAVE_SYS_SELECT_H@ HAVE_SYS_SOCKET_H = @HAVE_SYS_SOCKET_H@ HAVE_SYS_TIME_H = @HAVE_SYS_TIME_H@ @@ -833,15 +863,14 @@ HAVE_SYS_UIO_H = @HAVE_SYS_UIO_H@ HAVE_TIMEGM = @HAVE_TIMEGM@ HAVE_TIMEZONE_T = @HAVE_TIMEZONE_T@ HAVE_TYPE_VOLATILE_SIG_ATOMIC_T = @HAVE_TYPE_VOLATILE_SIG_ATOMIC_T@ -HAVE_TZSET = @HAVE_TZSET@ HAVE_UNISTD_H = @HAVE_UNISTD_H@ HAVE_UNLINKAT = @HAVE_UNLINKAT@ HAVE_UNLOCKPT = @HAVE_UNLOCKPT@ -HAVE_UNSIGNED_LONG_LONG_INT = @HAVE_UNSIGNED_LONG_LONG_INT@ HAVE_USLEEP = @HAVE_USLEEP@ HAVE_UTIMENSAT = @HAVE_UTIMENSAT@ HAVE_VASPRINTF = @HAVE_VASPRINTF@ HAVE_VDPRINTF = @HAVE_VDPRINTF@ +HAVE_VISIBILITY = @HAVE_VISIBILITY@ HAVE_WCHAR_H = @HAVE_WCHAR_H@ HAVE_WCHAR_T = @HAVE_WCHAR_T@ HAVE_WCPCPY = @HAVE_WCPCPY@ @@ -880,6 +909,7 @@ HAVE_WMEMCHR = @HAVE_WMEMCHR@ HAVE_WMEMCMP = @HAVE_WMEMCMP@ HAVE_WMEMCPY = @HAVE_WMEMCPY@ HAVE_WMEMMOVE = @HAVE_WMEMMOVE@ +HAVE_WMEMPCPY = @HAVE_WMEMPCPY@ HAVE_WMEMSET = @HAVE_WMEMSET@ HAVE_WS2TCPIP_H = @HAVE_WS2TCPIP_H@ HAVE_XLOCALE_H = @HAVE_XLOCALE_H@ @@ -905,16 +935,28 @@ LIBICONV = @LIBICONV@ LIBINTL = @LIBINTL@ LIBMULTITHREAD = @LIBMULTITHREAD@ LIBOBJS = @LIBOBJS@ +LIBPMULTITHREAD = @LIBPMULTITHREAD@ +LIBPTHREAD = @LIBPTHREAD@ LIBS = @LIBS@ LIBSOCKET = @LIBSOCKET@ +LIBSTDTHREAD = @LIBSTDTHREAD@ LIBTESTS_LIBDEPS = @LIBTESTS_LIBDEPS@ LIBTHREAD = @LIBTHREAD@ LIBTOOL = @LIBTOOL@ LIB_BLKID = @LIB_BLKID@ +LIB_CLOCK_GETTIME = @LIB_CLOCK_GETTIME@ +LIB_GETRANDOM = @LIB_GETRANDOM@ +LIB_HARD_LOCALE = @LIB_HARD_LOCALE@ +LIB_MBRTOWC = @LIB_MBRTOWC@ LIB_NANOSLEEP = @LIB_NANOSLEEP@ +LIB_NL_LANGINFO = @LIB_NL_LANGINFO@ LIB_PTHREAD = @LIB_PTHREAD@ LIB_PTHREAD_SIGMASK = @LIB_PTHREAD_SIGMASK@ +LIB_SCHED_YIELD = @LIB_SCHED_YIELD@ LIB_SELECT = @LIB_SELECT@ +LIB_SEMAPHORE = @LIB_SEMAPHORE@ +LIB_SETLOCALE = @LIB_SETLOCALE@ +LIB_SETLOCALE_NULL = @LIB_SETLOCALE_NULL@ LIMITS_H = @LIMITS_H@ LIPO = @LIPO@ LN_S = @LN_S@ @@ -963,6 +1005,7 @@ NEXT_AS_FIRST_DIRECTIVE_STDIO_H = @NEXT_AS_FIRST_DIRECTIVE_STDIO_H@ NEXT_AS_FIRST_DIRECTIVE_STDLIB_H = @NEXT_AS_FIRST_DIRECTIVE_STDLIB_H@ NEXT_AS_FIRST_DIRECTIVE_STRING_H = @NEXT_AS_FIRST_DIRECTIVE_STRING_H@ NEXT_AS_FIRST_DIRECTIVE_SYS_IOCTL_H = @NEXT_AS_FIRST_DIRECTIVE_SYS_IOCTL_H@ +NEXT_AS_FIRST_DIRECTIVE_SYS_RANDOM_H = @NEXT_AS_FIRST_DIRECTIVE_SYS_RANDOM_H@ NEXT_AS_FIRST_DIRECTIVE_SYS_SELECT_H = @NEXT_AS_FIRST_DIRECTIVE_SYS_SELECT_H@ NEXT_AS_FIRST_DIRECTIVE_SYS_SOCKET_H = @NEXT_AS_FIRST_DIRECTIVE_SYS_SOCKET_H@ NEXT_AS_FIRST_DIRECTIVE_SYS_STAT_H = @NEXT_AS_FIRST_DIRECTIVE_SYS_STAT_H@ @@ -992,6 +1035,7 @@ NEXT_STDIO_H = @NEXT_STDIO_H@ NEXT_STDLIB_H = @NEXT_STDLIB_H@ NEXT_STRING_H = @NEXT_STRING_H@ NEXT_SYS_IOCTL_H = @NEXT_SYS_IOCTL_H@ +NEXT_SYS_RANDOM_H = @NEXT_SYS_RANDOM_H@ NEXT_SYS_SELECT_H = @NEXT_SYS_SELECT_H@ NEXT_SYS_SOCKET_H = @NEXT_SYS_SOCKET_H@ NEXT_SYS_STAT_H = @NEXT_SYS_STAT_H@ @@ -1028,21 +1072,24 @@ POSUB = @POSUB@ PRAGMA_COLUMNS = @PRAGMA_COLUMNS@ PRAGMA_SYSTEM_HEADER = @PRAGMA_SYSTEM_HEADER@ PRIPTR_PREFIX = @PRIPTR_PREFIX@ -PRI_MACROS_BROKEN = @PRI_MACROS_BROKEN@ PTHREAD_H_DEFINES_STRUCT_TIMESPEC = @PTHREAD_H_DEFINES_STRUCT_TIMESPEC@ PTRDIFF_T_SUFFIX = @PTRDIFF_T_SUFFIX@ RANLIB = @RANLIB@ +REPLACE_ACCESS = @REPLACE_ACCESS@ +REPLACE_ALIGNED_ALLOC = @REPLACE_ALIGNED_ALLOC@ REPLACE_BTOWC = @REPLACE_BTOWC@ REPLACE_CALLOC = @REPLACE_CALLOC@ REPLACE_CANONICALIZE_FILE_NAME = @REPLACE_CANONICALIZE_FILE_NAME@ REPLACE_CHOWN = @REPLACE_CHOWN@ REPLACE_CLOSE = @REPLACE_CLOSE@ +REPLACE_CREAT = @REPLACE_CREAT@ REPLACE_CTIME = @REPLACE_CTIME@ REPLACE_DPRINTF = @REPLACE_DPRINTF@ REPLACE_DUP = @REPLACE_DUP@ REPLACE_DUP2 = @REPLACE_DUP2@ REPLACE_DUPLOCALE = @REPLACE_DUPLOCALE@ REPLACE_FACCESSAT = @REPLACE_FACCESSAT@ +REPLACE_FCHMODAT = @REPLACE_FCHMODAT@ REPLACE_FCHOWNAT = @REPLACE_FCHOWNAT@ REPLACE_FCLOSE = @REPLACE_FCLOSE@ REPLACE_FCNTL = @REPLACE_FCNTL@ @@ -1070,6 +1117,7 @@ REPLACE_GETLINE = @REPLACE_GETLINE@ REPLACE_GETLOGIN_R = @REPLACE_GETLOGIN_R@ REPLACE_GETPAGESIZE = @REPLACE_GETPAGESIZE@ REPLACE_GETPASS = @REPLACE_GETPASS@ +REPLACE_GETRANDOM = @REPLACE_GETRANDOM@ REPLACE_GETTIMEOFDAY = @REPLACE_GETTIMEOFDAY@ REPLACE_GMTIME = @REPLACE_GMTIME@ REPLACE_INET_NTOP = @REPLACE_INET_NTOP@ @@ -1079,6 +1127,8 @@ REPLACE_IOCTL = @REPLACE_IOCTL@ REPLACE_ISATTY = @REPLACE_ISATTY@ REPLACE_ISWBLANK = @REPLACE_ISWBLANK@ REPLACE_ISWCNTRL = @REPLACE_ISWCNTRL@ +REPLACE_ISWDIGIT = @REPLACE_ISWDIGIT@ +REPLACE_ISWXDIGIT = @REPLACE_ISWXDIGIT@ REPLACE_LCHOWN = @REPLACE_LCHOWN@ REPLACE_LINK = @REPLACE_LINK@ REPLACE_LINKAT = @REPLACE_LINKAT@ @@ -1111,6 +1161,7 @@ REPLACE_OPEN = @REPLACE_OPEN@ REPLACE_OPENAT = @REPLACE_OPENAT@ REPLACE_PERROR = @REPLACE_PERROR@ REPLACE_POPEN = @REPLACE_POPEN@ +REPLACE_POSIX_MEMALIGN = @REPLACE_POSIX_MEMALIGN@ REPLACE_PREAD = @REPLACE_PREAD@ REPLACE_PRINTF = @REPLACE_PRINTF@ REPLACE_PSELECT = @REPLACE_PSELECT@ @@ -1199,6 +1250,7 @@ REPLACE_STRCASESTR = @REPLACE_STRCASESTR@ REPLACE_STRCHRNUL = @REPLACE_STRCHRNUL@ REPLACE_STRDUP = @REPLACE_STRDUP@ REPLACE_STRERROR = @REPLACE_STRERROR@ +REPLACE_STRERRORNAME_NP = @REPLACE_STRERRORNAME_NP@ REPLACE_STRERROR_R = @REPLACE_STRERROR_R@ REPLACE_STRFTIME = @REPLACE_STRFTIME@ REPLACE_STRNCAT = @REPLACE_STRNCAT@ @@ -1236,13 +1288,13 @@ REPLACE_WCRTOMB = @REPLACE_WCRTOMB@ REPLACE_WCSFTIME = @REPLACE_WCSFTIME@ REPLACE_WCSNRTOMBS = @REPLACE_WCSNRTOMBS@ REPLACE_WCSRTOMBS = @REPLACE_WCSRTOMBS@ +REPLACE_WCSTOK = @REPLACE_WCSTOK@ REPLACE_WCSWIDTH = @REPLACE_WCSWIDTH@ REPLACE_WCTOB = @REPLACE_WCTOB@ REPLACE_WCTOMB = @REPLACE_WCTOMB@ REPLACE_WCWIDTH = @REPLACE_WCWIDTH@ REPLACE_WRITE = @REPLACE_WRITE@ SED = @SED@ -SELINUX_LIBS = @SELINUX_LIBS@ SET_MAKE = @SET_MAKE@ SHELL = @SHELL@ SIG_ATOMIC_T_SUFFIX = @SIG_ATOMIC_T_SUFFIX@ @@ -1261,6 +1313,7 @@ UINT32_MAX_LT_UINTMAX_MAX = @UINT32_MAX_LT_UINTMAX_MAX@ UINT64_MAX_EQ_ULONG_MAX = @UINT64_MAX_EQ_ULONG_MAX@ UNDEFINE_STRTOK_R = @UNDEFINE_STRTOK_R@ UNISTD_H_DEFINES_STRUCT_TIMESPEC = @UNISTD_H_DEFINES_STRUCT_TIMESPEC@ +UNISTD_H_HAVE_SYS_RANDOM_H = @UNISTD_H_HAVE_SYS_RANDOM_H@ UNISTD_H_HAVE_WINSOCK2_H = @UNISTD_H_HAVE_WINSOCK2_H@ UNISTD_H_HAVE_WINSOCK2_H_AND_USE_SOCKETS = @UNISTD_H_HAVE_WINSOCK2_H_AND_USE_SOCKETS@ USE_NLS = @USE_NLS@ diff --git a/doc/C/Makefile.in b/doc/C/Makefile.in index 28d82ed..de37424 100644 --- a/doc/C/Makefile.in +++ b/doc/C/Makefile.in @@ -94,9 +94,9 @@ am__aclocal_m4_deps = $(top_srcdir)/m4/00gnulib.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/calloc.m4 $(top_srcdir)/m4/canonicalize.m4 \ - $(top_srcdir)/m4/close.m4 $(top_srcdir)/m4/codeset.m4 \ - $(top_srcdir)/m4/config-h.m4 $(top_srcdir)/m4/configmake.m4 \ - $(top_srcdir)/m4/ctype.m4 $(top_srcdir)/m4/dirname.m4 \ + $(top_srcdir)/m4/clock_time.m4 $(top_srcdir)/m4/close.m4 \ + $(top_srcdir)/m4/codeset.m4 $(top_srcdir)/m4/config-h.m4 \ + $(top_srcdir)/m4/configmake.m4 $(top_srcdir)/m4/ctype.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 \ @@ -108,15 +108,13 @@ am__aclocal_m4_deps = $(top_srcdir)/m4/00gnulib.m4 \ $(top_srcdir)/m4/fsync.m4 $(top_srcdir)/m4/ftruncate.m4 \ $(top_srcdir)/m4/getcwd.m4 $(top_srcdir)/m4/getdtablesize.m4 \ $(top_srcdir)/m4/getopt.m4 $(top_srcdir)/m4/getpagesize.m4 \ - $(top_srcdir)/m4/getprogname.m4 $(top_srcdir)/m4/gettext.m4 \ - $(top_srcdir)/m4/gettimeofday.m4 $(top_srcdir)/m4/glibc21.m4 \ - $(top_srcdir)/m4/gnulib-common.m4 \ - $(top_srcdir)/m4/gnulib-comp.m4 \ - $(top_srcdir)/m4/host-cpu-c-abi.m4 $(top_srcdir)/m4/iconv.m4 \ + $(top_srcdir)/m4/getprogname.m4 $(top_srcdir)/m4/getrandom.m4 \ + $(top_srcdir)/m4/gettext.m4 $(top_srcdir)/m4/gettimeofday.m4 \ + $(top_srcdir)/m4/glibc21.m4 $(top_srcdir)/m4/gnulib-common.m4 \ + $(top_srcdir)/m4/gnulib-comp.m4 $(top_srcdir)/m4/iconv.m4 \ $(top_srcdir)/m4/include_next.m4 $(top_srcdir)/m4/inet_pton.m4 \ $(top_srcdir)/m4/intl-thread-locale.m4 \ - $(top_srcdir)/m4/intlmacosx.m4 \ - $(top_srcdir)/m4/inttypes-pri.m4 $(top_srcdir)/m4/inttypes.m4 \ + $(top_srcdir)/m4/intlmacosx.m4 $(top_srcdir)/m4/inttypes.m4 \ $(top_srcdir)/m4/ioctl.m4 $(top_srcdir)/m4/isblank.m4 \ $(top_srcdir)/m4/langinfo_h.m4 $(top_srcdir)/m4/largefile.m4 \ $(top_srcdir)/m4/lcmessage.m4 $(top_srcdir)/m4/lib-ignore.m4 \ @@ -126,25 +124,26 @@ am__aclocal_m4_deps = $(top_srcdir)/m4/00gnulib.m4 \ $(top_srcdir)/m4/locale-fr.m4 $(top_srcdir)/m4/locale-ja.m4 \ $(top_srcdir)/m4/locale-tr.m4 $(top_srcdir)/m4/locale-zh.m4 \ $(top_srcdir)/m4/locale_h.m4 $(top_srcdir)/m4/localeconv.m4 \ - $(top_srcdir)/m4/localename.m4 \ - $(top_srcdir)/m4/localtime-buffer.m4 $(top_srcdir)/m4/lock.m4 \ - $(top_srcdir)/m4/longlong.m4 $(top_srcdir)/m4/lseek.m4 \ - $(top_srcdir)/m4/lstat.m4 $(top_srcdir)/m4/ltoptions.m4 \ - $(top_srcdir)/m4/ltsugar.m4 $(top_srcdir)/m4/ltversion.m4 \ - $(top_srcdir)/m4/lt~obsolete.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/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/localename.m4 $(top_srcdir)/m4/lock.m4 \ + $(top_srcdir)/m4/lseek.m4 $(top_srcdir)/m4/lstat.m4 \ + $(top_srcdir)/m4/ltoptions.m4 $(top_srcdir)/m4/ltsugar.m4 \ + $(top_srcdir)/m4/ltversion.m4 $(top_srcdir)/m4/lt~obsolete.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/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/nanosleep.m4 $(top_srcdir)/m4/netinet_in_h.m4 \ + $(top_srcdir)/m4/musl.m4 $(top_srcdir)/m4/nanosleep.m4 \ + $(top_srcdir)/m4/netinet_in_h.m4 \ $(top_srcdir)/m4/nl_langinfo.m4 $(top_srcdir)/m4/nls.m4 \ $(top_srcdir)/m4/nocrash.m4 $(top_srcdir)/m4/o-direct.m4 \ $(top_srcdir)/m4/off_t.m4 $(top_srcdir)/m4/open-cloexec.m4 \ - $(top_srcdir)/m4/open.m4 $(top_srcdir)/m4/pathmax.m4 \ - $(top_srcdir)/m4/perror.m4 $(top_srcdir)/m4/pipe.m4 \ + $(top_srcdir)/m4/open-slash.m4 $(top_srcdir)/m4/open.m4 \ + $(top_srcdir)/m4/pathmax.m4 $(top_srcdir)/m4/perror.m4 \ + $(top_srcdir)/m4/pid_t.m4 $(top_srcdir)/m4/pipe.m4 \ $(top_srcdir)/m4/po.m4 $(top_srcdir)/m4/priv-set.m4 \ $(top_srcdir)/m4/progtest.m4 \ $(top_srcdir)/m4/pthread-thread.m4 \ @@ -156,9 +155,10 @@ am__aclocal_m4_deps = $(top_srcdir)/m4/00gnulib.m4 \ $(top_srcdir)/m4/readlink.m4 $(top_srcdir)/m4/realloc.m4 \ $(top_srcdir)/m4/regex.m4 $(top_srcdir)/m4/rpmatch.m4 \ $(top_srcdir)/m4/safe-read.m4 $(top_srcdir)/m4/sched_h.m4 \ - $(top_srcdir)/m4/select.m4 $(top_srcdir)/m4/setenv.m4 \ - $(top_srcdir)/m4/setlocale.m4 $(top_srcdir)/m4/sigaction.m4 \ - $(top_srcdir)/m4/signal_h.m4 \ + $(top_srcdir)/m4/select.m4 $(top_srcdir)/m4/semaphore.m4 \ + $(top_srcdir)/m4/setenv.m4 $(top_srcdir)/m4/setlocale.m4 \ + $(top_srcdir)/m4/setlocale_null.m4 \ + $(top_srcdir)/m4/sigaction.m4 $(top_srcdir)/m4/signal_h.m4 \ $(top_srcdir)/m4/signalblocking.m4 $(top_srcdir)/m4/sleep.m4 \ $(top_srcdir)/m4/socketlib.m4 $(top_srcdir)/m4/sockets.m4 \ $(top_srcdir)/m4/socklen.m4 $(top_srcdir)/m4/sockpfaf.m4 \ @@ -173,6 +173,7 @@ am__aclocal_m4_deps = $(top_srcdir)/m4/00gnulib.m4 \ $(top_srcdir)/m4/strnlen.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 \ @@ -181,14 +182,15 @@ am__aclocal_m4_deps = $(top_srcdir)/m4/00gnulib.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/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/xstrndup.m4 $(top_srcdir)/m4/xstrtol.m4 \ - $(top_srcdir)/m4/yield.m4 $(top_srcdir)/configure.ac + $(top_srcdir)/m4/yield.m4 $(top_srcdir)/m4/zzgnulib.m4 \ + $(top_srcdir)/configure.ac am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \ $(ACLOCAL_M4) DIST_COMMON = $(srcdir)/Makefile.am $(am__DIST_COMMON) @@ -271,6 +273,7 @@ BUILDINFO = @BUILDINFO@ CC = @CC@ CCDEPMODE = @CCDEPMODE@ CFLAGS = @CFLAGS@ +CFLAG_VISIBILITY = @CFLAG_VISIBILITY@ CHECK_CFLAGS = @CHECK_CFLAGS@ CHECK_LIBS = @CHECK_LIBS@ CONFIG_INCLUDE = @CONFIG_INCLUDE@ @@ -305,6 +308,8 @@ GMSGFMT = @GMSGFMT@ GMSGFMT_015 = @GMSGFMT_015@ GNULIB_ACCEPT = @GNULIB_ACCEPT@ GNULIB_ACCEPT4 = @GNULIB_ACCEPT4@ +GNULIB_ACCESS = @GNULIB_ACCESS@ +GNULIB_ALIGNED_ALLOC = @GNULIB_ALIGNED_ALLOC@ GNULIB_ATOLL = @GNULIB_ATOLL@ GNULIB_BIND = @GNULIB_BIND@ GNULIB_BTOWC = @GNULIB_BTOWC@ @@ -315,6 +320,7 @@ GNULIB_CHOWN = @GNULIB_CHOWN@ GNULIB_CLOSE = @GNULIB_CLOSE@ GNULIB_CONNECT = @GNULIB_CONNECT@ GNULIB_COPY_FILE_RANGE = @GNULIB_COPY_FILE_RANGE@ +GNULIB_CREAT = @GNULIB_CREAT@ GNULIB_CTIME = @GNULIB_CTIME@ GNULIB_DPRINTF = @GNULIB_DPRINTF@ GNULIB_DUP = @GNULIB_DUP@ @@ -362,19 +368,23 @@ GNULIB_GETCWD = @GNULIB_GETCWD@ GNULIB_GETDELIM = @GNULIB_GETDELIM@ GNULIB_GETDOMAINNAME = @GNULIB_GETDOMAINNAME@ GNULIB_GETDTABLESIZE = @GNULIB_GETDTABLESIZE@ +GNULIB_GETENTROPY = @GNULIB_GETENTROPY@ GNULIB_GETGROUPS = @GNULIB_GETGROUPS@ GNULIB_GETHOSTNAME = @GNULIB_GETHOSTNAME@ GNULIB_GETLINE = @GNULIB_GETLINE@ GNULIB_GETLOADAVG = @GNULIB_GETLOADAVG@ GNULIB_GETLOGIN = @GNULIB_GETLOGIN@ GNULIB_GETLOGIN_R = @GNULIB_GETLOGIN_R@ +GNULIB_GETOPT_POSIX = @GNULIB_GETOPT_POSIX@ GNULIB_GETPAGESIZE = @GNULIB_GETPAGESIZE@ GNULIB_GETPASS = @GNULIB_GETPASS@ GNULIB_GETPEERNAME = @GNULIB_GETPEERNAME@ +GNULIB_GETRANDOM = @GNULIB_GETRANDOM@ GNULIB_GETSOCKNAME = @GNULIB_GETSOCKNAME@ GNULIB_GETSOCKOPT = @GNULIB_GETSOCKOPT@ GNULIB_GETSUBOPT = @GNULIB_GETSUBOPT@ GNULIB_GETTIMEOFDAY = @GNULIB_GETTIMEOFDAY@ +GNULIB_GETUMASK = @GNULIB_GETUMASK@ GNULIB_GETUSERSHELL = @GNULIB_GETUSERSHELL@ GNULIB_GL_UNISTD_H_GETOPT = @GNULIB_GL_UNISTD_H_GETOPT@ GNULIB_GRANTPT = @GNULIB_GRANTPT@ @@ -388,6 +398,8 @@ GNULIB_ISATTY = @GNULIB_ISATTY@ GNULIB_ISBLANK = @GNULIB_ISBLANK@ GNULIB_ISWBLANK = @GNULIB_ISWBLANK@ GNULIB_ISWCTYPE = @GNULIB_ISWCTYPE@ +GNULIB_ISWDIGIT = @GNULIB_ISWDIGIT@ +GNULIB_ISWXDIGIT = @GNULIB_ISWXDIGIT@ GNULIB_LCHMOD = @GNULIB_LCHMOD@ GNULIB_LCHOWN = @GNULIB_LCHOWN@ GNULIB_LINK = @GNULIB_LINK@ @@ -448,6 +460,7 @@ GNULIB_PERROR = @GNULIB_PERROR@ GNULIB_PIPE = @GNULIB_PIPE@ GNULIB_PIPE2 = @GNULIB_PIPE2@ GNULIB_POPEN = @GNULIB_POPEN@ +GNULIB_POSIX_MEMALIGN = @GNULIB_POSIX_MEMALIGN@ GNULIB_POSIX_OPENPT = @GNULIB_POSIX_OPENPT@ GNULIB_PREAD = @GNULIB_PREAD@ GNULIB_PRINTF = @GNULIB_PRINTF@ @@ -496,9 +509,12 @@ GNULIB_SENDTO = @GNULIB_SENDTO@ GNULIB_SETENV = @GNULIB_SETENV@ GNULIB_SETHOSTNAME = @GNULIB_SETHOSTNAME@ GNULIB_SETLOCALE = @GNULIB_SETLOCALE@ +GNULIB_SETLOCALE_NULL = @GNULIB_SETLOCALE_NULL@ GNULIB_SETSOCKOPT = @GNULIB_SETSOCKOPT@ GNULIB_SHUTDOWN = @GNULIB_SHUTDOWN@ +GNULIB_SIGABBREV_NP = @GNULIB_SIGABBREV_NP@ GNULIB_SIGACTION = @GNULIB_SIGACTION@ +GNULIB_SIGDESCR_NP = @GNULIB_SIGDESCR_NP@ GNULIB_SIGNAL_H_SIGPIPE = @GNULIB_SIGNAL_H_SIGPIPE@ GNULIB_SIGPROCMASK = @GNULIB_SIGPROCMASK@ GNULIB_SLEEP = @GNULIB_SLEEP@ @@ -514,6 +530,7 @@ GNULIB_STRCASESTR = @GNULIB_STRCASESTR@ GNULIB_STRCHRNUL = @GNULIB_STRCHRNUL@ GNULIB_STRDUP = @GNULIB_STRDUP@ GNULIB_STRERROR = @GNULIB_STRERROR@ +GNULIB_STRERRORNAME_NP = @GNULIB_STRERRORNAME_NP@ GNULIB_STRERROR_R = @GNULIB_STRERROR_R@ GNULIB_STRFTIME = @GNULIB_STRFTIME@ GNULIB_STRNCAT = @GNULIB_STRNCAT@ @@ -597,11 +614,13 @@ GNULIB_WMEMCHR = @GNULIB_WMEMCHR@ GNULIB_WMEMCMP = @GNULIB_WMEMCMP@ GNULIB_WMEMCPY = @GNULIB_WMEMCPY@ GNULIB_WMEMMOVE = @GNULIB_WMEMMOVE@ +GNULIB_WMEMPCPY = @GNULIB_WMEMPCPY@ GNULIB_WMEMSET = @GNULIB_WMEMSET@ GNULIB_WRITE = @GNULIB_WRITE@ GNULIB__EXIT = @GNULIB__EXIT@ GREP = @GREP@ HAVE_ACCEPT4 = @HAVE_ACCEPT4@ +HAVE_ALIGNED_ALLOC = @HAVE_ALIGNED_ALLOC@ HAVE_ALLOCA_H = @HAVE_ALLOCA_H@ HAVE_ARPA_INET_H = @HAVE_ARPA_INET_H@ HAVE_ATOLL = @HAVE_ATOLL@ @@ -611,12 +630,17 @@ HAVE_CANONICALIZE_FILE_NAME = @HAVE_CANONICALIZE_FILE_NAME@ HAVE_CHOWN = @HAVE_CHOWN@ HAVE_COPY_FILE_RANGE = @HAVE_COPY_FILE_RANGE@ HAVE_CRTDEFS_H = @HAVE_CRTDEFS_H@ +HAVE_DECL_ECVT = @HAVE_DECL_ECVT@ HAVE_DECL_ENVIRON = @HAVE_DECL_ENVIRON@ +HAVE_DECL_EXECVPE = @HAVE_DECL_EXECVPE@ HAVE_DECL_FCHDIR = @HAVE_DECL_FCHDIR@ +HAVE_DECL_FCLOSEALL = @HAVE_DECL_FCLOSEALL@ +HAVE_DECL_FCVT = @HAVE_DECL_FCVT@ HAVE_DECL_FDATASYNC = @HAVE_DECL_FDATASYNC@ HAVE_DECL_FPURGE = @HAVE_DECL_FPURGE@ HAVE_DECL_FSEEKO = @HAVE_DECL_FSEEKO@ HAVE_DECL_FTELLO = @HAVE_DECL_FTELLO@ +HAVE_DECL_GCVT = @HAVE_DECL_GCVT@ HAVE_DECL_GETDELIM = @HAVE_DECL_GETDELIM@ HAVE_DECL_GETDOMAINNAME = @HAVE_DECL_GETDOMAINNAME@ HAVE_DECL_GETLINE = @HAVE_DECL_GETLINE@ @@ -650,10 +674,10 @@ HAVE_DECL_TRUNCATE = @HAVE_DECL_TRUNCATE@ HAVE_DECL_TTYNAME_R = @HAVE_DECL_TTYNAME_R@ HAVE_DECL_UNSETENV = @HAVE_DECL_UNSETENV@ HAVE_DECL_VSNPRINTF = @HAVE_DECL_VSNPRINTF@ +HAVE_DECL_WCSDUP = @HAVE_DECL_WCSDUP@ HAVE_DECL_WCTOB = @HAVE_DECL_WCTOB@ HAVE_DECL_WCWIDTH = @HAVE_DECL_WCWIDTH@ HAVE_DPRINTF = @HAVE_DPRINTF@ -HAVE_DUP2 = @HAVE_DUP2@ HAVE_DUP3 = @HAVE_DUP3@ HAVE_DUPLOCALE = @HAVE_DUPLOCALE@ HAVE_EUIDACCESS = @HAVE_EUIDACCESS@ @@ -675,14 +699,17 @@ HAVE_FTELLO = @HAVE_FTELLO@ HAVE_FTRUNCATE = @HAVE_FTRUNCATE@ HAVE_FUTIMENS = @HAVE_FUTIMENS@ HAVE_GETDTABLESIZE = @HAVE_GETDTABLESIZE@ +HAVE_GETENTROPY = @HAVE_GETENTROPY@ HAVE_GETGROUPS = @HAVE_GETGROUPS@ HAVE_GETHOSTNAME = @HAVE_GETHOSTNAME@ HAVE_GETLOGIN = @HAVE_GETLOGIN@ HAVE_GETOPT_H = @HAVE_GETOPT_H@ HAVE_GETPAGESIZE = @HAVE_GETPAGESIZE@ HAVE_GETPASS = @HAVE_GETPASS@ +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_IMAXDIV_T = @HAVE_IMAXDIV_T@ @@ -701,7 +728,6 @@ HAVE_LCHMOD = @HAVE_LCHMOD@ HAVE_LCHOWN = @HAVE_LCHOWN@ HAVE_LINK = @HAVE_LINK@ HAVE_LINKAT = @HAVE_LINKAT@ -HAVE_LONG_LONG_INT = @HAVE_LONG_LONG_INT@ HAVE_LSTAT = @HAVE_LSTAT@ HAVE_MAX_ALIGN_T = @HAVE_MAX_ALIGN_T@ HAVE_MBRLEN = @HAVE_MBRLEN@ @@ -711,7 +737,6 @@ HAVE_MBSLEN = @HAVE_MBSLEN@ HAVE_MBSNRTOWCS = @HAVE_MBSNRTOWCS@ HAVE_MBSRTOWCS = @HAVE_MBSRTOWCS@ HAVE_MBTOWC = @HAVE_MBTOWC@ -HAVE_MEMCHR = @HAVE_MEMCHR@ HAVE_MEMPCPY = @HAVE_MEMPCPY@ HAVE_MKDIRAT = @HAVE_MKDIRAT@ HAVE_MKDTEMP = @HAVE_MKDTEMP@ @@ -734,6 +759,7 @@ HAVE_PCLOSE = @HAVE_PCLOSE@ HAVE_PIPE = @HAVE_PIPE@ HAVE_PIPE2 = @HAVE_PIPE2@ HAVE_POPEN = @HAVE_POPEN@ +HAVE_POSIX_MEMALIGN = @HAVE_POSIX_MEMALIGN@ HAVE_POSIX_OPENPT = @HAVE_POSIX_OPENPT@ HAVE_POSIX_SIGNALBLOCKING = @HAVE_POSIX_SIGNALBLOCKING@ HAVE_PREAD = @HAVE_PREAD@ @@ -819,7 +845,9 @@ HAVE_SECURE_GETENV = @HAVE_SECURE_GETENV@ HAVE_SETENV = @HAVE_SETENV@ HAVE_SETHOSTNAME = @HAVE_SETHOSTNAME@ HAVE_SETSTATE = @HAVE_SETSTATE@ +HAVE_SIGABBREV_NP = @HAVE_SIGABBREV_NP@ HAVE_SIGACTION = @HAVE_SIGACTION@ +HAVE_SIGDESCR_NP = @HAVE_SIGDESCR_NP@ HAVE_SIGHANDLER_T = @HAVE_SIGHANDLER_T@ HAVE_SIGINFO_T = @HAVE_SIGINFO_T@ HAVE_SIGNED_SIG_ATOMIC_T = @HAVE_SIGNED_SIG_ATOMIC_T@ @@ -832,6 +860,7 @@ HAVE_STPCPY = @HAVE_STPCPY@ HAVE_STPNCPY = @HAVE_STPNCPY@ HAVE_STRCASESTR = @HAVE_STRCASESTR@ HAVE_STRCHRNUL = @HAVE_STRCHRNUL@ +HAVE_STRERRORNAME_NP = @HAVE_STRERRORNAME_NP@ HAVE_STRPBRK = @HAVE_STRPBRK@ HAVE_STRPTIME = @HAVE_STRPTIME@ HAVE_STRSEP = @HAVE_STRSEP@ @@ -854,6 +883,7 @@ HAVE_SYS_INTTYPES_H = @HAVE_SYS_INTTYPES_H@ HAVE_SYS_IOCTL_H = @HAVE_SYS_IOCTL_H@ HAVE_SYS_LOADAVG_H = @HAVE_SYS_LOADAVG_H@ HAVE_SYS_PARAM_H = @HAVE_SYS_PARAM_H@ +HAVE_SYS_RANDOM_H = @HAVE_SYS_RANDOM_H@ HAVE_SYS_SELECT_H = @HAVE_SYS_SELECT_H@ HAVE_SYS_SOCKET_H = @HAVE_SYS_SOCKET_H@ HAVE_SYS_TIME_H = @HAVE_SYS_TIME_H@ @@ -862,15 +892,14 @@ HAVE_SYS_UIO_H = @HAVE_SYS_UIO_H@ HAVE_TIMEGM = @HAVE_TIMEGM@ HAVE_TIMEZONE_T = @HAVE_TIMEZONE_T@ HAVE_TYPE_VOLATILE_SIG_ATOMIC_T = @HAVE_TYPE_VOLATILE_SIG_ATOMIC_T@ -HAVE_TZSET = @HAVE_TZSET@ HAVE_UNISTD_H = @HAVE_UNISTD_H@ HAVE_UNLINKAT = @HAVE_UNLINKAT@ HAVE_UNLOCKPT = @HAVE_UNLOCKPT@ -HAVE_UNSIGNED_LONG_LONG_INT = @HAVE_UNSIGNED_LONG_LONG_INT@ HAVE_USLEEP = @HAVE_USLEEP@ HAVE_UTIMENSAT = @HAVE_UTIMENSAT@ HAVE_VASPRINTF = @HAVE_VASPRINTF@ HAVE_VDPRINTF = @HAVE_VDPRINTF@ +HAVE_VISIBILITY = @HAVE_VISIBILITY@ HAVE_WCHAR_H = @HAVE_WCHAR_H@ HAVE_WCHAR_T = @HAVE_WCHAR_T@ HAVE_WCPCPY = @HAVE_WCPCPY@ @@ -909,6 +938,7 @@ HAVE_WMEMCHR = @HAVE_WMEMCHR@ HAVE_WMEMCMP = @HAVE_WMEMCMP@ HAVE_WMEMCPY = @HAVE_WMEMCPY@ HAVE_WMEMMOVE = @HAVE_WMEMMOVE@ +HAVE_WMEMPCPY = @HAVE_WMEMPCPY@ HAVE_WMEMSET = @HAVE_WMEMSET@ HAVE_WS2TCPIP_H = @HAVE_WS2TCPIP_H@ HAVE_XLOCALE_H = @HAVE_XLOCALE_H@ @@ -934,16 +964,28 @@ LIBICONV = @LIBICONV@ LIBINTL = @LIBINTL@ LIBMULTITHREAD = @LIBMULTITHREAD@ LIBOBJS = @LIBOBJS@ +LIBPMULTITHREAD = @LIBPMULTITHREAD@ +LIBPTHREAD = @LIBPTHREAD@ LIBS = @LIBS@ LIBSOCKET = @LIBSOCKET@ +LIBSTDTHREAD = @LIBSTDTHREAD@ LIBTESTS_LIBDEPS = @LIBTESTS_LIBDEPS@ LIBTHREAD = @LIBTHREAD@ LIBTOOL = @LIBTOOL@ LIB_BLKID = @LIB_BLKID@ +LIB_CLOCK_GETTIME = @LIB_CLOCK_GETTIME@ +LIB_GETRANDOM = @LIB_GETRANDOM@ +LIB_HARD_LOCALE = @LIB_HARD_LOCALE@ +LIB_MBRTOWC = @LIB_MBRTOWC@ LIB_NANOSLEEP = @LIB_NANOSLEEP@ +LIB_NL_LANGINFO = @LIB_NL_LANGINFO@ LIB_PTHREAD = @LIB_PTHREAD@ LIB_PTHREAD_SIGMASK = @LIB_PTHREAD_SIGMASK@ +LIB_SCHED_YIELD = @LIB_SCHED_YIELD@ LIB_SELECT = @LIB_SELECT@ +LIB_SEMAPHORE = @LIB_SEMAPHORE@ +LIB_SETLOCALE = @LIB_SETLOCALE@ +LIB_SETLOCALE_NULL = @LIB_SETLOCALE_NULL@ LIMITS_H = @LIMITS_H@ LIPO = @LIPO@ LN_S = @LN_S@ @@ -992,6 +1034,7 @@ NEXT_AS_FIRST_DIRECTIVE_STDIO_H = @NEXT_AS_FIRST_DIRECTIVE_STDIO_H@ NEXT_AS_FIRST_DIRECTIVE_STDLIB_H = @NEXT_AS_FIRST_DIRECTIVE_STDLIB_H@ NEXT_AS_FIRST_DIRECTIVE_STRING_H = @NEXT_AS_FIRST_DIRECTIVE_STRING_H@ NEXT_AS_FIRST_DIRECTIVE_SYS_IOCTL_H = @NEXT_AS_FIRST_DIRECTIVE_SYS_IOCTL_H@ +NEXT_AS_FIRST_DIRECTIVE_SYS_RANDOM_H = @NEXT_AS_FIRST_DIRECTIVE_SYS_RANDOM_H@ NEXT_AS_FIRST_DIRECTIVE_SYS_SELECT_H = @NEXT_AS_FIRST_DIRECTIVE_SYS_SELECT_H@ NEXT_AS_FIRST_DIRECTIVE_SYS_SOCKET_H = @NEXT_AS_FIRST_DIRECTIVE_SYS_SOCKET_H@ NEXT_AS_FIRST_DIRECTIVE_SYS_STAT_H = @NEXT_AS_FIRST_DIRECTIVE_SYS_STAT_H@ @@ -1021,6 +1064,7 @@ NEXT_STDIO_H = @NEXT_STDIO_H@ NEXT_STDLIB_H = @NEXT_STDLIB_H@ NEXT_STRING_H = @NEXT_STRING_H@ NEXT_SYS_IOCTL_H = @NEXT_SYS_IOCTL_H@ +NEXT_SYS_RANDOM_H = @NEXT_SYS_RANDOM_H@ NEXT_SYS_SELECT_H = @NEXT_SYS_SELECT_H@ NEXT_SYS_SOCKET_H = @NEXT_SYS_SOCKET_H@ NEXT_SYS_STAT_H = @NEXT_SYS_STAT_H@ @@ -1057,21 +1101,24 @@ POSUB = @POSUB@ PRAGMA_COLUMNS = @PRAGMA_COLUMNS@ PRAGMA_SYSTEM_HEADER = @PRAGMA_SYSTEM_HEADER@ PRIPTR_PREFIX = @PRIPTR_PREFIX@ -PRI_MACROS_BROKEN = @PRI_MACROS_BROKEN@ PTHREAD_H_DEFINES_STRUCT_TIMESPEC = @PTHREAD_H_DEFINES_STRUCT_TIMESPEC@ PTRDIFF_T_SUFFIX = @PTRDIFF_T_SUFFIX@ RANLIB = @RANLIB@ +REPLACE_ACCESS = @REPLACE_ACCESS@ +REPLACE_ALIGNED_ALLOC = @REPLACE_ALIGNED_ALLOC@ REPLACE_BTOWC = @REPLACE_BTOWC@ REPLACE_CALLOC = @REPLACE_CALLOC@ REPLACE_CANONICALIZE_FILE_NAME = @REPLACE_CANONICALIZE_FILE_NAME@ REPLACE_CHOWN = @REPLACE_CHOWN@ REPLACE_CLOSE = @REPLACE_CLOSE@ +REPLACE_CREAT = @REPLACE_CREAT@ REPLACE_CTIME = @REPLACE_CTIME@ REPLACE_DPRINTF = @REPLACE_DPRINTF@ REPLACE_DUP = @REPLACE_DUP@ REPLACE_DUP2 = @REPLACE_DUP2@ REPLACE_DUPLOCALE = @REPLACE_DUPLOCALE@ REPLACE_FACCESSAT = @REPLACE_FACCESSAT@ +REPLACE_FCHMODAT = @REPLACE_FCHMODAT@ REPLACE_FCHOWNAT = @REPLACE_FCHOWNAT@ REPLACE_FCLOSE = @REPLACE_FCLOSE@ REPLACE_FCNTL = @REPLACE_FCNTL@ @@ -1099,6 +1146,7 @@ REPLACE_GETLINE = @REPLACE_GETLINE@ REPLACE_GETLOGIN_R = @REPLACE_GETLOGIN_R@ REPLACE_GETPAGESIZE = @REPLACE_GETPAGESIZE@ REPLACE_GETPASS = @REPLACE_GETPASS@ +REPLACE_GETRANDOM = @REPLACE_GETRANDOM@ REPLACE_GETTIMEOFDAY = @REPLACE_GETTIMEOFDAY@ REPLACE_GMTIME = @REPLACE_GMTIME@ REPLACE_INET_NTOP = @REPLACE_INET_NTOP@ @@ -1108,6 +1156,8 @@ REPLACE_IOCTL = @REPLACE_IOCTL@ REPLACE_ISATTY = @REPLACE_ISATTY@ REPLACE_ISWBLANK = @REPLACE_ISWBLANK@ REPLACE_ISWCNTRL = @REPLACE_ISWCNTRL@ +REPLACE_ISWDIGIT = @REPLACE_ISWDIGIT@ +REPLACE_ISWXDIGIT = @REPLACE_ISWXDIGIT@ REPLACE_LCHOWN = @REPLACE_LCHOWN@ REPLACE_LINK = @REPLACE_LINK@ REPLACE_LINKAT = @REPLACE_LINKAT@ @@ -1140,6 +1190,7 @@ REPLACE_OPEN = @REPLACE_OPEN@ REPLACE_OPENAT = @REPLACE_OPENAT@ REPLACE_PERROR = @REPLACE_PERROR@ REPLACE_POPEN = @REPLACE_POPEN@ +REPLACE_POSIX_MEMALIGN = @REPLACE_POSIX_MEMALIGN@ REPLACE_PREAD = @REPLACE_PREAD@ REPLACE_PRINTF = @REPLACE_PRINTF@ REPLACE_PSELECT = @REPLACE_PSELECT@ @@ -1228,6 +1279,7 @@ REPLACE_STRCASESTR = @REPLACE_STRCASESTR@ REPLACE_STRCHRNUL = @REPLACE_STRCHRNUL@ REPLACE_STRDUP = @REPLACE_STRDUP@ REPLACE_STRERROR = @REPLACE_STRERROR@ +REPLACE_STRERRORNAME_NP = @REPLACE_STRERRORNAME_NP@ REPLACE_STRERROR_R = @REPLACE_STRERROR_R@ REPLACE_STRFTIME = @REPLACE_STRFTIME@ REPLACE_STRNCAT = @REPLACE_STRNCAT@ @@ -1265,13 +1317,13 @@ REPLACE_WCRTOMB = @REPLACE_WCRTOMB@ REPLACE_WCSFTIME = @REPLACE_WCSFTIME@ REPLACE_WCSNRTOMBS = @REPLACE_WCSNRTOMBS@ REPLACE_WCSRTOMBS = @REPLACE_WCSRTOMBS@ +REPLACE_WCSTOK = @REPLACE_WCSTOK@ REPLACE_WCSWIDTH = @REPLACE_WCSWIDTH@ REPLACE_WCTOB = @REPLACE_WCTOB@ REPLACE_WCTOMB = @REPLACE_WCTOMB@ REPLACE_WCWIDTH = @REPLACE_WCWIDTH@ REPLACE_WRITE = @REPLACE_WRITE@ SED = @SED@ -SELINUX_LIBS = @SELINUX_LIBS@ SET_MAKE = @SET_MAKE@ SHELL = @SHELL@ SIG_ATOMIC_T_SUFFIX = @SIG_ATOMIC_T_SUFFIX@ @@ -1290,6 +1342,7 @@ UINT32_MAX_LT_UINTMAX_MAX = @UINT32_MAX_LT_UINTMAX_MAX@ UINT64_MAX_EQ_ULONG_MAX = @UINT64_MAX_EQ_ULONG_MAX@ UNDEFINE_STRTOK_R = @UNDEFINE_STRTOK_R@ UNISTD_H_DEFINES_STRUCT_TIMESPEC = @UNISTD_H_DEFINES_STRUCT_TIMESPEC@ +UNISTD_H_HAVE_SYS_RANDOM_H = @UNISTD_H_HAVE_SYS_RANDOM_H@ UNISTD_H_HAVE_WINSOCK2_H = @UNISTD_H_HAVE_WINSOCK2_H@ UNISTD_H_HAVE_WINSOCK2_H_AND_USE_SOCKETS = @UNISTD_H_HAVE_WINSOCK2_H_AND_USE_SOCKETS@ USE_NLS = @USE_NLS@ diff --git a/doc/C/parted.8 b/doc/C/parted.8 index 15932c2..297c39a 100644 --- a/doc/C/parted.8 +++ b/doc/C/parted.8 @@ -112,7 +112,7 @@ or an LVM logical volume if necessary. .B set \fIpartition\fP \fIflag\fP \fIstate\fP 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" and "palo". +"legacy_boot", "irst", "msftres", "esp", "chromeos_kernel", "bls_boot" and "palo". \fIstate\fP should be either "on" or "off". .TP .B unit \fIunit\fP diff --git a/doc/Makefile.in b/doc/Makefile.in index 9ae38b9..1f05725 100644 --- a/doc/Makefile.in +++ b/doc/Makefile.in @@ -94,9 +94,9 @@ am__aclocal_m4_deps = $(top_srcdir)/m4/00gnulib.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/calloc.m4 $(top_srcdir)/m4/canonicalize.m4 \ - $(top_srcdir)/m4/close.m4 $(top_srcdir)/m4/codeset.m4 \ - $(top_srcdir)/m4/config-h.m4 $(top_srcdir)/m4/configmake.m4 \ - $(top_srcdir)/m4/ctype.m4 $(top_srcdir)/m4/dirname.m4 \ + $(top_srcdir)/m4/clock_time.m4 $(top_srcdir)/m4/close.m4 \ + $(top_srcdir)/m4/codeset.m4 $(top_srcdir)/m4/config-h.m4 \ + $(top_srcdir)/m4/configmake.m4 $(top_srcdir)/m4/ctype.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 \ @@ -108,15 +108,13 @@ am__aclocal_m4_deps = $(top_srcdir)/m4/00gnulib.m4 \ $(top_srcdir)/m4/fsync.m4 $(top_srcdir)/m4/ftruncate.m4 \ $(top_srcdir)/m4/getcwd.m4 $(top_srcdir)/m4/getdtablesize.m4 \ $(top_srcdir)/m4/getopt.m4 $(top_srcdir)/m4/getpagesize.m4 \ - $(top_srcdir)/m4/getprogname.m4 $(top_srcdir)/m4/gettext.m4 \ - $(top_srcdir)/m4/gettimeofday.m4 $(top_srcdir)/m4/glibc21.m4 \ - $(top_srcdir)/m4/gnulib-common.m4 \ - $(top_srcdir)/m4/gnulib-comp.m4 \ - $(top_srcdir)/m4/host-cpu-c-abi.m4 $(top_srcdir)/m4/iconv.m4 \ + $(top_srcdir)/m4/getprogname.m4 $(top_srcdir)/m4/getrandom.m4 \ + $(top_srcdir)/m4/gettext.m4 $(top_srcdir)/m4/gettimeofday.m4 \ + $(top_srcdir)/m4/glibc21.m4 $(top_srcdir)/m4/gnulib-common.m4 \ + $(top_srcdir)/m4/gnulib-comp.m4 $(top_srcdir)/m4/iconv.m4 \ $(top_srcdir)/m4/include_next.m4 $(top_srcdir)/m4/inet_pton.m4 \ $(top_srcdir)/m4/intl-thread-locale.m4 \ - $(top_srcdir)/m4/intlmacosx.m4 \ - $(top_srcdir)/m4/inttypes-pri.m4 $(top_srcdir)/m4/inttypes.m4 \ + $(top_srcdir)/m4/intlmacosx.m4 $(top_srcdir)/m4/inttypes.m4 \ $(top_srcdir)/m4/ioctl.m4 $(top_srcdir)/m4/isblank.m4 \ $(top_srcdir)/m4/langinfo_h.m4 $(top_srcdir)/m4/largefile.m4 \ $(top_srcdir)/m4/lcmessage.m4 $(top_srcdir)/m4/lib-ignore.m4 \ @@ -126,25 +124,26 @@ am__aclocal_m4_deps = $(top_srcdir)/m4/00gnulib.m4 \ $(top_srcdir)/m4/locale-fr.m4 $(top_srcdir)/m4/locale-ja.m4 \ $(top_srcdir)/m4/locale-tr.m4 $(top_srcdir)/m4/locale-zh.m4 \ $(top_srcdir)/m4/locale_h.m4 $(top_srcdir)/m4/localeconv.m4 \ - $(top_srcdir)/m4/localename.m4 \ - $(top_srcdir)/m4/localtime-buffer.m4 $(top_srcdir)/m4/lock.m4 \ - $(top_srcdir)/m4/longlong.m4 $(top_srcdir)/m4/lseek.m4 \ - $(top_srcdir)/m4/lstat.m4 $(top_srcdir)/m4/ltoptions.m4 \ - $(top_srcdir)/m4/ltsugar.m4 $(top_srcdir)/m4/ltversion.m4 \ - $(top_srcdir)/m4/lt~obsolete.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/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/localename.m4 $(top_srcdir)/m4/lock.m4 \ + $(top_srcdir)/m4/lseek.m4 $(top_srcdir)/m4/lstat.m4 \ + $(top_srcdir)/m4/ltoptions.m4 $(top_srcdir)/m4/ltsugar.m4 \ + $(top_srcdir)/m4/ltversion.m4 $(top_srcdir)/m4/lt~obsolete.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/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/nanosleep.m4 $(top_srcdir)/m4/netinet_in_h.m4 \ + $(top_srcdir)/m4/musl.m4 $(top_srcdir)/m4/nanosleep.m4 \ + $(top_srcdir)/m4/netinet_in_h.m4 \ $(top_srcdir)/m4/nl_langinfo.m4 $(top_srcdir)/m4/nls.m4 \ $(top_srcdir)/m4/nocrash.m4 $(top_srcdir)/m4/o-direct.m4 \ $(top_srcdir)/m4/off_t.m4 $(top_srcdir)/m4/open-cloexec.m4 \ - $(top_srcdir)/m4/open.m4 $(top_srcdir)/m4/pathmax.m4 \ - $(top_srcdir)/m4/perror.m4 $(top_srcdir)/m4/pipe.m4 \ + $(top_srcdir)/m4/open-slash.m4 $(top_srcdir)/m4/open.m4 \ + $(top_srcdir)/m4/pathmax.m4 $(top_srcdir)/m4/perror.m4 \ + $(top_srcdir)/m4/pid_t.m4 $(top_srcdir)/m4/pipe.m4 \ $(top_srcdir)/m4/po.m4 $(top_srcdir)/m4/priv-set.m4 \ $(top_srcdir)/m4/progtest.m4 \ $(top_srcdir)/m4/pthread-thread.m4 \ @@ -156,9 +155,10 @@ am__aclocal_m4_deps = $(top_srcdir)/m4/00gnulib.m4 \ $(top_srcdir)/m4/readlink.m4 $(top_srcdir)/m4/realloc.m4 \ $(top_srcdir)/m4/regex.m4 $(top_srcdir)/m4/rpmatch.m4 \ $(top_srcdir)/m4/safe-read.m4 $(top_srcdir)/m4/sched_h.m4 \ - $(top_srcdir)/m4/select.m4 $(top_srcdir)/m4/setenv.m4 \ - $(top_srcdir)/m4/setlocale.m4 $(top_srcdir)/m4/sigaction.m4 \ - $(top_srcdir)/m4/signal_h.m4 \ + $(top_srcdir)/m4/select.m4 $(top_srcdir)/m4/semaphore.m4 \ + $(top_srcdir)/m4/setenv.m4 $(top_srcdir)/m4/setlocale.m4 \ + $(top_srcdir)/m4/setlocale_null.m4 \ + $(top_srcdir)/m4/sigaction.m4 $(top_srcdir)/m4/signal_h.m4 \ $(top_srcdir)/m4/signalblocking.m4 $(top_srcdir)/m4/sleep.m4 \ $(top_srcdir)/m4/socketlib.m4 $(top_srcdir)/m4/sockets.m4 \ $(top_srcdir)/m4/socklen.m4 $(top_srcdir)/m4/sockpfaf.m4 \ @@ -173,6 +173,7 @@ am__aclocal_m4_deps = $(top_srcdir)/m4/00gnulib.m4 \ $(top_srcdir)/m4/strnlen.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 \ @@ -181,14 +182,15 @@ am__aclocal_m4_deps = $(top_srcdir)/m4/00gnulib.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/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/xstrndup.m4 $(top_srcdir)/m4/xstrtol.m4 \ - $(top_srcdir)/m4/yield.m4 $(top_srcdir)/configure.ac + $(top_srcdir)/m4/yield.m4 $(top_srcdir)/m4/zzgnulib.m4 \ + $(top_srcdir)/configure.ac am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \ $(ACLOCAL_M4) DIST_COMMON = $(srcdir)/Makefile.am $(srcdir)/version.texi \ @@ -372,6 +374,7 @@ BUILDINFO = @BUILDINFO@ CC = @CC@ CCDEPMODE = @CCDEPMODE@ CFLAGS = @CFLAGS@ +CFLAG_VISIBILITY = @CFLAG_VISIBILITY@ CHECK_CFLAGS = @CHECK_CFLAGS@ CHECK_LIBS = @CHECK_LIBS@ CONFIG_INCLUDE = @CONFIG_INCLUDE@ @@ -406,6 +409,8 @@ GMSGFMT = @GMSGFMT@ GMSGFMT_015 = @GMSGFMT_015@ GNULIB_ACCEPT = @GNULIB_ACCEPT@ GNULIB_ACCEPT4 = @GNULIB_ACCEPT4@ +GNULIB_ACCESS = @GNULIB_ACCESS@ +GNULIB_ALIGNED_ALLOC = @GNULIB_ALIGNED_ALLOC@ GNULIB_ATOLL = @GNULIB_ATOLL@ GNULIB_BIND = @GNULIB_BIND@ GNULIB_BTOWC = @GNULIB_BTOWC@ @@ -416,6 +421,7 @@ GNULIB_CHOWN = @GNULIB_CHOWN@ GNULIB_CLOSE = @GNULIB_CLOSE@ GNULIB_CONNECT = @GNULIB_CONNECT@ GNULIB_COPY_FILE_RANGE = @GNULIB_COPY_FILE_RANGE@ +GNULIB_CREAT = @GNULIB_CREAT@ GNULIB_CTIME = @GNULIB_CTIME@ GNULIB_DPRINTF = @GNULIB_DPRINTF@ GNULIB_DUP = @GNULIB_DUP@ @@ -463,19 +469,23 @@ GNULIB_GETCWD = @GNULIB_GETCWD@ GNULIB_GETDELIM = @GNULIB_GETDELIM@ GNULIB_GETDOMAINNAME = @GNULIB_GETDOMAINNAME@ GNULIB_GETDTABLESIZE = @GNULIB_GETDTABLESIZE@ +GNULIB_GETENTROPY = @GNULIB_GETENTROPY@ GNULIB_GETGROUPS = @GNULIB_GETGROUPS@ GNULIB_GETHOSTNAME = @GNULIB_GETHOSTNAME@ GNULIB_GETLINE = @GNULIB_GETLINE@ GNULIB_GETLOADAVG = @GNULIB_GETLOADAVG@ GNULIB_GETLOGIN = @GNULIB_GETLOGIN@ GNULIB_GETLOGIN_R = @GNULIB_GETLOGIN_R@ +GNULIB_GETOPT_POSIX = @GNULIB_GETOPT_POSIX@ GNULIB_GETPAGESIZE = @GNULIB_GETPAGESIZE@ GNULIB_GETPASS = @GNULIB_GETPASS@ GNULIB_GETPEERNAME = @GNULIB_GETPEERNAME@ +GNULIB_GETRANDOM = @GNULIB_GETRANDOM@ GNULIB_GETSOCKNAME = @GNULIB_GETSOCKNAME@ GNULIB_GETSOCKOPT = @GNULIB_GETSOCKOPT@ GNULIB_GETSUBOPT = @GNULIB_GETSUBOPT@ GNULIB_GETTIMEOFDAY = @GNULIB_GETTIMEOFDAY@ +GNULIB_GETUMASK = @GNULIB_GETUMASK@ GNULIB_GETUSERSHELL = @GNULIB_GETUSERSHELL@ GNULIB_GL_UNISTD_H_GETOPT = @GNULIB_GL_UNISTD_H_GETOPT@ GNULIB_GRANTPT = @GNULIB_GRANTPT@ @@ -489,6 +499,8 @@ GNULIB_ISATTY = @GNULIB_ISATTY@ GNULIB_ISBLANK = @GNULIB_ISBLANK@ GNULIB_ISWBLANK = @GNULIB_ISWBLANK@ GNULIB_ISWCTYPE = @GNULIB_ISWCTYPE@ +GNULIB_ISWDIGIT = @GNULIB_ISWDIGIT@ +GNULIB_ISWXDIGIT = @GNULIB_ISWXDIGIT@ GNULIB_LCHMOD = @GNULIB_LCHMOD@ GNULIB_LCHOWN = @GNULIB_LCHOWN@ GNULIB_LINK = @GNULIB_LINK@ @@ -549,6 +561,7 @@ GNULIB_PERROR = @GNULIB_PERROR@ GNULIB_PIPE = @GNULIB_PIPE@ GNULIB_PIPE2 = @GNULIB_PIPE2@ GNULIB_POPEN = @GNULIB_POPEN@ +GNULIB_POSIX_MEMALIGN = @GNULIB_POSIX_MEMALIGN@ GNULIB_POSIX_OPENPT = @GNULIB_POSIX_OPENPT@ GNULIB_PREAD = @GNULIB_PREAD@ GNULIB_PRINTF = @GNULIB_PRINTF@ @@ -597,9 +610,12 @@ GNULIB_SENDTO = @GNULIB_SENDTO@ GNULIB_SETENV = @GNULIB_SETENV@ GNULIB_SETHOSTNAME = @GNULIB_SETHOSTNAME@ GNULIB_SETLOCALE = @GNULIB_SETLOCALE@ +GNULIB_SETLOCALE_NULL = @GNULIB_SETLOCALE_NULL@ GNULIB_SETSOCKOPT = @GNULIB_SETSOCKOPT@ GNULIB_SHUTDOWN = @GNULIB_SHUTDOWN@ +GNULIB_SIGABBREV_NP = @GNULIB_SIGABBREV_NP@ GNULIB_SIGACTION = @GNULIB_SIGACTION@ +GNULIB_SIGDESCR_NP = @GNULIB_SIGDESCR_NP@ GNULIB_SIGNAL_H_SIGPIPE = @GNULIB_SIGNAL_H_SIGPIPE@ GNULIB_SIGPROCMASK = @GNULIB_SIGPROCMASK@ GNULIB_SLEEP = @GNULIB_SLEEP@ @@ -615,6 +631,7 @@ GNULIB_STRCASESTR = @GNULIB_STRCASESTR@ GNULIB_STRCHRNUL = @GNULIB_STRCHRNUL@ GNULIB_STRDUP = @GNULIB_STRDUP@ GNULIB_STRERROR = @GNULIB_STRERROR@ +GNULIB_STRERRORNAME_NP = @GNULIB_STRERRORNAME_NP@ GNULIB_STRERROR_R = @GNULIB_STRERROR_R@ GNULIB_STRFTIME = @GNULIB_STRFTIME@ GNULIB_STRNCAT = @GNULIB_STRNCAT@ @@ -698,11 +715,13 @@ GNULIB_WMEMCHR = @GNULIB_WMEMCHR@ GNULIB_WMEMCMP = @GNULIB_WMEMCMP@ GNULIB_WMEMCPY = @GNULIB_WMEMCPY@ GNULIB_WMEMMOVE = @GNULIB_WMEMMOVE@ +GNULIB_WMEMPCPY = @GNULIB_WMEMPCPY@ GNULIB_WMEMSET = @GNULIB_WMEMSET@ GNULIB_WRITE = @GNULIB_WRITE@ GNULIB__EXIT = @GNULIB__EXIT@ GREP = @GREP@ HAVE_ACCEPT4 = @HAVE_ACCEPT4@ +HAVE_ALIGNED_ALLOC = @HAVE_ALIGNED_ALLOC@ HAVE_ALLOCA_H = @HAVE_ALLOCA_H@ HAVE_ARPA_INET_H = @HAVE_ARPA_INET_H@ HAVE_ATOLL = @HAVE_ATOLL@ @@ -712,12 +731,17 @@ HAVE_CANONICALIZE_FILE_NAME = @HAVE_CANONICALIZE_FILE_NAME@ HAVE_CHOWN = @HAVE_CHOWN@ HAVE_COPY_FILE_RANGE = @HAVE_COPY_FILE_RANGE@ HAVE_CRTDEFS_H = @HAVE_CRTDEFS_H@ +HAVE_DECL_ECVT = @HAVE_DECL_ECVT@ HAVE_DECL_ENVIRON = @HAVE_DECL_ENVIRON@ +HAVE_DECL_EXECVPE = @HAVE_DECL_EXECVPE@ HAVE_DECL_FCHDIR = @HAVE_DECL_FCHDIR@ +HAVE_DECL_FCLOSEALL = @HAVE_DECL_FCLOSEALL@ +HAVE_DECL_FCVT = @HAVE_DECL_FCVT@ HAVE_DECL_FDATASYNC = @HAVE_DECL_FDATASYNC@ HAVE_DECL_FPURGE = @HAVE_DECL_FPURGE@ HAVE_DECL_FSEEKO = @HAVE_DECL_FSEEKO@ HAVE_DECL_FTELLO = @HAVE_DECL_FTELLO@ +HAVE_DECL_GCVT = @HAVE_DECL_GCVT@ HAVE_DECL_GETDELIM = @HAVE_DECL_GETDELIM@ HAVE_DECL_GETDOMAINNAME = @HAVE_DECL_GETDOMAINNAME@ HAVE_DECL_GETLINE = @HAVE_DECL_GETLINE@ @@ -751,10 +775,10 @@ HAVE_DECL_TRUNCATE = @HAVE_DECL_TRUNCATE@ HAVE_DECL_TTYNAME_R = @HAVE_DECL_TTYNAME_R@ HAVE_DECL_UNSETENV = @HAVE_DECL_UNSETENV@ HAVE_DECL_VSNPRINTF = @HAVE_DECL_VSNPRINTF@ +HAVE_DECL_WCSDUP = @HAVE_DECL_WCSDUP@ HAVE_DECL_WCTOB = @HAVE_DECL_WCTOB@ HAVE_DECL_WCWIDTH = @HAVE_DECL_WCWIDTH@ HAVE_DPRINTF = @HAVE_DPRINTF@ -HAVE_DUP2 = @HAVE_DUP2@ HAVE_DUP3 = @HAVE_DUP3@ HAVE_DUPLOCALE = @HAVE_DUPLOCALE@ HAVE_EUIDACCESS = @HAVE_EUIDACCESS@ @@ -776,14 +800,17 @@ HAVE_FTELLO = @HAVE_FTELLO@ HAVE_FTRUNCATE = @HAVE_FTRUNCATE@ HAVE_FUTIMENS = @HAVE_FUTIMENS@ HAVE_GETDTABLESIZE = @HAVE_GETDTABLESIZE@ +HAVE_GETENTROPY = @HAVE_GETENTROPY@ HAVE_GETGROUPS = @HAVE_GETGROUPS@ HAVE_GETHOSTNAME = @HAVE_GETHOSTNAME@ HAVE_GETLOGIN = @HAVE_GETLOGIN@ HAVE_GETOPT_H = @HAVE_GETOPT_H@ HAVE_GETPAGESIZE = @HAVE_GETPAGESIZE@ HAVE_GETPASS = @HAVE_GETPASS@ +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_IMAXDIV_T = @HAVE_IMAXDIV_T@ @@ -802,7 +829,6 @@ HAVE_LCHMOD = @HAVE_LCHMOD@ HAVE_LCHOWN = @HAVE_LCHOWN@ HAVE_LINK = @HAVE_LINK@ HAVE_LINKAT = @HAVE_LINKAT@ -HAVE_LONG_LONG_INT = @HAVE_LONG_LONG_INT@ HAVE_LSTAT = @HAVE_LSTAT@ HAVE_MAX_ALIGN_T = @HAVE_MAX_ALIGN_T@ HAVE_MBRLEN = @HAVE_MBRLEN@ @@ -812,7 +838,6 @@ HAVE_MBSLEN = @HAVE_MBSLEN@ HAVE_MBSNRTOWCS = @HAVE_MBSNRTOWCS@ HAVE_MBSRTOWCS = @HAVE_MBSRTOWCS@ HAVE_MBTOWC = @HAVE_MBTOWC@ -HAVE_MEMCHR = @HAVE_MEMCHR@ HAVE_MEMPCPY = @HAVE_MEMPCPY@ HAVE_MKDIRAT = @HAVE_MKDIRAT@ HAVE_MKDTEMP = @HAVE_MKDTEMP@ @@ -835,6 +860,7 @@ HAVE_PCLOSE = @HAVE_PCLOSE@ HAVE_PIPE = @HAVE_PIPE@ HAVE_PIPE2 = @HAVE_PIPE2@ HAVE_POPEN = @HAVE_POPEN@ +HAVE_POSIX_MEMALIGN = @HAVE_POSIX_MEMALIGN@ HAVE_POSIX_OPENPT = @HAVE_POSIX_OPENPT@ HAVE_POSIX_SIGNALBLOCKING = @HAVE_POSIX_SIGNALBLOCKING@ HAVE_PREAD = @HAVE_PREAD@ @@ -920,7 +946,9 @@ HAVE_SECURE_GETENV = @HAVE_SECURE_GETENV@ HAVE_SETENV = @HAVE_SETENV@ HAVE_SETHOSTNAME = @HAVE_SETHOSTNAME@ HAVE_SETSTATE = @HAVE_SETSTATE@ +HAVE_SIGABBREV_NP = @HAVE_SIGABBREV_NP@ HAVE_SIGACTION = @HAVE_SIGACTION@ +HAVE_SIGDESCR_NP = @HAVE_SIGDESCR_NP@ HAVE_SIGHANDLER_T = @HAVE_SIGHANDLER_T@ HAVE_SIGINFO_T = @HAVE_SIGINFO_T@ HAVE_SIGNED_SIG_ATOMIC_T = @HAVE_SIGNED_SIG_ATOMIC_T@ @@ -933,6 +961,7 @@ HAVE_STPCPY = @HAVE_STPCPY@ HAVE_STPNCPY = @HAVE_STPNCPY@ HAVE_STRCASESTR = @HAVE_STRCASESTR@ HAVE_STRCHRNUL = @HAVE_STRCHRNUL@ +HAVE_STRERRORNAME_NP = @HAVE_STRERRORNAME_NP@ HAVE_STRPBRK = @HAVE_STRPBRK@ HAVE_STRPTIME = @HAVE_STRPTIME@ HAVE_STRSEP = @HAVE_STRSEP@ @@ -955,6 +984,7 @@ HAVE_SYS_INTTYPES_H = @HAVE_SYS_INTTYPES_H@ HAVE_SYS_IOCTL_H = @HAVE_SYS_IOCTL_H@ HAVE_SYS_LOADAVG_H = @HAVE_SYS_LOADAVG_H@ HAVE_SYS_PARAM_H = @HAVE_SYS_PARAM_H@ +HAVE_SYS_RANDOM_H = @HAVE_SYS_RANDOM_H@ HAVE_SYS_SELECT_H = @HAVE_SYS_SELECT_H@ HAVE_SYS_SOCKET_H = @HAVE_SYS_SOCKET_H@ HAVE_SYS_TIME_H = @HAVE_SYS_TIME_H@ @@ -963,15 +993,14 @@ HAVE_SYS_UIO_H = @HAVE_SYS_UIO_H@ HAVE_TIMEGM = @HAVE_TIMEGM@ HAVE_TIMEZONE_T = @HAVE_TIMEZONE_T@ HAVE_TYPE_VOLATILE_SIG_ATOMIC_T = @HAVE_TYPE_VOLATILE_SIG_ATOMIC_T@ -HAVE_TZSET = @HAVE_TZSET@ HAVE_UNISTD_H = @HAVE_UNISTD_H@ HAVE_UNLINKAT = @HAVE_UNLINKAT@ HAVE_UNLOCKPT = @HAVE_UNLOCKPT@ -HAVE_UNSIGNED_LONG_LONG_INT = @HAVE_UNSIGNED_LONG_LONG_INT@ HAVE_USLEEP = @HAVE_USLEEP@ HAVE_UTIMENSAT = @HAVE_UTIMENSAT@ HAVE_VASPRINTF = @HAVE_VASPRINTF@ HAVE_VDPRINTF = @HAVE_VDPRINTF@ +HAVE_VISIBILITY = @HAVE_VISIBILITY@ HAVE_WCHAR_H = @HAVE_WCHAR_H@ HAVE_WCHAR_T = @HAVE_WCHAR_T@ HAVE_WCPCPY = @HAVE_WCPCPY@ @@ -1010,6 +1039,7 @@ HAVE_WMEMCHR = @HAVE_WMEMCHR@ HAVE_WMEMCMP = @HAVE_WMEMCMP@ HAVE_WMEMCPY = @HAVE_WMEMCPY@ HAVE_WMEMMOVE = @HAVE_WMEMMOVE@ +HAVE_WMEMPCPY = @HAVE_WMEMPCPY@ HAVE_WMEMSET = @HAVE_WMEMSET@ HAVE_WS2TCPIP_H = @HAVE_WS2TCPIP_H@ HAVE_XLOCALE_H = @HAVE_XLOCALE_H@ @@ -1035,16 +1065,28 @@ LIBICONV = @LIBICONV@ LIBINTL = @LIBINTL@ LIBMULTITHREAD = @LIBMULTITHREAD@ LIBOBJS = @LIBOBJS@ +LIBPMULTITHREAD = @LIBPMULTITHREAD@ +LIBPTHREAD = @LIBPTHREAD@ LIBS = @LIBS@ LIBSOCKET = @LIBSOCKET@ +LIBSTDTHREAD = @LIBSTDTHREAD@ LIBTESTS_LIBDEPS = @LIBTESTS_LIBDEPS@ LIBTHREAD = @LIBTHREAD@ LIBTOOL = @LIBTOOL@ LIB_BLKID = @LIB_BLKID@ +LIB_CLOCK_GETTIME = @LIB_CLOCK_GETTIME@ +LIB_GETRANDOM = @LIB_GETRANDOM@ +LIB_HARD_LOCALE = @LIB_HARD_LOCALE@ +LIB_MBRTOWC = @LIB_MBRTOWC@ LIB_NANOSLEEP = @LIB_NANOSLEEP@ +LIB_NL_LANGINFO = @LIB_NL_LANGINFO@ LIB_PTHREAD = @LIB_PTHREAD@ LIB_PTHREAD_SIGMASK = @LIB_PTHREAD_SIGMASK@ +LIB_SCHED_YIELD = @LIB_SCHED_YIELD@ LIB_SELECT = @LIB_SELECT@ +LIB_SEMAPHORE = @LIB_SEMAPHORE@ +LIB_SETLOCALE = @LIB_SETLOCALE@ +LIB_SETLOCALE_NULL = @LIB_SETLOCALE_NULL@ LIMITS_H = @LIMITS_H@ LIPO = @LIPO@ LN_S = @LN_S@ @@ -1093,6 +1135,7 @@ NEXT_AS_FIRST_DIRECTIVE_STDIO_H = @NEXT_AS_FIRST_DIRECTIVE_STDIO_H@ NEXT_AS_FIRST_DIRECTIVE_STDLIB_H = @NEXT_AS_FIRST_DIRECTIVE_STDLIB_H@ NEXT_AS_FIRST_DIRECTIVE_STRING_H = @NEXT_AS_FIRST_DIRECTIVE_STRING_H@ NEXT_AS_FIRST_DIRECTIVE_SYS_IOCTL_H = @NEXT_AS_FIRST_DIRECTIVE_SYS_IOCTL_H@ +NEXT_AS_FIRST_DIRECTIVE_SYS_RANDOM_H = @NEXT_AS_FIRST_DIRECTIVE_SYS_RANDOM_H@ NEXT_AS_FIRST_DIRECTIVE_SYS_SELECT_H = @NEXT_AS_FIRST_DIRECTIVE_SYS_SELECT_H@ NEXT_AS_FIRST_DIRECTIVE_SYS_SOCKET_H = @NEXT_AS_FIRST_DIRECTIVE_SYS_SOCKET_H@ NEXT_AS_FIRST_DIRECTIVE_SYS_STAT_H = @NEXT_AS_FIRST_DIRECTIVE_SYS_STAT_H@ @@ -1122,6 +1165,7 @@ NEXT_STDIO_H = @NEXT_STDIO_H@ NEXT_STDLIB_H = @NEXT_STDLIB_H@ NEXT_STRING_H = @NEXT_STRING_H@ NEXT_SYS_IOCTL_H = @NEXT_SYS_IOCTL_H@ +NEXT_SYS_RANDOM_H = @NEXT_SYS_RANDOM_H@ NEXT_SYS_SELECT_H = @NEXT_SYS_SELECT_H@ NEXT_SYS_SOCKET_H = @NEXT_SYS_SOCKET_H@ NEXT_SYS_STAT_H = @NEXT_SYS_STAT_H@ @@ -1158,21 +1202,24 @@ POSUB = @POSUB@ PRAGMA_COLUMNS = @PRAGMA_COLUMNS@ PRAGMA_SYSTEM_HEADER = @PRAGMA_SYSTEM_HEADER@ PRIPTR_PREFIX = @PRIPTR_PREFIX@ -PRI_MACROS_BROKEN = @PRI_MACROS_BROKEN@ PTHREAD_H_DEFINES_STRUCT_TIMESPEC = @PTHREAD_H_DEFINES_STRUCT_TIMESPEC@ PTRDIFF_T_SUFFIX = @PTRDIFF_T_SUFFIX@ RANLIB = @RANLIB@ +REPLACE_ACCESS = @REPLACE_ACCESS@ +REPLACE_ALIGNED_ALLOC = @REPLACE_ALIGNED_ALLOC@ REPLACE_BTOWC = @REPLACE_BTOWC@ REPLACE_CALLOC = @REPLACE_CALLOC@ REPLACE_CANONICALIZE_FILE_NAME = @REPLACE_CANONICALIZE_FILE_NAME@ REPLACE_CHOWN = @REPLACE_CHOWN@ REPLACE_CLOSE = @REPLACE_CLOSE@ +REPLACE_CREAT = @REPLACE_CREAT@ REPLACE_CTIME = @REPLACE_CTIME@ REPLACE_DPRINTF = @REPLACE_DPRINTF@ REPLACE_DUP = @REPLACE_DUP@ REPLACE_DUP2 = @REPLACE_DUP2@ REPLACE_DUPLOCALE = @REPLACE_DUPLOCALE@ REPLACE_FACCESSAT = @REPLACE_FACCESSAT@ +REPLACE_FCHMODAT = @REPLACE_FCHMODAT@ REPLACE_FCHOWNAT = @REPLACE_FCHOWNAT@ REPLACE_FCLOSE = @REPLACE_FCLOSE@ REPLACE_FCNTL = @REPLACE_FCNTL@ @@ -1200,6 +1247,7 @@ REPLACE_GETLINE = @REPLACE_GETLINE@ REPLACE_GETLOGIN_R = @REPLACE_GETLOGIN_R@ REPLACE_GETPAGESIZE = @REPLACE_GETPAGESIZE@ REPLACE_GETPASS = @REPLACE_GETPASS@ +REPLACE_GETRANDOM = @REPLACE_GETRANDOM@ REPLACE_GETTIMEOFDAY = @REPLACE_GETTIMEOFDAY@ REPLACE_GMTIME = @REPLACE_GMTIME@ REPLACE_INET_NTOP = @REPLACE_INET_NTOP@ @@ -1209,6 +1257,8 @@ REPLACE_IOCTL = @REPLACE_IOCTL@ REPLACE_ISATTY = @REPLACE_ISATTY@ REPLACE_ISWBLANK = @REPLACE_ISWBLANK@ REPLACE_ISWCNTRL = @REPLACE_ISWCNTRL@ +REPLACE_ISWDIGIT = @REPLACE_ISWDIGIT@ +REPLACE_ISWXDIGIT = @REPLACE_ISWXDIGIT@ REPLACE_LCHOWN = @REPLACE_LCHOWN@ REPLACE_LINK = @REPLACE_LINK@ REPLACE_LINKAT = @REPLACE_LINKAT@ @@ -1241,6 +1291,7 @@ REPLACE_OPEN = @REPLACE_OPEN@ REPLACE_OPENAT = @REPLACE_OPENAT@ REPLACE_PERROR = @REPLACE_PERROR@ REPLACE_POPEN = @REPLACE_POPEN@ +REPLACE_POSIX_MEMALIGN = @REPLACE_POSIX_MEMALIGN@ REPLACE_PREAD = @REPLACE_PREAD@ REPLACE_PRINTF = @REPLACE_PRINTF@ REPLACE_PSELECT = @REPLACE_PSELECT@ @@ -1329,6 +1380,7 @@ REPLACE_STRCASESTR = @REPLACE_STRCASESTR@ REPLACE_STRCHRNUL = @REPLACE_STRCHRNUL@ REPLACE_STRDUP = @REPLACE_STRDUP@ REPLACE_STRERROR = @REPLACE_STRERROR@ +REPLACE_STRERRORNAME_NP = @REPLACE_STRERRORNAME_NP@ REPLACE_STRERROR_R = @REPLACE_STRERROR_R@ REPLACE_STRFTIME = @REPLACE_STRFTIME@ REPLACE_STRNCAT = @REPLACE_STRNCAT@ @@ -1366,13 +1418,13 @@ REPLACE_WCRTOMB = @REPLACE_WCRTOMB@ REPLACE_WCSFTIME = @REPLACE_WCSFTIME@ REPLACE_WCSNRTOMBS = @REPLACE_WCSNRTOMBS@ REPLACE_WCSRTOMBS = @REPLACE_WCSRTOMBS@ +REPLACE_WCSTOK = @REPLACE_WCSTOK@ REPLACE_WCSWIDTH = @REPLACE_WCSWIDTH@ REPLACE_WCTOB = @REPLACE_WCTOB@ REPLACE_WCTOMB = @REPLACE_WCTOMB@ REPLACE_WCWIDTH = @REPLACE_WCWIDTH@ REPLACE_WRITE = @REPLACE_WRITE@ SED = @SED@ -SELINUX_LIBS = @SELINUX_LIBS@ SET_MAKE = @SET_MAKE@ SHELL = @SHELL@ SIG_ATOMIC_T_SUFFIX = @SIG_ATOMIC_T_SUFFIX@ @@ -1391,6 +1443,7 @@ UINT32_MAX_LT_UINTMAX_MAX = @UINT32_MAX_LT_UINTMAX_MAX@ UINT64_MAX_EQ_ULONG_MAX = @UINT64_MAX_EQ_ULONG_MAX@ UNDEFINE_STRTOK_R = @UNDEFINE_STRTOK_R@ UNISTD_H_DEFINES_STRUCT_TIMESPEC = @UNISTD_H_DEFINES_STRUCT_TIMESPEC@ +UNISTD_H_HAVE_SYS_RANDOM_H = @UNISTD_H_HAVE_SYS_RANDOM_H@ UNISTD_H_HAVE_WINSOCK2_H = @UNISTD_H_HAVE_WINSOCK2_H@ UNISTD_H_HAVE_WINSOCK2_H_AND_USE_SOCKETS = @UNISTD_H_HAVE_WINSOCK2_H_AND_USE_SOCKETS@ USE_NLS = @USE_NLS@ diff --git a/doc/fdl.texi b/doc/fdl.texi index 542edaa..eaf3da0 100644 --- a/doc/fdl.texi +++ b/doc/fdl.texi @@ -414,7 +414,7 @@ The Free Software Foundation may publish new, revised versions of the GNU Free Documentation License from time to time. Such new versions will be similar in spirit to the present version, but may differ in detail to address new problems or concerns. See -@uref{https://www.gnu.org/copyleft/}. +@uref{https://www.gnu.org/licenses/}. Each version of the License is given a distinguishing version number. If the Document specifies that a particular numbered version of this diff --git a/doc/parted-pt_BR.texi b/doc/parted-pt_BR.texi index fb1a807..45e3334 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 Free Software Foundation, Inc. +Copyright 1999--2002, 2009--2014, 2019--2021 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 36bced0..149447e 100644 --- a/doc/parted.info +++ b/doc/parted.info @@ -1,6 +1,6 @@ -This is parted.info, produced by makeinfo version 6.6 from parted.texi. +This is parted.info, produced by makeinfo version 6.7 from parted.texi. -Copyright (C) 1999-2014, 2019 Free Software Foundation, Inc. +Copyright (C) 1999-2014, 2019-2021 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.3* of GNU Parted. + This document applies roughly to version *3.4* 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 @@ -719,6 +719,11 @@ File: parted.info, Node: set, Next: unit, Prev: select, Up: Command explanat (GPT) - this flag is used to tell special purpose software that the GPT partition may be bootable. + 'bls_boot' + (MS-DOS, GPT) - Enable this to indicate that the selected + partition is a Linux Boot Loader Specification compatible + /boot partition. + 'boot' (Mac, MS-DOS, PC98) - should be enabled if you want to boot off the partition. The semantics vary between disk labels. @@ -750,6 +755,10 @@ File: parted.info, Node: set, Next: unit, Prev: select, Up: Command explanat (MS-DOS, GPT) - this flag identifies a UEFI System Partition. On GPT it is an alias for boot. + 'chromeos_kernel' + (GPT) - this flag indicates a partition that can be used with + the Chrome OS bootloader and verified boot implementation. + 'lba' (MS-DOS) - this flag can be enabled to tell MS DOS, MS Windows 9x and MS Windows ME based operating systems to use Linear @@ -1356,7 +1365,7 @@ A.1 GNU Free Documentation License the GNU Free Documentation License from time to time. Such new versions will be similar in spirit to the present version, but may differ in detail to address new problems or concerns. See - . + . Each version of the License is given a distinguishing version number. If the Document specifies that a particular numbered @@ -1528,39 +1537,44 @@ Index  Tag Table: -Node: Top770 -Node: Introduction1573 -Node: Overview2029 -Node: Software Required3556 -Node: Supported Platforms4657 -Node: License5111 -Node: Compiling5715 -Node: Using Parted6995 -Node: Partitioning7414 -Node: Running Parted9052 -Node: Invoking Parted11431 -Node: Command explanations12212 -Node: align-check12677 -Node: disk_set13402 -Node: help14103 -Node: mklabel14386 -Ref: mklabel-Footnote-115265 -Node: mkpart15395 -Ref: mkpart-Footnote-117805 -Node: name18056 -Node: print18573 -Node: quit19461 -Node: rescue19955 -Node: resizepart21480 -Node: rm22028 -Node: select22913 -Node: set23383 -Node: unit26834 -Ref: IEC binary units29217 -Node: Related information31310 -Node: Copying This Manual32132 -Node: GNU Free Documentation License32376 -Node: History57488 -Node: Concept index58293 +Node: Top775 +Node: Introduction1578 +Node: Overview2034 +Node: Software Required3561 +Node: Supported Platforms4662 +Node: License5116 +Node: Compiling5720 +Node: Using Parted7000 +Node: Partitioning7419 +Node: Running Parted9057 +Node: Invoking Parted11436 +Node: Command explanations12217 +Node: align-check12682 +Node: disk_set13407 +Node: help14108 +Node: mklabel14391 +Ref: mklabel-Footnote-115270 +Node: mkpart15400 +Ref: mkpart-Footnote-117810 +Node: name18061 +Node: print18578 +Node: quit19466 +Node: rescue19960 +Node: resizepart21485 +Node: rm22033 +Node: select22918 +Node: set23388 +Node: unit27184 +Ref: IEC binary units29567 +Node: Related information31660 +Node: Copying This Manual32482 +Node: GNU Free Documentation License32726 +Node: History57838 +Node: Concept index58643  End Tag Table + + +Local Variables: +coding: utf-8 +End: diff --git a/doc/parted.texi b/doc/parted.texi index 77c9628..d89d74d 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-2014, 2019 Free Software Foundation, Inc. +Copyright @copyright{} 1999--2014, 2019--2021 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 @@ -844,6 +844,10 @@ GRUB BIOS partition. (GPT) - this flag is used to tell special purpose software that the GPT partition may be bootable. +@item bls_boot +(MS-DOS, GPT) - Enable this to indicate that the selected partition is a +Linux Boot Loader Specification compatible /boot partition. + @item boot (Mac, MS-DOS, PC98) - should be enabled if you want to boot off the partition. The semantics vary between disk labels. For MS-DOS disk @@ -874,6 +878,10 @@ partition. (MS-DOS, GPT) - this flag identifies a UEFI System Partition. On GPT it is an alias for boot. +@item chromeos_kernel +(GPT) - this flag indicates a partition that can be used with the Chrome OS +bootloader and verified boot implementation. + @item lba (MS-DOS) - this flag can be enabled to tell MS DOS, MS Windows 9x and MS Windows ME based operating systems to use Linear (LBA) mode. diff --git a/doc/pt_BR/Makefile.in b/doc/pt_BR/Makefile.in index 32b8602..fe80c6c 100644 --- a/doc/pt_BR/Makefile.in +++ b/doc/pt_BR/Makefile.in @@ -119,9 +119,9 @@ am__aclocal_m4_deps = $(top_srcdir)/m4/00gnulib.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/calloc.m4 $(top_srcdir)/m4/canonicalize.m4 \ - $(top_srcdir)/m4/close.m4 $(top_srcdir)/m4/codeset.m4 \ - $(top_srcdir)/m4/config-h.m4 $(top_srcdir)/m4/configmake.m4 \ - $(top_srcdir)/m4/ctype.m4 $(top_srcdir)/m4/dirname.m4 \ + $(top_srcdir)/m4/clock_time.m4 $(top_srcdir)/m4/close.m4 \ + $(top_srcdir)/m4/codeset.m4 $(top_srcdir)/m4/config-h.m4 \ + $(top_srcdir)/m4/configmake.m4 $(top_srcdir)/m4/ctype.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 \ @@ -133,15 +133,13 @@ am__aclocal_m4_deps = $(top_srcdir)/m4/00gnulib.m4 \ $(top_srcdir)/m4/fsync.m4 $(top_srcdir)/m4/ftruncate.m4 \ $(top_srcdir)/m4/getcwd.m4 $(top_srcdir)/m4/getdtablesize.m4 \ $(top_srcdir)/m4/getopt.m4 $(top_srcdir)/m4/getpagesize.m4 \ - $(top_srcdir)/m4/getprogname.m4 $(top_srcdir)/m4/gettext.m4 \ - $(top_srcdir)/m4/gettimeofday.m4 $(top_srcdir)/m4/glibc21.m4 \ - $(top_srcdir)/m4/gnulib-common.m4 \ - $(top_srcdir)/m4/gnulib-comp.m4 \ - $(top_srcdir)/m4/host-cpu-c-abi.m4 $(top_srcdir)/m4/iconv.m4 \ + $(top_srcdir)/m4/getprogname.m4 $(top_srcdir)/m4/getrandom.m4 \ + $(top_srcdir)/m4/gettext.m4 $(top_srcdir)/m4/gettimeofday.m4 \ + $(top_srcdir)/m4/glibc21.m4 $(top_srcdir)/m4/gnulib-common.m4 \ + $(top_srcdir)/m4/gnulib-comp.m4 $(top_srcdir)/m4/iconv.m4 \ $(top_srcdir)/m4/include_next.m4 $(top_srcdir)/m4/inet_pton.m4 \ $(top_srcdir)/m4/intl-thread-locale.m4 \ - $(top_srcdir)/m4/intlmacosx.m4 \ - $(top_srcdir)/m4/inttypes-pri.m4 $(top_srcdir)/m4/inttypes.m4 \ + $(top_srcdir)/m4/intlmacosx.m4 $(top_srcdir)/m4/inttypes.m4 \ $(top_srcdir)/m4/ioctl.m4 $(top_srcdir)/m4/isblank.m4 \ $(top_srcdir)/m4/langinfo_h.m4 $(top_srcdir)/m4/largefile.m4 \ $(top_srcdir)/m4/lcmessage.m4 $(top_srcdir)/m4/lib-ignore.m4 \ @@ -151,25 +149,26 @@ am__aclocal_m4_deps = $(top_srcdir)/m4/00gnulib.m4 \ $(top_srcdir)/m4/locale-fr.m4 $(top_srcdir)/m4/locale-ja.m4 \ $(top_srcdir)/m4/locale-tr.m4 $(top_srcdir)/m4/locale-zh.m4 \ $(top_srcdir)/m4/locale_h.m4 $(top_srcdir)/m4/localeconv.m4 \ - $(top_srcdir)/m4/localename.m4 \ - $(top_srcdir)/m4/localtime-buffer.m4 $(top_srcdir)/m4/lock.m4 \ - $(top_srcdir)/m4/longlong.m4 $(top_srcdir)/m4/lseek.m4 \ - $(top_srcdir)/m4/lstat.m4 $(top_srcdir)/m4/ltoptions.m4 \ - $(top_srcdir)/m4/ltsugar.m4 $(top_srcdir)/m4/ltversion.m4 \ - $(top_srcdir)/m4/lt~obsolete.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/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/localename.m4 $(top_srcdir)/m4/lock.m4 \ + $(top_srcdir)/m4/lseek.m4 $(top_srcdir)/m4/lstat.m4 \ + $(top_srcdir)/m4/ltoptions.m4 $(top_srcdir)/m4/ltsugar.m4 \ + $(top_srcdir)/m4/ltversion.m4 $(top_srcdir)/m4/lt~obsolete.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/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/nanosleep.m4 $(top_srcdir)/m4/netinet_in_h.m4 \ + $(top_srcdir)/m4/musl.m4 $(top_srcdir)/m4/nanosleep.m4 \ + $(top_srcdir)/m4/netinet_in_h.m4 \ $(top_srcdir)/m4/nl_langinfo.m4 $(top_srcdir)/m4/nls.m4 \ $(top_srcdir)/m4/nocrash.m4 $(top_srcdir)/m4/o-direct.m4 \ $(top_srcdir)/m4/off_t.m4 $(top_srcdir)/m4/open-cloexec.m4 \ - $(top_srcdir)/m4/open.m4 $(top_srcdir)/m4/pathmax.m4 \ - $(top_srcdir)/m4/perror.m4 $(top_srcdir)/m4/pipe.m4 \ + $(top_srcdir)/m4/open-slash.m4 $(top_srcdir)/m4/open.m4 \ + $(top_srcdir)/m4/pathmax.m4 $(top_srcdir)/m4/perror.m4 \ + $(top_srcdir)/m4/pid_t.m4 $(top_srcdir)/m4/pipe.m4 \ $(top_srcdir)/m4/po.m4 $(top_srcdir)/m4/priv-set.m4 \ $(top_srcdir)/m4/progtest.m4 \ $(top_srcdir)/m4/pthread-thread.m4 \ @@ -181,9 +180,10 @@ am__aclocal_m4_deps = $(top_srcdir)/m4/00gnulib.m4 \ $(top_srcdir)/m4/readlink.m4 $(top_srcdir)/m4/realloc.m4 \ $(top_srcdir)/m4/regex.m4 $(top_srcdir)/m4/rpmatch.m4 \ $(top_srcdir)/m4/safe-read.m4 $(top_srcdir)/m4/sched_h.m4 \ - $(top_srcdir)/m4/select.m4 $(top_srcdir)/m4/setenv.m4 \ - $(top_srcdir)/m4/setlocale.m4 $(top_srcdir)/m4/sigaction.m4 \ - $(top_srcdir)/m4/signal_h.m4 \ + $(top_srcdir)/m4/select.m4 $(top_srcdir)/m4/semaphore.m4 \ + $(top_srcdir)/m4/setenv.m4 $(top_srcdir)/m4/setlocale.m4 \ + $(top_srcdir)/m4/setlocale_null.m4 \ + $(top_srcdir)/m4/sigaction.m4 $(top_srcdir)/m4/signal_h.m4 \ $(top_srcdir)/m4/signalblocking.m4 $(top_srcdir)/m4/sleep.m4 \ $(top_srcdir)/m4/socketlib.m4 $(top_srcdir)/m4/sockets.m4 \ $(top_srcdir)/m4/socklen.m4 $(top_srcdir)/m4/sockpfaf.m4 \ @@ -198,6 +198,7 @@ am__aclocal_m4_deps = $(top_srcdir)/m4/00gnulib.m4 \ $(top_srcdir)/m4/strnlen.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 \ @@ -206,14 +207,15 @@ am__aclocal_m4_deps = $(top_srcdir)/m4/00gnulib.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/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/xstrndup.m4 $(top_srcdir)/m4/xstrtol.m4 \ - $(top_srcdir)/m4/yield.m4 $(top_srcdir)/configure.ac + $(top_srcdir)/m4/yield.m4 $(top_srcdir)/m4/zzgnulib.m4 \ + $(top_srcdir)/configure.ac am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \ $(ACLOCAL_M4) DIST_COMMON = $(srcdir)/Makefile.am $(am__DIST_COMMON) @@ -266,6 +268,7 @@ BUILDINFO = @BUILDINFO@ CC = @CC@ CCDEPMODE = @CCDEPMODE@ CFLAGS = @CFLAGS@ +CFLAG_VISIBILITY = @CFLAG_VISIBILITY@ CHECK_CFLAGS = @CHECK_CFLAGS@ CHECK_LIBS = @CHECK_LIBS@ CONFIG_INCLUDE = @CONFIG_INCLUDE@ @@ -300,6 +303,8 @@ GMSGFMT = @GMSGFMT@ GMSGFMT_015 = @GMSGFMT_015@ GNULIB_ACCEPT = @GNULIB_ACCEPT@ GNULIB_ACCEPT4 = @GNULIB_ACCEPT4@ +GNULIB_ACCESS = @GNULIB_ACCESS@ +GNULIB_ALIGNED_ALLOC = @GNULIB_ALIGNED_ALLOC@ GNULIB_ATOLL = @GNULIB_ATOLL@ GNULIB_BIND = @GNULIB_BIND@ GNULIB_BTOWC = @GNULIB_BTOWC@ @@ -310,6 +315,7 @@ GNULIB_CHOWN = @GNULIB_CHOWN@ GNULIB_CLOSE = @GNULIB_CLOSE@ GNULIB_CONNECT = @GNULIB_CONNECT@ GNULIB_COPY_FILE_RANGE = @GNULIB_COPY_FILE_RANGE@ +GNULIB_CREAT = @GNULIB_CREAT@ GNULIB_CTIME = @GNULIB_CTIME@ GNULIB_DPRINTF = @GNULIB_DPRINTF@ GNULIB_DUP = @GNULIB_DUP@ @@ -357,19 +363,23 @@ GNULIB_GETCWD = @GNULIB_GETCWD@ GNULIB_GETDELIM = @GNULIB_GETDELIM@ GNULIB_GETDOMAINNAME = @GNULIB_GETDOMAINNAME@ GNULIB_GETDTABLESIZE = @GNULIB_GETDTABLESIZE@ +GNULIB_GETENTROPY = @GNULIB_GETENTROPY@ GNULIB_GETGROUPS = @GNULIB_GETGROUPS@ GNULIB_GETHOSTNAME = @GNULIB_GETHOSTNAME@ GNULIB_GETLINE = @GNULIB_GETLINE@ GNULIB_GETLOADAVG = @GNULIB_GETLOADAVG@ GNULIB_GETLOGIN = @GNULIB_GETLOGIN@ GNULIB_GETLOGIN_R = @GNULIB_GETLOGIN_R@ +GNULIB_GETOPT_POSIX = @GNULIB_GETOPT_POSIX@ GNULIB_GETPAGESIZE = @GNULIB_GETPAGESIZE@ GNULIB_GETPASS = @GNULIB_GETPASS@ GNULIB_GETPEERNAME = @GNULIB_GETPEERNAME@ +GNULIB_GETRANDOM = @GNULIB_GETRANDOM@ GNULIB_GETSOCKNAME = @GNULIB_GETSOCKNAME@ GNULIB_GETSOCKOPT = @GNULIB_GETSOCKOPT@ GNULIB_GETSUBOPT = @GNULIB_GETSUBOPT@ GNULIB_GETTIMEOFDAY = @GNULIB_GETTIMEOFDAY@ +GNULIB_GETUMASK = @GNULIB_GETUMASK@ GNULIB_GETUSERSHELL = @GNULIB_GETUSERSHELL@ GNULIB_GL_UNISTD_H_GETOPT = @GNULIB_GL_UNISTD_H_GETOPT@ GNULIB_GRANTPT = @GNULIB_GRANTPT@ @@ -383,6 +393,8 @@ GNULIB_ISATTY = @GNULIB_ISATTY@ GNULIB_ISBLANK = @GNULIB_ISBLANK@ GNULIB_ISWBLANK = @GNULIB_ISWBLANK@ GNULIB_ISWCTYPE = @GNULIB_ISWCTYPE@ +GNULIB_ISWDIGIT = @GNULIB_ISWDIGIT@ +GNULIB_ISWXDIGIT = @GNULIB_ISWXDIGIT@ GNULIB_LCHMOD = @GNULIB_LCHMOD@ GNULIB_LCHOWN = @GNULIB_LCHOWN@ GNULIB_LINK = @GNULIB_LINK@ @@ -443,6 +455,7 @@ GNULIB_PERROR = @GNULIB_PERROR@ GNULIB_PIPE = @GNULIB_PIPE@ GNULIB_PIPE2 = @GNULIB_PIPE2@ GNULIB_POPEN = @GNULIB_POPEN@ +GNULIB_POSIX_MEMALIGN = @GNULIB_POSIX_MEMALIGN@ GNULIB_POSIX_OPENPT = @GNULIB_POSIX_OPENPT@ GNULIB_PREAD = @GNULIB_PREAD@ GNULIB_PRINTF = @GNULIB_PRINTF@ @@ -491,9 +504,12 @@ GNULIB_SENDTO = @GNULIB_SENDTO@ GNULIB_SETENV = @GNULIB_SETENV@ GNULIB_SETHOSTNAME = @GNULIB_SETHOSTNAME@ GNULIB_SETLOCALE = @GNULIB_SETLOCALE@ +GNULIB_SETLOCALE_NULL = @GNULIB_SETLOCALE_NULL@ GNULIB_SETSOCKOPT = @GNULIB_SETSOCKOPT@ GNULIB_SHUTDOWN = @GNULIB_SHUTDOWN@ +GNULIB_SIGABBREV_NP = @GNULIB_SIGABBREV_NP@ GNULIB_SIGACTION = @GNULIB_SIGACTION@ +GNULIB_SIGDESCR_NP = @GNULIB_SIGDESCR_NP@ GNULIB_SIGNAL_H_SIGPIPE = @GNULIB_SIGNAL_H_SIGPIPE@ GNULIB_SIGPROCMASK = @GNULIB_SIGPROCMASK@ GNULIB_SLEEP = @GNULIB_SLEEP@ @@ -509,6 +525,7 @@ GNULIB_STRCASESTR = @GNULIB_STRCASESTR@ GNULIB_STRCHRNUL = @GNULIB_STRCHRNUL@ GNULIB_STRDUP = @GNULIB_STRDUP@ GNULIB_STRERROR = @GNULIB_STRERROR@ +GNULIB_STRERRORNAME_NP = @GNULIB_STRERRORNAME_NP@ GNULIB_STRERROR_R = @GNULIB_STRERROR_R@ GNULIB_STRFTIME = @GNULIB_STRFTIME@ GNULIB_STRNCAT = @GNULIB_STRNCAT@ @@ -592,11 +609,13 @@ GNULIB_WMEMCHR = @GNULIB_WMEMCHR@ GNULIB_WMEMCMP = @GNULIB_WMEMCMP@ GNULIB_WMEMCPY = @GNULIB_WMEMCPY@ GNULIB_WMEMMOVE = @GNULIB_WMEMMOVE@ +GNULIB_WMEMPCPY = @GNULIB_WMEMPCPY@ GNULIB_WMEMSET = @GNULIB_WMEMSET@ GNULIB_WRITE = @GNULIB_WRITE@ GNULIB__EXIT = @GNULIB__EXIT@ GREP = @GREP@ HAVE_ACCEPT4 = @HAVE_ACCEPT4@ +HAVE_ALIGNED_ALLOC = @HAVE_ALIGNED_ALLOC@ HAVE_ALLOCA_H = @HAVE_ALLOCA_H@ HAVE_ARPA_INET_H = @HAVE_ARPA_INET_H@ HAVE_ATOLL = @HAVE_ATOLL@ @@ -606,12 +625,17 @@ HAVE_CANONICALIZE_FILE_NAME = @HAVE_CANONICALIZE_FILE_NAME@ HAVE_CHOWN = @HAVE_CHOWN@ HAVE_COPY_FILE_RANGE = @HAVE_COPY_FILE_RANGE@ HAVE_CRTDEFS_H = @HAVE_CRTDEFS_H@ +HAVE_DECL_ECVT = @HAVE_DECL_ECVT@ HAVE_DECL_ENVIRON = @HAVE_DECL_ENVIRON@ +HAVE_DECL_EXECVPE = @HAVE_DECL_EXECVPE@ HAVE_DECL_FCHDIR = @HAVE_DECL_FCHDIR@ +HAVE_DECL_FCLOSEALL = @HAVE_DECL_FCLOSEALL@ +HAVE_DECL_FCVT = @HAVE_DECL_FCVT@ HAVE_DECL_FDATASYNC = @HAVE_DECL_FDATASYNC@ HAVE_DECL_FPURGE = @HAVE_DECL_FPURGE@ HAVE_DECL_FSEEKO = @HAVE_DECL_FSEEKO@ HAVE_DECL_FTELLO = @HAVE_DECL_FTELLO@ +HAVE_DECL_GCVT = @HAVE_DECL_GCVT@ HAVE_DECL_GETDELIM = @HAVE_DECL_GETDELIM@ HAVE_DECL_GETDOMAINNAME = @HAVE_DECL_GETDOMAINNAME@ HAVE_DECL_GETLINE = @HAVE_DECL_GETLINE@ @@ -645,10 +669,10 @@ HAVE_DECL_TRUNCATE = @HAVE_DECL_TRUNCATE@ HAVE_DECL_TTYNAME_R = @HAVE_DECL_TTYNAME_R@ HAVE_DECL_UNSETENV = @HAVE_DECL_UNSETENV@ HAVE_DECL_VSNPRINTF = @HAVE_DECL_VSNPRINTF@ +HAVE_DECL_WCSDUP = @HAVE_DECL_WCSDUP@ HAVE_DECL_WCTOB = @HAVE_DECL_WCTOB@ HAVE_DECL_WCWIDTH = @HAVE_DECL_WCWIDTH@ HAVE_DPRINTF = @HAVE_DPRINTF@ -HAVE_DUP2 = @HAVE_DUP2@ HAVE_DUP3 = @HAVE_DUP3@ HAVE_DUPLOCALE = @HAVE_DUPLOCALE@ HAVE_EUIDACCESS = @HAVE_EUIDACCESS@ @@ -670,14 +694,17 @@ HAVE_FTELLO = @HAVE_FTELLO@ HAVE_FTRUNCATE = @HAVE_FTRUNCATE@ HAVE_FUTIMENS = @HAVE_FUTIMENS@ HAVE_GETDTABLESIZE = @HAVE_GETDTABLESIZE@ +HAVE_GETENTROPY = @HAVE_GETENTROPY@ HAVE_GETGROUPS = @HAVE_GETGROUPS@ HAVE_GETHOSTNAME = @HAVE_GETHOSTNAME@ HAVE_GETLOGIN = @HAVE_GETLOGIN@ HAVE_GETOPT_H = @HAVE_GETOPT_H@ HAVE_GETPAGESIZE = @HAVE_GETPAGESIZE@ HAVE_GETPASS = @HAVE_GETPASS@ +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_IMAXDIV_T = @HAVE_IMAXDIV_T@ @@ -696,7 +723,6 @@ HAVE_LCHMOD = @HAVE_LCHMOD@ HAVE_LCHOWN = @HAVE_LCHOWN@ HAVE_LINK = @HAVE_LINK@ HAVE_LINKAT = @HAVE_LINKAT@ -HAVE_LONG_LONG_INT = @HAVE_LONG_LONG_INT@ HAVE_LSTAT = @HAVE_LSTAT@ HAVE_MAX_ALIGN_T = @HAVE_MAX_ALIGN_T@ HAVE_MBRLEN = @HAVE_MBRLEN@ @@ -706,7 +732,6 @@ HAVE_MBSLEN = @HAVE_MBSLEN@ HAVE_MBSNRTOWCS = @HAVE_MBSNRTOWCS@ HAVE_MBSRTOWCS = @HAVE_MBSRTOWCS@ HAVE_MBTOWC = @HAVE_MBTOWC@ -HAVE_MEMCHR = @HAVE_MEMCHR@ HAVE_MEMPCPY = @HAVE_MEMPCPY@ HAVE_MKDIRAT = @HAVE_MKDIRAT@ HAVE_MKDTEMP = @HAVE_MKDTEMP@ @@ -729,6 +754,7 @@ HAVE_PCLOSE = @HAVE_PCLOSE@ HAVE_PIPE = @HAVE_PIPE@ HAVE_PIPE2 = @HAVE_PIPE2@ HAVE_POPEN = @HAVE_POPEN@ +HAVE_POSIX_MEMALIGN = @HAVE_POSIX_MEMALIGN@ HAVE_POSIX_OPENPT = @HAVE_POSIX_OPENPT@ HAVE_POSIX_SIGNALBLOCKING = @HAVE_POSIX_SIGNALBLOCKING@ HAVE_PREAD = @HAVE_PREAD@ @@ -814,7 +840,9 @@ HAVE_SECURE_GETENV = @HAVE_SECURE_GETENV@ HAVE_SETENV = @HAVE_SETENV@ HAVE_SETHOSTNAME = @HAVE_SETHOSTNAME@ HAVE_SETSTATE = @HAVE_SETSTATE@ +HAVE_SIGABBREV_NP = @HAVE_SIGABBREV_NP@ HAVE_SIGACTION = @HAVE_SIGACTION@ +HAVE_SIGDESCR_NP = @HAVE_SIGDESCR_NP@ HAVE_SIGHANDLER_T = @HAVE_SIGHANDLER_T@ HAVE_SIGINFO_T = @HAVE_SIGINFO_T@ HAVE_SIGNED_SIG_ATOMIC_T = @HAVE_SIGNED_SIG_ATOMIC_T@ @@ -827,6 +855,7 @@ HAVE_STPCPY = @HAVE_STPCPY@ HAVE_STPNCPY = @HAVE_STPNCPY@ HAVE_STRCASESTR = @HAVE_STRCASESTR@ HAVE_STRCHRNUL = @HAVE_STRCHRNUL@ +HAVE_STRERRORNAME_NP = @HAVE_STRERRORNAME_NP@ HAVE_STRPBRK = @HAVE_STRPBRK@ HAVE_STRPTIME = @HAVE_STRPTIME@ HAVE_STRSEP = @HAVE_STRSEP@ @@ -849,6 +878,7 @@ HAVE_SYS_INTTYPES_H = @HAVE_SYS_INTTYPES_H@ HAVE_SYS_IOCTL_H = @HAVE_SYS_IOCTL_H@ HAVE_SYS_LOADAVG_H = @HAVE_SYS_LOADAVG_H@ HAVE_SYS_PARAM_H = @HAVE_SYS_PARAM_H@ +HAVE_SYS_RANDOM_H = @HAVE_SYS_RANDOM_H@ HAVE_SYS_SELECT_H = @HAVE_SYS_SELECT_H@ HAVE_SYS_SOCKET_H = @HAVE_SYS_SOCKET_H@ HAVE_SYS_TIME_H = @HAVE_SYS_TIME_H@ @@ -857,15 +887,14 @@ HAVE_SYS_UIO_H = @HAVE_SYS_UIO_H@ HAVE_TIMEGM = @HAVE_TIMEGM@ HAVE_TIMEZONE_T = @HAVE_TIMEZONE_T@ HAVE_TYPE_VOLATILE_SIG_ATOMIC_T = @HAVE_TYPE_VOLATILE_SIG_ATOMIC_T@ -HAVE_TZSET = @HAVE_TZSET@ HAVE_UNISTD_H = @HAVE_UNISTD_H@ HAVE_UNLINKAT = @HAVE_UNLINKAT@ HAVE_UNLOCKPT = @HAVE_UNLOCKPT@ -HAVE_UNSIGNED_LONG_LONG_INT = @HAVE_UNSIGNED_LONG_LONG_INT@ HAVE_USLEEP = @HAVE_USLEEP@ HAVE_UTIMENSAT = @HAVE_UTIMENSAT@ HAVE_VASPRINTF = @HAVE_VASPRINTF@ HAVE_VDPRINTF = @HAVE_VDPRINTF@ +HAVE_VISIBILITY = @HAVE_VISIBILITY@ HAVE_WCHAR_H = @HAVE_WCHAR_H@ HAVE_WCHAR_T = @HAVE_WCHAR_T@ HAVE_WCPCPY = @HAVE_WCPCPY@ @@ -904,6 +933,7 @@ HAVE_WMEMCHR = @HAVE_WMEMCHR@ HAVE_WMEMCMP = @HAVE_WMEMCMP@ HAVE_WMEMCPY = @HAVE_WMEMCPY@ HAVE_WMEMMOVE = @HAVE_WMEMMOVE@ +HAVE_WMEMPCPY = @HAVE_WMEMPCPY@ HAVE_WMEMSET = @HAVE_WMEMSET@ HAVE_WS2TCPIP_H = @HAVE_WS2TCPIP_H@ HAVE_XLOCALE_H = @HAVE_XLOCALE_H@ @@ -929,16 +959,28 @@ LIBICONV = @LIBICONV@ LIBINTL = @LIBINTL@ LIBMULTITHREAD = @LIBMULTITHREAD@ LIBOBJS = @LIBOBJS@ +LIBPMULTITHREAD = @LIBPMULTITHREAD@ +LIBPTHREAD = @LIBPTHREAD@ LIBS = @LIBS@ LIBSOCKET = @LIBSOCKET@ +LIBSTDTHREAD = @LIBSTDTHREAD@ LIBTESTS_LIBDEPS = @LIBTESTS_LIBDEPS@ LIBTHREAD = @LIBTHREAD@ LIBTOOL = @LIBTOOL@ LIB_BLKID = @LIB_BLKID@ +LIB_CLOCK_GETTIME = @LIB_CLOCK_GETTIME@ +LIB_GETRANDOM = @LIB_GETRANDOM@ +LIB_HARD_LOCALE = @LIB_HARD_LOCALE@ +LIB_MBRTOWC = @LIB_MBRTOWC@ LIB_NANOSLEEP = @LIB_NANOSLEEP@ +LIB_NL_LANGINFO = @LIB_NL_LANGINFO@ LIB_PTHREAD = @LIB_PTHREAD@ LIB_PTHREAD_SIGMASK = @LIB_PTHREAD_SIGMASK@ +LIB_SCHED_YIELD = @LIB_SCHED_YIELD@ LIB_SELECT = @LIB_SELECT@ +LIB_SEMAPHORE = @LIB_SEMAPHORE@ +LIB_SETLOCALE = @LIB_SETLOCALE@ +LIB_SETLOCALE_NULL = @LIB_SETLOCALE_NULL@ LIMITS_H = @LIMITS_H@ LIPO = @LIPO@ LN_S = @LN_S@ @@ -987,6 +1029,7 @@ NEXT_AS_FIRST_DIRECTIVE_STDIO_H = @NEXT_AS_FIRST_DIRECTIVE_STDIO_H@ NEXT_AS_FIRST_DIRECTIVE_STDLIB_H = @NEXT_AS_FIRST_DIRECTIVE_STDLIB_H@ NEXT_AS_FIRST_DIRECTIVE_STRING_H = @NEXT_AS_FIRST_DIRECTIVE_STRING_H@ NEXT_AS_FIRST_DIRECTIVE_SYS_IOCTL_H = @NEXT_AS_FIRST_DIRECTIVE_SYS_IOCTL_H@ +NEXT_AS_FIRST_DIRECTIVE_SYS_RANDOM_H = @NEXT_AS_FIRST_DIRECTIVE_SYS_RANDOM_H@ NEXT_AS_FIRST_DIRECTIVE_SYS_SELECT_H = @NEXT_AS_FIRST_DIRECTIVE_SYS_SELECT_H@ NEXT_AS_FIRST_DIRECTIVE_SYS_SOCKET_H = @NEXT_AS_FIRST_DIRECTIVE_SYS_SOCKET_H@ NEXT_AS_FIRST_DIRECTIVE_SYS_STAT_H = @NEXT_AS_FIRST_DIRECTIVE_SYS_STAT_H@ @@ -1016,6 +1059,7 @@ NEXT_STDIO_H = @NEXT_STDIO_H@ NEXT_STDLIB_H = @NEXT_STDLIB_H@ NEXT_STRING_H = @NEXT_STRING_H@ NEXT_SYS_IOCTL_H = @NEXT_SYS_IOCTL_H@ +NEXT_SYS_RANDOM_H = @NEXT_SYS_RANDOM_H@ NEXT_SYS_SELECT_H = @NEXT_SYS_SELECT_H@ NEXT_SYS_SOCKET_H = @NEXT_SYS_SOCKET_H@ NEXT_SYS_STAT_H = @NEXT_SYS_STAT_H@ @@ -1052,21 +1096,24 @@ POSUB = @POSUB@ PRAGMA_COLUMNS = @PRAGMA_COLUMNS@ PRAGMA_SYSTEM_HEADER = @PRAGMA_SYSTEM_HEADER@ PRIPTR_PREFIX = @PRIPTR_PREFIX@ -PRI_MACROS_BROKEN = @PRI_MACROS_BROKEN@ PTHREAD_H_DEFINES_STRUCT_TIMESPEC = @PTHREAD_H_DEFINES_STRUCT_TIMESPEC@ PTRDIFF_T_SUFFIX = @PTRDIFF_T_SUFFIX@ RANLIB = @RANLIB@ +REPLACE_ACCESS = @REPLACE_ACCESS@ +REPLACE_ALIGNED_ALLOC = @REPLACE_ALIGNED_ALLOC@ REPLACE_BTOWC = @REPLACE_BTOWC@ REPLACE_CALLOC = @REPLACE_CALLOC@ REPLACE_CANONICALIZE_FILE_NAME = @REPLACE_CANONICALIZE_FILE_NAME@ REPLACE_CHOWN = @REPLACE_CHOWN@ REPLACE_CLOSE = @REPLACE_CLOSE@ +REPLACE_CREAT = @REPLACE_CREAT@ REPLACE_CTIME = @REPLACE_CTIME@ REPLACE_DPRINTF = @REPLACE_DPRINTF@ REPLACE_DUP = @REPLACE_DUP@ REPLACE_DUP2 = @REPLACE_DUP2@ REPLACE_DUPLOCALE = @REPLACE_DUPLOCALE@ REPLACE_FACCESSAT = @REPLACE_FACCESSAT@ +REPLACE_FCHMODAT = @REPLACE_FCHMODAT@ REPLACE_FCHOWNAT = @REPLACE_FCHOWNAT@ REPLACE_FCLOSE = @REPLACE_FCLOSE@ REPLACE_FCNTL = @REPLACE_FCNTL@ @@ -1094,6 +1141,7 @@ REPLACE_GETLINE = @REPLACE_GETLINE@ REPLACE_GETLOGIN_R = @REPLACE_GETLOGIN_R@ REPLACE_GETPAGESIZE = @REPLACE_GETPAGESIZE@ REPLACE_GETPASS = @REPLACE_GETPASS@ +REPLACE_GETRANDOM = @REPLACE_GETRANDOM@ REPLACE_GETTIMEOFDAY = @REPLACE_GETTIMEOFDAY@ REPLACE_GMTIME = @REPLACE_GMTIME@ REPLACE_INET_NTOP = @REPLACE_INET_NTOP@ @@ -1103,6 +1151,8 @@ REPLACE_IOCTL = @REPLACE_IOCTL@ REPLACE_ISATTY = @REPLACE_ISATTY@ REPLACE_ISWBLANK = @REPLACE_ISWBLANK@ REPLACE_ISWCNTRL = @REPLACE_ISWCNTRL@ +REPLACE_ISWDIGIT = @REPLACE_ISWDIGIT@ +REPLACE_ISWXDIGIT = @REPLACE_ISWXDIGIT@ REPLACE_LCHOWN = @REPLACE_LCHOWN@ REPLACE_LINK = @REPLACE_LINK@ REPLACE_LINKAT = @REPLACE_LINKAT@ @@ -1135,6 +1185,7 @@ REPLACE_OPEN = @REPLACE_OPEN@ REPLACE_OPENAT = @REPLACE_OPENAT@ REPLACE_PERROR = @REPLACE_PERROR@ REPLACE_POPEN = @REPLACE_POPEN@ +REPLACE_POSIX_MEMALIGN = @REPLACE_POSIX_MEMALIGN@ REPLACE_PREAD = @REPLACE_PREAD@ REPLACE_PRINTF = @REPLACE_PRINTF@ REPLACE_PSELECT = @REPLACE_PSELECT@ @@ -1223,6 +1274,7 @@ REPLACE_STRCASESTR = @REPLACE_STRCASESTR@ REPLACE_STRCHRNUL = @REPLACE_STRCHRNUL@ REPLACE_STRDUP = @REPLACE_STRDUP@ REPLACE_STRERROR = @REPLACE_STRERROR@ +REPLACE_STRERRORNAME_NP = @REPLACE_STRERRORNAME_NP@ REPLACE_STRERROR_R = @REPLACE_STRERROR_R@ REPLACE_STRFTIME = @REPLACE_STRFTIME@ REPLACE_STRNCAT = @REPLACE_STRNCAT@ @@ -1260,13 +1312,13 @@ REPLACE_WCRTOMB = @REPLACE_WCRTOMB@ REPLACE_WCSFTIME = @REPLACE_WCSFTIME@ REPLACE_WCSNRTOMBS = @REPLACE_WCSNRTOMBS@ REPLACE_WCSRTOMBS = @REPLACE_WCSRTOMBS@ +REPLACE_WCSTOK = @REPLACE_WCSTOK@ REPLACE_WCSWIDTH = @REPLACE_WCSWIDTH@ REPLACE_WCTOB = @REPLACE_WCTOB@ REPLACE_WCTOMB = @REPLACE_WCTOMB@ REPLACE_WCWIDTH = @REPLACE_WCWIDTH@ REPLACE_WRITE = @REPLACE_WRITE@ SED = @SED@ -SELINUX_LIBS = @SELINUX_LIBS@ SET_MAKE = @SET_MAKE@ SHELL = @SHELL@ SIG_ATOMIC_T_SUFFIX = @SIG_ATOMIC_T_SUFFIX@ @@ -1285,6 +1337,7 @@ UINT32_MAX_LT_UINTMAX_MAX = @UINT32_MAX_LT_UINTMAX_MAX@ UINT64_MAX_EQ_ULONG_MAX = @UINT64_MAX_EQ_ULONG_MAX@ UNDEFINE_STRTOK_R = @UNDEFINE_STRTOK_R@ UNISTD_H_DEFINES_STRUCT_TIMESPEC = @UNISTD_H_DEFINES_STRUCT_TIMESPEC@ +UNISTD_H_HAVE_SYS_RANDOM_H = @UNISTD_H_HAVE_SYS_RANDOM_H@ UNISTD_H_HAVE_WINSOCK2_H = @UNISTD_H_HAVE_WINSOCK2_H@ UNISTD_H_HAVE_WINSOCK2_H_AND_USE_SOCKETS = @UNISTD_H_HAVE_WINSOCK2_H_AND_USE_SOCKETS@ USE_NLS = @USE_NLS@ diff --git a/doc/stamp-vti b/doc/stamp-vti index 900b9ae..f2419f4 100644 --- a/doc/stamp-vti +++ b/doc/stamp-vti @@ -1,4 +1,4 @@ -@set UPDATED 10 October 2019 -@set UPDATED-MONTH October 2019 -@set EDITION 3.3 -@set VERSION 3.3 +@set UPDATED 25 January 2021 +@set UPDATED-MONTH January 2021 +@set EDITION 3.4 +@set VERSION 3.4 diff --git a/doc/version.texi b/doc/version.texi index 900b9ae..f2419f4 100644 --- a/doc/version.texi +++ b/doc/version.texi @@ -1,4 +1,4 @@ -@set UPDATED 10 October 2019 -@set UPDATED-MONTH October 2019 -@set EDITION 3.3 -@set VERSION 3.3 +@set UPDATED 25 January 2021 +@set UPDATED-MONTH January 2021 +@set EDITION 3.4 +@set VERSION 3.4 diff --git a/include/Makefile.in b/include/Makefile.in index a135221..daf704f 100644 --- a/include/Makefile.in +++ b/include/Makefile.in @@ -94,9 +94,9 @@ am__aclocal_m4_deps = $(top_srcdir)/m4/00gnulib.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/calloc.m4 $(top_srcdir)/m4/canonicalize.m4 \ - $(top_srcdir)/m4/close.m4 $(top_srcdir)/m4/codeset.m4 \ - $(top_srcdir)/m4/config-h.m4 $(top_srcdir)/m4/configmake.m4 \ - $(top_srcdir)/m4/ctype.m4 $(top_srcdir)/m4/dirname.m4 \ + $(top_srcdir)/m4/clock_time.m4 $(top_srcdir)/m4/close.m4 \ + $(top_srcdir)/m4/codeset.m4 $(top_srcdir)/m4/config-h.m4 \ + $(top_srcdir)/m4/configmake.m4 $(top_srcdir)/m4/ctype.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 \ @@ -108,15 +108,13 @@ am__aclocal_m4_deps = $(top_srcdir)/m4/00gnulib.m4 \ $(top_srcdir)/m4/fsync.m4 $(top_srcdir)/m4/ftruncate.m4 \ $(top_srcdir)/m4/getcwd.m4 $(top_srcdir)/m4/getdtablesize.m4 \ $(top_srcdir)/m4/getopt.m4 $(top_srcdir)/m4/getpagesize.m4 \ - $(top_srcdir)/m4/getprogname.m4 $(top_srcdir)/m4/gettext.m4 \ - $(top_srcdir)/m4/gettimeofday.m4 $(top_srcdir)/m4/glibc21.m4 \ - $(top_srcdir)/m4/gnulib-common.m4 \ - $(top_srcdir)/m4/gnulib-comp.m4 \ - $(top_srcdir)/m4/host-cpu-c-abi.m4 $(top_srcdir)/m4/iconv.m4 \ + $(top_srcdir)/m4/getprogname.m4 $(top_srcdir)/m4/getrandom.m4 \ + $(top_srcdir)/m4/gettext.m4 $(top_srcdir)/m4/gettimeofday.m4 \ + $(top_srcdir)/m4/glibc21.m4 $(top_srcdir)/m4/gnulib-common.m4 \ + $(top_srcdir)/m4/gnulib-comp.m4 $(top_srcdir)/m4/iconv.m4 \ $(top_srcdir)/m4/include_next.m4 $(top_srcdir)/m4/inet_pton.m4 \ $(top_srcdir)/m4/intl-thread-locale.m4 \ - $(top_srcdir)/m4/intlmacosx.m4 \ - $(top_srcdir)/m4/inttypes-pri.m4 $(top_srcdir)/m4/inttypes.m4 \ + $(top_srcdir)/m4/intlmacosx.m4 $(top_srcdir)/m4/inttypes.m4 \ $(top_srcdir)/m4/ioctl.m4 $(top_srcdir)/m4/isblank.m4 \ $(top_srcdir)/m4/langinfo_h.m4 $(top_srcdir)/m4/largefile.m4 \ $(top_srcdir)/m4/lcmessage.m4 $(top_srcdir)/m4/lib-ignore.m4 \ @@ -126,25 +124,26 @@ am__aclocal_m4_deps = $(top_srcdir)/m4/00gnulib.m4 \ $(top_srcdir)/m4/locale-fr.m4 $(top_srcdir)/m4/locale-ja.m4 \ $(top_srcdir)/m4/locale-tr.m4 $(top_srcdir)/m4/locale-zh.m4 \ $(top_srcdir)/m4/locale_h.m4 $(top_srcdir)/m4/localeconv.m4 \ - $(top_srcdir)/m4/localename.m4 \ - $(top_srcdir)/m4/localtime-buffer.m4 $(top_srcdir)/m4/lock.m4 \ - $(top_srcdir)/m4/longlong.m4 $(top_srcdir)/m4/lseek.m4 \ - $(top_srcdir)/m4/lstat.m4 $(top_srcdir)/m4/ltoptions.m4 \ - $(top_srcdir)/m4/ltsugar.m4 $(top_srcdir)/m4/ltversion.m4 \ - $(top_srcdir)/m4/lt~obsolete.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/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/localename.m4 $(top_srcdir)/m4/lock.m4 \ + $(top_srcdir)/m4/lseek.m4 $(top_srcdir)/m4/lstat.m4 \ + $(top_srcdir)/m4/ltoptions.m4 $(top_srcdir)/m4/ltsugar.m4 \ + $(top_srcdir)/m4/ltversion.m4 $(top_srcdir)/m4/lt~obsolete.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/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/nanosleep.m4 $(top_srcdir)/m4/netinet_in_h.m4 \ + $(top_srcdir)/m4/musl.m4 $(top_srcdir)/m4/nanosleep.m4 \ + $(top_srcdir)/m4/netinet_in_h.m4 \ $(top_srcdir)/m4/nl_langinfo.m4 $(top_srcdir)/m4/nls.m4 \ $(top_srcdir)/m4/nocrash.m4 $(top_srcdir)/m4/o-direct.m4 \ $(top_srcdir)/m4/off_t.m4 $(top_srcdir)/m4/open-cloexec.m4 \ - $(top_srcdir)/m4/open.m4 $(top_srcdir)/m4/pathmax.m4 \ - $(top_srcdir)/m4/perror.m4 $(top_srcdir)/m4/pipe.m4 \ + $(top_srcdir)/m4/open-slash.m4 $(top_srcdir)/m4/open.m4 \ + $(top_srcdir)/m4/pathmax.m4 $(top_srcdir)/m4/perror.m4 \ + $(top_srcdir)/m4/pid_t.m4 $(top_srcdir)/m4/pipe.m4 \ $(top_srcdir)/m4/po.m4 $(top_srcdir)/m4/priv-set.m4 \ $(top_srcdir)/m4/progtest.m4 \ $(top_srcdir)/m4/pthread-thread.m4 \ @@ -156,9 +155,10 @@ am__aclocal_m4_deps = $(top_srcdir)/m4/00gnulib.m4 \ $(top_srcdir)/m4/readlink.m4 $(top_srcdir)/m4/realloc.m4 \ $(top_srcdir)/m4/regex.m4 $(top_srcdir)/m4/rpmatch.m4 \ $(top_srcdir)/m4/safe-read.m4 $(top_srcdir)/m4/sched_h.m4 \ - $(top_srcdir)/m4/select.m4 $(top_srcdir)/m4/setenv.m4 \ - $(top_srcdir)/m4/setlocale.m4 $(top_srcdir)/m4/sigaction.m4 \ - $(top_srcdir)/m4/signal_h.m4 \ + $(top_srcdir)/m4/select.m4 $(top_srcdir)/m4/semaphore.m4 \ + $(top_srcdir)/m4/setenv.m4 $(top_srcdir)/m4/setlocale.m4 \ + $(top_srcdir)/m4/setlocale_null.m4 \ + $(top_srcdir)/m4/sigaction.m4 $(top_srcdir)/m4/signal_h.m4 \ $(top_srcdir)/m4/signalblocking.m4 $(top_srcdir)/m4/sleep.m4 \ $(top_srcdir)/m4/socketlib.m4 $(top_srcdir)/m4/sockets.m4 \ $(top_srcdir)/m4/socklen.m4 $(top_srcdir)/m4/sockpfaf.m4 \ @@ -173,6 +173,7 @@ am__aclocal_m4_deps = $(top_srcdir)/m4/00gnulib.m4 \ $(top_srcdir)/m4/strnlen.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 \ @@ -181,14 +182,15 @@ am__aclocal_m4_deps = $(top_srcdir)/m4/00gnulib.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/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/xstrndup.m4 $(top_srcdir)/m4/xstrtol.m4 \ - $(top_srcdir)/m4/yield.m4 $(top_srcdir)/configure.ac + $(top_srcdir)/m4/yield.m4 $(top_srcdir)/m4/zzgnulib.m4 \ + $(top_srcdir)/configure.ac am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \ $(ACLOCAL_M4) DIST_COMMON = $(srcdir)/Makefile.am $(am__DIST_COMMON) @@ -300,6 +302,7 @@ BUILDINFO = @BUILDINFO@ CC = @CC@ CCDEPMODE = @CCDEPMODE@ CFLAGS = @CFLAGS@ +CFLAG_VISIBILITY = @CFLAG_VISIBILITY@ CHECK_CFLAGS = @CHECK_CFLAGS@ CHECK_LIBS = @CHECK_LIBS@ CONFIG_INCLUDE = @CONFIG_INCLUDE@ @@ -334,6 +337,8 @@ GMSGFMT = @GMSGFMT@ GMSGFMT_015 = @GMSGFMT_015@ GNULIB_ACCEPT = @GNULIB_ACCEPT@ GNULIB_ACCEPT4 = @GNULIB_ACCEPT4@ +GNULIB_ACCESS = @GNULIB_ACCESS@ +GNULIB_ALIGNED_ALLOC = @GNULIB_ALIGNED_ALLOC@ GNULIB_ATOLL = @GNULIB_ATOLL@ GNULIB_BIND = @GNULIB_BIND@ GNULIB_BTOWC = @GNULIB_BTOWC@ @@ -344,6 +349,7 @@ GNULIB_CHOWN = @GNULIB_CHOWN@ GNULIB_CLOSE = @GNULIB_CLOSE@ GNULIB_CONNECT = @GNULIB_CONNECT@ GNULIB_COPY_FILE_RANGE = @GNULIB_COPY_FILE_RANGE@ +GNULIB_CREAT = @GNULIB_CREAT@ GNULIB_CTIME = @GNULIB_CTIME@ GNULIB_DPRINTF = @GNULIB_DPRINTF@ GNULIB_DUP = @GNULIB_DUP@ @@ -391,19 +397,23 @@ GNULIB_GETCWD = @GNULIB_GETCWD@ GNULIB_GETDELIM = @GNULIB_GETDELIM@ GNULIB_GETDOMAINNAME = @GNULIB_GETDOMAINNAME@ GNULIB_GETDTABLESIZE = @GNULIB_GETDTABLESIZE@ +GNULIB_GETENTROPY = @GNULIB_GETENTROPY@ GNULIB_GETGROUPS = @GNULIB_GETGROUPS@ GNULIB_GETHOSTNAME = @GNULIB_GETHOSTNAME@ GNULIB_GETLINE = @GNULIB_GETLINE@ GNULIB_GETLOADAVG = @GNULIB_GETLOADAVG@ GNULIB_GETLOGIN = @GNULIB_GETLOGIN@ GNULIB_GETLOGIN_R = @GNULIB_GETLOGIN_R@ +GNULIB_GETOPT_POSIX = @GNULIB_GETOPT_POSIX@ GNULIB_GETPAGESIZE = @GNULIB_GETPAGESIZE@ GNULIB_GETPASS = @GNULIB_GETPASS@ GNULIB_GETPEERNAME = @GNULIB_GETPEERNAME@ +GNULIB_GETRANDOM = @GNULIB_GETRANDOM@ GNULIB_GETSOCKNAME = @GNULIB_GETSOCKNAME@ GNULIB_GETSOCKOPT = @GNULIB_GETSOCKOPT@ GNULIB_GETSUBOPT = @GNULIB_GETSUBOPT@ GNULIB_GETTIMEOFDAY = @GNULIB_GETTIMEOFDAY@ +GNULIB_GETUMASK = @GNULIB_GETUMASK@ GNULIB_GETUSERSHELL = @GNULIB_GETUSERSHELL@ GNULIB_GL_UNISTD_H_GETOPT = @GNULIB_GL_UNISTD_H_GETOPT@ GNULIB_GRANTPT = @GNULIB_GRANTPT@ @@ -417,6 +427,8 @@ GNULIB_ISATTY = @GNULIB_ISATTY@ GNULIB_ISBLANK = @GNULIB_ISBLANK@ GNULIB_ISWBLANK = @GNULIB_ISWBLANK@ GNULIB_ISWCTYPE = @GNULIB_ISWCTYPE@ +GNULIB_ISWDIGIT = @GNULIB_ISWDIGIT@ +GNULIB_ISWXDIGIT = @GNULIB_ISWXDIGIT@ GNULIB_LCHMOD = @GNULIB_LCHMOD@ GNULIB_LCHOWN = @GNULIB_LCHOWN@ GNULIB_LINK = @GNULIB_LINK@ @@ -477,6 +489,7 @@ GNULIB_PERROR = @GNULIB_PERROR@ GNULIB_PIPE = @GNULIB_PIPE@ GNULIB_PIPE2 = @GNULIB_PIPE2@ GNULIB_POPEN = @GNULIB_POPEN@ +GNULIB_POSIX_MEMALIGN = @GNULIB_POSIX_MEMALIGN@ GNULIB_POSIX_OPENPT = @GNULIB_POSIX_OPENPT@ GNULIB_PREAD = @GNULIB_PREAD@ GNULIB_PRINTF = @GNULIB_PRINTF@ @@ -525,9 +538,12 @@ GNULIB_SENDTO = @GNULIB_SENDTO@ GNULIB_SETENV = @GNULIB_SETENV@ GNULIB_SETHOSTNAME = @GNULIB_SETHOSTNAME@ GNULIB_SETLOCALE = @GNULIB_SETLOCALE@ +GNULIB_SETLOCALE_NULL = @GNULIB_SETLOCALE_NULL@ GNULIB_SETSOCKOPT = @GNULIB_SETSOCKOPT@ GNULIB_SHUTDOWN = @GNULIB_SHUTDOWN@ +GNULIB_SIGABBREV_NP = @GNULIB_SIGABBREV_NP@ GNULIB_SIGACTION = @GNULIB_SIGACTION@ +GNULIB_SIGDESCR_NP = @GNULIB_SIGDESCR_NP@ GNULIB_SIGNAL_H_SIGPIPE = @GNULIB_SIGNAL_H_SIGPIPE@ GNULIB_SIGPROCMASK = @GNULIB_SIGPROCMASK@ GNULIB_SLEEP = @GNULIB_SLEEP@ @@ -543,6 +559,7 @@ GNULIB_STRCASESTR = @GNULIB_STRCASESTR@ GNULIB_STRCHRNUL = @GNULIB_STRCHRNUL@ GNULIB_STRDUP = @GNULIB_STRDUP@ GNULIB_STRERROR = @GNULIB_STRERROR@ +GNULIB_STRERRORNAME_NP = @GNULIB_STRERRORNAME_NP@ GNULIB_STRERROR_R = @GNULIB_STRERROR_R@ GNULIB_STRFTIME = @GNULIB_STRFTIME@ GNULIB_STRNCAT = @GNULIB_STRNCAT@ @@ -626,11 +643,13 @@ GNULIB_WMEMCHR = @GNULIB_WMEMCHR@ GNULIB_WMEMCMP = @GNULIB_WMEMCMP@ GNULIB_WMEMCPY = @GNULIB_WMEMCPY@ GNULIB_WMEMMOVE = @GNULIB_WMEMMOVE@ +GNULIB_WMEMPCPY = @GNULIB_WMEMPCPY@ GNULIB_WMEMSET = @GNULIB_WMEMSET@ GNULIB_WRITE = @GNULIB_WRITE@ GNULIB__EXIT = @GNULIB__EXIT@ GREP = @GREP@ HAVE_ACCEPT4 = @HAVE_ACCEPT4@ +HAVE_ALIGNED_ALLOC = @HAVE_ALIGNED_ALLOC@ HAVE_ALLOCA_H = @HAVE_ALLOCA_H@ HAVE_ARPA_INET_H = @HAVE_ARPA_INET_H@ HAVE_ATOLL = @HAVE_ATOLL@ @@ -640,12 +659,17 @@ HAVE_CANONICALIZE_FILE_NAME = @HAVE_CANONICALIZE_FILE_NAME@ HAVE_CHOWN = @HAVE_CHOWN@ HAVE_COPY_FILE_RANGE = @HAVE_COPY_FILE_RANGE@ HAVE_CRTDEFS_H = @HAVE_CRTDEFS_H@ +HAVE_DECL_ECVT = @HAVE_DECL_ECVT@ HAVE_DECL_ENVIRON = @HAVE_DECL_ENVIRON@ +HAVE_DECL_EXECVPE = @HAVE_DECL_EXECVPE@ HAVE_DECL_FCHDIR = @HAVE_DECL_FCHDIR@ +HAVE_DECL_FCLOSEALL = @HAVE_DECL_FCLOSEALL@ +HAVE_DECL_FCVT = @HAVE_DECL_FCVT@ HAVE_DECL_FDATASYNC = @HAVE_DECL_FDATASYNC@ HAVE_DECL_FPURGE = @HAVE_DECL_FPURGE@ HAVE_DECL_FSEEKO = @HAVE_DECL_FSEEKO@ HAVE_DECL_FTELLO = @HAVE_DECL_FTELLO@ +HAVE_DECL_GCVT = @HAVE_DECL_GCVT@ HAVE_DECL_GETDELIM = @HAVE_DECL_GETDELIM@ HAVE_DECL_GETDOMAINNAME = @HAVE_DECL_GETDOMAINNAME@ HAVE_DECL_GETLINE = @HAVE_DECL_GETLINE@ @@ -679,10 +703,10 @@ HAVE_DECL_TRUNCATE = @HAVE_DECL_TRUNCATE@ HAVE_DECL_TTYNAME_R = @HAVE_DECL_TTYNAME_R@ HAVE_DECL_UNSETENV = @HAVE_DECL_UNSETENV@ HAVE_DECL_VSNPRINTF = @HAVE_DECL_VSNPRINTF@ +HAVE_DECL_WCSDUP = @HAVE_DECL_WCSDUP@ HAVE_DECL_WCTOB = @HAVE_DECL_WCTOB@ HAVE_DECL_WCWIDTH = @HAVE_DECL_WCWIDTH@ HAVE_DPRINTF = @HAVE_DPRINTF@ -HAVE_DUP2 = @HAVE_DUP2@ HAVE_DUP3 = @HAVE_DUP3@ HAVE_DUPLOCALE = @HAVE_DUPLOCALE@ HAVE_EUIDACCESS = @HAVE_EUIDACCESS@ @@ -704,14 +728,17 @@ HAVE_FTELLO = @HAVE_FTELLO@ HAVE_FTRUNCATE = @HAVE_FTRUNCATE@ HAVE_FUTIMENS = @HAVE_FUTIMENS@ HAVE_GETDTABLESIZE = @HAVE_GETDTABLESIZE@ +HAVE_GETENTROPY = @HAVE_GETENTROPY@ HAVE_GETGROUPS = @HAVE_GETGROUPS@ HAVE_GETHOSTNAME = @HAVE_GETHOSTNAME@ HAVE_GETLOGIN = @HAVE_GETLOGIN@ HAVE_GETOPT_H = @HAVE_GETOPT_H@ HAVE_GETPAGESIZE = @HAVE_GETPAGESIZE@ HAVE_GETPASS = @HAVE_GETPASS@ +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_IMAXDIV_T = @HAVE_IMAXDIV_T@ @@ -730,7 +757,6 @@ HAVE_LCHMOD = @HAVE_LCHMOD@ HAVE_LCHOWN = @HAVE_LCHOWN@ HAVE_LINK = @HAVE_LINK@ HAVE_LINKAT = @HAVE_LINKAT@ -HAVE_LONG_LONG_INT = @HAVE_LONG_LONG_INT@ HAVE_LSTAT = @HAVE_LSTAT@ HAVE_MAX_ALIGN_T = @HAVE_MAX_ALIGN_T@ HAVE_MBRLEN = @HAVE_MBRLEN@ @@ -740,7 +766,6 @@ HAVE_MBSLEN = @HAVE_MBSLEN@ HAVE_MBSNRTOWCS = @HAVE_MBSNRTOWCS@ HAVE_MBSRTOWCS = @HAVE_MBSRTOWCS@ HAVE_MBTOWC = @HAVE_MBTOWC@ -HAVE_MEMCHR = @HAVE_MEMCHR@ HAVE_MEMPCPY = @HAVE_MEMPCPY@ HAVE_MKDIRAT = @HAVE_MKDIRAT@ HAVE_MKDTEMP = @HAVE_MKDTEMP@ @@ -763,6 +788,7 @@ HAVE_PCLOSE = @HAVE_PCLOSE@ HAVE_PIPE = @HAVE_PIPE@ HAVE_PIPE2 = @HAVE_PIPE2@ HAVE_POPEN = @HAVE_POPEN@ +HAVE_POSIX_MEMALIGN = @HAVE_POSIX_MEMALIGN@ HAVE_POSIX_OPENPT = @HAVE_POSIX_OPENPT@ HAVE_POSIX_SIGNALBLOCKING = @HAVE_POSIX_SIGNALBLOCKING@ HAVE_PREAD = @HAVE_PREAD@ @@ -848,7 +874,9 @@ HAVE_SECURE_GETENV = @HAVE_SECURE_GETENV@ HAVE_SETENV = @HAVE_SETENV@ HAVE_SETHOSTNAME = @HAVE_SETHOSTNAME@ HAVE_SETSTATE = @HAVE_SETSTATE@ +HAVE_SIGABBREV_NP = @HAVE_SIGABBREV_NP@ HAVE_SIGACTION = @HAVE_SIGACTION@ +HAVE_SIGDESCR_NP = @HAVE_SIGDESCR_NP@ HAVE_SIGHANDLER_T = @HAVE_SIGHANDLER_T@ HAVE_SIGINFO_T = @HAVE_SIGINFO_T@ HAVE_SIGNED_SIG_ATOMIC_T = @HAVE_SIGNED_SIG_ATOMIC_T@ @@ -861,6 +889,7 @@ HAVE_STPCPY = @HAVE_STPCPY@ HAVE_STPNCPY = @HAVE_STPNCPY@ HAVE_STRCASESTR = @HAVE_STRCASESTR@ HAVE_STRCHRNUL = @HAVE_STRCHRNUL@ +HAVE_STRERRORNAME_NP = @HAVE_STRERRORNAME_NP@ HAVE_STRPBRK = @HAVE_STRPBRK@ HAVE_STRPTIME = @HAVE_STRPTIME@ HAVE_STRSEP = @HAVE_STRSEP@ @@ -883,6 +912,7 @@ HAVE_SYS_INTTYPES_H = @HAVE_SYS_INTTYPES_H@ HAVE_SYS_IOCTL_H = @HAVE_SYS_IOCTL_H@ HAVE_SYS_LOADAVG_H = @HAVE_SYS_LOADAVG_H@ HAVE_SYS_PARAM_H = @HAVE_SYS_PARAM_H@ +HAVE_SYS_RANDOM_H = @HAVE_SYS_RANDOM_H@ HAVE_SYS_SELECT_H = @HAVE_SYS_SELECT_H@ HAVE_SYS_SOCKET_H = @HAVE_SYS_SOCKET_H@ HAVE_SYS_TIME_H = @HAVE_SYS_TIME_H@ @@ -891,15 +921,14 @@ HAVE_SYS_UIO_H = @HAVE_SYS_UIO_H@ HAVE_TIMEGM = @HAVE_TIMEGM@ HAVE_TIMEZONE_T = @HAVE_TIMEZONE_T@ HAVE_TYPE_VOLATILE_SIG_ATOMIC_T = @HAVE_TYPE_VOLATILE_SIG_ATOMIC_T@ -HAVE_TZSET = @HAVE_TZSET@ HAVE_UNISTD_H = @HAVE_UNISTD_H@ HAVE_UNLINKAT = @HAVE_UNLINKAT@ HAVE_UNLOCKPT = @HAVE_UNLOCKPT@ -HAVE_UNSIGNED_LONG_LONG_INT = @HAVE_UNSIGNED_LONG_LONG_INT@ HAVE_USLEEP = @HAVE_USLEEP@ HAVE_UTIMENSAT = @HAVE_UTIMENSAT@ HAVE_VASPRINTF = @HAVE_VASPRINTF@ HAVE_VDPRINTF = @HAVE_VDPRINTF@ +HAVE_VISIBILITY = @HAVE_VISIBILITY@ HAVE_WCHAR_H = @HAVE_WCHAR_H@ HAVE_WCHAR_T = @HAVE_WCHAR_T@ HAVE_WCPCPY = @HAVE_WCPCPY@ @@ -938,6 +967,7 @@ HAVE_WMEMCHR = @HAVE_WMEMCHR@ HAVE_WMEMCMP = @HAVE_WMEMCMP@ HAVE_WMEMCPY = @HAVE_WMEMCPY@ HAVE_WMEMMOVE = @HAVE_WMEMMOVE@ +HAVE_WMEMPCPY = @HAVE_WMEMPCPY@ HAVE_WMEMSET = @HAVE_WMEMSET@ HAVE_WS2TCPIP_H = @HAVE_WS2TCPIP_H@ HAVE_XLOCALE_H = @HAVE_XLOCALE_H@ @@ -963,16 +993,28 @@ LIBICONV = @LIBICONV@ LIBINTL = @LIBINTL@ LIBMULTITHREAD = @LIBMULTITHREAD@ LIBOBJS = @LIBOBJS@ +LIBPMULTITHREAD = @LIBPMULTITHREAD@ +LIBPTHREAD = @LIBPTHREAD@ LIBS = @LIBS@ LIBSOCKET = @LIBSOCKET@ +LIBSTDTHREAD = @LIBSTDTHREAD@ LIBTESTS_LIBDEPS = @LIBTESTS_LIBDEPS@ LIBTHREAD = @LIBTHREAD@ LIBTOOL = @LIBTOOL@ LIB_BLKID = @LIB_BLKID@ +LIB_CLOCK_GETTIME = @LIB_CLOCK_GETTIME@ +LIB_GETRANDOM = @LIB_GETRANDOM@ +LIB_HARD_LOCALE = @LIB_HARD_LOCALE@ +LIB_MBRTOWC = @LIB_MBRTOWC@ LIB_NANOSLEEP = @LIB_NANOSLEEP@ +LIB_NL_LANGINFO = @LIB_NL_LANGINFO@ LIB_PTHREAD = @LIB_PTHREAD@ LIB_PTHREAD_SIGMASK = @LIB_PTHREAD_SIGMASK@ +LIB_SCHED_YIELD = @LIB_SCHED_YIELD@ LIB_SELECT = @LIB_SELECT@ +LIB_SEMAPHORE = @LIB_SEMAPHORE@ +LIB_SETLOCALE = @LIB_SETLOCALE@ +LIB_SETLOCALE_NULL = @LIB_SETLOCALE_NULL@ LIMITS_H = @LIMITS_H@ LIPO = @LIPO@ LN_S = @LN_S@ @@ -1021,6 +1063,7 @@ NEXT_AS_FIRST_DIRECTIVE_STDIO_H = @NEXT_AS_FIRST_DIRECTIVE_STDIO_H@ NEXT_AS_FIRST_DIRECTIVE_STDLIB_H = @NEXT_AS_FIRST_DIRECTIVE_STDLIB_H@ NEXT_AS_FIRST_DIRECTIVE_STRING_H = @NEXT_AS_FIRST_DIRECTIVE_STRING_H@ NEXT_AS_FIRST_DIRECTIVE_SYS_IOCTL_H = @NEXT_AS_FIRST_DIRECTIVE_SYS_IOCTL_H@ +NEXT_AS_FIRST_DIRECTIVE_SYS_RANDOM_H = @NEXT_AS_FIRST_DIRECTIVE_SYS_RANDOM_H@ NEXT_AS_FIRST_DIRECTIVE_SYS_SELECT_H = @NEXT_AS_FIRST_DIRECTIVE_SYS_SELECT_H@ NEXT_AS_FIRST_DIRECTIVE_SYS_SOCKET_H = @NEXT_AS_FIRST_DIRECTIVE_SYS_SOCKET_H@ NEXT_AS_FIRST_DIRECTIVE_SYS_STAT_H = @NEXT_AS_FIRST_DIRECTIVE_SYS_STAT_H@ @@ -1050,6 +1093,7 @@ NEXT_STDIO_H = @NEXT_STDIO_H@ NEXT_STDLIB_H = @NEXT_STDLIB_H@ NEXT_STRING_H = @NEXT_STRING_H@ NEXT_SYS_IOCTL_H = @NEXT_SYS_IOCTL_H@ +NEXT_SYS_RANDOM_H = @NEXT_SYS_RANDOM_H@ NEXT_SYS_SELECT_H = @NEXT_SYS_SELECT_H@ NEXT_SYS_SOCKET_H = @NEXT_SYS_SOCKET_H@ NEXT_SYS_STAT_H = @NEXT_SYS_STAT_H@ @@ -1086,21 +1130,24 @@ POSUB = @POSUB@ PRAGMA_COLUMNS = @PRAGMA_COLUMNS@ PRAGMA_SYSTEM_HEADER = @PRAGMA_SYSTEM_HEADER@ PRIPTR_PREFIX = @PRIPTR_PREFIX@ -PRI_MACROS_BROKEN = @PRI_MACROS_BROKEN@ PTHREAD_H_DEFINES_STRUCT_TIMESPEC = @PTHREAD_H_DEFINES_STRUCT_TIMESPEC@ PTRDIFF_T_SUFFIX = @PTRDIFF_T_SUFFIX@ RANLIB = @RANLIB@ +REPLACE_ACCESS = @REPLACE_ACCESS@ +REPLACE_ALIGNED_ALLOC = @REPLACE_ALIGNED_ALLOC@ REPLACE_BTOWC = @REPLACE_BTOWC@ REPLACE_CALLOC = @REPLACE_CALLOC@ REPLACE_CANONICALIZE_FILE_NAME = @REPLACE_CANONICALIZE_FILE_NAME@ REPLACE_CHOWN = @REPLACE_CHOWN@ REPLACE_CLOSE = @REPLACE_CLOSE@ +REPLACE_CREAT = @REPLACE_CREAT@ REPLACE_CTIME = @REPLACE_CTIME@ REPLACE_DPRINTF = @REPLACE_DPRINTF@ REPLACE_DUP = @REPLACE_DUP@ REPLACE_DUP2 = @REPLACE_DUP2@ REPLACE_DUPLOCALE = @REPLACE_DUPLOCALE@ REPLACE_FACCESSAT = @REPLACE_FACCESSAT@ +REPLACE_FCHMODAT = @REPLACE_FCHMODAT@ REPLACE_FCHOWNAT = @REPLACE_FCHOWNAT@ REPLACE_FCLOSE = @REPLACE_FCLOSE@ REPLACE_FCNTL = @REPLACE_FCNTL@ @@ -1128,6 +1175,7 @@ REPLACE_GETLINE = @REPLACE_GETLINE@ REPLACE_GETLOGIN_R = @REPLACE_GETLOGIN_R@ REPLACE_GETPAGESIZE = @REPLACE_GETPAGESIZE@ REPLACE_GETPASS = @REPLACE_GETPASS@ +REPLACE_GETRANDOM = @REPLACE_GETRANDOM@ REPLACE_GETTIMEOFDAY = @REPLACE_GETTIMEOFDAY@ REPLACE_GMTIME = @REPLACE_GMTIME@ REPLACE_INET_NTOP = @REPLACE_INET_NTOP@ @@ -1137,6 +1185,8 @@ REPLACE_IOCTL = @REPLACE_IOCTL@ REPLACE_ISATTY = @REPLACE_ISATTY@ REPLACE_ISWBLANK = @REPLACE_ISWBLANK@ REPLACE_ISWCNTRL = @REPLACE_ISWCNTRL@ +REPLACE_ISWDIGIT = @REPLACE_ISWDIGIT@ +REPLACE_ISWXDIGIT = @REPLACE_ISWXDIGIT@ REPLACE_LCHOWN = @REPLACE_LCHOWN@ REPLACE_LINK = @REPLACE_LINK@ REPLACE_LINKAT = @REPLACE_LINKAT@ @@ -1169,6 +1219,7 @@ REPLACE_OPEN = @REPLACE_OPEN@ REPLACE_OPENAT = @REPLACE_OPENAT@ REPLACE_PERROR = @REPLACE_PERROR@ REPLACE_POPEN = @REPLACE_POPEN@ +REPLACE_POSIX_MEMALIGN = @REPLACE_POSIX_MEMALIGN@ REPLACE_PREAD = @REPLACE_PREAD@ REPLACE_PRINTF = @REPLACE_PRINTF@ REPLACE_PSELECT = @REPLACE_PSELECT@ @@ -1257,6 +1308,7 @@ REPLACE_STRCASESTR = @REPLACE_STRCASESTR@ REPLACE_STRCHRNUL = @REPLACE_STRCHRNUL@ REPLACE_STRDUP = @REPLACE_STRDUP@ REPLACE_STRERROR = @REPLACE_STRERROR@ +REPLACE_STRERRORNAME_NP = @REPLACE_STRERRORNAME_NP@ REPLACE_STRERROR_R = @REPLACE_STRERROR_R@ REPLACE_STRFTIME = @REPLACE_STRFTIME@ REPLACE_STRNCAT = @REPLACE_STRNCAT@ @@ -1294,13 +1346,13 @@ REPLACE_WCRTOMB = @REPLACE_WCRTOMB@ REPLACE_WCSFTIME = @REPLACE_WCSFTIME@ REPLACE_WCSNRTOMBS = @REPLACE_WCSNRTOMBS@ REPLACE_WCSRTOMBS = @REPLACE_WCSRTOMBS@ +REPLACE_WCSTOK = @REPLACE_WCSTOK@ REPLACE_WCSWIDTH = @REPLACE_WCSWIDTH@ REPLACE_WCTOB = @REPLACE_WCTOB@ REPLACE_WCTOMB = @REPLACE_WCTOMB@ REPLACE_WCWIDTH = @REPLACE_WCWIDTH@ REPLACE_WRITE = @REPLACE_WRITE@ SED = @SED@ -SELINUX_LIBS = @SELINUX_LIBS@ SET_MAKE = @SET_MAKE@ SHELL = @SHELL@ SIG_ATOMIC_T_SUFFIX = @SIG_ATOMIC_T_SUFFIX@ @@ -1319,6 +1371,7 @@ UINT32_MAX_LT_UINTMAX_MAX = @UINT32_MAX_LT_UINTMAX_MAX@ UINT64_MAX_EQ_ULONG_MAX = @UINT64_MAX_EQ_ULONG_MAX@ UNDEFINE_STRTOK_R = @UNDEFINE_STRTOK_R@ UNISTD_H_DEFINES_STRUCT_TIMESPEC = @UNISTD_H_DEFINES_STRUCT_TIMESPEC@ +UNISTD_H_HAVE_SYS_RANDOM_H = @UNISTD_H_HAVE_SYS_RANDOM_H@ UNISTD_H_HAVE_WINSOCK2_H = @UNISTD_H_HAVE_WINSOCK2_H@ UNISTD_H_HAVE_WINSOCK2_H_AND_USE_SOCKETS = @UNISTD_H_HAVE_WINSOCK2_H_AND_USE_SOCKETS@ USE_NLS = @USE_NLS@ diff --git a/include/parted/Makefile.in b/include/parted/Makefile.in index c4be933..7f0e433 100644 --- a/include/parted/Makefile.in +++ b/include/parted/Makefile.in @@ -95,9 +95,9 @@ am__aclocal_m4_deps = $(top_srcdir)/m4/00gnulib.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/calloc.m4 $(top_srcdir)/m4/canonicalize.m4 \ - $(top_srcdir)/m4/close.m4 $(top_srcdir)/m4/codeset.m4 \ - $(top_srcdir)/m4/config-h.m4 $(top_srcdir)/m4/configmake.m4 \ - $(top_srcdir)/m4/ctype.m4 $(top_srcdir)/m4/dirname.m4 \ + $(top_srcdir)/m4/clock_time.m4 $(top_srcdir)/m4/close.m4 \ + $(top_srcdir)/m4/codeset.m4 $(top_srcdir)/m4/config-h.m4 \ + $(top_srcdir)/m4/configmake.m4 $(top_srcdir)/m4/ctype.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 \ @@ -109,15 +109,13 @@ am__aclocal_m4_deps = $(top_srcdir)/m4/00gnulib.m4 \ $(top_srcdir)/m4/fsync.m4 $(top_srcdir)/m4/ftruncate.m4 \ $(top_srcdir)/m4/getcwd.m4 $(top_srcdir)/m4/getdtablesize.m4 \ $(top_srcdir)/m4/getopt.m4 $(top_srcdir)/m4/getpagesize.m4 \ - $(top_srcdir)/m4/getprogname.m4 $(top_srcdir)/m4/gettext.m4 \ - $(top_srcdir)/m4/gettimeofday.m4 $(top_srcdir)/m4/glibc21.m4 \ - $(top_srcdir)/m4/gnulib-common.m4 \ - $(top_srcdir)/m4/gnulib-comp.m4 \ - $(top_srcdir)/m4/host-cpu-c-abi.m4 $(top_srcdir)/m4/iconv.m4 \ + $(top_srcdir)/m4/getprogname.m4 $(top_srcdir)/m4/getrandom.m4 \ + $(top_srcdir)/m4/gettext.m4 $(top_srcdir)/m4/gettimeofday.m4 \ + $(top_srcdir)/m4/glibc21.m4 $(top_srcdir)/m4/gnulib-common.m4 \ + $(top_srcdir)/m4/gnulib-comp.m4 $(top_srcdir)/m4/iconv.m4 \ $(top_srcdir)/m4/include_next.m4 $(top_srcdir)/m4/inet_pton.m4 \ $(top_srcdir)/m4/intl-thread-locale.m4 \ - $(top_srcdir)/m4/intlmacosx.m4 \ - $(top_srcdir)/m4/inttypes-pri.m4 $(top_srcdir)/m4/inttypes.m4 \ + $(top_srcdir)/m4/intlmacosx.m4 $(top_srcdir)/m4/inttypes.m4 \ $(top_srcdir)/m4/ioctl.m4 $(top_srcdir)/m4/isblank.m4 \ $(top_srcdir)/m4/langinfo_h.m4 $(top_srcdir)/m4/largefile.m4 \ $(top_srcdir)/m4/lcmessage.m4 $(top_srcdir)/m4/lib-ignore.m4 \ @@ -127,25 +125,26 @@ am__aclocal_m4_deps = $(top_srcdir)/m4/00gnulib.m4 \ $(top_srcdir)/m4/locale-fr.m4 $(top_srcdir)/m4/locale-ja.m4 \ $(top_srcdir)/m4/locale-tr.m4 $(top_srcdir)/m4/locale-zh.m4 \ $(top_srcdir)/m4/locale_h.m4 $(top_srcdir)/m4/localeconv.m4 \ - $(top_srcdir)/m4/localename.m4 \ - $(top_srcdir)/m4/localtime-buffer.m4 $(top_srcdir)/m4/lock.m4 \ - $(top_srcdir)/m4/longlong.m4 $(top_srcdir)/m4/lseek.m4 \ - $(top_srcdir)/m4/lstat.m4 $(top_srcdir)/m4/ltoptions.m4 \ - $(top_srcdir)/m4/ltsugar.m4 $(top_srcdir)/m4/ltversion.m4 \ - $(top_srcdir)/m4/lt~obsolete.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/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/localename.m4 $(top_srcdir)/m4/lock.m4 \ + $(top_srcdir)/m4/lseek.m4 $(top_srcdir)/m4/lstat.m4 \ + $(top_srcdir)/m4/ltoptions.m4 $(top_srcdir)/m4/ltsugar.m4 \ + $(top_srcdir)/m4/ltversion.m4 $(top_srcdir)/m4/lt~obsolete.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/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/nanosleep.m4 $(top_srcdir)/m4/netinet_in_h.m4 \ + $(top_srcdir)/m4/musl.m4 $(top_srcdir)/m4/nanosleep.m4 \ + $(top_srcdir)/m4/netinet_in_h.m4 \ $(top_srcdir)/m4/nl_langinfo.m4 $(top_srcdir)/m4/nls.m4 \ $(top_srcdir)/m4/nocrash.m4 $(top_srcdir)/m4/o-direct.m4 \ $(top_srcdir)/m4/off_t.m4 $(top_srcdir)/m4/open-cloexec.m4 \ - $(top_srcdir)/m4/open.m4 $(top_srcdir)/m4/pathmax.m4 \ - $(top_srcdir)/m4/perror.m4 $(top_srcdir)/m4/pipe.m4 \ + $(top_srcdir)/m4/open-slash.m4 $(top_srcdir)/m4/open.m4 \ + $(top_srcdir)/m4/pathmax.m4 $(top_srcdir)/m4/perror.m4 \ + $(top_srcdir)/m4/pid_t.m4 $(top_srcdir)/m4/pipe.m4 \ $(top_srcdir)/m4/po.m4 $(top_srcdir)/m4/priv-set.m4 \ $(top_srcdir)/m4/progtest.m4 \ $(top_srcdir)/m4/pthread-thread.m4 \ @@ -157,9 +156,10 @@ am__aclocal_m4_deps = $(top_srcdir)/m4/00gnulib.m4 \ $(top_srcdir)/m4/readlink.m4 $(top_srcdir)/m4/realloc.m4 \ $(top_srcdir)/m4/regex.m4 $(top_srcdir)/m4/rpmatch.m4 \ $(top_srcdir)/m4/safe-read.m4 $(top_srcdir)/m4/sched_h.m4 \ - $(top_srcdir)/m4/select.m4 $(top_srcdir)/m4/setenv.m4 \ - $(top_srcdir)/m4/setlocale.m4 $(top_srcdir)/m4/sigaction.m4 \ - $(top_srcdir)/m4/signal_h.m4 \ + $(top_srcdir)/m4/select.m4 $(top_srcdir)/m4/semaphore.m4 \ + $(top_srcdir)/m4/setenv.m4 $(top_srcdir)/m4/setlocale.m4 \ + $(top_srcdir)/m4/setlocale_null.m4 \ + $(top_srcdir)/m4/sigaction.m4 $(top_srcdir)/m4/signal_h.m4 \ $(top_srcdir)/m4/signalblocking.m4 $(top_srcdir)/m4/sleep.m4 \ $(top_srcdir)/m4/socketlib.m4 $(top_srcdir)/m4/sockets.m4 \ $(top_srcdir)/m4/socklen.m4 $(top_srcdir)/m4/sockpfaf.m4 \ @@ -174,6 +174,7 @@ am__aclocal_m4_deps = $(top_srcdir)/m4/00gnulib.m4 \ $(top_srcdir)/m4/strnlen.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 \ @@ -182,14 +183,15 @@ am__aclocal_m4_deps = $(top_srcdir)/m4/00gnulib.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/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/xstrndup.m4 $(top_srcdir)/m4/xstrtol.m4 \ - $(top_srcdir)/m4/yield.m4 $(top_srcdir)/configure.ac + $(top_srcdir)/m4/yield.m4 $(top_srcdir)/m4/zzgnulib.m4 \ + $(top_srcdir)/configure.ac am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \ $(ACLOCAL_M4) DIST_COMMON = $(srcdir)/Makefile.am $(am__noinst_HEADERS_DIST) \ @@ -290,6 +292,7 @@ BUILDINFO = @BUILDINFO@ CC = @CC@ CCDEPMODE = @CCDEPMODE@ CFLAGS = @CFLAGS@ +CFLAG_VISIBILITY = @CFLAG_VISIBILITY@ CHECK_CFLAGS = @CHECK_CFLAGS@ CHECK_LIBS = @CHECK_LIBS@ CONFIG_INCLUDE = @CONFIG_INCLUDE@ @@ -324,6 +327,8 @@ GMSGFMT = @GMSGFMT@ GMSGFMT_015 = @GMSGFMT_015@ GNULIB_ACCEPT = @GNULIB_ACCEPT@ GNULIB_ACCEPT4 = @GNULIB_ACCEPT4@ +GNULIB_ACCESS = @GNULIB_ACCESS@ +GNULIB_ALIGNED_ALLOC = @GNULIB_ALIGNED_ALLOC@ GNULIB_ATOLL = @GNULIB_ATOLL@ GNULIB_BIND = @GNULIB_BIND@ GNULIB_BTOWC = @GNULIB_BTOWC@ @@ -334,6 +339,7 @@ GNULIB_CHOWN = @GNULIB_CHOWN@ GNULIB_CLOSE = @GNULIB_CLOSE@ GNULIB_CONNECT = @GNULIB_CONNECT@ GNULIB_COPY_FILE_RANGE = @GNULIB_COPY_FILE_RANGE@ +GNULIB_CREAT = @GNULIB_CREAT@ GNULIB_CTIME = @GNULIB_CTIME@ GNULIB_DPRINTF = @GNULIB_DPRINTF@ GNULIB_DUP = @GNULIB_DUP@ @@ -381,19 +387,23 @@ GNULIB_GETCWD = @GNULIB_GETCWD@ GNULIB_GETDELIM = @GNULIB_GETDELIM@ GNULIB_GETDOMAINNAME = @GNULIB_GETDOMAINNAME@ GNULIB_GETDTABLESIZE = @GNULIB_GETDTABLESIZE@ +GNULIB_GETENTROPY = @GNULIB_GETENTROPY@ GNULIB_GETGROUPS = @GNULIB_GETGROUPS@ GNULIB_GETHOSTNAME = @GNULIB_GETHOSTNAME@ GNULIB_GETLINE = @GNULIB_GETLINE@ GNULIB_GETLOADAVG = @GNULIB_GETLOADAVG@ GNULIB_GETLOGIN = @GNULIB_GETLOGIN@ GNULIB_GETLOGIN_R = @GNULIB_GETLOGIN_R@ +GNULIB_GETOPT_POSIX = @GNULIB_GETOPT_POSIX@ GNULIB_GETPAGESIZE = @GNULIB_GETPAGESIZE@ GNULIB_GETPASS = @GNULIB_GETPASS@ GNULIB_GETPEERNAME = @GNULIB_GETPEERNAME@ +GNULIB_GETRANDOM = @GNULIB_GETRANDOM@ GNULIB_GETSOCKNAME = @GNULIB_GETSOCKNAME@ GNULIB_GETSOCKOPT = @GNULIB_GETSOCKOPT@ GNULIB_GETSUBOPT = @GNULIB_GETSUBOPT@ GNULIB_GETTIMEOFDAY = @GNULIB_GETTIMEOFDAY@ +GNULIB_GETUMASK = @GNULIB_GETUMASK@ GNULIB_GETUSERSHELL = @GNULIB_GETUSERSHELL@ GNULIB_GL_UNISTD_H_GETOPT = @GNULIB_GL_UNISTD_H_GETOPT@ GNULIB_GRANTPT = @GNULIB_GRANTPT@ @@ -407,6 +417,8 @@ GNULIB_ISATTY = @GNULIB_ISATTY@ GNULIB_ISBLANK = @GNULIB_ISBLANK@ GNULIB_ISWBLANK = @GNULIB_ISWBLANK@ GNULIB_ISWCTYPE = @GNULIB_ISWCTYPE@ +GNULIB_ISWDIGIT = @GNULIB_ISWDIGIT@ +GNULIB_ISWXDIGIT = @GNULIB_ISWXDIGIT@ GNULIB_LCHMOD = @GNULIB_LCHMOD@ GNULIB_LCHOWN = @GNULIB_LCHOWN@ GNULIB_LINK = @GNULIB_LINK@ @@ -467,6 +479,7 @@ GNULIB_PERROR = @GNULIB_PERROR@ GNULIB_PIPE = @GNULIB_PIPE@ GNULIB_PIPE2 = @GNULIB_PIPE2@ GNULIB_POPEN = @GNULIB_POPEN@ +GNULIB_POSIX_MEMALIGN = @GNULIB_POSIX_MEMALIGN@ GNULIB_POSIX_OPENPT = @GNULIB_POSIX_OPENPT@ GNULIB_PREAD = @GNULIB_PREAD@ GNULIB_PRINTF = @GNULIB_PRINTF@ @@ -515,9 +528,12 @@ GNULIB_SENDTO = @GNULIB_SENDTO@ GNULIB_SETENV = @GNULIB_SETENV@ GNULIB_SETHOSTNAME = @GNULIB_SETHOSTNAME@ GNULIB_SETLOCALE = @GNULIB_SETLOCALE@ +GNULIB_SETLOCALE_NULL = @GNULIB_SETLOCALE_NULL@ GNULIB_SETSOCKOPT = @GNULIB_SETSOCKOPT@ GNULIB_SHUTDOWN = @GNULIB_SHUTDOWN@ +GNULIB_SIGABBREV_NP = @GNULIB_SIGABBREV_NP@ GNULIB_SIGACTION = @GNULIB_SIGACTION@ +GNULIB_SIGDESCR_NP = @GNULIB_SIGDESCR_NP@ GNULIB_SIGNAL_H_SIGPIPE = @GNULIB_SIGNAL_H_SIGPIPE@ GNULIB_SIGPROCMASK = @GNULIB_SIGPROCMASK@ GNULIB_SLEEP = @GNULIB_SLEEP@ @@ -533,6 +549,7 @@ GNULIB_STRCASESTR = @GNULIB_STRCASESTR@ GNULIB_STRCHRNUL = @GNULIB_STRCHRNUL@ GNULIB_STRDUP = @GNULIB_STRDUP@ GNULIB_STRERROR = @GNULIB_STRERROR@ +GNULIB_STRERRORNAME_NP = @GNULIB_STRERRORNAME_NP@ GNULIB_STRERROR_R = @GNULIB_STRERROR_R@ GNULIB_STRFTIME = @GNULIB_STRFTIME@ GNULIB_STRNCAT = @GNULIB_STRNCAT@ @@ -616,11 +633,13 @@ GNULIB_WMEMCHR = @GNULIB_WMEMCHR@ GNULIB_WMEMCMP = @GNULIB_WMEMCMP@ GNULIB_WMEMCPY = @GNULIB_WMEMCPY@ GNULIB_WMEMMOVE = @GNULIB_WMEMMOVE@ +GNULIB_WMEMPCPY = @GNULIB_WMEMPCPY@ GNULIB_WMEMSET = @GNULIB_WMEMSET@ GNULIB_WRITE = @GNULIB_WRITE@ GNULIB__EXIT = @GNULIB__EXIT@ GREP = @GREP@ HAVE_ACCEPT4 = @HAVE_ACCEPT4@ +HAVE_ALIGNED_ALLOC = @HAVE_ALIGNED_ALLOC@ HAVE_ALLOCA_H = @HAVE_ALLOCA_H@ HAVE_ARPA_INET_H = @HAVE_ARPA_INET_H@ HAVE_ATOLL = @HAVE_ATOLL@ @@ -630,12 +649,17 @@ HAVE_CANONICALIZE_FILE_NAME = @HAVE_CANONICALIZE_FILE_NAME@ HAVE_CHOWN = @HAVE_CHOWN@ HAVE_COPY_FILE_RANGE = @HAVE_COPY_FILE_RANGE@ HAVE_CRTDEFS_H = @HAVE_CRTDEFS_H@ +HAVE_DECL_ECVT = @HAVE_DECL_ECVT@ HAVE_DECL_ENVIRON = @HAVE_DECL_ENVIRON@ +HAVE_DECL_EXECVPE = @HAVE_DECL_EXECVPE@ HAVE_DECL_FCHDIR = @HAVE_DECL_FCHDIR@ +HAVE_DECL_FCLOSEALL = @HAVE_DECL_FCLOSEALL@ +HAVE_DECL_FCVT = @HAVE_DECL_FCVT@ HAVE_DECL_FDATASYNC = @HAVE_DECL_FDATASYNC@ HAVE_DECL_FPURGE = @HAVE_DECL_FPURGE@ HAVE_DECL_FSEEKO = @HAVE_DECL_FSEEKO@ HAVE_DECL_FTELLO = @HAVE_DECL_FTELLO@ +HAVE_DECL_GCVT = @HAVE_DECL_GCVT@ HAVE_DECL_GETDELIM = @HAVE_DECL_GETDELIM@ HAVE_DECL_GETDOMAINNAME = @HAVE_DECL_GETDOMAINNAME@ HAVE_DECL_GETLINE = @HAVE_DECL_GETLINE@ @@ -669,10 +693,10 @@ HAVE_DECL_TRUNCATE = @HAVE_DECL_TRUNCATE@ HAVE_DECL_TTYNAME_R = @HAVE_DECL_TTYNAME_R@ HAVE_DECL_UNSETENV = @HAVE_DECL_UNSETENV@ HAVE_DECL_VSNPRINTF = @HAVE_DECL_VSNPRINTF@ +HAVE_DECL_WCSDUP = @HAVE_DECL_WCSDUP@ HAVE_DECL_WCTOB = @HAVE_DECL_WCTOB@ HAVE_DECL_WCWIDTH = @HAVE_DECL_WCWIDTH@ HAVE_DPRINTF = @HAVE_DPRINTF@ -HAVE_DUP2 = @HAVE_DUP2@ HAVE_DUP3 = @HAVE_DUP3@ HAVE_DUPLOCALE = @HAVE_DUPLOCALE@ HAVE_EUIDACCESS = @HAVE_EUIDACCESS@ @@ -694,14 +718,17 @@ HAVE_FTELLO = @HAVE_FTELLO@ HAVE_FTRUNCATE = @HAVE_FTRUNCATE@ HAVE_FUTIMENS = @HAVE_FUTIMENS@ HAVE_GETDTABLESIZE = @HAVE_GETDTABLESIZE@ +HAVE_GETENTROPY = @HAVE_GETENTROPY@ HAVE_GETGROUPS = @HAVE_GETGROUPS@ HAVE_GETHOSTNAME = @HAVE_GETHOSTNAME@ HAVE_GETLOGIN = @HAVE_GETLOGIN@ HAVE_GETOPT_H = @HAVE_GETOPT_H@ HAVE_GETPAGESIZE = @HAVE_GETPAGESIZE@ HAVE_GETPASS = @HAVE_GETPASS@ +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_IMAXDIV_T = @HAVE_IMAXDIV_T@ @@ -720,7 +747,6 @@ HAVE_LCHMOD = @HAVE_LCHMOD@ HAVE_LCHOWN = @HAVE_LCHOWN@ HAVE_LINK = @HAVE_LINK@ HAVE_LINKAT = @HAVE_LINKAT@ -HAVE_LONG_LONG_INT = @HAVE_LONG_LONG_INT@ HAVE_LSTAT = @HAVE_LSTAT@ HAVE_MAX_ALIGN_T = @HAVE_MAX_ALIGN_T@ HAVE_MBRLEN = @HAVE_MBRLEN@ @@ -730,7 +756,6 @@ HAVE_MBSLEN = @HAVE_MBSLEN@ HAVE_MBSNRTOWCS = @HAVE_MBSNRTOWCS@ HAVE_MBSRTOWCS = @HAVE_MBSRTOWCS@ HAVE_MBTOWC = @HAVE_MBTOWC@ -HAVE_MEMCHR = @HAVE_MEMCHR@ HAVE_MEMPCPY = @HAVE_MEMPCPY@ HAVE_MKDIRAT = @HAVE_MKDIRAT@ HAVE_MKDTEMP = @HAVE_MKDTEMP@ @@ -753,6 +778,7 @@ HAVE_PCLOSE = @HAVE_PCLOSE@ HAVE_PIPE = @HAVE_PIPE@ HAVE_PIPE2 = @HAVE_PIPE2@ HAVE_POPEN = @HAVE_POPEN@ +HAVE_POSIX_MEMALIGN = @HAVE_POSIX_MEMALIGN@ HAVE_POSIX_OPENPT = @HAVE_POSIX_OPENPT@ HAVE_POSIX_SIGNALBLOCKING = @HAVE_POSIX_SIGNALBLOCKING@ HAVE_PREAD = @HAVE_PREAD@ @@ -838,7 +864,9 @@ HAVE_SECURE_GETENV = @HAVE_SECURE_GETENV@ HAVE_SETENV = @HAVE_SETENV@ HAVE_SETHOSTNAME = @HAVE_SETHOSTNAME@ HAVE_SETSTATE = @HAVE_SETSTATE@ +HAVE_SIGABBREV_NP = @HAVE_SIGABBREV_NP@ HAVE_SIGACTION = @HAVE_SIGACTION@ +HAVE_SIGDESCR_NP = @HAVE_SIGDESCR_NP@ HAVE_SIGHANDLER_T = @HAVE_SIGHANDLER_T@ HAVE_SIGINFO_T = @HAVE_SIGINFO_T@ HAVE_SIGNED_SIG_ATOMIC_T = @HAVE_SIGNED_SIG_ATOMIC_T@ @@ -851,6 +879,7 @@ HAVE_STPCPY = @HAVE_STPCPY@ HAVE_STPNCPY = @HAVE_STPNCPY@ HAVE_STRCASESTR = @HAVE_STRCASESTR@ HAVE_STRCHRNUL = @HAVE_STRCHRNUL@ +HAVE_STRERRORNAME_NP = @HAVE_STRERRORNAME_NP@ HAVE_STRPBRK = @HAVE_STRPBRK@ HAVE_STRPTIME = @HAVE_STRPTIME@ HAVE_STRSEP = @HAVE_STRSEP@ @@ -873,6 +902,7 @@ HAVE_SYS_INTTYPES_H = @HAVE_SYS_INTTYPES_H@ HAVE_SYS_IOCTL_H = @HAVE_SYS_IOCTL_H@ HAVE_SYS_LOADAVG_H = @HAVE_SYS_LOADAVG_H@ HAVE_SYS_PARAM_H = @HAVE_SYS_PARAM_H@ +HAVE_SYS_RANDOM_H = @HAVE_SYS_RANDOM_H@ HAVE_SYS_SELECT_H = @HAVE_SYS_SELECT_H@ HAVE_SYS_SOCKET_H = @HAVE_SYS_SOCKET_H@ HAVE_SYS_TIME_H = @HAVE_SYS_TIME_H@ @@ -881,15 +911,14 @@ HAVE_SYS_UIO_H = @HAVE_SYS_UIO_H@ HAVE_TIMEGM = @HAVE_TIMEGM@ HAVE_TIMEZONE_T = @HAVE_TIMEZONE_T@ HAVE_TYPE_VOLATILE_SIG_ATOMIC_T = @HAVE_TYPE_VOLATILE_SIG_ATOMIC_T@ -HAVE_TZSET = @HAVE_TZSET@ HAVE_UNISTD_H = @HAVE_UNISTD_H@ HAVE_UNLINKAT = @HAVE_UNLINKAT@ HAVE_UNLOCKPT = @HAVE_UNLOCKPT@ -HAVE_UNSIGNED_LONG_LONG_INT = @HAVE_UNSIGNED_LONG_LONG_INT@ HAVE_USLEEP = @HAVE_USLEEP@ HAVE_UTIMENSAT = @HAVE_UTIMENSAT@ HAVE_VASPRINTF = @HAVE_VASPRINTF@ HAVE_VDPRINTF = @HAVE_VDPRINTF@ +HAVE_VISIBILITY = @HAVE_VISIBILITY@ HAVE_WCHAR_H = @HAVE_WCHAR_H@ HAVE_WCHAR_T = @HAVE_WCHAR_T@ HAVE_WCPCPY = @HAVE_WCPCPY@ @@ -928,6 +957,7 @@ HAVE_WMEMCHR = @HAVE_WMEMCHR@ HAVE_WMEMCMP = @HAVE_WMEMCMP@ HAVE_WMEMCPY = @HAVE_WMEMCPY@ HAVE_WMEMMOVE = @HAVE_WMEMMOVE@ +HAVE_WMEMPCPY = @HAVE_WMEMPCPY@ HAVE_WMEMSET = @HAVE_WMEMSET@ HAVE_WS2TCPIP_H = @HAVE_WS2TCPIP_H@ HAVE_XLOCALE_H = @HAVE_XLOCALE_H@ @@ -953,16 +983,28 @@ LIBICONV = @LIBICONV@ LIBINTL = @LIBINTL@ LIBMULTITHREAD = @LIBMULTITHREAD@ LIBOBJS = @LIBOBJS@ +LIBPMULTITHREAD = @LIBPMULTITHREAD@ +LIBPTHREAD = @LIBPTHREAD@ LIBS = @LIBS@ LIBSOCKET = @LIBSOCKET@ +LIBSTDTHREAD = @LIBSTDTHREAD@ LIBTESTS_LIBDEPS = @LIBTESTS_LIBDEPS@ LIBTHREAD = @LIBTHREAD@ LIBTOOL = @LIBTOOL@ LIB_BLKID = @LIB_BLKID@ +LIB_CLOCK_GETTIME = @LIB_CLOCK_GETTIME@ +LIB_GETRANDOM = @LIB_GETRANDOM@ +LIB_HARD_LOCALE = @LIB_HARD_LOCALE@ +LIB_MBRTOWC = @LIB_MBRTOWC@ LIB_NANOSLEEP = @LIB_NANOSLEEP@ +LIB_NL_LANGINFO = @LIB_NL_LANGINFO@ LIB_PTHREAD = @LIB_PTHREAD@ LIB_PTHREAD_SIGMASK = @LIB_PTHREAD_SIGMASK@ +LIB_SCHED_YIELD = @LIB_SCHED_YIELD@ LIB_SELECT = @LIB_SELECT@ +LIB_SEMAPHORE = @LIB_SEMAPHORE@ +LIB_SETLOCALE = @LIB_SETLOCALE@ +LIB_SETLOCALE_NULL = @LIB_SETLOCALE_NULL@ LIMITS_H = @LIMITS_H@ LIPO = @LIPO@ LN_S = @LN_S@ @@ -1011,6 +1053,7 @@ NEXT_AS_FIRST_DIRECTIVE_STDIO_H = @NEXT_AS_FIRST_DIRECTIVE_STDIO_H@ NEXT_AS_FIRST_DIRECTIVE_STDLIB_H = @NEXT_AS_FIRST_DIRECTIVE_STDLIB_H@ NEXT_AS_FIRST_DIRECTIVE_STRING_H = @NEXT_AS_FIRST_DIRECTIVE_STRING_H@ NEXT_AS_FIRST_DIRECTIVE_SYS_IOCTL_H = @NEXT_AS_FIRST_DIRECTIVE_SYS_IOCTL_H@ +NEXT_AS_FIRST_DIRECTIVE_SYS_RANDOM_H = @NEXT_AS_FIRST_DIRECTIVE_SYS_RANDOM_H@ NEXT_AS_FIRST_DIRECTIVE_SYS_SELECT_H = @NEXT_AS_FIRST_DIRECTIVE_SYS_SELECT_H@ NEXT_AS_FIRST_DIRECTIVE_SYS_SOCKET_H = @NEXT_AS_FIRST_DIRECTIVE_SYS_SOCKET_H@ NEXT_AS_FIRST_DIRECTIVE_SYS_STAT_H = @NEXT_AS_FIRST_DIRECTIVE_SYS_STAT_H@ @@ -1040,6 +1083,7 @@ NEXT_STDIO_H = @NEXT_STDIO_H@ NEXT_STDLIB_H = @NEXT_STDLIB_H@ NEXT_STRING_H = @NEXT_STRING_H@ NEXT_SYS_IOCTL_H = @NEXT_SYS_IOCTL_H@ +NEXT_SYS_RANDOM_H = @NEXT_SYS_RANDOM_H@ NEXT_SYS_SELECT_H = @NEXT_SYS_SELECT_H@ NEXT_SYS_SOCKET_H = @NEXT_SYS_SOCKET_H@ NEXT_SYS_STAT_H = @NEXT_SYS_STAT_H@ @@ -1076,21 +1120,24 @@ POSUB = @POSUB@ PRAGMA_COLUMNS = @PRAGMA_COLUMNS@ PRAGMA_SYSTEM_HEADER = @PRAGMA_SYSTEM_HEADER@ PRIPTR_PREFIX = @PRIPTR_PREFIX@ -PRI_MACROS_BROKEN = @PRI_MACROS_BROKEN@ PTHREAD_H_DEFINES_STRUCT_TIMESPEC = @PTHREAD_H_DEFINES_STRUCT_TIMESPEC@ PTRDIFF_T_SUFFIX = @PTRDIFF_T_SUFFIX@ RANLIB = @RANLIB@ +REPLACE_ACCESS = @REPLACE_ACCESS@ +REPLACE_ALIGNED_ALLOC = @REPLACE_ALIGNED_ALLOC@ REPLACE_BTOWC = @REPLACE_BTOWC@ REPLACE_CALLOC = @REPLACE_CALLOC@ REPLACE_CANONICALIZE_FILE_NAME = @REPLACE_CANONICALIZE_FILE_NAME@ REPLACE_CHOWN = @REPLACE_CHOWN@ REPLACE_CLOSE = @REPLACE_CLOSE@ +REPLACE_CREAT = @REPLACE_CREAT@ REPLACE_CTIME = @REPLACE_CTIME@ REPLACE_DPRINTF = @REPLACE_DPRINTF@ REPLACE_DUP = @REPLACE_DUP@ REPLACE_DUP2 = @REPLACE_DUP2@ REPLACE_DUPLOCALE = @REPLACE_DUPLOCALE@ REPLACE_FACCESSAT = @REPLACE_FACCESSAT@ +REPLACE_FCHMODAT = @REPLACE_FCHMODAT@ REPLACE_FCHOWNAT = @REPLACE_FCHOWNAT@ REPLACE_FCLOSE = @REPLACE_FCLOSE@ REPLACE_FCNTL = @REPLACE_FCNTL@ @@ -1118,6 +1165,7 @@ REPLACE_GETLINE = @REPLACE_GETLINE@ REPLACE_GETLOGIN_R = @REPLACE_GETLOGIN_R@ REPLACE_GETPAGESIZE = @REPLACE_GETPAGESIZE@ REPLACE_GETPASS = @REPLACE_GETPASS@ +REPLACE_GETRANDOM = @REPLACE_GETRANDOM@ REPLACE_GETTIMEOFDAY = @REPLACE_GETTIMEOFDAY@ REPLACE_GMTIME = @REPLACE_GMTIME@ REPLACE_INET_NTOP = @REPLACE_INET_NTOP@ @@ -1127,6 +1175,8 @@ REPLACE_IOCTL = @REPLACE_IOCTL@ REPLACE_ISATTY = @REPLACE_ISATTY@ REPLACE_ISWBLANK = @REPLACE_ISWBLANK@ REPLACE_ISWCNTRL = @REPLACE_ISWCNTRL@ +REPLACE_ISWDIGIT = @REPLACE_ISWDIGIT@ +REPLACE_ISWXDIGIT = @REPLACE_ISWXDIGIT@ REPLACE_LCHOWN = @REPLACE_LCHOWN@ REPLACE_LINK = @REPLACE_LINK@ REPLACE_LINKAT = @REPLACE_LINKAT@ @@ -1159,6 +1209,7 @@ REPLACE_OPEN = @REPLACE_OPEN@ REPLACE_OPENAT = @REPLACE_OPENAT@ REPLACE_PERROR = @REPLACE_PERROR@ REPLACE_POPEN = @REPLACE_POPEN@ +REPLACE_POSIX_MEMALIGN = @REPLACE_POSIX_MEMALIGN@ REPLACE_PREAD = @REPLACE_PREAD@ REPLACE_PRINTF = @REPLACE_PRINTF@ REPLACE_PSELECT = @REPLACE_PSELECT@ @@ -1247,6 +1298,7 @@ REPLACE_STRCASESTR = @REPLACE_STRCASESTR@ REPLACE_STRCHRNUL = @REPLACE_STRCHRNUL@ REPLACE_STRDUP = @REPLACE_STRDUP@ REPLACE_STRERROR = @REPLACE_STRERROR@ +REPLACE_STRERRORNAME_NP = @REPLACE_STRERRORNAME_NP@ REPLACE_STRERROR_R = @REPLACE_STRERROR_R@ REPLACE_STRFTIME = @REPLACE_STRFTIME@ REPLACE_STRNCAT = @REPLACE_STRNCAT@ @@ -1284,13 +1336,13 @@ REPLACE_WCRTOMB = @REPLACE_WCRTOMB@ REPLACE_WCSFTIME = @REPLACE_WCSFTIME@ REPLACE_WCSNRTOMBS = @REPLACE_WCSNRTOMBS@ REPLACE_WCSRTOMBS = @REPLACE_WCSRTOMBS@ +REPLACE_WCSTOK = @REPLACE_WCSTOK@ REPLACE_WCSWIDTH = @REPLACE_WCSWIDTH@ REPLACE_WCTOB = @REPLACE_WCTOB@ REPLACE_WCTOMB = @REPLACE_WCTOMB@ REPLACE_WCWIDTH = @REPLACE_WCWIDTH@ REPLACE_WRITE = @REPLACE_WRITE@ SED = @SED@ -SELINUX_LIBS = @SELINUX_LIBS@ SET_MAKE = @SET_MAKE@ SHELL = @SHELL@ SIG_ATOMIC_T_SUFFIX = @SIG_ATOMIC_T_SUFFIX@ @@ -1309,6 +1361,7 @@ UINT32_MAX_LT_UINTMAX_MAX = @UINT32_MAX_LT_UINTMAX_MAX@ UINT64_MAX_EQ_ULONG_MAX = @UINT64_MAX_EQ_ULONG_MAX@ UNDEFINE_STRTOK_R = @UNDEFINE_STRTOK_R@ UNISTD_H_DEFINES_STRUCT_TIMESPEC = @UNISTD_H_DEFINES_STRUCT_TIMESPEC@ +UNISTD_H_HAVE_SYS_RANDOM_H = @UNISTD_H_HAVE_SYS_RANDOM_H@ UNISTD_H_HAVE_WINSOCK2_H = @UNISTD_H_HAVE_WINSOCK2_H@ UNISTD_H_HAVE_WINSOCK2_H_AND_USE_SOCKETS = @UNISTD_H_HAVE_WINSOCK2_H_AND_USE_SOCKETS@ USE_NLS = @USE_NLS@ diff --git a/include/parted/constraint.h b/include/parted/constraint.h index e2f6a2b..42351ec 100644 --- a/include/parted/constraint.h +++ b/include/parted/constraint.h @@ -1,7 +1,7 @@ /* libparted - a library for manipulating disk partitions - Copyright (C) 1998-2000, 2007, 2009-2014, 2019 Free Software Foundation, - Inc. + Copyright (C) 1998-2000, 2007, 2009-2014, 2019-2021 Free Software + Foundation, Inc. This 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/constraint.in.h b/include/parted/constraint.in.h index efa6d1e..b7f7dcf 100644 --- a/include/parted/constraint.in.h +++ b/include/parted/constraint.in.h @@ -1,7 +1,7 @@ /* libparted - a library for manipulating disk partitions - Copyright (C) 1998-2000, 2007, 2009-2014, 2019 Free Software Foundation, - Inc. + Copyright (C) 1998-2000, 2007, 2009-2014, 2019-2021 Free Software + Foundation, Inc. This 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/crc32.h b/include/parted/crc32.h index 5ae6d0f..60e775d 100644 --- a/include/parted/crc32.h +++ b/include/parted/crc32.h @@ -1,7 +1,7 @@ /* libparted - a library for manipulating disk partitions - Copyright (C) 1998-2000, 2007, 2009-2014, 2019 Free Software Foundation, - Inc. + Copyright (C) 1998-2000, 2007, 2009-2014, 2019-2021 Free Software + Foundation, Inc. crc32.h diff --git a/include/parted/crc32.in.h b/include/parted/crc32.in.h index cbae91e..6158d40 100644 --- a/include/parted/crc32.in.h +++ b/include/parted/crc32.in.h @@ -1,7 +1,7 @@ /* libparted - a library for manipulating disk partitions - Copyright (C) 1998-2000, 2007, 2009-2014, 2019 Free Software Foundation, - Inc. + Copyright (C) 1998-2000, 2007, 2009-2014, 2019-2021 Free Software + Foundation, Inc. crc32.h diff --git a/include/parted/debug.h b/include/parted/debug.h index 4321dd9..33573b9 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 Free Software + Copyright (C) 1998-2000, 2002, 2007, 2009-2014, 2019-2021 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 4321dd9..33573b9 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 Free Software + Copyright (C) 1998-2000, 2002, 2007, 2009-2014, 2019-2021 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 3f4ca86..c3e83eb 100644 --- a/include/parted/device.h +++ b/include/parted/device.h @@ -1,7 +1,7 @@ /* libparted - a library for manipulating disk partitions - Copyright (C) 1998-2001, 2005, 2007-2008, 2011-2014, 2019 Free Software - Foundation, Inc. + Copyright (C) 1998-2001, 2005, 2007-2008, 2011-2014, 2019-2021 Free + Software Foundation, Inc. This 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/device.in.h b/include/parted/device.in.h index 8465248..414f770 100644 --- a/include/parted/device.in.h +++ b/include/parted/device.in.h @@ -1,7 +1,7 @@ /* libparted - a library for manipulating disk partitions - Copyright (C) 1998-2001, 2005, 2007-2008, 2011-2014, 2019 Free Software - Foundation, Inc. + Copyright (C) 1998-2001, 2005, 2007-2008, 2011-2014, 2019-2021 Free + Software Foundation, Inc. This 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/disk.h b/include/parted/disk.h index d666985..5392fb5 100644 --- a/include/parted/disk.h +++ b/include/parted/disk.h @@ -1,6 +1,7 @@ /* libparted - a library for manipulating disk partitions - Copyright (C) 1999-2002, 2007-2014, 2019 Free Software Foundation, Inc. + Copyright (C) 1999-2002, 2007-2014, 2019-2021 Free Software Foundation, + Inc. This program is free software; you can redistribute it and/or modify it under the terms of the GNU General Public License as published by @@ -75,10 +76,12 @@ enum _PedPartitionFlag { PED_PARTITION_LEGACY_BOOT=15, PED_PARTITION_MSFT_DATA=16, PED_PARTITION_IRST=17, - PED_PARTITION_ESP=18 + PED_PARTITION_ESP=18, + PED_PARTITION_CHROMEOS_KERNEL=19, + PED_PARTITION_BLS_BOOT=20 }; #define PED_PARTITION_FIRST_FLAG PED_PARTITION_BOOT -#define PED_PARTITION_LAST_FLAG PED_PARTITION_ESP +#define PED_PARTITION_LAST_FLAG PED_PARTITION_BLS_BOOT enum _PedDiskTypeFeature { PED_DISK_TYPE_EXTENDED=1, /**< supports extended partitions */ diff --git a/include/parted/disk.in.h b/include/parted/disk.in.h index a3b380d..6f42145 100644 --- a/include/parted/disk.in.h +++ b/include/parted/disk.in.h @@ -1,6 +1,7 @@ /* libparted - a library for manipulating disk partitions - Copyright (C) 1999-2002, 2007-2014, 2019 Free Software Foundation, Inc. + Copyright (C) 1999-2002, 2007-2014, 2019-2021 Free Software Foundation, + Inc. This program is free software; you can redistribute it and/or modify it under the terms of the GNU General Public License as published by @@ -75,10 +76,12 @@ enum _PedPartitionFlag { PED_PARTITION_LEGACY_BOOT=15, PED_PARTITION_MSFT_DATA=16, PED_PARTITION_IRST=17, - PED_PARTITION_ESP=18 + PED_PARTITION_ESP=18, + PED_PARTITION_CHROMEOS_KERNEL=19, + PED_PARTITION_BLS_BOOT=20 }; #define PED_PARTITION_FIRST_FLAG PED_PARTITION_BOOT -#define PED_PARTITION_LAST_FLAG PED_PARTITION_ESP +#define PED_PARTITION_LAST_FLAG PED_PARTITION_BLS_BOOT enum _PedDiskTypeFeature { PED_DISK_TYPE_EXTENDED=1, /**< supports extended partitions */ diff --git a/include/parted/endian.h b/include/parted/endian.h index 7ef0112..1dbcf12 100644 --- a/include/parted/endian.h +++ b/include/parted/endian.h @@ -1,7 +1,7 @@ /* libparted - a library for manipulating disk partitions - Copyright (C) 1998-2002, 2007, 2009-2014, 2019 Free Software Foundation, - Inc. + Copyright (C) 1998-2002, 2007, 2009-2014, 2019-2021 Free Software + Foundation, Inc. This 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/endian.in.h b/include/parted/endian.in.h index 7ef0112..1dbcf12 100644 --- a/include/parted/endian.in.h +++ b/include/parted/endian.in.h @@ -1,7 +1,7 @@ /* libparted - a library for manipulating disk partitions - Copyright (C) 1998-2002, 2007, 2009-2014, 2019 Free Software Foundation, - Inc. + Copyright (C) 1998-2002, 2007, 2009-2014, 2019-2021 Free Software + Foundation, Inc. This 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/exception.h b/include/parted/exception.h index bf6692e..5efe5ad 100644 --- a/include/parted/exception.h +++ b/include/parted/exception.h @@ -1,7 +1,7 @@ /* libparted - a library for manipulating disk partitions - Copyright (C) 1999-2000, 2007, 2009-2014, 2019 Free Software Foundation, - Inc. + Copyright (C) 1999-2000, 2007, 2009-2014, 2019-2021 Free Software + Foundation, Inc. This 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/exception.in.h b/include/parted/exception.in.h index bfc1fc9..20abb08 100644 --- a/include/parted/exception.in.h +++ b/include/parted/exception.in.h @@ -1,7 +1,7 @@ /* libparted - a library for manipulating disk partitions - Copyright (C) 1999-2000, 2007, 2009-2014, 2019 Free Software Foundation, - Inc. + Copyright (C) 1999-2000, 2007, 2009-2014, 2019-2021 Free Software + Foundation, Inc. This 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/filesys.h b/include/parted/filesys.h index 51534f8..9ac4cb2 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 Free Software + Copyright (C) 1999-2001, 2006-2007, 2009-2014, 2019-2021 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 e535617..8ff87b4 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 Free Software + Copyright (C) 1999-2001, 2006-2007, 2009-2014, 2019-2021 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 77e3a68..b218c22 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 Free Software + Copyright (C) 1998-2001, 2005, 2007, 2009-2014, 2019-2021 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 c4c067d..8ee66a4 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 Free Software + Copyright (C) 1998-2001, 2005, 2007, 2009-2014, 2019-2021 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 0d7f642..6941bba 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 Free Software Foundation, Inc. + Copyright (C) 2000, 2007-2014, 2019-2021 Free Software Foundation, Inc. This 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 36bffbe..4ba1936 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 Free Software Foundation, Inc. + Copyright (C) 2000, 2007-2014, 2019-2021 Free Software Foundation, Inc. This 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 f62d5bd..01150be 100644 --- a/include/parted/parted.h +++ b/include/parted/parted.h @@ -1,7 +1,7 @@ /* libparted - a library for manipulating disk partitions - Copyright (C) 1999-2001, 2007, 2009-2014, 2019 Free Software Foundation, - Inc. + Copyright (C) 1999-2001, 2007, 2009-2014, 2019-2021 Free Software + Foundation, Inc. This 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.in.h b/include/parted/parted.in.h index 2150623..0fb96d9 100644 --- a/include/parted/parted.in.h +++ b/include/parted/parted.in.h @@ -1,7 +1,7 @@ /* libparted - a library for manipulating disk partitions - Copyright (C) 1999-2001, 2007, 2009-2014, 2019 Free Software Foundation, - Inc. + Copyright (C) 1999-2001, 2007, 2009-2014, 2019-2021 Free Software + Foundation, Inc. This 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/timer.h b/include/parted/timer.h index cee659d..cdeefe3 100644 --- a/include/parted/timer.h +++ b/include/parted/timer.h @@ -1,7 +1,7 @@ /* libparted - a library for manipulating disk partitions - Copyright (C) 2001-2002, 2007, 2009-2014, 2019 Free Software Foundation, - Inc. + Copyright (C) 2001-2002, 2007, 2009-2014, 2019-2021 Free Software + Foundation, Inc. This 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/timer.in.h b/include/parted/timer.in.h index cee659d..cdeefe3 100644 --- a/include/parted/timer.in.h +++ b/include/parted/timer.in.h @@ -1,7 +1,7 @@ /* libparted - a library for manipulating disk partitions - Copyright (C) 2001-2002, 2007, 2009-2014, 2019 Free Software Foundation, - Inc. + Copyright (C) 2001-2002, 2007, 2009-2014, 2019-2021 Free Software + Foundation, Inc. This 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/unit.h b/include/parted/unit.h index 1f4025b..493fb6d 100644 --- a/include/parted/unit.h +++ b/include/parted/unit.h @@ -1,6 +1,7 @@ /* libparted - a library for manipulating disk partitions - Copyright (C) 2005, 2007, 2009-2014, 2019 Free Software Foundation, Inc. + Copyright (C) 2005, 2007, 2009-2014, 2019-2021 Free Software Foundation, + Inc. This 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/unit.in.h b/include/parted/unit.in.h index a8d4eb7..ba8d852 100644 --- a/include/parted/unit.in.h +++ b/include/parted/unit.in.h @@ -1,6 +1,7 @@ /* libparted - a library for manipulating disk partitions - Copyright (C) 2005, 2007, 2009-2014, 2019 Free Software Foundation, Inc. + Copyright (C) 2005, 2007, 2009-2014, 2019-2021 Free Software Foundation, + Inc. This program is free software; you can redistribute it and/or modify it under the terms of the GNU General Public License as published by diff --git a/lib/Makefile.in b/lib/Makefile.in index d42dde6..2c99df7 100644 --- a/lib/Makefile.in +++ b/lib/Makefile.in @@ -14,7 +14,7 @@ @SET_MAKE@ -# Copyright (C) 2002-2019 Free Software Foundation, Inc. +# Copyright (C) 2002-2020 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 @@ -177,9 +177,9 @@ am__aclocal_m4_deps = $(top_srcdir)/m4/00gnulib.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/calloc.m4 $(top_srcdir)/m4/canonicalize.m4 \ - $(top_srcdir)/m4/close.m4 $(top_srcdir)/m4/codeset.m4 \ - $(top_srcdir)/m4/config-h.m4 $(top_srcdir)/m4/configmake.m4 \ - $(top_srcdir)/m4/ctype.m4 $(top_srcdir)/m4/dirname.m4 \ + $(top_srcdir)/m4/clock_time.m4 $(top_srcdir)/m4/close.m4 \ + $(top_srcdir)/m4/codeset.m4 $(top_srcdir)/m4/config-h.m4 \ + $(top_srcdir)/m4/configmake.m4 $(top_srcdir)/m4/ctype.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 \ @@ -191,15 +191,13 @@ am__aclocal_m4_deps = $(top_srcdir)/m4/00gnulib.m4 \ $(top_srcdir)/m4/fsync.m4 $(top_srcdir)/m4/ftruncate.m4 \ $(top_srcdir)/m4/getcwd.m4 $(top_srcdir)/m4/getdtablesize.m4 \ $(top_srcdir)/m4/getopt.m4 $(top_srcdir)/m4/getpagesize.m4 \ - $(top_srcdir)/m4/getprogname.m4 $(top_srcdir)/m4/gettext.m4 \ - $(top_srcdir)/m4/gettimeofday.m4 $(top_srcdir)/m4/glibc21.m4 \ - $(top_srcdir)/m4/gnulib-common.m4 \ - $(top_srcdir)/m4/gnulib-comp.m4 \ - $(top_srcdir)/m4/host-cpu-c-abi.m4 $(top_srcdir)/m4/iconv.m4 \ + $(top_srcdir)/m4/getprogname.m4 $(top_srcdir)/m4/getrandom.m4 \ + $(top_srcdir)/m4/gettext.m4 $(top_srcdir)/m4/gettimeofday.m4 \ + $(top_srcdir)/m4/glibc21.m4 $(top_srcdir)/m4/gnulib-common.m4 \ + $(top_srcdir)/m4/gnulib-comp.m4 $(top_srcdir)/m4/iconv.m4 \ $(top_srcdir)/m4/include_next.m4 $(top_srcdir)/m4/inet_pton.m4 \ $(top_srcdir)/m4/intl-thread-locale.m4 \ - $(top_srcdir)/m4/intlmacosx.m4 \ - $(top_srcdir)/m4/inttypes-pri.m4 $(top_srcdir)/m4/inttypes.m4 \ + $(top_srcdir)/m4/intlmacosx.m4 $(top_srcdir)/m4/inttypes.m4 \ $(top_srcdir)/m4/ioctl.m4 $(top_srcdir)/m4/isblank.m4 \ $(top_srcdir)/m4/langinfo_h.m4 $(top_srcdir)/m4/largefile.m4 \ $(top_srcdir)/m4/lcmessage.m4 $(top_srcdir)/m4/lib-ignore.m4 \ @@ -209,25 +207,26 @@ am__aclocal_m4_deps = $(top_srcdir)/m4/00gnulib.m4 \ $(top_srcdir)/m4/locale-fr.m4 $(top_srcdir)/m4/locale-ja.m4 \ $(top_srcdir)/m4/locale-tr.m4 $(top_srcdir)/m4/locale-zh.m4 \ $(top_srcdir)/m4/locale_h.m4 $(top_srcdir)/m4/localeconv.m4 \ - $(top_srcdir)/m4/localename.m4 \ - $(top_srcdir)/m4/localtime-buffer.m4 $(top_srcdir)/m4/lock.m4 \ - $(top_srcdir)/m4/longlong.m4 $(top_srcdir)/m4/lseek.m4 \ - $(top_srcdir)/m4/lstat.m4 $(top_srcdir)/m4/ltoptions.m4 \ - $(top_srcdir)/m4/ltsugar.m4 $(top_srcdir)/m4/ltversion.m4 \ - $(top_srcdir)/m4/lt~obsolete.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/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/localename.m4 $(top_srcdir)/m4/lock.m4 \ + $(top_srcdir)/m4/lseek.m4 $(top_srcdir)/m4/lstat.m4 \ + $(top_srcdir)/m4/ltoptions.m4 $(top_srcdir)/m4/ltsugar.m4 \ + $(top_srcdir)/m4/ltversion.m4 $(top_srcdir)/m4/lt~obsolete.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/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/nanosleep.m4 $(top_srcdir)/m4/netinet_in_h.m4 \ + $(top_srcdir)/m4/musl.m4 $(top_srcdir)/m4/nanosleep.m4 \ + $(top_srcdir)/m4/netinet_in_h.m4 \ $(top_srcdir)/m4/nl_langinfo.m4 $(top_srcdir)/m4/nls.m4 \ $(top_srcdir)/m4/nocrash.m4 $(top_srcdir)/m4/o-direct.m4 \ $(top_srcdir)/m4/off_t.m4 $(top_srcdir)/m4/open-cloexec.m4 \ - $(top_srcdir)/m4/open.m4 $(top_srcdir)/m4/pathmax.m4 \ - $(top_srcdir)/m4/perror.m4 $(top_srcdir)/m4/pipe.m4 \ + $(top_srcdir)/m4/open-slash.m4 $(top_srcdir)/m4/open.m4 \ + $(top_srcdir)/m4/pathmax.m4 $(top_srcdir)/m4/perror.m4 \ + $(top_srcdir)/m4/pid_t.m4 $(top_srcdir)/m4/pipe.m4 \ $(top_srcdir)/m4/po.m4 $(top_srcdir)/m4/priv-set.m4 \ $(top_srcdir)/m4/progtest.m4 \ $(top_srcdir)/m4/pthread-thread.m4 \ @@ -239,9 +238,10 @@ am__aclocal_m4_deps = $(top_srcdir)/m4/00gnulib.m4 \ $(top_srcdir)/m4/readlink.m4 $(top_srcdir)/m4/realloc.m4 \ $(top_srcdir)/m4/regex.m4 $(top_srcdir)/m4/rpmatch.m4 \ $(top_srcdir)/m4/safe-read.m4 $(top_srcdir)/m4/sched_h.m4 \ - $(top_srcdir)/m4/select.m4 $(top_srcdir)/m4/setenv.m4 \ - $(top_srcdir)/m4/setlocale.m4 $(top_srcdir)/m4/sigaction.m4 \ - $(top_srcdir)/m4/signal_h.m4 \ + $(top_srcdir)/m4/select.m4 $(top_srcdir)/m4/semaphore.m4 \ + $(top_srcdir)/m4/setenv.m4 $(top_srcdir)/m4/setlocale.m4 \ + $(top_srcdir)/m4/setlocale_null.m4 \ + $(top_srcdir)/m4/sigaction.m4 $(top_srcdir)/m4/signal_h.m4 \ $(top_srcdir)/m4/signalblocking.m4 $(top_srcdir)/m4/sleep.m4 \ $(top_srcdir)/m4/socketlib.m4 $(top_srcdir)/m4/sockets.m4 \ $(top_srcdir)/m4/socklen.m4 $(top_srcdir)/m4/sockpfaf.m4 \ @@ -256,6 +256,7 @@ am__aclocal_m4_deps = $(top_srcdir)/m4/00gnulib.m4 \ $(top_srcdir)/m4/strnlen.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 \ @@ -264,14 +265,15 @@ am__aclocal_m4_deps = $(top_srcdir)/m4/00gnulib.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/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/xstrndup.m4 $(top_srcdir)/m4/xstrtol.m4 \ - $(top_srcdir)/m4/yield.m4 $(top_srcdir)/configure.ac + $(top_srcdir)/m4/yield.m4 $(top_srcdir)/m4/zzgnulib.m4 \ + $(top_srcdir)/configure.ac am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \ $(ACLOCAL_M4) DIST_COMMON = $(srcdir)/Makefile.am $(am__DIST_COMMON) @@ -282,15 +284,16 @@ CONFIG_CLEAN_VPATH_FILES = LTLIBRARIES = $(noinst_LTLIBRARIES) am__DEPENDENCIES_1 = am__dirstamp = $(am__leading_dot)dirstamp -am_libgnulib_la_OBJECTS = argmatch.lo c-ctype.lo c-strcasecmp.lo \ - c-strncasecmp.lo close-stream.lo closeout.lo dirname.lo \ - basename.lo dirname-lgpl.lo basename-lgpl.lo stripslash.lo \ - exitfail.lo fd-hook.lo getprogname.lo hard-locale.lo \ - localcharset.lo glthread/lock.lo long-options.lo malloca.lo \ - progname.lo quotearg.lo safe-read.lo stat-time.lo tempname.lo \ +am_libgnulib_la_OBJECTS = argmatch.lo basename-lgpl.lo c-ctype.lo \ + c-strcasecmp.lo c-strncasecmp.lo cloexec.lo close-stream.lo \ + closeout.lo dirname.lo basename.lo dirname-lgpl.lo \ + stripslash.lo exitfail.lo fd-hook.lo getprogname.lo \ + hard-locale.lo localcharset.lo glthread/lock.lo \ + long-options.lo malloca.lo progname.lo quotearg.lo \ + safe-read.lo setlocale_null.lo stat-time.lo tempname.lo \ glthread/threadlib.lo unistd.lo version-etc.lo \ version-etc-fsf.lo wctype-h.lo xmalloc.lo xalloc-die.lo \ - xstrndup.lo xstrtol.lo xstrtoul.lo xstrtol-error.lo + xstrndup.lo xstrtol.lo xstrtoul.lo xstrtoll.lo xstrtoull.lo libgnulib_la_OBJECTS = $(am_libgnulib_la_OBJECTS) AM_V_lt = $(am__v_lt_@AM_V@) am__v_lt_ = $(am__v_lt_@AM_DEFAULT_V@) @@ -319,28 +322,33 @@ am__depfiles_remade = ./$(DEPDIR)/alloca.Plo ./$(DEPDIR)/argmatch.Plo \ ./$(DEPDIR)/btowc.Plo ./$(DEPDIR)/c-ctype.Plo \ ./$(DEPDIR)/c-strcasecmp.Plo ./$(DEPDIR)/c-strncasecmp.Plo \ ./$(DEPDIR)/calloc.Plo ./$(DEPDIR)/canonicalize-lgpl.Plo \ - ./$(DEPDIR)/close-stream.Plo ./$(DEPDIR)/close.Plo \ - ./$(DEPDIR)/closeout.Plo ./$(DEPDIR)/dirname-lgpl.Plo \ - ./$(DEPDIR)/dirname.Plo ./$(DEPDIR)/error.Plo \ - ./$(DEPDIR)/exitfail.Plo ./$(DEPDIR)/fd-hook.Plo \ - ./$(DEPDIR)/fpending.Plo ./$(DEPDIR)/fstat.Plo \ - ./$(DEPDIR)/fsync.Plo ./$(DEPDIR)/getopt.Plo \ + ./$(DEPDIR)/cloexec.Plo ./$(DEPDIR)/close-stream.Plo \ + ./$(DEPDIR)/close.Plo ./$(DEPDIR)/closeout.Plo \ + ./$(DEPDIR)/dirname-lgpl.Plo ./$(DEPDIR)/dirname.Plo \ + ./$(DEPDIR)/dup2.Plo ./$(DEPDIR)/error.Plo \ + ./$(DEPDIR)/exitfail.Plo ./$(DEPDIR)/fcntl.Plo \ + ./$(DEPDIR)/fd-hook.Plo ./$(DEPDIR)/fpending.Plo \ + ./$(DEPDIR)/fstat.Plo ./$(DEPDIR)/fsync.Plo \ + ./$(DEPDIR)/getdtablesize.Plo ./$(DEPDIR)/getopt.Plo \ ./$(DEPDIR)/getopt1.Plo ./$(DEPDIR)/getprogname.Plo \ - ./$(DEPDIR)/gettimeofday.Plo ./$(DEPDIR)/hard-locale.Plo \ + ./$(DEPDIR)/getrandom.Plo ./$(DEPDIR)/hard-locale.Plo \ + ./$(DEPDIR)/lc-charset-dispatch.Plo \ ./$(DEPDIR)/localcharset.Plo ./$(DEPDIR)/localeconv.Plo \ - ./$(DEPDIR)/localtime-buffer.Plo ./$(DEPDIR)/long-options.Plo \ - ./$(DEPDIR)/lseek.Plo ./$(DEPDIR)/lstat.Plo \ - ./$(DEPDIR)/malloc.Plo ./$(DEPDIR)/malloca.Plo \ - ./$(DEPDIR)/mbrtowc.Plo ./$(DEPDIR)/mbsinit.Plo \ + ./$(DEPDIR)/long-options.Plo ./$(DEPDIR)/lseek.Plo \ + ./$(DEPDIR)/lstat.Plo ./$(DEPDIR)/malloc.Plo \ + ./$(DEPDIR)/malloca.Plo ./$(DEPDIR)/mbrtowc.Plo \ + ./$(DEPDIR)/mbsinit.Plo ./$(DEPDIR)/mbtowc-lock.Plo \ ./$(DEPDIR)/mbtowc.Plo ./$(DEPDIR)/mkdir.Plo \ ./$(DEPDIR)/mkstemp.Plo ./$(DEPDIR)/msvc-inval.Plo \ - ./$(DEPDIR)/msvc-nothrow.Plo ./$(DEPDIR)/nl_langinfo.Plo \ + ./$(DEPDIR)/msvc-nothrow.Plo ./$(DEPDIR)/nl_langinfo-lock.Plo \ + ./$(DEPDIR)/nl_langinfo.Plo ./$(DEPDIR)/open.Plo \ ./$(DEPDIR)/progname.Plo ./$(DEPDIR)/quotearg.Plo \ ./$(DEPDIR)/read.Plo ./$(DEPDIR)/readlink.Plo \ ./$(DEPDIR)/realloc.Plo ./$(DEPDIR)/regcomp.Plo \ ./$(DEPDIR)/regex.Plo ./$(DEPDIR)/regex_internal.Plo \ ./$(DEPDIR)/regexec.Plo ./$(DEPDIR)/rpmatch.Plo \ - ./$(DEPDIR)/safe-read.Plo ./$(DEPDIR)/sleep.Plo \ + ./$(DEPDIR)/safe-read.Plo ./$(DEPDIR)/setlocale-lock.Plo \ + ./$(DEPDIR)/setlocale_null.Plo ./$(DEPDIR)/sleep.Plo \ ./$(DEPDIR)/stat-time.Plo ./$(DEPDIR)/stat-w32.Plo \ ./$(DEPDIR)/stat.Plo ./$(DEPDIR)/strdup.Plo \ ./$(DEPDIR)/strerror-override.Plo ./$(DEPDIR)/strerror.Plo \ @@ -355,10 +363,9 @@ am__depfiles_remade = ./$(DEPDIR)/alloca.Plo ./$(DEPDIR)/argmatch.Plo \ ./$(DEPDIR)/windows-once.Plo ./$(DEPDIR)/windows-recmutex.Plo \ ./$(DEPDIR)/windows-rwlock.Plo ./$(DEPDIR)/xalloc-die.Plo \ ./$(DEPDIR)/xmalloc.Plo ./$(DEPDIR)/xstrndup.Plo \ - ./$(DEPDIR)/xstrtol-error.Plo ./$(DEPDIR)/xstrtol.Plo \ - ./$(DEPDIR)/xstrtoll.Plo ./$(DEPDIR)/xstrtoul.Plo \ - ./$(DEPDIR)/xstrtoull.Plo glthread/$(DEPDIR)/lock.Plo \ - glthread/$(DEPDIR)/threadlib.Plo + ./$(DEPDIR)/xstrtol.Plo ./$(DEPDIR)/xstrtoll.Plo \ + ./$(DEPDIR)/xstrtoul.Plo ./$(DEPDIR)/xstrtoull.Plo \ + glthread/$(DEPDIR)/lock.Plo glthread/$(DEPDIR)/threadlib.Plo am__mv = mv -f COMPILE = $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) \ $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) @@ -430,6 +437,7 @@ BUILDINFO = @BUILDINFO@ CC = @CC@ CCDEPMODE = @CCDEPMODE@ CFLAGS = @CFLAGS@ +CFLAG_VISIBILITY = @CFLAG_VISIBILITY@ CHECK_CFLAGS = @CHECK_CFLAGS@ CHECK_LIBS = @CHECK_LIBS@ CONFIG_INCLUDE = @CONFIG_INCLUDE@ @@ -464,6 +472,8 @@ GMSGFMT = @GMSGFMT@ GMSGFMT_015 = @GMSGFMT_015@ GNULIB_ACCEPT = @GNULIB_ACCEPT@ GNULIB_ACCEPT4 = @GNULIB_ACCEPT4@ +GNULIB_ACCESS = @GNULIB_ACCESS@ +GNULIB_ALIGNED_ALLOC = @GNULIB_ALIGNED_ALLOC@ GNULIB_ATOLL = @GNULIB_ATOLL@ GNULIB_BIND = @GNULIB_BIND@ GNULIB_BTOWC = @GNULIB_BTOWC@ @@ -474,6 +484,7 @@ GNULIB_CHOWN = @GNULIB_CHOWN@ GNULIB_CLOSE = @GNULIB_CLOSE@ GNULIB_CONNECT = @GNULIB_CONNECT@ GNULIB_COPY_FILE_RANGE = @GNULIB_COPY_FILE_RANGE@ +GNULIB_CREAT = @GNULIB_CREAT@ GNULIB_CTIME = @GNULIB_CTIME@ GNULIB_DPRINTF = @GNULIB_DPRINTF@ GNULIB_DUP = @GNULIB_DUP@ @@ -521,19 +532,23 @@ GNULIB_GETCWD = @GNULIB_GETCWD@ GNULIB_GETDELIM = @GNULIB_GETDELIM@ GNULIB_GETDOMAINNAME = @GNULIB_GETDOMAINNAME@ GNULIB_GETDTABLESIZE = @GNULIB_GETDTABLESIZE@ +GNULIB_GETENTROPY = @GNULIB_GETENTROPY@ GNULIB_GETGROUPS = @GNULIB_GETGROUPS@ GNULIB_GETHOSTNAME = @GNULIB_GETHOSTNAME@ GNULIB_GETLINE = @GNULIB_GETLINE@ GNULIB_GETLOADAVG = @GNULIB_GETLOADAVG@ GNULIB_GETLOGIN = @GNULIB_GETLOGIN@ GNULIB_GETLOGIN_R = @GNULIB_GETLOGIN_R@ +GNULIB_GETOPT_POSIX = @GNULIB_GETOPT_POSIX@ GNULIB_GETPAGESIZE = @GNULIB_GETPAGESIZE@ GNULIB_GETPASS = @GNULIB_GETPASS@ GNULIB_GETPEERNAME = @GNULIB_GETPEERNAME@ +GNULIB_GETRANDOM = @GNULIB_GETRANDOM@ GNULIB_GETSOCKNAME = @GNULIB_GETSOCKNAME@ GNULIB_GETSOCKOPT = @GNULIB_GETSOCKOPT@ GNULIB_GETSUBOPT = @GNULIB_GETSUBOPT@ GNULIB_GETTIMEOFDAY = @GNULIB_GETTIMEOFDAY@ +GNULIB_GETUMASK = @GNULIB_GETUMASK@ GNULIB_GETUSERSHELL = @GNULIB_GETUSERSHELL@ GNULIB_GL_UNISTD_H_GETOPT = @GNULIB_GL_UNISTD_H_GETOPT@ GNULIB_GRANTPT = @GNULIB_GRANTPT@ @@ -547,6 +562,8 @@ GNULIB_ISATTY = @GNULIB_ISATTY@ GNULIB_ISBLANK = @GNULIB_ISBLANK@ GNULIB_ISWBLANK = @GNULIB_ISWBLANK@ GNULIB_ISWCTYPE = @GNULIB_ISWCTYPE@ +GNULIB_ISWDIGIT = @GNULIB_ISWDIGIT@ +GNULIB_ISWXDIGIT = @GNULIB_ISWXDIGIT@ GNULIB_LCHMOD = @GNULIB_LCHMOD@ GNULIB_LCHOWN = @GNULIB_LCHOWN@ GNULIB_LINK = @GNULIB_LINK@ @@ -607,6 +624,7 @@ GNULIB_PERROR = @GNULIB_PERROR@ GNULIB_PIPE = @GNULIB_PIPE@ GNULIB_PIPE2 = @GNULIB_PIPE2@ GNULIB_POPEN = @GNULIB_POPEN@ +GNULIB_POSIX_MEMALIGN = @GNULIB_POSIX_MEMALIGN@ GNULIB_POSIX_OPENPT = @GNULIB_POSIX_OPENPT@ GNULIB_PREAD = @GNULIB_PREAD@ GNULIB_PRINTF = @GNULIB_PRINTF@ @@ -655,9 +673,12 @@ GNULIB_SENDTO = @GNULIB_SENDTO@ GNULIB_SETENV = @GNULIB_SETENV@ GNULIB_SETHOSTNAME = @GNULIB_SETHOSTNAME@ GNULIB_SETLOCALE = @GNULIB_SETLOCALE@ +GNULIB_SETLOCALE_NULL = @GNULIB_SETLOCALE_NULL@ GNULIB_SETSOCKOPT = @GNULIB_SETSOCKOPT@ GNULIB_SHUTDOWN = @GNULIB_SHUTDOWN@ +GNULIB_SIGABBREV_NP = @GNULIB_SIGABBREV_NP@ GNULIB_SIGACTION = @GNULIB_SIGACTION@ +GNULIB_SIGDESCR_NP = @GNULIB_SIGDESCR_NP@ GNULIB_SIGNAL_H_SIGPIPE = @GNULIB_SIGNAL_H_SIGPIPE@ GNULIB_SIGPROCMASK = @GNULIB_SIGPROCMASK@ GNULIB_SLEEP = @GNULIB_SLEEP@ @@ -673,6 +694,7 @@ GNULIB_STRCASESTR = @GNULIB_STRCASESTR@ GNULIB_STRCHRNUL = @GNULIB_STRCHRNUL@ GNULIB_STRDUP = @GNULIB_STRDUP@ GNULIB_STRERROR = @GNULIB_STRERROR@ +GNULIB_STRERRORNAME_NP = @GNULIB_STRERRORNAME_NP@ GNULIB_STRERROR_R = @GNULIB_STRERROR_R@ GNULIB_STRFTIME = @GNULIB_STRFTIME@ GNULIB_STRNCAT = @GNULIB_STRNCAT@ @@ -756,11 +778,13 @@ GNULIB_WMEMCHR = @GNULIB_WMEMCHR@ GNULIB_WMEMCMP = @GNULIB_WMEMCMP@ GNULIB_WMEMCPY = @GNULIB_WMEMCPY@ GNULIB_WMEMMOVE = @GNULIB_WMEMMOVE@ +GNULIB_WMEMPCPY = @GNULIB_WMEMPCPY@ GNULIB_WMEMSET = @GNULIB_WMEMSET@ GNULIB_WRITE = @GNULIB_WRITE@ GNULIB__EXIT = @GNULIB__EXIT@ GREP = @GREP@ HAVE_ACCEPT4 = @HAVE_ACCEPT4@ +HAVE_ALIGNED_ALLOC = @HAVE_ALIGNED_ALLOC@ HAVE_ALLOCA_H = @HAVE_ALLOCA_H@ HAVE_ARPA_INET_H = @HAVE_ARPA_INET_H@ HAVE_ATOLL = @HAVE_ATOLL@ @@ -770,12 +794,17 @@ HAVE_CANONICALIZE_FILE_NAME = @HAVE_CANONICALIZE_FILE_NAME@ HAVE_CHOWN = @HAVE_CHOWN@ HAVE_COPY_FILE_RANGE = @HAVE_COPY_FILE_RANGE@ HAVE_CRTDEFS_H = @HAVE_CRTDEFS_H@ +HAVE_DECL_ECVT = @HAVE_DECL_ECVT@ HAVE_DECL_ENVIRON = @HAVE_DECL_ENVIRON@ +HAVE_DECL_EXECVPE = @HAVE_DECL_EXECVPE@ HAVE_DECL_FCHDIR = @HAVE_DECL_FCHDIR@ +HAVE_DECL_FCLOSEALL = @HAVE_DECL_FCLOSEALL@ +HAVE_DECL_FCVT = @HAVE_DECL_FCVT@ HAVE_DECL_FDATASYNC = @HAVE_DECL_FDATASYNC@ HAVE_DECL_FPURGE = @HAVE_DECL_FPURGE@ HAVE_DECL_FSEEKO = @HAVE_DECL_FSEEKO@ HAVE_DECL_FTELLO = @HAVE_DECL_FTELLO@ +HAVE_DECL_GCVT = @HAVE_DECL_GCVT@ HAVE_DECL_GETDELIM = @HAVE_DECL_GETDELIM@ HAVE_DECL_GETDOMAINNAME = @HAVE_DECL_GETDOMAINNAME@ HAVE_DECL_GETLINE = @HAVE_DECL_GETLINE@ @@ -809,10 +838,10 @@ HAVE_DECL_TRUNCATE = @HAVE_DECL_TRUNCATE@ HAVE_DECL_TTYNAME_R = @HAVE_DECL_TTYNAME_R@ HAVE_DECL_UNSETENV = @HAVE_DECL_UNSETENV@ HAVE_DECL_VSNPRINTF = @HAVE_DECL_VSNPRINTF@ +HAVE_DECL_WCSDUP = @HAVE_DECL_WCSDUP@ HAVE_DECL_WCTOB = @HAVE_DECL_WCTOB@ HAVE_DECL_WCWIDTH = @HAVE_DECL_WCWIDTH@ HAVE_DPRINTF = @HAVE_DPRINTF@ -HAVE_DUP2 = @HAVE_DUP2@ HAVE_DUP3 = @HAVE_DUP3@ HAVE_DUPLOCALE = @HAVE_DUPLOCALE@ HAVE_EUIDACCESS = @HAVE_EUIDACCESS@ @@ -834,14 +863,17 @@ HAVE_FTELLO = @HAVE_FTELLO@ HAVE_FTRUNCATE = @HAVE_FTRUNCATE@ HAVE_FUTIMENS = @HAVE_FUTIMENS@ HAVE_GETDTABLESIZE = @HAVE_GETDTABLESIZE@ +HAVE_GETENTROPY = @HAVE_GETENTROPY@ HAVE_GETGROUPS = @HAVE_GETGROUPS@ HAVE_GETHOSTNAME = @HAVE_GETHOSTNAME@ HAVE_GETLOGIN = @HAVE_GETLOGIN@ HAVE_GETOPT_H = @HAVE_GETOPT_H@ HAVE_GETPAGESIZE = @HAVE_GETPAGESIZE@ HAVE_GETPASS = @HAVE_GETPASS@ +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_IMAXDIV_T = @HAVE_IMAXDIV_T@ @@ -860,7 +892,6 @@ HAVE_LCHMOD = @HAVE_LCHMOD@ HAVE_LCHOWN = @HAVE_LCHOWN@ HAVE_LINK = @HAVE_LINK@ HAVE_LINKAT = @HAVE_LINKAT@ -HAVE_LONG_LONG_INT = @HAVE_LONG_LONG_INT@ HAVE_LSTAT = @HAVE_LSTAT@ HAVE_MAX_ALIGN_T = @HAVE_MAX_ALIGN_T@ HAVE_MBRLEN = @HAVE_MBRLEN@ @@ -870,7 +901,6 @@ HAVE_MBSLEN = @HAVE_MBSLEN@ HAVE_MBSNRTOWCS = @HAVE_MBSNRTOWCS@ HAVE_MBSRTOWCS = @HAVE_MBSRTOWCS@ HAVE_MBTOWC = @HAVE_MBTOWC@ -HAVE_MEMCHR = @HAVE_MEMCHR@ HAVE_MEMPCPY = @HAVE_MEMPCPY@ HAVE_MKDIRAT = @HAVE_MKDIRAT@ HAVE_MKDTEMP = @HAVE_MKDTEMP@ @@ -893,6 +923,7 @@ HAVE_PCLOSE = @HAVE_PCLOSE@ HAVE_PIPE = @HAVE_PIPE@ HAVE_PIPE2 = @HAVE_PIPE2@ HAVE_POPEN = @HAVE_POPEN@ +HAVE_POSIX_MEMALIGN = @HAVE_POSIX_MEMALIGN@ HAVE_POSIX_OPENPT = @HAVE_POSIX_OPENPT@ HAVE_POSIX_SIGNALBLOCKING = @HAVE_POSIX_SIGNALBLOCKING@ HAVE_PREAD = @HAVE_PREAD@ @@ -978,7 +1009,9 @@ HAVE_SECURE_GETENV = @HAVE_SECURE_GETENV@ HAVE_SETENV = @HAVE_SETENV@ HAVE_SETHOSTNAME = @HAVE_SETHOSTNAME@ HAVE_SETSTATE = @HAVE_SETSTATE@ +HAVE_SIGABBREV_NP = @HAVE_SIGABBREV_NP@ HAVE_SIGACTION = @HAVE_SIGACTION@ +HAVE_SIGDESCR_NP = @HAVE_SIGDESCR_NP@ HAVE_SIGHANDLER_T = @HAVE_SIGHANDLER_T@ HAVE_SIGINFO_T = @HAVE_SIGINFO_T@ HAVE_SIGNED_SIG_ATOMIC_T = @HAVE_SIGNED_SIG_ATOMIC_T@ @@ -991,6 +1024,7 @@ HAVE_STPCPY = @HAVE_STPCPY@ HAVE_STPNCPY = @HAVE_STPNCPY@ HAVE_STRCASESTR = @HAVE_STRCASESTR@ HAVE_STRCHRNUL = @HAVE_STRCHRNUL@ +HAVE_STRERRORNAME_NP = @HAVE_STRERRORNAME_NP@ HAVE_STRPBRK = @HAVE_STRPBRK@ HAVE_STRPTIME = @HAVE_STRPTIME@ HAVE_STRSEP = @HAVE_STRSEP@ @@ -1013,6 +1047,7 @@ HAVE_SYS_INTTYPES_H = @HAVE_SYS_INTTYPES_H@ HAVE_SYS_IOCTL_H = @HAVE_SYS_IOCTL_H@ HAVE_SYS_LOADAVG_H = @HAVE_SYS_LOADAVG_H@ HAVE_SYS_PARAM_H = @HAVE_SYS_PARAM_H@ +HAVE_SYS_RANDOM_H = @HAVE_SYS_RANDOM_H@ HAVE_SYS_SELECT_H = @HAVE_SYS_SELECT_H@ HAVE_SYS_SOCKET_H = @HAVE_SYS_SOCKET_H@ HAVE_SYS_TIME_H = @HAVE_SYS_TIME_H@ @@ -1021,15 +1056,14 @@ HAVE_SYS_UIO_H = @HAVE_SYS_UIO_H@ HAVE_TIMEGM = @HAVE_TIMEGM@ HAVE_TIMEZONE_T = @HAVE_TIMEZONE_T@ HAVE_TYPE_VOLATILE_SIG_ATOMIC_T = @HAVE_TYPE_VOLATILE_SIG_ATOMIC_T@ -HAVE_TZSET = @HAVE_TZSET@ HAVE_UNISTD_H = @HAVE_UNISTD_H@ HAVE_UNLINKAT = @HAVE_UNLINKAT@ HAVE_UNLOCKPT = @HAVE_UNLOCKPT@ -HAVE_UNSIGNED_LONG_LONG_INT = @HAVE_UNSIGNED_LONG_LONG_INT@ HAVE_USLEEP = @HAVE_USLEEP@ HAVE_UTIMENSAT = @HAVE_UTIMENSAT@ HAVE_VASPRINTF = @HAVE_VASPRINTF@ HAVE_VDPRINTF = @HAVE_VDPRINTF@ +HAVE_VISIBILITY = @HAVE_VISIBILITY@ HAVE_WCHAR_H = @HAVE_WCHAR_H@ HAVE_WCHAR_T = @HAVE_WCHAR_T@ HAVE_WCPCPY = @HAVE_WCPCPY@ @@ -1068,6 +1102,7 @@ HAVE_WMEMCHR = @HAVE_WMEMCHR@ HAVE_WMEMCMP = @HAVE_WMEMCMP@ HAVE_WMEMCPY = @HAVE_WMEMCPY@ HAVE_WMEMMOVE = @HAVE_WMEMMOVE@ +HAVE_WMEMPCPY = @HAVE_WMEMPCPY@ HAVE_WMEMSET = @HAVE_WMEMSET@ HAVE_WS2TCPIP_H = @HAVE_WS2TCPIP_H@ HAVE_XLOCALE_H = @HAVE_XLOCALE_H@ @@ -1093,16 +1128,28 @@ LIBICONV = @LIBICONV@ LIBINTL = @LIBINTL@ LIBMULTITHREAD = @LIBMULTITHREAD@ LIBOBJS = @LIBOBJS@ +LIBPMULTITHREAD = @LIBPMULTITHREAD@ +LIBPTHREAD = @LIBPTHREAD@ LIBS = @LIBS@ LIBSOCKET = @LIBSOCKET@ +LIBSTDTHREAD = @LIBSTDTHREAD@ LIBTESTS_LIBDEPS = @LIBTESTS_LIBDEPS@ LIBTHREAD = @LIBTHREAD@ LIBTOOL = @LIBTOOL@ LIB_BLKID = @LIB_BLKID@ +LIB_CLOCK_GETTIME = @LIB_CLOCK_GETTIME@ +LIB_GETRANDOM = @LIB_GETRANDOM@ +LIB_HARD_LOCALE = @LIB_HARD_LOCALE@ +LIB_MBRTOWC = @LIB_MBRTOWC@ LIB_NANOSLEEP = @LIB_NANOSLEEP@ +LIB_NL_LANGINFO = @LIB_NL_LANGINFO@ LIB_PTHREAD = @LIB_PTHREAD@ LIB_PTHREAD_SIGMASK = @LIB_PTHREAD_SIGMASK@ +LIB_SCHED_YIELD = @LIB_SCHED_YIELD@ LIB_SELECT = @LIB_SELECT@ +LIB_SEMAPHORE = @LIB_SEMAPHORE@ +LIB_SETLOCALE = @LIB_SETLOCALE@ +LIB_SETLOCALE_NULL = @LIB_SETLOCALE_NULL@ LIMITS_H = @LIMITS_H@ LIPO = @LIPO@ LN_S = @LN_S@ @@ -1151,6 +1198,7 @@ NEXT_AS_FIRST_DIRECTIVE_STDIO_H = @NEXT_AS_FIRST_DIRECTIVE_STDIO_H@ NEXT_AS_FIRST_DIRECTIVE_STDLIB_H = @NEXT_AS_FIRST_DIRECTIVE_STDLIB_H@ NEXT_AS_FIRST_DIRECTIVE_STRING_H = @NEXT_AS_FIRST_DIRECTIVE_STRING_H@ NEXT_AS_FIRST_DIRECTIVE_SYS_IOCTL_H = @NEXT_AS_FIRST_DIRECTIVE_SYS_IOCTL_H@ +NEXT_AS_FIRST_DIRECTIVE_SYS_RANDOM_H = @NEXT_AS_FIRST_DIRECTIVE_SYS_RANDOM_H@ NEXT_AS_FIRST_DIRECTIVE_SYS_SELECT_H = @NEXT_AS_FIRST_DIRECTIVE_SYS_SELECT_H@ NEXT_AS_FIRST_DIRECTIVE_SYS_SOCKET_H = @NEXT_AS_FIRST_DIRECTIVE_SYS_SOCKET_H@ NEXT_AS_FIRST_DIRECTIVE_SYS_STAT_H = @NEXT_AS_FIRST_DIRECTIVE_SYS_STAT_H@ @@ -1180,6 +1228,7 @@ NEXT_STDIO_H = @NEXT_STDIO_H@ NEXT_STDLIB_H = @NEXT_STDLIB_H@ NEXT_STRING_H = @NEXT_STRING_H@ NEXT_SYS_IOCTL_H = @NEXT_SYS_IOCTL_H@ +NEXT_SYS_RANDOM_H = @NEXT_SYS_RANDOM_H@ NEXT_SYS_SELECT_H = @NEXT_SYS_SELECT_H@ NEXT_SYS_SOCKET_H = @NEXT_SYS_SOCKET_H@ NEXT_SYS_STAT_H = @NEXT_SYS_STAT_H@ @@ -1216,21 +1265,24 @@ POSUB = @POSUB@ PRAGMA_COLUMNS = @PRAGMA_COLUMNS@ PRAGMA_SYSTEM_HEADER = @PRAGMA_SYSTEM_HEADER@ PRIPTR_PREFIX = @PRIPTR_PREFIX@ -PRI_MACROS_BROKEN = @PRI_MACROS_BROKEN@ PTHREAD_H_DEFINES_STRUCT_TIMESPEC = @PTHREAD_H_DEFINES_STRUCT_TIMESPEC@ PTRDIFF_T_SUFFIX = @PTRDIFF_T_SUFFIX@ RANLIB = @RANLIB@ +REPLACE_ACCESS = @REPLACE_ACCESS@ +REPLACE_ALIGNED_ALLOC = @REPLACE_ALIGNED_ALLOC@ REPLACE_BTOWC = @REPLACE_BTOWC@ REPLACE_CALLOC = @REPLACE_CALLOC@ REPLACE_CANONICALIZE_FILE_NAME = @REPLACE_CANONICALIZE_FILE_NAME@ REPLACE_CHOWN = @REPLACE_CHOWN@ REPLACE_CLOSE = @REPLACE_CLOSE@ +REPLACE_CREAT = @REPLACE_CREAT@ REPLACE_CTIME = @REPLACE_CTIME@ REPLACE_DPRINTF = @REPLACE_DPRINTF@ REPLACE_DUP = @REPLACE_DUP@ REPLACE_DUP2 = @REPLACE_DUP2@ REPLACE_DUPLOCALE = @REPLACE_DUPLOCALE@ REPLACE_FACCESSAT = @REPLACE_FACCESSAT@ +REPLACE_FCHMODAT = @REPLACE_FCHMODAT@ REPLACE_FCHOWNAT = @REPLACE_FCHOWNAT@ REPLACE_FCLOSE = @REPLACE_FCLOSE@ REPLACE_FCNTL = @REPLACE_FCNTL@ @@ -1258,6 +1310,7 @@ REPLACE_GETLINE = @REPLACE_GETLINE@ REPLACE_GETLOGIN_R = @REPLACE_GETLOGIN_R@ REPLACE_GETPAGESIZE = @REPLACE_GETPAGESIZE@ REPLACE_GETPASS = @REPLACE_GETPASS@ +REPLACE_GETRANDOM = @REPLACE_GETRANDOM@ REPLACE_GETTIMEOFDAY = @REPLACE_GETTIMEOFDAY@ REPLACE_GMTIME = @REPLACE_GMTIME@ REPLACE_INET_NTOP = @REPLACE_INET_NTOP@ @@ -1267,6 +1320,8 @@ REPLACE_IOCTL = @REPLACE_IOCTL@ REPLACE_ISATTY = @REPLACE_ISATTY@ REPLACE_ISWBLANK = @REPLACE_ISWBLANK@ REPLACE_ISWCNTRL = @REPLACE_ISWCNTRL@ +REPLACE_ISWDIGIT = @REPLACE_ISWDIGIT@ +REPLACE_ISWXDIGIT = @REPLACE_ISWXDIGIT@ REPLACE_LCHOWN = @REPLACE_LCHOWN@ REPLACE_LINK = @REPLACE_LINK@ REPLACE_LINKAT = @REPLACE_LINKAT@ @@ -1299,6 +1354,7 @@ REPLACE_OPEN = @REPLACE_OPEN@ REPLACE_OPENAT = @REPLACE_OPENAT@ REPLACE_PERROR = @REPLACE_PERROR@ REPLACE_POPEN = @REPLACE_POPEN@ +REPLACE_POSIX_MEMALIGN = @REPLACE_POSIX_MEMALIGN@ REPLACE_PREAD = @REPLACE_PREAD@ REPLACE_PRINTF = @REPLACE_PRINTF@ REPLACE_PSELECT = @REPLACE_PSELECT@ @@ -1387,6 +1443,7 @@ REPLACE_STRCASESTR = @REPLACE_STRCASESTR@ REPLACE_STRCHRNUL = @REPLACE_STRCHRNUL@ REPLACE_STRDUP = @REPLACE_STRDUP@ REPLACE_STRERROR = @REPLACE_STRERROR@ +REPLACE_STRERRORNAME_NP = @REPLACE_STRERRORNAME_NP@ REPLACE_STRERROR_R = @REPLACE_STRERROR_R@ REPLACE_STRFTIME = @REPLACE_STRFTIME@ REPLACE_STRNCAT = @REPLACE_STRNCAT@ @@ -1424,13 +1481,13 @@ REPLACE_WCRTOMB = @REPLACE_WCRTOMB@ REPLACE_WCSFTIME = @REPLACE_WCSFTIME@ REPLACE_WCSNRTOMBS = @REPLACE_WCSNRTOMBS@ REPLACE_WCSRTOMBS = @REPLACE_WCSRTOMBS@ +REPLACE_WCSTOK = @REPLACE_WCSTOK@ REPLACE_WCSWIDTH = @REPLACE_WCSWIDTH@ REPLACE_WCTOB = @REPLACE_WCTOB@ REPLACE_WCTOMB = @REPLACE_WCTOMB@ REPLACE_WCWIDTH = @REPLACE_WCWIDTH@ REPLACE_WRITE = @REPLACE_WRITE@ SED = @SED@ -SELINUX_LIBS = @SELINUX_LIBS@ SET_MAKE = @SET_MAKE@ SHELL = @SHELL@ SIG_ATOMIC_T_SUFFIX = @SIG_ATOMIC_T_SUFFIX@ @@ -1449,6 +1506,7 @@ UINT32_MAX_LT_UINTMAX_MAX = @UINT32_MAX_LT_UINTMAX_MAX@ UINT64_MAX_EQ_ULONG_MAX = @UINT64_MAX_EQ_ULONG_MAX@ UNDEFINE_STRTOK_R = @UNDEFINE_STRTOK_R@ UNISTD_H_DEFINES_STRUCT_TIMESPEC = @UNISTD_H_DEFINES_STRUCT_TIMESPEC@ +UNISTD_H_HAVE_SYS_RANDOM_H = @UNISTD_H_HAVE_SYS_RANDOM_H@ UNISTD_H_HAVE_WINSOCK2_H = @UNISTD_H_HAVE_WINSOCK2_H@ UNISTD_H_HAVE_WINSOCK2_H_AND_USE_SOCKETS = @UNISTD_H_HAVE_WINSOCK2_H_AND_USE_SOCKETS@ USE_NLS = @USE_NLS@ @@ -1529,97 +1587,103 @@ AM_CFLAGS = $(GNULIB_WARN_CFLAGS) $(WERROR_CFLAGS) AM_CPPFLAGS = BUILT_SOURCES = $(ALLOCA_H) configmake.h $(ERRNO_H) fcntl.h \ $(GETOPT_H) $(GETOPT_CDEFS_H) inttypes.h langinfo.h \ - $(LIMITS_H) locale.h $(STDARG_H) $(STDBOOL_H) $(STDDEF_H) \ - $(STDINT_H) stdio.h stdlib.h string.h sys/stat.h sys/time.h \ - sys/types.h time.h unistd.h wchar.h wctype.h + $(LIMITS_H) locale.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 CLEANFILES = configmake.h configmake.h-t EXTRA_DIST = alloca.c alloca.in.h $(top_srcdir)/build-aux/announce-gen \ - argmatch.h assure.h btowc.c c-strcaseeq.h calloc.c calloc.c \ - canonicalize-lgpl.c close.c close-stream.h closeout.h \ - stripslash.c dirname.h \ - $(top_srcdir)/build-aux/do-release-commit-and-tag dosname.h \ - errno.in.h error.c error.h exitfail.h fcntl.in.h fd-hook.h \ - filename.h fpending.c fpending.h stdio-impl.h fstat.c \ - stat-w32.c stat-w32.h fsync.c \ - $(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.c getopt.in.h getopt1.c getopt_int.h gettimeofday.c \ - $(top_srcdir)/build-aux/git-version-gen \ + argmatch.h assure.h attribute.h basename-lgpl.h btowc.c \ + c-strcaseeq.h calloc.c calloc.c canonicalize-lgpl.c cloexec.h \ + close.c close-stream.h closeout.h stripslash.c dirname.h \ + $(top_srcdir)/build-aux/do-release-commit-and-tag dup2.c \ + errno.in.h error.c error.h exitfail.h fcntl.c fcntl.in.h \ + fd-hook.h filename.h fpending.c fpending.h stdio-impl.h \ + fstat.c stat-w32.c stat-w32.h fsync.c \ + $(top_srcdir)/build-aux/gendocs.sh getdtablesize.c \ + getopt-cdefs.in.h getopt-core.h getopt-ext.h getopt-pfx-core.h \ + getopt-pfx-ext.h getopt.c getopt.in.h getopt1.c getopt_int.h \ + getrandom.c $(top_srcdir)/build-aux/git-version-gen \ $(top_srcdir)/build-aux/gitlog-to-changelog \ $(top_srcdir)/build-aux/gnu-web-doc-update \ $(top_srcdir)/GNUmakefile $(top_srcdir)/build-aux/gnupload \ - hard-locale.h $(top_srcdir)/build-aux/config.rpath intprops.h \ - inttypes.in.h langinfo.in.h cdefs.h libc-config.h limits.in.h \ - localcharset.h locale.in.h localeconv.c localtime-buffer.c \ - localtime-buffer.h long-options.h lseek.c lstat.c \ - $(top_srcdir)/maint.mk malloc.c malloc.c malloca.h mbrtowc.c \ - mbsinit.c mbtowc-impl.h mbtowc.c mkdir.c mkstemp.c \ - $(top_srcdir)/build-aux/mktempd msvc-inval.c msvc-inval.h \ - msvc-nothrow.c msvc-nothrow.h nl_langinfo.c pathmax.h quote.h \ - quote.h quotearg.h read.c readlink.c realloc.c realloc.c \ - regcomp.c regex.c regex.h regex_internal.c regex_internal.h \ - regexec.c rpmatch.c safe-read.h sys-limits.h sleep.c \ + hard-locale.h intprops.h inttypes.in.h langinfo.in.h cdefs.h \ + libc-config.h limits.in.h localcharset.h locale.in.h \ + localeconv.c long-options.h lseek.c lstat.c \ + $(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 mbrtowc.c mbtowc-lock.c \ + mbtowc-lock.h windows-initguard.h mbsinit.c mbtowc-impl.h \ + mbtowc.c mkdir.c mkstemp.c $(top_srcdir)/build-aux/mktempd \ + msvc-inval.c msvc-inval.h msvc-nothrow.c msvc-nothrow.h \ + nl_langinfo-lock.c nl_langinfo.c windows-initguard.h open.c \ + pathmax.h quote.h quote.h quotearg.h read.c readlink.c \ + realloc.c realloc.c regcomp.c regex.c regex.h regex_internal.c \ + regex_internal.h regexec.c rpmatch.c safe-read.h sys-limits.h \ + setlocale-lock.c setlocale_null.h windows-initguard.h sleep.c \ _Noreturn.h arg-nonnull.h c++defs.h warn-on-use.h stat-w32.c \ - stat-w32.h stat.c stat-time.h stdarg.in.h stdbool.in.h \ - stddef.in.h stdint.in.h stdio.in.h stdlib.in.h strdup.c \ - streq.h strerror.c strerror-override.c strerror-override.h \ - string.in.h strndup.c strnlen.c strtol.c strtoll.c strtol.c \ - strtoul.c strtoull.c sys_stat.in.h sys_time.in.h \ - sys_types.in.h tempname.h $(top_srcdir)/build-aux/config.rpath \ - time.in.h unistd.in.h unlink.c \ - $(top_srcdir)/build-aux/update-copyright \ + stat-w32.h stat.c stat-time.h stdalign.in.h stdarg.in.h \ + stdbool.in.h stddef.in.h stdint.in.h stdio.in.h stdlib.in.h \ + strdup.c streq.h strerror.c strerror-override.c \ + strerror-override.h string.in.h strndup.c strnlen.c strtol.c \ + strtoll.c strtol.c strtoul.c strtoull.c sys_random.in.h \ + sys_stat.in.h sys_types.in.h tempname.h time.in.h unistd.in.h \ + unlink.c $(top_srcdir)/build-aux/update-copyright \ $(top_srcdir)/build-aux/useless-if-before-free usleep.c \ $(top_srcdir)/build-aux/vc-list-files verify.h wchar.in.h \ wcrtomb.c wctype.in.h windows-initguard.h windows-mutex.c \ windows-mutex.h windows-once.c windows-once.h \ windows-initguard.h windows-recmutex.c windows-recmutex.h \ windows-initguard.h windows-rwlock.c windows-rwlock.h xalloc.h \ - xalloc-oversized.h xstrtol.h xstrtoll.c xstrtoull.c + xalloc.h xalloc-oversized.h xstrtol.h MAINTAINERCLEANFILES = -MOSTLYCLEANDIRS = sys +MOSTLYCLEANDIRS = sys sys MOSTLYCLEANFILES = core *.stackdump alloca.h alloca.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 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/stat.h sys/stat.h-t sys/time.h sys/time.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 + langinfo.h-t limits.h limits.h-t locale.h locale.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 SUFFIXES = # No GNU Make output. noinst_LTLIBRARIES = libgnulib.la -libgnulib_la_SOURCES = argmatch.c c-ctype.h c-ctype.c c-strcase.h \ - c-strcasecmp.c c-strncasecmp.c close-stream.c closeout.c \ - dirname.c basename.c dirname-lgpl.c basename-lgpl.c \ +libgnulib_la_SOURCES = argmatch.c basename-lgpl.c c-ctype.h c-ctype.c \ + c-strcase.h c-strcasecmp.c c-strncasecmp.c cloexec.c \ + close-stream.c closeout.c dirname.c basename.c dirname-lgpl.c \ stripslash.c exitfail.c fd-hook.c getprogname.h getprogname.c \ - gettext.h hard-locale.c localcharset.c glthread/lock.h \ + gettext.h hard-locale.c idx.h localcharset.c glthread/lock.h \ glthread/lock.c long-options.c malloca.c minmax.h progname.h \ - progname.c quotearg.c safe-read.c stat-time.c tempname.c \ - glthread/threadlib.c unistd.c version-etc.h version-etc.c \ - version-etc-fsf.c wctype-h.c xmalloc.c xalloc-die.c xstrndup.h \ - xstrndup.c xstrtol.c xstrtoul.c xstrtol-error.c + progname.c quotearg.c safe-read.c setlocale_null.c stat-time.c \ + tempname.c glthread/threadlib.c unistd.c version-etc.h \ + version-etc.c version-etc-fsf.c wctype-h.c xmalloc.c \ + xalloc-die.c xstrndup.h xstrndup.c xstrtol.c xstrtoul.c \ + xstrtoll.c xstrtoull.c libgnulib_la_LIBADD = $(gl_LTLIBOBJS) @LTALLOCA@ libgnulib_la_DEPENDENCIES = $(gl_LTLIBOBJS) @LTALLOCA@ EXTRA_libgnulib_la_SOURCES = alloca.c btowc.c calloc.c calloc.c \ - canonicalize-lgpl.c close.c stripslash.c error.c fpending.c \ - fstat.c stat-w32.c fsync.c getopt.c getopt1.c gettimeofday.c \ - localeconv.c localtime-buffer.c lseek.c lstat.c malloc.c \ - malloc.c mbrtowc.c mbsinit.c mbtowc.c mkdir.c mkstemp.c \ - msvc-inval.c msvc-nothrow.c nl_langinfo.c read.c readlink.c \ - realloc.c realloc.c regcomp.c regex.c regex_internal.c \ - regexec.c rpmatch.c sleep.c stat-w32.c stat.c strdup.c \ - strerror.c strerror-override.c strndup.c strnlen.c strtol.c \ - strtoll.c strtol.c strtoul.c strtoull.c unlink.c usleep.c \ - wcrtomb.c windows-mutex.c windows-once.c windows-recmutex.c \ - windows-rwlock.c xstrtoll.c xstrtoull.c -libgnulib_la_LDFLAGS = $(AM_LDFLAGS) -no-undefined $(LTLIBINTL) \ - $(LTLIBTHREAD) + canonicalize-lgpl.c close.c stripslash.c dup2.c error.c \ + fcntl.c fpending.c fstat.c stat-w32.c fsync.c getdtablesize.c \ + getopt.c getopt1.c getrandom.c localeconv.c lseek.c lstat.c \ + malloc.c malloc.c lc-charset-dispatch.c mbrtowc.c \ + mbtowc-lock.c mbsinit.c mbtowc.c mkdir.c mkstemp.c \ + msvc-inval.c msvc-nothrow.c nl_langinfo-lock.c nl_langinfo.c \ + open.c read.c readlink.c realloc.c realloc.c regcomp.c regex.c \ + regex_internal.c regexec.c rpmatch.c setlocale-lock.c sleep.c \ + stat-w32.c stat.c strdup.c strerror.c strerror-override.c \ + strndup.c strnlen.c strtol.c strtoll.c strtol.c strtoul.c \ + strtoull.c unlink.c usleep.c wcrtomb.c windows-mutex.c \ + windows-once.c windows-recmutex.c windows-rwlock.c +libgnulib_la_LDFLAGS = $(AM_LDFLAGS) -no-undefined $(LIBTHREAD) \ + $(LIB_CLOCK_GETTIME) $(LIB_GETRANDOM) $(LIB_HARD_LOCALE) \ + $(LIB_MBRTOWC) $(LIB_SETLOCALE_NULL) $(LTLIBINTL) # Use this preprocessor expression to decide whether #include_next works. # Do not rely on a 'configure'-time test for this, since the expression # might appear in an installed header, which is used by some other compiler. -HAVE_INCLUDE_NEXT = (__GNUC__ || 60000000 <= __DECC_VER) +HAVE_INCLUDE_NEXT = (__GNUC__ || __clang__ || 60000000 <= __DECC_VER) # Because this Makefile snippet defines a variable used by other # gnulib Makefile snippets, it must be present in all makefiles that @@ -1733,25 +1797,29 @@ distclean-compile: @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/c-strncasecmp.Plo@am__quote@ # am--include-marker @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/calloc.Plo@am__quote@ # am--include-marker @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/canonicalize-lgpl.Plo@am__quote@ # am--include-marker +@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/cloexec.Plo@am__quote@ # am--include-marker @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/close-stream.Plo@am__quote@ # am--include-marker @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/close.Plo@am__quote@ # am--include-marker @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/closeout.Plo@am__quote@ # am--include-marker @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/dirname-lgpl.Plo@am__quote@ # am--include-marker @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/dirname.Plo@am__quote@ # am--include-marker +@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/dup2.Plo@am__quote@ # am--include-marker @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/error.Plo@am__quote@ # am--include-marker @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/exitfail.Plo@am__quote@ # am--include-marker +@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/fcntl.Plo@am__quote@ # am--include-marker @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/fd-hook.Plo@am__quote@ # am--include-marker @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/fpending.Plo@am__quote@ # am--include-marker @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/fstat.Plo@am__quote@ # am--include-marker @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/fsync.Plo@am__quote@ # am--include-marker +@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/getdtablesize.Plo@am__quote@ # am--include-marker @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/getopt.Plo@am__quote@ # am--include-marker @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/getopt1.Plo@am__quote@ # am--include-marker @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/getprogname.Plo@am__quote@ # am--include-marker -@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/gettimeofday.Plo@am__quote@ # am--include-marker +@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/getrandom.Plo@am__quote@ # am--include-marker @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/hard-locale.Plo@am__quote@ # am--include-marker +@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/lc-charset-dispatch.Plo@am__quote@ # am--include-marker @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/localcharset.Plo@am__quote@ # am--include-marker @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/localeconv.Plo@am__quote@ # am--include-marker -@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/localtime-buffer.Plo@am__quote@ # am--include-marker @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/long-options.Plo@am__quote@ # am--include-marker @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/lseek.Plo@am__quote@ # am--include-marker @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/lstat.Plo@am__quote@ # am--include-marker @@ -1759,12 +1827,15 @@ distclean-compile: @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/malloca.Plo@am__quote@ # am--include-marker @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/mbrtowc.Plo@am__quote@ # am--include-marker @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/mbsinit.Plo@am__quote@ # am--include-marker +@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/mbtowc-lock.Plo@am__quote@ # am--include-marker @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/mbtowc.Plo@am__quote@ # am--include-marker @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/mkdir.Plo@am__quote@ # am--include-marker @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/mkstemp.Plo@am__quote@ # am--include-marker @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/msvc-inval.Plo@am__quote@ # am--include-marker @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/msvc-nothrow.Plo@am__quote@ # am--include-marker +@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/nl_langinfo-lock.Plo@am__quote@ # am--include-marker @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/nl_langinfo.Plo@am__quote@ # am--include-marker +@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/open.Plo@am__quote@ # am--include-marker @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/progname.Plo@am__quote@ # am--include-marker @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/quotearg.Plo@am__quote@ # am--include-marker @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/read.Plo@am__quote@ # am--include-marker @@ -1776,6 +1847,8 @@ distclean-compile: @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/regexec.Plo@am__quote@ # am--include-marker @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/rpmatch.Plo@am__quote@ # am--include-marker @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/safe-read.Plo@am__quote@ # am--include-marker +@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/setlocale-lock.Plo@am__quote@ # am--include-marker +@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/setlocale_null.Plo@am__quote@ # am--include-marker @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/sleep.Plo@am__quote@ # am--include-marker @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/stat-time.Plo@am__quote@ # am--include-marker @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/stat-w32.Plo@am__quote@ # am--include-marker @@ -1805,7 +1878,6 @@ distclean-compile: @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/xalloc-die.Plo@am__quote@ # am--include-marker @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/xmalloc.Plo@am__quote@ # am--include-marker @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/xstrndup.Plo@am__quote@ # am--include-marker -@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/xstrtol-error.Plo@am__quote@ # am--include-marker @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/xstrtol.Plo@am__quote@ # am--include-marker @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/xstrtoll.Plo@am__quote@ # am--include-marker @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/xstrtoul.Plo@am__quote@ # am--include-marker @@ -1993,25 +2065,29 @@ distclean: distclean-am -rm -f ./$(DEPDIR)/c-strncasecmp.Plo -rm -f ./$(DEPDIR)/calloc.Plo -rm -f ./$(DEPDIR)/canonicalize-lgpl.Plo + -rm -f ./$(DEPDIR)/cloexec.Plo -rm -f ./$(DEPDIR)/close-stream.Plo -rm -f ./$(DEPDIR)/close.Plo -rm -f ./$(DEPDIR)/closeout.Plo -rm -f ./$(DEPDIR)/dirname-lgpl.Plo -rm -f ./$(DEPDIR)/dirname.Plo + -rm -f ./$(DEPDIR)/dup2.Plo -rm -f ./$(DEPDIR)/error.Plo -rm -f ./$(DEPDIR)/exitfail.Plo + -rm -f ./$(DEPDIR)/fcntl.Plo -rm -f ./$(DEPDIR)/fd-hook.Plo -rm -f ./$(DEPDIR)/fpending.Plo -rm -f ./$(DEPDIR)/fstat.Plo -rm -f ./$(DEPDIR)/fsync.Plo + -rm -f ./$(DEPDIR)/getdtablesize.Plo -rm -f ./$(DEPDIR)/getopt.Plo -rm -f ./$(DEPDIR)/getopt1.Plo -rm -f ./$(DEPDIR)/getprogname.Plo - -rm -f ./$(DEPDIR)/gettimeofday.Plo + -rm -f ./$(DEPDIR)/getrandom.Plo -rm -f ./$(DEPDIR)/hard-locale.Plo + -rm -f ./$(DEPDIR)/lc-charset-dispatch.Plo -rm -f ./$(DEPDIR)/localcharset.Plo -rm -f ./$(DEPDIR)/localeconv.Plo - -rm -f ./$(DEPDIR)/localtime-buffer.Plo -rm -f ./$(DEPDIR)/long-options.Plo -rm -f ./$(DEPDIR)/lseek.Plo -rm -f ./$(DEPDIR)/lstat.Plo @@ -2019,12 +2095,15 @@ distclean: distclean-am -rm -f ./$(DEPDIR)/malloca.Plo -rm -f ./$(DEPDIR)/mbrtowc.Plo -rm -f ./$(DEPDIR)/mbsinit.Plo + -rm -f ./$(DEPDIR)/mbtowc-lock.Plo -rm -f ./$(DEPDIR)/mbtowc.Plo -rm -f ./$(DEPDIR)/mkdir.Plo -rm -f ./$(DEPDIR)/mkstemp.Plo -rm -f ./$(DEPDIR)/msvc-inval.Plo -rm -f ./$(DEPDIR)/msvc-nothrow.Plo + -rm -f ./$(DEPDIR)/nl_langinfo-lock.Plo -rm -f ./$(DEPDIR)/nl_langinfo.Plo + -rm -f ./$(DEPDIR)/open.Plo -rm -f ./$(DEPDIR)/progname.Plo -rm -f ./$(DEPDIR)/quotearg.Plo -rm -f ./$(DEPDIR)/read.Plo @@ -2036,6 +2115,8 @@ distclean: distclean-am -rm -f ./$(DEPDIR)/regexec.Plo -rm -f ./$(DEPDIR)/rpmatch.Plo -rm -f ./$(DEPDIR)/safe-read.Plo + -rm -f ./$(DEPDIR)/setlocale-lock.Plo + -rm -f ./$(DEPDIR)/setlocale_null.Plo -rm -f ./$(DEPDIR)/sleep.Plo -rm -f ./$(DEPDIR)/stat-time.Plo -rm -f ./$(DEPDIR)/stat-w32.Plo @@ -2065,7 +2146,6 @@ distclean: distclean-am -rm -f ./$(DEPDIR)/xalloc-die.Plo -rm -f ./$(DEPDIR)/xmalloc.Plo -rm -f ./$(DEPDIR)/xstrndup.Plo - -rm -f ./$(DEPDIR)/xstrtol-error.Plo -rm -f ./$(DEPDIR)/xstrtol.Plo -rm -f ./$(DEPDIR)/xstrtoll.Plo -rm -f ./$(DEPDIR)/xstrtoul.Plo @@ -2127,25 +2207,29 @@ maintainer-clean: maintainer-clean-am -rm -f ./$(DEPDIR)/c-strncasecmp.Plo -rm -f ./$(DEPDIR)/calloc.Plo -rm -f ./$(DEPDIR)/canonicalize-lgpl.Plo + -rm -f ./$(DEPDIR)/cloexec.Plo -rm -f ./$(DEPDIR)/close-stream.Plo -rm -f ./$(DEPDIR)/close.Plo -rm -f ./$(DEPDIR)/closeout.Plo -rm -f ./$(DEPDIR)/dirname-lgpl.Plo -rm -f ./$(DEPDIR)/dirname.Plo + -rm -f ./$(DEPDIR)/dup2.Plo -rm -f ./$(DEPDIR)/error.Plo -rm -f ./$(DEPDIR)/exitfail.Plo + -rm -f ./$(DEPDIR)/fcntl.Plo -rm -f ./$(DEPDIR)/fd-hook.Plo -rm -f ./$(DEPDIR)/fpending.Plo -rm -f ./$(DEPDIR)/fstat.Plo -rm -f ./$(DEPDIR)/fsync.Plo + -rm -f ./$(DEPDIR)/getdtablesize.Plo -rm -f ./$(DEPDIR)/getopt.Plo -rm -f ./$(DEPDIR)/getopt1.Plo -rm -f ./$(DEPDIR)/getprogname.Plo - -rm -f ./$(DEPDIR)/gettimeofday.Plo + -rm -f ./$(DEPDIR)/getrandom.Plo -rm -f ./$(DEPDIR)/hard-locale.Plo + -rm -f ./$(DEPDIR)/lc-charset-dispatch.Plo -rm -f ./$(DEPDIR)/localcharset.Plo -rm -f ./$(DEPDIR)/localeconv.Plo - -rm -f ./$(DEPDIR)/localtime-buffer.Plo -rm -f ./$(DEPDIR)/long-options.Plo -rm -f ./$(DEPDIR)/lseek.Plo -rm -f ./$(DEPDIR)/lstat.Plo @@ -2153,12 +2237,15 @@ maintainer-clean: maintainer-clean-am -rm -f ./$(DEPDIR)/malloca.Plo -rm -f ./$(DEPDIR)/mbrtowc.Plo -rm -f ./$(DEPDIR)/mbsinit.Plo + -rm -f ./$(DEPDIR)/mbtowc-lock.Plo -rm -f ./$(DEPDIR)/mbtowc.Plo -rm -f ./$(DEPDIR)/mkdir.Plo -rm -f ./$(DEPDIR)/mkstemp.Plo -rm -f ./$(DEPDIR)/msvc-inval.Plo -rm -f ./$(DEPDIR)/msvc-nothrow.Plo + -rm -f ./$(DEPDIR)/nl_langinfo-lock.Plo -rm -f ./$(DEPDIR)/nl_langinfo.Plo + -rm -f ./$(DEPDIR)/open.Plo -rm -f ./$(DEPDIR)/progname.Plo -rm -f ./$(DEPDIR)/quotearg.Plo -rm -f ./$(DEPDIR)/read.Plo @@ -2170,6 +2257,8 @@ maintainer-clean: maintainer-clean-am -rm -f ./$(DEPDIR)/regexec.Plo -rm -f ./$(DEPDIR)/rpmatch.Plo -rm -f ./$(DEPDIR)/safe-read.Plo + -rm -f ./$(DEPDIR)/setlocale-lock.Plo + -rm -f ./$(DEPDIR)/setlocale_null.Plo -rm -f ./$(DEPDIR)/sleep.Plo -rm -f ./$(DEPDIR)/stat-time.Plo -rm -f ./$(DEPDIR)/stat-w32.Plo @@ -2199,7 +2288,6 @@ maintainer-clean: maintainer-clean-am -rm -f ./$(DEPDIR)/xalloc-die.Plo -rm -f ./$(DEPDIR)/xmalloc.Plo -rm -f ./$(DEPDIR)/xstrndup.Plo - -rm -f ./$(DEPDIR)/xstrtol-error.Plo -rm -f ./$(DEPDIR)/xstrtol.Plo -rm -f ./$(DEPDIR)/xstrtoll.Plo -rm -f ./$(DEPDIR)/xstrtoul.Plo @@ -2328,12 +2416,14 @@ fcntl.h: fcntl.in.h $(top_builddir)/config.status $(CXXDEFS_H) $(ARG_NONNULL_H) -e 's|@''PRAGMA_SYSTEM_HEADER''@|@PRAGMA_SYSTEM_HEADER@|g' \ -e 's|@''PRAGMA_COLUMNS''@|@PRAGMA_COLUMNS@|g' \ -e 's|@''NEXT_FCNTL_H''@|$(NEXT_FCNTL_H)|g' \ + -e 's/@''GNULIB_CREAT''@/$(GNULIB_CREAT)/g' \ -e 's/@''GNULIB_FCNTL''@/$(GNULIB_FCNTL)/g' \ -e 's/@''GNULIB_NONBLOCKING''@/$(GNULIB_NONBLOCKING)/g' \ -e 's/@''GNULIB_OPEN''@/$(GNULIB_OPEN)/g' \ -e 's/@''GNULIB_OPENAT''@/$(GNULIB_OPENAT)/g' \ -e 's|@''HAVE_FCNTL''@|$(HAVE_FCNTL)|g' \ -e 's|@''HAVE_OPENAT''@|$(HAVE_OPENAT)|g' \ + -e 's|@''REPLACE_CREAT''@|$(REPLACE_CREAT)|g' \ -e 's|@''REPLACE_FCNTL''@|$(REPLACE_FCNTL)|g' \ -e 's|@''REPLACE_OPEN''@|$(REPLACE_OPEN)|g' \ -e 's|@''REPLACE_OPENAT''@|$(REPLACE_OPENAT)|g' \ @@ -2381,10 +2471,7 @@ inttypes.h: inttypes.in.h $(top_builddir)/config.status $(CXXDEFS_H) $(WARN_ON_U -e 's|@''PRAGMA_SYSTEM_HEADER''@|@PRAGMA_SYSTEM_HEADER@|g' \ -e 's|@''PRAGMA_COLUMNS''@|@PRAGMA_COLUMNS@|g' \ -e 's|@''NEXT_INTTYPES_H''@|$(NEXT_INTTYPES_H)|g' \ - -e 's/@''PRI_MACROS_BROKEN''@/$(PRI_MACROS_BROKEN)/g' \ -e 's/@''APPLE_UNIVERSAL_BUILD''@/$(APPLE_UNIVERSAL_BUILD)/g' \ - -e 's/@''HAVE_LONG_LONG_INT''@/$(HAVE_LONG_LONG_INT)/g' \ - -e 's/@''HAVE_UNSIGNED_LONG_LONG_INT''@/$(HAVE_UNSIGNED_LONG_LONG_INT)/g' \ -e 's/@''PRIPTR_PREFIX''@/$(PRIPTR_PREFIX)/g' \ -e 's/@''GNULIB_IMAXABS''@/$(GNULIB_IMAXABS)/g' \ -e 's/@''GNULIB_IMAXDIV''@/$(GNULIB_IMAXDIV)/g' \ @@ -2461,6 +2548,7 @@ locale.h: locale.in.h $(top_builddir)/config.status $(CXXDEFS_H) $(ARG_NONNULL_H -e 's|@''NEXT_LOCALE_H''@|$(NEXT_LOCALE_H)|g' \ -e 's/@''GNULIB_LOCALECONV''@/$(GNULIB_LOCALECONV)/g' \ -e 's/@''GNULIB_SETLOCALE''@/$(GNULIB_SETLOCALE)/g' \ + -e 's/@''GNULIB_SETLOCALE_NULL''@/$(GNULIB_SETLOCALE_NULL)/g' \ -e 's/@''GNULIB_DUPLOCALE''@/$(GNULIB_DUPLOCALE)/g' \ -e 's/@''GNULIB_LOCALENAME''@/$(GNULIB_LOCALENAME)/g' \ -e 's|@''HAVE_NEWLOCALE''@|$(HAVE_NEWLOCALE)|g' \ @@ -2480,6 +2568,17 @@ locale.h: locale.in.h $(top_builddir)/config.status $(CXXDEFS_H) $(ARG_NONNULL_H } > $@-t && \ mv $@-t $@ +# We need the following in order to create 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@ $(AM_V_GEN)rm -f $@-t $@ && \ +@GL_GENERATE_STDALIGN_H_TRUE@ { echo '/* DO NOT EDIT! GENERATED AUTOMATICALLY! */'; \ +@GL_GENERATE_STDALIGN_H_TRUE@ cat $(srcdir)/stdalign.in.h; \ +@GL_GENERATE_STDALIGN_H_TRUE@ } > $@-t && \ +@GL_GENERATE_STDALIGN_H_TRUE@ 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 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 @@ -2543,8 +2642,6 @@ locale.h: locale.in.h $(top_builddir)/config.status $(CXXDEFS_H) $(ARG_NONNULL_H @GL_GENERATE_STDINT_H_TRUE@ -e 's/@''HAVE_SYS_INTTYPES_H''@/$(HAVE_SYS_INTTYPES_H)/g' \ @GL_GENERATE_STDINT_H_TRUE@ -e 's/@''HAVE_SYS_BITYPES_H''@/$(HAVE_SYS_BITYPES_H)/g' \ @GL_GENERATE_STDINT_H_TRUE@ -e 's/@''HAVE_WCHAR_H''@/$(HAVE_WCHAR_H)/g' \ -@GL_GENERATE_STDINT_H_TRUE@ -e 's/@''HAVE_LONG_LONG_INT''@/$(HAVE_LONG_LONG_INT)/g' \ -@GL_GENERATE_STDINT_H_TRUE@ -e 's/@''HAVE_UNSIGNED_LONG_LONG_INT''@/$(HAVE_UNSIGNED_LONG_LONG_INT)/g' \ @GL_GENERATE_STDINT_H_TRUE@ -e 's/@''APPLE_UNIVERSAL_BUILD''@/$(APPLE_UNIVERSAL_BUILD)/g' \ @GL_GENERATE_STDINT_H_TRUE@ -e 's/@''BITSIZEOF_PTRDIFF_T''@/$(BITSIZEOF_PTRDIFF_T)/g' \ @GL_GENERATE_STDINT_H_TRUE@ -e 's/@''PTRDIFF_T_SUFFIX''@/$(PTRDIFF_T_SUFFIX)/g' \ @@ -2630,7 +2727,8 @@ stdio.h: stdio.in.h $(top_builddir)/config.status $(CXXDEFS_H) $(ARG_NONNULL_H) -e 's/@''GNULIB_VSNPRINTF''@/$(GNULIB_VSNPRINTF)/g' \ -e 's/@''GNULIB_VSPRINTF_POSIX''@/$(GNULIB_VSPRINTF_POSIX)/g' \ < $(srcdir)/stdio.in.h | \ - sed -e 's|@''HAVE_DECL_FPURGE''@|$(HAVE_DECL_FPURGE)|g' \ + sed -e 's|@''HAVE_DECL_FCLOSEALL''@|$(HAVE_DECL_FCLOSEALL)|g' \ + -e 's|@''HAVE_DECL_FPURGE''@|$(HAVE_DECL_FPURGE)|g' \ -e 's|@''HAVE_DECL_FSEEKO''@|$(HAVE_DECL_FSEEKO)|g' \ -e 's|@''HAVE_DECL_FTELLO''@|$(HAVE_DECL_FTELLO)|g' \ -e 's|@''HAVE_DECL_GETDELIM''@|$(HAVE_DECL_GETDELIM)|g' \ @@ -2697,6 +2795,7 @@ stdlib.h: stdlib.in.h $(top_builddir)/config.status $(CXXDEFS_H) \ -e 's|@''PRAGMA_COLUMNS''@|@PRAGMA_COLUMNS@|g' \ -e 's|@''NEXT_STDLIB_H''@|$(NEXT_STDLIB_H)|g' \ -e 's/@''GNULIB__EXIT''@/$(GNULIB__EXIT)/g' \ + -e 's/@''GNULIB_ALIGNED_ALLOC''@/$(GNULIB_ALIGNED_ALLOC)/g' \ -e 's/@''GNULIB_ATOLL''@/$(GNULIB_ATOLL)/g' \ -e 's/@''GNULIB_CALLOC_POSIX''@/$(GNULIB_CALLOC_POSIX)/g' \ -e 's/@''GNULIB_CANONICALIZE_FILE_NAME''@/$(GNULIB_CANONICALIZE_FILE_NAME)/g' \ @@ -2710,6 +2809,7 @@ stdlib.h: stdlib.in.h $(top_builddir)/config.status $(CXXDEFS_H) \ -e 's/@''GNULIB_MKOSTEMPS''@/$(GNULIB_MKOSTEMPS)/g' \ -e 's/@''GNULIB_MKSTEMP''@/$(GNULIB_MKSTEMP)/g' \ -e 's/@''GNULIB_MKSTEMPS''@/$(GNULIB_MKSTEMPS)/g' \ + -e 's/@''GNULIB_POSIX_MEMALIGN''@/$(GNULIB_POSIX_MEMALIGN)/g' \ -e 's/@''GNULIB_POSIX_OPENPT''@/$(GNULIB_POSIX_OPENPT)/g' \ -e 's/@''GNULIB_PTSNAME''@/$(GNULIB_PTSNAME)/g' \ -e 's/@''GNULIB_PTSNAME_R''@/$(GNULIB_PTSNAME_R)/g' \ @@ -2733,8 +2833,12 @@ stdlib.h: stdlib.in.h $(top_builddir)/config.status $(CXXDEFS_H) \ -e 's/@''GNULIB_WCTOMB''@/$(GNULIB_WCTOMB)/g' \ < $(srcdir)/stdlib.in.h | \ sed -e 's|@''HAVE__EXIT''@|$(HAVE__EXIT)|g' \ + -e 's|@''HAVE_ALIGNED_ALLOC''@|$(HAVE_ALIGNED_ALLOC)|g' \ -e 's|@''HAVE_ATOLL''@|$(HAVE_ATOLL)|g' \ -e 's|@''HAVE_CANONICALIZE_FILE_NAME''@|$(HAVE_CANONICALIZE_FILE_NAME)|g' \ + -e 's|@''HAVE_DECL_ECVT''@|$(HAVE_DECL_ECVT)|g' \ + -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_GETSUBOPT''@|$(HAVE_GETSUBOPT)|g' \ -e 's|@''HAVE_GRANTPT''@|$(HAVE_GRANTPT)|g' \ @@ -2746,6 +2850,7 @@ stdlib.h: stdlib.in.h $(top_builddir)/config.status $(CXXDEFS_H) \ -e 's|@''HAVE_MKOSTEMPS''@|$(HAVE_MKOSTEMPS)|g' \ -e 's|@''HAVE_MKSTEMP''@|$(HAVE_MKSTEMP)|g' \ -e 's|@''HAVE_MKSTEMPS''@|$(HAVE_MKSTEMPS)|g' \ + -e 's|@''HAVE_POSIX_MEMALIGN''@|$(HAVE_POSIX_MEMALIGN)|g' \ -e 's|@''HAVE_POSIX_OPENPT''@|$(HAVE_POSIX_OPENPT)|g' \ -e 's|@''HAVE_PTSNAME''@|$(HAVE_PTSNAME)|g' \ -e 's|@''HAVE_PTSNAME_R''@|$(HAVE_PTSNAME_R)|g' \ @@ -2768,12 +2873,14 @@ 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_ALIGNED_ALLOC''@|$(REPLACE_ALIGNED_ALLOC)|g' \ -e 's|@''REPLACE_CALLOC''@|$(REPLACE_CALLOC)|g' \ -e 's|@''REPLACE_CANONICALIZE_FILE_NAME''@|$(REPLACE_CANONICALIZE_FILE_NAME)|g' \ -e 's|@''REPLACE_INITSTATE''@|$(REPLACE_INITSTATE)|g' \ -e 's|@''REPLACE_MALLOC''@|$(REPLACE_MALLOC)|g' \ -e 's|@''REPLACE_MBTOWC''@|$(REPLACE_MBTOWC)|g' \ -e 's|@''REPLACE_MKSTEMP''@|$(REPLACE_MKSTEMP)|g' \ + -e 's|@''REPLACE_POSIX_MEMALIGN''@|$(REPLACE_POSIX_MEMALIGN)|g' \ -e 's|@''REPLACE_PTSNAME''@|$(REPLACE_PTSNAME)|g' \ -e 's|@''REPLACE_PTSNAME_R''@|$(REPLACE_PTSNAME_R)|g' \ -e 's|@''REPLACE_PUTENV''@|$(REPLACE_PUTENV)|g' \ @@ -2841,6 +2948,9 @@ string.h: string.in.h $(top_builddir)/config.status $(CXXDEFS_H) $(ARG_NONNULL_H -e 's/@''GNULIB_STRTOK_R''@/$(GNULIB_STRTOK_R)/g' \ -e 's/@''GNULIB_STRERROR''@/$(GNULIB_STRERROR)/g' \ -e 's/@''GNULIB_STRERROR_R''@/$(GNULIB_STRERROR_R)/g' \ + -e 's/@''GNULIB_STRERRORNAME_NP''@/$(GNULIB_STRERRORNAME_NP)/g' \ + -e 's/@''GNULIB_SIGABBREV_NP''@/$(GNULIB_SIGABBREV_NP)/g' \ + -e 's/@''GNULIB_SIGDESCR_NP''@/$(GNULIB_SIGDESCR_NP)/g' \ -e 's/@''GNULIB_STRSIGNAL''@/$(GNULIB_STRSIGNAL)/g' \ -e 's/@''GNULIB_STRVERSCMP''@/$(GNULIB_STRVERSCMP)/g' \ < $(srcdir)/string.in.h | \ @@ -2848,7 +2958,6 @@ string.h: string.in.h $(top_builddir)/config.status $(CXXDEFS_H) $(ARG_NONNULL_H -e 's|@''HAVE_FFSL''@|$(HAVE_FFSL)|g' \ -e 's|@''HAVE_FFSLL''@|$(HAVE_FFSLL)|g' \ -e 's|@''HAVE_MBSLEN''@|$(HAVE_MBSLEN)|g' \ - -e 's|@''HAVE_MEMCHR''@|$(HAVE_MEMCHR)|g' \ -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' \ @@ -2864,6 +2973,9 @@ string.h: string.in.h $(top_builddir)/config.status $(CXXDEFS_H) $(ARG_NONNULL_H -e 's|@''HAVE_STRCASESTR''@|$(HAVE_STRCASESTR)|g' \ -e 's|@''HAVE_DECL_STRTOK_R''@|$(HAVE_DECL_STRTOK_R)|g' \ -e 's|@''HAVE_DECL_STRERROR_R''@|$(HAVE_DECL_STRERROR_R)|g' \ + -e 's|@''HAVE_STRERRORNAME_NP''@|$(HAVE_STRERRORNAME_NP)|g' \ + -e 's|@''HAVE_SIGABBREV_NP''@|$(HAVE_SIGABBREV_NP)|g' \ + -e 's|@''HAVE_SIGDESCR_NP''@|$(HAVE_SIGDESCR_NP)|g' \ -e 's|@''HAVE_DECL_STRSIGNAL''@|$(HAVE_DECL_STRSIGNAL)|g' \ -e 's|@''HAVE_STRVERSCMP''@|$(HAVE_STRVERSCMP)|g' \ -e 's|@''REPLACE_MEMCHR''@|$(REPLACE_MEMCHR)|g' \ @@ -2879,6 +2991,7 @@ string.h: string.in.h $(top_builddir)/config.status $(CXXDEFS_H) $(ARG_NONNULL_H -e 's|@''REPLACE_STRTOK_R''@|$(REPLACE_STRTOK_R)|g' \ -e 's|@''REPLACE_STRERROR''@|$(REPLACE_STRERROR)|g' \ -e 's|@''REPLACE_STRERROR_R''@|$(REPLACE_STRERROR_R)|g' \ + -e 's|@''REPLACE_STRERRORNAME_NP''@|$(REPLACE_STRERRORNAME_NP)|g' \ -e 's|@''REPLACE_STRSIGNAL''@|$(REPLACE_STRSIGNAL)|g' \ -e 's|@''UNDEFINE_STRTOK_R''@|$(UNDEFINE_STRTOK_R)|g' \ -e '/definitions of _GL_FUNCDECL_RPL/r $(CXXDEFS_H)' \ @@ -2888,6 +3001,28 @@ string.h: string.in.h $(top_builddir)/config.status $(CXXDEFS_H) $(ARG_NONNULL_H } > $@-t && \ mv $@-t $@ +# We need the following in order to create when the system +# doesn't have one. +sys/random.h: sys_random.in.h $(top_builddir)/config.status $(CXXDEFS_H) $(ARG_NONNULL_H) $(WARN_ON_USE_H) + $(AM_V_at)$(MKDIR_P) sys + $(AM_V_GEN)rm -f $@-t $@ && \ + { echo '/* DO NOT EDIT! GENERATED AUTOMATICALLY! */'; \ + sed -e 's|@''GUARD_PREFIX''@|GL|g' \ + -e 's|@''INCLUDE_NEXT''@|$(INCLUDE_NEXT)|g' \ + -e 's|@''PRAGMA_SYSTEM_HEADER''@|@PRAGMA_SYSTEM_HEADER@|g' \ + -e 's|@''PRAGMA_COLUMNS''@|@PRAGMA_COLUMNS@|g' \ + -e 's|@''NEXT_SYS_RANDOM_H''@|$(NEXT_SYS_RANDOM_H)|g' \ + -e 's|@''HAVE_SYS_RANDOM_H''@|$(HAVE_SYS_RANDOM_H)|g' \ + -e 's/@''GNULIB_GETRANDOM''@/$(GNULIB_GETRANDOM)/g' \ + -e 's/@''HAVE_GETRANDOM''@/$(HAVE_GETRANDOM)/g' \ + -e 's/@''REPLACE_GETRANDOM''@/$(REPLACE_GETRANDOM)/g' \ + -e '/definitions of _GL_FUNCDECL_RPL/r $(CXXDEFS_H)' \ + -e '/definition of _GL_ARG_NONNULL/r $(ARG_NONNULL_H)' \ + -e '/definition of _GL_WARN_ON_USE/r $(WARN_ON_USE_H)' \ + < $(srcdir)/sys_random.in.h; \ + } > $@-t && \ + mv -f $@-t $@ + # We need the following in order to create when the system # has one that is incomplete. sys/stat.h: sys_stat.in.h $(top_builddir)/config.status $(CXXDEFS_H) $(ARG_NONNULL_H) $(WARN_ON_USE_H) @@ -2905,6 +3040,7 @@ sys/stat.h: sys_stat.in.h $(top_builddir)/config.status $(CXXDEFS_H) $(ARG_NONNU -e 's/@''GNULIB_FSTAT''@/$(GNULIB_FSTAT)/g' \ -e 's/@''GNULIB_FSTATAT''@/$(GNULIB_FSTATAT)/g' \ -e 's/@''GNULIB_FUTIMENS''@/$(GNULIB_FUTIMENS)/g' \ + -e 's/@''GNULIB_GETUMASK''@/$(GNULIB_GETUMASK)/g' \ -e 's/@''GNULIB_LCHMOD''@/$(GNULIB_LCHMOD)/g' \ -e 's/@''GNULIB_LSTAT''@/$(GNULIB_LSTAT)/g' \ -e 's/@''GNULIB_MKDIRAT''@/$(GNULIB_MKDIRAT)/g' \ @@ -2918,6 +3054,7 @@ sys/stat.h: sys_stat.in.h $(top_builddir)/config.status $(CXXDEFS_H) $(ARG_NONNU -e 's|@''HAVE_FCHMODAT''@|$(HAVE_FCHMODAT)|g' \ -e 's|@''HAVE_FSTATAT''@|$(HAVE_FSTATAT)|g' \ -e 's|@''HAVE_FUTIMENS''@|$(HAVE_FUTIMENS)|g' \ + -e 's|@''HAVE_GETUMASK''@|$(HAVE_GETUMASK)|g' \ -e 's|@''HAVE_LCHMOD''@|$(HAVE_LCHMOD)|g' \ -e 's|@''HAVE_LSTAT''@|$(HAVE_LSTAT)|g' \ -e 's|@''HAVE_MKDIRAT''@|$(HAVE_MKDIRAT)|g' \ @@ -2926,6 +3063,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_FCHMODAT''@|$(REPLACE_FCHMODAT)|g' \ -e 's|@''REPLACE_FSTAT''@|$(REPLACE_FSTAT)|g' \ -e 's|@''REPLACE_FSTATAT''@|$(REPLACE_FSTATAT)|g' \ -e 's|@''REPLACE_FUTIMENS''@|$(REPLACE_FUTIMENS)|g' \ @@ -2942,31 +3080,6 @@ sys/stat.h: sys_stat.in.h $(top_builddir)/config.status $(CXXDEFS_H) $(ARG_NONNU } > $@-t && \ mv $@-t $@ -# We need the following in order to create when the system -# doesn't have one that works with the given compiler. -sys/time.h: sys_time.in.h $(top_builddir)/config.status $(CXXDEFS_H) $(ARG_NONNULL_H) $(WARN_ON_USE_H) - $(AM_V_at)$(MKDIR_P) sys - $(AM_V_GEN)rm -f $@-t $@ && \ - { echo '/* DO NOT EDIT! GENERATED AUTOMATICALLY! */'; \ - sed -e 's|@''GUARD_PREFIX''@|GL|g' \ - -e 's/@''HAVE_SYS_TIME_H''@/$(HAVE_SYS_TIME_H)/g' \ - -e 's|@''INCLUDE_NEXT''@|$(INCLUDE_NEXT)|g' \ - -e 's|@''PRAGMA_SYSTEM_HEADER''@|@PRAGMA_SYSTEM_HEADER@|g' \ - -e 's|@''PRAGMA_COLUMNS''@|@PRAGMA_COLUMNS@|g' \ - -e 's|@''NEXT_SYS_TIME_H''@|$(NEXT_SYS_TIME_H)|g' \ - -e 's/@''GNULIB_GETTIMEOFDAY''@/$(GNULIB_GETTIMEOFDAY)/g' \ - -e 's|@''HAVE_WINSOCK2_H''@|$(HAVE_WINSOCK2_H)|g' \ - -e 's/@''HAVE_GETTIMEOFDAY''@/$(HAVE_GETTIMEOFDAY)/g' \ - -e 's/@''HAVE_STRUCT_TIMEVAL''@/$(HAVE_STRUCT_TIMEVAL)/g' \ - -e 's/@''REPLACE_GETTIMEOFDAY''@/$(REPLACE_GETTIMEOFDAY)/g' \ - -e 's/@''REPLACE_STRUCT_TIMEVAL''@/$(REPLACE_STRUCT_TIMEVAL)/g' \ - -e '/definitions of _GL_FUNCDECL_RPL/r $(CXXDEFS_H)' \ - -e '/definition of _GL_ARG_NONNULL/r $(ARG_NONNULL_H)' \ - -e '/definition of _GL_WARN_ON_USE/r $(WARN_ON_USE_H)' \ - < $(srcdir)/sys_time.in.h; \ - } > $@-t && \ - mv $@-t $@ - # We need the following in order to create when the system # doesn't have one that works with the given compiler. sys/types.h: sys_types.in.h $(top_builddir)/config.status @@ -3009,7 +3122,6 @@ time.h: time.in.h $(top_builddir)/config.status $(CXXDEFS_H) $(ARG_NONNULL_H) $( -e 's|@''HAVE_STRPTIME''@|$(HAVE_STRPTIME)|g' \ -e 's|@''HAVE_TIMEGM''@|$(HAVE_TIMEGM)|g' \ -e 's|@''HAVE_TIMEZONE_T''@|$(HAVE_TIMEZONE_T)|g' \ - -e 's|@''HAVE_TZSET''@|$(HAVE_TZSET)|g' \ -e 's|@''REPLACE_CTIME''@|$(REPLACE_CTIME)|g' \ -e 's|@''REPLACE_GMTIME''@|$(REPLACE_GMTIME)|g' \ -e 's|@''REPLACE_LOCALTIME''@|$(REPLACE_LOCALTIME)|g' \ @@ -3042,6 +3154,7 @@ unistd.h: unistd.in.h $(top_builddir)/config.status $(CXXDEFS_H) $(ARG_NONNULL_H -e 's|@''PRAGMA_COLUMNS''@|@PRAGMA_COLUMNS@|g' \ -e 's|@''NEXT_UNISTD_H''@|$(NEXT_UNISTD_H)|g' \ -e 's|@''WINDOWS_64_BIT_OFF_T''@|$(WINDOWS_64_BIT_OFF_T)|g' \ + -e 's/@''GNULIB_ACCESS''@/$(GNULIB_ACCESS)/g' \ -e 's/@''GNULIB_CHDIR''@/$(GNULIB_CHDIR)/g' \ -e 's/@''GNULIB_CHOWN''@/$(GNULIB_CHOWN)/g' \ -e 's/@''GNULIB_CLOSE''@/$(GNULIB_CLOSE)/g' \ @@ -3060,10 +3173,12 @@ unistd.h: unistd.in.h $(top_builddir)/config.status $(CXXDEFS_H) $(ARG_NONNULL_H -e 's/@''GNULIB_GETCWD''@/$(GNULIB_GETCWD)/g' \ -e 's/@''GNULIB_GETDOMAINNAME''@/$(GNULIB_GETDOMAINNAME)/g' \ -e 's/@''GNULIB_GETDTABLESIZE''@/$(GNULIB_GETDTABLESIZE)/g' \ + -e 's/@''GNULIB_GETENTROPY''@/$(GNULIB_GETENTROPY)/g' \ -e 's/@''GNULIB_GETGROUPS''@/$(GNULIB_GETGROUPS)/g' \ -e 's/@''GNULIB_GETHOSTNAME''@/$(GNULIB_GETHOSTNAME)/g' \ -e 's/@''GNULIB_GETLOGIN''@/$(GNULIB_GETLOGIN)/g' \ -e 's/@''GNULIB_GETLOGIN_R''@/$(GNULIB_GETLOGIN_R)/g' \ + -e 's/@''GNULIB_GETOPT_POSIX''@/$(GNULIB_GETOPT_POSIX)/g' \ -e 's/@''GNULIB_GETPAGESIZE''@/$(GNULIB_GETPAGESIZE)/g' \ -e 's/@''GNULIB_GETPASS''@/$(GNULIB_GETPASS)/g' \ -e 's/@''GNULIB_GETUSERSHELL''@/$(GNULIB_GETUSERSHELL)/g' \ @@ -3097,7 +3212,6 @@ unistd.h: unistd.in.h $(top_builddir)/config.status $(CXXDEFS_H) $(ARG_NONNULL_H < $(srcdir)/unistd.in.h | \ sed -e 's|@''HAVE_CHOWN''@|$(HAVE_CHOWN)|g' \ -e 's|@''HAVE_COPY_FILE_RANGE''@|$(HAVE_COPY_FILE_RANGE)|g' \ - -e 's|@''HAVE_DUP2''@|$(HAVE_DUP2)|g' \ -e 's|@''HAVE_DUP3''@|$(HAVE_DUP3)|g' \ -e 's|@''HAVE_EUIDACCESS''@|$(HAVE_EUIDACCESS)|g' \ -e 's|@''HAVE_FACCESSAT''@|$(HAVE_FACCESSAT)|g' \ @@ -3107,6 +3221,7 @@ unistd.h: unistd.in.h $(top_builddir)/config.status $(CXXDEFS_H) $(ARG_NONNULL_H -e 's|@''HAVE_FSYNC''@|$(HAVE_FSYNC)|g' \ -e 's|@''HAVE_FTRUNCATE''@|$(HAVE_FTRUNCATE)|g' \ -e 's|@''HAVE_GETDTABLESIZE''@|$(HAVE_GETDTABLESIZE)|g' \ + -e 's|@''HAVE_GETENTROPY''@|$(HAVE_GETENTROPY)|g' \ -e 's|@''HAVE_GETGROUPS''@|$(HAVE_GETGROUPS)|g' \ -e 's|@''HAVE_GETHOSTNAME''@|$(HAVE_GETHOSTNAME)|g' \ -e 's|@''HAVE_GETPAGESIZE''@|$(HAVE_GETPAGESIZE)|g' \ @@ -3128,6 +3243,7 @@ unistd.h: unistd.in.h $(top_builddir)/config.status $(CXXDEFS_H) $(ARG_NONNULL_H -e 's|@''HAVE_UNLINKAT''@|$(HAVE_UNLINKAT)|g' \ -e 's|@''HAVE_USLEEP''@|$(HAVE_USLEEP)|g' \ -e 's|@''HAVE_DECL_ENVIRON''@|$(HAVE_DECL_ENVIRON)|g' \ + -e 's|@''HAVE_DECL_EXECVPE''@|$(HAVE_DECL_EXECVPE)|g' \ -e 's|@''HAVE_DECL_FCHDIR''@|$(HAVE_DECL_FCHDIR)|g' \ -e 's|@''HAVE_DECL_FDATASYNC''@|$(HAVE_DECL_FDATASYNC)|g' \ -e 's|@''HAVE_DECL_GETDOMAINNAME''@|$(HAVE_DECL_GETDOMAINNAME)|g' \ @@ -3141,7 +3257,8 @@ unistd.h: unistd.in.h $(top_builddir)/config.status $(CXXDEFS_H) $(ARG_NONNULL_H -e 's|@''HAVE_OS_H''@|$(HAVE_OS_H)|g' \ -e 's|@''HAVE_SYS_PARAM_H''@|$(HAVE_SYS_PARAM_H)|g' \ | \ - sed -e 's|@''REPLACE_CHOWN''@|$(REPLACE_CHOWN)|g' \ + sed -e 's|@''REPLACE_ACCESS''@|$(REPLACE_ACCESS)|g' \ + -e 's|@''REPLACE_CHOWN''@|$(REPLACE_CHOWN)|g' \ -e 's|@''REPLACE_CLOSE''@|$(REPLACE_CLOSE)|g' \ -e 's|@''REPLACE_DUP''@|$(REPLACE_DUP)|g' \ -e 's|@''REPLACE_DUP2''@|$(REPLACE_DUP2)|g' \ @@ -3175,6 +3292,7 @@ unistd.h: unistd.in.h $(top_builddir)/config.status $(CXXDEFS_H) $(ARG_NONNULL_H -e 's|@''REPLACE_UNLINKAT''@|$(REPLACE_UNLINKAT)|g' \ -e 's|@''REPLACE_USLEEP''@|$(REPLACE_USLEEP)|g' \ -e 's|@''REPLACE_WRITE''@|$(REPLACE_WRITE)|g' \ + -e 's|@''UNISTD_H_HAVE_SYS_RANDOM_H''@|$(UNISTD_H_HAVE_SYS_RANDOM_H)|g' \ -e 's|@''UNISTD_H_HAVE_WINSOCK2_H''@|$(UNISTD_H_HAVE_WINSOCK2_H)|g' \ -e 's|@''UNISTD_H_HAVE_WINSOCK2_H_AND_USE_SOCKETS''@|$(UNISTD_H_HAVE_WINSOCK2_H_AND_USE_SOCKETS)|g' \ -e '/definitions of _GL_FUNCDECL_RPL/r $(CXXDEFS_H)' \ @@ -3212,6 +3330,7 @@ wchar.h: wchar.in.h $(top_builddir)/config.status $(CXXDEFS_H) $(ARG_NONNULL_H) -e 's/@''GNULIB_WMEMCMP''@/$(GNULIB_WMEMCMP)/g' \ -e 's/@''GNULIB_WMEMCPY''@/$(GNULIB_WMEMCPY)/g' \ -e 's/@''GNULIB_WMEMMOVE''@/$(GNULIB_WMEMMOVE)/g' \ + -e 's/@''GNULIB_WMEMPCPY''@/$(GNULIB_WMEMPCPY)/g' \ -e 's/@''GNULIB_WMEMSET''@/$(GNULIB_WMEMSET)/g' \ -e 's/@''GNULIB_WCSLEN''@/$(GNULIB_WCSLEN)/g' \ -e 's/@''GNULIB_WCSNLEN''@/$(GNULIB_WCSNLEN)/g' \ @@ -3252,6 +3371,7 @@ wchar.h: wchar.in.h $(top_builddir)/config.status $(CXXDEFS_H) $(ARG_NONNULL_H) -e 's|@''HAVE_WMEMCMP''@|$(HAVE_WMEMCMP)|g' \ -e 's|@''HAVE_WMEMCPY''@|$(HAVE_WMEMCPY)|g' \ -e 's|@''HAVE_WMEMMOVE''@|$(HAVE_WMEMMOVE)|g' \ + -e 's|@''HAVE_WMEMPCPY''@|$(HAVE_WMEMPCPY)|g' \ -e 's|@''HAVE_WMEMSET''@|$(HAVE_WMEMSET)|g' \ -e 's|@''HAVE_WCSLEN''@|$(HAVE_WCSLEN)|g' \ -e 's|@''HAVE_WCSNLEN''@|$(HAVE_WCSNLEN)|g' \ @@ -3278,6 +3398,7 @@ wchar.h: wchar.in.h $(top_builddir)/config.status $(CXXDEFS_H) $(ARG_NONNULL_H) -e 's|@''HAVE_WCSWIDTH''@|$(HAVE_WCSWIDTH)|g' \ -e 's|@''HAVE_WCSFTIME''@|$(HAVE_WCSFTIME)|g' \ -e 's|@''HAVE_DECL_WCTOB''@|$(HAVE_DECL_WCTOB)|g' \ + -e 's|@''HAVE_DECL_WCSDUP''@|$(HAVE_DECL_WCSDUP)|g' \ -e 's|@''HAVE_DECL_WCWIDTH''@|$(HAVE_DECL_WCWIDTH)|g' \ | \ sed -e 's|@''REPLACE_MBSTATE_T''@|$(REPLACE_MBSTATE_T)|g' \ @@ -3294,6 +3415,7 @@ wchar.h: wchar.in.h $(top_builddir)/config.status $(CXXDEFS_H) $(ARG_NONNULL_H) -e 's|@''REPLACE_WCWIDTH''@|$(REPLACE_WCWIDTH)|g' \ -e 's|@''REPLACE_WCSWIDTH''@|$(REPLACE_WCSWIDTH)|g' \ -e 's|@''REPLACE_WCSFTIME''@|$(REPLACE_WCSFTIME)|g' \ + -e 's|@''REPLACE_WCSTOK''@|$(REPLACE_WCSTOK)|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)'; \ @@ -3314,6 +3436,8 @@ wctype.h: wctype.in.h $(top_builddir)/config.status $(CXXDEFS_H) $(WARN_ON_USE_H -e 's/@''HAVE_CRTDEFS_H''@/$(HAVE_CRTDEFS_H)/g' \ -e 's/@''GNULIB_OVERRIDES_WINT_T''@/$(GNULIB_OVERRIDES_WINT_T)/g' \ -e 's/@''GNULIB_ISWBLANK''@/$(GNULIB_ISWBLANK)/g' \ + -e 's/@''GNULIB_ISWDIGIT''@/$(GNULIB_ISWDIGIT)/g' \ + -e 's/@''GNULIB_ISWXDIGIT''@/$(GNULIB_ISWXDIGIT)/g' \ -e 's/@''GNULIB_WCTYPE''@/$(GNULIB_WCTYPE)/g' \ -e 's/@''GNULIB_ISWCTYPE''@/$(GNULIB_ISWCTYPE)/g' \ -e 's/@''GNULIB_WCTRANS''@/$(GNULIB_WCTRANS)/g' \ @@ -3324,6 +3448,8 @@ wctype.h: wctype.in.h $(top_builddir)/config.status $(CXXDEFS_H) $(WARN_ON_USE_H -e 's/@''HAVE_WCTRANS_T''@/$(HAVE_WCTRANS_T)/g' \ -e 's/@''HAVE_WINT_T''@/$(HAVE_WINT_T)/g' \ -e 's/@''REPLACE_ISWBLANK''@/$(REPLACE_ISWBLANK)/g' \ + -e 's/@''REPLACE_ISWDIGIT''@/$(REPLACE_ISWDIGIT)/g' \ + -e 's/@''REPLACE_ISWXDIGIT''@/$(REPLACE_ISWXDIGIT)/g' \ -e 's/@''REPLACE_ISWCNTRL''@/$(REPLACE_ISWCNTRL)/g' \ -e 's/@''REPLACE_TOWLOWER''@/$(REPLACE_TOWLOWER)/g' \ -e '/definitions of _GL_FUNCDECL_RPL/r $(CXXDEFS_H)' \ diff --git a/lib/_Noreturn.h b/lib/_Noreturn.h index db9b455..394ca3c 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-2019 Free Software Foundation, Inc. + Copyright (C) 2011-2020 Free Software Foundation, Inc. This program is free software: you can redistribute it and/or modify it under the terms of the GNU General Public License as published @@ -17,11 +17,21 @@ #ifndef _Noreturn # if (defined __cplusplus \ && ((201103 <= __cplusplus && !(__GNUC__ == 4 && __GNUC_MINOR__ == 7)) \ - || (defined _MSC_VER && 1900 <= _MSC_VER))) + || (defined _MSC_VER && 1900 <= _MSC_VER)) \ + && 0) + /* [[noreturn]] is not practically usable, because with it the syntax + extern _Noreturn void func (...); + would not be valid; such a declaration would only be valid with 'extern' + and '_Noreturn' swapped, or without the 'extern' keyword. However, some + AIX system header files and several gnulib header files use precisely + this syntax with 'extern'. */ # define _Noreturn [[noreturn]] # elif ((!defined __cplusplus || defined __clang__) \ && (201112 <= (defined __STDC_VERSION__ ? __STDC_VERSION__ : 0) \ - || 4 < __GNUC__ + (7 <= __GNUC_MINOR__))) + || 4 < __GNUC__ + (7 <= __GNUC_MINOR__) \ + || (defined __apple_build_version__ \ + ? 6000000 <= __apple_build_version__ \ + : 3 < __clang_major__ + (5 <= __clang_minor__)))) /* _Noreturn works as-is. */ # elif 2 < __GNUC__ + (8 <= __GNUC_MINOR__) || 0x5110 <= __SUNPRO_C # define _Noreturn __attribute__ ((__noreturn__)) diff --git a/lib/alloca.c b/lib/alloca.c index d0476d5..91b9ec3 100644 --- a/lib/alloca.c +++ b/lib/alloca.c @@ -39,8 +39,8 @@ # define memory_full() abort () #endif -/* If compiling with GCC 2, this file's not needed. */ -#if !defined (__GNUC__) || __GNUC__ < 2 +/* If compiling with GCC or clang, this file is not needed. */ +#if !(defined __GNUC__ || defined __clang__) /* If someone has defined alloca as a macro, there must be some other way alloca is supposed to work. */ @@ -62,16 +62,6 @@ lose # endif /* static */ # endif /* emacs */ -/* If your stack is a linked list of frames, you have to - provide an "address metric" ADDRESS_FUNCTION macro. */ - -# if defined (CRAY) && defined (CRAY_STACKSEG_END) -long i00afunc (); -# define ADDRESS_FUNCTION(arg) (char *) i00afunc (&(arg)) -# else -# define ADDRESS_FUNCTION(arg) &(arg) -# endif - /* Define STACK_DIRECTION if you know the direction of stack growth for your system; otherwise it will be automatically deduced at run-time. @@ -140,7 +130,7 @@ void * alloca (size_t size) { auto char probe; /* Probes stack depth: */ - register char *depth = ADDRESS_FUNCTION (probe); + register char *depth = &probe; # if STACK_DIRECTION == 0 if (STACK_DIR == 0) /* Unknown growth direction. */ @@ -206,273 +196,5 @@ alloca (size_t size) } } -# if defined (CRAY) && defined (CRAY_STACKSEG_END) - -# ifdef DEBUG_I00AFUNC -# include -# endif - -# ifndef CRAY_STACK -# define CRAY_STACK -# ifndef CRAY2 -/* Stack structures for CRAY-1, CRAY X-MP, and CRAY Y-MP */ -struct stack_control_header - { - long shgrow:32; /* Number of times stack has grown. */ - long shaseg:32; /* Size of increments to stack. */ - long shhwm:32; /* High water mark of stack. */ - long shsize:32; /* Current size of stack (all segments). */ - }; - -/* The stack segment linkage control information occurs at - the high-address end of a stack segment. (The stack - grows from low addresses to high addresses.) The initial - part of the stack segment linkage control information is - 0200 (octal) words. This provides for register storage - for the routine which overflows the stack. */ - -struct stack_segment_linkage - { - long ss[0200]; /* 0200 overflow words. */ - long sssize:32; /* Number of words in this segment. */ - long ssbase:32; /* Offset to stack base. */ - long:32; - long sspseg:32; /* Offset to linkage control of previous - segment of stack. */ - long:32; - long sstcpt:32; /* Pointer to task common address block. */ - long sscsnm; /* Private control structure number for - microtasking. */ - long ssusr1; /* Reserved for user. */ - long ssusr2; /* Reserved for user. */ - long sstpid; /* Process ID for pid based multi-tasking. */ - long ssgvup; /* Pointer to multitasking thread giveup. */ - long sscray[7]; /* Reserved for Cray Research. */ - long ssa0; - long ssa1; - long ssa2; - long ssa3; - long ssa4; - long ssa5; - long ssa6; - long ssa7; - long sss0; - long sss1; - long sss2; - long sss3; - long sss4; - long sss5; - long sss6; - long sss7; - }; - -# else /* CRAY2 */ -/* The following structure defines the vector of words - returned by the STKSTAT library routine. */ -struct stk_stat - { - long now; /* Current total stack size. */ - long maxc; /* Amount of contiguous space which would - be required to satisfy the maximum - stack demand to date. */ - long high_water; /* Stack high-water mark. */ - long overflows; /* Number of stack overflow ($STKOFEN) calls. */ - long hits; /* Number of internal buffer hits. */ - long extends; /* Number of block extensions. */ - long stko_mallocs; /* Block allocations by $STKOFEN. */ - long underflows; /* Number of stack underflow calls ($STKRETN). */ - long stko_free; /* Number of deallocations by $STKRETN. */ - long stkm_free; /* Number of deallocations by $STKMRET. */ - long segments; /* Current number of stack segments. */ - long maxs; /* Maximum number of stack segments so far. */ - long pad_size; /* Stack pad size. */ - long current_address; /* Current stack segment address. */ - long current_size; /* Current stack segment size. This - number is actually corrupted by STKSTAT to - include the fifteen word trailer area. */ - long initial_address; /* Address of initial segment. */ - long initial_size; /* Size of initial segment. */ - }; - -/* The following structure describes the data structure which trails - any stack segment. I think that the description in 'asdef' is - out of date. I only describe the parts that I am sure about. */ - -struct stk_trailer - { - long this_address; /* Address of this block. */ - long this_size; /* Size of this block (does not include - this trailer). */ - long unknown2; - long unknown3; - long link; /* Address of trailer block of previous - segment. */ - long unknown5; - long unknown6; - long unknown7; - long unknown8; - long unknown9; - long unknown10; - long unknown11; - long unknown12; - long unknown13; - long unknown14; - }; - -# endif /* CRAY2 */ -# endif /* not CRAY_STACK */ - -# ifdef CRAY2 -/* Determine a "stack measure" for an arbitrary ADDRESS. - I doubt that "lint" will like this much. */ - -static long -i00afunc (long *address) -{ - struct stk_stat status; - struct stk_trailer *trailer; - long *block, size; - long result = 0; - - /* We want to iterate through all of the segments. The first - step is to get the stack status structure. We could do this - more quickly and more directly, perhaps, by referencing the - $LM00 common block, but I know that this works. */ - - STKSTAT (&status); - - /* Set up the iteration. */ - - trailer = (struct stk_trailer *) (status.current_address - + status.current_size - - 15); - - /* There must be at least one stack segment. Therefore it is - a fatal error if "trailer" is null. */ - - if (trailer == NULL) - abort (); - - /* Discard segments that do not contain our argument address. */ - - while (trailer != NULL) - { - block = (long *) trailer->this_address; - size = trailer->this_size; - if (block == NULL || size == 0) - abort (); - trailer = (struct stk_trailer *) trailer->link; - if ((block <= address) && (address < (block + size))) - break; - } - - /* Set the result to the offset in this segment and add the sizes - of all predecessor segments. */ - - result = address - block; - - if (trailer == NULL) - { - return result; - } - - do - { - if (trailer->this_size <= 0) - abort (); - result += trailer->this_size; - trailer = (struct stk_trailer *) trailer->link; - } - while (trailer != NULL); - - /* We are done. Note that if you present a bogus address (one - not in any segment), you will get a different number back, formed - from subtracting the address of the first block. This is probably - not what you want. */ - - return (result); -} - -# else /* not CRAY2 */ -/* Stack address function for a CRAY-1, CRAY X-MP, or CRAY Y-MP. - Determine the number of the cell within the stack, - given the address of the cell. The purpose of this - routine is to linearize, in some sense, stack addresses - for alloca. */ - -static long -i00afunc (long address) -{ - long stkl = 0; - - long size, pseg, this_segment, stack; - long result = 0; - - struct stack_segment_linkage *ssptr; - - /* Register B67 contains the address of the end of the - current stack segment. If you (as a subprogram) store - your registers on the stack and find that you are past - the contents of B67, you have overflowed the segment. - - B67 also points to the stack segment linkage control - area, which is what we are really interested in. */ - - stkl = CRAY_STACKSEG_END (); - ssptr = (struct stack_segment_linkage *) stkl; - - /* If one subtracts 'size' from the end of the segment, - one has the address of the first word of the segment. - - If this is not the first segment, 'pseg' will be - nonzero. */ - - pseg = ssptr->sspseg; - size = ssptr->sssize; - - this_segment = stkl - size; - - /* It is possible that calling this routine itself caused - a stack overflow. Discard stack segments which do not - contain the target address. */ - - while (!(this_segment <= address && address <= stkl)) - { -# ifdef DEBUG_I00AFUNC - fprintf (stderr, "%011o %011o %011o\n", this_segment, address, stkl); -# endif - if (pseg == 0) - break; - stkl = stkl - pseg; - ssptr = (struct stack_segment_linkage *) stkl; - size = ssptr->sssize; - pseg = ssptr->sspseg; - this_segment = stkl - size; - } - - result = address - this_segment; - - /* If you subtract pseg from the current end of the stack, - you get the address of the previous stack segment's end. - This seems a little convoluted to me, but I'll bet you save - a cycle somewhere. */ - - while (pseg != 0) - { -# ifdef DEBUG_I00AFUNC - fprintf (stderr, "%011o %011o\n", pseg, size); -# endif - stkl = stkl - pseg; - ssptr = (struct stack_segment_linkage *) stkl; - size = ssptr->sssize; - pseg = ssptr->sspseg; - result += size; - } - return (result); -} - -# endif /* not CRAY2 */ -# endif /* CRAY */ - # endif /* no alloca */ -#endif /* not GCC 2 */ +#endif /* not GCC || clang */ diff --git a/lib/alloca.in.h b/lib/alloca.in.h index a581d58..c71e9bf 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-2019 Free Software Foundation, + Copyright (C) 1995, 1999, 2001-2004, 2006-2020 Free Software Foundation, Inc. This program is free software; you can redistribute it and/or modify it @@ -35,13 +35,16 @@ */ #ifndef alloca -# ifdef __GNUC__ - /* Some version of mingw have an that causes trouble when - included after 'alloca' gets defined as a macro. As a workaround, include - this first and define 'alloca' as a macro afterwards. */ -# if (defined _WIN32 && ! defined __CYGWIN__) && @HAVE_ALLOCA_H@ -# include_next -# endif + /* Some version of mingw have an that causes trouble when + included after 'alloca' gets defined as a macro. As a workaround, + include this first and define 'alloca' as a macro afterwards + if needed. */ +# if defined __GNUC__ && (defined _WIN32 && ! defined __CYGWIN__) && @HAVE_ALLOCA_H@ +# include_next +# endif +#endif +#ifndef alloca +# if defined __GNUC__ || (__clang_major__ >= 4) # define alloca __builtin_alloca # elif defined _AIX # define alloca __alloca diff --git a/lib/arg-nonnull.h b/lib/arg-nonnull.h index ad8c26c..db9d9ae 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-2019 Free Software Foundation, Inc. + Copyright (C) 2009-2020 Free Software Foundation, Inc. This program is free software: you can redistribute it and/or modify it under the terms of the GNU General Public License as published @@ -18,7 +18,7 @@ that the values passed as arguments n, ..., m must be non-NULL pointers. n = 1 stands for the first argument, n = 2 for the second argument etc. */ #ifndef _GL_ARG_NONNULL -# if (__GNUC__ == 3 && __GNUC_MINOR__ >= 3) || __GNUC__ > 3 +# if __GNUC__ > 3 || (__GNUC__ == 3 && __GNUC_MINOR__ >= 3) || defined __clang__ # define _GL_ARG_NONNULL(params) __attribute__ ((__nonnull__ params)) # else # define _GL_ARG_NONNULL(params) diff --git a/lib/argmatch.c b/lib/argmatch.c index 9eeb451..195f902 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-2019 Free Software + Copyright (C) 1990, 1998-1999, 2001-2007, 2009-2020 Free Software Foundation, Inc. This program is free software: you can redistribute it and/or modify diff --git a/lib/argmatch.h b/lib/argmatch.h index 897fa41..daa0fdb 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-2019 Free Software + Copyright (C) 1990, 1998-1999, 2001-2002, 2004-2005, 2009-2020 Free Software Foundation, Inc. This program is free software: you can redistribute it and/or modify diff --git a/lib/assure.h b/lib/assure.h index c21b6a6..09a4edf 100644 --- a/lib/assure.h +++ b/lib/assure.h @@ -1,6 +1,6 @@ /* Run-time assert-like macros. - Copyright (C) 2014-2019 Free Software Foundation, Inc. + Copyright (C) 2014-2020 Free Software Foundation, Inc. This program is free software: you can redistribute it and/or modify it under the terms of the GNU General Public License as published by @@ -21,12 +21,32 @@ #define _GL_ASSURE_H #include +#include "verify.h" + +/* Evaluate an assertion E that is guaranteed to be true. + If NDEBUG is not defined, abort the program if E is false. + If NDEBUG is defined, the compiler can assume E and behavior is + undefined if E is false, fails to evaluate, or has side effects. + + Unlike standard 'assert', this macro evaluates E even when NDEBUG + is defined, so as to catch typos, avoid some GCC warnings, and + improve performance when E is simple enough. + + Also see the documentation for 'assume' in verify.h. */ + +#ifdef NDEBUG +# define affirm(E) assume (E) +#else +# define affirm(E) assert (E) +#endif /* Check E's value at runtime, and report an error and abort if not. However, do nothing if NDEBUG is defined. - Unlike standard 'assert', this macro always compiles E even when NDEBUG - is defined, so as to catch typos and avoid some GCC warnings. */ + Unlike standard 'assert', this macro compiles E even when NDEBUG + is defined, so as to catch typos and avoid some GCC warnings. + Unlike 'affirm', it is OK for E to use hard-to-optimize features, + since E is not executed if NDEBUG is defined. */ #ifdef NDEBUG # define assure(E) ((void) (0 && (E))) diff --git a/lib/attribute.h b/lib/attribute.h new file mode 100644 index 0000000..5afcb8e --- /dev/null +++ b/lib/attribute.h @@ -0,0 +1,218 @@ +/* ATTRIBUTE_* macros for using attributes in GCC and similar compilers + + Copyright 2020 Free Software Foundation, Inc. + + This 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 . */ + +/* Written by Paul Eggert. */ + +/* Provide public ATTRIBUTE_* names for the private _GL_ATTRIBUTE_* + macros used within Gnulib. */ + +/* These attributes can be placed in two ways: + - At the start of a declaration (i.e. even before storage-class + specifiers!); then they apply to all entities that are declared + by the declaration. + - Immediately after the name of an entity being declared by the + declaration; then they apply to that entity only. */ + +#ifndef _GL_ATTRIBUTE_H +#define _GL_ATTRIBUTE_H + + +/* This file defines two types of attributes: + * C2X 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 + https://gcc.gnu.org/onlinedocs/gcc/Common-Variable-Attributes.html + https://gcc.gnu.org/onlinedocs/gcc/Common-Type-Attributes.html + These names begin with 'ATTRIBUTE_' to avoid name clashes. */ + + +/* =============== Attributes for specific kinds of functions =============== */ + +/* Attributes for functions that should not be used. */ + +/* Warn if the entity is used. */ +/* Applies to: + - function, variable, + - struct, union, struct/union member, + - enumeration, enumeration item, + - typedef, + in C++ also: namespace, class, template specialization. */ +#define DEPRECATED _GL_ATTRIBUTE_DEPRECATED + +/* If a function call is not optimized way, warn with MSG. */ +/* Applies to: functions. */ +#define ATTRIBUTE_WARNING(msg) _GL_ATTRIBUTE_WARNING (msg) + +/* If a function call is not optimized way, report an error with MSG. */ +/* Applies to: functions. */ +#define ATTRIBUTE_ERROR(msg) _GL_ATTRIBUTE_ERROR (msg) + + +/* Attributes for memory-allocating functions. */ + +/* The function returns a pointer to freshly allocated memory. */ +/* Applies to: functions. */ +#define ATTRIBUTE_MALLOC _GL_ATTRIBUTE_MALLOC + +/* ATTRIBUTE_ALLOC_SIZE ((N)) - The Nth argument of the function + is the size of the returned memory block. + ATTRIBUTE_ALLOC_SIZE ((M, N)) - Multiply the Mth and Nth arguments + to determine the size of the returned memory block. */ +/* Applies to: function, pointer to function, function types. */ +#define ATTRIBUTE_ALLOC_SIZE(args) _GL_ATTRIBUTE_ALLOC_SIZE (args) + + +/* Attributes for variadic functions. */ + +/* The variadic function expects a trailing NULL argument. + ATTRIBUTE_SENTINEL () - The last argument is NULL (requires C99). + ATTRIBUTE_SENTINEL ((N)) - The (N+1)st argument from the end is NULL. */ +/* Applies to: functions. */ +#define ATTRIBUTE_SENTINEL(pos) _GL_ATTRIBUTE_SENTINEL (pos) + + +/* ================== Attributes for compiler diagnostics ================== */ + +/* Attributes that help the compiler diagnose programmer mistakes. + Some of them may also help for some compiler optimizations. */ + +/* ATTRIBUTE_FORMAT ((ARCHETYPE, STRING-INDEX, FIRST-TO-CHECK)) - + The STRING-INDEXth function argument is a format string of style + ARCHETYPE, which is one of: + printf, gnu_printf + scanf, gnu_scanf, + strftime, gnu_strftime, + strfmon, + or the same thing prefixed and suffixed with '__'. + If FIRST-TO-CHECK is not 0, arguments starting at FIRST-TO_CHECK + are suitable for the format string. */ +/* Applies to: functions. */ +#define ATTRIBUTE_FORMAT(spec) _GL_ATTRIBUTE_FORMAT (spec) + +/* ATTRIBUTE_NONNULL ((N1, N2,...)) - Arguments N1, N2,... must not be NULL. + ATTRIBUTE_NONNULL () - All pointer arguments must not be null. */ +/* Applies to: functions. */ +#define ATTRIBUTE_NONNULL(args) _GL_ATTRIBUTE_NONNULL (args) + +/* The function's return value is a non-NULL pointer. */ +/* Applies to: functions. */ +#define ATTRIBUTE_RETURNS_NONNULL _GL_ATTRIBUTE_RETURNS_NONNULL + +/* Warn if the caller does not use the return value, + unless the caller uses something like ignore_value. */ +/* Applies to: function, enumeration, class. */ +#define NODISCARD _GL_ATTRIBUTE_NODISCARD + + +/* Attributes that disable false alarms when the compiler diagnoses + programmer "mistakes". */ + +/* Do not warn if the entity is not used. */ +/* Applies to: + - function, variable, + - struct, union, struct/union member, + - enumeration, enumeration item, + - typedef, + in C++ also: class. */ +#define MAYBE_UNUSED _GL_ATTRIBUTE_MAYBE_UNUSED + +/* 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'. */ +#define ATTRIBUTE_NONSTRING _GL_ATTRIBUTE_NONSTRING + +/* Do not warn if control flow falls through to the immediately + following 'case' or 'default' label. */ +/* Applies to: Empty statement (;), inside a 'switch' statement. */ +#define FALLTHROUGH _GL_ATTRIBUTE_FALLTHROUGH + + +/* ================== Attributes for debugging information ================== */ + +/* Attributes regarding debugging information emitted by the compiler. */ + +/* Omit the function from stack traces when debugging. */ +/* Applies to: function. */ +#define ATTRIBUTE_ARTIFICIAL _GL_ATTRIBUTE_ARTIFICIAL + +/* Make the entity visible to debuggers etc., even with '-fwhole-program'. */ +/* Applies to: functions, variables. */ +#define ATTRIBUTE_EXTERNALLY_VISIBLE _GL_ATTRIBUTE_EXTERNALLY_VISIBLE + + +/* ========== Attributes that mainly direct compiler optimizations ========== */ + +/* The function does not throw exceptions. */ +/* Applies to: functions. */ +#define ATTRIBUTE_NOTHROW _GL_ATTRIBUTE_NOTHROW + +/* Do not inline the function. */ +/* Applies to: functions. */ +#define ATTRIBUTE_NOINLINE _GL_ATTRIBUTE_NOINLINE + +/* Always inline the function, and report an error if the compiler + cannot inline. */ +/* Applies to: function. */ +#define ATTRIBUTE_ALWAYS_INLINE _GL_ATTRIBUTE_ALWAYS_INLINE + +/* It is OK for a compiler to omit duplicate calls with the same arguments. + This attribute is safe for a function that neither depends on + nor affects observable state, and always returns exactly once - + e.g., does not loop forever, and does not call longjmp. + (This attribute is stricter than ATTRIBUTE_PURE.) */ +/* Applies to: functions. */ +#define ATTRIBUTE_CONST _GL_ATTRIBUTE_CONST + +/* It is OK for a compiler to omit duplicate calls with the same + arguments if observable state is not changed between calls. + This attribute is safe for a function that does not affect + observable state, and always returns exactly once. + (This attribute is looser than ATTRIBUTE_CONST.) */ +/* Applies to: functions. */ +#define ATTRIBUTE_PURE _GL_ATTRIBUTE_PURE + +/* The function is rarely executed. */ +/* Applies to: functions. */ +#define ATTRIBUTE_COLD _GL_ATTRIBUTE_COLD + +/* If called from some other compilation unit, the function executes + code from that unit only by return or by exception handling, + letting the compiler optimize that unit more aggressively. */ +/* Applies to: functions. */ +#define ATTRIBUTE_LEAF _GL_ATTRIBUTE_LEAF + +/* For struct members: The member has the smallest possible alignment. + For struct, union, class: All members have the smallest possible alignment, + minimizing the memory required. */ +/* Applies to: struct members, struct, union, + in C++ also: class. */ +#define ATTRIBUTE_PACKED _GL_ATTRIBUTE_PACKED + + +/* ================ Attributes that make invalid code valid ================ */ + +/* Attributes that prevent fatal compiler optimizations for code that is not + fully ISO C compliant. */ + +/* Pointers to the type may point to the same storage as pointers to + other types, thus disabling strict aliasing optimization. */ +/* Applies to: types. */ +#define ATTRIBUTE_MAY_ALIAS _GL_ATTRIBUTE_MAY_ALIAS + + +#endif /* _GL_ATTRIBUTE_H */ diff --git a/lib/basename-lgpl.c b/lib/basename-lgpl.c index 0ae04ee..6bb28d4 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-2019 Free Software + Copyright (C) 1990, 1998-2001, 2003-2006, 2009-2020 Free Software Foundation, Inc. This program is free software: you can redistribute it and/or modify @@ -18,20 +18,20 @@ #include -#include "dirname.h" +/* Specification. */ +#include "basename-lgpl.h" +#include #include -/* Return the address of the last file name component of NAME. If - NAME has no relative file name components because it is a file - system root, return the empty string. */ +#include "filename.h" char * last_component (char const *name) { char const *base = name + FILE_SYSTEM_PREFIX_LEN (name); char const *p; - bool saw_slash = false; + bool last_was_slash = false; while (ISSLASH (*base)) base++; @@ -39,21 +39,17 @@ last_component (char const *name) for (p = base; *p; p++) { if (ISSLASH (*p)) - saw_slash = true; - else if (saw_slash) + last_was_slash = true; + else if (last_was_slash) { base = p; - saw_slash = false; + last_was_slash = false; } } return (char *) base; } -/* Return the length of the basename NAME. Typically NAME is the - value returned by base_name or last_component. Act like strlen - (NAME), except omit all trailing slashes. */ - size_t base_len (char const *name) { diff --git a/lib/basename-lgpl.h b/lib/basename-lgpl.h new file mode 100644 index 0000000..3807094 --- /dev/null +++ b/lib/basename-lgpl.h @@ -0,0 +1,78 @@ +/* Extract the last component (base name) of a file name. + + Copyright (C) 1998, 2001, 2003-2006, 2009-2020 Free Software Foundation, + Inc. + + This 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 . */ + +#ifndef _BASENAME_LGPL_H +#define _BASENAME_LGPL_H + +#include + +#ifndef DOUBLE_SLASH_IS_DISTINCT_ROOT +# define DOUBLE_SLASH_IS_DISTINCT_ROOT 0 +#endif + +#ifdef __cplusplus +extern "C" { +#endif + + +/* Return the address of the last file name component of FILENAME. + If FILENAME has some trailing slash(es), they are considered to be + part of the last component. + If FILENAME has no relative file name components because it is a file + system root, return the empty string. + Examples: + FILENAME RESULT + "foo.c" "foo.c" + "foo/bar.c" "bar.c" + "/foo/bar.c" "bar.c" + "foo/bar/" "bar/" + "foo/bar//" "bar//" + "/" "" + "//" "" + "" "" + The return value is a tail of the given FILENAME; do NOT free() it! */ + +/* This function was traditionally called 'basename', but we avoid this + function name because + * Various platforms have different functions in their libc. + In particular, the glibc basename(), defined in , does + not consider trailing slashes to be part of the component: + FILENAME RESULT + "foo/bar/" "" + "foo/bar//" "" + * The 'basename' command eliminates trailing slashes and for a root + produces a non-empty result: + FILENAME RESULT + "foo/bar/" "bar" + "foo/bar//" "bar" + "/" "/" + "//" "/" + */ +extern char *last_component (char const *filename) _GL_ATTRIBUTE_PURE; + +/* Return the length of the basename FILENAME. + Typically FILENAME is the value returned by base_name or last_component. + Act like strlen (FILENAME), except omit all trailing slashes. */ +extern size_t base_len (char const *filename) _GL_ATTRIBUTE_PURE; + + +#ifdef __cplusplus +} /* extern "C" */ +#endif + +#endif /* _BASENAME_LGPL_H */ diff --git a/lib/basename.c b/lib/basename.c index 1b6e0ea..b14417f 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-2019 Free Software + Copyright (C) 1990, 1998-2001, 2003-2006, 2009-2020 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 9e2496d..6828b70 100644 --- a/lib/btowc.c +++ b/lib/btowc.c @@ -1,5 +1,5 @@ /* Convert unibyte character to wide character. - Copyright (C) 2008, 2010-2019 Free Software Foundation, Inc. + Copyright (C) 2008, 2010-2020 Free Software Foundation, Inc. Written by Bruno Haible , 2008. This program is free software: you can redistribute it and/or modify diff --git a/lib/c++defs.h b/lib/c++defs.h index 87d0716..01ef814 100644 --- a/lib/c++defs.h +++ b/lib/c++defs.h @@ -1,5 +1,5 @@ /* C++ compatible function declaration macros. - Copyright (C) 2010-2019 Free Software Foundation, Inc. + Copyright (C) 2010-2020 Free Software Foundation, Inc. This program is free software: you can redistribute it and/or modify it under the terms of the GNU General Public License as published @@ -146,6 +146,16 @@ _GL_EXTERN_C int _gl_cxxalias_dummy #endif +/* _GL_CXXALIAS_MDA (func, rettype, parameters); + is to be used when func is a Microsoft deprecated alias, on native Windows. + It declares a C++ alias called GNULIB_NAMESPACE::func + that redirects to _func, if GNULIB_NAMESPACE is defined. + Example: + _GL_CXXALIAS_MDA (open, int, (const char *filename, int flags, ...)); + */ +#define _GL_CXXALIAS_MDA(func,rettype,parameters) \ + _GL_CXXALIAS_RPL_1 (func, _##func, rettype, parameters) + /* _GL_CXXALIAS_RPL_CAST_1 (func, rpl_func, rettype, parameters); is like _GL_CXXALIAS_RPL_1 (func, rpl_func, rettype, parameters); except that the C function rpl_func may have a slightly different @@ -171,6 +181,14 @@ _GL_EXTERN_C int _gl_cxxalias_dummy #endif +/* _GL_CXXALIAS_MDA_CAST (func, rettype, parameters); + is like _GL_CXXALIAS_MDA (func, rettype, parameters); + except that the C function func may have a slightly different declaration. + A cast is used to silence the "invalid conversion" error that would + otherwise occur. */ +#define _GL_CXXALIAS_MDA_CAST(func,rettype,parameters) \ + _GL_CXXALIAS_RPL_CAST_1 (func, _##func, rettype, parameters) + /* _GL_CXXALIAS_SYS (func, rettype, parameters); declares a C++ alias called GNULIB_NAMESPACE::func that redirects to the system provided function func, if GNULIB_NAMESPACE @@ -268,7 +286,7 @@ _GL_CXXALIASWARN_2 (func, namespace) /* To work around GCC bug , we enable the warning only when not optimizing. */ -# if !__OPTIMIZE__ +# if !(defined __GNUC__ && !defined __clang__ && __OPTIMIZE__) # define _GL_CXXALIASWARN_2(func,namespace) \ _GL_WARN_ON_USE (func, \ "The symbol ::" #func " refers to the system function. " \ @@ -296,14 +314,11 @@ _GL_CXXALIASWARN1_2 (func, rettype, parameters_and_attributes, namespace) /* To work around GCC bug , we enable the warning only when not optimizing. */ -# if !__OPTIMIZE__ +# if !(defined __GNUC__ && !defined __clang__ && __OPTIMIZE__) # define _GL_CXXALIASWARN1_2(func,rettype,parameters_and_attributes,namespace) \ - _GL_WARN_ON_USE_CXX (func, rettype, parameters_and_attributes, \ + _GL_WARN_ON_USE_CXX (func, rettype, rettype, parameters_and_attributes, \ "The symbol ::" #func " refers to the system function. " \ "Use " #namespace "::" #func " instead.") -# elif __GNUC__ >= 3 && GNULIB_STRICT_CHECKING -# define _GL_CXXALIASWARN1_2(func,rettype,parameters_and_attributes,namespace) \ - extern __typeof__ (func) func # else # define _GL_CXXALIASWARN1_2(func,rettype,parameters_and_attributes,namespace) \ _GL_EXTERN_C int _gl_cxxalias_dummy diff --git a/lib/c-ctype.h b/lib/c-ctype.h index 4d52176..fbd11b3 100644 --- a/lib/c-ctype.h +++ b/lib/c-ctype.h @@ -5,7 +5,7 @@ functions' behaviour depends on the current locale set via setlocale. - Copyright (C) 2000-2003, 2006, 2008-2019 Free Software Foundation, Inc. + Copyright (C) 2000-2003, 2006, 2008-2020 Free Software Foundation, Inc. This 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/c-strcase.h b/lib/c-strcase.h index b67c9b5..3b711f5 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-2019 Free Software + Copyright (C) 1995-1996, 2001, 2003, 2005, 2009-2020 Free Software Foundation, Inc. This program is free software; you can redistribute it and/or modify diff --git a/lib/c-strcasecmp.c b/lib/c-strcasecmp.c index ec50f1a..f1a4b98 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-2019 Free Software Foundation, Inc. + Copyright (C) 1998-1999, 2005-2006, 2009-2020 Free Software Foundation, Inc. This program is free software; you can redistribute it and/or modify it under the terms of the GNU General Public License as published by @@ -52,5 +52,5 @@ c_strcasecmp (const char *s1, const char *s2) /* On machines where 'char' and 'int' are types of the same size, the difference of two 'unsigned char' values - including the sign bit - doesn't fit in an 'int'. */ - return (c1 > c2 ? 1 : c1 < c2 ? -1 : 0); + return _GL_CMP (c1, c2); } diff --git a/lib/c-strcaseeq.h b/lib/c-strcaseeq.h index bcc81fc..0f7c50a 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-2019 Free Software Foundation, Inc. + Copyright (C) 2001-2002, 2007, 2009-2020 Free Software Foundation, Inc. This program is free software: you can redistribute it and/or modify it under the terms of the GNU General Public License as published @@ -27,7 +27,7 @@ /* Help GCC to generate good code for string comparisons with immediate strings. */ -#if defined (__GNUC__) && defined (__OPTIMIZE__) +#if (defined __GNUC__ || defined __clang__) && defined __OPTIMIZE__ /* Case insensitive comparison of ASCII characters. */ # if C_CTYPE_ASCII diff --git a/lib/c-strncasecmp.c b/lib/c-strncasecmp.c index 513c353..1d6e141 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-2019 Free Software Foundation, Inc. + Copyright (C) 1998-1999, 2005-2006, 2009-2020 Free Software Foundation, Inc. This program is free software; you can redistribute it and/or modify it under the terms of the GNU General Public License as published by @@ -52,5 +52,5 @@ c_strncasecmp (const char *s1, const char *s2, size_t n) /* On machines where 'char' and 'int' are types of the same size, the difference of two 'unsigned char' values - including the sign bit - doesn't fit in an 'int'. */ - return (c1 > c2 ? 1 : c1 < c2 ? -1 : 0); + return _GL_CMP (c1, c2); } diff --git a/lib/calloc.c b/lib/calloc.c index a0f5728..be37c2a 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-2019 Free Software Foundation, Inc. + Copyright (C) 2004-2007, 2009-2020 Free Software Foundation, Inc. This 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/canonicalize-lgpl.c b/lib/canonicalize-lgpl.c index 4d1be6d..d090dcd 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-2019 Free Software Foundation, Inc. + Copyright (C) 1996-2020 Free Software Foundation, Inc. This file is part of the GNU C Library. This program is free software: you can redistribute it and/or modify @@ -36,12 +36,12 @@ #if HAVE_SYS_PARAM_H || defined _LIBC # include #endif -#include #include #include #ifdef _LIBC # include +typedef ptrdiff_t idx_t; #else # define SHLIB_COMPAT(lib, introduced, obsoleted) 0 # define versioned_symbol(lib, local, symbol, version) extern int dummy @@ -49,10 +49,13 @@ # define weak_alias(local, symbol) # define __canonicalize_file_name canonicalize_file_name # define __realpath realpath +# include "idx.h" # include "pathmax.h" # include "malloca.h" -# include "dosname.h" -# if HAVE_GETCWD +# include "filename.h" +# if defined _WIN32 && !defined __CYGWIN__ +# define __getcwd _getcwd +# elif HAVE_GETCWD # if IN_RELOCWRAPPER /* When building the relocatable program wrapper, use the system's getcwd function, not the gnulib override, otherwise we would get a link error. @@ -196,12 +199,6 @@ __realpath (const char *name, char *resolved) for (end = start; *start; start = end) { -#ifdef _LIBC - struct stat64 st; -#else - struct stat st; -#endif - /* Skip sequence of multiple path-separators. */ while (ISSLASH (*start)) ++start; @@ -210,9 +207,7 @@ __realpath (const char *name, char *resolved) for (end = start; *end && !ISSLASH (*end); ++end) /* Nothing. */; - if (end - start == 0) - break; - else if (end - start == 1 && start[0] == '.') + if (end - start == 1 && start[0] == '.') /* nothing */; else if (end - start == 2 && start[0] == '.' && start[1] == '.') { @@ -232,9 +227,9 @@ __realpath (const char *name, char *resolved) if (!ISSLASH (dest[-1])) *dest++ = '/'; - if (dest + (end - start) >= rpath_limit) + if (rpath_limit - dest <= end - start) { - ptrdiff_t dest_offset = dest - rpath; + idx_t dest_offset = dest - rpath; char *new_rpath; if (resolved) @@ -270,20 +265,17 @@ __realpath (const char *name, char *resolved) #endif *dest = '\0'; - /* FIXME: if lstat fails with errno == EOVERFLOW, - the entry exists. */ -#ifdef _LIBC - if (__lxstat64 (_STAT_VER, rpath, &st) < 0) -#else - if (lstat (rpath, &st) < 0) -#endif - goto error; - - if (S_ISLNK (st.st_mode)) + char linkbuf[128]; + ssize_t n = __readlink (rpath, linkbuf, sizeof linkbuf); + if (n < 0) + { + if (errno != EINVAL) + goto error; + } + else { char *buf; size_t len; - ssize_t n; if (++num_links > MAXSYMLINKS) { @@ -291,39 +283,30 @@ __realpath (const char *name, char *resolved) goto error; } - buf = malloca (path_max); - if (!buf) - { - __set_errno (ENOMEM); - goto error; - } - - n = __readlink (rpath, buf, path_max - 1); - if (n < 0) - { - int saved_errno = errno; - freea (buf); - __set_errno (saved_errno); - goto error; - } - buf[n] = '\0'; - if (!extra_buf) { - extra_buf = malloca (path_max); + extra_buf = malloca (2 * path_max); if (!extra_buf) { - freea (buf); - __set_errno (ENOMEM); + alloc_failed (); goto error; } } + if (n < sizeof linkbuf) + buf = linkbuf; + else + { + buf = extra_buf + path_max; + n = __readlink (rpath, buf, path_max - 1); + if (n < 0) + goto error; + } + buf[n] = '\0'; len = strlen (end); /* Check that n + len + 1 doesn't overflow and is <= path_max. */ if (n >= SIZE_MAX - len || n + len >= path_max) { - freea (buf); __set_errno (ENAMETOOLONG); goto error; } @@ -361,11 +344,6 @@ __realpath (const char *name, char *resolved) dest++; } } - else if (!S_ISDIR (st.st_mode) && *end != '\0') - { - __set_errno (ENOTDIR); - goto error; - } } } if (dest > rpath + prefix_len + 1 && ISSLASH (dest[-1])) diff --git a/lib/cdefs.h b/lib/cdefs.h index 96d2616..1a2805d 100644 --- a/lib/cdefs.h +++ b/lib/cdefs.h @@ -1,4 +1,4 @@ -/* Copyright (C) 1992-2019 Free Software Foundation, Inc. +/* Copyright (C) 1992-2020 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 @@ -34,7 +34,34 @@ #undef __P #undef __PMT -#ifdef __GNUC__ +/* Compilers that are not clang may object to + #if defined __clang__ && __has_attribute(...) + even though they do not need to evaluate the right-hand side of the &&. */ +#if defined __clang__ && defined __has_attribute +# define __glibc_clang_has_attribute(name) __has_attribute (name) +#else +# define __glibc_clang_has_attribute(name) 0 +#endif + +/* Compilers that are not clang may object to + #if defined __clang__ && __has_builtin(...) + even though they do not need to evaluate the right-hand side of the &&. */ +#if defined __clang__ && defined __has_builtin +# define __glibc_clang_has_builtin(name) __has_builtin (name) +#else +# define __glibc_clang_has_builtin(name) 0 +#endif + +/* Compilers that are not clang may object to + #if defined __clang__ && __has_extension(...) + even though they do not need to evaluate the right-hand side of the &&. */ +#if defined __clang__ && defined __has_extension +# define __glibc_clang_has_extension(ext) __has_extension (ext) +#else +# define __glibc_clang_has_extension(ext) 0 +#endif + +#if defined __GNUC__ || defined __clang__ /* All functions, except those with callbacks or those that synchronize memory, are leaf functions. */ @@ -48,16 +75,17 @@ /* GCC can always grok prototypes. For C++ programs we add throw() to help it optimize the function calls. But this works only with - gcc 2.8.x and egcs. For gcc 3.2 and up we even mark C functions + gcc 2.8.x and egcs. For gcc 3.4 and up we even mark C functions as non-throwing using a function attribute since programs can use the -fexceptions options for C code as well. */ -# if !defined __cplusplus && __GNUC_PREREQ (3, 3) +# if !defined __cplusplus \ + && (__GNUC_PREREQ (3, 4) || __glibc_clang_has_attribute (__nothrow__)) # define __THROW __attribute__ ((__nothrow__ __LEAF)) # define __THROWNL __attribute__ ((__nothrow__)) # define __NTH(fct) __attribute__ ((__nothrow__ __LEAF)) fct # define __NTHNL(fct) __attribute__ ((__nothrow__)) fct # else -# if defined __cplusplus && __GNUC_PREREQ (2,8) +# if defined __cplusplus && (__GNUC_PREREQ (2,8) || __clang_major >= 4) # define __THROW throw () # define __THROWNL throw () # define __NTH(fct) __LEAF_ATTR fct throw () @@ -70,7 +98,7 @@ # endif # endif -#else /* Not GCC. */ +#else /* Not GCC or clang. */ # if (defined __cplusplus \ || (defined __STDC_VERSION__ && __STDC_VERSION__ >= 199901L)) @@ -83,16 +111,7 @@ # define __THROWNL # define __NTH(fct) fct -#endif /* GCC. */ - -/* Compilers that are not clang may object to - #if defined __clang__ && __has_extension(...) - even though they do not need to evaluate the right-hand side of the &&. */ -#if defined __clang__ && defined __has_extension -# define __glibc_clang_has_extension(ext) __has_extension (ext) -#else -# define __glibc_clang_has_extension(ext) 0 -#endif +#endif /* GCC || clang. */ /* These two macros are not used in glibc anymore. They are kept here only because some other projects expect the macros to be defined. */ @@ -129,6 +148,16 @@ # define __warnattr(msg) __attribute__((__warning__ (msg))) # define __errordecl(name, msg) \ extern void name (void) __attribute__((__error__ (msg))) +#elif __glibc_clang_has_attribute (__diagnose_if__) && 0 +/* These definitions are not enabled, because they produce bogus warnings + in the glibc Fortify functions. These functions are written in a style + that works with GCC. In order to work with clang, these functions would + need to be modified. */ +# define __warndecl(name, msg) \ + extern void name (void) __attribute__((__diagnose_if__ (1, msg, "warning"))) +# define __warnattr(msg) __attribute__((__diagnose_if__ (1, msg, "warning"))) +# define __errordecl(name, msg) \ + extern void name (void) __attribute__((__diagnose_if__ (1, msg, "error"))) #else # define __warndecl(name, msg) extern void name (void) # define __warnattr(msg) @@ -142,8 +171,8 @@ #if defined __STDC_VERSION__ && __STDC_VERSION__ >= 199901L && !defined __HP_cc # define __flexarr [] # define __glibc_c99_flexarr_available 1 -#elif __GNUC_PREREQ (2,97) -/* GCC 2.97 supports C99 flexible array members as an extension, +#elif __GNUC_PREREQ (2,97) || defined __clang__ +/* GCC 2.97 and clang support C99 flexible array members as an extension, even when in C89 mode or compiling C++ (any version). */ # define __flexarr [] # define __glibc_c99_flexarr_available 1 @@ -169,7 +198,7 @@ Example: int __REDIRECT(setpgrp, (__pid_t pid, __pid_t pgrp), setpgid); */ -#if defined __GNUC__ && __GNUC__ >= 2 +#if (defined __GNUC__ && __GNUC__ >= 2) || (__clang_major__ >= 4) # define __REDIRECT(name, proto, alias) name proto __asm__ (__ASMNAME (#alias)) # ifdef __cplusplus @@ -194,17 +223,17 @@ */ #endif -/* GCC has various useful declarations that can be made with the - `__attribute__' syntax. All of the ways we use this do fine if - they are omitted for compilers that don't understand it. */ -#if !defined __GNUC__ || __GNUC__ < 2 +/* GCC and clang have various useful declarations that can be made with + the '__attribute__' syntax. All of the ways we use this do fine if + they are omitted for compilers that don't understand it. */ +#if !(defined __GNUC__ || defined __clang__) # define __attribute__(xyz) /* Ignore */ #endif /* At some point during the gcc 2.96 development the `malloc' attribute for functions was introduced. We don't want to use it unconditionally (although this would be possible) since it generates warnings. */ -#if __GNUC_PREREQ (2,96) +#if __GNUC_PREREQ (2,96) || __glibc_clang_has_attribute (__malloc__) # define __attribute_malloc__ __attribute__ ((__malloc__)) #else # define __attribute_malloc__ /* Ignore */ @@ -222,14 +251,14 @@ /* At some point during the gcc 2.96 development the `pure' attribute for functions was introduced. We don't want to use it unconditionally (although this would be possible) since it generates warnings. */ -#if __GNUC_PREREQ (2,96) +#if __GNUC_PREREQ (2,96) || __glibc_clang_has_attribute (__pure__) # define __attribute_pure__ __attribute__ ((__pure__)) #else # define __attribute_pure__ /* Ignore */ #endif /* This declaration tells the compiler that the value is constant. */ -#if __GNUC_PREREQ (2,5) +#if __GNUC_PREREQ (2,5) || __glibc_clang_has_attribute (__const__) # define __attribute_const__ __attribute__ ((__const__)) #else # define __attribute_const__ /* Ignore */ @@ -238,7 +267,7 @@ /* At some point during the gcc 3.1 development the `used' attribute for functions was introduced. We don't want to use it unconditionally (although this would be possible) since it generates warnings. */ -#if __GNUC_PREREQ (3,1) +#if __GNUC_PREREQ (3,1) || __glibc_clang_has_attribute (__used__) # define __attribute_used__ __attribute__ ((__used__)) # define __attribute_noinline__ __attribute__ ((__noinline__)) #else @@ -247,7 +276,7 @@ #endif /* Since version 3.2, gcc allows marking deprecated functions. */ -#if __GNUC_PREREQ (3,2) +#if __GNUC_PREREQ (3,2) || __glibc_clang_has_attribute (__deprecated__) # define __attribute_deprecated__ __attribute__ ((__deprecated__)) #else # define __attribute_deprecated__ /* Ignore */ @@ -270,7 +299,7 @@ If several `format_arg' attributes are given for the same function, in gcc-3.0 and older, all but the last one are ignored. In newer gccs, all designated arguments are considered. */ -#if __GNUC_PREREQ (2,8) +#if __GNUC_PREREQ (2,8) || __glibc_clang_has_attribute (__format_arg__) # define __attribute_format_arg__(x) __attribute__ ((__format_arg__ (x))) #else # define __attribute_format_arg__(x) /* Ignore */ @@ -280,7 +309,7 @@ attribute for functions was introduced. We don't want to use it unconditionally (although this would be possible) since it generates warnings. */ -#if __GNUC_PREREQ (2,97) +#if __GNUC_PREREQ (2,97) || __glibc_clang_has_attribute (__format__) # define __attribute_format_strfmon__(a,b) \ __attribute__ ((__format__ (__strfmon__, a, b))) #else @@ -291,7 +320,7 @@ must not be NULL. Do not define __nonnull if it is already defined, for portability when this file is used in Gnulib. */ #ifndef __nonnull -# if __GNUC_PREREQ (3,3) +# if __GNUC_PREREQ (3,3) || __glibc_clang_has_attribute (__nonnull__) # define __nonnull(params) __attribute__ ((__nonnull__ params)) # else # define __nonnull(params) @@ -300,7 +329,7 @@ /* If fortification mode, we warn about unused results of certain function calls which can lead to problems. */ -#if __GNUC_PREREQ (3,4) +#if __GNUC_PREREQ (3,4) || __glibc_clang_has_attribute (__warn_unused_result__) # define __attribute_warn_unused_result__ \ __attribute__ ((__warn_unused_result__)) # if defined __USE_FORTIFY_LEVEL && __USE_FORTIFY_LEVEL > 0 @@ -314,7 +343,7 @@ #endif /* Forces a function to be always inlined. */ -#if __GNUC_PREREQ (3,2) +#if __GNUC_PREREQ (3,2) || __glibc_clang_has_attribute (__always_inline__) /* The Linux kernel defines __always_inline in stddef.h (283d7573), and it conflicts with this definition. Therefore undefine it first to allow either header to be included first. */ @@ -327,7 +356,7 @@ /* Associate error messages with the source location of the call site rather than with the source location inside the function. */ -#if __GNUC_PREREQ (4,3) +#if __GNUC_PREREQ (4,3) || __glibc_clang_has_attribute (__artificial__) # define __attribute_artificial__ __attribute__ ((__artificial__)) #else # define __attribute_artificial__ /* Ignore */ @@ -370,12 +399,14 @@ run in pedantic mode if the uses are carefully marked using the `__extension__' keyword. But this is not generally available before version 2.8. */ -#if !__GNUC_PREREQ (2,8) +#if !(__GNUC_PREREQ (2,8) || defined __clang__) # define __extension__ /* Ignore */ #endif -/* __restrict is known in EGCS 1.2 and above. */ -#if !__GNUC_PREREQ (2,92) +/* __restrict is known in EGCS 1.2 and above, and in clang. + It works also in C++ mode (outside of arrays), but only when spelled + as '__restrict', not 'restrict'. */ +#if !(__GNUC_PREREQ (2,92) || __clang_major__ >= 3) # if defined __STDC_VERSION__ && __STDC_VERSION__ >= 199901L # define __restrict restrict # else @@ -385,8 +416,9 @@ /* ISO C99 also allows to declare arrays as non-overlapping. The syntax is array_name[restrict] - GCC 3.1 supports this. */ -#if __GNUC_PREREQ (3,1) && !defined __GNUG__ + GCC 3.1 and clang support this. + This syntax is not usable in C++ mode. */ +#if (__GNUC_PREREQ (3,1) || __clang_major__ >= 3) && !defined __cplusplus # define __restrict_arr __restrict #else # ifdef __GNUC__ @@ -401,7 +433,7 @@ # endif #endif -#if __GNUC__ >= 3 +#if (__GNUC__ >= 3) || __glibc_clang_has_builtin (__builtin_expect) # define __glibc_unlikely(cond) __builtin_expect ((cond), 0) # define __glibc_likely(cond) __builtin_expect ((cond), 1) #else @@ -417,7 +449,8 @@ #if (!defined _Noreturn \ && (defined __STDC_VERSION__ ? __STDC_VERSION__ : 0) < 201112 \ - && !__GNUC_PREREQ (4,7)) + && !(__GNUC_PREREQ (4,7) \ + || (3 < __clang_major__ + (5 <= __clang_minor__)))) # if __GNUC_PREREQ (2,8) # define _Noreturn __attribute__ ((__noreturn__)) # else @@ -436,7 +469,8 @@ #if (!defined _Static_assert && !defined __cplusplus \ && (defined __STDC_VERSION__ ? __STDC_VERSION__ : 0) < 201112 \ - && (!__GNUC_PREREQ (4, 6) || defined __STRICT_ANSI__)) + && (!(__GNUC_PREREQ (4, 6) || __clang_major__ >= 4) \ + || defined __STRICT_ANSI__)) # define _Static_assert(expr, diagnostic) \ extern int (*__Static_assert_function (void)) \ [!!sizeof (struct { int __error_if_negative: (expr) ? 2 : -1; })] diff --git a/lib/cloexec.c b/lib/cloexec.c new file mode 100644 index 0000000..510be3d --- /dev/null +++ b/lib/cloexec.c @@ -0,0 +1,83 @@ +/* cloexec.c - set or clear the close-on-exec descriptor flag + + Copyright (C) 1991, 2004-2006, 2009-2020 Free Software Foundation, Inc. + + This 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 . + + The code is taken from glibc/manual/llio.texi */ + +#include + +#include "cloexec.h" + +#include +#include +#include + +/* 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. + + Note that on MingW, this function does NOT protect DESC from being + inherited into spawned children. Instead, either use dup_cloexec + followed by closing the original DESC, or use interfaces such as + open or pipe2 that accept flags like O_CLOEXEC to create DESC + non-inheritable in the first place. */ + +int +set_cloexec_flag (int desc, bool value) +{ +#ifdef F_SETFD + + int flags = fcntl (desc, F_GETFD, 0); + + if (0 <= flags) + { + int newflags = (value ? flags | FD_CLOEXEC : flags & ~FD_CLOEXEC); + + if (flags == newflags + || fcntl (desc, F_SETFD, newflags) != -1) + return 0; + } + + return -1; + +#else /* !F_SETFD */ + + /* Use dup2 to reject invalid file descriptors; the cloexec flag + will be unaffected. */ + if (desc < 0) + { + errno = EBADF; + return -1; + } + if (dup2 (desc, desc) < 0) + /* errno is EBADF here. */ + return -1; + + /* There is nothing we can do on this kind of platform. Punt. */ + return 0; +#endif /* !F_SETFD */ +} + + +/* Duplicates a file handle FD, while marking the copy to be closed + prior to exec or spawn. Returns -1 and sets errno if FD could not + be duplicated. */ + +int +dup_cloexec (int fd) +{ + return fcntl (fd, F_DUPFD_CLOEXEC, 0); +} diff --git a/lib/cloexec.h b/lib/cloexec.h new file mode 100644 index 0000000..f14a997 --- /dev/null +++ b/lib/cloexec.h @@ -0,0 +1,38 @@ +/* cloexec.c - set or clear the close-on-exec descriptor flag + + Copyright (C) 2004, 2009-2020 Free Software Foundation, Inc. + + This 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 . + +*/ + +#include + +/* 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. + + Note that on MingW, this function does NOT protect DESC from being + inherited into spawned children. Instead, either use dup_cloexec + followed by closing the original DESC, or use interfaces such as + open or pipe2 that accept flags like O_CLOEXEC to create DESC + non-inheritable in the first place. */ + +int set_cloexec_flag (int desc, bool value); + +/* Duplicates a file handle FD, while marking the copy to be closed + prior to exec or spawn. Returns -1 and sets errno if FD could not + be duplicated. */ + +int dup_cloexec (int fd); diff --git a/lib/close-stream.c b/lib/close-stream.c index 5458c4f..04bc800 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-2019 Free Software Foundation, Inc. + Copyright (C) 1998-2002, 2004, 2006-2020 Free Software Foundation, Inc. This 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/close.c b/lib/close.c index 40ce845..32503c0 100644 --- a/lib/close.c +++ b/lib/close.c @@ -1,5 +1,5 @@ /* close replacement. - Copyright (C) 2008-2019 Free Software Foundation, Inc. + Copyright (C) 2008-2020 Free Software Foundation, Inc. This program is free software: you can redistribute it and/or modify it under the terms of the GNU General Public License as published by @@ -28,7 +28,8 @@ #undef close -#if HAVE_MSVC_INVALID_PARAMETER_HANDLER +#if defined _WIN32 && !defined __CYGWIN__ +# if HAVE_MSVC_INVALID_PARAMETER_HANDLER static int close_nothrow (int fd) { @@ -36,7 +37,7 @@ close_nothrow (int fd) TRY_MSVC_INVAL { - result = close (fd); + result = _close (fd); } CATCH_MSVC_INVAL { @@ -47,6 +48,9 @@ close_nothrow (int fd) return result; } +# else +# define close_nothrow _close +# endif #else # define close_nothrow close #endif diff --git a/lib/closeout.c b/lib/closeout.c index 4a604ec..8b92ce9 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-2019 Free Software Foundation, + Copyright (C) 1998-2002, 2004, 2006, 2008-2020 Free Software Foundation, Inc. This program is free software: you can redistribute it and/or modify diff --git a/lib/closeout.h b/lib/closeout.h index ac89f76..8294c62 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-2019 Free Software + Copyright (C) 1998, 2000, 2003-2004, 2006, 2008-2020 Free Software Foundation, Inc. This program is free software: you can redistribute it and/or modify diff --git a/lib/config.h.in b/lib/config.h.in index d0640d2..124d95b 100644 --- a/lib/config.h.in +++ b/lib/config.h.in @@ -18,17 +18,9 @@ /* Define to the number of bits in type 'wint_t'. */ #undef BITSIZEOF_WINT_T -/* Define to one of `_getb67', `GETB67', `getb67' for Cray-2 and Cray-YMP - systems. This function is required for `alloca.c' support on those systems. - */ -#undef CRAY_STACKSEG_END - -/* Define to 1 if using `alloca.c'. */ +/* Define to 1 if using 'alloca.c'. */ #undef C_ALLOCA -/* Define to 1 if the C locale may have encoding errors. */ -#undef C_LOCALE_MAYBE_EILSEQ - /* Enable assertions, etc. */ #undef DEBUG @@ -73,9 +65,6 @@ and handles trailing slash correctly. */ #undef FUNC_REALPATH_WORKS -/* Define if gettimeofday clobbers the localtime buffer. */ -#undef GETTIMEOFDAY_CLOBBERS_LOCALTIME - /* Define this to 'void' or 'struct timezone' to match the system's declaration of the second argument to gettimeofday. */ #undef GETTIMEOFDAY_TIMEZONE @@ -100,6 +89,10 @@ whether the gnulib module fscanf shall be considered present. */ #undef GNULIB_FSCANF +/* Define to a C preprocessor expression that evaluates to 1 or 0, depending + whether the gnulib module isblank shall be considered present. */ +#undef GNULIB_ISBLANK + /* Define to a C preprocessor expression that evaluates to 1 or 0, depending whether the gnulib module lock shall be considered present. */ #undef GNULIB_LOCK @@ -135,6 +128,10 @@ whether the gnulib module strerror_r-posix shall be considered present. */ #undef GNULIB_STRERROR_R_POSIX +/* Define to a C preprocessor expression that evaluates to 1 or 0, depending + whether the gnulib module tempname shall be considered present. */ +#undef GNULIB_TEMPNAME + /* Define to 1 when the gnulib module accept should be tested. */ #undef GNULIB_TEST_ACCEPT @@ -187,9 +184,15 @@ /* Define to 1 when the gnulib module getdtablesize should be tested. */ #undef GNULIB_TEST_GETDTABLESIZE +/* Define to 1 when the gnulib module getopt-posix should be tested. */ +#undef GNULIB_TEST_GETOPT_POSIX + /* Define to 1 when the gnulib module getpagesize should be tested. */ #undef GNULIB_TEST_GETPAGESIZE +/* Define to 1 when the gnulib module getrandom should be tested. */ +#undef GNULIB_TEST_GETRANDOM + /* Define to 1 when the gnulib module gettimeofday should be tested. */ #undef GNULIB_TEST_GETTIMEOFDAY @@ -277,6 +280,9 @@ /* Define to 1 when the gnulib module setlocale should be tested. */ #undef GNULIB_TEST_SETLOCALE +/* Define to 1 when the gnulib module setlocale_null should be tested. */ +#undef GNULIB_TEST_SETLOCALE_NULL + /* Define to 1 when the gnulib module setsockopt should be tested. */ #undef GNULIB_TEST_SETSOCKOPT @@ -337,6 +343,14 @@ /* Define to 1 when the gnulib module wctomb should be tested. */ #undef GNULIB_TEST_WCTOMB +/* Define to a C preprocessor expression that evaluates to 1 or 0, depending + whether the gnulib module xalloc shall be considered present. */ +#undef GNULIB_XALLOC + +/* Define to a C preprocessor expression that evaluates to 1 or 0, depending + whether the gnulib module xalloc-die shall be considered present. */ +#undef GNULIB_XALLOC_DIE + /* Define to 1 if you have 'alloca' after including , a header that may be supplied by this distribution. */ #undef HAVE_ALLOCA @@ -351,6 +365,9 @@ /* Has backtrace support */ #undef HAVE_BACKTRACE +/* Define to 1 if you have the header file. */ +#undef HAVE_BCRYPT_H + /* Define to 1 if you have the header file. */ #undef HAVE_BLKID_BLKID_H @@ -381,8 +398,11 @@ the CoreFoundation framework. */ #undef HAVE_CFPREFERENCESCOPYAPPVALUE -/* Define to 1 if you have the `chsize' function. */ -#undef HAVE_CHSIZE +/* Define to 1 if you have the `clock_gettime' function. */ +#undef HAVE_CLOCK_GETTIME + +/* Define to 1 if you have the `clock_settime' function. */ +#undef HAVE_CLOCK_SETTIME /* Define to 1 if you have the header file. */ #undef HAVE_CRTDEFS_H @@ -395,6 +415,26 @@ */ #undef HAVE_DECL_ALARM +/* Define to 1 if you have the declaration of `ecvt', and to 0 if you don't. + */ +#undef HAVE_DECL_ECVT + +/* Define to 1 if you have the declaration of `execvpe', and to 0 if you + don't. */ +#undef HAVE_DECL_EXECVPE + +/* Define to 1 if you have the declaration of `fcloseall', and to 0 if you + don't. */ +#undef HAVE_DECL_FCLOSEALL + +/* Define to 1 if you have the declaration of `fcvt', and to 0 if you don't. + */ +#undef HAVE_DECL_FCVT + +/* Define to 1 if you have the declaration of `gcvt', and to 0 if you don't. + */ +#undef HAVE_DECL_GCVT + /* Define to 1 if you have the declaration of `getdtablesize', and to 0 if you don't. */ #undef HAVE_DECL_GETDTABLESIZE @@ -459,6 +499,10 @@ don't. */ #undef HAVE_DECL_WCRTOMB +/* Define to 1 if you have the declaration of `wcsdup', and to 0 if you don't. + */ +#undef HAVE_DECL_WCSDUP + /* Define to 1 if you have the declaration of `wctob', and to 0 if you don't. */ #undef HAVE_DECL_WCTOB @@ -478,9 +522,6 @@ /* Define to 1 if you have the header file. */ #undef HAVE_DLFCN_H -/* Define to 1 if you have the 'dup2' function. */ -#undef HAVE_DUP2 - /* Define to 1 if you have the `duplocale' function. */ #undef HAVE_DUPLOCALE @@ -530,6 +571,9 @@ /* Define to 1 if you have the `getprogname' function. */ #undef HAVE_GETPROGNAME +/* Define to 1 if you have the `getrandom' function. */ +#undef HAVE_GETRANDOM + /* Define if the GNU gettext() function is already present or preinstalled. */ #undef HAVE_GETTEXT @@ -587,6 +631,9 @@ /* have readline */ #undef HAVE_LIBREADLINE +/* Define to 1 if the bcrypt library is guaranteed to be present. */ +#undef HAVE_LIB_BCRYPT + /* Define to 1 if you have the header file. */ #undef HAVE_LIMITS_H @@ -669,6 +716,9 @@ /* Define to 1 if you have the header file. */ #undef HAVE_PRIV_H +/* Define if you have the header and the POSIX threads API. */ +#undef HAVE_PTHREAD_API + /* Define to 1 if you have the `pthread_atfork' function. */ #undef HAVE_PTHREAD_ATFORK @@ -728,6 +778,9 @@ /* Define to 1 if you have the header file. */ #undef HAVE_SCHED_H +/* Define to 1 if you have the header file. */ +#undef HAVE_SDKDDKVER_H + /* Define to 1 if you have the header file. */ #undef HAVE_SEARCH_H @@ -785,9 +838,6 @@ /* Define to 1 if you have the header file. */ #undef HAVE_STDLIB_H -/* Define to 1 if you have the `strdup' function. */ -#undef HAVE_STRDUP - /* Define to 1 if you have the `strerror_r' function. */ #undef HAVE_STRERROR_R @@ -860,9 +910,15 @@ /* Define to 1 if you have the header file. */ #undef HAVE_SYS_PARAM_H +/* Define to 1 if you have the header file. */ +#undef HAVE_SYS_RANDOM_H + /* Define to 1 if you have the header file. */ #undef HAVE_SYS_SELECT_H +/* Define to 1 if you have the header file. */ +#undef HAVE_SYS_SINGLE_THREADED_H + /* Define to 1 if you have the header file. */ #undef HAVE_SYS_SOCKET_H @@ -884,6 +940,9 @@ /* Define to 1 if you have the header file. */ #undef HAVE_TERMCAP_H +/* Define to 1 if you have the `thrd_create' function. */ +#undef HAVE_THRD_CREATE + /* Define to 1 if you have the header file. */ #undef HAVE_THREADS_H @@ -911,6 +970,10 @@ /* Define if you have a global __progname variable */ #undef HAVE_VAR___PROGNAME +/* Define to 1 or 0, depending whether the compiler supports simple visibility + declarations. */ +#undef HAVE_VISIBILITY + /* Define to 1 if you have the header file. */ #undef HAVE_WCHAR_H @@ -926,6 +989,10 @@ /* Define to 1 if you have the header file. */ #undef HAVE_WCTYPE_H +/* Define to 1 if the compiler and linker support weak declarations of + symbols. */ +#undef HAVE_WEAK_SYMBOLS + /* Define to 1 if you have the header file. */ #undef HAVE_WINSOCK2_H @@ -950,6 +1017,9 @@ /* 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 + /* Define to 1 if you have the `_set_invalid_parameter_handler' function. */ #undef HAVE__SET_INVALID_PARAMETER_HANDLER @@ -996,6 +1066,10 @@ */ #undef MBRTOWC_EMPTY_INPUT_BUG +/* Define if the mbrtowc function may signal encoding errors in the C locale. + */ +#undef MBRTOWC_IN_C_LOCALE_MAYBE_EILSEQ + /* Define if the mbrtowc function has the NULL pwc argument bug. */ #undef MBRTOWC_NULL_ARG1_BUG @@ -1008,15 +1082,31 @@ /* Define if the mbrtowc function returns a wrong return value. */ #undef MBRTOWC_RETVAL_BUG +/* Define if the mbrtowc function stores a wide character when reporting + incomplete input. */ +#undef MBRTOWC_STORES_INCOMPLETE_BUG + /* Use GNU style printf and scanf. */ #ifndef __USE_MINGW_ANSI_STDIO # undef __USE_MINGW_ANSI_STDIO #endif +/* Define to 1 on musl libc. */ +#undef MUSL_LIBC + /* Define to 1 if assertions should be disabled. */ #undef NDEBUG +/* Define to 1 to enable general improvements of setlocale. */ +#undef NEED_SETLOCALE_IMPROVED + +/* Define to 1 to enable a multithread-safety fix of setlocale. */ +#undef NEED_SETLOCALE_MTSAFE + +/* Define to 1 if nl_langinfo is multithread-safe. */ +#undef NL_LANGINFO_MTSAFE + /* Define to 1 if open() fails to recognize a trailing slash. */ #undef OPEN_TRAILING_SLASH_BUG @@ -1050,9 +1140,6 @@ /* Define to the version of this package. */ #undef PACKAGE_VERSION -/* Define if exists and defines unusable PRI* macros. */ -#undef PRI_MACROS_BROKEN - /* Define to the type that is the result of default argument promotions of type mode_t. */ #undef PROMOTED_MODE_T @@ -1093,6 +1180,12 @@ /* Define to 1 if strerror(0) does not return a message implying success. */ #undef REPLACE_STRERROR_0 +/* Define to 1 if setlocale (LC_ALL, NULL) is multithread-safe. */ +#undef SETLOCALE_NULL_ALL_MTSAFE + +/* Define to 1 if setlocale (category, NULL) is multithread-safe. */ +#undef SETLOCALE_NULL_ONE_MTSAFE + /* Define to l, ll, u, ul, ull, etc., as suitable for constants of type 'sig_atomic_t'. */ #undef SIG_ATOMIC_T_SUFFIX @@ -1107,9 +1200,9 @@ /* If using the C implementation of alloca, define if you know the direction of stack growth for your system; otherwise it will be automatically deduced at runtime. - STACK_DIRECTION > 0 => grows toward higher addresses - STACK_DIRECTION < 0 => grows toward lower addresses - STACK_DIRECTION = 0 => direction of growth unknown */ + STACK_DIRECTION > 0 => grows toward higher addresses + STACK_DIRECTION < 0 => grows toward lower addresses + STACK_DIRECTION = 0 => direction of growth unknown */ #undef STACK_DIRECTION /* Define to 1 if the `S_IS*' macros in do not work properly. */ @@ -1134,6 +1227,13 @@ /* Define if you have sufficient blkid support. */ #undef USE_BLKID +/* Define if the combination of the ISO C and POSIX multithreading APIs can be + used. */ +#undef USE_ISOC_AND_POSIX_THREADS + +/* Define if the ISO C multithreading library can be used. */ +#undef USE_ISOC_THREADS + /* Define if the POSIX multithreading library can be used. */ #undef USE_POSIX_THREADS @@ -1227,6 +1327,12 @@ 'wchar_t'. */ #undef WCHAR_T_SUFFIX +/* Define if the wcrtomb function does not work in the C locale. */ +#undef WCRTOMB_C_LOCALE_BUG + +/* Define if the wcrtomb function has an incorrect return value. */ +#undef WCRTOMB_RETVAL_BUG + /* Define if WSAStartup is needed. */ #undef WINDOWS_SOCKETS @@ -1246,15 +1352,21 @@ # endif #endif -/* Enable large inode numbers on Mac OS X 10.5. */ -#undef _DARWIN_USE_64_BIT_INODE - /* Number of bits in a file offset, on hosts where this is settable. */ #undef _FILE_OFFSET_BITS /* enable compile-time and run-time bounds-checking, and some warnings */ #undef _FORTIFY_SOURCE +/* True if the compiler says it groks GNU C version MAJOR.MINOR. */ +#if defined __GNUC__ && defined __GNUC_MINOR__ +# define _GL_GNUC_PREREQ(major, minor) \ + ((major) < __GNUC__ + ((minor) <= __GNUC_MINOR__)) +#else +# define _GL_GNUC_PREREQ(major, minor) 0 +#endif + + /* Define for large files, on AIX-style hosts. */ #undef _LARGE_FILES @@ -1271,13 +1383,23 @@ #ifndef _Noreturn # if (defined __cplusplus \ && ((201103 <= __cplusplus && !(__GNUC__ == 4 && __GNUC_MINOR__ == 7)) \ - || (defined _MSC_VER && 1900 <= _MSC_VER))) + || (defined _MSC_VER && 1900 <= _MSC_VER)) \ + && 0) + /* [[noreturn]] is not practically usable, because with it the syntax + extern _Noreturn void func (...); + would not be valid; such a declaration would only be valid with 'extern' + and '_Noreturn' swapped, or without the 'extern' keyword. However, some + AIX system header files and several gnulib header files use precisely + this syntax with 'extern'. */ # define _Noreturn [[noreturn]] # elif ((!defined __cplusplus || defined __clang__) \ && (201112 <= (defined __STDC_VERSION__ ? __STDC_VERSION__ : 0) \ - || 4 < __GNUC__ + (7 <= __GNUC_MINOR__))) + || _GL_GNUC_PREREQ (4, 7) \ + || (defined __apple_build_version__ \ + ? 6000000 <= __apple_build_version__ \ + : 3 < __clang_major__ + (5 <= __clang_minor__)))) /* _Noreturn works as-is. */ -# elif 2 < __GNUC__ + (8 <= __GNUC_MINOR__) || 0x5110 <= __SUNPRO_C +# elif _GL_GNUC_PREREQ (2, 8) || defined __clang__ || 0x5110 <= __SUNPRO_C # define _Noreturn __attribute__ ((__noreturn__)) # elif 1200 <= (defined _MSC_VER ? _MSC_VER : 0) # define _Noreturn __declspec (noreturn) @@ -1298,9 +1420,6 @@ /* Define to 1 if you need to in order for 'stat' and other things to work. */ #undef _POSIX_SOURCE -/* For thread-safety on OSF/1, Solaris. */ -#undef _REENTRANT - /* Define if you want to include , so that it consistently overrides 's RE_DUP_MAX. */ #undef _REGEX_INCLUDE_LIMITS_H @@ -1308,9 +1427,6 @@ /* Define if you want regoff_t to be at least as wide POSIX requires. */ #undef _REGEX_LARGE_OFFSETS -/* For thread-safety on AIX, FreeBSD. */ -#undef _THREAD_SAFE - /* For standard stat data types on VMS. */ #undef _USE_STD_STAT @@ -1329,7 +1445,7 @@ invoked from such signal handlers. Such functions have some restrictions: * All functions that it calls should be marked _GL_ASYNC_SAFE as well, or should be listed as async-signal-safe in POSIX - + section 2.4.3. Note that malloc(), sprintf(), and fwrite(), in particular, are NOT async-signal-safe. * All memory locations (variables and struct fields) that these functions @@ -1351,6 +1467,216 @@ #define _GL_ASYNC_SAFE +/* Attributes. */ +#ifdef __has_attribute +# define _GL_HAS_ATTRIBUTE(attr) __has_attribute (__##attr##__) +#else +# define _GL_HAS_ATTRIBUTE(attr) _GL_ATTR_##attr +# define _GL_ATTR_alloc_size _GL_GNUC_PREREQ (4, 3) +# define _GL_ATTR_always_inline _GL_GNUC_PREREQ (3, 2) +# define _GL_ATTR_artificial _GL_GNUC_PREREQ (4, 3) +# define _GL_ATTR_cold _GL_GNUC_PREREQ (4, 3) +# define _GL_ATTR_const _GL_GNUC_PREREQ (2, 95) +# define _GL_ATTR_deprecated _GL_GNUC_PREREQ (3, 1) +# define _GL_ATTR_diagnose_if 0 +# define _GL_ATTR_error _GL_GNUC_PREREQ (4, 3) +# define _GL_ATTR_externally_visible _GL_GNUC_PREREQ (4, 1) +# define _GL_ATTR_fallthrough _GL_GNUC_PREREQ (7, 0) +# define _GL_ATTR_format _GL_GNUC_PREREQ (2, 7) +# define _GL_ATTR_leaf _GL_GNUC_PREREQ (4, 6) +# ifdef _ICC +# define _GL_ATTR_may_alias 0 +# else +# define _GL_ATTR_may_alias _GL_GNUC_PREREQ (3, 3) +# endif +# define _GL_ATTR_malloc _GL_GNUC_PREREQ (3, 0) +# define _GL_ATTR_noinline _GL_GNUC_PREREQ (3, 1) +# define _GL_ATTR_nonnull _GL_GNUC_PREREQ (3, 3) +# define _GL_ATTR_nonstring _GL_GNUC_PREREQ (8, 0) +# define _GL_ATTR_nothrow _GL_GNUC_PREREQ (3, 3) +# define _GL_ATTR_packed _GL_GNUC_PREREQ (2, 7) +# define _GL_ATTR_pure _GL_GNUC_PREREQ (2, 96) +# define _GL_ATTR_returns_nonnull _GL_GNUC_PREREQ (4, 9) +# define _GL_ATTR_sentinel _GL_GNUC_PREREQ (4, 0) +# define _GL_ATTR_unused _GL_GNUC_PREREQ (2, 7) +# define _GL_ATTR_warn_unused_result _GL_GNUC_PREREQ (3, 4) +#endif + + +#if _GL_HAS_ATTRIBUTE (alloc_size) +# define _GL_ATTRIBUTE_ALLOC_SIZE(args) __attribute__ ((__alloc_size__ args)) +#else +# define _GL_ATTRIBUTE_ALLOC_SIZE(args) +#endif + +#if _GL_HAS_ATTRIBUTE (always_inline) +# define _GL_ATTRIBUTE_ALWAYS_INLINE __attribute__ ((__always_inline__)) +#else +# define _GL_ATTRIBUTE_ALWAYS_INLINE +#endif + +#if _GL_HAS_ATTRIBUTE (artificial) +# define _GL_ATTRIBUTE_ARTIFICIAL __attribute__ ((__artificial__)) +#else +# define _GL_ATTRIBUTE_ARTIFICIAL +#endif + +/* Avoid __attribute__ ((cold)) on MinGW; see thread starting at + . + 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__)) +# else +# define _GL_ATTRIBUTE_COLD __attribute__ ((cold)) +# endif +#else +# define _GL_ATTRIBUTE_COLD +#endif + +#if _GL_HAS_ATTRIBUTE (const) +# define _GL_ATTRIBUTE_CONST __attribute__ ((__const__)) +#else +# define _GL_ATTRIBUTE_CONST +#endif + +#if 201710L < __STDC_VERSION__ +# define _GL_ATTRIBUTE_DEPRECATED [[__deprecated__]] +#elif _GL_HAS_ATTRIBUTE (deprecated) +# define _GL_ATTRIBUTE_DEPRECATED __attribute__ ((__deprecated__)) +#else +# define _GL_ATTRIBUTE_DEPRECATED +#endif + +#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 + +#if _GL_HAS_ATTRIBUTE (externally_visible) +# define _GL_ATTRIBUTE_EXTERNALLY_VISIBLE __attribute__ ((externally_visible)) +#else +# define _GL_ATTRIBUTE_EXTERNALLY_VISIBLE +#endif + +/* FALLTHROUGH is special, because it always expands to something. */ +#if 201710L < __STDC_VERSION__ +# define _GL_ATTRIBUTE_FALLTHROUGH [[__fallthrough__]] +#elif _GL_HAS_ATTRIBUTE (fallthrough) +# define _GL_ATTRIBUTE_FALLTHROUGH __attribute__ ((__fallthrough__)) +#else +# define _GL_ATTRIBUTE_FALLTHROUGH ((void) 0) +#endif + +#if _GL_HAS_ATTRIBUTE (format) +# define _GL_ATTRIBUTE_FORMAT(spec) __attribute__ ((__format__ spec)) +#else +# define _GL_ATTRIBUTE_FORMAT(spec) +#endif + +#if _GL_HAS_ATTRIBUTE (leaf) +# define _GL_ATTRIBUTE_LEAF __attribute__ ((__leaf__)) +#else +# define _GL_ATTRIBUTE_LEAF +#endif + +/* 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 +#endif + +#if 201710L < __STDC_VERSION__ +# define _GL_ATTRIBUTE_MAYBE_UNUSED [[__maybe_unused__]] +#elif _GL_HAS_ATTRIBUTE (unused) +# define _GL_ATTRIBUTE_MAYBE_UNUSED __attribute__ ((__unused__)) +#else +# define _GL_ATTRIBUTE_MAYBE_UNUSED +#endif +/* Earlier spellings of this macro. */ +#define _GL_UNUSED _GL_ATTRIBUTE_MAYBE_UNUSED +#define _UNUSED_PARAMETER_ _GL_ATTRIBUTE_MAYBE_UNUSED + +#if _GL_HAS_ATTRIBUTE (malloc) +# define _GL_ATTRIBUTE_MALLOC __attribute__ ((__malloc__)) +#else +# define _GL_ATTRIBUTE_MALLOC +#endif + +#if 201710L < __STDC_VERSION__ +# 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 +#endif + +#if _GL_HAS_ATTRIBUTE (noinline) +# define _GL_ATTRIBUTE_NOINLINE __attribute__ ((__noinline__)) +#else +# define _GL_ATTRIBUTE_NOINLINE +#endif + +#if _GL_HAS_ATTRIBUTE (nonnull) +# define _GL_ATTRIBUTE_NONNULL(args) __attribute__ ((__nonnull__ args)) +#else +# define _GL_ATTRIBUTE_NONNULL(args) +#endif + +#if _GL_HAS_ATTRIBUTE (nonstring) +# define _GL_ATTRIBUTE_NONSTRING __attribute__ ((__nonstring__)) +#else +# define _GL_ATTRIBUTE_NONSTRING +#endif + +/* There is no _GL_ATTRIBUTE_NORETURN; use _Noreturn instead. */ + +#if _GL_HAS_ATTRIBUTE (nothrow) && !defined __cplusplus +# define _GL_ATTRIBUTE_NOTHROW __attribute__ ((__nothrow__)) +#else +# define _GL_ATTRIBUTE_NOTHROW +#endif + +#if _GL_HAS_ATTRIBUTE (packed) +# define _GL_ATTRIBUTE_PACKED __attribute__ ((__packed__)) +#else +# define _GL_ATTRIBUTE_PACKED +#endif + +#if _GL_HAS_ATTRIBUTE (pure) +# define _GL_ATTRIBUTE_PURE __attribute__ ((__pure__)) +#else +# define _GL_ATTRIBUTE_PURE +#endif + +#if _GL_HAS_ATTRIBUTE (returns_nonnull) +# define _GL_ATTRIBUTE_RETURNS_NONNULL __attribute__ ((__returns_nonnull__)) +#else +# define _GL_ATTRIBUTE_RETURNS_NONNULL +#endif + +#if _GL_HAS_ATTRIBUTE (sentinel) +# define _GL_ATTRIBUTE_SENTINEL(pos) __attribute__ ((__sentinel__ pos)) +#else +# define _GL_ATTRIBUTE_SENTINEL(pos) +#endif + + +/* To support C++ as well as C, use _GL_UNUSED_LABEL with trailing ';'. */ +#if !defined __cplusplus || _GL_GNUC_PREREQ (4, 5) +# define _GL_UNUSED_LABEL _GL_ATTRIBUTE_MAYBE_UNUSED +#else +# define _GL_UNUSED_LABEL +#endif + + /* Define to empty if `const' does not conform to ANSI C. */ #undef const @@ -1378,7 +1704,7 @@ https://lists.gnu.org/r/bug-gnulib/2012-12/msg00023.html DragonFly; see - http://muscles.dragonflybsd.org/bulk/bleeding-edge-potential/latest-per-pkg/ah-tty-0.3.12.log + http://muscles.dragonflybsd.org/bulk/clang-master-potential/20141111_102002/logs/ah-tty-0.3.12.log FreeBSD; see: https://lists.gnu.org/r/bug-gnulib/2014-07/msg00104.html @@ -1486,13 +1812,29 @@ /* Define to a type if does not define. */ #undef mbstate_t +/* _GL_CMP (n1, n2) performs a three-valued comparison on n1 vs. n2, where + n1 and n2 are expressions without side effects, that evaluate to real + numbers (excluding NaN). + It returns + 1 if n1 > n2 + 0 if n1 == n2 + -1 if n1 < n2 + The naïve code (n1 > n2 ? 1 : n1 < n2 ? -1 : 0) produces a conditional + jump with nearly all GCC versions up to GCC 10. + This variant (n1 < n2 ? -1 : n1 > n2) produces a conditional with many + GCC versions up to GCC 9. + The better code (n1 > n2) - (n1 < n2) from Hacker's Delight § 2-9 + avoids conditional jumps in all GCC versions >= 3.4. */ +#define _GL_CMP(n1, n2) (((n1) > (n2)) - ((n1) < (n2))) + + /* Define to `int' if does not define. */ #undef mode_t /* Define to the type of st_nlink in struct stat, or a supertype. */ #undef nlink_t -/* Define to `int' if does not define. */ +/* Define as a signed integer type capable of holding a process identifier. */ #undef pid_t /* Define to rpl_re_comp if the replacement should be used. */ @@ -1544,12 +1886,13 @@ nothing if this is not supported. Do not define if restrict is supported directly. */ #undef restrict -/* Work around a bug in Sun C++: it does not support _Restrict or - __restrict__, even though the corresponding Sun C compiler ends up with - "#define restrict _Restrict" or "#define restrict __restrict__" in the - previous line. Perhaps some future version of Sun C++ will work with - restrict; if so, hopefully it defines __RESTRICT like Sun C does. */ -#if defined __SUNPRO_CC && !defined __RESTRICT +/* Work around a bug in older versions of Sun C++, which did not + #define __restrict__ or support _Restrict or __restrict__ + even though the corresponding Sun C compiler ended up with + "#define restrict _Restrict" or "#define restrict __restrict__" + in the previous line. This workaround can be removed once + we assume Oracle Developer Studio 12.5 (2016) or later. */ +#if defined __SUNPRO_CC && !defined __RESTRICT && !defined __restrict__ # define _Restrict # define __restrict__ #endif @@ -1566,50 +1909,6 @@ /* Define to `int' if doesn't define. */ #undef uid_t -/* Define as a marker that can be attached to declarations that might not - be used. This helps to reduce warnings, such as from - GCC -Wunused-parameter. */ -#if __GNUC__ >= 3 || (__GNUC__ == 2 && __GNUC_MINOR__ >= 7) -# define _GL_UNUSED __attribute__ ((__unused__)) -#else -# define _GL_UNUSED -#endif -/* The name _UNUSED_PARAMETER_ is an earlier spelling, although the name - is a misnomer outside of parameter lists. */ -#define _UNUSED_PARAMETER_ _GL_UNUSED - -/* gcc supports the "unused" attribute on possibly unused labels, and - g++ has since version 4.5. Note to support C++ as well as C, - _GL_UNUSED_LABEL should be used with a trailing ; */ -#if !defined __cplusplus || __GNUC__ > 4 \ - || (__GNUC__ == 4 && __GNUC_MINOR__ >= 5) -# define _GL_UNUSED_LABEL _GL_UNUSED -#else -# define _GL_UNUSED_LABEL -#endif - -/* The __pure__ attribute was added in gcc 2.96. */ -#if __GNUC__ > 2 || (__GNUC__ == 2 && __GNUC_MINOR__ >= 96) -# define _GL_ATTRIBUTE_PURE __attribute__ ((__pure__)) -#else -# define _GL_ATTRIBUTE_PURE /* empty */ -#endif - -/* The __const__ attribute was added in gcc 2.95. */ -#if __GNUC__ > 2 || (__GNUC__ == 2 && __GNUC_MINOR__ >= 95) -# define _GL_ATTRIBUTE_CONST __attribute__ ((__const__)) -#else -# define _GL_ATTRIBUTE_CONST /* empty */ -#endif - -/* The __malloc__ attribute was added in gcc 3. */ -#if 3 <= __GNUC__ -# define _GL_ATTRIBUTE_MALLOC __attribute__ ((__malloc__)) -#else -# define _GL_ATTRIBUTE_MALLOC /* empty */ -#endif - - /* Define to an unsigned 32-bit type if lacks this type. */ #undef useconds_t diff --git a/lib/dirname-lgpl.c b/lib/dirname-lgpl.c index 7cf89d8..27d4374 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-2019 Free Software + Copyright (C) 1990, 1998, 2000-2001, 2003-2006, 2009-2020 Free Software Foundation, Inc. This program is free software: you can redistribute it and/or modify diff --git a/lib/dirname.c b/lib/dirname.c index 1e042a5..dc1997c 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-2019 Free Software + Copyright (C) 1990, 1998, 2000-2001, 2003-2006, 2009-2020 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 5791659..b2a91fd 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-2019 Free Software Foundation, + Copyright (C) 1998, 2001, 2003-2006, 2009-2020 Free Software Foundation, Inc. This program is free software: you can redistribute it and/or modify @@ -21,16 +21,13 @@ # include # include -# include "dosname.h" +# include "filename.h" +# include "basename-lgpl.h" # ifndef DIRECTORY_SEPARATOR # define DIRECTORY_SEPARATOR '/' # endif -# ifndef DOUBLE_SLASH_IS_DISTINCT_ROOT -# define DOUBLE_SLASH_IS_DISTINCT_ROOT 0 -# endif - #ifdef __cplusplus extern "C" { #endif @@ -41,9 +38,7 @@ char *dir_name (char const *file); # endif char *mdir_name (char const *file); -size_t base_len (char const *file) _GL_ATTRIBUTE_PURE; size_t dir_len (char const *file) _GL_ATTRIBUTE_PURE; -char *last_component (char const *file) _GL_ATTRIBUTE_PURE; bool strip_trailing_slashes (char *file); diff --git a/lib/dosname.h b/lib/dosname.h deleted file mode 100644 index c0ab684..0000000 --- a/lib/dosname.h +++ /dev/null @@ -1,52 +0,0 @@ -/* File names on MS-DOS/Windows systems. - - Copyright (C) 2000-2001, 2004-2006, 2009-2019 Free Software Foundation, Inc. - - This program is free software: you can redistribute it and/or modify - it under the terms of the GNU General Public License as published by - 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 . - - From Paul Eggert and Jim Meyering. */ - -#ifndef _DOSNAME_H -#define _DOSNAME_H - -#if (defined _WIN32 || defined __CYGWIN__ \ - || defined __EMX__ || defined __MSDOS__ || defined __DJGPP__) - /* This internal macro assumes ASCII, but all hosts that support drive - letters use ASCII. */ -# define _IS_DRIVE_LETTER(C) (((unsigned int) (C) | ('a' - 'A')) - 'a' \ - <= 'z' - 'a') -# define FILE_SYSTEM_PREFIX_LEN(Filename) \ - (_IS_DRIVE_LETTER ((Filename)[0]) && (Filename)[1] == ':' ? 2 : 0) -# ifndef __CYGWIN__ -# define FILE_SYSTEM_DRIVE_PREFIX_CAN_BE_RELATIVE 1 -# endif -# define ISSLASH(C) ((C) == '/' || (C) == '\\') -#else -# define FILE_SYSTEM_PREFIX_LEN(Filename) 0 -# define ISSLASH(C) ((C) == '/') -#endif - -#ifndef FILE_SYSTEM_DRIVE_PREFIX_CAN_BE_RELATIVE -# define FILE_SYSTEM_DRIVE_PREFIX_CAN_BE_RELATIVE 0 -#endif - -#if FILE_SYSTEM_DRIVE_PREFIX_CAN_BE_RELATIVE -# define IS_ABSOLUTE_FILE_NAME(F) ISSLASH ((F)[FILE_SYSTEM_PREFIX_LEN (F)]) -# else -# define IS_ABSOLUTE_FILE_NAME(F) \ - (ISSLASH ((F)[0]) || FILE_SYSTEM_PREFIX_LEN (F) != 0) -#endif -#define IS_RELATIVE_FILE_NAME(F) (! IS_ABSOLUTE_FILE_NAME (F)) - -#endif /* DOSNAME_H_ */ diff --git a/lib/dup2.c b/lib/dup2.c new file mode 100644 index 0000000..323e19b --- /dev/null +++ b/lib/dup2.c @@ -0,0 +1,189 @@ +/* Duplicate an open file descriptor to a specified file descriptor. + + Copyright (C) 1999, 2004-2007, 2009-2020 Free Software Foundation, Inc. + + This 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 . */ + +/* written by Paul Eggert */ + +#include + +/* Specification. */ +#include + +#include +#include + +#undef dup2 + +#if defined _WIN32 && ! defined __CYGWIN__ + +/* Get declarations of the native Windows API functions. */ +# define WIN32_LEAN_AND_MEAN +# include + +# if HAVE_MSVC_INVALID_PARAMETER_HANDLER +# include "msvc-inval.h" +# endif + +/* Get _get_osfhandle. */ +# if GNULIB_MSVC_NOTHROW +# include "msvc-nothrow.h" +# else +# include +# endif + +# if HAVE_MSVC_INVALID_PARAMETER_HANDLER +static int +dup2_nothrow (int fd, int desired_fd) +{ + int result; + + TRY_MSVC_INVAL + { + result = _dup2 (fd, desired_fd); + } + CATCH_MSVC_INVAL + { + errno = EBADF; + result = -1; + } + DONE_MSVC_INVAL; + + return result; +} +# else +# define dup2_nothrow _dup2 +# endif + +static int +ms_windows_dup2 (int fd, int desired_fd) +{ + int result; + + /* If fd is closed, mingw hangs on dup2 (fd, fd). If fd is open, + dup2 (fd, fd) returns 0, but all further attempts to use fd in + future dup2 calls will hang. */ + if (fd == desired_fd) + { + if ((HANDLE) _get_osfhandle (fd) == INVALID_HANDLE_VALUE) + { + errno = EBADF; + return -1; + } + return fd; + } + + /* Wine 1.0.1 return 0 when desired_fd is negative but not -1: + https://bugs.winehq.org/show_bug.cgi?id=21289 */ + if (desired_fd < 0) + { + errno = EBADF; + return -1; + } + + result = dup2_nothrow (fd, desired_fd); + + if (result == 0) + result = desired_fd; + + return result; +} + +# define dup2 ms_windows_dup2 + +#elif defined __KLIBC__ + +# include + +static int +klibc_dup2dirfd (int fd, int desired_fd) +{ + int tempfd; + int dupfd; + + tempfd = open ("NUL", O_RDONLY); + if (tempfd == -1) + return -1; + + if (tempfd == desired_fd) + { + close (tempfd); + + char path[_MAX_PATH]; + if (__libc_Back_ioFHToPath (fd, path, sizeof (path))) + return -1; + + return open(path, O_RDONLY); + } + + dupfd = klibc_dup2dirfd (fd, desired_fd); + + close (tempfd); + + return dupfd; +} + +static int +klibc_dup2 (int fd, int desired_fd) +{ + int dupfd; + struct stat sbuf; + + dupfd = dup2 (fd, desired_fd); + if (dupfd == -1 && errno == ENOTSUP \ + && !fstat (fd, &sbuf) && S_ISDIR (sbuf.st_mode)) + { + close (desired_fd); + + return klibc_dup2dirfd (fd, desired_fd); + } + + return dupfd; +} + +# define dup2 klibc_dup2 +#endif + +int +rpl_dup2 (int fd, int desired_fd) +{ + int result; + +#ifdef F_GETFL + /* On Linux kernels 2.6.26-2.6.29, dup2 (fd, fd) returns -EBADF. + On Cygwin 1.5.x, dup2 (1, 1) returns 0. + On Cygwin 1.7.17, dup2 (1, -1) dumps core. + On Cygwin 1.7.25, dup2 (1, 256) can dump core. + On Haiku, dup2 (fd, fd) mistakenly clears FD_CLOEXEC. */ +# if HAVE_SETDTABLESIZE + setdtablesize (desired_fd + 1); +# endif + if (desired_fd < 0) + fd = desired_fd; + if (fd == desired_fd) + return fcntl (fd, F_GETFL) == -1 ? -1 : fd; +#endif + + result = dup2 (fd, desired_fd); + + /* Correct an errno value on FreeBSD 6.1 and Cygwin 1.5.x. */ + if (result == -1 && errno == EMFILE) + errno = EBADF; +#if REPLACE_FCHDIR + if (fd != desired_fd && result != -1) + result = _gl_register_dup (fd, result); +#endif + return result; +} diff --git a/lib/errno.in.h b/lib/errno.in.h index 3bd27f1..c27e0c7 100644 --- a/lib/errno.in.h +++ b/lib/errno.in.h @@ -1,6 +1,6 @@ /* A POSIX-like . - Copyright (C) 2008-2019 Free Software Foundation, Inc. + Copyright (C) 2008-2020 Free Software Foundation, Inc. This 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/error.c b/lib/error.c index f8ab668..2fc7901 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-2019 Free Software Foundation, Inc. + Copyright (C) 1990-1998, 2000-2007, 2009-2020 Free Software Foundation, Inc. This file is part of the GNU C Library. This program is free software: you can redistribute it and/or modify @@ -40,7 +40,7 @@ # include # define mbsrtowcs __mbsrtowcs # define USE_UNLOCKED_IO 0 -# define _GL_ATTRIBUTE_FORMAT_PRINTF(a, b) +# define _GL_ATTRIBUTE_FORMAT_PRINTF_STANDARD(a, b) # define _GL_ARG_NONNULL(a) #else # include "getprogname.h" @@ -202,7 +202,7 @@ print_errno_message (int errnum) #endif } -static void _GL_ATTRIBUTE_FORMAT_PRINTF (3, 0) _GL_ARG_NONNULL ((3)) +static void _GL_ATTRIBUTE_FORMAT_PRINTF_STANDARD (3, 0) _GL_ARG_NONNULL ((3)) error_tail (int status, int errnum, const char *message, va_list args) { #if _LIBC diff --git a/lib/error.h b/lib/error.h index 3759f8a..6f6c90e 100644 --- a/lib/error.h +++ b/lib/error.h @@ -1,5 +1,5 @@ /* Declaration for error-reporting function - Copyright (C) 1995-1997, 2003, 2006, 2008-2019 Free Software Foundation, + Copyright (C) 1995-1997, 2003, 2006, 2008-2020 Free Software Foundation, Inc. This file is part of the GNU C Library. @@ -19,27 +19,8 @@ #ifndef _ERROR_H #define _ERROR_H 1 -/* The __attribute__ feature is available in gcc versions 2.5 and later. - The __-protected variants of the attributes 'format' and 'printf' are - accepted by gcc versions 2.6.4 (effectively 2.7) and later. - We enable _GL_ATTRIBUTE_FORMAT only if these are supported too, because - gnulib and libintl do '#define printf __printf__' when they override - the 'printf' function. */ -#if __GNUC__ > 2 || (__GNUC__ == 2 && __GNUC_MINOR__ >= 7) -# define _GL_ATTRIBUTE_FORMAT(spec) __attribute__ ((__format__ spec)) -#else -# define _GL_ATTRIBUTE_FORMAT(spec) /* empty */ -#endif - -/* On mingw, the flavor of printf depends on whether the extensions module - * is in use; the check for determines the witness macro. */ -#ifndef _GL_ATTRIBUTE_SPEC_PRINTF -# if GNULIB_PRINTF_ATTRIBUTE_FLAVOR_GNU -# define _GL_ATTRIBUTE_SPEC_PRINTF __gnu_printf__ -# else -# define _GL_ATTRIBUTE_SPEC_PRINTF __printf__ -# endif -#endif +/* Get _GL_ATTRIBUTE_SPEC_PRINTF_STANDARD, _GL_ATTRIBUTE_SPEC_PRINTF_SYSTEM. */ +#include #ifdef __cplusplus extern "C" { @@ -50,11 +31,21 @@ extern "C" { If STATUS is nonzero, terminate the program with 'exit (STATUS)'. */ extern void error (int __status, int __errnum, const char *__format, ...) - _GL_ATTRIBUTE_FORMAT ((_GL_ATTRIBUTE_SPEC_PRINTF, 3, 4)); +#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, ...) - _GL_ATTRIBUTE_FORMAT ((_GL_ATTRIBUTE_SPEC_PRINTF, 5, 6)); +#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 diff --git a/lib/exitfail.c b/lib/exitfail.c index 69b3513..189fa16 100644 --- a/lib/exitfail.c +++ b/lib/exitfail.c @@ -1,6 +1,6 @@ /* Failure exit status - Copyright (C) 2002-2003, 2005-2007, 2009-2019 Free Software Foundation, Inc. + Copyright (C) 2002-2003, 2005-2007, 2009-2020 Free Software Foundation, Inc. This 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/exitfail.h b/lib/exitfail.h index 480ad1a..a69a03b 100644 --- a/lib/exitfail.h +++ b/lib/exitfail.h @@ -1,6 +1,6 @@ /* Failure exit status - Copyright (C) 2002, 2009-2019 Free Software Foundation, Inc. + Copyright (C) 2002, 2009-2020 Free Software Foundation, Inc. This 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/fcntl.c b/lib/fcntl.c new file mode 100644 index 0000000..59bb3ca --- /dev/null +++ b/lib/fcntl.c @@ -0,0 +1,629 @@ +/* Provide file descriptor control. + + Copyright (C) 2009-2020 Free Software Foundation, Inc. + + This 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 . */ + +/* Written by Eric Blake . */ + +#include + +/* Specification. */ +#include + +#include +#include +#include +#include +#include + +#ifdef __KLIBC__ +# define INCL_DOS +# include +#endif + +#if defined _WIN32 && ! defined __CYGWIN__ +/* Get declarations of the native Windows API functions. */ +# define WIN32_LEAN_AND_MEAN +# include + +/* Get _get_osfhandle. */ +# if GNULIB_MSVC_NOTHROW +# include "msvc-nothrow.h" +# else +# include +# endif + +/* Upper bound on getdtablesize(). See lib/getdtablesize.c. */ +# define OPEN_MAX_MAX 0x10000 + +/* Duplicate OLDFD into the first available slot of at least NEWFD, + which must be positive, with FLAGS determining whether the duplicate + will be inheritable. */ +static int +dupfd (int oldfd, int newfd, int flags) +{ + /* Mingw has no way to create an arbitrary fd. Iterate until all + file descriptors less than newfd are filled up. */ + HANDLE curr_process = GetCurrentProcess (); + HANDLE old_handle = (HANDLE) _get_osfhandle (oldfd); + unsigned char fds_to_close[OPEN_MAX_MAX / CHAR_BIT]; + unsigned int fds_to_close_bound = 0; + int result; + BOOL inherit = flags & O_CLOEXEC ? FALSE : TRUE; + int mode; + + if (newfd < 0 || getdtablesize () <= newfd) + { + errno = EINVAL; + return -1; + } + if (old_handle == INVALID_HANDLE_VALUE + || (mode = _setmode (oldfd, O_BINARY)) == -1) + { + /* oldfd is not open, or is an unassigned standard file + descriptor. */ + errno = EBADF; + return -1; + } + _setmode (oldfd, mode); + flags |= mode; + + for (;;) + { + HANDLE new_handle; + int duplicated_fd; + unsigned int index; + + if (!DuplicateHandle (curr_process, /* SourceProcessHandle */ + old_handle, /* SourceHandle */ + curr_process, /* TargetProcessHandle */ + (PHANDLE) &new_handle, /* TargetHandle */ + (DWORD) 0, /* DesiredAccess */ + inherit, /* InheritHandle */ + DUPLICATE_SAME_ACCESS)) /* Options */ + { + switch (GetLastError ()) + { + case ERROR_TOO_MANY_OPEN_FILES: + errno = EMFILE; + break; + case ERROR_INVALID_HANDLE: + case ERROR_INVALID_TARGET_HANDLE: + case ERROR_DIRECT_ACCESS_HANDLE: + errno = EBADF; + break; + case ERROR_INVALID_PARAMETER: + case ERROR_INVALID_FUNCTION: + case ERROR_INVALID_ACCESS: + errno = EINVAL; + break; + default: + errno = EACCES; + break; + } + result = -1; + break; + } + duplicated_fd = _open_osfhandle ((intptr_t) new_handle, flags); + if (duplicated_fd < 0) + { + CloseHandle (new_handle); + result = -1; + break; + } + if (newfd <= duplicated_fd) + { + result = duplicated_fd; + break; + } + + /* Set the bit duplicated_fd in fds_to_close[]. */ + index = (unsigned int) duplicated_fd / CHAR_BIT; + if (fds_to_close_bound <= index) + { + if (sizeof fds_to_close <= index) + /* Need to increase OPEN_MAX_MAX. */ + abort (); + memset (fds_to_close + fds_to_close_bound, '\0', + index + 1 - fds_to_close_bound); + fds_to_close_bound = index + 1; + } + fds_to_close[index] |= 1 << ((unsigned int) duplicated_fd % CHAR_BIT); + } + + /* Close the previous fds that turned out to be too small. */ + { + int saved_errno = errno; + unsigned int duplicated_fd; + + for (duplicated_fd = 0; + duplicated_fd < fds_to_close_bound * CHAR_BIT; + duplicated_fd++) + if ((fds_to_close[duplicated_fd / CHAR_BIT] + >> (duplicated_fd % CHAR_BIT)) + & 1) + close (duplicated_fd); + + errno = saved_errno; + } + +# if REPLACE_FCHDIR + if (0 <= result) + result = _gl_register_dup (oldfd, result); +# endif + return result; +} +#endif /* W32 */ + +/* Forward declarations, because we '#undef fcntl' in the middle of this + compilation unit. */ +/* Our implementation of fcntl (fd, F_DUPFD, target). */ +static int rpl_fcntl_DUPFD (int fd, int target); +/* Our implementation of fcntl (fd, F_DUPFD_CLOEXEC, target). */ +static int rpl_fcntl_DUPFD_CLOEXEC (int fd, int target); +#ifdef __KLIBC__ +/* Adds support for fcntl on directories. */ +static int klibc_fcntl (int fd, int action, /* arg */...); +#endif + + +/* Perform the specified ACTION on the file descriptor FD, possibly + using the argument ARG further described below. This replacement + handles the following actions, and forwards all others on to the + native fcntl. An unrecognized ACTION returns -1 with errno set to + EINVAL. + + F_DUPFD - duplicate FD, with int ARG being the minimum target fd. + If successful, return the duplicate, which will be inheritable; + otherwise return -1 and set errno. + + F_DUPFD_CLOEXEC - duplicate FD, with int ARG being the minimum + target fd. If successful, return the duplicate, which will not be + inheritable; otherwise return -1 and set errno. + + F_GETFD - ARG need not be present. If successful, return a + non-negative value containing the descriptor flags of FD (only + FD_CLOEXEC is portable, but other flags may be present); otherwise + return -1 and set errno. */ + +int +fcntl (int fd, int action, /* arg */...) +#undef fcntl +#ifdef __KLIBC__ +# define fcntl klibc_fcntl +#endif +{ + va_list arg; + int result = -1; + va_start (arg, action); + switch (action) + { + case F_DUPFD: + { + int target = va_arg (arg, int); + result = rpl_fcntl_DUPFD (fd, target); + break; + } + + case F_DUPFD_CLOEXEC: + { + int target = va_arg (arg, int); + result = rpl_fcntl_DUPFD_CLOEXEC (fd, target); + break; + } + +#if !HAVE_FCNTL + case F_GETFD: + { +# if defined _WIN32 && ! defined __CYGWIN__ + HANDLE handle = (HANDLE) _get_osfhandle (fd); + DWORD flags; + if (handle == INVALID_HANDLE_VALUE + || GetHandleInformation (handle, &flags) == 0) + errno = EBADF; + else + result = (flags & HANDLE_FLAG_INHERIT) ? 0 : FD_CLOEXEC; +# else /* !W32 */ + /* Use dup2 to reject invalid file descriptors. No way to + access this information, so punt. */ + if (0 <= dup2 (fd, fd)) + result = 0; +# endif /* !W32 */ + break; + } /* F_GETFD */ +#endif /* !HAVE_FCNTL */ + + /* Implementing F_SETFD on mingw is not trivial - there is no + API for changing the O_NOINHERIT bit on an fd, and merely + changing the HANDLE_FLAG_INHERIT bit on the underlying handle + can lead to odd state. It may be possible by duplicating the + handle, using _open_osfhandle with the right flags, then + using dup2 to move the duplicate onto the original, but that + is not supported for now. */ + + default: + { +#if HAVE_FCNTL + switch (action) + { + #ifdef F_BARRIERFSYNC /* macOS */ + case F_BARRIERFSYNC: + #endif + #ifdef F_CHKCLEAN /* macOS */ + case F_CHKCLEAN: + #endif + #ifdef F_CLOSEM /* NetBSD, HP-UX */ + case F_CLOSEM: + #endif + #ifdef F_FLUSH_DATA /* macOS */ + case F_FLUSH_DATA: + #endif + #ifdef F_FREEZE_FS /* macOS */ + case F_FREEZE_FS: + #endif + #ifdef F_FULLFSYNC /* macOS */ + case F_FULLFSYNC: + #endif + #ifdef F_GETCONFINED /* macOS */ + case F_GETCONFINED: + #endif + #ifdef F_GETDEFAULTPROTLEVEL /* macOS */ + case F_GETDEFAULTPROTLEVEL: + #endif + #ifdef F_GETFD /* POSIX */ + case F_GETFD: + #endif + #ifdef F_GETFL /* POSIX */ + case F_GETFL: + #endif + #ifdef F_GETLEASE /* Linux */ + case F_GETLEASE: + #endif + #ifdef F_GETNOSIGPIPE /* macOS */ + case F_GETNOSIGPIPE: + #endif + #ifdef F_GETOWN /* POSIX */ + case F_GETOWN: + #endif + #ifdef F_GETPIPE_SZ /* Linux */ + case F_GETPIPE_SZ: + #endif + #ifdef F_GETPROTECTIONCLASS /* macOS */ + case F_GETPROTECTIONCLASS: + #endif + #ifdef F_GETPROTECTIONLEVEL /* macOS */ + case F_GETPROTECTIONLEVEL: + #endif + #ifdef F_GET_SEALS /* Linux */ + case F_GET_SEALS: + #endif + #ifdef F_GETSIG /* Linux */ + case F_GETSIG: + #endif + #ifdef F_MAXFD /* NetBSD */ + case F_MAXFD: + #endif + #ifdef F_RECYCLE /* macOS */ + case F_RECYCLE: + #endif + #ifdef F_SETFIFOENH /* HP-UX */ + case F_SETFIFOENH: + #endif + #ifdef F_THAW_FS /* macOS */ + case F_THAW_FS: + #endif + /* These actions take no argument. */ + result = fcntl (fd, action); + break; + + #ifdef F_ADD_SEALS /* Linux */ + case F_ADD_SEALS: + #endif + #ifdef F_BADFD /* Solaris */ + case F_BADFD: + #endif + #ifdef F_CHECK_OPENEVT /* macOS */ + case F_CHECK_OPENEVT: + #endif + #ifdef F_DUP2FD /* FreeBSD, AIX, Solaris */ + case F_DUP2FD: + #endif + #ifdef F_DUP2FD_CLOEXEC /* FreeBSD, Solaris */ + case F_DUP2FD_CLOEXEC: + #endif + #ifdef F_DUP2FD_CLOFORK /* Solaris */ + case F_DUP2FD_CLOFORK: + #endif + #ifdef F_DUPFD /* POSIX */ + case F_DUPFD: + #endif + #ifdef F_DUPFD_CLOEXEC /* POSIX */ + case F_DUPFD_CLOEXEC: + #endif + #ifdef F_DUPFD_CLOFORK /* Solaris */ + case F_DUPFD_CLOFORK: + #endif + #ifdef F_GETXFL /* Solaris */ + case F_GETXFL: + #endif + #ifdef F_GLOBAL_NOCACHE /* macOS */ + case F_GLOBAL_NOCACHE: + #endif + #ifdef F_MAKECOMPRESSED /* macOS */ + case F_MAKECOMPRESSED: + #endif + #ifdef F_MOVEDATAEXTENTS /* macOS */ + case F_MOVEDATAEXTENTS: + #endif + #ifdef F_NOCACHE /* macOS */ + case F_NOCACHE: + #endif + #ifdef F_NODIRECT /* macOS */ + case F_NODIRECT: + #endif + #ifdef F_NOTIFY /* Linux */ + case F_NOTIFY: + #endif + #ifdef F_OPLKACK /* IRIX */ + case F_OPLKACK: + #endif + #ifdef F_OPLKREG /* IRIX */ + case F_OPLKREG: + #endif + #ifdef F_RDAHEAD /* macOS */ + case F_RDAHEAD: + #endif + #ifdef F_SETBACKINGSTORE /* macOS */ + case F_SETBACKINGSTORE: + #endif + #ifdef F_SETCONFINED /* macOS */ + case F_SETCONFINED: + #endif + #ifdef F_SETFD /* POSIX */ + case F_SETFD: + #endif + #ifdef F_SETFL /* POSIX */ + case F_SETFL: + #endif + #ifdef F_SETLEASE /* Linux */ + case F_SETLEASE: + #endif + #ifdef F_SETNOSIGPIPE /* macOS */ + case F_SETNOSIGPIPE: + #endif + #ifdef F_SETOWN /* POSIX */ + case F_SETOWN: + #endif + #ifdef F_SETPIPE_SZ /* Linux */ + case F_SETPIPE_SZ: + #endif + #ifdef F_SETPROTECTIONCLASS /* macOS */ + case F_SETPROTECTIONCLASS: + #endif + #ifdef F_SETSIG /* Linux */ + case F_SETSIG: + #endif + #ifdef F_SINGLE_WRITER /* macOS */ + case F_SINGLE_WRITER: + #endif + /* These actions take an 'int' argument. */ + { + int x = va_arg (arg, int); + result = fcntl (fd, action, x); + } + break; + + default: + /* Other actions take a pointer argument. */ + { + void *p = va_arg (arg, void *); + result = fcntl (fd, action, p); + } + break; + } +#else + errno = EINVAL; +#endif + break; + } + } + va_end (arg); + return result; +} + +static int +rpl_fcntl_DUPFD (int fd, int target) +{ + int result; +#if !HAVE_FCNTL + result = dupfd (fd, target, 0); +#elif FCNTL_DUPFD_BUGGY || REPLACE_FCHDIR + /* Detect invalid target; needed for cygwin 1.5.x. */ + if (target < 0 || getdtablesize () <= target) + { + result = -1; + errno = EINVAL; + } + else + { + /* Haiku alpha 2 loses fd flags on original. */ + int flags = fcntl (fd, F_GETFD); + if (flags < 0) + result = -1; + else + { + result = fcntl (fd, F_DUPFD, target); + if (0 <= result && fcntl (fd, F_SETFD, flags) == -1) + { + int saved_errno = errno; + close (result); + result = -1; + errno = saved_errno; + } +# if REPLACE_FCHDIR + if (0 <= result) + result = _gl_register_dup (fd, result); +# endif + } + } +#else + result = fcntl (fd, F_DUPFD, target); +#endif + return result; +} + +static int +rpl_fcntl_DUPFD_CLOEXEC (int fd, int target) +{ + int result; +#if !HAVE_FCNTL + result = dupfd (fd, target, O_CLOEXEC); +#else /* HAVE_FCNTL */ +# if defined __NetBSD__ || defined __HAIKU__ + /* On NetBSD 9.0, the system fcntl (fd, F_DUPFD_CLOEXEC, target) + has only the same effect as fcntl (fd, F_DUPFD, target). */ + /* On Haiku, the system fcntl (fd, F_DUPFD_CLOEXEC, target) sets + the FD_CLOEXEC flag on fd, not on target. Therefore avoid the + system fcntl in this case. */ +# define have_dupfd_cloexec -1 +# else + /* Try the system call first, if the headers claim it exists + (that is, if GNULIB_defined_F_DUPFD_CLOEXEC is 0), since we + may be running with a glibc that has the macro but with an + older kernel that does not support it. Cache the + information on whether the system call really works, but + avoid caching failure if the corresponding F_DUPFD fails + for any reason. 0 = unknown, 1 = yes, -1 = no. */ + static int have_dupfd_cloexec = GNULIB_defined_F_DUPFD_CLOEXEC ? -1 : 0; + if (0 <= have_dupfd_cloexec) + { + result = fcntl (fd, F_DUPFD_CLOEXEC, target); + if (0 <= result || errno != EINVAL) + { + have_dupfd_cloexec = 1; +# if REPLACE_FCHDIR + if (0 <= result) + result = _gl_register_dup (fd, result); +# endif + } + else + { + result = rpl_fcntl_DUPFD (fd, target); + if (result >= 0) + have_dupfd_cloexec = -1; + } + } + else +# endif + result = rpl_fcntl_DUPFD (fd, target); + if (0 <= result && have_dupfd_cloexec == -1) + { + int flags = fcntl (result, F_GETFD); + if (flags < 0 || fcntl (result, F_SETFD, flags | FD_CLOEXEC) == -1) + { + int saved_errno = errno; + close (result); + errno = saved_errno; + result = -1; + } + } +#endif /* HAVE_FCNTL */ + return result; +} + +#undef fcntl + +#ifdef __KLIBC__ + +static int +klibc_fcntl (int fd, int action, /* arg */...) +{ + va_list arg_ptr; + int arg; + struct stat sbuf; + int result; + + va_start (arg_ptr, action); + arg = va_arg (arg_ptr, int); + result = fcntl (fd, action, arg); + /* EPERM for F_DUPFD, ENOTSUP for others */ + if (result == -1 && (errno == EPERM || errno == ENOTSUP) + && !fstat (fd, &sbuf) && S_ISDIR (sbuf.st_mode)) + { + ULONG ulMode; + + switch (action) + { + case F_DUPFD: + /* Find available fd */ + while (fcntl (arg, F_GETFL) != -1 || errno != EBADF) + arg++; + + result = dup2 (fd, arg); + break; + + /* Using underlying APIs is right ? */ + case F_GETFD: + if (DosQueryFHState (fd, &ulMode)) + break; + + result = (ulMode & OPEN_FLAGS_NOINHERIT) ? FD_CLOEXEC : 0; + break; + + case F_SETFD: + if (arg & ~FD_CLOEXEC) + break; + + if (DosQueryFHState (fd, &ulMode)) + break; + + if (arg & FD_CLOEXEC) + ulMode |= OPEN_FLAGS_NOINHERIT; + else + ulMode &= ~OPEN_FLAGS_NOINHERIT; + + /* Filter supported flags. */ + ulMode &= (OPEN_FLAGS_WRITE_THROUGH | OPEN_FLAGS_FAIL_ON_ERROR + | OPEN_FLAGS_NO_CACHE | OPEN_FLAGS_NOINHERIT); + + if (DosSetFHState (fd, ulMode)) + break; + + result = 0; + break; + + case F_GETFL: + result = 0; + break; + + case F_SETFL: + if (arg != 0) + break; + + result = 0; + break; + + default: + errno = EINVAL; + break; + } + } + + va_end (arg_ptr); + + return result; +} + +#endif diff --git a/lib/fcntl.in.h b/lib/fcntl.in.h index eb70dc6..11c9aae 100644 --- a/lib/fcntl.in.h +++ b/lib/fcntl.in.h @@ -1,6 +1,6 @@ /* Like , but with non-working flags defined to 0. - Copyright (C) 2006-2019 Free Software Foundation, Inc. + Copyright (C) 2006-2020 Free Software Foundation, Inc. This program is free software: you can redistribute it and/or modify it under the terms of the GNU General Public License as published by @@ -39,6 +39,12 @@ #endif #@INCLUDE_NEXT@ @NEXT_FCNTL_H@ +/* Native Windows platforms declare open(), creat() in . */ +#if (@GNULIB_CREAT@ || @GNULIB_OPEN@ || defined GNULIB_POSIXCHECK) \ + && (defined _WIN32 && ! defined __CYGWIN__) +# include +#endif + #else /* Normal invocation convention. */ @@ -59,6 +65,12 @@ /* The include_next requires a split double-inclusion guard. */ #@INCLUDE_NEXT@ @NEXT_FCNTL_H@ +/* Native Windows platforms declare open(), creat() in . */ +#if (@GNULIB_CREAT@ || @GNULIB_OPEN@ || defined GNULIB_POSIXCHECK) \ + && (defined _WIN32 && ! defined __CYGWIN__) +# include +#endif + #ifndef _@GUARD_PREFIX@_FCNTL_H #define _@GUARD_PREFIX@_FCNTL_H @@ -66,12 +78,6 @@ # include #endif -/* Native Windows platforms declare open(), creat() in . */ -#if (@GNULIB_OPEN@ || defined GNULIB_POSIXCHECK) \ - && (defined _WIN32 && ! defined __CYGWIN__) -# include -#endif - /* The definitions of _GL_FUNCDECL_RPL etc. are copied here. */ @@ -82,6 +88,47 @@ /* Declare overridden functions. */ +#if @GNULIB_CREAT@ +# if @REPLACE_CREAT@ +# if !(defined __cplusplus && defined GNULIB_NAMESPACE) +# undef creat +# define creat rpl_creat +# endif +_GL_FUNCDECL_RPL (creat, int, (const char *filename, mode_t mode) + _GL_ARG_NONNULL ((1))); +_GL_CXXALIAS_RPL (creat, int, (const char *filename, mode_t mode)); +# elif defined _WIN32 && !defined __CYGWIN__ +# if !(defined __cplusplus && defined GNULIB_NAMESPACE) +# undef creat +# define creat _creat +# endif +_GL_CXXALIAS_MDA (creat, int, (const char *filename, mode_t mode)); +# else +_GL_CXXALIAS_SYS (creat, int, (const char *filename, mode_t mode)); +# endif +_GL_CXXALIASWARN (creat); +#elif defined GNULIB_POSIXCHECK +# undef creat +/* Assume creat is always declared. */ +_GL_WARN_ON_USE (creat, "creat is not always POSIX compliant - " + "use gnulib module creat for portability"); +#else +/* On native Windows, map 'creat' to '_creat', so that -loldnames is not + required. In C++ with GNULIB_NAMESPACE, avoid differences between + platforms by defining GNULIB_NAMESPACE::creat always. */ +# if defined _WIN32 && !defined __CYGWIN__ +# if !(defined __cplusplus && defined GNULIB_NAMESPACE) +# undef creat +# define creat _creat +# endif +/* Need to cast, because in mingw the last argument is 'int mode'. */ +_GL_CXXALIAS_MDA_CAST (creat, int, (const char *filename, mode_t mode)); +# else +_GL_CXXALIAS_SYS (creat, int, (const char *filename, mode_t mode)); +# endif +_GL_CXXALIASWARN (creat); +#endif + #if @GNULIB_FCNTL@ # if @REPLACE_FCNTL@ # if !(defined __cplusplus && defined GNULIB_NAMESPACE) @@ -90,9 +137,15 @@ # endif _GL_FUNCDECL_RPL (fcntl, int, (int fd, int action, ...)); _GL_CXXALIAS_RPL (fcntl, int, (int fd, int action, ...)); +# if !GNULIB_defined_rpl_fcntl +# define GNULIB_defined_rpl_fcntl 1 +# endif # else # if !@HAVE_FCNTL@ _GL_FUNCDECL_SYS (fcntl, int, (int fd, int action, ...)); +# if !GNULIB_defined_fcntl +# define GNULIB_defined_fcntl 1 +# endif # endif _GL_CXXALIAS_SYS (fcntl, int, (int fd, int action, ...)); # endif @@ -114,6 +167,12 @@ _GL_WARN_ON_USE (fcntl, "fcntl is not always POSIX compliant - " _GL_FUNCDECL_RPL (open, int, (const char *filename, int flags, ...) _GL_ARG_NONNULL ((1))); _GL_CXXALIAS_RPL (open, int, (const char *filename, int flags, ...)); +# elif defined _WIN32 && !defined __CYGWIN__ +# if !(defined __cplusplus && defined GNULIB_NAMESPACE) +# undef open +# define open _open +# endif +_GL_CXXALIAS_MDA (open, int, (const char *filename, int flags, ...)); # else _GL_CXXALIAS_SYS (open, int, (const char *filename, int flags, ...)); # endif @@ -127,6 +186,22 @@ _GL_CXXALIASWARN (open); /* Assume open is always declared. */ _GL_WARN_ON_USE (open, "open is not always POSIX compliant - " "use gnulib module open for portability"); +#else +/* On native Windows, map 'open' to '_open', so that -loldnames is not + required. In C++ with GNULIB_NAMESPACE, avoid differences between + platforms by defining GNULIB_NAMESPACE::open always. */ +# if defined _WIN32 && !defined __CYGWIN__ +# if !(defined __cplusplus && defined GNULIB_NAMESPACE) +# undef open +# define open _open +# endif +_GL_CXXALIAS_MDA (open, int, (const char *filename, int flags, ...)); +# else +_GL_CXXALIAS_SYS (open, int, (const char *filename, int flags, ...)); +# endif +# if !defined __hpux +_GL_CXXALIASWARN (open); +# endif #endif #if @GNULIB_OPENAT@ diff --git a/lib/fd-hook.c b/lib/fd-hook.c index 7879119..8840f63 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-2019 Free Software Foundation, Inc. + Copyright (C) 2009-2020 Free Software Foundation, Inc. Written by Bruno Haible , 2009. This program is free software: you can redistribute it and/or modify it diff --git a/lib/fd-hook.h b/lib/fd-hook.h index bf07f00..ed1a15a 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-2019 Free Software Foundation, Inc. + Copyright (C) 2009-2020 Free Software Foundation, Inc. This program is free software: you can redistribute it and/or modify it under the terms of the GNU General Public License as published diff --git a/lib/filename.h b/lib/filename.h index 3ba3105..4598fb1 100644 --- a/lib/filename.h +++ b/lib/filename.h @@ -1,5 +1,5 @@ /* Basic filename support macros. - Copyright (C) 2001-2004, 2007-2019 Free Software Foundation, Inc. + Copyright (C) 2001-2004, 2007-2020 Free Software Foundation, Inc. This program is free software: you can redistribute it and/or modify it under the terms of the GNU General Public License as published by @@ -14,38 +14,94 @@ You should have received a copy of the GNU General Public License along with this program. If not, see . */ +/* From Paul Eggert and Jim Meyering. */ + #ifndef _FILENAME_H #define _FILENAME_H +#include + #ifdef __cplusplus extern "C" { #endif -/* Pathname support. - ISSLASH(C) tests whether C is a directory separator character. - IS_ABSOLUTE_PATH(P) tests whether P is an absolute path. If it is not, - it may be concatenated to a directory pathname. - IS_PATH_WITH_DIR(P) tests whether P contains a directory specification. +/* Filename support. + ISSLASH(C) tests whether C is a directory separator + character. + HAS_DEVICE(Filename) tests whether Filename contains a device + specification. + FILE_SYSTEM_PREFIX_LEN(Filename) length of the device specification + at the beginning of Filename, + index of the part consisting of + alternating components and slashes. + FILE_SYSTEM_DRIVE_PREFIX_CAN_BE_RELATIVE + 1 when a non-empty device specification + can be followed by an empty or relative + part, + 0 when a non-empty device specification + must be followed by a slash, + 0 when device specification don't exist. + IS_ABSOLUTE_FILE_NAME(Filename) + tests whether Filename is independent of + any notion of "current directory". + IS_RELATIVE_FILE_NAME(Filename) + tests whether Filename may be concatenated + to a directory filename. + Note: On native Windows, OS/2, DOS, "c:" is neither an absolute nor a + relative file name! + IS_FILE_NAME_WITH_DIR(Filename) tests whether Filename contains a device + or directory specification. */ -#if defined _WIN32 || defined __CYGWIN__ || defined __EMX__ || defined __DJGPP__ +#if defined _WIN32 || defined __CYGWIN__ \ + || defined __EMX__ || defined __MSDOS__ || defined __DJGPP__ /* Native Windows, Cygwin, OS/2, DOS */ # define ISSLASH(C) ((C) == '/' || (C) == '\\') -# define HAS_DEVICE(P) \ - ((((P)[0] >= 'A' && (P)[0] <= 'Z') || ((P)[0] >= 'a' && (P)[0] <= 'z')) \ - && (P)[1] == ':') -# define IS_ABSOLUTE_PATH(P) (ISSLASH ((P)[0]) || HAS_DEVICE (P)) -# define IS_PATH_WITH_DIR(P) \ - (strchr (P, '/') != NULL || strchr (P, '\\') != NULL || HAS_DEVICE (P)) -# define FILE_SYSTEM_PREFIX_LEN(P) (HAS_DEVICE (P) ? 2 : 0) + /* Internal macro: Tests whether a character is a drive letter. */ +# define _IS_DRIVE_LETTER(C) \ + (((C) >= 'A' && (C) <= 'Z') || ((C) >= 'a' && (C) <= 'z')) + /* Help the compiler optimizing it. This assumes ASCII. */ +# undef _IS_DRIVE_LETTER +# define _IS_DRIVE_LETTER(C) \ + (((unsigned int) (C) | ('a' - 'A')) - 'a' <= 'z' - 'a') +# define HAS_DEVICE(Filename) \ + (_IS_DRIVE_LETTER ((Filename)[0]) && (Filename)[1] == ':') +# define FILE_SYSTEM_PREFIX_LEN(Filename) (HAS_DEVICE (Filename) ? 2 : 0) +# ifdef __CYGWIN__ +# define FILE_SYSTEM_DRIVE_PREFIX_CAN_BE_RELATIVE 0 +# else + /* On native Windows, OS/2, DOS, the system has the notion of a + "current directory" on each drive. */ +# define FILE_SYSTEM_DRIVE_PREFIX_CAN_BE_RELATIVE 1 +# endif +# if FILE_SYSTEM_DRIVE_PREFIX_CAN_BE_RELATIVE +# define IS_ABSOLUTE_FILE_NAME(Filename) \ + ISSLASH ((Filename)[FILE_SYSTEM_PREFIX_LEN (Filename)]) +# else +# define IS_ABSOLUTE_FILE_NAME(Filename) \ + (ISSLASH ((Filename)[0]) || HAS_DEVICE (Filename)) +# endif +# define IS_RELATIVE_FILE_NAME(Filename) \ + (! (ISSLASH ((Filename)[0]) || HAS_DEVICE (Filename))) +# define IS_FILE_NAME_WITH_DIR(Filename) \ + (strchr ((Filename), '/') != NULL || strchr ((Filename), '\\') != NULL \ + || HAS_DEVICE (Filename)) #else /* Unix */ # define ISSLASH(C) ((C) == '/') -# define IS_ABSOLUTE_PATH(P) ISSLASH ((P)[0]) -# define IS_PATH_WITH_DIR(P) (strchr (P, '/') != NULL) -# define FILE_SYSTEM_PREFIX_LEN(P) 0 +# define HAS_DEVICE(Filename) ((void) (Filename), 0) +# define FILE_SYSTEM_PREFIX_LEN(Filename) ((void) (Filename), 0) +# define FILE_SYSTEM_DRIVE_PREFIX_CAN_BE_RELATIVE 0 +# define IS_ABSOLUTE_FILE_NAME(Filename) ISSLASH ((Filename)[0]) +# define IS_RELATIVE_FILE_NAME(Filename) (! ISSLASH ((Filename)[0])) +# define IS_FILE_NAME_WITH_DIR(Filename) (strchr ((Filename), '/') != NULL) #endif +/* Deprecated macros. For backward compatibility with old users of the + 'filename' module. */ +#define IS_ABSOLUTE_PATH IS_ABSOLUTE_FILE_NAME +#define IS_PATH_WITH_DIR IS_FILE_NAME_WITH_DIR + #ifdef __cplusplus } diff --git a/lib/fpending.c b/lib/fpending.c index 3c01285..836a3a9 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-2019 Free Software Foundation, + Copyright (C) 2000, 2004, 2006-2007, 2009-2020 Free Software Foundation, Inc. This program is free software: you can redistribute it and/or modify @@ -25,7 +25,8 @@ #include "stdio-impl.h" /* This file is not used on systems that already have the __fpending function, - namely glibc >= 2.2, Solaris >= 7, Android API >= 23. */ + namely glibc >= 2.2, Solaris >= 7, UnixWare >= 7.1.4.MP4, Cygwin >= 1.7.34, + Android API >= 23. */ /* Return the number of pending (aka buffered, unflushed) bytes on the stream, FP, that is open for writing. */ @@ -39,13 +40,13 @@ __fpending (FILE *fp) /* GNU libc, BeOS, Haiku, Linux libc5 */ return fp->_IO_write_ptr - fp->_IO_write_base; #elif defined __sferror || defined __DragonFly__ || defined __ANDROID__ - /* FreeBSD, NetBSD, OpenBSD, DragonFly, Mac OS X, Cygwin, Minix 3, Android */ + /* FreeBSD, NetBSD, OpenBSD, DragonFly, Mac OS X, Cygwin < 1.7.34, Minix 3, Android */ return fp->_p - fp->_bf._base; #elif defined __EMX__ /* emx+gcc */ return fp->_ptr - fp->_buffer; #elif defined __minix /* Minix */ return fp_->_ptr - fp_->_buf; -#elif defined _IOERR /* AIX, HP-UX, IRIX, OSF/1, Solaris, OpenServer, mingw, MSVC, NonStop Kernel, OpenVMS */ +#elif defined _IOERR /* AIX, HP-UX, IRIX, OSF/1, Solaris, OpenServer, UnixWare, mingw, MSVC, NonStop Kernel, OpenVMS */ return (fp_->_ptr ? fp_->_ptr - fp_->_base : 0); #elif defined __UCLIBC__ /* uClibc */ return (fp->__modeflags & __FLAG_WRITING ? fp->__bufpos - fp->__bufstart : 0); diff --git a/lib/fpending.h b/lib/fpending.h index 097a3ef..a8b8859 100644 --- a/lib/fpending.h +++ b/lib/fpending.h @@ -1,6 +1,6 @@ /* Declare __fpending. - Copyright (C) 2000, 2003, 2005-2006, 2009-2019 Free Software Foundation, + Copyright (C) 2000, 2003, 2005-2006, 2009-2020 Free Software Foundation, Inc. This program is free software: you can redistribute it and/or modify diff --git a/lib/fstat.c b/lib/fstat.c index a892b8f..235014a 100644 --- a/lib/fstat.c +++ b/lib/fstat.c @@ -1,5 +1,5 @@ /* fstat() replacement. - Copyright (C) 2011-2019 Free Software Foundation, Inc. + Copyright (C) 2011-2020 Free Software Foundation, Inc. This 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/fsync.c b/lib/fsync.c index bfb6d28..2298aad 100644 --- a/lib/fsync.c +++ b/lib/fsync.c @@ -7,7 +7,7 @@ Written by Richard W.M. Jones - Copyright (C) 2008-2019 Free Software Foundation, Inc. + Copyright (C) 2008-2020 Free Software Foundation, Inc. This library is free software; you can redistribute it and/or modify it under the terms of the GNU General Public diff --git a/lib/getdtablesize.c b/lib/getdtablesize.c new file mode 100644 index 0000000..0fe7092 --- /dev/null +++ b/lib/getdtablesize.c @@ -0,0 +1,124 @@ +/* getdtablesize() function: Return maximum possible file descriptor value + 1. + Copyright (C) 2008-2020 Free Software Foundation, Inc. + Written by Bruno Haible , 2008. + + This 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 . */ + +#include + +/* Specification. */ +#include + +#if defined _WIN32 && ! defined __CYGWIN__ + +# include + +# if HAVE_MSVC_INVALID_PARAMETER_HANDLER +# include "msvc-inval.h" +# endif + +# if HAVE_MSVC_INVALID_PARAMETER_HANDLER +static int +_setmaxstdio_nothrow (int newmax) +{ + int result; + + TRY_MSVC_INVAL + { + result = _setmaxstdio (newmax); + } + CATCH_MSVC_INVAL + { + result = -1; + } + DONE_MSVC_INVAL; + + return result; +} +# else +# define _setmaxstdio_nothrow _setmaxstdio +# endif + +/* Cache for the previous getdtablesize () result. Safe to cache because + Windows also lacks setrlimit. */ +static int dtablesize; + +int +getdtablesize (void) +{ + if (dtablesize == 0) + { + /* We are looking for the number N such that the valid file descriptors + are 0..N-1. It can be obtained through a loop as follows: + { + int fd; + for (fd = 3; fd < 65536; fd++) + if (dup2 (0, fd) == -1) + break; + return fd; + } + On Windows XP, the result is 2048. + The drawback of this loop is that it allocates memory for a libc + internal array that is never freed. + + The number N can also be obtained as the upper bound for + _getmaxstdio (). _getmaxstdio () returns the maximum number of open + FILE objects. The sanity check in _setmaxstdio reveals the maximum + number of file descriptors. This too allocates memory, but it is + freed when we call _setmaxstdio with the original value. */ + int orig_max_stdio = _getmaxstdio (); + unsigned int bound; + for (bound = 0x10000; _setmaxstdio_nothrow (bound) < 0; bound = bound / 2) + ; + _setmaxstdio_nothrow (orig_max_stdio); + dtablesize = bound; + } + return dtablesize; +} + +#else + +# include +# include + +# ifndef RLIM_SAVED_CUR +# define RLIM_SAVED_CUR RLIM_INFINITY +# endif +# ifndef RLIM_SAVED_MAX +# define RLIM_SAVED_MAX RLIM_INFINITY +# endif + +# ifdef __CYGWIN__ + /* Cygwin 1.7.25 auto-increases the RLIMIT_NOFILE soft limit until it + hits the compile-time constant hard limit of 3200. We might as + well just report the hard limit. */ +# define rlim_cur rlim_max +# endif + +int +getdtablesize (void) +{ + struct rlimit lim; + + if (getrlimit (RLIMIT_NOFILE, &lim) == 0 + && 0 <= lim.rlim_cur && lim.rlim_cur <= INT_MAX + && lim.rlim_cur != RLIM_INFINITY + && lim.rlim_cur != RLIM_SAVED_CUR + && lim.rlim_cur != RLIM_SAVED_MAX) + return lim.rlim_cur; + + return INT_MAX; +} + +#endif diff --git a/lib/getopt-cdefs.in.h b/lib/getopt-cdefs.in.h index 049145b..674838c 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-2019 Free Software Foundation, Inc. + Copyright (C) 1989-2020 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. @@ -57,7 +57,7 @@ #endif #ifndef __THROW -# if defined __cplusplus && __GNUC_PREREQ (2,8) +# if defined __cplusplus && (__GNUC_PREREQ (2,8) || __clang_major__ >= 4) # define __THROW throw () # else # define __THROW diff --git a/lib/getopt-core.h b/lib/getopt-core.h index 6360ad6..d4d942e 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-2019 Free Software Foundation, Inc. + Copyright (C) 1989-2020 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 13cb007..05f7083 100644 --- a/lib/getopt-ext.h +++ b/lib/getopt-ext.h @@ -1,5 +1,5 @@ /* Declarations for getopt (GNU extensions). - Copyright (C) 1989-2019 Free Software Foundation, Inc. + Copyright (C) 1989-2020 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 8fac269..ec545c1 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-2019 Free Software Foundation, Inc. + Copyright (C) 1989-2020 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. @@ -48,6 +48,14 @@ # define optind __GETOPT_ID (optind) # define optopt __GETOPT_ID (optopt) +/* Work around a a problem on macOS, which declares getopt with a + trailing __DARWIN_ALIAS(getopt) that would expand to something like + __asm("_" "rpl_getopt" "$UNIX2003") were it not for the following + hack to suppress the macOS declaration . */ +# ifdef __APPLE__ +# define _GETOPT +# endif + /* The system's getopt.h may have already included getopt-core.h to declare the unprefixed identifiers. Undef _GETOPT_CORE_H so that getopt-core.h declares them with prefixes. */ diff --git a/lib/getopt-pfx-ext.h b/lib/getopt-pfx-ext.h index 0e21aef..647fae6 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-2019 Free Software Foundation, Inc. + Copyright (C) 1989-2020 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 8ee075a..a6389d8 100644 --- a/lib/getopt.c +++ b/lib/getopt.c @@ -1,5 +1,5 @@ /* Getopt for GNU. - Copyright (C) 1987-2019 Free Software Foundation, Inc. + Copyright (C) 1987-2020 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 c77f34c..36e04bb 100644 --- a/lib/getopt.in.h +++ b/lib/getopt.in.h @@ -1,5 +1,5 @@ /* Declarations for getopt. - Copyright (C) 1989-2019 Free Software Foundation, Inc. + Copyright (C) 1989-2020 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 883aa6b..0902efe 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-2019 Free Software Foundation, Inc. + Copyright (C) 1987-2020 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 e63706f..afcd8a6 100644 --- a/lib/getopt_int.h +++ b/lib/getopt_int.h @@ -1,5 +1,5 @@ /* Internal declarations for getopt. - Copyright (C) 1989-2019 Free Software Foundation, Inc. + Copyright (C) 1989-2020 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 22d71eb..7199fbd 100644 --- a/lib/getprogname.c +++ b/lib/getprogname.c @@ -1,5 +1,5 @@ /* Program name management. - Copyright (C) 2016-2019 Free Software Foundation, Inc. + Copyright (C) 2016-2020 Free Software Foundation, Inc. This program is free software: you can redistribute it and/or modify it under the terms of the GNU General Public License as published by @@ -51,7 +51,13 @@ # include #endif -#include "dirname.h" +#if defined __SCO_VERSION__ || defined __sysv5__ +# include +# include +# include +#endif + +#include "basename-lgpl.h" #ifndef HAVE_GETPROGNAME /* not Mac OS X, FreeBSD, NetBSD, OpenBSD >= 5.4, Cygwin */ char const * @@ -223,7 +229,7 @@ getprogname (void) int fd; sprintf (filename, "/proc/pinfo/%d", (int) getpid ()); - fd = open (filename, O_RDONLY); + fd = open (filename, O_RDONLY | O_CLOEXEC); if (0 <= fd) { prpsinfo_t buf; @@ -233,17 +239,50 @@ getprogname (void) { char *name = buf.pr_fname; size_t namesize = sizeof buf.pr_fname; + /* It may not be NUL-terminated. */ char *namenul = memchr (name, '\0', namesize); size_t namelen = namenul ? namenul - name : namesize; char *namecopy = malloc (namelen + 1); if (namecopy) { - namecopy[namelen] = 0; + namecopy[namelen] = '\0'; return memcpy (namecopy, name, namelen); } } } return NULL; +# elif defined __SCO_VERSION__ || defined __sysv5__ /* SCO OpenServer6/UnixWare */ + char buf[80]; + int fd; + sprintf (buf, "/proc/%d/cmdline", getpid()); + fd = open (buf, O_RDONLY); + if (0 <= fd) + { + size_t n = read (fd, buf, 79); + if (n > 0) + { + buf[n] = '\0'; /* Guarantee null-termination */ + char *progname; + progname = strrchr (buf, '/'); + if (progname) + { + progname = progname + 1; /* Skip the '/' */ + } + else + { + progname = buf; + } + char *ret; + ret = malloc (strlen (progname) + 1); + if (ret) + { + strcpy (ret, progname); + return ret; + } + } + close (fd); + } + return "?"; # else # error "getprogname module not ported to this OS" # endif diff --git a/lib/getprogname.h b/lib/getprogname.h index 1590b38..676912b 100644 --- a/lib/getprogname.h +++ b/lib/getprogname.h @@ -1,5 +1,5 @@ /* Program name management. - Copyright (C) 2016-2019 Free Software Foundation, Inc. + Copyright (C) 2016-2020 Free Software Foundation, Inc. This 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/getrandom.c b/lib/getrandom.c new file mode 100644 index 0000000..f8695ab --- /dev/null +++ b/lib/getrandom.c @@ -0,0 +1,187 @@ +/* Obtain a series of random bytes. + + Copyright 2020 Free Software Foundation, Inc. + + This 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 . */ + +/* Written by Paul Eggert. */ + +#include + +#include + +#include +#include +#include +#include + +#if defined _WIN32 && ! defined __CYGWIN__ +# define WIN32_LEAN_AND_MEAN +# include +# if HAVE_BCRYPT_H +# include +# else +# define NTSTATUS LONG +typedef void * BCRYPT_ALG_HANDLE; +# define BCRYPT_USE_SYSTEM_PREFERRED_RNG 0x00000002 +# if HAVE_LIB_BCRYPT +extern NTSTATUS WINAPI BCryptGenRandom (BCRYPT_ALG_HANDLE, UCHAR *, ULONG, ULONG); +# endif +# endif +# if !HAVE_LIB_BCRYPT +# include +# ifndef CRYPT_VERIFY_CONTEXT +# define CRYPT_VERIFY_CONTEXT 0xF0000000 +# endif +# endif +#endif + +#include "minmax.h" + +#if defined _WIN32 && ! defined __CYGWIN__ + +/* Don't assume that UNICODE is not defined. */ +# undef LoadLibrary +# define LoadLibrary LoadLibraryA +# undef CryptAcquireContext +# define CryptAcquireContext CryptAcquireContextA + +# if !HAVE_LIB_BCRYPT + +/* Avoid warnings from gcc -Wcast-function-type. */ +# define GetProcAddress \ + (void *) GetProcAddress + +/* BCryptGenRandom with the BCRYPT_USE_SYSTEM_PREFERRED_RNG flag works only + starting with Windows 7. */ +typedef NTSTATUS (WINAPI * BCryptGenRandomFuncType) (BCRYPT_ALG_HANDLE, UCHAR *, ULONG, ULONG); +static BCryptGenRandomFuncType BCryptGenRandomFunc = NULL; +static BOOL initialized = FALSE; + +static void +initialize (void) +{ + HMODULE bcrypt = LoadLibrary ("bcrypt.dll"); + if (bcrypt != NULL) + { + BCryptGenRandomFunc = + (BCryptGenRandomFuncType) GetProcAddress (bcrypt, "BCryptGenRandom"); + } + initialized = TRUE; +} + +# else + +# define BCryptGenRandomFunc BCryptGenRandom + +# endif + +#else +/* These devices exist on all platforms except native Windows. */ + +/* Name of a device through which the kernel returns high quality random + numbers, from an entropy pool. When the pool is empty, the call blocks + until entropy sources have added enough bits of entropy. */ +# ifndef NAME_OF_RANDOM_DEVICE +# define NAME_OF_RANDOM_DEVICE "/dev/random" +# endif + +/* Name of a device through which the kernel returns random or pseudo-random + numbers. It uses an entropy pool, but, in order to avoid blocking, adds + bits generated by a pseudo-random number generator, as needed. */ +# ifndef NAME_OF_NONCE_DEVICE +# define NAME_OF_NONCE_DEVICE "/dev/urandom" +# endif + +#endif + +/* Set BUFFER (of size LENGTH) to random bytes under the control of FLAGS. + Return the number of bytes written (> 0). + Upon error, return -1 and set errno. */ +ssize_t +getrandom (void *buffer, size_t length, unsigned int flags) +#undef getrandom +{ +#if defined _WIN32 && ! defined __CYGWIN__ + /* BCryptGenRandom, defined in + + with the BCRYPT_USE_SYSTEM_PREFERRED_RNG flag + works in Windows 7 and newer. */ + static int bcrypt_not_working /* = 0 */; + if (!bcrypt_not_working) + { +# if !HAVE_LIB_BCRYPT + if (!initialized) + initialize (); +# endif + if (BCryptGenRandomFunc != NULL + && BCryptGenRandomFunc (NULL, buffer, length, + BCRYPT_USE_SYSTEM_PREFERRED_RNG) + == 0 /*STATUS_SUCCESS*/) + return length; + bcrypt_not_working = 1; + } +# if !HAVE_LIB_BCRYPT + /* CryptGenRandom, defined in + + works in older releases as well, but is now deprecated. + CryptAcquireContext, defined in + */ + { + static int crypt_initialized /* = 0 */; + static HCRYPTPROV provider; + if (!crypt_initialized) + { + if (CryptAcquireContext (&provider, NULL, NULL, PROV_RSA_FULL, + CRYPT_VERIFY_CONTEXT)) + crypt_initialized = 1; + else + crypt_initialized = -1; + } + if (crypt_initialized >= 0) + { + if (!CryptGenRandom (provider, length, buffer)) + { + errno = EIO; + return -1; + } + return length; + } + } +# endif + errno = ENOSYS; + return -1; +#elif HAVE_GETRANDOM + return getrandom (buffer, length, flags); +#else + static int randfd[2] = { -1, -1 }; + bool devrandom = (flags & GRND_RANDOM) != 0; + int fd = randfd[devrandom]; + + if (fd < 0) + { + static char const randdevice[][MAX (sizeof NAME_OF_NONCE_DEVICE, + sizeof NAME_OF_RANDOM_DEVICE)] + = { NAME_OF_NONCE_DEVICE, NAME_OF_RANDOM_DEVICE }; + int oflags = (O_RDONLY + O_CLOEXEC + + (flags & GRND_NONBLOCK ? O_NONBLOCK : 0)); + fd = open (randdevice[devrandom], oflags); + if (fd < 0) + return fd; + randfd[devrandom] = fd; + } + + return read (fd, buffer, length); +#endif +} diff --git a/lib/gettext.h b/lib/gettext.h index c7c0fdb..0bd1e13 100644 --- a/lib/gettext.h +++ b/lib/gettext.h @@ -1,5 +1,5 @@ /* Convenience header for conditional use of GNU . - Copyright (C) 1995-1998, 2000-2002, 2004-2006, 2009-2019 Free Software + Copyright (C) 1995-1998, 2000-2002, 2004-2006, 2009-2020 Free Software Foundation, Inc. This program is free software; you can redistribute it and/or modify diff --git a/lib/gettimeofday.c b/lib/gettimeofday.c deleted file mode 100644 index e728bf4..0000000 --- a/lib/gettimeofday.c +++ /dev/null @@ -1,150 +0,0 @@ -/* Provide gettimeofday for systems that don't have it or for which it's broken. - - Copyright (C) 2001-2003, 2005-2007, 2009-2019 Free Software Foundation, Inc. - - This program is free software; you can redistribute it and/or modify - it under the terms of the GNU General Public License as published by - the Free Software Foundation; either version 3, or (at your option) - any later version. - - This program is distributed in the hope that it will be useful, - but WITHOUT ANY WARRANTY; without even the implied warranty of - MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - GNU General Public License for more details. - - You should have received a copy of the GNU General Public License - along with this program; if not, see . */ - -/* written by Jim Meyering */ - -#include - -/* Specification. */ -#include - -#include - -#if defined _WIN32 && ! defined __CYGWIN__ -# define WINDOWS_NATIVE -# include -#endif - -#include "localtime-buffer.h" - -#ifdef WINDOWS_NATIVE - -/* Avoid warnings from gcc -Wcast-function-type. */ -# define GetProcAddress \ - (void *) GetProcAddress - -/* GetSystemTimePreciseAsFileTime was introduced only in Windows 8. */ -typedef void (WINAPI * GetSystemTimePreciseAsFileTimeFuncType) (FILETIME *lpTime); -static GetSystemTimePreciseAsFileTimeFuncType GetSystemTimePreciseAsFileTimeFunc = NULL; -static BOOL initialized = FALSE; - -static void -initialize (void) -{ - HMODULE kernel32 = LoadLibrary ("kernel32.dll"); - if (kernel32 != NULL) - { - GetSystemTimePreciseAsFileTimeFunc = - (GetSystemTimePreciseAsFileTimeFuncType) GetProcAddress (kernel32, "GetSystemTimePreciseAsFileTime"); - } - initialized = TRUE; -} - -#endif - -/* This is a wrapper for gettimeofday. It is used only on systems - that lack this function, or whose implementation of this function - causes problems. - Work around the bug in some systems whereby gettimeofday clobbers - the static buffer that localtime uses for its return value. The - gettimeofday function from Mac OS X 10.0.4 (i.e., Darwin 1.3.7) has - this problem. */ - -int -gettimeofday (struct timeval *restrict tv, void *restrict tz) -{ -#undef gettimeofday -#ifdef WINDOWS_NATIVE - - /* On native Windows, there are two ways to get the current time: - GetSystemTimeAsFileTime - - or - GetSystemTimePreciseAsFileTime - . - GetSystemTimeAsFileTime produces values that jump by increments of - 15.627 milliseconds (!) on average. - Whereas GetSystemTimePreciseAsFileTime values usually jump by 1 or 2 - microseconds. - More discussion on this topic: - . */ - FILETIME current_time; - - if (!initialized) - initialize (); - if (GetSystemTimePreciseAsFileTimeFunc != NULL) - GetSystemTimePreciseAsFileTimeFunc (¤t_time); - else - GetSystemTimeAsFileTime (¤t_time); - - /* Convert from FILETIME to 'struct timeval'. */ - /* FILETIME: */ - ULONGLONG since_1601 = - ((ULONGLONG) current_time.dwHighDateTime << 32) - | (ULONGLONG) current_time.dwLowDateTime; - /* Between 1601-01-01 and 1970-01-01 there were 280 normal years and 89 leap - years, in total 134774 days. */ - ULONGLONG since_1970 = - since_1601 - (ULONGLONG) 134774 * (ULONGLONG) 86400 * (ULONGLONG) 10000000; - ULONGLONG microseconds_since_1970 = since_1970 / (ULONGLONG) 10; - tv->tv_sec = microseconds_since_1970 / (ULONGLONG) 1000000; - tv->tv_usec = microseconds_since_1970 % (ULONGLONG) 1000000; - - return 0; - -#else - -# if HAVE_GETTIMEOFDAY -# if GETTIMEOFDAY_CLOBBERS_LOCALTIME - /* Save and restore the contents of the buffer used for localtime's - result around the call to gettimeofday. */ - struct tm save = *localtime_buffer_addr; -# endif - -# if defined timeval /* 'struct timeval' overridden by gnulib? */ -# undef timeval - struct timeval otv; - int result = gettimeofday (&otv, (struct timezone *) tz); - if (result == 0) - { - tv->tv_sec = otv.tv_sec; - tv->tv_usec = otv.tv_usec; - } -# else - int result = gettimeofday (tv, (struct timezone *) tz); -# endif - -# if GETTIMEOFDAY_CLOBBERS_LOCALTIME - *localtime_buffer_addr = save; -# endif - - return result; - -# else - -# if !defined OK_TO_USE_1S_CLOCK -# error "Only 1-second nominal clock resolution found. Is that intended?" \ - "If so, compile with the -DOK_TO_USE_1S_CLOCK option." -# endif - tv->tv_sec = time (NULL); - tv->tv_usec = 0; - - return 0; - -# endif -#endif -} diff --git a/lib/glthread/lock.c b/lib/glthread/lock.c index fefcd59..10af6f2 100644 --- a/lib/glthread/lock.c +++ b/lib/glthread/lock.c @@ -1,5 +1,5 @@ /* Locking in multithreaded situations. - Copyright (C) 2005-2019 Free Software Foundation, Inc. + Copyright (C) 2005-2020 Free Software Foundation, Inc. This program is free software; you can redistribute it and/or modify it under the terms of the GNU General Public License as published by @@ -23,6 +23,229 @@ /* ========================================================================= */ +#if USE_ISOC_THREADS || USE_ISOC_AND_POSIX_THREADS + +/* -------------------------- gl_lock_t datatype -------------------------- */ + +int +glthread_lock_init (gl_lock_t *lock) +{ + if (mtx_init (&lock->mutex, mtx_plain) != thrd_success) + return ENOMEM; + lock->init_needed = 0; + return 0; +} + +int +glthread_lock_lock (gl_lock_t *lock) +{ + if (lock->init_needed) + call_once (&lock->init_once, lock->init_func); + if (mtx_lock (&lock->mutex) != thrd_success) + return EAGAIN; + return 0; +} + +int +glthread_lock_unlock (gl_lock_t *lock) +{ + if (lock->init_needed) + call_once (&lock->init_once, lock->init_func); + if (mtx_unlock (&lock->mutex) != thrd_success) + return EINVAL; + return 0; +} + +int +glthread_lock_destroy (gl_lock_t *lock) +{ + if (lock->init_needed) + call_once (&lock->init_once, lock->init_func); + mtx_destroy (&lock->mutex); + return 0; +} + +/* ------------------------- gl_rwlock_t datatype ------------------------- */ + +int +glthread_rwlock_init (gl_rwlock_t *lock) +{ + if (mtx_init (&lock->lock, mtx_plain) != thrd_success + || cnd_init (&lock->waiting_readers) != thrd_success + || cnd_init (&lock->waiting_writers) != thrd_success) + return ENOMEM; + lock->waiting_writers_count = 0; + lock->runcount = 0; + lock->init_needed = 0; + return 0; +} + +int +glthread_rwlock_rdlock (gl_rwlock_t *lock) +{ + if (lock->init_needed) + call_once (&lock->init_once, lock->init_func); + if (mtx_lock (&lock->lock) != thrd_success) + return EAGAIN; + /* Test whether only readers are currently running, and whether the runcount + field will not overflow, and whether no writer is waiting. The latter + condition is because POSIX recommends that "write locks shall take + precedence over read locks", to avoid "writer starvation". */ + while (!(lock->runcount + 1 > 0 && lock->waiting_writers_count == 0)) + { + /* This thread has to wait for a while. Enqueue it among the + waiting_readers. */ + if (cnd_wait (&lock->waiting_readers, &lock->lock) != thrd_success) + { + mtx_unlock (&lock->lock); + return EINVAL; + } + } + lock->runcount++; + if (mtx_unlock (&lock->lock) != thrd_success) + return EINVAL; + return 0; +} + +int +glthread_rwlock_wrlock (gl_rwlock_t *lock) +{ + if (lock->init_needed) + call_once (&lock->init_once, lock->init_func); + if (mtx_lock (&lock->lock) != thrd_success) + return EAGAIN; + /* Test whether no readers or writers are currently running. */ + while (!(lock->runcount == 0)) + { + /* This thread has to wait for a while. Enqueue it among the + waiting_writers. */ + lock->waiting_writers_count++; + if (cnd_wait (&lock->waiting_writers, &lock->lock) != thrd_success) + { + lock->waiting_writers_count--; + mtx_unlock (&lock->lock); + return EINVAL; + } + lock->waiting_writers_count--; + } + lock->runcount--; /* runcount becomes -1 */ + if (mtx_unlock (&lock->lock) != thrd_success) + return EINVAL; + return 0; +} + +int +glthread_rwlock_unlock (gl_rwlock_t *lock) +{ + if (lock->init_needed) + call_once (&lock->init_once, lock->init_func); + if (mtx_lock (&lock->lock) != thrd_success) + return EAGAIN; + if (lock->runcount < 0) + { + /* Drop a writer lock. */ + if (!(lock->runcount == -1)) + { + mtx_unlock (&lock->lock); + return EINVAL; + } + lock->runcount = 0; + } + else + { + /* Drop a reader lock. */ + if (!(lock->runcount > 0)) + { + mtx_unlock (&lock->lock); + return EINVAL; + } + lock->runcount--; + } + if (lock->runcount == 0) + { + /* POSIX recommends that "write locks shall take precedence over read + locks", to avoid "writer starvation". */ + if (lock->waiting_writers_count > 0) + { + /* Wake up one of the waiting writers. */ + if (cnd_signal (&lock->waiting_writers) != thrd_success) + { + mtx_unlock (&lock->lock); + return EINVAL; + } + } + else + { + /* Wake up all waiting readers. */ + if (cnd_broadcast (&lock->waiting_readers) != thrd_success) + { + mtx_unlock (&lock->lock); + return EINVAL; + } + } + } + if (mtx_unlock (&lock->lock) != thrd_success) + return EINVAL; + return 0; +} + +int +glthread_rwlock_destroy (gl_rwlock_t *lock) +{ + if (lock->init_needed) + call_once (&lock->init_once, lock->init_func); + mtx_destroy (&lock->lock); + cnd_destroy (&lock->waiting_readers); + cnd_destroy (&lock->waiting_writers); + return 0; +} + +/* --------------------- gl_recursive_lock_t datatype --------------------- */ + +int +glthread_recursive_lock_init (gl_recursive_lock_t *lock) +{ + if (mtx_init (&lock->mutex, mtx_plain | mtx_recursive) != thrd_success) + return ENOMEM; + lock->init_needed = 0; + return 0; +} + +int +glthread_recursive_lock_lock (gl_recursive_lock_t *lock) +{ + if (lock->init_needed) + call_once (&lock->init_once, lock->init_func); + if (mtx_lock (&lock->mutex) != thrd_success) + return EAGAIN; + return 0; +} + +int +glthread_recursive_lock_unlock (gl_recursive_lock_t *lock) +{ + if (lock->init_needed) + call_once (&lock->init_once, lock->init_func); + if (mtx_unlock (&lock->mutex) != thrd_success) + return EINVAL; + return 0; +} + +int +glthread_recursive_lock_destroy (gl_recursive_lock_t *lock) +{ + if (lock->init_needed) + call_once (&lock->init_once, lock->init_func); + mtx_destroy (&lock->mutex); + return 0; +} + +/* -------------------------- gl_once_t datatype -------------------------- */ + +#endif + +/* ========================================================================= */ + #if USE_POSIX_THREADS /* -------------------------- gl_lock_t datatype -------------------------- */ @@ -31,7 +254,7 @@ # if HAVE_PTHREAD_RWLOCK && (HAVE_PTHREAD_RWLOCK_RDLOCK_PREFER_WRITER || (defined PTHREAD_RWLOCK_WRITER_NONRECURSIVE_INITIALIZER_NP && (__GNU_LIBRARY__ > 1))) -# ifdef PTHREAD_RWLOCK_INITIALIZER +# if defined PTHREAD_RWLOCK_INITIALIZER || defined PTHREAD_RWLOCK_INITIALIZER_NP # if !HAVE_PTHREAD_RWLOCK_RDLOCK_PREFER_WRITER /* glibc with bug https://sourceware.org/bugzilla/show_bug.cgi?id=13701 */ @@ -495,6 +718,26 @@ glthread_once_singlethreaded (pthread_once_t *once_control) return 0; } +# if !(PTHREAD_IN_USE_DETECTION_HARD || USE_POSIX_THREADS_WEAK) + +int +glthread_once_multithreaded (pthread_once_t *once_control, + void (*init_function) (void)) +{ + int err = pthread_once (once_control, init_function); + if (err == ENOSYS) + { + /* This happens on FreeBSD 11: The pthread_once function in libc returns + ENOSYS. */ + if (glthread_once_singlethreaded (once_control)) + init_function (); + return 0; + } + return err; +} + +# endif + #endif /* ========================================================================= */ diff --git a/lib/glthread/lock.h b/lib/glthread/lock.h index a92c2a8..59485f2 100644 --- a/lib/glthread/lock.h +++ b/lib/glthread/lock.h @@ -1,5 +1,5 @@ /* Locking in multithreaded situations. - Copyright (C) 2005-2019 Free Software Foundation, Inc. + Copyright (C) 2005-2020 Free Software Foundation, Inc. This program is free software; you can redistribute it and/or modify it under the terms of the GNU General Public License as published by @@ -92,6 +92,115 @@ /* ========================================================================= */ +#if USE_ISOC_THREADS || USE_ISOC_AND_POSIX_THREADS + +/* Use the ISO C threads library. */ + +# include + +# ifdef __cplusplus +extern "C" { +# endif + +/* -------------------------- gl_lock_t datatype -------------------------- */ + +typedef struct + { + int volatile init_needed; + once_flag init_once; + void (*init_func) (void); + mtx_t mutex; + } + gl_lock_t; +# define gl_lock_define(STORAGECLASS, NAME) \ + STORAGECLASS gl_lock_t NAME; +# define gl_lock_define_initialized(STORAGECLASS, NAME) \ + static void _atomic_init_##NAME (void); \ + STORAGECLASS gl_lock_t NAME = \ + { 1, ONCE_FLAG_INIT, _atomic_init_##NAME }; \ + static void _atomic_init_##NAME (void) \ + { \ + if (glthread_lock_init (&(NAME))) \ + abort (); \ + } +extern int glthread_lock_init (gl_lock_t *lock); +extern int glthread_lock_lock (gl_lock_t *lock); +extern int glthread_lock_unlock (gl_lock_t *lock); +extern int glthread_lock_destroy (gl_lock_t *lock); + +/* ------------------------- gl_rwlock_t datatype ------------------------- */ + +typedef struct + { + int volatile init_needed; + once_flag init_once; + void (*init_func) (void); + mtx_t lock; /* protects the remaining fields */ + cnd_t waiting_readers; /* waiting readers */ + cnd_t waiting_writers; /* waiting writers */ + unsigned int waiting_writers_count; /* number of waiting writers */ + int runcount; /* number of readers running, or -1 when a writer runs */ + } + gl_rwlock_t; +# define gl_rwlock_define(STORAGECLASS, NAME) \ + STORAGECLASS gl_rwlock_t NAME; +# define gl_rwlock_define_initialized(STORAGECLASS, NAME) \ + static void _atomic_init_##NAME (void); \ + STORAGECLASS gl_rwlock_t NAME = \ + { 1, ONCE_FLAG_INIT, _atomic_init_##NAME }; \ + static void _atomic_init_##NAME (void) \ + { \ + if (glthread_rwlock_init (&(NAME))) \ + abort (); \ + } +extern int glthread_rwlock_init (gl_rwlock_t *lock); +extern int glthread_rwlock_rdlock (gl_rwlock_t *lock); +extern int glthread_rwlock_wrlock (gl_rwlock_t *lock); +extern int glthread_rwlock_unlock (gl_rwlock_t *lock); +extern int glthread_rwlock_destroy (gl_rwlock_t *lock); + +/* --------------------- gl_recursive_lock_t datatype --------------------- */ + +typedef struct + { + int volatile init_needed; + once_flag init_once; + void (*init_func) (void); + mtx_t mutex; + } + gl_recursive_lock_t; +# define gl_recursive_lock_define(STORAGECLASS, NAME) \ + STORAGECLASS gl_recursive_lock_t NAME; +# define gl_recursive_lock_define_initialized(STORAGECLASS, NAME) \ + static void _atomic_init_##NAME (void); \ + STORAGECLASS gl_recursive_lock_t NAME = \ + { 1, ONCE_FLAG_INIT, _atomic_init_##NAME }; \ + static void _atomic_init_##NAME (void) \ + { \ + if (glthread_recursive_lock_init (&(NAME))) \ + abort (); \ + } +extern int glthread_recursive_lock_init (gl_recursive_lock_t *lock); +extern int glthread_recursive_lock_lock (gl_recursive_lock_t *lock); +extern int glthread_recursive_lock_unlock (gl_recursive_lock_t *lock); +extern int glthread_recursive_lock_destroy (gl_recursive_lock_t *lock); + +/* -------------------------- gl_once_t datatype -------------------------- */ + +typedef once_flag gl_once_t; +# define gl_once_define(STORAGECLASS, NAME) \ + STORAGECLASS once_flag NAME = ONCE_FLAG_INIT; +# define glthread_once(ONCE_CONTROL, INITFUNCTION) \ + (call_once (ONCE_CONTROL, INITFUNCTION), 0) + +# ifdef __cplusplus +} +# endif + +#endif + +/* ========================================================================= */ + #if USE_POSIX_THREADS /* Use the POSIX threads library. */ @@ -199,7 +308,7 @@ typedef pthread_mutex_t gl_lock_t; # if HAVE_PTHREAD_RWLOCK && (HAVE_PTHREAD_RWLOCK_RDLOCK_PREFER_WRITER || (defined PTHREAD_RWLOCK_WRITER_NONRECURSIVE_INITIALIZER_NP && (__GNU_LIBRARY__ > 1))) -# ifdef PTHREAD_RWLOCK_INITIALIZER +# if defined PTHREAD_RWLOCK_INITIALIZER || defined PTHREAD_RWLOCK_INITIALIZER_NP typedef pthread_rwlock_t gl_rwlock_t; # define gl_rwlock_define(STORAGECLASS, NAME) \ @@ -207,8 +316,13 @@ typedef pthread_rwlock_t gl_rwlock_t; # define gl_rwlock_define_initialized(STORAGECLASS, NAME) \ STORAGECLASS pthread_rwlock_t NAME = gl_rwlock_initializer; # if HAVE_PTHREAD_RWLOCK_RDLOCK_PREFER_WRITER -# define gl_rwlock_initializer \ - PTHREAD_RWLOCK_INITIALIZER +# if defined PTHREAD_RWLOCK_INITIALIZER +# define gl_rwlock_initializer \ + PTHREAD_RWLOCK_INITIALIZER +# else +# define gl_rwlock_initializer \ + PTHREAD_RWLOCK_INITIALIZER_NP +# endif # define glthread_rwlock_init(LOCK) \ (pthread_in_use () ? pthread_rwlock_init (LOCK, NULL) : 0) # else /* glibc with bug https://sourceware.org/bugzilla/show_bug.cgi?id=13701 */ @@ -391,10 +505,19 @@ extern int glthread_recursive_lock_destroy_multithreaded (gl_recursive_lock_t *l typedef pthread_once_t gl_once_t; # define gl_once_define(STORAGECLASS, NAME) \ STORAGECLASS pthread_once_t NAME = PTHREAD_ONCE_INIT; -# define glthread_once(ONCE_CONTROL, INITFUNCTION) \ - (pthread_in_use () \ - ? pthread_once (ONCE_CONTROL, INITFUNCTION) \ - : (glthread_once_singlethreaded (ONCE_CONTROL) ? (INITFUNCTION (), 0) : 0)) +# if PTHREAD_IN_USE_DETECTION_HARD || USE_POSIX_THREADS_WEAK +# define glthread_once(ONCE_CONTROL, INITFUNCTION) \ + (pthread_in_use () \ + ? pthread_once (ONCE_CONTROL, INITFUNCTION) \ + : (glthread_once_singlethreaded (ONCE_CONTROL) ? (INITFUNCTION (), 0) : 0)) +# else +# define glthread_once(ONCE_CONTROL, INITFUNCTION) \ + (pthread_in_use () \ + ? glthread_once_multithreaded (ONCE_CONTROL, INITFUNCTION) \ + : (glthread_once_singlethreaded (ONCE_CONTROL) ? (INITFUNCTION (), 0) : 0)) +extern int glthread_once_multithreaded (pthread_once_t *once_control, + void (*init_function) (void)); +# endif extern int glthread_once_singlethreaded (pthread_once_t *once_control); # ifdef __cplusplus @@ -502,7 +625,7 @@ typedef glwthread_once_t gl_once_t; /* ========================================================================= */ -#if !(USE_POSIX_THREADS || USE_WINDOWS_THREADS) +#if !(USE_ISOC_THREADS || USE_POSIX_THREADS || USE_ISOC_AND_POSIX_THREADS || USE_WINDOWS_THREADS) /* Provide dummy implementation if threads are not supported. */ diff --git a/lib/glthread/threadlib.c b/lib/glthread/threadlib.c index a5ebd9b..501260a 100644 --- a/lib/glthread/threadlib.c +++ b/lib/glthread/threadlib.c @@ -1,5 +1,5 @@ /* Multithreading primitives. - Copyright (C) 2005-2019 Free Software Foundation, Inc. + Copyright (C) 2005-2020 Free Software Foundation, Inc. This 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,15 +20,48 @@ /* ========================================================================= */ -#if USE_POSIX_THREADS +#if USE_POSIX_THREADS || USE_ISOC_AND_POSIX_THREADS /* Use the POSIX threads library. */ +# include # include # include # if PTHREAD_IN_USE_DETECTION_HARD +# if defined __FreeBSD__ || defined __DragonFly__ /* FreeBSD */ + +/* Test using pthread_key_create. */ + +int +glthread_in_use (void) +{ + static int tested; + static int result; /* 1: linked with -lpthread, 0: only with libc */ + + if (!tested) + { + pthread_key_t key; + int err = pthread_key_create (&key, NULL); + + if (err == ENOSYS) + result = 0; + else + { + result = 1; + if (err == 0) + pthread_key_delete (key); + } + tested = 1; + } + return result; +} + +# else /* Solaris, HP-UX */ + +/* Test using pthread_create. */ + /* The function to be executed by a dummy thread. */ static void * dummy_thread_func (void *arg) @@ -62,6 +95,8 @@ glthread_in_use (void) return result; } +# endif + # endif #endif diff --git a/lib/gnulib.mk b/lib/gnulib.mk index 3fa83a7..ba2f476 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-2019 Free Software Foundation, Inc. +# Copyright (C) 2002-2020 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 @@ -94,15 +94,20 @@ libgnulib_la_DEPENDENCIES = $(gl_LTLIBOBJS) EXTRA_libgnulib_la_SOURCES = libgnulib_la_LDFLAGS = $(AM_LDFLAGS) libgnulib_la_LDFLAGS += -no-undefined +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 += $(LTLIBTHREAD) ## begin gnulib module absolute-header # Use this preprocessor expression to decide whether #include_next works. # Do not rely on a 'configure'-time test for this, since the expression # might appear in an installed header, which is used by some other compiler. -HAVE_INCLUDE_NEXT = (__GNUC__ || 60000000 <= __DECC_VER) +HAVE_INCLUDE_NEXT = (__GNUC__ || __clang__ || 60000000 <= __DECC_VER) ## end gnulib module absolute-header @@ -162,6 +167,21 @@ EXTRA_DIST += assure.h ## end gnulib module assure +## begin gnulib module attribute + + +EXTRA_DIST += attribute.h + +## end gnulib module attribute + +## begin gnulib module basename-lgpl + +libgnulib_la_SOURCES += basename-lgpl.c + +EXTRA_DIST += basename-lgpl.h + +## end gnulib module basename-lgpl + ## begin gnulib module btowc @@ -217,6 +237,14 @@ EXTRA_libgnulib_la_SOURCES += canonicalize-lgpl.c ## end gnulib module canonicalize-lgpl +## begin gnulib module cloexec + +libgnulib_la_SOURCES += cloexec.c + +EXTRA_DIST += cloexec.h + +## end gnulib module cloexec + ## begin gnulib module close @@ -302,7 +330,7 @@ EXTRA_libgnulib_la_SOURCES += stripslash.c ## begin gnulib module dirname-lgpl -libgnulib_la_SOURCES += dirname-lgpl.c basename-lgpl.c stripslash.c +libgnulib_la_SOURCES += dirname-lgpl.c stripslash.c EXTRA_DIST += dirname.h @@ -315,12 +343,14 @@ EXTRA_DIST += $(top_srcdir)/build-aux/do-release-commit-and-tag ## end gnulib module do-release-commit-and-tag -## begin gnulib module dosname +## begin gnulib module dup2 + +EXTRA_DIST += dup2.c -EXTRA_DIST += dosname.h +EXTRA_libgnulib_la_SOURCES += dup2.c -## end gnulib module dosname +## end gnulib module dup2 ## begin gnulib module errno @@ -373,6 +403,15 @@ EXTRA_DIST += exitfail.h ## end gnulib module exitfail +## begin gnulib module fcntl + + +EXTRA_DIST += fcntl.c + +EXTRA_libgnulib_la_SOURCES += fcntl.c + +## end gnulib module fcntl + ## begin gnulib module fcntl-h BUILT_SOURCES += fcntl.h @@ -387,12 +426,14 @@ fcntl.h: fcntl.in.h $(top_builddir)/config.status $(CXXDEFS_H) $(ARG_NONNULL_H) -e 's|@''PRAGMA_SYSTEM_HEADER''@|@PRAGMA_SYSTEM_HEADER@|g' \ -e 's|@''PRAGMA_COLUMNS''@|@PRAGMA_COLUMNS@|g' \ -e 's|@''NEXT_FCNTL_H''@|$(NEXT_FCNTL_H)|g' \ + -e 's/@''GNULIB_CREAT''@/$(GNULIB_CREAT)/g' \ -e 's/@''GNULIB_FCNTL''@/$(GNULIB_FCNTL)/g' \ -e 's/@''GNULIB_NONBLOCKING''@/$(GNULIB_NONBLOCKING)/g' \ -e 's/@''GNULIB_OPEN''@/$(GNULIB_OPEN)/g' \ -e 's/@''GNULIB_OPENAT''@/$(GNULIB_OPENAT)/g' \ -e 's|@''HAVE_FCNTL''@|$(HAVE_FCNTL)|g' \ -e 's|@''HAVE_OPENAT''@|$(HAVE_OPENAT)|g' \ + -e 's|@''REPLACE_CREAT''@|$(REPLACE_CREAT)|g' \ -e 's|@''REPLACE_FCNTL''@|$(REPLACE_FCNTL)|g' \ -e 's|@''REPLACE_OPEN''@|$(REPLACE_OPEN)|g' \ -e 's|@''REPLACE_OPENAT''@|$(REPLACE_OPENAT)|g' \ @@ -457,6 +498,15 @@ EXTRA_DIST += $(top_srcdir)/build-aux/gendocs.sh ## end gnulib module gendocs +## begin gnulib module getdtablesize + + +EXTRA_DIST += getdtablesize.c + +EXTRA_libgnulib_la_SOURCES += getdtablesize.c + +## end gnulib module getdtablesize + ## begin gnulib module getopt-posix BUILT_SOURCES += $(GETOPT_H) $(GETOPT_CDEFS_H) @@ -499,20 +549,20 @@ libgnulib_la_SOURCES += getprogname.h getprogname.c ## end gnulib module getprogname -## begin gnulib module gettext-h +## begin gnulib module getrandom -libgnulib_la_SOURCES += gettext.h -## end gnulib module gettext-h +EXTRA_DIST += getrandom.c -## begin gnulib module gettimeofday +EXTRA_libgnulib_la_SOURCES += getrandom.c +## end gnulib module getrandom -EXTRA_DIST += gettimeofday.c +## begin gnulib module gettext-h -EXTRA_libgnulib_la_SOURCES += gettimeofday.c +libgnulib_la_SOURCES += gettext.h -## end gnulib module gettimeofday +## end gnulib module gettext-h ## begin gnulib module git-version-gen @@ -559,12 +609,11 @@ EXTRA_DIST += hard-locale.h ## end gnulib module hard-locale -## begin gnulib module havelib +## begin gnulib module idx +libgnulib_la_SOURCES += idx.h -EXTRA_DIST += $(top_srcdir)/build-aux/config.rpath - -## end gnulib module havelib +## end gnulib module idx ## begin gnulib module intprops @@ -587,10 +636,7 @@ inttypes.h: inttypes.in.h $(top_builddir)/config.status $(CXXDEFS_H) $(WARN_ON_U -e 's|@''PRAGMA_SYSTEM_HEADER''@|@PRAGMA_SYSTEM_HEADER@|g' \ -e 's|@''PRAGMA_COLUMNS''@|@PRAGMA_COLUMNS@|g' \ -e 's|@''NEXT_INTTYPES_H''@|$(NEXT_INTTYPES_H)|g' \ - -e 's/@''PRI_MACROS_BROKEN''@/$(PRI_MACROS_BROKEN)/g' \ -e 's/@''APPLE_UNIVERSAL_BUILD''@/$(APPLE_UNIVERSAL_BUILD)/g' \ - -e 's/@''HAVE_LONG_LONG_INT''@/$(HAVE_LONG_LONG_INT)/g' \ - -e 's/@''HAVE_UNSIGNED_LONG_LONG_INT''@/$(HAVE_UNSIGNED_LONG_LONG_INT)/g' \ -e 's/@''PRIPTR_PREFIX''@/$(PRIPTR_PREFIX)/g' \ -e 's/@''GNULIB_IMAXABS''@/$(GNULIB_IMAXABS)/g' \ -e 's/@''GNULIB_IMAXDIV''@/$(GNULIB_IMAXDIV)/g' \ @@ -712,6 +758,7 @@ locale.h: locale.in.h $(top_builddir)/config.status $(CXXDEFS_H) $(ARG_NONNULL_H -e 's|@''NEXT_LOCALE_H''@|$(NEXT_LOCALE_H)|g' \ -e 's/@''GNULIB_LOCALECONV''@/$(GNULIB_LOCALECONV)/g' \ -e 's/@''GNULIB_SETLOCALE''@/$(GNULIB_SETLOCALE)/g' \ + -e 's/@''GNULIB_SETLOCALE_NULL''@/$(GNULIB_SETLOCALE_NULL)/g' \ -e 's/@''GNULIB_DUPLOCALE''@/$(GNULIB_DUPLOCALE)/g' \ -e 's/@''GNULIB_LOCALENAME''@/$(GNULIB_LOCALENAME)/g' \ -e 's|@''HAVE_NEWLOCALE''@|$(HAVE_NEWLOCALE)|g' \ @@ -745,15 +792,6 @@ EXTRA_libgnulib_la_SOURCES += localeconv.c ## end gnulib module localeconv -## begin gnulib module localtime-buffer - - -EXTRA_DIST += localtime-buffer.c localtime-buffer.h - -EXTRA_libgnulib_la_SOURCES += localtime-buffer.c - -## end gnulib module localtime-buffer - ## begin gnulib module lock libgnulib_la_SOURCES += glthread/lock.h glthread/lock.c @@ -821,9 +859,9 @@ EXTRA_DIST += malloca.h ## begin gnulib module mbrtowc -EXTRA_DIST += mbrtowc.c +EXTRA_DIST += lc-charset-dispatch.c lc-charset-dispatch.h mbrtowc-impl-utf8.h mbrtowc-impl.h mbrtowc.c mbtowc-lock.c mbtowc-lock.h windows-initguard.h -EXTRA_libgnulib_la_SOURCES += mbrtowc.c +EXTRA_libgnulib_la_SOURCES += lc-charset-dispatch.c mbrtowc.c mbtowc-lock.c ## end gnulib module mbrtowc @@ -897,12 +935,21 @@ EXTRA_libgnulib_la_SOURCES += msvc-nothrow.c ## begin gnulib module nl_langinfo -EXTRA_DIST += nl_langinfo.c +EXTRA_DIST += nl_langinfo-lock.c nl_langinfo.c windows-initguard.h -EXTRA_libgnulib_la_SOURCES += nl_langinfo.c +EXTRA_libgnulib_la_SOURCES += nl_langinfo-lock.c nl_langinfo.c ## end gnulib module nl_langinfo +## begin gnulib module open + + +EXTRA_DIST += open.c + +EXTRA_libgnulib_la_SOURCES += open.c + +## end gnulib module open + ## begin gnulib module pathmax @@ -993,6 +1040,16 @@ EXTRA_DIST += safe-read.h sys-limits.h ## end gnulib module safe-read +## begin gnulib module setlocale-null + +libgnulib_la_SOURCES += setlocale_null.c + +EXTRA_DIST += setlocale-lock.c setlocale_null.h windows-initguard.h + +EXTRA_libgnulib_la_SOURCES += setlocale-lock.c + +## end gnulib module setlocale-null + ## begin gnulib module sleep @@ -1067,6 +1124,29 @@ 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 when the system +# doesn't have one that works. +if GL_GENERATE_STDALIGN_H +stdalign.h: stdalign.in.h $(top_builddir)/config.status + $(AM_V_GEN)rm -f $@-t $@ && \ + { echo '/* DO NOT EDIT! GENERATED AUTOMATICALLY! */'; \ + cat $(srcdir)/stdalign.in.h; \ + } > $@-t && \ + 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) @@ -1171,8 +1251,6 @@ stdint.h: stdint.in.h $(top_builddir)/config.status -e 's/@''HAVE_SYS_INTTYPES_H''@/$(HAVE_SYS_INTTYPES_H)/g' \ -e 's/@''HAVE_SYS_BITYPES_H''@/$(HAVE_SYS_BITYPES_H)/g' \ -e 's/@''HAVE_WCHAR_H''@/$(HAVE_WCHAR_H)/g' \ - -e 's/@''HAVE_LONG_LONG_INT''@/$(HAVE_LONG_LONG_INT)/g' \ - -e 's/@''HAVE_UNSIGNED_LONG_LONG_INT''@/$(HAVE_UNSIGNED_LONG_LONG_INT)/g' \ -e 's/@''APPLE_UNIVERSAL_BUILD''@/$(APPLE_UNIVERSAL_BUILD)/g' \ -e 's/@''BITSIZEOF_PTRDIFF_T''@/$(BITSIZEOF_PTRDIFF_T)/g' \ -e 's/@''PTRDIFF_T_SUFFIX''@/$(PTRDIFF_T_SUFFIX)/g' \ @@ -1269,7 +1347,8 @@ stdio.h: stdio.in.h $(top_builddir)/config.status $(CXXDEFS_H) $(ARG_NONNULL_H) -e 's/@''GNULIB_VSNPRINTF''@/$(GNULIB_VSNPRINTF)/g' \ -e 's/@''GNULIB_VSPRINTF_POSIX''@/$(GNULIB_VSPRINTF_POSIX)/g' \ < $(srcdir)/stdio.in.h | \ - sed -e 's|@''HAVE_DECL_FPURGE''@|$(HAVE_DECL_FPURGE)|g' \ + sed -e 's|@''HAVE_DECL_FCLOSEALL''@|$(HAVE_DECL_FCLOSEALL)|g' \ + -e 's|@''HAVE_DECL_FPURGE''@|$(HAVE_DECL_FPURGE)|g' \ -e 's|@''HAVE_DECL_FSEEKO''@|$(HAVE_DECL_FSEEKO)|g' \ -e 's|@''HAVE_DECL_FTELLO''@|$(HAVE_DECL_FTELLO)|g' \ -e 's|@''HAVE_DECL_GETDELIM''@|$(HAVE_DECL_GETDELIM)|g' \ @@ -1345,6 +1424,7 @@ stdlib.h: stdlib.in.h $(top_builddir)/config.status $(CXXDEFS_H) \ -e 's|@''PRAGMA_COLUMNS''@|@PRAGMA_COLUMNS@|g' \ -e 's|@''NEXT_STDLIB_H''@|$(NEXT_STDLIB_H)|g' \ -e 's/@''GNULIB__EXIT''@/$(GNULIB__EXIT)/g' \ + -e 's/@''GNULIB_ALIGNED_ALLOC''@/$(GNULIB_ALIGNED_ALLOC)/g' \ -e 's/@''GNULIB_ATOLL''@/$(GNULIB_ATOLL)/g' \ -e 's/@''GNULIB_CALLOC_POSIX''@/$(GNULIB_CALLOC_POSIX)/g' \ -e 's/@''GNULIB_CANONICALIZE_FILE_NAME''@/$(GNULIB_CANONICALIZE_FILE_NAME)/g' \ @@ -1358,6 +1438,7 @@ stdlib.h: stdlib.in.h $(top_builddir)/config.status $(CXXDEFS_H) \ -e 's/@''GNULIB_MKOSTEMPS''@/$(GNULIB_MKOSTEMPS)/g' \ -e 's/@''GNULIB_MKSTEMP''@/$(GNULIB_MKSTEMP)/g' \ -e 's/@''GNULIB_MKSTEMPS''@/$(GNULIB_MKSTEMPS)/g' \ + -e 's/@''GNULIB_POSIX_MEMALIGN''@/$(GNULIB_POSIX_MEMALIGN)/g' \ -e 's/@''GNULIB_POSIX_OPENPT''@/$(GNULIB_POSIX_OPENPT)/g' \ -e 's/@''GNULIB_PTSNAME''@/$(GNULIB_PTSNAME)/g' \ -e 's/@''GNULIB_PTSNAME_R''@/$(GNULIB_PTSNAME_R)/g' \ @@ -1381,8 +1462,12 @@ stdlib.h: stdlib.in.h $(top_builddir)/config.status $(CXXDEFS_H) \ -e 's/@''GNULIB_WCTOMB''@/$(GNULIB_WCTOMB)/g' \ < $(srcdir)/stdlib.in.h | \ sed -e 's|@''HAVE__EXIT''@|$(HAVE__EXIT)|g' \ + -e 's|@''HAVE_ALIGNED_ALLOC''@|$(HAVE_ALIGNED_ALLOC)|g' \ -e 's|@''HAVE_ATOLL''@|$(HAVE_ATOLL)|g' \ -e 's|@''HAVE_CANONICALIZE_FILE_NAME''@|$(HAVE_CANONICALIZE_FILE_NAME)|g' \ + -e 's|@''HAVE_DECL_ECVT''@|$(HAVE_DECL_ECVT)|g' \ + -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_GETSUBOPT''@|$(HAVE_GETSUBOPT)|g' \ -e 's|@''HAVE_GRANTPT''@|$(HAVE_GRANTPT)|g' \ @@ -1394,6 +1479,7 @@ stdlib.h: stdlib.in.h $(top_builddir)/config.status $(CXXDEFS_H) \ -e 's|@''HAVE_MKOSTEMPS''@|$(HAVE_MKOSTEMPS)|g' \ -e 's|@''HAVE_MKSTEMP''@|$(HAVE_MKSTEMP)|g' \ -e 's|@''HAVE_MKSTEMPS''@|$(HAVE_MKSTEMPS)|g' \ + -e 's|@''HAVE_POSIX_MEMALIGN''@|$(HAVE_POSIX_MEMALIGN)|g' \ -e 's|@''HAVE_POSIX_OPENPT''@|$(HAVE_POSIX_OPENPT)|g' \ -e 's|@''HAVE_PTSNAME''@|$(HAVE_PTSNAME)|g' \ -e 's|@''HAVE_PTSNAME_R''@|$(HAVE_PTSNAME_R)|g' \ @@ -1416,12 +1502,14 @@ 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_ALIGNED_ALLOC''@|$(REPLACE_ALIGNED_ALLOC)|g' \ -e 's|@''REPLACE_CALLOC''@|$(REPLACE_CALLOC)|g' \ -e 's|@''REPLACE_CANONICALIZE_FILE_NAME''@|$(REPLACE_CANONICALIZE_FILE_NAME)|g' \ -e 's|@''REPLACE_INITSTATE''@|$(REPLACE_INITSTATE)|g' \ -e 's|@''REPLACE_MALLOC''@|$(REPLACE_MALLOC)|g' \ -e 's|@''REPLACE_MBTOWC''@|$(REPLACE_MBTOWC)|g' \ -e 's|@''REPLACE_MKSTEMP''@|$(REPLACE_MKSTEMP)|g' \ + -e 's|@''REPLACE_POSIX_MEMALIGN''@|$(REPLACE_POSIX_MEMALIGN)|g' \ -e 's|@''REPLACE_PTSNAME''@|$(REPLACE_PTSNAME)|g' \ -e 's|@''REPLACE_PTSNAME_R''@|$(REPLACE_PTSNAME_R)|g' \ -e 's|@''REPLACE_PUTENV''@|$(REPLACE_PUTENV)|g' \ @@ -1532,6 +1620,9 @@ string.h: string.in.h $(top_builddir)/config.status $(CXXDEFS_H) $(ARG_NONNULL_H -e 's/@''GNULIB_STRTOK_R''@/$(GNULIB_STRTOK_R)/g' \ -e 's/@''GNULIB_STRERROR''@/$(GNULIB_STRERROR)/g' \ -e 's/@''GNULIB_STRERROR_R''@/$(GNULIB_STRERROR_R)/g' \ + -e 's/@''GNULIB_STRERRORNAME_NP''@/$(GNULIB_STRERRORNAME_NP)/g' \ + -e 's/@''GNULIB_SIGABBREV_NP''@/$(GNULIB_SIGABBREV_NP)/g' \ + -e 's/@''GNULIB_SIGDESCR_NP''@/$(GNULIB_SIGDESCR_NP)/g' \ -e 's/@''GNULIB_STRSIGNAL''@/$(GNULIB_STRSIGNAL)/g' \ -e 's/@''GNULIB_STRVERSCMP''@/$(GNULIB_STRVERSCMP)/g' \ < $(srcdir)/string.in.h | \ @@ -1539,7 +1630,6 @@ string.h: string.in.h $(top_builddir)/config.status $(CXXDEFS_H) $(ARG_NONNULL_H -e 's|@''HAVE_FFSL''@|$(HAVE_FFSL)|g' \ -e 's|@''HAVE_FFSLL''@|$(HAVE_FFSLL)|g' \ -e 's|@''HAVE_MBSLEN''@|$(HAVE_MBSLEN)|g' \ - -e 's|@''HAVE_MEMCHR''@|$(HAVE_MEMCHR)|g' \ -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' \ @@ -1555,6 +1645,9 @@ string.h: string.in.h $(top_builddir)/config.status $(CXXDEFS_H) $(ARG_NONNULL_H -e 's|@''HAVE_STRCASESTR''@|$(HAVE_STRCASESTR)|g' \ -e 's|@''HAVE_DECL_STRTOK_R''@|$(HAVE_DECL_STRTOK_R)|g' \ -e 's|@''HAVE_DECL_STRERROR_R''@|$(HAVE_DECL_STRERROR_R)|g' \ + -e 's|@''HAVE_STRERRORNAME_NP''@|$(HAVE_STRERRORNAME_NP)|g' \ + -e 's|@''HAVE_SIGABBREV_NP''@|$(HAVE_SIGABBREV_NP)|g' \ + -e 's|@''HAVE_SIGDESCR_NP''@|$(HAVE_SIGDESCR_NP)|g' \ -e 's|@''HAVE_DECL_STRSIGNAL''@|$(HAVE_DECL_STRSIGNAL)|g' \ -e 's|@''HAVE_STRVERSCMP''@|$(HAVE_STRVERSCMP)|g' \ -e 's|@''REPLACE_MEMCHR''@|$(REPLACE_MEMCHR)|g' \ @@ -1570,6 +1663,7 @@ string.h: string.in.h $(top_builddir)/config.status $(CXXDEFS_H) $(ARG_NONNULL_H -e 's|@''REPLACE_STRTOK_R''@|$(REPLACE_STRTOK_R)|g' \ -e 's|@''REPLACE_STRERROR''@|$(REPLACE_STRERROR)|g' \ -e 's|@''REPLACE_STRERROR_R''@|$(REPLACE_STRERROR_R)|g' \ + -e 's|@''REPLACE_STRERRORNAME_NP''@|$(REPLACE_STRERRORNAME_NP)|g' \ -e 's|@''REPLACE_STRSIGNAL''@|$(REPLACE_STRSIGNAL)|g' \ -e 's|@''UNDEFINE_STRTOK_R''@|$(UNDEFINE_STRTOK_R)|g' \ -e '/definitions of _GL_FUNCDECL_RPL/r $(CXXDEFS_H)' \ @@ -1620,6 +1714,38 @@ EXTRA_libgnulib_la_SOURCES += strtol.c strtoul.c strtoull.c ## end gnulib module strtoull +## begin gnulib module sys_random + +BUILT_SOURCES += sys/random.h + +# We need the following in order to create when the system +# doesn't have one. +sys/random.h: sys_random.in.h $(top_builddir)/config.status $(CXXDEFS_H) $(ARG_NONNULL_H) $(WARN_ON_USE_H) + $(AM_V_at)$(MKDIR_P) sys + $(AM_V_GEN)rm -f $@-t $@ && \ + { echo '/* DO NOT EDIT! GENERATED AUTOMATICALLY! */'; \ + sed -e 's|@''GUARD_PREFIX''@|GL|g' \ + -e 's|@''INCLUDE_NEXT''@|$(INCLUDE_NEXT)|g' \ + -e 's|@''PRAGMA_SYSTEM_HEADER''@|@PRAGMA_SYSTEM_HEADER@|g' \ + -e 's|@''PRAGMA_COLUMNS''@|@PRAGMA_COLUMNS@|g' \ + -e 's|@''NEXT_SYS_RANDOM_H''@|$(NEXT_SYS_RANDOM_H)|g' \ + -e 's|@''HAVE_SYS_RANDOM_H''@|$(HAVE_SYS_RANDOM_H)|g' \ + -e 's/@''GNULIB_GETRANDOM''@/$(GNULIB_GETRANDOM)/g' \ + -e 's/@''HAVE_GETRANDOM''@/$(HAVE_GETRANDOM)/g' \ + -e 's/@''REPLACE_GETRANDOM''@/$(REPLACE_GETRANDOM)/g' \ + -e '/definitions of _GL_FUNCDECL_RPL/r $(CXXDEFS_H)' \ + -e '/definition of _GL_ARG_NONNULL/r $(ARG_NONNULL_H)' \ + -e '/definition of _GL_WARN_ON_USE/r $(WARN_ON_USE_H)' \ + < $(srcdir)/sys_random.in.h; \ + } > $@-t && \ + mv -f $@-t $@ +MOSTLYCLEANFILES += sys/random.h sys/random.h-t +MOSTLYCLEANDIRS += sys + +EXTRA_DIST += sys_random.in.h + +## end gnulib module sys_random + ## begin gnulib module sys_stat BUILT_SOURCES += sys/stat.h @@ -1641,6 +1767,7 @@ sys/stat.h: sys_stat.in.h $(top_builddir)/config.status $(CXXDEFS_H) $(ARG_NONNU -e 's/@''GNULIB_FSTAT''@/$(GNULIB_FSTAT)/g' \ -e 's/@''GNULIB_FSTATAT''@/$(GNULIB_FSTATAT)/g' \ -e 's/@''GNULIB_FUTIMENS''@/$(GNULIB_FUTIMENS)/g' \ + -e 's/@''GNULIB_GETUMASK''@/$(GNULIB_GETUMASK)/g' \ -e 's/@''GNULIB_LCHMOD''@/$(GNULIB_LCHMOD)/g' \ -e 's/@''GNULIB_LSTAT''@/$(GNULIB_LSTAT)/g' \ -e 's/@''GNULIB_MKDIRAT''@/$(GNULIB_MKDIRAT)/g' \ @@ -1654,6 +1781,7 @@ sys/stat.h: sys_stat.in.h $(top_builddir)/config.status $(CXXDEFS_H) $(ARG_NONNU -e 's|@''HAVE_FCHMODAT''@|$(HAVE_FCHMODAT)|g' \ -e 's|@''HAVE_FSTATAT''@|$(HAVE_FSTATAT)|g' \ -e 's|@''HAVE_FUTIMENS''@|$(HAVE_FUTIMENS)|g' \ + -e 's|@''HAVE_GETUMASK''@|$(HAVE_GETUMASK)|g' \ -e 's|@''HAVE_LCHMOD''@|$(HAVE_LCHMOD)|g' \ -e 's|@''HAVE_LSTAT''@|$(HAVE_LSTAT)|g' \ -e 's|@''HAVE_MKDIRAT''@|$(HAVE_MKDIRAT)|g' \ @@ -1662,6 +1790,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_FCHMODAT''@|$(REPLACE_FCHMODAT)|g' \ -e 's|@''REPLACE_FSTAT''@|$(REPLACE_FSTAT)|g' \ -e 's|@''REPLACE_FSTATAT''@|$(REPLACE_FSTATAT)|g' \ -e 's|@''REPLACE_FUTIMENS''@|$(REPLACE_FUTIMENS)|g' \ @@ -1684,40 +1813,6 @@ EXTRA_DIST += sys_stat.in.h ## end gnulib module sys_stat -## begin gnulib module sys_time - -BUILT_SOURCES += sys/time.h - -# We need the following in order to create when the system -# doesn't have one that works with the given compiler. -sys/time.h: sys_time.in.h $(top_builddir)/config.status $(CXXDEFS_H) $(ARG_NONNULL_H) $(WARN_ON_USE_H) - $(AM_V_at)$(MKDIR_P) sys - $(AM_V_GEN)rm -f $@-t $@ && \ - { echo '/* DO NOT EDIT! GENERATED AUTOMATICALLY! */'; \ - sed -e 's|@''GUARD_PREFIX''@|GL|g' \ - -e 's/@''HAVE_SYS_TIME_H''@/$(HAVE_SYS_TIME_H)/g' \ - -e 's|@''INCLUDE_NEXT''@|$(INCLUDE_NEXT)|g' \ - -e 's|@''PRAGMA_SYSTEM_HEADER''@|@PRAGMA_SYSTEM_HEADER@|g' \ - -e 's|@''PRAGMA_COLUMNS''@|@PRAGMA_COLUMNS@|g' \ - -e 's|@''NEXT_SYS_TIME_H''@|$(NEXT_SYS_TIME_H)|g' \ - -e 's/@''GNULIB_GETTIMEOFDAY''@/$(GNULIB_GETTIMEOFDAY)/g' \ - -e 's|@''HAVE_WINSOCK2_H''@|$(HAVE_WINSOCK2_H)|g' \ - -e 's/@''HAVE_GETTIMEOFDAY''@/$(HAVE_GETTIMEOFDAY)/g' \ - -e 's/@''HAVE_STRUCT_TIMEVAL''@/$(HAVE_STRUCT_TIMEVAL)/g' \ - -e 's/@''REPLACE_GETTIMEOFDAY''@/$(REPLACE_GETTIMEOFDAY)/g' \ - -e 's/@''REPLACE_STRUCT_TIMEVAL''@/$(REPLACE_STRUCT_TIMEVAL)/g' \ - -e '/definitions of _GL_FUNCDECL_RPL/r $(CXXDEFS_H)' \ - -e '/definition of _GL_ARG_NONNULL/r $(ARG_NONNULL_H)' \ - -e '/definition of _GL_WARN_ON_USE/r $(WARN_ON_USE_H)' \ - < $(srcdir)/sys_time.in.h; \ - } > $@-t && \ - mv $@-t $@ -MOSTLYCLEANFILES += sys/time.h sys/time.h-t - -EXTRA_DIST += sys_time.in.h - -## end gnulib module sys_time - ## begin gnulib module sys_types BUILT_SOURCES += sys/types.h @@ -1756,8 +1851,6 @@ EXTRA_DIST += tempname.h libgnulib_la_SOURCES += glthread/threadlib.c -EXTRA_DIST += $(top_srcdir)/build-aux/config.rpath - ## end gnulib module threadlib ## begin gnulib module time @@ -1789,7 +1882,6 @@ time.h: time.in.h $(top_builddir)/config.status $(CXXDEFS_H) $(ARG_NONNULL_H) $( -e 's|@''HAVE_STRPTIME''@|$(HAVE_STRPTIME)|g' \ -e 's|@''HAVE_TIMEGM''@|$(HAVE_TIMEGM)|g' \ -e 's|@''HAVE_TIMEZONE_T''@|$(HAVE_TIMEZONE_T)|g' \ - -e 's|@''HAVE_TZSET''@|$(HAVE_TZSET)|g' \ -e 's|@''REPLACE_CTIME''@|$(REPLACE_CTIME)|g' \ -e 's|@''REPLACE_GMTIME''@|$(REPLACE_GMTIME)|g' \ -e 's|@''REPLACE_LOCALTIME''@|$(REPLACE_LOCALTIME)|g' \ @@ -1832,6 +1924,7 @@ unistd.h: unistd.in.h $(top_builddir)/config.status $(CXXDEFS_H) $(ARG_NONNULL_H -e 's|@''PRAGMA_COLUMNS''@|@PRAGMA_COLUMNS@|g' \ -e 's|@''NEXT_UNISTD_H''@|$(NEXT_UNISTD_H)|g' \ -e 's|@''WINDOWS_64_BIT_OFF_T''@|$(WINDOWS_64_BIT_OFF_T)|g' \ + -e 's/@''GNULIB_ACCESS''@/$(GNULIB_ACCESS)/g' \ -e 's/@''GNULIB_CHDIR''@/$(GNULIB_CHDIR)/g' \ -e 's/@''GNULIB_CHOWN''@/$(GNULIB_CHOWN)/g' \ -e 's/@''GNULIB_CLOSE''@/$(GNULIB_CLOSE)/g' \ @@ -1850,10 +1943,12 @@ unistd.h: unistd.in.h $(top_builddir)/config.status $(CXXDEFS_H) $(ARG_NONNULL_H -e 's/@''GNULIB_GETCWD''@/$(GNULIB_GETCWD)/g' \ -e 's/@''GNULIB_GETDOMAINNAME''@/$(GNULIB_GETDOMAINNAME)/g' \ -e 's/@''GNULIB_GETDTABLESIZE''@/$(GNULIB_GETDTABLESIZE)/g' \ + -e 's/@''GNULIB_GETENTROPY''@/$(GNULIB_GETENTROPY)/g' \ -e 's/@''GNULIB_GETGROUPS''@/$(GNULIB_GETGROUPS)/g' \ -e 's/@''GNULIB_GETHOSTNAME''@/$(GNULIB_GETHOSTNAME)/g' \ -e 's/@''GNULIB_GETLOGIN''@/$(GNULIB_GETLOGIN)/g' \ -e 's/@''GNULIB_GETLOGIN_R''@/$(GNULIB_GETLOGIN_R)/g' \ + -e 's/@''GNULIB_GETOPT_POSIX''@/$(GNULIB_GETOPT_POSIX)/g' \ -e 's/@''GNULIB_GETPAGESIZE''@/$(GNULIB_GETPAGESIZE)/g' \ -e 's/@''GNULIB_GETPASS''@/$(GNULIB_GETPASS)/g' \ -e 's/@''GNULIB_GETUSERSHELL''@/$(GNULIB_GETUSERSHELL)/g' \ @@ -1887,7 +1982,6 @@ unistd.h: unistd.in.h $(top_builddir)/config.status $(CXXDEFS_H) $(ARG_NONNULL_H < $(srcdir)/unistd.in.h | \ sed -e 's|@''HAVE_CHOWN''@|$(HAVE_CHOWN)|g' \ -e 's|@''HAVE_COPY_FILE_RANGE''@|$(HAVE_COPY_FILE_RANGE)|g' \ - -e 's|@''HAVE_DUP2''@|$(HAVE_DUP2)|g' \ -e 's|@''HAVE_DUP3''@|$(HAVE_DUP3)|g' \ -e 's|@''HAVE_EUIDACCESS''@|$(HAVE_EUIDACCESS)|g' \ -e 's|@''HAVE_FACCESSAT''@|$(HAVE_FACCESSAT)|g' \ @@ -1897,6 +1991,7 @@ unistd.h: unistd.in.h $(top_builddir)/config.status $(CXXDEFS_H) $(ARG_NONNULL_H -e 's|@''HAVE_FSYNC''@|$(HAVE_FSYNC)|g' \ -e 's|@''HAVE_FTRUNCATE''@|$(HAVE_FTRUNCATE)|g' \ -e 's|@''HAVE_GETDTABLESIZE''@|$(HAVE_GETDTABLESIZE)|g' \ + -e 's|@''HAVE_GETENTROPY''@|$(HAVE_GETENTROPY)|g' \ -e 's|@''HAVE_GETGROUPS''@|$(HAVE_GETGROUPS)|g' \ -e 's|@''HAVE_GETHOSTNAME''@|$(HAVE_GETHOSTNAME)|g' \ -e 's|@''HAVE_GETPAGESIZE''@|$(HAVE_GETPAGESIZE)|g' \ @@ -1918,6 +2013,7 @@ unistd.h: unistd.in.h $(top_builddir)/config.status $(CXXDEFS_H) $(ARG_NONNULL_H -e 's|@''HAVE_UNLINKAT''@|$(HAVE_UNLINKAT)|g' \ -e 's|@''HAVE_USLEEP''@|$(HAVE_USLEEP)|g' \ -e 's|@''HAVE_DECL_ENVIRON''@|$(HAVE_DECL_ENVIRON)|g' \ + -e 's|@''HAVE_DECL_EXECVPE''@|$(HAVE_DECL_EXECVPE)|g' \ -e 's|@''HAVE_DECL_FCHDIR''@|$(HAVE_DECL_FCHDIR)|g' \ -e 's|@''HAVE_DECL_FDATASYNC''@|$(HAVE_DECL_FDATASYNC)|g' \ -e 's|@''HAVE_DECL_GETDOMAINNAME''@|$(HAVE_DECL_GETDOMAINNAME)|g' \ @@ -1931,7 +2027,8 @@ unistd.h: unistd.in.h $(top_builddir)/config.status $(CXXDEFS_H) $(ARG_NONNULL_H -e 's|@''HAVE_OS_H''@|$(HAVE_OS_H)|g' \ -e 's|@''HAVE_SYS_PARAM_H''@|$(HAVE_SYS_PARAM_H)|g' \ | \ - sed -e 's|@''REPLACE_CHOWN''@|$(REPLACE_CHOWN)|g' \ + sed -e 's|@''REPLACE_ACCESS''@|$(REPLACE_ACCESS)|g' \ + -e 's|@''REPLACE_CHOWN''@|$(REPLACE_CHOWN)|g' \ -e 's|@''REPLACE_CLOSE''@|$(REPLACE_CLOSE)|g' \ -e 's|@''REPLACE_DUP''@|$(REPLACE_DUP)|g' \ -e 's|@''REPLACE_DUP2''@|$(REPLACE_DUP2)|g' \ @@ -1965,6 +2062,7 @@ unistd.h: unistd.in.h $(top_builddir)/config.status $(CXXDEFS_H) $(ARG_NONNULL_H -e 's|@''REPLACE_UNLINKAT''@|$(REPLACE_UNLINKAT)|g' \ -e 's|@''REPLACE_USLEEP''@|$(REPLACE_USLEEP)|g' \ -e 's|@''REPLACE_WRITE''@|$(REPLACE_WRITE)|g' \ + -e 's|@''UNISTD_H_HAVE_SYS_RANDOM_H''@|$(UNISTD_H_HAVE_SYS_RANDOM_H)|g' \ -e 's|@''UNISTD_H_HAVE_WINSOCK2_H''@|$(UNISTD_H_HAVE_WINSOCK2_H)|g' \ -e 's|@''UNISTD_H_HAVE_WINSOCK2_H_AND_USE_SOCKETS''@|$(UNISTD_H_HAVE_WINSOCK2_H_AND_USE_SOCKETS)|g' \ -e '/definitions of _GL_FUNCDECL_RPL/r $(CXXDEFS_H)' \ @@ -2069,6 +2167,7 @@ wchar.h: wchar.in.h $(top_builddir)/config.status $(CXXDEFS_H) $(ARG_NONNULL_H) -e 's/@''GNULIB_WMEMCMP''@/$(GNULIB_WMEMCMP)/g' \ -e 's/@''GNULIB_WMEMCPY''@/$(GNULIB_WMEMCPY)/g' \ -e 's/@''GNULIB_WMEMMOVE''@/$(GNULIB_WMEMMOVE)/g' \ + -e 's/@''GNULIB_WMEMPCPY''@/$(GNULIB_WMEMPCPY)/g' \ -e 's/@''GNULIB_WMEMSET''@/$(GNULIB_WMEMSET)/g' \ -e 's/@''GNULIB_WCSLEN''@/$(GNULIB_WCSLEN)/g' \ -e 's/@''GNULIB_WCSNLEN''@/$(GNULIB_WCSNLEN)/g' \ @@ -2109,6 +2208,7 @@ wchar.h: wchar.in.h $(top_builddir)/config.status $(CXXDEFS_H) $(ARG_NONNULL_H) -e 's|@''HAVE_WMEMCMP''@|$(HAVE_WMEMCMP)|g' \ -e 's|@''HAVE_WMEMCPY''@|$(HAVE_WMEMCPY)|g' \ -e 's|@''HAVE_WMEMMOVE''@|$(HAVE_WMEMMOVE)|g' \ + -e 's|@''HAVE_WMEMPCPY''@|$(HAVE_WMEMPCPY)|g' \ -e 's|@''HAVE_WMEMSET''@|$(HAVE_WMEMSET)|g' \ -e 's|@''HAVE_WCSLEN''@|$(HAVE_WCSLEN)|g' \ -e 's|@''HAVE_WCSNLEN''@|$(HAVE_WCSNLEN)|g' \ @@ -2135,6 +2235,7 @@ wchar.h: wchar.in.h $(top_builddir)/config.status $(CXXDEFS_H) $(ARG_NONNULL_H) -e 's|@''HAVE_WCSWIDTH''@|$(HAVE_WCSWIDTH)|g' \ -e 's|@''HAVE_WCSFTIME''@|$(HAVE_WCSFTIME)|g' \ -e 's|@''HAVE_DECL_WCTOB''@|$(HAVE_DECL_WCTOB)|g' \ + -e 's|@''HAVE_DECL_WCSDUP''@|$(HAVE_DECL_WCSDUP)|g' \ -e 's|@''HAVE_DECL_WCWIDTH''@|$(HAVE_DECL_WCWIDTH)|g' \ | \ sed -e 's|@''REPLACE_MBSTATE_T''@|$(REPLACE_MBSTATE_T)|g' \ @@ -2151,6 +2252,7 @@ wchar.h: wchar.in.h $(top_builddir)/config.status $(CXXDEFS_H) $(ARG_NONNULL_H) -e 's|@''REPLACE_WCWIDTH''@|$(REPLACE_WCWIDTH)|g' \ -e 's|@''REPLACE_WCSWIDTH''@|$(REPLACE_WCSWIDTH)|g' \ -e 's|@''REPLACE_WCSFTIME''@|$(REPLACE_WCSFTIME)|g' \ + -e 's|@''REPLACE_WCSTOK''@|$(REPLACE_WCSTOK)|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)'; \ @@ -2190,6 +2292,8 @@ wctype.h: wctype.in.h $(top_builddir)/config.status $(CXXDEFS_H) $(WARN_ON_USE_H -e 's/@''HAVE_CRTDEFS_H''@/$(HAVE_CRTDEFS_H)/g' \ -e 's/@''GNULIB_OVERRIDES_WINT_T''@/$(GNULIB_OVERRIDES_WINT_T)/g' \ -e 's/@''GNULIB_ISWBLANK''@/$(GNULIB_ISWBLANK)/g' \ + -e 's/@''GNULIB_ISWDIGIT''@/$(GNULIB_ISWDIGIT)/g' \ + -e 's/@''GNULIB_ISWXDIGIT''@/$(GNULIB_ISWXDIGIT)/g' \ -e 's/@''GNULIB_WCTYPE''@/$(GNULIB_WCTYPE)/g' \ -e 's/@''GNULIB_ISWCTYPE''@/$(GNULIB_ISWCTYPE)/g' \ -e 's/@''GNULIB_WCTRANS''@/$(GNULIB_WCTRANS)/g' \ @@ -2200,6 +2304,8 @@ wctype.h: wctype.in.h $(top_builddir)/config.status $(CXXDEFS_H) $(WARN_ON_USE_H -e 's/@''HAVE_WCTRANS_T''@/$(HAVE_WCTRANS_T)/g' \ -e 's/@''HAVE_WINT_T''@/$(HAVE_WINT_T)/g' \ -e 's/@''REPLACE_ISWBLANK''@/$(REPLACE_ISWBLANK)/g' \ + -e 's/@''REPLACE_ISWDIGIT''@/$(REPLACE_ISWDIGIT)/g' \ + -e 's/@''REPLACE_ISWXDIGIT''@/$(REPLACE_ISWXDIGIT)/g' \ -e 's/@''REPLACE_ISWCNTRL''@/$(REPLACE_ISWCNTRL)/g' \ -e 's/@''REPLACE_TOWLOWER''@/$(REPLACE_TOWLOWER)/g' \ -e '/definitions of _GL_FUNCDECL_RPL/r $(CXXDEFS_H)' \ @@ -2261,6 +2367,8 @@ EXTRA_DIST += xalloc.h libgnulib_la_SOURCES += xalloc-die.c +EXTRA_DIST += xalloc.h + ## end gnulib module xalloc-die ## begin gnulib module xalloc-oversized @@ -2278,7 +2386,7 @@ libgnulib_la_SOURCES += xstrndup.h xstrndup.c ## begin gnulib module xstrtol -libgnulib_la_SOURCES += xstrtol.c xstrtoul.c xstrtol-error.c +libgnulib_la_SOURCES += xstrtol.c xstrtoul.c EXTRA_DIST += xstrtol.h @@ -2286,10 +2394,7 @@ EXTRA_DIST += xstrtol.h ## begin gnulib module xstrtoll - -EXTRA_DIST += xstrtoll.c xstrtoull.c - -EXTRA_libgnulib_la_SOURCES += xstrtoll.c xstrtoull.c +libgnulib_la_SOURCES += xstrtoll.c xstrtoull.c ## end gnulib module xstrtoll diff --git a/lib/hard-locale.c b/lib/hard-locale.c index dcfcad6..730e9be 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-2019 Free Software + Copyright (C) 1997-1999, 2002-2004, 2006-2007, 2009-2020 Free Software Foundation, Inc. This program is free software: you can redistribute it and/or modify @@ -21,52 +21,15 @@ #include "hard-locale.h" #include -#include #include -#ifdef __GLIBC__ -# define GLIBC_VERSION __GLIBC__ -#elif defined __UCLIBC__ -# define GLIBC_VERSION 2 -#else -# define GLIBC_VERSION 0 -#endif - -/* Return true if the current CATEGORY locale is hard, i.e. if you - can't get away with assuming traditional C or POSIX behavior. */ bool hard_locale (int category) { - bool hard = true; - char const *p = setlocale (category, NULL); - - if (p) - { - if (2 <= GLIBC_VERSION) - { - if (strcmp (p, "C") == 0 || strcmp (p, "POSIX") == 0) - hard = false; - } - else - { - char *locale = strdup (p); - if (locale) - { - /* Temporarily set the locale to the "C" and "POSIX" locales - to find their names, so that we can determine whether one - or the other is the caller's locale. */ - if (((p = setlocale (category, "C")) - && strcmp (p, locale) == 0) - || ((p = setlocale (category, "POSIX")) - && strcmp (p, locale) == 0)) - hard = false; + char locale[SETLOCALE_NULL_MAX]; - /* Restore the caller's locale. */ - setlocale (category, locale); - free (locale); - } - } - } + if (setlocale_null_r (category, locale, sizeof (locale))) + return false; - return hard; + return !(strcmp (locale, "C") == 0 || strcmp (locale, "POSIX") == 0); } diff --git a/lib/hard-locale.h b/lib/hard-locale.h index 8f1da96..1886eaa 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-2019 Free Software Foundation, Inc. + Copyright (C) 1999, 2003-2004, 2009-2020 Free Software Foundation, Inc. This program is free software: you can redistribute it and/or modify it under the terms of the GNU General Public License as published by @@ -20,6 +20,9 @@ # include -bool hard_locale (int); +/* 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. */ +extern bool hard_locale (int category); #endif /* HARD_LOCALE_H_ */ diff --git a/lib/idx.h b/lib/idx.h new file mode 100644 index 0000000..a2c1de9 --- /dev/null +++ b/lib/idx.h @@ -0,0 +1,118 @@ +/* A type for indices and sizes. + + Copyright (C) 2020 Free Software Foundation, Inc. + + This program is free software; you can redistribute it and/or modify + it under the terms of the GNU General Public License as published by + the Free Software Foundation; either version 3, or (at your option) + any later version. + + This program is distributed in the hope that it will be useful, + but WITHOUT ANY WARRANTY; without even the implied warranty of + MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + GNU General Public License for more details. + + You should have received a copy of the GNU General Public License + along with this program; if not, see . */ + +#ifndef _IDX_H +#define _IDX_H + +/* Get ptrdiff_t. */ +#include + +/* Get PTRDIFF_WIDTH. */ +#include + +/* The type 'idx_t' holds an (array) index or an (object) size. + Its implementation is a signed integer type, capable of holding the values + 0..2^63-1 (on 64-bit platforms) or + 0..2^31-1 (on 32-bit platforms). + + Why a signed integer type? + + * Security: Signed types can be checked for overflow via + '-fsanitize=undefined', but unsigned types cannot. + + * Comparisons without surprises: ISO C99 § 6.3.1.8 specifies a few + surprising results for comparisons, such as + + (int) -3 < (unsigned long) 7 => false + (int) -3 < (unsigned int) 7 => false + and on 32-bit machines: + (long) -3 < (unsigned int) 7 => false + + This is surprising because the natural comparison order is by + value in the realm of infinite-precision signed integers (ℤ). + + The best way to get rid of such surprises is to use signed types + for numerical integer values, and use unsigned types only for + bit masks and enums. + + Why not use 'size_t' directly? + + * Because 'size_t' is an unsigned type, and a signed type is better. + See above. + + Why not use 'ptrdiff_t' directly? + + * Maintainability: When reading and modifying code, it helps to know that + a certain variable cannot have negative values. For example, when you + have a loop + + int n = ...; + for (int i = 0; i < n; i++) ... + + or + + ptrdiff_t n = ...; + for (ptrdiff_t i = 0; i < n; i++) ... + + you have to ask yourself "what if n < 0?". Whereas in + + idx_t n = ...; + for (idx_t i = 0; i < n; i++) ... + + you know that this case cannot happen. + + Similarly, when a programmer writes + + idx_t = ptr2 - ptr1; + + there is an implied assertion that ptr1 and ptr2 point into the same + object and that ptr1 <= ptr2. + + * Being future-proof: In the future, range types (integers which are + constrained to a certain range of values) may be added to C compilers + or to the C standard. Several programming languages (Ada, Haskell, + Common Lisp, Pascal) already have range types. Such range types may + help producing good code and good warnings. The type 'idx_t' could + then be typedef'ed to a (signed!) range type. */ + +#if 0 +/* In the future, idx_t could be typedef'ed to a signed range type. */ +/* Note: The clang "extended integer types", supported in Clang 11 or newer + , + are a special case of range types. However, these types don't support binary + operators with plain integer types (e.g. expressions such as x > 1). + Therefore, they don't behave like signed types (and not like unsigned types + either). So, we cannot use them here. */ +typedef idx_t; +#else +/* Use the signed type 'ptrdiff_t' by default. */ +/* Note: ISO C does not mandate that 'size_t' and 'ptrdiff_t' have the same + size, but it is so an all platforms we have seen since 1990. */ +typedef ptrdiff_t idx_t; +#endif + +/* IDX_MAX is the maximum value of an idx_t. */ +#if defined UNSIGNED_IDX_T +# define IDX_MAX SIZE_MAX +#else +# define IDX_MAX PTRDIFF_MAX +#endif + +/* IDX_WIDTH is the number of bits in an idx_t (31 or 63). */ +#define IDX_WIDTH (PTRDIFF_WIDTH - 1) + +#endif /* _IDX_H */ diff --git a/lib/intprops.h b/lib/intprops.h index 1a44ae5..f29c421 100644 --- a/lib/intprops.h +++ b/lib/intprops.h @@ -1,6 +1,6 @@ /* intprops.h -- properties of integer types - Copyright (C) 2001-2019 Free Software Foundation, Inc. + Copyright (C) 2001-2020 Free Software Foundation, Inc. This program is free software: you can redistribute it and/or modify it under the terms of the GNU General Public License as published @@ -48,7 +48,7 @@ /* Minimum and maximum values for integer types and expressions. */ /* The width in bits of the integer type or expression T. - Do not evaluate 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) @@ -70,7 +70,7 @@ ? _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) + 0) - 2)) - 1) * 2 + 1) + (((_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 @@ -86,6 +86,7 @@ /* 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 @@ -94,8 +95,9 @@ #endif /* Return 1 if the integer type or expression T might be signed. Return 0 - if it is definitely unsigned. This macro does not evaluate its argument, - and expands to an integer constant expression. */ + 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 @@ -108,18 +110,20 @@ #define INT_BITS_STRLEN_BOUND(b) (((b) * 146 + 484) / 485) /* Bound on length of the string representing an integer type or expression T. + T must not be a bit-field expression. + Subtract 1 for the sign bit if T is signed, and then add 1 more for a minus sign if needed. - Because _GL_SIGNED_TYPE_OR_EXPR sometimes returns 0 when its argument is - signed, this macro may overestimate the true bound by one byte when + Because _GL_SIGNED_TYPE_OR_EXPR sometimes returns 1 when its argument is + unsigned, this macro may overestimate the true bound by one byte when applied to unsigned types of size 2, 4, 16, ... bytes. */ #define INT_STRLEN_BOUND(t) \ (INT_BITS_STRLEN_BOUND (TYPE_WIDTH (t) - _GL_SIGNED_TYPE_OR_EXPR (t)) \ + _GL_SIGNED_TYPE_OR_EXPR (t)) /* Bound on buffer size needed to represent an integer type or expression T, - including the terminating null. */ + including the terminating null. T must not be a bit-field expression. */ #define INT_BUFSIZE_BOUND(t) (INT_STRLEN_BOUND (t) + 1) @@ -220,15 +224,33 @@ ? (a) < (min) >> (b) \ : (max) >> (b) < (a)) -/* True if __builtin_add_overflow (A, B, P) works when P is non-null. */ +/* True if __builtin_add_overflow (A, B, P) and __builtin_sub_overflow + (A, B, P) work when P is non-null. */ #if 5 <= __GNUC__ && !defined __ICC -# define _GL_HAS_BUILTIN_OVERFLOW 1 +# define _GL_HAS_BUILTIN_ADD_OVERFLOW 1 +#elif defined __has_builtin +# define _GL_HAS_BUILTIN_ADD_OVERFLOW __has_builtin (__builtin_add_overflow) +#else +# define _GL_HAS_BUILTIN_ADD_OVERFLOW 0 +#endif + +/* True if __builtin_mul_overflow (A, B, P) works when P is non-null. */ +#ifdef __clang__ +/* Work around Clang bug . */ +# define _GL_HAS_BUILTIN_MUL_OVERFLOW 0 #else -# define _GL_HAS_BUILTIN_OVERFLOW 0 +# define _GL_HAS_BUILTIN_MUL_OVERFLOW _GL_HAS_BUILTIN_ADD_OVERFLOW #endif -/* True if __builtin_add_overflow_p (A, B, C) works. */ -#define _GL_HAS_BUILTIN_OVERFLOW_P (7 <= __GNUC__) +/* True if __builtin_add_overflow_p (A, B, C) works, and similarly for + __builtin_sub_overflow_p and __builtin_mul_overflow_p. */ +#ifdef __clang__ +/* Clang 9 lacks __builtin_mul_overflow_p, and even if it did it would + presumably run afoul of Clang bug 16404. */ +# define _GL_HAS_BUILTIN_OVERFLOW_P 0 +#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 @@ -281,7 +303,9 @@ The INT__OVERFLOW macros return 1 if the corresponding C operators might not yield numerically correct answers due to arithmetic overflow. - The INT__WRAPV macros also store the low-order bits of the answer. + The INT__WRAPV macros compute the low-order bits of the sum, + difference, and product of two C integers, and return 1 if these + low-order bits are not numerically correct. These macros work correctly on all known practical hosts, and do not rely on undefined behavior due to signed arithmetic overflow. @@ -309,9 +333,11 @@ arguments should not have side effects. The WRAPV macros are not constant expressions. They support only - +, binary -, and *. The result type must be signed. + +, binary -, and *. Because the WRAPV macros convert the result, + they report overflow in different circumstances than the OVERFLOW + macros do. - These macros are tuned for their last argument being a constant. + These macros are tuned for their last input argument being a constant. Return 1 if the integer expressions A * B, A - B, -A, A * B, A / B, A % B, and A << B would overflow, respectively. */ @@ -347,73 +373,139 @@ /* 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. */ -#define INT_ADD_WRAPV(a, b, r) \ - _GL_INT_OP_WRAPV (a, b, r, +, __builtin_add_overflow, INT_ADD_OVERFLOW) -#define INT_SUBTRACT_WRAPV(a, b, r) \ - _GL_INT_OP_WRAPV (a, b, r, -, __builtin_sub_overflow, INT_SUBTRACT_OVERFLOW) -#define INT_MULTIPLY_WRAPV(a, b, r) \ - _GL_INT_OP_WRAPV (a, b, r, *, __builtin_mul_overflow, INT_MULTIPLY_OVERFLOW) +#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__)) +# 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 older compilers that - lack __builtin_add_overflow. */ -#if __GNUC__ + 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 B into *R, where OP specifies - the operation. BUILTIN is the builtin operation, and OVERFLOW the - overflow predicate. Return 1 if the result overflows. See above - for restrictions. */ -#if _GL_HAS_BUILTIN_OVERFLOW -# define _GL_INT_OP_WRAPV(a, b, r, op, builtin, overflow) builtin (a, b, r) -#elif 201112 <= __STDC_VERSION__ && !_GL__GENERIC_BOGUS -# define _GL_INT_OP_WRAPV(a, b, r, op, builtin, overflow) \ + 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))) + 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 -# define _GL_INT_OP_WRAPV(a, b, r, op, builtin, overflow) \ +/* Store the low-order bits of A 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_CALC (a, b, r, op, overflow, unsigned int, \ - signed char, SCHAR_MIN, SCHAR_MAX) \ + ? _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_CALC (a, b, r, op, overflow, unsigned int, \ - short int, SHRT_MIN, SHRT_MAX) \ + ? _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_INT_OP_CALC (a, b, r, op, overflow, unsigned int, \ - int, INT_MIN, INT_MAX) \ + ? (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_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 long int, \ - long long int, LLONG_MIN, LLONG_MAX)) + ? (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) \ - _GL_INT_OP_CALC (a, b, r, op, overflow, unsigned long int, \ - long int, LONG_MIN, LONG_MAX) + (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 @@ -422,13 +514,7 @@ 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) \ - (sizeof ((a) op (b)) < sizeof (t) \ - ? _GL_INT_OP_CALC1 ((t) (a), (t) (b), r, op, overflow, ut, t, tmin, tmax) \ - : _GL_INT_OP_CALC1 (a, b, r, op, overflow, ut, t, tmin, tmax)) -#define _GL_INT_OP_CALC1(a, b, r, op, overflow, ut, t, tmin, tmax) \ - ((overflow (a, b) \ - || (EXPR_SIGNED ((a) op (b)) && ((a) op (b)) < (tmin)) \ - || (tmax) < ((a) op (b))) \ + (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)) @@ -452,4 +538,86 @@ #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))) + +/* 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; + otherwise, they return 0 and may modify *R. + + Example usage: + + long int result; + if (INT_ADD_OK (a, b, &result)) + printf ("result is %ld\n", result); + else + printf ("overflow\n"); + + A, B, and *R should be integers; they need not be the same type, + and they need not be all signed or all unsigned. + + These macros work correctly on all known practical hosts, and do not rely + on undefined behavior due to signed arithmetic overflow. + + These macros are not constant expressions. + + These macros may evaluate their arguments zero or multiple times, so the + arguments should not have side effects. + + 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) + #endif /* _GL_INTPROPS_H */ diff --git a/lib/inttypes.in.h b/lib/inttypes.in.h index d3c735c..596a050 100644 --- a/lib/inttypes.in.h +++ b/lib/inttypes.in.h @@ -1,4 +1,4 @@ -/* Copyright (C) 2006-2019 Free Software Foundation, Inc. +/* Copyright (C) 2006-2020 Free Software Foundation, Inc. Written by Paul Eggert, Bruno Haible, Derek Price. This file is part of gnulib. @@ -17,7 +17,7 @@ /* * ISO C 99 for platforms that lack it. - * + * */ #if __GNUC__ >= 3 @@ -38,6 +38,8 @@ # endif # @INCLUDE_NEXT@ @NEXT_INTTYPES_H@ + +# define _GL_FINISHED_INCLUDING_SYSTEM_INTTYPES_H # endif #endif @@ -49,15 +51,15 @@ #ifndef __GLIBC__ # include #endif -/* Get CHAR_BIT. */ +/* Get CHAR_BIT, INT_MAX, LONG_MAX, etc. */ #include /* On mingw, __USE_MINGW_ANSI_STDIO only works if is also included */ #if defined _WIN32 && ! defined __CYGWIN__ # include #endif -#if !(INT_MIN == INT32_MIN && INT_MAX == INT32_MAX) -# error "This file assumes that 'int' has exactly 32 bits. Please report your platform and compiler to ." +#if !(INT_MAX == 0x7fffffff && INT_MIN + INT_MAX == -1) +# error "This file assumes that 'int' is 32-bit two's complement. Please report your platform and compiler to ." #endif /* The definitions of _GL_FUNCDECL_RPL etc. are copied here. */ @@ -76,110 +78,92 @@ # define _LONG_LONG_FORMAT_PREFIX "ll" #endif -#if !defined PRId8 || @PRI_MACROS_BROKEN@ -# undef PRId8 +#if !defined PRId8 # ifdef INT8_MAX # define PRId8 "d" # endif #endif -#if !defined PRIi8 || @PRI_MACROS_BROKEN@ -# undef PRIi8 +#if !defined PRIi8 # ifdef INT8_MAX # define PRIi8 "i" # endif #endif -#if !defined PRIo8 || @PRI_MACROS_BROKEN@ -# undef PRIo8 +#if !defined PRIo8 # ifdef UINT8_MAX # define PRIo8 "o" # endif #endif -#if !defined PRIu8 || @PRI_MACROS_BROKEN@ -# undef PRIu8 +#if !defined PRIu8 # ifdef UINT8_MAX # define PRIu8 "u" # endif #endif -#if !defined PRIx8 || @PRI_MACROS_BROKEN@ -# undef PRIx8 +#if !defined PRIx8 # ifdef UINT8_MAX # define PRIx8 "x" # endif #endif -#if !defined PRIX8 || @PRI_MACROS_BROKEN@ -# undef PRIX8 +#if !defined PRIX8 # ifdef UINT8_MAX # define PRIX8 "X" # endif #endif -#if !defined PRId16 || @PRI_MACROS_BROKEN@ -# undef PRId16 +#if !defined PRId16 # ifdef INT16_MAX # define PRId16 "d" # endif #endif -#if !defined PRIi16 || @PRI_MACROS_BROKEN@ -# undef PRIi16 +#if !defined PRIi16 # ifdef INT16_MAX # define PRIi16 "i" # endif #endif -#if !defined PRIo16 || @PRI_MACROS_BROKEN@ -# undef PRIo16 +#if !defined PRIo16 # ifdef UINT16_MAX # define PRIo16 "o" # endif #endif -#if !defined PRIu16 || @PRI_MACROS_BROKEN@ -# undef PRIu16 +#if !defined PRIu16 # ifdef UINT16_MAX # define PRIu16 "u" # endif #endif -#if !defined PRIx16 || @PRI_MACROS_BROKEN@ -# undef PRIx16 +#if !defined PRIx16 # ifdef UINT16_MAX # define PRIx16 "x" # endif #endif -#if !defined PRIX16 || @PRI_MACROS_BROKEN@ -# undef PRIX16 +#if !defined PRIX16 # ifdef UINT16_MAX # define PRIX16 "X" # endif #endif -#if !defined PRId32 || @PRI_MACROS_BROKEN@ -# undef PRId32 +#if !defined PRId32 # ifdef INT32_MAX # define PRId32 "d" # endif #endif -#if !defined PRIi32 || @PRI_MACROS_BROKEN@ -# undef PRIi32 +#if !defined PRIi32 # ifdef INT32_MAX # define PRIi32 "i" # endif #endif -#if !defined PRIo32 || @PRI_MACROS_BROKEN@ -# undef PRIo32 +#if !defined PRIo32 # ifdef UINT32_MAX # define PRIo32 "o" # endif #endif -#if !defined PRIu32 || @PRI_MACROS_BROKEN@ -# undef PRIu32 +#if !defined PRIu32 # ifdef UINT32_MAX # define PRIu32 "u" # endif #endif -#if !defined PRIx32 || @PRI_MACROS_BROKEN@ -# undef PRIx32 +#if !defined PRIx32 # ifdef UINT32_MAX # define PRIx32 "x" # endif #endif -#if !defined PRIX32 || @PRI_MACROS_BROKEN@ -# undef PRIX32 +#if !defined PRIX32 # ifdef UINT32_MAX # define PRIX32 "X" # endif @@ -189,15 +173,13 @@ # define _PRI64_PREFIX "l" # elif defined _MSC_VER || defined __MINGW32__ # define _PRI64_PREFIX "I64" -# elif @HAVE_LONG_LONG_INT@ && LONG_MAX >> 30 == 1 +# elif LONG_MAX >> 30 == 1 # define _PRI64_PREFIX _LONG_LONG_FORMAT_PREFIX # endif -# if !defined PRId64 || @PRI_MACROS_BROKEN@ -# undef PRId64 +# if !defined PRId64 # define PRId64 _PRI64_PREFIX "d" # endif -# if !defined PRIi64 || @PRI_MACROS_BROKEN@ -# undef PRIi64 +# if !defined PRIi64 # define PRIi64 _PRI64_PREFIX "i" # endif #endif @@ -206,266 +188,220 @@ # define _PRIu64_PREFIX "l" # elif defined _MSC_VER || defined __MINGW32__ # define _PRIu64_PREFIX "I64" -# elif @HAVE_UNSIGNED_LONG_LONG_INT@ && ULONG_MAX >> 31 == 1 +# elif ULONG_MAX >> 31 == 1 # define _PRIu64_PREFIX _LONG_LONG_FORMAT_PREFIX # endif -# if !defined PRIo64 || @PRI_MACROS_BROKEN@ -# undef PRIo64 +# if !defined PRIo64 # define PRIo64 _PRIu64_PREFIX "o" # endif -# if !defined PRIu64 || @PRI_MACROS_BROKEN@ -# undef PRIu64 +# if !defined PRIu64 # define PRIu64 _PRIu64_PREFIX "u" # endif -# if !defined PRIx64 || @PRI_MACROS_BROKEN@ -# undef PRIx64 +# if !defined PRIx64 # define PRIx64 _PRIu64_PREFIX "x" # endif -# if !defined PRIX64 || @PRI_MACROS_BROKEN@ -# undef PRIX64 +# if !defined PRIX64 # define PRIX64 _PRIu64_PREFIX "X" # endif #endif -#if !defined PRIdLEAST8 || @PRI_MACROS_BROKEN@ -# undef PRIdLEAST8 +#if !defined PRIdLEAST8 # define PRIdLEAST8 "d" #endif -#if !defined PRIiLEAST8 || @PRI_MACROS_BROKEN@ -# undef PRIiLEAST8 +#if !defined PRIiLEAST8 # define PRIiLEAST8 "i" #endif -#if !defined PRIoLEAST8 || @PRI_MACROS_BROKEN@ -# undef PRIoLEAST8 +#if !defined PRIoLEAST8 # define PRIoLEAST8 "o" #endif -#if !defined PRIuLEAST8 || @PRI_MACROS_BROKEN@ -# undef PRIuLEAST8 +#if !defined PRIuLEAST8 # define PRIuLEAST8 "u" #endif -#if !defined PRIxLEAST8 || @PRI_MACROS_BROKEN@ -# undef PRIxLEAST8 +#if !defined PRIxLEAST8 # define PRIxLEAST8 "x" #endif -#if !defined PRIXLEAST8 || @PRI_MACROS_BROKEN@ -# undef PRIXLEAST8 +#if !defined PRIXLEAST8 # define PRIXLEAST8 "X" #endif -#if !defined PRIdLEAST16 || @PRI_MACROS_BROKEN@ -# undef PRIdLEAST16 +#if !defined PRIdLEAST16 # define PRIdLEAST16 "d" #endif -#if !defined PRIiLEAST16 || @PRI_MACROS_BROKEN@ -# undef PRIiLEAST16 +#if !defined PRIiLEAST16 # define PRIiLEAST16 "i" #endif -#if !defined PRIoLEAST16 || @PRI_MACROS_BROKEN@ -# undef PRIoLEAST16 +#if !defined PRIoLEAST16 # define PRIoLEAST16 "o" #endif -#if !defined PRIuLEAST16 || @PRI_MACROS_BROKEN@ -# undef PRIuLEAST16 +#if !defined PRIuLEAST16 # define PRIuLEAST16 "u" #endif -#if !defined PRIxLEAST16 || @PRI_MACROS_BROKEN@ -# undef PRIxLEAST16 +#if !defined PRIxLEAST16 # define PRIxLEAST16 "x" #endif -#if !defined PRIXLEAST16 || @PRI_MACROS_BROKEN@ -# undef PRIXLEAST16 +#if !defined PRIXLEAST16 # define PRIXLEAST16 "X" #endif -#if !defined PRIdLEAST32 || @PRI_MACROS_BROKEN@ -# undef PRIdLEAST32 +#if !defined PRIdLEAST32 # define PRIdLEAST32 "d" #endif -#if !defined PRIiLEAST32 || @PRI_MACROS_BROKEN@ -# undef PRIiLEAST32 +#if !defined PRIiLEAST32 # define PRIiLEAST32 "i" #endif -#if !defined PRIoLEAST32 || @PRI_MACROS_BROKEN@ -# undef PRIoLEAST32 +#if !defined PRIoLEAST32 # define PRIoLEAST32 "o" #endif -#if !defined PRIuLEAST32 || @PRI_MACROS_BROKEN@ -# undef PRIuLEAST32 +#if !defined PRIuLEAST32 # define PRIuLEAST32 "u" #endif -#if !defined PRIxLEAST32 || @PRI_MACROS_BROKEN@ -# undef PRIxLEAST32 +#if !defined PRIxLEAST32 # define PRIxLEAST32 "x" #endif -#if !defined PRIXLEAST32 || @PRI_MACROS_BROKEN@ -# undef PRIXLEAST32 +#if !defined PRIXLEAST32 # define PRIXLEAST32 "X" #endif #ifdef INT64_MAX -# if !defined PRIdLEAST64 || @PRI_MACROS_BROKEN@ -# undef PRIdLEAST64 +# if !defined PRIdLEAST64 # define PRIdLEAST64 PRId64 # endif -# if !defined PRIiLEAST64 || @PRI_MACROS_BROKEN@ -# undef PRIiLEAST64 +# if !defined PRIiLEAST64 # define PRIiLEAST64 PRIi64 # endif #endif #ifdef UINT64_MAX -# if !defined PRIoLEAST64 || @PRI_MACROS_BROKEN@ -# undef PRIoLEAST64 +# if !defined PRIoLEAST64 # define PRIoLEAST64 PRIo64 # endif -# if !defined PRIuLEAST64 || @PRI_MACROS_BROKEN@ -# undef PRIuLEAST64 +# if !defined PRIuLEAST64 # define PRIuLEAST64 PRIu64 # endif -# if !defined PRIxLEAST64 || @PRI_MACROS_BROKEN@ -# undef PRIxLEAST64 +# if !defined PRIxLEAST64 # define PRIxLEAST64 PRIx64 # endif -# if !defined PRIXLEAST64 || @PRI_MACROS_BROKEN@ -# undef PRIXLEAST64 +# if !defined PRIXLEAST64 # define PRIXLEAST64 PRIX64 # endif #endif -#if !defined PRIdFAST8 || @PRI_MACROS_BROKEN@ -# undef PRIdFAST8 +#if !defined PRIdFAST8 # if INT_FAST8_MAX > INT32_MAX # define PRIdFAST8 PRId64 # else # define PRIdFAST8 "d" # endif #endif -#if !defined PRIiFAST8 || @PRI_MACROS_BROKEN@ -# undef PRIiFAST8 +#if !defined PRIiFAST8 # if INT_FAST8_MAX > INT32_MAX # define PRIiFAST8 PRIi64 # else # define PRIiFAST8 "i" # endif #endif -#if !defined PRIoFAST8 || @PRI_MACROS_BROKEN@ -# undef PRIoFAST8 +#if !defined PRIoFAST8 # if UINT_FAST8_MAX > UINT32_MAX # define PRIoFAST8 PRIo64 # else # define PRIoFAST8 "o" # endif #endif -#if !defined PRIuFAST8 || @PRI_MACROS_BROKEN@ -# undef PRIuFAST8 +#if !defined PRIuFAST8 # if UINT_FAST8_MAX > UINT32_MAX # define PRIuFAST8 PRIu64 # else # define PRIuFAST8 "u" # endif #endif -#if !defined PRIxFAST8 || @PRI_MACROS_BROKEN@ -# undef PRIxFAST8 +#if !defined PRIxFAST8 # if UINT_FAST8_MAX > UINT32_MAX # define PRIxFAST8 PRIx64 # else # define PRIxFAST8 "x" # endif #endif -#if !defined PRIXFAST8 || @PRI_MACROS_BROKEN@ -# undef PRIXFAST8 +#if !defined PRIXFAST8 # if UINT_FAST8_MAX > UINT32_MAX # define PRIXFAST8 PRIX64 # else # define PRIXFAST8 "X" # endif #endif -#if !defined PRIdFAST16 || @PRI_MACROS_BROKEN@ -# undef PRIdFAST16 +#if !defined PRIdFAST16 # if INT_FAST16_MAX > INT32_MAX # define PRIdFAST16 PRId64 # else # define PRIdFAST16 "d" # endif #endif -#if !defined PRIiFAST16 || @PRI_MACROS_BROKEN@ -# undef PRIiFAST16 +#if !defined PRIiFAST16 # if INT_FAST16_MAX > INT32_MAX # define PRIiFAST16 PRIi64 # else # define PRIiFAST16 "i" # endif #endif -#if !defined PRIoFAST16 || @PRI_MACROS_BROKEN@ -# undef PRIoFAST16 +#if !defined PRIoFAST16 # if UINT_FAST16_MAX > UINT32_MAX # define PRIoFAST16 PRIo64 # else # define PRIoFAST16 "o" # endif #endif -#if !defined PRIuFAST16 || @PRI_MACROS_BROKEN@ -# undef PRIuFAST16 +#if !defined PRIuFAST16 # if UINT_FAST16_MAX > UINT32_MAX # define PRIuFAST16 PRIu64 # else # define PRIuFAST16 "u" # endif #endif -#if !defined PRIxFAST16 || @PRI_MACROS_BROKEN@ -# undef PRIxFAST16 +#if !defined PRIxFAST16 # if UINT_FAST16_MAX > UINT32_MAX # define PRIxFAST16 PRIx64 # else # define PRIxFAST16 "x" # endif #endif -#if !defined PRIXFAST16 || @PRI_MACROS_BROKEN@ -# undef PRIXFAST16 +#if !defined PRIXFAST16 # if UINT_FAST16_MAX > UINT32_MAX # define PRIXFAST16 PRIX64 # else # define PRIXFAST16 "X" # endif #endif -#if !defined PRIdFAST32 || @PRI_MACROS_BROKEN@ -# undef PRIdFAST32 +#if !defined PRIdFAST32 # if INT_FAST32_MAX > INT32_MAX # define PRIdFAST32 PRId64 # else # define PRIdFAST32 "d" # endif #endif -#if !defined PRIiFAST32 || @PRI_MACROS_BROKEN@ -# undef PRIiFAST32 +#if !defined PRIiFAST32 # if INT_FAST32_MAX > INT32_MAX # define PRIiFAST32 PRIi64 # else # define PRIiFAST32 "i" # endif #endif -#if !defined PRIoFAST32 || @PRI_MACROS_BROKEN@ -# undef PRIoFAST32 +#if !defined PRIoFAST32 # if UINT_FAST32_MAX > UINT32_MAX # define PRIoFAST32 PRIo64 # else # define PRIoFAST32 "o" # endif #endif -#if !defined PRIuFAST32 || @PRI_MACROS_BROKEN@ -# undef PRIuFAST32 +#if !defined PRIuFAST32 # if UINT_FAST32_MAX > UINT32_MAX # define PRIuFAST32 PRIu64 # else # define PRIuFAST32 "u" # endif #endif -#if !defined PRIxFAST32 || @PRI_MACROS_BROKEN@ -# undef PRIxFAST32 +#if !defined PRIxFAST32 # if UINT_FAST32_MAX > UINT32_MAX # define PRIxFAST32 PRIx64 # else # define PRIxFAST32 "x" # endif #endif -#if !defined PRIXFAST32 || @PRI_MACROS_BROKEN@ -# undef PRIXFAST32 +#if !defined PRIXFAST32 # if UINT_FAST32_MAX > UINT32_MAX # define PRIXFAST32 PRIX64 # else @@ -473,76 +409,64 @@ # endif #endif #ifdef INT64_MAX -# if !defined PRIdFAST64 || @PRI_MACROS_BROKEN@ -# undef PRIdFAST64 +# if !defined PRIdFAST64 # define PRIdFAST64 PRId64 # endif -# if !defined PRIiFAST64 || @PRI_MACROS_BROKEN@ -# undef PRIiFAST64 +# if !defined PRIiFAST64 # define PRIiFAST64 PRIi64 # endif #endif #ifdef UINT64_MAX -# if !defined PRIoFAST64 || @PRI_MACROS_BROKEN@ -# undef PRIoFAST64 +# if !defined PRIoFAST64 # define PRIoFAST64 PRIo64 # endif -# if !defined PRIuFAST64 || @PRI_MACROS_BROKEN@ -# undef PRIuFAST64 +# if !defined PRIuFAST64 # define PRIuFAST64 PRIu64 # endif -# if !defined PRIxFAST64 || @PRI_MACROS_BROKEN@ -# undef PRIxFAST64 +# if !defined PRIxFAST64 # define PRIxFAST64 PRIx64 # endif -# if !defined PRIXFAST64 || @PRI_MACROS_BROKEN@ -# undef PRIXFAST64 +# if !defined PRIXFAST64 # define PRIXFAST64 PRIX64 # endif #endif -#if !defined PRIdMAX || @PRI_MACROS_BROKEN@ -# undef PRIdMAX +#if !defined PRIdMAX # if @INT32_MAX_LT_INTMAX_MAX@ # define PRIdMAX PRId64 # else # define PRIdMAX "ld" # endif #endif -#if !defined PRIiMAX || @PRI_MACROS_BROKEN@ -# undef PRIiMAX +#if !defined PRIiMAX # if @INT32_MAX_LT_INTMAX_MAX@ # define PRIiMAX PRIi64 # else # define PRIiMAX "li" # endif #endif -#if !defined PRIoMAX || @PRI_MACROS_BROKEN@ -# undef PRIoMAX +#if !defined PRIoMAX # if @UINT32_MAX_LT_UINTMAX_MAX@ # define PRIoMAX PRIo64 # else # define PRIoMAX "lo" # endif #endif -#if !defined PRIuMAX || @PRI_MACROS_BROKEN@ -# undef PRIuMAX +#if !defined PRIuMAX # if @UINT32_MAX_LT_UINTMAX_MAX@ # define PRIuMAX PRIu64 # else # define PRIuMAX "lu" # endif #endif -#if !defined PRIxMAX || @PRI_MACROS_BROKEN@ -# undef PRIxMAX +#if !defined PRIxMAX # if @UINT32_MAX_LT_UINTMAX_MAX@ # define PRIxMAX PRIx64 # else # define PRIxMAX "lx" # endif #endif -#if !defined PRIXMAX || @PRI_MACROS_BROKEN@ -# undef PRIXMAX +#if !defined PRIXMAX # if @UINT32_MAX_LT_UINTMAX_MAX@ # define PRIXMAX PRIX64 # else @@ -550,129 +474,108 @@ # endif #endif -#if !defined PRIdPTR || @PRI_MACROS_BROKEN@ -# undef PRIdPTR +#if !defined PRIdPTR # ifdef INTPTR_MAX # define PRIdPTR @PRIPTR_PREFIX@ "d" # endif #endif -#if !defined PRIiPTR || @PRI_MACROS_BROKEN@ -# undef PRIiPTR +#if !defined PRIiPTR # ifdef INTPTR_MAX # define PRIiPTR @PRIPTR_PREFIX@ "i" # endif #endif -#if !defined PRIoPTR || @PRI_MACROS_BROKEN@ -# undef PRIoPTR +#if !defined PRIoPTR # ifdef UINTPTR_MAX # define PRIoPTR @PRIPTR_PREFIX@ "o" # endif #endif -#if !defined PRIuPTR || @PRI_MACROS_BROKEN@ -# undef PRIuPTR +#if !defined PRIuPTR # ifdef UINTPTR_MAX # define PRIuPTR @PRIPTR_PREFIX@ "u" # endif #endif -#if !defined PRIxPTR || @PRI_MACROS_BROKEN@ -# undef PRIxPTR +#if !defined PRIxPTR # ifdef UINTPTR_MAX # define PRIxPTR @PRIPTR_PREFIX@ "x" # endif #endif -#if !defined PRIXPTR || @PRI_MACROS_BROKEN@ -# undef PRIXPTR +#if !defined PRIXPTR # ifdef UINTPTR_MAX # define PRIXPTR @PRIPTR_PREFIX@ "X" # endif #endif -#if !defined SCNd8 || @PRI_MACROS_BROKEN@ -# undef SCNd8 +#if !defined SCNd8 # ifdef INT8_MAX # define SCNd8 "hhd" # endif #endif -#if !defined SCNi8 || @PRI_MACROS_BROKEN@ -# undef SCNi8 +#if !defined SCNi8 # ifdef INT8_MAX # define SCNi8 "hhi" # endif #endif -#if !defined SCNo8 || @PRI_MACROS_BROKEN@ -# undef SCNo8 +#if !defined SCNo8 # ifdef UINT8_MAX # define SCNo8 "hho" # endif #endif -#if !defined SCNu8 || @PRI_MACROS_BROKEN@ -# undef SCNu8 +#if !defined SCNu8 # ifdef UINT8_MAX # define SCNu8 "hhu" # endif #endif -#if !defined SCNx8 || @PRI_MACROS_BROKEN@ -# undef SCNx8 +#if !defined SCNx8 # ifdef UINT8_MAX # define SCNx8 "hhx" # endif #endif -#if !defined SCNd16 || @PRI_MACROS_BROKEN@ -# undef SCNd16 +#if !defined SCNd16 # ifdef INT16_MAX # define SCNd16 "hd" # endif #endif -#if !defined SCNi16 || @PRI_MACROS_BROKEN@ -# undef SCNi16 +#if !defined SCNi16 # ifdef INT16_MAX # define SCNi16 "hi" # endif #endif -#if !defined SCNo16 || @PRI_MACROS_BROKEN@ -# undef SCNo16 +#if !defined SCNo16 # ifdef UINT16_MAX # define SCNo16 "ho" # endif #endif -#if !defined SCNu16 || @PRI_MACROS_BROKEN@ -# undef SCNu16 +#if !defined SCNu16 # ifdef UINT16_MAX # define SCNu16 "hu" # endif #endif -#if !defined SCNx16 || @PRI_MACROS_BROKEN@ -# undef SCNx16 +#if !defined SCNx16 # ifdef UINT16_MAX # define SCNx16 "hx" # endif #endif -#if !defined SCNd32 || @PRI_MACROS_BROKEN@ -# undef SCNd32 +#if !defined SCNd32 # ifdef INT32_MAX # define SCNd32 "d" # endif #endif -#if !defined SCNi32 || @PRI_MACROS_BROKEN@ -# undef SCNi32 +#if !defined SCNi32 # ifdef INT32_MAX # define SCNi32 "i" # endif #endif -#if !defined SCNo32 || @PRI_MACROS_BROKEN@ -# undef SCNo32 +#if !defined SCNo32 # ifdef UINT32_MAX # define SCNo32 "o" # endif #endif -#if !defined SCNu32 || @PRI_MACROS_BROKEN@ -# undef SCNu32 +#if !defined SCNu32 # ifdef UINT32_MAX # define SCNu32 "u" # endif #endif -#if !defined SCNx32 || @PRI_MACROS_BROKEN@ -# undef SCNx32 +#if !defined SCNx32 # ifdef UINT32_MAX # define SCNx32 "x" # endif @@ -682,15 +585,13 @@ # define _SCN64_PREFIX "l" # elif defined _MSC_VER || defined __MINGW32__ # define _SCN64_PREFIX "I64" -# elif @HAVE_LONG_LONG_INT@ && LONG_MAX >> 30 == 1 +# elif LONG_MAX >> 30 == 1 # define _SCN64_PREFIX _LONG_LONG_FORMAT_PREFIX # endif -# if !defined SCNd64 || @PRI_MACROS_BROKEN@ -# undef SCNd64 +# if !defined SCNd64 # define SCNd64 _SCN64_PREFIX "d" # endif -# if !defined SCNi64 || @PRI_MACROS_BROKEN@ -# undef SCNi64 +# if !defined SCNi64 # define SCNi64 _SCN64_PREFIX "i" # endif #endif @@ -699,110 +600,86 @@ # define _SCNu64_PREFIX "l" # elif defined _MSC_VER || defined __MINGW32__ # define _SCNu64_PREFIX "I64" -# elif @HAVE_UNSIGNED_LONG_LONG_INT@ && ULONG_MAX >> 31 == 1 +# elif ULONG_MAX >> 31 == 1 # define _SCNu64_PREFIX _LONG_LONG_FORMAT_PREFIX # endif -# if !defined SCNo64 || @PRI_MACROS_BROKEN@ -# undef SCNo64 +# if !defined SCNo64 # define SCNo64 _SCNu64_PREFIX "o" # endif -# if !defined SCNu64 || @PRI_MACROS_BROKEN@ -# undef SCNu64 +# if !defined SCNu64 # define SCNu64 _SCNu64_PREFIX "u" # endif -# if !defined SCNx64 || @PRI_MACROS_BROKEN@ -# undef SCNx64 +# if !defined SCNx64 # define SCNx64 _SCNu64_PREFIX "x" # endif #endif -#if !defined SCNdLEAST8 || @PRI_MACROS_BROKEN@ -# undef SCNdLEAST8 +#if !defined SCNdLEAST8 # define SCNdLEAST8 "hhd" #endif -#if !defined SCNiLEAST8 || @PRI_MACROS_BROKEN@ -# undef SCNiLEAST8 +#if !defined SCNiLEAST8 # define SCNiLEAST8 "hhi" #endif -#if !defined SCNoLEAST8 || @PRI_MACROS_BROKEN@ -# undef SCNoLEAST8 +#if !defined SCNoLEAST8 # define SCNoLEAST8 "hho" #endif -#if !defined SCNuLEAST8 || @PRI_MACROS_BROKEN@ -# undef SCNuLEAST8 +#if !defined SCNuLEAST8 # define SCNuLEAST8 "hhu" #endif -#if !defined SCNxLEAST8 || @PRI_MACROS_BROKEN@ -# undef SCNxLEAST8 +#if !defined SCNxLEAST8 # define SCNxLEAST8 "hhx" #endif -#if !defined SCNdLEAST16 || @PRI_MACROS_BROKEN@ -# undef SCNdLEAST16 +#if !defined SCNdLEAST16 # define SCNdLEAST16 "hd" #endif -#if !defined SCNiLEAST16 || @PRI_MACROS_BROKEN@ -# undef SCNiLEAST16 +#if !defined SCNiLEAST16 # define SCNiLEAST16 "hi" #endif -#if !defined SCNoLEAST16 || @PRI_MACROS_BROKEN@ -# undef SCNoLEAST16 +#if !defined SCNoLEAST16 # define SCNoLEAST16 "ho" #endif -#if !defined SCNuLEAST16 || @PRI_MACROS_BROKEN@ -# undef SCNuLEAST16 +#if !defined SCNuLEAST16 # define SCNuLEAST16 "hu" #endif -#if !defined SCNxLEAST16 || @PRI_MACROS_BROKEN@ -# undef SCNxLEAST16 +#if !defined SCNxLEAST16 # define SCNxLEAST16 "hx" #endif -#if !defined SCNdLEAST32 || @PRI_MACROS_BROKEN@ -# undef SCNdLEAST32 +#if !defined SCNdLEAST32 # define SCNdLEAST32 "d" #endif -#if !defined SCNiLEAST32 || @PRI_MACROS_BROKEN@ -# undef SCNiLEAST32 +#if !defined SCNiLEAST32 # define SCNiLEAST32 "i" #endif -#if !defined SCNoLEAST32 || @PRI_MACROS_BROKEN@ -# undef SCNoLEAST32 +#if !defined SCNoLEAST32 # define SCNoLEAST32 "o" #endif -#if !defined SCNuLEAST32 || @PRI_MACROS_BROKEN@ -# undef SCNuLEAST32 +#if !defined SCNuLEAST32 # define SCNuLEAST32 "u" #endif -#if !defined SCNxLEAST32 || @PRI_MACROS_BROKEN@ -# undef SCNxLEAST32 +#if !defined SCNxLEAST32 # define SCNxLEAST32 "x" #endif #ifdef INT64_MAX -# if !defined SCNdLEAST64 || @PRI_MACROS_BROKEN@ -# undef SCNdLEAST64 +# if !defined SCNdLEAST64 # define SCNdLEAST64 SCNd64 # endif -# if !defined SCNiLEAST64 || @PRI_MACROS_BROKEN@ -# undef SCNiLEAST64 +# if !defined SCNiLEAST64 # define SCNiLEAST64 SCNi64 # endif #endif #ifdef UINT64_MAX -# if !defined SCNoLEAST64 || @PRI_MACROS_BROKEN@ -# undef SCNoLEAST64 +# if !defined SCNoLEAST64 # define SCNoLEAST64 SCNo64 # endif -# if !defined SCNuLEAST64 || @PRI_MACROS_BROKEN@ -# undef SCNuLEAST64 +# if !defined SCNuLEAST64 # define SCNuLEAST64 SCNu64 # endif -# if !defined SCNxLEAST64 || @PRI_MACROS_BROKEN@ -# undef SCNxLEAST64 +# if !defined SCNxLEAST64 # define SCNxLEAST64 SCNx64 # endif #endif -#if !defined SCNdFAST8 || @PRI_MACROS_BROKEN@ -# undef SCNdFAST8 +#if !defined SCNdFAST8 # if INT_FAST8_MAX > INT32_MAX # define SCNdFAST8 SCNd64 # elif INT_FAST8_MAX == 0x7fff @@ -813,8 +690,7 @@ # define SCNdFAST8 "d" # endif #endif -#if !defined SCNiFAST8 || @PRI_MACROS_BROKEN@ -# undef SCNiFAST8 +#if !defined SCNiFAST8 # if INT_FAST8_MAX > INT32_MAX # define SCNiFAST8 SCNi64 # elif INT_FAST8_MAX == 0x7fff @@ -825,8 +701,7 @@ # define SCNiFAST8 "i" # endif #endif -#if !defined SCNoFAST8 || @PRI_MACROS_BROKEN@ -# undef SCNoFAST8 +#if !defined SCNoFAST8 # if UINT_FAST8_MAX > UINT32_MAX # define SCNoFAST8 SCNo64 # elif UINT_FAST8_MAX == 0xffff @@ -837,8 +712,7 @@ # define SCNoFAST8 "o" # endif #endif -#if !defined SCNuFAST8 || @PRI_MACROS_BROKEN@ -# undef SCNuFAST8 +#if !defined SCNuFAST8 # if UINT_FAST8_MAX > UINT32_MAX # define SCNuFAST8 SCNu64 # elif UINT_FAST8_MAX == 0xffff @@ -849,8 +723,7 @@ # define SCNuFAST8 "u" # endif #endif -#if !defined SCNxFAST8 || @PRI_MACROS_BROKEN@ -# undef SCNxFAST8 +#if !defined SCNxFAST8 # if UINT_FAST8_MAX > UINT32_MAX # define SCNxFAST8 SCNx64 # elif UINT_FAST8_MAX == 0xffff @@ -861,8 +734,7 @@ # define SCNxFAST8 "x" # endif #endif -#if !defined SCNdFAST16 || @PRI_MACROS_BROKEN@ -# undef SCNdFAST16 +#if !defined SCNdFAST16 # if INT_FAST16_MAX > INT32_MAX # define SCNdFAST16 SCNd64 # elif INT_FAST16_MAX == 0x7fff @@ -871,8 +743,7 @@ # define SCNdFAST16 "d" # endif #endif -#if !defined SCNiFAST16 || @PRI_MACROS_BROKEN@ -# undef SCNiFAST16 +#if !defined SCNiFAST16 # if INT_FAST16_MAX > INT32_MAX # define SCNiFAST16 SCNi64 # elif INT_FAST16_MAX == 0x7fff @@ -881,8 +752,7 @@ # define SCNiFAST16 "i" # endif #endif -#if !defined SCNoFAST16 || @PRI_MACROS_BROKEN@ -# undef SCNoFAST16 +#if !defined SCNoFAST16 # if UINT_FAST16_MAX > UINT32_MAX # define SCNoFAST16 SCNo64 # elif UINT_FAST16_MAX == 0xffff @@ -891,8 +761,7 @@ # define SCNoFAST16 "o" # endif #endif -#if !defined SCNuFAST16 || @PRI_MACROS_BROKEN@ -# undef SCNuFAST16 +#if !defined SCNuFAST16 # if UINT_FAST16_MAX > UINT32_MAX # define SCNuFAST16 SCNu64 # elif UINT_FAST16_MAX == 0xffff @@ -901,8 +770,7 @@ # define SCNuFAST16 "u" # endif #endif -#if !defined SCNxFAST16 || @PRI_MACROS_BROKEN@ -# undef SCNxFAST16 +#if !defined SCNxFAST16 # if UINT_FAST16_MAX > UINT32_MAX # define SCNxFAST16 SCNx64 # elif UINT_FAST16_MAX == 0xffff @@ -911,40 +779,35 @@ # define SCNxFAST16 "x" # endif #endif -#if !defined SCNdFAST32 || @PRI_MACROS_BROKEN@ -# undef SCNdFAST32 +#if !defined SCNdFAST32 # if INT_FAST32_MAX > INT32_MAX # define SCNdFAST32 SCNd64 # else # define SCNdFAST32 "d" # endif #endif -#if !defined SCNiFAST32 || @PRI_MACROS_BROKEN@ -# undef SCNiFAST32 +#if !defined SCNiFAST32 # if INT_FAST32_MAX > INT32_MAX # define SCNiFAST32 SCNi64 # else # define SCNiFAST32 "i" # endif #endif -#if !defined SCNoFAST32 || @PRI_MACROS_BROKEN@ -# undef SCNoFAST32 +#if !defined SCNoFAST32 # if UINT_FAST32_MAX > UINT32_MAX # define SCNoFAST32 SCNo64 # else # define SCNoFAST32 "o" # endif #endif -#if !defined SCNuFAST32 || @PRI_MACROS_BROKEN@ -# undef SCNuFAST32 +#if !defined SCNuFAST32 # if UINT_FAST32_MAX > UINT32_MAX # define SCNuFAST32 SCNu64 # else # define SCNuFAST32 "u" # endif #endif -#if !defined SCNxFAST32 || @PRI_MACROS_BROKEN@ -# undef SCNxFAST32 +#if !defined SCNxFAST32 # if UINT_FAST32_MAX > UINT32_MAX # define SCNxFAST32 SCNx64 # else @@ -952,64 +815,54 @@ # endif #endif #ifdef INT64_MAX -# if !defined SCNdFAST64 || @PRI_MACROS_BROKEN@ -# undef SCNdFAST64 +# if !defined SCNdFAST64 # define SCNdFAST64 SCNd64 # endif -# if !defined SCNiFAST64 || @PRI_MACROS_BROKEN@ -# undef SCNiFAST64 +# if !defined SCNiFAST64 # define SCNiFAST64 SCNi64 # endif #endif #ifdef UINT64_MAX -# if !defined SCNoFAST64 || @PRI_MACROS_BROKEN@ -# undef SCNoFAST64 +# if !defined SCNoFAST64 # define SCNoFAST64 SCNo64 # endif -# if !defined SCNuFAST64 || @PRI_MACROS_BROKEN@ -# undef SCNuFAST64 +# if !defined SCNuFAST64 # define SCNuFAST64 SCNu64 # endif -# if !defined SCNxFAST64 || @PRI_MACROS_BROKEN@ -# undef SCNxFAST64 +# if !defined SCNxFAST64 # define SCNxFAST64 SCNx64 # endif #endif -#if !defined SCNdMAX || @PRI_MACROS_BROKEN@ -# undef SCNdMAX +#if !defined SCNdMAX # if @INT32_MAX_LT_INTMAX_MAX@ # define SCNdMAX SCNd64 # else # define SCNdMAX "ld" # endif #endif -#if !defined SCNiMAX || @PRI_MACROS_BROKEN@ -# undef SCNiMAX +#if !defined SCNiMAX # if @INT32_MAX_LT_INTMAX_MAX@ # define SCNiMAX SCNi64 # else # define SCNiMAX "li" # endif #endif -#if !defined SCNoMAX || @PRI_MACROS_BROKEN@ -# undef SCNoMAX +#if !defined SCNoMAX # if @UINT32_MAX_LT_UINTMAX_MAX@ # define SCNoMAX SCNo64 # else # define SCNoMAX "lo" # endif #endif -#if !defined SCNuMAX || @PRI_MACROS_BROKEN@ -# undef SCNuMAX +#if !defined SCNuMAX # if @UINT32_MAX_LT_UINTMAX_MAX@ # define SCNuMAX SCNu64 # else # define SCNuMAX "lu" # endif #endif -#if !defined SCNxMAX || @PRI_MACROS_BROKEN@ -# undef SCNxMAX +#if !defined SCNxMAX # if @UINT32_MAX_LT_UINTMAX_MAX@ # define SCNxMAX SCNx64 # else @@ -1017,32 +870,27 @@ # endif #endif -#if !defined SCNdPTR || @PRI_MACROS_BROKEN@ -# undef SCNdPTR +#if !defined SCNdPTR # ifdef INTPTR_MAX # define SCNdPTR @PRIPTR_PREFIX@ "d" # endif #endif -#if !defined SCNiPTR || @PRI_MACROS_BROKEN@ -# undef SCNiPTR +#if !defined SCNiPTR # ifdef INTPTR_MAX # define SCNiPTR @PRIPTR_PREFIX@ "i" # endif #endif -#if !defined SCNoPTR || @PRI_MACROS_BROKEN@ -# undef SCNoPTR +#if !defined SCNoPTR # ifdef UINTPTR_MAX # define SCNoPTR @PRIPTR_PREFIX@ "o" # endif #endif -#if !defined SCNuPTR || @PRI_MACROS_BROKEN@ -# undef SCNuPTR +#if !defined SCNuPTR # ifdef UINTPTR_MAX # define SCNuPTR @PRIPTR_PREFIX@ "u" # endif #endif -#if !defined SCNxPTR || @PRI_MACROS_BROKEN@ -# undef SCNxPTR +#if !defined SCNxPTR # ifdef UINTPTR_MAX # define SCNxPTR @PRIPTR_PREFIX@ "x" # endif @@ -1091,15 +939,19 @@ _GL_WARN_ON_USE (imaxdiv, "imaxdiv is unportable - " # define strtoimax rpl_strtoimax # endif _GL_FUNCDECL_RPL (strtoimax, intmax_t, - (const char *, char **, int) _GL_ARG_NONNULL ((1))); -_GL_CXXALIAS_RPL (strtoimax, intmax_t, (const char *, char **, int)); + (const char *restrict, char **restrict, int) + _GL_ARG_NONNULL ((1))); +_GL_CXXALIAS_RPL (strtoimax, intmax_t, + (const char *restrict, char **restrict, int)); # else # if !@HAVE_DECL_STRTOIMAX@ # undef strtoimax _GL_FUNCDECL_SYS (strtoimax, intmax_t, - (const char *, char **, int) _GL_ARG_NONNULL ((1))); + (const char *restrict, char **restrict, int) + _GL_ARG_NONNULL ((1))); # endif -_GL_CXXALIAS_SYS (strtoimax, intmax_t, (const char *, char **, int)); +_GL_CXXALIAS_SYS (strtoimax, intmax_t, + (const char *restrict, char **restrict, int)); # endif _GL_CXXALIASWARN (strtoimax); #elif defined GNULIB_POSIXCHECK @@ -1117,15 +969,19 @@ _GL_WARN_ON_USE (strtoimax, "strtoimax is unportable - " # define strtoumax rpl_strtoumax # endif _GL_FUNCDECL_RPL (strtoumax, uintmax_t, - (const char *, char **, int) _GL_ARG_NONNULL ((1))); -_GL_CXXALIAS_RPL (strtoumax, uintmax_t, (const char *, char **, int)); + (const char *restrict, char **restrict, int) + _GL_ARG_NONNULL ((1))); +_GL_CXXALIAS_RPL (strtoumax, uintmax_t, + (const char *restrict, char **restrict, int)); # else # if !@HAVE_DECL_STRTOUMAX@ # undef strtoumax _GL_FUNCDECL_SYS (strtoumax, uintmax_t, - (const char *, char **, int) _GL_ARG_NONNULL ((1))); + (const char *restrict, char **restrict, int) + _GL_ARG_NONNULL ((1))); # endif -_GL_CXXALIAS_SYS (strtoumax, uintmax_t, (const char *, char **, int)); +_GL_CXXALIAS_SYS (strtoumax, uintmax_t, + (const char *restrict, char **restrict, int)); # endif _GL_CXXALIASWARN (strtoumax); #elif defined GNULIB_POSIXCHECK diff --git a/lib/langinfo.in.h b/lib/langinfo.in.h index 6d40635..e912cd3 100644 --- a/lib/langinfo.in.h +++ b/lib/langinfo.in.h @@ -1,5 +1,5 @@ /* Substitute for and wrapper around . - Copyright (C) 2009-2019 Free Software Foundation, Inc. + Copyright (C) 2009-2020 Free Software Foundation, Inc. This program is free software; you can redistribute it and/or modify it under the terms of the GNU General Public License as published by @@ -16,7 +16,7 @@ /* * POSIX for platforms that lack it or have an incomplete one. - * + * */ #ifndef _@GUARD_PREFIX@_LANGINFO_H diff --git a/lib/lc-charset-dispatch.c b/lib/lc-charset-dispatch.c new file mode 100644 index 0000000..79057d4 --- /dev/null +++ b/lib/lc-charset-dispatch.c @@ -0,0 +1,82 @@ +/* Dispatching based on the current locale's character encoding. + Copyright (C) 2018-2020 Free Software Foundation, Inc. + + This 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 . */ + +/* Written by Bruno Haible , 2018. */ + +#include + +/* Specification. */ +#include "lc-charset-dispatch.h" + +#if GNULIB_defined_mbstate_t + +# include "localcharset.h" +# include "streq.h" + +# if GNULIB_WCHAR_SINGLE +/* When we know that the locale does not change, provide a speedup by + caching the value of locale_encoding_classification. */ +# define locale_encoding_classification_cached locale_encoding_classification +# else +/* By default, don't make assumptions, hence no caching. */ +# define locale_encoding_classification_uncached locale_encoding_classification +# endif + +# if GNULIB_WCHAR_SINGLE +static inline +# endif +enc_t +locale_encoding_classification_uncached (void) +{ + const char *encoding = locale_charset (); + if (STREQ_OPT (encoding, "UTF-8", 'U', 'T', 'F', '-', '8', 0, 0, 0, 0)) + return enc_utf8; + if (STREQ_OPT (encoding, "EUC-JP", 'E', 'U', 'C', '-', 'J', 'P', 0, 0, 0)) + return enc_eucjp; + if (STREQ_OPT (encoding, "EUC-KR", 'E', 'U', 'C', '-', 'K', 'R', 0, 0, 0) + || STREQ_OPT (encoding, "GB2312", 'G', 'B', '2', '3', '1', '2', 0, 0, 0) + || STREQ_OPT (encoding, "BIG5", 'B', 'I', 'G', '5', 0, 0, 0, 0, 0)) + return enc_94; + if (STREQ_OPT (encoding, "EUC-TW", 'E', 'U', 'C', '-', 'T', 'W', 0, 0, 0)) + return enc_euctw; + if (STREQ_OPT (encoding, "GB18030", 'G', 'B', '1', '8', '0', '3', '0', 0, 0)) + return enc_gb18030; + if (STREQ_OPT (encoding, "SJIS", 'S', 'J', 'I', 'S', 0, 0, 0, 0, 0)) + return enc_sjis; + return enc_other; +} + +# if GNULIB_WCHAR_SINGLE + +static int cached_locale_enc = -1; + +enc_t +locale_encoding_classification_cached (void) +{ + if (cached_locale_enc < 0) + cached_locale_enc = locale_encoding_classification_uncached (); + return cached_locale_enc; +} + +# endif + +#else + +/* This declaration is solely to ensure that after preprocessing + this file is never empty. */ +typedef int dummy; + +#endif diff --git a/lib/lc-charset-dispatch.h b/lib/lc-charset-dispatch.h new file mode 100644 index 0000000..95c2316 --- /dev/null +++ b/lib/lc-charset-dispatch.h @@ -0,0 +1,40 @@ +/* Dispatching based on the current locale's character encoding. + Copyright (C) 2018-2020 Free Software Foundation, Inc. + + This 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 . */ + +/* Written by Bruno Haible , 2018. */ + +#include + +#if GNULIB_defined_mbstate_t + +/* A classification of special values of the encoding of the current locale. */ +typedef enum + { + enc_other, /* other */ + enc_utf8, /* UTF-8 */ + enc_eucjp, /* EUC-JP */ + enc_94, /* EUC-KR, GB2312, BIG5 */ + enc_euctw, /* EUC-TW */ + enc_gb18030, /* GB18030 */ + enc_sjis /* SJIS */ + } + enc_t; + +/* Returns a classification of special values of the encoding of the current + locale. */ +extern enc_t locale_encoding_classification (void); + +#endif diff --git a/lib/libc-config.h b/lib/libc-config.h index 57c6966..1300c3a 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-2019 Free Software Foundation, Inc. + Copyright 2017-2020 Free Software Foundation, Inc. This program is free software; you can redistribute it and/or modify it under the terms of the GNU General Public @@ -55,8 +55,17 @@ #ifndef __glibc_clang_prereq # if defined __clang_major__ && defined __clang_minor__ -# define __glibc_clang_prereq(maj, min) \ - ((maj) < __clang_major__ + ((min) <= __clang_minor__)) +# ifdef __apple_build_version__ +/* Apple for some reason renumbers __clang_major__ and __clang_minor__. + Gnulib code uses only __glibc_clang_prereq (3, 5); map it to + 6000000 <= __apple_build_version__. Support for other calls to + __glibc_clang_prereq can be added here as needed. */ +# define __glibc_clang_prereq(maj, min) \ + ((maj) == 3 && (min) == 5 ? 6000000 <= __apple_build_version__ : 0) +# else +# define __glibc_clang_prereq(maj, min) \ + ((maj) < __clang_major__ + ((min) <= __clang_minor__)) +# endif # else # define __glibc_clang_prereq(maj, min) 0 # endif @@ -171,4 +180,5 @@ /* A substitute for glibc , good enough for Gnulib. */ #define SHLIB_COMPAT(lib, introduced, obsoleted) 0 -#define versioned_symbol(lib, local, symbol, version) +#define compat_symbol(lib, local, symbol, version) extern int dummy +#define versioned_symbol(lib, local, symbol, version) extern int dummy diff --git a/lib/limits.in.h b/lib/limits.in.h index 39750b3..d25c523 100644 --- a/lib/limits.in.h +++ b/lib/limits.in.h @@ -1,6 +1,6 @@ /* A GNU-like . - Copyright 2016-2019 Free Software Foundation, Inc. + Copyright 2016-2020 Free Software Foundation, Inc. This program is free software; you can redistribute it and/or modify it under the terms of the GNU General Public License @@ -15,16 +15,32 @@ You should have received a copy of the GNU General Public License along with this program; if not, see . */ -#ifndef _@GUARD_PREFIX@_LIMITS_H - #if __GNUC__ >= 3 @PRAGMA_SYSTEM_HEADER@ #endif @PRAGMA_COLUMNS@ -/* The include_next requires a split double-inclusion guard. */ +#if defined _GL_ALREADY_INCLUDING_LIMITS_H +/* Special invocation convention: + On Haiku/x86_64, we have a sequence of nested includes + -> -> . + In this situation, LONG_MAX and INT_MAX are not yet defined, + therefore we should not attempt to define LONG_BIT. */ + #@INCLUDE_NEXT@ @NEXT_LIMITS_H@ +#else +/* Normal invocation convention. */ + +#ifndef _@GUARD_PREFIX@_LIMITS_H + +# define _GL_ALREADY_INCLUDING_LIMITS_H + +/* The include_next requires a split double-inclusion guard. */ +# @INCLUDE_NEXT@ @NEXT_LIMITS_H@ + +# undef _GL_ALREADY_INCLUDING_LIMITS_H + #ifndef _@GUARD_PREFIX@_LIMITS_H #define _@GUARD_PREFIX@_LIMITS_H @@ -102,3 +118,4 @@ #endif /* _@GUARD_PREFIX@_LIMITS_H */ #endif /* _@GUARD_PREFIX@_LIMITS_H */ +#endif diff --git a/lib/localcharset.c b/lib/localcharset.c index dabef94..721c8a9 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-2019 Free Software Foundation, Inc. + Copyright (C) 2000-2006, 2008-2020 Free Software Foundation, Inc. This program is free software; you can redistribute it and/or modify it under the terms of the GNU General Public License as published by @@ -58,6 +58,9 @@ #elif defined WINDOWS_NATIVE # define WIN32_LEAN_AND_MEAN # include + /* For the use of setlocale() below, the Gnulib override in setlocale.c is + not needed; see the platform lists in setlocale_null.m4. */ +# undef setlocale #endif #if defined OS2 # define INCL_DOS @@ -150,7 +153,8 @@ static const struct table_entry alias_table[] = { "ISO8859-2", "ISO-8859-2" }, { "ISO8859-4", "ISO-8859-4" }, { "ISO8859-5", "ISO-8859-5" }, - { "ISO8859-7", "ISO-8859-7" } + { "ISO8859-7", "ISO-8859-7" }, + { "US-ASCII", "ASCII" } # define alias_table_defined # endif # if defined __APPLE__ && defined __MACH__ /* Mac OS X */ @@ -378,8 +382,6 @@ static const struct table_entry alias_table[] = by Alex Taylor: . See also "__convcp() of kLIBC": - , - or: . */ { "CP1004", "CP1252" }, /*{ "CP1041", "CP943" },*/ @@ -814,8 +816,11 @@ static const struct table_entry locale_table[] = /* Determine the current locale's character encoding, and canonicalize it - into one of the canonical names listed in localcharset.h. - The result must not be freed; it is statically allocated. + into one of the canonical names listed below. + The result must not be freed; it is statically allocated. The result + becomes invalid when setlocale() is used to change the global locale, or + when the value of one of the environment variables LC_ALL, LC_CTYPE, LANG + is changed; threads in multithreaded programs should not do this. If the canonical name cannot be determined, the result is a non-canonical name. */ @@ -827,6 +832,13 @@ locale_charset (void) { const char *codeset; + /* This function must be multithread-safe. To achieve this without using + thread-local storage, we use a simple strcpy or memcpy to fill this static + buffer. Filling it through, for example, strcpy + strcat would not be + guaranteed to leave the buffer's contents intact if another thread is + currently accessing it. If necessary, the contents is first assembled in + a stack-allocated buffer. */ + #if HAVE_LANGINFO_CODESET || defined WINDOWS_NATIVE || defined OS2 # if HAVE_LANGINFO_CODESET @@ -841,7 +853,7 @@ locale_charset (void) if (codeset != NULL && strcmp (codeset, "US-ASCII") == 0) { const char *locale; - static char buf[2 + 10 + 1]; + static char resultbuf[2 + 10 + 1]; locale = getenv ("LC_ALL"); if (locale == NULL || locale[0] == '\0') @@ -865,11 +877,12 @@ locale_charset (void) modifier = strchr (dot, '@'); if (modifier == NULL) return dot; - if (modifier - dot < sizeof (buf)) + if (modifier - dot < sizeof (resultbuf)) { - memcpy (buf, dot, modifier - dot); - buf [modifier - dot] = '\0'; - return buf; + /* This way of filling resultbuf is multithread-safe. */ + memcpy (resultbuf, dot, modifier - dot); + resultbuf [modifier - dot] = '\0'; + return resultbuf; } } } @@ -885,8 +898,13 @@ locale_charset (void) converting to GetConsoleOutputCP(). This leads to correct results, except when SetConsoleOutputCP has been called and a raster font is in use. */ - sprintf (buf, "CP%u", GetACP ()); - codeset = buf; + { + char buf[2 + 10 + 1]; + + sprintf (buf, "CP%u", GetACP ()); + strcpy (resultbuf, buf); + codeset = resultbuf; + } } # endif @@ -896,34 +914,28 @@ locale_charset (void) # elif defined WINDOWS_NATIVE - static char buf[2 + 10 + 1]; + char buf[2 + 10 + 1]; + static char resultbuf[2 + 10 + 1]; /* The Windows API has a function returning the locale's codepage as a number, but the value doesn't change according to what the 'setlocale' call specified. So we use it as a last resort, in case the string returned by 'setlocale' doesn't specify the codepage. */ - char *current_locale = setlocale (LC_ALL, NULL); - char *pdot; - - /* If they set different locales for different categories, - 'setlocale' will return a semi-colon separated list of locale - values. To make sure we use the correct one, we choose LC_CTYPE. */ - if (strchr (current_locale, ';')) - current_locale = setlocale (LC_CTYPE, NULL); + char *current_locale = setlocale (LC_CTYPE, NULL); + char *pdot = strrchr (current_locale, '.'); - pdot = strrchr (current_locale, '.'); if (pdot && 2 + strlen (pdot + 1) + 1 <= sizeof (buf)) sprintf (buf, "CP%s", pdot + 1); else { /* The Windows API has a function returning the locale's codepage as a - number: GetACP(). - When the output goes to a console window, it needs to be provided in - GetOEMCP() encoding if the console is using a raster font, or in - GetConsoleOutputCP() encoding if it is using a TrueType font. - But in GUI programs and for output sent to files and pipes, GetACP() - encoding is the best bet. */ + number: GetACP(). + When the output goes to a console window, it needs to be provided in + GetOEMCP() encoding if the console is using a raster font, or in + GetConsoleOutputCP() encoding if it is using a TrueType font. + But in GUI programs and for output sent to files and pipes, GetACP() + encoding is the best bet. */ sprintf (buf, "CP%u", GetACP ()); } /* For a locale name such as "French_France.65001", in Windows 10, @@ -931,12 +943,15 @@ locale_charset (void) if (strcmp (buf + 2, "65001") == 0 || strcmp (buf + 2, "utf8") == 0) codeset = "UTF-8"; else - codeset = buf; + { + strcpy (resultbuf, buf); + codeset = resultbuf; + } # elif defined OS2 const char *locale; - static char buf[2 + 10 + 1]; + static char resultbuf[2 + 10 + 1]; ULONG cp[3]; ULONG cplen; @@ -965,11 +980,12 @@ locale_charset (void) modifier = strchr (dot, '@'); if (modifier == NULL) return dot; - if (modifier - dot < sizeof (buf)) + if (modifier - dot < sizeof (resultbuf)) { - memcpy (buf, dot, modifier - dot); - buf [modifier - dot] = '\0'; - return buf; + /* This way of filling resultbuf is multithread-safe. */ + memcpy (resultbuf, dot, modifier - dot); + resultbuf [modifier - dot] = '\0'; + return resultbuf; } } @@ -985,8 +1001,11 @@ locale_charset (void) codeset = ""; else { + char buf[2 + 10 + 1]; + sprintf (buf, "CP%u", cp[0]); - codeset = buf; + strcpy (resultbuf, buf); + codeset = resultbuf; } } diff --git a/lib/localcharset.h b/lib/localcharset.h index 7d0d771..aa623be 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-2019 Free Software Foundation, Inc. + Copyright (C) 2000-2003, 2009-2020 Free Software Foundation, Inc. This file is part of the GNU CHARSET Library. This program is free software; you can redistribute it and/or modify @@ -26,7 +26,10 @@ extern "C" { /* Determine the current locale's character encoding, and canonicalize it into one of the canonical names listed below. - The result must not be freed; it is statically allocated. + The result must not be freed; it is statically allocated. The result + becomes invalid when setlocale() is used to change the global locale, or + when the value of one of the environment variables LC_ALL, LC_CTYPE, LANG + is changed; threads in multithreaded programs should not do this. If the canonical name cannot be determined, the result is a non-canonical name. */ extern const char * locale_charset (void); @@ -45,15 +48,15 @@ extern const char * locale_charset (void); (darwin = Mac OS X, windows = native Windows) ASCII, ANSI_X3.4-1968 glibc solaris freebsd netbsd darwin minix cygwin - ISO-8859-1 Y glibc aix hpux irix osf solaris freebsd netbsd openbsd darwin cygwin - ISO-8859-2 Y glibc aix hpux irix osf solaris freebsd netbsd openbsd darwin cygwin + ISO-8859-1 Y glibc aix hpux irix osf solaris freebsd netbsd openbsd darwin cygwin zos + ISO-8859-2 Y glibc aix hpux irix osf solaris freebsd netbsd openbsd darwin cygwin zos ISO-8859-3 Y glibc solaris cygwin ISO-8859-4 Y hpux osf solaris freebsd netbsd openbsd darwin - ISO-8859-5 Y glibc aix hpux irix osf solaris freebsd netbsd openbsd darwin cygwin + ISO-8859-5 Y glibc aix hpux irix osf solaris freebsd netbsd openbsd darwin cygwin zos ISO-8859-6 Y glibc aix hpux solaris cygwin - ISO-8859-7 Y glibc aix hpux irix osf solaris freebsd netbsd openbsd darwin cygwin - ISO-8859-8 Y glibc aix hpux osf solaris cygwin - ISO-8859-9 Y glibc aix hpux irix osf solaris freebsd darwin cygwin + ISO-8859-7 Y glibc aix hpux irix osf solaris freebsd netbsd openbsd darwin cygwin zos + ISO-8859-8 Y glibc aix hpux osf solaris cygwin zos + ISO-8859-9 Y glibc aix hpux irix osf solaris freebsd darwin cygwin zos ISO-8859-13 glibc hpux solaris freebsd netbsd openbsd darwin cygwin ISO-8859-14 glibc cygwin ISO-8859-15 glibc aix irix osf solaris freebsd netbsd openbsd darwin cygwin @@ -76,7 +79,7 @@ extern const char * locale_charset (void); CP874 windows dos CP922 aix CP932 aix cygwin windows dos - CP943 aix + CP943 aix zos CP949 osf darwin windows dos CP950 windows dos CP1046 aix @@ -92,17 +95,17 @@ extern const char * locale_charset (void); CP1255 glibc windows CP1256 windows CP1257 windows - GB2312 Y glibc aix hpux irix solaris freebsd netbsd darwin cygwin + GB2312 Y glibc aix hpux irix solaris freebsd netbsd darwin cygwin zos EUC-JP Y glibc aix hpux irix osf solaris freebsd netbsd darwin cygwin - EUC-KR Y glibc aix hpux irix osf solaris freebsd netbsd darwin cygwin + EUC-KR Y glibc aix hpux irix osf solaris freebsd netbsd darwin cygwin zos EUC-TW glibc aix hpux irix osf solaris netbsd - BIG5 Y glibc aix hpux osf solaris freebsd netbsd darwin cygwin + BIG5 Y glibc aix hpux osf solaris freebsd netbsd darwin cygwin zos BIG5-HKSCS glibc hpux solaris netbsd darwin GBK glibc aix osf solaris freebsd darwin cygwin windows dos GB18030 glibc hpux solaris freebsd netbsd darwin SHIFT_JIS Y hpux osf solaris freebsd netbsd darwin JOHAB glibc solaris windows - TIS-620 glibc aix hpux osf solaris cygwin + TIS-620 glibc aix hpux osf solaris cygwin zos VISCII Y glibc TCVN5712-1 glibc ARMSCII-8 glibc freebsd netbsd darwin @@ -116,7 +119,7 @@ extern const char * locale_charset (void); HP-KANA8 hpux DEC-KANJI osf DEC-HANYU osf - UTF-8 Y glibc aix hpux osf solaris netbsd darwin cygwin + UTF-8 Y glibc aix hpux osf solaris netbsd darwin cygwin zos Note: Names which are not marked as being a MIME name should not be used in Internet protocols for information interchange (mail, news, etc.). diff --git a/lib/locale.in.h b/lib/locale.in.h index 5f33ed1..4e9b3f3 100644 --- a/lib/locale.in.h +++ b/lib/locale.in.h @@ -1,5 +1,5 @@ /* A POSIX . - Copyright (C) 2007-2019 Free Software Foundation, Inc. + Copyright (C) 2007-2020 Free Software Foundation, Inc. This 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,6 +64,18 @@ # define LC_MESSAGES 1729 #endif +/* On native Windows with MSVC, 'struct lconv' lacks the members int_p_* and + int_n_*. Instead of overriding 'struct lconv', merely define these member + names as macros. This avoids trouble in C++ mode. */ +#if defined _MSC_VER +# define int_p_cs_precedes p_cs_precedes +# define int_p_sign_posn p_sign_posn +# define int_p_sep_by_space p_sep_by_space +# define int_n_cs_precedes n_cs_precedes +# define int_n_sign_posn n_sign_posn +# define int_n_sep_by_space n_sep_by_space +#endif + /* Bionic libc's 'struct lconv' is just a dummy. */ #if @REPLACE_STRUCT_LCONV@ # define lconv rpl_lconv @@ -72,7 +84,7 @@ struct lconv /* All 'char *' are actually 'const char *'. */ /* Members that depend on the LC_NUMERIC category of the locale. See - */ + */ /* Symbol used as decimal point. */ char *decimal_point; @@ -84,7 +96,7 @@ struct lconv char *grouping; /* Members that depend on the LC_MONETARY category of the locale. See - */ + */ /* Symbol used as decimal point. */ char *mon_decimal_point; @@ -156,7 +168,9 @@ _GL_CXXALIAS_RPL (localeconv, struct lconv *, (void)); # else _GL_CXXALIAS_SYS (localeconv, struct lconv *, (void)); # endif +# if __GLIBC__ >= 2 _GL_CXXALIASWARN (localeconv); +# endif #elif @REPLACE_STRUCT_LCONV@ # undef localeconv # define localeconv localeconv_used_without_requesting_gnulib_module_localeconv @@ -181,7 +195,9 @@ _GL_CXXALIAS_RPL (setlocale, char *, (int category, const char *locale)); # else _GL_CXXALIAS_SYS (setlocale, char *, (int category, const char *locale)); # endif +# if __GLIBC__ >= 2 _GL_CXXALIASWARN (setlocale); +# endif #elif defined GNULIB_POSIXCHECK # undef setlocale # if HAVE_RAW_DECL_SETLOCALE @@ -190,6 +206,11 @@ _GL_WARN_ON_USE (setlocale, "setlocale works differently on native Windows - " # endif #endif +#if @GNULIB_SETLOCALE_NULL@ +/* Included here for convenience. */ +# include "setlocale_null.h" +#endif + #if /*@GNULIB_NEWLOCALE@ ||*/ (@GNULIB_LOCALENAME@ && @HAVE_NEWLOCALE@) # if @REPLACE_NEWLOCALE@ # if !(defined __cplusplus && defined GNULIB_NAMESPACE) @@ -211,6 +232,11 @@ _GL_CXXALIAS_SYS (newlocale, locale_t, # if @HAVE_NEWLOCALE@ _GL_CXXALIASWARN (newlocale); # endif +# if @HAVE_NEWLOCALE@ || @REPLACE_NEWLOCALE@ +# ifndef HAVE_WORKING_NEWLOCALE +# define HAVE_WORKING_NEWLOCALE 1 +# endif +# endif #elif defined GNULIB_POSIXCHECK # undef newlocale # if HAVE_RAW_DECL_NEWLOCALE @@ -235,6 +261,11 @@ _GL_CXXALIAS_SYS (duplocale, locale_t, (locale_t locale)); # if @HAVE_DUPLOCALE@ _GL_CXXALIASWARN (duplocale); # endif +# if @HAVE_DUPLOCALE@ || @REPLACE_DUPLOCALE@ +# ifndef HAVE_WORKING_DUPLOCALE +# define HAVE_WORKING_DUPLOCALE 1 +# endif +# endif #elif defined GNULIB_POSIXCHECK # undef duplocale # if HAVE_RAW_DECL_DUPLOCALE @@ -254,7 +285,9 @@ _GL_FUNCDECL_RPL (freelocale, void, (locale_t locale) _GL_ARG_NONNULL ((1))); _GL_CXXALIAS_RPL (freelocale, void, (locale_t locale)); # else # if @HAVE_FREELOCALE@ -_GL_CXXALIAS_SYS (freelocale, void, (locale_t locale)); +/* Need to cast, because on FreeBSD and Mac OS X 10.13, the return type is + int. */ +_GL_CXXALIAS_SYS_CAST (freelocale, void, (locale_t locale)); # endif # endif # if @HAVE_FREELOCALE@ diff --git a/lib/localeconv.c b/lib/localeconv.c index b5a965f..8aa9bbe 100644 --- a/lib/localeconv.c +++ b/lib/localeconv.c @@ -1,5 +1,5 @@ /* Query locale dependent information for formatting numbers. - Copyright (C) 2012-2019 Free Software Foundation, Inc. + Copyright (C) 2012-2020 Free Software Foundation, Inc. This 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/localtime-buffer.c b/lib/localtime-buffer.c deleted file mode 100644 index b65ea45..0000000 --- a/lib/localtime-buffer.c +++ /dev/null @@ -1,60 +0,0 @@ -/* Provide access to the last buffer returned by localtime() or gmtime(). - - Copyright (C) 2001-2003, 2005-2007, 2009-2019 Free Software Foundation, Inc. - - This program is free software; you can redistribute it and/or modify - it under the terms of the GNU General Public License as published by - the Free Software Foundation; either version 3, or (at your option) - any later version. - - This program is distributed in the hope that it will be useful, - but WITHOUT ANY WARRANTY; without even the implied warranty of - MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - GNU General Public License for more details. - - You should have received a copy of the GNU General Public License - along with this program; if not, see . */ - -/* written by Jim Meyering */ - -#include - -/* Specification. */ -#include "localtime-buffer.h" - -#if GETTIMEOFDAY_CLOBBERS_LOCALTIME || TZSET_CLOBBERS_LOCALTIME - -static struct tm tm_zero_buffer; -struct tm *localtime_buffer_addr = &tm_zero_buffer; - -/* This is a wrapper for localtime. - - On the first call, record the address of the static buffer that - localtime uses for its result. */ - -struct tm * -rpl_localtime (time_t const *timep) -#undef localtime -{ - struct tm *tm = localtime (timep); - - if (localtime_buffer_addr == &tm_zero_buffer) - localtime_buffer_addr = tm; - - return tm; -} - -/* Same as above, since gmtime and localtime use the same buffer. */ -struct tm * -rpl_gmtime (time_t const *timep) -#undef gmtime -{ - struct tm *tm = gmtime (timep); - - if (localtime_buffer_addr == &tm_zero_buffer) - localtime_buffer_addr = tm; - - return tm; -} - -#endif diff --git a/lib/localtime-buffer.h b/lib/localtime-buffer.h deleted file mode 100644 index 031111a..0000000 --- a/lib/localtime-buffer.h +++ /dev/null @@ -1,27 +0,0 @@ -/* Provide access to the last buffer returned by localtime() or gmtime(). - - Copyright (C) 2001-2003, 2005-2007, 2009-2019 Free Software Foundation, Inc. - - This program is free software; you can redistribute it and/or modify - it under the terms of the GNU General Public License as published by - the Free Software Foundation; either version 3, or (at your option) - any later version. - - This program is distributed in the hope that it will be useful, - but WITHOUT ANY WARRANTY; without even the implied warranty of - MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - GNU General Public License for more details. - - You should have received a copy of the GNU General Public License - along with this program; if not, see . */ - -/* written by Jim Meyering */ - -#include - -#if GETTIMEOFDAY_CLOBBERS_LOCALTIME || TZSET_CLOBBERS_LOCALTIME - -/* The address of the last buffer returned by localtime() or gmtime(). */ -extern struct tm *localtime_buffer_addr; - -#endif diff --git a/lib/long-options.c b/lib/long-options.c index cbdc6a9..e8f0799 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-2019 Free Software + Copyright (C) 1993-1994, 1998-2000, 2002-2006, 2009-2020 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 13f17ec..c30c16f 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-2019 Free Software + Copyright (C) 1993-1994, 1998-1999, 2003, 2009-2020 Free Software Foundation, Inc. This program is free software: you can redistribute it and/or modify diff --git a/lib/lseek.c b/lib/lseek.c index 46f7a3f..aaf9f32 100644 --- a/lib/lseek.c +++ b/lib/lseek.c @@ -1,5 +1,5 @@ /* An lseek() function that detects pipes. - Copyright (C) 2007, 2009-2019 Free Software Foundation, Inc. + Copyright (C) 2007, 2009-2020 Free Software Foundation, Inc. This program is free software; you can redistribute it and/or modify it under the terms of the GNU General Public License as published by @@ -63,7 +63,7 @@ rpl_lseek (int fd, off_t offset, int whence) return -1; } #endif -#if _GL_WINDOWS_64_BIT_OFF_T +#if _GL_WINDOWS_64_BIT_OFF_T || (defined __MINGW32__ && defined _FILE_OFFSET_BITS && (_FILE_OFFSET_BITS == 64)) return _lseeki64 (fd, offset, whence); #else return lseek (fd, offset, whence); diff --git a/lib/lstat.c b/lib/lstat.c index a3e40d8..f74392b 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-2019 Free Software Foundation, Inc. + Copyright (C) 1997-2006, 2008-2020 Free Software Foundation, Inc. This 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/malloc.c b/lib/malloc.c index 76e6ff7..7232f1e 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-2019 Free Software Foundation, Inc. + Copyright (C) 1997-1998, 2006-2007, 2009-2020 Free Software Foundation, Inc. This 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/malloca.c b/lib/malloca.c index f60c5fb..975b166 100644 --- a/lib/malloca.c +++ b/lib/malloca.c @@ -1,5 +1,5 @@ /* Safe automatic memory allocation. - Copyright (C) 2003, 2006-2007, 2009-2019 Free Software Foundation, Inc. + Copyright (C) 2003, 2006-2007, 2009-2020 Free Software Foundation, Inc. Written by Bruno Haible , 2003, 2018. This program is free software; you can redistribute it and/or modify diff --git a/lib/malloca.h b/lib/malloca.h index d80c316..ccc485a 100644 --- a/lib/malloca.h +++ b/lib/malloca.h @@ -1,5 +1,5 @@ /* Safe automatic memory allocation. - Copyright (C) 2003-2007, 2009-2019 Free Software Foundation, Inc. + Copyright (C) 2003-2007, 2009-2020 Free Software Foundation, Inc. Written by Bruno Haible , 2003. This program is free software; you can redistribute it and/or modify @@ -89,7 +89,7 @@ extern void freea (void *p); /* ------------------- Auxiliary, non-public definitions ------------------- */ /* Determine the alignment of a type at compile time. */ -#if defined __GNUC__ || defined __IBM__ALIGNOF__ +#if defined __GNUC__ || defined __clang__ || defined __IBM__ALIGNOF__ # define sa_alignof __alignof__ #elif defined __cplusplus template struct sa_alignof_helper { char __slot1; type __slot2; }; @@ -112,14 +112,10 @@ enum among all elementary types. */ sa_alignment_long = sa_alignof (long), sa_alignment_double = sa_alignof (double), -#if HAVE_LONG_LONG_INT sa_alignment_longlong = sa_alignof (long long), -#endif sa_alignment_longdouble = sa_alignof (long double), sa_alignment_max = ((sa_alignment_long - 1) | (sa_alignment_double - 1) -#if HAVE_LONG_LONG_INT | (sa_alignment_longlong - 1) -#endif | (sa_alignment_longdouble - 1) ) + 1 }; diff --git a/lib/mbrtowc-impl-utf8.h b/lib/mbrtowc-impl-utf8.h new file mode 100644 index 0000000..a826b1b --- /dev/null +++ b/lib/mbrtowc-impl-utf8.h @@ -0,0 +1,138 @@ +/* Convert multibyte character to wide character. + Copyright (C) 1999-2002, 2005-2020 Free Software Foundation, Inc. + + This 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 . */ + +/* Written by Bruno Haible , 2008. */ + +/* This file contains the part of the body of the mbrtowc and mbrtoc32 functions + that handles the special case of the UTF-8 encoding. */ + + /* Cf. unistr/u8-mbtouc.c. */ + unsigned char c = (unsigned char) p[0]; + + if (c < 0x80) + { + if (pwc != NULL) + *pwc = c; + res = (c == 0 ? 0 : 1); + goto success; + } + if (c >= 0xc2) + { + if (c < 0xe0) + { + if (m == 1) + goto incomplete; + else /* m >= 2 */ + { + unsigned char c2 = (unsigned char) p[1]; + + if ((c2 ^ 0x80) < 0x40) + { + if (pwc != NULL) + *pwc = ((unsigned int) (c & 0x1f) << 6) + | (unsigned int) (c2 ^ 0x80); + res = 2; + goto success; + } + } + } + else if (c < 0xf0) + { + if (m == 1) + goto incomplete; + else + { + unsigned char c2 = (unsigned char) p[1]; + + if ((c2 ^ 0x80) < 0x40 + && (c >= 0xe1 || c2 >= 0xa0) + && (c != 0xed || c2 < 0xa0)) + { + if (m == 2) + goto incomplete; + else /* m >= 3 */ + { + unsigned char c3 = (unsigned char) p[2]; + + if ((c3 ^ 0x80) < 0x40) + { + unsigned int wc = + (((unsigned int) (c & 0x0f) << 12) + | ((unsigned int) (c2 ^ 0x80) << 6) + | (unsigned int) (c3 ^ 0x80)); + + if (FITS_IN_CHAR_TYPE (wc)) + { + if (pwc != NULL) + *pwc = wc; + res = 3; + goto success; + } + } + } + } + } + } + else if (c <= 0xf4) + { + if (m == 1) + goto incomplete; + else + { + unsigned char c2 = (unsigned char) p[1]; + + if ((c2 ^ 0x80) < 0x40 + && (c >= 0xf1 || c2 >= 0x90) + && (c < 0xf4 || (c == 0xf4 && c2 < 0x90))) + { + if (m == 2) + goto incomplete; + else + { + unsigned char c3 = (unsigned char) p[2]; + + if ((c3 ^ 0x80) < 0x40) + { + if (m == 3) + goto incomplete; + else /* m >= 4 */ + { + unsigned char c4 = (unsigned char) p[3]; + + if ((c4 ^ 0x80) < 0x40) + { + unsigned int wc = + (((unsigned int) (c & 0x07) << 18) + | ((unsigned int) (c2 ^ 0x80) << 12) + | ((unsigned int) (c3 ^ 0x80) << 6) + | (unsigned int) (c4 ^ 0x80)); + + if (FITS_IN_CHAR_TYPE (wc)) + { + if (pwc != NULL) + *pwc = wc; + res = 4; + goto success; + } + } + } + } + } + } + } + } + } + goto invalid; diff --git a/lib/mbrtowc-impl.h b/lib/mbrtowc-impl.h new file mode 100644 index 0000000..c970439 --- /dev/null +++ b/lib/mbrtowc-impl.h @@ -0,0 +1,262 @@ +/* Convert multibyte character to wide character. + Copyright (C) 1999-2002, 2005-2020 Free Software Foundation, Inc. + + This 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 . */ + +/* Written by Bruno Haible , 2008. */ + +/* This file contains the body of the mbrtowc and mbrtoc32 functions, + when GNULIB_defined_mbstate_t is defined. */ + + char *pstate = (char *)ps; + + if (s == NULL) + { + pwc = NULL; + s = ""; + n = 1; + } + + if (n == 0) + return (size_t)(-2); + + /* Here n > 0. */ + + if (pstate == NULL) + pstate = internal_state; + + { + size_t nstate = pstate[0]; + char buf[4]; + const char *p; + size_t m; + enc_t enc; + int res; + + switch (nstate) + { + case 0: + p = s; + m = n; + break; + case 3: + buf[2] = pstate[3]; + FALLTHROUGH; + case 2: + buf[1] = pstate[2]; + FALLTHROUGH; + case 1: + buf[0] = pstate[1]; + p = buf; + m = nstate; + buf[m++] = s[0]; + if (n >= 2 && m < 4) + { + buf[m++] = s[1]; + if (n >= 3 && m < 4) + buf[m++] = s[2]; + } + break; + default: + errno = EINVAL; + return (size_t)(-1); + } + + /* Here m > 0. */ + + enc = locale_encoding_classification (); + + if (enc == enc_utf8) /* UTF-8 */ + { + /* Achieve + - multi-thread safety and + - the ability to produce wide character values > WCHAR_MAX + by not calling mbtowc() at all. */ +#include "mbrtowc-impl-utf8.h" + } + else + { + /* The hidden internal state of mbtowc would make this function not + multi-thread safe. Achieve multi-thread safety through a lock. */ + wchar_t wc; + res = mbtowc_with_lock (&wc, p, m); + + if (res >= 0) + { + if ((wc == 0) != (res == 0)) + abort (); + if (pwc != NULL) + *pwc = wc; + goto success; + } + + /* mbtowc does not distinguish between invalid and incomplete multibyte + sequences. But mbrtowc needs to make this distinction. + There are two possible approaches: + - Use iconv() and its return value. + - Use built-in knowledge about the possible encodings. + Given the low quality of implementation of iconv() on the systems + that lack mbrtowc(), we use the second approach. + The possible encodings are: + - 8-bit encodings, + - EUC-JP, EUC-KR, GB2312, EUC-TW, BIG5, GB18030, SJIS, + - UTF-8 (already handled above). + Use specialized code for each. */ + if (m >= 4 || m >= MB_CUR_MAX) + goto invalid; + /* Here MB_CUR_MAX > 1 and 0 < m < 4. */ + switch (enc) + { + /* As a reference for this code, you can use the GNU libiconv + implementation. Look for uses of the RET_TOOFEW macro. */ + + case enc_eucjp: /* EUC-JP */ + { + if (m == 1) + { + unsigned char c = (unsigned char) p[0]; + + if ((c >= 0xa1 && c < 0xff) || c == 0x8e || c == 0x8f) + goto incomplete; + } + if (m == 2) + { + unsigned char c = (unsigned char) p[0]; + + if (c == 0x8f) + { + unsigned char c2 = (unsigned char) p[1]; + + if (c2 >= 0xa1 && c2 < 0xff) + goto incomplete; + } + } + goto invalid; + } + + case enc_94: /* EUC-KR, GB2312, BIG5 */ + { + if (m == 1) + { + unsigned char c = (unsigned char) p[0]; + + if (c >= 0xa1 && c < 0xff) + goto incomplete; + } + goto invalid; + } + + case enc_euctw: /* EUC-TW */ + { + if (m == 1) + { + unsigned char c = (unsigned char) p[0]; + + if ((c >= 0xa1 && c < 0xff) || c == 0x8e) + goto incomplete; + } + else /* m == 2 || m == 3 */ + { + unsigned char c = (unsigned char) p[0]; + + if (c == 0x8e) + goto incomplete; + } + goto invalid; + } + + case enc_gb18030: /* GB18030 */ + { + if (m == 1) + { + unsigned char c = (unsigned char) p[0]; + + if ((c >= 0x90 && c <= 0xe3) || (c >= 0xf8 && c <= 0xfe)) + goto incomplete; + } + else /* m == 2 || m == 3 */ + { + unsigned char c = (unsigned char) p[0]; + + if (c >= 0x90 && c <= 0xe3) + { + unsigned char c2 = (unsigned char) p[1]; + + if (c2 >= 0x30 && c2 <= 0x39) + { + if (m == 2) + goto incomplete; + else /* m == 3 */ + { + unsigned char c3 = (unsigned char) p[2]; + + if (c3 >= 0x81 && c3 <= 0xfe) + goto incomplete; + } + } + } + } + goto invalid; + } + + case enc_sjis: /* SJIS */ + { + if (m == 1) + { + unsigned char c = (unsigned char) p[0]; + + if ((c >= 0x81 && c <= 0x9f) || (c >= 0xe0 && c <= 0xea) + || (c >= 0xf0 && c <= 0xf9)) + goto incomplete; + } + goto invalid; + } + + default: + /* An unknown multibyte encoding. */ + goto incomplete; + } + } + + success: + /* res >= 0 is the corrected return value of + mbtowc_with_lock (&wc, p, m). */ + if (nstate >= (res > 0 ? res : 1)) + abort (); + res -= nstate; + pstate[0] = 0; + return res; + + incomplete: + { + size_t k = nstate; + /* Here 0 <= k < m < 4. */ + pstate[++k] = s[0]; + if (k < m) + { + pstate[++k] = s[1]; + if (k < m) + pstate[++k] = s[2]; + } + if (k != m) + abort (); + } + pstate[0] = m; + return (size_t)(-2); + + invalid: + errno = EILSEQ; + /* The conversion state is undefined, says POSIX. */ + return (size_t)(-1); + } diff --git a/lib/mbrtowc.c b/lib/mbrtowc.c index 1aad22c..a71d394 100644 --- a/lib/mbrtowc.c +++ b/lib/mbrtowc.c @@ -1,5 +1,5 @@ /* Convert multibyte character to wide character. - Copyright (C) 1999-2002, 2005-2019 Free Software Foundation, Inc. + Copyright (C) 1999-2002, 2005-2020 Free Software Foundation, Inc. Written by Bruno Haible , 2008. This program is free software: you can redistribute it and/or modify @@ -20,441 +20,59 @@ /* Specification. */ #include -#if C_LOCALE_MAYBE_EILSEQ -# include "hard-locale.h" -# include -#endif - #if GNULIB_defined_mbstate_t -/* Implement mbrtowc() on top of mbtowc(). */ +/* Implement mbrtowc() on top of mbtowc() for the non-UTF-8 locales + and directly for the UTF-8 locales. */ # include +# include # include -# include "localcharset.h" -# include "streq.h" -# include "verify.h" -# include "glthread/lock.h" +# if defined _WIN32 && !defined __CYGWIN__ + +# define WIN32_LEAN_AND_MEAN /* avoid including junk */ +# include + +# elif HAVE_PTHREAD_API -# ifndef FALLTHROUGH -# if __GNUC__ < 7 -# define FALLTHROUGH ((void) 0) +# include +# if HAVE_THREADS_H && HAVE_WEAK_SYMBOLS +# include +# pragma weak thrd_exit +# define c11_threads_in_use() (thrd_exit != NULL) # else -# define FALLTHROUGH __attribute__ ((__fallthrough__)) +# define c11_threads_in_use() 0 # endif -# endif -/* Returns a classification of special values of the encoding of the current - locale. */ -typedef enum { - enc_other, /* other */ - enc_utf8, /* UTF-8 */ - enc_eucjp, /* EUC-JP */ - enc_94, /* EUC-KR, GB2312, BIG5 */ - enc_euctw, /* EUC-TW */ - enc_gb18030, /* GB18030 */ - enc_sjis /* SJIS */ -} enc_t; -static inline enc_t -locale_enc (void) -{ - const char *encoding = locale_charset (); - if (STREQ_OPT (encoding, "UTF-8", 'U', 'T', 'F', '-', '8', 0, 0, 0, 0)) - return enc_utf8; - if (STREQ_OPT (encoding, "EUC-JP", 'E', 'U', 'C', '-', 'J', 'P', 0, 0, 0)) - return enc_eucjp; - if (STREQ_OPT (encoding, "EUC-KR", 'E', 'U', 'C', '-', 'K', 'R', 0, 0, 0) - || STREQ_OPT (encoding, "GB2312", 'G', 'B', '2', '3', '1', '2', 0, 0, 0) - || STREQ_OPT (encoding, "BIG5", 'B', 'I', 'G', '5', 0, 0, 0, 0, 0)) - return enc_94; - if (STREQ_OPT (encoding, "EUC-TW", 'E', 'U', 'C', '-', 'T', 'W', 0, 0, 0)) - return enc_euctw; - if (STREQ_OPT (encoding, "GB18030", 'G', 'B', '1', '8', '0', '3', '0', 0, 0)) - return enc_gb18030; - if (STREQ_OPT (encoding, "SJIS", 'S', 'J', 'I', 'S', 0, 0, 0, 0, 0)) - return enc_sjis; - return enc_other; -} +# elif HAVE_THREADS_H + +# include -# if GNULIB_WCHAR_SINGLE -/* When we know that the locale does not change, provide a speedup by - caching the value of locale_enc. */ -static int cached_locale_enc = -1; -static inline enc_t -locale_enc_cached (void) -{ - if (cached_locale_enc < 0) - cached_locale_enc = locale_enc (); - return cached_locale_enc; -} -# else -/* By default, don't make assumptions, hence no caching. */ -# define locale_enc_cached locale_enc # endif -/* This lock protects the internal state of mbtowc against multiple simultaneous - calls of mbrtowc. */ -gl_lock_define_initialized(static, mbtowc_lock) +# include "attribute.h" +# include "verify.h" +# include "lc-charset-dispatch.h" +# include "mbtowc-lock.h" verify (sizeof (mbstate_t) >= 4); - static char internal_state[4]; size_t mbrtowc (wchar_t *pwc, const char *s, size_t n, mbstate_t *ps) { - char *pstate = (char *)ps; - - if (s == NULL) - { - pwc = NULL; - s = ""; - n = 1; - } - - if (n == 0) - return (size_t)(-2); - - /* Here n > 0. */ - - if (pstate == NULL) - pstate = internal_state; - - { - size_t nstate = pstate[0]; - char buf[4]; - const char *p; - size_t m; - enc_t enc; - int res; - - switch (nstate) - { - case 0: - p = s; - m = n; - break; - case 3: - buf[2] = pstate[3]; - FALLTHROUGH; - case 2: - buf[1] = pstate[2]; - FALLTHROUGH; - case 1: - buf[0] = pstate[1]; - p = buf; - m = nstate; - buf[m++] = s[0]; - if (n >= 2 && m < 4) - { - buf[m++] = s[1]; - if (n >= 3 && m < 4) - buf[m++] = s[2]; - } - break; - default: - errno = EINVAL; - return (size_t)(-1); - } - - /* Here m > 0. */ - - enc = locale_enc_cached (); - - if (enc == enc_utf8) /* UTF-8 */ - { - /* Achieve multi-thread safety by not calling mbtowc() at all. */ - /* Cf. unistr/u8-mbtouc.c. */ - unsigned char c = (unsigned char) p[0]; - - if (c < 0x80) - { - if (pwc != NULL) - *pwc = c; - res = (c == 0 ? 0 : 1); - goto success; - } - if (c >= 0xc2) - { - if (c < 0xe0) - { - if (m == 1) - goto incomplete; - else /* m >= 2 */ - { - unsigned char c2 = (unsigned char) p[1]; - - if ((c2 ^ 0x80) < 0x40) - { - if (pwc != NULL) - *pwc = ((unsigned int) (c & 0x1f) << 6) - | (unsigned int) (c2 ^ 0x80); - res = 2; - goto success; - } - } - } - else if (c < 0xf0) - { - if (m == 1) - goto incomplete; - else - { - unsigned char c2 = (unsigned char) p[1]; - - if ((c2 ^ 0x80) < 0x40 - && (c >= 0xe1 || c2 >= 0xa0) - && (c != 0xed || c2 < 0xa0)) - { - if (m == 2) - goto incomplete; - else /* m >= 3 */ - { - unsigned char c3 = (unsigned char) p[2]; - - if ((c3 ^ 0x80) < 0x40) - { - if (pwc != NULL) - *pwc = ((unsigned int) (c & 0x0f) << 12) - | ((unsigned int) (c2 ^ 0x80) << 6) - | (unsigned int) (c3 ^ 0x80); - res = 3; - goto success; - } - } - } - } - } - else if (c <= 0xf4) - { - if (m == 1) - goto incomplete; - else - { - unsigned char c2 = (unsigned char) p[1]; - - if ((c2 ^ 0x80) < 0x40 - && (c >= 0xf1 || c2 >= 0x90) - && (c < 0xf4 || (c == 0xf4 && c2 < 0x90))) - { - if (m == 2) - goto incomplete; - else - { - unsigned char c3 = (unsigned char) p[2]; - - if ((c3 ^ 0x80) < 0x40) - { - if (m == 3) - goto incomplete; - else /* m >= 4 */ - { - unsigned char c4 = (unsigned char) p[3]; - - if ((c4 ^ 0x80) < 0x40) - { - if (pwc != NULL) - *pwc = ((unsigned int) (c & 0x07) << 18) - | ((unsigned int) (c2 ^ 0x80) << 12) - | ((unsigned int) (c3 ^ 0x80) << 6) - | (unsigned int) (c4 ^ 0x80); - res = 4; - goto success; - } - } - } - } - } - } - } - } - goto invalid; - } - else - { - /* The hidden internal state of mbtowc would make this function not - multi-thread safe. Achieve multi-thread safety through a lock. */ - gl_lock_lock (mbtowc_lock); - - /* Put the hidden internal state of mbtowc into its initial state. - This is needed at least with glibc, uClibc, and MSVC CRT. - See . */ - mbtowc (NULL, NULL, 0); - - res = mbtowc (pwc, p, m); - - gl_lock_unlock (mbtowc_lock); - - if (res >= 0) - { - if (pwc != NULL && ((*pwc == 0) != (res == 0))) - abort (); - goto success; - } - - /* mbtowc does not distinguish between invalid and incomplete multibyte - sequences. But mbrtowc needs to make this distinction. - There are two possible approaches: - - Use iconv() and its return value. - - Use built-in knowledge about the possible encodings. - Given the low quality of implementation of iconv() on the systems - that lack mbrtowc(), we use the second approach. - The possible encodings are: - - 8-bit encodings, - - EUC-JP, EUC-KR, GB2312, EUC-TW, BIG5, GB18030, SJIS, - - UTF-8 (already handled above). - Use specialized code for each. */ - if (m >= 4 || m >= MB_CUR_MAX) - goto invalid; - /* Here MB_CUR_MAX > 1 and 0 < m < 4. */ - switch (enc) - { - /* As a reference for this code, you can use the GNU libiconv - implementation. Look for uses of the RET_TOOFEW macro. */ - - case enc_eucjp: /* EUC-JP */ - { - if (m == 1) - { - unsigned char c = (unsigned char) p[0]; - - if ((c >= 0xa1 && c < 0xff) || c == 0x8e || c == 0x8f) - goto incomplete; - } - if (m == 2) - { - unsigned char c = (unsigned char) p[0]; - - if (c == 0x8f) - { - unsigned char c2 = (unsigned char) p[1]; - - if (c2 >= 0xa1 && c2 < 0xff) - goto incomplete; - } - } - goto invalid; - } - - case enc_94: /* EUC-KR, GB2312, BIG5 */ - { - if (m == 1) - { - unsigned char c = (unsigned char) p[0]; - - if (c >= 0xa1 && c < 0xff) - goto incomplete; - } - goto invalid; - } - - case enc_euctw: /* EUC-TW */ - { - if (m == 1) - { - unsigned char c = (unsigned char) p[0]; - - if ((c >= 0xa1 && c < 0xff) || c == 0x8e) - goto incomplete; - } - else /* m == 2 || m == 3 */ - { - unsigned char c = (unsigned char) p[0]; - - if (c == 0x8e) - goto incomplete; - } - goto invalid; - } - - case enc_gb18030: /* GB18030 */ - { - if (m == 1) - { - unsigned char c = (unsigned char) p[0]; - - if ((c >= 0x90 && c <= 0xe3) || (c >= 0xf8 && c <= 0xfe)) - goto incomplete; - } - else /* m == 2 || m == 3 */ - { - unsigned char c = (unsigned char) p[0]; - - if (c >= 0x90 && c <= 0xe3) - { - unsigned char c2 = (unsigned char) p[1]; - - if (c2 >= 0x30 && c2 <= 0x39) - { - if (m == 2) - goto incomplete; - else /* m == 3 */ - { - unsigned char c3 = (unsigned char) p[2]; - - if (c3 >= 0x81 && c3 <= 0xfe) - goto incomplete; - } - } - } - } - goto invalid; - } - - case enc_sjis: /* SJIS */ - { - if (m == 1) - { - unsigned char c = (unsigned char) p[0]; - - if ((c >= 0x81 && c <= 0x9f) || (c >= 0xe0 && c <= 0xea) - || (c >= 0xf0 && c <= 0xf9)) - goto incomplete; - } - goto invalid; - } - - default: - /* An unknown multibyte encoding. */ - goto incomplete; - } - } - - success: - /* res >= 0 is the corrected return value of mbtowc (pwc, p, m). */ - if (nstate >= (res > 0 ? res : 1)) - abort (); - res -= nstate; - pstate[0] = 0; - return res; - - incomplete: - { - size_t k = nstate; - /* Here 0 <= k < m < 4. */ - pstate[++k] = s[0]; - if (k < m) - { - pstate[++k] = s[1]; - if (k < m) - pstate[++k] = s[2]; - } - if (k != m) - abort (); - } - pstate[0] = m; - return (size_t)(-2); - - invalid: - errno = EILSEQ; - /* The conversion state is undefined, says POSIX. */ - return (size_t)(-1); - } +# define FITS_IN_CHAR_TYPE(wc) ((wc) <= WCHAR_MAX) +# include "mbrtowc-impl.h" } #else /* Override the system's mbrtowc() function. */ +# if MBRTOWC_IN_C_LOCALE_MAYBE_EILSEQ +# include "hard-locale.h" +# include +# endif + # undef mbrtowc size_t @@ -512,14 +130,20 @@ rpl_mbrtowc (wchar_t *pwc, const char *s, size_t n, mbstate_t *ps) } # endif +# if MBRTOWC_STORES_INCOMPLETE_BUG + ret = mbrtowc (&wc, s, n, ps); + if (ret < (size_t) -2 && pwc != NULL) + *pwc = wc; +# else ret = mbrtowc (pwc, s, n, ps); +# endif # if MBRTOWC_NUL_RETVAL_BUG if (ret < (size_t) -2 && !*pwc) return 0; # endif -# if C_LOCALE_MAYBE_EILSEQ +# if MBRTOWC_IN_C_LOCALE_MAYBE_EILSEQ if ((size_t) -2 <= ret && n != 0 && ! hard_locale (LC_CTYPE)) { unsigned char uc = *s; diff --git a/lib/mbsinit.c b/lib/mbsinit.c index 5ecaef7..981a894 100644 --- a/lib/mbsinit.c +++ b/lib/mbsinit.c @@ -1,5 +1,5 @@ /* Test for initial conversion state. - Copyright (C) 2008-2019 Free Software Foundation, Inc. + Copyright (C) 2008-2020 Free Software Foundation, Inc. Written by Bruno Haible , 2008. This program is free software: you can redistribute it and/or modify @@ -56,13 +56,10 @@ mbsinit (const mbstate_t *ps) { # if defined _WIN32 && !defined __CYGWIN__ /* Native Windows. */ -# ifdef __MINGW32__ - /* On mingw, 'mbstate_t' is defined as 'int'. */ - return ps == NULL || *ps == 0; -# else - /* MSVC defines 'mbstate_t' as an 8-byte struct; the first 4-bytes matter. */ + /* MSVC defines 'mbstate_t' as an 8-byte struct; the first 4 bytes matter. + On mingw, 'mbstate_t' is sometimes defined as 'int', sometimes defined as + an 8-byte struct, of which the first 4 bytes matter. */ return ps == NULL || *(const unsigned int *)ps == 0; -# endif # else /* Minix, HP-UX 11.00, Solaris 2.6, Interix, ... */ /* Maybe this definition works, maybe not... */ diff --git a/lib/mbtowc-impl.h b/lib/mbtowc-impl.h index f4ab981..22e414a 100644 --- a/lib/mbtowc-impl.h +++ b/lib/mbtowc-impl.h @@ -1,5 +1,5 @@ /* Convert multibyte character to wide character. - Copyright (C) 2011-2019 Free Software Foundation, Inc. + Copyright (C) 2011-2020 Free Software Foundation, Inc. Written by Bruno Haible , 2011. This program is free software: you can redistribute it and/or modify diff --git a/lib/mbtowc-lock.c b/lib/mbtowc-lock.c new file mode 100644 index 0000000..85ad3c4 --- /dev/null +++ b/lib/mbtowc-lock.c @@ -0,0 +1,150 @@ +/* Return the internal lock used by mbrtowc and mbrtoc32. + Copyright (C) 2019-2020 Free Software Foundation, Inc. + + This 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 . */ + +/* Written by Bruno Haible , 2019-2020. */ + +#include + +/* When it is known that the gl_get_mbtowc_lock function is defined + by a dependency library, it should not be defined here. */ +#if OMIT_MBTOWC_LOCK + +/* This declaration is solely to ensure that after preprocessing + this file is never empty. */ +typedef int dummy; + +#else + +/* This file defines the internal lock used by mbrtowc and mbrtoc32. + It is a separate compilation unit, so that only one copy of it is + present when linking statically. */ + +/* Prohibit renaming this symbol. */ +# undef gl_get_mbtowc_lock + +/* Macro for exporting a symbol (function, not variable) defined in this file, + when compiled into a shared library. */ +# ifndef DLL_EXPORTED +# if HAVE_VISIBILITY + /* Override the effect of the compiler option '-fvisibility=hidden'. */ +# define DLL_EXPORTED __attribute__((__visibility__("default"))) +# elif defined _WIN32 || defined __CYGWIN__ +# define DLL_EXPORTED __declspec(dllexport) +# else +# define DLL_EXPORTED +# endif +# endif + +# if defined _WIN32 && !defined __CYGWIN__ + +# define WIN32_LEAN_AND_MEAN /* avoid including junk */ +# include + +# include "windows-initguard.h" + +/* The return type is a 'CRITICAL_SECTION *', not a 'glwthread_mutex_t *', + because the latter is not guaranteed to be a stable ABI in the future. */ + +/* Make sure the function gets exported from DLLs. */ +DLL_EXPORTED CRITICAL_SECTION *gl_get_mbtowc_lock (void); + +static glwthread_initguard_t guard = GLWTHREAD_INITGUARD_INIT; +static CRITICAL_SECTION lock; + +/* Returns the internal lock used by mbrtowc and mbrtoc32. */ +CRITICAL_SECTION * +gl_get_mbtowc_lock (void) +{ + if (!guard.done) + { + if (InterlockedIncrement (&guard.started) == 0) + { + /* This thread is the first one to need the lock. Initialize it. */ + InitializeCriticalSection (&lock); + guard.done = 1; + } + else + { + /* Don't let guard.started grow and wrap around. */ + InterlockedDecrement (&guard.started); + /* Yield the CPU while waiting for another thread to finish + initializing this mutex. */ + while (!guard.done) + Sleep (0); + } + } + return &lock; +} + +# elif HAVE_PTHREAD_API + +# include + +static pthread_mutex_t mutex = PTHREAD_MUTEX_INITIALIZER; + +/* Make sure the function gets exported from shared libraries. */ +DLL_EXPORTED pthread_mutex_t *gl_get_mbtowc_lock (void); + +/* Returns the internal lock used by mbrtowc and mbrtoc32. */ +pthread_mutex_t * +gl_get_mbtowc_lock (void) +{ + return &mutex; +} + +# elif HAVE_THREADS_H + +# include +# include + +static int volatile init_needed = 1; +static once_flag init_once = ONCE_FLAG_INIT; +static mtx_t mutex; + +static void +atomic_init (void) +{ + if (mtx_init (&mutex, mtx_plain) != thrd_success) + abort (); + init_needed = 0; +} + +/* Make sure the function gets exported from shared libraries. */ +DLL_EXPORTED mtx_t *gl_get_mbtowc_lock (void); + +/* Returns the internal lock used by mbrtowc and mbrtoc32. */ +mtx_t * +gl_get_mbtowc_lock (void) +{ + if (init_needed) + call_once (&init_once, atomic_init); + return &mutex; +} + +# endif + +# if (defined _WIN32 || defined __CYGWIN__) && !defined _MSC_VER +/* Make sure the '__declspec(dllimport)' in mbrtowc.c and mbrtoc32.c does not + cause a link failure when no DLLs are involved. */ +# if defined _WIN64 || defined _LP64 +# define IMP(x) __imp_##x +# else +# define IMP(x) _imp__##x +# endif +void * IMP(gl_get_mbtowc_lock) = &gl_get_mbtowc_lock; +# endif + +#endif diff --git a/lib/mbtowc-lock.h b/lib/mbtowc-lock.h new file mode 100644 index 0000000..e101978 --- /dev/null +++ b/lib/mbtowc-lock.h @@ -0,0 +1,115 @@ +/* Use the internal lock used by mbrtowc and mbrtoc32. + Copyright (C) 2019-2020 Free Software Foundation, Inc. + + This 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 . */ + +/* Written by Bruno Haible , 2019-2020. */ + +/* Use a lock, so that no two threads can invoke mbtowc at the same time. */ + +static inline int +mbtowc_unlocked (wchar_t *pwc, const char *p, size_t m) +{ + /* Put the hidden internal state of mbtowc into its initial state. + This is needed at least with glibc, uClibc, and MSVC CRT. + See . */ + mbtowc (NULL, NULL, 0); + + return mbtowc (pwc, p, m); +} + +/* Prohibit renaming this symbol. */ +#undef gl_get_mbtowc_lock + +#if defined _WIN32 && !defined __CYGWIN__ + +extern __declspec(dllimport) CRITICAL_SECTION *gl_get_mbtowc_lock (void); + +static int +mbtowc_with_lock (wchar_t *pwc, const char *p, size_t m) +{ + CRITICAL_SECTION *lock = gl_get_mbtowc_lock (); + int ret; + + EnterCriticalSection (lock); + ret = mbtowc_unlocked (pwc, p, m); + LeaveCriticalSection (lock); + + return ret; +} + +#elif HAVE_PTHREAD_API /* AIX, IRIX, Cygwin */ + +extern +# if defined _WIN32 || defined __CYGWIN__ + __declspec(dllimport) +# endif + pthread_mutex_t *gl_get_mbtowc_lock (void); + +# if HAVE_WEAK_SYMBOLS /* IRIX */ + + /* Avoid the need to link with '-lpthread'. */ +# pragma weak pthread_mutex_lock +# pragma weak pthread_mutex_unlock + + /* Determine whether libpthread is in use. */ +# pragma weak pthread_mutexattr_gettype + /* See the comments in lock.h. */ +# define pthread_in_use() \ + (pthread_mutexattr_gettype != NULL || c11_threads_in_use ()) + +# else +# define pthread_in_use() 1 +# endif + +static int +mbtowc_with_lock (wchar_t *pwc, const char *p, size_t m) +{ + if (pthread_in_use()) + { + pthread_mutex_t *lock = gl_get_mbtowc_lock (); + int ret; + + if (pthread_mutex_lock (lock)) + abort (); + ret = mbtowc_unlocked (pwc, p, m); + if (pthread_mutex_unlock (lock)) + abort (); + + return ret; + } + else + return mbtowc_unlocked (pwc, p, m); +} + +#elif HAVE_THREADS_H + +extern mtx_t *gl_get_mbtowc_lock (void); + +static int +mbtowc_with_lock (wchar_t *pwc, const char *p, size_t m) +{ + mtx_t *lock = gl_get_mbtowc_lock (); + int ret; + + if (mtx_lock (lock) != thrd_success) + abort (); + ret = mbtowc_unlocked (pwc, p, m); + if (mtx_unlock (lock) != thrd_success) + abort (); + + return ret; +} + +#endif diff --git a/lib/mbtowc.c b/lib/mbtowc.c index 77a8472..5fc2d28 100644 --- a/lib/mbtowc.c +++ b/lib/mbtowc.c @@ -1,5 +1,5 @@ /* Convert multibyte character to wide character. - Copyright (C) 2011-2019 Free Software Foundation, Inc. + Copyright (C) 2011-2020 Free Software Foundation, Inc. Written by Bruno Haible , 2011. This program is free software: you can redistribute it and/or modify diff --git a/lib/minmax.h b/lib/minmax.h index d7f6bea..b947776 100644 --- a/lib/minmax.h +++ b/lib/minmax.h @@ -1,5 +1,5 @@ /* MIN, MAX macros. - Copyright (C) 1995, 1998, 2001, 2003, 2005, 2009-2019 Free Software + Copyright (C) 1995, 1998, 2001, 2003, 2005, 2009-2020 Free Software Foundation, Inc. This program is free software; you can redistribute it and/or modify diff --git a/lib/mkdir.c b/lib/mkdir.c index b8320d0..c0d4b61 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-2019 Free Software Foundation, Inc. + Copyright (C) 2001, 2003, 2006, 2008-2020 Free Software Foundation, Inc. This 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/mkstemp.c b/lib/mkstemp.c index 7ef0420..c809de8 100644 --- a/lib/mkstemp.c +++ b/lib/mkstemp.c @@ -1,4 +1,4 @@ -/* Copyright (C) 1998-1999, 2001, 2005-2007, 2009-2019 Free Software +/* Copyright (C) 1998-1999, 2001, 2005-2007, 2009-2020 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 75b5a07..8636688 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-2019 Free Software Foundation, Inc. + Copyright (C) 2011-2020 Free Software Foundation, Inc. This 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/msvc-inval.h b/lib/msvc-inval.h index 9d3aa1f..93ee785 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-2019 Free Software Foundation, Inc. + Copyright (C) 2011-2020 Free Software Foundation, Inc. This 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/msvc-nothrow.c b/lib/msvc-nothrow.c index 49b709c..bf93b88 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-2019 Free Software Foundation, Inc. + Copyright (C) 2011-2020 Free Software Foundation, Inc. This 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/msvc-nothrow.h b/lib/msvc-nothrow.h index 8d3ca78..fca5415 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-2019 Free Software Foundation, Inc. + Copyright (C) 2011-2020 Free Software Foundation, Inc. This 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/nl_langinfo-lock.c b/lib/nl_langinfo-lock.c new file mode 100644 index 0000000..c2328ab --- /dev/null +++ b/lib/nl_langinfo-lock.c @@ -0,0 +1,150 @@ +/* Return the internal lock used by nl_langinfo. + Copyright (C) 2019-2020 Free Software Foundation, Inc. + + This 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 . */ + +/* Written by Bruno Haible , 2019-2020. */ + +#include + +/* When it is known that the gl_get_nl_langinfo_lock function is defined + by a dependency library, it should not be defined here. */ +#if OMIT_NL_LANGINFO_LOCK + +/* This declaration is solely to ensure that after preprocessing + this file is never empty. */ +typedef int dummy; + +#else + +/* This file defines the internal lock used by nl_langinfo. + It is a separate compilation unit, so that only one copy of it is + present when linking statically. */ + +/* Prohibit renaming this symbol. */ +# undef gl_get_nl_langinfo_lock + +/* Macro for exporting a symbol (function, not variable) defined in this file, + when compiled into a shared library. */ +# ifndef DLL_EXPORTED +# if HAVE_VISIBILITY + /* Override the effect of the compiler option '-fvisibility=hidden'. */ +# define DLL_EXPORTED __attribute__((__visibility__("default"))) +# elif defined _WIN32 || defined __CYGWIN__ +# define DLL_EXPORTED __declspec(dllexport) +# else +# define DLL_EXPORTED +# endif +# endif + +# if defined _WIN32 && !defined __CYGWIN__ + +# define WIN32_LEAN_AND_MEAN /* avoid including junk */ +# include + +# include "windows-initguard.h" + +/* The return type is a 'CRITICAL_SECTION *', not a 'glwthread_mutex_t *', + because the latter is not guaranteed to be a stable ABI in the future. */ + +/* Make sure the function gets exported from DLLs. */ +DLL_EXPORTED CRITICAL_SECTION *gl_get_nl_langinfo_lock (void); + +static glwthread_initguard_t guard = GLWTHREAD_INITGUARD_INIT; +static CRITICAL_SECTION lock; + +/* Returns the internal lock used by nl_langinfo. */ +CRITICAL_SECTION * +gl_get_nl_langinfo_lock (void) +{ + if (!guard.done) + { + if (InterlockedIncrement (&guard.started) == 0) + { + /* This thread is the first one to need the lock. Initialize it. */ + InitializeCriticalSection (&lock); + guard.done = 1; + } + else + { + /* Don't let guard.started grow and wrap around. */ + InterlockedDecrement (&guard.started); + /* Yield the CPU while waiting for another thread to finish + initializing this mutex. */ + while (!guard.done) + Sleep (0); + } + } + return &lock; +} + +# elif HAVE_PTHREAD_API + +# include + +static pthread_mutex_t mutex = PTHREAD_MUTEX_INITIALIZER; + +/* Make sure the function gets exported from shared libraries. */ +DLL_EXPORTED pthread_mutex_t *gl_get_nl_langinfo_lock (void); + +/* Returns the internal lock used by nl_langinfo. */ +pthread_mutex_t * +gl_get_nl_langinfo_lock (void) +{ + return &mutex; +} + +# elif HAVE_THREADS_H + +# include +# include + +static int volatile init_needed = 1; +static once_flag init_once = ONCE_FLAG_INIT; +static mtx_t mutex; + +static void +atomic_init (void) +{ + if (mtx_init (&mutex, mtx_plain) != thrd_success) + abort (); + init_needed = 0; +} + +/* Make sure the function gets exported from shared libraries. */ +DLL_EXPORTED mtx_t *gl_get_nl_langinfo_lock (void); + +/* Returns the internal lock used by nl_langinfo. */ +mtx_t * +gl_get_nl_langinfo_lock (void) +{ + if (init_needed) + call_once (&init_once, atomic_init); + return &mutex; +} + +# endif + +# if (defined _WIN32 || defined __CYGWIN__) && !defined _MSC_VER +/* Make sure the '__declspec(dllimport)' in nl_langinfo.c does not cause + a link failure when no DLLs are involved. */ +# if defined _WIN64 || defined _LP64 +# define IMP(x) __imp_##x +# else +# define IMP(x) _imp__##x +# endif +void * IMP(gl_get_nl_langinfo_lock) = &gl_get_nl_langinfo_lock; +# endif + +#endif diff --git a/lib/nl_langinfo.c b/lib/nl_langinfo.c index 76579a8..2b4c0c5 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-2019 Free Software Foundation, Inc. + Copyright (C) 2007-2020 Free Software Foundation, Inc. This program is free software: you can redistribute it and/or modify it under the terms of the GNU General Public License as published by @@ -21,6 +21,7 @@ #include #include +#include #include #if defined _WIN32 && ! defined __CYGWIN__ # define WIN32_LEAN_AND_MEAN /* avoid including junk */ @@ -28,19 +29,60 @@ # include #endif +#if REPLACE_NL_LANGINFO && !NL_LANGINFO_MTSAFE +# if defined _WIN32 && !defined __CYGWIN__ + +# define WIN32_LEAN_AND_MEAN /* avoid including junk */ +# include + +# elif HAVE_PTHREAD_API + +# include +# if HAVE_THREADS_H && HAVE_WEAK_SYMBOLS +# include +# pragma weak thrd_exit +# define c11_threads_in_use() (thrd_exit != NULL) +# else +# define c11_threads_in_use() 0 +# endif + +# elif HAVE_THREADS_H + +# include + +# endif +#endif + +/* nl_langinfo() must be multithread-safe. To achieve this without using + thread-local storage: + 1. We use a specific static buffer for each possible argument. + So that different threads can call nl_langinfo with different arguments, + without interfering. + 2. We use a simple strcpy or memcpy to fill this static buffer. Filling it + through, for example, strcpy + strcat would not be guaranteed to leave + the buffer's contents intact if another thread is currently accessing + it. If necessary, the contents is first assembled in a stack-allocated + buffer. */ + #if !REPLACE_NL_LANGINFO || GNULIB_defined_CODESET /* Return the codeset of the current locale, if this is easily deducible. Otherwise, return "". */ static char * ctype_codeset (void) { - static char buf[2 + 10 + 1]; - char const *locale = setlocale (LC_CTYPE, NULL); - char *codeset = buf; + static char result[2 + 10 + 1]; + char buf[2 + 10 + 1]; + char locale[SETLOCALE_NULL_MAX]; + char *codeset; size_t codesetlen; + + if (setlocale_null_r (LC_CTYPE, locale, sizeof (locale))) + locale[0] = '\0'; + + codeset = buf; codeset[0] = '\0'; - if (locale && locale[0]) + if (locale[0]) { /* If the locale name contains an encoding after the dot, return it. */ char *dot = strchr (locale, '.'); @@ -79,11 +121,16 @@ ctype_codeset (void) /* For a locale name such as "French_France.65001", in Windows 10, setlocale now returns "French_France.utf8" instead. */ if (strcmp (buf + 2, "65001") == 0 || strcmp (buf + 2, "utf8") == 0) - return "UTF-8"; + return (char *) "UTF-8"; else - return memcpy (buf, "CP", 2); + { + memcpy (buf, "CP", 2); + strcpy (result, buf); + return result; + } # else - return codeset; + strcpy (result, codeset); + return result; #endif } #endif @@ -95,6 +142,137 @@ ctype_codeset (void) # undef nl_langinfo +/* Without locking, on Solaris 11.3, test-nl_langinfo-mt fails, with message + "thread5 disturbed by threadN!", even when threadN invokes only + nl_langinfo (CODESET); + nl_langinfo (CRNCYSTR); + Similarly on Solaris 10. */ + +# if !NL_LANGINFO_MTSAFE /* Solaris */ + +# define ITEMS (MAXSTRMSG + 1) +# define MAX_RESULT_LEN 80 + +static char * +nl_langinfo_unlocked (nl_item item) +{ + static char result[ITEMS][MAX_RESULT_LEN]; + + /* The result of nl_langinfo is in storage that can be overwritten by + other calls to nl_langinfo. */ + char *tmp = nl_langinfo (item); + if (item >= 0 && item < ITEMS && tmp != NULL) + { + size_t tmp_len = strlen (tmp); + if (tmp_len < MAX_RESULT_LEN) + strcpy (result[item], tmp); + else + { + /* Produce a truncated result. Oh well... */ + result[item][MAX_RESULT_LEN - 1] = '\0'; + memcpy (result[item], tmp, MAX_RESULT_LEN - 1); + } + return result[item]; + } + else + return tmp; +} + +/* Use a lock, so that no two threads can invoke nl_langinfo_unlocked + at the same time. */ + +/* Prohibit renaming this symbol. */ +# undef gl_get_nl_langinfo_lock + +# if defined _WIN32 && !defined __CYGWIN__ + +extern __declspec(dllimport) CRITICAL_SECTION *gl_get_nl_langinfo_lock (void); + +static char * +nl_langinfo_with_lock (nl_item item) +{ + CRITICAL_SECTION *lock = gl_get_nl_langinfo_lock (); + char *ret; + + EnterCriticalSection (lock); + ret = nl_langinfo_unlocked (item); + LeaveCriticalSection (lock); + + return ret; +} + +# elif HAVE_PTHREAD_API + +extern +# if defined _WIN32 || defined __CYGWIN__ + __declspec(dllimport) +# endif + pthread_mutex_t *gl_get_nl_langinfo_lock (void); + +# if HAVE_WEAK_SYMBOLS /* musl libc, FreeBSD, NetBSD, OpenBSD, Haiku */ + + /* Avoid the need to link with '-lpthread'. */ +# pragma weak pthread_mutex_lock +# pragma weak pthread_mutex_unlock + + /* Determine whether libpthread is in use. */ +# pragma weak pthread_mutexattr_gettype + /* See the comments in lock.h. */ +# define pthread_in_use() \ + (pthread_mutexattr_gettype != NULL || c11_threads_in_use ()) + +# else +# define pthread_in_use() 1 +# endif + +static char * +nl_langinfo_with_lock (nl_item item) +{ + if (pthread_in_use()) + { + pthread_mutex_t *lock = gl_get_nl_langinfo_lock (); + char *ret; + + if (pthread_mutex_lock (lock)) + abort (); + ret = nl_langinfo_unlocked (item); + if (pthread_mutex_unlock (lock)) + abort (); + + return ret; + } + else + return nl_langinfo_unlocked (item); +} + +# elif HAVE_THREADS_H + +extern mtx_t *gl_get_nl_langinfo_lock (void); + +static char * +nl_langinfo_with_lock (nl_item item) +{ + mtx_t *lock = gl_get_nl_langinfo_lock (); + char *ret; + + if (mtx_lock (lock) != thrd_success) + abort (); + ret = nl_langinfo_unlocked (item); + if (mtx_unlock (lock) != thrd_success) + abort (); + + return ret; +} + +# endif + +# else + +/* On other platforms, no lock is needed. */ +# define nl_langinfo_with_lock nl_langinfo + +# endif + char * rpl_nl_langinfo (nl_item item) { @@ -161,7 +339,7 @@ rpl_nl_langinfo (nl_item item) default: break; } - return nl_langinfo (item); + return nl_langinfo_with_lock (item); } #else @@ -175,7 +353,7 @@ rpl_nl_langinfo (nl_item item) char * nl_langinfo (nl_item item) { - static char nlbuf[100]; + char buf[100]; struct tm tmm = { 0 }; switch (item) @@ -215,14 +393,22 @@ nl_langinfo (nl_item item) case T_FMT_AMPM: return (char *) "%I:%M:%S %p"; case AM_STR: - if (!strftime (nlbuf, sizeof nlbuf, "%p", &tmm)) - return (char *) "AM"; - return nlbuf; + { + static char result[80]; + if (!strftime (buf, sizeof result, "%p", &tmm)) + return (char *) "AM"; + strcpy (result, buf); + return result; + } case PM_STR: - tmm.tm_hour = 12; - if (!strftime (nlbuf, sizeof nlbuf, "%p", &tmm)) - return (char *) "PM"; - return nlbuf; + { + static char result[80]; + tmm.tm_hour = 12; + if (!strftime (buf, sizeof result, "%p", &tmm)) + return (char *) "PM"; + strcpy (result, buf); + return result; + } case DAY_1: case DAY_2: case DAY_3: @@ -231,14 +417,16 @@ nl_langinfo (nl_item item) case DAY_6: case DAY_7: { + static char result[7][50]; static char const days[][sizeof "Wednesday"] = { "Sunday", "Monday", "Tuesday", "Wednesday", "Thursday", "Friday", "Saturday" }; tmm.tm_wday = item - DAY_1; - if (!strftime (nlbuf, sizeof nlbuf, "%A", &tmm)) + if (!strftime (buf, sizeof result[0], "%A", &tmm)) return (char *) days[item - DAY_1]; - return nlbuf; + strcpy (result[item - DAY_1], buf); + return result[item - DAY_1]; } case ABDAY_1: case ABDAY_2: @@ -248,13 +436,15 @@ nl_langinfo (nl_item item) case ABDAY_6: case ABDAY_7: { + static char result[7][30]; static char const abdays[][sizeof "Sun"] = { "Sun", "Mon", "Tue", "Wed", "Thu", "Fri", "Sat" }; tmm.tm_wday = item - ABDAY_1; - if (!strftime (nlbuf, sizeof nlbuf, "%a", &tmm)) + if (!strftime (buf, sizeof result[0], "%a", &tmm)) return (char *) abdays[item - ABDAY_1]; - return nlbuf; + strcpy (result[item - ABDAY_1], buf); + return result[item - ABDAY_1]; } { static char const months[][sizeof "September"] = { @@ -273,10 +463,14 @@ nl_langinfo (nl_item item) case MON_10: case MON_11: case MON_12: - tmm.tm_mon = item - MON_1; - if (!strftime (nlbuf, sizeof nlbuf, "%B", &tmm)) - return (char *) months[item - MON_1]; - return nlbuf; + { + static char result[12][50]; + tmm.tm_mon = item - MON_1; + if (!strftime (buf, sizeof result[0], "%B", &tmm)) + return (char *) months[item - MON_1]; + strcpy (result[item - MON_1], buf); + return result[item - MON_1]; + } case ALTMON_1: case ALTMON_2: case ALTMON_3: @@ -289,15 +483,19 @@ nl_langinfo (nl_item item) case ALTMON_10: case ALTMON_11: case ALTMON_12: - tmm.tm_mon = item - ALTMON_1; - /* The platforms without nl_langinfo() don't support strftime with %OB. - We don't even need to try. */ - #if 0 - if (!strftime (nlbuf, sizeof nlbuf, "%OB", &tmm)) - #endif - if (!strftime (nlbuf, sizeof nlbuf, "%B", &tmm)) - return (char *) months[item - ALTMON_1]; - return nlbuf; + { + static char result[12][50]; + tmm.tm_mon = item - ALTMON_1; + /* The platforms without nl_langinfo() don't support strftime with + %OB. We don't even need to try. */ + #if 0 + if (!strftime (buf, sizeof result[0], "%OB", &tmm)) + #endif + if (!strftime (buf, sizeof result[0], "%B", &tmm)) + return (char *) months[item - ALTMON_1]; + strcpy (result[item - ALTMON_1], buf); + return result[item - ALTMON_1]; + } } case ABMON_1: case ABMON_2: @@ -312,14 +510,16 @@ nl_langinfo (nl_item item) case ABMON_11: case ABMON_12: { + static char result[12][30]; static char const abmonths[][sizeof "Jan"] = { "Jan", "Feb", "Mar", "Apr", "May", "Jun", "Jul", "Sep", "Oct", "Nov", "Dec" }; tmm.tm_mon = item - ABMON_1; - if (!strftime (nlbuf, sizeof nlbuf, "%b", &tmm)) + if (!strftime (buf, sizeof result[0], "%b", &tmm)) return (char *) abmonths[item - ABMON_1]; - return nlbuf; + strcpy (result[item - ABMON_1], buf); + return result[item - ABMON_1]; } case ERA: return (char *) ""; diff --git a/lib/open.c b/lib/open.c new file mode 100644 index 0000000..0f7c6e9 --- /dev/null +++ b/lib/open.c @@ -0,0 +1,209 @@ +/* Open a descriptor to a file. + Copyright (C) 2007-2020 Free Software Foundation, Inc. + + This 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 . */ + +/* Written by Bruno Haible , 2007. */ + +/* If the user's config.h happens to include , let it include only + the system's here, so that orig_open doesn't recurse to + rpl_open. */ +#define __need_system_fcntl_h +#include + +/* Get the original definition of open. It might be defined as a macro. */ +#include +#include +#undef __need_system_fcntl_h + +static int +orig_open (const char *filename, int flags, mode_t mode) +{ +#if defined _WIN32 && !defined __CYGWIN__ + return _open (filename, flags, mode); +#else + return open (filename, flags, mode); +#endif +} + +/* Specification. */ +/* Write "fcntl.h" here, not , otherwise OSF/1 5.1 DTK cc eliminates + this include because of the preliminary #include above. */ +#include "fcntl.h" + +#include "cloexec.h" + +#include +#include +#include +#include +#include +#include + +#ifndef REPLACE_OPEN_DIRECTORY +# define REPLACE_OPEN_DIRECTORY 0 +#endif + +int +open (const char *filename, int flags, ...) +{ + /* 0 = unknown, 1 = yes, -1 = no. */ +#if GNULIB_defined_O_CLOEXEC + int have_cloexec = -1; +#else + static int have_cloexec; +#endif + + mode_t mode; + int fd; + + mode = 0; + if (flags & O_CREAT) + { + va_list arg; + va_start (arg, flags); + + /* We have to use PROMOTED_MODE_T instead of mode_t, otherwise GCC 4 + creates crashing code when 'mode_t' is smaller than 'int'. */ + mode = va_arg (arg, PROMOTED_MODE_T); + + va_end (arg); + } + +#if GNULIB_defined_O_NONBLOCK + /* The only known platform that lacks O_NONBLOCK is mingw, but it + also lacks named pipes and Unix sockets, which are the only two + file types that require non-blocking handling in open(). + Therefore, it is safe to ignore O_NONBLOCK here. It is handy + that mingw also lacks openat(), so that is also covered here. */ + flags &= ~O_NONBLOCK; +#endif + +#if defined _WIN32 && ! defined __CYGWIN__ + if (strcmp (filename, "/dev/null") == 0) + filename = "NUL"; +#endif + +#if OPEN_TRAILING_SLASH_BUG + /* Fail if one of O_CREAT, O_WRONLY, O_RDWR is specified and the filename + ends in a slash, as POSIX says such a filename must name a directory + : + "A pathname that contains at least one non- character and that + ends with one or more trailing characters shall not be resolved + successfully unless the last pathname component before the trailing + characters names an existing directory" + If the named file already exists as a directory, then + - if O_CREAT is specified, open() must fail because of the semantics + of O_CREAT, + - if O_WRONLY or O_RDWR is specified, open() must fail because POSIX + + says that it fails with errno = EISDIR in this case. + If the named file does not exist or does not name a directory, then + - if O_CREAT is specified, open() must fail since open() cannot create + directories, + - if O_WRONLY or O_RDWR is specified, open() must fail because the + file does not contain a '.' directory. */ + if ((flags & O_CREAT) + || (flags & O_ACCMODE) == O_RDWR + || (flags & O_ACCMODE) == O_WRONLY) + { + size_t len = strlen (filename); + if (len > 0 && filename[len - 1] == '/') + { + errno = EISDIR; + return -1; + } + } +#endif + + fd = orig_open (filename, + flags & ~(have_cloexec < 0 ? O_CLOEXEC : 0), mode); + + if (flags & O_CLOEXEC) + { + if (! have_cloexec) + { + if (0 <= fd) + have_cloexec = 1; + else if (errno == EINVAL) + { + fd = orig_open (filename, flags & ~O_CLOEXEC, mode); + have_cloexec = -1; + } + } + if (have_cloexec < 0 && 0 <= fd) + set_cloexec_flag (fd, true); + } + + +#if REPLACE_FCHDIR + /* Implementing fchdir and fdopendir requires the ability to open a + directory file descriptor. If open doesn't support that (as on + mingw), we use a dummy file that behaves the same as directories + on Linux (ie. always reports EOF on attempts to read()), and + override fstat() in fchdir.c to hide the fact that we have a + dummy. */ + if (REPLACE_OPEN_DIRECTORY && fd < 0 && errno == EACCES + && ((flags & O_ACCMODE) == O_RDONLY + || (O_SEARCH != O_RDONLY && (flags & O_ACCMODE) == O_SEARCH))) + { + struct stat statbuf; + if (stat (filename, &statbuf) == 0 && S_ISDIR (statbuf.st_mode)) + { + /* Maximum recursion depth of 1. */ + fd = open ("/dev/null", flags, mode); + if (0 <= fd) + fd = _gl_register_fd (fd, filename); + } + else + errno = EACCES; + } +#endif + +#if OPEN_TRAILING_SLASH_BUG + /* If the filename ends in a slash and fd does not refer to a directory, + then fail. + Rationale: POSIX says such a filename must name a directory + : + "A pathname that contains at least one non- character and that + ends with one or more trailing characters shall not be resolved + successfully unless the last pathname component before the trailing + characters names an existing directory" + If the named file without the slash is not a directory, open() must fail + with ENOTDIR. */ + if (fd >= 0) + { + /* We know len is positive, since open did not fail with ENOENT. */ + size_t len = strlen (filename); + if (filename[len - 1] == '/') + { + struct stat statbuf; + + if (fstat (fd, &statbuf) >= 0 && !S_ISDIR (statbuf.st_mode)) + { + close (fd); + errno = ENOTDIR; + return -1; + } + } + } +#endif + +#if REPLACE_FCHDIR + if (!REPLACE_OPEN_DIRECTORY && 0 <= fd) + fd = _gl_register_fd (fd, filename); +#endif + + return fd; +} diff --git a/lib/pathmax.h b/lib/pathmax.h index 9463a1f..15a236f 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-2019 Free Software + Copyright (C) 1992, 1999, 2001, 2003, 2005, 2009-2020 Free Software Foundation, Inc. This program is free software; you can redistribute it and/or modify @@ -20,7 +20,7 @@ /* POSIX:2008 defines PATH_MAX to be the maximum number of bytes in a filename, including the terminating NUL byte. - + PATH_MAX is not defined on systems which have no limit on filename length, such as GNU/Hurd. diff --git a/lib/progname.c b/lib/progname.c index a42b7fa..d59d969 100644 --- a/lib/progname.c +++ b/lib/progname.c @@ -1,5 +1,5 @@ /* Program name management. - Copyright (C) 2001-2003, 2005-2019 Free Software Foundation, Inc. + Copyright (C) 2001-2003, 2005-2020 Free Software Foundation, Inc. Written by Bruno Haible , 2001. This program is free software: you can redistribute it and/or modify diff --git a/lib/progname.h b/lib/progname.h index c726e97..bc276cc 100644 --- a/lib/progname.h +++ b/lib/progname.h @@ -1,5 +1,5 @@ /* Program name management. - Copyright (C) 2001-2004, 2006, 2009-2019 Free Software Foundation, Inc. + Copyright (C) 2001-2004, 2006, 2009-2020 Free Software Foundation, Inc. Written by Bruno Haible , 2001. This program is free software: you can redistribute it and/or modify diff --git a/lib/quote.h b/lib/quote.h index 5cef8ff..391ff1a 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-2019 Free Software Foundation, Inc. + Copyright (C) 1998-2001, 2003, 2009-2020 Free Software Foundation, Inc. This 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 773d53f..b13574d 100644 --- a/lib/quotearg.c +++ b/lib/quotearg.c @@ -1,6 +1,6 @@ /* quotearg.c - quote arguments for output - Copyright (C) 1998-2002, 2004-2019 Free Software Foundation, Inc. + Copyright (C) 1998-2002, 2004-2020 Free Software Foundation, Inc. This program is free software: you can redistribute it and/or modify it under the terms of the GNU General Public License as published by @@ -29,6 +29,7 @@ #include "quotearg.h" #include "quote.h" +#include "attribute.h" #include "minmax.h" #include "xalloc.h" #include "c-strcaseeq.h" @@ -54,14 +55,6 @@ #define INT_BITS (sizeof (int) * CHAR_BIT) -#ifndef FALLTHROUGH -# if __GNUC__ < 7 -# define FALLTHROUGH ((void) 0) -# else -# define FALLTHROUGH __attribute__ ((__fallthrough__)) -# endif -#endif - struct quoting_options { /* Basic quoting style. */ diff --git a/lib/quotearg.h b/lib/quotearg.h index 0f07e02..3bf149b 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-2019 Free Software Foundation, + Copyright (C) 1998-2002, 2004, 2006, 2008-2020 Free Software Foundation, Inc. This program is free software: you can redistribute it and/or modify @@ -323,7 +323,7 @@ void set_custom_quoting (struct quoting_options *o, On output, BUFFER might contain embedded null bytes if ARGSIZE was not -1, the style of O does not use backslash escapes, and the flags of O do not request elision of null bytes.*/ -size_t quotearg_buffer (char *buffer, size_t buffersize, +size_t quotearg_buffer (char *restrict buffer, size_t buffersize, char const *arg, size_t argsize, struct quoting_options const *o); diff --git a/lib/read.c b/lib/read.c index 52df1b0..0fc60ea 100644 --- a/lib/read.c +++ b/lib/read.c @@ -1,5 +1,5 @@ /* POSIX compatible read() function. - Copyright (C) 2008-2019 Free Software Foundation, Inc. + Copyright (C) 2008-2020 Free Software Foundation, Inc. Written by Bruno Haible , 2011. This program is free software: you can redistribute it and/or modify @@ -37,6 +37,10 @@ # include # endif +/* Don't assume that UNICODE is not defined. */ +# undef GetNamedPipeHandleState +# define GetNamedPipeHandleState GetNamedPipeHandleStateA + # undef read # if HAVE_MSVC_INVALID_PARAMETER_HANDLER @@ -47,7 +51,7 @@ read_nothrow (int fd, void *buf, size_t count) TRY_MSVC_INVAL { - result = read (fd, buf, count); + result = _read (fd, buf, count); } CATCH_MSVC_INVAL { @@ -59,7 +63,7 @@ read_nothrow (int fd, void *buf, size_t count) return result; } # else -# define read_nothrow read +# define read_nothrow _read # endif ssize_t diff --git a/lib/readlink.c b/lib/readlink.c index bf71109..4d392ef 100644 --- a/lib/readlink.c +++ b/lib/readlink.c @@ -1,5 +1,5 @@ /* Stub for readlink(). - Copyright (C) 2003-2007, 2009-2019 Free Software Foundation, Inc. + Copyright (C) 2003-2007, 2009-2020 Free Software Foundation, Inc. This 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/realloc.c b/lib/realloc.c index a81ce3b..a24054d 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-2019 Free Software + Copyright (C) 1997, 2003-2004, 2006-2007, 2009-2020 Free Software Foundation, Inc. This program is free software: you can redistribute it and/or modify diff --git a/lib/regcomp.c b/lib/regcomp.c index 892139a..a4b95b0 100644 --- a/lib/regcomp.c +++ b/lib/regcomp.c @@ -1,5 +1,5 @@ /* Extended regular expression matching and search library. - Copyright (C) 2002-2019 Free Software Foundation, Inc. + Copyright (C) 2002-2020 Free Software Foundation, Inc. This file is part of the GNU C Library. Contributed by Isamu Hasegawa . @@ -558,7 +558,7 @@ weak_alias (__regerror, regerror) static const bitset_t utf8_sb_map = { /* Set the first 128 bits. */ -# if defined __GNUC__ && !defined __STRICT_ANSI__ +# if (defined __GNUC__ || __clang_major__ >= 4) && !defined __STRICT_ANSI__ [0 ... 0x80 / BITSET_WORD_BITS - 1] = BITSET_WORD_MAX # else # if 4 * BITSET_WORD_BITS < ASCII_CHARS @@ -1436,7 +1436,7 @@ link_nfa_nodes (void *extra, bin_tree_t *node) break; case END_OF_RE: - assert (node->next == NULL); + DEBUG_ASSERT (node->next == NULL); break; case OP_DUP_ASTERISK: @@ -1452,8 +1452,8 @@ link_nfa_nodes (void *extra, bin_tree_t *node) right = node->right->first->node_idx; else right = node->next->node_idx; - assert (left > -1); - assert (right > -1); + DEBUG_ASSERT (left > -1); + DEBUG_ASSERT (right > -1); err = re_node_set_init_2 (dfa->edests + idx, left, right); } break; @@ -1471,7 +1471,7 @@ link_nfa_nodes (void *extra, bin_tree_t *node) break; default: - assert (!IS_EPSILON_NODE (node->token.type)); + DEBUG_ASSERT (!IS_EPSILON_NODE (node->token.type)); dfa->nexts[idx] = node->next->node_idx; break; } @@ -1653,9 +1653,7 @@ calc_eclosure (re_dfa_t *dfa) { Idx node_idx; bool incomplete; -#ifdef DEBUG - assert (dfa->nodes_len > 0); -#endif + DEBUG_ASSERT (dfa->nodes_len > 0); incomplete = false; /* For each nodes, calculate epsilon closure. */ for (node_idx = 0; ; ++node_idx) @@ -1670,9 +1668,7 @@ calc_eclosure (re_dfa_t *dfa) node_idx = 0; } -#ifdef DEBUG - assert (dfa->eclosures[node_idx].nelem != -1); -#endif + DEBUG_ASSERT (dfa->eclosures[node_idx].nelem != -1); /* If we have already calculated, skip it. */ if (dfa->eclosures[node_idx].nelem != 0) @@ -2442,9 +2438,7 @@ parse_expression (re_string_t *regexp, regex_t *preg, re_token_t *token, default: /* Must not happen? */ -#ifdef DEBUG - assert (0); -#endif + DEBUG_ASSERT (false); return NULL; } fetch_token (token, regexp, syntax); @@ -3306,7 +3300,7 @@ parse_bracket_exp (re_string_t *regexp, re_dfa_t *dfa, re_token_t *token, goto parse_bracket_exp_free_return; break; default: - assert (0); + DEBUG_ASSERT (false); break; } } @@ -3662,7 +3656,6 @@ build_charclass_op (re_dfa_t *dfa, RE_TRANSLATE_TYPE trans, Idx alloc = 0; #endif /* not RE_ENABLE_I18N */ reg_errcode_t ret; - re_token_t br_token; bin_tree_t *tree; sbcset = (re_bitset_ptr_t) calloc (sizeof (bitset_t), 1); @@ -3713,11 +3706,7 @@ build_charclass_op (re_dfa_t *dfa, RE_TRANSLATE_TYPE trans, #endif /* Build a tree for simple bracket. */ -#if defined GCC_LINT || defined lint - memset (&br_token, 0, sizeof br_token); -#endif - br_token.type = SIMPLE_BRACKET; - br_token.opr.sbcset = sbcset; + re_token_t br_token = { .type = SIMPLE_BRACKET, .opr.sbcset = sbcset }; tree = create_token_tree (dfa, NULL, NULL, &br_token); if (__glibc_unlikely (tree == NULL)) goto build_word_op_espace; @@ -3808,11 +3797,7 @@ static bin_tree_t * create_tree (re_dfa_t *dfa, bin_tree_t *left, bin_tree_t *right, re_token_type_t type) { - re_token_t t; -#if defined GCC_LINT || defined lint - memset (&t, 0, sizeof t); -#endif - t.type = type; + re_token_t t = { .type = type }; return create_token_tree (dfa, left, right, &t); } diff --git a/lib/regex.c b/lib/regex.c index eab7a48..88173bb 100644 --- a/lib/regex.c +++ b/lib/regex.c @@ -1,5 +1,5 @@ /* Extended regular expression matching and search library. - Copyright (C) 2002-2019 Free Software Foundation, Inc. + Copyright (C) 2002-2020 Free Software Foundation, Inc. This file is part of the GNU C Library. Contributed by Isamu Hasegawa . @@ -17,6 +17,8 @@ License along with the GNU C Library; if not, see . */ +#define __STDC_WANT_IEC_60559_BFP_EXT__ + #ifndef _LIBC # include diff --git a/lib/regex.h b/lib/regex.h index 77ac1a5..306521a 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-2019 Free Software Foundation, Inc. + Copyright (C) 1985, 1989-2020 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 @@ -600,11 +600,9 @@ extern void re_set_registers (struct re_pattern_buffer *__buffer, #endif /* Use GNU */ #if defined _REGEX_RE_COMP || (defined _LIBC && defined __USE_MISC) -# ifndef _CRAY /* 4.2 bsd compatibility. */ extern char *re_comp (const char *); extern int re_exec (const char *); -# endif #endif /* For plain 'restrict', use glibc's __restrict if defined. @@ -614,7 +612,9 @@ extern int re_exec (const char *); 'configure' might #define 'restrict' to those words, so pick a different name. */ #ifndef _Restrict_ -# if defined __restrict || 2 < __GNUC__ + (95 <= __GNUC_MINOR__) +# if defined __restrict \ + || 2 < __GNUC__ + (95 <= __GNUC_MINOR__) \ + || __clang_major__ >= 3 # define _Restrict_ __restrict # elif 199901L <= __STDC_VERSION__ || defined restrict # define _Restrict_ restrict @@ -622,13 +622,18 @@ extern int re_exec (const char *); # define _Restrict_ # endif #endif -/* For [restrict], use glibc's __restrict_arr if available. - Otherwise, GCC 3.1 (not in C++ mode) and C99 support [restrict]. */ +/* For the ISO C99 syntax + array_name[restrict] + use glibc's __restrict_arr if available. + Otherwise, GCC 3.1 and clang support this syntax (but not in C++ mode). + Other ISO C99 compilers support it as well. */ #ifndef _Restrict_arr_ # ifdef __restrict_arr # define _Restrict_arr_ __restrict_arr -# elif ((199901L <= __STDC_VERSION__ || 3 < __GNUC__ + (1 <= __GNUC_MINOR__)) \ - && !defined __GNUG__) +# elif ((199901L <= __STDC_VERSION__ \ + || 3 < __GNUC__ + (1 <= __GNUC_MINOR__) \ + || __clang_major__ >= 3) \ + && !defined __cplusplus) # define _Restrict_arr_ _Restrict_ # else # define _Restrict_arr_ diff --git a/lib/regex_internal.c b/lib/regex_internal.c index b592f06..bf9439e 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-2019 Free Software Foundation, Inc. + Copyright (C) 2002-2020 Free Software Foundation, Inc. This file is part of the GNU C Library. Contributed by Isamu Hasegawa . @@ -212,7 +212,7 @@ build_wcs_buffer (re_string_t *pstr) { #ifdef _LIBC unsigned char buf[MB_LEN_MAX]; - assert (MB_LEN_MAX >= pstr->mb_cur_max); + DEBUG_ASSERT (MB_LEN_MAX >= pstr->mb_cur_max); #else unsigned char buf[64]; #endif @@ -285,7 +285,7 @@ build_wcs_upper_buffer (re_string_t *pstr) size_t mbclen; #ifdef _LIBC char buf[MB_LEN_MAX]; - assert (MB_LEN_MAX >= pstr->mb_cur_max); + DEBUG_ASSERT (pstr->mb_cur_max <= MB_LEN_MAX); #else char buf[64]; #endif @@ -300,18 +300,20 @@ build_wcs_upper_buffer (re_string_t *pstr) while (byte_idx < end_idx) { wchar_t wc; + unsigned char ch = pstr->raw_mbs[pstr->raw_mbs_idx + byte_idx]; - if (isascii (pstr->raw_mbs[pstr->raw_mbs_idx + byte_idx]) - && mbsinit (&pstr->cur_state)) + if (isascii (ch) && mbsinit (&pstr->cur_state)) { - /* In case of a singlebyte character. */ - pstr->mbs[byte_idx] - = toupper (pstr->raw_mbs[pstr->raw_mbs_idx + byte_idx]); /* The next step uses the assumption that wchar_t is encoded ASCII-safe: all ASCII values can be converted like this. */ - pstr->wcs[byte_idx] = (wchar_t) pstr->mbs[byte_idx]; - ++byte_idx; - continue; + wchar_t wcu = __towupper (ch); + if (isascii (wcu)) + { + pstr->mbs[byte_idx] = wcu; + pstr->wcs[byte_idx] = wcu; + byte_idx++; + continue; + } } remain_len = end_idx - byte_idx; @@ -348,7 +350,6 @@ build_wcs_upper_buffer (re_string_t *pstr) { /* It is an invalid character, an incomplete character at the end of the string, or '\0'. Just use the byte. */ - int ch = pstr->raw_mbs[pstr->raw_mbs_idx + byte_idx]; pstr->mbs[byte_idx] = ch; /* And also cast it to wide char. */ pstr->wcs[byte_idx++] = (wchar_t) ch; @@ -685,9 +686,7 @@ re_string_reconstruct (re_string_t *pstr, Idx idx, int eflags) pstr->valid_len - offset); pstr->valid_len -= offset; pstr->valid_raw_len -= offset; -#if defined DEBUG && DEBUG - assert (pstr->valid_len > 0); -#endif + DEBUG_ASSERT (pstr->valid_len > 0); } } else @@ -941,10 +940,7 @@ re_string_context_at (const re_string_t *input, Idx idx, int eflags) Idx wc_idx = idx; while(input->wcs[wc_idx] == WEOF) { -#if defined DEBUG && DEBUG - /* It must not happen. */ - assert (wc_idx >= 0); -#endif + DEBUG_ASSERT (wc_idx >= 0); --wc_idx; if (wc_idx < 0) return input->tip_context; @@ -1311,7 +1307,6 @@ re_node_set_insert (re_node_set *set, Idx elem) first element separately to skip a check in the inner loop. */ if (elem < set->elems[0]) { - idx = 0; for (idx = set->nelem; idx > 0; idx--) set->elems[idx] = set->elems[idx - 1]; } @@ -1716,15 +1711,19 @@ create_cd_newstate (const re_dfa_t *dfa, const re_node_set *nodes, { if (newstate->entrance_nodes == &newstate->nodes) { - newstate->entrance_nodes = re_malloc (re_node_set, 1); - if (__glibc_unlikely (newstate->entrance_nodes == NULL)) + re_node_set *entrance_nodes = re_malloc (re_node_set, 1); + if (__glibc_unlikely (entrance_nodes == NULL)) { free_state (newstate); return NULL; } + newstate->entrance_nodes = entrance_nodes; if (re_node_set_init_copy (newstate->entrance_nodes, nodes) != REG_NOERROR) - return NULL; + { + free_state (newstate); + return NULL; + } nctx_nodes = 0; newstate->has_constraint = 1; } diff --git a/lib/regex_internal.h b/lib/regex_internal.h index a3aedda..7b50b47 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-2019 Free Software Foundation, Inc. + Copyright (C) 2002-2020 Free Software Foundation, Inc. This file is part of the GNU C Library. Contributed by Isamu Hasegawa . @@ -20,7 +20,6 @@ #ifndef _REGEX_INTERNAL_H #define _REGEX_INTERNAL_H 1 -#include #include #include #include @@ -34,6 +33,14 @@ #include #include +#include + +#if defined DEBUG && DEBUG != 0 +# include +# define DEBUG_ASSERT(x) assert (x) +#else +# define DEBUG_ASSERT(x) assume (x) +#endif #ifdef _LIBC # include @@ -44,22 +51,7 @@ # define lock_unlock(lock) __libc_lock_unlock (lock) #elif defined GNULIB_LOCK && !defined USE_UNLOCKED_IO # include "glthread/lock.h" - /* Use gl_lock_define if empty macro arguments are known to work. - Otherwise, fall back on less-portable substitutes. */ -# if ((defined __GNUC__ && !defined __STRICT_ANSI__) \ - || (defined __STDC_VERSION__ && 199901L <= __STDC_VERSION__)) -# define lock_define(name) gl_lock_define (, name) -# elif USE_POSIX_THREADS -# define lock_define(name) pthread_mutex_t name; -# elif USE_PTH_THREADS -# define lock_define(name) pth_mutex_t name; -# elif USE_SOLARIS_THREADS -# define lock_define(name) mutex_t name; -# elif USE_WINDOWS_THREADS -# define lock_define(name) gl_lock_t name; -# else -# define lock_define(name) -# endif +# define lock_define(name) gl_lock_define (, name) # define lock_init(lock) glthread_lock_init (&(lock)) # define lock_fini(lock) glthread_lock_destroy (&(lock)) # define lock_lock(lock) glthread_lock_lock (&(lock)) @@ -85,6 +77,14 @@ # define isblank(ch) ((ch) == ' ' || (ch) == '\t') #endif +/* regex code assumes isascii has its usual numeric meaning, + even if the portable character set uses EBCDIC encoding, + and even if wint_t is wider than int. */ +#ifndef _LIBC +# undef isascii +# define isascii(c) (((c) & ~0x7f) == 0) +#endif + #ifdef _LIBC # ifndef _RE_DEFINE_LOCALE_FUNCTIONS # define _RE_DEFINE_LOCALE_FUNCTIONS 1 @@ -149,6 +149,24 @@ #ifndef SSIZE_MAX # define SSIZE_MAX ((ssize_t) (SIZE_MAX / 2)) #endif +#ifndef ULONG_WIDTH +# define ULONG_WIDTH REGEX_UINTEGER_WIDTH (ULONG_MAX) +/* The number of usable bits in an unsigned integer type with maximum + value MAX, as an int expression suitable in #if. Cover all known + practical hosts. This implementation exploits the fact that MAX is + 1 less than a power of 2, and merely counts the number of 1 bits in + MAX; "COBn" means "count the number of 1 bits in the low-order n bits". */ +# define REGEX_UINTEGER_WIDTH(max) REGEX_COB128 (max) +# define REGEX_COB128(n) (REGEX_COB64 ((n) >> 31 >> 31 >> 2) + REGEX_COB64 (n)) +# define REGEX_COB64(n) (REGEX_COB32 ((n) >> 31 >> 1) + REGEX_COB32 (n)) +# define REGEX_COB32(n) (REGEX_COB16 ((n) >> 16) + REGEX_COB16 (n)) +# define REGEX_COB16(n) (REGEX_COB8 ((n) >> 8) + REGEX_COB8 (n)) +# define REGEX_COB8(n) (REGEX_COB4 ((n) >> 4) + REGEX_COB4 (n)) +# define REGEX_COB4(n) (!!((n) & 8) + !!((n) & 4) + !!((n) & 2) + ((n) & 1)) +# if ULONG_MAX / 2 + 1 != 1ul << (ULONG_WIDTH - 1) +# error "ULONG_MAX out of range" +# endif +#endif /* The type of indexes into strings. This is signed, not size_t, since the API requires indexes to fit in regoff_t anyway, and using @@ -172,36 +190,8 @@ typedef __re_size_t re_hashval_t; typedef unsigned long int bitset_word_t; /* All bits set in a bitset_word_t. */ #define BITSET_WORD_MAX ULONG_MAX - -/* Number of bits in a bitset_word_t. For portability to hosts with - padding bits, do not use '(sizeof (bitset_word_t) * CHAR_BIT)'; - instead, deduce it directly from BITSET_WORD_MAX. Avoid - greater-than-32-bit integers and unconditional shifts by more than - 31 bits, as they're not portable. */ -#if BITSET_WORD_MAX == 0xffffffffUL -# define BITSET_WORD_BITS 32 -#elif BITSET_WORD_MAX >> 31 >> 4 == 1 -# define BITSET_WORD_BITS 36 -#elif BITSET_WORD_MAX >> 31 >> 16 == 1 -# define BITSET_WORD_BITS 48 -#elif BITSET_WORD_MAX >> 31 >> 28 == 1 -# define BITSET_WORD_BITS 60 -#elif BITSET_WORD_MAX >> 31 >> 31 >> 1 == 1 -# define BITSET_WORD_BITS 64 -#elif BITSET_WORD_MAX >> 31 >> 31 >> 9 == 1 -# define BITSET_WORD_BITS 72 -#elif BITSET_WORD_MAX >> 31 >> 31 >> 31 >> 31 >> 3 == 1 -# define BITSET_WORD_BITS 128 -#elif BITSET_WORD_MAX >> 31 >> 31 >> 31 >> 31 >> 31 >> 31 >> 31 >> 31 >> 7 == 1 -# define BITSET_WORD_BITS 256 -#elif BITSET_WORD_MAX >> 31 >> 31 >> 31 >> 31 >> 31 >> 31 >> 31 >> 31 >> 7 > 1 -# define BITSET_WORD_BITS 257 /* any value > SBC_MAX will do here */ -# if BITSET_WORD_BITS <= SBC_MAX -# error "Invalid SBC_MAX" -# endif -#else -# error "Add case for new bitset_word_t size" -#endif +/* Number of bits in a bitset_word_t. */ +#define BITSET_WORD_BITS ULONG_WIDTH /* Number of bitset_word_t values in a bitset_t. */ #define BITSET_WORDS ((SBC_MAX + BITSET_WORD_BITS - 1) / BITSET_WORD_BITS) @@ -353,7 +343,7 @@ typedef struct Idx idx; /* for BACK_REF */ re_context_type ctx_type; /* for ANCHOR */ } opr; -#if __GNUC__ >= 2 && !defined __STRICT_ANSI__ +#if (__GNUC__ >= 2 || defined __clang__) && !defined __STRICT_ANSI__ re_token_type_t type : 8; #else re_token_type_t type; @@ -609,20 +599,15 @@ struct re_backref_cache_entry Idx str_idx; Idx subexp_from; Idx subexp_to; + bitset_word_t eps_reachable_subexps_map; char more; - char unused; - unsigned short int eps_reachable_subexps_map; }; typedef struct { /* The string object corresponding to the input string. */ re_string_t input; -#if defined _LIBC || (defined __STDC_VERSION__ && __STDC_VERSION__ >= 199901L) const re_dfa_t *const dfa; -#else - const re_dfa_t *dfa; -#endif /* EFLAGS of the argument of regexec. */ int eflags; /* Where the matching ends. */ @@ -864,10 +849,10 @@ re_string_elem_size_at (const re_string_t *pstr, Idx idx) #endif /* RE_ENABLE_I18N */ #ifndef FALLTHROUGH -# if __GNUC__ < 7 -# define FALLTHROUGH ((void) 0) -# else +# if (__GNUC__ >= 7) || (__clang_major__ >= 10) # define FALLTHROUGH __attribute__ ((__fallthrough__)) +# else +# define FALLTHROUGH ((void) 0) # endif #endif diff --git a/lib/regexec.c b/lib/regexec.c index f464869..395e37d 100644 --- a/lib/regexec.c +++ b/lib/regexec.c @@ -1,5 +1,5 @@ /* Extended regular expression matching and search library. - Copyright (C) 2002-2019 Free Software Foundation, Inc. + Copyright (C) 2002-2020 Free Software Foundation, Inc. This file is part of the GNU C Library. Contributed by Isamu Hasegawa . @@ -443,7 +443,7 @@ re_search_stub (struct re_pattern_buffer *bufp, const char *string, Idx length, { if (ret_len) { - assert (pmatch[0].rm_so == start); + DEBUG_ASSERT (pmatch[0].rm_so == start); rval = pmatch[0].rm_eo - start; } else @@ -502,9 +502,9 @@ re_copy_regs (struct re_registers *regs, regmatch_t *pmatch, Idx nregs, } else { - assert (regs_allocated == REGS_FIXED); + DEBUG_ASSERT (regs_allocated == REGS_FIXED); /* This function may not be called with REGS_FIXED and nregs too big. */ - assert (regs->num_regs >= nregs); + DEBUG_ASSERT (nregs <= regs->num_regs); rval = REGS_FIXED; } @@ -597,21 +597,12 @@ re_search_internal (const regex_t *preg, const char *string, Idx length, Idx extra_nmatch; bool sb; int ch; -#if defined _LIBC || (defined __STDC_VERSION__ && __STDC_VERSION__ >= 199901L) re_match_context_t mctx = { .dfa = dfa }; -#else - re_match_context_t mctx; -#endif char *fastmap = ((preg->fastmap != NULL && preg->fastmap_accurate && start != last_start && !preg->can_be_null) ? preg->fastmap : NULL); RE_TRANSLATE_TYPE t = preg->translate; -#if !(defined _LIBC || (defined __STDC_VERSION__ && __STDC_VERSION__ >= 199901L)) - memset (&mctx, '\0', sizeof (re_match_context_t)); - mctx.dfa = dfa; -#endif - extra_nmatch = (nmatch > preg->re_nsub) ? nmatch - (preg->re_nsub + 1) : 0; nmatch -= extra_nmatch; @@ -622,10 +613,8 @@ re_search_internal (const regex_t *preg, const char *string, Idx length, || dfa->init_state_begbuf == NULL)) return REG_NOMATCH; -#ifdef DEBUG /* We assume front-end functions already check them. */ - assert (0 <= last_start && last_start <= length); -#endif + DEBUG_ASSERT (0 <= last_start && last_start <= length); /* If initial states with non-begbuf contexts have no elements, the regex must be anchored. If preg->newline_anchor is set, @@ -677,8 +666,6 @@ re_search_internal (const regex_t *preg, const char *string, Idx length, goto free_return; } } - else - mctx.state_log = NULL; match_first = start; mctx.input.tip_context = (eflags & REG_NOTBOL) ? CONTEXT_BEGBUF @@ -838,10 +825,8 @@ re_search_internal (const regex_t *preg, const char *string, Idx length, match_ctx_clean (&mctx); } -#ifdef DEBUG - assert (match_last != -1); - assert (err == REG_NOERROR); -#endif + DEBUG_ASSERT (match_last != -1); + DEBUG_ASSERT (err == REG_NOERROR); /* Set pmatch[] if we need. */ if (nmatch > 0) @@ -886,7 +871,7 @@ re_search_internal (const regex_t *preg, const char *string, Idx length, : mctx.input.offsets[pmatch[reg_idx].rm_eo]); } #else - assert (mctx.input.offsets_needed == 0); + DEBUG_ASSERT (mctx.input.offsets_needed == 0); #endif pmatch[reg_idx].rm_so += match_first; pmatch[reg_idx].rm_eo += match_first; @@ -926,9 +911,7 @@ prune_impossible_nodes (re_match_context_t *mctx) re_dfastate_t **sifted_states; re_dfastate_t **lim_states = NULL; re_sift_context_t sctx; -#ifdef DEBUG - assert (mctx->state_log != NULL); -#endif + DEBUG_ASSERT (mctx->state_log != NULL); match_last = mctx->match_last; halt_node = mctx->last_node; @@ -1074,7 +1057,7 @@ check_matching (re_match_context_t *mctx, bool fl_longest_match, /* An initial state must not be NULL (invalid). */ if (__glibc_unlikely (cur_state == NULL)) { - assert (err == REG_ESPACE); + DEBUG_ASSERT (err == REG_ESPACE); return -2; } @@ -1129,7 +1112,7 @@ check_matching (re_match_context_t *mctx, bool fl_longest_match, err = extend_buffers (mctx, next_char_idx + 1); if (__glibc_unlikely (err != REG_NOERROR)) { - assert (err == REG_ESPACE); + DEBUG_ASSERT (err == REG_ESPACE); return -2; } } @@ -1212,9 +1195,7 @@ check_halt_state_context (const re_match_context_t *mctx, { Idx i; unsigned int context; -#ifdef DEBUG - assert (state->halt); -#endif + DEBUG_ASSERT (state->halt); context = re_string_context_at (&mctx->input, idx, mctx->eflags); for (i = 0; i < state->nodes.nelem; ++i) if (check_halt_node_context (mctx->dfa, state->nodes.elems[i], context)) @@ -1285,10 +1266,13 @@ proceed_next_node (const re_match_context_t *mctx, Idx nregs, regmatch_t *regs, if (type == OP_BACK_REF) { Idx subexp_idx = dfa->nodes[node].opr.idx + 1; - naccepted = regs[subexp_idx].rm_eo - regs[subexp_idx].rm_so; + if (subexp_idx < nregs) + naccepted = regs[subexp_idx].rm_eo - regs[subexp_idx].rm_so; if (fs != NULL) { - if (regs[subexp_idx].rm_so == -1 || regs[subexp_idx].rm_eo == -1) + if (subexp_idx >= nregs + || regs[subexp_idx].rm_so == -1 + || regs[subexp_idx].rm_eo == -1) return -1; else if (naccepted) { @@ -1362,7 +1346,7 @@ pop_fail_stack (struct re_fail_stack_t *fs, Idx *pidx, Idx nregs, regmatch_t *regs, re_node_set *eps_via_nodes) { Idx num = --fs->num; - assert (num >= 0); + DEBUG_ASSERT (num >= 0); *pidx = fs->stack[num].idx; memcpy (regs, fs->stack[num].regs, sizeof (regmatch_t) * nregs); re_node_set_free (eps_via_nodes); @@ -1389,10 +1373,8 @@ set_regs (const regex_t *preg, const re_match_context_t *mctx, size_t nmatch, regmatch_t *prev_idx_match; bool prev_idx_match_malloced = false; -#ifdef DEBUG - assert (nmatch > 1); - assert (mctx->state_log != NULL); -#endif + DEBUG_ASSERT (nmatch > 1); + DEBUG_ASSERT (mctx->state_log != NULL); if (fl_backtrack) { fs = &fs_body; @@ -1578,9 +1560,7 @@ sift_states_backward (const re_match_context_t *mctx, re_sift_context_t *sctx) Idx str_idx = sctx->last_str_idx; re_node_set cur_dest; -#ifdef DEBUG - assert (mctx->state_log != NULL && mctx->state_log[str_idx] != NULL); -#endif + DEBUG_ASSERT (mctx->state_log != NULL && mctx->state_log[str_idx] != NULL); /* Build sifted state_log[str_idx]. It has the nodes which can epsilon transit to the last_node and the last_node itself. */ @@ -1648,11 +1628,8 @@ build_sifted_states (const re_match_context_t *mctx, re_sift_context_t *sctx, Idx prev_node = cur_src->elems[i]; int naccepted = 0; bool ok; + DEBUG_ASSERT (!IS_EPSILON_NODE (dfa->nodes[prev_node].type)); -#ifdef DEBUG - re_token_type_t type = dfa->nodes[prev_node].type; - assert (!IS_EPSILON_NODE (type)); -#endif #ifdef RE_ENABLE_I18N /* If the node may accept "multi byte". */ if (dfa->nodes[prev_node].accept_mb) @@ -2505,9 +2482,7 @@ transit_state_mb (re_match_context_t *mctx, re_dfastate_t *pstate) err = clean_state_log_if_needed (mctx, dest_idx); if (__glibc_unlikely (err != REG_NOERROR)) return err; -#ifdef DEBUG - assert (dfa->nexts[cur_node_idx] != -1); -#endif + DEBUG_ASSERT (dfa->nexts[cur_node_idx] != -1); new_nodes = dfa->eclosures + dfa->nexts[cur_node_idx]; dest_state = mctx->state_log[dest_idx]; @@ -2571,9 +2546,7 @@ transit_state_bkref (re_match_context_t *mctx, const re_node_set *nodes) /* And add the epsilon closures (which is 'new_dest_nodes') of the backreference to appropriate state_log. */ -#ifdef DEBUG - assert (dfa->nexts[node_idx] != -1); -#endif + DEBUG_ASSERT (dfa->nexts[node_idx] != -1); for (; bkc_idx < mctx->nbkref_ents; ++bkc_idx) { Idx subexp_len; @@ -3032,10 +3005,8 @@ check_arrival_add_next_nodes (re_match_context_t *mctx, Idx str_idx, { int naccepted = 0; Idx cur_node = cur_nodes->elems[cur_idx]; -#ifdef DEBUG - re_token_type_t type = dfa->nodes[cur_node].type; - assert (!IS_EPSILON_NODE (type)); -#endif + DEBUG_ASSERT (!IS_EPSILON_NODE (dfa->nodes[cur_node].type)); + #ifdef RE_ENABLE_I18N /* If the node may accept "multi byte". */ if (dfa->nodes[cur_node].accept_mb) @@ -3103,9 +3074,7 @@ check_arrival_expand_ecl (const re_dfa_t *dfa, re_node_set *cur_nodes, reg_errcode_t err; Idx idx, outside_node; re_node_set new_nodes; -#ifdef DEBUG - assert (cur_nodes->nelem); -#endif + DEBUG_ASSERT (cur_nodes->nelem); err = re_node_set_alloc (&new_nodes, cur_nodes->nelem); if (__glibc_unlikely (err != REG_NOERROR)) return err; @@ -3695,6 +3664,7 @@ group_nodes_into_DFAstates (const re_dfa_t *dfa, const re_dfastate_t *state, bitset_empty (accepts); } } + assume (ndests <= SBC_MAX); return ndests; error_return: for (j = 0; j < ndests; ++j) @@ -4272,10 +4242,8 @@ static reg_errcode_t __attribute_warn_unused_result__ match_ctx_add_subtop (re_match_context_t *mctx, Idx node, Idx str_idx) { -#ifdef DEBUG - assert (mctx->sub_tops != NULL); - assert (mctx->asub_tops > 0); -#endif + DEBUG_ASSERT (mctx->sub_tops != NULL); + DEBUG_ASSERT (mctx->asub_tops > 0); if (__glibc_unlikely (mctx->nsub_tops == mctx->asub_tops)) { Idx new_asub_tops = mctx->asub_tops * 2; diff --git a/lib/rpmatch.c b/lib/rpmatch.c index 4c80973..c9615d5 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-2019 Free Software + Copyright (C) 1996, 1998, 2000, 2002-2003, 2006-2020 Free Software Foundation, Inc. This program is free software: you can redistribute it and/or modify diff --git a/lib/safe-read.c b/lib/safe-read.c index e6c54b7..613e056 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-2019 Free Software + Copyright (C) 1993-1994, 1998, 2002-2006, 2009-2020 Free Software Foundation, Inc. This program is free software: you can redistribute it and/or modify diff --git a/lib/safe-read.h b/lib/safe-read.h index 3f421f6..ea18423 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-2019 Free Software Foundation, Inc. + Copyright (C) 2002, 2006, 2009-2020 Free Software Foundation, Inc. This 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/setlocale-lock.c b/lib/setlocale-lock.c new file mode 100644 index 0000000..7dde32d --- /dev/null +++ b/lib/setlocale-lock.c @@ -0,0 +1,150 @@ +/* Return the internal lock used by setlocale_null_r. + Copyright (C) 2019-2020 Free Software Foundation, Inc. + + This 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 . */ + +/* Written by Bruno Haible , 2019. */ + +#include + +/* When it is known that the gl_get_setlocale_null_lock function is defined + by a dependency library, it should not be defined here. */ +#if OMIT_SETLOCALE_LOCK + +/* This declaration is solely to ensure that after preprocessing + this file is never empty. */ +typedef int dummy; + +#else + +/* This file defines the internal lock used by setlocale_null_r. + It is a separate compilation unit, so that only one copy of it is + present when linking statically. */ + +/* Prohibit renaming this symbol. */ +# undef gl_get_setlocale_null_lock + +/* Macro for exporting a symbol (function, not variable) defined in this file, + when compiled into a shared library. */ +# ifndef DLL_EXPORTED +# if HAVE_VISIBILITY + /* Override the effect of the compiler option '-fvisibility=hidden'. */ +# define DLL_EXPORTED __attribute__((__visibility__("default"))) +# elif defined _WIN32 || defined __CYGWIN__ +# define DLL_EXPORTED __declspec(dllexport) +# else +# define DLL_EXPORTED +# endif +# endif + +# if defined _WIN32 && !defined __CYGWIN__ + +# define WIN32_LEAN_AND_MEAN /* avoid including junk */ +# include + +# include "windows-initguard.h" + +/* The return type is a 'CRITICAL_SECTION *', not a 'glwthread_mutex_t *', + because the latter is not guaranteed to be a stable ABI in the future. */ + +/* Make sure the function gets exported from DLLs. */ +DLL_EXPORTED CRITICAL_SECTION *gl_get_setlocale_null_lock (void); + +static glwthread_initguard_t guard = GLWTHREAD_INITGUARD_INIT; +static CRITICAL_SECTION lock; + +/* Returns the internal lock used by setlocale_null_r. */ +CRITICAL_SECTION * +gl_get_setlocale_null_lock (void) +{ + if (!guard.done) + { + if (InterlockedIncrement (&guard.started) == 0) + { + /* This thread is the first one to need the lock. Initialize it. */ + InitializeCriticalSection (&lock); + guard.done = 1; + } + else + { + /* Don't let guard.started grow and wrap around. */ + InterlockedDecrement (&guard.started); + /* Yield the CPU while waiting for another thread to finish + initializing this mutex. */ + while (!guard.done) + Sleep (0); + } + } + return &lock; +} + +# elif HAVE_PTHREAD_API + +# include + +static pthread_mutex_t mutex = PTHREAD_MUTEX_INITIALIZER; + +/* Make sure the function gets exported from shared libraries. */ +DLL_EXPORTED pthread_mutex_t *gl_get_setlocale_null_lock (void); + +/* Returns the internal lock used by setlocale_null_r. */ +pthread_mutex_t * +gl_get_setlocale_null_lock (void) +{ + return &mutex; +} + +# elif HAVE_THREADS_H + +# include +# include + +static int volatile init_needed = 1; +static once_flag init_once = ONCE_FLAG_INIT; +static mtx_t mutex; + +static void +atomic_init (void) +{ + if (mtx_init (&mutex, mtx_plain) != thrd_success) + abort (); + init_needed = 0; +} + +/* Make sure the function gets exported from shared libraries. */ +DLL_EXPORTED mtx_t *gl_get_setlocale_null_lock (void); + +/* Returns the internal lock used by setlocale_null_r. */ +mtx_t * +gl_get_setlocale_null_lock (void) +{ + if (init_needed) + call_once (&init_once, atomic_init); + return &mutex; +} + +# endif + +# if (defined _WIN32 || defined __CYGWIN__) && !defined _MSC_VER +/* Make sure the '__declspec(dllimport)' in setlocale_null.c does not cause + a link failure when no DLLs are involved. */ +# if defined _WIN64 || defined _LP64 +# define IMP(x) __imp_##x +# else +# define IMP(x) _imp__##x +# endif +void * IMP(gl_get_setlocale_null_lock) = &gl_get_setlocale_null_lock; +# endif + +#endif diff --git a/lib/setlocale_null.c b/lib/setlocale_null.c new file mode 100644 index 0000000..abe55b5 --- /dev/null +++ b/lib/setlocale_null.c @@ -0,0 +1,411 @@ +/* Query the name of the current global locale. + Copyright (C) 2019-2020 Free Software Foundation, Inc. + + This 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 . */ + +/* Written by Bruno Haible , 2019. */ + +#include + +/* Specification. */ +#include "setlocale_null.h" + +#include +#include +#include +#include +#if defined _WIN32 && !defined __CYGWIN__ +# include +#endif + +#if !(SETLOCALE_NULL_ALL_MTSAFE && SETLOCALE_NULL_ONE_MTSAFE) +# if defined _WIN32 && !defined __CYGWIN__ + +# define WIN32_LEAN_AND_MEAN /* avoid including junk */ +# include + +# elif HAVE_PTHREAD_API + +# include +# if HAVE_THREADS_H && HAVE_WEAK_SYMBOLS +# include +# pragma weak thrd_exit +# define c11_threads_in_use() (thrd_exit != NULL) +# else +# define c11_threads_in_use() 0 +# endif + +# elif HAVE_THREADS_H + +# include + +# endif +#endif + +/* Use the system's setlocale() function, not the gnulib override, here. */ +#undef setlocale + +static const char * +setlocale_null_androidfix (int category) +{ + const char *result = setlocale (category, NULL); + +#ifdef __ANDROID__ + if (result == NULL) + switch (category) + { + case LC_CTYPE: + case LC_NUMERIC: + case LC_TIME: + case LC_COLLATE: + case LC_MONETARY: + case LC_MESSAGES: + case LC_ALL: + case LC_PAPER: + case LC_NAME: + case LC_ADDRESS: + case LC_TELEPHONE: + case LC_MEASUREMENT: + result = "C"; + break; + default: + break; + } +#endif + + return result; +} + +static int +setlocale_null_unlocked (int category, char *buf, size_t bufsize) +{ +#if defined _WIN32 && !defined __CYGWIN__ && defined _MSC_VER + /* On native Windows, nowadays, the setlocale() implementation is based + on _wsetlocale() and uses malloc() for the result. We are better off + using _wsetlocale() directly. */ + const wchar_t *result = _wsetlocale (category, NULL); + + if (result == NULL) + { + /* CATEGORY is invalid. */ + if (bufsize > 0) + /* Return an empty string in BUF. + This is a convenience for callers that don't want to write explicit + code for handling EINVAL. */ + buf[0] = '\0'; + return EINVAL; + } + else + { + size_t length = wcslen (result); + if (length < bufsize) + { + size_t i; + + /* Convert wchar_t[] -> char[], assuming plain ASCII. */ + for (i = 0; i <= length; i++) + buf[i] = result[i]; + + return 0; + } + else + { + if (bufsize > 0) + { + /* Return a truncated result in BUF. + This is a convenience for callers that don't want to write + explicit code for handling ERANGE. */ + size_t i; + + /* Convert wchar_t[] -> char[], assuming plain ASCII. */ + for (i = 0; i < bufsize; i++) + buf[i] = result[i]; + buf[bufsize - 1] = '\0'; + } + return ERANGE; + } + } +#else + const char *result = setlocale_null_androidfix (category); + + if (result == NULL) + { + /* CATEGORY is invalid. */ + if (bufsize > 0) + /* Return an empty string in BUF. + This is a convenience for callers that don't want to write explicit + code for handling EINVAL. */ + buf[0] = '\0'; + return EINVAL; + } + else + { + size_t length = strlen (result); + if (length < bufsize) + { + memcpy (buf, result, length + 1); + return 0; + } + else + { + if (bufsize > 0) + { + /* Return a truncated result in BUF. + This is a convenience for callers that don't want to write + explicit code for handling ERANGE. */ + memcpy (buf, result, bufsize - 1); + buf[bufsize - 1] = '\0'; + } + return ERANGE; + } + } +#endif +} + +#if !(SETLOCALE_NULL_ALL_MTSAFE && SETLOCALE_NULL_ONE_MTSAFE) /* musl libc, macOS, FreeBSD, NetBSD, OpenBSD, AIX, Haiku, Cygwin */ + +/* Use a lock, so that no two threads can invoke setlocale_null_unlocked + at the same time. */ + +/* Prohibit renaming this symbol. */ +# undef gl_get_setlocale_null_lock + +# if defined _WIN32 && !defined __CYGWIN__ + +extern __declspec(dllimport) CRITICAL_SECTION *gl_get_setlocale_null_lock (void); + +static int +setlocale_null_with_lock (int category, char *buf, size_t bufsize) +{ + CRITICAL_SECTION *lock = gl_get_setlocale_null_lock (); + int ret; + + EnterCriticalSection (lock); + ret = setlocale_null_unlocked (category, buf, bufsize); + LeaveCriticalSection (lock); + + return ret; +} + +# elif HAVE_PTHREAD_API /* musl libc, macOS, FreeBSD, NetBSD, OpenBSD, AIX, Haiku, Cygwin */ + +extern +# if defined _WIN32 || defined __CYGWIN__ + __declspec(dllimport) +# endif + pthread_mutex_t *gl_get_setlocale_null_lock (void); + +# if HAVE_WEAK_SYMBOLS /* musl libc, FreeBSD, NetBSD, OpenBSD, Haiku */ + + /* Avoid the need to link with '-lpthread'. */ +# pragma weak pthread_mutex_lock +# pragma weak pthread_mutex_unlock + + /* Determine whether libpthread is in use. */ +# pragma weak pthread_mutexattr_gettype + /* See the comments in lock.h. */ +# define pthread_in_use() \ + (pthread_mutexattr_gettype != NULL || c11_threads_in_use ()) + +# else +# define pthread_in_use() 1 +# endif + +static int +setlocale_null_with_lock (int category, char *buf, size_t bufsize) +{ + if (pthread_in_use()) + { + pthread_mutex_t *lock = gl_get_setlocale_null_lock (); + int ret; + + if (pthread_mutex_lock (lock)) + abort (); + ret = setlocale_null_unlocked (category, buf, bufsize); + if (pthread_mutex_unlock (lock)) + abort (); + + return ret; + } + else + return setlocale_null_unlocked (category, buf, bufsize); +} + +# elif HAVE_THREADS_H + +extern mtx_t *gl_get_setlocale_null_lock (void); + +static int +setlocale_null_with_lock (int category, char *buf, size_t bufsize) +{ + mtx_t *lock = gl_get_setlocale_null_lock (); + int ret; + + if (mtx_lock (lock) != thrd_success) + abort (); + ret = setlocale_null_unlocked (category, buf, bufsize); + if (mtx_unlock (lock) != thrd_success) + abort (); + + return ret; +} + +# endif + +#endif + +int +setlocale_null_r (int category, char *buf, size_t bufsize) +{ +#if SETLOCALE_NULL_ALL_MTSAFE +# if SETLOCALE_NULL_ONE_MTSAFE + + return setlocale_null_unlocked (category, buf, bufsize); + +# else + + if (category == LC_ALL) + return setlocale_null_unlocked (category, buf, bufsize); + else + return setlocale_null_with_lock (category, buf, bufsize); + +# endif +#else +# if SETLOCALE_NULL_ONE_MTSAFE + + if (category == LC_ALL) + return setlocale_null_with_lock (category, buf, bufsize); + else + return setlocale_null_unlocked (category, buf, bufsize); + +# else + + return setlocale_null_with_lock (category, buf, bufsize); + +# endif +#endif +} + +const char * +setlocale_null (int category) +{ +#if SETLOCALE_NULL_ALL_MTSAFE && SETLOCALE_NULL_ONE_MTSAFE + return setlocale_null_androidfix (category); +#else + + /* This call must be multithread-safe. To achieve this without using + thread-local storage: + 1. We use a specific static buffer for each possible CATEGORY + argument. So that different threads can call setlocale_mtsafe + with different CATEGORY arguments, without interfering. + 2. We use a simple strcpy or memcpy to fill this static buffer. + Filling it through, for example, strcpy + strcat would not be + guaranteed to leave the buffer's contents intact if another thread + is currently accessing it. If necessary, the contents is first + assembled in a stack-allocated buffer. */ + if (category == LC_ALL) + { +# if SETLOCALE_NULL_ALL_MTSAFE + return setlocale_null_androidfix (LC_ALL); +# else + char buf[SETLOCALE_NULL_ALL_MAX]; + static char resultbuf[SETLOCALE_NULL_ALL_MAX]; + + if (setlocale_null_r (LC_ALL, buf, sizeof (buf))) + return "C"; + strcpy (resultbuf, buf); + return resultbuf; +# endif + } + else + { +# if SETLOCALE_NULL_ONE_MTSAFE + return setlocale_null_androidfix (category); +# else + enum + { + LC_CTYPE_INDEX, + LC_NUMERIC_INDEX, + LC_TIME_INDEX, + LC_COLLATE_INDEX, + LC_MONETARY_INDEX, + LC_MESSAGES_INDEX, +# ifdef LC_PAPER + LC_PAPER_INDEX, +# endif +# ifdef LC_NAME + LC_NAME_INDEX, +# endif +# ifdef LC_ADDRESS + LC_ADDRESS_INDEX, +# endif +# ifdef LC_TELEPHONE + LC_TELEPHONE_INDEX, +# endif +# ifdef LC_MEASUREMENT + LC_MEASUREMENT_INDEX, +# endif +# ifdef LC_IDENTIFICATION + LC_IDENTIFICATION_INDEX, +# endif + LC_INDICES_COUNT + } + i; + char buf[SETLOCALE_NULL_MAX]; + static char resultbuf[LC_INDICES_COUNT][SETLOCALE_NULL_MAX]; + int err; + + err = setlocale_null_r (category, buf, sizeof (buf)); + if (err == EINVAL) + return NULL; + if (err) + return "C"; + + switch (category) + { + case LC_CTYPE: i = LC_CTYPE_INDEX; break; + case LC_NUMERIC: i = LC_NUMERIC_INDEX; break; + case LC_TIME: i = LC_TIME_INDEX; break; + case LC_COLLATE: i = LC_COLLATE_INDEX; break; + case LC_MONETARY: i = LC_MONETARY_INDEX; break; + case LC_MESSAGES: i = LC_MESSAGES_INDEX; break; +# ifdef LC_PAPER + case LC_PAPER: i = LC_PAPER_INDEX; break; +# endif +# ifdef LC_NAME + case LC_NAME: i = LC_NAME_INDEX; break; +# endif +# ifdef LC_ADDRESS + case LC_ADDRESS: i = LC_ADDRESS_INDEX; break; +# endif +# ifdef LC_TELEPHONE + case LC_TELEPHONE: i = LC_TELEPHONE_INDEX; break; +# endif +# ifdef LC_MEASUREMENT + case LC_MEASUREMENT: i = LC_MEASUREMENT_INDEX; break; +# endif +# ifdef LC_IDENTIFICATION + case LC_IDENTIFICATION: i = LC_IDENTIFICATION_INDEX; break; +# endif + default: + /* If you get here, a #ifdef LC_xxx is missing. */ + abort (); + } + + strcpy (resultbuf[i], buf); + return resultbuf[i]; +# endif + } +#endif +} diff --git a/lib/setlocale_null.h b/lib/setlocale_null.h new file mode 100644 index 0000000..6844be5 --- /dev/null +++ b/lib/setlocale_null.h @@ -0,0 +1,82 @@ +/* Query the name of the current global locale. + Copyright (C) 2019-2020 Free Software Foundation, Inc. + + This 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 . */ + +/* Written by Bruno Haible , 2019. */ + +#ifndef _SETLOCALE_NULL_H +#define _SETLOCALE_NULL_H + +#include + +#include "arg-nonnull.h" + + +#ifdef __cplusplus +extern "C" { +#endif + + +/* Recommended size of a buffer for a locale name for a single category. + On glibc systems, you can have locale names that are relative file names; + assume a maximum length 256. + In native Windows, in 2018 the longest locale name was of length 58 + ("FYRO Macedonian_Former Yugoslav Republic of Macedonia.1251"). */ +#define SETLOCALE_NULL_MAX (256+1) + +/* Recommended size of a buffer for a locale name with all categories. + On glibc systems, you can have locale names that are relative file names; + assume maximum length 256 for each. There are 12 categories; so, the + maximum total length is 148+12*256. + In native Windows, there are 5 categories, and the maximum total length is + 55+5*58. */ +#define SETLOCALE_NULL_ALL_MAX (148+12*256+1) + +/* setlocale_null_r (CATEGORY, BUF, BUFSIZE) is like setlocale (CATEGORY, NULL), + except that + - it is guaranteed to be multithread-safe, + - it returns the resulting locale category name or locale name in the + user-supplied buffer BUF, which must be BUFSIZE bytes long. + The recommended minimum buffer size is + - SETLOCALE_NULL_MAX for CATEGORY != LC_ALL, and + - SETLOCALE_NULL_ALL_MAX for CATEGORY == LC_ALL. + The return value is an error code: 0 if the call is successful, EINVAL if + CATEGORY is invalid, or ERANGE if BUFSIZE is smaller than the length needed + size (including the trailing NUL byte). In the latter case, a truncated + result is returned in BUF, but still NUL-terminated if BUFSIZE > 0. + For this call to be multithread-safe, *all* calls to + setlocale (CATEGORY, NULL) in all other threads must have been converted + to use setlocale_null_r or setlocale_null as well, and the other threads + must not make other setlocale invocations (since changing the global locale + has side effects on all threads). */ +extern int setlocale_null_r (int category, char *buf, size_t bufsize) + _GL_ARG_NONNULL ((2)); + +/* setlocale_null (CATEGORY) is like setlocale (CATEGORY, NULL), except that + it is guaranteed to be multithread-safe. + The return value is NULL if CATEGORY is invalid. + For this call to be multithread-safe, *all* calls to + setlocale (CATEGORY, NULL) in all other threads must have been converted + to use setlocale_null_r or setlocale_null as well, and the other threads + must not make other setlocale invocations (since changing the global locale + has side effects on all threads). */ +extern const char *setlocale_null (int category); + + +#ifdef __cplusplus +} +#endif + +#endif /* _SETLOCALE_NULL_H */ diff --git a/lib/sleep.c b/lib/sleep.c index c5218e5..8aca605 100644 --- a/lib/sleep.c +++ b/lib/sleep.c @@ -1,5 +1,5 @@ /* Pausing execution of the current thread. - Copyright (C) 2007, 2009-2019 Free Software Foundation, Inc. + Copyright (C) 2007, 2009-2020 Free Software Foundation, Inc. Written by Bruno Haible , 2007. This program is free software: you can redistribute it and/or modify diff --git a/lib/stat-time.h b/lib/stat-time.h index 38a1f55..884ffd8 100644 --- a/lib/stat-time.h +++ b/lib/stat-time.h @@ -1,6 +1,6 @@ /* stat-related time functions. - Copyright (C) 2005, 2007, 2009-2019 Free Software Foundation, Inc. + Copyright (C) 2005, 2007, 2009-2020 Free Software Foundation, Inc. This 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/stat-w32.c b/lib/stat-w32.c index 60fe5f6..108ce19 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-2019 Free Software Foundation, Inc. + Copyright (C) 2017-2020 Free Software Foundation, Inc. This 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,23 @@ #if defined _WIN32 && ! defined __CYGWIN__ -/* Ensure that defines FILE_ID_INFO. */ -#undef _WIN32_WINNT -#define _WIN32_WINNT _WIN32_WINNT_WIN8 +/* Attempt to make define FILE_ID_INFO. + But ensure that the redefinition of _WIN32_WINNT does not make us assume + Windows Vista or newer when building for an older version of Windows. */ +#if HAVE_SDKDDKVER_H +# include +# if _WIN32_WINNT >= _WIN32_WINNT_VISTA +# define WIN32_ASSUME_VISTA 1 +# else +# define WIN32_ASSUME_VISTA 0 +# endif +# if !defined _WIN32_WINNT || (_WIN32_WINNT < _WIN32_WINNT_WIN8) +# undef _WIN32_WINNT +# define _WIN32_WINNT _WIN32_WINNT_WIN8 +# endif +#else +# define WIN32_ASSUME_VISTA (_WIN32_WINNT >= _WIN32_WINNT_VISTA) +#endif #include #include @@ -38,21 +52,34 @@ #include "pathmax.h" #include "verify.h" +/* Don't assume that UNICODE is not defined. */ +#undef LoadLibrary +#define LoadLibrary LoadLibraryA +#undef GetFinalPathNameByHandle +#define GetFinalPathNameByHandle GetFinalPathNameByHandleA + +/* Older mingw headers do not define VOLUME_NAME_NONE. */ +#ifndef VOLUME_NAME_NONE +# define VOLUME_NAME_NONE 4 +#endif + +#if !WIN32_ASSUME_VISTA + /* Avoid warnings from gcc -Wcast-function-type. */ -#define GetProcAddress \ - (void *) GetProcAddress +# define GetProcAddress \ + (void *) GetProcAddress -#if _GL_WINDOWS_STAT_INODES == 2 +# if _GL_WINDOWS_STAT_INODES == 2 /* GetFileInformationByHandleEx was introduced only in Windows Vista. */ typedef DWORD (WINAPI * GetFileInformationByHandleExFuncType) (HANDLE hFile, FILE_INFO_BY_HANDLE_CLASS fiClass, LPVOID lpBuffer, DWORD dwBufferSize); static GetFileInformationByHandleExFuncType GetFileInformationByHandleExFunc = NULL; -#endif +# endif /* GetFinalPathNameByHandle was introduced only in Windows Vista. */ typedef DWORD (WINAPI * GetFinalPathNameByHandleFuncType) (HANDLE hFile, - LPTSTR lpFilePath, + LPSTR lpFilePath, DWORD lenFilePath, DWORD dwFlags); static GetFinalPathNameByHandleFuncType GetFinalPathNameByHandleFunc = NULL; @@ -64,16 +91,23 @@ initialize (void) HMODULE kernel32 = LoadLibrary ("kernel32.dll"); if (kernel32 != NULL) { -#if _GL_WINDOWS_STAT_INODES == 2 +# if _GL_WINDOWS_STAT_INODES == 2 GetFileInformationByHandleExFunc = (GetFileInformationByHandleExFuncType) GetProcAddress (kernel32, "GetFileInformationByHandleEx"); -#endif +# endif GetFinalPathNameByHandleFunc = (GetFinalPathNameByHandleFuncType) GetProcAddress (kernel32, "GetFinalPathNameByHandleA"); } initialized = TRUE; } +#else + +# define GetFileInformationByHandleExFunc GetFileInformationByHandleEx +# define GetFinalPathNameByHandleFunc GetFinalPathNameByHandle + +#endif + /* Converts a FILETIME to GMT time since 1970-01-01 00:00:00. */ #if _GL_WINDOWS_STAT_TIMESPEC struct timespec @@ -132,8 +166,10 @@ _gl_fstat_by_handle (HANDLE h, const char *path, struct stat *buf) DWORD type = GetFileType (h); if (type == FILE_TYPE_DISK) { +#if !WIN32_ASSUME_VISTA if (!initialized) initialize (); +#endif /* st_mode can be determined through GetFileAttributesEx diff --git a/lib/stat-w32.h b/lib/stat-w32.h index 6b961d7..491a754 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-2019 Free Software Foundation, Inc. + Copyright (C) 2017-2020 Free Software Foundation, Inc. This 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/stat.c b/lib/stat.c index 1c28aa4..9d3965d 100644 --- a/lib/stat.c +++ b/lib/stat.c @@ -1,5 +1,5 @@ /* Work around platform bugs in stat. - Copyright (C) 2009-2019 Free Software Foundation, Inc. + Copyright (C) 2009-2020 Free Software Foundation, Inc. This program is free software: you can redistribute it and/or modify it under the terms of the GNU General Public License as published by @@ -65,6 +65,13 @@ orig_stat (const char *filename, struct stat *buf) # define WIN32_LEAN_AND_MEAN # include # include "stat-w32.h" +/* Don't assume that UNICODE is not defined. */ +# undef WIN32_FIND_DATA +# define WIN32_FIND_DATA WIN32_FIND_DATAA +# undef CreateFile +# define CreateFile CreateFileA +# undef FindFirstFile +# define FindFirstFile FindFirstFileA #endif #ifdef WINDOWS_NATIVE @@ -113,7 +120,7 @@ rpl_stat (char const *name, struct stat *buf) around length limitations ? */ - /* POSIX + /* POSIX specifies: "More than two leading characters shall be treated as a single character." */ if (ISSLASH (name[0]) && ISSLASH (name[1]) && ISSLASH (name[2])) @@ -375,7 +382,7 @@ rpl_stat (char const *name, struct stat *buf) case ERROR_ACCESS_DENIED: /* rname is such as 'C:\System Volume Information\foo'. */ case ERROR_SHARING_VIOLATION: /* rname is such as 'C:\pagefile.sys' (second approach only). */ - /* XXX map to EACCESS or EPERM? */ + /* XXX map to EACCES or EPERM? */ errno = EACCES; break; @@ -398,7 +405,7 @@ rpl_stat (char const *name, struct stat *buf) errno = ENAMETOOLONG; break; - case ERROR_DELETE_PENDING: /* XXX map to EACCESS or EPERM? */ + case ERROR_DELETE_PENDING: /* XXX map to EACCES or EPERM? */ errno = EPERM; break; diff --git a/lib/stdalign.in.h b/lib/stdalign.in.h new file mode 100644 index 0000000..b5b63e5 --- /dev/null +++ b/lib/stdalign.in.h @@ -0,0 +1,126 @@ +/* A substitute for ISO C11 . + + Copyright 2011-2020 Free Software Foundation, Inc. + + This program is free software; you can redistribute it and/or modify + it under the terms of the GNU General Public License as published by + the Free Software Foundation; either version 3, or (at your option) + any later version. + + This program is distributed in the hope that it will be useful, + but WITHOUT ANY WARRANTY; without even the implied warranty of + MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + GNU General Public License for more details. + + You should have received a copy of the GNU General Public License + along with this program; if not, see . */ + +/* Written by Paul Eggert and Bruno Haible. */ + +#ifndef _GL_STDALIGN_H +#define _GL_STDALIGN_H + +/* ISO C11 for platforms that lack it. + + References: + ISO C11 (latest free draft + ) + sections 6.5.3.4, 6.7.5, 7.15. + C++11 (latest free draft + ) + 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 for offsetof. */ +#include + +/* FreeBSD 9.1 , included by 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 + . + 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 struct __alignof_helper { char __a; __t __b; }; +# define _Alignof(type) offsetof (__alignof_helper, __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 __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 5eec8ba..8cdc685 100644 --- a/lib/stdarg.in.h +++ b/lib/stdarg.in.h @@ -1,5 +1,5 @@ /* Substitute for and wrapper around . - Copyright (C) 2008-2019 Free Software Foundation, Inc. + Copyright (C) 2008-2020 Free Software Foundation, Inc. This 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/stdbool.in.h b/lib/stdbool.in.h index 8158b00..baacf98 100644 --- a/lib/stdbool.in.h +++ b/lib/stdbool.in.h @@ -1,4 +1,4 @@ -/* Copyright (C) 2001-2003, 2006-2019 Free Software Foundation, Inc. +/* Copyright (C) 2001-2003, 2006-2020 Free Software Foundation, Inc. Written by Bruno Haible , 2001. This program is free software; you can redistribute it and/or modify diff --git a/lib/stddef.in.h b/lib/stddef.in.h index 5aad121..87b46d5 100644 --- a/lib/stddef.in.h +++ b/lib/stddef.in.h @@ -1,6 +1,6 @@ /* A substitute for POSIX 2008 , for platforms that have issues. - Copyright (C) 2009-2019 Free Software Foundation, Inc. + Copyright (C) 2009-2020 Free Software Foundation, Inc. This program is free software; you can redistribute it and/or modify it under the terms of the GNU General Public License as published by @@ -19,7 +19,7 @@ /* * POSIX 2008 for platforms that have issues. - * + * */ #if __GNUC__ >= 3 @@ -83,20 +83,26 @@ /* Some platforms lack max_align_t. The check for _GCC_MAX_ALIGN_T is a hack in case the configure-time test was done with g++ even though - we are currently compiling with gcc. */ -#if ! (@HAVE_MAX_ALIGN_T@ || defined _GCC_MAX_ALIGN_T) -# if !GNULIB_defined_max_align_t + we are currently compiling with gcc. + On MSVC, max_align_t is defined only in C++ mode, after was + included. Its definition is good since it has an alignment of 8 (on x86 + and x86_64). */ +#if defined _MSC_VER && defined __cplusplus +# include +#else +# if ! (@HAVE_MAX_ALIGN_T@ || defined _GCC_MAX_ALIGN_T) +# if !GNULIB_defined_max_align_t /* On the x86, the maximum storage alignment of double, long, etc. is 4, but GCC's C11 ABI for x86 says that max_align_t has an alignment of 8, and the C11 standard allows this. Work around this problem by using __alignof__ (which returns 8 for double) rather than _Alignof (which returns 4), and align each union member accordingly. */ -# ifdef __GNUC__ -# define _GL_STDDEF_ALIGNAS(type) \ - __attribute__ ((__aligned__ (__alignof__ (type)))) -# else -# define _GL_STDDEF_ALIGNAS(type) /* */ -# endif +# if defined __GNUC__ || (__clang_major__ >= 4) +# define _GL_STDDEF_ALIGNAS(type) \ + __attribute__ ((__aligned__ (__alignof__ (type)))) +# else +# define _GL_STDDEF_ALIGNAS(type) /* */ +# endif typedef union { char *__p _GL_STDDEF_ALIGNAS (char *); @@ -104,8 +110,9 @@ typedef union long double __ld _GL_STDDEF_ALIGNAS (long double); long int __i _GL_STDDEF_ALIGNAS (long int); } rpl_max_align_t; -# define max_align_t rpl_max_align_t -# define GNULIB_defined_max_align_t 1 +# define max_align_t rpl_max_align_t +# define GNULIB_defined_max_align_t 1 +# endif # endif #endif diff --git a/lib/stdint.in.h b/lib/stdint.in.h index 21dd8d2..63fa1aa 100644 --- a/lib/stdint.in.h +++ b/lib/stdint.in.h @@ -1,4 +1,4 @@ -/* Copyright (C) 2001-2002, 2004-2019 Free Software Foundation, Inc. +/* Copyright (C) 2001-2002, 2004-2020 Free Software Foundation, Inc. Written by Paul Eggert, Bruno Haible, Sam Steingold, Peter Burwood. This file is part of gnulib. @@ -17,7 +17,7 @@ /* * ISO C 99 for platforms that lack it. - * + * */ #ifndef _@GUARD_PREFIX@_STDINT_H @@ -188,7 +188,7 @@ typedef long int gl_int64_t; typedef __int64 gl_int64_t; # define int64_t gl_int64_t # define GL_INT64_T -# elif @HAVE_LONG_LONG_INT@ +# else # undef int64_t typedef long long int gl_int64_t; # define int64_t gl_int64_t @@ -209,7 +209,7 @@ typedef unsigned long int gl_uint64_t; typedef unsigned __int64 gl_uint64_t; # define uint64_t gl_uint64_t # define GL_UINT64_T -# elif @HAVE_UNSIGNED_LONG_LONG_INT@ +# else # undef uint64_t typedef unsigned long long int gl_uint64_t; # define uint64_t gl_uint64_t @@ -299,16 +299,25 @@ typedef gl_uint_fast32_t gl_uint_fast16_t; /* 7.18.1.4. Integer types capable of holding object pointers */ -/* kLIBC's stdint.h defines _INTPTR_T_DECLARED and needs its own +/* kLIBC's defines _INTPTR_T_DECLARED and needs its own definitions of intptr_t and uintptr_t (which use int and unsigned) - to avoid clashes with declarations of system functions like sbrk. */ -# ifndef _INTPTR_T_DECLARED -# undef intptr_t -# undef uintptr_t + to avoid clashes with declarations of system functions like sbrk. + Similarly, MinGW WSL-5.4.1 needs its own intptr_t and + uintptr_t to avoid conflicting declarations of system functions like + _findclose in . */ +# if !((defined __KLIBC__ && defined _INTPTR_T_DECLARED) \ + || defined __MINGW32__) +# undef intptr_t +# undef uintptr_t +# ifdef _WIN64 +typedef long long int gl_intptr_t; +typedef unsigned long long int gl_uintptr_t; +# else typedef long int gl_intptr_t; typedef unsigned long int gl_uintptr_t; -# define intptr_t gl_intptr_t -# define uintptr_t gl_uintptr_t +# endif +# define intptr_t gl_intptr_t +# define uintptr_t gl_uintptr_t # endif /* 7.18.1.5. Greatest-width integer types */ @@ -323,7 +332,7 @@ typedef unsigned long int gl_uintptr_t; # ifndef INTMAX_MAX # undef INTMAX_C # undef intmax_t -# if @HAVE_LONG_LONG_INT@ && LONG_MAX >> 30 == 1 +# if LONG_MAX >> 30 == 1 typedef long long int gl_intmax_t; # define intmax_t gl_intmax_t # elif defined GL_INT64_T @@ -337,7 +346,7 @@ typedef long int gl_intmax_t; # ifndef UINTMAX_MAX # undef UINTMAX_C # undef uintmax_t -# if @HAVE_UNSIGNED_LONG_LONG_INT@ && ULONG_MAX >> 31 == 1 +# if ULONG_MAX >> 31 == 1 typedef unsigned long long int gl_uintmax_t; # define uintmax_t gl_uintmax_t # elif defined GL_UINT64_T @@ -485,9 +494,15 @@ typedef int _verify_intmax_size[sizeof (intmax_t) == sizeof (uintmax_t) # undef INTPTR_MIN # undef INTPTR_MAX # undef UINTPTR_MAX -# define INTPTR_MIN LONG_MIN -# define INTPTR_MAX LONG_MAX -# define UINTPTR_MAX ULONG_MAX +# ifdef _WIN64 +# define INTPTR_MIN LLONG_MIN +# define INTPTR_MAX LLONG_MAX +# define UINTPTR_MAX ULLONG_MAX +# else +# define INTPTR_MIN LONG_MIN +# define INTPTR_MAX LONG_MAX +# define UINTPTR_MAX ULONG_MAX +# endif /* 7.18.2.5. Limits of greatest-width integer types */ @@ -586,17 +601,21 @@ typedef int _verify_intmax_size[sizeof (intmax_t) == sizeof (uintmax_t) _STDINT_MAX (@HAVE_SIGNED_WCHAR_T@, @BITSIZEOF_WCHAR_T@, 0@WCHAR_T_SUFFIX@) /* wint_t limits */ -# undef WINT_MIN -# undef WINT_MAX -# if @HAVE_SIGNED_WINT_T@ -# define WINT_MIN \ - _STDINT_SIGNED_MIN (@BITSIZEOF_WINT_T@, 0@WINT_T_SUFFIX@) -# else -# define WINT_MIN \ - _STDINT_UNSIGNED_MIN (@BITSIZEOF_WINT_T@, 0@WINT_T_SUFFIX@) +/* If gnulib's or overrides wint_t, @WINT_T_SUFFIX@ is not + accurate, therefore use the definitions from above. */ +# if !@GNULIB_OVERRIDES_WINT_T@ +# undef WINT_MIN +# undef WINT_MAX +# if @HAVE_SIGNED_WINT_T@ +# define WINT_MIN \ + _STDINT_SIGNED_MIN (@BITSIZEOF_WINT_T@, 0@WINT_T_SUFFIX@) +# else +# define WINT_MIN \ + _STDINT_UNSIGNED_MIN (@BITSIZEOF_WINT_T@, 0@WINT_T_SUFFIX@) +# endif +# define WINT_MAX \ + _STDINT_MAX (@HAVE_SIGNED_WINT_T@, @BITSIZEOF_WINT_T@, 0@WINT_T_SUFFIX@) # endif -# define WINT_MAX \ - _STDINT_MAX (@HAVE_SIGNED_WINT_T@, @BITSIZEOF_WINT_T@, 0@WINT_T_SUFFIX@) /* 7.18.4. Macros for integer constants */ @@ -627,21 +646,21 @@ typedef int _verify_intmax_size[sizeof (intmax_t) == sizeof (uintmax_t) # define INT64_C(x) x##L # elif defined _MSC_VER # define INT64_C(x) x##i64 -# elif @HAVE_LONG_LONG_INT@ +# else # define INT64_C(x) x##LL # endif # if ULONG_MAX >> 31 >> 31 >> 1 == 1 # define UINT64_C(x) x##UL # elif defined _MSC_VER # define UINT64_C(x) x##ui64 -# elif @HAVE_UNSIGNED_LONG_LONG_INT@ +# else # define UINT64_C(x) x##ULL # endif /* 7.18.4.2. Macros for greatest-width integer constants */ # ifndef INTMAX_C -# if @HAVE_LONG_LONG_INT@ && LONG_MAX >> 30 == 1 +# if LONG_MAX >> 30 == 1 # define INTMAX_C(x) x##LL # elif defined GL_INT64_T # define INTMAX_C(x) INT64_C(x) @@ -651,7 +670,7 @@ typedef int _verify_intmax_size[sizeof (intmax_t) == sizeof (uintmax_t) # endif # ifndef UINTMAX_C -# if @HAVE_UNSIGNED_LONG_LONG_INT@ && ULONG_MAX >> 31 == 1 +# if ULONG_MAX >> 31 == 1 # define UINTMAX_C(x) x##ULL # elif defined GL_UINT64_T # define UINTMAX_C(x) UINT64_C(x) diff --git a/lib/stdio-impl.h b/lib/stdio-impl.h index 4260468..15066aa 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-2019 Free Software Foundation, Inc. + Copyright (C) 2007-2008, 2010-2020 Free Software Foundation, Inc. This program is free software: you can redistribute it and/or modify it under the terms of the GNU General Public License as published by @@ -18,11 +18,16 @@ the same implementation of stdio extension API, except that some fields have different naming conventions, or their access requires some casts. */ -/* Glibc 2.28 made _IO_IN_BACKUP private. For now, work around this - problem by defining it ourselves. FIXME: Do not rely on glibc +/* Glibc 2.28 made _IO_UNBUFFERED and _IO_IN_BACKUP private. For now, work + around this problem by defining them ourselves. FIXME: Do not rely on glibc internals. */ -#if !defined _IO_IN_BACKUP && defined _IO_EOF_SEEN -# define _IO_IN_BACKUP 0x100 +#if defined _IO_EOF_SEEN +# if !defined _IO_UNBUFFERED +# define _IO_UNBUFFERED 0x2 +# endif +# if !defined _IO_IN_BACKUP +# define _IO_IN_BACKUP 0x100 +# endif #endif /* BSD stdio derived implementations. */ @@ -170,7 +175,7 @@ # define fp_ fp # endif -# if defined _SCO_DS /* OpenServer */ +# if defined _SCO_DS || (defined __SCO_VERSION__ || defined __sysv5__) /* OpenServer 5, OpenServer 6, UnixWare 7 */ # define _cnt __cnt # define _ptr __ptr # define _base __base diff --git a/lib/stdio.in.h b/lib/stdio.in.h index 4a8aa55..458036b 100644 --- a/lib/stdio.in.h +++ b/lib/stdio.in.h @@ -1,6 +1,6 @@ /* A GNU-like . - Copyright (C) 2004, 2007-2019 Free Software Foundation, Inc. + Copyright (C) 2004, 2007-2020 Free Software Foundation, Inc. This program is free software; you can redistribute it and/or modify it under the terms of the GNU General Public License as published by @@ -62,35 +62,51 @@ We enable _GL_ATTRIBUTE_FORMAT only if these are supported too, because gnulib and libintl do '#define printf __printf__' when they override the 'printf' function. */ -#if __GNUC__ > 2 || (__GNUC__ == 2 && __GNUC_MINOR__ >= 7) -# define _GL_ATTRIBUTE_FORMAT(spec) __attribute__ ((__format__ spec)) +#ifndef _GL_ATTRIBUTE_FORMAT +# if __GNUC__ > 2 || (__GNUC__ == 2 && __GNUC_MINOR__ >= 7) || defined __clang__ +# define _GL_ATTRIBUTE_FORMAT(spec) __attribute__ ((__format__ spec)) +# else +# define _GL_ATTRIBUTE_FORMAT(spec) /* empty */ +# endif +#endif + +/* An __attribute__ __format__ specifier for a function that takes a format + string and arguments, where the format string directives are the ones + standardized by ISO C99 and POSIX. + _GL_ATTRIBUTE_SPEC_PRINTF_STANDARD */ +/* __gnu_printf__ is supported in GCC >= 4.4. */ +#if __GNUC__ > 4 || (__GNUC__ == 4 && __GNUC_MINOR__ >= 4) +# define _GL_ATTRIBUTE_SPEC_PRINTF_STANDARD __gnu_printf__ +#else +# define _GL_ATTRIBUTE_SPEC_PRINTF_STANDARD __printf__ +#endif + +/* An __attribute__ __format__ specifier for a function that takes a format + string and arguments, where the format string directives are the ones of the + system printf(), rather than the ones standardized by ISO C99 and POSIX. + _GL_ATTRIBUTE_SPEC_PRINTF_SYSTEM */ +/* On mingw, Gnulib sets __USE_MINGW_ANSI_STDIO in order to get closer to + the standards. The macro GNULIB_PRINTF_ATTRIBUTE_FLAVOR_GNU indicates + whether this change is effective. On older mingw, it is not. */ +#if GNULIB_PRINTF_ATTRIBUTE_FLAVOR_GNU +# define _GL_ATTRIBUTE_SPEC_PRINTF_SYSTEM _GL_ATTRIBUTE_SPEC_PRINTF_STANDARD #else -# define _GL_ATTRIBUTE_FORMAT(spec) /* empty */ +# define _GL_ATTRIBUTE_SPEC_PRINTF_SYSTEM __printf__ #endif -/* _GL_ATTRIBUTE_FORMAT_PRINTF +/* _GL_ATTRIBUTE_FORMAT_PRINTF_STANDARD indicates to GCC that the function takes a format string and arguments, where the format string directives are the ones standardized by ISO C99 and POSIX. */ -#if __GNUC__ > 4 || (__GNUC__ == 4 && __GNUC_MINOR__ >= 4) -# define _GL_ATTRIBUTE_FORMAT_PRINTF(formatstring_parameter, first_argument) \ - _GL_ATTRIBUTE_FORMAT ((__gnu_printf__, formatstring_parameter, first_argument)) -#else -# define _GL_ATTRIBUTE_FORMAT_PRINTF(formatstring_parameter, first_argument) \ - _GL_ATTRIBUTE_FORMAT ((__printf__, formatstring_parameter, first_argument)) -#endif +#define _GL_ATTRIBUTE_FORMAT_PRINTF_STANDARD(formatstring_parameter, first_argument) \ + _GL_ATTRIBUTE_FORMAT ((_GL_ATTRIBUTE_SPEC_PRINTF_STANDARD, formatstring_parameter, first_argument)) -/* _GL_ATTRIBUTE_FORMAT_PRINTF_SYSTEM is like _GL_ATTRIBUTE_FORMAT_PRINTF, +/* _GL_ATTRIBUTE_FORMAT_PRINTF_SYSTEM is like _GL_ATTRIBUTE_FORMAT_PRINTF_STANDARD, except that it indicates to GCC that the supported format string directives are the ones of the system printf(), rather than the ones standardized by ISO C99 and POSIX. */ -#if GNULIB_PRINTF_ATTRIBUTE_FLAVOR_GNU -# define _GL_ATTRIBUTE_FORMAT_PRINTF_SYSTEM(formatstring_parameter, first_argument) \ - _GL_ATTRIBUTE_FORMAT_PRINTF (formatstring_parameter, first_argument) -#else -# define _GL_ATTRIBUTE_FORMAT_PRINTF_SYSTEM(formatstring_parameter, first_argument) \ - _GL_ATTRIBUTE_FORMAT ((__printf__, formatstring_parameter, first_argument)) -#endif +#define _GL_ATTRIBUTE_FORMAT_PRINTF_SYSTEM(formatstring_parameter, first_argument) \ + _GL_ATTRIBUTE_FORMAT ((_GL_ATTRIBUTE_SPEC_PRINTF_SYSTEM, formatstring_parameter, first_argument)) /* _GL_ATTRIBUTE_FORMAT_SCANF indicates to GCC that the function takes a format string and arguments, @@ -171,17 +187,17 @@ # if !(defined __cplusplus && defined GNULIB_NAMESPACE) # define dprintf rpl_dprintf # endif -_GL_FUNCDECL_RPL (dprintf, int, (int fd, const char *format, ...) - _GL_ATTRIBUTE_FORMAT_PRINTF (2, 3) +_GL_FUNCDECL_RPL (dprintf, int, (int fd, const char *restrict format, ...) + _GL_ATTRIBUTE_FORMAT_PRINTF_STANDARD (2, 3) _GL_ARG_NONNULL ((2))); -_GL_CXXALIAS_RPL (dprintf, int, (int fd, const char *format, ...)); +_GL_CXXALIAS_RPL (dprintf, int, (int fd, const char *restrict format, ...)); # else # if !@HAVE_DPRINTF@ -_GL_FUNCDECL_SYS (dprintf, int, (int fd, const char *format, ...) - _GL_ATTRIBUTE_FORMAT_PRINTF (2, 3) +_GL_FUNCDECL_SYS (dprintf, int, (int fd, const char *restrict format, ...) + _GL_ATTRIBUTE_FORMAT_PRINTF_STANDARD (2, 3) _GL_ARG_NONNULL ((2))); # endif -_GL_CXXALIAS_SYS (dprintf, int, (int fd, const char *format, ...)); +_GL_CXXALIAS_SYS (dprintf, int, (int fd, const char *restrict format, ...)); # endif _GL_CXXALIASWARN (dprintf); #elif defined GNULIB_POSIXCHECK @@ -203,7 +219,9 @@ _GL_CXXALIAS_RPL (fclose, int, (FILE *stream)); # else _GL_CXXALIAS_SYS (fclose, int, (FILE *stream)); # endif +# if __GLIBC__ >= 2 _GL_CXXALIASWARN (fclose); +# endif #elif defined GNULIB_POSIXCHECK # undef fclose /* Assume fclose is always declared. */ @@ -211,6 +229,29 @@ _GL_WARN_ON_USE (fclose, "fclose is not always POSIX compliant - " "use gnulib module fclose for portable POSIX compliance"); #endif +/* On native Windows, map 'fcloseall' to '_fcloseall', so that -loldnames is + not required. In C++ with GNULIB_NAMESPACE, avoid differences between + platforms by defining GNULIB_NAMESPACE::fcloseall on all platforms that have + it. */ +#if defined _WIN32 && !defined __CYGWIN__ +# if !(defined __cplusplus && defined GNULIB_NAMESPACE) +# undef fcloseall +# define fcloseall _fcloseall +# endif +_GL_CXXALIAS_MDA (fcloseall, int, (void)); +#else +# if @HAVE_DECL_FCLOSEALL@ +# if defined __FreeBSD__ +_GL_CXXALIAS_SYS (fcloseall, void, (void)); +# else +_GL_CXXALIAS_SYS (fcloseall, int, (void)); +# endif +# endif +#endif +#if (defined _WIN32 && !defined __CYGWIN__) || @HAVE_DECL_FCLOSEALL@ +_GL_CXXALIASWARN (fcloseall); +#endif + #if @GNULIB_FDOPEN@ # if @REPLACE_FDOPEN@ # if !(defined __cplusplus && defined GNULIB_NAMESPACE) @@ -220,6 +261,12 @@ _GL_WARN_ON_USE (fclose, "fclose is not always POSIX compliant - " _GL_FUNCDECL_RPL (fdopen, FILE *, (int fd, const char *mode) _GL_ARG_NONNULL ((2))); _GL_CXXALIAS_RPL (fdopen, FILE *, (int fd, const char *mode)); +# elif defined _WIN32 && !defined __CYGWIN__ +# if !(defined __cplusplus && defined GNULIB_NAMESPACE) +# undef fdopen +# define fdopen _fdopen +# endif +_GL_CXXALIAS_MDA (fdopen, FILE *, (int fd, const char *mode)); # else _GL_CXXALIAS_SYS (fdopen, FILE *, (int fd, const char *mode)); # endif @@ -229,6 +276,20 @@ _GL_CXXALIASWARN (fdopen); /* Assume fdopen is always declared. */ _GL_WARN_ON_USE (fdopen, "fdopen on native Windows platforms is not POSIX compliant - " "use gnulib module fdopen for portability"); +#else +/* On native Windows, map 'fdopen' to '_fdopen', so that -loldnames is not + required. In C++ with GNULIB_NAMESPACE, avoid differences between + platforms by defining GNULIB_NAMESPACE::fdopen always. */ +# if defined _WIN32 && !defined __CYGWIN__ +# if !(defined __cplusplus && defined GNULIB_NAMESPACE) +# undef fdopen +# define fdopen _fdopen +# endif +_GL_CXXALIAS_MDA (fdopen, FILE *, (int fd, const char *mode)); +# else +_GL_CXXALIAS_SYS (fdopen, FILE *, (int fd, const char *mode)); +# endif +_GL_CXXALIASWARN (fdopen); #endif #if @GNULIB_FFLUSH@ @@ -247,7 +308,9 @@ _GL_CXXALIAS_RPL (fflush, int, (FILE *gl_stream)); # else _GL_CXXALIAS_SYS (fflush, int, (FILE *gl_stream)); # endif +# if __GLIBC__ >= 2 _GL_CXXALIASWARN (fflush); +# endif #elif defined GNULIB_POSIXCHECK # undef fflush /* Assume fflush is always declared. */ @@ -266,7 +329,9 @@ _GL_CXXALIAS_RPL (fgetc, int, (FILE *stream)); # else _GL_CXXALIAS_SYS (fgetc, int, (FILE *stream)); # endif +# if __GLIBC__ >= 2 _GL_CXXALIASWARN (fgetc); +# endif #endif #if @GNULIB_FGETS@ @@ -275,14 +340,33 @@ _GL_CXXALIASWARN (fgetc); # undef fgets # define fgets rpl_fgets # endif -_GL_FUNCDECL_RPL (fgets, char *, (char *s, int n, FILE *stream) - _GL_ARG_NONNULL ((1, 3))); -_GL_CXXALIAS_RPL (fgets, char *, (char *s, int n, FILE *stream)); +_GL_FUNCDECL_RPL (fgets, char *, + (char *restrict s, int n, FILE *restrict stream) + _GL_ARG_NONNULL ((1, 3))); +_GL_CXXALIAS_RPL (fgets, char *, + (char *restrict s, int n, FILE *restrict stream)); # else -_GL_CXXALIAS_SYS (fgets, char *, (char *s, int n, FILE *stream)); +_GL_CXXALIAS_SYS (fgets, char *, + (char *restrict s, int n, FILE *restrict stream)); # endif +# if __GLIBC__ >= 2 _GL_CXXALIASWARN (fgets); +# endif +#endif + +/* On native Windows, map 'fileno' to '_fileno', so that -loldnames is not + required. In C++ with GNULIB_NAMESPACE, avoid differences between + platforms by defining GNULIB_NAMESPACE::fileno always. */ +#if defined _WIN32 && !defined __CYGWIN__ +# if !(defined __cplusplus && defined GNULIB_NAMESPACE) +# undef fileno +# define fileno _fileno +# endif +_GL_CXXALIAS_MDA (fileno, int, (FILE *restrict stream)); +#else +_GL_CXXALIAS_SYS (fileno, int, (FILE *restrict stream)); #endif +_GL_CXXALIASWARN (fileno); #if @GNULIB_FOPEN@ # if @REPLACE_FOPEN@ @@ -290,13 +374,18 @@ _GL_CXXALIASWARN (fgets); # undef fopen # define fopen rpl_fopen # endif -_GL_FUNCDECL_RPL (fopen, FILE *, (const char *filename, const char *mode) - _GL_ARG_NONNULL ((1, 2))); -_GL_CXXALIAS_RPL (fopen, FILE *, (const char *filename, const char *mode)); +_GL_FUNCDECL_RPL (fopen, FILE *, + (const char *restrict filename, const char *restrict mode) + _GL_ARG_NONNULL ((1, 2))); +_GL_CXXALIAS_RPL (fopen, FILE *, + (const char *restrict filename, const char *restrict mode)); # else -_GL_CXXALIAS_SYS (fopen, FILE *, (const char *filename, const char *mode)); +_GL_CXXALIAS_SYS (fopen, FILE *, + (const char *restrict filename, const char *restrict mode)); # endif +# if __GLIBC__ >= 2 _GL_CXXALIASWARN (fopen); +# endif #elif defined GNULIB_POSIXCHECK # undef fopen /* Assume fopen is always declared. */ @@ -312,19 +401,25 @@ _GL_WARN_ON_USE (fopen, "fopen on native Windows platforms is not POSIX complian # endif # define GNULIB_overrides_fprintf 1 # if @GNULIB_FPRINTF_POSIX@ || @GNULIB_VFPRINTF_POSIX@ -_GL_FUNCDECL_RPL (fprintf, int, (FILE *fp, const char *format, ...) - _GL_ATTRIBUTE_FORMAT_PRINTF (2, 3) - _GL_ARG_NONNULL ((1, 2))); +_GL_FUNCDECL_RPL (fprintf, int, + (FILE *restrict fp, const char *restrict format, ...) + _GL_ATTRIBUTE_FORMAT_PRINTF_STANDARD (2, 3) + _GL_ARG_NONNULL ((1, 2))); # else -_GL_FUNCDECL_RPL (fprintf, int, (FILE *fp, const char *format, ...) - _GL_ATTRIBUTE_FORMAT_PRINTF_SYSTEM (2, 3) - _GL_ARG_NONNULL ((1, 2))); +_GL_FUNCDECL_RPL (fprintf, int, + (FILE *restrict fp, const char *restrict format, ...) + _GL_ATTRIBUTE_FORMAT_PRINTF_SYSTEM (2, 3) + _GL_ARG_NONNULL ((1, 2))); # endif -_GL_CXXALIAS_RPL (fprintf, int, (FILE *fp, const char *format, ...)); +_GL_CXXALIAS_RPL (fprintf, int, + (FILE *restrict fp, const char *restrict format, ...)); # else -_GL_CXXALIAS_SYS (fprintf, int, (FILE *fp, const char *format, ...)); +_GL_CXXALIAS_SYS (fprintf, int, + (FILE *restrict fp, const char *restrict format, ...)); # endif +# if __GLIBC__ >= 2 _GL_CXXALIASWARN (fprintf); +# endif #endif #if !@GNULIB_FPRINTF_POSIX@ && defined GNULIB_POSIXCHECK # if !GNULIB_overrides_fprintf @@ -375,7 +470,9 @@ _GL_CXXALIAS_RPL (fputc, int, (int c, FILE *stream)); # else _GL_CXXALIAS_SYS (fputc, int, (int c, FILE *stream)); # endif +# if __GLIBC__ >= 2 _GL_CXXALIASWARN (fputc); +# endif #endif #if @GNULIB_FPUTS@ @@ -384,13 +481,18 @@ _GL_CXXALIASWARN (fputc); # undef fputs # define fputs rpl_fputs # endif -_GL_FUNCDECL_RPL (fputs, int, (const char *string, FILE *stream) - _GL_ARG_NONNULL ((1, 2))); -_GL_CXXALIAS_RPL (fputs, int, (const char *string, FILE *stream)); +_GL_FUNCDECL_RPL (fputs, int, + (const char *restrict string, FILE *restrict stream) + _GL_ARG_NONNULL ((1, 2))); +_GL_CXXALIAS_RPL (fputs, int, + (const char *restrict string, FILE *restrict stream)); # else -_GL_CXXALIAS_SYS (fputs, int, (const char *string, FILE *stream)); +_GL_CXXALIAS_SYS (fputs, int, + (const char *restrict string, FILE *restrict stream)); # endif +# if __GLIBC__ >= 2 _GL_CXXALIASWARN (fputs); +# endif #endif #if @GNULIB_FREAD@ @@ -399,13 +501,21 @@ _GL_CXXALIASWARN (fputs); # undef fread # define fread rpl_fread # endif -_GL_FUNCDECL_RPL (fread, size_t, (void *ptr, size_t s, size_t n, FILE *stream) - _GL_ARG_NONNULL ((4))); -_GL_CXXALIAS_RPL (fread, size_t, (void *ptr, size_t s, size_t n, FILE *stream)); +_GL_FUNCDECL_RPL (fread, size_t, + (void *restrict ptr, size_t s, size_t n, + FILE *restrict stream) + _GL_ARG_NONNULL ((4))); +_GL_CXXALIAS_RPL (fread, size_t, + (void *restrict ptr, size_t s, size_t n, + FILE *restrict stream)); # else -_GL_CXXALIAS_SYS (fread, size_t, (void *ptr, size_t s, size_t n, FILE *stream)); +_GL_CXXALIAS_SYS (fread, size_t, + (void *restrict ptr, size_t s, size_t n, + FILE *restrict stream)); # endif +# if __GLIBC__ >= 2 _GL_CXXALIASWARN (fread); +# endif #endif #if @GNULIB_FREOPEN@ @@ -415,15 +525,20 @@ _GL_CXXALIASWARN (fread); # define freopen rpl_freopen # endif _GL_FUNCDECL_RPL (freopen, FILE *, - (const char *filename, const char *mode, FILE *stream) + (const char *restrict filename, const char *restrict mode, + FILE *restrict stream) _GL_ARG_NONNULL ((2, 3))); _GL_CXXALIAS_RPL (freopen, FILE *, - (const char *filename, const char *mode, FILE *stream)); + (const char *restrict filename, const char *restrict mode, + FILE *restrict stream)); # else _GL_CXXALIAS_SYS (freopen, FILE *, - (const char *filename, const char *mode, FILE *stream)); + (const char *restrict filename, const char *restrict mode, + FILE *restrict stream)); # endif +# if __GLIBC__ >= 2 _GL_CXXALIASWARN (freopen); +# endif #elif defined GNULIB_POSIXCHECK # undef freopen /* Assume freopen is always declared. */ @@ -438,14 +553,19 @@ _GL_WARN_ON_USE (freopen, # undef fscanf # define fscanf rpl_fscanf # endif -_GL_FUNCDECL_RPL (fscanf, int, (FILE *stream, const char *format, ...) - _GL_ATTRIBUTE_FORMAT_SCANF_SYSTEM (2, 3) - _GL_ARG_NONNULL ((1, 2))); -_GL_CXXALIAS_RPL (fscanf, int, (FILE *stream, const char *format, ...)); +_GL_FUNCDECL_RPL (fscanf, int, + (FILE *restrict stream, const char *restrict format, ...) + _GL_ATTRIBUTE_FORMAT_SCANF_SYSTEM (2, 3) + _GL_ARG_NONNULL ((1, 2))); +_GL_CXXALIAS_RPL (fscanf, int, + (FILE *restrict stream, const char *restrict format, ...)); # else -_GL_CXXALIAS_SYS (fscanf, int, (FILE *stream, const char *format, ...)); +_GL_CXXALIAS_SYS (fscanf, int, + (FILE *restrict stream, const char *restrict format, ...)); # endif +# if __GLIBC__ >= 2 _GL_CXXALIASWARN (fscanf); +# endif #endif @@ -496,7 +616,9 @@ _GL_CXXALIAS_RPL (fseek, int, (FILE *fp, long offset, int whence)); # else _GL_CXXALIAS_SYS (fseek, int, (FILE *fp, long offset, int whence)); # endif +# if __GLIBC__ >= 2 _GL_CXXALIASWARN (fseek); +# endif #endif #if @GNULIB_FSEEKO@ @@ -559,7 +681,9 @@ _GL_CXXALIAS_RPL (ftell, long, (FILE *fp)); # else _GL_CXXALIAS_SYS (ftell, long, (FILE *fp)); # endif +# if __GLIBC__ >= 2 _GL_CXXALIASWARN (ftell); +# endif #endif #if @GNULIB_FTELLO@ @@ -608,13 +732,16 @@ _GL_WARN_ON_USE (ftell, "ftell cannot handle files larger than 4 GB " # define fwrite rpl_fwrite # endif _GL_FUNCDECL_RPL (fwrite, size_t, - (const void *ptr, size_t s, size_t n, FILE *stream) + (const void *restrict ptr, size_t s, size_t n, + FILE *restrict stream) _GL_ARG_NONNULL ((1, 4))); _GL_CXXALIAS_RPL (fwrite, size_t, - (const void *ptr, size_t s, size_t n, FILE *stream)); + (const void *restrict ptr, size_t s, size_t n, + FILE *restrict stream)); # else _GL_CXXALIAS_SYS (fwrite, size_t, - (const void *ptr, size_t s, size_t n, FILE *stream)); + (const void *restrict ptr, size_t s, size_t n, + FILE *restrict stream)); /* Work around bug 11959 when fortifying glibc 2.4 through 2.15 , @@ -639,7 +766,9 @@ extern size_t __REDIRECT (rpl_fwrite_unlocked, # define fwrite_unlocked rpl_fwrite_unlocked # endif # endif +# if __GLIBC__ >= 2 _GL_CXXALIASWARN (fwrite); +# endif #endif #if @GNULIB_GETC@ @@ -653,7 +782,9 @@ _GL_CXXALIAS_RPL_1 (getc, rpl_fgetc, int, (FILE *stream)); # else _GL_CXXALIAS_SYS (getc, int, (FILE *stream)); # endif +# if __GLIBC__ >= 2 _GL_CXXALIASWARN (getc); +# endif #endif #if @GNULIB_GETCHAR@ @@ -667,7 +798,9 @@ _GL_CXXALIAS_RPL (getchar, int, (void)); # else _GL_CXXALIAS_SYS (getchar, int, (void)); # endif +# if __GLIBC__ >= 2 _GL_CXXALIASWARN (getchar); +# endif #endif #if @GNULIB_GETDELIM@ @@ -683,22 +816,26 @@ _GL_CXXALIASWARN (getchar); # define getdelim rpl_getdelim # endif _GL_FUNCDECL_RPL (getdelim, ssize_t, - (char **lineptr, size_t *linesize, int delimiter, - FILE *stream) + (char **restrict lineptr, size_t *restrict linesize, + int delimiter, + FILE *restrict stream) _GL_ARG_NONNULL ((1, 2, 4))); _GL_CXXALIAS_RPL (getdelim, ssize_t, - (char **lineptr, size_t *linesize, int delimiter, - FILE *stream)); + (char **restrict lineptr, size_t *restrict linesize, + int delimiter, + FILE *restrict stream)); # else # if !@HAVE_DECL_GETDELIM@ _GL_FUNCDECL_SYS (getdelim, ssize_t, - (char **lineptr, size_t *linesize, int delimiter, - FILE *stream) + (char **restrict lineptr, size_t *restrict linesize, + int delimiter, + FILE *restrict stream) _GL_ARG_NONNULL ((1, 2, 4))); # endif _GL_CXXALIAS_SYS (getdelim, ssize_t, - (char **lineptr, size_t *linesize, int delimiter, - FILE *stream)); + (char **restrict lineptr, size_t *restrict linesize, + int delimiter, + FILE *restrict stream)); # endif _GL_CXXALIASWARN (getdelim); #elif defined GNULIB_POSIXCHECK @@ -722,18 +859,22 @@ _GL_WARN_ON_USE (getdelim, "getdelim is unportable - " # define getline rpl_getline # endif _GL_FUNCDECL_RPL (getline, ssize_t, - (char **lineptr, size_t *linesize, FILE *stream) + (char **restrict lineptr, size_t *restrict linesize, + FILE *restrict stream) _GL_ARG_NONNULL ((1, 2, 3))); _GL_CXXALIAS_RPL (getline, ssize_t, - (char **lineptr, size_t *linesize, FILE *stream)); + (char **restrict lineptr, size_t *restrict linesize, + FILE *restrict stream)); # else # if !@HAVE_DECL_GETLINE@ _GL_FUNCDECL_SYS (getline, ssize_t, - (char **lineptr, size_t *linesize, FILE *stream) + (char **restrict lineptr, size_t *restrict linesize, + FILE *restrict stream) _GL_ARG_NONNULL ((1, 2, 3))); # endif _GL_CXXALIAS_SYS (getline, ssize_t, - (char **lineptr, size_t *linesize, FILE *stream)); + (char **restrict lineptr, size_t *restrict linesize, + FILE *restrict stream)); # endif # if @HAVE_DECL_GETLINE@ _GL_CXXALIASWARN (getline); @@ -754,6 +895,20 @@ _GL_WARN_ON_USE (getline, "getline is unportable - " _GL_WARN_ON_USE (gets, "gets is a security hole - use fgets instead"); #endif +/* On native Windows, map 'getw' to '_getw', so that -loldnames is not + required. In C++ with GNULIB_NAMESPACE, avoid differences between + platforms by defining GNULIB_NAMESPACE::getw always. */ +#if defined _WIN32 && !defined __CYGWIN__ +# if !(defined __cplusplus && defined GNULIB_NAMESPACE) +# undef getw +# define getw _getw +# endif +_GL_CXXALIAS_MDA (getw, int, (FILE *restrict stream)); +#else +_GL_CXXALIAS_SYS (getw, int, (FILE *restrict stream)); +#endif +_GL_CXXALIASWARN (getw); + #if @GNULIB_OBSTACK_PRINTF@ || @GNULIB_OBSTACK_PRINTF_POSIX@ struct obstack; /* Grow an obstack with formatted output. Return the number of @@ -767,7 +922,7 @@ struct obstack; # endif _GL_FUNCDECL_RPL (obstack_printf, int, (struct obstack *obs, const char *format, ...) - _GL_ATTRIBUTE_FORMAT_PRINTF (2, 3) + _GL_ATTRIBUTE_FORMAT_PRINTF_STANDARD (2, 3) _GL_ARG_NONNULL ((1, 2))); _GL_CXXALIAS_RPL (obstack_printf, int, (struct obstack *obs, const char *format, ...)); @@ -775,7 +930,7 @@ _GL_CXXALIAS_RPL (obstack_printf, int, # if !@HAVE_DECL_OBSTACK_PRINTF@ _GL_FUNCDECL_SYS (obstack_printf, int, (struct obstack *obs, const char *format, ...) - _GL_ATTRIBUTE_FORMAT_PRINTF (2, 3) + _GL_ATTRIBUTE_FORMAT_PRINTF_STANDARD (2, 3) _GL_ARG_NONNULL ((1, 2))); # endif _GL_CXXALIAS_SYS (obstack_printf, int, @@ -788,7 +943,7 @@ _GL_CXXALIASWARN (obstack_printf); # endif _GL_FUNCDECL_RPL (obstack_vprintf, int, (struct obstack *obs, const char *format, va_list args) - _GL_ATTRIBUTE_FORMAT_PRINTF (2, 0) + _GL_ATTRIBUTE_FORMAT_PRINTF_STANDARD (2, 0) _GL_ARG_NONNULL ((1, 2))); _GL_CXXALIAS_RPL (obstack_vprintf, int, (struct obstack *obs, const char *format, va_list args)); @@ -796,7 +951,7 @@ _GL_CXXALIAS_RPL (obstack_vprintf, int, # if !@HAVE_DECL_OBSTACK_PRINTF@ _GL_FUNCDECL_SYS (obstack_vprintf, int, (struct obstack *obs, const char *format, va_list args) - _GL_ATTRIBUTE_FORMAT_PRINTF (2, 0) + _GL_ATTRIBUTE_FORMAT_PRINTF_STANDARD (2, 0) _GL_ARG_NONNULL ((1, 2))); # endif _GL_CXXALIAS_SYS (obstack_vprintf, int, @@ -832,7 +987,9 @@ _GL_CXXALIAS_RPL (perror, void, (const char *string)); # else _GL_CXXALIAS_SYS (perror, void, (const char *string)); # endif +# if __GLIBC__ >= 2 _GL_CXXALIASWARN (perror); +# endif #elif defined GNULIB_POSIXCHECK # undef perror /* Assume perror is always declared. */ @@ -868,21 +1025,21 @@ _GL_WARN_ON_USE (popen, "popen is buggy on some platforms - " #if @GNULIB_PRINTF_POSIX@ || @GNULIB_PRINTF@ # if (@GNULIB_PRINTF_POSIX@ && @REPLACE_PRINTF@) \ || (@GNULIB_PRINTF@ && @REPLACE_STDIO_WRITE_FUNCS@ && (@GNULIB_STDIO_H_NONBLOCKING@ || @GNULIB_STDIO_H_SIGPIPE@)) -# if defined __GNUC__ +# if defined __GNUC__ || defined __clang__ # if !(defined __cplusplus && defined GNULIB_NAMESPACE) /* Don't break __attribute__((format(printf,M,N))). */ # define printf __printf__ # endif # if @GNULIB_PRINTF_POSIX@ || @GNULIB_VFPRINTF_POSIX@ _GL_FUNCDECL_RPL_1 (__printf__, int, - (const char *format, ...) + (const char *restrict format, ...) __asm__ (@ASM_SYMBOL_PREFIX@ _GL_STDIO_MACROEXPAND_AND_STRINGIZE(rpl_printf)) - _GL_ATTRIBUTE_FORMAT_PRINTF (1, 2) + _GL_ATTRIBUTE_FORMAT_PRINTF_STANDARD (1, 2) _GL_ARG_NONNULL ((1))); # else _GL_FUNCDECL_RPL_1 (__printf__, int, - (const char *format, ...) + (const char *restrict format, ...) __asm__ (@ASM_SYMBOL_PREFIX@ _GL_STDIO_MACROEXPAND_AND_STRINGIZE(rpl_printf)) _GL_ATTRIBUTE_FORMAT_PRINTF_SYSTEM (1, 2) @@ -894,16 +1051,18 @@ _GL_CXXALIAS_RPL_1 (printf, __printf__, int, (const char *format, ...)); # define printf rpl_printf # endif _GL_FUNCDECL_RPL (printf, int, - (const char *format, ...) - _GL_ATTRIBUTE_FORMAT_PRINTF (1, 2) + (const char *restrict format, ...) + _GL_ATTRIBUTE_FORMAT_PRINTF_STANDARD (1, 2) _GL_ARG_NONNULL ((1))); -_GL_CXXALIAS_RPL (printf, int, (const char *format, ...)); +_GL_CXXALIAS_RPL (printf, int, (const char *restrict format, ...)); # endif # define GNULIB_overrides_printf 1 # else -_GL_CXXALIAS_SYS (printf, int, (const char *format, ...)); +_GL_CXXALIAS_SYS (printf, int, (const char *restrict format, ...)); # endif +# if __GLIBC__ >= 2 _GL_CXXALIASWARN (printf); +# endif #endif #if !@GNULIB_PRINTF_POSIX@ && defined GNULIB_POSIXCHECK # if !GNULIB_overrides_printf @@ -926,7 +1085,9 @@ _GL_CXXALIAS_RPL_1 (putc, rpl_fputc, int, (int c, FILE *stream)); # else _GL_CXXALIAS_SYS (putc, int, (int c, FILE *stream)); # endif +# if __GLIBC__ >= 2 _GL_CXXALIASWARN (putc); +# endif #endif #if @GNULIB_PUTCHAR@ @@ -940,7 +1101,9 @@ _GL_CXXALIAS_RPL (putchar, int, (int c)); # else _GL_CXXALIAS_SYS (putchar, int, (int c)); # endif +# if __GLIBC__ >= 2 _GL_CXXALIASWARN (putchar); +# endif #endif #if @GNULIB_PUTS@ @@ -954,9 +1117,25 @@ _GL_CXXALIAS_RPL (puts, int, (const char *string)); # else _GL_CXXALIAS_SYS (puts, int, (const char *string)); # endif +# if __GLIBC__ >= 2 _GL_CXXALIASWARN (puts); +# endif #endif +/* On native Windows, map 'putw' to '_putw', so that -loldnames is not + required. In C++ with GNULIB_NAMESPACE, avoid differences between + platforms by defining GNULIB_NAMESPACE::putw always. */ +#if defined _WIN32 && !defined __CYGWIN__ +# if !(defined __cplusplus && defined GNULIB_NAMESPACE) +# undef putw +# define putw _putw +# endif +_GL_CXXALIAS_MDA (putw, int, (int w, FILE *restrict stream)); +#else +_GL_CXXALIAS_SYS (putw, int, (int w, FILE *restrict stream)); +#endif +_GL_CXXALIASWARN (putw); + #if @GNULIB_REMOVE@ # if @REPLACE_REMOVE@ # if !(defined __cplusplus && defined GNULIB_NAMESPACE) @@ -968,7 +1147,9 @@ _GL_CXXALIAS_RPL (remove, int, (const char *name)); # else _GL_CXXALIAS_SYS (remove, int, (const char *name)); # endif +# if __GLIBC__ >= 2 _GL_CXXALIASWARN (remove); +# endif #elif defined GNULIB_POSIXCHECK # undef remove /* Assume remove is always declared. */ @@ -991,7 +1172,9 @@ _GL_CXXALIAS_RPL (rename, int, _GL_CXXALIAS_SYS (rename, int, (const char *old_filename, const char *new_filename)); # endif +# if __GLIBC__ >= 2 _GL_CXXALIASWARN (rename); +# endif #elif defined GNULIB_POSIXCHECK # undef rename /* Assume rename is always declared. */ @@ -1030,33 +1213,35 @@ _GL_WARN_ON_USE (renameat, "renameat is not portable - " #if @GNULIB_SCANF@ # if @REPLACE_STDIO_READ_FUNCS@ && @GNULIB_STDIO_H_NONBLOCKING@ -# if defined __GNUC__ +# if defined __GNUC__ || defined __clang__ # if !(defined __cplusplus && defined GNULIB_NAMESPACE) # undef scanf /* Don't break __attribute__((format(scanf,M,N))). */ # define scanf __scanf__ # endif _GL_FUNCDECL_RPL_1 (__scanf__, int, - (const char *format, ...) + (const char *restrict format, ...) __asm__ (@ASM_SYMBOL_PREFIX@ _GL_STDIO_MACROEXPAND_AND_STRINGIZE(rpl_scanf)) _GL_ATTRIBUTE_FORMAT_SCANF_SYSTEM (1, 2) _GL_ARG_NONNULL ((1))); -_GL_CXXALIAS_RPL_1 (scanf, __scanf__, int, (const char *format, ...)); +_GL_CXXALIAS_RPL_1 (scanf, __scanf__, int, (const char *restrict format, ...)); # else # if !(defined __cplusplus && defined GNULIB_NAMESPACE) # undef scanf # define scanf rpl_scanf # endif -_GL_FUNCDECL_RPL (scanf, int, (const char *format, ...) +_GL_FUNCDECL_RPL (scanf, int, (const char *restrict format, ...) _GL_ATTRIBUTE_FORMAT_SCANF_SYSTEM (1, 2) _GL_ARG_NONNULL ((1))); -_GL_CXXALIAS_RPL (scanf, int, (const char *format, ...)); +_GL_CXXALIAS_RPL (scanf, int, (const char *restrict format, ...)); # endif # else -_GL_CXXALIAS_SYS (scanf, int, (const char *format, ...)); +_GL_CXXALIAS_SYS (scanf, int, (const char *restrict format, ...)); # endif +# if __GLIBC__ >= 2 _GL_CXXALIASWARN (scanf); +# endif #endif #if @GNULIB_SNPRINTF@ @@ -1065,22 +1250,28 @@ _GL_CXXALIASWARN (scanf); # define snprintf rpl_snprintf # endif _GL_FUNCDECL_RPL (snprintf, int, - (char *str, size_t size, const char *format, ...) - _GL_ATTRIBUTE_FORMAT_PRINTF (3, 4) + (char *restrict str, size_t size, + const char *restrict format, ...) + _GL_ATTRIBUTE_FORMAT_PRINTF_STANDARD (3, 4) _GL_ARG_NONNULL ((3))); _GL_CXXALIAS_RPL (snprintf, int, - (char *str, size_t size, const char *format, ...)); + (char *restrict str, size_t size, + const char *restrict format, ...)); # else # if !@HAVE_DECL_SNPRINTF@ _GL_FUNCDECL_SYS (snprintf, int, - (char *str, size_t size, const char *format, ...) - _GL_ATTRIBUTE_FORMAT_PRINTF (3, 4) + (char *restrict str, size_t size, + const char *restrict format, ...) + _GL_ATTRIBUTE_FORMAT_PRINTF_STANDARD (3, 4) _GL_ARG_NONNULL ((3))); # endif _GL_CXXALIAS_SYS (snprintf, int, - (char *str, size_t size, const char *format, ...)); + (char *restrict str, size_t size, + const char *restrict format, ...)); # endif +# if __GLIBC__ >= 2 _GL_CXXALIASWARN (snprintf); +# endif #elif defined GNULIB_POSIXCHECK # undef snprintf # if HAVE_RAW_DECL_SNPRINTF @@ -1103,14 +1294,19 @@ _GL_WARN_ON_USE (snprintf, "snprintf is unportable - " # if !(defined __cplusplus && defined GNULIB_NAMESPACE) # define sprintf rpl_sprintf # endif -_GL_FUNCDECL_RPL (sprintf, int, (char *str, const char *format, ...) - _GL_ATTRIBUTE_FORMAT_PRINTF (2, 3) - _GL_ARG_NONNULL ((1, 2))); -_GL_CXXALIAS_RPL (sprintf, int, (char *str, const char *format, ...)); +_GL_FUNCDECL_RPL (sprintf, int, + (char *restrict str, const char *restrict format, ...) + _GL_ATTRIBUTE_FORMAT_PRINTF_STANDARD (2, 3) + _GL_ARG_NONNULL ((1, 2))); +_GL_CXXALIAS_RPL (sprintf, int, + (char *restrict str, const char *restrict format, ...)); # else -_GL_CXXALIAS_SYS (sprintf, int, (char *str, const char *format, ...)); +_GL_CXXALIAS_SYS (sprintf, int, + (char *restrict str, const char *restrict format, ...)); # endif +# if __GLIBC__ >= 2 _GL_CXXALIASWARN (sprintf); +# endif #elif defined GNULIB_POSIXCHECK # undef sprintf /* Assume sprintf is always declared. */ @@ -1119,6 +1315,20 @@ _GL_WARN_ON_USE (sprintf, "sprintf is not always POSIX compliant - " "POSIX compliance"); #endif +/* On native Windows, map 'tempnam' to '_tempnam', so that -loldnames is not + required. In C++ with GNULIB_NAMESPACE, avoid differences between + platforms by defining GNULIB_NAMESPACE::tempnam always. */ +#if defined _WIN32 && !defined __CYGWIN__ +# if !(defined __cplusplus && defined GNULIB_NAMESPACE) +# undef tempnam +# define tempnam _tempnam +# endif +_GL_CXXALIAS_MDA (tempnam, char *, (const char *dir, const char *prefix)); +#else +_GL_CXXALIAS_SYS (tempnam, char *, (const char *dir, const char *prefix)); +#endif +_GL_CXXALIASWARN (tempnam); + #if @GNULIB_TMPFILE@ # if @REPLACE_TMPFILE@ # if !(defined __cplusplus && defined GNULIB_NAMESPACE) @@ -1129,7 +1339,9 @@ _GL_CXXALIAS_RPL (tmpfile, FILE *, (void)); # else _GL_CXXALIAS_SYS (tmpfile, FILE *, (void)); # endif +# if __GLIBC__ >= 2 _GL_CXXALIASWARN (tmpfile); +# endif #elif defined GNULIB_POSIXCHECK # undef tmpfile # if HAVE_RAW_DECL_TMPFILE @@ -1149,7 +1361,7 @@ _GL_WARN_ON_USE (tmpfile, "tmpfile is not usable on mingw - " # endif _GL_FUNCDECL_RPL (asprintf, int, (char **result, const char *format, ...) - _GL_ATTRIBUTE_FORMAT_PRINTF (2, 3) + _GL_ATTRIBUTE_FORMAT_PRINTF_STANDARD (2, 3) _GL_ARG_NONNULL ((1, 2))); _GL_CXXALIAS_RPL (asprintf, int, (char **result, const char *format, ...)); @@ -1157,7 +1369,7 @@ _GL_CXXALIAS_RPL (asprintf, int, # if !@HAVE_VASPRINTF@ _GL_FUNCDECL_SYS (asprintf, int, (char **result, const char *format, ...) - _GL_ATTRIBUTE_FORMAT_PRINTF (2, 3) + _GL_ATTRIBUTE_FORMAT_PRINTF_STANDARD (2, 3) _GL_ARG_NONNULL ((1, 2))); # endif _GL_CXXALIAS_SYS (asprintf, int, @@ -1170,7 +1382,7 @@ _GL_CXXALIASWARN (asprintf); # endif _GL_FUNCDECL_RPL (vasprintf, int, (char **result, const char *format, va_list args) - _GL_ATTRIBUTE_FORMAT_PRINTF (2, 0) + _GL_ATTRIBUTE_FORMAT_PRINTF_STANDARD (2, 0) _GL_ARG_NONNULL ((1, 2))); _GL_CXXALIAS_RPL (vasprintf, int, (char **result, const char *format, va_list args)); @@ -1178,7 +1390,7 @@ _GL_CXXALIAS_RPL (vasprintf, int, # if !@HAVE_VASPRINTF@ _GL_FUNCDECL_SYS (vasprintf, int, (char **result, const char *format, va_list args) - _GL_ATTRIBUTE_FORMAT_PRINTF (2, 0) + _GL_ATTRIBUTE_FORMAT_PRINTF_STANDARD (2, 0) _GL_ARG_NONNULL ((1, 2))); # endif _GL_CXXALIAS_SYS (vasprintf, int, @@ -1192,22 +1404,27 @@ _GL_CXXALIASWARN (vasprintf); # if !(defined __cplusplus && defined GNULIB_NAMESPACE) # define vdprintf rpl_vdprintf # endif -_GL_FUNCDECL_RPL (vdprintf, int, (int fd, const char *format, va_list args) - _GL_ATTRIBUTE_FORMAT_PRINTF (2, 0) - _GL_ARG_NONNULL ((2))); -_GL_CXXALIAS_RPL (vdprintf, int, (int fd, const char *format, va_list args)); +_GL_FUNCDECL_RPL (vdprintf, int, + (int fd, const char *restrict format, va_list args) + _GL_ATTRIBUTE_FORMAT_PRINTF_STANDARD (2, 0) + _GL_ARG_NONNULL ((2))); +_GL_CXXALIAS_RPL (vdprintf, int, + (int fd, const char *restrict format, va_list args)); # else # if !@HAVE_VDPRINTF@ -_GL_FUNCDECL_SYS (vdprintf, int, (int fd, const char *format, va_list args) - _GL_ATTRIBUTE_FORMAT_PRINTF (2, 0) - _GL_ARG_NONNULL ((2))); +_GL_FUNCDECL_SYS (vdprintf, int, + (int fd, const char *restrict format, va_list args) + _GL_ATTRIBUTE_FORMAT_PRINTF_STANDARD (2, 0) + _GL_ARG_NONNULL ((2))); # endif /* Need to cast, because on Solaris, the third parameter will likely be __va_list args. */ _GL_CXXALIAS_SYS_CAST (vdprintf, int, - (int fd, const char *format, va_list args)); + (int fd, const char *restrict format, va_list args)); # endif +# if __GLIBC__ >= 2 _GL_CXXALIASWARN (vdprintf); +# endif #elif defined GNULIB_POSIXCHECK # undef vdprintf # if HAVE_RAW_DECL_VDPRINTF @@ -1224,23 +1441,32 @@ _GL_WARN_ON_USE (vdprintf, "vdprintf is unportable - " # endif # define GNULIB_overrides_vfprintf 1 # if @GNULIB_VFPRINTF_POSIX@ -_GL_FUNCDECL_RPL (vfprintf, int, (FILE *fp, const char *format, va_list args) - _GL_ATTRIBUTE_FORMAT_PRINTF (2, 0) - _GL_ARG_NONNULL ((1, 2))); +_GL_FUNCDECL_RPL (vfprintf, int, + (FILE *restrict fp, + const char *restrict format, va_list args) + _GL_ATTRIBUTE_FORMAT_PRINTF_STANDARD (2, 0) + _GL_ARG_NONNULL ((1, 2))); # else -_GL_FUNCDECL_RPL (vfprintf, int, (FILE *fp, const char *format, va_list args) - _GL_ATTRIBUTE_FORMAT_PRINTF_SYSTEM (2, 0) - _GL_ARG_NONNULL ((1, 2))); +_GL_FUNCDECL_RPL (vfprintf, int, + (FILE *restrict fp, + const char *restrict format, va_list args) + _GL_ATTRIBUTE_FORMAT_PRINTF_SYSTEM (2, 0) + _GL_ARG_NONNULL ((1, 2))); # endif -_GL_CXXALIAS_RPL (vfprintf, int, (FILE *fp, const char *format, va_list args)); +_GL_CXXALIAS_RPL (vfprintf, int, + (FILE *restrict fp, + const char *restrict format, va_list args)); # else /* Need to cast, because on Solaris, the third parameter is __va_list args and GCC's fixincludes did not change this to __gnuc_va_list. */ _GL_CXXALIAS_SYS_CAST (vfprintf, int, - (FILE *fp, const char *format, va_list args)); + (FILE *restrict fp, + const char *restrict format, va_list args)); # endif +# if __GLIBC__ >= 2 _GL_CXXALIASWARN (vfprintf); +# endif #endif #if !@GNULIB_VFPRINTF_POSIX@ && defined GNULIB_POSIXCHECK # if !GNULIB_overrides_vfprintf @@ -1259,16 +1485,21 @@ _GL_WARN_ON_USE (vfprintf, "vfprintf is not always POSIX compliant - " # define vfscanf rpl_vfscanf # endif _GL_FUNCDECL_RPL (vfscanf, int, - (FILE *stream, const char *format, va_list args) + (FILE *restrict stream, + const char *restrict format, va_list args) _GL_ATTRIBUTE_FORMAT_SCANF_SYSTEM (2, 0) _GL_ARG_NONNULL ((1, 2))); _GL_CXXALIAS_RPL (vfscanf, int, - (FILE *stream, const char *format, va_list args)); + (FILE *restrict stream, + const char *restrict format, va_list args)); # else _GL_CXXALIAS_SYS (vfscanf, int, - (FILE *stream, const char *format, va_list args)); + (FILE *restrict stream, + const char *restrict format, va_list args)); # endif +# if __GLIBC__ >= 2 _GL_CXXALIASWARN (vfscanf); +# endif #endif #if @GNULIB_VPRINTF_POSIX@ || @GNULIB_VPRINTF@ @@ -1279,22 +1510,25 @@ _GL_CXXALIASWARN (vfscanf); # endif # define GNULIB_overrides_vprintf 1 # if @GNULIB_VPRINTF_POSIX@ || @GNULIB_VFPRINTF_POSIX@ -_GL_FUNCDECL_RPL (vprintf, int, (const char *format, va_list args) - _GL_ATTRIBUTE_FORMAT_PRINTF (1, 0) +_GL_FUNCDECL_RPL (vprintf, int, (const char *restrict format, va_list args) + _GL_ATTRIBUTE_FORMAT_PRINTF_STANDARD (1, 0) _GL_ARG_NONNULL ((1))); # else -_GL_FUNCDECL_RPL (vprintf, int, (const char *format, va_list args) +_GL_FUNCDECL_RPL (vprintf, int, (const char *restrict format, va_list args) _GL_ATTRIBUTE_FORMAT_PRINTF_SYSTEM (1, 0) _GL_ARG_NONNULL ((1))); # endif -_GL_CXXALIAS_RPL (vprintf, int, (const char *format, va_list args)); +_GL_CXXALIAS_RPL (vprintf, int, (const char *restrict format, va_list args)); # else /* Need to cast, because on Solaris, the second parameter is __va_list args and GCC's fixincludes did not change this to __gnuc_va_list. */ -_GL_CXXALIAS_SYS_CAST (vprintf, int, (const char *format, va_list args)); +_GL_CXXALIAS_SYS_CAST (vprintf, int, + (const char *restrict format, va_list args)); # endif +# if __GLIBC__ >= 2 _GL_CXXALIASWARN (vprintf); +# endif #endif #if !@GNULIB_VPRINTF_POSIX@ && defined GNULIB_POSIXCHECK # if !GNULIB_overrides_vprintf @@ -1312,14 +1546,16 @@ _GL_WARN_ON_USE (vprintf, "vprintf is not always POSIX compliant - " # undef vscanf # define vscanf rpl_vscanf # endif -_GL_FUNCDECL_RPL (vscanf, int, (const char *format, va_list args) +_GL_FUNCDECL_RPL (vscanf, int, (const char *restrict format, va_list args) _GL_ATTRIBUTE_FORMAT_SCANF_SYSTEM (1, 0) _GL_ARG_NONNULL ((1))); -_GL_CXXALIAS_RPL (vscanf, int, (const char *format, va_list args)); +_GL_CXXALIAS_RPL (vscanf, int, (const char *restrict format, va_list args)); # else -_GL_CXXALIAS_SYS (vscanf, int, (const char *format, va_list args)); +_GL_CXXALIAS_SYS (vscanf, int, (const char *restrict format, va_list args)); # endif +# if __GLIBC__ >= 2 _GL_CXXALIASWARN (vscanf); +# endif #endif #if @GNULIB_VSNPRINTF@ @@ -1328,22 +1564,28 @@ _GL_CXXALIASWARN (vscanf); # define vsnprintf rpl_vsnprintf # endif _GL_FUNCDECL_RPL (vsnprintf, int, - (char *str, size_t size, const char *format, va_list args) - _GL_ATTRIBUTE_FORMAT_PRINTF (3, 0) + (char *restrict str, size_t size, + const char *restrict format, va_list args) + _GL_ATTRIBUTE_FORMAT_PRINTF_STANDARD (3, 0) _GL_ARG_NONNULL ((3))); _GL_CXXALIAS_RPL (vsnprintf, int, - (char *str, size_t size, const char *format, va_list args)); + (char *restrict str, size_t size, + const char *restrict format, va_list args)); # else # if !@HAVE_DECL_VSNPRINTF@ _GL_FUNCDECL_SYS (vsnprintf, int, - (char *str, size_t size, const char *format, va_list args) - _GL_ATTRIBUTE_FORMAT_PRINTF (3, 0) + (char *restrict str, size_t size, + const char *restrict format, va_list args) + _GL_ATTRIBUTE_FORMAT_PRINTF_STANDARD (3, 0) _GL_ARG_NONNULL ((3))); # endif _GL_CXXALIAS_SYS (vsnprintf, int, - (char *str, size_t size, const char *format, va_list args)); + (char *restrict str, size_t size, + const char *restrict format, va_list args)); # endif +# if __GLIBC__ >= 2 _GL_CXXALIASWARN (vsnprintf); +# endif #elif defined GNULIB_POSIXCHECK # undef vsnprintf # if HAVE_RAW_DECL_VSNPRINTF @@ -1358,19 +1600,24 @@ _GL_WARN_ON_USE (vsnprintf, "vsnprintf is unportable - " # define vsprintf rpl_vsprintf # endif _GL_FUNCDECL_RPL (vsprintf, int, - (char *str, const char *format, va_list args) - _GL_ATTRIBUTE_FORMAT_PRINTF (2, 0) + (char *restrict str, + const char *restrict format, va_list args) + _GL_ATTRIBUTE_FORMAT_PRINTF_STANDARD (2, 0) _GL_ARG_NONNULL ((1, 2))); _GL_CXXALIAS_RPL (vsprintf, int, - (char *str, const char *format, va_list args)); + (char *restrict str, + const char *restrict format, va_list args)); # else /* Need to cast, because on Solaris, the third parameter is __va_list args and GCC's fixincludes did not change this to __gnuc_va_list. */ _GL_CXXALIAS_SYS_CAST (vsprintf, int, - (char *str, const char *format, va_list args)); + (char *restrict str, + const char *restrict format, va_list args)); # endif +# if __GLIBC__ >= 2 _GL_CXXALIASWARN (vsprintf); +# endif #elif defined GNULIB_POSIXCHECK # undef vsprintf /* Assume vsprintf is always declared. */ diff --git a/lib/stdlib.in.h b/lib/stdlib.in.h index f829525..a76fbdc 100644 --- a/lib/stdlib.in.h +++ b/lib/stdlib.in.h @@ -1,6 +1,6 @@ /* A GNU-like . - Copyright (C) 1995, 2001-2004, 2006-2019 Free Software Foundation, Inc. + Copyright (C) 1995, 2001-2004, 2006-2020 Free Software Foundation, Inc. This program is free software: you can redistribute it and/or modify it under the terms of the GNU General Public License as published by @@ -53,8 +53,8 @@ # include #endif -/* Native Windows platforms declare mktemp() in . */ -#if 0 && (defined _WIN32 && ! defined __CYGWIN__) +/* Native Windows platforms declare _mktemp() in . */ +#if defined _WIN32 && !defined __CYGWIN__ # include #endif @@ -101,10 +101,12 @@ struct random_data /* The __attribute__ feature is available in gcc versions 2.5 and later. The attribute __pure__ was added in gcc 2.96. */ -#if __GNUC__ > 2 || (__GNUC__ == 2 && __GNUC_MINOR__ >= 96) -# define _GL_ATTRIBUTE_PURE __attribute__ ((__pure__)) -#else -# define _GL_ATTRIBUTE_PURE /* empty */ +#ifndef _GL_ATTRIBUTE_PURE +# if __GNUC__ > 2 || (__GNUC__ == 2 && __GNUC_MINOR__ >= 96) || defined __clang__ +# define _GL_ATTRIBUTE_PURE __attribute__ ((__pure__)) +# else +# define _GL_ATTRIBUTE_PURE /* empty */ +# endif #endif /* The definition of _Noreturn is copied here. */ @@ -147,6 +149,31 @@ _GL_WARN_ON_USE (_Exit, "_Exit is unportable - " #endif +/* Allocate memory with indefinite extent and specified alignment. */ +#if @GNULIB_ALIGNED_ALLOC@ +# if @REPLACE_ALIGNED_ALLOC@ +# if !(defined __cplusplus && defined GNULIB_NAMESPACE) +# undef aligned_alloc +# define aligned_alloc rpl_aligned_alloc +# endif +_GL_FUNCDECL_RPL (aligned_alloc, void *, (size_t alignment, size_t size)); +_GL_CXXALIAS_RPL (aligned_alloc, void *, (size_t alignment, size_t size)); +# else +# if @HAVE_ALIGNED_ALLOC@ +_GL_CXXALIAS_SYS (aligned_alloc, void *, (size_t alignment, size_t size)); +# endif +# endif +# if @HAVE_ALIGNED_ALLOC@ +_GL_CXXALIASWARN (aligned_alloc); +# endif +#elif defined GNULIB_POSIXCHECK +# undef aligned_alloc +# if HAVE_RAW_DECL_ALIGNED_ALLOC +_GL_WARN_ON_USE (aligned_alloc, "aligned_alloc is not portable - " + "use gnulib module aligned_alloc for portability"); +# endif +#endif + #if @GNULIB_ATOLL@ /* Parse a signed decimal integer. Returns the value of the integer. Errors are not detected. */ @@ -176,7 +203,9 @@ _GL_CXXALIAS_RPL (calloc, void *, (size_t nmemb, size_t size)); # else _GL_CXXALIAS_SYS (calloc, void *, (size_t nmemb, size_t size)); # endif +# if __GLIBC__ >= 2 _GL_CXXALIASWARN (calloc); +# endif #elif defined GNULIB_POSIXCHECK # undef calloc /* Assume calloc is always declared. */ @@ -199,6 +228,10 @@ _GL_FUNCDECL_SYS (canonicalize_file_name, char *, (const char *name) # endif _GL_CXXALIAS_SYS (canonicalize_file_name, char *, (const char *name)); # endif +# ifndef GNULIB_defined_canonicalize_file_name +# define GNULIB_defined_canonicalize_file_name \ + (!@HAVE_CANONICALIZE_FILE_NAME@ || @REPLACE_CANONICALIZE_FILE_NAME@) +# endif _GL_CXXALIASWARN (canonicalize_file_name); #elif defined GNULIB_POSIXCHECK # undef canonicalize_file_name @@ -209,6 +242,67 @@ _GL_WARN_ON_USE (canonicalize_file_name, # endif #endif +/* On native Windows, map 'ecvt' to '_ecvt', so that -loldnames is not + required. In C++ with GNULIB_NAMESPACE, avoid differences between + platforms by defining GNULIB_NAMESPACE::ecvt on all platforms that have + it. */ +#if defined _WIN32 && !defined __CYGWIN__ +# if !(defined __cplusplus && defined GNULIB_NAMESPACE) +# undef ecvt +# define ecvt _ecvt +# endif +_GL_CXXALIAS_MDA (ecvt, char *, + (double number, int ndigits, int *decptp, int *signp)); +#else +# if @HAVE_DECL_ECVT@ +_GL_CXXALIAS_SYS (ecvt, char *, + (double number, int ndigits, int *decptp, int *signp)); +# endif +#endif +#if (defined _WIN32 && !defined __CYGWIN__) || @HAVE_DECL_ECVT@ +_GL_CXXALIASWARN (ecvt); +#endif + +/* On native Windows, map 'fcvt' to '_fcvt', so that -loldnames is not + required. In C++ with GNULIB_NAMESPACE, avoid differences between + platforms by defining GNULIB_NAMESPACE::fcvt on all platforms that have + it. */ +#if defined _WIN32 && !defined __CYGWIN__ +# if !(defined __cplusplus && defined GNULIB_NAMESPACE) +# undef fcvt +# define fcvt _fcvt +# endif +_GL_CXXALIAS_MDA (fcvt, char *, + (double number, int ndigits, int *decptp, int *signp)); +#else +# if @HAVE_DECL_FCVT@ +_GL_CXXALIAS_SYS (fcvt, char *, + (double number, int ndigits, int *decptp, int *signp)); +# endif +#endif +#if (defined _WIN32 && !defined __CYGWIN__) || @HAVE_DECL_FCVT@ +_GL_CXXALIASWARN (fcvt); +#endif + +/* On native Windows, map 'gcvt' to '_gcvt', so that -loldnames is not + required. In C++ with GNULIB_NAMESPACE, avoid differences between + platforms by defining GNULIB_NAMESPACE::gcvt on all platforms that have + it. */ +#if defined _WIN32 && !defined __CYGWIN__ +# if !(defined __cplusplus && defined GNULIB_NAMESPACE) +# undef gcvt +# define gcvt _gcvt +# endif +_GL_CXXALIAS_MDA (gcvt, char *, (double number, int ndigits, char *buf)); +#else +# if @HAVE_DECL_GCVT@ +_GL_CXXALIAS_SYS (gcvt, char *, (double number, int ndigits, char *buf)); +# endif +#endif +#if (defined _WIN32 && !defined __CYGWIN__) || @HAVE_DECL_GCVT@ +_GL_CXXALIASWARN (gcvt); +#endif + #if @GNULIB_GETLOADAVG@ /* Store max(NELEM,3) load average numbers in LOADAVG[]. The three numbers are the load average of the last 1 minute, the last 5 @@ -238,8 +332,8 @@ _GL_WARN_ON_USE (getloadavg, "getloadavg is not portable - " element (or NULL if it doesn't contain an "=" sign), - It returns the index of the "token" in the given array of tokens. Otherwise it returns -1, and *OPTIONP and *VALUEP are undefined. - For more details see the POSIX:2001 specification. - http://www.opengroup.org/susv3xsh/getsubopt.html */ + For more details see the POSIX specification. + https://pubs.opengroup.org/onlinepubs/9699919799/functions/getsubopt.html */ # if !@HAVE_GETSUBOPT@ _GL_FUNCDECL_SYS (getsubopt, int, (char **optionp, char *const *tokens, char **valuep) @@ -288,7 +382,9 @@ _GL_CXXALIAS_RPL (malloc, void *, (size_t size)); # else _GL_CXXALIAS_SYS (malloc, void *, (size_t size)); # endif +# if __GLIBC__ >= 2 _GL_CXXALIASWARN (malloc); +# endif #elif defined GNULIB_POSIXCHECK && !_GL_USE_STDLIB_ALLOC # undef malloc /* Assume malloc is always declared. */ @@ -303,15 +399,21 @@ _GL_WARN_ON_USE (malloc, "malloc is not POSIX compliant everywhere - " # undef mbtowc # define mbtowc rpl_mbtowc # endif -_GL_FUNCDECL_RPL (mbtowc, int, (wchar_t *pwc, const char *s, size_t n)); -_GL_CXXALIAS_RPL (mbtowc, int, (wchar_t *pwc, const char *s, size_t n)); +_GL_FUNCDECL_RPL (mbtowc, int, + (wchar_t *restrict pwc, const char *restrict s, size_t n)); +_GL_CXXALIAS_RPL (mbtowc, int, + (wchar_t *restrict pwc, const char *restrict s, size_t n)); # else # if !@HAVE_MBTOWC@ -_GL_FUNCDECL_SYS (mbtowc, int, (wchar_t *pwc, const char *s, size_t n)); +_GL_FUNCDECL_SYS (mbtowc, int, + (wchar_t *restrict pwc, const char *restrict s, size_t n)); # endif -_GL_CXXALIAS_SYS (mbtowc, int, (wchar_t *pwc, const char *s, size_t n)); +_GL_CXXALIAS_SYS (mbtowc, int, + (wchar_t *restrict pwc, const char *restrict s, size_t n)); # endif +# if __GLIBC__ >= 2 _GL_CXXALIASWARN (mbtowc); +# endif #elif defined GNULIB_POSIXCHECK # undef mbtowc # if HAVE_RAW_DECL_MBTOWC @@ -452,6 +554,49 @@ _GL_WARN_ON_USE (mkstemps, "mkstemps is unportable - " # endif #endif +/* On native Windows, map 'mktemp' to '_mktemp', so that -loldnames is not + required. In C++ with GNULIB_NAMESPACE, avoid differences between + platforms by defining GNULIB_NAMESPACE::mktemp always. */ +#if defined _WIN32 && !defined __CYGWIN__ +# if !(defined __cplusplus && defined GNULIB_NAMESPACE) +# undef mktemp +# define mktemp _mktemp +# endif +_GL_CXXALIAS_MDA (mktemp, char *, (char * /*template*/)); +#else +_GL_CXXALIAS_SYS (mktemp, char *, (char * /*template*/)); +#endif +_GL_CXXALIASWARN (mktemp); + +/* Allocate memory with indefinite extent and specified alignment. */ +#if @GNULIB_POSIX_MEMALIGN@ +# if @REPLACE_POSIX_MEMALIGN@ +# if !(defined __cplusplus && defined GNULIB_NAMESPACE) +# undef posix_memalign +# define posix_memalign rpl_posix_memalign +# endif +_GL_FUNCDECL_RPL (posix_memalign, int, + (void **memptr, size_t alignment, size_t size) + _GL_ARG_NONNULL ((1))); +_GL_CXXALIAS_RPL (posix_memalign, int, + (void **memptr, size_t alignment, size_t size)); +# else +# if @HAVE_POSIX_MEMALIGN@ +_GL_CXXALIAS_SYS (posix_memalign, int, + (void **memptr, size_t alignment, size_t size)); +# endif +# endif +# if @HAVE_POSIX_MEMALIGN@ +_GL_CXXALIASWARN (posix_memalign); +# endif +#elif defined GNULIB_POSIXCHECK +# undef posix_memalign +# if HAVE_RAW_DECL_POSIX_MEMALIGN +_GL_WARN_ON_USE (posix_memalign, "posix_memalign is not portable - " + "use gnulib module posix_memalign for portability"); +# endif +#endif + #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. */ @@ -510,6 +655,9 @@ _GL_FUNCDECL_SYS (ptsname_r, int, (int fd, char *buf, size_t len)); # endif _GL_CXXALIAS_SYS (ptsname_r, int, (int fd, char *buf, size_t len)); # endif +# ifndef GNULIB_defined_ptsname_r +# define GNULIB_defined_ptsname_r (!@HAVE_PTSNAME_R@ || @REPLACE_PTSNAME_R@) +# endif _GL_CXXALIASWARN (ptsname_r); #elif defined GNULIB_POSIXCHECK # undef ptsname_r @@ -527,6 +675,28 @@ _GL_WARN_ON_USE (ptsname_r, "ptsname_r is not portable - " # endif _GL_FUNCDECL_RPL (putenv, int, (char *string) _GL_ARG_NONNULL ((1))); _GL_CXXALIAS_RPL (putenv, int, (char *string)); +# elif defined _WIN32 && !defined __CYGWIN__ +# if !(defined __cplusplus && defined GNULIB_NAMESPACE) +# undef putenv +# define putenv _putenv +# endif +_GL_CXXALIAS_MDA (putenv, int, (char *string)); +# else +_GL_CXXALIAS_SYS (putenv, int, (char *string)); +# endif +_GL_CXXALIASWARN (putenv); +#else +/* On native Windows, map 'putenv' to '_putenv', so that -loldnames is not + required. In C++ with GNULIB_NAMESPACE, avoid differences between + platforms by defining GNULIB_NAMESPACE::putenv always. */ +# if defined _WIN32 && !defined __CYGWIN__ +# if !(defined __cplusplus && defined GNULIB_NAMESPACE) +# undef putenv +# define putenv _putenv +# endif +/* Need to cast, because on mingw, the parameter is either + 'const char *string' or 'char *string'. */ +_GL_CXXALIAS_MDA_CAST (putenv, int, (char *string)); # else _GL_CXXALIAS_SYS (putenv, int, (char *string)); # endif @@ -593,7 +763,9 @@ _GL_CXXALIAS_RPL (random, long, (void)); # if !@HAVE_RANDOM@ _GL_FUNCDECL_SYS (random, long, (void)); # endif -_GL_CXXALIAS_SYS (random, long, (void)); +/* Need to cast, because on Haiku, the return type is + int. */ +_GL_CXXALIAS_SYS_CAST (random, long, (void)); # endif _GL_CXXALIASWARN (random); #elif defined GNULIB_POSIXCHECK @@ -616,7 +788,9 @@ _GL_CXXALIAS_RPL (srandom, void, (unsigned int seed)); # if !@HAVE_RANDOM@ _GL_FUNCDECL_SYS (srandom, void, (unsigned int seed)); # endif -_GL_CXXALIAS_SYS (srandom, void, (unsigned int seed)); +/* Need to cast, because on FreeBSD, the first parameter is + unsigned long seed. */ +_GL_CXXALIAS_SYS_CAST (srandom, void, (unsigned int seed)); # endif _GL_CXXALIASWARN (srandom); #elif defined GNULIB_POSIXCHECK @@ -644,8 +818,10 @@ _GL_FUNCDECL_SYS (initstate, char *, (unsigned int seed, char *buf, size_t buf_size) _GL_ARG_NONNULL ((2))); # endif -_GL_CXXALIAS_SYS (initstate, char *, - (unsigned int seed, char *buf, size_t buf_size)); +/* Need to cast, because on FreeBSD, the first parameter is + unsigned long seed. */ +_GL_CXXALIAS_SYS_CAST (initstate, char *, + (unsigned int seed, char *buf, size_t buf_size)); # endif _GL_CXXALIASWARN (initstate); #elif defined GNULIB_POSIXCHECK @@ -668,7 +844,9 @@ _GL_CXXALIAS_RPL (setstate, char *, (char *arg_state)); # if !@HAVE_SETSTATE@ || !@HAVE_DECL_SETSTATE@ _GL_FUNCDECL_SYS (setstate, char *, (char *arg_state) _GL_ARG_NONNULL ((1))); # endif -_GL_CXXALIAS_SYS (setstate, char *, (char *arg_state)); +/* Need to cast, because on Mac OS X 10.13, HP-UX, Solaris the first parameter + is const char *arg_state. */ +_GL_CXXALIAS_SYS_CAST (setstate, char *, (char *arg_state)); # endif _GL_CXXALIASWARN (setstate); #elif defined GNULIB_POSIXCHECK @@ -754,9 +932,11 @@ _GL_FUNCDECL_SYS (initstate_r, int, struct random_data *rand_state) _GL_ARG_NONNULL ((2, 4))); # endif -_GL_CXXALIAS_SYS (initstate_r, int, - (unsigned int seed, char *buf, size_t buf_size, - struct random_data *rand_state)); +/* Need to cast, because on Haiku, the third parameter is + unsigned long buf_size. */ +_GL_CXXALIAS_SYS_CAST (initstate_r, int, + (unsigned int seed, char *buf, size_t buf_size, + struct random_data *rand_state)); # endif _GL_CXXALIASWARN (initstate_r); #elif defined GNULIB_POSIXCHECK @@ -784,8 +964,10 @@ _GL_FUNCDECL_SYS (setstate_r, int, (char *arg_state, struct random_data *rand_state) _GL_ARG_NONNULL ((1, 2))); # endif -_GL_CXXALIAS_SYS (setstate_r, int, - (char *arg_state, struct random_data *rand_state)); +/* Need to cast, because on Haiku, the first parameter is + void *arg_state. */ +_GL_CXXALIAS_SYS_CAST (setstate_r, int, + (char *arg_state, struct random_data *rand_state)); # endif _GL_CXXALIASWARN (setstate_r); #elif defined GNULIB_POSIXCHECK @@ -809,7 +991,9 @@ _GL_CXXALIAS_RPL (realloc, void *, (void *ptr, size_t size)); # else _GL_CXXALIAS_SYS (realloc, void *, (void *ptr, size_t size)); # endif +# if __GLIBC__ >= 2 _GL_CXXALIASWARN (realloc); +# endif #elif defined GNULIB_POSIXCHECK && !_GL_USE_STDLIB_ALLOC # undef realloc /* Assume realloc is always declared. */ @@ -839,15 +1023,19 @@ _GL_WARN_ON_USE (reallocarray, "reallocarray is not portable - " # if !(defined __cplusplus && defined GNULIB_NAMESPACE) # define realpath rpl_realpath # endif -_GL_FUNCDECL_RPL (realpath, char *, (const char *name, char *resolved) - _GL_ARG_NONNULL ((1))); -_GL_CXXALIAS_RPL (realpath, char *, (const char *name, char *resolved)); +_GL_FUNCDECL_RPL (realpath, char *, + (const char *restrict name, char *restrict resolved) + _GL_ARG_NONNULL ((1))); +_GL_CXXALIAS_RPL (realpath, char *, + (const char *restrict name, char *restrict resolved)); # else # if !@HAVE_REALPATH@ -_GL_FUNCDECL_SYS (realpath, char *, (const char *name, char *resolved) - _GL_ARG_NONNULL ((1))); +_GL_FUNCDECL_SYS (realpath, char *, + (const char *restrict name, char *restrict resolved) + _GL_ARG_NONNULL ((1))); # endif -_GL_CXXALIAS_SYS (realpath, char *, (const char *name, char *resolved)); +_GL_CXXALIAS_SYS (realpath, char *, + (const char *restrict name, char *restrict resolved)); # endif _GL_CXXALIASWARN (realpath); #elif defined GNULIB_POSIXCHECK @@ -930,17 +1118,23 @@ _GL_WARN_ON_USE (setenv, "setenv is unportable - " # define strtod rpl_strtod # endif # define GNULIB_defined_strtod_function 1 -_GL_FUNCDECL_RPL (strtod, double, (const char *str, char **endp) - _GL_ARG_NONNULL ((1))); -_GL_CXXALIAS_RPL (strtod, double, (const char *str, char **endp)); +_GL_FUNCDECL_RPL (strtod, double, + (const char *restrict str, char **restrict endp) + _GL_ARG_NONNULL ((1))); +_GL_CXXALIAS_RPL (strtod, double, + (const char *restrict str, char **restrict endp)); # else # if !@HAVE_STRTOD@ -_GL_FUNCDECL_SYS (strtod, double, (const char *str, char **endp) - _GL_ARG_NONNULL ((1))); +_GL_FUNCDECL_SYS (strtod, double, + (const char *restrict str, char **restrict endp) + _GL_ARG_NONNULL ((1))); # endif -_GL_CXXALIAS_SYS (strtod, double, (const char *str, char **endp)); +_GL_CXXALIAS_SYS (strtod, double, + (const char *restrict str, char **restrict endp)); # endif +# if __GLIBC__ >= 2 _GL_CXXALIASWARN (strtod); +# endif #elif defined GNULIB_POSIXCHECK # undef strtod # if HAVE_RAW_DECL_STRTOD @@ -956,15 +1150,19 @@ _GL_WARN_ON_USE (strtod, "strtod is unportable - " # define strtold rpl_strtold # endif # define GNULIB_defined_strtold_function 1 -_GL_FUNCDECL_RPL (strtold, long double, (const char *str, char **endp) - _GL_ARG_NONNULL ((1))); -_GL_CXXALIAS_RPL (strtold, long double, (const char *str, char **endp)); +_GL_FUNCDECL_RPL (strtold, long double, + (const char *restrict str, char **restrict endp) + _GL_ARG_NONNULL ((1))); +_GL_CXXALIAS_RPL (strtold, long double, + (const char *restrict str, char **restrict endp)); # else # if !@HAVE_STRTOLD@ -_GL_FUNCDECL_SYS (strtold, long double, (const char *str, char **endp) - _GL_ARG_NONNULL ((1))); +_GL_FUNCDECL_SYS (strtold, long double, + (const char *restrict str, char **restrict endp) + _GL_ARG_NONNULL ((1))); # endif -_GL_CXXALIAS_SYS (strtold, long double, (const char *str, char **endp)); +_GL_CXXALIAS_SYS (strtold, long double, + (const char *restrict str, char **restrict endp)); # endif _GL_CXXALIASWARN (strtold); #elif defined GNULIB_POSIXCHECK @@ -986,11 +1184,13 @@ _GL_WARN_ON_USE (strtold, "strtold is unportable - " to ERANGE. */ # if !@HAVE_STRTOLL@ _GL_FUNCDECL_SYS (strtoll, long long, - (const char *string, char **endptr, int base) + (const char *restrict string, char **restrict endptr, + int base) _GL_ARG_NONNULL ((1))); # endif _GL_CXXALIAS_SYS (strtoll, long long, - (const char *string, char **endptr, int base)); + (const char *restrict string, char **restrict endptr, + int base)); _GL_CXXALIASWARN (strtoll); #elif defined GNULIB_POSIXCHECK # undef strtoll @@ -1011,11 +1211,13 @@ _GL_WARN_ON_USE (strtoll, "strtoll is unportable - " ERANGE. */ # if !@HAVE_STRTOULL@ _GL_FUNCDECL_SYS (strtoull, unsigned long long, - (const char *string, char **endptr, int base) + (const char *restrict string, char **restrict endptr, + int base) _GL_ARG_NONNULL ((1))); # endif _GL_CXXALIAS_SYS (strtoull, unsigned long long, - (const char *string, char **endptr, int base)); + (const char *restrict string, char **restrict endptr, + int base)); _GL_CXXALIASWARN (strtoull); #elif defined GNULIB_POSIXCHECK # undef strtoull @@ -1079,7 +1281,9 @@ _GL_CXXALIAS_RPL (wctomb, int, (char *s, wchar_t wc)); # else _GL_CXXALIAS_SYS (wctomb, int, (char *s, wchar_t wc)); # endif +# if __GLIBC__ >= 2 _GL_CXXALIASWARN (wctomb); +# endif #endif diff --git a/lib/strdup.c b/lib/strdup.c index 717cf65..4da6007 100644 --- a/lib/strdup.c +++ b/lib/strdup.c @@ -1,4 +1,4 @@ -/* Copyright (C) 1991, 1996-1998, 2002-2004, 2006-2007, 2009-2019 Free Software +/* Copyright (C) 1991, 1996-1998, 2002-2004, 2006-2007, 2009-2020 Free Software Foundation, Inc. This file is part of the GNU C Library. diff --git a/lib/streq.h b/lib/streq.h index 326537b..586f051 100644 --- a/lib/streq.h +++ b/lib/streq.h @@ -1,5 +1,5 @@ /* Optimized string comparison. - Copyright (C) 2001-2002, 2007, 2009-2019 Free Software Foundation, Inc. + Copyright (C) 2001-2002, 2007, 2009-2020 Free Software Foundation, Inc. This program is free software: you can redistribute it and/or modify it under the terms of the GNU General Public License as published @@ -29,7 +29,7 @@ /* Help GCC to generate good code for string comparisons with immediate strings. */ -#if defined (__GNUC__) && defined (__OPTIMIZE__) +#if (defined __GNUC__ || defined __clang__) && defined __OPTIMIZE__ static inline int streq9 (const char *s1, const char *s2) diff --git a/lib/strerror-override.c b/lib/strerror-override.c index 558a010..61b7689 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-2019 Free Software Foundation, Inc. + Copyright (C) 2010-2020 Free Software Foundation, Inc. This 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/strerror-override.h b/lib/strerror-override.h index 255febc..062f51c 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-2019 Free Software Foundation, Inc. + Copyright (C) 2010-2020 Free Software Foundation, Inc. This 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/strerror.c b/lib/strerror.c index f5900fd..1a53a8b 100644 --- a/lib/strerror.c +++ b/lib/strerror.c @@ -1,6 +1,6 @@ /* strerror.c --- POSIX compatible system error routine - Copyright (C) 2007-2019 Free Software Foundation, Inc. + Copyright (C) 2007-2020 Free Software Foundation, Inc. This 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/string.in.h b/lib/string.in.h index 4a9292f..e93bb2b 100644 --- a/lib/string.in.h +++ b/lib/string.in.h @@ -1,6 +1,6 @@ /* A GNU-like . - Copyright (C) 1995-1996, 2001-2019 Free Software Foundation, Inc. + Copyright (C) 1995-1996, 2001-2020 Free Software Foundation, Inc. This program is free software; you can redistribute it and/or modify it under the terms of the GNU General Public License as published by @@ -54,10 +54,12 @@ /* The __attribute__ feature is available in gcc versions 2.5 and later. The attribute __pure__ was added in gcc 2.96. */ -#if __GNUC__ > 2 || (__GNUC__ == 2 && __GNUC_MINOR__ >= 96) -# define _GL_ATTRIBUTE_PURE __attribute__ ((__pure__)) -#else -# define _GL_ATTRIBUTE_PURE /* empty */ +#ifndef _GL_ATTRIBUTE_PURE +# if __GNUC__ > 2 || (__GNUC__ == 2 && __GNUC_MINOR__ >= 96) || defined __clang__ +# define _GL_ATTRIBUTE_PURE __attribute__ ((__pure__)) +# else +# define _GL_ATTRIBUTE_PURE /* empty */ +# endif #endif /* NetBSD 5.0 declares strsignal in , not in . */ @@ -121,6 +123,23 @@ _GL_WARN_ON_USE (ffsll, "ffsll is not portable - use the ffsll module"); #endif +/* On native Windows, map 'memccpy' to '_memccpy', so that -loldnames is not + required. In C++ with GNULIB_NAMESPACE, avoid differences between + platforms by defining GNULIB_NAMESPACE::memccpy always. */ +#if defined _WIN32 && !defined __CYGWIN__ +# if !(defined __cplusplus && defined GNULIB_NAMESPACE) +# undef memccpy +# define memccpy _memccpy +# endif +_GL_CXXALIAS_MDA (memccpy, void *, + (void *dest, const void *src, int c, size_t n)); +#else +_GL_CXXALIAS_SYS (memccpy, void *, + (void *dest, const void *src, int c, size_t n)); +#endif +_GL_CXXALIASWARN (memccpy); + + /* Return the first instance of C within N bytes of S, or NULL. */ #if @GNULIB_MEMCHR@ # if @REPLACE_MEMCHR@ @@ -132,11 +151,6 @@ _GL_FUNCDECL_RPL (memchr, void *, (void const *__s, int __c, size_t __n) _GL_ARG_NONNULL ((1))); _GL_CXXALIAS_RPL (memchr, void *, (void const *__s, int __c, size_t __n)); # else -# if ! @HAVE_MEMCHR@ -_GL_FUNCDECL_SYS (memchr, void *, (void const *__s, int __c, size_t __n) - _GL_ATTRIBUTE_PURE - _GL_ARG_NONNULL ((1))); -# endif /* On some systems, this function is defined as an overloaded function: extern "C" { const void * std::memchr (const void *, int, size_t); } extern "C++" { void * std::memchr (void *, int, size_t); } */ @@ -149,7 +163,7 @@ _GL_CXXALIAS_SYS_CAST2 (memchr, _GL_CXXALIASWARN1 (memchr, void *, (void *__s, int __c, size_t __n)); _GL_CXXALIASWARN1 (memchr, void const *, (void const *__s, int __c, size_t __n)); -# else +# elif __GLIBC__ >= 2 _GL_CXXALIASWARN (memchr); # endif #elif defined GNULIB_POSIXCHECK @@ -332,9 +346,11 @@ _GL_WARN_ON_USE (stpncpy, "stpncpy is unportable - " GB18030 and the character to be searched is a digit. */ # undef strchr /* Assume strchr is always declared. */ -_GL_WARN_ON_USE (strchr, "strchr cannot work correctly on character strings " - "in some multibyte locales - " - "use mbschr if you care about internationalization"); +_GL_WARN_ON_USE_CXX (strchr, + const char *, char *, (const char *, int), + "strchr cannot work correctly on character strings " + "in some multibyte locales - " + "use mbschr if you care about internationalization"); #endif /* Find the first occurrence of C in S or the final NUL byte. */ @@ -385,6 +401,12 @@ _GL_WARN_ON_USE (strchrnul, "strchrnul is unportable - " # endif _GL_FUNCDECL_RPL (strdup, char *, (char const *__s) _GL_ARG_NONNULL ((1))); _GL_CXXALIAS_RPL (strdup, char *, (char const *__s)); +# elif defined _WIN32 && !defined __CYGWIN__ +# if !(defined __cplusplus && defined GNULIB_NAMESPACE) +# undef strdup +# define strdup _strdup +# endif +_GL_CXXALIAS_MDA (strdup, char *, (char const *__s)); # else # if defined __cplusplus && defined GNULIB_NAMESPACE && defined strdup /* strdup exists as a function and as a macro. Get rid of the macro. */ @@ -402,6 +424,23 @@ _GL_CXXALIASWARN (strdup); _GL_WARN_ON_USE (strdup, "strdup is unportable - " "use gnulib module strdup for portability"); # endif +#else +/* On native Windows, map 'creat' to '_creat', so that -loldnames is not + required. In C++ with GNULIB_NAMESPACE, avoid differences between + platforms by defining GNULIB_NAMESPACE::creat always. */ +# if defined _WIN32 && !defined __CYGWIN__ +# if !(defined __cplusplus && defined GNULIB_NAMESPACE) +# undef strdup +# define strdup _strdup +# endif +_GL_CXXALIAS_MDA (strdup, char *, (char const *__s)); +# else +# if defined __cplusplus && defined GNULIB_NAMESPACE && defined strdup +# undef strdup +# endif +_GL_CXXALIAS_SYS (strdup, char *, (char const *__s)); +# endif +_GL_CXXALIASWARN (strdup); #endif /* Append no more than N characters from SRC onto DEST. */ @@ -411,13 +450,18 @@ _GL_WARN_ON_USE (strdup, "strdup is unportable - " # undef strncat # define strncat rpl_strncat # endif -_GL_FUNCDECL_RPL (strncat, char *, (char *dest, const char *src, size_t n) - _GL_ARG_NONNULL ((1, 2))); -_GL_CXXALIAS_RPL (strncat, char *, (char *dest, const char *src, size_t n)); +_GL_FUNCDECL_RPL (strncat, char *, + (char *restrict dest, const char *restrict src, size_t n) + _GL_ARG_NONNULL ((1, 2))); +_GL_CXXALIAS_RPL (strncat, char *, + (char *restrict dest, const char *restrict src, size_t n)); # else -_GL_CXXALIAS_SYS (strncat, char *, (char *dest, const char *src, size_t n)); +_GL_CXXALIAS_SYS (strncat, char *, + (char *restrict dest, const char *restrict src, size_t n)); # endif +# if __GLIBC__ >= 2 _GL_CXXALIASWARN (strncat); +# endif #elif defined GNULIB_POSIXCHECK # undef strncat # if HAVE_RAW_DECL_STRNCAT @@ -512,7 +556,7 @@ _GL_CXXALIAS_SYS_CAST2 (strpbrk, _GL_CXXALIASWARN1 (strpbrk, char *, (char *__s, char const *__accept)); _GL_CXXALIASWARN1 (strpbrk, char const *, (char const *__s, char const *__accept)); -# else +# elif __GLIBC__ >= 2 _GL_CXXALIASWARN (strpbrk); # endif # if defined GNULIB_POSIXCHECK @@ -521,15 +565,19 @@ _GL_CXXALIASWARN (strpbrk); locale encoding is GB18030 and one of the characters to be searched is a digit. */ # undef strpbrk -_GL_WARN_ON_USE (strpbrk, "strpbrk cannot work correctly on character strings " - "in multibyte locales - " - "use mbspbrk if you care about internationalization"); +_GL_WARN_ON_USE_CXX (strpbrk, + const char *, char *, (const char *, const char *), + "strpbrk cannot work correctly on character strings " + "in multibyte locales - " + "use mbspbrk if you care about internationalization"); # endif #elif defined GNULIB_POSIXCHECK # undef strpbrk # if HAVE_RAW_DECL_STRPBRK -_GL_WARN_ON_USE (strpbrk, "strpbrk is unportable - " - "use gnulib module strpbrk for portability"); +_GL_WARN_ON_USE_CXX (strpbrk, + const char *, char *, (const char *, const char *), + "strpbrk is unportable - " + "use gnulib module strpbrk for portability"); # endif #endif @@ -548,9 +596,11 @@ _GL_WARN_ON_USE (strspn, "strspn cannot work correctly on character strings " GB18030 and the character to be searched is a digit. */ # undef strrchr /* Assume strrchr is always declared. */ -_GL_WARN_ON_USE (strrchr, "strrchr cannot work correctly on character strings " - "in some multibyte locales - " - "use mbsrchr if you care about internationalization"); +_GL_WARN_ON_USE_CXX (strrchr, + const char *, char *, (const char *, int), + "strrchr cannot work correctly on character strings " + "in some multibyte locales - " + "use mbsrchr if you care about internationalization"); #endif /* Search the next delimiter (char listed in DELIM) starting at *STRINGP. @@ -614,7 +664,7 @@ _GL_CXXALIAS_SYS_CAST2 (strstr, _GL_CXXALIASWARN1 (strstr, char *, (char *haystack, const char *needle)); _GL_CXXALIASWARN1 (strstr, const char *, (const char *haystack, const char *needle)); -# else +# elif __GLIBC__ >= 2 _GL_CXXALIASWARN (strstr); # endif #elif defined GNULIB_POSIXCHECK @@ -693,7 +743,7 @@ _GL_WARN_ON_USE (strcasestr, "strcasestr does work correctly on character " This is a variant of strtok() that is multithread-safe. For the POSIX documentation for this function, see: - http://www.opengroup.org/susv3xsh/strtok.html + https://pubs.opengroup.org/onlinepubs/9699919799/functions/strtok.html Caveat: It modifies the original string. Caveat: These functions cannot be used on constant strings. @@ -964,7 +1014,8 @@ _GL_EXTERN_C char * mbssep (char **stringp, const char *delim) Caveat: The identity of the delimiting character is lost. See also mbssep(). */ -_GL_EXTERN_C char * mbstok_r (char *string, const char *delim, char **save_ptr) +_GL_EXTERN_C char * mbstok_r (char *restrict string, const char *delim, + char **save_ptr) _GL_ARG_NONNULL ((2, 3)); #endif @@ -980,7 +1031,9 @@ _GL_CXXALIAS_RPL (strerror, char *, (int)); # else _GL_CXXALIAS_SYS (strerror, char *, (int)); # endif +# if __GLIBC__ >= 2 _GL_CXXALIASWARN (strerror); +# endif #elif defined GNULIB_POSIXCHECK # undef strerror /* Assume strerror is always declared. */ @@ -1017,6 +1070,60 @@ _GL_WARN_ON_USE (strerror_r, "strerror_r is unportable - " # endif #endif +/* Return the name of the system error code ERRNUM. */ +#if @GNULIB_STRERRORNAME_NP@ +# if @REPLACE_STRERRORNAME_NP@ +# if !(defined __cplusplus && defined GNULIB_NAMESPACE) +# undef strerrorname_np +# define strerrorname_np rpl_strerrorname_np +# endif +_GL_FUNCDECL_RPL (strerrorname_np, const char *, (int errnum)); +_GL_CXXALIAS_RPL (strerrorname_np, const char *, (int errnum)); +# else +# if !@HAVE_STRERRORNAME_NP@ +_GL_FUNCDECL_SYS (strerrorname_np, const char *, (int errnum)); +# endif +_GL_CXXALIAS_SYS (strerrorname_np, const char *, (int errnum)); +# endif +_GL_CXXALIASWARN (strerrorname_np); +#elif defined GNULIB_POSIXCHECK +# undef strerrorname_np +# if HAVE_RAW_DECL_STRERRORNAME_NP +_GL_WARN_ON_USE (strerrorname_np, "strerrorname_np is unportable - " + "use gnulib module strerrorname_np for portability"); +# endif +#endif + +/* Return an abbreviation string for the signal number SIG. */ +#if @GNULIB_SIGABBREV_NP@ +# if ! @HAVE_SIGABBREV_NP@ +_GL_FUNCDECL_SYS (sigabbrev_np, const char *, (int sig)); +# endif +_GL_CXXALIAS_SYS (sigabbrev_np, const char *, (int sig)); +_GL_CXXALIASWARN (sigabbrev_np); +#elif defined GNULIB_POSIXCHECK +# undef sigabbrev_np +# if HAVE_RAW_DECL_SIGABBREV_NP +_GL_WARN_ON_USE (sigabbrev_np, "sigabbrev_np is unportable - " + "use gnulib module sigabbrev_np for portability"); +# endif +#endif + +/* Return an English description string for the signal number SIG. */ +#if @GNULIB_SIGDESCR_NP@ +# if ! @HAVE_SIGDESCR_NP@ +_GL_FUNCDECL_SYS (sigdescr_np, const char *, (int sig)); +# endif +_GL_CXXALIAS_SYS (sigdescr_np, const char *, (int sig)); +_GL_CXXALIASWARN (sigdescr_np); +#elif defined GNULIB_POSIXCHECK +# undef sigdescr_np +# if HAVE_RAW_DECL_SIGDESCR_NP +_GL_WARN_ON_USE (sigdescr_np, "sigdescr_np is unportable - " + "use gnulib module sigdescr_np for portability"); +# endif +#endif + #if @GNULIB_STRSIGNAL@ # if @REPLACE_STRSIGNAL@ # if !(defined __cplusplus && defined GNULIB_NAMESPACE) diff --git a/lib/stripslash.c b/lib/stripslash.c index dfc15b4..6818b30 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-2019 Free Software Foundation, + Copyright (C) 1990, 2001, 2003-2006, 2009-2020 Free Software Foundation, Inc. This program is free software: you can redistribute it and/or modify diff --git a/lib/strndup.c b/lib/strndup.c index 5b74828..d5294b8 100644 --- a/lib/strndup.c +++ b/lib/strndup.c @@ -1,6 +1,6 @@ /* A replacement function, for systems that lack strndup. - Copyright (C) 1996-1998, 2001-2003, 2005-2007, 2009-2019 Free Software + Copyright (C) 1996-1998, 2001-2003, 2005-2007, 2009-2020 Free Software Foundation, Inc. This program is free software; you can redistribute it and/or modify it diff --git a/lib/strnlen.c b/lib/strnlen.c index 9fb6635..dcecf08 100644 --- a/lib/strnlen.c +++ b/lib/strnlen.c @@ -1,5 +1,5 @@ /* Find the length of STRING, but scan at most MAXLEN characters. - Copyright (C) 2005-2007, 2009-2019 Free Software Foundation, Inc. + Copyright (C) 2005-2007, 2009-2020 Free Software Foundation, Inc. Written by Simon Josefsson. This program is free software; you can redistribute it and/or modify diff --git a/lib/strtol.c b/lib/strtol.c index 1d920af..02aafca 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-2019 Free Software + Copyright (C) 1991-1992, 1994-1999, 2003, 2005-2007, 2009-2020 Free Software Foundation, Inc. NOTE: The canonical source of this file is maintained with the GNU C diff --git a/lib/strtoll.c b/lib/strtoll.c index 038362a..3c7e8c0 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-2019 Free Software Foundation, + Copyright (C) 1995-1997, 1999, 2001, 2009-2020 Free Software Foundation, Inc. This file is part of the GNU C Library. diff --git a/lib/strtoul.c b/lib/strtoul.c index e098701..01977bb 100644 --- a/lib/strtoul.c +++ b/lib/strtoul.c @@ -1,4 +1,4 @@ -/* Copyright (C) 1991, 1997, 2009-2019 Free Software Foundation, Inc. +/* Copyright (C) 1991, 1997, 2009-2020 Free Software Foundation, Inc. This file is part of the GNU C Library. This program is free software: you can redistribute it and/or modify diff --git a/lib/strtoull.c b/lib/strtoull.c index 8ba92bf..7cd4bf5 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-2019 Free Software Foundation, Inc. + Copyright (C) 1995-1997, 1999, 2009-2020 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 f407eff..9b6b490 100644 --- a/lib/sys-limits.h +++ b/lib/sys-limits.h @@ -1,6 +1,6 @@ /* System call limits - Copyright 2018-2019 Free Software Foundation, Inc. + Copyright 2018-2020 Free Software Foundation, Inc. This 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/sys_random.in.h b/lib/sys_random.in.h new file mode 100644 index 0000000..a82d716 --- /dev/null +++ b/lib/sys_random.in.h @@ -0,0 +1,96 @@ +/* Substitute for . + Copyright (C) 2020 Free Software Foundation, Inc. + + This program is free software; you can redistribute it and/or modify + it under the terms of the GNU General Public License as published by + the Free Software Foundation; either version 3, or (at your option) + any later version. + + This program is distributed in the hope that it will be useful, + but WITHOUT ANY WARRANTY; without even the implied warranty of + MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + GNU General Public License for more details. + + You should have received a copy of the GNU General Public License + along with this program; if not, see . */ + +# if __GNUC__ >= 3 +@PRAGMA_SYSTEM_HEADER@ +# endif +@PRAGMA_COLUMNS@ + +#ifndef _@GUARD_PREFIX@_SYS_RANDOM_H + +#if @HAVE_SYS_RANDOM_H@ + +/* On uClibc, assumes prior inclusion of . */ +# if defined __UCLIBC__ +# include +# endif +/* On Mac OS X 10.5, assumes prior inclusion of . + On Max OS X 10.13, assumes prior inclusion of a file that + includes , such as or . */ +# if defined __APPLE__ && defined __MACH__ /* Mac OS X */ +# include +# include +# endif + +/* The include_next requires a split double-inclusion guard. */ +# @INCLUDE_NEXT@ @NEXT_SYS_RANDOM_H@ + +#endif + +#ifndef _@GUARD_PREFIX@_SYS_RANDOM_H +#define _@GUARD_PREFIX@_SYS_RANDOM_H + +#include + +/* Define the GRND_* constants. */ +#ifndef GRND_NONBLOCK +# define GRND_NONBLOCK 1 +# define GRND_RANDOM 2 +#endif + +/* The definitions of _GL_FUNCDECL_RPL etc. are copied here. */ + +/* The definition of _GL_ARG_NONNULL is copied here. */ + +/* The definition of _GL_WARN_ON_USE is copied here. */ + + +/* Declare overridden functions. */ + + +#if @GNULIB_GETRANDOM@ +/* Fill a buffer with random bytes. */ +# if @REPLACE_GETRANDOM@ +# if !(defined __cplusplus && defined GNULIB_NAMESPACE) +# undef getrandom +# define getrandom rpl_getrandom +# endif +_GL_FUNCDECL_RPL (getrandom, ssize_t, + (void *buffer, size_t length, unsigned int flags) + _GL_ARG_NONNULL ((1))); +_GL_CXXALIAS_RPL (getrandom, ssize_t, + (void *buffer, size_t length, unsigned int flags)); +# else +# if !@HAVE_GETRANDOM@ +_GL_FUNCDECL_SYS (getrandom, ssize_t, + (void *buffer, size_t length, unsigned int flags) + _GL_ARG_NONNULL ((1))); +# endif +_GL_CXXALIAS_SYS (getrandom, ssize_t, + (void *buffer, size_t length, unsigned int flags)); +# endif +_GL_CXXALIASWARN (getrandom); +#elif defined GNULIB_POSIXCHECK +# undef getrandom +# if HAVE_RAW_DECL_GETRANDOM +_GL_WARN_ON_USE (getrandom, "getrandom is unportable - " + "use gnulib module getrandom for portability"); +# endif +#endif + + +#endif /* _@GUARD_PREFIX@_SYS_RANDOM_H */ +#endif /* _@GUARD_PREFIX@_SYS_RANDOM_H */ diff --git a/lib/sys_stat.in.h b/lib/sys_stat.in.h index 9ddd1a8..3ce2a0d 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-2019 Free Software Foundation, Inc. + Copyright (C) 2005-2020 Free Software Foundation, Inc. This program is free software; you can redistribute it and/or modify it under the terms of the GNU General Public License as published by @@ -375,11 +375,11 @@ struct stat # define S_IRWXO (S_IROTH | S_IWOTH | S_IXOTH) #endif -/* S_IXUGO is a common extension to POSIX. */ +/* Although S_IXUGO and S_IRWXUGO are not specified by POSIX and are + not implemented in GNU/Linux, some Gnulib-using apps use the macros. */ #if !S_IXUGO # define S_IXUGO (S_IXUSR | S_IXGRP | S_IXOTH) #endif - #ifndef S_IRWXUGO # define S_IRWXUGO (S_IRWXU | S_IRWXG | S_IRWXO) #endif @@ -391,14 +391,42 @@ struct stat #endif +/* 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. */ +#if 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); + + #if @GNULIB_FCHMODAT@ -# if !@HAVE_FCHMODAT@ +# if @REPLACE_FCHMODAT@ +# if !(defined __cplusplus && defined GNULIB_NAMESPACE) +# undef fchmodat +# define fchmodat rpl_fchmodat +# endif +_GL_FUNCDECL_RPL (fchmodat, int, + (int fd, char const *file, mode_t mode, int flag) + _GL_ARG_NONNULL ((2))); +_GL_CXXALIAS_RPL (fchmodat, int, + (int fd, char const *file, mode_t mode, int flag)); +# else +# if !@HAVE_FCHMODAT@ _GL_FUNCDECL_SYS (fchmodat, int, (int fd, char const *file, mode_t mode, int flag) _GL_ARG_NONNULL ((2))); -# endif +# endif _GL_CXXALIAS_SYS (fchmodat, int, (int fd, char const *file, mode_t mode, int flag)); +# endif _GL_CXXALIASWARN (fchmodat); #elif defined GNULIB_POSIXCHECK # undef fchmodat @@ -420,7 +448,9 @@ _GL_CXXALIAS_RPL (fstat, int, (int fd, struct stat *buf)); # else _GL_CXXALIAS_SYS (fstat, int, (int fd, struct stat *buf)); # endif +# if __GLIBC__ >= 2 _GL_CXXALIASWARN (fstat); +# endif #elif @GNULIB_OVERRIDES_STRUCT_STAT@ # undef fstat # define fstat fstat_used_without_requesting_gnulib_module_fstat @@ -443,18 +473,22 @@ _GL_WARN_ON_USE (fstat, "fstat has portability problems - " # define fstatat rpl_fstatat # endif _GL_FUNCDECL_RPL (fstatat, int, - (int fd, char const *name, struct stat *st, int flags) + (int fd, char const *restrict name, struct stat *restrict st, + int flags) _GL_ARG_NONNULL ((2, 3))); _GL_CXXALIAS_RPL (fstatat, int, - (int fd, char const *name, struct stat *st, int flags)); + (int fd, char const *restrict name, struct stat *restrict st, + int flags)); # else # if !@HAVE_FSTATAT@ _GL_FUNCDECL_SYS (fstatat, int, - (int fd, char const *name, struct stat *st, int flags) + (int fd, char const *restrict name, struct stat *restrict st, + int flags) _GL_ARG_NONNULL ((2, 3))); # endif _GL_CXXALIAS_SYS (fstatat, int, - (int fd, char const *name, struct stat *st, int flags)); + (int fd, char const *restrict name, struct stat *restrict st, + int flags)); # endif _GL_CXXALIASWARN (fstatat); #elif @GNULIB_OVERRIDES_STRUCT_STAT@ @@ -499,34 +533,32 @@ _GL_WARN_ON_USE (futimens, "futimens is not portable - " #endif +#if @GNULIB_GETUMASK@ +# if !@HAVE_GETUMASK@ +_GL_FUNCDECL_SYS (getumask, mode_t, (void)); +# endif +_GL_CXXALIAS_SYS (getumask, mode_t, (void)); +# if @HAVE_GETUMASK@ +_GL_CXXALIASWARN (getumask); +# endif +#elif defined GNULIB_POSIXCHECK +# undef getumask +# if HAVE_RAW_DECL_GETUMASK +_GL_WARN_ON_USE (getumask, "getumask is not portable - " + "use gnulib module getumask for portability"); +# endif +#endif + + #if @GNULIB_LCHMOD@ /* Change the mode of FILENAME to MODE, without dereferencing it if FILENAME denotes a symbolic link. */ -# if !@HAVE_LCHMOD@ -/* The lchmod replacement follows symbolic links. Callers should take - this into account; lchmod should be applied only to arguments that - are known to not be symbolic links. On hosts that lack lchmod, - this can lead to race conditions between the check and the - invocation of lchmod, but we know of no workarounds that are - reliable in general. You might try requesting support for lchmod - from your operating system supplier. */ -# if !(defined __cplusplus && defined GNULIB_NAMESPACE) -# define lchmod chmod -# endif -/* Need to cast, because on mingw, the second parameter of chmod is - int mode. */ -_GL_CXXALIAS_RPL_CAST_1 (lchmod, chmod, int, - (const char *filename, mode_t mode)); -# else -# if 0 /* assume already declared */ +# if !@HAVE_LCHMOD@ || defined __hpux _GL_FUNCDECL_SYS (lchmod, int, (const char *filename, mode_t mode) _GL_ARG_NONNULL ((1))); -# endif -_GL_CXXALIAS_SYS (lchmod, int, (const char *filename, mode_t mode)); # endif -# if @HAVE_LCHMOD@ +_GL_CXXALIAS_SYS (lchmod, int, (const char *filename, mode_t mode)); _GL_CXXALIASWARN (lchmod); -# endif #elif defined GNULIB_POSIXCHECK # undef lchmod # if HAVE_RAW_DECL_LCHMOD @@ -543,17 +575,21 @@ _GL_WARN_ON_USE (lchmod, "lchmod is unportable - " # if !(defined __cplusplus && defined GNULIB_NAMESPACE) # define lstat stat # endif -_GL_CXXALIAS_RPL_1 (lstat, stat, int, (const char *name, struct stat *buf)); +_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 *name, struct stat *buf) - _GL_ARG_NONNULL ((1, 2))); -_GL_CXXALIAS_RPL (lstat, int, (const char *name, struct stat *buf)); +_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 *name, struct stat *buf)); +_GL_CXXALIAS_SYS (lstat, int, + (const char *restrict name, struct stat *restrict buf)); # endif # if @HAVE_LSTAT@ _GL_CXXALIASWARN (lstat); @@ -766,7 +802,7 @@ _GL_WARN_ON_USE (mknodat, "mknodat is not portable - " # define stat(name, st) rpl_stat (name, st) # endif /* !_LARGE_FILES */ # endif /* !@GNULIB_OVERRIDES_STRUCT_STAT@ */ -_GL_EXTERN_C int stat (const char *name, struct stat *buf) +_GL_EXTERN_C int stat (const char *restrict name, struct stat *restrict buf) _GL_ARG_NONNULL ((1, 2)); # endif #elif @GNULIB_OVERRIDES_STRUCT_STAT@ @@ -782,6 +818,22 @@ _GL_WARN_ON_USE (stat, "stat is unportable - " #endif +/* On native Windows, map 'umask' to '_umask', so that -loldnames is not + required. In C++ with GNULIB_NAMESPACE, avoid differences between + platforms by defining GNULIB_NAMESPACE::umask always. */ +#if defined _WIN32 && !defined __CYGWIN__ +# if !(defined __cplusplus && defined GNULIB_NAMESPACE) +# undef umask +# define umask _umask +# endif +/* Need to cast, because in mingw the last argument is 'int mode'. */ +_GL_CXXALIAS_MDA_CAST (umask, mode_t, (mode_t mask)); +#else +_GL_CXXALIAS_SYS (umask, mode_t, (mode_t mask)); +#endif +_GL_CXXALIASWARN (umask); + + #if @GNULIB_UTIMENSAT@ /* Use the rpl_ prefix also on Solaris <= 9, because on Solaris 9 our utimensat implementation relies on futimesat, which on Solaris 10 makes an invocation diff --git a/lib/sys_time.in.h b/lib/sys_time.in.h deleted file mode 100644 index 5397688..0000000 --- a/lib/sys_time.in.h +++ /dev/null @@ -1,220 +0,0 @@ -/* Provide a more complete sys/time.h. - - Copyright (C) 2007-2019 Free Software Foundation, Inc. - - This program is free software; you can redistribute it and/or modify - it under the terms of the GNU General Public License as published by - the Free Software Foundation; either version 3, or (at your option) - any later version. - - This program is distributed in the hope that it will be useful, - but WITHOUT ANY WARRANTY; without even the implied warranty of - MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - GNU General Public License for more details. - - You should have received a copy of the GNU General Public License - along with this program; if not, see . */ - -/* Written by Paul Eggert. */ - -#ifndef _@GUARD_PREFIX@_SYS_TIME_H - -#if __GNUC__ >= 3 -@PRAGMA_SYSTEM_HEADER@ -#endif -@PRAGMA_COLUMNS@ - -/* On Cygwin and on many BSDish systems, includes itself - recursively via . - Simply delegate to the system's header in this case; it is a no-op. - Without this extra ifdef, the C++ gettimeofday declaration below - would be a forward declaration in gnulib's nested . */ -#if defined _CYGWIN_SYS_TIME_H || defined _SYS_TIME_H || defined _SYS_TIME_H_ -# @INCLUDE_NEXT@ @NEXT_SYS_TIME_H@ -#else - -/* The include_next requires a split double-inclusion guard. */ -#if @HAVE_SYS_TIME_H@ -# @INCLUDE_NEXT@ @NEXT_SYS_TIME_H@ -#endif - -#ifndef _@GUARD_PREFIX@_SYS_TIME_H -#define _@GUARD_PREFIX@_SYS_TIME_H - -#if ! @HAVE_SYS_TIME_H@ -# include -#endif - -/* On native Windows with MSVC, get the 'struct timeval' type. - Also, on native Windows with a 64-bit time_t, where we are overriding the - 'struct timeval' type, get all declarations of system functions whose - signature contains 'struct timeval'. */ -#if (defined _MSC_VER || @REPLACE_STRUCT_TIMEVAL@) && @HAVE_WINSOCK2_H@ && !defined _GL_INCLUDING_WINSOCK2_H -# define _GL_INCLUDING_WINSOCK2_H -# include -# undef _GL_INCLUDING_WINSOCK2_H -#endif - -/* The definitions of _GL_FUNCDECL_RPL etc. are copied here. */ - -/* The definition of _GL_ARG_NONNULL is copied here. */ - -/* The definition of _GL_WARN_ON_USE is copied here. */ - -#ifdef __cplusplus -extern "C" { -#endif - -#if !@HAVE_STRUCT_TIMEVAL@ || @REPLACE_STRUCT_TIMEVAL@ - -# if @REPLACE_STRUCT_TIMEVAL@ -# define timeval rpl_timeval -# endif - -# if !GNULIB_defined_struct_timeval -struct timeval -{ - time_t tv_sec; - long int tv_usec; -}; -# define GNULIB_defined_struct_timeval 1 -# endif - -#endif - -#ifdef __cplusplus -} -#endif - -#if @GNULIB_GETTIMEOFDAY@ -# if @REPLACE_GETTIMEOFDAY@ -# if !(defined __cplusplus && defined GNULIB_NAMESPACE) -# undef gettimeofday -# define gettimeofday rpl_gettimeofday -# endif -_GL_FUNCDECL_RPL (gettimeofday, int, - (struct timeval *restrict, void *restrict) - _GL_ARG_NONNULL ((1))); -_GL_CXXALIAS_RPL (gettimeofday, int, - (struct timeval *restrict, void *restrict)); -# else -# if !@HAVE_GETTIMEOFDAY@ -_GL_FUNCDECL_SYS (gettimeofday, int, - (struct timeval *restrict, void *restrict) - _GL_ARG_NONNULL ((1))); -# endif -/* Need to cast, because on glibc systems, by default, the second argument is - struct timezone *. */ -_GL_CXXALIAS_SYS_CAST (gettimeofday, int, - (struct timeval *restrict, void *restrict)); -# endif -_GL_CXXALIASWARN (gettimeofday); -# if defined __cplusplus && defined GNULIB_NAMESPACE -namespace GNULIB_NAMESPACE { - typedef ::timeval -#undef timeval - timeval; -} -# endif -#elif defined GNULIB_POSIXCHECK -# undef gettimeofday -# if HAVE_RAW_DECL_GETTIMEOFDAY -_GL_WARN_ON_USE (gettimeofday, "gettimeofday is unportable - " - "use gnulib module gettimeofday for portability"); -# endif -#endif - -/* Hide some function declarations from . */ - -#if defined _MSC_VER && @HAVE_WINSOCK2_H@ -# if !defined _@GUARD_PREFIX@_UNISTD_H -# if !(defined __cplusplus && defined GNULIB_NAMESPACE) -# undef close -# define close close_used_without_including_unistd_h -# else - _GL_WARN_ON_USE (close, - "close() used without including "); -# endif -# if !(defined __cplusplus && defined GNULIB_NAMESPACE) -# undef gethostname -# define gethostname gethostname_used_without_including_unistd_h -# else - _GL_WARN_ON_USE (gethostname, - "gethostname() used without including "); -# endif -# endif -# if !defined _@GUARD_PREFIX@_SYS_SOCKET_H -# if !(defined __cplusplus && defined GNULIB_NAMESPACE) -# undef socket -# define socket socket_used_without_including_sys_socket_h -# undef connect -# define connect connect_used_without_including_sys_socket_h -# undef accept -# define accept accept_used_without_including_sys_socket_h -# undef bind -# define bind bind_used_without_including_sys_socket_h -# undef getpeername -# define getpeername getpeername_used_without_including_sys_socket_h -# undef getsockname -# define getsockname getsockname_used_without_including_sys_socket_h -# undef getsockopt -# define getsockopt getsockopt_used_without_including_sys_socket_h -# undef listen -# define listen listen_used_without_including_sys_socket_h -# undef recv -# define recv recv_used_without_including_sys_socket_h -# undef send -# define send send_used_without_including_sys_socket_h -# undef recvfrom -# define recvfrom recvfrom_used_without_including_sys_socket_h -# undef sendto -# define sendto sendto_used_without_including_sys_socket_h -# undef setsockopt -# define setsockopt setsockopt_used_without_including_sys_socket_h -# undef shutdown -# define shutdown shutdown_used_without_including_sys_socket_h -# else - _GL_WARN_ON_USE (socket, - "socket() used without including "); - _GL_WARN_ON_USE (connect, - "connect() used without including "); - _GL_WARN_ON_USE (accept, - "accept() used without including "); - _GL_WARN_ON_USE (bind, - "bind() used without including "); - _GL_WARN_ON_USE (getpeername, - "getpeername() used without including "); - _GL_WARN_ON_USE (getsockname, - "getsockname() used without including "); - _GL_WARN_ON_USE (getsockopt, - "getsockopt() used without including "); - _GL_WARN_ON_USE (listen, - "listen() used without including "); - _GL_WARN_ON_USE (recv, - "recv() used without including "); - _GL_WARN_ON_USE (send, - "send() used without including "); - _GL_WARN_ON_USE (recvfrom, - "recvfrom() used without including "); - _GL_WARN_ON_USE (sendto, - "sendto() used without including "); - _GL_WARN_ON_USE (setsockopt, - "setsockopt() used without including "); - _GL_WARN_ON_USE (shutdown, - "shutdown() used without including "); -# endif -# endif -# if !defined _@GUARD_PREFIX@_SYS_SELECT_H -# if !(defined __cplusplus && defined GNULIB_NAMESPACE) -# undef select -# define select select_used_without_including_sys_select_h -# else - _GL_WARN_ON_USE (select, - "select() used without including "); -# endif -# endif -#endif - -#endif /* _@GUARD_PREFIX@_SYS_TIME_H */ -#endif /* _CYGWIN_SYS_TIME_H */ -#endif /* _@GUARD_PREFIX@_SYS_TIME_H */ diff --git a/lib/sys_types.in.h b/lib/sys_types.in.h index 237e206..e7e1a22 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-2019 Free Software Foundation, Inc. + Copyright (C) 2011-2020 Free Software Foundation, Inc. This 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/tempname.c b/lib/tempname.c index be62ed9..b9f7cc8 100644 --- a/lib/tempname.c +++ b/lib/tempname.c @@ -1,24 +1,22 @@ -/* tempname.c - generate the name of a temporary file. +/* Copyright (C) 1991-2020 Free Software Foundation, Inc. + This file is part of the GNU C Library. - Copyright (C) 1991-2003, 2005-2007, 2009-2019 Free Software Foundation, Inc. + The GNU C Library is free software; you can redistribute it and/or + modify it under the terms of the GNU General Public + License as published by the Free Software Foundation; either + version 3 of the License, or (at your option) any later version. - This program is free software: you can redistribute it and/or modify - it under the terms of the GNU General Public License as published by - the Free Software Foundation; either version 3 of the License, or - (at your option) any later version. - - This program is distributed in the hope that it will be useful, + The GNU C Library is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without even the implied warranty of - MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - GNU General Public License for more details. - - You should have received a copy of the GNU General Public License - along with this program. If not, see . */ + MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + General Public License for more details. -/* Extracted from glibc sysdeps/posix/tempname.c. See also tmpdir.c. */ + You should have received a copy of the GNU General Public + License along with the GNU C Library; if not, see + . */ #if !_LIBC -# include +# include # include "tempname.h" #endif @@ -26,9 +24,6 @@ #include #include -#ifndef __set_errno -# define __set_errno(Val) errno = (Val) -#endif #include #ifndef P_tmpdir @@ -52,52 +47,48 @@ #include #include -#include +#include #include -#include - +#include #include +#include #if _LIBC # define struct_stat64 struct stat64 +# define __secure_getenv __libc_secure_getenv #else # define struct_stat64 struct stat -# define __try_tempname try_tempname # define __gen_tempname gen_tempname -# define __getpid getpid -# define __gettimeofday gettimeofday # define __mkdir mkdir # define __open open # define __lxstat64(version, file, buf) lstat (file, buf) +# define __getrandom getrandom +# define __clock_gettime64 clock_gettime +# define __timespec64 timespec #endif -#ifdef _LIBC -# include -# if HP_TIMING_AVAIL -# define RANDOM_BITS(Var) \ - if (__builtin_expect (value == UINT64_C (0), 0)) \ - { \ - /* If this is the first time this function is used initialize \ - the variable we accumulate the value in to some somewhat \ - random value. If we'd not do this programs at startup time \ - might have a reduced set of possible names, at least on slow \ - machines. */ \ - struct timeval tv; \ - __gettimeofday (&tv, NULL); \ - value = ((uint64_t) tv.tv_usec << 16) ^ tv.tv_sec; \ - } \ - HP_TIMING_NOW (Var) -# endif -#endif +/* Use getrandom if it works, falling back on a 64-bit linear + congruential generator that starts with Var's value + mixed in with a clock's low-order bits if available. */ +typedef uint_fast64_t random_value; +#define RANDOM_VALUE_MAX UINT_FAST64_MAX +#define BASE_62_DIGITS 10 /* 62**10 < UINT_FAST64_MAX */ +#define BASE_62_POWER (62LL * 62 * 62 * 62 * 62 * 62 * 62 * 62 * 62 * 62) -/* Use the widest available unsigned type if uint64_t is not - available. The algorithm below extracts a number less than 62**6 - (approximately 2**35.725) from uint64_t, so ancient hosts where - uintmax_t is only 32 bits lose about 3.725 bits of randomness, - which is better than not having mkstemp at all. */ -#if !defined UINT64_MAX && !defined uint64_t -# define uint64_t uintmax_t +static random_value +random_bits (random_value var) +{ + random_value r; + if (__getrandom (&r, sizeof r, 0) == sizeof r) + return r; +#if _LIBC || (defined CLOCK_MONOTONIC && HAVE_CLOCK_GETTIME) + /* Add entropy if getrandom is not supported. */ + struct __timespec64 tv; + __clock_gettime64 (CLOCK_MONOTONIC, &tv); + var ^= tv.tv_nsec; #endif + return 2862933555777941757 * var + 3037000493; +} #if _LIBC /* Return nonzero if DIR is an existent directory. */ @@ -172,18 +163,80 @@ __path_search (char *tmpl, size_t tmpl_len, const char *dir, const char *pfx, } #endif /* _LIBC */ +#if _LIBC +static int try_tempname_len (char *, int, void *, int (*) (char *, void *), + size_t); +#endif + +static int +try_file (char *tmpl, void *flags) +{ + int *openflags = flags; + return __open (tmpl, + (*openflags & ~O_ACCMODE) + | O_RDWR | O_CREAT | O_EXCL, S_IRUSR | S_IWUSR); +} + +static int +try_dir (char *tmpl, void *flags _GL_UNUSED) +{ + return __mkdir (tmpl, S_IRUSR | S_IWUSR | S_IXUSR); +} + +static int +try_nocreate (char *tmpl, void *flags _GL_UNUSED) +{ + struct_stat64 st; + + if (__lxstat64 (_STAT_VER, tmpl, &st) == 0 || errno == EOVERFLOW) + __set_errno (EEXIST); + return errno == ENOENT ? 0 : -1; +} + /* These are the characters used in temporary file names. */ static const char letters[] = "abcdefghijklmnopqrstuvwxyzABCDEFGHIJKLMNOPQRSTUVWXYZ0123456789"; +/* Generate a temporary file name based on TMPL. TMPL must match the + rules for mk[s]temp (i.e., end in at least X_SUFFIX_LEN "X"s, + possibly with a suffix). + The name constructed does not exist at the time of the call to + this function. TMPL is overwritten with the result. + + KIND may be one of: + __GT_NOCREATE: simply verify that the name does not exist + at the time of the call. + __GT_FILE: create the file using open(O_CREAT|O_EXCL) + 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 +int +gen_tempname_len (char *tmpl, int suffixlen, int flags, int kind, + size_t x_suffix_len) +{ + static int (*const tryfunc[]) (char *, void *) = + { + [__GT_FILE] = try_file, + [__GT_DIR] = try_dir, + [__GT_NOCREATE] = try_nocreate + }; + return try_tempname_len (tmpl, suffixlen, &flags, tryfunc[kind], + x_suffix_len); +} + +#ifdef _LIBC +static +#endif int -__try_tempname (char *tmpl, int suffixlen, void *args, - int (*tryfunc) (char *, void *)) +try_tempname_len (char *tmpl, int suffixlen, void *args, + int (*tryfunc) (char *, void *), size_t x_suffix_len) { - int len; + size_t len; char *XXXXXX; - static uint64_t value; - uint64_t random_time_bits; unsigned int count; int fd = -1; int save_errno = errno; @@ -193,7 +246,8 @@ __try_tempname (char *tmpl, int suffixlen, void *args, can exist for a given template is 62**6. It should never be necessary to try all of these combinations. Instead if a reasonable number of names is tried (we define reasonable as 62**3) fail to - give the system administrator the chance to remove the problems. */ + give the system administrator the chance to remove the problems. + This value requires that X_SUFFIX_LEN be at least 3. */ #define ATTEMPTS_MIN (62 * 62 * 62) /* The number of times to attempt to generate a temporary file. To @@ -204,44 +258,48 @@ __try_tempname (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); + + /* How many random base-62 digits can currently be extracted from V. */ + int vdigits = 0; + + /* 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 + = RANDOM_VALUE_MAX - RANDOM_VALUE_MAX % BASE_62_POWER; + len = strlen (tmpl); - if (len < 6 + suffixlen || memcmp (&tmpl[len - 6 - suffixlen], "XXXXXX", 6)) + if (len < x_suffix_len + suffixlen + || strspn (&tmpl[len - x_suffix_len - suffixlen], "X") < x_suffix_len) { __set_errno (EINVAL); return -1; } /* This is where the Xs start. */ - XXXXXX = &tmpl[len - 6 - suffixlen]; - - /* Get some more or less random data. */ -#ifdef RANDOM_BITS - RANDOM_BITS (random_time_bits); -#else - { - struct timeval tv; - __gettimeofday (&tv, NULL); - random_time_bits = ((uint64_t) tv.tv_usec << 16) ^ tv.tv_sec; - } -#endif - value += random_time_bits ^ __getpid (); + XXXXXX = &tmpl[len - x_suffix_len - suffixlen]; - for (count = 0; count < attempts; value += 7777, ++count) + for (count = 0; count < attempts; ++count) { - uint64_t v = value; - - /* Fill in the random bits. */ - XXXXXX[0] = letters[v % 62]; - v /= 62; - XXXXXX[1] = letters[v % 62]; - v /= 62; - XXXXXX[2] = letters[v % 62]; - v /= 62; - XXXXXX[3] = letters[v % 62]; - v /= 62; - XXXXXX[4] = letters[v % 62]; - v /= 62; - XXXXXX[5] = letters[v % 62]; + for (size_t i = 0; i < x_suffix_len; i++) + { + if (vdigits == 0) + { + do + v = random_bits (v); + while (unfair_min <= v); + + vdigits = BASE_62_DIGITS; + } + + XXXXXX[i] = letters[v % 62]; + v /= 62; + vdigits--; + } fd = tryfunc (tmpl, args); if (fd >= 0) @@ -258,66 +316,17 @@ __try_tempname (char *tmpl, int suffixlen, void *args, return -1; } -static int -try_file (char *tmpl, void *flags) -{ - int *openflags = flags; - return __open (tmpl, - (*openflags & ~O_ACCMODE) - | O_RDWR | O_CREAT | O_EXCL, S_IRUSR | S_IWUSR); -} - -static int -try_dir (char *tmpl, void *flags _GL_UNUSED) -{ - return __mkdir (tmpl, S_IRUSR | S_IWUSR | S_IXUSR); -} - -static int -try_nocreate (char *tmpl, void *flags _GL_UNUSED) +int +__gen_tempname (char *tmpl, int suffixlen, int flags, int kind) { - struct_stat64 st; - - if (__lxstat64 (_STAT_VER, tmpl, &st) == 0 || errno == EOVERFLOW) - __set_errno (EEXIST); - return errno == ENOENT ? 0 : -1; + return gen_tempname_len (tmpl, suffixlen, flags, kind, 6); } -/* Generate a temporary file name based on TMPL. TMPL must match the - rules for mk[s]temp (i.e. end in "XXXXXX", possibly with a suffix). - The name constructed does not exist at the time of the call to - __gen_tempname. TMPL is overwritten with the result. - - KIND may be one of: - __GT_NOCREATE: simply verify that the name does not exist - at the time of the call. - __GT_FILE: create the file using open(O_CREAT|O_EXCL) - 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. */ +#if !_LIBC int -__gen_tempname (char *tmpl, int suffixlen, int flags, int kind) +try_tempname (char *tmpl, int suffixlen, void *args, + int (*tryfunc) (char *, void *)) { - int (*tryfunc) (char *, void *); - - switch (kind) - { - case __GT_FILE: - tryfunc = try_file; - break; - - case __GT_DIR: - tryfunc = try_dir; - break; - - case __GT_NOCREATE: - tryfunc = try_nocreate; - break; - - default: - assert (! "invalid KIND in __gen_tempname"); - abort (); - } - return __try_tempname (tmpl, suffixlen, &flags, tryfunc); + return try_tempname_len (tmpl, suffixlen, args, tryfunc, 6); } +#endif diff --git a/lib/tempname.h b/lib/tempname.h index fb203d3..00dcbe4 100644 --- a/lib/tempname.h +++ b/lib/tempname.h @@ -1,6 +1,6 @@ /* Create a temporary file or directory. - Copyright (C) 2006, 2009-2019 Free Software Foundation, Inc. + Copyright (C) 2006, 2009-2020 Free Software Foundation, Inc. This program is free software: you can redistribute it and/or modify it under the terms of the GNU General Public License as published by @@ -50,6 +50,9 @@ extern "C" { 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, + size_t x_suffix_len); /* Similar to gen_tempname, but TRYFUNC is called for each temporary name to try. If TRYFUNC returns a non-negative number, TRY_GEN_TEMPNAME @@ -57,6 +60,10 @@ extern int gen_tempname (char *tmpl, int suffixlen, int flags, int kind); name is tried, or else TRY_GEN_TEMPNAME returns -1. */ extern int try_tempname (char *tmpl, int suffixlen, void *args, int (*tryfunc) (char *, void *)); +/* Similar, except X_SUFFIX_LEN gives the number of Xs. */ +extern int try_tempname_len (char *tmpl, int suffixlen, void *args, + int (*tryfunc) (char *, void *), + size_t x_suffix_len); #ifdef __cplusplus } diff --git a/lib/time.in.h b/lib/time.in.h index dd3b212..1b17c15 100644 --- a/lib/time.in.h +++ b/lib/time.in.h @@ -1,6 +1,6 @@ /* A more-standard . - Copyright (C) 2007-2019 Free Software Foundation, Inc. + Copyright (C) 2007-2020 Free Software Foundation, Inc. This 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,6 +37,12 @@ # define _@GUARD_PREFIX@_TIME_H +/* mingw's provides the functions asctime_r, ctime_r, gmtime_r, + localtime_r only if or has been included before. */ +# if defined __MINGW32__ +# include +# endif + # @INCLUDE_NEXT@ @NEXT_TIME_H@ /* NetBSD 5.0 mis-defines NULL. */ @@ -84,8 +90,8 @@ struct timespec # endif # if !GNULIB_defined_struct_time_t_must_be_integral -/* Per http://austingroupbugs.net/view.php?id=327, POSIX requires - time_t to be an integer type, even though C99 permits floating +/* https://pubs.opengroup.org/onlinepubs/9699919799/basedefs/sys_types.h.html + requires time_t to be an integer type, even though C99 permits floating point. We don't know of any implementation that uses floating point, and it is much easier to write code that doesn't have to worry about that corner case, so we force the issue. */ @@ -97,7 +103,7 @@ struct __time_t_must_be_integral { /* Sleep for at least RQTP seconds unless interrupted, If interrupted, return -1 and store the remaining time into RMTP. See - . */ + . */ # if @GNULIB_NANOSLEEP@ # if @REPLACE_NANOSLEEP@ # if !(defined __cplusplus && defined GNULIB_NAMESPACE) @@ -129,10 +135,27 @@ _GL_CXXALIASWARN (nanosleep); # endif _GL_FUNCDECL_RPL (tzset, void, (void)); _GL_CXXALIAS_RPL (tzset, void, (void)); +# elif defined _WIN32 && !defined __CYGWIN__ +# if !(defined __cplusplus && defined GNULIB_NAMESPACE) +# undef tzset +# define tzset _tzset +# endif +_GL_CXXALIAS_MDA (tzset, void, (void)); # else -# if ! @HAVE_TZSET@ -_GL_FUNCDECL_SYS (tzset, void, (void)); +_GL_CXXALIAS_SYS (tzset, void, (void)); +# endif +_GL_CXXALIASWARN (tzset); +# else +/* On native Windows, map 'tzset' to '_tzset', so that -loldnames is not + required. In C++ with GNULIB_NAMESPACE, avoid differences between + platforms by defining GNULIB_NAMESPACE::tzset always. */ +# if defined _WIN32 && !defined __CYGWIN__ +# if !(defined __cplusplus && defined GNULIB_NAMESPACE) +# undef tzset +# define tzset _tzset # endif +_GL_CXXALIAS_MDA (tzset, void, (void)); +# else _GL_CXXALIAS_SYS (tzset, void, (void)); # endif _GL_CXXALIASWARN (tzset); @@ -149,12 +172,14 @@ _GL_CXXALIAS_RPL (mktime, time_t, (struct tm *__tp)); # else _GL_CXXALIAS_SYS (mktime, time_t, (struct tm *__tp)); # endif +# if __GLIBC__ >= 2 _GL_CXXALIASWARN (mktime); +# endif # endif /* Convert TIMER to RESULT, assuming local time and UTC respectively. See - and - . */ + and + . */ # if @GNULIB_TIME_R@ # if @REPLACE_LOCALTIME_R@ # if !(defined __cplusplus && defined GNULIB_NAMESPACE) @@ -203,8 +228,8 @@ _GL_CXXALIASWARN (gmtime_r); # endif /* Convert TIMER to RESULT, assuming local time and UTC respectively. See - and - . */ + and + . */ # if @GNULIB_LOCALTIME@ || @REPLACE_LOCALTIME@ # if @REPLACE_LOCALTIME@ # if !(defined __cplusplus && defined GNULIB_NAMESPACE) @@ -217,7 +242,9 @@ _GL_CXXALIAS_RPL (localtime, struct tm *, (time_t const *__timer)); # else _GL_CXXALIAS_SYS (localtime, struct tm *, (time_t const *__timer)); # endif +# if __GLIBC__ >= 2 _GL_CXXALIASWARN (localtime); +# endif # endif # if 0 || @REPLACE_GMTIME@ @@ -237,7 +264,7 @@ _GL_CXXALIASWARN (gmtime); /* Parse BUF as a timestamp, assuming FORMAT specifies its layout, and store the resulting broken-down time into TM. See - . */ + . */ # if @GNULIB_STRPTIME@ # if ! @HAVE_STRPTIME@ _GL_FUNCDECL_SYS (strptime, char *, (char const *restrict __buf, @@ -252,7 +279,7 @@ _GL_CXXALIASWARN (strptime); # endif /* Convert *TP to a date and time string. See - . */ + . */ # if @GNULIB_CTIME@ # if @REPLACE_CTIME@ # if !(defined __cplusplus && defined GNULIB_NAMESPACE) @@ -264,26 +291,33 @@ _GL_CXXALIAS_RPL (ctime, char *, (time_t const *__tp)); # else _GL_CXXALIAS_SYS (ctime, char *, (time_t const *__tp)); # endif +# if __GLIBC__ >= 2 _GL_CXXALIASWARN (ctime); +# endif # endif /* Convert *TP to a date and time string. See - . */ + . */ # if @GNULIB_STRFTIME@ # if @REPLACE_STRFTIME@ # if !(defined __cplusplus && defined GNULIB_NAMESPACE) # define strftime rpl_strftime # endif -_GL_FUNCDECL_RPL (strftime, size_t, (char *__buf, size_t __bufsize, - const char *__fmt, const struct tm *__tp) - _GL_ARG_NONNULL ((1, 3, 4))); -_GL_CXXALIAS_RPL (strftime, size_t, (char *__buf, size_t __bufsize, - const char *__fmt, const struct tm *__tp)); +_GL_FUNCDECL_RPL (strftime, size_t, + (char *restrict __buf, size_t __bufsize, + const char *restrict __fmt, const struct tm *restrict __tp) + _GL_ARG_NONNULL ((1, 3, 4))); +_GL_CXXALIAS_RPL (strftime, size_t, + (char *restrict __buf, size_t __bufsize, + const char *restrict __fmt, const struct tm *restrict __tp)); # else -_GL_CXXALIAS_SYS (strftime, size_t, (char *__buf, size_t __bufsize, - const char *__fmt, const struct tm *__tp)); +_GL_CXXALIAS_SYS (strftime, size_t, + (char *restrict __buf, size_t __bufsize, + const char *restrict __fmt, const struct tm *restrict __tp)); # endif +# if __GLIBC__ >= 2 _GL_CXXALIASWARN (strftime); +# endif # endif # if defined _GNU_SOURCE && @GNULIB_TIME_RZ@ && ! @HAVE_TIMEZONE_T@ @@ -333,17 +367,17 @@ _GL_WARN_ON_USE (asctime, "asctime can overrun buffers in some cases - " # endif # if defined GNULIB_POSIXCHECK # undef asctime_r -_GL_WARN_ON_USE (asctime, "asctime_r can overrun buffers in some cases - " +_GL_WARN_ON_USE (asctime_r, "asctime_r can overrun buffers in some cases - " "better use strftime (or even sprintf) instead"); # endif # if defined GNULIB_POSIXCHECK # undef ctime -_GL_WARN_ON_USE (asctime, "ctime can overrun buffers in some cases - " +_GL_WARN_ON_USE (ctime, "ctime can overrun buffers in some cases - " "better use strftime (or even sprintf) instead"); # endif # if defined GNULIB_POSIXCHECK # undef ctime_r -_GL_WARN_ON_USE (asctime, "ctime_r can overrun buffers in some cases - " +_GL_WARN_ON_USE (ctime_r, "ctime_r can overrun buffers in some cases - " "better use strftime (or even sprintf) instead"); # endif diff --git a/lib/unistd.in.h b/lib/unistd.in.h index 59ee39e..4033ffe 100644 --- a/lib/unistd.in.h +++ b/lib/unistd.in.h @@ -1,5 +1,5 @@ /* Substitute for and wrapper around . - Copyright (C) 2003-2019 Free Software Foundation, Inc. + Copyright (C) 2003-2020 Free Software Foundation, Inc. This program is free software; you can redistribute it and/or modify it under the terms of the GNU General Public License as published by @@ -21,7 +21,7 @@ #endif @PRAGMA_COLUMNS@ -#ifdef _GL_INCLUDING_UNISTD_H +#if @HAVE_UNISTD_H@ && defined _GL_INCLUDING_UNISTD_H /* Special invocation convention: - On Mac OS X 10.3.9 we have a sequence of nested includes -> -> -> @@ -93,20 +93,18 @@ # undef __need_system_stdlib_h #endif -/* Native Windows platforms declare chdir, getcwd, rmdir in +/* Native Windows platforms declare _chdir, _getcwd, _rmdir in and/or , not in . - They also declare access(), chmod(), close(), dup(), dup2(), isatty(), - lseek(), read(), unlink(), write() in . */ -#if ((@GNULIB_CHDIR@ || @GNULIB_GETCWD@ || @GNULIB_RMDIR@ \ - || defined GNULIB_POSIXCHECK) \ - && (defined _WIN32 && ! defined __CYGWIN__)) -# include /* mingw32, mingw64 */ -# include /* mingw64, MSVC 9 */ -#elif (@GNULIB_CLOSE@ || @GNULIB_DUP@ || @GNULIB_DUP2@ || @GNULIB_ISATTY@ \ - || @GNULIB_LSEEK@ || @GNULIB_READ@ || @GNULIB_UNLINK@ || @GNULIB_WRITE@ \ - || defined GNULIB_POSIXCHECK) \ - && (defined _WIN32 && ! defined __CYGWIN__) + They also declare _access(), _chmod(), _close(), _dup(), _dup2(), _isatty(), + _lseek(), _read(), _unlink(), _write() in . */ +#if defined _WIN32 && !defined __CYGWIN__ # include +# include +#endif + +/* Native Windows platforms declare _execl*, _execv* in . */ +#if defined _WIN32 && !defined __CYGWIN__ +# include #endif /* AIX and OSF/1 5.1 declare getdomainname in , not in . @@ -118,6 +116,17 @@ # include #endif +/* Mac OS X 10.13, Solaris 11.4, and Android 9.0 declare getentropy in + , not in . */ +/* But avoid namespace pollution on glibc systems. */ +#if (@GNULIB_GETENTROPY@ || defined GNULIB_POSIXCHECK) \ + && ((defined __APPLE__ && defined __MACH__) || defined __sun \ + || defined __ANDROID__) \ + && @UNISTD_H_HAVE_SYS_RANDOM_H@ \ + && !defined __GLIBC__ +# include +#endif + /* Android 4.3 declares fchownat in , not in . */ /* But avoid namespace pollution on glibc systems. */ #if (@GNULIB_FCHOWNAT@ || defined GNULIB_POSIXCHECK) && defined __ANDROID__ \ @@ -127,11 +136,8 @@ /* MSVC defines off_t in . May also define off_t to a 64-bit type on native Windows. */ -/* But avoid namespace pollution on glibc systems. */ -#ifndef __GLIBC__ -/* Get off_t, ssize_t. */ -# include -#endif +/* Get off_t, ssize_t, mode_t. */ +#include /* The definitions of _GL_FUNCDECL_RPL etc. are copied here. */ @@ -141,7 +147,7 @@ /* Get getopt(), optarg, optind, opterr, optopt. */ -#if @GNULIB_UNISTD_H_GETOPT@ && !defined _GL_SYSTEM_GETOPT +#if @GNULIB_GETOPT_POSIX@ && @GNULIB_UNISTD_H_GETOPT@ && !defined _GL_SYSTEM_GETOPT # include # include #endif @@ -253,15 +259,61 @@ _GL_INLINE_HEADER_BEGIN /* Declare overridden functions. */ -#if defined GNULIB_POSIXCHECK +#if @GNULIB_ACCESS@ +# if @REPLACE_ACCESS@ +# if !(defined __cplusplus && defined GNULIB_NAMESPACE) +# undef access +# define access rpl_access +# endif +_GL_FUNCDECL_RPL (access, int, (const char *file, int mode) + _GL_ARG_NONNULL ((1))); +_GL_CXXALIAS_RPL (access, int, (const char *file, int mode)); +# elif defined _WIN32 && !defined __CYGWIN__ +# if !(defined __cplusplus && defined GNULIB_NAMESPACE) +# undef access +# define access _access +# endif +_GL_CXXALIAS_MDA (access, int, (const char *file, int mode)); +# else +_GL_CXXALIAS_SYS (access, int, (const char *file, int mode)); +# endif +_GL_CXXALIASWARN (access); +#elif defined GNULIB_POSIXCHECK +# undef access +# if HAVE_RAW_DECL_ACCESS /* The access() function is a security risk. */ -_GL_WARN_ON_USE (access, "the access function is a security risk - " +_GL_WARN_ON_USE (access, "access does not always support X_OK - " + "use gnulib module access for portability; " + "also, this function is a security risk - " "use the gnulib module faccessat instead"); +# endif +#else +/* On native Windows, map 'access' to '_access', so that -loldnames is not + required. In C++ with GNULIB_NAMESPACE, avoid differences between + platforms by defining GNULIB_NAMESPACE::access always. */ +# if defined _WIN32 && !defined __CYGWIN__ +# if !(defined __cplusplus && defined GNULIB_NAMESPACE) +# undef access +# define access _access +# endif +_GL_CXXALIAS_MDA (access, int, (const char *file, int mode)); +# else +_GL_CXXALIAS_SYS (access, int, (const char *file, int mode)); +# endif +_GL_CXXALIASWARN (access); #endif #if @GNULIB_CHDIR@ +# if defined _WIN32 && !defined __CYGWIN__ +# if !(defined __cplusplus && defined GNULIB_NAMESPACE) +# undef chdir +# define chdir _chdir +# endif +_GL_CXXALIAS_MDA (chdir, int, (const char *file)); +# else _GL_CXXALIAS_SYS (chdir, int, (const char *file) _GL_ARG_NONNULL ((1))); +# endif _GL_CXXALIASWARN (chdir); #elif defined GNULIB_POSIXCHECK # undef chdir @@ -269,6 +321,20 @@ _GL_CXXALIASWARN (chdir); _GL_WARN_ON_USE (chown, "chdir is not always in - " "use gnulib module chdir for portability"); # endif +#else +/* On native Windows, map 'chdir' to '_chdir', so that -loldnames is not + required. In C++ with GNULIB_NAMESPACE, avoid differences between + platforms by defining GNULIB_NAMESPACE::chdir always. */ +# if defined _WIN32 && !defined __CYGWIN__ +# if !(defined __cplusplus && defined GNULIB_NAMESPACE) +# undef chdir +# define chdir _chdir +# endif +_GL_CXXALIAS_MDA (chdir, int, (const char *file)); +# else +_GL_CXXALIAS_SYS (chdir, int, (const char *file) _GL_ARG_NONNULL ((1))); +# endif +_GL_CXXALIASWARN (chdir); #endif @@ -277,7 +343,7 @@ _GL_WARN_ON_USE (chown, "chdir is not always in - " to GID (if GID is not -1). Follow symbolic links. Return 0 if successful, otherwise -1 and errno set. See the POSIX:2008 specification - . */ + . */ # if @REPLACE_DUP2@ # if !(defined __cplusplus && defined GNULIB_NAMESPACE) # define dup2 rpl_dup2 # endif _GL_FUNCDECL_RPL (dup2, int, (int oldfd, int newfd)); _GL_CXXALIAS_RPL (dup2, int, (int oldfd, int newfd)); -# else -# if !@HAVE_DUP2@ -_GL_FUNCDECL_SYS (dup2, int, (int oldfd, int newfd)); +# elif defined _WIN32 && !defined __CYGWIN__ +# if !(defined __cplusplus && defined GNULIB_NAMESPACE) +# undef dup2 +# define dup2 _dup2 # endif +_GL_CXXALIAS_MDA (dup2, int, (int oldfd, int newfd)); +# else _GL_CXXALIAS_SYS (dup2, int, (int oldfd, int newfd)); # endif _GL_CXXALIASWARN (dup2); @@ -391,6 +501,20 @@ _GL_CXXALIASWARN (dup2); _GL_WARN_ON_USE (dup2, "dup2 is unportable - " "use gnulib module dup2 for portability"); # endif +#else +/* On native Windows, map 'dup2' to '_dup2', so that -loldnames is not + required. In C++ with GNULIB_NAMESPACE, avoid differences between + platforms by defining GNULIB_NAMESPACE::dup2 always. */ +# if defined _WIN32 && !defined __CYGWIN__ +# if !(defined __cplusplus && defined GNULIB_NAMESPACE) +# undef dup2 +# define dup2 _dup2 +# endif +_GL_CXXALIAS_MDA (dup2, int, (int oldfd, int newfd)); +# else +_GL_CXXALIAS_SYS (dup2, int, (int oldfd, int newfd)); +# endif +_GL_CXXALIASWARN (dup2); #endif @@ -491,6 +615,119 @@ _GL_WARN_ON_USE (euidaccess, "euidaccess is unportable - " #endif +/* On native Windows, map 'execl' to '_execl', so that -loldnames is not + required. In C++ with GNULIB_NAMESPACE, avoid differences between + platforms by defining GNULIB_NAMESPACE::execl always. */ +#if defined _WIN32 && !defined __CYGWIN__ +# if !(defined __cplusplus && defined GNULIB_NAMESPACE) +# undef execl +# define execl _execl +# endif +_GL_CXXALIAS_MDA (execl, intptr_t, (const char *program, const char *arg, ...)); +#else +_GL_CXXALIAS_SYS (execl, int, (const char *program, const char *arg, ...)); +#endif +_GL_CXXALIASWARN (execl); + +/* On native Windows, map 'execle' to '_execle', so that -loldnames is not + required. In C++ with GNULIB_NAMESPACE, avoid differences between + platforms by defining GNULIB_NAMESPACE::execle always. */ +#if defined _WIN32 && !defined __CYGWIN__ +# if !(defined __cplusplus && defined GNULIB_NAMESPACE) +# undef execle +# define execle _execle +# endif +_GL_CXXALIAS_MDA (execle, intptr_t, (const char *program, const char *arg, ...)); +#else +_GL_CXXALIAS_SYS (execle, int, (const char *program, const char *arg, ...)); +#endif +_GL_CXXALIASWARN (execle); + +/* On native Windows, map 'execlp' to '_execlp', so that -loldnames is not + required. In C++ with GNULIB_NAMESPACE, avoid differences between + platforms by defining GNULIB_NAMESPACE::execlp always. */ +#if defined _WIN32 && !defined __CYGWIN__ +# if !(defined __cplusplus && defined GNULIB_NAMESPACE) +# undef execlp +# define execlp _execlp +# endif +_GL_CXXALIAS_MDA (execlp, intptr_t, (const char *program, const char *arg, ...)); +#else +_GL_CXXALIAS_SYS (execlp, int, (const char *program, const char *arg, ...)); +#endif +_GL_CXXALIASWARN (execlp); + + +/* On native Windows, map 'execv' to '_execv', so that -loldnames is not + required. In C++ with GNULIB_NAMESPACE, avoid differences between + platforms by defining GNULIB_NAMESPACE::execv always. */ +#if defined _WIN32 && !defined __CYGWIN__ +# if !(defined __cplusplus && defined GNULIB_NAMESPACE) +# undef execv +# define execv _execv +# endif +_GL_CXXALIAS_MDA (execv, intptr_t, + (const char *program, const char * const *argv)); +#else +_GL_CXXALIAS_SYS (execv, int, (const char *program, char * const *argv)); +#endif +_GL_CXXALIASWARN (execv); + +/* On native Windows, map 'execve' to '_execve', so that -loldnames is not + required. In C++ with GNULIB_NAMESPACE, avoid differences between + platforms by defining GNULIB_NAMESPACE::execve always. */ +#if defined _WIN32 && !defined __CYGWIN__ +# if !(defined __cplusplus && defined GNULIB_NAMESPACE) +# undef execve +# define execve _execve +# endif +_GL_CXXALIAS_MDA (execve, intptr_t, + (const char *program, const char * const *argv, + const char * const *env)); +#else +_GL_CXXALIAS_SYS (execve, int, + (const char *program, char * const *argv, char * const *env)); +#endif +_GL_CXXALIASWARN (execve); + +/* On native Windows, map 'execvp' to '_execvp', so that -loldnames is not + required. In C++ with GNULIB_NAMESPACE, avoid differences between + platforms by defining GNULIB_NAMESPACE::execvp always. */ +#if defined _WIN32 && !defined __CYGWIN__ +# if !(defined __cplusplus && defined GNULIB_NAMESPACE) +# undef execvp +# define execvp _execvp +# endif +_GL_CXXALIAS_MDA (execvp, intptr_t, + (const char *program, const char * const *argv)); +#else +_GL_CXXALIAS_SYS (execvp, int, (const char *program, char * const *argv)); +#endif +_GL_CXXALIASWARN (execvp); + +/* On native Windows, map 'execvpe' to '_execvpe', so that -loldnames is not + required. In C++ with GNULIB_NAMESPACE, avoid differences between + platforms by defining GNULIB_NAMESPACE::execvpe on all platforms that have + it. */ +#if defined _WIN32 && !defined __CYGWIN__ +# if !(defined __cplusplus && defined GNULIB_NAMESPACE) +# undef execvpe +# define execvpe _execvpe +# endif +_GL_CXXALIAS_MDA (execvpe, intptr_t, + (const char *program, const char * const *argv, + const char * const *env)); +#else +# if @HAVE_DECL_EXECVPE@ +_GL_CXXALIAS_SYS (execvpe, int, + (const char *program, char * const *argv, char * const *env)); +# endif +#endif +#if (defined _WIN32 && !defined __CYGWIN__) || @HAVE_DECL_EXECVPE@ +_GL_CXXALIASWARN (execvpe); +#endif + + #if @GNULIB_FACCESSAT@ # if @REPLACE_FACCESSAT@ # if !(defined __cplusplus && defined GNULIB_NAMESPACE) @@ -526,7 +763,7 @@ _GL_WARN_ON_USE (faccessat, "faccessat is not portable - " the given file descriptor is open. Return 0 if successful, otherwise -1 and errno set. See the POSIX:2008 specification - . */ + . */ # if ! @HAVE_FCHDIR@ _GL_FUNCDECL_SYS (fchdir, int, (int /*fd*/)); @@ -587,7 +824,7 @@ _GL_WARN_ON_USE (fchownat, "fchownat is not portable - " /* Synchronize changes to a file. Return 0 if successful, otherwise -1 and errno set. See POSIX:2008 specification - . */ + . */ # if !@HAVE_FDATASYNC@ || !@HAVE_DECL_FDATASYNC@ _GL_FUNCDECL_SYS (fdatasync, int, (int fd)); # endif @@ -606,7 +843,7 @@ _GL_WARN_ON_USE (fdatasync, "fdatasync is unportable - " /* Synchronize changes, including metadata, to a file. Return 0 if successful, otherwise -1 and errno set. See POSIX:2008 specification - . */ + . */ # if !@HAVE_FSYNC@ _GL_FUNCDECL_SYS (fsync, int, (int fd)); # endif @@ -625,7 +862,7 @@ _GL_WARN_ON_USE (fsync, "fsync is unportable - " /* Change the size of the file to which FD is opened to become equal to LENGTH. Return 0 if successful, otherwise -1 and errno set. See the POSIX:2008 specification - . */ + . */ # if @REPLACE_FTRUNCATE@ # if !(defined __cplusplus && defined GNULIB_NAMESPACE) # undef ftruncate @@ -655,7 +892,7 @@ _GL_WARN_ON_USE (ftruncate, "ftruncate is unportable - " Return BUF if successful, or NULL if the directory couldn't be determined or SIZE was too small. See the POSIX:2008 specification - . + . Additionally, the gnulib module 'getcwd' guarantees the following GNU extension: If BUF is NULL, an array is allocated with 'malloc'; the array is SIZE bytes long, unless SIZE == 0, in which case it is as big as @@ -666,6 +903,12 @@ _GL_WARN_ON_USE (ftruncate, "ftruncate is unportable - " # endif _GL_FUNCDECL_RPL (getcwd, char *, (char *buf, size_t size)); _GL_CXXALIAS_RPL (getcwd, char *, (char *buf, size_t size)); +# elif defined _WIN32 && !defined __CYGWIN__ +# if !(defined __cplusplus && defined GNULIB_NAMESPACE) +# undef getcwd +# define getcwd _getcwd +# endif +_GL_CXXALIAS_MDA (getcwd, char *, (char *buf, size_t size)); # else /* Need to cast, because on mingw, the second parameter is int size. */ @@ -678,6 +921,22 @@ _GL_CXXALIASWARN (getcwd); _GL_WARN_ON_USE (getcwd, "getcwd is unportable - " "use gnulib module getcwd for portability"); # endif +#else +/* On native Windows, map 'getcwd' to '_getcwd', so that -loldnames is not + required. In C++ with GNULIB_NAMESPACE, avoid differences between + platforms by defining GNULIB_NAMESPACE::getcwd always. */ +# if defined _WIN32 && !defined __CYGWIN__ +# if !(defined __cplusplus && defined GNULIB_NAMESPACE) +# undef getcwd +# define getcwd _getcwd +# endif +/* Need to cast, because on mingw, the second parameter is either + 'int size' or 'size_t size'. */ +_GL_CXXALIAS_MDA_CAST (getcwd, char *, (char *buf, size_t size)); +# else +_GL_CXXALIAS_SYS_CAST (getcwd, char *, (char *buf, size_t size)); +# endif +_GL_CXXALIASWARN (getcwd); #endif @@ -731,7 +990,9 @@ _GL_CXXALIAS_RPL (getdtablesize, int, (void)); # if !@HAVE_GETDTABLESIZE@ _GL_FUNCDECL_SYS (getdtablesize, int, (void)); # endif -_GL_CXXALIAS_SYS (getdtablesize, int, (void)); +/* Need to cast, because on AIX, the parameter list is + (...). */ +_GL_CXXALIAS_SYS_CAST (getdtablesize, int, (void)); # endif _GL_CXXALIASWARN (getdtablesize); #elif defined GNULIB_POSIXCHECK @@ -743,6 +1004,22 @@ _GL_WARN_ON_USE (getdtablesize, "getdtablesize is unportable - " #endif +#if @GNULIB_GETENTROPY@ +/* Fill a buffer with random bytes. */ +# if !@HAVE_GETENTROPY@ +_GL_FUNCDECL_SYS (getentropy, int, (void *buffer, size_t length)); +# endif +_GL_CXXALIAS_SYS (getentropy, int, (void *buffer, size_t length)); +_GL_CXXALIASWARN (getentropy); +#elif defined GNULIB_POSIXCHECK +# undef getentropy +# if HAVE_RAW_DECL_GETENTROPY +_GL_WARN_ON_USE (getentropy, "getentropy is unportable - " + "use gnulib module getentropy for portability"); +# endif +#endif + + #if @GNULIB_GETGROUPS@ /* Return the supplemental groups that the current process belongs to. It is unspecified whether the effective group id is in the list. @@ -815,7 +1092,7 @@ _GL_WARN_ON_USE (gethostname, "gethostname is unportable - " /* Returns the user's login name, or NULL if it cannot be found. Upon error, returns NULL with errno set. - See . + See . Most programs don't need to use this function, because the information is available through environment variables: @@ -844,7 +1121,7 @@ _GL_WARN_ON_USE (getlogin, "getlogin is unportable - " the case that the login name cannot be found but no specific error is provided (this case is hopefully rare but is left open by the POSIX spec). - See . + See . Most programs don't need to use this function, because the information is available through environment variables: @@ -885,6 +1162,11 @@ _GL_WARN_ON_USE (getlogin_r, "getlogin_r is unportable - " _GL_FUNCDECL_RPL (getpagesize, int, (void)); _GL_CXXALIAS_RPL (getpagesize, int, (void)); # else +/* On HP-UX, getpagesize exists, but it is not declared in even if + the compiler options -D_HPUX_SOURCE -D_XOPEN_SOURCE=600 are used. */ +# if defined __hpux +_GL_FUNCDECL_SYS (getpagesize, int, (void)); +# endif # if !@HAVE_GETPAGESIZE@ # if !defined getpagesize /* This is for POSIX systems. */ @@ -989,6 +1271,21 @@ _GL_WARN_ON_USE (getpass, "getpass is unportable - " #endif +/* On native Windows, map 'getpid' to '_getpid', so that -loldnames is not + required. In C++ with GNULIB_NAMESPACE, avoid differences between + platforms by defining GNULIB_NAMESPACE::getpid always. */ +#if defined _WIN32 && !defined __CYGWIN__ +# if !(defined __cplusplus && defined GNULIB_NAMESPACE) +# undef getpid +# define getpid _getpid +# endif +_GL_CXXALIAS_MDA (getpid, int, (void)); +#else +_GL_CXXALIAS_SYS (getpid, pid_t, (void)); +#endif +_GL_CXXALIASWARN (getpid); + + #if @GNULIB_GETUSERSHELL@ /* Return the next valid login shell on the system, or NULL when the end of the list has been reached. */ @@ -1061,6 +1358,12 @@ _GL_WARN_ON_USE (group_member, "group_member is unportable - " # endif _GL_FUNCDECL_RPL (isatty, int, (int fd)); _GL_CXXALIAS_RPL (isatty, int, (int fd)); +# elif defined _WIN32 && !defined __CYGWIN__ +# if !(defined __cplusplus && defined GNULIB_NAMESPACE) +# undef isatty +# define isatty _isatty +# endif +_GL_CXXALIAS_MDA (isatty, int, (int fd)); # else _GL_CXXALIAS_SYS (isatty, int, (int fd)); # endif @@ -1071,6 +1374,20 @@ _GL_CXXALIASWARN (isatty); _GL_WARN_ON_USE (isatty, "isatty has portability problems on native Windows - " "use gnulib module isatty for portability"); # endif +#else +/* On native Windows, map 'isatty' to '_isatty', so that -loldnames is not + required. In C++ with GNULIB_NAMESPACE, avoid differences between + platforms by defining GNULIB_NAMESPACE::isatty always. */ +# if defined _WIN32 && !defined __CYGWIN__ +# if !(defined __cplusplus && defined GNULIB_NAMESPACE) +# undef isatty +# define isatty _isatty +# endif +_GL_CXXALIAS_MDA (isatty, int, (int fd)); +# else +_GL_CXXALIAS_SYS (isatty, int, (int fd)); +# endif +_GL_CXXALIASWARN (isatty); #endif @@ -1079,7 +1396,7 @@ _GL_WARN_ON_USE (isatty, "isatty has portability problems on native Windows - " to GID (if GID is not -1). Do not follow symbolic links. Return 0 if successful, otherwise -1 and errno set. See the POSIX:2008 specification - . */ + . */ # if @REPLACE_LCHOWN@ # if !(defined __cplusplus && defined GNULIB_NAMESPACE) # undef lchown @@ -1109,7 +1426,7 @@ _GL_WARN_ON_USE (lchown, "lchown is unportable to pre-POSIX.1-2001 systems - " /* Create a new hard link for an existing file. Return 0 if successful, otherwise -1 and errno set. See POSIX:2008 specification - . */ + . */ # if @REPLACE_LINK@ # if !(defined __cplusplus && defined GNULIB_NAMESPACE) # define link rpl_link @@ -1175,13 +1492,19 @@ _GL_WARN_ON_USE (linkat, "linkat is unportable - " /* Set the offset of FD relative to SEEK_SET, SEEK_CUR, or SEEK_END. Return the new offset if successful, otherwise -1 and errno set. See the POSIX:2008 specification - . */ + . */ # if @REPLACE_LSEEK@ # if !(defined __cplusplus && defined GNULIB_NAMESPACE) # define lseek rpl_lseek # endif _GL_FUNCDECL_RPL (lseek, off_t, (int fd, off_t offset, int whence)); _GL_CXXALIAS_RPL (lseek, off_t, (int fd, off_t offset, int whence)); +# elif defined _WIN32 && !defined __CYGWIN__ +# if !(defined __cplusplus && defined GNULIB_NAMESPACE) +# undef lseek +# define lseek _lseek +# endif +_GL_CXXALIAS_MDA (lseek, off_t, (int fd, off_t offset, int whence)); # else _GL_CXXALIAS_SYS (lseek, off_t, (int fd, off_t offset, int whence)); # endif @@ -1192,6 +1515,20 @@ _GL_CXXALIASWARN (lseek); _GL_WARN_ON_USE (lseek, "lseek does not fail with ESPIPE on pipes on some " "systems - use gnulib module lseek for portability"); # endif +#else +/* On native Windows, map 'lseek' to '_lseek', so that -loldnames is not + required. In C++ with GNULIB_NAMESPACE, avoid differences between + platforms by defining GNULIB_NAMESPACE::lseek always. */ +# if defined _WIN32 && !defined __CYGWIN__ +# if !(defined __cplusplus && defined GNULIB_NAMESPACE) +# undef lseek +# define lseek _lseek +# endif +_GL_CXXALIAS_MDA (lseek, long, (int fd, long offset, int whence)); +# else +_GL_CXXALIAS_SYS (lseek, off_t, (int fd, off_t offset, int whence)); +# endif +_GL_CXXALIASWARN (lseek); #endif @@ -1247,7 +1584,7 @@ _GL_WARN_ON_USE (pipe2, "pipe2 is unportable - " Return the number of bytes placed into BUF if successful, otherwise set errno and return -1. 0 indicates EOF. See the POSIX:2008 specification - . */ + . */ # if @REPLACE_PREAD@ # if !(defined __cplusplus && defined GNULIB_NAMESPACE) # undef pread @@ -1282,7 +1619,7 @@ _GL_WARN_ON_USE (pread, "pread is unportable - " Return the number of bytes written if successful, otherwise set errno and return -1. 0 indicates nothing written. See the POSIX:2008 specification - . */ + . */ # if @REPLACE_PWRITE@ # if !(defined __cplusplus && defined GNULIB_NAMESPACE) # undef pwrite @@ -1315,7 +1652,7 @@ _GL_WARN_ON_USE (pwrite, "pwrite is unportable - " #if @GNULIB_READ@ /* Read up to COUNT bytes from file descriptor FD into the buffer starting at BUF. See the POSIX:2008 specification - . */ + . */ # if @REPLACE_READ@ # if !(defined __cplusplus && defined GNULIB_NAMESPACE) # undef read @@ -1324,11 +1661,32 @@ _GL_WARN_ON_USE (pwrite, "pwrite is unportable - " _GL_FUNCDECL_RPL (read, ssize_t, (int fd, void *buf, size_t count) _GL_ARG_NONNULL ((2))); _GL_CXXALIAS_RPL (read, ssize_t, (int fd, void *buf, size_t count)); +# elif defined _WIN32 && !defined __CYGWIN__ +# if !(defined __cplusplus && defined GNULIB_NAMESPACE) +# undef read +# define read _read +# endif +_GL_CXXALIAS_MDA (read, ssize_t, (int fd, void *buf, size_t count)); # else -/* Need to cast, because on mingw, the third parameter is - unsigned int count - and the return type is 'int'. */ -_GL_CXXALIAS_SYS_CAST (read, ssize_t, (int fd, void *buf, size_t count)); +_GL_CXXALIAS_SYS (read, ssize_t, (int fd, void *buf, size_t count)); +# endif +_GL_CXXALIASWARN (read); +#else +/* On native Windows, map 'read' to '_read', so that -loldnames is not + required. In C++ with GNULIB_NAMESPACE, avoid differences between + platforms by defining GNULIB_NAMESPACE::read always. */ +# if defined _WIN32 && !defined __CYGWIN__ +# if !(defined __cplusplus && defined GNULIB_NAMESPACE) +# undef read +# define read _read +# endif +# ifdef __MINGW32__ +_GL_CXXALIAS_MDA (read, int, (int fd, void *buf, unsigned int count)); +# else +_GL_CXXALIAS_MDA (read, ssize_t, (int fd, void *buf, unsigned int count)); +# endif +# else +_GL_CXXALIAS_SYS (read, ssize_t, (int fd, void *buf, size_t count)); # endif _GL_CXXALIASWARN (read); #endif @@ -1339,24 +1697,28 @@ _GL_CXXALIASWARN (read); bytes of it into BUF. Return the number of bytes placed into BUF if successful, otherwise -1 and errno set. See the POSIX:2008 specification - . */ + . */ # if @REPLACE_READLINK@ # if !(defined __cplusplus && defined GNULIB_NAMESPACE) # define readlink rpl_readlink # endif _GL_FUNCDECL_RPL (readlink, ssize_t, - (const char *file, char *buf, size_t bufsize) + (const char *restrict file, + char *restrict buf, size_t bufsize) _GL_ARG_NONNULL ((1, 2))); _GL_CXXALIAS_RPL (readlink, ssize_t, - (const char *file, char *buf, size_t bufsize)); + (const char *restrict file, + char *restrict buf, size_t bufsize)); # else # if !@HAVE_READLINK@ _GL_FUNCDECL_SYS (readlink, ssize_t, - (const char *file, char *buf, size_t bufsize) + (const char *restrict file, + char *restrict buf, size_t bufsize) _GL_ARG_NONNULL ((1, 2))); # endif _GL_CXXALIAS_SYS (readlink, ssize_t, - (const char *file, char *buf, size_t bufsize)); + (const char *restrict file, + char *restrict buf, size_t bufsize)); # endif _GL_CXXALIASWARN (readlink); #elif defined GNULIB_POSIXCHECK @@ -1374,18 +1736,22 @@ _GL_WARN_ON_USE (readlink, "readlink is unportable - " # define readlinkat rpl_readlinkat # endif _GL_FUNCDECL_RPL (readlinkat, ssize_t, - (int fd, char const *file, char *buf, size_t len) + (int fd, char const *restrict file, + char *restrict buf, size_t len) _GL_ARG_NONNULL ((2, 3))); _GL_CXXALIAS_RPL (readlinkat, ssize_t, - (int fd, char const *file, char *buf, size_t len)); + (int fd, char const *restrict file, + char *restrict buf, size_t len)); # else # if !@HAVE_READLINKAT@ _GL_FUNCDECL_SYS (readlinkat, ssize_t, - (int fd, char const *file, char *buf, size_t len) + (int fd, char const *restrict file, + char *restrict buf, size_t len) _GL_ARG_NONNULL ((2, 3))); # endif _GL_CXXALIAS_SYS (readlinkat, ssize_t, - (int fd, char const *file, char *buf, size_t len)); + (int fd, char const *restrict file, + char *restrict buf, size_t len)); # endif _GL_CXXALIASWARN (readlinkat); #elif defined GNULIB_POSIXCHECK @@ -1405,6 +1771,12 @@ _GL_WARN_ON_USE (readlinkat, "readlinkat is not portable - " # endif _GL_FUNCDECL_RPL (rmdir, int, (char const *name) _GL_ARG_NONNULL ((1))); _GL_CXXALIAS_RPL (rmdir, int, (char const *name)); +# elif defined _WIN32 && !defined __CYGWIN__ +# if !(defined __cplusplus && defined GNULIB_NAMESPACE) +# undef rmdir +# define rmdir _rmdir +# endif +_GL_CXXALIAS_MDA (rmdir, int, (char const *name)); # else _GL_CXXALIAS_SYS (rmdir, int, (char const *name)); # endif @@ -1415,6 +1787,20 @@ _GL_CXXALIASWARN (rmdir); _GL_WARN_ON_USE (rmdir, "rmdir is unportable - " "use gnulib module rmdir for portability"); # endif +#else +/* On native Windows, map 'rmdir' to '_rmdir', so that -loldnames is not + required. In C++ with GNULIB_NAMESPACE, avoid differences between + platforms by defining GNULIB_NAMESPACE::rmdir always. */ +# if defined _WIN32 && !defined __CYGWIN__ +# if !(defined __cplusplus && defined GNULIB_NAMESPACE) +# undef rmdir +# define rmdir _rmdir +# endif +_GL_CXXALIAS_MDA (rmdir, int, (char const *name)); +# else +_GL_CXXALIAS_SYS (rmdir, int, (char const *name)); +# endif +_GL_CXXALIASWARN (rmdir); #endif @@ -1449,7 +1835,7 @@ _GL_WARN_ON_USE (sethostname, "sethostname is unportable - " /* Pause the execution of the current thread for N seconds. Returns the number of seconds left to sleep. See the POSIX:2008 specification - . */ + . */ # if @REPLACE_SLEEP@ # if !(defined __cplusplus && defined GNULIB_NAMESPACE) # undef sleep @@ -1473,6 +1859,21 @@ _GL_WARN_ON_USE (sleep, "sleep is unportable - " #endif +/* On native Windows, map 'swab' to '_swab', so that -loldnames is not + required. In C++ with GNULIB_NAMESPACE, avoid differences between + platforms by defining GNULIB_NAMESPACE::creat always. */ +#if defined _WIN32 && !defined __CYGWIN__ +# if !(defined __cplusplus && defined GNULIB_NAMESPACE) +# undef swab +# define swab _swab +# endif +_GL_CXXALIAS_MDA (swab, void, (char *from, char *to, int n)); +#else +_GL_CXXALIAS_SYS (swab, void, (const void *from, void *to, ssize_t n)); +#endif +_GL_CXXALIASWARN (swab); + + #if @GNULIB_SYMLINK@ # if @REPLACE_SYMLINK@ # if !(defined __cplusplus && defined GNULIB_NAMESPACE) @@ -1533,7 +1934,7 @@ _GL_WARN_ON_USE (symlinkat, "symlinkat is not portable - " /* Change the size of the file designated by FILENAME to become equal to LENGTH. Return 0 if successful, otherwise -1 and errno set. See the POSIX:2008 specification - . */ + . */ # if @REPLACE_TRUNCATE@ # if !(defined __cplusplus && defined GNULIB_NAMESPACE) # undef truncate @@ -1597,6 +1998,12 @@ _GL_WARN_ON_USE (ttyname_r, "ttyname_r is not portable - " # endif _GL_FUNCDECL_RPL (unlink, int, (char const *file) _GL_ARG_NONNULL ((1))); _GL_CXXALIAS_RPL (unlink, int, (char const *file)); +# elif defined _WIN32 && !defined __CYGWIN__ +# if !(defined __cplusplus && defined GNULIB_NAMESPACE) +# undef unlink +# define unlink _unlink +# endif +_GL_CXXALIAS_MDA (unlink, int, (char const *file)); # else _GL_CXXALIAS_SYS (unlink, int, (char const *file)); # endif @@ -1607,6 +2014,20 @@ _GL_CXXALIASWARN (unlink); _GL_WARN_ON_USE (unlink, "unlink is not portable - " "use gnulib module unlink for portability"); # endif +#else +/* On native Windows, map 'unlink' to '_unlink', so that -loldnames is not + required. In C++ with GNULIB_NAMESPACE, avoid differences between + platforms by defining GNULIB_NAMESPACE::unlink always. */ +# if defined _WIN32 && !defined __CYGWIN__ +# if !(defined __cplusplus && defined GNULIB_NAMESPACE) +# undef unlink +# define unlink _unlink +# endif +_GL_CXXALIAS_MDA (unlink, int, (char const *file)); +# else +_GL_CXXALIAS_SYS (unlink, int, (char const *file)); +# endif +_GL_CXXALIASWARN (unlink); #endif @@ -1640,7 +2061,7 @@ _GL_WARN_ON_USE (unlinkat, "unlinkat is not portable - " /* Pause the execution of the current thread for N microseconds. Returns 0 on completion, or -1 on range error. See the POSIX:2001 specification - . */ + . */ # if @REPLACE_USLEEP@ # if !(defined __cplusplus && defined GNULIB_NAMESPACE) # undef usleep @@ -1652,7 +2073,9 @@ _GL_CXXALIAS_RPL (usleep, int, (useconds_t n)); # if !@HAVE_USLEEP@ _GL_FUNCDECL_SYS (usleep, int, (useconds_t n)); # endif -_GL_CXXALIAS_SYS (usleep, int, (useconds_t n)); +/* Need to cast, because on Haiku, the first parameter is + unsigned int n. */ +_GL_CXXALIAS_SYS_CAST (usleep, int, (useconds_t n)); # endif _GL_CXXALIASWARN (usleep); #elif defined GNULIB_POSIXCHECK @@ -1667,7 +2090,7 @@ _GL_WARN_ON_USE (usleep, "usleep is unportable - " #if @GNULIB_WRITE@ /* Write up to COUNT bytes starting at BUF to file descriptor FD. See the POSIX:2008 specification - . */ + . */ # if @REPLACE_WRITE@ # if !(defined __cplusplus && defined GNULIB_NAMESPACE) # undef write @@ -1676,11 +2099,32 @@ _GL_WARN_ON_USE (usleep, "usleep is unportable - " _GL_FUNCDECL_RPL (write, ssize_t, (int fd, const void *buf, size_t count) _GL_ARG_NONNULL ((2))); _GL_CXXALIAS_RPL (write, ssize_t, (int fd, const void *buf, size_t count)); +# elif defined _WIN32 && !defined __CYGWIN__ +# if !(defined __cplusplus && defined GNULIB_NAMESPACE) +# undef write +# define write _write +# endif +_GL_CXXALIAS_MDA (write, ssize_t, (int fd, const void *buf, size_t count)); +# else +_GL_CXXALIAS_SYS (write, ssize_t, (int fd, const void *buf, size_t count)); +# endif +_GL_CXXALIASWARN (write); +#else +/* On native Windows, map 'write' to '_write', so that -loldnames is not + required. In C++ with GNULIB_NAMESPACE, avoid differences between + platforms by defining GNULIB_NAMESPACE::write always. */ +# if defined _WIN32 && !defined __CYGWIN__ +# if !(defined __cplusplus && defined GNULIB_NAMESPACE) +# undef write +# define write _write +# endif +# ifdef __MINGW32__ +_GL_CXXALIAS_MDA (write, int, (int fd, const void *buf, unsigned int count)); +# else +_GL_CXXALIAS_MDA (write, ssize_t, (int fd, const void *buf, unsigned int count)); +# endif # else -/* Need to cast, because on mingw, the third parameter is - unsigned int count - and the return type is 'int'. */ -_GL_CXXALIAS_SYS_CAST (write, ssize_t, (int fd, const void *buf, size_t count)); +_GL_CXXALIAS_SYS (write, ssize_t, (int fd, const void *buf, size_t count)); # endif _GL_CXXALIASWARN (write); #endif diff --git a/lib/unlink.c b/lib/unlink.c index 90dc9d3..ba5f626 100644 --- a/lib/unlink.c +++ b/lib/unlink.c @@ -1,6 +1,6 @@ /* Work around unlink bugs. - Copyright (C) 2009-2019 Free Software Foundation, Inc. + Copyright (C) 2009-2020 Free Software Foundation, Inc. This 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,9 +24,12 @@ #include #include -#include "dosname.h" +#include "filename.h" #undef unlink +#if defined _WIN32 && !defined __CYGWIN__ +# define unlink _unlink +#endif /* Remove file NAME. Return 0 if successful, -1 if not. */ @@ -65,10 +68,7 @@ rpl_unlink (char const *name) /* Trailing NUL will overwrite the trailing slash. */ char *short_name = malloc (len); if (!short_name) - { - errno = EPERM; - return -1; - } + return -1; memcpy (short_name, name, len); while (len && ISSLASH (short_name[len - 1])) short_name[--len] = '\0'; diff --git a/lib/usleep.c b/lib/usleep.c index 480605f..f735302 100644 --- a/lib/usleep.c +++ b/lib/usleep.c @@ -1,5 +1,5 @@ /* Pausing execution of the current thread. - Copyright (C) 2009-2019 Free Software Foundation, Inc. + Copyright (C) 2009-2020 Free Software Foundation, Inc. Written by Eric Blake , 2009. This program is free software: you can redistribute it and/or modify diff --git a/lib/verify.h b/lib/verify.h index 9b8e1ed..fa1ed71 100644 --- a/lib/verify.h +++ b/lib/verify.h @@ -1,6 +1,6 @@ /* Compile-time assert-like macros. - Copyright (C) 2005-2006, 2009-2019 Free Software Foundation, Inc. + Copyright (C) 2005-2006, 2009-2020 Free Software Foundation, Inc. This program is free software: you can redistribute it and/or modify it under the terms of the GNU General Public License as published by @@ -23,11 +23,15 @@ /* Define _GL_HAVE__STATIC_ASSERT to 1 if _Static_assert (R, DIAGNOSTIC) works as per C11. This is supported by GCC 4.6.0 and later, in C - mode. + mode, and by clang (also in C++ mode). Define _GL_HAVE__STATIC_ASSERT1 to 1 if _Static_assert (R) works as - per C2X, and define _GL_HAVE_STATIC_ASSERT1 if static_assert (R) - works as per C++17. This is supported by GCC 9.1 and later. + per C2X. This is supported by GCC 9.1 and later, and by clang in + C++1z mode. + + Define _GL_HAVE_STATIC_ASSERT1 if static_assert (R) works as per + C++17. This is supported by GCC 9.1 and later, and by clang in + C++1z mode. Support compilers claiming conformance to the relevant standard, and also support GCC when not pedantic. If we were willing to slow @@ -35,7 +39,8 @@ since this affects only the quality of diagnostics, why bother? */ #ifndef __cplusplus # if (201112L <= __STDC_VERSION__ \ - || (!defined __STRICT_ANSI__ && 4 < __GNUC__ + (6 <= __GNUC_MINOR__))) + || (!defined __STRICT_ANSI__ \ + && (4 < __GNUC__ + (6 <= __GNUC_MINOR__) || 4 <= __clang_major__))) # define _GL_HAVE__STATIC_ASSERT 1 # endif # if (202000L <= __STDC_VERSION__ \ @@ -43,7 +48,15 @@ # define _GL_HAVE__STATIC_ASSERT1 1 # endif #else -# if 201703L <= __cplusplus || 9 <= __GNUC__ +# if 4 <= __clang_major__ +# define _GL_HAVE__STATIC_ASSERT 1 +# endif +# if 4 <= __clang_major__ && 201411 <= __cpp_static_assert +# define _GL_HAVE__STATIC_ASSERT1 1 +# endif +# if 201703L <= __cplusplus \ + || 9 <= __GNUC__ \ + || (4 <= __clang_major__ && 201411 <= __cpp_static_assert) # define _GL_HAVE_STATIC_ASSERT1 1 # endif #endif @@ -175,9 +188,11 @@ #define _GL_GENSYM(prefix) _GL_CONCAT (prefix, _GL_COUNTER) /* Verify requirement R at compile-time, as an integer constant expression - that returns 1. If R is false, fail at compile-time. */ + that returns 1. If R is false, fail at compile-time, preferably + with a diagnostic that includes the string-literal DIAGNOSTIC. */ -#define _GL_VERIFY_TRUE(R) (!!sizeof (_GL_VERIFY_TYPE (R))) +#define _GL_VERIFY_TRUE(R, DIAGNOSTIC) \ + (!!sizeof (_GL_VERIFY_TYPE (R, DIAGNOSTIC))) #ifdef __cplusplus # if !GNULIB_defined_struct__gl_verify_type @@ -187,15 +202,16 @@ template }; # define GNULIB_defined_struct__gl_verify_type 1 # endif -# define _GL_VERIFY_TYPE(R) _gl_verify_type<(R) ? 1 : -1> -#elif defined _GL_HAVE__STATIC_ASSERT1 -# define _GL_VERIFY_TYPE(R) \ +# define _GL_VERIFY_TYPE(R, DIAGNOSTIC) \ + _gl_verify_type<(R) ? 1 : -1> +#elif defined _GL_HAVE__STATIC_ASSERT +# define _GL_VERIFY_TYPE(R, DIAGNOSTIC) \ struct { \ - _Static_assert (R); \ + _Static_assert (R, DIAGNOSTIC); \ int _gl_dummy; \ } #else -# define _GL_VERIFY_TYPE(R) \ +# define _GL_VERIFY_TYPE(R, DIAGNOSTIC) \ struct { unsigned int _gl_verify_error_if_negative: (R) ? 1 : -1; } #endif @@ -214,7 +230,7 @@ template #else # define _GL_VERIFY(R, DIAGNOSTIC, ...) \ extern int (*_GL_GENSYM (_gl_verify_function) (void)) \ - [_GL_VERIFY_TRUE (R)] + [_GL_VERIFY_TRUE (R, DIAGNOSTIC)] #endif /* _GL_STATIC_ASSERT_H is defined if this code is copied into assert.h. */ @@ -230,6 +246,22 @@ template /* @assert.h omit start@ */ +#if 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) +#else +# 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 +#endif + /* Each of these macros verifies that its argument R is nonzero. To be portable, R should be an integer constant expression. Unlike assert (R), there is no run-time overhead. @@ -242,37 +274,49 @@ template /* Verify requirement R at compile-time. Return the value of the expression E. */ -#define verify_expr(R, E) (_GL_VERIFY_TRUE (R) ? (E) : (E)) +#define verify_expr(R, E) \ + (_GL_VERIFY_TRUE (R, "verify_expr (" #R ", " #E ")") ? (E) : (E)) /* Verify requirement R at compile-time, as a declaration without a trailing ';'. verify (R) acts like static_assert (R) except that - it is portable to C11/C++14 and earlier, and its name is shorter - and may be more convenient. */ + it is portable to C11/C++14 and earlier, it can issue better + diagnostics, and its name is shorter and may be more convenient. */ -#ifdef _GL_HAVE__STATIC_ASSERT1 -# define verify(R) _Static_assert (R) -#else +#ifdef __PGI +/* PGI barfs if R is long. */ # define verify(R) _GL_VERIFY (R, "verify (...)", -) -#endif - -#ifndef __has_builtin -# define __has_builtin(x) 0 +#else +# define verify(R) _GL_VERIFY (R, "verify (" #R ")", -) #endif /* Assume that R always holds. Behavior is undefined if R is false, - fails to evaluate, or has side effects. Although assuming R can - help a compiler generate better code or diagnostics, performance - can suffer if R uses hard-to-optimize features such as function - calls not inlined by the compiler. */ + fails to evaluate, or has side effects. + + 'assume (R)' is a directive from the programmer telling the + compiler that R is true so the compiler needn't generate code to + test R. This is why 'assume' is in verify.h: it's related to + static checking (in this case, static checking done by the + programmer), not dynamic checking. + + 'assume (R)' can affect compilation of all the code, not just code + that happens to be executed after the assume (R) is "executed". + For example, if the code mistakenly does 'assert (R); assume (R);' + the compiler is entitled to optimize away the 'assert (R)'. + + Although assuming R can help a compiler generate better code or + diagnostics, performance can suffer if R uses hard-to-optimize + features such as function calls not inlined by the compiler. + + Avoid Clang's __builtin_assume, as it breaks GNU Emacs master + as of 2020-08-23T21:09:49Z!eggert@cs.ucla.edu; see + . It's not known whether this breakage + is a Clang bug or an Emacs bug; play it safe for now. */ -#if (__has_builtin (__builtin_unreachable) \ - || 4 < __GNUC__ + (5 <= __GNUC_MINOR__)) +#if _GL_HAS_BUILTIN_UNREACHABLE # define assume(R) ((R) ? (void) 0 : __builtin_unreachable ()) #elif 1200 <= _MSC_VER # define assume(R) __assume (R) -#elif ((defined GCC_LINT || defined lint) \ - && (__has_builtin (__builtin_trap) \ - || 3 < __GNUC__ + (3 < __GNUC_MINOR__ + (4 <= __GNUC_PATCHLEVEL__)))) +#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. */ diff --git a/lib/version-etc-fsf.c b/lib/version-etc-fsf.c index b00819d..20fa0d0 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-2019 Free Software Foundation, Inc. + Copyright (C) 1999-2006, 2009-2020 Free Software Foundation, Inc. This 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/version-etc.c b/lib/version-etc.c index f6b26ef..525691d 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-2019 Free Software Foundation, Inc. + Copyright (C) 1999-2021 Free Software Foundation, Inc. This 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 @@ # define PACKAGE PACKAGE_TARNAME #endif -enum { COPYRIGHT_YEAR = 2019 }; +enum { COPYRIGHT_YEAR = 2021 }; /* The three functions below display the --version information the standard way. diff --git a/lib/version-etc.h b/lib/version-etc.h index 225cfcd..dd1edaf 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-2019 Free Software Foundation, Inc. + Copyright (C) 1999, 2003, 2005, 2009-2020 Free Software Foundation, Inc. This 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,15 +22,6 @@ # include # include -/* The 'sentinel' attribute was added in gcc 4.0. */ -#ifndef _GL_ATTRIBUTE_SENTINEL -# if 4 <= __GNUC__ -# define _GL_ATTRIBUTE_SENTINEL __attribute__ ((__sentinel__)) -# else -# define _GL_ATTRIBUTE_SENTINEL /* empty */ -# endif -#endif - extern const char version_etc_copyright[]; /* The three functions below display the --version information in the @@ -70,7 +61,7 @@ extern void version_etc (FILE *stream, const char *command_name, const char *package, const char *version, /* const char *author1, ..., NULL */ ...) - _GL_ATTRIBUTE_SENTINEL; + _GL_ATTRIBUTE_SENTINEL ((0)); /* Display the usual "Report bugs to" stanza. */ extern void emit_bug_reporting_address (void); diff --git a/lib/warn-on-use.h b/lib/warn-on-use.h index 7d11a15..3f728d1 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-2019 Free Software Foundation, Inc. + Copyright (C) 2010-2020 Free Software Foundation, Inc. This program is free software: you can redistribute it and/or modify it under the terms of the GNU General Public License as published @@ -87,6 +87,13 @@ extern __typeof__ (function) function __attribute__ ((__warning__ (message))) # define _GL_WARN_ON_USE_ATTRIBUTE(message) \ __attribute__ ((__warning__ (message))) +# elif __clang_major__ >= 4 +/* Another compiler attribute is available in clang. */ +# define _GL_WARN_ON_USE(function, message) \ +extern __typeof__ (function) function \ + __attribute__ ((__diagnose_if__ (1, message, "warning"))) +# define _GL_WARN_ON_USE_ATTRIBUTE(message) \ + __attribute__ ((__diagnose_if__ (1, message, "warning"))) # elif __GNUC__ >= 3 && GNULIB_STRICT_CHECKING /* Verify the existence of the function. */ # define _GL_WARN_ON_USE(function, message) \ @@ -99,24 +106,35 @@ _GL_WARN_EXTERN_C int _gl_warn_on_use # endif #endif -/* _GL_WARN_ON_USE_CXX (function, rettype, parameters_and_attributes, "string") - is like _GL_WARN_ON_USE (function, "string"), except that the function is - declared with the given prototype, consisting of return type, parameters, - and attributes. +/* _GL_WARN_ON_USE_CXX (function, rettype_gcc, rettype_clang, parameters_and_attributes, "message") + is like _GL_WARN_ON_USE (function, "message"), except that in C++ mode the + function is declared with the given prototype, consisting of return type, + parameters, and attributes. This variant is useful for overloaded functions in C++. _GL_WARN_ON_USE does not work in this case. */ #ifndef _GL_WARN_ON_USE_CXX -# if 4 < __GNUC__ || (__GNUC__ == 4 && 3 <= __GNUC_MINOR__) -# define _GL_WARN_ON_USE_CXX(function,rettype,parameters_and_attributes,msg) \ -extern rettype function parameters_and_attributes \ - __attribute__ ((__warning__ (msg))) -# elif __GNUC__ >= 3 && GNULIB_STRICT_CHECKING +# if !defined __cplusplus +# define _GL_WARN_ON_USE_CXX(function,rettype_gcc,rettype_clang,parameters_and_attributes,msg) \ + _GL_WARN_ON_USE (function, msg) +# else +# if 4 < __GNUC__ || (__GNUC__ == 4 && 3 <= __GNUC_MINOR__) +/* A compiler attribute is available in gcc versions 4.3.0 and later. */ +# define _GL_WARN_ON_USE_CXX(function,rettype_gcc,rettype_clang,parameters_and_attributes,msg) \ +extern rettype_gcc function parameters_and_attributes \ + __attribute__ ((__warning__ (msg))) +# elif __clang_major__ >= 4 +/* Another compiler attribute is available in clang. */ +# define _GL_WARN_ON_USE_CXX(function,rettype_gcc,rettype_clang,parameters_and_attributes,msg) \ +extern rettype_clang function parameters_and_attributes \ + __attribute__ ((__diagnose_if__ (1, msg, "warning"))) +# elif __GNUC__ >= 3 && GNULIB_STRICT_CHECKING /* Verify the existence of the function. */ -# define _GL_WARN_ON_USE_CXX(function,rettype,parameters_and_attributes,msg) \ -extern rettype function parameters_and_attributes -# else /* Unsupported. */ -# define _GL_WARN_ON_USE_CXX(function,rettype,parameters_and_attributes,msg) \ +# define _GL_WARN_ON_USE_CXX(function,rettype_gcc,rettype_clang,parameters_and_attributes,msg) \ +extern rettype_gcc function parameters_and_attributes +# else /* Unsupported. */ +# define _GL_WARN_ON_USE_CXX(function,rettype_gcc,rettype_clang,parameters_and_attributes,msg) \ _GL_WARN_EXTERN_C int _gl_warn_on_use +# endif # endif #endif diff --git a/lib/wchar.in.h b/lib/wchar.in.h index 17d5691..ab92dcd 100644 --- a/lib/wchar.in.h +++ b/lib/wchar.in.h @@ -1,6 +1,6 @@ /* A substitute for ISO C99 , for platforms that have issues. - Copyright (C) 2007-2019 Free Software Foundation, Inc. + Copyright (C) 2007-2020 Free Software Foundation, Inc. This program is free software; you can redistribute it and/or modify it under the terms of the GNU General Public License as published by @@ -19,7 +19,7 @@ /* * ISO C 99 for platforms that have issues. - * + * * * For now, this just ensures proper prerequisite inclusion order and * the declaration of wcwidth(). @@ -33,7 +33,8 @@ #if (((defined __need_mbstate_t || defined __need_wint_t) \ && !defined __MINGW32__) \ || (defined __hpux \ - && ((defined _INTTYPES_INCLUDED && !defined strtoimax) \ + && ((defined _INTTYPES_INCLUDED \ + && !defined _GL_FINISHED_INCLUDING_SYSTEM_INTTYPES_H) \ || defined _GL_JUST_INCLUDE_SYSTEM_WCHAR_H)) \ || (defined __MINGW32__ && defined __STRING_H_SOURCED__) \ || defined _GL_ALREADY_INCLUDING_WCHAR_H) @@ -93,10 +94,12 @@ /* The __attribute__ feature is available in gcc versions 2.5 and later. The attribute __pure__ was added in gcc 2.96. */ -#if __GNUC__ > 2 || (__GNUC__ == 2 && __GNUC_MINOR__ >= 96) -# define _GL_ATTRIBUTE_PURE __attribute__ ((__pure__)) -#else -# define _GL_ATTRIBUTE_PURE /* empty */ +#ifndef _GL_ATTRIBUTE_PURE +# if __GNUC__ > 2 || (__GNUC__ == 2 && __GNUC_MINOR__ >= 96) || defined __clang__ +# define _GL_ATTRIBUTE_PURE __attribute__ ((__pure__)) +# else +# define _GL_ATTRIBUTE_PURE /* empty */ +# endif #endif /* The definitions of _GL_FUNCDECL_RPL etc. are copied here. */ @@ -137,12 +140,16 @@ typedef unsigned int rpl_wint_t; /* Override mbstate_t if it is too small. On IRIX 6.5, sizeof (mbstate_t) == 1, which is not sufficient for - implementing mbrtowc for encodings like UTF-8. */ -#if !(@HAVE_MBSINIT@ && @HAVE_MBRTOWC@) || @REPLACE_MBSTATE_T@ + implementing mbrtowc for encodings like UTF-8. + On AIX and MSVC, mbrtowc needs to be overridden, but mbstate_t exists and is + large enough and overriding it would cause problems in C++ mode. */ +#if !(((defined _WIN32 && !defined __CYGWIN__) || @HAVE_MBSINIT@) && @HAVE_MBRTOWC@) || @REPLACE_MBSTATE_T@ # if !GNULIB_defined_mbstate_t +# if !(defined _AIX || defined _MSC_VER) typedef int rpl_mbstate_t; -# undef mbstate_t -# define mbstate_t rpl_mbstate_t +# undef mbstate_t +# define mbstate_t rpl_mbstate_t +# endif # define GNULIB_defined_mbstate_t 1 # endif #endif @@ -161,9 +168,12 @@ _GL_CXXALIAS_RPL (btowc, wint_t, (int c)); # if !@HAVE_BTOWC@ _GL_FUNCDECL_SYS (btowc, wint_t, (int c) _GL_ATTRIBUTE_PURE); # endif -_GL_CXXALIAS_SYS (btowc, wint_t, (int c)); +/* Need to cast, because on mingw, the return type is 'unsigned short'. */ +_GL_CXXALIAS_SYS_CAST (btowc, wint_t, (int c)); # endif +# if __GLIBC__ >= 2 _GL_CXXALIASWARN (btowc); +# endif #elif defined GNULIB_POSIXCHECK # undef btowc # if HAVE_RAW_DECL_BTOWC @@ -189,7 +199,9 @@ _GL_FUNCDECL_SYS (wctob, int, (wint_t wc) _GL_ATTRIBUTE_PURE); # endif _GL_CXXALIAS_SYS (wctob, int, (wint_t wc)); # endif +# if __GLIBC__ >= 2 _GL_CXXALIASWARN (wctob); +# endif #elif defined GNULIB_POSIXCHECK # undef wctob # if HAVE_RAW_DECL_WCTOB @@ -214,7 +226,9 @@ _GL_FUNCDECL_SYS (mbsinit, int, (const mbstate_t *ps)); # endif _GL_CXXALIAS_SYS (mbsinit, int, (const mbstate_t *ps)); # endif +# if __GLIBC__ >= 2 _GL_CXXALIASWARN (mbsinit); +# endif #elif defined GNULIB_POSIXCHECK # undef mbsinit # if HAVE_RAW_DECL_MBSINIT @@ -232,18 +246,24 @@ _GL_WARN_ON_USE (mbsinit, "mbsinit is unportable - " # define mbrtowc rpl_mbrtowc # endif _GL_FUNCDECL_RPL (mbrtowc, size_t, - (wchar_t *pwc, const char *s, size_t n, mbstate_t *ps)); + (wchar_t *restrict pwc, const char *restrict s, size_t n, + mbstate_t *restrict ps)); _GL_CXXALIAS_RPL (mbrtowc, size_t, - (wchar_t *pwc, const char *s, size_t n, mbstate_t *ps)); + (wchar_t *restrict pwc, const char *restrict s, size_t n, + mbstate_t *restrict ps)); # else # if !@HAVE_MBRTOWC@ _GL_FUNCDECL_SYS (mbrtowc, size_t, - (wchar_t *pwc, const char *s, size_t n, mbstate_t *ps)); + (wchar_t *restrict pwc, const char *restrict s, size_t n, + mbstate_t *restrict ps)); # endif _GL_CXXALIAS_SYS (mbrtowc, size_t, - (wchar_t *pwc, const char *s, size_t n, mbstate_t *ps)); + (wchar_t *restrict pwc, const char *restrict s, size_t n, + mbstate_t *restrict ps)); # endif +# if __GLIBC__ >= 2 _GL_CXXALIASWARN (mbrtowc); +# endif #elif defined GNULIB_POSIXCHECK # undef mbrtowc # if HAVE_RAW_DECL_MBRTOWC @@ -260,15 +280,21 @@ _GL_WARN_ON_USE (mbrtowc, "mbrtowc is unportable - " # undef mbrlen # define mbrlen rpl_mbrlen # endif -_GL_FUNCDECL_RPL (mbrlen, size_t, (const char *s, size_t n, mbstate_t *ps)); -_GL_CXXALIAS_RPL (mbrlen, size_t, (const char *s, size_t n, mbstate_t *ps)); +_GL_FUNCDECL_RPL (mbrlen, size_t, + (const char *restrict s, size_t n, mbstate_t *restrict ps)); +_GL_CXXALIAS_RPL (mbrlen, size_t, + (const char *restrict s, size_t n, mbstate_t *restrict ps)); # else # if !@HAVE_MBRLEN@ -_GL_FUNCDECL_SYS (mbrlen, size_t, (const char *s, size_t n, mbstate_t *ps)); +_GL_FUNCDECL_SYS (mbrlen, size_t, + (const char *restrict s, size_t n, mbstate_t *restrict ps)); # endif -_GL_CXXALIAS_SYS (mbrlen, size_t, (const char *s, size_t n, mbstate_t *ps)); +_GL_CXXALIAS_SYS (mbrlen, size_t, + (const char *restrict s, size_t n, mbstate_t *restrict ps)); # endif +# if __GLIBC__ >= 2 _GL_CXXALIASWARN (mbrlen); +# endif #elif defined GNULIB_POSIXCHECK # undef mbrlen # if HAVE_RAW_DECL_MBRLEN @@ -286,22 +312,30 @@ _GL_WARN_ON_USE (mbrlen, "mbrlen is unportable - " # define mbsrtowcs rpl_mbsrtowcs # endif _GL_FUNCDECL_RPL (mbsrtowcs, size_t, - (wchar_t *dest, const char **srcp, size_t len, mbstate_t *ps) + (wchar_t *restrict dest, + const char **restrict srcp, size_t len, + mbstate_t *restrict ps) _GL_ARG_NONNULL ((2))); _GL_CXXALIAS_RPL (mbsrtowcs, size_t, - (wchar_t *dest, const char **srcp, size_t len, - mbstate_t *ps)); + (wchar_t *restrict dest, + const char **restrict srcp, size_t len, + mbstate_t *restrict ps)); # else # if !@HAVE_MBSRTOWCS@ _GL_FUNCDECL_SYS (mbsrtowcs, size_t, - (wchar_t *dest, const char **srcp, size_t len, mbstate_t *ps) + (wchar_t *restrict dest, + const char **restrict srcp, size_t len, + mbstate_t *restrict ps) _GL_ARG_NONNULL ((2))); # endif _GL_CXXALIAS_SYS (mbsrtowcs, size_t, - (wchar_t *dest, const char **srcp, size_t len, - mbstate_t *ps)); + (wchar_t *restrict dest, + const char **restrict srcp, size_t len, + mbstate_t *restrict ps)); # endif +# if __GLIBC__ >= 2 _GL_CXXALIASWARN (mbsrtowcs); +# endif #elif defined GNULIB_POSIXCHECK # undef mbsrtowcs # if HAVE_RAW_DECL_MBSRTOWCS @@ -319,22 +353,26 @@ _GL_WARN_ON_USE (mbsrtowcs, "mbsrtowcs is unportable - " # define mbsnrtowcs rpl_mbsnrtowcs # endif _GL_FUNCDECL_RPL (mbsnrtowcs, size_t, - (wchar_t *dest, const char **srcp, size_t srclen, size_t len, - mbstate_t *ps) + (wchar_t *restrict dest, + const char **restrict srcp, size_t srclen, size_t len, + mbstate_t *restrict ps) _GL_ARG_NONNULL ((2))); _GL_CXXALIAS_RPL (mbsnrtowcs, size_t, - (wchar_t *dest, const char **srcp, size_t srclen, size_t len, - mbstate_t *ps)); + (wchar_t *restrict dest, + const char **restrict srcp, size_t srclen, size_t len, + mbstate_t *restrict ps)); # else # if !@HAVE_MBSNRTOWCS@ _GL_FUNCDECL_SYS (mbsnrtowcs, size_t, - (wchar_t *dest, const char **srcp, size_t srclen, size_t len, - mbstate_t *ps) + (wchar_t *restrict dest, + const char **restrict srcp, size_t srclen, size_t len, + mbstate_t *restrict ps) _GL_ARG_NONNULL ((2))); # endif _GL_CXXALIAS_SYS (mbsnrtowcs, size_t, - (wchar_t *dest, const char **srcp, size_t srclen, size_t len, - mbstate_t *ps)); + (wchar_t *restrict dest, + const char **restrict srcp, size_t srclen, size_t len, + mbstate_t *restrict ps)); # endif _GL_CXXALIASWARN (mbsnrtowcs); #elif defined GNULIB_POSIXCHECK @@ -353,15 +391,21 @@ _GL_WARN_ON_USE (mbsnrtowcs, "mbsnrtowcs is unportable - " # undef wcrtomb # define wcrtomb rpl_wcrtomb # endif -_GL_FUNCDECL_RPL (wcrtomb, size_t, (char *s, wchar_t wc, mbstate_t *ps)); -_GL_CXXALIAS_RPL (wcrtomb, size_t, (char *s, wchar_t wc, mbstate_t *ps)); +_GL_FUNCDECL_RPL (wcrtomb, size_t, + (char *restrict s, wchar_t wc, mbstate_t *restrict ps)); +_GL_CXXALIAS_RPL (wcrtomb, size_t, + (char *restrict s, wchar_t wc, mbstate_t *restrict ps)); # else # if !@HAVE_WCRTOMB@ -_GL_FUNCDECL_SYS (wcrtomb, size_t, (char *s, wchar_t wc, mbstate_t *ps)); +_GL_FUNCDECL_SYS (wcrtomb, size_t, + (char *restrict s, wchar_t wc, mbstate_t *restrict ps)); # endif -_GL_CXXALIAS_SYS (wcrtomb, size_t, (char *s, wchar_t wc, mbstate_t *ps)); +_GL_CXXALIAS_SYS (wcrtomb, size_t, + (char *restrict s, wchar_t wc, mbstate_t *restrict ps)); # endif +# if __GLIBC__ >= 2 _GL_CXXALIASWARN (wcrtomb); +# endif #elif defined GNULIB_POSIXCHECK # undef wcrtomb # if HAVE_RAW_DECL_WCRTOMB @@ -379,22 +423,30 @@ _GL_WARN_ON_USE (wcrtomb, "wcrtomb is unportable - " # define wcsrtombs rpl_wcsrtombs # endif _GL_FUNCDECL_RPL (wcsrtombs, size_t, - (char *dest, const wchar_t **srcp, size_t len, mbstate_t *ps) + (char *restrict dest, const wchar_t **restrict srcp, + size_t len, + mbstate_t *restrict ps) _GL_ARG_NONNULL ((2))); _GL_CXXALIAS_RPL (wcsrtombs, size_t, - (char *dest, const wchar_t **srcp, size_t len, - mbstate_t *ps)); + (char *restrict dest, const wchar_t **restrict srcp, + size_t len, + mbstate_t *restrict ps)); # else # if !@HAVE_WCSRTOMBS@ _GL_FUNCDECL_SYS (wcsrtombs, size_t, - (char *dest, const wchar_t **srcp, size_t len, mbstate_t *ps) + (char *restrict dest, const wchar_t **restrict srcp, + size_t len, + mbstate_t *restrict ps) _GL_ARG_NONNULL ((2))); # endif _GL_CXXALIAS_SYS (wcsrtombs, size_t, - (char *dest, const wchar_t **srcp, size_t len, - mbstate_t *ps)); + (char *restrict dest, const wchar_t **restrict srcp, + size_t len, + mbstate_t *restrict ps)); # endif +# if __GLIBC__ >= 2 _GL_CXXALIASWARN (wcsrtombs); +# endif #elif defined GNULIB_POSIXCHECK # undef wcsrtombs # if HAVE_RAW_DECL_WCSRTOMBS @@ -412,24 +464,34 @@ _GL_WARN_ON_USE (wcsrtombs, "wcsrtombs is unportable - " # define wcsnrtombs rpl_wcsnrtombs # endif _GL_FUNCDECL_RPL (wcsnrtombs, size_t, - (char *dest, const wchar_t **srcp, size_t srclen, size_t len, - mbstate_t *ps) + (char *restrict dest, + const wchar_t **restrict srcp, size_t srclen, + size_t len, + mbstate_t *restrict ps) _GL_ARG_NONNULL ((2))); _GL_CXXALIAS_RPL (wcsnrtombs, size_t, - (char *dest, const wchar_t **srcp, size_t srclen, size_t len, - mbstate_t *ps)); + (char *restrict dest, + const wchar_t **restrict srcp, size_t srclen, + size_t len, + mbstate_t *restrict ps)); # else -# if !@HAVE_WCSNRTOMBS@ +# if !@HAVE_WCSNRTOMBS@ || (defined __cplusplus && defined __sun) _GL_FUNCDECL_SYS (wcsnrtombs, size_t, - (char *dest, const wchar_t **srcp, size_t srclen, size_t len, - mbstate_t *ps) + (char *restrict dest, + const wchar_t **restrict srcp, size_t srclen, + size_t len, + mbstate_t *restrict ps) _GL_ARG_NONNULL ((2))); # endif _GL_CXXALIAS_SYS (wcsnrtombs, size_t, - (char *dest, const wchar_t **srcp, size_t srclen, size_t len, - mbstate_t *ps)); + (char *restrict dest, + const wchar_t **restrict srcp, size_t srclen, + size_t len, + mbstate_t *restrict ps)); # endif +# if __GLIBC__ >= 2 _GL_CXXALIASWARN (wcsnrtombs); +# endif #elif defined GNULIB_POSIXCHECK # undef wcsnrtombs # if HAVE_RAW_DECL_WCSNRTOMBS @@ -455,7 +517,9 @@ _GL_FUNCDECL_SYS (wcwidth, int, (wchar_t) _GL_ATTRIBUTE_PURE); # endif _GL_CXXALIAS_SYS (wcwidth, int, (wchar_t)); # endif +# if __GLIBC__ >= 2 _GL_CXXALIASWARN (wcwidth); +# endif #elif defined GNULIB_POSIXCHECK # undef wcwidth # if HAVE_RAW_DECL_WCWIDTH @@ -484,7 +548,7 @@ _GL_CXXALIAS_SYS_CAST2 (wmemchr, _GL_CXXALIASWARN1 (wmemchr, wchar_t *, (wchar_t *s, wchar_t c, size_t n)); _GL_CXXALIASWARN1 (wmemchr, const wchar_t *, (const wchar_t *s, wchar_t c, size_t n)); -# else +# elif __GLIBC__ >= 2 _GL_CXXALIASWARN (wmemchr); # endif #elif defined GNULIB_POSIXCHECK @@ -505,7 +569,9 @@ _GL_FUNCDECL_SYS (wmemcmp, int, # endif _GL_CXXALIAS_SYS (wmemcmp, int, (const wchar_t *s1, const wchar_t *s2, size_t n)); +# if __GLIBC__ >= 2 _GL_CXXALIASWARN (wmemcmp); +# endif #elif defined GNULIB_POSIXCHECK # undef wmemcmp # if HAVE_RAW_DECL_WMEMCMP @@ -519,11 +585,15 @@ _GL_WARN_ON_USE (wmemcmp, "wmemcmp is unportable - " #if @GNULIB_WMEMCPY@ # if !@HAVE_WMEMCPY@ _GL_FUNCDECL_SYS (wmemcpy, wchar_t *, - (wchar_t *dest, const wchar_t *src, size_t n)); + (wchar_t *restrict dest, + const wchar_t *restrict src, size_t n)); # endif _GL_CXXALIAS_SYS (wmemcpy, wchar_t *, - (wchar_t *dest, const wchar_t *src, size_t n)); + (wchar_t *restrict dest, + const wchar_t *restrict src, size_t n)); +# if __GLIBC__ >= 2 _GL_CXXALIASWARN (wmemcpy); +# endif #elif defined GNULIB_POSIXCHECK # undef wmemcpy # if HAVE_RAW_DECL_WMEMCPY @@ -542,7 +612,9 @@ _GL_FUNCDECL_SYS (wmemmove, wchar_t *, # endif _GL_CXXALIAS_SYS (wmemmove, wchar_t *, (wchar_t *dest, const wchar_t *src, size_t n)); +# if __GLIBC__ >= 2 _GL_CXXALIASWARN (wmemmove); +# endif #elif defined GNULIB_POSIXCHECK # undef wmemmove # if HAVE_RAW_DECL_WMEMMOVE @@ -552,13 +624,38 @@ _GL_WARN_ON_USE (wmemmove, "wmemmove is unportable - " #endif +/* 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@ +_GL_FUNCDECL_SYS (wmempcpy, wchar_t *, + (wchar_t *restrict dest, + const wchar_t *restrict src, size_t n)); +# endif +_GL_CXXALIAS_SYS (wmempcpy, wchar_t *, + (wchar_t *restrict dest, + const wchar_t *restrict src, size_t n)); +# if __GLIBC__ >= 2 +_GL_CXXALIASWARN (wmempcpy); +# endif +#elif defined GNULIB_POSIXCHECK +# undef wmempcpy +# if HAVE_RAW_DECL_WMEMPCPY +_GL_WARN_ON_USE (wmempcpy, "wmempcpy is unportable - " + "use gnulib module wmempcpy for portability"); +# endif +#endif + + /* Set N wide characters of S to C. */ #if @GNULIB_WMEMSET@ # if !@HAVE_WMEMSET@ _GL_FUNCDECL_SYS (wmemset, wchar_t *, (wchar_t *s, wchar_t c, size_t n)); # endif _GL_CXXALIAS_SYS (wmemset, wchar_t *, (wchar_t *s, wchar_t c, size_t n)); +# if __GLIBC__ >= 2 _GL_CXXALIASWARN (wmemset); +# endif #elif defined GNULIB_POSIXCHECK # undef wmemset # if HAVE_RAW_DECL_WMEMSET @@ -574,7 +671,9 @@ _GL_WARN_ON_USE (wmemset, "wmemset is unportable - " _GL_FUNCDECL_SYS (wcslen, size_t, (const wchar_t *s) _GL_ATTRIBUTE_PURE); # endif _GL_CXXALIAS_SYS (wcslen, size_t, (const wchar_t *s)); +# if __GLIBC__ >= 2 _GL_CXXALIASWARN (wcslen); +# endif #elif defined GNULIB_POSIXCHECK # undef wcslen # if HAVE_RAW_DECL_WCSLEN @@ -604,10 +703,14 @@ _GL_WARN_ON_USE (wcsnlen, "wcsnlen is unportable - " /* Copy SRC to DEST. */ #if @GNULIB_WCSCPY@ # if !@HAVE_WCSCPY@ -_GL_FUNCDECL_SYS (wcscpy, wchar_t *, (wchar_t *dest, const wchar_t *src)); +_GL_FUNCDECL_SYS (wcscpy, wchar_t *, + (wchar_t *restrict dest, const wchar_t *restrict src)); # endif -_GL_CXXALIAS_SYS (wcscpy, wchar_t *, (wchar_t *dest, const wchar_t *src)); +_GL_CXXALIAS_SYS (wcscpy, wchar_t *, + (wchar_t *restrict dest, const wchar_t *restrict src)); +# if __GLIBC__ >= 2 _GL_CXXALIASWARN (wcscpy); +# endif #elif defined GNULIB_POSIXCHECK # undef wcscpy # if HAVE_RAW_DECL_WCSCPY @@ -620,9 +723,11 @@ _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@ -_GL_FUNCDECL_SYS (wcpcpy, wchar_t *, (wchar_t *dest, const wchar_t *src)); +_GL_FUNCDECL_SYS (wcpcpy, wchar_t *, + (wchar_t *restrict dest, const wchar_t *restrict src)); # endif -_GL_CXXALIAS_SYS (wcpcpy, wchar_t *, (wchar_t *dest, const wchar_t *src)); +_GL_CXXALIAS_SYS (wcpcpy, wchar_t *, + (wchar_t *restrict dest, const wchar_t *restrict src)); _GL_CXXALIASWARN (wcpcpy); #elif defined GNULIB_POSIXCHECK # undef wcpcpy @@ -637,11 +742,15 @@ _GL_WARN_ON_USE (wcpcpy, "wcpcpy is unportable - " #if @GNULIB_WCSNCPY@ # if !@HAVE_WCSNCPY@ _GL_FUNCDECL_SYS (wcsncpy, wchar_t *, - (wchar_t *dest, const wchar_t *src, size_t n)); + (wchar_t *restrict dest, + const wchar_t *restrict src, size_t n)); # endif _GL_CXXALIAS_SYS (wcsncpy, wchar_t *, - (wchar_t *dest, const wchar_t *src, size_t n)); + (wchar_t *restrict dest, + const wchar_t *restrict src, size_t n)); +# if __GLIBC__ >= 2 _GL_CXXALIASWARN (wcsncpy); +# endif #elif defined GNULIB_POSIXCHECK # undef wcsncpy # if HAVE_RAW_DECL_WCSNCPY @@ -656,10 +765,12 @@ _GL_WARN_ON_USE (wcsncpy, "wcsncpy is unportable - " #if @GNULIB_WCPNCPY@ # if !@HAVE_WCPNCPY@ _GL_FUNCDECL_SYS (wcpncpy, wchar_t *, - (wchar_t *dest, const wchar_t *src, size_t n)); + (wchar_t *restrict dest, + const wchar_t *restrict src, size_t n)); # endif _GL_CXXALIAS_SYS (wcpncpy, wchar_t *, - (wchar_t *dest, const wchar_t *src, size_t n)); + (wchar_t *restrict dest, + const wchar_t *restrict src, size_t n)); _GL_CXXALIASWARN (wcpncpy); #elif defined GNULIB_POSIXCHECK # undef wcpncpy @@ -673,10 +784,14 @@ _GL_WARN_ON_USE (wcpncpy, "wcpncpy is unportable - " /* Append SRC onto DEST. */ #if @GNULIB_WCSCAT@ # if !@HAVE_WCSCAT@ -_GL_FUNCDECL_SYS (wcscat, wchar_t *, (wchar_t *dest, const wchar_t *src)); +_GL_FUNCDECL_SYS (wcscat, wchar_t *, + (wchar_t *restrict dest, const wchar_t *restrict src)); # endif -_GL_CXXALIAS_SYS (wcscat, wchar_t *, (wchar_t *dest, const wchar_t *src)); +_GL_CXXALIAS_SYS (wcscat, wchar_t *, + (wchar_t *restrict dest, const wchar_t *restrict src)); +# if __GLIBC__ >= 2 _GL_CXXALIASWARN (wcscat); +# endif #elif defined GNULIB_POSIXCHECK # undef wcscat # if HAVE_RAW_DECL_WCSCAT @@ -690,11 +805,15 @@ _GL_WARN_ON_USE (wcscat, "wcscat is unportable - " #if @GNULIB_WCSNCAT@ # if !@HAVE_WCSNCAT@ _GL_FUNCDECL_SYS (wcsncat, wchar_t *, - (wchar_t *dest, const wchar_t *src, size_t n)); + (wchar_t *restrict dest, const wchar_t *restrict src, + size_t n)); # endif _GL_CXXALIAS_SYS (wcsncat, wchar_t *, - (wchar_t *dest, const wchar_t *src, size_t n)); + (wchar_t *restrict dest, const wchar_t *restrict src, + size_t n)); +# if __GLIBC__ >= 2 _GL_CXXALIASWARN (wcsncat); +# endif #elif defined GNULIB_POSIXCHECK # undef wcsncat # if HAVE_RAW_DECL_WCSNCAT @@ -711,7 +830,9 @@ _GL_FUNCDECL_SYS (wcscmp, int, (const wchar_t *s1, const wchar_t *s2) _GL_ATTRIBUTE_PURE); # endif _GL_CXXALIAS_SYS (wcscmp, int, (const wchar_t *s1, const wchar_t *s2)); +# if __GLIBC__ >= 2 _GL_CXXALIASWARN (wcscmp); +# endif #elif defined GNULIB_POSIXCHECK # undef wcscmp # if HAVE_RAW_DECL_WCSCMP @@ -730,7 +851,9 @@ _GL_FUNCDECL_SYS (wcsncmp, int, # endif _GL_CXXALIAS_SYS (wcsncmp, int, (const wchar_t *s1, const wchar_t *s2, size_t n)); +# if __GLIBC__ >= 2 _GL_CXXALIASWARN (wcsncmp); +# endif #elif defined GNULIB_POSIXCHECK # undef wcsncmp # if HAVE_RAW_DECL_WCSNCMP @@ -783,7 +906,9 @@ _GL_WARN_ON_USE (wcsncasecmp, "wcsncasecmp is unportable - " _GL_FUNCDECL_SYS (wcscoll, int, (const wchar_t *s1, const wchar_t *s2)); # endif _GL_CXXALIAS_SYS (wcscoll, int, (const wchar_t *s1, const wchar_t *s2)); +# if __GLIBC__ >= 2 _GL_CXXALIASWARN (wcscoll); +# endif #elif defined GNULIB_POSIXCHECK # undef wcscoll # if HAVE_RAW_DECL_WCSCOLL @@ -798,10 +923,14 @@ _GL_WARN_ON_USE (wcscoll, "wcscoll is unportable - " original strings. */ #if @GNULIB_WCSXFRM@ # if !@HAVE_WCSXFRM@ -_GL_FUNCDECL_SYS (wcsxfrm, size_t, (wchar_t *s1, const wchar_t *s2, size_t n)); +_GL_FUNCDECL_SYS (wcsxfrm, size_t, + (wchar_t *restrict s1, const wchar_t *restrict s2, size_t n)); # endif -_GL_CXXALIAS_SYS (wcsxfrm, size_t, (wchar_t *s1, const wchar_t *s2, size_t n)); +_GL_CXXALIAS_SYS (wcsxfrm, size_t, + (wchar_t *restrict s1, const wchar_t *restrict s2, size_t n)); +# if __GLIBC__ >= 2 _GL_CXXALIASWARN (wcsxfrm); +# endif #elif defined GNULIB_POSIXCHECK # undef wcsxfrm # if HAVE_RAW_DECL_WCSXFRM @@ -813,10 +942,18 @@ _GL_WARN_ON_USE (wcsxfrm, "wcsxfrm is unportable - " /* Duplicate S, returning an identical malloc'd string. */ #if @GNULIB_WCSDUP@ -# if !@HAVE_WCSDUP@ +# if defined _WIN32 && !defined __CYGWIN__ +# if !(defined __cplusplus && defined GNULIB_NAMESPACE) +# undef wcsdup +# define wcsdup _wcsdup +# endif +_GL_CXXALIAS_MDA (wcsdup, wchar_t *, (const wchar_t *s)); +# else +# if !@HAVE_WCSDUP@ _GL_FUNCDECL_SYS (wcsdup, wchar_t *, (const wchar_t *s)); -# endif +# endif _GL_CXXALIAS_SYS (wcsdup, wchar_t *, (const wchar_t *s)); +# endif _GL_CXXALIASWARN (wcsdup); #elif defined GNULIB_POSIXCHECK # undef wcsdup @@ -824,6 +961,25 @@ _GL_CXXALIASWARN (wcsdup); _GL_WARN_ON_USE (wcsdup, "wcsdup is unportable - " "use gnulib module wcsdup for portability"); # endif +#else +/* On native Windows, map 'wcsdup' to '_wcsdup', so that -loldnames is not + required. In C++ with GNULIB_NAMESPACE, avoid differences between + platforms by defining GNULIB_NAMESPACE::wcsdup always. */ +# if defined _WIN32 && !defined __CYGWIN__ +# if !(defined __cplusplus && defined GNULIB_NAMESPACE) +# undef wcsdup +# define wcsdup _wcsdup +# endif +_GL_CXXALIAS_MDA (wcsdup, wchar_t *, (const wchar_t *s)); +# else +_GL_FUNCDECL_SYS (wcsdup, wchar_t *, (const wchar_t *s)); +# if @HAVE_DECL_WCSDUP@ +_GL_CXXALIAS_SYS (wcsdup, wchar_t *, (const wchar_t *s)); +# endif +# endif +# if (defined _WIN32 && !defined __CYGWIN__) || @HAVE_DECL_WCSDUP@ +_GL_CXXALIASWARN (wcsdup); +# endif #endif @@ -845,7 +1001,7 @@ _GL_CXXALIAS_SYS_CAST2 (wcschr, && (__GNUC__ > 4 || (__GNUC__ == 4 && __GNUC_MINOR__ >= 4)) _GL_CXXALIASWARN1 (wcschr, wchar_t *, (wchar_t *wcs, wchar_t wc)); _GL_CXXALIASWARN1 (wcschr, const wchar_t *, (const wchar_t *wcs, wchar_t wc)); -# else +# elif __GLIBC__ >= 2 _GL_CXXALIASWARN (wcschr); # endif #elif defined GNULIB_POSIXCHECK @@ -875,7 +1031,7 @@ _GL_CXXALIAS_SYS_CAST2 (wcsrchr, && (__GNUC__ > 4 || (__GNUC__ == 4 && __GNUC_MINOR__ >= 4)) _GL_CXXALIASWARN1 (wcsrchr, wchar_t *, (wchar_t *wcs, wchar_t wc)); _GL_CXXALIASWARN1 (wcsrchr, const wchar_t *, (const wchar_t *wcs, wchar_t wc)); -# else +# elif __GLIBC__ >= 2 _GL_CXXALIASWARN (wcsrchr); # endif #elif defined GNULIB_POSIXCHECK @@ -895,7 +1051,9 @@ _GL_FUNCDECL_SYS (wcscspn, size_t, (const wchar_t *wcs, const wchar_t *reject) _GL_ATTRIBUTE_PURE); # endif _GL_CXXALIAS_SYS (wcscspn, size_t, (const wchar_t *wcs, const wchar_t *reject)); +# if __GLIBC__ >= 2 _GL_CXXALIASWARN (wcscspn); +# endif #elif defined GNULIB_POSIXCHECK # undef wcscspn # if HAVE_RAW_DECL_WCSCSPN @@ -913,7 +1071,9 @@ _GL_FUNCDECL_SYS (wcsspn, size_t, (const wchar_t *wcs, const wchar_t *accept) _GL_ATTRIBUTE_PURE); # endif _GL_CXXALIAS_SYS (wcsspn, size_t, (const wchar_t *wcs, const wchar_t *accept)); +# if __GLIBC__ >= 2 _GL_CXXALIASWARN (wcsspn); +# endif #elif defined GNULIB_POSIXCHECK # undef wcsspn # if HAVE_RAW_DECL_WCSSPN @@ -944,7 +1104,7 @@ _GL_CXXALIASWARN1 (wcspbrk, wchar_t *, (wchar_t *wcs, const wchar_t *accept)); _GL_CXXALIASWARN1 (wcspbrk, const wchar_t *, (const wchar_t *wcs, const wchar_t *accept)); -# else +# elif __GLIBC__ >= 2 _GL_CXXALIASWARN (wcspbrk); # endif #elif defined GNULIB_POSIXCHECK @@ -960,7 +1120,8 @@ _GL_WARN_ON_USE (wcspbrk, "wcspbrk is unportable - " #if @GNULIB_WCSSTR@ # if !@HAVE_WCSSTR@ _GL_FUNCDECL_SYS (wcsstr, wchar_t *, - (const wchar_t *haystack, const wchar_t *needle) + (const wchar_t *restrict haystack, + const wchar_t *restrict needle) _GL_ATTRIBUTE_PURE); # endif /* On some systems, this function is defined as an overloaded function: @@ -969,15 +1130,19 @@ _GL_FUNCDECL_SYS (wcsstr, wchar_t *, wchar_t * std::wcsstr (wchar_t *, const wchar_t *); } */ _GL_CXXALIAS_SYS_CAST2 (wcsstr, - wchar_t *, (const wchar_t *, const wchar_t *), - const wchar_t *, (const wchar_t *, const wchar_t *)); + wchar_t *, + (const wchar_t *restrict, const wchar_t *restrict), + const wchar_t *, + (const wchar_t *restrict, const wchar_t *restrict)); # if ((__GLIBC__ == 2 && __GLIBC_MINOR__ >= 10) && !defined __UCLIBC__) \ && (__GNUC__ > 4 || (__GNUC__ == 4 && __GNUC_MINOR__ >= 4)) _GL_CXXALIASWARN1 (wcsstr, wchar_t *, - (wchar_t *haystack, const wchar_t *needle)); + (wchar_t *restrict haystack, + const wchar_t *restrict needle)); _GL_CXXALIASWARN1 (wcsstr, const wchar_t *, - (const wchar_t *haystack, const wchar_t *needle)); -# else + (const wchar_t *restrict haystack, + const wchar_t *restrict needle)); +# elif __GLIBC__ >= 2 _GL_CXXALIASWARN (wcsstr); # endif #elif defined GNULIB_POSIXCHECK @@ -991,13 +1156,30 @@ _GL_WARN_ON_USE (wcsstr, "wcsstr is unportable - " /* Divide WCS into tokens separated by characters in DELIM. */ #if @GNULIB_WCSTOK@ -# if !@HAVE_WCSTOK@ +# if @REPLACE_WCSTOK@ +# if !(defined __cplusplus && defined GNULIB_NAMESPACE) +# undef wcstok +# define wcstok rpl_wcstok +# endif +_GL_FUNCDECL_RPL (wcstok, wchar_t *, + (wchar_t *restrict wcs, const wchar_t *restrict delim, + wchar_t **restrict ptr)); +_GL_CXXALIAS_RPL (wcstok, wchar_t *, + (wchar_t *restrict wcs, const wchar_t *restrict delim, + wchar_t **restrict ptr)); +# else +# if !@HAVE_WCSTOK@ _GL_FUNCDECL_SYS (wcstok, wchar_t *, - (wchar_t *wcs, const wchar_t *delim, wchar_t **ptr)); -# endif + (wchar_t *restrict wcs, const wchar_t *restrict delim, + wchar_t **restrict ptr)); +# endif _GL_CXXALIAS_SYS (wcstok, wchar_t *, - (wchar_t *wcs, const wchar_t *delim, wchar_t **ptr)); + (wchar_t *restrict wcs, const wchar_t *restrict delim, + wchar_t **restrict ptr)); +# endif +# if __GLIBC__ >= 2 _GL_CXXALIASWARN (wcstok); +# endif #elif defined GNULIB_POSIXCHECK # undef wcstok # if HAVE_RAW_DECL_WCSTOK @@ -1025,7 +1207,9 @@ _GL_FUNCDECL_SYS (wcswidth, int, (const wchar_t *s, size_t n) # endif _GL_CXXALIAS_SYS (wcswidth, int, (const wchar_t *s, size_t n)); # endif +# if __GLIBC__ >= 2 _GL_CXXALIASWARN (wcswidth); +# endif #elif defined GNULIB_POSIXCHECK # undef wcswidth # if HAVE_RAW_DECL_WCSWIDTH @@ -1036,28 +1220,38 @@ _GL_WARN_ON_USE (wcswidth, "wcswidth is unportable - " /* Convert *TP to a date and time wide string. See - . */ + . */ #if @GNULIB_WCSFTIME@ # if @REPLACE_WCSFTIME@ # if !(defined __cplusplus && defined GNULIB_NAMESPACE) # undef wcsftime # define wcsftime rpl_wcsftime # endif -_GL_FUNCDECL_RPL (wcsftime, size_t, (wchar_t *__buf, size_t __bufsize, - const wchar_t *__fmt, const struct tm *__tp) - _GL_ARG_NONNULL ((1, 3, 4))); -_GL_CXXALIAS_RPL (wcsftime, size_t, (wchar_t *__buf, size_t __bufsize, - const wchar_t *__fmt, const struct tm *__tp)); +_GL_FUNCDECL_RPL (wcsftime, size_t, + (wchar_t *restrict __buf, size_t __bufsize, + const wchar_t *restrict __fmt, + const struct tm *restrict __tp) + _GL_ARG_NONNULL ((1, 3, 4))); +_GL_CXXALIAS_RPL (wcsftime, size_t, + (wchar_t *restrict __buf, size_t __bufsize, + const wchar_t *restrict __fmt, + const struct tm *restrict __tp)); # else # if !@HAVE_WCSFTIME@ -_GL_FUNCDECL_SYS (wcsftime, size_t, (wchar_t *__buf, size_t __bufsize, - const wchar_t *__fmt, const struct tm *__tp) - _GL_ARG_NONNULL ((1, 3, 4))); +_GL_FUNCDECL_SYS (wcsftime, size_t, + (wchar_t *restrict __buf, size_t __bufsize, + const wchar_t *restrict __fmt, + const struct tm *restrict __tp) + _GL_ARG_NONNULL ((1, 3, 4))); # endif -_GL_CXXALIAS_SYS (wcsftime, size_t, (wchar_t *__buf, size_t __bufsize, - const wchar_t *__fmt, const struct tm *__tp)); +_GL_CXXALIAS_SYS (wcsftime, size_t, + (wchar_t *restrict __buf, size_t __bufsize, + const wchar_t *restrict __fmt, + const struct tm *restrict __tp)); # endif +# if __GLIBC__ >= 2 _GL_CXXALIASWARN (wcsftime); +# endif #elif defined GNULIB_POSIXCHECK # undef wcsftime # if HAVE_RAW_DECL_WCSFTIME diff --git a/lib/wcrtomb.c b/lib/wcrtomb.c index 8e56732..06105f1 100644 --- a/lib/wcrtomb.c +++ b/lib/wcrtomb.c @@ -1,5 +1,5 @@ /* Convert wide character to multibyte character. - Copyright (C) 2008-2019 Free Software Foundation, Inc. + Copyright (C) 2008-2020 Free Software Foundation, Inc. Written by Bruno Haible , 2008. This program is free software: you can redistribute it and/or modify @@ -26,6 +26,7 @@ size_t wcrtomb (char *s, wchar_t wc, mbstate_t *ps) +#undef wcrtomb { /* This implementation of wcrtomb supports only stateless encodings. ps must be in the initial state. */ @@ -35,12 +36,17 @@ wcrtomb (char *s, wchar_t wc, mbstate_t *ps) return (size_t)(-1); } +#if !HAVE_WCRTOMB /* IRIX 6.5 */ \ + || WCRTOMB_RETVAL_BUG /* Solaris 11.3, MSVC */ \ + || WCRTOMB_C_LOCALE_BUG /* Android */ if (s == NULL) /* We know the NUL wide character corresponds to the NUL character. */ return 1; else +#endif { -#if defined __ANDROID__ +#if HAVE_WCRTOMB +# if WCRTOMB_C_LOCALE_BUG /* Android */ /* Implement consistently with mbrtowc(): through a 1:1 correspondence, as in ISO-8859-1. */ if (wc >= 0 && wc <= 0xff) @@ -48,17 +54,27 @@ wcrtomb (char *s, wchar_t wc, mbstate_t *ps) *s = (unsigned char) wc; return 1; } -#else - /* Implement on top of wctomb(). */ + else + { + errno = EILSEQ; + return (size_t)(-1); + } +# else + return wcrtomb (s, wc, ps); +# endif +#else /* IRIX 6.5 */ + /* Fallback for platforms that don't have wcrtomb(). + Implement on top of wctomb(). + This code is not multithread-safe. */ int ret = wctomb (s, wc); if (ret >= 0) return ret; -#endif else { errno = EILSEQ; return (size_t)(-1); } +#endif } } diff --git a/lib/wctype.in.h b/lib/wctype.in.h index 0a7471f..57b8692 100644 --- a/lib/wctype.in.h +++ b/lib/wctype.in.h @@ -1,6 +1,6 @@ /* A substitute for ISO C99 , for platforms that lack it. - Copyright (C) 2006-2019 Free Software Foundation, Inc. + Copyright (C) 2006-2020 Free Software Foundation, Inc. This program is free software; you can redistribute it and/or modify it under the terms of the GNU General Public License as published by @@ -19,7 +19,7 @@ /* * ISO C 99 for platforms that lack it. - * + * * * iswctype, towctrans, towlower, towupper, wctrans, wctype, * wctrans_t, and wctype_t are not yet implemented. @@ -133,33 +133,116 @@ typedef unsigned int rpl_wint_t; /* FreeBSD 4.4 to 4.11 has but lacks the functions. Linux libc5 has and the functions but they are broken. + mingw and MSVC have and the functions but they take a wchar_t + as argument, not an rpl_wint_t. Assume all 11 functions (all isw* except iswblank) are implemented the same way, or not at all. */ # if ! @HAVE_ISWCNTRL@ || @REPLACE_ISWCNTRL@ -/* IRIX 5.3 has macros but no functions, its isw* macros refer to an - undefined variable _ctmp_ and to macros like _P, and they - refer to system functions like _iswctype that are not in the - standard C library. Rather than try to get ancient buggy - implementations like this to work, just disable them. */ -# undef iswalnum -# undef iswalpha -# undef iswblank -# undef iswcntrl -# undef iswdigit -# undef iswgraph -# undef iswlower -# undef iswprint -# undef iswpunct -# undef iswspace -# undef iswupper -# undef iswxdigit -# undef towlower -# undef towupper +# if @GNULIB_OVERRIDES_WINT_T@ /* implies @REPLACE_ISWCNTRL@ */ + +_GL_WCTYPE_INLINE int +rpl_iswalnum (wint_t wc) +{ + return ((wchar_t) wc == wc ? iswalnum ((wchar_t) wc) : 0); +} + +_GL_WCTYPE_INLINE int +rpl_iswalpha (wint_t wc) +{ + return ((wchar_t) wc == wc ? iswalpha ((wchar_t) wc) : 0); +} + +_GL_WCTYPE_INLINE int +rpl_iswblank (wint_t wc) +{ + return ((wchar_t) wc == wc ? iswblank ((wchar_t) wc) : 0); +} + +_GL_WCTYPE_INLINE int +rpl_iswcntrl (wint_t wc) +{ + return ((wchar_t) wc == wc ? iswcntrl ((wchar_t) wc) : 0); +} + +_GL_WCTYPE_INLINE int +rpl_iswdigit (wint_t wc) +{ + return ((wchar_t) wc == wc ? wc >= '0' && wc <= '9' : 0); +} + +_GL_WCTYPE_INLINE int +rpl_iswgraph (wint_t wc) +{ + return ((wchar_t) wc == wc ? iswgraph ((wchar_t) wc) : 0); +} + +_GL_WCTYPE_INLINE int +rpl_iswlower (wint_t wc) +{ + return ((wchar_t) wc == wc ? iswlower ((wchar_t) wc) : 0); +} + +_GL_WCTYPE_INLINE int +rpl_iswprint (wint_t wc) +{ + return ((wchar_t) wc == wc ? iswprint ((wchar_t) wc) : 0); +} + +_GL_WCTYPE_INLINE int +rpl_iswpunct (wint_t wc) +{ + return ((wchar_t) wc == wc ? iswpunct ((wchar_t) wc) : 0); +} + +_GL_WCTYPE_INLINE int +rpl_iswspace (wint_t wc) +{ + return ((wchar_t) wc == wc ? iswspace ((wchar_t) wc) : 0); +} + +_GL_WCTYPE_INLINE int +rpl_iswupper (wint_t wc) +{ + return ((wchar_t) wc == wc ? iswupper ((wchar_t) wc) : 0); +} + +_GL_WCTYPE_INLINE int +rpl_iswxdigit (wint_t wc) +{ + return ((wchar_t) wc == wc + ? (wc >= '0' && wc <= '9') + || ((wc & ~0x20) >= 'A' && (wc & ~0x20) <= 'F') + : 0); +} + +_GL_WCTYPE_INLINE wint_t +rpl_towlower (wint_t wc) +{ + return ((wchar_t) wc == wc ? (wchar_t) towlower ((wchar_t) wc) : wc); +} + +_GL_WCTYPE_INLINE wint_t +rpl_towupper (wint_t wc) +{ + return ((wchar_t) wc == wc ? (wchar_t) towupper ((wchar_t) wc) : wc); +} -/* Linux libc5 has and the functions but they are broken. */ -# if @REPLACE_ISWCNTRL@ # if !(defined __cplusplus && defined GNULIB_NAMESPACE) +# undef iswalnum +# undef iswalpha +# undef iswblank +# undef iswcntrl +# undef iswdigit +# undef iswgraph +# undef iswlower +# undef iswprint +# undef iswpunct +# undef iswspace +# undef iswupper +# undef iswxdigit +# undef towlower +# undef towupper # define iswalnum rpl_iswalnum # define iswalpha rpl_iswalpha # define iswblank rpl_iswblank @@ -172,21 +255,62 @@ typedef unsigned int rpl_wint_t; # define iswspace rpl_iswspace # define iswupper rpl_iswupper # define iswxdigit rpl_iswxdigit -# endif -# endif -# if @REPLACE_TOWLOWER@ -# if !(defined __cplusplus && defined GNULIB_NAMESPACE) # define towlower rpl_towlower # define towupper rpl_towupper # endif -# endif + +# else + +/* IRIX 5.3 has macros but no functions, its isw* macros refer to an + undefined variable _ctmp_ and to macros like _P, and they + refer to system functions like _iswctype that are not in the + standard C library. Rather than try to get ancient buggy + implementations like this to work, just disable them. */ +# undef iswalnum +# undef iswalpha +# undef iswblank +# undef iswcntrl +# undef iswdigit +# undef iswgraph +# undef iswlower +# undef iswprint +# undef iswpunct +# undef iswspace +# undef iswupper +# undef iswxdigit +# undef towlower +# undef towupper + +/* Linux libc5 has and the functions but they are broken. */ +# if @REPLACE_ISWCNTRL@ +# if !(defined __cplusplus && defined GNULIB_NAMESPACE) +# define iswalnum rpl_iswalnum +# define iswalpha rpl_iswalpha +# define iswblank rpl_iswblank +# define iswcntrl rpl_iswcntrl +# define iswdigit rpl_iswdigit +# define iswgraph rpl_iswgraph +# define iswlower rpl_iswlower +# define iswprint rpl_iswprint +# define iswpunct rpl_iswpunct +# define iswspace rpl_iswspace +# define iswupper rpl_iswupper +# define iswxdigit rpl_iswxdigit +# endif +# endif +# if @REPLACE_TOWLOWER@ +# if !(defined __cplusplus && defined GNULIB_NAMESPACE) +# define towlower rpl_towlower +# define towupper rpl_towupper +# endif +# endif _GL_WCTYPE_INLINE int -# if @REPLACE_ISWCNTRL@ +# if @REPLACE_ISWCNTRL@ rpl_iswalnum -# else +# else iswalnum -# endif +# endif (wint_t wc) { return ((wc >= '0' && wc <= '9') @@ -194,88 +318,88 @@ iswalnum } _GL_WCTYPE_INLINE int -# if @REPLACE_ISWCNTRL@ +# if @REPLACE_ISWCNTRL@ rpl_iswalpha -# else +# else iswalpha -# endif +# endif (wint_t wc) { return (wc & ~0x20) >= 'A' && (wc & ~0x20) <= 'Z'; } _GL_WCTYPE_INLINE int -# if @REPLACE_ISWCNTRL@ +# if @REPLACE_ISWCNTRL@ rpl_iswblank -# else +# else iswblank -# endif +# endif (wint_t wc) { return wc == ' ' || wc == '\t'; } _GL_WCTYPE_INLINE int -# if @REPLACE_ISWCNTRL@ +# if @REPLACE_ISWCNTRL@ rpl_iswcntrl -# else +# else iswcntrl -# endif +# endif (wint_t wc) { return (wc & ~0x1f) == 0 || wc == 0x7f; } _GL_WCTYPE_INLINE int -# if @REPLACE_ISWCNTRL@ +# if @REPLACE_ISWDIGIT@ rpl_iswdigit -# else +# else iswdigit -# endif +# endif (wint_t wc) { return wc >= '0' && wc <= '9'; } _GL_WCTYPE_INLINE int -# if @REPLACE_ISWCNTRL@ +# if @REPLACE_ISWCNTRL@ rpl_iswgraph -# else +# else iswgraph -# endif +# endif (wint_t wc) { return wc >= '!' && wc <= '~'; } _GL_WCTYPE_INLINE int -# if @REPLACE_ISWCNTRL@ +# if @REPLACE_ISWCNTRL@ rpl_iswlower -# else +# else iswlower -# endif +# endif (wint_t wc) { return wc >= 'a' && wc <= 'z'; } _GL_WCTYPE_INLINE int -# if @REPLACE_ISWCNTRL@ +# if @REPLACE_ISWCNTRL@ rpl_iswprint -# else +# else iswprint -# endif +# endif (wint_t wc) { return wc >= ' ' && wc <= '~'; } _GL_WCTYPE_INLINE int -# if @REPLACE_ISWCNTRL@ +# if @REPLACE_ISWCNTRL@ rpl_iswpunct -# else +# else iswpunct -# endif +# endif (wint_t wc) { return (wc >= '!' && wc <= '~' @@ -284,11 +408,11 @@ iswpunct } _GL_WCTYPE_INLINE int -# if @REPLACE_ISWCNTRL@ +# if @REPLACE_ISWCNTRL@ rpl_iswspace -# else +# else iswspace -# endif +# endif (wint_t wc) { return (wc == ' ' || wc == '\t' @@ -296,22 +420,22 @@ iswspace } _GL_WCTYPE_INLINE int -# if @REPLACE_ISWCNTRL@ +# if @REPLACE_ISWCNTRL@ rpl_iswupper -# else +# else iswupper -# endif +# endif (wint_t wc) { return wc >= 'A' && wc <= 'Z'; } _GL_WCTYPE_INLINE int -# if @REPLACE_ISWCNTRL@ +# if @REPLACE_ISWXDIGIT@ rpl_iswxdigit -# else +# else iswxdigit -# endif +# endif (wint_t wc) { return ((wc >= '0' && wc <= '9') @@ -319,42 +443,67 @@ iswxdigit } _GL_WCTYPE_INLINE wint_t -# if @REPLACE_TOWLOWER@ +# if @REPLACE_TOWLOWER@ rpl_towlower -# else +# else towlower -# endif +# endif (wint_t wc) { return (wc >= 'A' && wc <= 'Z' ? wc - 'A' + 'a' : wc); } _GL_WCTYPE_INLINE wint_t -# if @REPLACE_TOWLOWER@ +# if @REPLACE_TOWLOWER@ rpl_towupper -# else +# else towupper -# endif +# endif (wint_t wc) { return (wc >= 'a' && wc <= 'z' ? wc - 'a' + 'A' : wc); } -# elif @GNULIB_ISWBLANK@ && (! @HAVE_ISWBLANK@ || @REPLACE_ISWBLANK@) -/* Only the iswblank function is missing. */ +# endif -# if @REPLACE_ISWBLANK@ -# if !(defined __cplusplus && defined GNULIB_NAMESPACE) -# define iswblank rpl_iswblank -# endif +# else +/* Only some of the functions are missing or broken. */ + +# if @GNULIB_ISWBLANK@ && (! @HAVE_ISWBLANK@ || @REPLACE_ISWBLANK@) +/* Only the iswblank function is missing. */ +# if @REPLACE_ISWBLANK@ +# if !(defined __cplusplus && defined GNULIB_NAMESPACE) +# define iswblank rpl_iswblank +# endif _GL_FUNCDECL_RPL (iswblank, int, (wint_t wc)); -# else +# else _GL_FUNCDECL_SYS (iswblank, int, (wint_t wc)); +# endif +# endif + +# if @GNULIB_ISWDIGIT@ +# if @REPLACE_ISWDIGIT@ +# if !(defined __cplusplus && defined GNULIB_NAMESPACE) +# undef iswdigit +# define iswdigit rpl_iswdigit +# endif +_GL_FUNCDECL_RPL (iswdigit, int, (wint_t wc)); +# endif +# endif + +# if @GNULIB_ISWXDIGIT@ +# if @REPLACE_ISWXDIGIT@ +# if !(defined __cplusplus && defined GNULIB_NAMESPACE) +# undef iswxdigit +# define iswxdigit rpl_iswxdigit +# endif +_GL_FUNCDECL_RPL (iswxdigit, int, (wint_t wc)); +# endif # endif # endif -# if defined __MINGW32__ +# if defined __MINGW32__ && !@GNULIB_OVERRIDES_WINT_T@ /* On native Windows, wchar_t is uint16_t, and wint_t is uint32_t. The functions towlower and towupper are implemented in the MSVCRT library @@ -387,36 +536,71 @@ rpl_towupper (wint_t wc) # define towupper rpl_towupper # endif -# endif /* __MINGW32__ */ +# endif /* __MINGW32__ && !@GNULIB_OVERRIDES_WINT_T@ */ # define GNULIB_defined_wctype_functions 1 #endif #if @REPLACE_ISWCNTRL@ _GL_CXXALIAS_RPL (iswalnum, int, (wint_t wc)); -_GL_CXXALIAS_RPL (iswalpha, int, (wint_t wc)); -_GL_CXXALIAS_RPL (iswcntrl, int, (wint_t wc)); -_GL_CXXALIAS_RPL (iswdigit, int, (wint_t wc)); -_GL_CXXALIAS_RPL (iswgraph, int, (wint_t wc)); -_GL_CXXALIAS_RPL (iswlower, int, (wint_t wc)); -_GL_CXXALIAS_RPL (iswprint, int, (wint_t wc)); -_GL_CXXALIAS_RPL (iswpunct, int, (wint_t wc)); -_GL_CXXALIAS_RPL (iswspace, int, (wint_t wc)); -_GL_CXXALIAS_RPL (iswupper, int, (wint_t wc)); -_GL_CXXALIAS_RPL (iswxdigit, int, (wint_t wc)); #else _GL_CXXALIAS_SYS (iswalnum, int, (wint_t wc)); +#endif +#if @REPLACE_ISWCNTRL@ +_GL_CXXALIAS_RPL (iswalpha, int, (wint_t wc)); +#else _GL_CXXALIAS_SYS (iswalpha, int, (wint_t wc)); +#endif +#if @REPLACE_ISWCNTRL@ +_GL_CXXALIAS_RPL (iswcntrl, int, (wint_t wc)); +#else _GL_CXXALIAS_SYS (iswcntrl, int, (wint_t wc)); +#endif +#if @GNULIB_ISWDIGIT@ +# if @REPLACE_ISWDIGIT@ +_GL_CXXALIAS_RPL (iswdigit, int, (wint_t wc)); +# else _GL_CXXALIAS_SYS (iswdigit, int, (wint_t wc)); +# endif +#endif +#if @REPLACE_ISWCNTRL@ +_GL_CXXALIAS_RPL (iswgraph, int, (wint_t wc)); +#else _GL_CXXALIAS_SYS (iswgraph, int, (wint_t wc)); +#endif +#if @REPLACE_ISWCNTRL@ +_GL_CXXALIAS_RPL (iswlower, int, (wint_t wc)); +#else _GL_CXXALIAS_SYS (iswlower, int, (wint_t wc)); +#endif +#if @REPLACE_ISWCNTRL@ +_GL_CXXALIAS_RPL (iswprint, int, (wint_t wc)); +#else _GL_CXXALIAS_SYS (iswprint, int, (wint_t wc)); +#endif +#if @REPLACE_ISWCNTRL@ +_GL_CXXALIAS_RPL (iswpunct, int, (wint_t wc)); +#else _GL_CXXALIAS_SYS (iswpunct, int, (wint_t wc)); +#endif +#if @REPLACE_ISWCNTRL@ +_GL_CXXALIAS_RPL (iswspace, int, (wint_t wc)); +#else _GL_CXXALIAS_SYS (iswspace, int, (wint_t wc)); +#endif +#if @REPLACE_ISWCNTRL@ +_GL_CXXALIAS_RPL (iswupper, int, (wint_t wc)); +#else _GL_CXXALIAS_SYS (iswupper, int, (wint_t wc)); +#endif +#if @GNULIB_ISWXDIGIT@ +# if @REPLACE_ISWXDIGIT@ +_GL_CXXALIAS_RPL (iswxdigit, int, (wint_t wc)); +# else _GL_CXXALIAS_SYS (iswxdigit, int, (wint_t wc)); +# endif #endif +#if __GLIBC__ >= 2 _GL_CXXALIASWARN (iswalnum); _GL_CXXALIASWARN (iswalpha); _GL_CXXALIASWARN (iswcntrl); @@ -428,6 +612,7 @@ _GL_CXXALIASWARN (iswpunct); _GL_CXXALIASWARN (iswspace); _GL_CXXALIASWARN (iswupper); _GL_CXXALIASWARN (iswxdigit); +#endif #if @GNULIB_ISWBLANK@ # if @REPLACE_ISWCNTRL@ || @REPLACE_ISWBLANK@ @@ -435,7 +620,9 @@ _GL_CXXALIAS_RPL (iswblank, int, (wint_t wc)); # else _GL_CXXALIAS_SYS (iswblank, int, (wint_t wc)); # endif +# if __GLIBC__ >= 2 _GL_CXXALIASWARN (iswblank); +# endif #endif #if !@HAVE_WCTYPE_T@ @@ -451,7 +638,9 @@ typedef void * wctype_t; _GL_FUNCDECL_SYS (wctype, wctype_t, (const char *name)); # endif _GL_CXXALIAS_SYS (wctype, wctype_t, (const char *name)); +# if __GLIBC__ >= 2 _GL_CXXALIASWARN (wctype); +# endif #elif defined GNULIB_POSIXCHECK # undef wctype # if HAVE_RAW_DECL_WCTYPE @@ -464,11 +653,22 @@ _GL_WARN_ON_USE (wctype, "wctype is unportable - " The argument WC must be either a wchar_t value or WEOF. The argument DESC must have been returned by the wctype() function. */ #if @GNULIB_ISWCTYPE@ -# if !@HAVE_WCTYPE_T@ +# if @GNULIB_OVERRIDES_WINT_T@ +# if !(defined __cplusplus && defined GNULIB_NAMESPACE) +# undef iswctype +# define iswctype rpl_iswctype +# endif +_GL_FUNCDECL_RPL (iswctype, int, (wint_t wc, wctype_t desc)); +_GL_CXXALIAS_RPL (iswctype, int, (wint_t wc, wctype_t desc)); +# else +# if !@HAVE_WCTYPE_T@ _GL_FUNCDECL_SYS (iswctype, int, (wint_t wc, wctype_t desc)); -# endif +# endif _GL_CXXALIAS_SYS (iswctype, int, (wint_t wc, wctype_t desc)); +# endif +# if __GLIBC__ >= 2 _GL_CXXALIASWARN (iswctype); +# endif #elif defined GNULIB_POSIXCHECK # undef iswctype # if HAVE_RAW_DECL_ISWCTYPE @@ -484,8 +684,10 @@ _GL_CXXALIAS_RPL (towupper, wint_t, (wint_t wc)); _GL_CXXALIAS_SYS (towlower, wint_t, (wint_t wc)); _GL_CXXALIAS_SYS (towupper, wint_t, (wint_t wc)); #endif +#if __GLIBC__ >= 2 _GL_CXXALIASWARN (towlower); _GL_CXXALIASWARN (towupper); +#endif #if !@HAVE_WCTRANS_T@ # if !GNULIB_defined_wctrans_t @@ -500,7 +702,9 @@ typedef void * wctrans_t; _GL_FUNCDECL_SYS (wctrans, wctrans_t, (const char *name)); # endif _GL_CXXALIAS_SYS (wctrans, wctrans_t, (const char *name)); +# if __GLIBC__ >= 2 _GL_CXXALIASWARN (wctrans); +# endif #elif defined GNULIB_POSIXCHECK # undef wctrans # if HAVE_RAW_DECL_WCTRANS @@ -517,7 +721,9 @@ _GL_WARN_ON_USE (wctrans, "wctrans is unportable - " _GL_FUNCDECL_SYS (towctrans, wint_t, (wint_t wc, wctrans_t desc)); # endif _GL_CXXALIAS_SYS (towctrans, wint_t, (wint_t wc, wctrans_t desc)); +# if __GLIBC__ >= 2 _GL_CXXALIASWARN (towctrans); +# endif #elif defined GNULIB_POSIXCHECK # undef towctrans # if HAVE_RAW_DECL_TOWCTRANS diff --git a/lib/windows-initguard.h b/lib/windows-initguard.h index 8aefd0b..c4be45a 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-2019 Free Software Foundation, Inc. + Copyright (C) 2005-2020 Free Software Foundation, Inc. This 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/windows-mutex.c b/lib/windows-mutex.c index 9433881..7eb38a2 100644 --- a/lib/windows-mutex.c +++ b/lib/windows-mutex.c @@ -1,5 +1,5 @@ /* Plain mutexes (native Windows implementation). - Copyright (C) 2005-2019 Free Software Foundation, Inc. + Copyright (C) 2005-2020 Free Software Foundation, Inc. This 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/windows-mutex.h b/lib/windows-mutex.h index 5364f92..748b988 100644 --- a/lib/windows-mutex.h +++ b/lib/windows-mutex.h @@ -1,5 +1,5 @@ /* Plain mutexes (native Windows implementation). - Copyright (C) 2005-2019 Free Software Foundation, Inc. + Copyright (C) 2005-2020 Free Software Foundation, Inc. This 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/windows-once.c b/lib/windows-once.c index 455c50e..c431bd6 100644 --- a/lib/windows-once.c +++ b/lib/windows-once.c @@ -1,5 +1,5 @@ /* Once-only control (native Windows implementation). - Copyright (C) 2005-2019 Free Software Foundation, Inc. + Copyright (C) 2005-2020 Free Software Foundation, Inc. This 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/windows-once.h b/lib/windows-once.h index 1599983..d31717e 100644 --- a/lib/windows-once.h +++ b/lib/windows-once.h @@ -1,5 +1,5 @@ /* Once-only control (native Windows implementation). - Copyright (C) 2005-2019 Free Software Foundation, Inc. + Copyright (C) 2005-2020 Free Software Foundation, Inc. This 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/windows-recmutex.c b/lib/windows-recmutex.c index 7e6e446..db3c40c 100644 --- a/lib/windows-recmutex.c +++ b/lib/windows-recmutex.c @@ -1,5 +1,5 @@ /* Plain recursive mutexes (native Windows implementation). - Copyright (C) 2005-2019 Free Software Foundation, Inc. + Copyright (C) 2005-2020 Free Software Foundation, Inc. This 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/windows-recmutex.h b/lib/windows-recmutex.h index d143108..3b315e5 100644 --- a/lib/windows-recmutex.h +++ b/lib/windows-recmutex.h @@ -1,5 +1,5 @@ /* Plain recursive mutexes (native Windows implementation). - Copyright (C) 2005-2019 Free Software Foundation, Inc. + Copyright (C) 2005-2020 Free Software Foundation, Inc. This 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/windows-rwlock.c b/lib/windows-rwlock.c index 9207d1b..64e761c 100644 --- a/lib/windows-rwlock.c +++ b/lib/windows-rwlock.c @@ -1,5 +1,5 @@ /* Read-write locks (native Windows implementation). - Copyright (C) 2005-2019 Free Software Foundation, Inc. + Copyright (C) 2005-2020 Free Software Foundation, Inc. This 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,6 +25,10 @@ #include #include +/* Don't assume that UNICODE is not defined. */ +#undef CreateEvent +#define CreateEvent CreateEventA + /* In this file, the waitqueues are implemented as circular arrays. */ #define glwthread_waitqueue_t glwthread_carray_waitqueue_t diff --git a/lib/windows-rwlock.h b/lib/windows-rwlock.h index 9002040..ae5b82f 100644 --- a/lib/windows-rwlock.h +++ b/lib/windows-rwlock.h @@ -1,5 +1,5 @@ /* Read-write locks (native Windows implementation). - Copyright (C) 2005-2019 Free Software Foundation, Inc. + Copyright (C) 2005-2020 Free Software Foundation, Inc. This 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/xalloc-die.c b/lib/xalloc-die.c index 295f8d8..68559de 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-2019 Free Software + Copyright (C) 1997-2000, 2002-2004, 2006, 2009-2020 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 e3068c8..7cd4a74 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-2019 Free Software Foundation, Inc. + Copyright (C) 1990-2000, 2003-2004, 2006-2020 Free Software Foundation, Inc. This program is free software: you can redistribute it and/or modify it under the terms of the GNU General Public License as published by @@ -41,7 +41,7 @@ typedef size_t __xalloc_count_type; positive and N must be nonnegative. This is a macro, not a function, so that it works correctly even when SIZE_MAX < N. */ -#if 7 <= __GNUC__ +#if 7 <= __GNUC__ && !defined __clang__ # define xalloc_oversized(n, s) \ __builtin_mul_overflow_p (n, s, (__xalloc_count_type) 1) #elif 5 <= __GNUC__ && !defined __ICC && !__STRICT_ANSI__ diff --git a/lib/xalloc.h b/lib/xalloc.h index fc7e86b..d4f96bf 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-2019 Free Software Foundation, Inc. + Copyright (C) 1990-2000, 2003-2004, 2006-2020 Free Software Foundation, Inc. This program is free software: you can redistribute it and/or modify it under the terms of the GNU General Public License as published by @@ -31,24 +31,24 @@ _GL_INLINE_HEADER_BEGIN # define XALLOC_INLINE _GL_INLINE #endif + #ifdef __cplusplus extern "C" { #endif -#if ! defined __clang__ && \ - (__GNUC__ > 4 || (__GNUC__ == 4 && __GNUC_MINOR__ >= 3)) -# define _GL_ATTRIBUTE_ALLOC_SIZE(args) __attribute__ ((__alloc_size__ args)) -#else -# define _GL_ATTRIBUTE_ALLOC_SIZE(args) -#endif +#if GNULIB_XALLOC_DIE /* This function is always triggered when memory is exhausted. It must be defined by the application, either explicitly or by using gnulib's xalloc-die module. This is the function to call when one wants the program to die because of a memory allocation failure. */ -extern _Noreturn void xalloc_die (void); +/*extern*/ _Noreturn void xalloc_die (void); + +#endif /* GNULIB_XALLOC_DIE */ + +#if GNULIB_XALLOC void *xmalloc (size_t s) _GL_ATTRIBUTE_MALLOC _GL_ATTRIBUTE_ALLOC_SIZE ((1)); @@ -71,23 +71,23 @@ char *xstrdup (char const *str) /* Allocate an object of type T dynamically, with error checking. */ /* extern t *XMALLOC (typename t); */ -#define XMALLOC(t) ((t *) xmalloc (sizeof (t))) +# define XMALLOC(t) ((t *) xmalloc (sizeof (t))) /* Allocate memory for N elements of type T, with error checking. */ /* extern t *XNMALLOC (size_t n, typename t); */ -#define XNMALLOC(n, t) \ - ((t *) (sizeof (t) == 1 ? xmalloc (n) : xnmalloc (n, sizeof (t)))) +# define XNMALLOC(n, t) \ + ((t *) (sizeof (t) == 1 ? xmalloc (n) : xnmalloc (n, sizeof (t)))) /* Allocate an object of type T dynamically, with error checking, and zero it. */ /* extern t *XZALLOC (typename t); */ -#define XZALLOC(t) ((t *) xzalloc (sizeof (t))) +# define XZALLOC(t) ((t *) xzalloc (sizeof (t))) /* Allocate memory for N elements of type T, with error checking, and zero it. */ /* extern t *XCALLOC (size_t n, typename t); */ -#define XCALLOC(n, t) \ - ((t *) (sizeof (t) == 1 ? xzalloc (n) : xcalloc (n, sizeof (t)))) +# define XCALLOC(n, t) \ + ((t *) (sizeof (t) == 1 ? xzalloc (n) : xcalloc (n, sizeof (t)))) /* Allocate an array of N objects, each with S bytes of memory, @@ -218,8 +218,15 @@ xcharalloc (size_t n) return XNMALLOC (n, char); } +#endif /* GNULIB_XALLOC */ + + #ifdef __cplusplus } +#endif + + +#if GNULIB_XALLOC && defined __cplusplus /* C++ does not allow conversions from void * to other pointer types without a cast. Use templates to work around the problem when @@ -255,7 +262,8 @@ xmemdup (T const *p, size_t s) return (T *) xmemdup ((void const *) p, s); } -#endif +#endif /* GNULIB_XALLOC && C++ */ + _GL_INLINE_HEADER_END diff --git a/lib/xmalloc.c b/lib/xmalloc.c index cbe9a4f..69c4e7d 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-2019 Free Software Foundation, Inc. + Copyright (C) 1990-2000, 2002-2006, 2008-2020 Free Software Foundation, Inc. This program is free software: you can redistribute it and/or modify it under the terms of the GNU General Public License as published by @@ -24,14 +24,26 @@ #include #include -/* 1 if calloc is known to be compatible with GNU calloc. This - matters if we are not also using the calloc module, which defines - HAVE_CALLOC_GNU and supports the GNU API even on non-GNU platforms. */ +/* 1 if calloc, malloc and realloc are known to be compatible with GNU. + This matters if we are not also using the calloc-gnu, malloc-gnu + and realloc-gnu modules, which define HAVE_CALLOC_GNU, + HAVE_MALLOC_GNU and HAVE_REALLOC_GNU and support the GNU API even + on non-GNU platforms. */ #if defined HAVE_CALLOC_GNU || (defined __GLIBC__ && !defined __UCLIBC__) enum { HAVE_GNU_CALLOC = 1 }; #else enum { HAVE_GNU_CALLOC = 0 }; #endif +#if defined HAVE_MALLOC_GNU || (defined __GLIBC__ && !defined __UCLIBC__) +enum { HAVE_GNU_MALLOC = 1 }; +#else +enum { HAVE_GNU_MALLOC = 0 }; +#endif +#if defined HAVE_REALLOC_GNU || (defined __GLIBC__ && !defined __UCLIBC__) +enum { HAVE_GNU_REALLOC = 1 }; +#else +enum { HAVE_GNU_REALLOC = 0 }; +#endif /* Allocate N bytes of memory dynamically, with error checking. */ @@ -39,7 +51,7 @@ void * xmalloc (size_t n) { void *p = malloc (n); - if (!p && n != 0) + if (!p && (HAVE_GNU_MALLOC || n)) xalloc_die (); return p; } @@ -50,18 +62,17 @@ xmalloc (size_t n) void * xrealloc (void *p, size_t n) { - if (!n && p) + if (!HAVE_GNU_REALLOC && !n && p) { - /* The GNU and C99 realloc behaviors disagree here. Act like - GNU, even if the underlying realloc is C99. */ + /* The GNU and C99 realloc behaviors disagree here. Act like GNU. */ free (p); return NULL; } - p = realloc (p, n); - if (!p && n) + void *r = realloc (p, n); + if (!r && (n || (HAVE_GNU_REALLOC && !p))) xalloc_die (); - return p; + return r; } /* If P is null, allocate a block of at least *PN bytes; otherwise, @@ -76,14 +87,14 @@ x2realloc (void *p, size_t *pn) return x2nrealloc (p, pn, 1); } -/* Allocate S bytes of zeroed memory dynamically, with error checking. +/* Allocate N bytes of zeroed memory dynamically, with error checking. There's no need for xnzalloc (N, S), since it would be equivalent to xcalloc (N, S). */ void * -xzalloc (size_t s) +xzalloc (size_t n) { - return memset (xmalloc (s), 0, s); + return xcalloc (n, 1); } /* Allocate zeroed memory for N elements of S bytes, with error diff --git a/lib/xstrndup.c b/lib/xstrndup.c index a973829..93dcfe5 100644 --- a/lib/xstrndup.c +++ b/lib/xstrndup.c @@ -1,6 +1,6 @@ /* Duplicate a bounded initial segment of a string, with out-of-memory checking. - Copyright (C) 2003, 2006-2007, 2009-2019 Free Software Foundation, Inc. + Copyright (C) 2003, 2006-2007, 2009-2020 Free Software Foundation, Inc. This 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/xstrndup.h b/lib/xstrndup.h index 360ccfd..4f1da97 100644 --- a/lib/xstrndup.h +++ b/lib/xstrndup.h @@ -1,6 +1,6 @@ /* Duplicate a bounded initial segment of a string, with out-of-memory checking. - Copyright (C) 2003, 2009-2019 Free Software Foundation, Inc. + Copyright (C) 2003, 2009-2020 Free Software Foundation, Inc. This 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/xstrtol-error.c b/lib/xstrtol-error.c deleted file mode 100644 index a0d10c2..0000000 --- a/lib/xstrtol-error.c +++ /dev/null @@ -1,98 +0,0 @@ -/* A more useful interface to strtol. - - Copyright (C) 1995-1996, 1998-1999, 2001-2004, 2006-2019 Free Software - Foundation, Inc. - - This program is free software: you can redistribute it and/or modify - 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 . */ - -#include -#include "xstrtol.h" - -#include - -#include "error.h" -#include "exitfail.h" -#include "gettext.h" - -#define N_(msgid) msgid - -/* Report an error for an invalid integer in an option argument. - - ERR is the error code returned by one of the xstrto* functions. - - Use OPT_IDX to decide whether to print the short option string "C" - or "-C" or a long option string derived from LONG_OPTION. OPT_IDX - is -2 if the short option "C" was used, without any leading "-"; it - is -1 if the short option "-C" was used; otherwise it is an index - into LONG_OPTIONS, which should have a name preceded by two '-' - characters. - - ARG is the option-argument containing the integer. - - After reporting an error, exit with status EXIT_STATUS if it is - nonzero. */ - -static void -xstrtol_error (enum strtol_error err, - int opt_idx, char c, struct option const *long_options, - char const *arg, - int exit_status) -{ - char const *hyphens = "--"; - char const *msgid; - char const *option; - char option_buffer[2]; - - switch (err) - { - default: - abort (); - - case LONGINT_INVALID: - msgid = N_("invalid %s%s argument '%s'"); - break; - - case LONGINT_INVALID_SUFFIX_CHAR: - case LONGINT_INVALID_SUFFIX_CHAR_WITH_OVERFLOW: - msgid = N_("invalid suffix in %s%s argument '%s'"); - break; - - case LONGINT_OVERFLOW: - msgid = N_("%s%s argument '%s' too large"); - break; - } - - if (opt_idx < 0) - { - hyphens -= opt_idx; - option_buffer[0] = c; - option_buffer[1] = '\0'; - option = option_buffer; - } - else - option = long_options[opt_idx].name; - - error (exit_status, 0, gettext (msgid), hyphens, option, arg); -} - -/* Like xstrtol_error, except exit with a failure status. */ - -void -xstrtol_fatal (enum strtol_error err, - int opt_idx, char c, struct option const *long_options, - char const *arg) -{ - xstrtol_error (err, opt_idx, c, long_options, arg, exit_failure); - abort (); -} diff --git a/lib/xstrtol.c b/lib/xstrtol.c index ab73d04..b567fff 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-2019 Free Software + Copyright (C) 1995-1996, 1998-2001, 2003-2007, 2009-2020 Free Software Foundation, Inc. This program is free software: you can redistribute it and/or modify diff --git a/lib/xstrtol.h b/lib/xstrtol.h index fff320d..15d9bb7 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-2019 Free Software + Copyright (C) 1995-1996, 1998-1999, 2001-2004, 2006-2020 Free Software Foundation, Inc. This program is free software: you can redistribute it and/or modify @@ -19,7 +19,6 @@ #ifndef XSTRTOL_H_ # define XSTRTOL_H_ 1 -# include # include # ifndef _STRTOL_ERROR @@ -43,31 +42,9 @@ typedef enum strtol_error strtol_error; strtol_error name (const char *, char **, int, type *, const char *); _DECLARE_XSTRTOL (xstrtol, long int) _DECLARE_XSTRTOL (xstrtoul, unsigned long int) -_DECLARE_XSTRTOL (xstrtoimax, intmax_t) -_DECLARE_XSTRTOL (xstrtoumax, uintmax_t) - -#if HAVE_LONG_LONG_INT _DECLARE_XSTRTOL (xstrtoll, long long int) _DECLARE_XSTRTOL (xstrtoull, unsigned long long int) -#endif - -/* Report an error for an invalid integer in an option argument. - - ERR is the error code returned by one of the xstrto* functions. - - Use OPT_IDX to decide whether to print the short option string "C" - or "-C" or a long option string derived from LONG_OPTION. OPT_IDX - is -2 if the short option "C" was used, without any leading "-"; it - is -1 if the short option "-C" was used; otherwise it is an index - into LONG_OPTIONS, which should have a name preceded by two '-' - characters. - - ARG is the option-argument containing the integer. - - After reporting an error, exit with a failure status. */ - -_Noreturn void xstrtol_fatal (enum strtol_error, - int, char, struct option const *, - char const *); +_DECLARE_XSTRTOL (xstrtoimax, intmax_t) +_DECLARE_XSTRTOL (xstrtoumax, uintmax_t) #endif /* not XSTRTOL_H_ */ diff --git a/libparted/Makefile.am b/libparted/Makefile.am index bcdde77..dc624cf 100644 --- a/libparted/Makefile.am +++ b/libparted/Makefile.am @@ -1,5 +1,6 @@ # This file is part of GNU Parted -# Copyright (C) 1999-2001, 2007, 2009-2014, 2019 Free Software Foundation, Inc. +# Copyright (C) 1999-2001, 2007, 2009-2014, 2019-2021 Free Software Foundation, +# Inc. # # This file may be modified and/or distributed without restriction. @@ -23,7 +24,7 @@ lib_LTLIBRARIES = libparted.la # For details, see the "Updating library version information" section of # "info libtool". CURRENT = 2 -REVISION = 2 +REVISION = 3 AGE = 0 libparted_la_LDFLAGS = -version-info $(CURRENT):$(REVISION):$(AGE) @@ -55,7 +56,6 @@ libparted_la_LIBADD = \ $(top_builddir)/lib/libgnulib.la \ $(OS_LIBS) \ $(DM_LIBS) \ - $(SELINUX_LIBS) \ $(LIB_BLKID) \ $(UUID_LIBS) \ $(INTLLIBS) diff --git a/libparted/Makefile.in b/libparted/Makefile.in index b386952..29b51fc 100644 --- a/libparted/Makefile.in +++ b/libparted/Makefile.in @@ -15,7 +15,8 @@ @SET_MAKE@ # This file is part of GNU Parted -# Copyright (C) 1999-2001, 2007, 2009-2014, 2019 Free Software Foundation, Inc. +# Copyright (C) 1999-2001, 2007, 2009-2014, 2019-2021 Free Software Foundation, +# Inc. # # This file may be modified and/or distributed without restriction. @@ -101,9 +102,9 @@ am__aclocal_m4_deps = $(top_srcdir)/m4/00gnulib.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/calloc.m4 $(top_srcdir)/m4/canonicalize.m4 \ - $(top_srcdir)/m4/close.m4 $(top_srcdir)/m4/codeset.m4 \ - $(top_srcdir)/m4/config-h.m4 $(top_srcdir)/m4/configmake.m4 \ - $(top_srcdir)/m4/ctype.m4 $(top_srcdir)/m4/dirname.m4 \ + $(top_srcdir)/m4/clock_time.m4 $(top_srcdir)/m4/close.m4 \ + $(top_srcdir)/m4/codeset.m4 $(top_srcdir)/m4/config-h.m4 \ + $(top_srcdir)/m4/configmake.m4 $(top_srcdir)/m4/ctype.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 \ @@ -115,15 +116,13 @@ am__aclocal_m4_deps = $(top_srcdir)/m4/00gnulib.m4 \ $(top_srcdir)/m4/fsync.m4 $(top_srcdir)/m4/ftruncate.m4 \ $(top_srcdir)/m4/getcwd.m4 $(top_srcdir)/m4/getdtablesize.m4 \ $(top_srcdir)/m4/getopt.m4 $(top_srcdir)/m4/getpagesize.m4 \ - $(top_srcdir)/m4/getprogname.m4 $(top_srcdir)/m4/gettext.m4 \ - $(top_srcdir)/m4/gettimeofday.m4 $(top_srcdir)/m4/glibc21.m4 \ - $(top_srcdir)/m4/gnulib-common.m4 \ - $(top_srcdir)/m4/gnulib-comp.m4 \ - $(top_srcdir)/m4/host-cpu-c-abi.m4 $(top_srcdir)/m4/iconv.m4 \ + $(top_srcdir)/m4/getprogname.m4 $(top_srcdir)/m4/getrandom.m4 \ + $(top_srcdir)/m4/gettext.m4 $(top_srcdir)/m4/gettimeofday.m4 \ + $(top_srcdir)/m4/glibc21.m4 $(top_srcdir)/m4/gnulib-common.m4 \ + $(top_srcdir)/m4/gnulib-comp.m4 $(top_srcdir)/m4/iconv.m4 \ $(top_srcdir)/m4/include_next.m4 $(top_srcdir)/m4/inet_pton.m4 \ $(top_srcdir)/m4/intl-thread-locale.m4 \ - $(top_srcdir)/m4/intlmacosx.m4 \ - $(top_srcdir)/m4/inttypes-pri.m4 $(top_srcdir)/m4/inttypes.m4 \ + $(top_srcdir)/m4/intlmacosx.m4 $(top_srcdir)/m4/inttypes.m4 \ $(top_srcdir)/m4/ioctl.m4 $(top_srcdir)/m4/isblank.m4 \ $(top_srcdir)/m4/langinfo_h.m4 $(top_srcdir)/m4/largefile.m4 \ $(top_srcdir)/m4/lcmessage.m4 $(top_srcdir)/m4/lib-ignore.m4 \ @@ -133,25 +132,26 @@ am__aclocal_m4_deps = $(top_srcdir)/m4/00gnulib.m4 \ $(top_srcdir)/m4/locale-fr.m4 $(top_srcdir)/m4/locale-ja.m4 \ $(top_srcdir)/m4/locale-tr.m4 $(top_srcdir)/m4/locale-zh.m4 \ $(top_srcdir)/m4/locale_h.m4 $(top_srcdir)/m4/localeconv.m4 \ - $(top_srcdir)/m4/localename.m4 \ - $(top_srcdir)/m4/localtime-buffer.m4 $(top_srcdir)/m4/lock.m4 \ - $(top_srcdir)/m4/longlong.m4 $(top_srcdir)/m4/lseek.m4 \ - $(top_srcdir)/m4/lstat.m4 $(top_srcdir)/m4/ltoptions.m4 \ - $(top_srcdir)/m4/ltsugar.m4 $(top_srcdir)/m4/ltversion.m4 \ - $(top_srcdir)/m4/lt~obsolete.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/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/localename.m4 $(top_srcdir)/m4/lock.m4 \ + $(top_srcdir)/m4/lseek.m4 $(top_srcdir)/m4/lstat.m4 \ + $(top_srcdir)/m4/ltoptions.m4 $(top_srcdir)/m4/ltsugar.m4 \ + $(top_srcdir)/m4/ltversion.m4 $(top_srcdir)/m4/lt~obsolete.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/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/nanosleep.m4 $(top_srcdir)/m4/netinet_in_h.m4 \ + $(top_srcdir)/m4/musl.m4 $(top_srcdir)/m4/nanosleep.m4 \ + $(top_srcdir)/m4/netinet_in_h.m4 \ $(top_srcdir)/m4/nl_langinfo.m4 $(top_srcdir)/m4/nls.m4 \ $(top_srcdir)/m4/nocrash.m4 $(top_srcdir)/m4/o-direct.m4 \ $(top_srcdir)/m4/off_t.m4 $(top_srcdir)/m4/open-cloexec.m4 \ - $(top_srcdir)/m4/open.m4 $(top_srcdir)/m4/pathmax.m4 \ - $(top_srcdir)/m4/perror.m4 $(top_srcdir)/m4/pipe.m4 \ + $(top_srcdir)/m4/open-slash.m4 $(top_srcdir)/m4/open.m4 \ + $(top_srcdir)/m4/pathmax.m4 $(top_srcdir)/m4/perror.m4 \ + $(top_srcdir)/m4/pid_t.m4 $(top_srcdir)/m4/pipe.m4 \ $(top_srcdir)/m4/po.m4 $(top_srcdir)/m4/priv-set.m4 \ $(top_srcdir)/m4/progtest.m4 \ $(top_srcdir)/m4/pthread-thread.m4 \ @@ -163,9 +163,10 @@ am__aclocal_m4_deps = $(top_srcdir)/m4/00gnulib.m4 \ $(top_srcdir)/m4/readlink.m4 $(top_srcdir)/m4/realloc.m4 \ $(top_srcdir)/m4/regex.m4 $(top_srcdir)/m4/rpmatch.m4 \ $(top_srcdir)/m4/safe-read.m4 $(top_srcdir)/m4/sched_h.m4 \ - $(top_srcdir)/m4/select.m4 $(top_srcdir)/m4/setenv.m4 \ - $(top_srcdir)/m4/setlocale.m4 $(top_srcdir)/m4/sigaction.m4 \ - $(top_srcdir)/m4/signal_h.m4 \ + $(top_srcdir)/m4/select.m4 $(top_srcdir)/m4/semaphore.m4 \ + $(top_srcdir)/m4/setenv.m4 $(top_srcdir)/m4/setlocale.m4 \ + $(top_srcdir)/m4/setlocale_null.m4 \ + $(top_srcdir)/m4/sigaction.m4 $(top_srcdir)/m4/signal_h.m4 \ $(top_srcdir)/m4/signalblocking.m4 $(top_srcdir)/m4/sleep.m4 \ $(top_srcdir)/m4/socketlib.m4 $(top_srcdir)/m4/sockets.m4 \ $(top_srcdir)/m4/socklen.m4 $(top_srcdir)/m4/sockpfaf.m4 \ @@ -180,6 +181,7 @@ am__aclocal_m4_deps = $(top_srcdir)/m4/00gnulib.m4 \ $(top_srcdir)/m4/strnlen.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 \ @@ -188,14 +190,15 @@ am__aclocal_m4_deps = $(top_srcdir)/m4/00gnulib.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/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/xstrndup.m4 $(top_srcdir)/m4/xstrtol.m4 \ - $(top_srcdir)/m4/yield.m4 $(top_srcdir)/configure.ac + $(top_srcdir)/m4/yield.m4 $(top_srcdir)/m4/zzgnulib.m4 \ + $(top_srcdir)/configure.ac am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \ $(ACLOCAL_M4) DIST_COMMON = $(srcdir)/Makefile.am $(am__DIST_COMMON) @@ -236,8 +239,7 @@ am__DEPENDENCIES_1 = libparted_la_DEPENDENCIES = fs/libfs.la labels/liblabels.la \ $(top_builddir)/lib/libgnulib.la $(am__DEPENDENCIES_1) \ $(am__DEPENDENCIES_1) $(am__DEPENDENCIES_1) \ - $(am__DEPENDENCIES_1) $(am__DEPENDENCIES_1) \ - $(am__DEPENDENCIES_1) + $(am__DEPENDENCIES_1) $(am__DEPENDENCIES_1) am__dirstamp = $(am__leading_dot)dirstamp am__objects_1 = arch/$(OS).lo am_libparted_la_OBJECTS = debug.lo architecture.lo device.lo \ @@ -387,6 +389,7 @@ BUILDINFO = @BUILDINFO@ CC = @CC@ CCDEPMODE = @CCDEPMODE@ CFLAGS = @CFLAGS@ +CFLAG_VISIBILITY = @CFLAG_VISIBILITY@ CHECK_CFLAGS = @CHECK_CFLAGS@ CHECK_LIBS = @CHECK_LIBS@ CONFIG_INCLUDE = @CONFIG_INCLUDE@ @@ -421,6 +424,8 @@ GMSGFMT = @GMSGFMT@ GMSGFMT_015 = @GMSGFMT_015@ GNULIB_ACCEPT = @GNULIB_ACCEPT@ GNULIB_ACCEPT4 = @GNULIB_ACCEPT4@ +GNULIB_ACCESS = @GNULIB_ACCESS@ +GNULIB_ALIGNED_ALLOC = @GNULIB_ALIGNED_ALLOC@ GNULIB_ATOLL = @GNULIB_ATOLL@ GNULIB_BIND = @GNULIB_BIND@ GNULIB_BTOWC = @GNULIB_BTOWC@ @@ -431,6 +436,7 @@ GNULIB_CHOWN = @GNULIB_CHOWN@ GNULIB_CLOSE = @GNULIB_CLOSE@ GNULIB_CONNECT = @GNULIB_CONNECT@ GNULIB_COPY_FILE_RANGE = @GNULIB_COPY_FILE_RANGE@ +GNULIB_CREAT = @GNULIB_CREAT@ GNULIB_CTIME = @GNULIB_CTIME@ GNULIB_DPRINTF = @GNULIB_DPRINTF@ GNULIB_DUP = @GNULIB_DUP@ @@ -478,19 +484,23 @@ GNULIB_GETCWD = @GNULIB_GETCWD@ GNULIB_GETDELIM = @GNULIB_GETDELIM@ GNULIB_GETDOMAINNAME = @GNULIB_GETDOMAINNAME@ GNULIB_GETDTABLESIZE = @GNULIB_GETDTABLESIZE@ +GNULIB_GETENTROPY = @GNULIB_GETENTROPY@ GNULIB_GETGROUPS = @GNULIB_GETGROUPS@ GNULIB_GETHOSTNAME = @GNULIB_GETHOSTNAME@ GNULIB_GETLINE = @GNULIB_GETLINE@ GNULIB_GETLOADAVG = @GNULIB_GETLOADAVG@ GNULIB_GETLOGIN = @GNULIB_GETLOGIN@ GNULIB_GETLOGIN_R = @GNULIB_GETLOGIN_R@ +GNULIB_GETOPT_POSIX = @GNULIB_GETOPT_POSIX@ GNULIB_GETPAGESIZE = @GNULIB_GETPAGESIZE@ GNULIB_GETPASS = @GNULIB_GETPASS@ GNULIB_GETPEERNAME = @GNULIB_GETPEERNAME@ +GNULIB_GETRANDOM = @GNULIB_GETRANDOM@ GNULIB_GETSOCKNAME = @GNULIB_GETSOCKNAME@ GNULIB_GETSOCKOPT = @GNULIB_GETSOCKOPT@ GNULIB_GETSUBOPT = @GNULIB_GETSUBOPT@ GNULIB_GETTIMEOFDAY = @GNULIB_GETTIMEOFDAY@ +GNULIB_GETUMASK = @GNULIB_GETUMASK@ GNULIB_GETUSERSHELL = @GNULIB_GETUSERSHELL@ GNULIB_GL_UNISTD_H_GETOPT = @GNULIB_GL_UNISTD_H_GETOPT@ GNULIB_GRANTPT = @GNULIB_GRANTPT@ @@ -504,6 +514,8 @@ GNULIB_ISATTY = @GNULIB_ISATTY@ GNULIB_ISBLANK = @GNULIB_ISBLANK@ GNULIB_ISWBLANK = @GNULIB_ISWBLANK@ GNULIB_ISWCTYPE = @GNULIB_ISWCTYPE@ +GNULIB_ISWDIGIT = @GNULIB_ISWDIGIT@ +GNULIB_ISWXDIGIT = @GNULIB_ISWXDIGIT@ GNULIB_LCHMOD = @GNULIB_LCHMOD@ GNULIB_LCHOWN = @GNULIB_LCHOWN@ GNULIB_LINK = @GNULIB_LINK@ @@ -564,6 +576,7 @@ GNULIB_PERROR = @GNULIB_PERROR@ GNULIB_PIPE = @GNULIB_PIPE@ GNULIB_PIPE2 = @GNULIB_PIPE2@ GNULIB_POPEN = @GNULIB_POPEN@ +GNULIB_POSIX_MEMALIGN = @GNULIB_POSIX_MEMALIGN@ GNULIB_POSIX_OPENPT = @GNULIB_POSIX_OPENPT@ GNULIB_PREAD = @GNULIB_PREAD@ GNULIB_PRINTF = @GNULIB_PRINTF@ @@ -612,9 +625,12 @@ GNULIB_SENDTO = @GNULIB_SENDTO@ GNULIB_SETENV = @GNULIB_SETENV@ GNULIB_SETHOSTNAME = @GNULIB_SETHOSTNAME@ GNULIB_SETLOCALE = @GNULIB_SETLOCALE@ +GNULIB_SETLOCALE_NULL = @GNULIB_SETLOCALE_NULL@ GNULIB_SETSOCKOPT = @GNULIB_SETSOCKOPT@ GNULIB_SHUTDOWN = @GNULIB_SHUTDOWN@ +GNULIB_SIGABBREV_NP = @GNULIB_SIGABBREV_NP@ GNULIB_SIGACTION = @GNULIB_SIGACTION@ +GNULIB_SIGDESCR_NP = @GNULIB_SIGDESCR_NP@ GNULIB_SIGNAL_H_SIGPIPE = @GNULIB_SIGNAL_H_SIGPIPE@ GNULIB_SIGPROCMASK = @GNULIB_SIGPROCMASK@ GNULIB_SLEEP = @GNULIB_SLEEP@ @@ -630,6 +646,7 @@ GNULIB_STRCASESTR = @GNULIB_STRCASESTR@ GNULIB_STRCHRNUL = @GNULIB_STRCHRNUL@ GNULIB_STRDUP = @GNULIB_STRDUP@ GNULIB_STRERROR = @GNULIB_STRERROR@ +GNULIB_STRERRORNAME_NP = @GNULIB_STRERRORNAME_NP@ GNULIB_STRERROR_R = @GNULIB_STRERROR_R@ GNULIB_STRFTIME = @GNULIB_STRFTIME@ GNULIB_STRNCAT = @GNULIB_STRNCAT@ @@ -713,11 +730,13 @@ GNULIB_WMEMCHR = @GNULIB_WMEMCHR@ GNULIB_WMEMCMP = @GNULIB_WMEMCMP@ GNULIB_WMEMCPY = @GNULIB_WMEMCPY@ GNULIB_WMEMMOVE = @GNULIB_WMEMMOVE@ +GNULIB_WMEMPCPY = @GNULIB_WMEMPCPY@ GNULIB_WMEMSET = @GNULIB_WMEMSET@ GNULIB_WRITE = @GNULIB_WRITE@ GNULIB__EXIT = @GNULIB__EXIT@ GREP = @GREP@ HAVE_ACCEPT4 = @HAVE_ACCEPT4@ +HAVE_ALIGNED_ALLOC = @HAVE_ALIGNED_ALLOC@ HAVE_ALLOCA_H = @HAVE_ALLOCA_H@ HAVE_ARPA_INET_H = @HAVE_ARPA_INET_H@ HAVE_ATOLL = @HAVE_ATOLL@ @@ -727,12 +746,17 @@ HAVE_CANONICALIZE_FILE_NAME = @HAVE_CANONICALIZE_FILE_NAME@ HAVE_CHOWN = @HAVE_CHOWN@ HAVE_COPY_FILE_RANGE = @HAVE_COPY_FILE_RANGE@ HAVE_CRTDEFS_H = @HAVE_CRTDEFS_H@ +HAVE_DECL_ECVT = @HAVE_DECL_ECVT@ HAVE_DECL_ENVIRON = @HAVE_DECL_ENVIRON@ +HAVE_DECL_EXECVPE = @HAVE_DECL_EXECVPE@ HAVE_DECL_FCHDIR = @HAVE_DECL_FCHDIR@ +HAVE_DECL_FCLOSEALL = @HAVE_DECL_FCLOSEALL@ +HAVE_DECL_FCVT = @HAVE_DECL_FCVT@ HAVE_DECL_FDATASYNC = @HAVE_DECL_FDATASYNC@ HAVE_DECL_FPURGE = @HAVE_DECL_FPURGE@ HAVE_DECL_FSEEKO = @HAVE_DECL_FSEEKO@ HAVE_DECL_FTELLO = @HAVE_DECL_FTELLO@ +HAVE_DECL_GCVT = @HAVE_DECL_GCVT@ HAVE_DECL_GETDELIM = @HAVE_DECL_GETDELIM@ HAVE_DECL_GETDOMAINNAME = @HAVE_DECL_GETDOMAINNAME@ HAVE_DECL_GETLINE = @HAVE_DECL_GETLINE@ @@ -766,10 +790,10 @@ HAVE_DECL_TRUNCATE = @HAVE_DECL_TRUNCATE@ HAVE_DECL_TTYNAME_R = @HAVE_DECL_TTYNAME_R@ HAVE_DECL_UNSETENV = @HAVE_DECL_UNSETENV@ HAVE_DECL_VSNPRINTF = @HAVE_DECL_VSNPRINTF@ +HAVE_DECL_WCSDUP = @HAVE_DECL_WCSDUP@ HAVE_DECL_WCTOB = @HAVE_DECL_WCTOB@ HAVE_DECL_WCWIDTH = @HAVE_DECL_WCWIDTH@ HAVE_DPRINTF = @HAVE_DPRINTF@ -HAVE_DUP2 = @HAVE_DUP2@ HAVE_DUP3 = @HAVE_DUP3@ HAVE_DUPLOCALE = @HAVE_DUPLOCALE@ HAVE_EUIDACCESS = @HAVE_EUIDACCESS@ @@ -791,14 +815,17 @@ HAVE_FTELLO = @HAVE_FTELLO@ HAVE_FTRUNCATE = @HAVE_FTRUNCATE@ HAVE_FUTIMENS = @HAVE_FUTIMENS@ HAVE_GETDTABLESIZE = @HAVE_GETDTABLESIZE@ +HAVE_GETENTROPY = @HAVE_GETENTROPY@ HAVE_GETGROUPS = @HAVE_GETGROUPS@ HAVE_GETHOSTNAME = @HAVE_GETHOSTNAME@ HAVE_GETLOGIN = @HAVE_GETLOGIN@ HAVE_GETOPT_H = @HAVE_GETOPT_H@ HAVE_GETPAGESIZE = @HAVE_GETPAGESIZE@ HAVE_GETPASS = @HAVE_GETPASS@ +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_IMAXDIV_T = @HAVE_IMAXDIV_T@ @@ -817,7 +844,6 @@ HAVE_LCHMOD = @HAVE_LCHMOD@ HAVE_LCHOWN = @HAVE_LCHOWN@ HAVE_LINK = @HAVE_LINK@ HAVE_LINKAT = @HAVE_LINKAT@ -HAVE_LONG_LONG_INT = @HAVE_LONG_LONG_INT@ HAVE_LSTAT = @HAVE_LSTAT@ HAVE_MAX_ALIGN_T = @HAVE_MAX_ALIGN_T@ HAVE_MBRLEN = @HAVE_MBRLEN@ @@ -827,7 +853,6 @@ HAVE_MBSLEN = @HAVE_MBSLEN@ HAVE_MBSNRTOWCS = @HAVE_MBSNRTOWCS@ HAVE_MBSRTOWCS = @HAVE_MBSRTOWCS@ HAVE_MBTOWC = @HAVE_MBTOWC@ -HAVE_MEMCHR = @HAVE_MEMCHR@ HAVE_MEMPCPY = @HAVE_MEMPCPY@ HAVE_MKDIRAT = @HAVE_MKDIRAT@ HAVE_MKDTEMP = @HAVE_MKDTEMP@ @@ -850,6 +875,7 @@ HAVE_PCLOSE = @HAVE_PCLOSE@ HAVE_PIPE = @HAVE_PIPE@ HAVE_PIPE2 = @HAVE_PIPE2@ HAVE_POPEN = @HAVE_POPEN@ +HAVE_POSIX_MEMALIGN = @HAVE_POSIX_MEMALIGN@ HAVE_POSIX_OPENPT = @HAVE_POSIX_OPENPT@ HAVE_POSIX_SIGNALBLOCKING = @HAVE_POSIX_SIGNALBLOCKING@ HAVE_PREAD = @HAVE_PREAD@ @@ -935,7 +961,9 @@ HAVE_SECURE_GETENV = @HAVE_SECURE_GETENV@ HAVE_SETENV = @HAVE_SETENV@ HAVE_SETHOSTNAME = @HAVE_SETHOSTNAME@ HAVE_SETSTATE = @HAVE_SETSTATE@ +HAVE_SIGABBREV_NP = @HAVE_SIGABBREV_NP@ HAVE_SIGACTION = @HAVE_SIGACTION@ +HAVE_SIGDESCR_NP = @HAVE_SIGDESCR_NP@ HAVE_SIGHANDLER_T = @HAVE_SIGHANDLER_T@ HAVE_SIGINFO_T = @HAVE_SIGINFO_T@ HAVE_SIGNED_SIG_ATOMIC_T = @HAVE_SIGNED_SIG_ATOMIC_T@ @@ -948,6 +976,7 @@ HAVE_STPCPY = @HAVE_STPCPY@ HAVE_STPNCPY = @HAVE_STPNCPY@ HAVE_STRCASESTR = @HAVE_STRCASESTR@ HAVE_STRCHRNUL = @HAVE_STRCHRNUL@ +HAVE_STRERRORNAME_NP = @HAVE_STRERRORNAME_NP@ HAVE_STRPBRK = @HAVE_STRPBRK@ HAVE_STRPTIME = @HAVE_STRPTIME@ HAVE_STRSEP = @HAVE_STRSEP@ @@ -970,6 +999,7 @@ HAVE_SYS_INTTYPES_H = @HAVE_SYS_INTTYPES_H@ HAVE_SYS_IOCTL_H = @HAVE_SYS_IOCTL_H@ HAVE_SYS_LOADAVG_H = @HAVE_SYS_LOADAVG_H@ HAVE_SYS_PARAM_H = @HAVE_SYS_PARAM_H@ +HAVE_SYS_RANDOM_H = @HAVE_SYS_RANDOM_H@ HAVE_SYS_SELECT_H = @HAVE_SYS_SELECT_H@ HAVE_SYS_SOCKET_H = @HAVE_SYS_SOCKET_H@ HAVE_SYS_TIME_H = @HAVE_SYS_TIME_H@ @@ -978,15 +1008,14 @@ HAVE_SYS_UIO_H = @HAVE_SYS_UIO_H@ HAVE_TIMEGM = @HAVE_TIMEGM@ HAVE_TIMEZONE_T = @HAVE_TIMEZONE_T@ HAVE_TYPE_VOLATILE_SIG_ATOMIC_T = @HAVE_TYPE_VOLATILE_SIG_ATOMIC_T@ -HAVE_TZSET = @HAVE_TZSET@ HAVE_UNISTD_H = @HAVE_UNISTD_H@ HAVE_UNLINKAT = @HAVE_UNLINKAT@ HAVE_UNLOCKPT = @HAVE_UNLOCKPT@ -HAVE_UNSIGNED_LONG_LONG_INT = @HAVE_UNSIGNED_LONG_LONG_INT@ HAVE_USLEEP = @HAVE_USLEEP@ HAVE_UTIMENSAT = @HAVE_UTIMENSAT@ HAVE_VASPRINTF = @HAVE_VASPRINTF@ HAVE_VDPRINTF = @HAVE_VDPRINTF@ +HAVE_VISIBILITY = @HAVE_VISIBILITY@ HAVE_WCHAR_H = @HAVE_WCHAR_H@ HAVE_WCHAR_T = @HAVE_WCHAR_T@ HAVE_WCPCPY = @HAVE_WCPCPY@ @@ -1025,6 +1054,7 @@ HAVE_WMEMCHR = @HAVE_WMEMCHR@ HAVE_WMEMCMP = @HAVE_WMEMCMP@ HAVE_WMEMCPY = @HAVE_WMEMCPY@ HAVE_WMEMMOVE = @HAVE_WMEMMOVE@ +HAVE_WMEMPCPY = @HAVE_WMEMPCPY@ HAVE_WMEMSET = @HAVE_WMEMSET@ HAVE_WS2TCPIP_H = @HAVE_WS2TCPIP_H@ HAVE_XLOCALE_H = @HAVE_XLOCALE_H@ @@ -1050,16 +1080,28 @@ LIBICONV = @LIBICONV@ LIBINTL = @LIBINTL@ LIBMULTITHREAD = @LIBMULTITHREAD@ LIBOBJS = @LIBOBJS@ +LIBPMULTITHREAD = @LIBPMULTITHREAD@ +LIBPTHREAD = @LIBPTHREAD@ LIBS = @LIBS@ LIBSOCKET = @LIBSOCKET@ +LIBSTDTHREAD = @LIBSTDTHREAD@ LIBTESTS_LIBDEPS = @LIBTESTS_LIBDEPS@ LIBTHREAD = @LIBTHREAD@ LIBTOOL = @LIBTOOL@ LIB_BLKID = @LIB_BLKID@ +LIB_CLOCK_GETTIME = @LIB_CLOCK_GETTIME@ +LIB_GETRANDOM = @LIB_GETRANDOM@ +LIB_HARD_LOCALE = @LIB_HARD_LOCALE@ +LIB_MBRTOWC = @LIB_MBRTOWC@ LIB_NANOSLEEP = @LIB_NANOSLEEP@ +LIB_NL_LANGINFO = @LIB_NL_LANGINFO@ LIB_PTHREAD = @LIB_PTHREAD@ LIB_PTHREAD_SIGMASK = @LIB_PTHREAD_SIGMASK@ +LIB_SCHED_YIELD = @LIB_SCHED_YIELD@ LIB_SELECT = @LIB_SELECT@ +LIB_SEMAPHORE = @LIB_SEMAPHORE@ +LIB_SETLOCALE = @LIB_SETLOCALE@ +LIB_SETLOCALE_NULL = @LIB_SETLOCALE_NULL@ LIMITS_H = @LIMITS_H@ LIPO = @LIPO@ LN_S = @LN_S@ @@ -1108,6 +1150,7 @@ NEXT_AS_FIRST_DIRECTIVE_STDIO_H = @NEXT_AS_FIRST_DIRECTIVE_STDIO_H@ NEXT_AS_FIRST_DIRECTIVE_STDLIB_H = @NEXT_AS_FIRST_DIRECTIVE_STDLIB_H@ NEXT_AS_FIRST_DIRECTIVE_STRING_H = @NEXT_AS_FIRST_DIRECTIVE_STRING_H@ NEXT_AS_FIRST_DIRECTIVE_SYS_IOCTL_H = @NEXT_AS_FIRST_DIRECTIVE_SYS_IOCTL_H@ +NEXT_AS_FIRST_DIRECTIVE_SYS_RANDOM_H = @NEXT_AS_FIRST_DIRECTIVE_SYS_RANDOM_H@ NEXT_AS_FIRST_DIRECTIVE_SYS_SELECT_H = @NEXT_AS_FIRST_DIRECTIVE_SYS_SELECT_H@ NEXT_AS_FIRST_DIRECTIVE_SYS_SOCKET_H = @NEXT_AS_FIRST_DIRECTIVE_SYS_SOCKET_H@ NEXT_AS_FIRST_DIRECTIVE_SYS_STAT_H = @NEXT_AS_FIRST_DIRECTIVE_SYS_STAT_H@ @@ -1137,6 +1180,7 @@ NEXT_STDIO_H = @NEXT_STDIO_H@ NEXT_STDLIB_H = @NEXT_STDLIB_H@ NEXT_STRING_H = @NEXT_STRING_H@ NEXT_SYS_IOCTL_H = @NEXT_SYS_IOCTL_H@ +NEXT_SYS_RANDOM_H = @NEXT_SYS_RANDOM_H@ NEXT_SYS_SELECT_H = @NEXT_SYS_SELECT_H@ NEXT_SYS_SOCKET_H = @NEXT_SYS_SOCKET_H@ NEXT_SYS_STAT_H = @NEXT_SYS_STAT_H@ @@ -1173,21 +1217,24 @@ POSUB = @POSUB@ PRAGMA_COLUMNS = @PRAGMA_COLUMNS@ PRAGMA_SYSTEM_HEADER = @PRAGMA_SYSTEM_HEADER@ PRIPTR_PREFIX = @PRIPTR_PREFIX@ -PRI_MACROS_BROKEN = @PRI_MACROS_BROKEN@ PTHREAD_H_DEFINES_STRUCT_TIMESPEC = @PTHREAD_H_DEFINES_STRUCT_TIMESPEC@ PTRDIFF_T_SUFFIX = @PTRDIFF_T_SUFFIX@ RANLIB = @RANLIB@ +REPLACE_ACCESS = @REPLACE_ACCESS@ +REPLACE_ALIGNED_ALLOC = @REPLACE_ALIGNED_ALLOC@ REPLACE_BTOWC = @REPLACE_BTOWC@ REPLACE_CALLOC = @REPLACE_CALLOC@ REPLACE_CANONICALIZE_FILE_NAME = @REPLACE_CANONICALIZE_FILE_NAME@ REPLACE_CHOWN = @REPLACE_CHOWN@ REPLACE_CLOSE = @REPLACE_CLOSE@ +REPLACE_CREAT = @REPLACE_CREAT@ REPLACE_CTIME = @REPLACE_CTIME@ REPLACE_DPRINTF = @REPLACE_DPRINTF@ REPLACE_DUP = @REPLACE_DUP@ REPLACE_DUP2 = @REPLACE_DUP2@ REPLACE_DUPLOCALE = @REPLACE_DUPLOCALE@ REPLACE_FACCESSAT = @REPLACE_FACCESSAT@ +REPLACE_FCHMODAT = @REPLACE_FCHMODAT@ REPLACE_FCHOWNAT = @REPLACE_FCHOWNAT@ REPLACE_FCLOSE = @REPLACE_FCLOSE@ REPLACE_FCNTL = @REPLACE_FCNTL@ @@ -1215,6 +1262,7 @@ REPLACE_GETLINE = @REPLACE_GETLINE@ REPLACE_GETLOGIN_R = @REPLACE_GETLOGIN_R@ REPLACE_GETPAGESIZE = @REPLACE_GETPAGESIZE@ REPLACE_GETPASS = @REPLACE_GETPASS@ +REPLACE_GETRANDOM = @REPLACE_GETRANDOM@ REPLACE_GETTIMEOFDAY = @REPLACE_GETTIMEOFDAY@ REPLACE_GMTIME = @REPLACE_GMTIME@ REPLACE_INET_NTOP = @REPLACE_INET_NTOP@ @@ -1224,6 +1272,8 @@ REPLACE_IOCTL = @REPLACE_IOCTL@ REPLACE_ISATTY = @REPLACE_ISATTY@ REPLACE_ISWBLANK = @REPLACE_ISWBLANK@ REPLACE_ISWCNTRL = @REPLACE_ISWCNTRL@ +REPLACE_ISWDIGIT = @REPLACE_ISWDIGIT@ +REPLACE_ISWXDIGIT = @REPLACE_ISWXDIGIT@ REPLACE_LCHOWN = @REPLACE_LCHOWN@ REPLACE_LINK = @REPLACE_LINK@ REPLACE_LINKAT = @REPLACE_LINKAT@ @@ -1256,6 +1306,7 @@ REPLACE_OPEN = @REPLACE_OPEN@ REPLACE_OPENAT = @REPLACE_OPENAT@ REPLACE_PERROR = @REPLACE_PERROR@ REPLACE_POPEN = @REPLACE_POPEN@ +REPLACE_POSIX_MEMALIGN = @REPLACE_POSIX_MEMALIGN@ REPLACE_PREAD = @REPLACE_PREAD@ REPLACE_PRINTF = @REPLACE_PRINTF@ REPLACE_PSELECT = @REPLACE_PSELECT@ @@ -1344,6 +1395,7 @@ REPLACE_STRCASESTR = @REPLACE_STRCASESTR@ REPLACE_STRCHRNUL = @REPLACE_STRCHRNUL@ REPLACE_STRDUP = @REPLACE_STRDUP@ REPLACE_STRERROR = @REPLACE_STRERROR@ +REPLACE_STRERRORNAME_NP = @REPLACE_STRERRORNAME_NP@ REPLACE_STRERROR_R = @REPLACE_STRERROR_R@ REPLACE_STRFTIME = @REPLACE_STRFTIME@ REPLACE_STRNCAT = @REPLACE_STRNCAT@ @@ -1381,13 +1433,13 @@ REPLACE_WCRTOMB = @REPLACE_WCRTOMB@ REPLACE_WCSFTIME = @REPLACE_WCSFTIME@ REPLACE_WCSNRTOMBS = @REPLACE_WCSNRTOMBS@ REPLACE_WCSRTOMBS = @REPLACE_WCSRTOMBS@ +REPLACE_WCSTOK = @REPLACE_WCSTOK@ REPLACE_WCSWIDTH = @REPLACE_WCSWIDTH@ REPLACE_WCTOB = @REPLACE_WCTOB@ REPLACE_WCTOMB = @REPLACE_WCTOMB@ REPLACE_WCWIDTH = @REPLACE_WCWIDTH@ REPLACE_WRITE = @REPLACE_WRITE@ SED = @SED@ -SELINUX_LIBS = @SELINUX_LIBS@ SET_MAKE = @SET_MAKE@ SHELL = @SHELL@ SIG_ATOMIC_T_SUFFIX = @SIG_ATOMIC_T_SUFFIX@ @@ -1406,6 +1458,7 @@ UINT32_MAX_LT_UINTMAX_MAX = @UINT32_MAX_LT_UINTMAX_MAX@ UINT64_MAX_EQ_ULONG_MAX = @UINT64_MAX_EQ_ULONG_MAX@ UNDEFINE_STRTOK_R = @UNDEFINE_STRTOK_R@ UNISTD_H_DEFINES_STRUCT_TIMESPEC = @UNISTD_H_DEFINES_STRUCT_TIMESPEC@ +UNISTD_H_HAVE_SYS_RANDOM_H = @UNISTD_H_HAVE_SYS_RANDOM_H@ UNISTD_H_HAVE_WINSOCK2_H = @UNISTD_H_HAVE_WINSOCK2_H@ UNISTD_H_HAVE_WINSOCK2_H_AND_USE_SOCKETS = @UNISTD_H_HAVE_WINSOCK2_H_AND_USE_SOCKETS@ USE_NLS = @USE_NLS@ @@ -1495,7 +1548,7 @@ lib_LTLIBRARIES = libparted.la # For details, see the "Updating library version information" section of # "info libtool". CURRENT = 2 -REVISION = 2 +REVISION = 3 AGE = 0 libparted_la_LDFLAGS = -version-info $(CURRENT):$(REVISION):$(AGE) libparted_la_SOURCES = debug.c \ @@ -1524,7 +1577,6 @@ libparted_la_LIBADD = \ $(top_builddir)/lib/libgnulib.la \ $(OS_LIBS) \ $(DM_LIBS) \ - $(SELINUX_LIBS) \ $(LIB_BLKID) \ $(UUID_LIBS) \ $(INTLLIBS) diff --git a/libparted/arch/beos.c b/libparted/arch/beos.c index 91664ad..d308bd9 100644 --- a/libparted/arch/beos.c +++ b/libparted/arch/beos.c @@ -1,6 +1,7 @@ /* libparted - a library for manipulating disk partitions - Copyright (C) 2006-2007, 2009-2014, 2019 Free Software Foundation, Inc. + Copyright (C) 2006-2007, 2009-2014, 2019-2021 Free Software Foundation, + Inc. This 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/gnu.c b/libparted/arch/gnu.c index 321b70a..d7204cc 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 Free Software + Copyright (C) 1999-2001, 2005, 2007, 2009-2014, 2019-2021 Free Software Foundation, Inc. This program is free software; you can redistribute it and/or modify @@ -359,46 +359,6 @@ gnu_close (PedDevice* dev) dev->dirty = 0; } -#if 0 - if (dev->dirty && dev->boot_dirty && dev->type != PED_DEVICE_FILE) { - /* ouch! */ - ped_exception_throw ( - PED_EXCEPTION_WARNING, - PED_EXCEPTION_OK, - _("The partition table cannot be re-read. This means " - "you need to reboot before mounting any " - "modified partitions. You also need to reinstall " - "your boot loader before you reboot (which may " - "require mounting modified partitions). It is " - "impossible do both things! So you'll need to " - "boot off a rescue disk, and reinstall your boot " - "loader from the rescue disk. Read section 4 of " - "the Parted User documentation for more " - "information.")); - return 1; - } - - if (dev->dirty && dev->type != PED_DEVICE_FILE) { - ped_exception_throw ( - PED_EXCEPTION_WARNING, - PED_EXCEPTION_IGNORE, - _("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 " - "computer before doing anything with %s."), - dev->path, strerror (errno), dev->path); - } - - if (dev->boot_dirty && dev->type != PED_DEVICE_FILE) { - ped_exception_throw ( - PED_EXCEPTION_WARNING, - PED_EXCEPTION_OK, - _("You should reinstall your boot loader before " - "rebooting. Read section 4 of the Parted User " - "documentation for more information.")); - } -#endif - return 1; } diff --git a/libparted/arch/linux.c b/libparted/arch/linux.c index 09ec781..94ea176 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 Free Software Foundation, Inc. + Copyright (C) 1999-2014, 2019-2021 Free Software Foundation, Inc. This program is free software; you can redistribute it and/or modify it under the terms of the GNU General Public License as published by @@ -720,9 +720,9 @@ _get_linux_version () static int kver = -1; struct utsname uts; - int major = 0; - int minor = 0; - int teeny = 0; + unsigned int major = 0; + unsigned int minor = 0; + unsigned int teeny = 0; if (kver != -1) return kver; @@ -2884,7 +2884,7 @@ _dm_get_partition_start_and_length(PedPartition const *part, char *params; char *target_type; dm_get_next_target(task, NULL, (uint64_t *)start, (uint64_t *)length, &target_type, ¶ms); - if (sscanf (params, "%d:%d %Ld", &major, &minor, start) != 3) + if (sscanf (params, "%d:%d %Lu", &major, &minor, start) != 3) goto err; rc = 1; diff --git a/libparted/arch/linux.h b/libparted/arch/linux.h index b61cd75..e246561 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 Free Software Foundation, Inc. + Copyright (C) 2009-2014, 2019-2021 Free Software Foundation, Inc. This 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 f43d1fc..88075fb 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 Free Software Foundation, Inc. + Copyright (C) 2007, 2009-2014, 2019-2021 Free Software Foundation, Inc. This 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 56f5515..111b9cb 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 Free Software Foundation, Inc. + Copyright (C) 2007, 2009-2014, 2019-2021 Free Software Foundation, Inc. This 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 ed24eaa..ab502d8 100644 --- a/libparted/cs/constraint.c +++ b/libparted/cs/constraint.c @@ -1,7 +1,7 @@ /* libparted - a library for manipulating disk partitions - Copyright (C) 2000-2001, 2007, 2009-2014, 2019 Free Software Foundation, - Inc. + Copyright (C) 2000-2001, 2007, 2009-2014, 2019-2021 Free Software + Foundation, Inc. This 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/geom.c b/libparted/cs/geom.c index 1b562c8..7eccdab 100644 --- a/libparted/cs/geom.c +++ b/libparted/cs/geom.c @@ -1,7 +1,7 @@ /* libparted - a library for manipulating disk partitions - Copyright (C) 1999-2000, 2005, 2007-2014, 2019 Free Software Foundation, - Inc. + Copyright (C) 1999-2000, 2005, 2007-2014, 2019-2021 Free Software + Foundation, Inc. This 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/natmath.c b/libparted/cs/natmath.c index c8cdcab..f53cbda 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 Free Software Foundation, Inc. + Copyright (C) 2000, 2007-2014, 2019-2021 Free Software Foundation, Inc. This 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 c4932ca..65d0bc6 100644 --- a/libparted/debug.c +++ b/libparted/debug.c @@ -1,7 +1,7 @@ /* libparted - a library for manipulating disk partitions - Copyright (C) 2000, 2005, 2007, 2009-2014, 2019 Free Software Foundation, - Inc. + Copyright (C) 2000, 2005, 2007, 2009-2014, 2019-2021 Free Software + Foundation, Inc. This program is free software; you can redistribute it and/or modify it under the terms of the GNU General Public License as published by @@ -106,7 +106,7 @@ void ped_assert (const char* cond_text, /* Throw the exception */ ped_exception_throw ( PED_EXCEPTION_BUG, - PED_EXCEPTION_FATAL, + PED_EXCEPTION_CANCEL, _("Assertion (%s) at %s:%d in function %s() failed."), cond_text, file, line, function); abort (); diff --git a/libparted/disk.c b/libparted/disk.c index 5aaac5a..345b9e7 100644 --- a/libparted/disk.c +++ b/libparted/disk.c @@ -1,7 +1,7 @@ /* libparted - a library for manipulating disk partitions - Copyright (C) 1999-2003, 2005, 2007-2014, 2019 Free Software Foundation, - Inc. + Copyright (C) 1999-2003, 2005, 2007-2014, 2019-2021 Free Software + Foundation, Inc. This program is free software; you can redistribute it and/or modify it under the terms of the GNU General Public License as published by @@ -2407,6 +2407,10 @@ ped_partition_flag_get_name (PedPartitionFlag flag) return N_("irst"); case PED_PARTITION_ESP: return N_("esp"); + case PED_PARTITION_CHROMEOS_KERNEL: + return N_("chromeos_kernel"); + case PED_PARTITION_BLS_BOOT: + return N_("bls_boot"); default: ped_exception_throw ( @@ -2446,8 +2450,8 @@ ped_partition_flag_get_by_name (const char* name) for (flag = ped_partition_flag_next (0); flag; flag = ped_partition_flag_next (flag)) { flag_name = ped_partition_flag_get_name (flag); - if (strcasecmp (name, flag_name) == 0 - || strcasecmp (name, _(flag_name)) == 0) + if (flag_name && (strcasecmp (name, flag_name) == 0 + || strcasecmp (name, _(flag_name)) == 0)) return flag; } diff --git a/libparted/exception.c b/libparted/exception.c index 8fbb437..b9c571c 100644 --- a/libparted/exception.c +++ b/libparted/exception.c @@ -1,6 +1,7 @@ /* libparted - a library for manipulating disk partitions - Copyright (C) 1999-2000, 2007-2014, 2019 Free Software Foundation, Inc. + Copyright (C) 1999-2000, 2007-2014, 2019-2021 Free Software Foundation, + Inc. This 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/filesys.c b/libparted/filesys.c index 69c95b6..ba2594c 100644 --- a/libparted/filesys.c +++ b/libparted/filesys.c @@ -1,6 +1,7 @@ /* libparted - a library for manipulating disk partitions - Copyright (C) 1999-2001, 2007-2014, 2019 Free Software Foundation, Inc. + Copyright (C) 1999-2001, 2007-2014, 2019-2021 Free Software Foundation, + Inc. This 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/Makefile.am b/libparted/fs/Makefile.am index 74f275a..a2fbb5a 100644 --- a/libparted/fs/Makefile.am +++ b/libparted/fs/Makefile.am @@ -1,9 +1,10 @@ # This file is part of GNU Parted -# Copyright (C) 1999-2001, 2007, 2009-2014, 2019 Free Software Foundation, Inc. +# Copyright (C) 1999-2001, 2007, 2009-2014, 2019-2021 Free Software Foundation, +# Inc. # # This file may be modified and/or distributed without restriction. -partedincludedir = -I$(top_builddir)/include -I$(top_srcdir)/include +partedincludedir = -I$(top_builddir)/include -I$(top_srcdir)/include -I$(top_srcdir)/lib AM_CFLAGS = $(WARN_CFLAGS) @@ -32,6 +33,8 @@ libfs_la_SOURCES = \ fat/count.h \ fat/fat.c \ fat/fat.h \ + f2fs/f2fs.c \ + f2fs/f2fs.h \ hfs/hfs.c \ hfs/hfs.h \ hfs/probe.c \ @@ -62,7 +65,7 @@ EXTRA_DIST = \ # For details, see the "Updating library version information" section of # "info libtool". CURRENT = 0 -REVISION = 2 +REVISION = 3 AGE = 0 sym_file = $(srcdir)/fsresize.sym diff --git a/libparted/fs/Makefile.in b/libparted/fs/Makefile.in index 48c1266..fb74e9d 100644 --- a/libparted/fs/Makefile.in +++ b/libparted/fs/Makefile.in @@ -15,7 +15,8 @@ @SET_MAKE@ # This file is part of GNU Parted -# Copyright (C) 1999-2001, 2007, 2009-2014, 2019 Free Software Foundation, Inc. +# Copyright (C) 1999-2001, 2007, 2009-2014, 2019-2021 Free Software Foundation, +# Inc. # # This file may be modified and/or distributed without restriction. @@ -100,9 +101,9 @@ am__aclocal_m4_deps = $(top_srcdir)/m4/00gnulib.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/calloc.m4 $(top_srcdir)/m4/canonicalize.m4 \ - $(top_srcdir)/m4/close.m4 $(top_srcdir)/m4/codeset.m4 \ - $(top_srcdir)/m4/config-h.m4 $(top_srcdir)/m4/configmake.m4 \ - $(top_srcdir)/m4/ctype.m4 $(top_srcdir)/m4/dirname.m4 \ + $(top_srcdir)/m4/clock_time.m4 $(top_srcdir)/m4/close.m4 \ + $(top_srcdir)/m4/codeset.m4 $(top_srcdir)/m4/config-h.m4 \ + $(top_srcdir)/m4/configmake.m4 $(top_srcdir)/m4/ctype.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 \ @@ -114,15 +115,13 @@ am__aclocal_m4_deps = $(top_srcdir)/m4/00gnulib.m4 \ $(top_srcdir)/m4/fsync.m4 $(top_srcdir)/m4/ftruncate.m4 \ $(top_srcdir)/m4/getcwd.m4 $(top_srcdir)/m4/getdtablesize.m4 \ $(top_srcdir)/m4/getopt.m4 $(top_srcdir)/m4/getpagesize.m4 \ - $(top_srcdir)/m4/getprogname.m4 $(top_srcdir)/m4/gettext.m4 \ - $(top_srcdir)/m4/gettimeofday.m4 $(top_srcdir)/m4/glibc21.m4 \ - $(top_srcdir)/m4/gnulib-common.m4 \ - $(top_srcdir)/m4/gnulib-comp.m4 \ - $(top_srcdir)/m4/host-cpu-c-abi.m4 $(top_srcdir)/m4/iconv.m4 \ + $(top_srcdir)/m4/getprogname.m4 $(top_srcdir)/m4/getrandom.m4 \ + $(top_srcdir)/m4/gettext.m4 $(top_srcdir)/m4/gettimeofday.m4 \ + $(top_srcdir)/m4/glibc21.m4 $(top_srcdir)/m4/gnulib-common.m4 \ + $(top_srcdir)/m4/gnulib-comp.m4 $(top_srcdir)/m4/iconv.m4 \ $(top_srcdir)/m4/include_next.m4 $(top_srcdir)/m4/inet_pton.m4 \ $(top_srcdir)/m4/intl-thread-locale.m4 \ - $(top_srcdir)/m4/intlmacosx.m4 \ - $(top_srcdir)/m4/inttypes-pri.m4 $(top_srcdir)/m4/inttypes.m4 \ + $(top_srcdir)/m4/intlmacosx.m4 $(top_srcdir)/m4/inttypes.m4 \ $(top_srcdir)/m4/ioctl.m4 $(top_srcdir)/m4/isblank.m4 \ $(top_srcdir)/m4/langinfo_h.m4 $(top_srcdir)/m4/largefile.m4 \ $(top_srcdir)/m4/lcmessage.m4 $(top_srcdir)/m4/lib-ignore.m4 \ @@ -132,25 +131,26 @@ am__aclocal_m4_deps = $(top_srcdir)/m4/00gnulib.m4 \ $(top_srcdir)/m4/locale-fr.m4 $(top_srcdir)/m4/locale-ja.m4 \ $(top_srcdir)/m4/locale-tr.m4 $(top_srcdir)/m4/locale-zh.m4 \ $(top_srcdir)/m4/locale_h.m4 $(top_srcdir)/m4/localeconv.m4 \ - $(top_srcdir)/m4/localename.m4 \ - $(top_srcdir)/m4/localtime-buffer.m4 $(top_srcdir)/m4/lock.m4 \ - $(top_srcdir)/m4/longlong.m4 $(top_srcdir)/m4/lseek.m4 \ - $(top_srcdir)/m4/lstat.m4 $(top_srcdir)/m4/ltoptions.m4 \ - $(top_srcdir)/m4/ltsugar.m4 $(top_srcdir)/m4/ltversion.m4 \ - $(top_srcdir)/m4/lt~obsolete.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/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/localename.m4 $(top_srcdir)/m4/lock.m4 \ + $(top_srcdir)/m4/lseek.m4 $(top_srcdir)/m4/lstat.m4 \ + $(top_srcdir)/m4/ltoptions.m4 $(top_srcdir)/m4/ltsugar.m4 \ + $(top_srcdir)/m4/ltversion.m4 $(top_srcdir)/m4/lt~obsolete.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/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/nanosleep.m4 $(top_srcdir)/m4/netinet_in_h.m4 \ + $(top_srcdir)/m4/musl.m4 $(top_srcdir)/m4/nanosleep.m4 \ + $(top_srcdir)/m4/netinet_in_h.m4 \ $(top_srcdir)/m4/nl_langinfo.m4 $(top_srcdir)/m4/nls.m4 \ $(top_srcdir)/m4/nocrash.m4 $(top_srcdir)/m4/o-direct.m4 \ $(top_srcdir)/m4/off_t.m4 $(top_srcdir)/m4/open-cloexec.m4 \ - $(top_srcdir)/m4/open.m4 $(top_srcdir)/m4/pathmax.m4 \ - $(top_srcdir)/m4/perror.m4 $(top_srcdir)/m4/pipe.m4 \ + $(top_srcdir)/m4/open-slash.m4 $(top_srcdir)/m4/open.m4 \ + $(top_srcdir)/m4/pathmax.m4 $(top_srcdir)/m4/perror.m4 \ + $(top_srcdir)/m4/pid_t.m4 $(top_srcdir)/m4/pipe.m4 \ $(top_srcdir)/m4/po.m4 $(top_srcdir)/m4/priv-set.m4 \ $(top_srcdir)/m4/progtest.m4 \ $(top_srcdir)/m4/pthread-thread.m4 \ @@ -162,9 +162,10 @@ am__aclocal_m4_deps = $(top_srcdir)/m4/00gnulib.m4 \ $(top_srcdir)/m4/readlink.m4 $(top_srcdir)/m4/realloc.m4 \ $(top_srcdir)/m4/regex.m4 $(top_srcdir)/m4/rpmatch.m4 \ $(top_srcdir)/m4/safe-read.m4 $(top_srcdir)/m4/sched_h.m4 \ - $(top_srcdir)/m4/select.m4 $(top_srcdir)/m4/setenv.m4 \ - $(top_srcdir)/m4/setlocale.m4 $(top_srcdir)/m4/sigaction.m4 \ - $(top_srcdir)/m4/signal_h.m4 \ + $(top_srcdir)/m4/select.m4 $(top_srcdir)/m4/semaphore.m4 \ + $(top_srcdir)/m4/setenv.m4 $(top_srcdir)/m4/setlocale.m4 \ + $(top_srcdir)/m4/setlocale_null.m4 \ + $(top_srcdir)/m4/sigaction.m4 $(top_srcdir)/m4/signal_h.m4 \ $(top_srcdir)/m4/signalblocking.m4 $(top_srcdir)/m4/sleep.m4 \ $(top_srcdir)/m4/socketlib.m4 $(top_srcdir)/m4/sockets.m4 \ $(top_srcdir)/m4/socklen.m4 $(top_srcdir)/m4/sockpfaf.m4 \ @@ -179,6 +180,7 @@ am__aclocal_m4_deps = $(top_srcdir)/m4/00gnulib.m4 \ $(top_srcdir)/m4/strnlen.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 \ @@ -187,14 +189,15 @@ am__aclocal_m4_deps = $(top_srcdir)/m4/00gnulib.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/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/xstrndup.m4 $(top_srcdir)/m4/xstrtol.m4 \ - $(top_srcdir)/m4/yield.m4 $(top_srcdir)/configure.ac + $(top_srcdir)/m4/yield.m4 $(top_srcdir)/m4/zzgnulib.m4 \ + $(top_srcdir)/configure.ac am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \ $(ACLOCAL_M4) DIST_COMMON = $(srcdir)/Makefile.am $(am__DIST_COMMON) @@ -237,8 +240,8 @@ libfs_la_DEPENDENCIES = $(am__DEPENDENCIES_1) $(am__DEPENDENCIES_1) \ am__dirstamp = $(am__leading_dot)dirstamp am_libfs_la_OBJECTS = amiga/affs.lo amiga/amiga.lo amiga/apfs.lo \ amiga/asfs.lo amiga/a-interface.lo btrfs/btrfs.lo \ - ext2/interface.lo fat/bootsector.lo fat/fat.lo hfs/hfs.lo \ - hfs/probe.lo jfs/jfs.lo linux_swap/linux_swap.lo \ + ext2/interface.lo fat/bootsector.lo fat/fat.lo f2fs/f2fs.lo \ + hfs/hfs.lo hfs/probe.lo jfs/jfs.lo linux_swap/linux_swap.lo \ nilfs2/nilfs2.lo ntfs/ntfs.lo reiserfs/reiserfs.lo udf/udf.lo \ ufs/ufs.lo xfs/xfs.lo libfs_la_OBJECTS = $(am_libfs_la_OBJECTS) @@ -278,9 +281,10 @@ am__depfiles_remade = amiga/$(DEPDIR)/a-interface.Plo \ amiga/$(DEPDIR)/affs.Plo amiga/$(DEPDIR)/amiga.Plo \ amiga/$(DEPDIR)/apfs.Plo amiga/$(DEPDIR)/asfs.Plo \ btrfs/$(DEPDIR)/btrfs.Plo ext2/$(DEPDIR)/interface.Plo \ - fat/$(DEPDIR)/bootsector.Plo fat/$(DEPDIR)/fat.Plo \ - hfs/$(DEPDIR)/hfs.Plo hfs/$(DEPDIR)/probe.Plo \ - jfs/$(DEPDIR)/jfs.Plo linux_swap/$(DEPDIR)/linux_swap.Plo \ + f2fs/$(DEPDIR)/f2fs.Plo fat/$(DEPDIR)/bootsector.Plo \ + fat/$(DEPDIR)/fat.Plo hfs/$(DEPDIR)/hfs.Plo \ + hfs/$(DEPDIR)/probe.Plo jfs/$(DEPDIR)/jfs.Plo \ + linux_swap/$(DEPDIR)/linux_swap.Plo \ nilfs2/$(DEPDIR)/nilfs2.Plo ntfs/$(DEPDIR)/ntfs.Plo \ r/$(DEPDIR)/filesys.Plo r/fat/$(DEPDIR)/bootsector.Plo \ r/fat/$(DEPDIR)/calc.Plo r/fat/$(DEPDIR)/clstdup.Plo \ @@ -365,6 +369,7 @@ BUILDINFO = @BUILDINFO@ CC = @CC@ CCDEPMODE = @CCDEPMODE@ CFLAGS = @CFLAGS@ +CFLAG_VISIBILITY = @CFLAG_VISIBILITY@ CHECK_CFLAGS = @CHECK_CFLAGS@ CHECK_LIBS = @CHECK_LIBS@ CONFIG_INCLUDE = @CONFIG_INCLUDE@ @@ -399,6 +404,8 @@ GMSGFMT = @GMSGFMT@ GMSGFMT_015 = @GMSGFMT_015@ GNULIB_ACCEPT = @GNULIB_ACCEPT@ GNULIB_ACCEPT4 = @GNULIB_ACCEPT4@ +GNULIB_ACCESS = @GNULIB_ACCESS@ +GNULIB_ALIGNED_ALLOC = @GNULIB_ALIGNED_ALLOC@ GNULIB_ATOLL = @GNULIB_ATOLL@ GNULIB_BIND = @GNULIB_BIND@ GNULIB_BTOWC = @GNULIB_BTOWC@ @@ -409,6 +416,7 @@ GNULIB_CHOWN = @GNULIB_CHOWN@ GNULIB_CLOSE = @GNULIB_CLOSE@ GNULIB_CONNECT = @GNULIB_CONNECT@ GNULIB_COPY_FILE_RANGE = @GNULIB_COPY_FILE_RANGE@ +GNULIB_CREAT = @GNULIB_CREAT@ GNULIB_CTIME = @GNULIB_CTIME@ GNULIB_DPRINTF = @GNULIB_DPRINTF@ GNULIB_DUP = @GNULIB_DUP@ @@ -456,19 +464,23 @@ GNULIB_GETCWD = @GNULIB_GETCWD@ GNULIB_GETDELIM = @GNULIB_GETDELIM@ GNULIB_GETDOMAINNAME = @GNULIB_GETDOMAINNAME@ GNULIB_GETDTABLESIZE = @GNULIB_GETDTABLESIZE@ +GNULIB_GETENTROPY = @GNULIB_GETENTROPY@ GNULIB_GETGROUPS = @GNULIB_GETGROUPS@ GNULIB_GETHOSTNAME = @GNULIB_GETHOSTNAME@ GNULIB_GETLINE = @GNULIB_GETLINE@ GNULIB_GETLOADAVG = @GNULIB_GETLOADAVG@ GNULIB_GETLOGIN = @GNULIB_GETLOGIN@ GNULIB_GETLOGIN_R = @GNULIB_GETLOGIN_R@ +GNULIB_GETOPT_POSIX = @GNULIB_GETOPT_POSIX@ GNULIB_GETPAGESIZE = @GNULIB_GETPAGESIZE@ GNULIB_GETPASS = @GNULIB_GETPASS@ GNULIB_GETPEERNAME = @GNULIB_GETPEERNAME@ +GNULIB_GETRANDOM = @GNULIB_GETRANDOM@ GNULIB_GETSOCKNAME = @GNULIB_GETSOCKNAME@ GNULIB_GETSOCKOPT = @GNULIB_GETSOCKOPT@ GNULIB_GETSUBOPT = @GNULIB_GETSUBOPT@ GNULIB_GETTIMEOFDAY = @GNULIB_GETTIMEOFDAY@ +GNULIB_GETUMASK = @GNULIB_GETUMASK@ GNULIB_GETUSERSHELL = @GNULIB_GETUSERSHELL@ GNULIB_GL_UNISTD_H_GETOPT = @GNULIB_GL_UNISTD_H_GETOPT@ GNULIB_GRANTPT = @GNULIB_GRANTPT@ @@ -482,6 +494,8 @@ GNULIB_ISATTY = @GNULIB_ISATTY@ GNULIB_ISBLANK = @GNULIB_ISBLANK@ GNULIB_ISWBLANK = @GNULIB_ISWBLANK@ GNULIB_ISWCTYPE = @GNULIB_ISWCTYPE@ +GNULIB_ISWDIGIT = @GNULIB_ISWDIGIT@ +GNULIB_ISWXDIGIT = @GNULIB_ISWXDIGIT@ GNULIB_LCHMOD = @GNULIB_LCHMOD@ GNULIB_LCHOWN = @GNULIB_LCHOWN@ GNULIB_LINK = @GNULIB_LINK@ @@ -542,6 +556,7 @@ GNULIB_PERROR = @GNULIB_PERROR@ GNULIB_PIPE = @GNULIB_PIPE@ GNULIB_PIPE2 = @GNULIB_PIPE2@ GNULIB_POPEN = @GNULIB_POPEN@ +GNULIB_POSIX_MEMALIGN = @GNULIB_POSIX_MEMALIGN@ GNULIB_POSIX_OPENPT = @GNULIB_POSIX_OPENPT@ GNULIB_PREAD = @GNULIB_PREAD@ GNULIB_PRINTF = @GNULIB_PRINTF@ @@ -590,9 +605,12 @@ GNULIB_SENDTO = @GNULIB_SENDTO@ GNULIB_SETENV = @GNULIB_SETENV@ GNULIB_SETHOSTNAME = @GNULIB_SETHOSTNAME@ GNULIB_SETLOCALE = @GNULIB_SETLOCALE@ +GNULIB_SETLOCALE_NULL = @GNULIB_SETLOCALE_NULL@ GNULIB_SETSOCKOPT = @GNULIB_SETSOCKOPT@ GNULIB_SHUTDOWN = @GNULIB_SHUTDOWN@ +GNULIB_SIGABBREV_NP = @GNULIB_SIGABBREV_NP@ GNULIB_SIGACTION = @GNULIB_SIGACTION@ +GNULIB_SIGDESCR_NP = @GNULIB_SIGDESCR_NP@ GNULIB_SIGNAL_H_SIGPIPE = @GNULIB_SIGNAL_H_SIGPIPE@ GNULIB_SIGPROCMASK = @GNULIB_SIGPROCMASK@ GNULIB_SLEEP = @GNULIB_SLEEP@ @@ -608,6 +626,7 @@ GNULIB_STRCASESTR = @GNULIB_STRCASESTR@ GNULIB_STRCHRNUL = @GNULIB_STRCHRNUL@ GNULIB_STRDUP = @GNULIB_STRDUP@ GNULIB_STRERROR = @GNULIB_STRERROR@ +GNULIB_STRERRORNAME_NP = @GNULIB_STRERRORNAME_NP@ GNULIB_STRERROR_R = @GNULIB_STRERROR_R@ GNULIB_STRFTIME = @GNULIB_STRFTIME@ GNULIB_STRNCAT = @GNULIB_STRNCAT@ @@ -691,11 +710,13 @@ GNULIB_WMEMCHR = @GNULIB_WMEMCHR@ GNULIB_WMEMCMP = @GNULIB_WMEMCMP@ GNULIB_WMEMCPY = @GNULIB_WMEMCPY@ GNULIB_WMEMMOVE = @GNULIB_WMEMMOVE@ +GNULIB_WMEMPCPY = @GNULIB_WMEMPCPY@ GNULIB_WMEMSET = @GNULIB_WMEMSET@ GNULIB_WRITE = @GNULIB_WRITE@ GNULIB__EXIT = @GNULIB__EXIT@ GREP = @GREP@ HAVE_ACCEPT4 = @HAVE_ACCEPT4@ +HAVE_ALIGNED_ALLOC = @HAVE_ALIGNED_ALLOC@ HAVE_ALLOCA_H = @HAVE_ALLOCA_H@ HAVE_ARPA_INET_H = @HAVE_ARPA_INET_H@ HAVE_ATOLL = @HAVE_ATOLL@ @@ -705,12 +726,17 @@ HAVE_CANONICALIZE_FILE_NAME = @HAVE_CANONICALIZE_FILE_NAME@ HAVE_CHOWN = @HAVE_CHOWN@ HAVE_COPY_FILE_RANGE = @HAVE_COPY_FILE_RANGE@ HAVE_CRTDEFS_H = @HAVE_CRTDEFS_H@ +HAVE_DECL_ECVT = @HAVE_DECL_ECVT@ HAVE_DECL_ENVIRON = @HAVE_DECL_ENVIRON@ +HAVE_DECL_EXECVPE = @HAVE_DECL_EXECVPE@ HAVE_DECL_FCHDIR = @HAVE_DECL_FCHDIR@ +HAVE_DECL_FCLOSEALL = @HAVE_DECL_FCLOSEALL@ +HAVE_DECL_FCVT = @HAVE_DECL_FCVT@ HAVE_DECL_FDATASYNC = @HAVE_DECL_FDATASYNC@ HAVE_DECL_FPURGE = @HAVE_DECL_FPURGE@ HAVE_DECL_FSEEKO = @HAVE_DECL_FSEEKO@ HAVE_DECL_FTELLO = @HAVE_DECL_FTELLO@ +HAVE_DECL_GCVT = @HAVE_DECL_GCVT@ HAVE_DECL_GETDELIM = @HAVE_DECL_GETDELIM@ HAVE_DECL_GETDOMAINNAME = @HAVE_DECL_GETDOMAINNAME@ HAVE_DECL_GETLINE = @HAVE_DECL_GETLINE@ @@ -744,10 +770,10 @@ HAVE_DECL_TRUNCATE = @HAVE_DECL_TRUNCATE@ HAVE_DECL_TTYNAME_R = @HAVE_DECL_TTYNAME_R@ HAVE_DECL_UNSETENV = @HAVE_DECL_UNSETENV@ HAVE_DECL_VSNPRINTF = @HAVE_DECL_VSNPRINTF@ +HAVE_DECL_WCSDUP = @HAVE_DECL_WCSDUP@ HAVE_DECL_WCTOB = @HAVE_DECL_WCTOB@ HAVE_DECL_WCWIDTH = @HAVE_DECL_WCWIDTH@ HAVE_DPRINTF = @HAVE_DPRINTF@ -HAVE_DUP2 = @HAVE_DUP2@ HAVE_DUP3 = @HAVE_DUP3@ HAVE_DUPLOCALE = @HAVE_DUPLOCALE@ HAVE_EUIDACCESS = @HAVE_EUIDACCESS@ @@ -769,14 +795,17 @@ HAVE_FTELLO = @HAVE_FTELLO@ HAVE_FTRUNCATE = @HAVE_FTRUNCATE@ HAVE_FUTIMENS = @HAVE_FUTIMENS@ HAVE_GETDTABLESIZE = @HAVE_GETDTABLESIZE@ +HAVE_GETENTROPY = @HAVE_GETENTROPY@ HAVE_GETGROUPS = @HAVE_GETGROUPS@ HAVE_GETHOSTNAME = @HAVE_GETHOSTNAME@ HAVE_GETLOGIN = @HAVE_GETLOGIN@ HAVE_GETOPT_H = @HAVE_GETOPT_H@ HAVE_GETPAGESIZE = @HAVE_GETPAGESIZE@ HAVE_GETPASS = @HAVE_GETPASS@ +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_IMAXDIV_T = @HAVE_IMAXDIV_T@ @@ -795,7 +824,6 @@ HAVE_LCHMOD = @HAVE_LCHMOD@ HAVE_LCHOWN = @HAVE_LCHOWN@ HAVE_LINK = @HAVE_LINK@ HAVE_LINKAT = @HAVE_LINKAT@ -HAVE_LONG_LONG_INT = @HAVE_LONG_LONG_INT@ HAVE_LSTAT = @HAVE_LSTAT@ HAVE_MAX_ALIGN_T = @HAVE_MAX_ALIGN_T@ HAVE_MBRLEN = @HAVE_MBRLEN@ @@ -805,7 +833,6 @@ HAVE_MBSLEN = @HAVE_MBSLEN@ HAVE_MBSNRTOWCS = @HAVE_MBSNRTOWCS@ HAVE_MBSRTOWCS = @HAVE_MBSRTOWCS@ HAVE_MBTOWC = @HAVE_MBTOWC@ -HAVE_MEMCHR = @HAVE_MEMCHR@ HAVE_MEMPCPY = @HAVE_MEMPCPY@ HAVE_MKDIRAT = @HAVE_MKDIRAT@ HAVE_MKDTEMP = @HAVE_MKDTEMP@ @@ -828,6 +855,7 @@ HAVE_PCLOSE = @HAVE_PCLOSE@ HAVE_PIPE = @HAVE_PIPE@ HAVE_PIPE2 = @HAVE_PIPE2@ HAVE_POPEN = @HAVE_POPEN@ +HAVE_POSIX_MEMALIGN = @HAVE_POSIX_MEMALIGN@ HAVE_POSIX_OPENPT = @HAVE_POSIX_OPENPT@ HAVE_POSIX_SIGNALBLOCKING = @HAVE_POSIX_SIGNALBLOCKING@ HAVE_PREAD = @HAVE_PREAD@ @@ -913,7 +941,9 @@ HAVE_SECURE_GETENV = @HAVE_SECURE_GETENV@ HAVE_SETENV = @HAVE_SETENV@ HAVE_SETHOSTNAME = @HAVE_SETHOSTNAME@ HAVE_SETSTATE = @HAVE_SETSTATE@ +HAVE_SIGABBREV_NP = @HAVE_SIGABBREV_NP@ HAVE_SIGACTION = @HAVE_SIGACTION@ +HAVE_SIGDESCR_NP = @HAVE_SIGDESCR_NP@ HAVE_SIGHANDLER_T = @HAVE_SIGHANDLER_T@ HAVE_SIGINFO_T = @HAVE_SIGINFO_T@ HAVE_SIGNED_SIG_ATOMIC_T = @HAVE_SIGNED_SIG_ATOMIC_T@ @@ -926,6 +956,7 @@ HAVE_STPCPY = @HAVE_STPCPY@ HAVE_STPNCPY = @HAVE_STPNCPY@ HAVE_STRCASESTR = @HAVE_STRCASESTR@ HAVE_STRCHRNUL = @HAVE_STRCHRNUL@ +HAVE_STRERRORNAME_NP = @HAVE_STRERRORNAME_NP@ HAVE_STRPBRK = @HAVE_STRPBRK@ HAVE_STRPTIME = @HAVE_STRPTIME@ HAVE_STRSEP = @HAVE_STRSEP@ @@ -948,6 +979,7 @@ HAVE_SYS_INTTYPES_H = @HAVE_SYS_INTTYPES_H@ HAVE_SYS_IOCTL_H = @HAVE_SYS_IOCTL_H@ HAVE_SYS_LOADAVG_H = @HAVE_SYS_LOADAVG_H@ HAVE_SYS_PARAM_H = @HAVE_SYS_PARAM_H@ +HAVE_SYS_RANDOM_H = @HAVE_SYS_RANDOM_H@ HAVE_SYS_SELECT_H = @HAVE_SYS_SELECT_H@ HAVE_SYS_SOCKET_H = @HAVE_SYS_SOCKET_H@ HAVE_SYS_TIME_H = @HAVE_SYS_TIME_H@ @@ -956,15 +988,14 @@ HAVE_SYS_UIO_H = @HAVE_SYS_UIO_H@ HAVE_TIMEGM = @HAVE_TIMEGM@ HAVE_TIMEZONE_T = @HAVE_TIMEZONE_T@ HAVE_TYPE_VOLATILE_SIG_ATOMIC_T = @HAVE_TYPE_VOLATILE_SIG_ATOMIC_T@ -HAVE_TZSET = @HAVE_TZSET@ HAVE_UNISTD_H = @HAVE_UNISTD_H@ HAVE_UNLINKAT = @HAVE_UNLINKAT@ HAVE_UNLOCKPT = @HAVE_UNLOCKPT@ -HAVE_UNSIGNED_LONG_LONG_INT = @HAVE_UNSIGNED_LONG_LONG_INT@ HAVE_USLEEP = @HAVE_USLEEP@ HAVE_UTIMENSAT = @HAVE_UTIMENSAT@ HAVE_VASPRINTF = @HAVE_VASPRINTF@ HAVE_VDPRINTF = @HAVE_VDPRINTF@ +HAVE_VISIBILITY = @HAVE_VISIBILITY@ HAVE_WCHAR_H = @HAVE_WCHAR_H@ HAVE_WCHAR_T = @HAVE_WCHAR_T@ HAVE_WCPCPY = @HAVE_WCPCPY@ @@ -1003,6 +1034,7 @@ HAVE_WMEMCHR = @HAVE_WMEMCHR@ HAVE_WMEMCMP = @HAVE_WMEMCMP@ HAVE_WMEMCPY = @HAVE_WMEMCPY@ HAVE_WMEMMOVE = @HAVE_WMEMMOVE@ +HAVE_WMEMPCPY = @HAVE_WMEMPCPY@ HAVE_WMEMSET = @HAVE_WMEMSET@ HAVE_WS2TCPIP_H = @HAVE_WS2TCPIP_H@ HAVE_XLOCALE_H = @HAVE_XLOCALE_H@ @@ -1028,16 +1060,28 @@ LIBICONV = @LIBICONV@ LIBINTL = @LIBINTL@ LIBMULTITHREAD = @LIBMULTITHREAD@ LIBOBJS = @LIBOBJS@ +LIBPMULTITHREAD = @LIBPMULTITHREAD@ +LIBPTHREAD = @LIBPTHREAD@ LIBS = @LIBS@ LIBSOCKET = @LIBSOCKET@ +LIBSTDTHREAD = @LIBSTDTHREAD@ LIBTESTS_LIBDEPS = @LIBTESTS_LIBDEPS@ LIBTHREAD = @LIBTHREAD@ LIBTOOL = @LIBTOOL@ LIB_BLKID = @LIB_BLKID@ +LIB_CLOCK_GETTIME = @LIB_CLOCK_GETTIME@ +LIB_GETRANDOM = @LIB_GETRANDOM@ +LIB_HARD_LOCALE = @LIB_HARD_LOCALE@ +LIB_MBRTOWC = @LIB_MBRTOWC@ LIB_NANOSLEEP = @LIB_NANOSLEEP@ +LIB_NL_LANGINFO = @LIB_NL_LANGINFO@ LIB_PTHREAD = @LIB_PTHREAD@ LIB_PTHREAD_SIGMASK = @LIB_PTHREAD_SIGMASK@ +LIB_SCHED_YIELD = @LIB_SCHED_YIELD@ LIB_SELECT = @LIB_SELECT@ +LIB_SEMAPHORE = @LIB_SEMAPHORE@ +LIB_SETLOCALE = @LIB_SETLOCALE@ +LIB_SETLOCALE_NULL = @LIB_SETLOCALE_NULL@ LIMITS_H = @LIMITS_H@ LIPO = @LIPO@ LN_S = @LN_S@ @@ -1086,6 +1130,7 @@ NEXT_AS_FIRST_DIRECTIVE_STDIO_H = @NEXT_AS_FIRST_DIRECTIVE_STDIO_H@ NEXT_AS_FIRST_DIRECTIVE_STDLIB_H = @NEXT_AS_FIRST_DIRECTIVE_STDLIB_H@ NEXT_AS_FIRST_DIRECTIVE_STRING_H = @NEXT_AS_FIRST_DIRECTIVE_STRING_H@ NEXT_AS_FIRST_DIRECTIVE_SYS_IOCTL_H = @NEXT_AS_FIRST_DIRECTIVE_SYS_IOCTL_H@ +NEXT_AS_FIRST_DIRECTIVE_SYS_RANDOM_H = @NEXT_AS_FIRST_DIRECTIVE_SYS_RANDOM_H@ NEXT_AS_FIRST_DIRECTIVE_SYS_SELECT_H = @NEXT_AS_FIRST_DIRECTIVE_SYS_SELECT_H@ NEXT_AS_FIRST_DIRECTIVE_SYS_SOCKET_H = @NEXT_AS_FIRST_DIRECTIVE_SYS_SOCKET_H@ NEXT_AS_FIRST_DIRECTIVE_SYS_STAT_H = @NEXT_AS_FIRST_DIRECTIVE_SYS_STAT_H@ @@ -1115,6 +1160,7 @@ NEXT_STDIO_H = @NEXT_STDIO_H@ NEXT_STDLIB_H = @NEXT_STDLIB_H@ NEXT_STRING_H = @NEXT_STRING_H@ NEXT_SYS_IOCTL_H = @NEXT_SYS_IOCTL_H@ +NEXT_SYS_RANDOM_H = @NEXT_SYS_RANDOM_H@ NEXT_SYS_SELECT_H = @NEXT_SYS_SELECT_H@ NEXT_SYS_SOCKET_H = @NEXT_SYS_SOCKET_H@ NEXT_SYS_STAT_H = @NEXT_SYS_STAT_H@ @@ -1151,21 +1197,24 @@ POSUB = @POSUB@ PRAGMA_COLUMNS = @PRAGMA_COLUMNS@ PRAGMA_SYSTEM_HEADER = @PRAGMA_SYSTEM_HEADER@ PRIPTR_PREFIX = @PRIPTR_PREFIX@ -PRI_MACROS_BROKEN = @PRI_MACROS_BROKEN@ PTHREAD_H_DEFINES_STRUCT_TIMESPEC = @PTHREAD_H_DEFINES_STRUCT_TIMESPEC@ PTRDIFF_T_SUFFIX = @PTRDIFF_T_SUFFIX@ RANLIB = @RANLIB@ +REPLACE_ACCESS = @REPLACE_ACCESS@ +REPLACE_ALIGNED_ALLOC = @REPLACE_ALIGNED_ALLOC@ REPLACE_BTOWC = @REPLACE_BTOWC@ REPLACE_CALLOC = @REPLACE_CALLOC@ REPLACE_CANONICALIZE_FILE_NAME = @REPLACE_CANONICALIZE_FILE_NAME@ REPLACE_CHOWN = @REPLACE_CHOWN@ REPLACE_CLOSE = @REPLACE_CLOSE@ +REPLACE_CREAT = @REPLACE_CREAT@ REPLACE_CTIME = @REPLACE_CTIME@ REPLACE_DPRINTF = @REPLACE_DPRINTF@ REPLACE_DUP = @REPLACE_DUP@ REPLACE_DUP2 = @REPLACE_DUP2@ REPLACE_DUPLOCALE = @REPLACE_DUPLOCALE@ REPLACE_FACCESSAT = @REPLACE_FACCESSAT@ +REPLACE_FCHMODAT = @REPLACE_FCHMODAT@ REPLACE_FCHOWNAT = @REPLACE_FCHOWNAT@ REPLACE_FCLOSE = @REPLACE_FCLOSE@ REPLACE_FCNTL = @REPLACE_FCNTL@ @@ -1193,6 +1242,7 @@ REPLACE_GETLINE = @REPLACE_GETLINE@ REPLACE_GETLOGIN_R = @REPLACE_GETLOGIN_R@ REPLACE_GETPAGESIZE = @REPLACE_GETPAGESIZE@ REPLACE_GETPASS = @REPLACE_GETPASS@ +REPLACE_GETRANDOM = @REPLACE_GETRANDOM@ REPLACE_GETTIMEOFDAY = @REPLACE_GETTIMEOFDAY@ REPLACE_GMTIME = @REPLACE_GMTIME@ REPLACE_INET_NTOP = @REPLACE_INET_NTOP@ @@ -1202,6 +1252,8 @@ REPLACE_IOCTL = @REPLACE_IOCTL@ REPLACE_ISATTY = @REPLACE_ISATTY@ REPLACE_ISWBLANK = @REPLACE_ISWBLANK@ REPLACE_ISWCNTRL = @REPLACE_ISWCNTRL@ +REPLACE_ISWDIGIT = @REPLACE_ISWDIGIT@ +REPLACE_ISWXDIGIT = @REPLACE_ISWXDIGIT@ REPLACE_LCHOWN = @REPLACE_LCHOWN@ REPLACE_LINK = @REPLACE_LINK@ REPLACE_LINKAT = @REPLACE_LINKAT@ @@ -1234,6 +1286,7 @@ REPLACE_OPEN = @REPLACE_OPEN@ REPLACE_OPENAT = @REPLACE_OPENAT@ REPLACE_PERROR = @REPLACE_PERROR@ REPLACE_POPEN = @REPLACE_POPEN@ +REPLACE_POSIX_MEMALIGN = @REPLACE_POSIX_MEMALIGN@ REPLACE_PREAD = @REPLACE_PREAD@ REPLACE_PRINTF = @REPLACE_PRINTF@ REPLACE_PSELECT = @REPLACE_PSELECT@ @@ -1322,6 +1375,7 @@ REPLACE_STRCASESTR = @REPLACE_STRCASESTR@ REPLACE_STRCHRNUL = @REPLACE_STRCHRNUL@ REPLACE_STRDUP = @REPLACE_STRDUP@ REPLACE_STRERROR = @REPLACE_STRERROR@ +REPLACE_STRERRORNAME_NP = @REPLACE_STRERRORNAME_NP@ REPLACE_STRERROR_R = @REPLACE_STRERROR_R@ REPLACE_STRFTIME = @REPLACE_STRFTIME@ REPLACE_STRNCAT = @REPLACE_STRNCAT@ @@ -1359,13 +1413,13 @@ REPLACE_WCRTOMB = @REPLACE_WCRTOMB@ REPLACE_WCSFTIME = @REPLACE_WCSFTIME@ REPLACE_WCSNRTOMBS = @REPLACE_WCSNRTOMBS@ REPLACE_WCSRTOMBS = @REPLACE_WCSRTOMBS@ +REPLACE_WCSTOK = @REPLACE_WCSTOK@ REPLACE_WCSWIDTH = @REPLACE_WCSWIDTH@ REPLACE_WCTOB = @REPLACE_WCTOB@ REPLACE_WCTOMB = @REPLACE_WCTOMB@ REPLACE_WCWIDTH = @REPLACE_WCWIDTH@ REPLACE_WRITE = @REPLACE_WRITE@ SED = @SED@ -SELINUX_LIBS = @SELINUX_LIBS@ SET_MAKE = @SET_MAKE@ SHELL = @SHELL@ SIG_ATOMIC_T_SUFFIX = @SIG_ATOMIC_T_SUFFIX@ @@ -1384,6 +1438,7 @@ UINT32_MAX_LT_UINTMAX_MAX = @UINT32_MAX_LT_UINTMAX_MAX@ UINT64_MAX_EQ_ULONG_MAX = @UINT64_MAX_EQ_ULONG_MAX@ UNDEFINE_STRTOK_R = @UNDEFINE_STRTOK_R@ UNISTD_H_DEFINES_STRUCT_TIMESPEC = @UNISTD_H_DEFINES_STRUCT_TIMESPEC@ +UNISTD_H_HAVE_SYS_RANDOM_H = @UNISTD_H_HAVE_SYS_RANDOM_H@ UNISTD_H_HAVE_WINSOCK2_H = @UNISTD_H_HAVE_WINSOCK2_H@ UNISTD_H_HAVE_WINSOCK2_H_AND_USE_SOCKETS = @UNISTD_H_HAVE_WINSOCK2_H_AND_USE_SOCKETS@ USE_NLS = @USE_NLS@ @@ -1460,7 +1515,7 @@ target_alias = @target_alias@ top_build_prefix = @top_build_prefix@ top_builddir = @top_builddir@ top_srcdir = @top_srcdir@ -partedincludedir = -I$(top_builddir)/include -I$(top_srcdir)/include +partedincludedir = -I$(top_builddir)/include -I$(top_srcdir)/include -I$(top_srcdir)/lib AM_CFLAGS = $(WARN_CFLAGS) noinst_LTLIBRARIES = libfs.la libfs_la_LIBADD = $(UUID_LIBS) \ @@ -1486,6 +1541,8 @@ libfs_la_SOURCES = \ fat/count.h \ fat/fat.c \ fat/fat.h \ + f2fs/f2fs.c \ + f2fs/f2fs.h \ hfs/hfs.c \ hfs/hfs.h \ hfs/probe.c \ @@ -1512,7 +1569,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 = 2 +REVISION = 3 AGE = 0 sym_file = $(srcdir)/fsresize.sym libparted_fs_resize_la_LDFLAGS = \ @@ -1680,6 +1737,13 @@ fat/$(DEPDIR)/$(am__dirstamp): @: > fat/$(DEPDIR)/$(am__dirstamp) fat/bootsector.lo: fat/$(am__dirstamp) fat/$(DEPDIR)/$(am__dirstamp) fat/fat.lo: fat/$(am__dirstamp) fat/$(DEPDIR)/$(am__dirstamp) +f2fs/$(am__dirstamp): + @$(MKDIR_P) f2fs + @: > f2fs/$(am__dirstamp) +f2fs/$(DEPDIR)/$(am__dirstamp): + @$(MKDIR_P) f2fs/$(DEPDIR) + @: > f2fs/$(DEPDIR)/$(am__dirstamp) +f2fs/f2fs.lo: f2fs/$(am__dirstamp) f2fs/$(DEPDIR)/$(am__dirstamp) hfs/$(am__dirstamp): @$(MKDIR_P) hfs @: > hfs/$(am__dirstamp) @@ -1809,6 +1873,8 @@ mostlyclean-compile: -rm -f btrfs/*.lo -rm -f ext2/*.$(OBJEXT) -rm -f ext2/*.lo + -rm -f f2fs/*.$(OBJEXT) + -rm -f f2fs/*.lo -rm -f fat/*.$(OBJEXT) -rm -f fat/*.lo -rm -f hfs/*.$(OBJEXT) @@ -1846,6 +1912,7 @@ distclean-compile: @AMDEP_TRUE@@am__include@ @am__quote@amiga/$(DEPDIR)/asfs.Plo@am__quote@ # am--include-marker @AMDEP_TRUE@@am__include@ @am__quote@btrfs/$(DEPDIR)/btrfs.Plo@am__quote@ # am--include-marker @AMDEP_TRUE@@am__include@ @am__quote@ext2/$(DEPDIR)/interface.Plo@am__quote@ # am--include-marker +@AMDEP_TRUE@@am__include@ @am__quote@f2fs/$(DEPDIR)/f2fs.Plo@am__quote@ # am--include-marker @AMDEP_TRUE@@am__include@ @am__quote@fat/$(DEPDIR)/bootsector.Plo@am__quote@ # am--include-marker @AMDEP_TRUE@@am__include@ @am__quote@fat/$(DEPDIR)/fat.Plo@am__quote@ # am--include-marker @AMDEP_TRUE@@am__include@ @am__quote@hfs/$(DEPDIR)/hfs.Plo@am__quote@ # am--include-marker @@ -1918,6 +1985,7 @@ clean-libtool: -rm -rf amiga/.libs amiga/_libs -rm -rf btrfs/.libs btrfs/_libs -rm -rf ext2/.libs ext2/_libs + -rm -rf f2fs/.libs f2fs/_libs -rm -rf fat/.libs fat/_libs -rm -rf hfs/.libs hfs/_libs -rm -rf jfs/.libs jfs/_libs @@ -2056,6 +2124,8 @@ distclean-generic: -rm -f btrfs/$(am__dirstamp) -rm -f ext2/$(DEPDIR)/$(am__dirstamp) -rm -f ext2/$(am__dirstamp) + -rm -f f2fs/$(DEPDIR)/$(am__dirstamp) + -rm -f f2fs/$(am__dirstamp) -rm -f fat/$(DEPDIR)/$(am__dirstamp) -rm -f fat/$(am__dirstamp) -rm -f hfs/$(DEPDIR)/$(am__dirstamp) @@ -2099,6 +2169,7 @@ distclean: distclean-am -rm -f amiga/$(DEPDIR)/asfs.Plo -rm -f btrfs/$(DEPDIR)/btrfs.Plo -rm -f ext2/$(DEPDIR)/interface.Plo + -rm -f f2fs/$(DEPDIR)/f2fs.Plo -rm -f fat/$(DEPDIR)/bootsector.Plo -rm -f fat/$(DEPDIR)/fat.Plo -rm -f hfs/$(DEPDIR)/hfs.Plo @@ -2184,6 +2255,7 @@ maintainer-clean: maintainer-clean-am -rm -f amiga/$(DEPDIR)/asfs.Plo -rm -f btrfs/$(DEPDIR)/btrfs.Plo -rm -f ext2/$(DEPDIR)/interface.Plo + -rm -f f2fs/$(DEPDIR)/f2fs.Plo -rm -f fat/$(DEPDIR)/bootsector.Plo -rm -f fat/$(DEPDIR)/fat.Plo -rm -f hfs/$(DEPDIR)/hfs.Plo diff --git a/libparted/fs/amiga/a-interface.c b/libparted/fs/amiga/a-interface.c index a6b92f9..8d6696d 100644 --- a/libparted/fs/amiga/a-interface.c +++ b/libparted/fs/amiga/a-interface.c @@ -1,7 +1,7 @@ /* interface.c -- parted support amiga file systems - Copyright (C) 1998-2000, 2007, 2009-2014, 2019 Free Software Foundation, - Inc. + Copyright (C) 1998-2000, 2007, 2009-2014, 2019-2021 Free Software + Foundation, Inc. This 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/amiga/affs.c b/libparted/fs/amiga/affs.c index 1fde17c..3dbc435 100644 --- a/libparted/fs/amiga/affs.c +++ b/libparted/fs/amiga/affs.c @@ -1,7 +1,7 @@ /* affs.c -- parted support for affs file systems - Copyright (C) 1998-2000, 2007, 2009-2014, 2019 Free Software Foundation, - Inc. + Copyright (C) 1998-2000, 2007, 2009-2014, 2019-2021 Free Software + Foundation, Inc. This program is free software; you can redistribute it and/or modify it under the terms of the GNU General Public License as published by @@ -52,20 +52,19 @@ _generic_affs_probe (PedGeometry* geom, uint32_t kind) uint32_t *block; PedSector root, len, pos; struct PartitionBlock * part; - int blocksize = 1, reserved = 2, prealloc = 0; + int blocksize = 1, reserved = 2; PED_ASSERT (geom != NULL); PED_ASSERT (geom->dev != NULL); if (geom->dev->sector_size != 512) return NULL; - /* Finds the blocksize, prealloc and reserved values of the partition block */ + /* Finds the blocksize and reserved values of the partition block */ if (!(part = ped_malloc (PED_SECTOR_SIZE_DEFAULT*blocksize))) { ped_exception_throw(PED_EXCEPTION_ERROR, PED_EXCEPTION_CANCEL, _("%s : Failed to allocate partition block\n"), __func__); goto error_part; } if (amiga_find_part(geom, part) != NULL) { - prealloc = PED_BE32_TO_CPU (part->de_PreAlloc); reserved = PED_BE32_TO_CPU (part->de_Reserved); reserved = reserved == 0 ? 1 : reserved; blocksize = PED_BE32_TO_CPU (part->de_SizeBlock) diff --git a/libparted/fs/amiga/affs.h b/libparted/fs/amiga/affs.h index 9e9505c..7af6950 100644 --- a/libparted/fs/amiga/affs.h +++ b/libparted/fs/amiga/affs.h @@ -1,8 +1,8 @@ /* affs.h -- parted suppoer for affs filesystems header files - Copyright (C) 1998-2000, 2007, 2009-2014, 2019 Free Software Foundation, - Inc. + Copyright (C) 1998-2000, 2007, 2009-2014, 2019-2021 Free Software + Foundation, Inc. This 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/amiga/amiga.c b/libparted/fs/amiga/amiga.c index be10dae..80538ba 100644 --- a/libparted/fs/amiga/amiga.c +++ b/libparted/fs/amiga/amiga.c @@ -1,7 +1,7 @@ /* libparted/fs_amiga - amiga file system support. - Copyright (C) 2000-2001, 2007, 2009-2014, 2019 Free Software Foundation, - Inc. + Copyright (C) 2000-2001, 2007, 2009-2014, 2019-2021 Free Software + Foundation, Inc. This program is free software; you can redistribute it and/or modify it under the terms of the GNU General Public License as published by @@ -217,6 +217,7 @@ _amiga_read_block (PedDevice *dev, struct AmigaBlock *blk, PedSector block, stru return NULL; } } + /* FALLTHROUGH */ case PED_EXCEPTION_IGNORE : case PED_EXCEPTION_UNHANDLED : default : diff --git a/libparted/fs/amiga/amiga.h b/libparted/fs/amiga/amiga.h index eb520ab..45d0034 100644 --- a/libparted/fs/amiga/amiga.h +++ b/libparted/fs/amiga/amiga.h @@ -1,7 +1,7 @@ /* util.h -- amiga partition table headers. - Copyright (C) 1998-2000, 2007, 2009-2014, 2019 Free Software Foundation, - Inc. + Copyright (C) 1998-2000, 2007, 2009-2014, 2019-2021 Free Software + Foundation, Inc. This 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/amiga/apfs.c b/libparted/fs/amiga/apfs.c index 775e77e..6249f6d 100644 --- a/libparted/fs/amiga/apfs.c +++ b/libparted/fs/amiga/apfs.c @@ -1,7 +1,7 @@ /* apfs.c -- parted support for apfs file systems - Copyright (C) 1998-2000, 2007, 2009-2014, 2019 Free Software Foundation, - Inc. + Copyright (C) 1998-2000, 2007, 2009-2014, 2019-2021 Free Software + Foundation, Inc. This 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/amiga/apfs.h b/libparted/fs/amiga/apfs.h index 103bfbe..b54a04d 100644 --- a/libparted/fs/amiga/apfs.h +++ b/libparted/fs/amiga/apfs.h @@ -1,7 +1,7 @@ /* apfs.h -- parted support for apfs file systems header files - Copyright (C) 1998-2000, 2007, 2009-2014, 2019 Free Software Foundation, - Inc. + Copyright (C) 1998-2000, 2007, 2009-2014, 2019-2021 Free Software + Foundation, Inc. This 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/amiga/asfs.c b/libparted/fs/amiga/asfs.c index 118d204..2ecd68e 100644 --- a/libparted/fs/amiga/asfs.c +++ b/libparted/fs/amiga/asfs.c @@ -1,7 +1,7 @@ /* asfs.c -- parted asfs filesystem support - Copyright (C) 1998-2000, 2007, 2009-2014, 2019 Free Software Foundation, - Inc. + Copyright (C) 1998-2000, 2007, 2009-2014, 2019-2021 Free Software + Foundation, Inc. This 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/amiga/asfs.h b/libparted/fs/amiga/asfs.h index 2ac8c2a..24c5d22 100644 --- a/libparted/fs/amiga/asfs.h +++ b/libparted/fs/amiga/asfs.h @@ -1,7 +1,7 @@ /* asfs.h -- parted asfs filesystem support header files - Copyright (C) 1998-2000, 2007, 2009-2014, 2019 Free Software Foundation, - Inc. + Copyright (C) 1998-2000, 2007, 2009-2014, 2019-2021 Free Software + Foundation, Inc. This 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/btrfs/btrfs.c b/libparted/fs/btrfs/btrfs.c index 8815508..0c462dd 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 Free Software Foundation, Inc. + Copyright (C) 2013-2014, 2019-2021 Free Software Foundation, Inc. This 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 a44fd4e..6e1545b 100644 --- a/libparted/fs/ext2/ext2.h +++ b/libparted/fs/ext2/ext2.h @@ -1,7 +1,7 @@ /* ext2.h -- ext2 header - Copyright (C) 1998-2000, 2007, 2009-2014, 2019 Free Software Foundation, - Inc. + Copyright (C) 1998-2000, 2007, 2009-2014, 2019-2021 Free Software + Foundation, Inc. This 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_fs.h b/libparted/fs/ext2/ext2_fs.h index ac1b6a0..fe2a6f7 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 - * Copyright (C) 2000, 2009-2014, 2019 Free Software Foundation, Inc. + * Copyright (C) 2000, 2009-2014, 2019-2021 Free Software Foundation, Inc. */ #ifndef _EXT2_FS_H @@ -173,7 +173,7 @@ struct ext2_inode #define i_size_high i_dir_acl -struct ext2_super_block +struct __attribute__ ((packed)) ext2_super_block { uint32_t s_inodes_count; /* Inodes count */ uint32_t s_blocks_count; /* Blocks count */ diff --git a/libparted/fs/ext2/interface.c b/libparted/fs/ext2/interface.c index a49568b..1da9d33 100644 --- a/libparted/fs/ext2/interface.c +++ b/libparted/fs/ext2/interface.c @@ -1,6 +1,7 @@ /* interface.c -- parted binding glue to libext2resize - Copyright (C) 1998-2000, 2007-2014, 2019 Free Software Foundation, Inc. + Copyright (C) 1998-2000, 2007-2014, 2019-2021 Free Software Foundation, + Inc. This program is free software; you can redistribute it and/or modify it under the terms of the GNU General Public License as published by @@ -33,12 +34,13 @@ struct ext2_dev_handle* ext2_make_dev_handle_from_parted_geometry(PedGeometry* g static PedGeometry* _ext2_generic_probe (PedGeometry* geom, int expect_ext_ver) { + struct ext2_super_block *sb; const int sectors = (4096 + geom->dev->sector_size - 1) / geom->dev->sector_size; - char *sb_v = alloca (sectors * geom->dev->sector_size); - if (!ped_geometry_read(geom, sb_v, 0, sectors)) + uint8_t *buf = alloca (sectors * geom->dev->sector_size); + if (!ped_geometry_read(geom, buf, 0, sectors)) return NULL; - struct ext2_super_block *sb = (struct ext2_super_block *)(sb_v + 1024); + sb = (struct ext2_super_block *)(buf+1024); if (EXT2_SUPER_MAGIC(*sb) == EXT2_SUPER_MAGIC_CONST) { PedSector block_size = (EXT2_MIN_BLOCK_SIZE << (EXT2_SUPER_LOG_BLOCK_SIZE(*sb))) / geom->dev->sector_size; diff --git a/libparted/fs/f2fs/f2fs.c b/libparted/fs/f2fs/f2fs.c new file mode 100644 index 0000000..e9254c3 --- /dev/null +++ b/libparted/fs/f2fs/f2fs.c @@ -0,0 +1,60 @@ +/* + libparted/fs/f2fs - Flash-Friendly File System + Copyright (C) 2020-2021 Free Software Foundation, Inc. + + This 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 . +*/ + +#include + +#include +#include + +#include "f2fs.h" + +static PedGeometry* +f2fs_probe (PedGeometry* geom) +{ + struct f2fs_super_block *sb = alloca(geom->dev->sector_size); + + if (!ped_geometry_read (geom, sb, F2FS_SB_OFFSET, 1)) + return NULL; + + if (PED_LE32_TO_CPU(sb->magic) == F2FS_MAGIC) + return ped_geometry_new (geom->dev, geom->start, geom->length); + + return NULL; +} + +static PedFileSystemOps f2fs_ops = { + probe: f2fs_probe, +}; + +static PedFileSystemType f2fs_type = { + next: NULL, + ops: &f2fs_ops, + name: "f2fs", +}; + +void +ped_file_system_f2fs_init () +{ + ped_file_system_type_register (&f2fs_type); +} + +void +ped_file_system_f2fs_done () +{ + ped_file_system_type_unregister (&f2fs_type); +} diff --git a/libparted/fs/f2fs/f2fs.h b/libparted/fs/f2fs/f2fs.h new file mode 100644 index 0000000..1c7b963 --- /dev/null +++ b/libparted/fs/f2fs/f2fs.h @@ -0,0 +1,57 @@ +/* + libparted/fs/f2fs - Flash-Friendly File System + Copyright (C) 2020-2021 Free Software Foundation, Inc. + + This 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 . +*/ +#ifndef _F2FS_H +#define _F2FS_H + +#define F2FS_MAGIC 0xF2F52010 +#define F2FS_MAX_VOLUME_NAME 512 +#define F2FS_SB_OFFSET 0x02 + +struct f2fs_super_block { + uint32_t magic; /* Magic Number */ + uint16_t major_ver; /* Major Version */ + uint16_t minor_ver; /* Minor Version */ + uint32_t log_sectorsize; /* log2 sector size in bytes */ + uint32_t log_sectors_per_block; /* log2 # of sectors per block */ + uint32_t log_blocksize; /* log2 block size in bytes */ + uint32_t log_blocks_per_seg; /* log2 # of blocks per segment */ + uint32_t segs_per_sec; /* # of segments per section */ + uint32_t secs_per_zone; /* # of sections per zone */ + uint32_t checksum_offset; /* checksum offset inside super block */ + uint64_t block_count; /* total # of user blocks */ + uint32_t section_count; /* total # of sections */ + uint32_t segment_count; /* total # of segments */ + uint32_t segment_count_ckpt; /* # of segments for checkpoint */ + uint32_t segment_count_sit; /* # of segments for SIT */ + uint32_t segment_count_nat; /* # of segments for NAT */ + uint32_t segment_count_ssa; /* # of segments for SSA */ + uint32_t segment_count_main; /* # of segments for main area */ + uint32_t segment0_blkaddr; /* start block address of segment 0 */ + uint32_t cp_blkaddr; /* start block address of checkpoint */ + uint32_t sit_blkaddr; /* start block address of SIT */ + uint32_t nat_blkaddr; /* start block address of NAT */ + uint32_t ssa_blkaddr; /* start block address of SSA */ + uint32_t main_blkaddr; /* start block address of main area */ + uint32_t root_ino; /* root inode number */ + uint32_t node_ino; /* node inode number */ + uint32_t meta_ino; /* meta inode number */ + uint8_t uuid[16]; /* 128-bit uuid for volume */ + uint16_t volume_name[F2FS_MAX_VOLUME_NAME]; /* volume name */ +} __attribute__((packed)); + +#endif diff --git a/libparted/fs/fat/bootsector.c b/libparted/fs/fat/bootsector.c index 0c3ae77..8087106 100644 --- a/libparted/fs/fat/bootsector.c +++ b/libparted/fs/fat/bootsector.c @@ -1,7 +1,7 @@ /* libparted - Copyright (C) 1998-2000, 2002, 2004, 2007, 2009-2014, 2019 Free Software - Foundation, Inc. + Copyright (C) 1998-2000, 2002, 2004, 2007, 2009-2014, 2019-2021 Free + Software Foundation, Inc. This program is free software; you can redistribute it and/or modify it under the terms of the GNU General Public License as published by @@ -86,7 +86,7 @@ fat_boot_sector_read (FatBootSector** bsp, const PedGeometry *geom) /* Don't trust the FAT12, FAT16 or FAT32 label string. */ -FatType +FatType _GL_ATTRIBUTE_PURE fat_boot_sector_probe_type (const FatBootSector* bs, const PedGeometry* geom) { PedSector logical_sector_size; diff --git a/libparted/fs/fat/bootsector.h b/libparted/fs/fat/bootsector.h index 191c11d..fc4d695 100644 --- a/libparted/fs/fat/bootsector.h +++ b/libparted/fs/fat/bootsector.h @@ -1,7 +1,7 @@ /* libparted - Copyright (C) 1998-2000, 2007, 2009-2014, 2019 Free Software Foundation, - Inc. + Copyright (C) 1998-2000, 2007, 2009-2014, 2019-2021 Free Software + Foundation, Inc. This 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/count.h b/libparted/fs/fat/count.h index aa07bac..dfa8914 100644 --- a/libparted/fs/fat/count.h +++ b/libparted/fs/fat/count.h @@ -1,6 +1,7 @@ /* libparted - Copyright (C) 1999-2000, 2007-2014, 2019 Free Software Foundation, Inc. + Copyright (C) 1999-2000, 2007-2014, 2019-2021 Free Software Foundation, + Inc. This 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/fat.c b/libparted/fs/fat/fat.c index 7ef7f31..52681e0 100644 --- a/libparted/fs/fat/fat.c +++ b/libparted/fs/fat/fat.c @@ -1,6 +1,7 @@ /* libparted - Copyright (C) 1998-2001, 2007-2014, 2019 Free Software Foundation, Inc. + Copyright (C) 1998-2001, 2007-2014, 2019-2021 Free Software Foundation, + Inc. This 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/fat.h b/libparted/fs/fat/fat.h index bfb5588..0a81ef0 100644 --- a/libparted/fs/fat/fat.h +++ b/libparted/fs/fat/fat.h @@ -1,7 +1,7 @@ /* libparted - Copyright (C) 1998-2001, 2007, 2009-2014, 2019 Free Software Foundation, - Inc. + Copyright (C) 1998-2001, 2007, 2009-2014, 2019-2021 Free Software + Foundation, Inc. This 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/hfs/hfs.c b/libparted/fs/hfs/hfs.c index 84d738d..a6af540 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 Free Software + Copyright (C) 2000, 2003-2005, 2007, 2009-2014, 2019-2021 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 4fa2e95..3d48820 100644 --- a/libparted/fs/hfs/hfs.h +++ b/libparted/fs/hfs/hfs.h @@ -1,7 +1,7 @@ /* libparted - a library for manipulating disk partitions - Copyright (C) 2003-2005, 2007, 2009-2014, 2019 Free Software Foundation, - Inc. + Copyright (C) 2003-2005, 2007, 2009-2014, 2019-2021 Free Software + Foundation, Inc. This program is free software; you can redistribute it and/or modify it under the terms of the GNU General Public License as published by @@ -529,7 +529,7 @@ struct __attribute__ ((packed)) _HfsJBlockListHeader { uint32_t bytes_used; uint32_t checksum; uint32_t pad; - HfsJBlockInfo binfo[1]; + HfsJBlockInfo binfo[]; }; typedef struct _HfsJBlockListHeader HfsJBlockListHeader; diff --git a/libparted/fs/hfs/probe.c b/libparted/fs/hfs/probe.c index 3b79886..fc00cef 100644 --- a/libparted/fs/hfs/probe.c +++ b/libparted/fs/hfs/probe.c @@ -1,7 +1,7 @@ /* libparted - a library for manipulating disk partitions - Copyright (C) 2004-2005, 2007, 2009-2014, 2019 Free Software Foundation, - Inc. + Copyright (C) 2004-2005, 2007, 2009-2014, 2019-2021 Free Software + Foundation, Inc. This 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/hfs/probe.h b/libparted/fs/hfs/probe.h index 61c2f9f..a79ae73 100644 --- a/libparted/fs/hfs/probe.h +++ b/libparted/fs/hfs/probe.h @@ -1,7 +1,7 @@ /* libparted - a library for manipulating disk partitions - Copyright (C) 2004-2005, 2007, 2009-2014, 2019 Free Software Foundation, - Inc. + Copyright (C) 2004-2005, 2007, 2009-2014, 2019-2021 Free Software + Foundation, Inc. This 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/jfs/jfs.c b/libparted/fs/jfs/jfs.c index b15a963..e760aaf 100644 --- a/libparted/fs/jfs/jfs.c +++ b/libparted/fs/jfs/jfs.c @@ -1,6 +1,7 @@ /* libparted - a library for manipulating disk partitions - Copyright (C) 2001, 2007, 2009-2014, 2019 Free Software Foundation, Inc. + Copyright (C) 2001, 2007, 2009-2014, 2019-2021 Free Software Foundation, + Inc. This 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/linux_swap/linux_swap.c b/libparted/fs/linux_swap/linux_swap.c index a489563..e545830 100644 --- a/libparted/fs/linux_swap/linux_swap.c +++ b/libparted/fs/linux_swap/linux_swap.c @@ -1,7 +1,7 @@ /* libparted - a library for manipulating disk partitions - Copyright (C) 1999-2000, 2002, 2007-2014, 2019 Free Software Foundation, - Inc. + Copyright (C) 1999-2000, 2002, 2007-2014, 2019-2021 Free Software + Foundation, Inc. This 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/nilfs2/nilfs2.c b/libparted/fs/nilfs2/nilfs2.c index 3ca4808..7596a37 100644 --- a/libparted/fs/nilfs2/nilfs2.c +++ b/libparted/fs/nilfs2/nilfs2.c @@ -3,7 +3,7 @@ * * Written by Jiro SEKIBA * - * Copyright (C) 2011-2014, 2019 Free Software Foundation, Inc. + * Copyright (C) 2011-2014, 2019-2021 Free Software Foundation, Inc. * * This program is free software; you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by @@ -34,8 +34,7 @@ /* secondary superblock offset in 512byte blocks. */ #define NILFS_SB2_OFFSET(devsize) ((((devsize)>>3) - 1) << 3) -struct nilfs2_super_block -{ +struct __attribute__ ((packed)) nilfs2_super_block { uint32_t s_rev_level; uint16_t s_minor_rev_level; uint16_t s_magic; @@ -112,18 +111,18 @@ nilfs2_probe (PedGeometry* geom) return NULL; const int sectors = (4096 + geom->dev->sector_size - 1) / geom->dev->sector_size; - char *buf = alloca (sectors * geom->dev->sector_size); + uint8_t *buf = alloca (sectors * geom->dev->sector_size); const int sectors2 = (1024 + geom->dev->sector_size -1 ) / geom->dev->sector_size; void *buff2 = alloca (sectors2 * geom->dev->sector_size); if (ped_geometry_read(geom, buf, 0, sectors)) - sb = (struct nilfs2_super_block *)(buf+1024); + sb = (struct nilfs2_super_block*)(buf + 1024); if (ped_geometry_read(geom, buff2, sb2off, sectors2)) - sb2 = buff2; + sb2 = (struct nilfs2_super_block*)buff2; if ((!sb || !is_valid_nilfs_sb(sb)) && - (!sb2 || !is_valid_nilfs_sb(sb2)) ) + (!sb2 || !is_valid_nilfs_sb(sb2))) return NULL; /* reserve 4k bytes for secondary superblock */ diff --git a/libparted/fs/ntfs/ntfs.c b/libparted/fs/ntfs/ntfs.c index 3bfb28e..3455bd7 100644 --- a/libparted/fs/ntfs/ntfs.c +++ b/libparted/fs/ntfs/ntfs.c @@ -1,6 +1,7 @@ /* libparted - a library for manipulating disk partitions - Copyright (C) 2000, 2007, 2009-2014, 2019 Free Software Foundation, Inc. + Copyright (C) 2000, 2007, 2009-2014, 2019-2021 Free Software Foundation, + Inc. This 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,16 +36,17 @@ PedGeometry* ntfs_probe (PedGeometry* geom) { - char *buf = alloca (geom->dev->sector_size); + uint8_t *buf = alloca(geom->dev->sector_size); PedGeometry *newg = NULL; if (!ped_geometry_read(geom, buf, 0, 1)) return 0; - if (strncmp (NTFS_SIGNATURE, buf + 3, strlen (NTFS_SIGNATURE)) == 0) - newg = ped_geometry_new (geom->dev, geom->start, - PED_LE64_TO_CPU (*(uint64_t*) - (buf + 0x28))); + if (strncmp (NTFS_SIGNATURE, ((char *)buf + 3), strlen (NTFS_SIGNATURE)) == 0) { + uint64_t length; + memcpy(&length, buf + 0x28, sizeof(uint64_t)); + newg = ped_geometry_new (geom->dev, geom->start, length); + } return newg; } diff --git a/libparted/fs/r/fat/bootsector.c b/libparted/fs/r/fat/bootsector.c index 46d5926..0df9880 100644 --- a/libparted/fs/r/fat/bootsector.c +++ b/libparted/fs/r/fat/bootsector.c @@ -1,7 +1,7 @@ /* libparted - Copyright (C) 1998-2000, 2002, 2004, 2007, 2009-2014, 2019 Free Software - Foundation, Inc. + Copyright (C) 1998-2000, 2002, 2004, 2007, 2009-2014, 2019-2021 Free + Software Foundation, Inc. This program is free software; you can redistribute it and/or modify it under the terms of the GNU General Public License as published by @@ -85,7 +85,7 @@ fat_boot_sector_read (FatBootSector** bsp, const PedGeometry *geom) /* Don't trust the FAT12, FAT16 or FAT32 label string. */ -FatType +FatType _GL_ATTRIBUTE_PURE fat_boot_sector_probe_type (const FatBootSector* bs, const PedGeometry* geom) { PedSector logical_sector_size; @@ -271,8 +271,6 @@ fat_boot_sector_analyse (FatBootSector* bs, PedFileSystem* fs) int fat_boot_sector_set_boot_code (FatBootSector** bsp, const PedFileSystem* fs) { - FatSpecific* fs_info = FAT_SPECIFIC (fs); - PED_ASSERT (bsp != NULL); *bsp = ped_malloc (fs->geom->dev->sector_size); FatBootSector *bs = *bsp; @@ -280,7 +278,8 @@ fat_boot_sector_set_boot_code (FatBootSector** bsp, const PedFileSystem* fs) memset (bs, 0, 512); memcpy (bs->boot_jump, FAT_BOOT_JUMP, 3); - memcpy (bs->u.fat32.boot_code, FAT_BOOT_CODE, FAT_BOOT_CODE_LENGTH); + PED_ASSERT (sizeof(FAT_BOOT_CODE) < sizeof(bs->u.fat32.boot_code)); + strcpy (bs->u.fat32.boot_code, FAT_BOOT_CODE); return 1; } diff --git a/libparted/fs/r/fat/bootsector.h b/libparted/fs/r/fat/bootsector.h index 6b0363f..e7e4257 100644 --- a/libparted/fs/r/fat/bootsector.h +++ b/libparted/fs/r/fat/bootsector.h @@ -1,7 +1,7 @@ /* libparted - Copyright (C) 1998-2000, 2007, 2009-2014, 2019 Free Software Foundation, - Inc. + Copyright (C) 1998-2000, 2007, 2009-2014, 2019-2021 Free Software + Foundation, Inc. This program is free software; you can redistribute it and/or modify it under the terms of the GNU General Public License as published by @@ -57,8 +57,6 @@ typedef struct _FatInfoSector FatInfoSector; /* message: */ \ FAT_BOOT_MESSAGE -#define FAT_BOOT_CODE_LENGTH 128 - struct __attribute__ ((packed)) _FatBootSector { uint8_t boot_jump[3]; /* 00: Boot strap short or near jump */ uint8_t system_id[8]; /* 03: system name */ diff --git a/libparted/fs/r/fat/calc.c b/libparted/fs/r/fat/calc.c index e524007..ed6adc3 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 Free Software + Copyright (C) 1998-2000, 2002, 2007, 2009-2014, 2019-2021 Free Software Foundation, Inc. This program is free software; you can redistribute it and/or modify @@ -23,7 +23,7 @@ #ifndef DISCOVER_ONLY /* returns the minimum size of clusters for a given file system type */ -PedSector +PedSector _GL_ATTRIBUTE_CONST fat_min_cluster_size (FatType fat_type) { switch (fat_type) { case FAT_TYPE_FAT12: return 1; @@ -33,7 +33,7 @@ fat_min_cluster_size (FatType fat_type) { return 0; } -static PedSector +static PedSector _GL_ATTRIBUTE_CONST _smallest_power2_over (PedSector ceiling) { PedSector result = 1; @@ -45,7 +45,7 @@ _smallest_power2_over (PedSector ceiling) } /* returns the minimum size of clusters for a given file system type */ -PedSector +PedSector _GL_ATTRIBUTE_CONST fat_recommend_min_cluster_size (FatType fat_type, PedSector size) { switch (fat_type) { case FAT_TYPE_FAT12: return 1; @@ -59,7 +59,7 @@ fat_recommend_min_cluster_size (FatType fat_type, PedSector size) { } /* returns the maxmimum size of clusters for a given file system type */ -PedSector +PedSector _GL_ATTRIBUTE_CONST fat_max_cluster_size (FatType fat_type) { switch (fat_type) { case FAT_TYPE_FAT12: return 1; /* dunno... who cares? */ @@ -70,7 +70,7 @@ fat_max_cluster_size (FatType fat_type) { } /* returns the minimum number of clusters for a given file system type */ -FatCluster +FatCluster _GL_ATTRIBUTE_CONST fat_min_cluster_count (FatType fat_type) { switch (fat_type) { case FAT_TYPE_FAT12: @@ -83,7 +83,7 @@ fat_min_cluster_count (FatType fat_type) { } /* returns the maximum number of clusters for a given file system type */ -FatCluster +FatCluster _GL_ATTRIBUTE_CONST fat_max_cluster_count (FatType fat_type) { switch (fat_type) { case FAT_TYPE_FAT12: return 0xff0; @@ -94,7 +94,7 @@ fat_max_cluster_count (FatType fat_type) { } /* what is this supposed to be? What drugs are M$ on? (Can I have some? :-) */ -PedSector +PedSector _GL_ATTRIBUTE_CONST fat_min_reserved_sector_count (FatType fat_type) { return (fat_type == FAT_TYPE_FAT32) ? 32 : 1; @@ -314,7 +314,7 @@ fat_calc_resize_sizes ( friends, to allow room for this space. If too much of this space is left over, everyone will complain, so we have to be greedy, and use it all up... */ -PedSector +PedSector _GL_ATTRIBUTE_PURE fat_calc_align_sectors (const PedFileSystem* new_fs, const PedFileSystem* old_fs) { @@ -359,7 +359,7 @@ fat_calc_align_sectors (const PedFileSystem* new_fs, return align; } -int +int _GL_ATTRIBUTE_PURE fat_is_sector_in_clusters (const PedFileSystem* fs, PedSector sector) { FatSpecific* fs_info = FAT_SPECIFIC (fs); @@ -369,7 +369,7 @@ fat_is_sector_in_clusters (const PedFileSystem* fs, PedSector sector) + fs_info->cluster_sectors * fs_info->cluster_count; } -FatFragment +FatFragment _GL_ATTRIBUTE_PURE fat_cluster_to_frag (const PedFileSystem* fs, FatCluster cluster) { FatSpecific* fs_info = FAT_SPECIFIC (fs); @@ -379,7 +379,7 @@ fat_cluster_to_frag (const PedFileSystem* fs, FatCluster cluster) return (cluster - 2) * fs_info->cluster_frags; } -FatCluster +FatCluster _GL_ATTRIBUTE_PURE fat_frag_to_cluster (const PedFileSystem* fs, FatFragment frag) { FatSpecific* fs_info = FAT_SPECIFIC (fs); @@ -389,7 +389,7 @@ fat_frag_to_cluster (const PedFileSystem* fs, FatFragment frag) return frag / fs_info->cluster_frags + 2; } -PedSector +PedSector _GL_ATTRIBUTE_PURE fat_frag_to_sector (const PedFileSystem* fs, FatFragment frag) { FatSpecific* fs_info = FAT_SPECIFIC (fs); @@ -399,7 +399,7 @@ fat_frag_to_sector (const PedFileSystem* fs, FatFragment frag) return frag * fs_info->frag_sectors + fs_info->cluster_offset; } -FatFragment +FatFragment _GL_ATTRIBUTE_PURE fat_sector_to_frag (const PedFileSystem* fs, PedSector sector) { FatSpecific* fs_info = FAT_SPECIFIC (fs); @@ -409,7 +409,7 @@ fat_sector_to_frag (const PedFileSystem* fs, PedSector sector) return (sector - fs_info->cluster_offset) / fs_info->frag_sectors; } -PedSector +PedSector _GL_ATTRIBUTE_PURE fat_cluster_to_sector (const PedFileSystem* fs, FatCluster cluster) { FatSpecific* fs_info = FAT_SPECIFIC (fs); @@ -420,7 +420,7 @@ fat_cluster_to_sector (const PedFileSystem* fs, FatCluster cluster) + fs_info->cluster_offset; } -FatCluster +FatCluster _GL_ATTRIBUTE_PURE fat_sector_to_cluster (const PedFileSystem* fs, PedSector sector) { FatSpecific* fs_info = FAT_SPECIFIC (fs); diff --git a/libparted/fs/r/fat/calc.h b/libparted/fs/r/fat/calc.h index 4c53193..2c0394f 100644 --- a/libparted/fs/r/fat/calc.h +++ b/libparted/fs/r/fat/calc.h @@ -1,7 +1,7 @@ /* libparted - Copyright (C) 1998-2000, 2007, 2009-2014, 2019 Free Software Foundation, - Inc. + Copyright (C) 1998-2000, 2007, 2009-2014, 2019-2021 Free Software + Foundation, Inc. This 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/r/fat/clstdup.c b/libparted/fs/r/fat/clstdup.c index 7456f60..c22de4d 100644 --- a/libparted/fs/r/fat/clstdup.c +++ b/libparted/fs/r/fat/clstdup.c @@ -1,7 +1,7 @@ /* libparted - Copyright (C) 1998-2001, 2007, 2009-2014, 2019 Free Software Foundation, - Inc. + Copyright (C) 1998-2001, 2007, 2009-2014, 2019-2021 Free Software + Foundation, Inc. This program is free software; you can redistribute it and/or modify it under the terms of the GNU General Public License as published by @@ -126,7 +126,7 @@ fetch_fragments (FatOpContext* ctx) /* finds the first fragment that is not going to get overwritten (that needs to get read in) */ -static FatFragment +static FatFragment _GL_ATTRIBUTE_PURE get_first_underlay (const FatOpContext* ctx, int first, int last) { int old; @@ -147,7 +147,7 @@ get_first_underlay (const FatOpContext* ctx, int first, int last) /* finds the last fragment that is not going to get overwritten (that needs to get read in) */ -static FatFragment +static FatFragment _GL_ATTRIBUTE_PURE get_last_underlay (const FatOpContext* ctx, int first, int last) { int old; diff --git a/libparted/fs/r/fat/clstdup.h b/libparted/fs/r/fat/clstdup.h index 5b5f63c..add8420 100644 --- a/libparted/fs/r/fat/clstdup.h +++ b/libparted/fs/r/fat/clstdup.h @@ -1,6 +1,7 @@ /* libparted - Copyright (C) 1999, 2007, 2009-2014, 2019 Free Software Foundation, Inc. + Copyright (C) 1999, 2007, 2009-2014, 2019-2021 Free Software Foundation, + Inc. This 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/r/fat/context.c b/libparted/fs/r/fat/context.c index 5c27d09..5ca154c 100644 --- a/libparted/fs/r/fat/context.c +++ b/libparted/fs/r/fat/context.c @@ -1,7 +1,7 @@ /* libparted - Copyright (C) 1998-2000, 2007, 2009-2014, 2019 Free Software Foundation, - Inc. + Copyright (C) 1998-2000, 2007, 2009-2014, 2019-2021 Free Software + Foundation, Inc. This program is free software; you can redistribute it and/or modify it under the terms of the GNU General Public License as published by @@ -124,7 +124,7 @@ fat_op_context_destroy (FatOpContext* ctx) free (ctx); } -FatFragment +FatFragment _GL_ATTRIBUTE_PURE fat_op_context_map_static_fragment (const FatOpContext* ctx, FatFragment frag) { FatSpecific* new_fs_info = FAT_SPECIFIC (ctx->new_fs); @@ -160,7 +160,7 @@ fat_op_context_map_static_cluster (const FatOpContext* ctx, FatCluster clst) return 0; } -FatFragment +FatFragment _GL_ATTRIBUTE_PURE fat_op_context_map_fragment (const FatOpContext* ctx, FatFragment frag) { return ctx->remap [frag]; diff --git a/libparted/fs/r/fat/context.h b/libparted/fs/r/fat/context.h index 8d0f6a5..ea6e62d 100644 --- a/libparted/fs/r/fat/context.h +++ b/libparted/fs/r/fat/context.h @@ -1,7 +1,7 @@ /* libparted - Copyright (C) 1999-2000, 2007, 2009-2014, 2019 Free Software Foundation, - Inc. + Copyright (C) 1999-2000, 2007, 2009-2014, 2019-2021 Free Software + Foundation, Inc. This 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/r/fat/count.c b/libparted/fs/r/fat/count.c index 250e80d..cdb3028 100644 --- a/libparted/fs/r/fat/count.c +++ b/libparted/fs/r/fat/count.c @@ -1,7 +1,7 @@ /* libparted - Copyright (C) 1998-2000, 2007, 2009-2014, 2019 Free Software Foundation, - Inc. + Copyright (C) 1998-2000, 2007, 2009-2014, 2019-2021 Free Software + Foundation, Inc. This program is free software; you can redistribute it and/or modify it under the terms of the GNU General Public License as published by @@ -27,66 +27,6 @@ #ifndef DISCOVER_ONLY -#if 0 -/* extremely ugly hack: stick everything that obviously isn't an unmovable file - * in here. Note: DAT is a bit dubious. Unfortunately, it's used by the - * registry, so it'll be all over the place :-( - */ -static char* movable_extensions[] = { - "", - "1ST", - "AVI", - "BAK", "BAT", "BMP", - "CFG", "COM", "CSS", - "DAT", "DLL", "DOC", "DRV", - "EXE", - "FAQ", "FLT", "FON", - "GID", "GIF", - "HLP", "HTT", "HTM", - "ICO", "INI", - "JPG", - "LNK", "LOG", - "KBD", - "ME", "MID", "MSG", - "OCX", "OLD", - "PIF", "PNG", "PRV", - "RTF", - "SCR", "SYS", - "TMP", "TTF", "TXT", - "URL", - "WAV", - "VBX", "VOC", "VXD", - NULL -}; - -static char* -get_extension (char* file_name) -{ - char* ext; - - ext = strrchr (file_name, '.'); - if (!ext) - return ""; - if (strchr (ext, '\\')) - return ""; - return ext + 1; -} - -static int -is_movable_system_file (char* file_name) -{ - char* ext = get_extension (file_name); - int i; - - for (i = 0; movable_extensions [i]; i++) { - if (strcasecmp (ext, movable_extensions [i]) == 0) - return 1; - } - - return 0; -} -#endif /* 0 */ - /* prints out the sequence of clusters for a given file chain, beginning at start_cluster. @@ -248,29 +188,6 @@ flag_traverse_dir (FatTraverseInfo* trav_info) { print_chain (fs, first_cluster); #endif -#if 0 - if (fat_dir_entry_is_system_file (this_entry) - && !is_movable_system_file (file_name)) { - PedExceptionOption ex_status; - ex_status = ped_exception_throw ( - PED_EXCEPTION_WARNING, - PED_EXCEPTION_IGNORE_CANCEL, - _("The file %s is marked as a system file. " - "This means moving it could cause some " - "programs to stop working."), - file_name); - - switch (ex_status) { - case PED_EXCEPTION_CANCEL: - return 0; - - case PED_EXCEPTION_UNHANDLED: - ped_exception_catch (); - case PED_EXCEPTION_IGNORE: - } - } -#endif /* 0 */ - if (fat_dir_entry_is_directory (this_entry)) { if (!flag_traverse_fat (fs, file_name, first_cluster, FAT_FLAG_DIRECTORY, size)) @@ -338,7 +255,7 @@ fat_collect_cluster_info (PedFileSystem* fs) { return 1; } -FatClusterFlag +FatClusterFlag _GL_ATTRIBUTE_PURE fat_get_cluster_flag (PedFileSystem* fs, FatCluster cluster) { FatSpecific* fs_info = FAT_SPECIFIC (fs); @@ -346,7 +263,7 @@ fat_get_cluster_flag (PedFileSystem* fs, FatCluster cluster) return fs_info->cluster_info [cluster].flag; } -PedSector +PedSector _GL_ATTRIBUTE_PURE fat_get_cluster_usage (PedFileSystem* fs, FatCluster cluster) { FatSpecific* fs_info = FAT_SPECIFIC (fs); diff --git a/libparted/fs/r/fat/count.h b/libparted/fs/r/fat/count.h index aa07bac..dfa8914 100644 --- a/libparted/fs/r/fat/count.h +++ b/libparted/fs/r/fat/count.h @@ -1,6 +1,7 @@ /* libparted - Copyright (C) 1999-2000, 2007-2014, 2019 Free Software Foundation, Inc. + Copyright (C) 1999-2000, 2007-2014, 2019-2021 Free Software Foundation, + Inc. This 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/r/fat/fat.c b/libparted/fs/r/fat/fat.c index ad57d36..396494a 100644 --- a/libparted/fs/r/fat/fat.c +++ b/libparted/fs/r/fat/fat.c @@ -1,6 +1,7 @@ /* libparted - Copyright (C) 1998-2001, 2007-2014, 2019 Free Software Foundation, Inc. + Copyright (C) 1998-2001, 2007-2014, 2019-2021 Free Software Foundation, + Inc. This program is free software; you can redistribute it and/or modify it under the terms of the GNU General Public License as published by @@ -613,68 +614,6 @@ fat_get_resize_constraint (const PedFileSystem* fs) return fat_get_copy_constraint (fs, fs->geom->dev); } -/* FIXME: fat_calc_sizes() needs to say "too big" or "too small", or - * something. This is a really difficult (maths) problem to do - * nicely... - * So, this algorithm works if dev->length / 2 is a valid fat_type - * size. (Which is how I got the magic numbers below) - */ -#if 0 -/* returns: -1 too small, 0 ok, 1 too big */ -static int -_test_create_size (PedSector length, FatType fat_type, - PedSector cluster_sectors, PedSector cluster_count) -{ - PedSector rootdir_sectors; - PedSector _cluster_sectors; - FatCluster _cluster_count; - PedSector _fat_size; - - rootdir_sectors = (fat_type == FAT_TYPE_FAT16) ? 16 : 0; - - if (!fat_calc_sizes (length, 0, fat_type, rootdir_sectors, - &_cluster_sectors, &_cluster_count, &_fat_size)) - return -1; // XXX: doesn't work... can't see a better way! - - if (_cluster_sectors < cluster_sectors) - return -1; - if (_cluster_sectors > cluster_sectors) - return 1; - - if (_cluster_count < cluster_count) - return -1; - if (_cluster_count > cluster_count) - return 1; - - return 0; -} - -static PedSector -_get_create_size (PedSector upper_bound, FatType fat_type, - PedSector cluster_sectors, FatCluster cluster_count) -{ - PedSector min_length = 0; - PedSector max_length = upper_bound; - PedSector length; - - while (1) { - length = (min_length + max_length) / 2; - switch (_test_create_size (length, fat_type, cluster_sectors, - cluster_count)) { - case -1: min_length = length; break; - case 0: return length; - case 1: max_length = length; break; - } - /* hack... won't always be able to get max cluster count - * with max cluster size, etc. */ - if (max_length - min_length == 1) - return min_length; - } - - return 0; /* shut gcc up */ -} -#endif - PedConstraint* fat_get_create_constraint_fat16 (const PedDevice* dev) { @@ -685,19 +624,8 @@ fat_get_create_constraint_fat16 (const PedDevice* dev) if (!ped_geometry_init (&full_dev, dev, 0, dev->length - 1)) return NULL; -#if 0 - min_size = _get_create_size (dev->length, FAT_TYPE_FAT16, - fat_min_cluster_size (FAT_TYPE_FAT16), - fat_min_cluster_count (FAT_TYPE_FAT16)); - max_size = _get_create_size (dev->length, FAT_TYPE_FAT16, - fat_max_cluster_size (FAT_TYPE_FAT16), - fat_max_cluster_count (FAT_TYPE_FAT16)); - if (!min_size) - return NULL; -#else min_size = 65794; max_size = 2097153; -#endif return ped_constraint_new ( ped_alignment_any, ped_alignment_any, @@ -714,15 +642,7 @@ fat_get_create_constraint_fat32 (const PedDevice* dev) if (!ped_geometry_init (&full_dev, dev, 0, dev->length - 1)) return NULL; -#if 0 - min_size = _get_create_size (dev->length, FAT_TYPE_FAT32, - fat_min_cluster_size (FAT_TYPE_FAT32), - fat_min_cluster_count (FAT_TYPE_FAT32)); - if (!min_size) - return NULL; -#else min_size = 525224; -#endif return ped_constraint_new ( ped_alignment_any, ped_alignment_any, @@ -730,97 +650,3 @@ fat_get_create_constraint_fat32 (const PedDevice* dev) min_size, dev->length); } #endif /* !DISCOVER_ONLY */ - -#if 0 - -static PedFileSystemOps fat16_ops = { - probe: fat_probe_fat16, -#ifndef DISCOVER_ONLY - clobber: fat_clobber, - open: fat_open, - create: fat_create_fat16, - close: fat_close, - check: fat_check, - resize: fat_resize, - copy: fat_copy, - get_create_constraint: fat_get_create_constraint_fat16, - get_resize_constraint: fat_get_resize_constraint, - get_copy_constraint: fat_get_copy_constraint, -#else /* !DISCOVER_ONLY */ - clobber: NULL, - open: NULL, - create: NULL, - close: NULL, - check: NULL, - resize: NULL, - copy: NULL, - get_create_constraint: NULL, - get_resize_constraint: NULL, - get_copy_constraint: NULL, -#endif /* !DISCOVER_ONLY */ -}; - -static PedFileSystemOps fat32_ops = { - probe: fat_probe_fat32, -#ifndef DISCOVER_ONLY - clobber: fat_clobber, - open: fat_open, - create: fat_create_fat32, - close: fat_close, - check: fat_check, - resize: fat_resize, - copy: fat_copy, - get_create_constraint: fat_get_create_constraint_fat32, - get_resize_constraint: fat_get_resize_constraint, - get_copy_constraint: fat_get_copy_constraint, -#else /* !DISCOVER_ONLY */ - clobber: NULL, - open: NULL, - create: NULL, - close: NULL, - check: NULL, - resize: NULL, - copy: NULL, - get_create_constraint: NULL, - get_resize_constraint: NULL, - get_copy_constraint: NULL, -#endif /* !DISCOVER_ONLY */ -}; - -#define FAT_BLOCK_SIZES ((int[2]){512, 0}) - -PedFileSystemType fat16_type = { - next: NULL, - ops: &fat16_ops, - name: "fat16", - block_sizes: FAT_BLOCK_SIZES -}; - -PedFileSystemType fat32_type = { - next: NULL, - ops: &fat32_ops, - name: "fat32", - block_sizes: FAT_BLOCK_SIZES -}; - -void -ped_file_system_fat_init () -{ - if (sizeof (FatBootSector) != 512) { - ped_exception_throw (PED_EXCEPTION_BUG, PED_EXCEPTION_CANCEL, - _("GNU Parted was miscompiled: the FAT boot sector " - "should be 512 bytes. FAT support will be disabled.")); - } else { - ped_file_system_type_register (&fat16_type); - ped_file_system_type_register (&fat32_type); - } -} - -void -ped_file_system_fat_done () -{ - ped_file_system_type_unregister (&fat16_type); - ped_file_system_type_unregister (&fat32_type); -} - -#endif diff --git a/libparted/fs/r/fat/fat.h b/libparted/fs/r/fat/fat.h index efa1652..0e36ae4 100644 --- a/libparted/fs/r/fat/fat.h +++ b/libparted/fs/r/fat/fat.h @@ -1,7 +1,7 @@ /* libparted - Copyright (C) 1998-2001, 2007, 2009-2014, 2019 Free Software Foundation, - Inc. + Copyright (C) 1998-2001, 2007, 2009-2014, 2019-2021 Free Software + Foundation, Inc. This 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/r/fat/fatio.c b/libparted/fs/r/fat/fatio.c index 54d150e..af8dddf 100644 --- a/libparted/fs/r/fat/fatio.c +++ b/libparted/fs/r/fat/fatio.c @@ -1,7 +1,7 @@ /* libparted - Copyright (C) 1998-2000, 2007, 2009-2014, 2019 Free Software Foundation, - Inc. + Copyright (C) 1998-2000, 2007, 2009-2014, 2019-2021 Free Software + Foundation, Inc. This 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/r/fat/fatio.h b/libparted/fs/r/fat/fatio.h index 1302ce3..5b1f3b1 100644 --- a/libparted/fs/r/fat/fatio.h +++ b/libparted/fs/r/fat/fatio.h @@ -1,7 +1,7 @@ /* libparted - Copyright (C) 1998-2000, 2007, 2009-2014, 2019 Free Software Foundation, - Inc. + Copyright (C) 1998-2000, 2007, 2009-2014, 2019-2021 Free Software + Foundation, Inc. This 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/r/fat/resize.c b/libparted/fs/r/fat/resize.c index 71113d4..00f5c8c 100644 --- a/libparted/fs/r/fat/resize.c +++ b/libparted/fs/r/fat/resize.c @@ -1,6 +1,7 @@ /* libparted - Copyright (C) 1998-2000, 2007-2014, 2019 Free Software Foundation, Inc. + Copyright (C) 1998-2000, 2007-2014, 2019-2021 Free Software Foundation, + Inc. This program is free software; you can redistribute it and/or modify it under the terms of the GNU General Public License as published by @@ -446,23 +447,6 @@ fat_construct_new_fat (FatOpContext* ctx) fat_table_set (new_fs_info->fat, new_cluster, new_next_cluster); } -#if 0 -#ifdef PED_VERBOSE - for (old_cluster=2; old_cluster < old_fs_info->cluster_count+2; - old_cluster++) { - if (fat_table_is_available (old_fs_info->fat, old_cluster)) - continue; - - printf ("%d->%d\t(next: %d->%d)\n", - old_cluster, - ctx->remap [old_cluster], - fat_table_get (old_fs_info->fat, old_cluster), - fat_table_get (new_fs_info->fat, - ctx->remap [old_cluster])); - } -#endif /* PED_VERBOSE */ -#endif - if (old_fs_info->fat_type == FAT_TYPE_FAT32 && new_fs_info->fat_type == FAT_TYPE_FAT32) { new_fs_info->root_cluster diff --git a/libparted/fs/r/fat/table.c b/libparted/fs/r/fat/table.c index fe8e040..e18a9a2 100644 --- a/libparted/fs/r/fat/table.c +++ b/libparted/fs/r/fat/table.c @@ -1,6 +1,7 @@ /* libparted - Copyright (C) 1998-2000, 2007-2014, 2019 Free Software Foundation, Inc. + Copyright (C) 1998-2000, 2007-2014, 2019-2021 Free Software Foundation, + Inc. This program is free software; you can redistribute it and/or modify it under the terms of the GNU General Public License as published by @@ -371,7 +372,7 @@ fat_table_is_bad (const FatTable* ft, FatCluster cluster) /* returns true if represents an EOF marker */ -int +int _GL_ATTRIBUTE_PURE fat_table_is_eof (const FatTable* ft, FatCluster cluster) { return _test_code_eof (ft, cluster); @@ -462,7 +463,7 @@ fat_table_set_avail (FatTable* ft, FatCluster cluster) #endif /* !DISCOVER_ONLY */ -int +int _GL_ATTRIBUTE_CONST fat_table_entry_size (FatType fat_type) { switch (fat_type) { diff --git a/libparted/fs/r/fat/table.h b/libparted/fs/r/fat/table.h index 2527d9a..6e9bc84 100644 --- a/libparted/fs/r/fat/table.h +++ b/libparted/fs/r/fat/table.h @@ -1,7 +1,7 @@ /* libparted - Copyright (C) 1998-2000, 2007, 2009-2014, 2019 Free Software Foundation, - Inc. + Copyright (C) 1998-2000, 2007, 2009-2014, 2019-2021 Free Software + Foundation, Inc. This 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/r/fat/traverse.c b/libparted/fs/r/fat/traverse.c index fc8a795..bd4d45b 100644 --- a/libparted/fs/r/fat/traverse.c +++ b/libparted/fs/r/fat/traverse.c @@ -1,7 +1,7 @@ /* libparted - Copyright (C) 1998-2000, 2005, 2007-2014, 2019 Free Software Foundation, - Inc. + Copyright (C) 1998-2000, 2005, 2007-2014, 2019-2021 Free Software + Foundation, Inc. This program is free software; you can redistribute it and/or modify it under the terms of the GNU General Public License as published by @@ -31,7 +31,7 @@ static char tmp_buffer [4096]; -int +int _GL_ATTRIBUTE_PURE fat_traverse_entries_per_buffer (FatTraverseInfo* trav_info) { return trav_info->buffer_size / sizeof (FatDirEntry); @@ -226,7 +226,7 @@ fat_traverse_next_dir_entry (FatTraverseInfo *trav_info) return trav_info->dir_entries + trav_info->current_entry; } -FatCluster +FatCluster _GL_ATTRIBUTE_PURE fat_dir_entry_get_first_cluster (FatDirEntry* dir_entry, PedFileSystem *fs) { FatSpecific* fs_info = FAT_SPECIFIC (fs); @@ -269,7 +269,7 @@ fat_dir_entry_set_first_cluster (FatDirEntry* dir_entry, PedFileSystem* fs, } } -uint32_t +uint32_t _GL_ATTRIBUTE_PURE fat_dir_entry_get_length (FatDirEntry* dir_entry) { return PED_LE32_TO_CPU (dir_entry->length); @@ -284,7 +284,7 @@ fat_dir_entry_is_null_term (const FatDirEntry* dir_entry) return memcmp (&null_entry, dir_entry, sizeof (null_entry)) == 0; } -int +int _GL_ATTRIBUTE_PURE fat_dir_entry_is_active (FatDirEntry* dir_entry) { if ((unsigned char) dir_entry->name[0] == DELETED_FLAG) return 0; @@ -293,7 +293,7 @@ fat_dir_entry_is_active (FatDirEntry* dir_entry) return 1; } -int +int _GL_ATTRIBUTE_PURE fat_dir_entry_is_file (FatDirEntry* dir_entry) { if (dir_entry->attributes == VFAT_ATTR) return 0; if (dir_entry->attributes & VOLUME_LABEL_ATTR) return 0; @@ -302,7 +302,7 @@ fat_dir_entry_is_file (FatDirEntry* dir_entry) { return 1; } -int +int _GL_ATTRIBUTE_PURE fat_dir_entry_is_system_file (FatDirEntry* dir_entry) { if (!fat_dir_entry_is_file (dir_entry)) return 0; @@ -310,7 +310,7 @@ fat_dir_entry_is_system_file (FatDirEntry* dir_entry) || (dir_entry->attributes & HIDDEN_ATTR); } -int +int _GL_ATTRIBUTE_PURE fat_dir_entry_is_directory (FatDirEntry* dir_entry) { if (dir_entry->attributes == VFAT_ATTR) return 0; diff --git a/libparted/fs/r/fat/traverse.h b/libparted/fs/r/fat/traverse.h index f2fc2d8..ef811d7 100644 --- a/libparted/fs/r/fat/traverse.h +++ b/libparted/fs/r/fat/traverse.h @@ -1,6 +1,7 @@ /* libparted - Copyright (C) 1998-2000, 2007-2014, 2019 Free Software Foundation, Inc. + Copyright (C) 1998-2000, 2007-2014, 2019-2021 Free Software Foundation, + Inc. This 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/r/filesys.c b/libparted/fs/r/filesys.c index d57447c..9b64393 100644 --- a/libparted/fs/r/filesys.c +++ b/libparted/fs/r/filesys.c @@ -1,5 +1,6 @@ /* libparted - a library for manipulating disk partitions - Copyright (C) 1999-2001, 2007-2014, 2019 Free Software Foundation, Inc. + Copyright (C) 1999-2001, 2007-2014, 2019-2021 Free Software Foundation, + Inc. This program is free software; you can redistribute it and/or modify it under the terms of the GNU General Public License as published by @@ -213,8 +214,6 @@ error_close_dev: * file system occupies a given region described by \p geom. * After this operation ped_file_system_probe() won't detect any file system. * - * \note ped_file_system_create() calls this before creating a new file system. - * * \return \c 1 on success, \c 0 on failure */ static int diff --git a/libparted/fs/r/hfs/advfs.c b/libparted/fs/r/hfs/advfs.c index d0afa30..51f3093 100644 --- a/libparted/fs/r/hfs/advfs.c +++ b/libparted/fs/r/hfs/advfs.c @@ -1,7 +1,7 @@ /* libparted - a library for manipulating disk partitions - Copyright (C) 2004-2005, 2007, 2009-2014, 2019 Free Software Foundation, - Inc. + Copyright (C) 2004-2005, 2007, 2009-2014, 2019-2021 Free Software + Foundation, Inc. This program is free software; you can redistribute it and/or modify it under the terms of the GNU General Public License as published by @@ -87,12 +87,14 @@ hfs_btree_search (HfsPrivateFile* b_tree_file, HfsPrivateGenericKey* key, HfsPrivateGenericKey* record_key = NULL; unsigned int node_number, record_number; int i; + uint16_t record_pos; /* Read the header node */ if (!hfs_file_read_sector(b_tree_file, node, 0)) return 0; - header = ((HfsHeaderRecord*) (node + PED_BE16_TO_CPU(*((uint16_t *) - (node+(PED_SECTOR_SIZE_DEFAULT-2)))))); + uint16_t offset; + memcpy(&offset, node+(PED_SECTOR_SIZE_DEFAULT-2), sizeof(uint16_t)); + header = (HfsHeaderRecord*) (node + PED_BE16_TO_CPU(offset)); /* Get the node number of the root */ node_number = PED_BE32_TO_CPU(header->root_node); @@ -107,13 +109,13 @@ hfs_btree_search (HfsPrivateFile* b_tree_file, HfsPrivateGenericKey* key, while (1) { record_number = PED_BE16_TO_CPU (desc->rec_nb); for (i = record_number; i; i--) { - record_key = (HfsPrivateGenericKey*) - (node + PED_BE16_TO_CPU(*((uint16_t *) - (node+(PED_SECTOR_SIZE_DEFAULT - 2*i))))); + uint16_t value; + memcpy(&value, node+(PED_SECTOR_SIZE_DEFAULT - (2*i)), sizeof(uint16_t)); + record_pos = PED_BE16_TO_CPU(value); + record_key = (HfsPrivateGenericKey*) (node + record_pos); /* check for obvious error in FS */ - if (((uint8_t*)record_key - node < HFS_FIRST_REC) - || ((uint8_t*)record_key - node - >= PED_SECTOR_SIZE_DEFAULT + if ((record_pos< HFS_FIRST_REC) + || (record_pos>= PED_SECTOR_SIZE_DEFAULT - 2 * (signed)(record_number+1))) { ped_exception_throw ( PED_EXCEPTION_ERROR, @@ -129,8 +131,9 @@ hfs_btree_search (HfsPrivateFile* b_tree_file, HfsPrivateGenericKey* key, unsigned int skip; skip = (1 + record_key->key_length + 1) & ~1; - node_number = PED_BE32_TO_CPU (*((uint32_t *) - (((uint8_t *) record_key) + skip))); + uint32_t value; + memcpy(&value, node+record_pos+skip, sizeof(uint32_t)); + node_number = PED_BE32_TO_CPU(value); if (!hfs_file_read_sector(b_tree_file, node, node_number)) return 0; @@ -146,7 +149,7 @@ hfs_btree_search (HfsPrivateFile* b_tree_file, HfsPrivateGenericKey* key, if (record_ref) { record_ref->node_size = 1; /* in sectors */ record_ref->node_number = node_number; - record_ref->record_pos = (uint8_t*)record_key - node; + record_ref->record_pos = record_pos; record_ref->record_number = i; } @@ -239,7 +242,7 @@ errbb: hfs_free_bad_blocks_list(priv_data->bad_blocks_xtent_list); } /* This function check if fblock is a bad block */ -int +int _GL_ATTRIBUTE_PURE hfs_is_bad_block (const PedFileSystem *fs, unsigned int fblock) { HfsPrivateFSData* priv_data = (HfsPrivateFSData*) @@ -304,7 +307,7 @@ hfs_get_empty_end (const PedFileSystem *fs) /* return the block which should be used to pack data to have at least free fblock blocks at the end of the volume */ -unsigned int +unsigned int _GL_ATTRIBUTE_PURE hfs_find_start_pack (const PedFileSystem *fs, unsigned int fblock) { HfsPrivateFSData* priv_data = (HfsPrivateFSData*) diff --git a/libparted/fs/r/hfs/advfs.h b/libparted/fs/r/hfs/advfs.h index b7ec4bc..b0cc3c2 100644 --- a/libparted/fs/r/hfs/advfs.h +++ b/libparted/fs/r/hfs/advfs.h @@ -1,6 +1,7 @@ /* libparted - a library for manipulating disk partitions - Copyright (C) 2004, 2007, 2009-2014, 2019 Free Software Foundation, Inc. + Copyright (C) 2004, 2007, 2009-2014, 2019-2021 Free Software Foundation, + Inc. This 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/r/hfs/advfs_plus.c b/libparted/fs/r/hfs/advfs_plus.c index 5453c25..55e88cd 100644 --- a/libparted/fs/r/hfs/advfs_plus.c +++ b/libparted/fs/r/hfs/advfs_plus.c @@ -1,7 +1,7 @@ /* libparted - a library for manipulating disk partitions - Copyright (C) 2004-2005, 2007, 2009-2014, 2019 Free Software Foundation, - Inc. + Copyright (C) 2004-2005, 2007, 2009-2014, 2019-2021 Free Software + Foundation, Inc. This program is free software; you can redistribute it and/or modify it under the terms of the GNU General Public License as published by @@ -80,6 +80,7 @@ hfsplus_btree_search (HfsPPrivateFile* b_tree_file, HfsPPrivateGenericKey* key, HfsPPrivateGenericKey* record_key = NULL; unsigned int node_number, record_number, size, bsize; int i; + uint16_t record_pos; /* Read the header node */ if (!hfsplus_file_read_sector(b_tree_file, node_1, 0)) @@ -93,7 +94,7 @@ hfsplus_btree_search (HfsPPrivateFile* b_tree_file, HfsPPrivateGenericKey* key, /* Get the size of a node in sectors and allocate buffer */ size = (bsize = PED_BE16_TO_CPU (header->node_size)) / PED_SECTOR_SIZE_DEFAULT; - node = (uint8_t*) ped_malloc (bsize); + node = ped_malloc (bsize); if (!node) return 0; HfsPNodeDescriptor *desc = (HfsPNodeDescriptor*) node; @@ -107,13 +108,13 @@ hfsplus_btree_search (HfsPPrivateFile* b_tree_file, HfsPPrivateGenericKey* key, while (1) { record_number = PED_BE16_TO_CPU (desc->rec_nb); for (i = record_number; i; i--) { - record_key = (HfsPPrivateGenericKey*) - (node + PED_BE16_TO_CPU(*((uint16_t *) - (node+(bsize - 2*i))))); + uint16_t value; + memcpy(&value, node+(bsize - (2*i)), sizeof(uint16_t)); + record_pos = PED_BE16_TO_CPU(value); + record_key = (HfsPPrivateGenericKey*) (node + record_pos); /* check for obvious error in FS */ - if (((uint8_t*)record_key - node < HFS_FIRST_REC) - || ((uint8_t*)record_key - node - >= (signed)bsize + if ((record_pos < HFS_FIRST_REC) + || (record_pos >= (signed)bsize - 2 * (signed)(record_number+1))) { ped_exception_throw ( PED_EXCEPTION_ERROR, @@ -131,8 +132,9 @@ hfsplus_btree_search (HfsPPrivateFile* b_tree_file, HfsPPrivateGenericKey* key, skip = ( 2 + PED_BE16_TO_CPU (record_key->key_length) + 1 ) & ~1; - node_number = PED_BE32_TO_CPU (*((uint32_t *) - (((uint8_t *) record_key) + skip))); + uint32_t value; + memcpy(&value, node+record_pos+skip, sizeof(uint32_t)); + node_number = PED_BE32_TO_CPU(value); if (!hfsplus_file_read(b_tree_file, node, (PedSector) node_number * size, size)) { @@ -151,7 +153,7 @@ hfsplus_btree_search (HfsPPrivateFile* b_tree_file, HfsPPrivateGenericKey* key, if (record_ref) { record_ref->node_size = size; /* in sectors */ record_ref->node_number = node_number; - record_ref->record_pos = (uint8_t*)record_key - node; + record_ref->record_pos = record_pos; record_ref->record_number = i; } @@ -247,7 +249,7 @@ errbbp: hfsplus_free_bad_blocks_list(priv_data->bad_blocks_xtent_list); } /* This function check if fblock is a bad block */ -int +int _GL_ATTRIBUTE_PURE hfsplus_is_bad_block (const PedFileSystem *fs, unsigned int fblock) { HfsPPrivateFSData* priv_data = (HfsPPrivateFSData*) @@ -358,7 +360,7 @@ hfsplus_get_min_size (const PedFileSystem *fs) /* return the block which should be used to pack data to have at least free fblock blocks at the end of the volume */ -unsigned int +unsigned int _GL_ATTRIBUTE_PURE hfsplus_find_start_pack (const PedFileSystem *fs, unsigned int fblock) { HfsPPrivateFSData* priv_data = (HfsPPrivateFSData*) diff --git a/libparted/fs/r/hfs/advfs_plus.h b/libparted/fs/r/hfs/advfs_plus.h index ae5982d..9e4e796 100644 --- a/libparted/fs/r/hfs/advfs_plus.h +++ b/libparted/fs/r/hfs/advfs_plus.h @@ -1,6 +1,7 @@ /* libparted - a library for manipulating disk partitions - Copyright (C) 2004, 2007, 2009-2014, 2019 Free Software Foundation, Inc. + Copyright (C) 2004, 2007, 2009-2014, 2019-2021 Free Software Foundation, + Inc. This 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/r/hfs/cache.c b/libparted/fs/r/hfs/cache.c index 5e5b071..b2ba812 100644 --- a/libparted/fs/r/hfs/cache.c +++ b/libparted/fs/r/hfs/cache.c @@ -1,7 +1,7 @@ /* libparted - a library for manipulating disk partitions - Copyright (C) 2004-2005, 2007, 2009-2014, 2019 Free Software Foundation, - Inc. + Copyright (C) 2004-2005, 2007, 2009-2014, 2019-2021 Free Software + Foundation, Inc. This program is free software; you can redistribute it and/or modify it under the terms of the GNU General Public License as published by @@ -173,7 +173,7 @@ hfsc_cache_add_extent(HfsCPrivateCache* cache, uint32_t start, uint32_t length, return ext; } -HfsCPrivateExtent* +HfsCPrivateExtent* _GL_ATTRIBUTE_PURE hfsc_cache_search_extent(HfsCPrivateCache* cache, uint32_t start) { HfsCPrivateExtent* ret; diff --git a/libparted/fs/r/hfs/cache.h b/libparted/fs/r/hfs/cache.h index 98f6155..141d096 100644 --- a/libparted/fs/r/hfs/cache.h +++ b/libparted/fs/r/hfs/cache.h @@ -1,7 +1,7 @@ /* libparted - a library for manipulating disk partitions - Copyright (C) 2004-2005, 2007, 2009-2014, 2019 Free Software Foundation, - Inc. + Copyright (C) 2004-2005, 2007, 2009-2014, 2019-2021 Free Software + Foundation, Inc. This 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/r/hfs/file.c b/libparted/fs/r/hfs/file.c index fa8f0ff..d6cdb89 100644 --- a/libparted/fs/r/hfs/file.c +++ b/libparted/fs/r/hfs/file.c @@ -1,7 +1,7 @@ /* libparted - a library for manipulating disk partitions - Copyright (C) 2004-2005, 2007, 2009-2014, 2019 Free Software Foundation, - Inc. + Copyright (C) 2004-2005, 2007, 2009-2014, 2019-2021 Free Software + Foundation, Inc. This 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/r/hfs/file.h b/libparted/fs/r/hfs/file.h index 12e1c6b..a58377f 100644 --- a/libparted/fs/r/hfs/file.h +++ b/libparted/fs/r/hfs/file.h @@ -1,6 +1,7 @@ /* libparted - a library for manipulating disk partitions - Copyright (C) 2004, 2007, 2009-2014, 2019 Free Software Foundation, Inc. + Copyright (C) 2004, 2007, 2009-2014, 2019-2021 Free Software Foundation, + Inc. This 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/r/hfs/file_plus.c b/libparted/fs/r/hfs/file_plus.c index 95c5643..e2426b3 100644 --- a/libparted/fs/r/hfs/file_plus.c +++ b/libparted/fs/r/hfs/file_plus.c @@ -1,7 +1,7 @@ /* libparted - a library for manipulating disk partitions - Copyright (C) 2004-2005, 2007, 2009-2014, 2019 Free Software Foundation, - Inc. + Copyright (C) 2004-2005, 2007, 2009-2014, 2019-2021 Free Software + Foundation, Inc. This 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/r/hfs/file_plus.h b/libparted/fs/r/hfs/file_plus.h index 685920d..5e5aa41 100644 --- a/libparted/fs/r/hfs/file_plus.h +++ b/libparted/fs/r/hfs/file_plus.h @@ -1,6 +1,7 @@ /* libparted - a library for manipulating disk partitions - Copyright (C) 2004, 2007, 2009-2014, 2019 Free Software Foundation, Inc. + Copyright (C) 2004, 2007, 2009-2014, 2019-2021 Free Software Foundation, + Inc. This 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/r/hfs/hfs.c b/libparted/fs/r/hfs/hfs.c index 6be0390..278710e 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 Free Software + Copyright (C) 2000, 2003-2005, 2007, 2009-2014, 2019-2021 Free Software Foundation, Inc. This program is free software; you can redistribute it and/or modify @@ -59,26 +59,6 @@ static PedFileSystemType hfsplus_type; /* ----- HFS ----- */ -/* This is a very unundoable operation */ -/* Maybe I shouldn't touch the alternate MDB ? */ -/* Anyway clobber is call before other fs creation */ -/* So this is a non-issue */ -static int -hfs_clobber (PedGeometry* geom) -{ - uint8_t buf[PED_SECTOR_SIZE_DEFAULT]; - - memset (buf, 0, PED_SECTOR_SIZE_DEFAULT); - - /* destroy boot blocks, mdb, alternate mdb ... */ - return (!!ped_geometry_write (geom, buf, 0, 1)) & - (!!ped_geometry_write (geom, buf, 1, 1)) & - (!!ped_geometry_write (geom, buf, 2, 1)) & - (!!ped_geometry_write (geom, buf, geom->length - 2, 1)) & - (!!ped_geometry_write (geom, buf, geom->length - 1, 1)) & - (!!ped_geometry_sync (geom)); -} - PedFileSystem * hfs_open (PedGeometry* geom) { @@ -339,42 +319,6 @@ hfs_resize (PedFileSystem* fs, PedGeometry* geom, PedTimer* timer) #include "reloc_plus.h" #include "journal.h" -static int -hfsplus_clobber (PedGeometry* geom) -{ - unsigned int i = 1; - uint8_t buf[PED_SECTOR_SIZE_DEFAULT]; - HfsMasterDirectoryBlock *mdb; - - mdb = (HfsMasterDirectoryBlock *) buf; - - if (!ped_geometry_read (geom, buf, 2, 1)) - return 0; - - if (PED_BE16_TO_CPU (mdb->signature) == HFS_SIGNATURE) { - /* embedded hfs+ */ - PedGeometry *embedded; - - i = PED_BE32_TO_CPU(mdb->block_size) / PED_SECTOR_SIZE_DEFAULT; - embedded = ped_geometry_new ( - geom->dev, - (PedSector) geom->start - + PED_BE16_TO_CPU (mdb->start_block) - + (PedSector) PED_BE16_TO_CPU ( - mdb->old_new.embedded.location.start_block ) * i, - (PedSector) PED_BE16_TO_CPU ( - mdb->old_new.embedded.location.block_count ) * i ); - if (!embedded) i = 0; - else { - i = hfs_clobber (embedded); - ped_geometry_destroy (embedded); - } - } - - /* non-embedded or envelop destroy as hfs */ - return ( hfs_clobber (geom) && i ); -} - int hfsplus_close (PedFileSystem *fs) { @@ -887,12 +831,11 @@ hfsplus_wrapper_update (PedFileSystem* fs) ref.record_number = 1; } - ref.record_pos = - PED_BE16_TO_CPU (*((uint16_t *) - (node + (PED_SECTOR_SIZE_DEFAULT - - 2*ref.record_number)))); + uint16_t value; + memcpy(&value, node+PED_SECTOR_SIZE_DEFAULT - (2*ref.record_number), sizeof(uint16_t)); + ref.record_pos = PED_BE16_TO_CPU(value); ret_key = (HfsExtentKey*) (node + ref.record_pos); - ret_data = (HfsExtDescriptor*) ( node + ref.record_pos + ret_data = (HfsExtDescriptor*) (node + ref.record_pos + sizeof (HfsExtentKey) ); } @@ -1221,137 +1164,3 @@ hfsplus_extract (PedFileSystem* fs, PedTimer* timer) #endif /* HFS_EXTRACT_FS */ #endif /* !DISCOVER_ONLY */ - -#if 0 -static PedFileSystemOps hfs_ops = { - probe: hfs_probe, -#ifndef DISCOVER_ONLY - clobber: hfs_clobber, - open: hfs_open, - create: NULL, - close: hfs_close, -#ifndef HFS_EXTRACT_FS - check: NULL, -#else - check: hfs_extract, -#endif - copy: NULL, - resize: hfs_resize, - get_create_constraint: NULL, - get_resize_constraint: hfs_get_resize_constraint, - get_copy_constraint: NULL, -#else /* DISCOVER_ONLY */ - clobber: NULL, - open: NULL, - create: NULL, - close: NULL, - check: NULL, - copy: NULL, - resize: NULL, - get_create_constraint: NULL, - get_resize_constraint: NULL, - get_copy_constraint: NULL, -#endif /* DISCOVER_ONLY */ -}; - -static PedFileSystemOps hfsplus_ops = { - probe: hfsplus_probe, -#ifndef DISCOVER_ONLY - clobber: hfsplus_clobber, - open: hfsplus_open, - create: NULL, - close: hfsplus_close, -#ifndef HFS_EXTRACT_FS - check: NULL, -#else - check: hfsplus_extract, -#endif - copy: NULL, - resize: hfsplus_resize, - get_create_constraint: NULL, - get_resize_constraint: hfsplus_get_resize_constraint, - get_copy_constraint: NULL, -#else /* DISCOVER_ONLY */ - clobber: NULL, - open: NULL, - create: NULL, - close: NULL, - check: NULL, - copy: NULL, - resize: NULL, - get_create_constraint: NULL, - get_resize_constraint: NULL, - get_copy_constraint: NULL, -#endif /* DISCOVER_ONLY */ -}; - -static PedFileSystemOps hfsx_ops = { - probe: hfsx_probe, -#ifndef DISCOVER_ONLY - clobber: hfs_clobber, /* NOT hfsplus_clobber ! - HFSX can't be embedded */ - open: hfsplus_open, - create: NULL, - close: hfsplus_close, -#ifndef HFS_EXTRACT_FS - check: NULL, -#else - check: hfsplus_extract, -#endif - copy: NULL, - resize: hfsplus_resize, - get_create_constraint: NULL, - get_resize_constraint: hfsplus_get_resize_constraint, - get_copy_constraint: NULL, -#else /* DISCOVER_ONLY */ - clobber: NULL, - open: NULL, - create: NULL, - close: NULL, - check: NULL, - copy: NULL, - resize: NULL, - get_create_constraint: NULL, - get_resize_constraint: NULL, - get_copy_constraint: NULL, -#endif /* DISCOVER_ONLY */ -}; - - -static PedFileSystemType hfs_type = { - next: NULL, - ops: &hfs_ops, - name: "hfs", - block_sizes: HFS_BLOCK_SIZES -}; - -static PedFileSystemType hfsplus_type = { - next: NULL, - ops: &hfsplus_ops, - name: "hfs+", - block_sizes: HFSP_BLOCK_SIZES -}; - -static PedFileSystemType hfsx_type = { - next: NULL, - ops: &hfsx_ops, - name: "hfsx", - block_sizes: HFSX_BLOCK_SIZES -}; - -void -ped_file_system_hfs_init () -{ - ped_file_system_type_register (&hfs_type); - ped_file_system_type_register (&hfsplus_type); - ped_file_system_type_register (&hfsx_type); -} - -void -ped_file_system_hfs_done () -{ - ped_file_system_type_unregister (&hfs_type); - ped_file_system_type_unregister (&hfsplus_type); - ped_file_system_type_unregister (&hfsx_type); -} -#endif diff --git a/libparted/fs/r/hfs/hfs.h b/libparted/fs/r/hfs/hfs.h index 4fa2e95..3d48820 100644 --- a/libparted/fs/r/hfs/hfs.h +++ b/libparted/fs/r/hfs/hfs.h @@ -1,7 +1,7 @@ /* libparted - a library for manipulating disk partitions - Copyright (C) 2003-2005, 2007, 2009-2014, 2019 Free Software Foundation, - Inc. + Copyright (C) 2003-2005, 2007, 2009-2014, 2019-2021 Free Software + Foundation, Inc. This program is free software; you can redistribute it and/or modify it under the terms of the GNU General Public License as published by @@ -529,7 +529,7 @@ struct __attribute__ ((packed)) _HfsJBlockListHeader { uint32_t bytes_used; uint32_t checksum; uint32_t pad; - HfsJBlockInfo binfo[1]; + HfsJBlockInfo binfo[]; }; typedef struct _HfsJBlockListHeader HfsJBlockListHeader; diff --git a/libparted/fs/r/hfs/journal.c b/libparted/fs/r/hfs/journal.c index 157e6d5..862d3d3 100644 --- a/libparted/fs/r/hfs/journal.c +++ b/libparted/fs/r/hfs/journal.c @@ -1,7 +1,7 @@ /* libparted - a library for manipulating disk partitions - Copyright (C) 2004-2005, 2007, 2009-2014, 2019 Free Software Foundation, - Inc. + Copyright (C) 2004-2005, 2007, 2009-2014, 2019-2021 Free Software + Foundation, Inc. This 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/r/hfs/journal.h b/libparted/fs/r/hfs/journal.h index 2dffa3a..ea33d79 100644 --- a/libparted/fs/r/hfs/journal.h +++ b/libparted/fs/r/hfs/journal.h @@ -1,6 +1,7 @@ /* libparted - a library for manipulating disk partitions - Copyright (C) 2004, 2007, 2009-2014, 2019 Free Software Foundation, Inc. + Copyright (C) 2004, 2007, 2009-2014, 2019-2021 Free Software Foundation, + Inc. This 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/r/hfs/probe.c b/libparted/fs/r/hfs/probe.c index c9546fa..b7488ed 100644 --- a/libparted/fs/r/hfs/probe.c +++ b/libparted/fs/r/hfs/probe.c @@ -1,7 +1,7 @@ /* libparted - a library for manipulating disk partitions - Copyright (C) 2004-2005, 2007, 2009-2014, 2019 Free Software Foundation, - Inc. + Copyright (C) 2004-2005, 2007, 2009-2014, 2019-2021 Free Software + Foundation, Inc. This 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/r/hfs/probe.h b/libparted/fs/r/hfs/probe.h index ef22372..8753e64 100644 --- a/libparted/fs/r/hfs/probe.h +++ b/libparted/fs/r/hfs/probe.h @@ -1,7 +1,7 @@ /* libparted - a library for manipulating disk partitions - Copyright (C) 2004-2005, 2007, 2009-2014, 2019 Free Software Foundation, - Inc. + Copyright (C) 2004-2005, 2007, 2009-2014, 2019-2021 Free Software + Foundation, Inc. This 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/r/hfs/reloc.c b/libparted/fs/r/hfs/reloc.c index 0b8ddc1..96cf6e4 100644 --- a/libparted/fs/r/hfs/reloc.c +++ b/libparted/fs/r/hfs/reloc.c @@ -1,7 +1,7 @@ /* libparted - a library for manipulating disk partitions - Copyright (C) 2004-2005, 2007, 2009-2014, 2019 Free Software Foundation, - Inc. + Copyright (C) 2004-2005, 2007, 2009-2014, 2019-2021 Free Software + Foundation, Inc. This program is free software; you can redistribute it and/or modify it under the terms of the GNU General Public License as published by @@ -224,6 +224,7 @@ hfs_do_move (PedFileSystem* fs, unsigned int *ptr_src, priv_data->catalog_file ->cache[ref->ref_index].start_block = PED_CPU_TO_BE16(new_start); + /* FALLTHROUGH */ case CR_BTREE_EXT_0 : file = priv_data->extent_file; goto CR_BTREE; @@ -372,6 +373,7 @@ hfs_cache_from_catalog(HfsCPrivateCache* cache, PedFileSystem* fs, HfsExtDescriptor* extent; unsigned int leaf_node, record_number; unsigned int i, j; + uint16_t catalog_pos; if (!priv_data->catalog_file->sect_nb) { ped_exception_throw ( @@ -384,8 +386,9 @@ hfs_cache_from_catalog(HfsCPrivateCache* cache, PedFileSystem* fs, if (!hfs_file_read_sector (priv_data->catalog_file, node, 0)) return 0; - header = (HfsHeaderRecord*)(node + PED_BE16_TO_CPU(*((uint16_t*) - (node+(PED_SECTOR_SIZE_DEFAULT-2))))); + uint16_t offset; + memcpy(&offset, node+(PED_SECTOR_SIZE_DEFAULT-2), sizeof(uint16_t)); + header = (HfsHeaderRecord*) (node + PED_BE16_TO_CPU(offset)); for (leaf_node = PED_BE32_TO_CPU (header->first_leaf_node); leaf_node; @@ -396,14 +399,15 @@ hfs_cache_from_catalog(HfsCPrivateCache* cache, PedFileSystem* fs, record_number = PED_BE16_TO_CPU (desc->rec_nb); for (i = 1; i <= record_number; ++i) { /* undocumented alignement */ + uint16_t value; + memcpy(&value, node+(PED_SECTOR_SIZE_DEFAULT - (2*i)), sizeof(uint16_t)); + catalog_pos = PED_BE16_TO_CPU(value); + catalog_key = (HfsCatalogKey*) (node + catalog_pos); unsigned int skip; - catalog_key = (HfsCatalogKey*) (node + PED_BE16_TO_CPU( - *((uint16_t*)(node+(PED_SECTOR_SIZE_DEFAULT - 2*i))))); skip = (1 + catalog_key->key_length + 1) & ~1; - catalog_data = (HfsCatalog*)( ((uint8_t*)catalog_key) - + skip ); + catalog_data = (HfsCatalog*)(node+catalog_pos+skip); /* check for obvious error in FS */ - if (((uint8_t*)catalog_key - node < HFS_FIRST_REC) + if ((catalog_pos < HFS_FIRST_REC) || ((uint8_t*)catalog_data - node >= PED_SECTOR_SIZE_DEFAULT - 2 * (signed)(record_number+1))) { @@ -466,6 +470,7 @@ hfs_cache_from_extent(HfsCPrivateCache* cache, PedFileSystem* fs, HfsExtDescriptor* extent; unsigned int leaf_node, record_number; unsigned int i, j; + uint16_t extent_pos; if (!priv_data->extent_file->sect_nb) { ped_exception_throw ( @@ -478,8 +483,9 @@ hfs_cache_from_extent(HfsCPrivateCache* cache, PedFileSystem* fs, if (!hfs_file_read_sector (priv_data->extent_file, node, 0)) return 0; - header = ((HfsHeaderRecord*) (node + PED_BE16_TO_CPU(*((uint16_t *) - (node+(PED_SECTOR_SIZE_DEFAULT-2)))))); + uint16_t offset; + memcpy(&offset, node+(PED_SECTOR_SIZE_DEFAULT-2), sizeof(uint16_t)); + header = (HfsHeaderRecord*) (node + PED_BE16_TO_CPU(offset)); for (leaf_node = PED_BE32_TO_CPU (header->first_leaf_node); leaf_node; @@ -490,14 +496,14 @@ hfs_cache_from_extent(HfsCPrivateCache* cache, PedFileSystem* fs, record_number = PED_BE16_TO_CPU (desc->rec_nb); for (i = 1; i <= record_number; i++) { uint8_t where; - extent_key = (HfsExtentKey*) - (node + PED_BE16_TO_CPU(*((uint16_t *) - (node+(PED_SECTOR_SIZE_DEFAULT - 2*i))))); + uint16_t value; + memcpy(&value, node+(PED_SECTOR_SIZE_DEFAULT - (2*i)), sizeof(uint16_t)); + extent_pos = PED_BE16_TO_CPU(value); + extent_key = (HfsExtentKey*)(node + extent_pos); /* size is cst */ - extent = (HfsExtDescriptor*)(((uint8_t*)extent_key) - + sizeof (HfsExtentKey)); + extent = (HfsExtDescriptor*)(node+extent_pos+sizeof(HfsExtentKey)); /* check for obvious error in FS */ - if (((uint8_t*)extent_key - node < HFS_FIRST_REC) + if ((extent_pos < HFS_FIRST_REC) || ((uint8_t*)extent - node >= PED_SECTOR_SIZE_DEFAULT - 2 * (signed)(record_number+1))) { diff --git a/libparted/fs/r/hfs/reloc.h b/libparted/fs/r/hfs/reloc.h index fc14b28..0c9f8bf 100644 --- a/libparted/fs/r/hfs/reloc.h +++ b/libparted/fs/r/hfs/reloc.h @@ -1,6 +1,7 @@ /* libparted - a library for manipulating disk partitions - Copyright (C) 2004, 2007, 2009-2014, 2019 Free Software Foundation, Inc. + Copyright (C) 2004, 2007, 2009-2014, 2019-2021 Free Software Foundation, + Inc. This 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/r/hfs/reloc_plus.c b/libparted/fs/r/hfs/reloc_plus.c index cebadbe..f065406 100644 --- a/libparted/fs/r/hfs/reloc_plus.c +++ b/libparted/fs/r/hfs/reloc_plus.c @@ -1,7 +1,7 @@ /* libparted - a library for manipulating disk partitions - Copyright (C) 2004-2005, 2007, 2009-2014, 2019 Free Software Foundation, - Inc. + Copyright (C) 2004-2005, 2007, 2009-2014, 2019-2021 Free Software + Foundation, Inc. This program is free software; you can redistribute it and/or modify it under the terms of the GNU General Public License as published by @@ -486,6 +486,7 @@ hfsplus_cache_from_catalog(HfsCPrivateCache* cache, PedFileSystem* fs, unsigned int i, j, size, bsize; uint32_t jib = priv_data->jib_start_block, jl = priv_data->jl_start_block; + uint16_t catalog_pos; if (!priv_data->catalog_file->sect_nb) { ped_exception_throw ( @@ -520,15 +521,16 @@ hfsplus_cache_from_catalog(HfsCPrivateCache* cache, PedFileSystem* fs, unsigned int skip; uint8_t where; - catalog_key = (HfsPCatalogKey*) - ( node + PED_BE16_TO_CPU (*((uint16_t *) - (node+(bsize - 2*i)))) ); + uint16_t value; + memcpy(&value, node+(bsize - (2*i)), sizeof(uint16_t)); + catalog_pos = PED_BE16_TO_CPU(value); + catalog_key = (HfsPCatalogKey*)(node + catalog_pos); skip = ( 2 + PED_BE16_TO_CPU (catalog_key->key_length) + 1) & ~1; catalog_data = (HfsPCatalog*) (((uint8_t*)catalog_key) + skip); /* check for obvious error in FS */ - if (((uint8_t*)catalog_key - node < HFS_FIRST_REC) + if ((catalog_pos < HFS_FIRST_REC) || ((uint8_t*)catalog_data - node >= (signed) bsize - 2 * (signed)(record_number+1))) { @@ -609,6 +611,7 @@ hfsplus_cache_from_extent(HfsCPrivateCache* cache, PedFileSystem* fs, HfsPExtDescriptor* extent; unsigned int leaf_node, record_number; unsigned int i, j, size, bsize; + uint16_t extent_pos; if (!priv_data->extents_file->sect_nb) { ped_exception_throw ( @@ -640,13 +643,14 @@ hfsplus_cache_from_extent(HfsCPrivateCache* cache, PedFileSystem* fs, record_number = PED_BE16_TO_CPU (desc->rec_nb); for (i = 1; i <= record_number; i++) { uint8_t where; - extent_key = (HfsPExtentKey*) - (node + PED_BE16_TO_CPU(*((uint16_t *) - (node+(bsize - 2*i))))); + uint16_t value; + memcpy(&value, node+(bsize - (2*i)), sizeof(uint16_t)); + extent_pos = PED_BE16_TO_CPU(value); + extent_key = (HfsPExtentKey*)(node + extent_pos); extent = (HfsPExtDescriptor*) (((uint8_t*)extent_key) + sizeof (HfsPExtentKey)); /* check for obvious error in FS */ - if (((uint8_t*)extent_key - node < HFS_FIRST_REC) + if ((extent_pos < HFS_FIRST_REC) || ((uint8_t*)extent - node >= (signed)bsize - 2 * (signed)(record_number+1))) { @@ -724,6 +728,7 @@ hfsplus_cache_from_attributes(HfsCPrivateCache* cache, PedFileSystem* fs, HfsPExtDescriptor* extent; unsigned int leaf_node, record_number; unsigned int i, j, size, bsize; + uint16_t generic_pos; /* attributes file is facultative */ if (!priv_data->attributes_file->sect_nb) @@ -751,15 +756,15 @@ hfsplus_cache_from_attributes(HfsCPrivateCache* cache, PedFileSystem* fs, record_number = PED_BE16_TO_CPU (desc->rec_nb); for (i = 1; i <= record_number; i++) { unsigned int skip; - generic_key = (HfsPPrivateGenericKey*) - (node + PED_BE16_TO_CPU(*((uint16_t *) - (node+(bsize - 2*i))))); + uint16_t value; + memcpy(&value, node+(bsize - (2*i)), sizeof(uint16_t)); + generic_pos = PED_BE16_TO_CPU(value); + generic_key = (HfsPPrivateGenericKey*)(node + generic_pos); skip = ( 2 + PED_BE16_TO_CPU (generic_key->key_length) + 1 ) & ~1; - fork_ext_data = (HfsPForkDataAttr*) - (((uint8_t*)generic_key) + skip); + fork_ext_data = (HfsPForkDataAttr*)(node+generic_pos+skip); /* check for obvious error in FS */ - if (((uint8_t*)generic_key - node < HFS_FIRST_REC) + if ((generic_pos < HFS_FIRST_REC) || ((uint8_t*)fork_ext_data - node >= (signed) bsize - 2 * (signed)(record_number+1))) { diff --git a/libparted/fs/r/hfs/reloc_plus.h b/libparted/fs/r/hfs/reloc_plus.h index ff40f8a..9e6a23b 100644 --- a/libparted/fs/r/hfs/reloc_plus.h +++ b/libparted/fs/r/hfs/reloc_plus.h @@ -1,6 +1,7 @@ /* libparted - a library for manipulating disk partitions - Copyright (C) 2004, 2007, 2009-2014, 2019 Free Software Foundation, Inc. + Copyright (C) 2004, 2007, 2009-2014, 2019-2021 Free Software Foundation, + Inc. This 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/reiserfs/reiserfs.c b/libparted/fs/reiserfs/reiserfs.c index 878f30f..c2527d7 100644 --- a/libparted/fs/reiserfs/reiserfs.c +++ b/libparted/fs/reiserfs/reiserfs.c @@ -1,7 +1,7 @@ /* reiserfs.c -- ReiserFS detection - Copyright (C) 2001-2002, 2007, 2009-2014, 2019 Free Software Foundation, - Inc. + Copyright (C) 2001-2002, 2007, 2009-2014, 2019-2021 Free Software + Foundation, Inc. This 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/reiserfs/reiserfs.h b/libparted/fs/reiserfs/reiserfs.h index 0ace633..a197066 100644 --- a/libparted/fs/reiserfs/reiserfs.h +++ b/libparted/fs/reiserfs/reiserfs.h @@ -1,6 +1,7 @@ /* libparted - a library for manipulating disk partitions - Copyright (C) 2000, 2007, 2009-2014, 2019 Free Software Foundation, Inc. + Copyright (C) 2000, 2007, 2009-2014, 2019-2021 Free Software Foundation, + Inc. This 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/udf/udf.c b/libparted/fs/udf/udf.c index fd0d21a..cb25abc 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-2019 Free Software Foundation, Inc. + Copyright (C) 2018-2021 Free Software Foundation, Inc. This 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 27cb036..d4ba5f0 100644 --- a/libparted/fs/ufs/ufs.c +++ b/libparted/fs/ufs/ufs.c @@ -1,6 +1,7 @@ /* libparted - a library for manipulating disk partitions - Copyright (C) 2001, 2007, 2009-2014, 2019 Free Software Foundation, Inc. + Copyright (C) 2001, 2007, 2009-2014, 2019-2021 Free Software Foundation, + Inc. This 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,14 +46,14 @@ #define UFS_MAGIC_FEA 0x00195612 #define UFS_MAGIC_4GB 0x05231994 -struct ufs_csum { +struct __attribute__ ((packed)) ufs_csum { uint32_t cs_ndir; /* number of directories */ uint32_t cs_nbfree; /* number of free blocks */ uint32_t cs_nifree; /* number of free inodes */ uint32_t cs_nffree; /* number of free frags */ }; -struct ufs_super_block { +struct __attribute__ ((packed)) ufs_super_block { uint32_t fs_link; /* UNUSED */ uint32_t fs_rlink; /* UNUSED */ uint32_t fs_sblkno; /* addr of super-block in filesys */ @@ -176,7 +177,7 @@ ufs_probe_sun (PedGeometry* geom) { const int sectors = ((3 * 512) + geom->dev->sector_size - 1) / geom->dev->sector_size; - char * buf = alloca (sectors * geom->dev->sector_size); + uint8_t* buf = alloca (sectors * geom->dev->sector_size); struct ufs_super_block *sb; if (geom->length < 5) @@ -212,7 +213,7 @@ ufs_probe_hp (PedGeometry* geom) return 0; const int sectors = ((3 * 512) + geom->dev->sector_size - 1) / geom->dev->sector_size; - char * buf = alloca (sectors * geom->dev->sector_size); + uint8_t* buf = alloca (sectors * geom->dev->sector_size); if (!ped_geometry_read (geom, buf, 16 * 512 / geom->dev->sector_size, sectors)) return 0; diff --git a/libparted/fs/xfs/xfs.c b/libparted/fs/xfs/xfs.c index 79cef40..aa2936c 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 Free Software Foundation, Inc. + Copyright (C) 2001, 2009-2014, 2019-2021 Free Software Foundation, Inc. This 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 a6bb9e3..c2d880b 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 Free Software Foundation, Inc. +# Copyright (C) 1999-2001, 2007-2014, 2019-2021 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 73af106..36d9d00 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 Free Software Foundation, Inc. +# Copyright (C) 1999-2001, 2007-2014, 2019-2021 Free Software Foundation, Inc. # # This file may be modified and/or distributed without restriction. @@ -100,9 +100,9 @@ am__aclocal_m4_deps = $(top_srcdir)/m4/00gnulib.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/calloc.m4 $(top_srcdir)/m4/canonicalize.m4 \ - $(top_srcdir)/m4/close.m4 $(top_srcdir)/m4/codeset.m4 \ - $(top_srcdir)/m4/config-h.m4 $(top_srcdir)/m4/configmake.m4 \ - $(top_srcdir)/m4/ctype.m4 $(top_srcdir)/m4/dirname.m4 \ + $(top_srcdir)/m4/clock_time.m4 $(top_srcdir)/m4/close.m4 \ + $(top_srcdir)/m4/codeset.m4 $(top_srcdir)/m4/config-h.m4 \ + $(top_srcdir)/m4/configmake.m4 $(top_srcdir)/m4/ctype.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 \ @@ -114,15 +114,13 @@ am__aclocal_m4_deps = $(top_srcdir)/m4/00gnulib.m4 \ $(top_srcdir)/m4/fsync.m4 $(top_srcdir)/m4/ftruncate.m4 \ $(top_srcdir)/m4/getcwd.m4 $(top_srcdir)/m4/getdtablesize.m4 \ $(top_srcdir)/m4/getopt.m4 $(top_srcdir)/m4/getpagesize.m4 \ - $(top_srcdir)/m4/getprogname.m4 $(top_srcdir)/m4/gettext.m4 \ - $(top_srcdir)/m4/gettimeofday.m4 $(top_srcdir)/m4/glibc21.m4 \ - $(top_srcdir)/m4/gnulib-common.m4 \ - $(top_srcdir)/m4/gnulib-comp.m4 \ - $(top_srcdir)/m4/host-cpu-c-abi.m4 $(top_srcdir)/m4/iconv.m4 \ + $(top_srcdir)/m4/getprogname.m4 $(top_srcdir)/m4/getrandom.m4 \ + $(top_srcdir)/m4/gettext.m4 $(top_srcdir)/m4/gettimeofday.m4 \ + $(top_srcdir)/m4/glibc21.m4 $(top_srcdir)/m4/gnulib-common.m4 \ + $(top_srcdir)/m4/gnulib-comp.m4 $(top_srcdir)/m4/iconv.m4 \ $(top_srcdir)/m4/include_next.m4 $(top_srcdir)/m4/inet_pton.m4 \ $(top_srcdir)/m4/intl-thread-locale.m4 \ - $(top_srcdir)/m4/intlmacosx.m4 \ - $(top_srcdir)/m4/inttypes-pri.m4 $(top_srcdir)/m4/inttypes.m4 \ + $(top_srcdir)/m4/intlmacosx.m4 $(top_srcdir)/m4/inttypes.m4 \ $(top_srcdir)/m4/ioctl.m4 $(top_srcdir)/m4/isblank.m4 \ $(top_srcdir)/m4/langinfo_h.m4 $(top_srcdir)/m4/largefile.m4 \ $(top_srcdir)/m4/lcmessage.m4 $(top_srcdir)/m4/lib-ignore.m4 \ @@ -132,25 +130,26 @@ am__aclocal_m4_deps = $(top_srcdir)/m4/00gnulib.m4 \ $(top_srcdir)/m4/locale-fr.m4 $(top_srcdir)/m4/locale-ja.m4 \ $(top_srcdir)/m4/locale-tr.m4 $(top_srcdir)/m4/locale-zh.m4 \ $(top_srcdir)/m4/locale_h.m4 $(top_srcdir)/m4/localeconv.m4 \ - $(top_srcdir)/m4/localename.m4 \ - $(top_srcdir)/m4/localtime-buffer.m4 $(top_srcdir)/m4/lock.m4 \ - $(top_srcdir)/m4/longlong.m4 $(top_srcdir)/m4/lseek.m4 \ - $(top_srcdir)/m4/lstat.m4 $(top_srcdir)/m4/ltoptions.m4 \ - $(top_srcdir)/m4/ltsugar.m4 $(top_srcdir)/m4/ltversion.m4 \ - $(top_srcdir)/m4/lt~obsolete.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/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/localename.m4 $(top_srcdir)/m4/lock.m4 \ + $(top_srcdir)/m4/lseek.m4 $(top_srcdir)/m4/lstat.m4 \ + $(top_srcdir)/m4/ltoptions.m4 $(top_srcdir)/m4/ltsugar.m4 \ + $(top_srcdir)/m4/ltversion.m4 $(top_srcdir)/m4/lt~obsolete.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/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/nanosleep.m4 $(top_srcdir)/m4/netinet_in_h.m4 \ + $(top_srcdir)/m4/musl.m4 $(top_srcdir)/m4/nanosleep.m4 \ + $(top_srcdir)/m4/netinet_in_h.m4 \ $(top_srcdir)/m4/nl_langinfo.m4 $(top_srcdir)/m4/nls.m4 \ $(top_srcdir)/m4/nocrash.m4 $(top_srcdir)/m4/o-direct.m4 \ $(top_srcdir)/m4/off_t.m4 $(top_srcdir)/m4/open-cloexec.m4 \ - $(top_srcdir)/m4/open.m4 $(top_srcdir)/m4/pathmax.m4 \ - $(top_srcdir)/m4/perror.m4 $(top_srcdir)/m4/pipe.m4 \ + $(top_srcdir)/m4/open-slash.m4 $(top_srcdir)/m4/open.m4 \ + $(top_srcdir)/m4/pathmax.m4 $(top_srcdir)/m4/perror.m4 \ + $(top_srcdir)/m4/pid_t.m4 $(top_srcdir)/m4/pipe.m4 \ $(top_srcdir)/m4/po.m4 $(top_srcdir)/m4/priv-set.m4 \ $(top_srcdir)/m4/progtest.m4 \ $(top_srcdir)/m4/pthread-thread.m4 \ @@ -162,9 +161,10 @@ am__aclocal_m4_deps = $(top_srcdir)/m4/00gnulib.m4 \ $(top_srcdir)/m4/readlink.m4 $(top_srcdir)/m4/realloc.m4 \ $(top_srcdir)/m4/regex.m4 $(top_srcdir)/m4/rpmatch.m4 \ $(top_srcdir)/m4/safe-read.m4 $(top_srcdir)/m4/sched_h.m4 \ - $(top_srcdir)/m4/select.m4 $(top_srcdir)/m4/setenv.m4 \ - $(top_srcdir)/m4/setlocale.m4 $(top_srcdir)/m4/sigaction.m4 \ - $(top_srcdir)/m4/signal_h.m4 \ + $(top_srcdir)/m4/select.m4 $(top_srcdir)/m4/semaphore.m4 \ + $(top_srcdir)/m4/setenv.m4 $(top_srcdir)/m4/setlocale.m4 \ + $(top_srcdir)/m4/setlocale_null.m4 \ + $(top_srcdir)/m4/sigaction.m4 $(top_srcdir)/m4/signal_h.m4 \ $(top_srcdir)/m4/signalblocking.m4 $(top_srcdir)/m4/sleep.m4 \ $(top_srcdir)/m4/socketlib.m4 $(top_srcdir)/m4/sockets.m4 \ $(top_srcdir)/m4/socklen.m4 $(top_srcdir)/m4/sockpfaf.m4 \ @@ -179,6 +179,7 @@ am__aclocal_m4_deps = $(top_srcdir)/m4/00gnulib.m4 \ $(top_srcdir)/m4/strnlen.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 \ @@ -187,14 +188,15 @@ am__aclocal_m4_deps = $(top_srcdir)/m4/00gnulib.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/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/xstrndup.m4 $(top_srcdir)/m4/xstrtol.m4 \ - $(top_srcdir)/m4/yield.m4 $(top_srcdir)/configure.ac + $(top_srcdir)/m4/yield.m4 $(top_srcdir)/m4/zzgnulib.m4 \ + $(top_srcdir)/configure.ac am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \ $(ACLOCAL_M4) DIST_COMMON = $(srcdir)/Makefile.am $(am__DIST_COMMON) @@ -310,6 +312,7 @@ BUILDINFO = @BUILDINFO@ CC = @CC@ CCDEPMODE = @CCDEPMODE@ CFLAGS = @CFLAGS@ +CFLAG_VISIBILITY = @CFLAG_VISIBILITY@ CHECK_CFLAGS = @CHECK_CFLAGS@ CHECK_LIBS = @CHECK_LIBS@ CONFIG_INCLUDE = @CONFIG_INCLUDE@ @@ -344,6 +347,8 @@ GMSGFMT = @GMSGFMT@ GMSGFMT_015 = @GMSGFMT_015@ GNULIB_ACCEPT = @GNULIB_ACCEPT@ GNULIB_ACCEPT4 = @GNULIB_ACCEPT4@ +GNULIB_ACCESS = @GNULIB_ACCESS@ +GNULIB_ALIGNED_ALLOC = @GNULIB_ALIGNED_ALLOC@ GNULIB_ATOLL = @GNULIB_ATOLL@ GNULIB_BIND = @GNULIB_BIND@ GNULIB_BTOWC = @GNULIB_BTOWC@ @@ -354,6 +359,7 @@ GNULIB_CHOWN = @GNULIB_CHOWN@ GNULIB_CLOSE = @GNULIB_CLOSE@ GNULIB_CONNECT = @GNULIB_CONNECT@ GNULIB_COPY_FILE_RANGE = @GNULIB_COPY_FILE_RANGE@ +GNULIB_CREAT = @GNULIB_CREAT@ GNULIB_CTIME = @GNULIB_CTIME@ GNULIB_DPRINTF = @GNULIB_DPRINTF@ GNULIB_DUP = @GNULIB_DUP@ @@ -401,19 +407,23 @@ GNULIB_GETCWD = @GNULIB_GETCWD@ GNULIB_GETDELIM = @GNULIB_GETDELIM@ GNULIB_GETDOMAINNAME = @GNULIB_GETDOMAINNAME@ GNULIB_GETDTABLESIZE = @GNULIB_GETDTABLESIZE@ +GNULIB_GETENTROPY = @GNULIB_GETENTROPY@ GNULIB_GETGROUPS = @GNULIB_GETGROUPS@ GNULIB_GETHOSTNAME = @GNULIB_GETHOSTNAME@ GNULIB_GETLINE = @GNULIB_GETLINE@ GNULIB_GETLOADAVG = @GNULIB_GETLOADAVG@ GNULIB_GETLOGIN = @GNULIB_GETLOGIN@ GNULIB_GETLOGIN_R = @GNULIB_GETLOGIN_R@ +GNULIB_GETOPT_POSIX = @GNULIB_GETOPT_POSIX@ GNULIB_GETPAGESIZE = @GNULIB_GETPAGESIZE@ GNULIB_GETPASS = @GNULIB_GETPASS@ GNULIB_GETPEERNAME = @GNULIB_GETPEERNAME@ +GNULIB_GETRANDOM = @GNULIB_GETRANDOM@ GNULIB_GETSOCKNAME = @GNULIB_GETSOCKNAME@ GNULIB_GETSOCKOPT = @GNULIB_GETSOCKOPT@ GNULIB_GETSUBOPT = @GNULIB_GETSUBOPT@ GNULIB_GETTIMEOFDAY = @GNULIB_GETTIMEOFDAY@ +GNULIB_GETUMASK = @GNULIB_GETUMASK@ GNULIB_GETUSERSHELL = @GNULIB_GETUSERSHELL@ GNULIB_GL_UNISTD_H_GETOPT = @GNULIB_GL_UNISTD_H_GETOPT@ GNULIB_GRANTPT = @GNULIB_GRANTPT@ @@ -427,6 +437,8 @@ GNULIB_ISATTY = @GNULIB_ISATTY@ GNULIB_ISBLANK = @GNULIB_ISBLANK@ GNULIB_ISWBLANK = @GNULIB_ISWBLANK@ GNULIB_ISWCTYPE = @GNULIB_ISWCTYPE@ +GNULIB_ISWDIGIT = @GNULIB_ISWDIGIT@ +GNULIB_ISWXDIGIT = @GNULIB_ISWXDIGIT@ GNULIB_LCHMOD = @GNULIB_LCHMOD@ GNULIB_LCHOWN = @GNULIB_LCHOWN@ GNULIB_LINK = @GNULIB_LINK@ @@ -487,6 +499,7 @@ GNULIB_PERROR = @GNULIB_PERROR@ GNULIB_PIPE = @GNULIB_PIPE@ GNULIB_PIPE2 = @GNULIB_PIPE2@ GNULIB_POPEN = @GNULIB_POPEN@ +GNULIB_POSIX_MEMALIGN = @GNULIB_POSIX_MEMALIGN@ GNULIB_POSIX_OPENPT = @GNULIB_POSIX_OPENPT@ GNULIB_PREAD = @GNULIB_PREAD@ GNULIB_PRINTF = @GNULIB_PRINTF@ @@ -535,9 +548,12 @@ GNULIB_SENDTO = @GNULIB_SENDTO@ GNULIB_SETENV = @GNULIB_SETENV@ GNULIB_SETHOSTNAME = @GNULIB_SETHOSTNAME@ GNULIB_SETLOCALE = @GNULIB_SETLOCALE@ +GNULIB_SETLOCALE_NULL = @GNULIB_SETLOCALE_NULL@ GNULIB_SETSOCKOPT = @GNULIB_SETSOCKOPT@ GNULIB_SHUTDOWN = @GNULIB_SHUTDOWN@ +GNULIB_SIGABBREV_NP = @GNULIB_SIGABBREV_NP@ GNULIB_SIGACTION = @GNULIB_SIGACTION@ +GNULIB_SIGDESCR_NP = @GNULIB_SIGDESCR_NP@ GNULIB_SIGNAL_H_SIGPIPE = @GNULIB_SIGNAL_H_SIGPIPE@ GNULIB_SIGPROCMASK = @GNULIB_SIGPROCMASK@ GNULIB_SLEEP = @GNULIB_SLEEP@ @@ -553,6 +569,7 @@ GNULIB_STRCASESTR = @GNULIB_STRCASESTR@ GNULIB_STRCHRNUL = @GNULIB_STRCHRNUL@ GNULIB_STRDUP = @GNULIB_STRDUP@ GNULIB_STRERROR = @GNULIB_STRERROR@ +GNULIB_STRERRORNAME_NP = @GNULIB_STRERRORNAME_NP@ GNULIB_STRERROR_R = @GNULIB_STRERROR_R@ GNULIB_STRFTIME = @GNULIB_STRFTIME@ GNULIB_STRNCAT = @GNULIB_STRNCAT@ @@ -636,11 +653,13 @@ GNULIB_WMEMCHR = @GNULIB_WMEMCHR@ GNULIB_WMEMCMP = @GNULIB_WMEMCMP@ GNULIB_WMEMCPY = @GNULIB_WMEMCPY@ GNULIB_WMEMMOVE = @GNULIB_WMEMMOVE@ +GNULIB_WMEMPCPY = @GNULIB_WMEMPCPY@ GNULIB_WMEMSET = @GNULIB_WMEMSET@ GNULIB_WRITE = @GNULIB_WRITE@ GNULIB__EXIT = @GNULIB__EXIT@ GREP = @GREP@ HAVE_ACCEPT4 = @HAVE_ACCEPT4@ +HAVE_ALIGNED_ALLOC = @HAVE_ALIGNED_ALLOC@ HAVE_ALLOCA_H = @HAVE_ALLOCA_H@ HAVE_ARPA_INET_H = @HAVE_ARPA_INET_H@ HAVE_ATOLL = @HAVE_ATOLL@ @@ -650,12 +669,17 @@ HAVE_CANONICALIZE_FILE_NAME = @HAVE_CANONICALIZE_FILE_NAME@ HAVE_CHOWN = @HAVE_CHOWN@ HAVE_COPY_FILE_RANGE = @HAVE_COPY_FILE_RANGE@ HAVE_CRTDEFS_H = @HAVE_CRTDEFS_H@ +HAVE_DECL_ECVT = @HAVE_DECL_ECVT@ HAVE_DECL_ENVIRON = @HAVE_DECL_ENVIRON@ +HAVE_DECL_EXECVPE = @HAVE_DECL_EXECVPE@ HAVE_DECL_FCHDIR = @HAVE_DECL_FCHDIR@ +HAVE_DECL_FCLOSEALL = @HAVE_DECL_FCLOSEALL@ +HAVE_DECL_FCVT = @HAVE_DECL_FCVT@ HAVE_DECL_FDATASYNC = @HAVE_DECL_FDATASYNC@ HAVE_DECL_FPURGE = @HAVE_DECL_FPURGE@ HAVE_DECL_FSEEKO = @HAVE_DECL_FSEEKO@ HAVE_DECL_FTELLO = @HAVE_DECL_FTELLO@ +HAVE_DECL_GCVT = @HAVE_DECL_GCVT@ HAVE_DECL_GETDELIM = @HAVE_DECL_GETDELIM@ HAVE_DECL_GETDOMAINNAME = @HAVE_DECL_GETDOMAINNAME@ HAVE_DECL_GETLINE = @HAVE_DECL_GETLINE@ @@ -689,10 +713,10 @@ HAVE_DECL_TRUNCATE = @HAVE_DECL_TRUNCATE@ HAVE_DECL_TTYNAME_R = @HAVE_DECL_TTYNAME_R@ HAVE_DECL_UNSETENV = @HAVE_DECL_UNSETENV@ HAVE_DECL_VSNPRINTF = @HAVE_DECL_VSNPRINTF@ +HAVE_DECL_WCSDUP = @HAVE_DECL_WCSDUP@ HAVE_DECL_WCTOB = @HAVE_DECL_WCTOB@ HAVE_DECL_WCWIDTH = @HAVE_DECL_WCWIDTH@ HAVE_DPRINTF = @HAVE_DPRINTF@ -HAVE_DUP2 = @HAVE_DUP2@ HAVE_DUP3 = @HAVE_DUP3@ HAVE_DUPLOCALE = @HAVE_DUPLOCALE@ HAVE_EUIDACCESS = @HAVE_EUIDACCESS@ @@ -714,14 +738,17 @@ HAVE_FTELLO = @HAVE_FTELLO@ HAVE_FTRUNCATE = @HAVE_FTRUNCATE@ HAVE_FUTIMENS = @HAVE_FUTIMENS@ HAVE_GETDTABLESIZE = @HAVE_GETDTABLESIZE@ +HAVE_GETENTROPY = @HAVE_GETENTROPY@ HAVE_GETGROUPS = @HAVE_GETGROUPS@ HAVE_GETHOSTNAME = @HAVE_GETHOSTNAME@ HAVE_GETLOGIN = @HAVE_GETLOGIN@ HAVE_GETOPT_H = @HAVE_GETOPT_H@ HAVE_GETPAGESIZE = @HAVE_GETPAGESIZE@ HAVE_GETPASS = @HAVE_GETPASS@ +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_IMAXDIV_T = @HAVE_IMAXDIV_T@ @@ -740,7 +767,6 @@ HAVE_LCHMOD = @HAVE_LCHMOD@ HAVE_LCHOWN = @HAVE_LCHOWN@ HAVE_LINK = @HAVE_LINK@ HAVE_LINKAT = @HAVE_LINKAT@ -HAVE_LONG_LONG_INT = @HAVE_LONG_LONG_INT@ HAVE_LSTAT = @HAVE_LSTAT@ HAVE_MAX_ALIGN_T = @HAVE_MAX_ALIGN_T@ HAVE_MBRLEN = @HAVE_MBRLEN@ @@ -750,7 +776,6 @@ HAVE_MBSLEN = @HAVE_MBSLEN@ HAVE_MBSNRTOWCS = @HAVE_MBSNRTOWCS@ HAVE_MBSRTOWCS = @HAVE_MBSRTOWCS@ HAVE_MBTOWC = @HAVE_MBTOWC@ -HAVE_MEMCHR = @HAVE_MEMCHR@ HAVE_MEMPCPY = @HAVE_MEMPCPY@ HAVE_MKDIRAT = @HAVE_MKDIRAT@ HAVE_MKDTEMP = @HAVE_MKDTEMP@ @@ -773,6 +798,7 @@ HAVE_PCLOSE = @HAVE_PCLOSE@ HAVE_PIPE = @HAVE_PIPE@ HAVE_PIPE2 = @HAVE_PIPE2@ HAVE_POPEN = @HAVE_POPEN@ +HAVE_POSIX_MEMALIGN = @HAVE_POSIX_MEMALIGN@ HAVE_POSIX_OPENPT = @HAVE_POSIX_OPENPT@ HAVE_POSIX_SIGNALBLOCKING = @HAVE_POSIX_SIGNALBLOCKING@ HAVE_PREAD = @HAVE_PREAD@ @@ -858,7 +884,9 @@ HAVE_SECURE_GETENV = @HAVE_SECURE_GETENV@ HAVE_SETENV = @HAVE_SETENV@ HAVE_SETHOSTNAME = @HAVE_SETHOSTNAME@ HAVE_SETSTATE = @HAVE_SETSTATE@ +HAVE_SIGABBREV_NP = @HAVE_SIGABBREV_NP@ HAVE_SIGACTION = @HAVE_SIGACTION@ +HAVE_SIGDESCR_NP = @HAVE_SIGDESCR_NP@ HAVE_SIGHANDLER_T = @HAVE_SIGHANDLER_T@ HAVE_SIGINFO_T = @HAVE_SIGINFO_T@ HAVE_SIGNED_SIG_ATOMIC_T = @HAVE_SIGNED_SIG_ATOMIC_T@ @@ -871,6 +899,7 @@ HAVE_STPCPY = @HAVE_STPCPY@ HAVE_STPNCPY = @HAVE_STPNCPY@ HAVE_STRCASESTR = @HAVE_STRCASESTR@ HAVE_STRCHRNUL = @HAVE_STRCHRNUL@ +HAVE_STRERRORNAME_NP = @HAVE_STRERRORNAME_NP@ HAVE_STRPBRK = @HAVE_STRPBRK@ HAVE_STRPTIME = @HAVE_STRPTIME@ HAVE_STRSEP = @HAVE_STRSEP@ @@ -893,6 +922,7 @@ HAVE_SYS_INTTYPES_H = @HAVE_SYS_INTTYPES_H@ HAVE_SYS_IOCTL_H = @HAVE_SYS_IOCTL_H@ HAVE_SYS_LOADAVG_H = @HAVE_SYS_LOADAVG_H@ HAVE_SYS_PARAM_H = @HAVE_SYS_PARAM_H@ +HAVE_SYS_RANDOM_H = @HAVE_SYS_RANDOM_H@ HAVE_SYS_SELECT_H = @HAVE_SYS_SELECT_H@ HAVE_SYS_SOCKET_H = @HAVE_SYS_SOCKET_H@ HAVE_SYS_TIME_H = @HAVE_SYS_TIME_H@ @@ -901,15 +931,14 @@ HAVE_SYS_UIO_H = @HAVE_SYS_UIO_H@ HAVE_TIMEGM = @HAVE_TIMEGM@ HAVE_TIMEZONE_T = @HAVE_TIMEZONE_T@ HAVE_TYPE_VOLATILE_SIG_ATOMIC_T = @HAVE_TYPE_VOLATILE_SIG_ATOMIC_T@ -HAVE_TZSET = @HAVE_TZSET@ HAVE_UNISTD_H = @HAVE_UNISTD_H@ HAVE_UNLINKAT = @HAVE_UNLINKAT@ HAVE_UNLOCKPT = @HAVE_UNLOCKPT@ -HAVE_UNSIGNED_LONG_LONG_INT = @HAVE_UNSIGNED_LONG_LONG_INT@ HAVE_USLEEP = @HAVE_USLEEP@ HAVE_UTIMENSAT = @HAVE_UTIMENSAT@ HAVE_VASPRINTF = @HAVE_VASPRINTF@ HAVE_VDPRINTF = @HAVE_VDPRINTF@ +HAVE_VISIBILITY = @HAVE_VISIBILITY@ HAVE_WCHAR_H = @HAVE_WCHAR_H@ HAVE_WCHAR_T = @HAVE_WCHAR_T@ HAVE_WCPCPY = @HAVE_WCPCPY@ @@ -948,6 +977,7 @@ HAVE_WMEMCHR = @HAVE_WMEMCHR@ HAVE_WMEMCMP = @HAVE_WMEMCMP@ HAVE_WMEMCPY = @HAVE_WMEMCPY@ HAVE_WMEMMOVE = @HAVE_WMEMMOVE@ +HAVE_WMEMPCPY = @HAVE_WMEMPCPY@ HAVE_WMEMSET = @HAVE_WMEMSET@ HAVE_WS2TCPIP_H = @HAVE_WS2TCPIP_H@ HAVE_XLOCALE_H = @HAVE_XLOCALE_H@ @@ -973,16 +1003,28 @@ LIBICONV = @LIBICONV@ LIBINTL = @LIBINTL@ LIBMULTITHREAD = @LIBMULTITHREAD@ LIBOBJS = @LIBOBJS@ +LIBPMULTITHREAD = @LIBPMULTITHREAD@ +LIBPTHREAD = @LIBPTHREAD@ LIBS = @LIBS@ LIBSOCKET = @LIBSOCKET@ +LIBSTDTHREAD = @LIBSTDTHREAD@ LIBTESTS_LIBDEPS = @LIBTESTS_LIBDEPS@ LIBTHREAD = @LIBTHREAD@ LIBTOOL = @LIBTOOL@ LIB_BLKID = @LIB_BLKID@ +LIB_CLOCK_GETTIME = @LIB_CLOCK_GETTIME@ +LIB_GETRANDOM = @LIB_GETRANDOM@ +LIB_HARD_LOCALE = @LIB_HARD_LOCALE@ +LIB_MBRTOWC = @LIB_MBRTOWC@ LIB_NANOSLEEP = @LIB_NANOSLEEP@ +LIB_NL_LANGINFO = @LIB_NL_LANGINFO@ LIB_PTHREAD = @LIB_PTHREAD@ LIB_PTHREAD_SIGMASK = @LIB_PTHREAD_SIGMASK@ +LIB_SCHED_YIELD = @LIB_SCHED_YIELD@ LIB_SELECT = @LIB_SELECT@ +LIB_SEMAPHORE = @LIB_SEMAPHORE@ +LIB_SETLOCALE = @LIB_SETLOCALE@ +LIB_SETLOCALE_NULL = @LIB_SETLOCALE_NULL@ LIMITS_H = @LIMITS_H@ LIPO = @LIPO@ LN_S = @LN_S@ @@ -1031,6 +1073,7 @@ NEXT_AS_FIRST_DIRECTIVE_STDIO_H = @NEXT_AS_FIRST_DIRECTIVE_STDIO_H@ NEXT_AS_FIRST_DIRECTIVE_STDLIB_H = @NEXT_AS_FIRST_DIRECTIVE_STDLIB_H@ NEXT_AS_FIRST_DIRECTIVE_STRING_H = @NEXT_AS_FIRST_DIRECTIVE_STRING_H@ NEXT_AS_FIRST_DIRECTIVE_SYS_IOCTL_H = @NEXT_AS_FIRST_DIRECTIVE_SYS_IOCTL_H@ +NEXT_AS_FIRST_DIRECTIVE_SYS_RANDOM_H = @NEXT_AS_FIRST_DIRECTIVE_SYS_RANDOM_H@ NEXT_AS_FIRST_DIRECTIVE_SYS_SELECT_H = @NEXT_AS_FIRST_DIRECTIVE_SYS_SELECT_H@ NEXT_AS_FIRST_DIRECTIVE_SYS_SOCKET_H = @NEXT_AS_FIRST_DIRECTIVE_SYS_SOCKET_H@ NEXT_AS_FIRST_DIRECTIVE_SYS_STAT_H = @NEXT_AS_FIRST_DIRECTIVE_SYS_STAT_H@ @@ -1060,6 +1103,7 @@ NEXT_STDIO_H = @NEXT_STDIO_H@ NEXT_STDLIB_H = @NEXT_STDLIB_H@ NEXT_STRING_H = @NEXT_STRING_H@ NEXT_SYS_IOCTL_H = @NEXT_SYS_IOCTL_H@ +NEXT_SYS_RANDOM_H = @NEXT_SYS_RANDOM_H@ NEXT_SYS_SELECT_H = @NEXT_SYS_SELECT_H@ NEXT_SYS_SOCKET_H = @NEXT_SYS_SOCKET_H@ NEXT_SYS_STAT_H = @NEXT_SYS_STAT_H@ @@ -1096,21 +1140,24 @@ POSUB = @POSUB@ PRAGMA_COLUMNS = @PRAGMA_COLUMNS@ PRAGMA_SYSTEM_HEADER = @PRAGMA_SYSTEM_HEADER@ PRIPTR_PREFIX = @PRIPTR_PREFIX@ -PRI_MACROS_BROKEN = @PRI_MACROS_BROKEN@ PTHREAD_H_DEFINES_STRUCT_TIMESPEC = @PTHREAD_H_DEFINES_STRUCT_TIMESPEC@ PTRDIFF_T_SUFFIX = @PTRDIFF_T_SUFFIX@ RANLIB = @RANLIB@ +REPLACE_ACCESS = @REPLACE_ACCESS@ +REPLACE_ALIGNED_ALLOC = @REPLACE_ALIGNED_ALLOC@ REPLACE_BTOWC = @REPLACE_BTOWC@ REPLACE_CALLOC = @REPLACE_CALLOC@ REPLACE_CANONICALIZE_FILE_NAME = @REPLACE_CANONICALIZE_FILE_NAME@ REPLACE_CHOWN = @REPLACE_CHOWN@ REPLACE_CLOSE = @REPLACE_CLOSE@ +REPLACE_CREAT = @REPLACE_CREAT@ REPLACE_CTIME = @REPLACE_CTIME@ REPLACE_DPRINTF = @REPLACE_DPRINTF@ REPLACE_DUP = @REPLACE_DUP@ REPLACE_DUP2 = @REPLACE_DUP2@ REPLACE_DUPLOCALE = @REPLACE_DUPLOCALE@ REPLACE_FACCESSAT = @REPLACE_FACCESSAT@ +REPLACE_FCHMODAT = @REPLACE_FCHMODAT@ REPLACE_FCHOWNAT = @REPLACE_FCHOWNAT@ REPLACE_FCLOSE = @REPLACE_FCLOSE@ REPLACE_FCNTL = @REPLACE_FCNTL@ @@ -1138,6 +1185,7 @@ REPLACE_GETLINE = @REPLACE_GETLINE@ REPLACE_GETLOGIN_R = @REPLACE_GETLOGIN_R@ REPLACE_GETPAGESIZE = @REPLACE_GETPAGESIZE@ REPLACE_GETPASS = @REPLACE_GETPASS@ +REPLACE_GETRANDOM = @REPLACE_GETRANDOM@ REPLACE_GETTIMEOFDAY = @REPLACE_GETTIMEOFDAY@ REPLACE_GMTIME = @REPLACE_GMTIME@ REPLACE_INET_NTOP = @REPLACE_INET_NTOP@ @@ -1147,6 +1195,8 @@ REPLACE_IOCTL = @REPLACE_IOCTL@ REPLACE_ISATTY = @REPLACE_ISATTY@ REPLACE_ISWBLANK = @REPLACE_ISWBLANK@ REPLACE_ISWCNTRL = @REPLACE_ISWCNTRL@ +REPLACE_ISWDIGIT = @REPLACE_ISWDIGIT@ +REPLACE_ISWXDIGIT = @REPLACE_ISWXDIGIT@ REPLACE_LCHOWN = @REPLACE_LCHOWN@ REPLACE_LINK = @REPLACE_LINK@ REPLACE_LINKAT = @REPLACE_LINKAT@ @@ -1179,6 +1229,7 @@ REPLACE_OPEN = @REPLACE_OPEN@ REPLACE_OPENAT = @REPLACE_OPENAT@ REPLACE_PERROR = @REPLACE_PERROR@ REPLACE_POPEN = @REPLACE_POPEN@ +REPLACE_POSIX_MEMALIGN = @REPLACE_POSIX_MEMALIGN@ REPLACE_PREAD = @REPLACE_PREAD@ REPLACE_PRINTF = @REPLACE_PRINTF@ REPLACE_PSELECT = @REPLACE_PSELECT@ @@ -1267,6 +1318,7 @@ REPLACE_STRCASESTR = @REPLACE_STRCASESTR@ REPLACE_STRCHRNUL = @REPLACE_STRCHRNUL@ REPLACE_STRDUP = @REPLACE_STRDUP@ REPLACE_STRERROR = @REPLACE_STRERROR@ +REPLACE_STRERRORNAME_NP = @REPLACE_STRERRORNAME_NP@ REPLACE_STRERROR_R = @REPLACE_STRERROR_R@ REPLACE_STRFTIME = @REPLACE_STRFTIME@ REPLACE_STRNCAT = @REPLACE_STRNCAT@ @@ -1304,13 +1356,13 @@ REPLACE_WCRTOMB = @REPLACE_WCRTOMB@ REPLACE_WCSFTIME = @REPLACE_WCSFTIME@ REPLACE_WCSNRTOMBS = @REPLACE_WCSNRTOMBS@ REPLACE_WCSRTOMBS = @REPLACE_WCSRTOMBS@ +REPLACE_WCSTOK = @REPLACE_WCSTOK@ REPLACE_WCSWIDTH = @REPLACE_WCSWIDTH@ REPLACE_WCTOB = @REPLACE_WCTOB@ REPLACE_WCTOMB = @REPLACE_WCTOMB@ REPLACE_WCWIDTH = @REPLACE_WCWIDTH@ REPLACE_WRITE = @REPLACE_WRITE@ SED = @SED@ -SELINUX_LIBS = @SELINUX_LIBS@ SET_MAKE = @SET_MAKE@ SHELL = @SHELL@ SIG_ATOMIC_T_SUFFIX = @SIG_ATOMIC_T_SUFFIX@ @@ -1329,6 +1381,7 @@ UINT32_MAX_LT_UINTMAX_MAX = @UINT32_MAX_LT_UINTMAX_MAX@ UINT64_MAX_EQ_ULONG_MAX = @UINT64_MAX_EQ_ULONG_MAX@ UNDEFINE_STRTOK_R = @UNDEFINE_STRTOK_R@ UNISTD_H_DEFINES_STRUCT_TIMESPEC = @UNISTD_H_DEFINES_STRUCT_TIMESPEC@ +UNISTD_H_HAVE_SYS_RANDOM_H = @UNISTD_H_HAVE_SYS_RANDOM_H@ UNISTD_H_HAVE_WINSOCK2_H = @UNISTD_H_HAVE_WINSOCK2_H@ UNISTD_H_HAVE_WINSOCK2_H_AND_USE_SOCKETS = @UNISTD_H_HAVE_WINSOCK2_H_AND_USE_SOCKETS@ USE_NLS = @USE_NLS@ diff --git a/libparted/labels/aix.c b/libparted/labels/aix.c index d6f79ec..76c9990 100644 --- a/libparted/labels/aix.c +++ b/libparted/labels/aix.c @@ -1,7 +1,8 @@ /* -*- 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 Free Software Foundation, Inc. + Copyright (C) 2000-2001, 2007-2014, 2019-2021 Free Software Foundation, + Inc. This 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/atari.c b/libparted/labels/atari.c index c984685..7923487 100644 --- a/libparted/labels/atari.c +++ b/libparted/labels/atari.c @@ -2,8 +2,8 @@ libparted - a library for manipulating disk partitions atari.c - libparted module to manipulate Atari partition tables. - Copyright (C) 2000-2001, 2004, 2007-2014, 2019 Free Software Foundation, - Inc. + Copyright (C) 2000-2001, 2004, 2007-2014, 2019-2021 Free Software + Foundation, Inc. This 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/bsd.c b/libparted/labels/bsd.c index 6946563..238b8af 100644 --- a/libparted/labels/bsd.c +++ b/libparted/labels/bsd.c @@ -1,7 +1,8 @@ /* -*- 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 Free Software Foundation, Inc. + Copyright (C) 2000-2001, 2007-2014, 2019-2021 Free Software Foundation, + Inc. This program is free software; you can redistribute it and/or modify it under the terms of the GNU General Public License as published by @@ -164,8 +165,6 @@ bsd_probe (const PedDevice *dev) label = &((BSDDiskData*) s0)->label; - alpha_bootblock_checksum(label); - /* check magic */ bool found = PED_LE32_TO_CPU (label->d_magic) == BSD_DISKMAGIC; free (s0); @@ -307,19 +306,16 @@ error: static void _probe_and_add_boot_code (const PedDisk* disk) { - char *old_boot_code; - BSDRawLabel *old_label; + BSDDiskData *old_data; void *s0; if (!ptt_read_sector (disk->dev, 0, &s0)) return; - old_boot_code = ((BSDDiskData*) s0)->boot_code; - old_label = &((BSDDiskData*) s0)->label; - - if (old_boot_code [0] - && old_label->d_magic == PED_CPU_TO_LE32 (BSD_DISKMAGIC)) { + old_data = (BSDDiskData*) s0; + if (old_data->boot_code [0] + && old_data->label.d_magic == PED_CPU_TO_LE32 (BSD_DISKMAGIC)) { BSDDiskData *bsd_specific = (BSDDiskData*) disk->disk_specific; - memcpy (bsd_specific, old_boot_code, sizeof (BSDDiskData)); + memcpy (bsd_specific, old_data, sizeof (BSDDiskData)); } free (s0); } diff --git a/libparted/labels/dasd.c b/libparted/labels/dasd.c index dd08f33..6b0b10d 100644 --- a/libparted/labels/dasd.c +++ b/libparted/labels/dasd.c @@ -1,7 +1,8 @@ /* -*- 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 Free Software Foundation, Inc. + Copyright (C) 2000-2001, 2007-2014, 2019-2021 Free Software Foundation, + Inc. This 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/dos.c b/libparted/labels/dos.c index ed1341e..e2aa5e0 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 Free Software + Copyright (C) 1999-2001, 2004-2005, 2007-2014, 2019-2021 Free Software Foundation, Inc. This program is free software; you can redistribute it and/or modify @@ -92,6 +92,7 @@ static const char MBR_BOOT_CODE[] = { #define PARTITION_HFS 0xaf #define PARTITION_SUN_UFS 0xbf #define PARTITION_DELL_DIAG 0xde +#define PARTITION_BLS_BOOT 0xea #define PARTITION_GPT 0xee #define PARTITION_ESP 0xef #define PARTITION_PALO 0xf0 @@ -165,6 +166,7 @@ typedef struct { int diag; int irst; int esp; + int bls_boot; OrigState* orig; /* used for CHS stuff */ } DosPartitionData; @@ -961,6 +963,7 @@ raw_part_parse (const PedDisk* disk, const DosRawPartition* raw_part, 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); @@ -1288,7 +1291,7 @@ msdos_write (const PedDisk* disk) DosRawTable *table = (DosRawTable *) s0; if (!table->boot_code[0]) { - memset (table->boot_code, 0, 512); + memset (table, 0, 512); memcpy (table->boot_code, MBR_BOOT_CODE, sizeof (MBR_BOOT_CODE)); } @@ -1340,22 +1343,10 @@ msdos_partition_new (const PedDisk* disk, PedPartitionType part_type, if (ped_partition_is_active (part)) { part->disk_specific - = dos_data = ped_malloc (sizeof (DosPartitionData)); + = dos_data = ped_calloc (sizeof (DosPartitionData)); if (!dos_data) goto error_free_part; - dos_data->orig = NULL; dos_data->system = PARTITION_LINUX; - dos_data->hidden = 0; - dos_data->msftres = 0; - dos_data->boot = 0; - dos_data->diag = 0; - dos_data->raid = 0; - dos_data->lvm = 0; - dos_data->lba = 0; - dos_data->palo = 0; - dos_data->prep = 0; - dos_data->irst = 0; - dos_data->esp = 0; } else { part->disk_specific = NULL; } @@ -1394,6 +1385,7 @@ msdos_partition_duplicate (const PedPartition* part) 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)); @@ -1492,6 +1484,10 @@ msdos_partition_set_system (PedPartition* part, dos_data->system = PARTITION_ESP; return 1; } + if (dos_data->bls_boot) { + dos_data->system = PARTITION_BLS_BOOT; + return 1; + } if (!fs_type) dos_data->system = PARTITION_LINUX; @@ -1534,6 +1530,7 @@ clear_flags (DosPartitionData *dos_data) dos_data->irst = 0; dos_data->esp = 0; dos_data->raid = 0; + dos_data->bls_boot = 0; } static int @@ -1635,6 +1632,12 @@ msdos_partition_set_flag (PedPartition* part, dos_data->esp = state; return ped_partition_set_system (part, part->fs_type); + 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); + default: return 0; } @@ -1689,6 +1692,9 @@ msdos_partition_get_flag (const PedPartition* part, PedPartitionFlag flag) case PED_PARTITION_ESP: return dos_data->esp; + case PED_PARTITION_BLS_BOOT: + return dos_data->bls_boot; + default: return 0; } @@ -1719,6 +1725,7 @@ msdos_partition_is_flag_available (const PedPartition* part, case PED_PARTITION_PREP: case PED_PARTITION_IRST: case PED_PARTITION_ESP: + case PED_PARTITION_BLS_BOOT: case PED_PARTITION_DIAG: return 1; diff --git a/libparted/labels/dvh.c b/libparted/labels/dvh.c index 72cabcc..53f96d0 100644 --- a/libparted/labels/dvh.c +++ b/libparted/labels/dvh.c @@ -1,7 +1,7 @@ /* libparted - a library for manipulating disk partitions - Copyright (C) 2001-2002, 2005, 2007-2014, 2019 Free Software Foundation, - Inc. + Copyright (C) 2001-2002, 2005, 2007-2014, 2019-2021 Free Software + Foundation, Inc. This 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/gpt.c b/libparted/labels/gpt.c index 8e9500b..93f7add 100644 --- a/libparted/labels/gpt.c +++ b/libparted/labels/gpt.c @@ -156,6 +156,14 @@ typedef struct ((efi_guid_t) { PED_CPU_TO_LE32 (0xD3BFE2DE), PED_CPU_TO_LE16 (0x3DAF), \ PED_CPU_TO_LE16 (0x11DF), 0xba, 0x40, \ { 0xE3, 0xA5, 0x56, 0xD8, 0x95, 0x93 }}) +#define PARTITION_CHROMEOS_KERNEL_GUID \ + ((efi_guid_t) { PED_CPU_TO_LE32 (0xfe3a2a5d), PED_CPU_TO_LE16 (0x4f32), \ + PED_CPU_TO_LE16 (0x41a7), 0xb7, 0x25, \ + { 0xac, 0xcc, 0x32, 0x85, 0xa3, 0x09 }}) +#define PARTITION_BLS_BOOT_GUID \ + ((efi_guid_t) { PED_CPU_TO_LE32 (0xbc13c2ff), PED_CPU_TO_LE16 (0x59e6), \ + PED_CPU_TO_LE16 (0x4262), 0xa3, 0x52, \ + { 0xb2, 0x75, 0xfd, 0x6f, 0x71, 0x72 }}) struct __attribute__ ((packed)) _GuidPartitionTableHeader_t { @@ -303,6 +311,8 @@ typedef struct _GPTPartitionData int legacy_boot; int prep; int irst; + int chromeos_kernel; + int bls_boot; } GPTPartitionData; static PedDiskType gpt_disk_type; @@ -826,6 +836,8 @@ _parse_part_entry (PedDisk *disk, GuidPartitionEntry_t *pte) = gpt_part_data->legacy_boot = gpt_part_data->prep = gpt_part_data->irst + = gpt_part_data->chromeos_kernel + = gpt_part_data->bls_boot = gpt_part_data->bios_grub = gpt_part_data->atvrecv = 0; if (pte->Attributes.RequiredToFunction & 0x1) @@ -857,6 +869,10 @@ _parse_part_entry (PedDisk *disk, GuidPartitionEntry_t *pte) gpt_part_data->prep = 1; else if (!guid_cmp (gpt_part_data->type, PARTITION_IRST_GUID)) gpt_part_data->irst = 1; + else if (!guid_cmp (gpt_part_data->type, PARTITION_CHROMEOS_KERNEL_GUID)) + gpt_part_data->chromeos_kernel = 1; + else if (!guid_cmp (gpt_part_data->type, PARTITION_BLS_BOOT_GUID)) + gpt_part_data->bls_boot = 1; return part; } @@ -1377,6 +1393,8 @@ gpt_partition_new (const PedDisk *disk, gpt_part_data->prep = 0; gpt_part_data->translated_name = 0; gpt_part_data->irst = 0; + gpt_part_data->chromeos_kernel = 0; + gpt_part_data->bls_boot = 0; uuid_generate ((unsigned char *) &gpt_part_data->uuid); swap_uuid_and_efi_guid (&gpt_part_data->uuid); memset (gpt_part_data->name, 0, sizeof gpt_part_data->name); @@ -1507,6 +1525,16 @@ gpt_partition_set_system (PedPartition *part, gpt_part_data->type = PARTITION_IRST_GUID; return 1; } + if (gpt_part_data->chromeos_kernel) + { + gpt_part_data->type = PARTITION_CHROMEOS_KERNEL_GUID; + return 1; + } + if (gpt_part_data->bls_boot) + { + gpt_part_data->type = PARTITION_BLS_BOOT_GUID; + return 1; + } if (fs_type) { @@ -1653,6 +1681,8 @@ gpt_partition_set_flag (PedPartition *part, PedPartitionFlag flag, int state) = gpt_part_data->msftrecv = gpt_part_data->prep = gpt_part_data->irst + = gpt_part_data->chromeos_kernel + = gpt_part_data->bls_boot = gpt_part_data->atvrecv = 0; return gpt_partition_set_system (part, part->fs_type); case PED_PARTITION_BIOS_GRUB: @@ -1668,6 +1698,8 @@ gpt_partition_set_flag (PedPartition *part, PedPartitionFlag flag, int state) = gpt_part_data->msftrecv = gpt_part_data->prep = gpt_part_data->irst + = gpt_part_data->chromeos_kernel + = gpt_part_data->bls_boot = gpt_part_data->atvrecv = 0; return gpt_partition_set_system (part, part->fs_type); case PED_PARTITION_RAID: @@ -1683,6 +1715,8 @@ gpt_partition_set_flag (PedPartition *part, PedPartitionFlag flag, int state) = gpt_part_data->msftrecv = gpt_part_data->prep = gpt_part_data->irst + = gpt_part_data->chromeos_kernel + = gpt_part_data->bls_boot = gpt_part_data->atvrecv = 0; return gpt_partition_set_system (part, part->fs_type); case PED_PARTITION_LVM: @@ -1698,6 +1732,8 @@ gpt_partition_set_flag (PedPartition *part, PedPartitionFlag flag, int state) = gpt_part_data->msftrecv = gpt_part_data->prep = gpt_part_data->irst + = gpt_part_data->chromeos_kernel + = gpt_part_data->bls_boot = gpt_part_data->atvrecv = 0; return gpt_partition_set_system (part, part->fs_type); case PED_PARTITION_SWAP: @@ -1713,6 +1749,8 @@ gpt_partition_set_flag (PedPartition *part, PedPartitionFlag flag, int state) = gpt_part_data->msftrecv = gpt_part_data->prep = gpt_part_data->irst + = gpt_part_data->chromeos_kernel + = gpt_part_data->bls_boot = gpt_part_data->atvrecv = 0; return gpt_partition_set_system (part, part->fs_type); case PED_PARTITION_HPSERVICE: @@ -1728,6 +1766,8 @@ gpt_partition_set_flag (PedPartition *part, PedPartitionFlag flag, int state) = gpt_part_data->msftrecv = gpt_part_data->prep = gpt_part_data->irst + = gpt_part_data->chromeos_kernel + = gpt_part_data->bls_boot = gpt_part_data->atvrecv = 0; return gpt_partition_set_system (part, part->fs_type); case PED_PARTITION_MSFT_RESERVED: @@ -1743,6 +1783,8 @@ gpt_partition_set_flag (PedPartition *part, PedPartitionFlag flag, int state) = gpt_part_data->msftrecv = gpt_part_data->prep = gpt_part_data->irst + = gpt_part_data->chromeos_kernel + = gpt_part_data->bls_boot = gpt_part_data->atvrecv = 0; return gpt_partition_set_system (part, part->fs_type); case PED_PARTITION_MSFT_DATA: @@ -1758,6 +1800,8 @@ gpt_partition_set_flag (PedPartition *part, PedPartitionFlag flag, int state) = gpt_part_data->msftrecv = gpt_part_data->prep = gpt_part_data->irst + = gpt_part_data->chromeos_kernel + = gpt_part_data->bls_boot = gpt_part_data->atvrecv = 0; gpt_part_data->msftdata = 1; } else { @@ -1777,6 +1821,7 @@ gpt_partition_set_flag (PedPartition *part, PedPartitionFlag flag, int state) = gpt_part_data->msftres = gpt_part_data->prep = gpt_part_data->irst + = gpt_part_data->chromeos_kernel = gpt_part_data->atvrecv = 0; return gpt_partition_set_system (part, part->fs_type); case PED_PARTITION_APPLE_TV_RECOVERY: @@ -1791,6 +1836,7 @@ gpt_partition_set_flag (PedPartition *part, PedPartitionFlag flag, int state) = gpt_part_data->msftres = gpt_part_data->msftdata = gpt_part_data->prep + = gpt_part_data->chromeos_kernel = gpt_part_data->msftrecv = 0; return gpt_partition_set_system (part, part->fs_type); case PED_PARTITION_PREP: @@ -1805,6 +1851,8 @@ gpt_partition_set_flag (PedPartition *part, PedPartitionFlag flag, int state) = gpt_part_data->msftres = gpt_part_data->irst = gpt_part_data->atvrecv + = gpt_part_data->chromeos_kernel + = gpt_part_data->bls_boot = gpt_part_data->msftrecv = 0; return gpt_partition_set_system (part, part->fs_type); case PED_PARTITION_IRST: @@ -1820,6 +1868,42 @@ gpt_partition_set_flag (PedPartition *part, PedPartitionFlag flag, int state) = gpt_part_data->msftdata = gpt_part_data->msftrecv = gpt_part_data->prep + = gpt_part_data->chromeos_kernel + = gpt_part_data->bls_boot + = gpt_part_data->atvrecv = 0; + return gpt_partition_set_system (part, part->fs_type); + case PED_PARTITION_CHROMEOS_KERNEL: + gpt_part_data->chromeos_kernel = state; + if (state) + gpt_part_data->boot + = gpt_part_data->bios_grub + = gpt_part_data->raid + = gpt_part_data->lvm + = gpt_part_data->swap + = gpt_part_data->hp_service + = gpt_part_data->msftres + = gpt_part_data->msftdata + = gpt_part_data->msftrecv + = gpt_part_data->atvrecv + = gpt_part_data->prep + = gpt_part_data->irst + = gpt_part_data->bls_boot = 0; + return gpt_partition_set_system (part, part->fs_type); + case PED_PARTITION_BLS_BOOT: + gpt_part_data->bls_boot = state; + if (state) + gpt_part_data->boot + = gpt_part_data->raid + = gpt_part_data->lvm + = gpt_part_data->swap + = gpt_part_data->bios_grub + = gpt_part_data->hp_service + = gpt_part_data->msftres + = gpt_part_data->msftdata + = gpt_part_data->msftrecv + = gpt_part_data->prep + = gpt_part_data->irst + = gpt_part_data->chromeos_kernel = gpt_part_data->atvrecv = 0; return gpt_partition_set_system (part, part->fs_type); case PED_PARTITION_HIDDEN: @@ -1872,8 +1956,12 @@ gpt_partition_get_flag (const PedPartition *part, PedPartitionFlag flag) return gpt_part_data->prep; case PED_PARTITION_IRST: return gpt_part_data->irst; + case PED_PARTITION_BLS_BOOT: + return gpt_part_data->bls_boot; case PED_PARTITION_SWAP: return gpt_part_data->swap; + case PED_PARTITION_CHROMEOS_KERNEL: + return gpt_part_data->chromeos_kernel; case PED_PARTITION_LBA: case PED_PARTITION_ROOT: default: @@ -1903,6 +1991,8 @@ gpt_partition_is_flag_available (const PedPartition *part, case PED_PARTITION_PREP: case PED_PARTITION_IRST: case PED_PARTITION_ESP: + case PED_PARTITION_CHROMEOS_KERNEL: + case PED_PARTITION_BLS_BOOT: return 1; case PED_PARTITION_ROOT: case PED_PARTITION_LBA: diff --git a/libparted/labels/loop.c b/libparted/labels/loop.c index 88e47f9..20aba5e 100644 --- a/libparted/labels/loop.c +++ b/libparted/labels/loop.c @@ -1,6 +1,7 @@ /* libparted - a library for manipulating disk partitions - Copyright (C) 1999-2000, 2007-2014, 2019 Free Software Foundation, Inc. + Copyright (C) 1999-2000, 2007-2014, 2019-2021 Free Software Foundation, + Inc. This 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/mac.c b/libparted/labels/mac.c index 8980885..75b59ac 100644 --- a/libparted/labels/mac.c +++ b/libparted/labels/mac.c @@ -1,7 +1,7 @@ /* libparted - a library for manipulating disk partitions - Copyright (C) 2000, 2002, 2004, 2007-2014, 2019 Free Software Foundation, - Inc. + Copyright (C) 2000, 2002, 2004, 2007-2014, 2019-2021 Free Software + Foundation, Inc. This program is free software; you can redistribute it and/or modify it under the terms of the GNU General Public License as published by @@ -560,20 +560,6 @@ _rawpart_analyse (MacRawPartition* raw_part, PedDisk* disk, int num) mac_part_data->data_region_length = PED_BE32_TO_CPU (raw_part->data_count); - /* boot region - we have no idea what this is for, but Mac OSX - * seems to put garbage here, and doesn't pay any attention to - * it afterwards. [clausen, dan burcaw] - */ -#if 0 - if (raw_part->boot_start) { - ped_exception_throw ( - PED_EXCEPTION_ERROR, - PED_EXCEPTION_CANCEL, - _("The boot region doesn't start at the start " - "of the partition.")); - goto error_destroy_part; - } -#endif mac_part_data->boot_region_length = PED_BE32_TO_CPU (raw_part->boot_count); diff --git a/libparted/labels/misc.h b/libparted/labels/misc.h index c1b5e3c..cfd1d71 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 Free Software Foundation, Inc. + Copyright (C) 2007, 2009-2014, 2019-2021 Free Software Foundation, Inc. This 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 328cd8d..015800e 100644 --- a/libparted/labels/pc98.c +++ b/libparted/labels/pc98.c @@ -1,6 +1,7 @@ /* libparted - a library for manipulating disk partitions - Copyright (C) 2000-2001, 2007-2014, 2019 Free Software Foundation, Inc. + Copyright (C) 2000-2001, 2007-2014, 2019-2021 Free Software Foundation, + Inc. This program is free software; you can redistribute it and/or modify it under the terms of the GNU General Public License as published by @@ -418,13 +419,8 @@ fill_raw_part (PC98RawPartition* raw_part, const PedPartition* part) return 0; } raw_part->end_cyl = PED_CPU_TO_LE16(c); -#if 0 - raw_part->end_head = h; - raw_part->end_sector = s; -#else raw_part->end_head = 0; raw_part->end_sector = 0; -#endif return 1; } diff --git a/libparted/labels/pt-tools.c b/libparted/labels/pt-tools.c index ff30df2..bfca0a8 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 Free Software Foundation, Inc. + Copyright (C) 2008-2014, 2019-2021 Free Software Foundation, Inc. This 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 be1daf1..88e5334 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 Free Software Foundation, Inc. + Copyright (C) 2008-2014, 2019-2021 Free Software Foundation, Inc. This 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 63c90bf..cbbf29a 100644 --- a/libparted/labels/rdb.c +++ b/libparted/labels/rdb.c @@ -2,8 +2,8 @@ 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 Free Software Foundation, - Inc. + Copyright (C) 2000-2001, 2004, 2007-2014, 2019-2021 Free Software + Foundation, Inc. This 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/sun.c b/libparted/labels/sun.c index 9b9c2c0..2718383 100644 --- a/libparted/labels/sun.c +++ b/libparted/labels/sun.c @@ -1,8 +1,8 @@ /* -*- 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 Free Software Foundation, - Inc. + Copyright (C) 2000-2001, 2005, 2007-2014, 2019-2021 Free Software + Foundation, Inc. This 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/libparted.c b/libparted/libparted.c index 00f5ff8..d46897f 100644 --- a/libparted/libparted.c +++ b/libparted/libparted.c @@ -1,6 +1,7 @@ /* libparted - a library for manipulating disk partitions - Copyright (C) 1999-2001, 2007-2014, 2019 Free Software Foundation, Inc. + Copyright (C) 1999-2001, 2007-2014, 2019-2021 Free Software Foundation, + Inc. This program is free software; you can redistribute it and/or modify it under the terms of the GNU General Public License as published by @@ -109,6 +110,7 @@ extern void ped_file_system_linux_swap_init (void); extern void ped_file_system_jfs_init (void); extern void ped_file_system_hfs_init (void); extern void ped_file_system_fat_init (void); +extern void ped_file_system_f2fs_init (void); extern void ped_file_system_ext2_init (void); extern void ped_file_system_nilfs2_init (void); extern void ped_file_system_btrfs_init (void); @@ -126,6 +128,7 @@ init_file_system_types () ped_file_system_jfs_init (); ped_file_system_hfs_init (); ped_file_system_fat_init (); + ped_file_system_f2fs_init (); ped_file_system_ext2_init (); ped_file_system_nilfs2_init (); ped_file_system_btrfs_init (); @@ -186,6 +189,7 @@ _init() extern void ped_file_system_nilfs2_done (void); extern void ped_file_system_ext2_done (void); extern void ped_file_system_fat_done (void); +extern void ped_file_system_f2fs_done (void); extern void ped_file_system_hfs_done (void); extern void ped_file_system_jfs_done (void); extern void ped_file_system_linux_swap_done (void); @@ -202,6 +206,7 @@ done_file_system_types () { ped_file_system_nilfs2_done (); ped_file_system_ext2_done (); + ped_file_system_f2fs_done (); ped_file_system_fat_done (); ped_file_system_hfs_done (); ped_file_system_jfs_done (); diff --git a/libparted/mbr.s b/libparted/mbr.s index b80c330..b94ae4f 100644 --- a/libparted/mbr.s +++ b/libparted/mbr.s @@ -1,6 +1,6 @@ ; libparted - a library for manipulating disk partitions -; Copyright (C) 1999-2000, 2007, 2009-2014, 2019 Free Software Foundation, -; Inc. +; Copyright (C) 1999-2000, 2007, 2009-2014, 2019-2021 Free Software +; Foundation, Inc. ; ; This 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/Makefile.am b/libparted/tests/Makefile.am index 58ac920..c92a3a3 100644 --- a/libparted/tests/Makefile.am +++ b/libparted/tests/Makefile.am @@ -1,5 +1,5 @@ # This file is part of GNU Parted -# Copyright (C) 1999-2001, 2007-2014, 2019 Free Software Foundation, Inc. +# Copyright (C) 1999-2001, 2007-2014, 2019-2021 Free Software Foundation, Inc. # # This file may be modified and/or distributed without restriction. diff --git a/libparted/tests/Makefile.in b/libparted/tests/Makefile.in index c2bbd08..f8c1d76 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 Free Software Foundation, Inc. +# Copyright (C) 1999-2001, 2007-2014, 2019-2021 Free Software Foundation, Inc. # # This file may be modified and/or distributed without restriction. VPATH = @srcdir@ @@ -101,9 +101,9 @@ am__aclocal_m4_deps = $(top_srcdir)/m4/00gnulib.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/calloc.m4 $(top_srcdir)/m4/canonicalize.m4 \ - $(top_srcdir)/m4/close.m4 $(top_srcdir)/m4/codeset.m4 \ - $(top_srcdir)/m4/config-h.m4 $(top_srcdir)/m4/configmake.m4 \ - $(top_srcdir)/m4/ctype.m4 $(top_srcdir)/m4/dirname.m4 \ + $(top_srcdir)/m4/clock_time.m4 $(top_srcdir)/m4/close.m4 \ + $(top_srcdir)/m4/codeset.m4 $(top_srcdir)/m4/config-h.m4 \ + $(top_srcdir)/m4/configmake.m4 $(top_srcdir)/m4/ctype.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 \ @@ -115,15 +115,13 @@ am__aclocal_m4_deps = $(top_srcdir)/m4/00gnulib.m4 \ $(top_srcdir)/m4/fsync.m4 $(top_srcdir)/m4/ftruncate.m4 \ $(top_srcdir)/m4/getcwd.m4 $(top_srcdir)/m4/getdtablesize.m4 \ $(top_srcdir)/m4/getopt.m4 $(top_srcdir)/m4/getpagesize.m4 \ - $(top_srcdir)/m4/getprogname.m4 $(top_srcdir)/m4/gettext.m4 \ - $(top_srcdir)/m4/gettimeofday.m4 $(top_srcdir)/m4/glibc21.m4 \ - $(top_srcdir)/m4/gnulib-common.m4 \ - $(top_srcdir)/m4/gnulib-comp.m4 \ - $(top_srcdir)/m4/host-cpu-c-abi.m4 $(top_srcdir)/m4/iconv.m4 \ + $(top_srcdir)/m4/getprogname.m4 $(top_srcdir)/m4/getrandom.m4 \ + $(top_srcdir)/m4/gettext.m4 $(top_srcdir)/m4/gettimeofday.m4 \ + $(top_srcdir)/m4/glibc21.m4 $(top_srcdir)/m4/gnulib-common.m4 \ + $(top_srcdir)/m4/gnulib-comp.m4 $(top_srcdir)/m4/iconv.m4 \ $(top_srcdir)/m4/include_next.m4 $(top_srcdir)/m4/inet_pton.m4 \ $(top_srcdir)/m4/intl-thread-locale.m4 \ - $(top_srcdir)/m4/intlmacosx.m4 \ - $(top_srcdir)/m4/inttypes-pri.m4 $(top_srcdir)/m4/inttypes.m4 \ + $(top_srcdir)/m4/intlmacosx.m4 $(top_srcdir)/m4/inttypes.m4 \ $(top_srcdir)/m4/ioctl.m4 $(top_srcdir)/m4/isblank.m4 \ $(top_srcdir)/m4/langinfo_h.m4 $(top_srcdir)/m4/largefile.m4 \ $(top_srcdir)/m4/lcmessage.m4 $(top_srcdir)/m4/lib-ignore.m4 \ @@ -133,25 +131,26 @@ am__aclocal_m4_deps = $(top_srcdir)/m4/00gnulib.m4 \ $(top_srcdir)/m4/locale-fr.m4 $(top_srcdir)/m4/locale-ja.m4 \ $(top_srcdir)/m4/locale-tr.m4 $(top_srcdir)/m4/locale-zh.m4 \ $(top_srcdir)/m4/locale_h.m4 $(top_srcdir)/m4/localeconv.m4 \ - $(top_srcdir)/m4/localename.m4 \ - $(top_srcdir)/m4/localtime-buffer.m4 $(top_srcdir)/m4/lock.m4 \ - $(top_srcdir)/m4/longlong.m4 $(top_srcdir)/m4/lseek.m4 \ - $(top_srcdir)/m4/lstat.m4 $(top_srcdir)/m4/ltoptions.m4 \ - $(top_srcdir)/m4/ltsugar.m4 $(top_srcdir)/m4/ltversion.m4 \ - $(top_srcdir)/m4/lt~obsolete.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/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/localename.m4 $(top_srcdir)/m4/lock.m4 \ + $(top_srcdir)/m4/lseek.m4 $(top_srcdir)/m4/lstat.m4 \ + $(top_srcdir)/m4/ltoptions.m4 $(top_srcdir)/m4/ltsugar.m4 \ + $(top_srcdir)/m4/ltversion.m4 $(top_srcdir)/m4/lt~obsolete.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/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/nanosleep.m4 $(top_srcdir)/m4/netinet_in_h.m4 \ + $(top_srcdir)/m4/musl.m4 $(top_srcdir)/m4/nanosleep.m4 \ + $(top_srcdir)/m4/netinet_in_h.m4 \ $(top_srcdir)/m4/nl_langinfo.m4 $(top_srcdir)/m4/nls.m4 \ $(top_srcdir)/m4/nocrash.m4 $(top_srcdir)/m4/o-direct.m4 \ $(top_srcdir)/m4/off_t.m4 $(top_srcdir)/m4/open-cloexec.m4 \ - $(top_srcdir)/m4/open.m4 $(top_srcdir)/m4/pathmax.m4 \ - $(top_srcdir)/m4/perror.m4 $(top_srcdir)/m4/pipe.m4 \ + $(top_srcdir)/m4/open-slash.m4 $(top_srcdir)/m4/open.m4 \ + $(top_srcdir)/m4/pathmax.m4 $(top_srcdir)/m4/perror.m4 \ + $(top_srcdir)/m4/pid_t.m4 $(top_srcdir)/m4/pipe.m4 \ $(top_srcdir)/m4/po.m4 $(top_srcdir)/m4/priv-set.m4 \ $(top_srcdir)/m4/progtest.m4 \ $(top_srcdir)/m4/pthread-thread.m4 \ @@ -163,9 +162,10 @@ am__aclocal_m4_deps = $(top_srcdir)/m4/00gnulib.m4 \ $(top_srcdir)/m4/readlink.m4 $(top_srcdir)/m4/realloc.m4 \ $(top_srcdir)/m4/regex.m4 $(top_srcdir)/m4/rpmatch.m4 \ $(top_srcdir)/m4/safe-read.m4 $(top_srcdir)/m4/sched_h.m4 \ - $(top_srcdir)/m4/select.m4 $(top_srcdir)/m4/setenv.m4 \ - $(top_srcdir)/m4/setlocale.m4 $(top_srcdir)/m4/sigaction.m4 \ - $(top_srcdir)/m4/signal_h.m4 \ + $(top_srcdir)/m4/select.m4 $(top_srcdir)/m4/semaphore.m4 \ + $(top_srcdir)/m4/setenv.m4 $(top_srcdir)/m4/setlocale.m4 \ + $(top_srcdir)/m4/setlocale_null.m4 \ + $(top_srcdir)/m4/sigaction.m4 $(top_srcdir)/m4/signal_h.m4 \ $(top_srcdir)/m4/signalblocking.m4 $(top_srcdir)/m4/sleep.m4 \ $(top_srcdir)/m4/socketlib.m4 $(top_srcdir)/m4/sockets.m4 \ $(top_srcdir)/m4/socklen.m4 $(top_srcdir)/m4/sockpfaf.m4 \ @@ -180,6 +180,7 @@ am__aclocal_m4_deps = $(top_srcdir)/m4/00gnulib.m4 \ $(top_srcdir)/m4/strnlen.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 \ @@ -188,14 +189,15 @@ am__aclocal_m4_deps = $(top_srcdir)/m4/00gnulib.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/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/xstrndup.m4 $(top_srcdir)/m4/xstrtol.m4 \ - $(top_srcdir)/m4/yield.m4 $(top_srcdir)/configure.ac + $(top_srcdir)/m4/yield.m4 $(top_srcdir)/m4/zzgnulib.m4 \ + $(top_srcdir)/configure.ac am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \ $(ACLOCAL_M4) DIST_COMMON = $(srcdir)/Makefile.am $(am__DIST_COMMON) @@ -528,6 +530,7 @@ BUILDINFO = @BUILDINFO@ CC = @CC@ CCDEPMODE = @CCDEPMODE@ CFLAGS = @CFLAGS@ +CFLAG_VISIBILITY = @CFLAG_VISIBILITY@ CHECK_CFLAGS = @CHECK_CFLAGS@ CHECK_LIBS = @CHECK_LIBS@ CONFIG_INCLUDE = @CONFIG_INCLUDE@ @@ -562,6 +565,8 @@ GMSGFMT = @GMSGFMT@ GMSGFMT_015 = @GMSGFMT_015@ GNULIB_ACCEPT = @GNULIB_ACCEPT@ GNULIB_ACCEPT4 = @GNULIB_ACCEPT4@ +GNULIB_ACCESS = @GNULIB_ACCESS@ +GNULIB_ALIGNED_ALLOC = @GNULIB_ALIGNED_ALLOC@ GNULIB_ATOLL = @GNULIB_ATOLL@ GNULIB_BIND = @GNULIB_BIND@ GNULIB_BTOWC = @GNULIB_BTOWC@ @@ -572,6 +577,7 @@ GNULIB_CHOWN = @GNULIB_CHOWN@ GNULIB_CLOSE = @GNULIB_CLOSE@ GNULIB_CONNECT = @GNULIB_CONNECT@ GNULIB_COPY_FILE_RANGE = @GNULIB_COPY_FILE_RANGE@ +GNULIB_CREAT = @GNULIB_CREAT@ GNULIB_CTIME = @GNULIB_CTIME@ GNULIB_DPRINTF = @GNULIB_DPRINTF@ GNULIB_DUP = @GNULIB_DUP@ @@ -619,19 +625,23 @@ GNULIB_GETCWD = @GNULIB_GETCWD@ GNULIB_GETDELIM = @GNULIB_GETDELIM@ GNULIB_GETDOMAINNAME = @GNULIB_GETDOMAINNAME@ GNULIB_GETDTABLESIZE = @GNULIB_GETDTABLESIZE@ +GNULIB_GETENTROPY = @GNULIB_GETENTROPY@ GNULIB_GETGROUPS = @GNULIB_GETGROUPS@ GNULIB_GETHOSTNAME = @GNULIB_GETHOSTNAME@ GNULIB_GETLINE = @GNULIB_GETLINE@ GNULIB_GETLOADAVG = @GNULIB_GETLOADAVG@ GNULIB_GETLOGIN = @GNULIB_GETLOGIN@ GNULIB_GETLOGIN_R = @GNULIB_GETLOGIN_R@ +GNULIB_GETOPT_POSIX = @GNULIB_GETOPT_POSIX@ GNULIB_GETPAGESIZE = @GNULIB_GETPAGESIZE@ GNULIB_GETPASS = @GNULIB_GETPASS@ GNULIB_GETPEERNAME = @GNULIB_GETPEERNAME@ +GNULIB_GETRANDOM = @GNULIB_GETRANDOM@ GNULIB_GETSOCKNAME = @GNULIB_GETSOCKNAME@ GNULIB_GETSOCKOPT = @GNULIB_GETSOCKOPT@ GNULIB_GETSUBOPT = @GNULIB_GETSUBOPT@ GNULIB_GETTIMEOFDAY = @GNULIB_GETTIMEOFDAY@ +GNULIB_GETUMASK = @GNULIB_GETUMASK@ GNULIB_GETUSERSHELL = @GNULIB_GETUSERSHELL@ GNULIB_GL_UNISTD_H_GETOPT = @GNULIB_GL_UNISTD_H_GETOPT@ GNULIB_GRANTPT = @GNULIB_GRANTPT@ @@ -645,6 +655,8 @@ GNULIB_ISATTY = @GNULIB_ISATTY@ GNULIB_ISBLANK = @GNULIB_ISBLANK@ GNULIB_ISWBLANK = @GNULIB_ISWBLANK@ GNULIB_ISWCTYPE = @GNULIB_ISWCTYPE@ +GNULIB_ISWDIGIT = @GNULIB_ISWDIGIT@ +GNULIB_ISWXDIGIT = @GNULIB_ISWXDIGIT@ GNULIB_LCHMOD = @GNULIB_LCHMOD@ GNULIB_LCHOWN = @GNULIB_LCHOWN@ GNULIB_LINK = @GNULIB_LINK@ @@ -705,6 +717,7 @@ GNULIB_PERROR = @GNULIB_PERROR@ GNULIB_PIPE = @GNULIB_PIPE@ GNULIB_PIPE2 = @GNULIB_PIPE2@ GNULIB_POPEN = @GNULIB_POPEN@ +GNULIB_POSIX_MEMALIGN = @GNULIB_POSIX_MEMALIGN@ GNULIB_POSIX_OPENPT = @GNULIB_POSIX_OPENPT@ GNULIB_PREAD = @GNULIB_PREAD@ GNULIB_PRINTF = @GNULIB_PRINTF@ @@ -753,9 +766,12 @@ GNULIB_SENDTO = @GNULIB_SENDTO@ GNULIB_SETENV = @GNULIB_SETENV@ GNULIB_SETHOSTNAME = @GNULIB_SETHOSTNAME@ GNULIB_SETLOCALE = @GNULIB_SETLOCALE@ +GNULIB_SETLOCALE_NULL = @GNULIB_SETLOCALE_NULL@ GNULIB_SETSOCKOPT = @GNULIB_SETSOCKOPT@ GNULIB_SHUTDOWN = @GNULIB_SHUTDOWN@ +GNULIB_SIGABBREV_NP = @GNULIB_SIGABBREV_NP@ GNULIB_SIGACTION = @GNULIB_SIGACTION@ +GNULIB_SIGDESCR_NP = @GNULIB_SIGDESCR_NP@ GNULIB_SIGNAL_H_SIGPIPE = @GNULIB_SIGNAL_H_SIGPIPE@ GNULIB_SIGPROCMASK = @GNULIB_SIGPROCMASK@ GNULIB_SLEEP = @GNULIB_SLEEP@ @@ -771,6 +787,7 @@ GNULIB_STRCASESTR = @GNULIB_STRCASESTR@ GNULIB_STRCHRNUL = @GNULIB_STRCHRNUL@ GNULIB_STRDUP = @GNULIB_STRDUP@ GNULIB_STRERROR = @GNULIB_STRERROR@ +GNULIB_STRERRORNAME_NP = @GNULIB_STRERRORNAME_NP@ GNULIB_STRERROR_R = @GNULIB_STRERROR_R@ GNULIB_STRFTIME = @GNULIB_STRFTIME@ GNULIB_STRNCAT = @GNULIB_STRNCAT@ @@ -854,11 +871,13 @@ GNULIB_WMEMCHR = @GNULIB_WMEMCHR@ GNULIB_WMEMCMP = @GNULIB_WMEMCMP@ GNULIB_WMEMCPY = @GNULIB_WMEMCPY@ GNULIB_WMEMMOVE = @GNULIB_WMEMMOVE@ +GNULIB_WMEMPCPY = @GNULIB_WMEMPCPY@ GNULIB_WMEMSET = @GNULIB_WMEMSET@ GNULIB_WRITE = @GNULIB_WRITE@ GNULIB__EXIT = @GNULIB__EXIT@ GREP = @GREP@ HAVE_ACCEPT4 = @HAVE_ACCEPT4@ +HAVE_ALIGNED_ALLOC = @HAVE_ALIGNED_ALLOC@ HAVE_ALLOCA_H = @HAVE_ALLOCA_H@ HAVE_ARPA_INET_H = @HAVE_ARPA_INET_H@ HAVE_ATOLL = @HAVE_ATOLL@ @@ -868,12 +887,17 @@ HAVE_CANONICALIZE_FILE_NAME = @HAVE_CANONICALIZE_FILE_NAME@ HAVE_CHOWN = @HAVE_CHOWN@ HAVE_COPY_FILE_RANGE = @HAVE_COPY_FILE_RANGE@ HAVE_CRTDEFS_H = @HAVE_CRTDEFS_H@ +HAVE_DECL_ECVT = @HAVE_DECL_ECVT@ HAVE_DECL_ENVIRON = @HAVE_DECL_ENVIRON@ +HAVE_DECL_EXECVPE = @HAVE_DECL_EXECVPE@ HAVE_DECL_FCHDIR = @HAVE_DECL_FCHDIR@ +HAVE_DECL_FCLOSEALL = @HAVE_DECL_FCLOSEALL@ +HAVE_DECL_FCVT = @HAVE_DECL_FCVT@ HAVE_DECL_FDATASYNC = @HAVE_DECL_FDATASYNC@ HAVE_DECL_FPURGE = @HAVE_DECL_FPURGE@ HAVE_DECL_FSEEKO = @HAVE_DECL_FSEEKO@ HAVE_DECL_FTELLO = @HAVE_DECL_FTELLO@ +HAVE_DECL_GCVT = @HAVE_DECL_GCVT@ HAVE_DECL_GETDELIM = @HAVE_DECL_GETDELIM@ HAVE_DECL_GETDOMAINNAME = @HAVE_DECL_GETDOMAINNAME@ HAVE_DECL_GETLINE = @HAVE_DECL_GETLINE@ @@ -907,10 +931,10 @@ HAVE_DECL_TRUNCATE = @HAVE_DECL_TRUNCATE@ HAVE_DECL_TTYNAME_R = @HAVE_DECL_TTYNAME_R@ HAVE_DECL_UNSETENV = @HAVE_DECL_UNSETENV@ HAVE_DECL_VSNPRINTF = @HAVE_DECL_VSNPRINTF@ +HAVE_DECL_WCSDUP = @HAVE_DECL_WCSDUP@ HAVE_DECL_WCTOB = @HAVE_DECL_WCTOB@ HAVE_DECL_WCWIDTH = @HAVE_DECL_WCWIDTH@ HAVE_DPRINTF = @HAVE_DPRINTF@ -HAVE_DUP2 = @HAVE_DUP2@ HAVE_DUP3 = @HAVE_DUP3@ HAVE_DUPLOCALE = @HAVE_DUPLOCALE@ HAVE_EUIDACCESS = @HAVE_EUIDACCESS@ @@ -932,14 +956,17 @@ HAVE_FTELLO = @HAVE_FTELLO@ HAVE_FTRUNCATE = @HAVE_FTRUNCATE@ HAVE_FUTIMENS = @HAVE_FUTIMENS@ HAVE_GETDTABLESIZE = @HAVE_GETDTABLESIZE@ +HAVE_GETENTROPY = @HAVE_GETENTROPY@ HAVE_GETGROUPS = @HAVE_GETGROUPS@ HAVE_GETHOSTNAME = @HAVE_GETHOSTNAME@ HAVE_GETLOGIN = @HAVE_GETLOGIN@ HAVE_GETOPT_H = @HAVE_GETOPT_H@ HAVE_GETPAGESIZE = @HAVE_GETPAGESIZE@ HAVE_GETPASS = @HAVE_GETPASS@ +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_IMAXDIV_T = @HAVE_IMAXDIV_T@ @@ -958,7 +985,6 @@ HAVE_LCHMOD = @HAVE_LCHMOD@ HAVE_LCHOWN = @HAVE_LCHOWN@ HAVE_LINK = @HAVE_LINK@ HAVE_LINKAT = @HAVE_LINKAT@ -HAVE_LONG_LONG_INT = @HAVE_LONG_LONG_INT@ HAVE_LSTAT = @HAVE_LSTAT@ HAVE_MAX_ALIGN_T = @HAVE_MAX_ALIGN_T@ HAVE_MBRLEN = @HAVE_MBRLEN@ @@ -968,7 +994,6 @@ HAVE_MBSLEN = @HAVE_MBSLEN@ HAVE_MBSNRTOWCS = @HAVE_MBSNRTOWCS@ HAVE_MBSRTOWCS = @HAVE_MBSRTOWCS@ HAVE_MBTOWC = @HAVE_MBTOWC@ -HAVE_MEMCHR = @HAVE_MEMCHR@ HAVE_MEMPCPY = @HAVE_MEMPCPY@ HAVE_MKDIRAT = @HAVE_MKDIRAT@ HAVE_MKDTEMP = @HAVE_MKDTEMP@ @@ -991,6 +1016,7 @@ HAVE_PCLOSE = @HAVE_PCLOSE@ HAVE_PIPE = @HAVE_PIPE@ HAVE_PIPE2 = @HAVE_PIPE2@ HAVE_POPEN = @HAVE_POPEN@ +HAVE_POSIX_MEMALIGN = @HAVE_POSIX_MEMALIGN@ HAVE_POSIX_OPENPT = @HAVE_POSIX_OPENPT@ HAVE_POSIX_SIGNALBLOCKING = @HAVE_POSIX_SIGNALBLOCKING@ HAVE_PREAD = @HAVE_PREAD@ @@ -1076,7 +1102,9 @@ HAVE_SECURE_GETENV = @HAVE_SECURE_GETENV@ HAVE_SETENV = @HAVE_SETENV@ HAVE_SETHOSTNAME = @HAVE_SETHOSTNAME@ HAVE_SETSTATE = @HAVE_SETSTATE@ +HAVE_SIGABBREV_NP = @HAVE_SIGABBREV_NP@ HAVE_SIGACTION = @HAVE_SIGACTION@ +HAVE_SIGDESCR_NP = @HAVE_SIGDESCR_NP@ HAVE_SIGHANDLER_T = @HAVE_SIGHANDLER_T@ HAVE_SIGINFO_T = @HAVE_SIGINFO_T@ HAVE_SIGNED_SIG_ATOMIC_T = @HAVE_SIGNED_SIG_ATOMIC_T@ @@ -1089,6 +1117,7 @@ HAVE_STPCPY = @HAVE_STPCPY@ HAVE_STPNCPY = @HAVE_STPNCPY@ HAVE_STRCASESTR = @HAVE_STRCASESTR@ HAVE_STRCHRNUL = @HAVE_STRCHRNUL@ +HAVE_STRERRORNAME_NP = @HAVE_STRERRORNAME_NP@ HAVE_STRPBRK = @HAVE_STRPBRK@ HAVE_STRPTIME = @HAVE_STRPTIME@ HAVE_STRSEP = @HAVE_STRSEP@ @@ -1111,6 +1140,7 @@ HAVE_SYS_INTTYPES_H = @HAVE_SYS_INTTYPES_H@ HAVE_SYS_IOCTL_H = @HAVE_SYS_IOCTL_H@ HAVE_SYS_LOADAVG_H = @HAVE_SYS_LOADAVG_H@ HAVE_SYS_PARAM_H = @HAVE_SYS_PARAM_H@ +HAVE_SYS_RANDOM_H = @HAVE_SYS_RANDOM_H@ HAVE_SYS_SELECT_H = @HAVE_SYS_SELECT_H@ HAVE_SYS_SOCKET_H = @HAVE_SYS_SOCKET_H@ HAVE_SYS_TIME_H = @HAVE_SYS_TIME_H@ @@ -1119,15 +1149,14 @@ HAVE_SYS_UIO_H = @HAVE_SYS_UIO_H@ HAVE_TIMEGM = @HAVE_TIMEGM@ HAVE_TIMEZONE_T = @HAVE_TIMEZONE_T@ HAVE_TYPE_VOLATILE_SIG_ATOMIC_T = @HAVE_TYPE_VOLATILE_SIG_ATOMIC_T@ -HAVE_TZSET = @HAVE_TZSET@ HAVE_UNISTD_H = @HAVE_UNISTD_H@ HAVE_UNLINKAT = @HAVE_UNLINKAT@ HAVE_UNLOCKPT = @HAVE_UNLOCKPT@ -HAVE_UNSIGNED_LONG_LONG_INT = @HAVE_UNSIGNED_LONG_LONG_INT@ HAVE_USLEEP = @HAVE_USLEEP@ HAVE_UTIMENSAT = @HAVE_UTIMENSAT@ HAVE_VASPRINTF = @HAVE_VASPRINTF@ HAVE_VDPRINTF = @HAVE_VDPRINTF@ +HAVE_VISIBILITY = @HAVE_VISIBILITY@ HAVE_WCHAR_H = @HAVE_WCHAR_H@ HAVE_WCHAR_T = @HAVE_WCHAR_T@ HAVE_WCPCPY = @HAVE_WCPCPY@ @@ -1166,6 +1195,7 @@ HAVE_WMEMCHR = @HAVE_WMEMCHR@ HAVE_WMEMCMP = @HAVE_WMEMCMP@ HAVE_WMEMCPY = @HAVE_WMEMCPY@ HAVE_WMEMMOVE = @HAVE_WMEMMOVE@ +HAVE_WMEMPCPY = @HAVE_WMEMPCPY@ HAVE_WMEMSET = @HAVE_WMEMSET@ HAVE_WS2TCPIP_H = @HAVE_WS2TCPIP_H@ HAVE_XLOCALE_H = @HAVE_XLOCALE_H@ @@ -1191,16 +1221,28 @@ LIBICONV = @LIBICONV@ LIBINTL = @LIBINTL@ LIBMULTITHREAD = @LIBMULTITHREAD@ LIBOBJS = @LIBOBJS@ +LIBPMULTITHREAD = @LIBPMULTITHREAD@ +LIBPTHREAD = @LIBPTHREAD@ LIBS = @LIBS@ LIBSOCKET = @LIBSOCKET@ +LIBSTDTHREAD = @LIBSTDTHREAD@ LIBTESTS_LIBDEPS = @LIBTESTS_LIBDEPS@ LIBTHREAD = @LIBTHREAD@ LIBTOOL = @LIBTOOL@ LIB_BLKID = @LIB_BLKID@ +LIB_CLOCK_GETTIME = @LIB_CLOCK_GETTIME@ +LIB_GETRANDOM = @LIB_GETRANDOM@ +LIB_HARD_LOCALE = @LIB_HARD_LOCALE@ +LIB_MBRTOWC = @LIB_MBRTOWC@ LIB_NANOSLEEP = @LIB_NANOSLEEP@ +LIB_NL_LANGINFO = @LIB_NL_LANGINFO@ LIB_PTHREAD = @LIB_PTHREAD@ LIB_PTHREAD_SIGMASK = @LIB_PTHREAD_SIGMASK@ +LIB_SCHED_YIELD = @LIB_SCHED_YIELD@ LIB_SELECT = @LIB_SELECT@ +LIB_SEMAPHORE = @LIB_SEMAPHORE@ +LIB_SETLOCALE = @LIB_SETLOCALE@ +LIB_SETLOCALE_NULL = @LIB_SETLOCALE_NULL@ LIMITS_H = @LIMITS_H@ LIPO = @LIPO@ LN_S = @LN_S@ @@ -1249,6 +1291,7 @@ NEXT_AS_FIRST_DIRECTIVE_STDIO_H = @NEXT_AS_FIRST_DIRECTIVE_STDIO_H@ NEXT_AS_FIRST_DIRECTIVE_STDLIB_H = @NEXT_AS_FIRST_DIRECTIVE_STDLIB_H@ NEXT_AS_FIRST_DIRECTIVE_STRING_H = @NEXT_AS_FIRST_DIRECTIVE_STRING_H@ NEXT_AS_FIRST_DIRECTIVE_SYS_IOCTL_H = @NEXT_AS_FIRST_DIRECTIVE_SYS_IOCTL_H@ +NEXT_AS_FIRST_DIRECTIVE_SYS_RANDOM_H = @NEXT_AS_FIRST_DIRECTIVE_SYS_RANDOM_H@ NEXT_AS_FIRST_DIRECTIVE_SYS_SELECT_H = @NEXT_AS_FIRST_DIRECTIVE_SYS_SELECT_H@ NEXT_AS_FIRST_DIRECTIVE_SYS_SOCKET_H = @NEXT_AS_FIRST_DIRECTIVE_SYS_SOCKET_H@ NEXT_AS_FIRST_DIRECTIVE_SYS_STAT_H = @NEXT_AS_FIRST_DIRECTIVE_SYS_STAT_H@ @@ -1278,6 +1321,7 @@ NEXT_STDIO_H = @NEXT_STDIO_H@ NEXT_STDLIB_H = @NEXT_STDLIB_H@ NEXT_STRING_H = @NEXT_STRING_H@ NEXT_SYS_IOCTL_H = @NEXT_SYS_IOCTL_H@ +NEXT_SYS_RANDOM_H = @NEXT_SYS_RANDOM_H@ NEXT_SYS_SELECT_H = @NEXT_SYS_SELECT_H@ NEXT_SYS_SOCKET_H = @NEXT_SYS_SOCKET_H@ NEXT_SYS_STAT_H = @NEXT_SYS_STAT_H@ @@ -1314,21 +1358,24 @@ POSUB = @POSUB@ PRAGMA_COLUMNS = @PRAGMA_COLUMNS@ PRAGMA_SYSTEM_HEADER = @PRAGMA_SYSTEM_HEADER@ PRIPTR_PREFIX = @PRIPTR_PREFIX@ -PRI_MACROS_BROKEN = @PRI_MACROS_BROKEN@ PTHREAD_H_DEFINES_STRUCT_TIMESPEC = @PTHREAD_H_DEFINES_STRUCT_TIMESPEC@ PTRDIFF_T_SUFFIX = @PTRDIFF_T_SUFFIX@ RANLIB = @RANLIB@ +REPLACE_ACCESS = @REPLACE_ACCESS@ +REPLACE_ALIGNED_ALLOC = @REPLACE_ALIGNED_ALLOC@ REPLACE_BTOWC = @REPLACE_BTOWC@ REPLACE_CALLOC = @REPLACE_CALLOC@ REPLACE_CANONICALIZE_FILE_NAME = @REPLACE_CANONICALIZE_FILE_NAME@ REPLACE_CHOWN = @REPLACE_CHOWN@ REPLACE_CLOSE = @REPLACE_CLOSE@ +REPLACE_CREAT = @REPLACE_CREAT@ REPLACE_CTIME = @REPLACE_CTIME@ REPLACE_DPRINTF = @REPLACE_DPRINTF@ REPLACE_DUP = @REPLACE_DUP@ REPLACE_DUP2 = @REPLACE_DUP2@ REPLACE_DUPLOCALE = @REPLACE_DUPLOCALE@ REPLACE_FACCESSAT = @REPLACE_FACCESSAT@ +REPLACE_FCHMODAT = @REPLACE_FCHMODAT@ REPLACE_FCHOWNAT = @REPLACE_FCHOWNAT@ REPLACE_FCLOSE = @REPLACE_FCLOSE@ REPLACE_FCNTL = @REPLACE_FCNTL@ @@ -1356,6 +1403,7 @@ REPLACE_GETLINE = @REPLACE_GETLINE@ REPLACE_GETLOGIN_R = @REPLACE_GETLOGIN_R@ REPLACE_GETPAGESIZE = @REPLACE_GETPAGESIZE@ REPLACE_GETPASS = @REPLACE_GETPASS@ +REPLACE_GETRANDOM = @REPLACE_GETRANDOM@ REPLACE_GETTIMEOFDAY = @REPLACE_GETTIMEOFDAY@ REPLACE_GMTIME = @REPLACE_GMTIME@ REPLACE_INET_NTOP = @REPLACE_INET_NTOP@ @@ -1365,6 +1413,8 @@ REPLACE_IOCTL = @REPLACE_IOCTL@ REPLACE_ISATTY = @REPLACE_ISATTY@ REPLACE_ISWBLANK = @REPLACE_ISWBLANK@ REPLACE_ISWCNTRL = @REPLACE_ISWCNTRL@ +REPLACE_ISWDIGIT = @REPLACE_ISWDIGIT@ +REPLACE_ISWXDIGIT = @REPLACE_ISWXDIGIT@ REPLACE_LCHOWN = @REPLACE_LCHOWN@ REPLACE_LINK = @REPLACE_LINK@ REPLACE_LINKAT = @REPLACE_LINKAT@ @@ -1397,6 +1447,7 @@ REPLACE_OPEN = @REPLACE_OPEN@ REPLACE_OPENAT = @REPLACE_OPENAT@ REPLACE_PERROR = @REPLACE_PERROR@ REPLACE_POPEN = @REPLACE_POPEN@ +REPLACE_POSIX_MEMALIGN = @REPLACE_POSIX_MEMALIGN@ REPLACE_PREAD = @REPLACE_PREAD@ REPLACE_PRINTF = @REPLACE_PRINTF@ REPLACE_PSELECT = @REPLACE_PSELECT@ @@ -1485,6 +1536,7 @@ REPLACE_STRCASESTR = @REPLACE_STRCASESTR@ REPLACE_STRCHRNUL = @REPLACE_STRCHRNUL@ REPLACE_STRDUP = @REPLACE_STRDUP@ REPLACE_STRERROR = @REPLACE_STRERROR@ +REPLACE_STRERRORNAME_NP = @REPLACE_STRERRORNAME_NP@ REPLACE_STRERROR_R = @REPLACE_STRERROR_R@ REPLACE_STRFTIME = @REPLACE_STRFTIME@ REPLACE_STRNCAT = @REPLACE_STRNCAT@ @@ -1522,13 +1574,13 @@ REPLACE_WCRTOMB = @REPLACE_WCRTOMB@ REPLACE_WCSFTIME = @REPLACE_WCSFTIME@ REPLACE_WCSNRTOMBS = @REPLACE_WCSNRTOMBS@ REPLACE_WCSRTOMBS = @REPLACE_WCSRTOMBS@ +REPLACE_WCSTOK = @REPLACE_WCSTOK@ REPLACE_WCSWIDTH = @REPLACE_WCSWIDTH@ REPLACE_WCTOB = @REPLACE_WCTOB@ REPLACE_WCTOMB = @REPLACE_WCTOMB@ REPLACE_WCWIDTH = @REPLACE_WCWIDTH@ REPLACE_WRITE = @REPLACE_WRITE@ SED = @SED@ -SELINUX_LIBS = @SELINUX_LIBS@ SET_MAKE = @SET_MAKE@ SHELL = @SHELL@ SIG_ATOMIC_T_SUFFIX = @SIG_ATOMIC_T_SUFFIX@ @@ -1547,6 +1599,7 @@ UINT32_MAX_LT_UINTMAX_MAX = @UINT32_MAX_LT_UINTMAX_MAX@ UINT64_MAX_EQ_ULONG_MAX = @UINT64_MAX_EQ_ULONG_MAX@ UNDEFINE_STRTOK_R = @UNDEFINE_STRTOK_R@ UNISTD_H_DEFINES_STRUCT_TIMESPEC = @UNISTD_H_DEFINES_STRUCT_TIMESPEC@ +UNISTD_H_HAVE_SYS_RANDOM_H = @UNISTD_H_HAVE_SYS_RANDOM_H@ UNISTD_H_HAVE_WINSOCK2_H = @UNISTD_H_HAVE_WINSOCK2_H@ UNISTD_H_HAVE_WINSOCK2_H_AND_USE_SOCKETS = @UNISTD_H_HAVE_WINSOCK2_H_AND_USE_SOCKETS@ USE_NLS = @USE_NLS@ diff --git a/libparted/tests/t1000-label.sh b/libparted/tests/t1000-label.sh index c508c69..b3b5a42 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 Free Software Foundation, Inc. +# Copyright (C) 2007-2014, 2019-2021 Free Software Foundation, Inc. # This 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/t2000-disk.sh b/libparted/tests/t2000-disk.sh index 050178f..4d21529 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 Free Software Foundation, Inc. +# Copyright (C) 2007-2014, 2019-2021 Free Software Foundation, Inc. # This 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 924d4a2..5e1bc7a 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 Free Software Foundation, Inc. +# Copyright (C) 2007-2014, 2019-2021 Free Software Foundation, Inc. # This 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 56615f5..da8750c 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 Free Software Foundation, Inc. +# Copyright (C) 2007-2014, 2019-2021 Free Software Foundation, Inc. # This 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/timer.c b/libparted/timer.c index 94a9287..efef4bd 100644 --- a/libparted/timer.c +++ b/libparted/timer.c @@ -1,6 +1,7 @@ /* libparted - a library for manipulating disk partitions - Copyright (C) 2001, 2007, 2009-2014, 2019 Free Software Foundation, Inc. + Copyright (C) 2001, 2007, 2009-2014, 2019-2021 Free Software Foundation, + Inc. This 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/unit.c b/libparted/unit.c index 7cc98fc..b53f1bb 100644 --- a/libparted/unit.c +++ b/libparted/unit.c @@ -1,6 +1,7 @@ /* libparted - a library for manipulating disk partitions - Copyright (C) 2005, 2007, 2009-2014, 2019 Free Software Foundation, Inc. + Copyright (C) 2005, 2007, 2009-2014, 2019-2021 Free Software Foundation, + Inc. This program is free software; you can redistribute it and/or modify it under the terms of the GNU General Public License as published by diff --git a/m4/00gnulib.m4 b/m4/00gnulib.m4 index e3e0fb6..14628c3 100644 --- a/m4/00gnulib.m4 +++ b/m4/00gnulib.m4 @@ -1,43 +1,82 @@ -# 00gnulib.m4 serial 3 -dnl Copyright (C) 2009-2019 Free Software Foundation, Inc. +# 00gnulib.m4 serial 8 +dnl Copyright (C) 2009-2020 Free Software Foundation, Inc. dnl This file is free software; the Free Software Foundation dnl gives unlimited permission to copy and/or distribute it, dnl with or without modifications, as long as this notice is preserved. dnl This file must be named something that sorts before all other -dnl gnulib-provided .m4 files. It is needed until such time as we can -dnl assume Autoconf 2.64, with its improved AC_DEFUN_ONCE and -dnl m4_divert semantics. +dnl gnulib-provided .m4 files. It is needed until the clang fix has +dnl been included in Autoconf. -# Until autoconf 2.63, handling of the diversion stack required m4_init -# to be called first; but this does not happen with aclocal. Wrapping -# the entire execution in another layer of the diversion stack fixes this. -# Worse, prior to autoconf 2.62, m4_wrap depended on the underlying m4 -# for whether it was FIFO or LIFO; in order to properly balance with -# m4_init, we need to undo our push just before anything wrapped within -# the m4_init body. The way to ensure this is to wrap both sides of -# m4_init with a one-shot macro that does the pop at the right time. -m4_ifndef([_m4_divert_diversion], -[m4_divert_push([KILL]) -m4_define([gl_divert_fixup], [m4_divert_pop()m4_define([$0])]) -m4_define([m4_init], - [gl_divert_fixup()]m4_defn([m4_init])[gl_divert_fixup()])]) - - -# AC_DEFUN_ONCE([NAME], VALUE) -# ---------------------------- -# Define NAME to expand to VALUE on the first use (whether by direct -# expansion, or by AC_REQUIRE), and to nothing on all subsequent uses. -# Avoid bugs in AC_REQUIRE in Autoconf 2.63 and earlier. This -# definition is slower than the version in Autoconf 2.64, because it -# can only use interfaces that existed since 2.59; but it achieves the -# same effect. Quoting is necessary to avoid confusing Automake. -m4_version_prereq([2.63.263], [], -[m4_define([AC][_DEFUN_ONCE], - [AC][_DEFUN([$1], - [AC_REQUIRE([_gl_DEFUN_ONCE([$1])], - [m4_indir([_gl_DEFUN_ONCE([$1])])])])]dnl -[AC][_DEFUN([_gl_DEFUN_ONCE([$1])], [$2])])]) +# The following definitions arrange to use a compiler option +# -Werror=implicit-function-declaration in AC_CHECK_DECL, when the +# compiler is clang. Without it, clang implicitly declares "known" +# library functions in C mode, but not in C++ mode, which would cause +# Gnulib to omit a declaration and thus later produce an error in C++ +# mode. As of clang 9.0, these "known" functions are identified through +# LIBBUILTIN invocations in the LLVM source file +# llvm/tools/clang/include/clang/Basic/Builtins.def. +# It's not possible to AC_REQUIRE the extra tests from AC_CHECK_DECL, +# because AC_CHECK_DECL, like other Autoconf built-ins, is not supposed +# to AC_REQUIRE anything: some configure.ac files have their first +# AC_CHECK_DECL executed conditionally. Therefore append the extra tests +# to AC_PROG_CC. +AC_DEFUN([gl_COMPILER_CLANG], +[ +dnl AC_REQUIRE([AC_PROG_CC]) + AC_CACHE_CHECK([whether the compiler is clang], + [gl_cv_compiler_clang], + [dnl Use _AC_COMPILE_IFELSE instead of AC_EGREP_CPP, to avoid error + dnl "circular dependency of AC_LANG_COMPILER(C)" if AC_PROG_CC has + dnl not yet been invoked. + _AC_COMPILE_IFELSE( + [AC_LANG_PROGRAM([[ + #ifdef __clang__ + barfbarf + #endif + ]],[[]]) + ], + [gl_cv_compiler_clang=no], + [gl_cv_compiler_clang=yes]) + ]) +]) +AC_DEFUN([gl_COMPILER_PREPARE_CHECK_DECL], +[ +dnl AC_REQUIRE([AC_PROG_CC]) +dnl AC_REQUIRE([gl_COMPILER_CLANG]) + AC_CACHE_CHECK([for compiler option needed when checking for declarations], + [gl_cv_compiler_check_decl_option], + [if test $gl_cv_compiler_clang = yes; then + dnl Test whether the compiler supports the option + dnl '-Werror=implicit-function-declaration'. + save_ac_compile="$ac_compile" + ac_compile="$ac_compile -Werror=implicit-function-declaration" + dnl Use _AC_COMPILE_IFELSE instead of AC_COMPILE_IFELSE, to avoid a + dnl warning "AC_COMPILE_IFELSE was called before AC_USE_SYSTEM_EXTENSIONS". + _AC_COMPILE_IFELSE([AC_LANG_PROGRAM([[]],[[]])], + [gl_cv_compiler_check_decl_option='-Werror=implicit-function-declaration'], + [gl_cv_compiler_check_decl_option=none]) + ac_compile="$save_ac_compile" + else + gl_cv_compiler_check_decl_option=none + fi + ]) + if test "x$gl_cv_compiler_check_decl_option" != xnone; then + ac_compile_for_check_decl="$ac_compile $gl_cv_compiler_check_decl_option" + else + ac_compile_for_check_decl="$ac_compile" + fi +]) +dnl Redefine _AC_CHECK_DECL_BODY so that it references ac_compile_for_check_decl +dnl instead of ac_compile. If, for whatever reason, the override of AC_PROG_CC +dnl in zzgnulib.m4 is inactive, use the original ac_compile. +m4_define([_AC_CHECK_DECL_BODY], +[ ac_save_ac_compile="$ac_compile" + if test -n "$ac_compile_for_check_decl"; then + ac_compile="$ac_compile_for_check_decl" + fi] +m4_defn([_AC_CHECK_DECL_BODY])[ ac_compile="$ac_save_ac_compile" +]) # gl_00GNULIB # ----------- diff --git a/m4/__inline.m4 b/m4/__inline.m4 index e1aa310..520c8c4 100644 --- a/m4/__inline.m4 +++ b/m4/__inline.m4 @@ -1,5 +1,5 @@ # Test for __inline keyword -dnl Copyright 2017-2019 Free Software Foundation, Inc. +dnl Copyright 2017-2020 Free Software Foundation, Inc. dnl This file is free software; the Free Software Foundation dnl gives unlimited permission to copy and/or distribute it, dnl with or without modifications, as long as this notice is preserved. diff --git a/m4/absolute-header.m4 b/m4/absolute-header.m4 index a8f2cba..c043233 100644 --- a/m4/absolute-header.m4 +++ b/m4/absolute-header.m4 @@ -1,5 +1,5 @@ -# absolute-header.m4 serial 16 -dnl Copyright (C) 2006-2019 Free Software Foundation, Inc. +# absolute-header.m4 serial 17 +dnl Copyright (C) 2006-2020 Free Software Foundation, Inc. dnl This file is free software; the Free Software Foundation dnl gives unlimited permission to copy and/or distribute it, dnl with or without modifications, as long as this notice is preserved. @@ -22,23 +22,21 @@ dnl From Derek Price. AC_DEFUN([gl_ABSOLUTE_HEADER], [AC_REQUIRE([AC_CANONICAL_HOST]) AC_LANG_PREPROC_REQUIRE()dnl -dnl FIXME: gl_absolute_header and ac_header_exists must be used unquoted -dnl until we can assume autoconf 2.64 or newer. m4_foreach_w([gl_HEADER_NAME], [$1], [AS_VAR_PUSHDEF([gl_absolute_header], [gl_cv_absolute_]m4_defn([gl_HEADER_NAME]))dnl AC_CACHE_CHECK([absolute name of <]m4_defn([gl_HEADER_NAME])[>], - m4_defn([gl_absolute_header]), + [gl_absolute_header], [AS_VAR_PUSHDEF([ac_header_exists], [ac_cv_header_]m4_defn([gl_HEADER_NAME]))dnl AC_CHECK_HEADERS_ONCE(m4_defn([gl_HEADER_NAME]))dnl - if test AS_VAR_GET(ac_header_exists) = yes; then + if test AS_VAR_GET([ac_header_exists]) = yes; then gl_ABSOLUTE_HEADER_ONE(m4_defn([gl_HEADER_NAME])) fi AS_VAR_POPDEF([ac_header_exists])dnl ])dnl AC_DEFINE_UNQUOTED(AS_TR_CPP([ABSOLUTE_]m4_defn([gl_HEADER_NAME])), - ["AS_VAR_GET(gl_absolute_header)"], + ["AS_VAR_GET([gl_absolute_header])"], [Define this to an absolute name of <]m4_defn([gl_HEADER_NAME])[>.]) AS_VAR_POPDEF([gl_absolute_header])dnl ])dnl diff --git a/m4/alloca.m4 b/m4/alloca.m4 index 29bd289..619959b 100644 --- a/m4/alloca.m4 +++ b/m4/alloca.m4 @@ -1,5 +1,5 @@ -# alloca.m4 serial 15 -dnl Copyright (C) 2002-2004, 2006-2007, 2009-2019 Free Software Foundation, +# alloca.m4 serial 19 +dnl Copyright (C) 2002-2004, 2006-2007, 2009-2020 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, @@ -50,13 +50,13 @@ AC_DEFUN([gl_FUNC_ALLOCA], # STACK_DIRECTION is already handled by AC_FUNC_ALLOCA. AC_DEFUN([gl_PREREQ_ALLOCA], [:]) -# This works around a bug in autoconf <= 2.68. -# See . +m4_version_prereq([2.69c], [], [ -m4_version_prereq([2.69], [] ,[ - -# This is taken from the following Autoconf patch: -# https://git.savannah.gnu.org/gitweb/?p=autoconf.git;a=commitdiff;h=6cd9f12520b0d6f76d3230d7565feba1ecf29497 +# This works around a bug in autoconf <= 2.68 and has simplifications +# from 2.69c. See: +# https://lists.gnu.org/r/bug-gnulib/2011-06/msg00277.html +# https://git.savannah.gnu.org/cgit/autoconf.git/commit/?id=6cd9f12520b0d6f76d3230d7565feba1ecf29497 +# https://git.savannah.gnu.org/cgit/autoconf.git/commit/?id=15edf7fd8094fd14a89d9891dd72a9624762597a # _AC_LIBOBJ_ALLOCA # ----------------- @@ -72,26 +72,6 @@ AC_LIBSOURCES(alloca.c) AC_SUBST([ALLOCA], [\${LIBOBJDIR}alloca.$ac_objext])dnl AC_DEFINE(C_ALLOCA, 1, [Define to 1 if using 'alloca.c'.]) -AC_CACHE_CHECK(whether 'alloca.c' needs Cray hooks, ac_cv_os_cray, -[AC_EGREP_CPP(webecray, -[#if defined CRAY && ! defined CRAY2 -webecray -#else -wenotbecray -#endif -], ac_cv_os_cray=yes, ac_cv_os_cray=no)]) -if test $ac_cv_os_cray = yes; then - for ac_func in _getb67 GETB67 getb67; do - AC_CHECK_FUNC($ac_func, - [AC_DEFINE_UNQUOTED(CRAY_STACKSEG_END, $ac_func, - [Define to one of '_getb67', 'GETB67', - 'getb67' for Cray-2 and Cray-YMP - systems. This function is required for - 'alloca.c' support on those systems.]) - break]) - done -fi - AC_CACHE_CHECK([stack direction for C alloca], [ac_cv_c_stack_direction], [AC_RUN_IFELSE([AC_LANG_SOURCE( @@ -122,7 +102,7 @@ AH_VERBATIM([STACK_DIRECTION], STACK_DIRECTION > 0 => grows toward higher addresses STACK_DIRECTION < 0 => grows toward lower addresses STACK_DIRECTION = 0 => direction of growth unknown */ -@%:@undef STACK_DIRECTION])dnl +#undef STACK_DIRECTION])dnl AC_DEFINE_UNQUOTED(STACK_DIRECTION, $ac_cv_c_stack_direction) -])# _AC_LIBOBJ_ALLOCA +]) ]) diff --git a/m4/arpa_inet_h.m4 b/m4/arpa_inet_h.m4 index 645011d..b394494 100644 --- a/m4/arpa_inet_h.m4 +++ b/m4/arpa_inet_h.m4 @@ -1,5 +1,5 @@ # arpa_inet_h.m4 serial 14 -dnl Copyright (C) 2006, 2008-2019 Free Software Foundation, Inc. +dnl Copyright (C) 2006, 2008-2020 Free Software Foundation, Inc. dnl This file is free software; the Free Software Foundation dnl gives unlimited permission to copy and/or distribute it, dnl with or without modifications, as long as this notice is preserved. diff --git a/m4/assert.m4 b/m4/assert.m4 index 15048a7..d823b9f 100644 --- a/m4/assert.m4 +++ b/m4/assert.m4 @@ -1,6 +1,6 @@ #serial 7 -# Copyright (C) 1998-1999, 2001, 2004, 2008-2019 Free Software Foundation, Inc. +# Copyright (C) 1998-1999, 2001, 2004, 2008-2020 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/btowc.m4 b/m4/btowc.m4 index 85c2cbf..c28ccb2 100644 --- a/m4/btowc.m4 +++ b/m4/btowc.m4 @@ -1,5 +1,5 @@ # btowc.m4 serial 11 -dnl Copyright (C) 2008-2019 Free Software Foundation, Inc. +dnl Copyright (C) 2008-2020 Free Software Foundation, Inc. dnl This file is free software; the Free Software Foundation dnl gives unlimited permission to copy and/or distribute it, dnl with or without modifications, as long as this notice is preserved. diff --git a/m4/builtin-expect.m4 b/m4/builtin-expect.m4 index b65fbf8..a6e8895 100644 --- a/m4/builtin-expect.m4 +++ b/m4/builtin-expect.m4 @@ -1,6 +1,6 @@ dnl Check for __builtin_expect. -dnl Copyright 2016-2019 Free Software Foundation, Inc. +dnl Copyright 2016-2020 Free Software Foundation, Inc. dnl This file is free software; the Free Software Foundation dnl gives unlimited permission to copy and/or distribute it, dnl with or without modifications, as long as this notice is preserved. diff --git a/m4/calloc.m4 b/m4/calloc.m4 index d76535d..f179a8a 100644 --- a/m4/calloc.m4 +++ b/m4/calloc.m4 @@ -1,6 +1,6 @@ -# calloc.m4 serial 19 +# calloc.m4 serial 23 -# Copyright (C) 2004-2019 Free Software Foundation, Inc. +# Copyright (C) 2004-2020 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. @@ -21,33 +21,59 @@ AC_DEFUN([_AC_FUNC_CALLOC_IF], AC_REQUIRE([AC_CANONICAL_HOST]) dnl for cross-compiles AC_CACHE_CHECK([for GNU libc compatible calloc], [ac_cv_func_calloc_0_nonnull], - [AC_RUN_IFELSE( - [AC_LANG_PROGRAM( - [AC_INCLUDES_DEFAULT], - [[int result = 0; - char *p = calloc (0, 0); - if (!p) - result |= 1; - free (p); - p = calloc ((size_t) -1 / 8 + 1, 8); - if (p) - result |= 2; - free (p); - return result; - ]])], - [ac_cv_func_calloc_0_nonnull=yes], - [ac_cv_func_calloc_0_nonnull=no], - [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, assume the worst. - *) ac_cv_func_calloc_0_nonnull="guessing no" ;; - esac - ])]) + [if test $cross_compiling != yes; then + ac_cv_func_calloc_0_nonnull=yes + AC_RUN_IFELSE( + [AC_LANG_PROGRAM( + [AC_INCLUDES_DEFAULT], + [[int result = 0; + char * volatile p = calloc (0, 0); + if (!p) + result |= 1; + free (p); + return result; + ]])], + [], + [ac_cv_func_calloc_0_nonnull=no]) + AC_RUN_IFELSE( + [AC_LANG_PROGRAM( + [AC_INCLUDES_DEFAULT], + [[int result; + typedef struct { char c[8]; } S8; + size_t n = (size_t) -1 / sizeof (S8) + 2; + S8 * volatile s = calloc (n, sizeof (S8)); + if (s) + { + s[0].c[0] = 1; + if (s[n - 1].c[0]) + result = 0; + else + result = 2; + } + else + result = 3; + free (s); + return result; + ]])], + dnl The exit code of this program is 0 if calloc() succeeded with a + dnl wrap-around bug (which it shouldn't), 2 if calloc() succeeded in + dnl a non-flat address space, 3 if calloc() failed, or 1 if some leak + dnl sanitizer terminated the program as a result of the calloc() call. + [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" ;; + esac + fi + ]) case "$ac_cv_func_calloc_0_nonnull" in *yes) $1 diff --git a/m4/canonicalize.m4 b/m4/canonicalize.m4 index b61747b..14ea3e1 100644 --- a/m4/canonicalize.m4 +++ b/m4/canonicalize.m4 @@ -1,6 +1,6 @@ -# canonicalize.m4 serial 30 +# canonicalize.m4 serial 33 -dnl Copyright (C) 2003-2007, 2009-2019 Free Software Foundation, Inc. +dnl Copyright (C) 2003-2007, 2009-2020 Free Software Foundation, Inc. dnl This file is free software; the Free Software Foundation dnl gives unlimited permission to copy and/or distribute it, @@ -56,7 +56,16 @@ AC_DEFUN([gl_CANONICALIZE_LGPL], AC_DEFUN([gl_CANONICALIZE_LGPL_SEPARATE], [ AC_REQUIRE([gl_USE_SYSTEM_EXTENSIONS]) - AC_CHECK_FUNCS_ONCE([canonicalize_file_name getcwd readlink]) + AC_CHECK_FUNCS_ONCE([canonicalize_file_name readlink]) + + dnl On native Windows, we use _getcwd(), regardless whether getcwd() is + dnl available through the linker option '-loldnames'. + AC_REQUIRE([AC_CANONICAL_HOST]) + case "$host_os" in + mingw*) ;; + *) AC_CHECK_FUNCS([getcwd]) ;; + esac + AC_REQUIRE([gl_DOUBLE_SLASH_ROOT]) AC_REQUIRE([gl_FUNC_REALPATH_WORKS]) AC_CHECK_HEADERS_ONCE([sys/param.h]) @@ -70,6 +79,7 @@ AC_DEFUN([gl_FUNC_REALPATH_WORKS], AC_CHECK_FUNCS_ONCE([realpath]) AC_REQUIRE([AC_CANONICAL_HOST]) dnl for cross-compiles AC_CACHE_CHECK([whether realpath works], [gl_cv_func_realpath_works], [ + rm -rf conftest.a conftest.d touch conftest.a mkdir conftest.d AC_RUN_IFELSE([ @@ -117,8 +127,8 @@ AC_DEFUN([gl_FUNC_REALPATH_WORKS], *-musl*) gl_cv_func_realpath_works="guessing yes" ;; # Guess no on native Windows. mingw*) gl_cv_func_realpath_works="guessing no" ;; - # If we don't know, assume the worst. - *) gl_cv_func_realpath_works="guessing no" ;; + # If we don't know, obey --enable-cross-guesses. + *) gl_cv_func_realpath_works="$gl_cross_guess_normal" ;; esac ]) rm -rf conftest.a conftest.d diff --git a/m4/clock_time.m4 b/m4/clock_time.m4 new file mode 100644 index 0000000..f4f51fa --- /dev/null +++ b/m4/clock_time.m4 @@ -0,0 +1,31 @@ +# clock_time.m4 serial 10 +dnl Copyright (C) 2002-2006, 2009-2020 Free Software Foundation, Inc. +dnl This file is free software; the Free Software Foundation +dnl gives unlimited permission to copy and/or distribute it, +dnl with or without modifications, as long as this notice is preserved. + +# Check for clock_gettime and clock_settime, and set LIB_CLOCK_GETTIME. +# 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) + +AC_DEFUN([gl_CLOCK_TIME], +[ + dnl Persuade glibc and Solaris to declare these functions. + AC_REQUIRE([gl_USE_SYSTEM_EXTENSIONS]) + + # Solaris 2.5.1 needs -lposix4 to get the clock_gettime function. + # Solaris 7 prefers the library name -lrt to the obsolescent name -lposix4. + + # 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]) + 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]) + AC_CHECK_FUNCS([clock_gettime clock_settime]) + LIBS=$gl_saved_libs +]) diff --git a/m4/close.m4 b/m4/close.m4 index 7013a13..378ec4c 100644 --- a/m4/close.m4 +++ b/m4/close.m4 @@ -1,5 +1,5 @@ # close.m4 serial 9 -dnl Copyright (C) 2008-2019 Free Software Foundation, Inc. +dnl Copyright (C) 2008-2020 Free Software Foundation, Inc. dnl This file is free software; the Free Software Foundation dnl gives unlimited permission to copy and/or distribute it, dnl with or without modifications, as long as this notice is preserved. diff --git a/m4/codeset.m4 b/m4/codeset.m4 index 280f556..9b019cf 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 Free Software +dnl Copyright (C) 2000-2002, 2006, 2008-2014, 2016, 2019-2020 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 7379df7..213b1cf 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-2019 Free Software Foundation, Inc. +dnl Copyright (C) 2006, 2009-2020 Free Software Foundation, Inc. dnl This file is free software; the Free Software Foundation dnl gives unlimited permission to copy and/or distribute it, dnl with or without modifications, as long as this notice is preserved. diff --git a/m4/configmake.m4 b/m4/configmake.m4 index 0571952..f0f094f 100644 --- a/m4/configmake.m4 +++ b/m4/configmake.m4 @@ -1,5 +1,5 @@ -# configmake.m4 serial 3 -dnl Copyright (C) 2010-2019 Free Software Foundation, Inc. +# configmake.m4 serial 4 +dnl Copyright (C) 2010-2020 Free Software Foundation, Inc. dnl This file is free software; the Free Software Foundation dnl gives unlimited permission to copy and/or distribute it, dnl with or without modifications, as long as this notice is preserved. @@ -9,7 +9,7 @@ AC_PREREQ([2.60]) # gl_CONFIGMAKE_PREP # ------------------ # Guarantee all of the standard directory variables, even when used with -# autoconf 2.63 (runstatedir wasn't supported before 2.70) or +# autoconf 2.64 (runstatedir wasn't supported before 2.70) or # automake 1.11 (runstatedir isn't supported even in 1.16.1). AC_DEFUN([gl_CONFIGMAKE_PREP], [ diff --git a/m4/ctype.m4 b/m4/ctype.m4 index bd30e11..0b123d5 100644 --- a/m4/ctype.m4 +++ b/m4/ctype.m4 @@ -1,5 +1,5 @@ # ctype_h.m4 serial 6 -dnl Copyright (C) 2009-2019 Free Software Foundation, Inc. +dnl Copyright (C) 2009-2020 Free Software Foundation, Inc. dnl This file is free software; the Free Software Foundation dnl gives unlimited permission to copy and/or distribute it, dnl with or without modifications, as long as this notice is preserved. diff --git a/m4/dirname.m4 b/m4/dirname.m4 deleted file mode 100644 index 32141ae..0000000 --- a/m4/dirname.m4 +++ /dev/null @@ -1,19 +0,0 @@ -#serial 10 -*- autoconf -*- -dnl Copyright (C) 2002-2006, 2009-2019 Free Software Foundation, Inc. -dnl This file is free software; the Free Software Foundation -dnl gives unlimited permission to copy and/or distribute it, -dnl with or without modifications, as long as this notice is preserved. - -AC_DEFUN([gl_DIRNAME], -[ - AC_REQUIRE([gl_DIRNAME_LGPL]) -]) - -AC_DEFUN([gl_DIRNAME_LGPL], -[ - dnl Prerequisites of lib/dirname.h. - AC_REQUIRE([gl_DOUBLE_SLASH_ROOT]) - - dnl No prerequisites of lib/basename-lgpl.c, lib/dirname-lgpl.c, - dnl lib/stripslash.c. -]) diff --git a/m4/double-slash-root.m4 b/m4/double-slash-root.m4 index 0c5afb1..c463ac4 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-2019 Free Software Foundation, Inc. +dnl Copyright (C) 2006, 2008-2020 Free Software Foundation, Inc. dnl This file is free software; the Free Software Foundation dnl gives unlimited permission to copy and/or distribute it, dnl with or without modifications, as long as this notice is preserved. diff --git a/m4/dup2.m4 b/m4/dup2.m4 index b314247..a82798d 100644 --- a/m4/dup2.m4 +++ b/m4/dup2.m4 @@ -1,5 +1,5 @@ -#serial 25 -dnl Copyright (C) 2002, 2005, 2007, 2009-2019 Free Software Foundation, Inc. +#serial 27 +dnl Copyright (C) 2002, 2005, 2007, 2009-2020 Free Software Foundation, Inc. dnl This file is free software; the Free Software Foundation dnl gives unlimited permission to copy and/or distribute it, dnl with or without modifications, as long as this notice is preserved. @@ -8,107 +8,95 @@ AC_DEFUN([gl_FUNC_DUP2], [ AC_REQUIRE([gl_UNISTD_H_DEFAULTS]) AC_REQUIRE([AC_CANONICAL_HOST]) - m4_ifdef([gl_FUNC_DUP2_OBSOLETE], [ - AC_CHECK_FUNCS_ONCE([dup2]) - if test $ac_cv_func_dup2 = no; then - HAVE_DUP2=0 - fi - ], [ - AC_DEFINE([HAVE_DUP2], [1], [Define to 1 if you have the 'dup2' function.]) - ]) - if test $HAVE_DUP2 = 1; then - AC_CACHE_CHECK([whether dup2 works], [gl_cv_func_dup2_works], - [AC_RUN_IFELSE([ - AC_LANG_PROGRAM( - [[#include - #include - #include - #include - #include - #ifndef RLIM_SAVED_CUR - # define RLIM_SAVED_CUR RLIM_INFINITY - #endif - #ifndef RLIM_SAVED_MAX - # define RLIM_SAVED_MAX RLIM_INFINITY - #endif - ]], - [[int result = 0; - int bad_fd = INT_MAX; - struct rlimit rlim; - if (getrlimit (RLIMIT_NOFILE, &rlim) == 0 - && 0 <= rlim.rlim_cur && rlim.rlim_cur <= INT_MAX - && rlim.rlim_cur != RLIM_INFINITY - && rlim.rlim_cur != RLIM_SAVED_MAX - && rlim.rlim_cur != RLIM_SAVED_CUR) - bad_fd = rlim.rlim_cur; - #ifdef FD_CLOEXEC - if (fcntl (1, F_SETFD, FD_CLOEXEC) == -1) - result |= 1; - #endif - if (dup2 (1, 1) != 1) - result |= 2; - #ifdef FD_CLOEXEC - if (fcntl (1, F_GETFD) != FD_CLOEXEC) - result |= 4; - #endif - close (0); - if (dup2 (0, 0) != -1) - result |= 8; - /* Many gnulib modules require POSIX conformance of EBADF. */ - if (dup2 (2, bad_fd) == -1 && errno != EBADF) - result |= 16; - /* Flush out some cygwin core dumps. */ - if (dup2 (2, -1) != -1 || errno != EBADF) - result |= 32; - dup2 (2, 255); - dup2 (2, 256); - /* On OS/2 kLIBC, dup2() does not work on a directory fd. */ - { - int fd = open (".", O_RDONLY); - if (fd == -1) - result |= 64; - else if (dup2 (fd, fd + 1) == -1) - result |= 128; - - close (fd); - } - return result;]]) - ], - [gl_cv_func_dup2_works=yes], [gl_cv_func_dup2_works=no], - [case "$host_os" in - mingw*) # on this platform, dup2 always returns 0 for success - gl_cv_func_dup2_works="guessing no" ;; - cygwin*) # on cygwin 1.5.x, dup2(1,1) returns 0 - gl_cv_func_dup2_works="guessing no" ;; - aix* | freebsd*) - # on AIX 7.1 and FreeBSD 6.1, dup2 (1,toobig) gives EMFILE, - # not EBADF. - gl_cv_func_dup2_works="guessing no" ;; - haiku*) # on Haiku alpha 2, dup2(1, 1) resets FD_CLOEXEC. - gl_cv_func_dup2_works="guessing no" ;; - *-android*) # implemented using dup3(), which fails if oldfd == newfd - gl_cv_func_dup2_works="guessing no" ;; - os2*) # on OS/2 kLIBC, dup2() does not work on a directory fd. - gl_cv_func_dup2_works="guessing no" ;; - *) gl_cv_func_dup2_works="guessing yes" ;; - esac]) - ]) - case "$gl_cv_func_dup2_works" in - *yes) ;; - *) - REPLACE_DUP2=1 - AC_CHECK_FUNCS([setdtablesize]) - ;; - esac - fi + AC_CACHE_CHECK([whether dup2 works], [gl_cv_func_dup2_works], + [AC_RUN_IFELSE([ + AC_LANG_PROGRAM( + [[#include + #include + #include + #include + #include + ]GL_MDA_DEFINES[ + #ifndef RLIM_SAVED_CUR + # define RLIM_SAVED_CUR RLIM_INFINITY + #endif + #ifndef RLIM_SAVED_MAX + # define RLIM_SAVED_MAX RLIM_INFINITY + #endif + ]], + [[int result = 0; + int bad_fd = INT_MAX; + struct rlimit rlim; + if (getrlimit (RLIMIT_NOFILE, &rlim) == 0 + && 0 <= rlim.rlim_cur && rlim.rlim_cur <= INT_MAX + && rlim.rlim_cur != RLIM_INFINITY + && rlim.rlim_cur != RLIM_SAVED_MAX + && rlim.rlim_cur != RLIM_SAVED_CUR) + bad_fd = rlim.rlim_cur; + #ifdef FD_CLOEXEC + if (fcntl (1, F_SETFD, FD_CLOEXEC) == -1) + result |= 1; + #endif + if (dup2 (1, 1) != 1) + result |= 2; + #ifdef FD_CLOEXEC + if (fcntl (1, F_GETFD) != FD_CLOEXEC) + result |= 4; + #endif + close (0); + if (dup2 (0, 0) != -1) + result |= 8; + /* Many gnulib modules require POSIX conformance of EBADF. */ + if (dup2 (2, bad_fd) == -1 && errno != EBADF) + result |= 16; + /* Flush out some cygwin core dumps. */ + if (dup2 (2, -1) != -1 || errno != EBADF) + result |= 32; + dup2 (2, 255); + dup2 (2, 256); + /* On OS/2 kLIBC, dup2() does not work on a directory fd. */ + { + int fd = open (".", O_RDONLY); + if (fd == -1) + result |= 64; + else if (dup2 (fd, fd + 1) == -1) + result |= 128; + close (fd); + } + return result;]]) + ], + [gl_cv_func_dup2_works=yes], [gl_cv_func_dup2_works=no], + [case "$host_os" in + mingw*) # on this platform, dup2 always returns 0 for success + gl_cv_func_dup2_works="guessing no" ;; + cygwin*) # on cygwin 1.5.x, dup2(1,1) returns 0 + gl_cv_func_dup2_works="guessing no" ;; + aix* | freebsd*) + # on AIX 7.1 and FreeBSD 6.1, dup2 (1,toobig) gives EMFILE, + # not EBADF. + gl_cv_func_dup2_works="guessing no" ;; + haiku*) # on Haiku alpha 2, dup2(1, 1) resets FD_CLOEXEC. + gl_cv_func_dup2_works="guessing no" ;; + *-android*) # implemented using dup3(), which fails if oldfd == newfd + gl_cv_func_dup2_works="guessing no" ;; + os2*) # on OS/2 kLIBC, dup2() does not work on a directory fd. + gl_cv_func_dup2_works="guessing no" ;; + *) gl_cv_func_dup2_works="guessing yes" ;; + esac]) + ]) + case "$gl_cv_func_dup2_works" in + *yes) ;; + *) + REPLACE_DUP2=1 + AC_CHECK_FUNCS([setdtablesize]) + ;; + esac dnl Replace dup2() for supporting the gnulib-defined fchdir() function, dnl to keep fchdir's bookkeeping up-to-date. m4_ifdef([gl_FUNC_FCHDIR], [ gl_TEST_FCHDIR if test $HAVE_FCHDIR = 0; then - if test $HAVE_DUP2 = 1; then - REPLACE_DUP2=1 - fi + REPLACE_DUP2=1 fi ]) ]) diff --git a/m4/eealloc.m4 b/m4/eealloc.m4 index 2a4b120..236f373 100644 --- a/m4/eealloc.m4 +++ b/m4/eealloc.m4 @@ -1,5 +1,5 @@ # eealloc.m4 serial 3 -dnl Copyright (C) 2003, 2009-2019 Free Software Foundation, Inc. +dnl Copyright (C) 2003, 2009-2020 Free Software Foundation, Inc. dnl This file is free software; the Free Software Foundation dnl gives unlimited permission to copy and/or distribute it, dnl with or without modifications, as long as this notice is preserved. diff --git a/m4/environ.m4 b/m4/environ.m4 index c1a6fa3..bab85f1 100644 --- a/m4/environ.m4 +++ b/m4/environ.m4 @@ -1,5 +1,5 @@ # environ.m4 serial 7 -dnl Copyright (C) 2001-2004, 2006-2019 Free Software Foundation, Inc. +dnl Copyright (C) 2001-2004, 2006-2020 Free Software Foundation, Inc. dnl This file is free software; the Free Software Foundation dnl gives unlimited permission to copy and/or distribute it, dnl with or without modifications, as long as this notice is preserved. diff --git a/m4/errno_h.m4 b/m4/errno_h.m4 index 2388854..dd4994f 100644 --- a/m4/errno_h.m4 +++ b/m4/errno_h.m4 @@ -1,5 +1,5 @@ # errno_h.m4 serial 13 -dnl Copyright (C) 2004, 2006, 2008-2019 Free Software Foundation, Inc. +dnl Copyright (C) 2004, 2006, 2008-2020 Free Software Foundation, Inc. dnl This file is free software; the Free Software Foundation dnl gives unlimited permission to copy and/or distribute it, dnl with or without modifications, as long as this notice is preserved. diff --git a/m4/error.m4 b/m4/error.m4 index 393adb5..60c229d 100644 --- a/m4/error.m4 +++ b/m4/error.m4 @@ -1,6 +1,6 @@ #serial 14 -# Copyright (C) 1996-1998, 2001-2004, 2009-2019 Free Software Foundation, Inc. +# Copyright (C) 1996-1998, 2001-2004, 2009-2020 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/extensions.m4 b/m4/extensions.m4 index fd1ce81..3179080 100644 --- a/m4/extensions.m4 +++ b/m4/extensions.m4 @@ -1,7 +1,7 @@ -# serial 18 -*- Autoconf -*- +# serial 20 -*- Autoconf -*- # Enable extensions on systems that normally disable them. -# Copyright (C) 2003, 2006-2019 Free Software Foundation, Inc. +# Copyright (C) 2003, 2006-2020 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. @@ -177,13 +177,5 @@ dnl configure.ac when using autoheader 2.62. # typically due to standards-conformance issues. AC_DEFUN_ONCE([gl_USE_SYSTEM_EXTENSIONS], [ - dnl Require this macro before AC_USE_SYSTEM_EXTENSIONS. - dnl gnulib does not need it. But if it gets required by third-party macros - dnl after AC_USE_SYSTEM_EXTENSIONS is required, autoconf 2.62..2.63 emit a - dnl warning: "AC_COMPILE_IFELSE was called before AC_USE_SYSTEM_EXTENSIONS". - dnl Note: We can do this only for one of the macros AC_AIX, AC_GNU_SOURCE, - dnl AC_MINIX. If people still use AC_AIX or AC_MINIX, they are out of luck. - AC_REQUIRE([AC_GNU_SOURCE]) - AC_REQUIRE([AC_USE_SYSTEM_EXTENSIONS]) ]) diff --git a/m4/extern-inline.m4 b/m4/extern-inline.m4 index ec9f221..75c5008 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-2019 Free Software Foundation, Inc. +dnl Copyright 2012-2020 Free Software Foundation, Inc. dnl This file is free software; the Free Software Foundation dnl gives unlimited permission to copy and/or distribute it, dnl with or without modifications, as long as this notice is preserved. @@ -32,7 +32,7 @@ AC_DEFUN([gl_EXTERN_INLINE], https://lists.gnu.org/r/bug-gnulib/2012-12/msg00023.html DragonFly; see - http://muscles.dragonflybsd.org/bulk/bleeding-edge-potential/latest-per-pkg/ah-tty-0.3.12.log + http://muscles.dragonflybsd.org/bulk/clang-master-potential/20141111_102002/logs/ah-tty-0.3.12.log FreeBSD; see: https://lists.gnu.org/r/bug-gnulib/2014-07/msg00104.html diff --git a/m4/fcntl-o.m4 b/m4/fcntl-o.m4 index 6ab3387..3ef061d 100644 --- a/m4/fcntl-o.m4 +++ b/m4/fcntl-o.m4 @@ -1,5 +1,5 @@ -# fcntl-o.m4 serial 6 -dnl Copyright (C) 2006, 2009-2019 Free Software Foundation, Inc. +# fcntl-o.m4 serial 7 +dnl Copyright (C) 2006, 2009-2020 Free Software Foundation, Inc. dnl This file is free software; the Free Software Foundation dnl gives unlimited permission to copy and/or distribute it, dnl with or without modifications, as long as this notice is preserved. @@ -32,6 +32,7 @@ AC_DEFUN([gl_FCNTL_O_FLAGS], # defined sleep(n) _sleep ((n) * 1000) #endif #include + ]GL_MDA_DEFINES[ #ifndef O_NOATIME #define O_NOATIME 0 #endif diff --git a/m4/fcntl.m4 b/m4/fcntl.m4 index e409e96..547ff40 100644 --- a/m4/fcntl.m4 +++ b/m4/fcntl.m4 @@ -1,5 +1,5 @@ -# fcntl.m4 serial 9 -dnl Copyright (C) 2009-2019 Free Software Foundation, Inc. +# fcntl.m4 serial 11 +dnl Copyright (C) 2009-2020 Free Software Foundation, Inc. dnl This file is free software; the Free Software Foundation dnl gives unlimited permission to copy and/or distribute it, dnl with or without modifications, as long as this notice is preserved. @@ -34,6 +34,7 @@ AC_DEFUN([gl_FUNC_FCNTL], #include #include #include + ]GL_MDA_DEFINES[ #ifndef RLIM_SAVED_CUR # define RLIM_SAVED_CUR RLIM_INFINITY #endif @@ -80,15 +81,29 @@ AC_DEFUN([gl_FUNC_FCNTL], behavior does not match POSIX]) ;; esac - dnl Many systems lack F_DUPFD_CLOEXEC + dnl Many systems lack F_DUPFD_CLOEXEC. + dnl NetBSD 9.0 declares F_DUPFD_CLOEXEC but it works only like F_DUPFD. AC_CACHE_CHECK([whether fcntl understands F_DUPFD_CLOEXEC], [gl_cv_func_fcntl_f_dupfd_cloexec], - [AC_COMPILE_IFELSE([AC_LANG_PROGRAM([[ -#include -#ifndef F_DUPFD_CLOEXEC -choke me -#endif - ]])], + [AC_RUN_IFELSE( + [AC_LANG_SOURCE( + [[#include + #include + int main (int argc, char *argv[]) + { + if (argc == 1) + /* parent process */ + { + if (fcntl (1, F_DUPFD_CLOEXEC, 10) < 0) + return 1; + return execl ("./conftest", "./conftest", "child", NULL); + } + else + /* child process */ + return (fcntl (10, F_GETFL) < 0 ? 0 : 42); + } + ]]) + ], [AC_COMPILE_IFELSE([AC_LANG_PROGRAM([[ #ifdef __linux__ /* The Linux kernel only added F_DUPFD_CLOEXEC in 2.6.24, so we always replace @@ -97,12 +112,22 @@ choke me #endif ]])], [gl_cv_func_fcntl_f_dupfd_cloexec=yes], - [gl_cv_func_fcntl_f_dupfd_cloexec="needs runtime check"])], - [gl_cv_func_fcntl_f_dupfd_cloexec=no])]) - if test "$gl_cv_func_fcntl_f_dupfd_cloexec" != yes; then - gl_REPLACE_FCNTL - dnl No witness macro needed for this bug. - fi + [gl_cv_func_fcntl_f_dupfd_cloexec="needs runtime check"]) + ], + [gl_cv_func_fcntl_f_dupfd_cloexec=no], + [case "$host_os" in + # Guess no on NetBSD. + netbsd*) gl_cv_func_fcntl_f_dupfd_cloexec="guessing no" ;; + *) gl_cv_func_fcntl_f_dupfd_cloexec="$gl_cross_guess_normal" ;; + esac + ]) + ]) + case "$gl_cv_func_fcntl_f_dupfd_cloexec" in + *yes) ;; + *) gl_REPLACE_FCNTL + dnl No witness macro needed for this bug. + ;; + esac fi dnl Replace fcntl() for supporting the gnulib-defined fchdir() function, dnl to keep fchdir's bookkeeping up-to-date. diff --git a/m4/fcntl_h.m4 b/m4/fcntl_h.m4 index a86fdae..6b25393 100644 --- a/m4/fcntl_h.m4 +++ b/m4/fcntl_h.m4 @@ -1,6 +1,6 @@ -# serial 15 +# serial 16 # Configure fcntl.h. -dnl Copyright (C) 2006-2007, 2009-2019 Free Software Foundation, Inc. +dnl Copyright (C) 2006-2007, 2009-2020 Free Software Foundation, Inc. dnl This file is free software; the Free Software Foundation dnl gives unlimited permission to copy and/or distribute it, dnl with or without modifications, as long as this notice is preserved. @@ -37,6 +37,7 @@ AC_DEFUN([gl_FCNTL_MODULE_INDICATOR], AC_DEFUN([gl_FCNTL_H_DEFAULTS], [ + GNULIB_CREAT=0; AC_SUBST([GNULIB_CREAT]) GNULIB_FCNTL=0; AC_SUBST([GNULIB_FCNTL]) GNULIB_NONBLOCKING=0; AC_SUBST([GNULIB_NONBLOCKING]) GNULIB_OPEN=0; AC_SUBST([GNULIB_OPEN]) @@ -44,6 +45,7 @@ AC_DEFUN([gl_FCNTL_H_DEFAULTS], dnl Assume proper GNU behavior unless another module says otherwise. HAVE_FCNTL=1; AC_SUBST([HAVE_FCNTL]) HAVE_OPENAT=1; AC_SUBST([HAVE_OPENAT]) + REPLACE_CREAT=0; AC_SUBST([REPLACE_CREAT]) REPLACE_FCNTL=0; AC_SUBST([REPLACE_FCNTL]) REPLACE_OPEN=0; AC_SUBST([REPLACE_OPEN]) REPLACE_OPENAT=0; AC_SUBST([REPLACE_OPENAT]) diff --git a/m4/fdopen.m4 b/m4/fdopen.m4 index 06b43f6..f4d4425 100644 --- a/m4/fdopen.m4 +++ b/m4/fdopen.m4 @@ -1,5 +1,5 @@ -# fdopen.m4 serial 4 -dnl Copyright (C) 2011-2019 Free Software Foundation, Inc. +# fdopen.m4 serial 5 +dnl Copyright (C) 2011-2020 Free Software Foundation, Inc. dnl This file is free software; the Free Software Foundation dnl gives unlimited permission to copy and/or distribute it, dnl with or without modifications, as long as this notice is preserved. @@ -22,6 +22,7 @@ AC_DEFUN([gl_FUNC_FDOPEN], [AC_LANG_SOURCE([[ #include #include +]GL_MDA_DEFINES[ int main (void) { diff --git a/m4/flexmember.m4 b/m4/flexmember.m4 index c245ab0..90f3ddd 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-2019 Free Software Foundation, Inc. +# Copyright (C) 2006, 2009-2020 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 402ec40..edabcec 100644 --- a/m4/fpending.m4 +++ b/m4/fpending.m4 @@ -1,6 +1,6 @@ -# serial 22 +# serial 23 -# Copyright (C) 2000-2001, 2004-2019 Free Software Foundation, Inc. +# Copyright (C) 2000-2001, 2004-2020 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. @@ -25,7 +25,7 @@ AC_DEFUN([gl_FUNC_FPENDING], AC_CACHE_CHECK([for __fpending], [gl_cv_func___fpending], [ AC_LINK_IFELSE( - [AC_LANG_PROGRAM([$fp_headers], + [AC_LANG_PROGRAM([[$fp_headers]], [[return ! __fpending (stdin);]])], [gl_cv_func___fpending=yes], [gl_cv_func___fpending=no]) diff --git a/m4/fstat.m4 b/m4/fstat.m4 index 2a59c8f..bd8cb79 100644 --- a/m4/fstat.m4 +++ b/m4/fstat.m4 @@ -1,5 +1,5 @@ -# fstat.m4 serial 6 -dnl Copyright (C) 2011-2019 Free Software Foundation, Inc. +# fstat.m4 serial 7 +dnl Copyright (C) 2011-2020 Free Software Foundation, Inc. dnl This file is free software; the Free Software Foundation dnl gives unlimited permission to copy and/or distribute it, dnl with or without modifications, as long as this notice is preserved. @@ -35,5 +35,6 @@ AC_DEFUN([gl_FUNC_FSTAT], # Prerequisites of lib/fstat.c and lib/stat-w32.c. AC_DEFUN([gl_PREREQ_FSTAT], [ AC_REQUIRE([gl_HEADER_SYS_STAT_H]) + AC_REQUIRE([gl_PREREQ_STAT_W32]) : ]) diff --git a/m4/fsync.m4 b/m4/fsync.m4 index 1b94a25..c86c0e6 100644 --- a/m4/fsync.m4 +++ b/m4/fsync.m4 @@ -1,5 +1,5 @@ # fsync.m4 serial 2 -dnl Copyright (C) 2008-2019 Free Software Foundation, Inc. +dnl Copyright (C) 2008-2020 Free Software Foundation, Inc. dnl This file is free software; the Free Software Foundation dnl gives unlimited permission to copy and/or distribute it, dnl with or without modifications, as long as this notice is preserved. diff --git a/m4/ftruncate.m4 b/m4/ftruncate.m4 index 5151bdc..752b0dd 100644 --- a/m4/ftruncate.m4 +++ b/m4/ftruncate.m4 @@ -1,8 +1,8 @@ -# serial 20 +# serial 21 -# See if we need to emulate a missing ftruncate function using chsize. +# See if we need to emulate a missing ftruncate function using _chsize. -# Copyright (C) 2000-2001, 2003-2007, 2009-2019 Free Software Foundation, Inc. +# Copyright (C) 2000-2001, 2003-2007, 2009-2020 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. @@ -20,7 +20,7 @@ AC_DEFUN([gl_FUNC_FTRUNCATE], dnl The MSVCRT _chsize() function only accepts a 32-bit file size, dnl and the mingw64 ftruncate64() function is unreliable (it may dnl delete the file, see - dnl ). + dnl ). dnl Use gnulib's ftruncate() implementation instead. REPLACE_FTRUNCATE=1 ;; @@ -36,5 +36,5 @@ AC_DEFUN([gl_FUNC_FTRUNCATE], # Prerequisites of lib/ftruncate.c. AC_DEFUN([gl_PREREQ_FTRUNCATE], [ - AC_CHECK_FUNCS([chsize]) + AC_CHECK_FUNCS([_chsize]) ]) diff --git a/m4/getcwd.m4 b/m4/getcwd.m4 index 625171a..a646b90 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-2019 Free Software Foundation, Inc. +# Copyright (C) 2001, 2003-2007, 2009-2020 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 17 +# serial 19 AC_DEFUN([gl_FUNC_GETCWD_NULL], [ @@ -21,12 +21,13 @@ AC_DEFUN([gl_FUNC_GETCWD_NULL], # else /* on Windows with MSVC */ # include # endif + ]GL_MDA_DEFINES[ # ifndef getcwd char *getcwd (); # endif ]], [[ #if defined _WIN32 && ! defined __CYGWIN__ -/* mingw cwd does not start with '/', but getcwd does allocate. +/* mingw cwd does not start with '/', but _getcwd does allocate. However, mingw fails to honor non-zero size. */ #else if (chdir ("/") != 0) @@ -54,8 +55,8 @@ AC_DEFUN([gl_FUNC_GETCWD_NULL], *-musl*) gl_cv_func_getcwd_null="guessing yes";; # Guess yes on Cygwin. cygwin*) gl_cv_func_getcwd_null="guessing yes";; - # If we don't know, assume the worst. - *) gl_cv_func_getcwd_null="guessing no";; + # If we don't know, obey --enable-cross-guesses. + *) gl_cv_func_getcwd_null="$gl_cross_guess_normal";; esac ]])]) ]) @@ -66,7 +67,8 @@ AC_DEFUN([gl_FUNC_GETCWD_SIGNATURE], [gl_cv_func_getcwd_posix_signature], [AC_COMPILE_IFELSE( [AC_LANG_PROGRAM( - [[#include ]], + [[#include + ]GL_MDA_DEFINES], [[extern #ifdef __cplusplus "C" @@ -127,7 +129,7 @@ AC_DEFUN([gl_FUNC_GETCWD], dnl Define HAVE_MINIMALLY_WORKING_GETCWD and HAVE_PARTLY_WORKING_GETCWD dnl if appropriate. case "$gl_cv_func_getcwd_path_max" in - "no"|"no, it has the AIX bug") ;; + *"no" | *"no, it has the AIX bug") ;; *) AC_DEFINE([HAVE_MINIMALLY_WORKING_GETCWD], [1], [Define to 1 if getcwd minimally works, that is, its result can be @@ -135,12 +137,12 @@ AC_DEFUN([gl_FUNC_GETCWD], ;; esac case "$gl_cv_func_getcwd_path_max" in - "no, but it is partly working") + *"no, but it is partly working") AC_DEFINE([HAVE_PARTLY_WORKING_GETCWD], [1], [Define to 1 if getcwd works, except it sometimes fails when it shouldn't, setting errno to ERANGE, ENAMETOOLONG, or ENOENT.]) ;; - "yes, but with shorter paths") + *"yes, but with shorter paths") AC_DEFINE([HAVE_GETCWD_SHORTER], [1], [Define to 1 if getcwd works, but with shorter paths than is generally tested with the replacement.]) diff --git a/m4/getdtablesize.m4 b/m4/getdtablesize.m4 index 96aa241..af32864 100644 --- a/m4/getdtablesize.m4 +++ b/m4/getdtablesize.m4 @@ -1,5 +1,5 @@ -# getdtablesize.m4 serial 7 -dnl Copyright (C) 2008-2019 Free Software Foundation, Inc. +# getdtablesize.m4 serial 8 +dnl Copyright (C) 2008-2020 Free Software Foundation, Inc. dnl This file is free software; the Free Software Foundation dnl gives unlimited permission to copy and/or distribute it, dnl with or without modifications, as long as this notice is preserved. @@ -29,13 +29,16 @@ AC_DEFUN([gl_FUNC_GETDTABLESIZE], dnl correctly require setrlimit before getdtablesize() can report dnl a larger value. AC_RUN_IFELSE([ - AC_LANG_PROGRAM([[#include ]], - [int size = getdtablesize(); - if (dup2 (0, getdtablesize()) != -1) - return 1; - if (size != getdtablesize()) - return 2; - ])], + AC_LANG_PROGRAM( + [[#include ] + GL_MDA_DEFINES + ], + [[int size = getdtablesize(); + if (dup2 (0, getdtablesize()) != -1) + return 1; + if (size != getdtablesize()) + return 2; + ]])], [gl_cv_func_getdtablesize_works=yes], [gl_cv_func_getdtablesize_works=no], [case "$host_os" in diff --git a/m4/getopt.m4 b/m4/getopt.m4 index 5991bf8..595483d 100644 --- a/m4/getopt.m4 +++ b/m4/getopt.m4 @@ -1,5 +1,5 @@ -# getopt.m4 serial 46 -dnl Copyright (C) 2002-2006, 2008-2019 Free Software Foundation, Inc. +# getopt.m4 serial 47 +dnl Copyright (C) 2002-2006, 2008-2020 Free Software Foundation, Inc. dnl This file is free software; the Free Software Foundation dnl gives unlimited permission to copy and/or distribute it, dnl with or without modifications, as long as this notice is preserved. @@ -302,8 +302,10 @@ dnl is ambiguous with environment values that contain newlines. ]])], [gl_cv_func_getopt_gnu=yes], [gl_cv_func_getopt_gnu=no], - [dnl Cross compiling. Assume the worst, even on glibc platforms. - gl_cv_func_getopt_gnu="guessing no" + [dnl Cross compiling. + dnl Assume the worst, even on glibc platforms. + dnl But obey --enable-cross-guesses. + gl_cv_func_getopt_gnu="$gl_cross_guess_normal" ]) case $gl_had_POSIXLY_CORRECT in exported) ;; diff --git a/m4/getpagesize.m4 b/m4/getpagesize.m4 index 546c3ad..8f0f046 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-2019 Free Software Foundation, +dnl Copyright (C) 2002, 2004-2005, 2007, 2009-2020 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 4a96d06..6baefc9 100644 --- a/m4/getprogname.m4 +++ b/m4/getprogname.m4 @@ -1,6 +1,6 @@ # getprogname.m4 - check for getprogname or replacements for it -# Copyright (C) 2016-2019 Free Software Foundation, Inc. +# Copyright (C) 2016-2020 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/getrandom.m4 b/m4/getrandom.m4 new file mode 100644 index 0000000..d6da71a --- /dev/null +++ b/m4/getrandom.m4 @@ -0,0 +1,68 @@ +# getrandom.m4 serial 8 +dnl Copyright 2020 Free Software Foundation, Inc. +dnl This file is free software; the Free Software Foundation +dnl gives unlimited permission to copy and/or distribute it, +dnl with or without modifications, as long as this notice is preserved. + +dnl Written by Paul Eggert. + +AC_DEFUN([gl_FUNC_GETRANDOM], +[ + AC_REQUIRE([gl_SYS_RANDOM_H_DEFAULTS]) + AC_CHECK_FUNCS_ONCE([getrandom]) + if test "$ac_cv_func_getrandom" != yes; then + HAVE_GETRANDOM=0 + 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], + [gl_cv_func_getrandom_ok], + [AC_COMPILE_IFELSE( + [AC_LANG_PROGRAM( + [[/* Additional includes are needed before on uClibc + and Mac OS X. */ + #include + #include + #include + ssize_t getrandom (void *, size_t, unsigned int); + ]], + [[]]) + ], + [gl_cv_func_getrandom_ok=yes], + [gl_cv_func_getrandom_ok=no]) + ]) + if test $gl_cv_func_getrandom_ok = no; then + REPLACE_GETRANDOM=1 + fi + fi + + case "$host_os" in + mingw*) + AC_CHECK_HEADERS([bcrypt.h], [], [], + [[#include + ]]) + AC_CACHE_CHECK([whether the bcrypt library is guaranteed to be present], + [gl_cv_lib_assume_bcrypt], + [AC_COMPILE_IFELSE( + [AC_LANG_PROGRAM( + [[#include ]], + [[#if !(_WIN32_WINNT >= _WIN32_WINNT_WIN7) + cannot assume it + #endif + ]]) + ], + [gl_cv_lib_assume_bcrypt=yes], + [gl_cv_lib_assume_bcrypt=no]) + ]) + 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' + else + LIB_GETRANDOM='-ladvapi32' + fi + ;; + *) + LIB_GETRANDOM= ;; + esac + AC_SUBST([LIB_GETRANDOM]) +]) diff --git a/m4/gettimeofday.m4 b/m4/gettimeofday.m4 index 5e2ef6f..578ed49 100644 --- a/m4/gettimeofday.m4 +++ b/m4/gettimeofday.m4 @@ -1,6 +1,6 @@ -# serial 26 +# serial 28 -# Copyright (C) 2001-2003, 2005, 2007, 2009-2019 Free Software Foundation, Inc. +# Copyright (C) 2001-2003, 2005, 2007, 2009-2020 Free Software Foundation, Inc. # This file is free software; the Free Software Foundation # gives unlimited permission to copy and/or distribute it, # with or without modifications, as long as this notice is preserved. @@ -19,7 +19,6 @@ AC_DEFUN([gl_FUNC_GETTIMEOFDAY], if test $ac_cv_func_gettimeofday != yes; then HAVE_GETTIMEOFDAY=0 else - gl_FUNC_GETTIMEOFDAY_CLOBBER AC_CACHE_CHECK([for gettimeofday with POSIX signature], [gl_cv_func_gettimeofday_posix_signature], [AC_COMPILE_IFELSE( @@ -66,63 +65,5 @@ int gettimeofday (struct timeval *restrict, struct timezone *restrict); declaration of the second argument to gettimeofday.]) ]) - -dnl See if gettimeofday clobbers the static buffer that localtime uses -dnl for its return value. The gettimeofday function from Mac OS X 10.0.4 -dnl (i.e., Darwin 1.3.7) has this problem. -dnl -dnl If it does, then arrange to use gettimeofday and localtime only via -dnl the wrapper functions that work around the problem. - -AC_DEFUN([gl_FUNC_GETTIMEOFDAY_CLOBBER], -[ - AC_REQUIRE([gl_HEADER_SYS_TIME_H]) - AC_REQUIRE([AC_CANONICAL_HOST]) dnl for cross-compiles - AC_REQUIRE([gl_LOCALTIME_BUFFER_DEFAULTS]) - - AC_CACHE_CHECK([whether gettimeofday clobbers localtime buffer], - [gl_cv_func_gettimeofday_clobber], - [AC_RUN_IFELSE( - [AC_LANG_PROGRAM( - [[#include - #include - #include - #include - ]], - [[ - time_t t = 0; - struct tm *lt; - struct tm saved_lt; - struct timeval tv; - lt = localtime (&t); - saved_lt = *lt; - gettimeofday (&tv, NULL); - return memcmp (lt, &saved_lt, sizeof (struct tm)) != 0; - ]])], - [gl_cv_func_gettimeofday_clobber=no], - [gl_cv_func_gettimeofday_clobber=yes], - [# When cross-compiling: - case "$host_os" in - # Guess all is fine on glibc systems. - *-gnu* | gnu*) gl_cv_func_gettimeofday_clobber="guessing no" ;; - # Guess all is fine on musl systems. - *-musl*) gl_cv_func_gettimeofday_clobber="guessing no" ;; - # Guess no on native Windows. - mingw*) gl_cv_func_gettimeofday_clobber="guessing no" ;; - # If we don't know, assume the worst. - *) gl_cv_func_gettimeofday_clobber="guessing yes" ;; - esac - ])]) - - case "$gl_cv_func_gettimeofday_clobber" in - *yes) - REPLACE_GETTIMEOFDAY=1 - AC_DEFINE([GETTIMEOFDAY_CLOBBERS_LOCALTIME], [1], - [Define if gettimeofday clobbers the localtime buffer.]) - gl_LOCALTIME_BUFFER_NEEDED - ;; - esac -]) - # Prerequisites of lib/gettimeofday.c. AC_DEFUN([gl_PREREQ_GETTIMEOFDAY], [:]) diff --git a/m4/glibc21.m4 b/m4/glibc21.m4 index 0ab0f23..ece484b 100644 --- a/m4/glibc21.m4 +++ b/m4/glibc21.m4 @@ -1,5 +1,5 @@ # glibc21.m4 serial 5 -dnl Copyright (C) 2000-2002, 2004, 2008, 2010-2019 Free Software Foundation, +dnl Copyright (C) 2000-2002, 2004, 2008, 2010-2020 Free Software Foundation, dnl Inc. dnl This file is free software; the Free Software Foundation dnl gives unlimited permission to copy and/or distribute it, diff --git a/m4/gnulib-common.m4 b/m4/gnulib-common.m4 index 57b94ed..8a40713 100644 --- a/m4/gnulib-common.m4 +++ b/m4/gnulib-common.m4 @@ -1,5 +1,5 @@ -# gnulib-common.m4 serial 44 -dnl Copyright (C) 2007-2019 Free Software Foundation, Inc. +# gnulib-common.m4 serial 62 +dnl Copyright (C) 2007-2020 Free Software Foundation, Inc. dnl This file is free software; the Free Software Foundation dnl gives unlimited permission to copy and/or distribute it, dnl with or without modifications, as long as this notice is preserved. @@ -12,20 +12,40 @@ AC_DEFUN([gl_COMMON], [ dnl Use AC_REQUIRE here, so that the code is expanded once only. AC_REQUIRE([gl_00GNULIB]) AC_REQUIRE([gl_COMMON_BODY]) + AC_REQUIRE([gl_ZZGNULIB]) ]) AC_DEFUN([gl_COMMON_BODY], [ + AH_VERBATIM([_GL_GNUC_PREREQ], +[/* True if the compiler says it groks GNU C version MAJOR.MINOR. */ +#if defined __GNUC__ && defined __GNUC_MINOR__ +# define _GL_GNUC_PREREQ(major, minor) \ + ((major) < __GNUC__ + ((minor) <= __GNUC_MINOR__)) +#else +# define _GL_GNUC_PREREQ(major, minor) 0 +#endif +]) AH_VERBATIM([_Noreturn], [/* The _Noreturn keyword of C11. */ #ifndef _Noreturn # if (defined __cplusplus \ && ((201103 <= __cplusplus && !(__GNUC__ == 4 && __GNUC_MINOR__ == 7)) \ - || (defined _MSC_VER && 1900 <= _MSC_VER))) + || (defined _MSC_VER && 1900 <= _MSC_VER)) \ + && 0) + /* [[noreturn]] is not practically usable, because with it the syntax + extern _Noreturn void func (...); + would not be valid; such a declaration would only be valid with 'extern' + and '_Noreturn' swapped, or without the 'extern' keyword. However, some + AIX system header files and several gnulib header files use precisely + this syntax with 'extern'. */ # define _Noreturn [[noreturn]] # elif ((!defined __cplusplus || defined __clang__) \ && (201112 <= (defined __STDC_VERSION__ ? __STDC_VERSION__ : 0) \ - || 4 < __GNUC__ + (7 <= __GNUC_MINOR__))) + || _GL_GNUC_PREREQ (4, 7) \ + || (defined __apple_build_version__ \ + ? 6000000 <= __apple_build_version__ \ + : 3 < __clang_major__ + (5 <= __clang_minor__)))) /* _Noreturn works as-is. */ -# elif 2 < __GNUC__ + (8 <= __GNUC_MINOR__) || 0x5110 <= __SUNPRO_C +# elif _GL_GNUC_PREREQ (2, 8) || defined __clang__ || 0x5110 <= __SUNPRO_C # define _Noreturn __attribute__ ((__noreturn__)) # elif 1200 <= (defined _MSC_VER ? _MSC_VER : 0) # define _Noreturn __declspec (noreturn) @@ -44,48 +64,216 @@ AC_DEFUN([gl_COMMON_BODY], [ #if defined __APPLE__ && defined __MACH__ && __APPLE_CC__ >= 5465 && !defined __cplusplus && __STDC_VERSION__ >= 199901L && !defined __GNUC_STDC_INLINE__ # define __GNUC_STDC_INLINE__ 1 #endif]) - AH_VERBATIM([unused_parameter], -[/* Define as a marker that can be attached to declarations that might not - be used. This helps to reduce warnings, such as from - GCC -Wunused-parameter. */ -#if __GNUC__ >= 3 || (__GNUC__ == 2 && __GNUC_MINOR__ >= 7) -# define _GL_UNUSED __attribute__ ((__unused__)) + AH_VERBATIM([attribute], +[/* Attributes. */ +#ifdef __has_attribute +# define _GL_HAS_ATTRIBUTE(attr) __has_attribute (__##attr##__) #else -# define _GL_UNUSED +# define _GL_HAS_ATTRIBUTE(attr) _GL_ATTR_##attr +# define _GL_ATTR_alloc_size _GL_GNUC_PREREQ (4, 3) +# define _GL_ATTR_always_inline _GL_GNUC_PREREQ (3, 2) +# define _GL_ATTR_artificial _GL_GNUC_PREREQ (4, 3) +# define _GL_ATTR_cold _GL_GNUC_PREREQ (4, 3) +# define _GL_ATTR_const _GL_GNUC_PREREQ (2, 95) +# define _GL_ATTR_deprecated _GL_GNUC_PREREQ (3, 1) +# define _GL_ATTR_diagnose_if 0 +# define _GL_ATTR_error _GL_GNUC_PREREQ (4, 3) +# define _GL_ATTR_externally_visible _GL_GNUC_PREREQ (4, 1) +# define _GL_ATTR_fallthrough _GL_GNUC_PREREQ (7, 0) +# define _GL_ATTR_format _GL_GNUC_PREREQ (2, 7) +# define _GL_ATTR_leaf _GL_GNUC_PREREQ (4, 6) +# ifdef _ICC +# define _GL_ATTR_may_alias 0 +# else +# define _GL_ATTR_may_alias _GL_GNUC_PREREQ (3, 3) +# endif +# define _GL_ATTR_malloc _GL_GNUC_PREREQ (3, 0) +# define _GL_ATTR_noinline _GL_GNUC_PREREQ (3, 1) +# define _GL_ATTR_nonnull _GL_GNUC_PREREQ (3, 3) +# define _GL_ATTR_nonstring _GL_GNUC_PREREQ (8, 0) +# define _GL_ATTR_nothrow _GL_GNUC_PREREQ (3, 3) +# define _GL_ATTR_packed _GL_GNUC_PREREQ (2, 7) +# define _GL_ATTR_pure _GL_GNUC_PREREQ (2, 96) +# define _GL_ATTR_returns_nonnull _GL_GNUC_PREREQ (4, 9) +# define _GL_ATTR_sentinel _GL_GNUC_PREREQ (4, 0) +# define _GL_ATTR_unused _GL_GNUC_PREREQ (2, 7) +# define _GL_ATTR_warn_unused_result _GL_GNUC_PREREQ (3, 4) #endif -/* The name _UNUSED_PARAMETER_ is an earlier spelling, although the name - is a misnomer outside of parameter lists. */ -#define _UNUSED_PARAMETER_ _GL_UNUSED - -/* gcc supports the "unused" attribute on possibly unused labels, and - g++ has since version 4.5. Note to support C++ as well as C, - _GL_UNUSED_LABEL should be used with a trailing ; */ -#if !defined __cplusplus || __GNUC__ > 4 \ - || (__GNUC__ == 4 && __GNUC_MINOR__ >= 5) -# define _GL_UNUSED_LABEL _GL_UNUSED + +]dnl There is no _GL_ATTRIBUTE_ALIGNED; use stdalign's _Alignas instead. +[ +#if _GL_HAS_ATTRIBUTE (alloc_size) +# define _GL_ATTRIBUTE_ALLOC_SIZE(args) __attribute__ ((__alloc_size__ args)) #else -# define _GL_UNUSED_LABEL +# define _GL_ATTRIBUTE_ALLOC_SIZE(args) #endif -/* The __pure__ attribute was added in gcc 2.96. */ -#if __GNUC__ > 2 || (__GNUC__ == 2 && __GNUC_MINOR__ >= 96) -# define _GL_ATTRIBUTE_PURE __attribute__ ((__pure__)) +#if _GL_HAS_ATTRIBUTE (always_inline) +# define _GL_ATTRIBUTE_ALWAYS_INLINE __attribute__ ((__always_inline__)) +#else +# define _GL_ATTRIBUTE_ALWAYS_INLINE +#endif + +#if _GL_HAS_ATTRIBUTE (artificial) +# define _GL_ATTRIBUTE_ARTIFICIAL __attribute__ ((__artificial__)) +#else +# define _GL_ATTRIBUTE_ARTIFICIAL +#endif + +/* Avoid __attribute__ ((cold)) on MinGW; see thread starting at + . + 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__)) +# else +# define _GL_ATTRIBUTE_COLD __attribute__ ((cold)) +# endif #else -# define _GL_ATTRIBUTE_PURE /* empty */ +# define _GL_ATTRIBUTE_COLD #endif -/* The __const__ attribute was added in gcc 2.95. */ -#if __GNUC__ > 2 || (__GNUC__ == 2 && __GNUC_MINOR__ >= 95) +#if _GL_HAS_ATTRIBUTE (const) # define _GL_ATTRIBUTE_CONST __attribute__ ((__const__)) #else -# define _GL_ATTRIBUTE_CONST /* empty */ +# define _GL_ATTRIBUTE_CONST +#endif + +#if 201710L < __STDC_VERSION__ +# define _GL_ATTRIBUTE_DEPRECATED [[__deprecated__]] +#elif _GL_HAS_ATTRIBUTE (deprecated) +# define _GL_ATTRIBUTE_DEPRECATED __attribute__ ((__deprecated__)) +#else +# define _GL_ATTRIBUTE_DEPRECATED +#endif + +#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 + +#if _GL_HAS_ATTRIBUTE (externally_visible) +# define _GL_ATTRIBUTE_EXTERNALLY_VISIBLE __attribute__ ((externally_visible)) +#else +# define _GL_ATTRIBUTE_EXTERNALLY_VISIBLE +#endif + +/* FALLTHROUGH is special, because it always expands to something. */ +#if 201710L < __STDC_VERSION__ +# define _GL_ATTRIBUTE_FALLTHROUGH [[__fallthrough__]] +#elif _GL_HAS_ATTRIBUTE (fallthrough) +# define _GL_ATTRIBUTE_FALLTHROUGH __attribute__ ((__fallthrough__)) +#else +# define _GL_ATTRIBUTE_FALLTHROUGH ((void) 0) +#endif + +#if _GL_HAS_ATTRIBUTE (format) +# define _GL_ATTRIBUTE_FORMAT(spec) __attribute__ ((__format__ spec)) +#else +# define _GL_ATTRIBUTE_FORMAT(spec) +#endif + +#if _GL_HAS_ATTRIBUTE (leaf) +# define _GL_ATTRIBUTE_LEAF __attribute__ ((__leaf__)) +#else +# define _GL_ATTRIBUTE_LEAF +#endif + +/* 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 #endif -/* The __malloc__ attribute was added in gcc 3. */ -#if 3 <= __GNUC__ +#if 201710L < __STDC_VERSION__ +# define _GL_ATTRIBUTE_MAYBE_UNUSED [[__maybe_unused__]] +#elif _GL_HAS_ATTRIBUTE (unused) +# define _GL_ATTRIBUTE_MAYBE_UNUSED __attribute__ ((__unused__)) +#else +# define _GL_ATTRIBUTE_MAYBE_UNUSED +#endif +/* Earlier spellings of this macro. */ +#define _GL_UNUSED _GL_ATTRIBUTE_MAYBE_UNUSED +#define _UNUSED_PARAMETER_ _GL_ATTRIBUTE_MAYBE_UNUSED + +#if _GL_HAS_ATTRIBUTE (malloc) # define _GL_ATTRIBUTE_MALLOC __attribute__ ((__malloc__)) #else -# define _GL_ATTRIBUTE_MALLOC /* empty */ +# define _GL_ATTRIBUTE_MALLOC +#endif + +#if 201710L < __STDC_VERSION__ +# 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 +#endif + +#if _GL_HAS_ATTRIBUTE (noinline) +# define _GL_ATTRIBUTE_NOINLINE __attribute__ ((__noinline__)) +#else +# define _GL_ATTRIBUTE_NOINLINE +#endif + +#if _GL_HAS_ATTRIBUTE (nonnull) +# define _GL_ATTRIBUTE_NONNULL(args) __attribute__ ((__nonnull__ args)) +#else +# define _GL_ATTRIBUTE_NONNULL(args) +#endif + +#if _GL_HAS_ATTRIBUTE (nonstring) +# define _GL_ATTRIBUTE_NONSTRING __attribute__ ((__nonstring__)) +#else +# define _GL_ATTRIBUTE_NONSTRING +#endif + +/* There is no _GL_ATTRIBUTE_NORETURN; use _Noreturn instead. */ + +#if _GL_HAS_ATTRIBUTE (nothrow) && !defined __cplusplus +# define _GL_ATTRIBUTE_NOTHROW __attribute__ ((__nothrow__)) +#else +# define _GL_ATTRIBUTE_NOTHROW +#endif + +#if _GL_HAS_ATTRIBUTE (packed) +# define _GL_ATTRIBUTE_PACKED __attribute__ ((__packed__)) +#else +# define _GL_ATTRIBUTE_PACKED +#endif + +#if _GL_HAS_ATTRIBUTE (pure) +# define _GL_ATTRIBUTE_PURE __attribute__ ((__pure__)) +#else +# define _GL_ATTRIBUTE_PURE +#endif + +#if _GL_HAS_ATTRIBUTE (returns_nonnull) +# define _GL_ATTRIBUTE_RETURNS_NONNULL __attribute__ ((__returns_nonnull__)) +#else +# define _GL_ATTRIBUTE_RETURNS_NONNULL +#endif + +#if _GL_HAS_ATTRIBUTE (sentinel) +# define _GL_ATTRIBUTE_SENTINEL(pos) __attribute__ ((__sentinel__ pos)) +#else +# define _GL_ATTRIBUTE_SENTINEL(pos) +#endif + +]dnl There is no _GL_ATTRIBUTE_VISIBILITY; see m4/visibility.m4 instead. +[ +/* To support C++ as well as C, use _GL_UNUSED_LABEL with trailing ';'. */ +#if !defined __cplusplus || _GL_GNUC_PREREQ (4, 5) +# define _GL_UNUSED_LABEL _GL_ATTRIBUTE_MAYBE_UNUSED +#else +# define _GL_UNUSED_LABEL #endif ]) AH_VERBATIM([async_safe], @@ -94,7 +282,7 @@ AC_DEFUN([gl_COMMON_BODY], [ invoked from such signal handlers. Such functions have some restrictions: * All functions that it calls should be marked _GL_ASYNC_SAFE as well, or should be listed as async-signal-safe in POSIX - + section 2.4.3. Note that malloc(), sprintf(), and fwrite(), in particular, are NOT async-signal-safe. * All memory locations (variables and struct fields) that these functions @@ -115,6 +303,49 @@ AC_DEFUN([gl_COMMON_BODY], [ errno. */ #define _GL_ASYNC_SAFE ]) + AH_VERBATIM([micro_optimizations], +[/* _GL_CMP (n1, n2) performs a three-valued comparison on n1 vs. n2, where + n1 and n2 are expressions without side effects, that evaluate to real + numbers (excluding NaN). + It returns + 1 if n1 > n2 + 0 if n1 == n2 + -1 if n1 < n2 + The naïve code (n1 > n2 ? 1 : n1 < n2 ? -1 : 0) produces a conditional + jump with nearly all GCC versions up to GCC 10. + This variant (n1 < n2 ? -1 : n1 > n2) produces a conditional with many + GCC versions up to GCC 9. + The better code (n1 > n2) - (n1 < n2) from Hacker's Delight § 2-9 + avoids conditional jumps in all GCC versions >= 3.4. */ +#define _GL_CMP(n1, n2) (((n1) > (n2)) - ((n1) < (n2))) +]) + dnl Hint which direction to take regarding cross-compilation guesses: + dnl When a user installs a program on a platform they are not intimately + dnl familiar with, --enable-cross-guesses=conservative is the appropriate + dnl choice. It implements the "If we don't know, assume the worst" principle. + dnl However, when an operating system developer (on a platform which is not + dnl yet known to gnulib) builds packages for their platform, they want to + dnl expose, not hide, possible platform bugs; in this case, + dnl --enable-cross-guesses=risky is the appropriate choice. + dnl Sets the variables + dnl gl_cross_guess_normal (to be used when 'yes' is good and 'no' is bad), + dnl gl_cross_guess_inverted (to be used when 'no' is good and 'yes' is bad). + AC_ARG_ENABLE([cross-guesses], + [AS_HELP_STRING([--enable-cross-guesses={conservative|risky}], + [specify policy for cross-compilation guesses])], + [if test "x$enableval" != xconservative && test "x$enableval" != xrisky; then + AC_MSG_WARN([invalid argument supplied to --enable-cross-guesses]) + enableval=conservative + fi + gl_cross_guesses="$enableval"], + [gl_cross_guesses=conservative]) + if test $gl_cross_guesses = risky; then + gl_cross_guess_normal="guessing yes" + gl_cross_guess_inverted="guessing no" + else + gl_cross_guess_normal="guessing no" + gl_cross_guess_inverted="guessing yes" + fi dnl Preparation for running test programs: dnl Tell glibc to write diagnostics from -D_FORTIFY_SOURCE=2 to stderr, not dnl to /dev/tty, so they can be redirected to log files. Such diagnostics @@ -249,34 +480,20 @@ AC_DEFUN([gl_FEATURES_H], AC_SUBST([HAVE_FEATURES_H]) ]) -# AS_VAR_IF(VAR, VALUE, [IF-MATCH], [IF-NOT-MATCH]) -# ---------------------------------------------------- -# Backport of autoconf-2.63b's macro. -# Remove this macro when we can assume autoconf >= 2.64. -m4_ifndef([AS_VAR_IF], -[m4_define([AS_VAR_IF], -[AS_IF([test x"AS_VAR_GET([$1])" = x""$2], [$3], [$4])])]) - # gl_PROG_CC_C99 # Modifies the value of the shell variable CC in an attempt to make $CC # understand ISO C99 source code. -# This is like AC_PROG_CC_C99, except that -# - AC_PROG_CC_C99 does not mix well with AC_PROG_CC_STDC -# , -# but many more packages use AC_PROG_CC_STDC than AC_PROG_CC_C99 -# . -# Remaining problems: -# - When AC_PROG_CC_STDC is invoked twice, it adds the C99 enabling options -# to CC twice -# . -# - AC_PROG_CC_STDC is likely to change now that C11 is an ISO standard. AC_DEFUN([gl_PROG_CC_C99], [ - dnl Change that version number to the minimum Autoconf version that supports - dnl mixing AC_PROG_CC_C99 calls with AC_PROG_CC_STDC calls. - m4_version_prereq([9.0], - [AC_REQUIRE([AC_PROG_CC_C99])], - [AC_REQUIRE([AC_PROG_CC_STDC])]) + dnl Just use AC_PROG_CC_C99. + dnl When AC_PROG_CC_C99 and AC_PROG_CC_STDC are used together, the substituted + dnl value of CC will contain the C99 enabling options twice. But this is only + dnl a cosmetic problem. + dnl With Autoconf >= 2.69c, use AC_PROG_CC since it implies AC_PROG_CC_C99; + dnl this avoids a "warning: The macro `AC_PROG_CC_C99' is obsolete." + m4_version_prereq([2.69c], + [AC_REQUIRE([AC_PROG_CC])], + [AC_REQUIRE([AC_PROG_CC_C99])]) ]) # gl_PROG_AR_RANLIB @@ -381,12 +598,13 @@ AC_DEFUN([AC_C_RESTRICT], nothing if this is not supported. Do not define if restrict is supported directly. */ #undef restrict -/* Work around a bug in Sun C++: it does not support _Restrict or - __restrict__, even though the corresponding Sun C compiler ends up with - "#define restrict _Restrict" or "#define restrict __restrict__" in the - previous line. Perhaps some future version of Sun C++ will work with - restrict; if so, hopefully it defines __RESTRICT like Sun C does. */ -#if defined __SUNPRO_CC && !defined __RESTRICT +/* Work around a bug in older versions of Sun C++, which did not + #define __restrict__ or support _Restrict or __restrict__ + even though the corresponding Sun C compiler ended up with + "#define restrict _Restrict" or "#define restrict __restrict__" + in the previous line. This workaround can be removed once + we assume Oracle Developer Studio 12.5 (2016) or later. */ +#if defined __SUNPRO_CC && !defined __RESTRICT && !defined __restrict__ # define _Restrict # define __restrict__ #endif]) @@ -406,6 +624,22 @@ AC_DEFUN([gl_BIGENDIAN], AC_C_BIGENDIAN ]) +# A temporary file descriptor. +# Must be less than 10, because dash 0.5.8 does not support redirections +# with multi-digit file descriptors. +m4_define([GL_TMP_FD], 9) + +# gl_SILENT(command) +# executes command, but without the normal configure output. +# This is useful when you want to invoke AC_CACHE_CHECK (or AC_CHECK_FUNC etc.) +# inside another AC_CACHE_CHECK. +AC_DEFUN([gl_SILENT], +[ + exec GL_TMP_FD>&AS_MESSAGE_FD AS_MESSAGE_FD>/dev/null + $1 + exec AS_MESSAGE_FD>&GL_TMP_FD GL_TMP_FD>&- +]) + # gl_CACHE_VAL_SILENT(cache-id, command-to-set-it) # is like AC_CACHE_VAL(cache-id, command-to-set-it), except that it does not # output a spurious "(cached)" mark in the midst of other configure output. @@ -413,12 +647,77 @@ AC_DEFUN([gl_BIGENDIAN], # by an AC_MSG_CHECKING/AC_MSG_RESULT pair. AC_DEFUN([gl_CACHE_VAL_SILENT], [ - saved_as_echo_n="$as_echo_n" - as_echo_n=':' - AC_CACHE_VAL([$1], [$2]) - as_echo_n="$saved_as_echo_n" + gl_SILENT([ + AC_CACHE_VAL([$1], [$2]) + ]) ]) -# AS_VAR_COPY was added in autoconf 2.63b -m4_define_default([AS_VAR_COPY], -[AS_LITERAL_IF([$1[]$2], [$1=$$2], [eval $1=\$$2])]) +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 +dnl without linking with '-loldnames' and without generating warnings. +dnl Usage: Use it after all system header files are included. +dnl #include <...> +dnl #include <...> +dnl ]GL_MDA_DEFINES[ +dnl ... +AC_DEFUN([GL_MDA_DEFINES],[ +AC_REQUIRE([_GL_MDA_DEFINES]) +[$gl_mda_defines] +]) +AC_DEFUN([_GL_MDA_DEFINES], +[gl_mda_defines=' +#if defined _WIN32 && !defined __CYGWIN__ +#define access _access +#define chdir _chdir +#define chmod _chmod +#define close _close +#define creat _creat +#define dup _dup +#define dup2 _dup2 +#define ecvt _ecvt +#define execl _execl +#define execle _execle +#define execlp _execlp +#define execv _execv +#define execve _execve +#define execvp _execvp +#define execvpe _execvpe +#define fcloseall _fcloseall +#define fcvt _fcvt +#define fdopen _fdopen +#define fileno _fileno +#define gcvt _gcvt +#define getcwd _getcwd +#define getpid _getpid +#define getw _getw +#define isatty _isatty +#define j0 _j0 +#define j1 _j1 +#define jn _jn +#define lfind _lfind +#define lsearch _lsearch +#define lseek _lseek +#define memccpy _memccpy +#define mkdir _mkdir +#define mktemp _mktemp +#define open _open +#define putenv _putenv +#define putw _putw +#define read _read +#define rmdir _rmdir +#define strdup _strdup +#define swab _swab +#define tempnam _tempnam +#define tzset _tzset +#define umask _umask +#define unlink _unlink +#define utime _utime +#define wcsdup _wcsdup +#define write _write +#define y0 _y0 +#define y1 _y1 +#define yn _yn +#endif +' +]) diff --git a/m4/gnulib-comp.m4 b/m4/gnulib-comp.m4 index f46f178..e04e589 100644 --- a/m4/gnulib-comp.m4 +++ b/m4/gnulib-comp.m4 @@ -1,5 +1,5 @@ # DO NOT EDIT! GENERATED AUTOMATICALLY! -# Copyright (C) 2002-2019 Free Software Foundation, Inc. +# Copyright (C) 2002-2020 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 @@ -56,6 +56,8 @@ AC_DEFUN([gl_EARLY], # Code from module arpa_inet-tests: # Code from module assert: # Code from module assure: + # Code from module attribute: + # Code from module basename-lgpl: # Code from module binary-io: # Code from module binary-io-tests: # Code from module bind: @@ -74,6 +76,7 @@ AC_DEFUN([gl_EARLY], # Code from module calloc-posix: # Code from module canonicalize-lgpl: # Code from module canonicalize-lgpl-tests: + # Code from module clock-time: # Code from module cloexec: # Code from module cloexec-tests: # Code from module close: @@ -90,7 +93,6 @@ AC_DEFUN([gl_EARLY], # Code from module dirname-lgpl: # Code from module dirname-tests: # Code from module do-release-commit-and-tag: - # Code from module dosname: # Code from module double-slash-root: # Code from module dup2: # Code from module dup2-tests: @@ -136,6 +138,8 @@ AC_DEFUN([gl_EARLY], # Code from module getpagesize: # Code from module getprogname: # Code from module getprogname-tests: + # Code from module getrandom: + # Code from module getrandom-tests: # Code from module gettext-h: # Code from module gettimeofday: # Code from module gettimeofday-tests: @@ -145,7 +149,8 @@ AC_DEFUN([gl_EARLY], # Code from module gnumakefile: # Code from module gnupload: # Code from module hard-locale: - # Code from module havelib: + # Code from module hard-locale-tests: + # Code from module idx: # Code from module ignore-value: # Code from module ignore-value-tests: # Code from module include_next: @@ -178,7 +183,6 @@ AC_DEFUN([gl_EARLY], # Code from module localeconv-tests: # Code from module localename: # Code from module localename-tests: - # Code from module localtime-buffer: # Code from module lock: # Code from module lock-tests: # Code from module long-options: @@ -225,8 +229,7 @@ AC_DEFUN([gl_EARLY], # Code from module priv-set-tests: # Code from module progname: # Code from module pthread-h: - AC_DEFINE([_REENTRANT], 1, [For thread-safety on OSF/1, Solaris.]) - AC_DEFINE([_THREAD_SAFE], 1, [For thread-safety on AIX, FreeBSD.]) + gl_ANYTHREADLIB_EARLY # Code from module pthread-h-tests: # Code from module pthread-thread: # Code from module pthread-thread-tests: @@ -259,6 +262,8 @@ AC_DEFUN([gl_EARLY], # Code from module setenv: # Code from module setenv-tests: # Code from module setlocale: + # Code from module setlocale-null: + # Code from module setlocale-null-tests: # Code from module setlocale-tests: # Code from module setsockopt: # Code from module setsockopt-tests: @@ -291,6 +296,7 @@ AC_DEFUN([gl_EARLY], 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. gl_PROG_CC_C99 + # Code from module stdarg-tests: # Code from module stdbool: # Code from module stdbool-tests: # Code from module stddef: @@ -321,6 +327,8 @@ AC_DEFUN([gl_EARLY], # Code from module symlink-tests: # Code from module sys_ioctl: # Code from module sys_ioctl-tests: + # Code from module sys_random: + # Code from module sys_random-tests: # Code from module sys_select: # Code from module sys_select-tests: # Code from module sys_socket: @@ -337,6 +345,7 @@ AC_DEFUN([gl_EARLY], # Code from module test-framework-sh: # Code from module test-framework-sh-tests: # Code from module thread: + # Code from module thread-optim: # Code from module thread-tests: # Code from module threadlib: gl_THREADLIB_EARLY @@ -382,6 +391,7 @@ AC_DEFUN([gl_EARLY], # Code from module xalloc-oversized: # Code from module xstrndup: # Code from module xstrtol: + # Code from module xstrtol-error: # Code from module xstrtol-tests: # Code from module xstrtoll: # Code from module xstrtoll-tests: @@ -432,6 +442,8 @@ AC_SUBST([LTALLOCA]) gl_MODULE_INDICATOR([canonicalize-lgpl]) gl_STDLIB_MODULE_INDICATOR([canonicalize_file_name]) gl_STDLIB_MODULE_INDICATOR([realpath]) + gl_CLOCK_TIME + gl_MODULE_INDICATOR_FOR_TESTS([cloexec]) gl_FUNC_CLOSE if test $REPLACE_CLOSE = 1; then AC_LIBOBJ([close]) @@ -440,10 +452,14 @@ AC_SUBST([LTALLOCA]) gl_MODULE_INDICATOR([close-stream]) gl_CONFIG_H gl_CONFIGMAKE_PREP - gl_DIRNAME gl_MODULE_INDICATOR([dirname]) - gl_DIRNAME_LGPL gl_DOUBLE_SLASH_ROOT + gl_FUNC_DUP2 + if test $REPLACE_DUP2 = 1; then + AC_LIBOBJ([dup2]) + gl_PREREQ_DUP2 + fi + gl_UNISTD_MODULE_INDICATOR([dup2]) gl_HEADER_ERRNO_H gl_ERROR if test $ac_cv_lib_error_at_line = no; then @@ -454,6 +470,11 @@ AC_SUBST([LTALLOCA]) [AM_][XGETTEXT_OPTION([--flag=error:3:c-format]) AM_][XGETTEXT_OPTION([--flag=error_at_line:5:c-format])]) AC_REQUIRE([gl_EXTERN_INLINE]) + gl_FUNC_FCNTL + if test $HAVE_FCNTL = 0 || test $REPLACE_FCNTL = 1; then + AC_LIBOBJ([fcntl]) + fi + gl_FCNTL_MODULE_INDICATOR([fcntl]) gl_FCNTL_H gl_FUNC_FPENDING if test $gl_cv_func___fpending = no; then @@ -476,6 +497,12 @@ AC_SUBST([LTALLOCA]) gl_PREREQ_FSYNC fi gl_UNISTD_MODULE_INDICATOR([fsync]) + gl_FUNC_GETDTABLESIZE + if test $HAVE_GETDTABLESIZE = 0 || test $REPLACE_GETDTABLESIZE = 1; then + AC_LIBOBJ([getdtablesize]) + gl_PREREQ_GETDTABLESIZE + fi + gl_UNISTD_MODULE_INDICATOR([getdtablesize]) gl_FUNC_GETOPT_GNU dnl Because of the way gl_FUNC_GETOPT_GNU is implemented (the gl_getopt_required dnl mechanism), there is no need to do any AC_LIBOBJ or AC_SUBST here; they are @@ -488,15 +515,16 @@ AC_SUBST([LTALLOCA]) GNULIB_GL_UNISTD_H_GETOPT=1 fi AC_SUBST([GNULIB_GL_UNISTD_H_GETOPT]) + gl_UNISTD_MODULE_INDICATOR([getopt-posix]) gl_FUNC_GETPROGNAME + AC_REQUIRE([AC_CANONICAL_HOST]) + gl_FUNC_GETRANDOM + if test $HAVE_GETRANDOM = 0 || test $REPLACE_GETRANDOM = 1; then + AC_LIBOBJ([getrandom]) + fi + gl_SYS_RANDOM_MODULE_INDICATOR([getrandom]) AC_SUBST([LIBINTL]) AC_SUBST([LTLIBINTL]) - gl_FUNC_GETTIMEOFDAY - if test $HAVE_GETTIMEOFDAY = 0 || test $REPLACE_GETTIMEOFDAY = 1; then - AC_LIBOBJ([gettimeofday]) - gl_PREREQ_GETTIMEOFDAY - fi - gl_SYS_TIME_MODULE_INDICATOR([gettimeofday]) # 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. @@ -507,6 +535,9 @@ AC_SUBST([LTALLOCA]) m4_defn([m4_PACKAGE_VERSION])), [1], [], [AC_CONFIG_LINKS([$GNUmakefile:$GNUmakefile], [], [GNUmakefile=$GNUmakefile])]) + AC_REQUIRE([gl_FUNC_SETLOCALE_NULL]) + LIB_HARD_LOCALE="$LIB_SETLOCALE_NULL" + AC_SUBST([LIB_HARD_LOCALE]) gl_INTTYPES_H gl_INTTYPES_INCOMPLETE gl_LANGINFO_H @@ -525,8 +556,6 @@ AC_SUBST([LTALLOCA]) gl_PREREQ_LOCALECONV fi gl_LOCALE_MODULE_INDICATOR([localeconv]) - AC_REQUIRE([gl_LOCALTIME_BUFFER_DEFAULTS]) - AC_LIBOBJ([localtime-buffer]) gl_LOCK gl_MODULE_INDICATOR([lock]) gl_FUNC_LSEEK @@ -558,6 +587,11 @@ AC_SUBST([LTALLOCA]) gl_FUNC_MBRTOWC if test $HAVE_MBRTOWC = 0 || test $REPLACE_MBRTOWC = 1; then AC_LIBOBJ([mbrtowc]) + if test $REPLACE_MBSTATE_T = 1; then + AC_LIBOBJ([lc-charset-dispatch]) + AC_LIBOBJ([mbtowc-lock]) + gl_PREREQ_MBTOWC_LOCK + fi gl_PREREQ_MBRTOWC fi gl_WCHAR_MODULE_INDICATOR([mbrtowc]) @@ -598,7 +632,17 @@ AC_SUBST([LTALLOCA]) if test $HAVE_NL_LANGINFO = 0 || test $REPLACE_NL_LANGINFO = 1; then AC_LIBOBJ([nl_langinfo]) fi + if test $REPLACE_NL_LANGINFO = 1 && test $NL_LANGINFO_MTSAFE = 0; then + AC_LIBOBJ([nl_langinfo-lock]) + gl_PREREQ_NL_LANGINFO_LOCK + fi gl_LANGINFO_MODULE_INDICATOR([nl_langinfo]) + gl_FUNC_OPEN + if test $REPLACE_OPEN = 1; then + AC_LIBOBJ([open]) + gl_PREREQ_OPEN + fi + gl_FCNTL_MODULE_INDICATOR([open]) gl_PATHMAX AC_CHECK_DECLS([program_invocation_name], [], [], [#include ]) AC_CHECK_DECLS([program_invocation_short_name], [], [], [#include ]) @@ -638,6 +682,12 @@ AC_SUBST([LTALLOCA]) fi gl_STDLIB_MODULE_INDICATOR([rpmatch]) gl_PREREQ_SAFE_READ + gl_FUNC_SETLOCALE_NULL + if test $SETLOCALE_NULL_ALL_MTSAFE = 0 || test $SETLOCALE_NULL_ONE_MTSAFE = 0; then + AC_LIBOBJ([setlocale-lock]) + gl_PREREQ_SETLOCALE_LOCK + fi + gl_LOCALE_MODULE_INDICATOR([setlocale_null]) gl_FUNC_SLEEP if test $HAVE_SLEEP = 0 || test $REPLACE_SLEEP = 1; then AC_LIBOBJ([sleep]) @@ -657,6 +707,7 @@ AC_SUBST([LTALLOCA]) gl_SYS_STAT_MODULE_INDICATOR([stat]) gl_STAT_TIME gl_STAT_BIRTHTIME + gl_STDALIGN_H gl_STDARG_H AM_STDBOOL_H gl_STDDEF_H @@ -664,7 +715,7 @@ AC_SUBST([LTALLOCA]) gl_STDIO_H gl_STDLIB_H gl_FUNC_STRDUP_POSIX - if test $ac_cv_func_strdup = no || test $REPLACE_STRDUP = 1; then + if test $REPLACE_STRDUP = 1; then AC_LIBOBJ([strdup]) gl_PREREQ_STRDUP fi @@ -705,13 +756,14 @@ AC_SUBST([LTALLOCA]) gl_PREREQ_STRTOULL fi gl_STDLIB_MODULE_INDICATOR([strtoull]) - gl_HEADER_SYS_STAT_H + gl_HEADER_SYS_RANDOM AC_PROG_MKDIR_P - gl_HEADER_SYS_TIME_H + gl_HEADER_SYS_STAT_H AC_PROG_MKDIR_P gl_SYS_TYPES_H AC_PROG_MKDIR_P gl_FUNC_GEN_TEMPNAME + gl_MODULE_INDICATOR([tempname]) AC_REQUIRE([gl_THREADLIB]) gl_HEADER_TIME_H gl_UNISTD_H @@ -759,14 +811,10 @@ AC_SUBST([LTALLOCA]) ;; esac gl_XALLOC + gl_MODULE_INDICATOR([xalloc]) + gl_MODULE_INDICATOR([xalloc-die]) gl_XSTRNDUP gl_XSTRTOL - AC_LIBOBJ([xstrtoll]) - AC_LIBOBJ([xstrtoull]) - AC_TYPE_LONG_LONG_INT - test $ac_cv_type_long_long_int = no \ - && AC_MSG_ERROR( - [you lack long long support; required by gnulib's xstrtoll module]) # End of code from modules m4_ifval(gl_LIBSOURCES_LIST, [ m4_syscmd([test ! -d ]m4_defn([gl_LIBSOURCES_DIR])[ || @@ -829,26 +877,14 @@ changequote([, ])dnl gt_LOCALE_FR_UTF8 gt_LOCALE_FR gt_LOCALE_TR_UTF8 - gl_MODULE_INDICATOR_FOR_TESTS([cloexec]) AC_REQUIRE([gl_HEADER_SYS_SOCKET]) if test "$ac_cv_header_winsock2_h" = yes; then AC_LIBOBJ([connect]) fi gl_SYS_SOCKET_MODULE_INDICATOR([connect]) gl_CTYPE_H - gl_FUNC_DUP2 - if test $HAVE_DUP2 = 0 || test $REPLACE_DUP2 = 1; then - AC_LIBOBJ([dup2]) - gl_PREREQ_DUP2 - fi - gl_UNISTD_MODULE_INDICATOR([dup2]) gl_ENVIRON gl_UNISTD_MODULE_INDICATOR([environ]) - gl_FUNC_FCNTL - if test $HAVE_FCNTL = 0 || test $REPLACE_FCNTL = 1; then - AC_LIBOBJ([fcntl]) - fi - gl_FCNTL_MODULE_INDICATOR([fcntl]) gl_FUNC_FDOPEN if test $REPLACE_FDOPEN = 1; then AC_LIBOBJ([fdopen]) @@ -867,17 +903,20 @@ changequote([, ])dnl AC_LIBOBJ([getcwd-lgpl]) fi gl_UNISTD_MODULE_INDICATOR([getcwd]) - gl_FUNC_GETDTABLESIZE - if test $HAVE_GETDTABLESIZE = 0 || test $REPLACE_GETDTABLESIZE = 1; then - AC_LIBOBJ([getdtablesize]) - gl_PREREQ_GETDTABLESIZE - fi - gl_UNISTD_MODULE_INDICATOR([getdtablesize]) gl_FUNC_GETPAGESIZE if test $REPLACE_GETPAGESIZE = 1; then AC_LIBOBJ([getpagesize]) fi gl_UNISTD_MODULE_INDICATOR([getpagesize]) + gl_FUNC_GETTIMEOFDAY + if test $HAVE_GETTIMEOFDAY = 0 || test $REPLACE_GETTIMEOFDAY = 1; then + AC_LIBOBJ([gettimeofday]) + gl_PREREQ_GETTIMEOFDAY + fi + gl_SYS_TIME_MODULE_INDICATOR([gettimeofday]) + gl_MUSL_LIBC + dnl Distinguish OpenBSD >= 6.2 from OpenBSD < 6.2. + AC_CHECK_FUNCS_ONCE([duplocale]) gl_FUNC_INET_PTON if test $HAVE_INET_PTON = 0 || test $REPLACE_INET_PTON = 1; then AC_LIBOBJ([inet_pton]) @@ -894,6 +933,7 @@ changequote([, ])dnl if test $HAVE_ISBLANK = 0; then AC_LIBOBJ([isblank]) fi + gl_MODULE_INDICATOR([isblank]) gl_CTYPE_MODULE_INDICATOR([isblank]) AC_REQUIRE([gl_HEADER_SYS_SOCKET]) if test "$ac_cv_header_winsock2_h" = yes; then @@ -906,6 +946,7 @@ changequote([, ])dnl AC_CHECK_FUNCS_ONCE([newlocale]) AC_CHECK_HEADERS_ONCE([semaphore.h]) AC_CHECK_DECLS_ONCE([alarm]) + AC_REQUIRE([gl_SEMAPHORE]) gt_LOCALE_FR gt_LOCALE_FR_UTF8 gt_LOCALE_JA @@ -922,12 +963,6 @@ changequote([, ])dnl AC_PROG_MKDIR_P gt_LOCALE_FR gt_LOCALE_FR_UTF8 - gl_FUNC_OPEN - if test $REPLACE_OPEN = 1; then - AC_LIBOBJ([open]) - gl_PREREQ_OPEN - fi - gl_FCNTL_MODULE_INDICATOR([open]) gl_FUNC_PERROR if test $REPLACE_PERROR = 1; then AC_LIBOBJ([perror]) @@ -1026,7 +1061,6 @@ changequote([, ])dnl AC_REQUIRE([gl_SOCKETLIB]) AC_REQUIRE([gl_SOCKETS]) gl_TYPE_SOCKLEN_T - gl_STDALIGN_H AC_REQUIRE([gt_TYPE_WCHAR_T]) AC_REQUIRE([gt_TYPE_WINT_T]) gl_FUNC_STRERROR_R @@ -1053,9 +1087,12 @@ changequote([, ])dnl AC_REQUIRE([gl_HEADER_SYS_SOCKET]) AC_PROG_MKDIR_P AC_CHECK_FUNCS_ONCE([shutdown]) + gl_HEADER_SYS_TIME_H + AC_PROG_MKDIR_P gl_HEADER_SYS_UIO AC_PROG_MKDIR_P gl_THREAD + AC_CHECK_HEADERS([sys/single_threaded.h]) gl_UNLINKDIR gl_FUNC_UNSETENV if test $HAVE_UNSETENV = 0 || test $REPLACE_UNSETENV = 1; then @@ -1189,7 +1226,6 @@ AC_DEFUN([gltests_LIBSOURCES], [ # gnulib-tool and may be removed by future gnulib-tool invocations. AC_DEFUN([gl_FILE_LIST], [ build-aux/announce-gen - build-aux/config.rpath build-aux/do-release-commit-and-tag build-aux/gendocs.sh build-aux/git-version-gen @@ -1210,7 +1246,9 @@ AC_DEFUN([gl_FILE_LIST], [ lib/argmatch.c lib/argmatch.h lib/assure.h + lib/attribute.h lib/basename-lgpl.c + lib/basename-lgpl.h lib/basename.c lib/btowc.c lib/c++defs.h @@ -1223,6 +1261,8 @@ AC_DEFUN([gl_FILE_LIST], [ lib/calloc.c lib/canonicalize-lgpl.c lib/cdefs.h + lib/cloexec.c + lib/cloexec.h lib/close-stream.c lib/close-stream.h lib/close.c @@ -1231,12 +1271,13 @@ AC_DEFUN([gl_FILE_LIST], [ lib/dirname-lgpl.c lib/dirname.c lib/dirname.h - lib/dosname.h + lib/dup2.c lib/errno.in.h lib/error.c lib/error.h lib/exitfail.c lib/exitfail.h + lib/fcntl.c lib/fcntl.in.h lib/fd-hook.c lib/fd-hook.h @@ -1245,6 +1286,7 @@ AC_DEFUN([gl_FILE_LIST], [ lib/fpending.h lib/fstat.c lib/fsync.c + lib/getdtablesize.c lib/getopt-cdefs.in.h lib/getopt-core.h lib/getopt-ext.h @@ -1256,24 +1298,25 @@ AC_DEFUN([gl_FILE_LIST], [ lib/getopt_int.h lib/getprogname.c lib/getprogname.h + lib/getrandom.c lib/gettext.h - lib/gettimeofday.c lib/glthread/lock.c lib/glthread/lock.h lib/glthread/threadlib.c lib/hard-locale.c lib/hard-locale.h + lib/idx.h lib/intprops.h lib/inttypes.in.h lib/langinfo.in.h + lib/lc-charset-dispatch.c + lib/lc-charset-dispatch.h lib/libc-config.h lib/limits.in.h lib/localcharset.c lib/localcharset.h lib/locale.in.h lib/localeconv.c - lib/localtime-buffer.c - lib/localtime-buffer.h lib/long-options.c lib/long-options.h lib/lseek.c @@ -1281,9 +1324,13 @@ AC_DEFUN([gl_FILE_LIST], [ lib/malloc.c lib/malloca.c lib/malloca.h + lib/mbrtowc-impl-utf8.h + lib/mbrtowc-impl.h lib/mbrtowc.c lib/mbsinit.c lib/mbtowc-impl.h + lib/mbtowc-lock.c + lib/mbtowc-lock.h lib/mbtowc.c lib/minmax.h lib/mkdir.c @@ -1292,7 +1339,9 @@ AC_DEFUN([gl_FILE_LIST], [ lib/msvc-inval.h lib/msvc-nothrow.c lib/msvc-nothrow.h + lib/nl_langinfo-lock.c lib/nl_langinfo.c + lib/open.c lib/pathmax.h lib/progname.c lib/progname.h @@ -1311,12 +1360,16 @@ AC_DEFUN([gl_FILE_LIST], [ lib/rpmatch.c lib/safe-read.c lib/safe-read.h + lib/setlocale-lock.c + lib/setlocale_null.c + lib/setlocale_null.h lib/sleep.c lib/stat-time.c lib/stat-time.h lib/stat-w32.c lib/stat-w32.h lib/stat.c + lib/stdalign.in.h lib/stdarg.in.h lib/stdbool.in.h lib/stddef.in.h @@ -1338,8 +1391,8 @@ AC_DEFUN([gl_FILE_LIST], [ lib/strtoul.c lib/strtoull.c lib/sys-limits.h + lib/sys_random.in.h lib/sys_stat.in.h - lib/sys_time.in.h lib/sys_types.in.h lib/tempname.c lib/tempname.h @@ -1372,7 +1425,6 @@ AC_DEFUN([gl_FILE_LIST], [ lib/xmalloc.c lib/xstrndup.c lib/xstrndup.h - lib/xstrtol-error.c lib/xstrtol.c lib/xstrtol.h lib/xstrtoll.c @@ -1388,12 +1440,12 @@ AC_DEFUN([gl_FILE_LIST], [ m4/builtin-expect.m4 m4/calloc.m4 m4/canonicalize.m4 + m4/clock_time.m4 m4/close.m4 m4/codeset.m4 m4/config-h.m4 m4/configmake.m4 m4/ctype.m4 - m4/dirname.m4 m4/double-slash-root.m4 m4/dup2.m4 m4/eealloc.m4 @@ -1416,15 +1468,14 @@ AC_DEFUN([gl_FILE_LIST], [ m4/getopt.m4 m4/getpagesize.m4 m4/getprogname.m4 + m4/getrandom.m4 m4/gettimeofday.m4 m4/glibc21.m4 m4/gnulib-common.m4 - m4/host-cpu-c-abi.m4 m4/include_next.m4 m4/inet_pton.m4 m4/intl-thread-locale.m4 m4/intlmacosx.m4 - m4/inttypes-pri.m4 m4/inttypes.m4 m4/ioctl.m4 m4/isblank.m4 @@ -1432,9 +1483,6 @@ AC_DEFUN([gl_FILE_LIST], [ m4/largefile.m4 m4/lcmessage.m4 m4/lib-ignore.m4 - m4/lib-ld.m4 - m4/lib-link.m4 - m4/lib-prefix.m4 m4/limits-h.m4 m4/localcharset.m4 m4/locale-fr.m4 @@ -1444,9 +1492,7 @@ AC_DEFUN([gl_FILE_LIST], [ m4/locale_h.m4 m4/localeconv.m4 m4/localename.m4 - m4/localtime-buffer.m4 m4/lock.m4 - m4/longlong.m4 m4/lseek.m4 m4/lstat.m4 m4/malloc.m4 @@ -1465,15 +1511,18 @@ AC_DEFUN([gl_FILE_LIST], [ m4/msvc-inval.m4 m4/msvc-nothrow.m4 m4/multiarch.m4 + m4/musl.m4 m4/nanosleep.m4 m4/netinet_in_h.m4 m4/nl_langinfo.m4 m4/nocrash.m4 m4/off_t.m4 m4/open-cloexec.m4 + m4/open-slash.m4 m4/open.m4 m4/pathmax.m4 m4/perror.m4 + m4/pid_t.m4 m4/pipe.m4 m4/priv-set.m4 m4/pthread-thread.m4 @@ -1492,8 +1541,10 @@ AC_DEFUN([gl_FILE_LIST], [ m4/safe-read.m4 m4/sched_h.m4 m4/select.m4 + m4/semaphore.m4 m4/setenv.m4 m4/setlocale.m4 + m4/setlocale_null.m4 m4/sigaction.m4 m4/signal_h.m4 m4/signalblocking.m4 @@ -1523,6 +1574,7 @@ AC_DEFUN([gl_FILE_LIST], [ m4/strtoull.m4 m4/symlink.m4 m4/sys_ioctl_h.m4 + m4/sys_random_h.m4 m4/sys_select_h.m4 m4/sys_socket_h.m4 m4/sys_stat_h.m4 @@ -1538,6 +1590,7 @@ AC_DEFUN([gl_FILE_LIST], [ m4/unlinkdir.m4 m4/usleep.m4 m4/version-etc.m4 + m4/visibility.m4 m4/warn-on-use.m4 m4/warnings.m4 m4/wchar_h.m4 @@ -1551,7 +1604,10 @@ AC_DEFUN([gl_FILE_LIST], [ m4/xstrndup.m4 m4/xstrtol.m4 m4/yield.m4 + m4/zzgnulib.m4 + tests/atomic-int-gnulib.h tests/init.sh + tests/locale.c tests/macros.h tests/nap.h tests/null-ptr.h @@ -1601,7 +1657,9 @@ AC_DEFUN([gl_FILE_LIST], [ tests/test-getopt.h tests/test-getopt_long.h tests/test-getprogname.c + tests/test-getrandom.c tests/test-gettimeofday.c + tests/test-hard-locale.c tests/test-ignore-value.c tests/test-inet_pton.c tests/test-init.sh @@ -1628,6 +1686,8 @@ AC_DEFUN([gl_FILE_LIST], [ tests/test-mbrtowc-w32-3.sh tests/test-mbrtowc-w32-4.sh tests/test-mbrtowc-w32-5.sh + tests/test-mbrtowc-w32-6.sh + tests/test-mbrtowc-w32-7.sh tests/test-mbrtowc-w32.c tests/test-mbrtowc.c tests/test-mbrtowc1.sh @@ -1641,6 +1701,7 @@ AC_DEFUN([gl_FILE_LIST], [ 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-once.c @@ -1677,6 +1738,9 @@ AC_DEFUN([gl_FILE_LIST], [ tests/test-setlocale1.sh tests/test-setlocale2.c tests/test-setlocale2.sh + tests/test-setlocale_null-mt-all.c + tests/test-setlocale_null-mt-one.c + tests/test-setlocale_null.c tests/test-setsockopt.c tests/test-sigaction.c tests/test-signal-h.c @@ -1701,6 +1765,7 @@ AC_DEFUN([gl_FILE_LIST], [ tests/test-symlink.c tests/test-symlink.h tests/test-sys_ioctl.c + tests/test-sys_random.c tests/test-sys_select.c tests/test-sys_socket.c tests/test-sys_stat.c @@ -1730,6 +1795,8 @@ AC_DEFUN([gl_FILE_LIST], [ tests/test-wcrtomb-w32-3.sh tests/test-wcrtomb-w32-4.sh tests/test-wcrtomb-w32-5.sh + tests/test-wcrtomb-w32-6.sh + tests/test-wcrtomb-w32-7.sh tests/test-wcrtomb-w32.c tests/test-wcrtomb.c tests/test-wcrtomb.sh @@ -1751,18 +1818,14 @@ AC_DEFUN([gl_FILE_LIST], [ tests=lib/binary-io.h tests=lib/bind.c tests=lib/c++defs.h - tests=lib/cloexec.c - tests=lib/cloexec.h tests=lib/connect.c tests=lib/ctype.in.h - tests=lib/dup2.c - tests=lib/fcntl.c tests=lib/fdopen.c tests=lib/flexmember.h tests=lib/ftruncate.c tests=lib/getcwd-lgpl.c - tests=lib/getdtablesize.c tests=lib/getpagesize.c + tests=lib/gettimeofday.c tests=lib/glthread/thread.c tests=lib/glthread/thread.h tests=lib/glthread/yield.h @@ -1777,7 +1840,6 @@ AC_DEFUN([gl_FILE_LIST], [ tests=lib/localename.h tests=lib/nanosleep.c tests=lib/netinet_in.in.h - tests=lib/open.c tests=lib/perror.c tests=lib/pipe.c tests=lib/priv-set.c @@ -1802,14 +1864,15 @@ AC_DEFUN([gl_FILE_LIST], [ tests=lib/socket.c tests=lib/sockets.c tests=lib/sockets.h - tests=lib/stdalign.in.h tests=lib/strerror_r.c tests=lib/symlink.c tests=lib/sys_ioctl.in.h tests=lib/sys_select.in.h tests=lib/sys_socket.c tests=lib/sys_socket.in.h + tests=lib/sys_time.in.h tests=lib/sys_uio.in.h + tests=lib/thread-optim.h tests=lib/unlinkdir.c tests=lib/unlinkdir.h tests=lib/unsetenv.c @@ -1822,6 +1885,8 @@ AC_DEFUN([gl_FILE_LIST], [ tests=lib/windows-thread.h tests=lib/windows-tls.c tests=lib/windows-tls.h + tests=lib/xstrtol-error.c + tests=lib/xstrtol-error.h top/GNUmakefile top/maint.mk ]) diff --git a/m4/host-cpu-c-abi.m4 b/m4/host-cpu-c-abi.m4 deleted file mode 100644 index 4407296..0000000 --- a/m4/host-cpu-c-abi.m4 +++ /dev/null @@ -1,644 +0,0 @@ -# host-cpu-c-abi.m4 serial 11 -dnl Copyright (C) 2002-2019 Free Software Foundation, Inc. -dnl This file is free software; the Free Software Foundation -dnl gives unlimited permission to copy and/or distribute it, -dnl with or without modifications, as long as this notice is preserved. - -dnl From Bruno Haible and Sam Steingold. - -dnl Sets the HOST_CPU variable to the canonical name of the CPU. -dnl Sets the HOST_CPU_C_ABI variable to the canonical name of the CPU with its -dnl C language ABI (application binary interface). -dnl Also defines __${HOST_CPU}__ and __${HOST_CPU_C_ABI}__ as C macros in -dnl config.h. -dnl -dnl This canonical name can be used to select a particular assembly language -dnl source file that will interoperate with C code on the given host. -dnl -dnl For example: -dnl * 'i386' and 'sparc' are different canonical names, because code for i386 -dnl will not run on SPARC CPUs and vice versa. They have different -dnl instruction sets. -dnl * 'sparc' and 'sparc64' are different canonical names, because code for -dnl 'sparc' and code for 'sparc64' cannot be linked together: 'sparc' code -dnl contains 32-bit instructions, whereas 'sparc64' code contains 64-bit -dnl instructions. A process on a SPARC CPU can be in 32-bit mode or in 64-bit -dnl mode, but not both. -dnl * 'mips' and 'mipsn32' are different canonical names, because they use -dnl different argument passing and return conventions for C functions, and -dnl although the instruction set of 'mips' is a large subset of the -dnl instruction set of 'mipsn32'. -dnl * 'mipsn32' and 'mips64' are different canonical names, because they use -dnl different sizes for the C types like 'int' and 'void *', and although -dnl the instruction sets of 'mipsn32' and 'mips64' are the same. -dnl * The same canonical name is used for different endiannesses. You can -dnl determine the endianness through preprocessor symbols: -dnl - 'arm': test __ARMEL__. -dnl - 'mips', 'mipsn32', 'mips64': test _MIPSEB vs. _MIPSEL. -dnl - 'powerpc64': test _BIG_ENDIAN vs. _LITTLE_ENDIAN. -dnl * The same name 'i386' is used for CPUs of type i386, i486, i586 -dnl (Pentium), AMD K7, Pentium II, Pentium IV, etc., because -dnl - Instructions that do not exist on all of these CPUs (cmpxchg, -dnl MMX, SSE, SSE2, 3DNow! etc.) are not frequently used. If your -dnl assembly language source files use such instructions, you will -dnl need to make the distinction. -dnl - Speed of execution of the common instruction set is reasonable across -dnl the entire family of CPUs. If you have assembly language source files -dnl that are optimized for particular CPU types (like GNU gmp has), you -dnl will need to make the distinction. -dnl See . -AC_DEFUN([gl_HOST_CPU_C_ABI], -[ - AC_REQUIRE([AC_CANONICAL_HOST]) - AC_REQUIRE([gl_C_ASM]) - AC_CACHE_CHECK([host CPU and C ABI], [gl_cv_host_cpu_c_abi], - [case "$host_cpu" in - -changequote(,)dnl - i[4567]86 ) -changequote([,])dnl - gl_cv_host_cpu_c_abi=i386 - ;; - - x86_64 ) - # On x86_64 systems, the C compiler may be generating code in one of - # these ABIs: - # - 64-bit instruction set, 64-bit pointers, 64-bit 'long': x86_64. - # - 64-bit instruction set, 64-bit pointers, 32-bit 'long': x86_64 - # with native Windows (mingw, MSVC). - # - 64-bit instruction set, 32-bit pointers, 32-bit 'long': x86_64-x32. - # - 32-bit instruction set, 32-bit pointers, 32-bit 'long': i386. - AC_COMPILE_IFELSE( - [AC_LANG_SOURCE( - [[#if (defined __x86_64__ || defined __amd64__ \ - || defined _M_X64 || defined _M_AMD64) - int ok; - #else - error fail - #endif - ]])], - [AC_COMPILE_IFELSE( - [AC_LANG_SOURCE( - [[#if defined __ILP32__ || defined _ILP32 - int ok; - #else - error fail - #endif - ]])], - [gl_cv_host_cpu_c_abi=x86_64-x32], - [gl_cv_host_cpu_c_abi=x86_64])], - [gl_cv_host_cpu_c_abi=i386]) - ;; - -changequote(,)dnl - alphaev[4-8] | alphaev56 | alphapca5[67] | alphaev6[78] ) -changequote([,])dnl - gl_cv_host_cpu_c_abi=alpha - ;; - - arm* | aarch64 ) - # Assume arm with EABI. - # On arm64 systems, the C compiler may be generating code in one of - # these ABIs: - # - aarch64 instruction set, 64-bit pointers, 64-bit 'long': arm64. - # - aarch64 instruction set, 32-bit pointers, 32-bit 'long': arm64-ilp32. - # - 32-bit instruction set, 32-bit pointers, 32-bit 'long': arm or armhf. - AC_COMPILE_IFELSE( - [AC_LANG_SOURCE( - [[#ifdef __aarch64__ - int ok; - #else - error fail - #endif - ]])], - [AC_COMPILE_IFELSE( - [AC_LANG_SOURCE( - [[#if defined __ILP32__ || defined _ILP32 - int ok; - #else - error fail - #endif - ]])], - [gl_cv_host_cpu_c_abi=arm64-ilp32], - [gl_cv_host_cpu_c_abi=arm64])], - [# Don't distinguish little-endian and big-endian arm, since they - # don't require different machine code for simple operations and - # since the user can distinguish them through the preprocessor - # defines __ARMEL__ vs. __ARMEB__. - # But distinguish arm which passes floating-point arguments and - # return values in integer registers (r0, r1, ...) - this is - # gcc -mfloat-abi=soft or gcc -mfloat-abi=softfp - from arm which - # passes them in float registers (s0, s1, ...) and double registers - # (d0, d1, ...) - this is gcc -mfloat-abi=hard. GCC 4.6 or newer - # sets the preprocessor defines __ARM_PCS (for the first case) and - # __ARM_PCS_VFP (for the second case), but older GCC does not. - echo 'double ddd; void func (double dd) { ddd = dd; }' > conftest.c - # Look for a reference to the register d0 in the .s file. - AC_TRY_COMMAND(${CC-cc} $CFLAGS $CPPFLAGS $gl_c_asm_opt conftest.c) >/dev/null 2>&1 - if LC_ALL=C grep 'd0,' conftest.$gl_asmext >/dev/null; then - gl_cv_host_cpu_c_abi=armhf - else - gl_cv_host_cpu_c_abi=arm - fi - rm -f conftest* - ]) - ;; - - hppa1.0 | hppa1.1 | hppa2.0* | hppa64 ) - # On hppa, the C compiler may be generating 32-bit code or 64-bit - # code. In the latter case, it defines _LP64 and __LP64__. - AC_COMPILE_IFELSE( - [AC_LANG_SOURCE( - [[#ifdef __LP64__ - int ok; - #else - error fail - #endif - ]])], - [gl_cv_host_cpu_c_abi=hppa64], - [gl_cv_host_cpu_c_abi=hppa]) - ;; - - ia64* ) - # On ia64 on HP-UX, the C compiler may be generating 64-bit code or - # 32-bit code. In the latter case, it defines _ILP32. - AC_COMPILE_IFELSE( - [AC_LANG_SOURCE( - [[#ifdef _ILP32 - int ok; - #else - error fail - #endif - ]])], - [gl_cv_host_cpu_c_abi=ia64-ilp32], - [gl_cv_host_cpu_c_abi=ia64]) - ;; - - mips* ) - # We should also check for (_MIPS_SZPTR == 64), but gcc keeps this - # at 32. - AC_COMPILE_IFELSE( - [AC_LANG_SOURCE( - [[#if defined _MIPS_SZLONG && (_MIPS_SZLONG == 64) - int ok; - #else - error fail - #endif - ]])], - [gl_cv_host_cpu_c_abi=mips64], - [# In the n32 ABI, _ABIN32 is defined, _ABIO32 is not defined (but - # may later get defined by ), and _MIPS_SIM == _ABIN32. - # In the 32 ABI, _ABIO32 is defined, _ABIN32 is not defined (but - # may later get defined by ), and _MIPS_SIM == _ABIO32. - AC_COMPILE_IFELSE( - [AC_LANG_SOURCE( - [[#if (_MIPS_SIM == _ABIN32) - int ok; - #else - error fail - #endif - ]])], - [gl_cv_host_cpu_c_abi=mipsn32], - [gl_cv_host_cpu_c_abi=mips])]) - ;; - - powerpc* ) - # Different ABIs are in use on AIX vs. Mac OS X vs. Linux,*BSD. - # No need to distinguish them here; the caller may distinguish - # them based on the OS. - # On powerpc64 systems, the C compiler may still be generating - # 32-bit code. And on powerpc-ibm-aix systems, the C compiler may - # be generating 64-bit code. - AC_COMPILE_IFELSE( - [AC_LANG_SOURCE( - [[#if defined __powerpc64__ || defined _ARCH_PPC64 - int ok; - #else - error fail - #endif - ]])], - [# On powerpc64, there are two ABIs on Linux: The AIX compatible - # one and the ELFv2 one. The latter defines _CALL_ELF=2. - AC_COMPILE_IFELSE( - [AC_LANG_SOURCE( - [[#if defined _CALL_ELF && _CALL_ELF == 2 - int ok; - #else - error fail - #endif - ]])], - [gl_cv_host_cpu_c_abi=powerpc64-elfv2], - [gl_cv_host_cpu_c_abi=powerpc64]) - ], - [gl_cv_host_cpu_c_abi=powerpc]) - ;; - - rs6000 ) - gl_cv_host_cpu_c_abi=powerpc - ;; - - riscv32 | riscv64 ) - # There are 2 architectures (with variants): rv32* and rv64*. - AC_COMPILE_IFELSE( - [AC_LANG_SOURCE( - [[#if __riscv_xlen == 64 - int ok; - #else - error fail - #endif - ]])], - [cpu=riscv64], - [cpu=riscv32]) - # There are 6 ABIs: ilp32, ilp32f, ilp32d, lp64, lp64f, lp64d. - # Size of 'long' and 'void *': - AC_COMPILE_IFELSE( - [AC_LANG_SOURCE( - [[#if defined __LP64__ - int ok; - #else - error fail - #endif - ]])], - [main_abi=lp64], - [main_abi=ilp32]) - # Float ABIs: - # __riscv_float_abi_double: - # 'float' and 'double' are passed in floating-point registers. - # __riscv_float_abi_single: - # 'float' are passed in floating-point registers. - # __riscv_float_abi_soft: - # No values are passed in floating-point registers. - AC_COMPILE_IFELSE( - [AC_LANG_SOURCE( - [[#if defined __riscv_float_abi_double - int ok; - #else - error fail - #endif - ]])], - [float_abi=d], - [AC_COMPILE_IFELSE( - [AC_LANG_SOURCE( - [[#if defined __riscv_float_abi_single - int ok; - #else - error fail - #endif - ]])], - [float_abi=f], - [float_abi='']) - ]) - gl_cv_host_cpu_c_abi="${cpu}-${main_abi}${float_abi}" - ;; - - s390* ) - # On s390x, the C compiler may be generating 64-bit (= s390x) code - # or 31-bit (= s390) code. - AC_COMPILE_IFELSE( - [AC_LANG_SOURCE( - [[#if defined __LP64__ || defined __s390x__ - int ok; - #else - error fail - #endif - ]])], - [gl_cv_host_cpu_c_abi=s390x], - [gl_cv_host_cpu_c_abi=s390]) - ;; - - sparc | sparc64 ) - # UltraSPARCs running Linux have `uname -m` = "sparc64", but the - # C compiler still generates 32-bit code. - AC_COMPILE_IFELSE( - [AC_LANG_SOURCE( - [[#if defined __sparcv9 || defined __arch64__ - int ok; - #else - error fail - #endif - ]])], - [gl_cv_host_cpu_c_abi=sparc64], - [gl_cv_host_cpu_c_abi=sparc]) - ;; - - *) - gl_cv_host_cpu_c_abi="$host_cpu" - ;; - esac - ]) - - dnl In most cases, $HOST_CPU and $HOST_CPU_C_ABI are the same. - HOST_CPU=`echo "$gl_cv_host_cpu_c_abi" | sed -e 's/-.*//'` - HOST_CPU_C_ABI="$gl_cv_host_cpu_c_abi" - AC_SUBST([HOST_CPU]) - AC_SUBST([HOST_CPU_C_ABI]) - - # This was - # AC_DEFINE_UNQUOTED([__${HOST_CPU}__]) - # AC_DEFINE_UNQUOTED([__${HOST_CPU_C_ABI}__]) - # earlier, but KAI C++ 3.2d doesn't like this. - sed -e 's/-/_/g' >> confdefs.h <']) + AS_VAR_SET([gl_next_header], ['<'gl_HEADER_NAME'>']) else AC_CACHE_CHECK( [absolute name of <]m4_defn([gl_HEADER_NAME])[>], - m4_defn([gl_next_header]), + [gl_next_header], [m4_if([$2], [check], [AS_VAR_PUSHDEF([gl_header_exists], [ac_cv_header_]m4_defn([gl_HEADER_NAME])) - if test AS_VAR_GET(gl_header_exists) = yes; then + if test AS_VAR_GET([gl_header_exists]) = yes; then AS_VAR_POPDEF([gl_header_exists]) ]) gl_ABSOLUTE_HEADER_ONE(gl_HEADER_NAME) AS_VAR_COPY([gl_header], [gl_cv_absolute_]AS_TR_SH(gl_HEADER_NAME)) - AS_VAR_SET(gl_next_header, ['"'$gl_header'"']) + AS_VAR_SET([gl_next_header], ['"'$gl_header'"']) m4_if([$2], [check], [else - AS_VAR_SET(gl_next_header, ['<'gl_HEADER_NAME'>']) + AS_VAR_SET([gl_next_header], ['<'gl_HEADER_NAME'>']) fi ]) ]) fi AC_SUBST( AS_TR_CPP([NEXT_]m4_defn([gl_HEADER_NAME])), - [AS_VAR_GET(gl_next_header)]) + [AS_VAR_GET([gl_next_header])]) 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='<'gl_HEADER_NAME'>' else # INCLUDE_NEXT_AS_FIRST_DIRECTIVE='include' - gl_next_as_first_directive=AS_VAR_GET(gl_next_header) + gl_next_as_first_directive=AS_VAR_GET([gl_next_header]) fi AC_SUBST( AS_TR_CPP([NEXT_AS_FIRST_DIRECTIVE_]m4_defn([gl_HEADER_NAME])), diff --git a/m4/inet_pton.m4 b/m4/inet_pton.m4 index 264892c..4191a39 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-2019 Free Software Foundation, Inc. +dnl Copyright (C) 2006, 2008-2020 Free Software Foundation, Inc. dnl This file is free software; the Free Software Foundation dnl gives unlimited permission to copy and/or distribute it, dnl with or without modifications, as long as this notice is preserved. diff --git a/m4/intl-thread-locale.m4 b/m4/intl-thread-locale.m4 index 3ecba86..3cdee24 100644 --- a/m4/intl-thread-locale.m4 +++ b/m4/intl-thread-locale.m4 @@ -1,15 +1,15 @@ -# intl-thread-locale.m4 serial 4 -dnl Copyright (C) 2015-2019 Free Software Foundation, Inc. +# intl-thread-locale.m4 serial 8 +dnl Copyright (C) 2015-2020 Free Software Foundation, Inc. dnl This file is free software; the Free Software Foundation dnl gives unlimited permission to copy and/or distribute it, dnl with or without modifications, as long as this notice is preserved. dnl dnl This file can be used in projects which are not available under -dnl the GNU General Public License or the GNU Library General Public +dnl the GNU General Public License or the GNU Lesser General Public dnl License but which still want to provide support for the GNU gettext dnl functionality. dnl Please note that the actual code of the GNU gettext library is covered -dnl by the GNU Library General Public License, and the rest of the GNU +dnl by the GNU Lesser General Public License, and the rest of the GNU dnl gettext package is covered by the GNU General Public License. dnl They are *not* in the public domain. @@ -17,7 +17,7 @@ dnl Check how to retrieve the name of a per-thread locale (POSIX locale_t). dnl Sets gt_nameless_locales. AC_DEFUN([gt_INTL_THREAD_LOCALE_NAME], [ - AC_REQUIRE([AC_CANONICAL_HOST]) dnl for cross-compiles + AC_REQUIRE([AC_CANONICAL_HOST]) dnl Persuade Solaris to define 'locale_t'. AC_REQUIRE([AC_USE_SYSTEM_EXTENSIONS]) @@ -119,18 +119,20 @@ int main () ;; esac - dnl This code is for future use, in case we some day have to port to a - dnl platform where the locale_t type does not provide access to the name of - dnl each locale category. This code has the drawback that it requires the - dnl gnulib overrides of 'newlocale', 'duplocale', 'freelocale', which is a - dnl problem for GNU libunistring. Therefore try hard to avoid enabling this - dnl code! + dnl This code is for platforms where the locale_t type does not provide access + dnl to the name of each locale category. This code has the drawback that it + dnl requires the gnulib overrides of 'newlocale', 'duplocale', 'freelocale', + dnl which is a problem for GNU libunistring. Therefore try hard to avoid + dnl enabling this code! gt_nameless_locales=no - if false; then - gt_nameless_locales=yes - AC_DEFINE([HAVE_NAMELESS_LOCALES], [1], - [Define if the locale_t type does not contain the name of each locale category.]) - fi + case "$host_os" in + dnl It's needed on AIX 7.2. + aix*) + gt_nameless_locales=yes + AC_DEFINE([HAVE_NAMELESS_LOCALES], [1], + [Define if the locale_t type does not contain the name of each locale category.]) + ;; + esac ]) dnl Tests whether uselocale() exists and is usable. @@ -139,13 +141,15 @@ AC_DEFUN([gt_FUNC_USELOCALE], [ AC_REQUIRE([AC_CANONICAL_HOST]) dnl for cross-compiles - dnl Persuade Solaris to define 'locale_t'. + dnl Persuade glibc and Solaris to define 'locale_t'. AC_REQUIRE([AC_USE_SYSTEM_EXTENSIONS]) AC_CHECK_FUNCS_ONCE([uselocale]) dnl On AIX 7.2, the uselocale() function is not documented and leads to dnl crashes in subsequent setlocale() invocations. + dnl In 2019, some versions of z/OS lack the locale_t type and have a broken + dnl uselocale function. if test $ac_cv_func_uselocale = yes; then AC_CHECK_HEADERS_ONCE([xlocale.h]) AC_CACHE_CHECK([whether uselocale works], @@ -156,6 +160,7 @@ AC_DEFUN([gt_FUNC_USELOCALE], #if HAVE_XLOCALE_H # include #endif +locale_t loc1; int main () { uselocale (NULL); @@ -164,10 +169,10 @@ int main () }]])], [gt_cv_func_uselocale_works=yes], [gt_cv_func_uselocale_works=no], - [# Guess no on AIX, yes otherwise. + [# Guess no on AIX and z/OS, yes otherwise. case "$host_os" in - aix*) gt_cv_func_uselocale_works="guessing no" ;; - *) gt_cv_func_uselocale_works="guessing yes" ;; + aix* | openedition*) gt_cv_func_uselocale_works="guessing no" ;; + *) gt_cv_func_uselocale_works="guessing yes" ;; esac ]) ]) diff --git a/m4/intlmacosx.m4 b/m4/intlmacosx.m4 index 3495174..ebd9937 100644 --- a/m4/intlmacosx.m4 +++ b/m4/intlmacosx.m4 @@ -1,15 +1,15 @@ -# intlmacosx.m4 serial 7 (gettext-0.20.2) -dnl Copyright (C) 2004-2014, 2016, 2019 Free Software Foundation, Inc. +# intlmacosx.m4 serial 8 (gettext-0.20.2) +dnl Copyright (C) 2004-2014, 2016, 2019-2020 Free Software Foundation, Inc. dnl This file is free software; the Free Software Foundation dnl gives unlimited permission to copy and/or distribute it, dnl with or without modifications, as long as this notice is preserved. dnl dnl This file can be used in projects which are not available under -dnl the GNU General Public License or the GNU Library General Public +dnl the GNU General Public License or the GNU Lesser General Public dnl License but which still want to provide support for the GNU gettext dnl functionality. dnl Please note that the actual code of the GNU gettext library is covered -dnl by the GNU Library General Public License, and the rest of the GNU +dnl by the GNU Lesser General Public License, and the rest of the GNU dnl gettext package is covered by the GNU General Public License. dnl They are *not* in the public domain. diff --git a/m4/inttypes-pri.m4 b/m4/inttypes-pri.m4 deleted file mode 100644 index 38fe118..0000000 --- a/m4/inttypes-pri.m4 +++ /dev/null @@ -1,42 +0,0 @@ -# inttypes-pri.m4 serial 7 (gettext-0.18.2) -dnl Copyright (C) 1997-2002, 2006, 2008-2019 Free Software Foundation, Inc. -dnl This file is free software; the Free Software Foundation -dnl gives unlimited permission to copy and/or distribute it, -dnl with or without modifications, as long as this notice is preserved. - -dnl From Bruno Haible. - -AC_PREREQ([2.53]) - -# Define PRI_MACROS_BROKEN if exists and defines the PRI* -# macros to non-string values. This is the case on AIX 4.3.3. - -AC_DEFUN([gt_INTTYPES_PRI], -[ - AC_CHECK_HEADERS([inttypes.h]) - if test $ac_cv_header_inttypes_h = yes; then - AC_CACHE_CHECK([whether the inttypes.h PRIxNN macros are broken], - [gt_cv_inttypes_pri_broken], - [ - AC_COMPILE_IFELSE( - [AC_LANG_PROGRAM( - [[ -#include -#ifdef PRId32 -char *p = PRId32; -#endif - ]], - [[]])], - [gt_cv_inttypes_pri_broken=no], - [gt_cv_inttypes_pri_broken=yes]) - ]) - fi - if test "$gt_cv_inttypes_pri_broken" = yes; then - AC_DEFINE_UNQUOTED([PRI_MACROS_BROKEN], [1], - [Define if exists and defines unusable PRI* macros.]) - PRI_MACROS_BROKEN=1 - else - PRI_MACROS_BROKEN=0 - fi - AC_SUBST([PRI_MACROS_BROKEN]) -]) diff --git a/m4/inttypes.m4 b/m4/inttypes.m4 index c58a1be..84b1654 100644 --- a/m4/inttypes.m4 +++ b/m4/inttypes.m4 @@ -1,5 +1,5 @@ -# inttypes.m4 serial 27 -dnl Copyright (C) 2006-2019 Free Software Foundation, Inc. +# inttypes.m4 serial 32 +dnl Copyright (C) 2006-2020 Free Software Foundation, Inc. dnl This file is free software; the Free Software Foundation dnl gives unlimited permission to copy and/or distribute it, dnl with or without modifications, as long as this notice is preserved. @@ -28,17 +28,26 @@ AC_DEFUN_ONCE([gl_INTTYPES_INCOMPLETE], dnl corresponding gnulib module is not in use. gl_WARN_ON_USE_PREPARE([[#include ]], [imaxabs imaxdiv strtoimax strtoumax]) + + AC_REQUIRE([AC_C_RESTRICT]) ]) # Ensure that the PRI* and SCN* macros are defined appropriately. AC_DEFUN([gl_INTTYPES_PRI_SCN], [ - AC_REQUIRE([gt_INTTYPES_PRI]) - PRIPTR_PREFIX= if test -n "$STDINT_H"; then - dnl Using the gnulib . It always defines intptr_t to 'long'. - PRIPTR_PREFIX='"l"' + dnl Using the gnulib . It defines intptr_t to 'long' or + dnl 'long long', depending on _WIN64. + AC_COMPILE_IFELSE( + [AC_LANG_PROGRAM([[ + #ifdef _WIN64 + LLP64 + #endif + ]]) + ], + [PRIPTR_PREFIX='"l"'], + [PRIPTR_PREFIX='"ll"']) else dnl Using the system's . for glpfx in '' l ll I64; do @@ -113,10 +122,8 @@ AC_DEFUN([gl_INTTYPES_CHECK_LONG_LONG_INT_CONDITION], #if $2 #define CONDITION ($3) - #elif HAVE_LONG_LONG_INT - #define CONDITION ($4) #else - #define CONDITION 0 + #define CONDITION ($4) #endif int test[CONDITION ? 1 : -1];]])], [gl_cv_test_$1=yes], @@ -152,7 +159,6 @@ AC_DEFUN([gl_INTTYPES_H_DEFAULTS], REPLACE_STRTOUMAX=0; AC_SUBST([REPLACE_STRTOUMAX]) INT32_MAX_LT_INTMAX_MAX=1; AC_SUBST([INT32_MAX_LT_INTMAX_MAX]) INT64_MAX_EQ_LONG_MAX='defined _LP64'; AC_SUBST([INT64_MAX_EQ_LONG_MAX]) - PRI_MACROS_BROKEN=0; AC_SUBST([PRI_MACROS_BROKEN]) PRIPTR_PREFIX=__PRIPTR_PREFIX; AC_SUBST([PRIPTR_PREFIX]) UINT32_MAX_LT_UINTMAX_MAX=1; AC_SUBST([UINT32_MAX_LT_UINTMAX_MAX]) UINT64_MAX_EQ_ULONG_MAX='defined _LP64'; AC_SUBST([UINT64_MAX_EQ_ULONG_MAX]) diff --git a/m4/ioctl.m4 b/m4/ioctl.m4 index 2d00611..263aaae 100644 --- a/m4/ioctl.m4 +++ b/m4/ioctl.m4 @@ -1,5 +1,5 @@ # ioctl.m4 serial 5 -dnl Copyright (C) 2008-2019 Free Software Foundation, Inc. +dnl Copyright (C) 2008-2020 Free Software Foundation, Inc. dnl This file is free software; the Free Software Foundation dnl gives unlimited permission to copy and/or distribute it, dnl with or without modifications, as long as this notice is preserved. diff --git a/m4/isblank.m4 b/m4/isblank.m4 index 817084e..5e1b783 100644 --- a/m4/isblank.m4 +++ b/m4/isblank.m4 @@ -1,5 +1,5 @@ # isblank.m4 serial 3 -dnl Copyright (C) 2009-2019 Free Software Foundation, Inc. +dnl Copyright (C) 2009-2020 Free Software Foundation, Inc. dnl This file is free software; the Free Software Foundation dnl gives unlimited permission to copy and/or distribute it, dnl with or without modifications, as long as this notice is preserved. diff --git a/m4/langinfo_h.m4 b/m4/langinfo_h.m4 index 76385d8..9d5e16e 100644 --- a/m4/langinfo_h.m4 +++ b/m4/langinfo_h.m4 @@ -1,5 +1,5 @@ -# langinfo_h.m4 serial 8 -dnl Copyright (C) 2009-2019 Free Software Foundation, Inc. +# langinfo_h.m4 serial 9 +dnl Copyright (C) 2009-2020 Free Software Foundation, Inc. dnl This file is free software; the Free Software Foundation dnl gives unlimited permission to copy and/or distribute it, dnl with or without modifications, as long as this notice is preserved. @@ -23,8 +23,10 @@ AC_DEFUN([gl_LANGINFO_H], AC_CHECK_HEADERS_ONCE([langinfo.h]) if test $ac_cv_header_langinfo_h = yes; then HAVE_LANGINFO_H=1 - dnl Determine what defines. CODESET and ERA etc. are missing - dnl on OpenBSD 3.8. T_FMT_AMPM and YESEXPR, NOEXPR are missing on IRIX 5.3. + dnl Determine what defines. + dnl CODESET is missing on OpenBSD 3.8. + dnl ERA etc. are missing on OpenBSD 6.7. + dnl T_FMT_AMPM and YESEXPR, NOEXPR are missing on IRIX 5.3. dnl ALTMON_* are missing on glibc 2.26 and many other systems. AC_CACHE_CHECK([whether langinfo.h defines CODESET], [gl_cv_header_langinfo_codeset], diff --git a/m4/largefile.m4 b/m4/largefile.m4 index 1938188..2562d06 100644 --- a/m4/largefile.m4 +++ b/m4/largefile.m4 @@ -1,24 +1,41 @@ # 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-2019 Free Software Foundation, Inc. +# Copyright 1992-1996, 1998-2020 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. +# The following macro works around a problem in Autoconf's AC_FUNC_FSEEKO: +# It does not set _LARGEFILE_SOURCE=1 on HP-UX/ia64 32-bit, although this +# setting of _LARGEFILE_SOURCE is needed so that declares fseeko +# and ftello in C++ mode as well. +AC_DEFUN([gl_SET_LARGEFILE_SOURCE], +[ + AC_REQUIRE([AC_CANONICAL_HOST]) + AC_FUNC_FSEEKO + case "$host_os" in + hpux*) + AC_DEFINE([_LARGEFILE_SOURCE], [1], + [Define to 1 to make fseeko visible on some hosts (e.g. glibc 2.2).]) + ;; + esac +]) + # The following implementation works 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], [] ,[ +m4_version_prereq([2.69c], [] ,[ # _AC_SYS_LARGEFILE_TEST_INCLUDES # ------------------------------- m4_define([_AC_SYS_LARGEFILE_TEST_INCLUDES], -[@%:@include +[#include /* Check that off_t can represent 2**63 - 1 correctly. We can't simply define LARGE_OFF_T to be 9223372036854775807, since some C++ compilers masquerading as C compilers incorrectly reject 9223372036854775807. */ -@%:@define LARGE_OFF_T (((off_t) 1 << 62) - 1 + ((off_t) 1 << 62)) +#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 @@ -37,7 +54,7 @@ m4_define([_AC_SYS_LARGEFILE_MACRO_VALUE], [AC_LANG_PROGRAM([$5], [$6])], [$3=no; break]) m4_ifval([$6], [AC_LINK_IFELSE], [AC_COMPILE_IFELSE])( - [AC_LANG_PROGRAM([@%:@define $1 $2 + [AC_LANG_PROGRAM([#define $1 $2 $5], [$6])], [$3=$2; break]) $3=unknown @@ -56,7 +73,10 @@ rm -rf conftest*[]dnl # By default, many hosts won't let programs access large files; # one must use special compiler options to get large-file access to work. # For more details about this brain damage please see: -# http://www.unix-systems.org/version2/whatsnew/lfs20mar.html +# http://www.unix.org/version2/whatsnew/lfs20mar.html +# 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. AC_DEFUN([AC_SYS_LARGEFILE], [AC_ARG_ENABLE(largefile, [ --disable-largefile omit support for large files]) @@ -93,12 +113,9 @@ if test "$enable_largefile" != no; then [Define for large files, on AIX-style hosts.], [_AC_SYS_LARGEFILE_TEST_INCLUDES]) fi - - AC_DEFINE([_DARWIN_USE_64_BIT_INODE], [1], - [Enable large inode numbers on Mac OS X 10.5.]) fi ])# AC_SYS_LARGEFILE -])# m4_version_prereq 2.70 +])# m4_version_prereq 2.69c # 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 8d32e10..f67c3d7 100644 --- a/m4/lcmessage.m4 +++ b/m4/lcmessage.m4 @@ -1,16 +1,16 @@ -# lcmessage.m4 serial 7 (gettext-0.18.2) -dnl Copyright (C) 1995-2002, 2004-2005, 2008-2014, 2016, 2019 Free Software -dnl Foundation, Inc. +# lcmessage.m4 serial 8 +dnl Copyright (C) 1995-2002, 2004-2005, 2008-2014, 2016, 2019-2020 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, dnl with or without modifications, as long as this notice is preserved. dnl dnl This file can be used in projects which are not available under -dnl the GNU General Public License or the GNU Library General Public +dnl the GNU General Public License or the GNU Lesser General Public dnl License but which still want to provide support for the GNU gettext dnl functionality. dnl Please note that the actual code of the GNU gettext library is covered -dnl by the GNU Library General Public License, and the rest of the GNU +dnl by the GNU Lesser General Public License, and the rest of the GNU dnl gettext package is covered by the GNU General Public License. dnl They are *not* in the public domain. diff --git a/m4/lib-ignore.m4 b/m4/lib-ignore.m4 index 1c198f9..1b7703f 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-2019 Free Software Foundation, Inc. +dnl Copyright (C) 2006, 2009-2020 Free Software Foundation, Inc. dnl This file is free software; the Free Software Foundation dnl gives unlimited permission to copy and/or distribute it, dnl with or without modifications, as long as this notice is preserved. diff --git a/m4/lib-ld.m4 b/m4/lib-ld.m4 index a187196..ebb3052 100644 --- a/m4/lib-ld.m4 +++ b/m4/lib-ld.m4 @@ -1,168 +1,110 @@ -# lib-ld.m4 serial 9 -dnl Copyright (C) 1996-2003, 2009-2019 Free Software Foundation, Inc. +# lib-ld.m4 serial 4 (gettext-0.18) +dnl Copyright (C) 1996-2003, 2009-2010 Free Software Foundation, Inc. dnl This file is free software; the Free 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 Subroutines of libtool.m4, -dnl with replacements s/_*LT_PATH/AC_LIB_PROG/ and s/lt_/acl_/ to avoid -dnl collision with libtool.m4. +dnl with replacements s/AC_/AC_LIB/ and s/lt_cv/acl_cv/ to avoid collision +dnl with libtool.m4. -dnl From libtool-2.4. Sets the variable with_gnu_ld to yes or no. +dnl From libtool-1.4. Sets the variable with_gnu_ld to yes or no. AC_DEFUN([AC_LIB_PROG_LD_GNU], [AC_CACHE_CHECK([if the linker ($LD) is GNU ld], [acl_cv_prog_gnu_ld], -[# I'd rather use --version here, but apparently some GNU lds only accept -v. +[# I'd rather use --version here, but apparently some GNU ld's only accept -v. case `$LD -v 2>&1 /dev/null 2>&1 \ - && { (PATH='/bin:/bin'; FPATH=$PATH; sh -c :) >/dev/null 2>&1 \ - || PATH_SEPARATOR=';' - } + echo "#! /bin/sh" >conf$$.sh + echo "exit 0" >>conf$$.sh + chmod +x conf$$.sh + if (PATH="/nonexistent;."; conf$$.sh) >/dev/null 2>&1; then + PATH_SEPARATOR=';' + else + PATH_SEPARATOR=: + fi + rm -f conf$$.sh fi - -if test -n "$LD"; then - AC_MSG_CHECKING([for ld]) -elif test "$GCC" = yes; then - AC_MSG_CHECKING([for ld used by $CC]) +ac_prog=ld +if test "$GCC" = yes; then + # Check if gcc -print-prog-name=ld gives a path. + AC_MSG_CHECKING([for ld used by GCC]) + case $host in + *-*-mingw*) + # gcc leaves a trailing carriage return which upsets mingw + ac_prog=`($CC -print-prog-name=ld) 2>&5 | tr -d '\015'` ;; + *) + ac_prog=`($CC -print-prog-name=ld) 2>&5` ;; + esac + case $ac_prog in + # Accept absolute paths. + [[\\/]* | [A-Za-z]:[\\/]*)] + [re_direlt='/[^/][^/]*/\.\./'] + # Canonicalize the path of ld + ac_prog=`echo $ac_prog| sed 's%\\\\%/%g'` + while echo $ac_prog | grep "$re_direlt" > /dev/null 2>&1; do + ac_prog=`echo $ac_prog| sed "s%$re_direlt%/%"` + done + test -z "$LD" && LD="$ac_prog" + ;; + "") + # If it fails, then pretend we aren't using GCC. + ac_prog=ld + ;; + *) + # If it is relative, then search for the first ld in PATH. + with_gnu_ld=unknown + ;; + esac elif test "$with_gnu_ld" = yes; then AC_MSG_CHECKING([for GNU ld]) else AC_MSG_CHECKING([for non-GNU ld]) fi -if test -n "$LD"; then - # Let the user override the test with a path. - : -else - AC_CACHE_VAL([acl_cv_path_LD], - [ - acl_cv_path_LD= # Final result of this test - ac_prog=ld # Program to search in $PATH - if test "$GCC" = yes; then - # Check if gcc -print-prog-name=ld gives a path. - case $host in - *-*-mingw*) - # gcc leaves a trailing carriage return which upsets mingw - acl_output=`($CC -print-prog-name=ld) 2>&5 | tr -d '\015'` ;; - *) - acl_output=`($CC -print-prog-name=ld) 2>&5` ;; - esac - case $acl_output in - # Accept absolute paths. - [[\\/]]* | ?:[[\\/]]*) - re_direlt='/[[^/]][[^/]]*/\.\./' - # Canonicalize the pathname of ld - acl_output=`echo "$acl_output" | sed 's%\\\\%/%g'` - while echo "$acl_output" | grep "$re_direlt" > /dev/null 2>&1; do - acl_output=`echo $acl_output | sed "s%$re_direlt%/%"` - done - # Got the pathname. No search in PATH is needed. - acl_cv_path_LD="$acl_output" - ac_prog= - ;; - "") - # If it fails, then pretend we aren't using GCC. - ;; - *) - # If it is relative, then search for the first ld in PATH. - with_gnu_ld=unknown - ;; +AC_CACHE_VAL([acl_cv_path_LD], +[if test -z "$LD"; then + IFS="${IFS= }"; ac_save_ifs="$IFS"; IFS="${IFS}${PATH_SEPARATOR-:}" + for ac_dir in $PATH; do + test -z "$ac_dir" && ac_dir=. + if test -f "$ac_dir/$ac_prog" || test -f "$ac_dir/$ac_prog$ac_exeext"; then + acl_cv_path_LD="$ac_dir/$ac_prog" + # Check to see if the program is GNU ld. I'd rather use --version, + # but apparently some GNU ld's only accept -v. + # Break only if it was the GNU/non-GNU ld that we prefer. + case `"$acl_cv_path_LD" -v 2>&1 < /dev/null` in + *GNU* | *'with BFD'*) + test "$with_gnu_ld" != no && break ;; + *) + test "$with_gnu_ld" != yes && break ;; esac fi - if test -n "$ac_prog"; then - # Search for $ac_prog in $PATH. - acl_save_ifs="$IFS"; IFS=$PATH_SEPARATOR - for ac_dir in $PATH; do - IFS="$acl_save_ifs" - test -z "$ac_dir" && ac_dir=. - if test -f "$ac_dir/$ac_prog" || test -f "$ac_dir/$ac_prog$ac_exeext"; then - acl_cv_path_LD="$ac_dir/$ac_prog" - # Check to see if the program is GNU ld. I'd rather use --version, - # but apparently some variants of GNU ld only accept -v. - # Break only if it was the GNU/non-GNU ld that we prefer. - case `"$acl_cv_path_LD" -v 2>&1 = 1.10 to complain if config.rpath is missing. + m4_ifdef([AC_REQUIRE_AUX_FILE], [AC_REQUIRE_AUX_FILE([config.rpath])]) AC_REQUIRE([AC_PROG_CC]) dnl we use $CC, $GCC, $LDFLAGS AC_REQUIRE([AC_LIB_PROG_LD]) dnl we use $LD, $with_gnu_ld AC_REQUIRE([AC_CANONICAL_HOST]) dnl we use $host @@ -160,15 +157,15 @@ dnl package. This declaration must occur before an AC_LIB_LINKFLAGS or similar dnl macro call that searches for libname. AC_DEFUN([AC_LIB_FROMPACKAGE], [ - pushdef([NAME],[m4_translit([$1],[abcdefghijklmnopqrstuvwxyz./+-], - [ABCDEFGHIJKLMNOPQRSTUVWXYZ____])]) + pushdef([NAME],[translit([$1],[abcdefghijklmnopqrstuvwxyz./-], + [ABCDEFGHIJKLMNOPQRSTUVWXYZ___])]) define([acl_frompackage_]NAME, [$2]) popdef([NAME]) pushdef([PACK],[$2]) - pushdef([PACKUP],[m4_translit(PACK,[abcdefghijklmnopqrstuvwxyz./+-], - [ABCDEFGHIJKLMNOPQRSTUVWXYZ____])]) + pushdef([PACKUP],[translit(PACK,[abcdefghijklmnopqrstuvwxyz./-], + [ABCDEFGHIJKLMNOPQRSTUVWXYZ___])]) define([acl_libsinpackage_]PACKUP, - m4_ifdef([acl_libsinpackage_]PACKUP, [m4_defn([acl_libsinpackage_]PACKUP)[, ]],)[lib$1]) + m4_ifdef([acl_libsinpackage_]PACKUP, [acl_libsinpackage_]PACKUP[[, ]],)[lib$1]) popdef([PACKUP]) popdef([PACK]) ]) @@ -181,21 +178,23 @@ dnl in ${LIB${NAME}_PREFIX}/$acl_libdirstem. AC_DEFUN([AC_LIB_LINKFLAGS_BODY], [ AC_REQUIRE([AC_LIB_PREPARE_MULTILIB]) - pushdef([NAME],[m4_translit([$1],[abcdefghijklmnopqrstuvwxyz./+-], - [ABCDEFGHIJKLMNOPQRSTUVWXYZ____])]) + pushdef([NAME],[translit([$1],[abcdefghijklmnopqrstuvwxyz./-], + [ABCDEFGHIJKLMNOPQRSTUVWXYZ___])]) pushdef([PACK],[m4_ifdef([acl_frompackage_]NAME, [acl_frompackage_]NAME, lib[$1])]) - pushdef([PACKUP],[m4_translit(PACK,[abcdefghijklmnopqrstuvwxyz./+-], - [ABCDEFGHIJKLMNOPQRSTUVWXYZ____])]) + pushdef([PACKUP],[translit(PACK,[abcdefghijklmnopqrstuvwxyz./-], + [ABCDEFGHIJKLMNOPQRSTUVWXYZ___])]) pushdef([PACKLIBS],[m4_ifdef([acl_frompackage_]NAME, [acl_libsinpackage_]PACKUP, lib[$1])]) + dnl Autoconf >= 2.61 supports dots in --with options. + pushdef([P_A_C_K],[m4_if(m4_version_compare(m4_defn([m4_PACKAGE_VERSION]),[2.61]),[-1],[translit(PACK,[.],[_])],PACK)]) dnl By default, look in $includedir and $libdir. use_additional=yes AC_LIB_WITH_FINAL_PREFIX([ eval additional_includedir=\"$includedir\" eval additional_libdir=\"$libdir\" ]) - AC_ARG_WITH(PACK[-prefix], -[[ --with-]]PACK[[-prefix[=DIR] search for ]PACKLIBS[ in DIR/include and DIR/lib - --without-]]PACK[[-prefix don't search for ]PACKLIBS[ in includedir and libdir]], + AC_ARG_WITH(P_A_C_K[-prefix], +[[ --with-]]P_A_C_K[[-prefix[=DIR] search for ]PACKLIBS[ in DIR/include and DIR/lib + --without-]]P_A_C_K[[-prefix don't search for ]PACKLIBS[ in includedir and libdir]], [ if test "X$withval" = "Xno"; then use_additional=no @@ -209,7 +208,7 @@ AC_DEFUN([AC_LIB_LINKFLAGS_BODY], additional_includedir="$withval/include" additional_libdir="$withval/$acl_libdirstem" if test "$acl_libdirstem2" != "$acl_libdirstem" \ - && test ! -d "$withval/$acl_libdirstem"; then + && ! test -d "$withval/$acl_libdirstem"; then additional_libdir="$withval/$acl_libdirstem2" fi fi @@ -243,7 +242,7 @@ AC_DEFUN([AC_LIB_LINKFLAGS_BODY], names_already_handled="$names_already_handled $name" dnl See if it was already located by an earlier AC_LIB_LINKFLAGS dnl or AC_LIB_HAVE_LINKFLAGS call. - uppername=`echo "$name" | sed -e 'y|abcdefghijklmnopqrstuvwxyz./+-|ABCDEFGHIJKLMNOPQRSTUVWXYZ____|'` + uppername=`echo "$name" | sed -e 'y|abcdefghijklmnopqrstuvwxyz./-|ABCDEFGHIJKLMNOPQRSTUVWXYZ___|'` eval value=\"\$HAVE_LIB$uppername\" if test -n "$value"; then if test "$value" = yes; then @@ -668,6 +667,7 @@ AC_DEFUN([AC_LIB_LINKFLAGS_BODY], LTLIB[]NAME="${LTLIB[]NAME}${LTLIB[]NAME:+ }-R$found_dir" done fi + popdef([P_A_C_K]) popdef([PACKLIBS]) popdef([PACKUP]) popdef([PACK]) diff --git a/m4/lib-prefix.m4 b/m4/lib-prefix.m4 index 8adb17b..1601cea 100644 --- a/m4/lib-prefix.m4 +++ b/m4/lib-prefix.m4 @@ -1,11 +1,18 @@ -# lib-prefix.m4 serial 14 -dnl Copyright (C) 2001-2005, 2008-2019 Free Software Foundation, Inc. +# lib-prefix.m4 serial 7 (gettext-0.18) +dnl Copyright (C) 2001-2005, 2008-2010 Free Software Foundation, Inc. dnl This file is free software; the Free Software Foundation dnl gives unlimited permission to copy and/or distribute it, dnl with or without modifications, as long as this notice is preserved. dnl From Bruno Haible. +dnl AC_LIB_ARG_WITH is synonymous to AC_ARG_WITH in autoconf-2.13, and +dnl similar to AC_ARG_WITH in autoconf 2.52...2.57 except that is doesn't +dnl require excessive bracketing. +ifdef([AC_HELP_STRING], +[AC_DEFUN([AC_LIB_ARG_WITH], [AC_ARG_WITH([$1],[[$2]],[$3],[$4])])], +[AC_DEFUN([AC_][LIB_ARG_WITH], [AC_ARG_WITH([$1],[$2],[$3],[$4])])]) + dnl AC_LIB_PREFIX adds to the CPPFLAGS and LDFLAGS the flags that are needed dnl to access previously installed libraries. The basic assumption is that dnl a user will want packages to use other packages he previously installed @@ -25,9 +32,9 @@ AC_DEFUN([AC_LIB_PREFIX], eval additional_includedir=\"$includedir\" eval additional_libdir=\"$libdir\" ]) - AC_ARG_WITH([lib-prefix], -[[ --with-lib-prefix[=DIR] search for libraries in DIR/include and DIR/lib - --without-lib-prefix don't search for libraries in includedir and libdir]], + AC_LIB_ARG_WITH([lib-prefix], +[ --with-lib-prefix[=DIR] search for libraries in DIR/include and DIR/lib + --without-lib-prefix don't search for libraries in includedir and libdir], [ if test "X$withval" = "Xno"; then use_additional=no @@ -167,83 +174,51 @@ AC_DEFUN([AC_LIB_PREPARE_MULTILIB], dnl $prefix/lib/64 (which is a symlink to either $prefix/lib/sparcv9 or dnl $prefix/lib/amd64) and 32-bit libraries go under $prefix/lib. AC_REQUIRE([AC_CANONICAL_HOST]) - AC_REQUIRE([gl_HOST_CPU_C_ABI_32BIT]) - + acl_libdirstem=lib + acl_libdirstem2= case "$host_os" in solaris*) + dnl See Solaris 10 Software Developer Collection > Solaris 64-bit Developer's Guide > The Development Environment + dnl . + dnl "Portable Makefiles should refer to any library directories using the 64 symbolic link." + dnl But we want to recognize the sparcv9 or amd64 subdirectory also if the + dnl symlink is missing, so we set acl_libdirstem2 too. AC_CACHE_CHECK([for 64-bit host], [gl_cv_solaris_64bit], - [AC_COMPILE_IFELSE( - [AC_LANG_SOURCE( - [[#ifdef _LP64 - int ok; - #else - error fail - #endif - ]])], - [gl_cv_solaris_64bit=yes], - [gl_cv_solaris_64bit=no]) - ]);; - esac - - dnl Allow the user to override the result by setting acl_cv_libdirstems. - AC_CACHE_CHECK([for the common suffixes of directories in the library search path], - [acl_cv_libdirstems], - [acl_libdirstem=lib - acl_libdirstem2= - case "$host_os" in - solaris*) - dnl See Solaris 10 Software Developer Collection > Solaris 64-bit Developer's Guide > The Development Environment - dnl . - dnl "Portable Makefiles should refer to any library directories using the 64 symbolic link." - dnl But we want to recognize the sparcv9 or amd64 subdirectory also if the - dnl symlink is missing, so we set acl_libdirstem2 too. - if test $gl_cv_solaris_64bit = yes; then - acl_libdirstem=lib/64 - case "$host_cpu" in - sparc*) acl_libdirstem2=lib/sparcv9 ;; - i*86 | x86_64) acl_libdirstem2=lib/amd64 ;; - esac - fi - ;; - *) - dnl If $CC generates code for a 32-bit ABI, the libraries are - dnl surely under $prefix/lib, not $prefix/lib64. - if test "$HOST_CPU_C_ABI_32BIT" != yes; then - dnl The result is a property of the system. However, non-system - dnl compilers sometimes have odd library search paths. Therefore - dnl prefer asking /usr/bin/gcc, if available, rather than $CC. - searchpath=`(if test -f /usr/bin/gcc \ - && LC_ALL=C /usr/bin/gcc -print-search-dirs >/dev/null 2>/dev/null; then \ - LC_ALL=C /usr/bin/gcc -print-search-dirs; \ - else \ - LC_ALL=C $CC -print-search-dirs; \ - fi) 2>/dev/null \ - | sed -n -e 's,^libraries: ,,p' | sed -e 's,^=,,'` - if test -n "$searchpath"; then - acl_save_IFS="${IFS= }"; IFS=":" - for searchdir in $searchpath; do - if test -d "$searchdir"; then + [AC_EGREP_CPP([sixtyfour bits], [ +#ifdef _LP64 +sixtyfour bits +#endif + ], [gl_cv_solaris_64bit=yes], [gl_cv_solaris_64bit=no]) + ]) + if test $gl_cv_solaris_64bit = yes; then + acl_libdirstem=lib/64 + case "$host_cpu" in + sparc*) acl_libdirstem2=lib/sparcv9 ;; + i*86 | x86_64) acl_libdirstem2=lib/amd64 ;; + esac + fi + ;; + *) + searchpath=`(LC_ALL=C $CC -print-search-dirs) 2>/dev/null | sed -n -e 's,^libraries: ,,p' | sed -e 's,^=,,'` + if test -n "$searchpath"; then + acl_save_IFS="${IFS= }"; IFS=":" + for searchdir in $searchpath; do + if test -d "$searchdir"; then + case "$searchdir" in + */lib64/ | */lib64 ) acl_libdirstem=lib64 ;; + */../ | */.. ) + # Better ignore directories of this form. They are misleading. + ;; + *) searchdir=`cd "$searchdir" && pwd` case "$searchdir" in - */lib64/ | */lib64 ) acl_libdirstem=lib64 ;; - */../ | */.. ) - # Better ignore directories of this form. They are misleading. - ;; - *) searchdir=`cd "$searchdir" && pwd` - case "$searchdir" in - */lib64 ) acl_libdirstem=lib64 ;; - esac ;; - esac - fi - done - IFS="$acl_save_IFS" - fi - fi - ;; - esac - test -n "$acl_libdirstem2" || acl_libdirstem2="$acl_libdirstem" - acl_cv_libdirstems="$acl_libdirstem,$acl_libdirstem2" - ]) - # Decompose acl_cv_libdirstems into acl_libdirstem and acl_libdirstem2. - acl_libdirstem=`echo "$acl_cv_libdirstems" | sed -e 's/,.*//'` - acl_libdirstem2=`echo "$acl_cv_libdirstems" | sed -e '/,/s/.*,//'` + */lib64 ) acl_libdirstem=lib64 ;; + esac ;; + esac + fi + done + IFS="$acl_save_IFS" + fi + ;; + esac + test -n "$acl_libdirstem2" || acl_libdirstem2="$acl_libdirstem" ]) diff --git a/m4/limits-h.m4 b/m4/limits-h.m4 index 68f724c..0b4f092 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-2019 Free Software Foundation, Inc. +dnl Copyright 2016-2020 Free Software Foundation, Inc. dnl This file is free software; the Free Software Foundation dnl gives unlimited permission to copy and/or distribute it, dnl with or without modifications, as long as this notice is preserved. diff --git a/m4/localcharset.m4 b/m4/localcharset.m4 index 2a7f82d..9d21c4f 100644 --- a/m4/localcharset.m4 +++ b/m4/localcharset.m4 @@ -1,5 +1,5 @@ # localcharset.m4 serial 8 -dnl Copyright (C) 2002, 2004, 2006, 2009-2019 Free Software Foundation, Inc. +dnl Copyright (C) 2002, 2004, 2006, 2009-2020 Free Software Foundation, Inc. dnl This file is free software; the Free Software Foundation dnl gives unlimited permission to copy and/or distribute it, dnl with or without modifications, as long as this notice is preserved. diff --git a/m4/locale-fr.m4 b/m4/locale-fr.m4 index cfa068d..406951f 100644 --- a/m4/locale-fr.m4 +++ b/m4/locale-fr.m4 @@ -1,5 +1,5 @@ -# locale-fr.m4 serial 19 -dnl Copyright (C) 2003, 2005-2019 Free Software Foundation, Inc. +# locale-fr.m4 serial 20 +dnl Copyright (C) 2003, 2005-2020 Free Software Foundation, Inc. dnl This file is free software; the Free Software Foundation dnl gives unlimited permission to copy and/or distribute it, dnl with or without modifications, as long as this notice is preserved. @@ -12,8 +12,7 @@ AC_DEFUN([gt_LOCALE_FR], AC_REQUIRE([AC_CANONICAL_HOST]) AC_REQUIRE([AM_LANGINFO_CODESET]) AC_CACHE_CHECK([for a traditional french locale], [gt_cv_locale_fr], [ - AC_LANG_CONFTEST([AC_LANG_SOURCE([ -changequote(,)dnl + AC_LANG_CONFTEST([AC_LANG_SOURCE([[ #include #include #if HAVE_LANGINFO_CODESET @@ -78,8 +77,7 @@ int main () { return 0; #endif } -changequote([,])dnl - ])]) + ]])]) if AC_TRY_EVAL([ac_link]) && test -s conftest$ac_exeext; then case "$host_os" in # Handle native Windows specially, because there setlocale() interprets @@ -143,8 +141,7 @@ AC_DEFUN([gt_LOCALE_FR_UTF8], [ AC_REQUIRE([AM_LANGINFO_CODESET]) AC_CACHE_CHECK([for a french Unicode locale], [gt_cv_locale_fr_utf8], [ - AC_LANG_CONFTEST([AC_LANG_SOURCE([ -changequote(,)dnl + AC_LANG_CONFTEST([AC_LANG_SOURCE([[ #include #include #if HAVE_LANGINFO_CODESET @@ -206,8 +203,7 @@ int main () { #endif return 0; } -changequote([,])dnl - ])]) + ]])]) if AC_TRY_EVAL([ac_link]) && test -s conftest$ac_exeext; then case "$host_os" in # Handle native Windows specially, because there setlocale() interprets diff --git a/m4/locale-ja.m4 b/m4/locale-ja.m4 index 487f68b..31e95b8 100644 --- a/m4/locale-ja.m4 +++ b/m4/locale-ja.m4 @@ -1,5 +1,5 @@ -# locale-ja.m4 serial 14 -dnl Copyright (C) 2003, 2005-2019 Free Software Foundation, Inc. +# locale-ja.m4 serial 15 +dnl Copyright (C) 2003, 2005-2020 Free Software Foundation, Inc. dnl This file is free software; the Free Software Foundation dnl gives unlimited permission to copy and/or distribute it, dnl with or without modifications, as long as this notice is preserved. @@ -12,8 +12,7 @@ AC_DEFUN([gt_LOCALE_JA], AC_REQUIRE([AC_CANONICAL_HOST]) AC_REQUIRE([AM_LANGINFO_CODESET]) AC_CACHE_CHECK([for a traditional japanese locale], [gt_cv_locale_ja], [ - AC_LANG_CONFTEST([AC_LANG_SOURCE([ -changequote(,)dnl + AC_LANG_CONFTEST([AC_LANG_SOURCE([[ #include #include #if HAVE_LANGINFO_CODESET @@ -82,8 +81,7 @@ int main () return 0; #endif } -changequote([,])dnl - ])]) + ]])]) if AC_TRY_EVAL([ac_link]) && test -s conftest$ac_exeext; then case "$host_os" in # Handle native Windows specially, because there setlocale() interprets diff --git a/m4/locale-tr.m4 b/m4/locale-tr.m4 index aeb2419..b88a8a3 100644 --- a/m4/locale-tr.m4 +++ b/m4/locale-tr.m4 @@ -1,5 +1,5 @@ -# locale-tr.m4 serial 11 -dnl Copyright (C) 2003, 2005-2019 Free Software Foundation, Inc. +# locale-tr.m4 serial 13 +dnl Copyright (C) 2003, 2005-2020 Free Software Foundation, Inc. dnl This file is free software; the Free Software Foundation dnl gives unlimited permission to copy and/or distribute it, dnl with or without modifications, as long as this notice is preserved. @@ -12,8 +12,7 @@ AC_DEFUN([gt_LOCALE_TR_UTF8], AC_REQUIRE([AC_CANONICAL_HOST]) AC_REQUIRE([AM_LANGINFO_CODESET]) AC_CACHE_CHECK([for a turkish Unicode locale], [gt_cv_locale_tr_utf8], [ - AC_LANG_CONFTEST([AC_LANG_SOURCE([ -changequote(,)dnl + AC_LANG_CONFTEST([AC_LANG_SOURCE([[ #include #include #if HAVE_LANGINFO_CODESET @@ -21,6 +20,7 @@ changequote(,)dnl #endif #include #include +#include struct tm t; char buf[16]; int main () { @@ -74,8 +74,7 @@ int main () { return 1; return 0; } -changequote([,])dnl - ])]) + ]])]) if AC_TRY_EVAL([ac_link]) && test -s conftest$ac_exeext; then case "$host_os" in # Handle native Windows specially, because there setlocale() interprets diff --git a/m4/locale-zh.m4 b/m4/locale-zh.m4 index 8b81326..c60883c 100644 --- a/m4/locale-zh.m4 +++ b/m4/locale-zh.m4 @@ -1,5 +1,5 @@ -# locale-zh.m4 serial 14 -dnl Copyright (C) 2003, 2005-2019 Free Software Foundation, Inc. +# locale-zh.m4 serial 15 +dnl Copyright (C) 2003, 2005-2020 Free Software Foundation, Inc. dnl This file is free software; the Free Software Foundation dnl gives unlimited permission to copy and/or distribute it, dnl with or without modifications, as long as this notice is preserved. @@ -12,8 +12,7 @@ AC_DEFUN([gt_LOCALE_ZH_CN], AC_REQUIRE([AC_CANONICAL_HOST]) AC_REQUIRE([AM_LANGINFO_CODESET]) AC_CACHE_CHECK([for a transitional chinese locale], [gt_cv_locale_zh_CN], [ - AC_LANG_CONFTEST([AC_LANG_SOURCE([ -changequote(,)dnl + AC_LANG_CONFTEST([AC_LANG_SOURCE([[ #include #include #include @@ -83,8 +82,7 @@ int main () return 0; #endif } -changequote([,])dnl - ])]) + ]])]) if AC_TRY_EVAL([ac_link]) && test -s conftest$ac_exeext; then case "$host_os" in # Handle native Windows specially, because there setlocale() interprets diff --git a/m4/locale_h.m4 b/m4/locale_h.m4 index d28ba0c..32494cf 100644 --- a/m4/locale_h.m4 +++ b/m4/locale_h.m4 @@ -1,5 +1,5 @@ -# locale_h.m4 serial 21 -dnl Copyright (C) 2007, 2009-2019 Free Software Foundation, Inc. +# locale_h.m4 serial 24 +dnl Copyright (C) 2007, 2009-2020 Free Software Foundation, Inc. dnl This file is free software; the Free Software Foundation dnl gives unlimited permission to copy and/or distribute it, dnl with or without modifications, as long as this notice is preserved. @@ -17,6 +17,8 @@ AC_DEFUN([gl_LOCALE_H], dnl If is replaced, then must also be replaced. AC_REQUIRE([gl_STDDEF_H]) + AC_REQUIRE([gl_LOCALE_T]) + dnl Solaris 11.0 defines the int_p_*, int_n_* members of 'struct lconv' dnl only if _LCONV_C99 is defined. AC_REQUIRE([AC_CANONICAL_HOST]) @@ -37,34 +39,6 @@ AC_DEFUN([gl_LOCALE_H], [gl_cv_header_locale_h_posix2001=yes], [gl_cv_header_locale_h_posix2001=no])]) - dnl Check for . - AC_CHECK_HEADERS_ONCE([xlocale.h]) - if test $ac_cv_header_xlocale_h = yes; then - HAVE_XLOCALE_H=1 - dnl Check whether use of locale_t requires inclusion of , - dnl e.g. on Mac OS X 10.5. If does not define locale_t by - dnl itself, we assume that will do so. - AC_CACHE_CHECK([whether locale.h defines locale_t], - [gl_cv_header_locale_has_locale_t], - [AC_COMPILE_IFELSE( - [AC_LANG_PROGRAM( - [[#include - locale_t x;]], - [[]])], - [gl_cv_header_locale_has_locale_t=yes], - [gl_cv_header_locale_has_locale_t=no]) - ]) - if test $gl_cv_header_locale_has_locale_t = yes; then - gl_cv_header_locale_h_needs_xlocale_h=no - else - gl_cv_header_locale_h_needs_xlocale_h=yes - fi - else - HAVE_XLOCALE_H=0 - gl_cv_header_locale_h_needs_xlocale_h=no - fi - AC_SUBST([HAVE_XLOCALE_H]) - dnl Check whether 'struct lconv' is complete. dnl Bionic libc's 'struct lconv' is just a dummy. dnl On OpenBSD 4.9, HP-UX 11, IRIX 6.5, OSF/1 5.1, Solaris 9, Cygwin 1.5.x, @@ -82,7 +56,20 @@ AC_DEFUN([gl_LOCALE_H], [gl_cv_sys_struct_lconv_ok=no]) ]) if test $gl_cv_sys_struct_lconv_ok = no; then - REPLACE_STRUCT_LCONV=1 + dnl On native Windows with MSVC, merely define these member names as macros. + dnl This avoids trouble in C++ mode. + case "$host_os" in + mingw*) + AC_EGREP_CPP([Special], [ +#ifdef _MSC_VER + Special +#endif + ], + [], + [REPLACE_STRUCT_LCONV=1]) + ;; + *) REPLACE_STRUCT_LCONV=1 ;; + esac fi dnl is always overridden, because of GNULIB_POSIXCHECK. @@ -99,6 +86,49 @@ AC_DEFUN([gl_LOCALE_H], [setlocale newlocale duplocale freelocale]) ]) +dnl Checks to determine whether the system has the locale_t type, +dnl and how to obtain it. +AC_DEFUN([gl_LOCALE_T], +[ + dnl Persuade glibc and Solaris to define locale_t. + AC_REQUIRE([gl_USE_SYSTEM_EXTENSIONS]) + + dnl Check whether use of locale_t requires inclusion of , + dnl e.g. on Mac OS X 10.5. If does not define locale_t by + dnl itself, we assume that will do so. + AC_CACHE_CHECK([whether locale.h defines locale_t], + [gl_cv_header_locale_has_locale_t], + [AC_COMPILE_IFELSE( + [AC_LANG_PROGRAM( + [[#include + locale_t x;]], + [[]])], + [gl_cv_header_locale_has_locale_t=yes], + [gl_cv_header_locale_has_locale_t=no]) + ]) + + dnl Check for . + AC_CHECK_HEADERS_ONCE([xlocale.h]) + if test $ac_cv_header_xlocale_h = yes; then + HAVE_XLOCALE_H=1 + if test $gl_cv_header_locale_has_locale_t = yes; then + gl_cv_header_locale_h_needs_xlocale_h=no + else + gl_cv_header_locale_h_needs_xlocale_h=yes + fi + HAVE_LOCALE_T=1 + else + HAVE_XLOCALE_H=0 + gl_cv_header_locale_h_needs_xlocale_h=no + if test $gl_cv_header_locale_has_locale_t = yes; then + HAVE_LOCALE_T=1 + else + HAVE_LOCALE_T=0 + fi + fi + AC_SUBST([HAVE_XLOCALE_H]) +]) + AC_DEFUN([gl_LOCALE_MODULE_INDICATOR], [ dnl Use AC_REQUIRE here, so that the default settings are expanded once only. @@ -110,10 +140,11 @@ AC_DEFUN([gl_LOCALE_MODULE_INDICATOR], AC_DEFUN([gl_LOCALE_H_DEFAULTS], [ - GNULIB_LOCALECONV=0; AC_SUBST([GNULIB_LOCALECONV]) - GNULIB_SETLOCALE=0; AC_SUBST([GNULIB_SETLOCALE]) - GNULIB_DUPLOCALE=0; AC_SUBST([GNULIB_DUPLOCALE]) - GNULIB_LOCALENAME=0; AC_SUBST([GNULIB_LOCALENAME]) + GNULIB_LOCALECONV=0; AC_SUBST([GNULIB_LOCALECONV]) + GNULIB_SETLOCALE=0; AC_SUBST([GNULIB_SETLOCALE]) + GNULIB_SETLOCALE_NULL=0; AC_SUBST([GNULIB_SETLOCALE_NULL]) + GNULIB_DUPLOCALE=0; AC_SUBST([GNULIB_DUPLOCALE]) + GNULIB_LOCALENAME=0; AC_SUBST([GNULIB_LOCALENAME]) dnl Assume proper GNU behavior unless another module says otherwise. HAVE_NEWLOCALE=1; AC_SUBST([HAVE_NEWLOCALE]) HAVE_DUPLOCALE=1; AC_SUBST([HAVE_DUPLOCALE]) diff --git a/m4/localeconv.m4 b/m4/localeconv.m4 index 9bb78f0..a926224 100644 --- a/m4/localeconv.m4 +++ b/m4/localeconv.m4 @@ -1,5 +1,5 @@ # localeconv.m4 serial 1 -dnl Copyright (C) 2012-2019 Free Software Foundation, Inc. +dnl Copyright (C) 2012-2020 Free Software Foundation, Inc. dnl This file is free software; the Free Software Foundation dnl gives unlimited permission to copy and/or distribute it, dnl with or without modifications, as long as this notice is preserved. diff --git a/m4/localename.m4 b/m4/localename.m4 index a9f629d..fa7fe12 100644 --- a/m4/localename.m4 +++ b/m4/localename.m4 @@ -1,5 +1,5 @@ -# localename.m4 serial 6 -dnl Copyright (C) 2007, 2009-2019 Free Software Foundation, Inc. +# localename.m4 serial 7 +dnl Copyright (C) 2007, 2009-2020 Free Software Foundation, Inc. dnl This file is free software; the Free Software Foundation dnl gives unlimited permission to copy and/or distribute it, dnl with or without modifications, as long as this notice is preserved. @@ -7,18 +7,30 @@ dnl with or without modifications, as long as this notice is preserved. AC_DEFUN([gl_LOCALENAME], [ AC_REQUIRE([gl_LOCALE_H_DEFAULTS]) + AC_REQUIRE([gl_LOCALE_T]) AC_REQUIRE([gt_LC_MESSAGES]) AC_REQUIRE([gt_INTL_THREAD_LOCALE_NAME]) AC_REQUIRE([gt_INTL_MACOSX]) AC_CHECK_HEADERS_ONCE([langinfo.h]) - AC_CHECK_FUNCS_ONCE([newlocale duplocale freelocale]) - if test $ac_cv_func_newlocale != yes; then + if test $HAVE_LOCALE_T = 1; then + AC_CHECK_FUNCS_ONCE([newlocale duplocale freelocale]) + 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_func_newlocale=no + gl_func_duplocale=no + gl_func_freelocale=no + fi + if test $gl_func_newlocale != yes; then HAVE_NEWLOCALE=0 fi - if test $ac_cv_func_duplocale != yes; then + if test $gl_func_duplocale != yes; then HAVE_DUPLOCALE=0 fi - if test $ac_cv_func_freelocale != yes; then + if test $gl_func_freelocale != yes; then HAVE_FREELOCALE=0 fi if test $gt_nameless_locales = yes; then diff --git a/m4/localtime-buffer.m4 b/m4/localtime-buffer.m4 deleted file mode 100644 index 6d99828..0000000 --- a/m4/localtime-buffer.m4 +++ /dev/null @@ -1,21 +0,0 @@ -# localtime-buffer.m4 serial 1 -dnl Copyright (C) 2017-2019 Free Software Foundation, Inc. -dnl This file is free software; the Free Software Foundation -dnl gives unlimited permission to copy and/or distribute it, -dnl with or without modifications, as long as this notice is preserved. - -AC_DEFUN([gl_LOCALTIME_BUFFER_DEFAULTS], -[ - NEED_LOCALTIME_BUFFER=0 -]) - -dnl Macro invoked from other modules, to signal that the compilation of -dnl module 'localtime-buffer' is needed. -AC_DEFUN([gl_LOCALTIME_BUFFER_NEEDED], -[ - AC_REQUIRE([gl_LOCALTIME_BUFFER_DEFAULTS]) - AC_REQUIRE([gl_HEADER_TIME_H_DEFAULTS]) - NEED_LOCALTIME_BUFFER=1 - REPLACE_GMTIME=1 - REPLACE_LOCALTIME=1 -]) diff --git a/m4/lock.m4 b/m4/lock.m4 index 93b76fa..1c39591 100644 --- a/m4/lock.m4 +++ b/m4/lock.m4 @@ -1,5 +1,5 @@ # lock.m4 serial 14 -dnl Copyright (C) 2005-2019 Free Software Foundation, Inc. +dnl Copyright (C) 2005-2020 Free Software Foundation, Inc. dnl This file is free software; the Free Software Foundation dnl gives unlimited permission to copy and/or distribute it, dnl with or without modifications, as long as this notice is preserved. diff --git a/m4/longlong.m4 b/m4/longlong.m4 deleted file mode 100644 index 08d0e36..0000000 --- a/m4/longlong.m4 +++ /dev/null @@ -1,113 +0,0 @@ -# longlong.m4 serial 18 -dnl Copyright (C) 1999-2007, 2009-2019 Free Software Foundation, Inc. -dnl This file is free software; the Free Software Foundation -dnl gives unlimited permission to copy and/or distribute it, -dnl with or without modifications, as long as this notice is preserved. - -dnl From Paul Eggert. - -AC_PREREQ([2.62]) - -# Define HAVE_LONG_LONG_INT if 'long long int' works. -# This can be faster than what's in Autoconf 2.62 through 2.68. - -# Note: If the type 'long long int' exists but is only 32 bits large -# (as on some very old compilers), HAVE_LONG_LONG_INT will not be -# defined. In this case you can treat 'long long int' like 'long int'. - -AC_DEFUN([AC_TYPE_LONG_LONG_INT], -[ - AC_REQUIRE([AC_TYPE_UNSIGNED_LONG_LONG_INT]) - AC_CACHE_CHECK([for long long int], [ac_cv_type_long_long_int], - [ac_cv_type_long_long_int=yes - if test "x${ac_cv_prog_cc_c99-no}" = xno; then - ac_cv_type_long_long_int=$ac_cv_type_unsigned_long_long_int - if test $ac_cv_type_long_long_int = yes; then - dnl Catch a bug in Tandem NonStop Kernel (OSS) cc -O circa 2004. - dnl If cross compiling, assume the bug is not important, since - dnl nobody cross compiles for this platform as far as we know. - AC_RUN_IFELSE( - [AC_LANG_PROGRAM( - [[@%:@include - @%:@ifndef LLONG_MAX - @%:@ define HALF \ - (1LL << (sizeof (long long int) * CHAR_BIT - 2)) - @%:@ define LLONG_MAX (HALF - 1 + HALF) - @%:@endif]], - [[long long int n = 1; - int i; - for (i = 0; ; i++) - { - long long int m = n << i; - if (m >> i != n) - return 1; - if (LLONG_MAX / 2 < m) - break; - } - return 0;]])], - [], - [ac_cv_type_long_long_int=no], - [:]) - fi - fi]) - if test $ac_cv_type_long_long_int = yes; then - AC_DEFINE([HAVE_LONG_LONG_INT], [1], - [Define to 1 if the system has the type 'long long int'.]) - fi -]) - -# Define HAVE_UNSIGNED_LONG_LONG_INT if 'unsigned long long int' works. -# This can be faster than what's in Autoconf 2.62 through 2.68. - -# Note: If the type 'unsigned long long int' exists but is only 32 bits -# large (as on some very old compilers), AC_TYPE_UNSIGNED_LONG_LONG_INT -# will not be defined. In this case you can treat 'unsigned long long int' -# like 'unsigned long int'. - -AC_DEFUN([AC_TYPE_UNSIGNED_LONG_LONG_INT], -[ - AC_CACHE_CHECK([for unsigned long long int], - [ac_cv_type_unsigned_long_long_int], - [ac_cv_type_unsigned_long_long_int=yes - if test "x${ac_cv_prog_cc_c99-no}" = xno; then - AC_LINK_IFELSE( - [_AC_TYPE_LONG_LONG_SNIPPET], - [], - [ac_cv_type_unsigned_long_long_int=no]) - fi]) - if test $ac_cv_type_unsigned_long_long_int = yes; then - AC_DEFINE([HAVE_UNSIGNED_LONG_LONG_INT], [1], - [Define to 1 if the system has the type 'unsigned long long int'.]) - fi -]) - -# Expands to a C program that can be used to test for simultaneous support -# of 'long long' and 'unsigned long long'. We don't want to say that -# 'long long' is available if 'unsigned long long' is not, or vice versa, -# because too many programs rely on the symmetry between signed and unsigned -# integer types (excluding 'bool'). -AC_DEFUN([_AC_TYPE_LONG_LONG_SNIPPET], -[ - AC_LANG_PROGRAM( - [[/* For now, do not test the preprocessor; as of 2007 there are too many - implementations with broken preprocessors. Perhaps this can - be revisited in 2012. In the meantime, code should not expect - #if to work with literals wider than 32 bits. */ - /* Test literals. */ - long long int ll = 9223372036854775807ll; - long long int nll = -9223372036854775807LL; - unsigned long long int ull = 18446744073709551615ULL; - /* Test constant expressions. */ - typedef int a[((-9223372036854775807LL < 0 && 0 < 9223372036854775807ll) - ? 1 : -1)]; - typedef int b[(18446744073709551615ULL <= (unsigned long long int) -1 - ? 1 : -1)]; - int i = 63;]], - [[/* Test availability of runtime routines for shift and division. */ - long long int llmax = 9223372036854775807ll; - unsigned long long int ullmax = 18446744073709551615ull; - return ((ll << 63) | (ll >> 63) | (ll < i) | (ll > i) - | (llmax / ll) | (llmax % ll) - | (ull << 63) | (ull >> 63) | (ull << i) | (ull >> i) - | (ullmax / ull) | (ullmax % ull));]]) -]) diff --git a/m4/lseek.m4 b/m4/lseek.m4 index d55ec2a..472a1cb 100644 --- a/m4/lseek.m4 +++ b/m4/lseek.m4 @@ -1,5 +1,5 @@ -# lseek.m4 serial 10 -dnl Copyright (C) 2007, 2009-2019 Free Software Foundation, Inc. +# lseek.m4 serial 11 +dnl Copyright (C) 2007, 2009-2020 Free Software Foundation, Inc. dnl This file is free software; the Free Software Foundation dnl gives unlimited permission to copy and/or distribute it, dnl with or without modifications, as long as this notice is preserved. @@ -32,7 +32,8 @@ AC_DEFUN([gl_FUNC_LSEEK], #else /* on Windows with MSVC */ # include #endif -]], [[ +]GL_MDA_DEFINES], +[[ /* Exit with success only if stdin is seekable. */ return lseek (0, (off_t)0, SEEK_CUR) < 0; ]])], diff --git a/m4/lstat.m4 b/m4/lstat.m4 index ace1638..3c2b214 100644 --- a/m4/lstat.m4 +++ b/m4/lstat.m4 @@ -1,6 +1,6 @@ -# serial 32 +# serial 33 -# Copyright (C) 1997-2001, 2003-2019 Free Software Foundation, Inc. +# Copyright (C) 1997-2001, 2003-2020 Free Software Foundation, Inc. # # This file is free software; the Free Software Foundation # gives unlimited permission to copy and/or distribute it, @@ -63,8 +63,8 @@ AC_DEFUN([gl_FUNC_LSTAT_FOLLOWS_SLASHED_SYMLINK], # Guess no on native Windows. gl_cv_func_lstat_dereferences_slashed_symlink="guessing no" ;; *) - # If we don't know, assume the worst. - gl_cv_func_lstat_dereferences_slashed_symlink="guessing no" ;; + # If we don't know, obey --enable-cross-guesses. + gl_cv_func_lstat_dereferences_slashed_symlink="$gl_cross_guess_normal" ;; esac ]) rm -f conftest.sym conftest.file diff --git a/m4/malloc.m4 b/m4/malloc.m4 index c469c45..3823566 100644 --- a/m4/malloc.m4 +++ b/m4/malloc.m4 @@ -1,27 +1,19 @@ -# malloc.m4 serial 19 -dnl Copyright (C) 2007, 2009-2019 Free Software Foundation, Inc. +# malloc.m4 serial 21 +dnl Copyright (C) 2007, 2009-2020 Free Software Foundation, Inc. dnl This file is free software; the Free Software Foundation dnl gives unlimited permission to copy and/or distribute it, dnl with or without modifications, as long as this notice is preserved. -m4_version_prereq([2.70], [] ,[ - # This is adapted with modifications from upstream Autoconf here: # https://git.savannah.gnu.org/cgit/autoconf.git/commit/?id=04be2b7a29d65d9a08e64e8e56e594c91749598c AC_DEFUN([_AC_FUNC_MALLOC_IF], [ - AC_REQUIRE([AC_HEADER_STDC])dnl AC_REQUIRE([AC_CANONICAL_HOST])dnl for cross-compiles - AC_CHECK_HEADERS([stdlib.h]) AC_CACHE_CHECK([for GNU libc compatible malloc], [ac_cv_func_malloc_0_nonnull], [AC_RUN_IFELSE( [AC_LANG_PROGRAM( - [[#if defined STDC_HEADERS || defined HAVE_STDLIB_H - # include - #else - char *malloc (); - #endif + [[#include ]], [[char *p = malloc (0); int result = !p; @@ -35,8 +27,8 @@ AC_DEFUN([_AC_FUNC_MALLOC_IF], *-gnu* | gnu* | *-musl* | freebsd* | netbsd* | openbsd* \ | hpux* | solaris* | cygwin* | mingw*) ac_cv_func_malloc_0_nonnull="guessing yes" ;; - # If we don't know, assume the worst. - *) ac_cv_func_malloc_0_nonnull="guessing no" ;; + # If we don't know, obey --enable-cross-guesses. + *) ac_cv_func_malloc_0_nonnull="$gl_cross_guess_normal" ;; esac ]) ]) @@ -50,8 +42,6 @@ AC_DEFUN([_AC_FUNC_MALLOC_IF], esac ])# _AC_FUNC_MALLOC_IF -]) - # gl_FUNC_MALLOC_GNU # ------------------ # Test whether 'malloc (0)' is handled like in GNU libc, and replace malloc if diff --git a/m4/malloca.m4 b/m4/malloca.m4 index 820f40a..930199d 100644 --- a/m4/malloca.m4 +++ b/m4/malloca.m4 @@ -1,5 +1,5 @@ -# malloca.m4 serial 1 -dnl Copyright (C) 2003-2004, 2006-2007, 2009-2019 Free Software Foundation, +# malloca.m4 serial 2 +dnl Copyright (C) 2003-2004, 2006-2007, 2009-2020 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, @@ -11,5 +11,4 @@ AC_DEFUN([gl_MALLOCA], dnl @ALLOCA@ and @LTALLOCA@. dnl gl_FUNC_ALLOCA dnl Already brought in by the module dependencies. AC_REQUIRE([gl_EEMALLOC]) - AC_REQUIRE([AC_TYPE_LONG_LONG_INT]) ]) diff --git a/m4/manywarnings.m4 b/m4/manywarnings.m4 index 6bb9f8f..a37cd15 100644 --- a/m4/manywarnings.m4 +++ b/m4/manywarnings.m4 @@ -1,5 +1,5 @@ -# manywarnings.m4 serial 18 -dnl Copyright (C) 2008-2019 Free Software Foundation, Inc. +# manywarnings.m4 serial 21 +dnl Copyright (C) 2008-2020 Free Software Foundation, Inc. dnl This file is free software; the Free Software Foundation dnl gives unlimited permission to copy and/or distribute it, dnl with or without modifications, as long as this notice is preserved. @@ -21,7 +21,7 @@ AC_DEFUN([gl_MANYWARN_COMPLEMENT], *" $gl_warn_item "*) ;; *) - gl_warn_set="$gl_warn_set $gl_warn_item" + gl_AS_VAR_APPEND([gl_warn_set], [" $gl_warn_item"]) ;; esac done @@ -39,8 +39,7 @@ AC_DEFUN([gl_MANYWARN_ALL_GCC], [_AC_LANG_DISPATCH([$0], _AC_LANG, $@)]) # Specialization for _AC_LANG = C. -# Use of m4_defun rather than AC_DEFUN works around a bug in autoconf < 2.63b. -m4_defun([gl_MANYWARN_ALL_GCC(C)], +AC_DEFUN([gl_MANYWARN_ALL_GCC(C)], [ AC_LANG_PUSH([C]) @@ -49,12 +48,12 @@ m4_defun([gl_MANYWARN_ALL_GCC(C)], AC_REQUIRE([AC_PROG_CC]) if test -n "$GCC"; then - dnl Check if -W -Werror -Wno-missing-field-initializers is supported + dnl Check if -Wextra -Werror -Wno-missing-field-initializers is supported dnl with the current $CC $CFLAGS $CPPFLAGS. AC_CACHE_CHECK([whether -Wno-missing-field-initializers is supported], [gl_cv_cc_nomfi_supported], [gl_save_CFLAGS="$CFLAGS" - CFLAGS="$CFLAGS -W -Werror -Wno-missing-field-initializers" + CFLAGS="$CFLAGS -Wextra -Werror -Wno-missing-field-initializers" AC_COMPILE_IFELSE( [AC_LANG_PROGRAM([[]], [[]])], [gl_cv_cc_nomfi_supported=yes], @@ -68,7 +67,7 @@ m4_defun([gl_MANYWARN_ALL_GCC(C)], AC_CACHE_CHECK([whether -Wno-missing-field-initializers is needed], [gl_cv_cc_nomfi_needed], [gl_save_CFLAGS="$CFLAGS" - CFLAGS="$CFLAGS -W -Werror" + CFLAGS="$CFLAGS -Wextra -Werror" AC_COMPILE_IFELSE( [AC_LANG_PROGRAM( [[int f (void) @@ -105,133 +104,41 @@ m4_defun([gl_MANYWARN_ALL_GCC(C)], # To compare this list to your installed GCC's, run this Bash command: # # comm -3 \ - # <((sed -n 's/^ *\(-[^ 0-9][^ ]*\) .*/\1/p' manywarnings.m4; \ + # <((sed -n 's/^ *\(-[^ 0-9][^ ]*\).*/\1/p' manywarnings.m4; \ # awk '/^[^#]/ {print $1}' ../build-aux/gcc-warning.spec) | sort) \ # <(LC_ALL=C gcc --help=warnings | sed -n 's/^ \(-[^ ]*\) .*/\1/p' | sort) - gl_manywarn_set= - for gl_manywarn_item in -fno-common \ - -W \ - -Wabsolute-value \ - -Waddress \ - -Waddress-of-packed-member \ - -Waggressive-loop-optimizations \ + $1= + for gl_manywarn_item in -fanalyzer -fno-common \ -Wall \ - -Wattribute-warning \ - -Wattributes \ + -Warith-conversion \ -Wbad-function-cast \ - -Wbool-compare \ - -Wbool-operation \ - -Wbuiltin-declaration-mismatch \ - -Wbuiltin-macro-redefined \ - -Wcannot-profile \ - -Wcast-align \ -Wcast-align=strict \ - -Wcast-function-type \ - -Wchar-subscripts \ - -Wclobbered \ - -Wcomment \ - -Wcomments \ - -Wcoverage-mismatch \ - -Wcpp \ - -Wdangling-else \ -Wdate-time \ - -Wdeprecated \ - -Wdeprecated-declarations \ - -Wdesignated-init \ -Wdisabled-optimization \ - -Wdiscarded-array-qualifiers \ - -Wdiscarded-qualifiers \ - -Wdiv-by-zero \ -Wdouble-promotion \ -Wduplicated-branches \ -Wduplicated-cond \ - -Wduplicate-decl-specifier \ - -Wempty-body \ - -Wendif-labels \ - -Wenum-compare \ - -Wexpansion-to-defined \ -Wextra \ - -Wformat-contains-nul \ - -Wformat-extra-args \ - -Wformat-nonliteral \ - -Wformat-security \ -Wformat-signedness \ - -Wformat-y2k \ - -Wformat-zero-length \ - -Wframe-address \ - -Wfree-nonheap-object \ - -Whsa \ - -Wif-not-aligned \ - -Wignored-attributes \ - -Wignored-qualifiers \ - -Wimplicit \ - -Wimplicit-function-declaration \ - -Wimplicit-int \ - -Wincompatible-pointer-types \ -Winit-self \ -Winline \ - -Wint-conversion \ - -Wint-in-bool-context \ - -Wint-to-pointer-cast \ - -Winvalid-memory-model \ -Winvalid-pch \ - -Wlogical-not-parentheses \ -Wlogical-op \ - -Wmain \ - -Wmaybe-uninitialized \ - -Wmemset-elt-size \ - -Wmemset-transposed-args \ - -Wmisleading-indentation \ - -Wmissing-attributes \ - -Wmissing-braces \ -Wmissing-declarations \ - -Wmissing-field-initializers \ -Wmissing-include-dirs \ - -Wmissing-parameter-type \ - -Wmissing-profile \ -Wmissing-prototypes \ - -Wmultichar \ - -Wmultistatement-macros \ - -Wnarrowing \ -Wnested-externs \ - -Wnonnull \ - -Wnonnull-compare \ -Wnull-dereference \ - -Wodr \ - -Wold-style-declaration \ -Wold-style-definition \ -Wopenmp-simd \ - -Woverflow \ -Woverlength-strings \ - -Woverride-init \ -Wpacked \ - -Wpacked-bitfield-compat \ - -Wpacked-not-aligned \ - -Wparentheses \ -Wpointer-arith \ - -Wpointer-compare \ - -Wpointer-sign \ - -Wpointer-to-int-cast \ - -Wpragmas \ - -Wpsabi \ - -Wrestrict \ - -Wreturn-local-addr \ - -Wreturn-type \ - -Wscalar-storage-order \ - -Wsequence-point \ -Wshadow \ - -Wshift-count-negative \ - -Wshift-count-overflow \ - -Wshift-negative-value \ - -Wsizeof-array-argument \ - -Wsizeof-pointer-div \ - -Wsizeof-pointer-memaccess \ -Wstack-protector \ - -Wstrict-aliasing \ -Wstrict-overflow \ -Wstrict-prototypes \ - -Wstringop-truncation \ -Wsuggest-attribute=cold \ -Wsuggest-attribute=const \ -Wsuggest-attribute=format \ @@ -240,100 +147,69 @@ m4_defun([gl_MANYWARN_ALL_GCC(C)], -Wsuggest-attribute=pure \ -Wsuggest-final-methods \ -Wsuggest-final-types \ - -Wswitch \ - -Wswitch-bool \ - -Wswitch-unreachable \ -Wsync-nand \ -Wsystem-headers \ - -Wtautological-compare \ -Wtrampolines \ - -Wtrigraphs \ - -Wtype-limits \ -Wuninitialized \ -Wunknown-pragmas \ -Wunsafe-loop-optimizations \ - -Wunused \ - -Wunused-but-set-parameter \ - -Wunused-but-set-variable \ - -Wunused-function \ - -Wunused-label \ - -Wunused-local-typedefs \ -Wunused-macros \ - -Wunused-parameter \ - -Wunused-result \ - -Wunused-value \ - -Wunused-variable \ - -Wvarargs \ -Wvariadic-macros \ -Wvector-operation-performance \ -Wvla \ - -Wvolatile-register-var \ -Wwrite-strings \ \ ; do - gl_manywarn_set="$gl_manywarn_set $gl_manywarn_item" + gl_AS_VAR_APPEND([$1], [" $gl_manywarn_item"]) done # gcc --help=warnings outputs an unusual form for these options; list # them here so that the above 'comm' command doesn't report a false match. - # Would prefer "min (PTRDIFF_MAX, SIZE_MAX)", but it must be a literal. - # Also, AC_COMPUTE_INT requires it to fit in a long; it is 2**63 on - # the only platforms where it does not fit in a long, so make that - # a special case. - AC_MSG_CHECKING([max safe object size]) - AC_COMPUTE_INT([gl_alloc_max], - [LONG_MAX < (PTRDIFF_MAX < (size_t) -1 ? PTRDIFF_MAX : (size_t) -1) - ? -1 - : PTRDIFF_MAX < (size_t) -1 ? (long) PTRDIFF_MAX : (long) (size_t) -1], - [[#include - #include - #include - ]], - [gl_alloc_max=2147483647]) - case $gl_alloc_max in - -1) gl_alloc_max=9223372036854775807;; - esac - AC_MSG_RESULT([$gl_alloc_max]) - gl_manywarn_set="$gl_manywarn_set -Walloc-size-larger-than=$gl_alloc_max" - gl_manywarn_set="$gl_manywarn_set -Warray-bounds=2" - gl_manywarn_set="$gl_manywarn_set -Wattribute-alias=2" - gl_manywarn_set="$gl_manywarn_set -Wformat-overflow=2" - gl_manywarn_set="$gl_manywarn_set -Wformat-truncation=2" - gl_manywarn_set="$gl_manywarn_set -Wimplicit-fallthrough=5" - gl_manywarn_set="$gl_manywarn_set -Wnormalized=nfc" - gl_manywarn_set="$gl_manywarn_set -Wshift-overflow=2" - gl_manywarn_set="$gl_manywarn_set -Wstringop-overflow=2" - gl_manywarn_set="$gl_manywarn_set -Wunused-const-variable=2" - gl_manywarn_set="$gl_manywarn_set -Wvla-larger-than=4031" + gl_AS_VAR_APPEND([$1], [' -Warray-bounds=2']) + gl_AS_VAR_APPEND([$1], [' -Wattribute-alias=2']) + 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], [' -Wunused-const-variable=2']) + gl_AS_VAR_APPEND([$1], [' -Wvla-larger-than=4031']) # These are needed for older GCC versions. if test -n "$GCC"; then case `($CC --version) 2>/dev/null` in 'gcc (GCC) '[[0-3]].* | \ 'gcc (GCC) '4.[[0-7]].*) - gl_manywarn_set="$gl_manywarn_set -fdiagnostics-show-option" - gl_manywarn_set="$gl_manywarn_set -funit-at-a-time" + gl_AS_VAR_APPEND([$1], [' -fdiagnostics-show-option']) + gl_AS_VAR_APPEND([$1], [' -funit-at-a-time']) ;; esac fi # Disable specific options as needed. if test "$gl_cv_cc_nomfi_needed" = yes; then - gl_manywarn_set="$gl_manywarn_set -Wno-missing-field-initializers" + gl_AS_VAR_APPEND([$1], [' -Wno-missing-field-initializers']) fi if test "$gl_cv_cc_uninitialized_supported" = no; then - gl_manywarn_set="$gl_manywarn_set -Wno-uninitialized" + gl_AS_VAR_APPEND([$1], [' -Wno-uninitialized']) fi - $1=$gl_manywarn_set + # Some warnings have too many false alarms in GCC 10.1. + # https://gcc.gnu.org/bugzilla/show_bug.cgi?id=93695 + gl_AS_VAR_APPEND([$1], [' -Wno-analyzer-double-free']) + # https://gcc.gnu.org/bugzilla/show_bug.cgi?id=94458 + gl_AS_VAR_APPEND([$1], [' -Wno-analyzer-malloc-leak']) + # https://gcc.gnu.org/bugzilla/show_bug.cgi?id=94851 + gl_AS_VAR_APPEND([$1], [' -Wno-analyzer-null-dereference']) + # https://gcc.gnu.org/bugzilla/show_bug.cgi?id=95758 + gl_AS_VAR_APPEND([$1], [' -Wno-analyzer-use-after-free']) AC_LANG_POP([C]) ]) # Specialization for _AC_LANG = C++. -# Use of m4_defun rather than AC_DEFUN works around a bug in autoconf < 2.63b. -m4_defun([gl_MANYWARN_ALL_GCC(C++)], +AC_DEFUN([gl_MANYWARN_ALL_GCC(C++)], [ gl_MANYWARN_ALL_GCC_CXX_IMPL([$1]) ]) diff --git a/m4/mbrtowc.m4 b/m4/mbrtowc.m4 index 4811af5..755f8c9 100644 --- a/m4/mbrtowc.m4 +++ b/m4/mbrtowc.m4 @@ -1,5 +1,5 @@ -# mbrtowc.m4 serial 31 -*- coding: utf-8 -*- -dnl Copyright (C) 2001-2002, 2004-2005, 2008-2019 Free Software Foundation, +# mbrtowc.m4 serial 37 -*- coding: utf-8 -*- +dnl Copyright (C) 2001-2002, 2004-2005, 2008-2020 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, @@ -8,6 +8,8 @@ dnl with or without modifications, as long as this notice is preserved. AC_DEFUN([gl_FUNC_MBRTOWC], [ AC_REQUIRE([gl_WCHAR_H_DEFAULTS]) + AC_REQUIRE([gl_PTHREADLIB]) + AC_CHECK_HEADERS_ONCE([threads.h]) AC_REQUIRE([AC_TYPE_MBSTATE_T]) gl_MBSTATE_T_BROKEN @@ -39,6 +41,7 @@ AC_DEFUN([gl_FUNC_MBRTOWC], gl_MBRTOWC_NULL_ARG2 gl_MBRTOWC_RETVAL gl_MBRTOWC_NUL_RETVAL + gl_MBRTOWC_STORES_INCOMPLETE gl_MBRTOWC_EMPTY_INPUT gl_MBRTOWC_C_LOCALE case "$gl_cv_func_mbrtowc_null_arg1" in @@ -69,6 +72,13 @@ AC_DEFUN([gl_FUNC_MBRTOWC], REPLACE_MBRTOWC=1 ;; esac + case "$gl_cv_func_mbrtowc_stores_incomplete" in + *no) ;; + *) AC_DEFINE([MBRTOWC_STORES_INCOMPLETE_BUG], [1], + [Define if the mbrtowc function stores a wide character when reporting incomplete input.]) + REPLACE_MBRTOWC=1 + ;; + esac case "$gl_cv_func_mbrtowc_empty_input" in *yes) ;; *) AC_DEFINE([MBRTOWC_EMPTY_INPUT_BUG], [1], @@ -77,15 +87,32 @@ AC_DEFUN([gl_FUNC_MBRTOWC], REPLACE_MBRTOWC=1 ;; esac - case $gl_cv_C_locale_sans_EILSEQ in + case "$gl_cv_func_mbrtowc_C_locale_sans_EILSEQ" in *yes) ;; - *) AC_DEFINE([C_LOCALE_MAYBE_EILSEQ], [1], - [Define to 1 if the C locale may have encoding errors.]) + *) AC_DEFINE([MBRTOWC_IN_C_LOCALE_MAYBE_EILSEQ], [1], + [Define if the mbrtowc function may signal encoding errors in the C locale.]) REPLACE_MBRTOWC=1 ;; esac fi fi + if test $REPLACE_MBSTATE_T = 1; then + case "$host_os" in + mingw*) LIB_MBRTOWC= ;; + *) + gl_WEAK_SYMBOLS + case "$gl_cv_have_weak" in + *yes) LIB_MBRTOWC= ;; + *) LIB_MBRTOWC="$LIBPTHREAD" ;; + esac + ;; + esac + else + LIB_MBRTOWC= + fi + dnl LIB_MBRTOWC is expected to be '-pthread' or '-lpthread' on AIX + dnl with gcc or xlc, and empty otherwise. + AC_SUBST([LIB_MBRTOWC]) ]) dnl Test whether mbsinit() and mbrtowc() need to be overridden in a way that @@ -97,11 +124,19 @@ dnl avoid inconsistencies. AC_DEFUN([gl_MBSTATE_T_BROKEN], [ AC_REQUIRE([gl_WCHAR_H_DEFAULTS]) + AC_REQUIRE([AC_CANONICAL_HOST]) AC_REQUIRE([AC_TYPE_MBSTATE_T]) AC_CHECK_FUNCS_ONCE([mbsinit]) AC_CHECK_FUNCS_ONCE([mbrtowc]) - if test $ac_cv_func_mbsinit = yes && test $ac_cv_func_mbrtowc = yes; then + dnl On native Windows, we know exactly how mbsinit() behaves and don't need + dnl to override it, even if - like on MSVC - mbsinit() is only defined as + dnl an inline function, not as a global function. + if case "$host_os" in + mingw*) true ;; + *) test $ac_cv_func_mbsinit = yes ;; + esac \ + && test $ac_cv_func_mbrtowc = yes; then gl_MBRTOWC_INCOMPLETE_STATE gl_MBRTOWC_SANITYCHECK REPLACE_MBSTATE_T=0 @@ -126,6 +161,7 @@ AC_DEFUN([gl_MBRTOWC_INCOMPLETE_STATE], [ AC_REQUIRE([AC_PROG_CC]) AC_REQUIRE([gt_LOCALE_JA]) + AC_REQUIRE([gt_LOCALE_FR_UTF8]) AC_REQUIRE([AC_CANONICAL_HOST]) dnl for cross-compiles AC_CACHE_CHECK([whether mbrtowc handles incomplete characters], [gl_cv_func_mbrtowc_incomplete_state], @@ -171,6 +207,39 @@ int main () [gl_cv_func_mbrtowc_incomplete_state=yes], [gl_cv_func_mbrtowc_incomplete_state=no], [:]) + else + if test $LOCALE_FR_UTF8 != none; then + AC_RUN_IFELSE( + [AC_LANG_SOURCE([[ +#include +#include +/* Tru64 with Desktop Toolkit C has a bug: must be included before + . + BSD/OS 4.0.1 has a bug: , and must be + included before . */ +#include +#include +#include +#include +int main () +{ + if (setlocale (LC_ALL, "$LOCALE_FR_UTF8") != NULL) + { + const char input[] = "B\303\274\303\237er"; /* "Büßer" */ + mbstate_t state; + wchar_t wc; + + memset (&state, '\0', sizeof (mbstate_t)); + if (mbrtowc (&wc, input + 1, 1, &state) == (size_t)(-2)) + if (mbsinit (&state)) + return 2; + } + return 0; +}]])], + [gl_cv_func_mbrtowc_incomplete_state=yes], + [gl_cv_func_mbrtowc_incomplete_state=no], + [:]) + fi fi ]) ]) @@ -550,6 +619,126 @@ int main () ]) ]) +dnl Test whether mbrtowc stores a wide character when reporting incomplete +dnl input. + +AC_DEFUN([gl_MBRTOWC_STORES_INCOMPLETE], +[ + AC_REQUIRE([AC_PROG_CC]) + AC_REQUIRE([AC_CANONICAL_HOST]) dnl for cross-compiles + AC_CACHE_CHECK([whether mbrtowc stores incomplete characters], + [gl_cv_func_mbrtowc_stores_incomplete], + [ + dnl Initial guess, used when cross-compiling or when no suitable locale + dnl is present. +changequote(,)dnl + case "$host_os" in + # Guess yes on native Windows. + mingw*) gl_cv_func_mbrtowc_stores_incomplete="guessing yes" ;; + *) gl_cv_func_mbrtowc_stores_incomplete="guessing no" ;; + esac +changequote([,])dnl + case "$host_os" in + mingw*) + AC_RUN_IFELSE( + [AC_LANG_SOURCE([[ +#include +#include +/* Tru64 with Desktop Toolkit C has a bug: must be included before + . + BSD/OS 4.0.1 has a bug: , and must be + included before . */ +#include +#include +#include +#include +int main () +{ + int result = 0; + if (setlocale (LC_ALL, "French_France.65001") != NULL) + { + wchar_t wc = (wchar_t) 0xBADFACE; + mbstate_t state; + + memset (&state, '\0', sizeof (mbstate_t)); + if (mbrtowc (&wc, "\303", 1, &state) == (size_t)(-2) + && wc != (wchar_t) 0xBADFACE) + result |= 1; + } + if (setlocale (LC_ALL, "Japanese_Japan.932") != NULL) + { + wchar_t wc = (wchar_t) 0xBADFACE; + mbstate_t state; + + memset (&state, '\0', sizeof (mbstate_t)); + if (mbrtowc (&wc, "\226", 1, &state) == (size_t)(-2) + && wc != (wchar_t) 0xBADFACE) + result |= 2; + } + if (setlocale (LC_ALL, "Chinese_Taiwan.950") != NULL) + { + wchar_t wc = (wchar_t) 0xBADFACE; + mbstate_t state; + + memset (&state, '\0', sizeof (mbstate_t)); + if (mbrtowc (&wc, "\245", 1, &state) == (size_t)(-2) + && wc != (wchar_t) 0xBADFACE) + result |= 4; + } + if (setlocale (LC_ALL, "Chinese_China.936") != NULL) + { + wchar_t wc = (wchar_t) 0xBADFACE; + mbstate_t state; + + memset (&state, '\0', sizeof (mbstate_t)); + if (mbrtowc (&wc, "\261", 1, &state) == (size_t)(-2) + && wc != (wchar_t) 0xBADFACE) + result |= 8; + } + return result; +}]])], + [gl_cv_func_mbrtowc_stores_incomplete=no], + [gl_cv_func_mbrtowc_stores_incomplete=yes], + [:]) + ;; + *) + AC_REQUIRE([gt_LOCALE_FR_UTF8]) + if test $LOCALE_FR_UTF8 != none; then + AC_RUN_IFELSE( + [AC_LANG_SOURCE([[ +#include +#include +/* Tru64 with Desktop Toolkit C has a bug: must be included before + . + BSD/OS 4.0.1 has a bug: , and must be + included before . */ +#include +#include +#include +#include +int main () +{ + if (setlocale (LC_ALL, "$LOCALE_FR_UTF8") != NULL) + { + wchar_t wc = (wchar_t) 0xBADFACE; + mbstate_t state; + + memset (&state, '\0', sizeof (mbstate_t)); + if (mbrtowc (&wc, "\303", 1, &state) == (size_t)(-2) + && wc != (wchar_t) 0xBADFACE) + return 1; + } + return 0; +}]])], + [gl_cv_func_mbrtowc_stores_incomplete=no], + [gl_cv_func_mbrtowc_stores_incomplete=yes], + [:]) + fi + ;; + esac + ]) +]) + dnl Test whether mbrtowc returns the correct value on empty input. AC_DEFUN([gl_MBRTOWC_EMPTY_INPUT], @@ -595,11 +784,11 @@ AC_DEFUN([gl_MBRTOWC_C_LOCALE], [ AC_REQUIRE([AC_CANONICAL_HOST]) dnl for cross-compiles AC_CACHE_CHECK([whether the C locale is free of encoding errors], - [gl_cv_C_locale_sans_EILSEQ], + [gl_cv_func_mbrtowc_C_locale_sans_EILSEQ], [ dnl Initial guess, used when cross-compiling or when no suitable locale dnl is present. - gl_cv_C_locale_sans_EILSEQ="guessing no" + gl_cv_func_mbrtowc_C_locale_sans_EILSEQ="$gl_cross_guess_normal" AC_RUN_IFELSE( [AC_LANG_PROGRAM( @@ -622,22 +811,28 @@ AC_DEFUN([gl_MBRTOWC_C_LOCALE], } return 0; ]])], - [gl_cv_C_locale_sans_EILSEQ=yes], - [gl_cv_C_locale_sans_EILSEQ=no], + [gl_cv_func_mbrtowc_C_locale_sans_EILSEQ=yes], + [gl_cv_func_mbrtowc_C_locale_sans_EILSEQ=no], [case "$host_os" in # Guess yes on native Windows. - mingw*) gl_cv_C_locale_sans_EILSEQ="guessing yes" ;; + mingw*) gl_cv_func_mbrtowc_C_locale_sans_EILSEQ="guessing yes" ;; esac ]) ]) ]) -# Prerequisites of lib/mbrtowc.c. +# Prerequisites of lib/mbrtowc.c and lib/lc-charset-dispatch.c. AC_DEFUN([gl_PREREQ_MBRTOWC], [ AC_REQUIRE([AC_C_INLINE]) : ]) +# Prerequisites of lib/mbtowc-lock.c. +AC_DEFUN([gl_PREREQ_MBTOWC_LOCK], +[ + gl_VISIBILITY +]) + dnl From Paul Eggert diff --git a/m4/mbsinit.m4 b/m4/mbsinit.m4 index e2f45e7..8c26b6b 100644 --- a/m4/mbsinit.m4 +++ b/m4/mbsinit.m4 @@ -1,5 +1,5 @@ # mbsinit.m4 serial 8 -dnl Copyright (C) 2008, 2010-2019 Free Software Foundation, Inc. +dnl Copyright (C) 2008, 2010-2020 Free Software Foundation, Inc. dnl This file is free software; the Free Software Foundation dnl gives unlimited permission to copy and/or distribute it, dnl with or without modifications, as long as this notice is preserved. diff --git a/m4/mbstate_t.m4 b/m4/mbstate_t.m4 index f669753..057ce12 100644 --- a/m4/mbstate_t.m4 +++ b/m4/mbstate_t.m4 @@ -1,5 +1,5 @@ # mbstate_t.m4 serial 13 -dnl Copyright (C) 2000-2002, 2008-2019 Free Software Foundation, Inc. +dnl Copyright (C) 2000-2002, 2008-2020 Free Software Foundation, Inc. dnl This file is free software; the Free Software Foundation dnl gives unlimited permission to copy and/or distribute it, dnl with or without modifications, as long as this notice is preserved. diff --git a/m4/mbtowc.m4 b/m4/mbtowc.m4 index 5a4b92e..befcffa 100644 --- a/m4/mbtowc.m4 +++ b/m4/mbtowc.m4 @@ -1,5 +1,5 @@ # mbtowc.m4 serial 3 -dnl Copyright (C) 2011-2019 Free Software Foundation, Inc. +dnl Copyright (C) 2011-2020 Free Software Foundation, Inc. dnl This file is free software; the Free Software Foundation dnl gives unlimited permission to copy and/or distribute it, dnl with or without modifications, as long as this notice is preserved. diff --git a/m4/minmax.m4 b/m4/minmax.m4 index 1e0d30b..e5b28b0 100644 --- a/m4/minmax.m4 +++ b/m4/minmax.m4 @@ -1,5 +1,5 @@ # minmax.m4 serial 4 -dnl Copyright (C) 2005, 2009-2019 Free Software Foundation, Inc. +dnl Copyright (C) 2005, 2009-2020 Free Software Foundation, Inc. dnl This file is free software; the Free Software Foundation dnl gives unlimited permission to copy and/or distribute it, dnl with or without modifications, as long as this notice is preserved. diff --git a/m4/mkdir.m4 b/m4/mkdir.m4 index 366a3cd..bd9e088 100644 --- a/m4/mkdir.m4 +++ b/m4/mkdir.m4 @@ -1,6 +1,6 @@ -# serial 15 +# serial 17 -# Copyright (C) 2001, 2003-2004, 2006, 2008-2019 Free Software Foundation, Inc. +# Copyright (C) 2001, 2003-2004, 2006, 2008-2020 Free Software Foundation, Inc. # This file is free software; the Free Software Foundation # gives unlimited permission to copy and/or distribute it, # with or without modifications, as long as this notice is preserved. @@ -16,33 +16,34 @@ AC_DEFUN([gl_FUNC_MKDIR], AC_CACHE_CHECK([whether mkdir handles trailing slash], [gl_cv_func_mkdir_trailing_slash_works], [rm -rf conftest.dir - AC_RUN_IFELSE([AC_LANG_PROGRAM([[ -# include -# include -]], [return mkdir ("conftest.dir/", 0700);])], - [gl_cv_func_mkdir_trailing_slash_works=yes], - [gl_cv_func_mkdir_trailing_slash_works=no], - [case "$host_os" in - # Guess yes on Linux systems. - linux-* | linux) gl_cv_func_mkdir_trailing_slash_works="guessing yes" ;; - # Guess yes on glibc systems. - *-gnu* | gnu*) gl_cv_func_mkdir_trailing_slash_works="guessing yes" ;; - # Guess yes on MSVC, no on mingw. - mingw*) AC_EGREP_CPP([Known], [ + AC_RUN_IFELSE( + [AC_LANG_PROGRAM([[ + #include + #include + ]GL_MDA_DEFINES], + [[return mkdir ("conftest.dir/", 0700);]])], + [gl_cv_func_mkdir_trailing_slash_works=yes], + [gl_cv_func_mkdir_trailing_slash_works=no], + [case "$host_os" in + # Guess yes on Linux systems. + linux-* | linux) gl_cv_func_mkdir_trailing_slash_works="guessing yes" ;; + # Guess yes on glibc systems. + *-gnu* | gnu*) gl_cv_func_mkdir_trailing_slash_works="guessing yes" ;; + # Guess yes on MSVC, no on mingw. + mingw*) AC_EGREP_CPP([Known], [ #ifdef _MSC_VER Known #endif - ], - [gl_cv_func_mkdir_trailing_slash_works="guessing yes"], - [gl_cv_func_mkdir_trailing_slash_works="guessing no"]) - ;; - # If we don't know, assume the worst. - *) gl_cv_func_mkdir_trailing_slash_works="guessing no" ;; - esac - ]) - rm -rf conftest.dir - ] - ) + ], + [gl_cv_func_mkdir_trailing_slash_works="guessing yes"], + [gl_cv_func_mkdir_trailing_slash_works="guessing no"]) + ;; + # If we don't know, obey --enable-cross-guesses. + *) gl_cv_func_mkdir_trailing_slash_works="$gl_cross_guess_normal" ;; + esac + ]) + rm -rf conftest.dir + ]) case "$gl_cv_func_mkdir_trailing_slash_works" in *yes) ;; *) @@ -53,24 +54,26 @@ AC_DEFUN([gl_FUNC_MKDIR], AC_CACHE_CHECK([whether mkdir handles trailing dot], [gl_cv_func_mkdir_trailing_dot_works], [rm -rf conftest.dir - AC_RUN_IFELSE([AC_LANG_PROGRAM([[ -# include -# include -]], [return !mkdir ("conftest.dir/./", 0700);])], - [gl_cv_func_mkdir_trailing_dot_works=yes], - [gl_cv_func_mkdir_trailing_dot_works=no], - [case "$host_os" in - # Guess yes on glibc systems. - *-gnu* | 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 no on native Windows. - mingw*) gl_cv_func_mkdir_trailing_dot_works="guessing no" ;; - # If we don't know, assume the worst. - *) gl_cv_func_mkdir_trailing_dot_works="guessing no" ;; - esac - ]) - rm -rf conftest.dir + AC_RUN_IFELSE( + [AC_LANG_PROGRAM([[ + #include + #include + ]GL_MDA_DEFINES], + [[return !mkdir ("conftest.dir/./", 0700);]])], + [gl_cv_func_mkdir_trailing_dot_works=yes], + [gl_cv_func_mkdir_trailing_dot_works=no], + [case "$host_os" in + # Guess yes on glibc systems. + *-gnu* | 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 no on native Windows. + mingw*) gl_cv_func_mkdir_trailing_dot_works="guessing no" ;; + # If we don't know, obey --enable-cross-guesses. + *) gl_cv_func_mkdir_trailing_dot_works="$gl_cross_guess_normal" ;; + esac + ]) + rm -rf conftest.dir ] ) case "$gl_cv_func_mkdir_trailing_dot_works" in diff --git a/m4/mkstemp.m4 b/m4/mkstemp.m4 index 1b15c2e..392f97c 100644 --- a/m4/mkstemp.m4 +++ b/m4/mkstemp.m4 @@ -1,6 +1,6 @@ -#serial 26 +#serial 28 -# Copyright (C) 2001, 2003-2007, 2009-2019 Free Software Foundation, Inc. +# Copyright (C) 2001, 2003-2007, 2009-2020 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. @@ -26,7 +26,8 @@ AC_DEFUN([gl_FUNC_MKSTEMP], mkdir conftest.mkstemp AC_RUN_IFELSE( [AC_LANG_PROGRAM( - [AC_INCLUDES_DEFAULT], + [AC_INCLUDES_DEFAULT + GL_MDA_DEFINES], [[int result = 0; int i; off_t large = (off_t) 4294967295u; @@ -63,8 +64,8 @@ AC_DEFUN([gl_FUNC_MKSTEMP], *-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, assume the worst. - *) 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 50c3808..2995ad5 100644 --- a/m4/mmap-anon.m4 +++ b/m4/mmap-anon.m4 @@ -1,5 +1,5 @@ -# mmap-anon.m4 serial 10 -dnl Copyright (C) 2005, 2007, 2009-2019 Free Software Foundation, Inc. +# mmap-anon.m4 serial 11 +dnl Copyright (C) 2005, 2007, 2009-2020 Free Software Foundation, Inc. dnl This file is free software; the Free Software Foundation dnl gives unlimited permission to copy and/or distribute it, dnl with or without modifications, as long as this notice is preserved. @@ -9,7 +9,7 @@ dnl with or without modifications, as long as this notice is preserved. # - On Linux, AIX, OSF/1, Solaris, Cygwin, Interix, Haiku, both MAP_ANONYMOUS # and MAP_ANON exist and have the same value. # - On HP-UX, only MAP_ANONYMOUS exists. -# - On Mac OS X, FreeBSD, NetBSD, OpenBSD, only MAP_ANON exists. +# - On Mac OS X, FreeBSD, NetBSD, OpenBSD, Minix, only MAP_ANON exists. # - On IRIX, neither exists, and a file descriptor opened to /dev/zero must be # used. diff --git a/m4/mode_t.m4 b/m4/mode_t.m4 index ba840dc..f190951 100644 --- a/m4/mode_t.m4 +++ b/m4/mode_t.m4 @@ -1,5 +1,5 @@ # mode_t.m4 serial 2 -dnl Copyright (C) 2009-2019 Free Software Foundation, Inc. +dnl Copyright (C) 2009-2020 Free Software Foundation, Inc. dnl This file is free software; the Free Software Foundation dnl gives unlimited permission to copy and/or distribute it, dnl with or without modifications, as long as this notice is preserved. diff --git a/m4/msvc-inval.m4 b/m4/msvc-inval.m4 index 4b95876..dcf398d 100644 --- a/m4/msvc-inval.m4 +++ b/m4/msvc-inval.m4 @@ -1,5 +1,5 @@ # msvc-inval.m4 serial 1 -dnl Copyright (C) 2011-2019 Free Software Foundation, Inc. +dnl Copyright (C) 2011-2020 Free Software Foundation, Inc. dnl This file is free software; the Free Software Foundation dnl gives unlimited permission to copy and/or distribute it, dnl with or without modifications, as long as this notice is preserved. diff --git a/m4/msvc-nothrow.m4 b/m4/msvc-nothrow.m4 index 7e73b40..13198d8 100644 --- a/m4/msvc-nothrow.m4 +++ b/m4/msvc-nothrow.m4 @@ -1,5 +1,5 @@ # msvc-nothrow.m4 serial 1 -dnl Copyright (C) 2011-2019 Free Software Foundation, Inc. +dnl Copyright (C) 2011-2020 Free Software Foundation, Inc. dnl This file is free software; the Free Software Foundation dnl gives unlimited permission to copy and/or distribute it, dnl with or without modifications, as long as this notice is preserved. diff --git a/m4/multiarch.m4 b/m4/multiarch.m4 index d48316e..2c61afb 100644 --- a/m4/multiarch.m4 +++ b/m4/multiarch.m4 @@ -1,5 +1,5 @@ -# multiarch.m4 serial 7 -dnl Copyright (C) 2008-2019 Free Software Foundation, Inc. +# multiarch.m4 serial 9 +dnl Copyright (C) 2008-2020 Free Software Foundation, Inc. dnl This file is free software; the Free Software Foundation dnl gives unlimited permission to copy and/or distribute it, dnl with or without modifications, as long as this notice is preserved. @@ -21,37 +21,40 @@ dnl with or without modifications, as long as this notice is preserved. AC_DEFUN_ONCE([gl_MULTIARCH], [ dnl Code similar to autoconf-2.63 AC_C_BIGENDIAN. - gl_cv_c_multiarch=no - AC_COMPILE_IFELSE( - [AC_LANG_SOURCE( - [[#ifndef __APPLE_CC__ - not a universal capable compiler - #endif - typedef int dummy; - ]])], - [ - dnl Check for potential -arch flags. It is not universal unless - dnl there are at least two -arch flags with different values. - arch= - prev= - for word in ${CC} ${CFLAGS} ${CPPFLAGS} ${LDFLAGS}; do - if test -n "$prev"; then - case $word in - i?86 | x86_64 | ppc | ppc64) - if test -z "$arch" || test "$arch" = "$word"; then - arch="$word" - else - gl_cv_c_multiarch=yes - fi - ;; - esac - prev= - else - if test "x$word" = "x-arch"; then - prev=arch - fi - fi - done + AC_CACHE_CHECK([whether the compiler produces multi-arch binaries], + [gl_cv_c_multiarch], + [gl_cv_c_multiarch=no + AC_COMPILE_IFELSE( + [AC_LANG_SOURCE( + [[#ifndef __APPLE_CC__ + not a universal capable compiler + #endif + typedef int dummy; + ]])], + [ + dnl Check for potential -arch flags. It is not universal unless + dnl there are at least two -arch flags with different values. + arch= + prev= + for word in ${CC} ${CFLAGS} ${CPPFLAGS} ${LDFLAGS}; do + if test -n "$prev"; then + case $word in + i?86 | x86_64 | ppc | ppc64 | arm | arm64) + if test -z "$arch" || test "$arch" = "$word"; then + arch="$word" + else + gl_cv_c_multiarch=yes + fi + ;; + esac + prev= + else + if test "x$word" = "x-arch"; then + prev=arch + fi + fi + done + ]) ]) if test $gl_cv_c_multiarch = yes; then APPLE_UNIVERSAL_BUILD=1 diff --git a/m4/musl.m4 b/m4/musl.m4 new file mode 100644 index 0000000..d552cd7 --- /dev/null +++ b/m4/musl.m4 @@ -0,0 +1,18 @@ +# musl.m4 serial 3 +dnl Copyright (C) 2019-2020 Free Software Foundation, Inc. +dnl This file is free software; the Free Software Foundation +dnl gives unlimited permission to copy and/or distribute it, +dnl with or without modifications, as long as this notice is preserved. + +# Test for musl libc, despite the musl libc authors don't like it +# +# . +# From Bruno Haible. + +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.]) ;; + esac +]) diff --git a/m4/nanosleep.m4 b/m4/nanosleep.m4 index 971aae3..1fb13ed 100644 --- a/m4/nanosleep.m4 +++ b/m4/nanosleep.m4 @@ -1,11 +1,11 @@ -# serial 38 +# serial 39 dnl From Jim Meyering. dnl Check for the nanosleep function. dnl If not found, use the supplied replacement. dnl -# Copyright (C) 1999-2001, 2003-2019 Free Software Foundation, Inc. +# Copyright (C) 1999-2001, 2003-2020 Free Software Foundation, Inc. # This file is free software; the Free Software Foundation # gives unlimited permission to copy and/or distribute it, @@ -119,8 +119,8 @@ AC_DEFUN([gl_FUNC_NANOSLEEP], gl_cv_func_nanosleep='guessing no (mishandles large arguments)' ;; mingw*) # Guess no on native Windows. gl_cv_func_nanosleep='guessing no' ;; - *) # If we don't know, assume the worst. - gl_cv_func_nanosleep='guessing no' ;; + *) # If we don't know, obey --enable-cross-guesses. + gl_cv_func_nanosleep="$gl_cross_guess_normal" ;; esac ]) ]) diff --git a/m4/netinet_in_h.m4 b/m4/netinet_in_h.m4 index 0f96cae..df9f383 100644 --- a/m4/netinet_in_h.m4 +++ b/m4/netinet_in_h.m4 @@ -1,5 +1,5 @@ # netinet_in_h.m4 serial 5 -dnl Copyright (C) 2006-2019 Free Software Foundation, Inc. +dnl Copyright (C) 2006-2020 Free Software Foundation, Inc. dnl This file is free software; the Free Software Foundation dnl gives unlimited permission to copy and/or distribute it, dnl with or without modifications, as long as this notice is preserved. diff --git a/m4/nl_langinfo.m4 b/m4/nl_langinfo.m4 index 66eee41..342afd2 100644 --- a/m4/nl_langinfo.m4 +++ b/m4/nl_langinfo.m4 @@ -1,5 +1,5 @@ -# nl_langinfo.m4 serial 6 -dnl Copyright (C) 2009-2019 Free Software Foundation, Inc. +# nl_langinfo.m4 serial 8 +dnl Copyright (C) 2009-2020 Free Software Foundation, Inc. dnl This file is free software; the Free Software Foundation dnl gives unlimited permission to copy and/or distribute it, dnl with or without modifications, as long as this notice is preserved. @@ -9,7 +9,10 @@ AC_DEFUN([gl_FUNC_NL_LANGINFO], AC_REQUIRE([gl_LANGINFO_H_DEFAULTS]) AC_REQUIRE([gl_LANGINFO_H]) AC_CHECK_FUNCS_ONCE([nl_langinfo]) - AC_REQUIRE([AC_CANONICAL_HOST]) dnl for cross-compiles + AC_REQUIRE([AC_CANONICAL_HOST]) + AC_REQUIRE([gl_FUNC_SETLOCALE_NULL]) + AC_REQUIRE([gl_PTHREADLIB]) + AC_CHECK_HEADERS_ONCE([threads.h]) if test $ac_cv_func_nl_langinfo = yes; then # On Irix 6.5, YESEXPR is defined, but nl_langinfo(YESEXPR) is broken. AC_CACHE_CHECK([whether YESEXPR works], @@ -36,11 +39,19 @@ AC_DEFUN([gl_FUNC_NL_LANGINFO], AC_DEFINE_UNQUOTED([FUNC_NL_LANGINFO_YESEXPR_WORKS], [$FUNC_NL_LANGINFO_YESEXPR_WORKS], [Define to 1 if nl_langinfo (YESEXPR) returns a non-empty string.]) + # On Solaris 10 and Solaris 11.3, nl_langinfo is not multithread-safe. + case "$host_os" in + solaris*) NL_LANGINFO_MTSAFE=0 ;; + *) NL_LANGINFO_MTSAFE=1 ;; + esac + AC_DEFINE_UNQUOTED([NL_LANGINFO_MTSAFE], [$NL_LANGINFO_MTSAFE], + [Define to 1 if nl_langinfo is multithread-safe.]) if test $HAVE_LANGINFO_CODESET = 1 \ && test $HAVE_LANGINFO_T_FMT_AMPM = 1 \ && test $HAVE_LANGINFO_ALTMON = 1 \ && test $HAVE_LANGINFO_ERA = 1 \ - && test $FUNC_NL_LANGINFO_YESEXPR_WORKS = 1; then + && test $FUNC_NL_LANGINFO_YESEXPR_WORKS = 1 \ + && test $NL_LANGINFO_MTSAFE = 1; then : else REPLACE_NL_LANGINFO=1 @@ -50,4 +61,17 @@ AC_DEFUN([gl_FUNC_NL_LANGINFO], else HAVE_NL_LANGINFO=0 fi + if test $HAVE_NL_LANGINFO = 0 || test $HAVE_LANGINFO_CODESET = 0; then + LIB_NL_LANGINFO="$LIB_SETLOCALE_NULL" + else + LIB_NL_LANGINFO= + fi + dnl LIB_NL_LANGINFO is expected to be empty everywhere. + AC_SUBST([LIB_NL_LANGINFO]) +]) + +# Prerequisites of lib/nl_langinfo-lock.c. +AC_DEFUN([gl_PREREQ_NL_LANGINFO_LOCK], +[ + gl_VISIBILITY ]) diff --git a/m4/nocrash.m4 b/m4/nocrash.m4 index 4d9f022..637a0ea 100644 --- a/m4/nocrash.m4 +++ b/m4/nocrash.m4 @@ -1,5 +1,5 @@ # nocrash.m4 serial 5 -dnl Copyright (C) 2005, 2009-2019 Free Software Foundation, Inc. +dnl Copyright (C) 2005, 2009-2020 Free Software Foundation, Inc. dnl This file is free software; the Free Software Foundation dnl gives unlimited permission to copy and/or distribute it, dnl with or without modifications, as long as this notice is preserved. @@ -53,7 +53,7 @@ nocrash_init (void) /* Allocate a port on which the thread shall listen for exceptions. */ if (mach_port_allocate (self, MACH_PORT_RIGHT_RECEIVE, &our_exception_port) == KERN_SUCCESS) { - /* See http://web.mit.edu/darwin/src/modules/xnu/osfmk/man/mach_port_insert_right.html. */ + /* See https://web.mit.edu/darwin/src/modules/xnu/osfmk/man/mach_port_insert_right.html. */ if (mach_port_insert_right (self, our_exception_port, our_exception_port, MACH_MSG_TYPE_MAKE_SEND) == KERN_SUCCESS) { @@ -72,7 +72,7 @@ nocrash_init (void) for a particular thread. This has the effect that when our exception port gets the message, the thread specific exception port has already been asked, and we don't need to bother about it. - See http://web.mit.edu/darwin/src/modules/xnu/osfmk/man/task_set_exception_ports.html. */ + See https://web.mit.edu/darwin/src/modules/xnu/osfmk/man/task_set_exception_ports.html. */ task_set_exception_ports (self, mask, our_exception_port, EXCEPTION_DEFAULT, MACHINE_THREAD_STATE); } diff --git a/m4/o-direct.m4 b/m4/o-direct.m4 index 3999fba..264fb45 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 Free Software Foundation, Inc. +# Copyright (C) 2007-2014, 2019-2021 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 711a2d4..6e19af8 100644 --- a/m4/off_t.m4 +++ b/m4/off_t.m4 @@ -1,5 +1,5 @@ # off_t.m4 serial 1 -dnl Copyright (C) 2012-2019 Free Software Foundation, Inc. +dnl Copyright (C) 2012-2020 Free Software Foundation, Inc. dnl This file is free software; the Free Software Foundation dnl gives unlimited permission to copy and/or distribute it, dnl with or without modifications, as long as this notice is preserved. diff --git a/m4/open-cloexec.m4 b/m4/open-cloexec.m4 index 52498d9..11652d5 100644 --- a/m4/open-cloexec.m4 +++ b/m4/open-cloexec.m4 @@ -1,6 +1,6 @@ # Test whether O_CLOEXEC is defined. -dnl Copyright 2017-2019 Free Software Foundation, Inc. +dnl Copyright 2017-2020 Free Software Foundation, Inc. dnl This file is free software; the Free Software Foundation dnl gives unlimited permission to copy and/or distribute it, dnl with or without modifications, as long as this notice is preserved. diff --git a/m4/open-slash.m4 b/m4/open-slash.m4 new file mode 100644 index 0000000..5d84f2b --- /dev/null +++ b/m4/open-slash.m4 @@ -0,0 +1,60 @@ +# open-slash.m4 serial 2 +dnl Copyright (C) 2007-2020 Free Software Foundation, Inc. +dnl This file is free software; the Free Software Foundation +dnl gives unlimited permission to copy and/or distribute it, +dnl with or without modifications, as long as this notice is preserved. + +dnl Tests whether open() and creat() recognize a trailing slash. +dnl Sets gl_cv_func_open_slash. +AC_DEFUN([gl_OPEN_TRAILING_SLASH_BUG], +[ + AC_REQUIRE([AC_CANONICAL_HOST]) dnl for cross-compiles + dnl open("foo/") should not create a file when the file name has a + dnl trailing slash. FreeBSD only has the problem on symlinks. + AC_CHECK_FUNCS_ONCE([lstat]) + AC_CACHE_CHECK([whether open recognizes a trailing slash], + [gl_cv_func_open_slash], + [# Assume that if we have lstat, we can also check symlinks. + if test $ac_cv_func_lstat = yes; then + touch conftest.tmp + ln -s conftest.tmp conftest.lnk + fi + AC_RUN_IFELSE( + [AC_LANG_SOURCE([[ +#include +#if HAVE_UNISTD_H +# include +#endif +]GL_MDA_DEFINES[ +int main () +{ + int result = 0; +#if HAVE_LSTAT + if (open ("conftest.lnk/", O_RDONLY) != -1) + result |= 1; +#endif + if (open ("conftest.sl/", O_CREAT, 0600) >= 0) + result |= 2; + return result; +}]])], + [gl_cv_func_open_slash=yes], + [gl_cv_func_open_slash=no], + [ +changequote(,)dnl + case "$host_os" in + freebsd* | aix* | hpux* | solaris2.[0-9] | solaris2.[0-9].*) + gl_cv_func_open_slash="guessing no" ;; + *) + gl_cv_func_open_slash="guessing yes" ;; + esac +changequote([,])dnl + ]) + rm -f conftest.sl conftest.tmp conftest.lnk + ]) + case "$gl_cv_func_open_slash" in + *no) + AC_DEFINE([OPEN_TRAILING_SLASH_BUG], [1], + [Define to 1 if open() fails to recognize a trailing slash.]) + ;; + esac +]) diff --git a/m4/open.m4 b/m4/open.m4 index 5d73f4d..552eedf 100644 --- a/m4/open.m4 +++ b/m4/open.m4 @@ -1,5 +1,5 @@ # open.m4 serial 15 -dnl Copyright (C) 2007-2019 Free Software Foundation, Inc. +dnl Copyright (C) 2007-2020 Free Software Foundation, Inc. dnl This file is free software; the Free Software Foundation dnl gives unlimited permission to copy and/or distribute it, dnl with or without modifications, as long as this notice is preserved. @@ -19,48 +19,9 @@ AC_DEFUN([gl_FUNC_OPEN], if test "$gl_cv_macro_O_CLOEXEC" != yes; then REPLACE_OPEN=1 fi - AC_CACHE_CHECK([whether open recognizes a trailing slash], - [gl_cv_func_open_slash], - [# Assume that if we have lstat, we can also check symlinks. - if test $ac_cv_func_lstat = yes; then - touch conftest.tmp - ln -s conftest.tmp conftest.lnk - fi - AC_RUN_IFELSE( - [AC_LANG_SOURCE([[ -#include -#if HAVE_UNISTD_H -# include -#endif -int main () -{ - int result = 0; -#if HAVE_LSTAT - if (open ("conftest.lnk/", O_RDONLY) != -1) - result |= 1; -#endif - if (open ("conftest.sl/", O_CREAT, 0600) >= 0) - result |= 2; - return result; -}]])], - [gl_cv_func_open_slash=yes], - [gl_cv_func_open_slash=no], - [ -changequote(,)dnl - case "$host_os" in - freebsd* | aix* | hpux* | solaris2.[0-9] | solaris2.[0-9].*) - gl_cv_func_open_slash="guessing no" ;; - *) - gl_cv_func_open_slash="guessing yes" ;; - esac -changequote([,])dnl - ]) - rm -f conftest.sl conftest.tmp conftest.lnk - ]) + gl_OPEN_TRAILING_SLASH_BUG case "$gl_cv_func_open_slash" in *no) - AC_DEFINE([OPEN_TRAILING_SLASH_BUG], [1], - [Define to 1 if open() fails to recognize a trailing slash.]) REPLACE_OPEN=1 ;; esac diff --git a/m4/pathmax.m4 b/m4/pathmax.m4 index 0770aca..bb4fdeb 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-2019 Free Software Foundation, +dnl Copyright (C) 2002-2003, 2005-2006, 2009-2020 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 08e2db1..6a36408 100644 --- a/m4/perror.m4 +++ b/m4/perror.m4 @@ -1,5 +1,5 @@ -# perror.m4 serial 8 -dnl Copyright (C) 2008-2019 Free Software Foundation, Inc. +# perror.m4 serial 9 +dnl Copyright (C) 2008-2020 Free Software Foundation, Inc. dnl This file is free software; the Free Software Foundation dnl gives unlimited permission to copy and/or distribute it, dnl with or without modifications, as long as this notice is preserved. @@ -52,8 +52,8 @@ AC_DEFUN([gl_FUNC_PERROR], *-musl*) gl_cv_func_perror_works="guessing yes" ;; # Guess yes on native Windows. mingw*) gl_cv_func_perror_works="guessing yes" ;; - # Otherwise guess no. - *) gl_cv_func_perror_works="guessing no" ;; + # Otherwise obey --enable-cross-guesses. + *) gl_cv_func_perror_works="$gl_cross_guess_normal" ;; esac ]) ]) diff --git a/m4/pid_t.m4 b/m4/pid_t.m4 new file mode 100644 index 0000000..3eb7916 --- /dev/null +++ b/m4/pid_t.m4 @@ -0,0 +1,38 @@ +# pid_t.m4 serial 3 +dnl Copyright (C) 2020 Free Software Foundation, Inc. +dnl This file is free software; the Free Software Foundation +dnl gives unlimited permission to copy and/or distribute it, +dnl with or without modifications, as long as this notice is preserved. + +# The following implementation works around a problem in autoconf <= 2.69. +m4_version_prereq([2.69c], [] ,[ + +dnl Define pid_t if the headers don't define it. +AC_DEFUN([AC_TYPE_PID_T], +[ + AC_CHECK_TYPE([pid_t], + [], + [dnl On 64-bit native Windows, define it to the equivalent of 'intptr_t' + dnl (= 'long long' = '__int64'), because that is the return type + dnl of the _spawnv* functions + dnl + dnl and the argument type of the _cwait function + dnl . + dnl Otherwise (on 32-bit Windows and on old Unix platforms), define it + dnl to 'int'. + AC_COMPILE_IFELSE( + [AC_LANG_PROGRAM([[ + #if defined _WIN64 && !defined __CYGWIN__ + LLP64 + #endif + ]]) + ], + [gl_pid_type='int'], + [gl_pid_type='__int64']) + AC_DEFINE_UNQUOTED([pid_t], [$gl_pid_type], + [Define as a signed integer type capable of holding a process identifier.]) + ], + [AC_INCLUDES_DEFAULT]) +]) + +])# m4_version_prereq 2.70 diff --git a/m4/pipe.m4 b/m4/pipe.m4 index 199cfef..6b1fa2f 100644 --- a/m4/pipe.m4 +++ b/m4/pipe.m4 @@ -1,5 +1,5 @@ # pipe.m4 serial 2 -dnl Copyright (C) 2010-2019 Free Software Foundation, Inc. +dnl Copyright (C) 2010-2020 Free Software Foundation, Inc. dnl This file is free software; the Free Software Foundation dnl gives unlimited permission to copy and/or distribute it, dnl with or without modifications, as long as this notice is preserved. diff --git a/m4/priv-set.m4 b/m4/priv-set.m4 index 258dc43..b74c9ae 100644 --- a/m4/priv-set.m4 +++ b/m4/priv-set.m4 @@ -1,6 +1,6 @@ # serial 8 -# Copyright (C) 2009-2019 Free Software Foundation, Inc. +# Copyright (C) 2009-2020 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/pthread-thread.m4 b/m4/pthread-thread.m4 index eef29c9..5a95995 100644 --- a/m4/pthread-thread.m4 +++ b/m4/pthread-thread.m4 @@ -1,5 +1,5 @@ -# pthread-thread.m4 serial 1 -dnl Copyright (C) 2019 Free Software Foundation, Inc. +# pthread-thread.m4 serial 2 +dnl Copyright (C) 2019-2020 Free Software Foundation, Inc. dnl This file is free software; the Free Software Foundation dnl gives unlimited permission to copy and/or distribute it, dnl with or without modifications, as long as this notice is preserved. @@ -41,7 +41,7 @@ AC_DEFUN([gl_PTHREAD_THREAD], AC_CACHE_CHECK([whether pthread_create exists as a global function], [gl_cv_func_pthread_create], [saved_LIBS="$LIBS" - LIBS="$LIBS $LIBMULTITHREAD" + LIBS="$LIBS $LIBPMULTITHREAD" AC_LINK_IFELSE( [AC_LANG_SOURCE( [[extern diff --git a/m4/pthread_h.m4 b/m4/pthread_h.m4 index 8c23a77..5b5e7ba 100644 --- a/m4/pthread_h.m4 +++ b/m4/pthread_h.m4 @@ -1,5 +1,5 @@ -# pthread_h.m4 serial 4 -dnl Copyright (C) 2009-2019 Free Software Foundation, Inc. +# pthread_h.m4 serial 5 +dnl Copyright (C) 2009-2020 Free Software Foundation, Inc. dnl This file is free software; the Free Software Foundation dnl gives unlimited permission to copy and/or distribute it, dnl with or without modifications, as long as this notice is preserved. @@ -10,13 +10,21 @@ AC_DEFUN([gl_PTHREAD_H], dnl once only, before all statements that occur in other macros. AC_REQUIRE([gl_PTHREAD_H_DEFAULTS]) - AC_REQUIRE([gl_THREADLIB]) + AC_REQUIRE([AC_CANONICAL_HOST]) + AC_REQUIRE([gl_PTHREADLIB]) gl_CHECK_NEXT_HEADERS([pthread.h]) - dnl On mingw, if --enable-threads=windows or gl_AVOID_WINPTHREAD is used, - dnl ignore the from the mingw-w64 winpthreads library. - if test $ac_cv_header_pthread_h = yes && test $gl_threads_api != windows; then + if test $ac_cv_header_pthread_h = yes; then HAVE_PTHREAD_H=1 + dnl On mingw, if --enable-threads=windows or gl_AVOID_WINPTHREAD is used, + dnl ignore the from the mingw-w64 winpthreads library. + m4_ifdef([gl_][THREADLIB], [ + AC_REQUIRE([gl_][THREADLIB]) + if { case "$host_os" in mingw*) true;; *) false;; esac; } \ + && test $gl_threads_api = windows; then + HAVE_PTHREAD_H=0 + fi + ]) else HAVE_PTHREAD_H=0 fi @@ -125,7 +133,7 @@ AC_DEFUN([gl_PTHREAD_H], AC_REQUIRE([AC_C_RESTRICT]) dnl For backward compatibility with gnulib versions <= 2019-07. - LIB_PTHREAD="$LIBMULTITHREAD" + LIB_PTHREAD="$LIBPMULTITHREAD" AC_SUBST([LIB_PTHREAD]) ]) diff --git a/m4/pthread_rwlock_rdlock.m4 b/m4/pthread_rwlock_rdlock.m4 index 3c1d645..049af50 100644 --- a/m4/pthread_rwlock_rdlock.m4 +++ b/m4/pthread_rwlock_rdlock.m4 @@ -1,5 +1,5 @@ -# pthread_rwlock_rdlock.m4 serial 2 -dnl Copyright (C) 2017-2019 Free Software Foundation, Inc. +# pthread_rwlock_rdlock.m4 serial 4 +dnl Copyright (C) 2017-2020 Free Software Foundation, Inc. dnl This file is free software; the Free Software Foundation dnl gives unlimited permission to copy and/or distribute it, dnl with or without modifications, as long as this notice is preserved. @@ -26,14 +26,16 @@ dnl dnl POSIX:2017 makes this requirement only for implementations that support TPS dnl (Thread Priority Scheduling) and only for the scheduling policies SCHED_FIFO dnl and SCHED_RR, see -dnl http://pubs.opengroup.org/onlinepubs/9699919799/functions/pthread_rwlock_rdlock.html +dnl https://pubs.opengroup.org/onlinepubs/9699919799/functions/pthread_rwlock_rdlock.html dnl but this test verifies the guarantee regardless of TPS and regardless of dnl scheduling policy. -dnl Glibc currently does not provide this guarantee, see +dnl Glibc does not provide this guarantee (and never will on Linux), see dnl https://sourceware.org/bugzilla/show_bug.cgi?id=13701 +dnl https://bugzilla.redhat.com/show_bug.cgi?id=1410052 AC_DEFUN([gl_PTHREAD_RWLOCK_RDLOCK_PREFER_WRITER], [ AC_REQUIRE([gl_THREADLIB_EARLY]) + AC_REQUIRE([AC_CANONICAL_HOST]) dnl for cross-compiles AC_CACHE_CHECK([whether pthread_rwlock_rdlock prefers a writer to a reader], [gl_cv_pthread_rwlock_rdlock_prefer_writer], [save_LIBS="$LIBS" @@ -153,7 +155,25 @@ main () ]])], [gl_cv_pthread_rwlock_rdlock_prefer_writer=yes], [gl_cv_pthread_rwlock_rdlock_prefer_writer=no], - [gl_cv_pthread_rwlock_rdlock_prefer_writer="guessing yes"]) + [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" ;; + esac + ]) LIBS="$save_LIBS" ]) case "$gl_cv_pthread_rwlock_rdlock_prefer_writer" in diff --git a/m4/pthread_sigmask.m4 b/m4/pthread_sigmask.m4 index d788cf6..030862d 100644 --- a/m4/pthread_sigmask.m4 +++ b/m4/pthread_sigmask.m4 @@ -1,5 +1,5 @@ -# pthread_sigmask.m4 serial 18 -dnl Copyright (C) 2011-2019 Free Software Foundation, Inc. +# pthread_sigmask.m4 serial 19 +dnl Copyright (C) 2011-2020 Free Software Foundation, Inc. dnl This file is free software; the Free Software Foundation dnl gives unlimited permission to copy and/or distribute it, dnl with or without modifications, as long as this notice is preserved. @@ -220,6 +220,7 @@ int main () #include #include #include +]GL_MDA_DEFINES[ static volatile int sigint_occurred; static void sigint_handler (int sig) diff --git a/m4/putenv.m4 b/m4/putenv.m4 index 342ba26..3799fb5 100644 --- a/m4/putenv.m4 +++ b/m4/putenv.m4 @@ -1,5 +1,5 @@ -# putenv.m4 serial 23 -dnl Copyright (C) 2002-2019 Free Software Foundation, Inc. +# putenv.m4 serial 25 +dnl Copyright (C) 2002-2020 Free Software Foundation, Inc. dnl This file is free software; the Free Software Foundation dnl gives unlimited permission to copy and/or distribute it, dnl with or without modifications, as long as this notice is preserved. @@ -14,37 +14,41 @@ AC_DEFUN([gl_FUNC_PUTENV], AC_REQUIRE([gl_STDLIB_H_DEFAULTS]) AC_REQUIRE([AC_CANONICAL_HOST]) dnl for cross-compiles AC_CACHE_CHECK([for putenv compatible with GNU and SVID], - [gl_cv_func_svid_putenv], - [AC_RUN_IFELSE([AC_LANG_PROGRAM([AC_INCLUDES_DEFAULT],[[ - /* Put it in env. */ - if (putenv ("CONFTEST_putenv=val")) - return 1; + [gl_cv_func_svid_putenv], + [AC_RUN_IFELSE( + [AC_LANG_PROGRAM( + [AC_INCLUDES_DEFAULT + GL_MDA_DEFINES], + [[ + /* Put it in env. */ + if (putenv ("CONFTEST_putenv=val")) + return 1; - /* Try to remove it. */ - if (putenv ("CONFTEST_putenv")) - return 2; + /* Try to remove it. */ + if (putenv ("CONFTEST_putenv")) + return 2; - /* Make sure it was deleted. */ - if (getenv ("CONFTEST_putenv") != 0) - return 3; + /* Make sure it was deleted. */ + if (getenv ("CONFTEST_putenv") != 0) + return 3; - return 0; - ]])], - gl_cv_func_svid_putenv=yes, - 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, assume the worst. - *) gl_cv_func_svid_putenv="guessing no" ;; - esac - ]) - ]) + return 0; + ]])], + [gl_cv_func_svid_putenv=yes], + [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" ;; + esac + ]) + ]) case "$gl_cv_func_svid_putenv" in *yes) ;; *) diff --git a/m4/quote.m4 b/m4/quote.m4 index feaa735..9efab95 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-2019 Free Software Foundation, +dnl Copyright (C) 2002-2003, 2005-2006, 2009-2020 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 c478f50..4038711 100644 --- a/m4/quotearg.m4 +++ b/m4/quotearg.m4 @@ -1,10 +1,11 @@ -# quotearg.m4 serial 9 -dnl Copyright (C) 2002, 2004-2019 Free Software Foundation, Inc. +# quotearg.m4 serial 10 +dnl Copyright (C) 2002, 2004-2020 Free Software Foundation, Inc. dnl This file is free software; the Free Software Foundation dnl gives unlimited permission to copy and/or distribute it, dnl with or without modifications, as long as this notice is preserved. AC_DEFUN([gl_QUOTEARG], [ + AC_REQUIRE([AC_C_RESTRICT]) : ]) diff --git a/m4/raise.m4 b/m4/raise.m4 index f7661e6..5b61b65 100644 --- a/m4/raise.m4 +++ b/m4/raise.m4 @@ -1,5 +1,5 @@ # raise.m4 serial 4 -dnl Copyright (C) 2011-2019 Free Software Foundation, Inc. +dnl Copyright (C) 2011-2020 Free Software Foundation, Inc. dnl This file is free software; the Free Software Foundation dnl gives unlimited permission to copy and/or distribute it, dnl with or without modifications, as long as this notice is preserved. diff --git a/m4/read.m4 b/m4/read.m4 index b1e77d2..5ba775f 100644 --- a/m4/read.m4 +++ b/m4/read.m4 @@ -1,5 +1,5 @@ # read.m4 serial 5 -dnl Copyright (C) 2011-2019 Free Software Foundation, Inc. +dnl Copyright (C) 2011-2020 Free Software Foundation, Inc. dnl This file is free software; the Free Software Foundation dnl gives unlimited permission to copy and/or distribute it, dnl with or without modifications, as long as this notice is preserved. diff --git a/m4/readlink.m4 b/m4/readlink.m4 index 2d76815..9aa9e46 100644 --- a/m4/readlink.m4 +++ b/m4/readlink.m4 @@ -1,5 +1,5 @@ -# readlink.m4 serial 14 -dnl Copyright (C) 2003, 2007, 2009-2019 Free Software Foundation, Inc. +# readlink.m4 serial 15 +dnl Copyright (C) 2003, 2007, 2009-2020 Free Software Foundation, Inc. dnl This file is free software; the Free Software Foundation dnl gives unlimited permission to copy and/or distribute it, dnl with or without modifications, as long as this notice is preserved. @@ -38,8 +38,8 @@ AC_DEFUN([gl_FUNC_READLINK], linux-* | linux) gl_cv_func_readlink_works="guessing yes" ;; # Guess yes on glibc systems. *-gnu* | gnu*) gl_cv_func_readlink_works="guessing yes" ;; - # If we don't know, assume the worst. - *) gl_cv_func_readlink_works="guessing no" ;; + # If we don't know, obey --enable-cross-guesses. + *) gl_cv_func_readlink_works="$gl_cross_guess_normal" ;; esac ]) rm -f conftest.link conftest.lnk2]) diff --git a/m4/realloc.m4 b/m4/realloc.m4 index 93066e8..53967f4 100644 --- a/m4/realloc.m4 +++ b/m4/realloc.m4 @@ -1,27 +1,19 @@ -# realloc.m4 serial 17 -dnl Copyright (C) 2007, 2009-2019 Free Software Foundation, Inc. +# realloc.m4 serial 19 +dnl Copyright (C) 2007, 2009-2020 Free Software Foundation, Inc. dnl This file is free software; the Free Software Foundation dnl gives unlimited permission to copy and/or distribute it, dnl with or without modifications, as long as this notice is preserved. -m4_version_prereq([2.70], [] ,[ - # This is adapted with modifications from upstream Autoconf here: # https://git.savannah.gnu.org/cgit/autoconf.git/commit/?id=04be2b7a29d65d9a08e64e8e56e594c91749598c AC_DEFUN([_AC_FUNC_REALLOC_IF], [ - AC_REQUIRE([AC_HEADER_STDC])dnl AC_REQUIRE([AC_CANONICAL_HOST])dnl for cross-compiles - AC_CHECK_HEADERS([stdlib.h]) AC_CACHE_CHECK([for GNU libc compatible realloc], [ac_cv_func_realloc_0_nonnull], [AC_RUN_IFELSE( [AC_LANG_PROGRAM( - [[#if defined STDC_HEADERS || defined HAVE_STDLIB_H - # include - #else - char *realloc (); - #endif + [[#include ]], [[char *p = realloc (0, 0); int result = !p; @@ -35,8 +27,8 @@ AC_DEFUN([_AC_FUNC_REALLOC_IF], *-gnu* | gnu* | *-musl* | freebsd* | netbsd* | openbsd* \ | hpux* | solaris* | cygwin* | mingw*) ac_cv_func_realloc_0_nonnull="guessing yes" ;; - # If we don't know, assume the worst. - *) ac_cv_func_realloc_0_nonnull="guessing no" ;; + # If we don't know, obey --enable-cross-guesses. + *) ac_cv_func_realloc_0_nonnull="$gl_cross_guess_normal" ;; esac ]) ]) @@ -50,8 +42,6 @@ AC_DEFUN([_AC_FUNC_REALLOC_IF], esac ])# AC_FUNC_REALLOC -]) - # gl_FUNC_REALLOC_GNU # ------------------- # Test whether 'realloc (0, 0)' is handled like in GNU libc, and replace diff --git a/m4/regex.m4 b/m4/regex.m4 index 35119c5..e723f59 100644 --- a/m4/regex.m4 +++ b/m4/regex.m4 @@ -1,6 +1,6 @@ -# serial 68 +# serial 70 -# Copyright (C) 1996-2001, 2003-2019 Free Software Foundation, Inc. +# Copyright (C) 1996-2001, 2003-2020 Free Software Foundation, Inc. # # This file is free software; the Free Software Foundation # gives unlimited permission to copy and/or distribute it, @@ -90,11 +90,14 @@ AC_DEFUN([gl_REGEX], s = re_compile_pattern (pat, sizeof pat - 1, ®ex); if (s) result |= 1; - else if (re_search (®ex, data, sizeof data - 1, - 0, sizeof data - 1, ®s) - != -1) - result |= 1; - regfree (®ex); + else + { + if (re_search (®ex, data, sizeof data - 1, + 0, sizeof data - 1, ®s) + != -1) + result |= 1; + regfree (®ex); + } } { @@ -125,8 +128,8 @@ AC_DEFUN([gl_REGEX], 0, sizeof data - 1, 0); if (i != 0 && i != 21) result |= 1; + regfree (®ex); } - regfree (®ex); } if (! setlocale (LC_ALL, "C")) @@ -139,9 +142,13 @@ AC_DEFUN([gl_REGEX], s = re_compile_pattern ("a[^x]b", 6, ®ex); if (s) result |= 2; - /* This should fail, but succeeds for glibc-2.5. */ - else if (re_search (®ex, "a\nb", 3, 0, 3, ®s) != -1) - result |= 2; + else + { + /* This should fail, but succeeds for glibc-2.5. */ + if (re_search (®ex, "a\nb", 3, 0, 3, ®s) != -1) + result |= 2; + regfree (®ex); + } /* This regular expression is from Spencer ere test number 75 in grep-2.3. */ @@ -153,7 +160,10 @@ AC_DEFUN([gl_REGEX], s = re_compile_pattern ("a[[:@:>@:]]b\n", 11, ®ex); /* This should fail with _Invalid character class name_ error. */ if (!s) - result |= 4; + { + result |= 4; + regfree (®ex); + } /* Ensure that [b-a] is diagnosed as invalid, when using RE_NO_EMPTY_RANGES. */ @@ -161,13 +171,18 @@ AC_DEFUN([gl_REGEX], memset (®ex, 0, sizeof regex); s = re_compile_pattern ("a[b-a]", 6, ®ex); if (s == 0) - result |= 8; + { + result |= 8; + regfree (®ex); + } /* This should succeed, but does not for glibc-2.1.3. */ memset (®ex, 0, sizeof regex); s = re_compile_pattern ("{1", 2, ®ex); if (s) result |= 8; + else + regfree (®ex); /* The following example is derived from a problem report against gawk from Jorge Stolfi . */ @@ -175,17 +190,35 @@ AC_DEFUN([gl_REGEX], s = re_compile_pattern ("[an\371]*n", 7, ®ex); if (s) result |= 8; - /* This should match, but does not for glibc-2.2.1. */ - else if (re_match (®ex, "an", 2, 0, ®s) != 2) - result |= 8; + else + { + /* This should match, but does not for glibc-2.2.1. */ + if (re_match (®ex, "an", 2, 0, ®s) != 2) + result |= 8; + else + { + free (regs.start); + free (regs.end); + } + regfree (®ex); + } memset (®ex, 0, sizeof regex); s = re_compile_pattern ("x", 1, ®ex); if (s) result |= 8; - /* glibc-2.2.93 does not work with a negative RANGE argument. */ - else if (re_search (®ex, "wxy", 3, 2, -2, ®s) != 1) - result |= 8; + else + { + /* glibc-2.2.93 does not work with a negative RANGE argument. */ + if (re_search (®ex, "wxy", 3, 2, -2, ®s) != 1) + result |= 8; + else + { + free (regs.start); + free (regs.end); + } + regfree (®ex); + } /* The version of regex.c in older versions of gnulib ignored RE_ICASE. Detect that problem too. */ @@ -194,8 +227,17 @@ AC_DEFUN([gl_REGEX], s = re_compile_pattern ("x", 1, ®ex); if (s) result |= 16; - else if (re_search (®ex, "WXY", 3, 0, 3, ®s) < 0) - result |= 16; + else + { + if (re_search (®ex, "WXY", 3, 0, 3, ®s) < 0) + result |= 16; + else + { + free (regs.start); + free (regs.end); + } + regfree (®ex); + } /* Catch a bug reported by Vin Shelton in https://lists.gnu.org/r/bug-coreutils/2007-06/msg00089.html @@ -207,6 +249,8 @@ AC_DEFUN([gl_REGEX], s = re_compile_pattern ("[[:alnum:]_-]\\\\+$", 16, ®ex); if (s) result |= 32; + else + regfree (®ex); /* REG_STARTEND was added to glibc on 2004-01-15. Reject older versions. */ @@ -221,8 +265,14 @@ AC_DEFUN([gl_REGEX], re_set_syntax (RE_SYNTAX_POSIX_EGREP); memset (®ex, 0, sizeof regex); s = re_compile_pattern ("0|()0|\\1|0", 10, ®ex); - if (!s || strcmp (s, "Invalid back reference")) + if (!s) result |= 64; + else + { + if (strcmp (s, "Invalid back reference")) + result |= 64; + regfree (®ex); + } #if 0 /* It would be nice to reject hosts whose regoff_t values are too @@ -243,8 +293,8 @@ AC_DEFUN([gl_REGEX], [case "$host_os" in # Guess no on native Windows. mingw*) gl_cv_func_re_compile_pattern_working="guessing no" ;; - # Otherwise, assume it is not working. - *) gl_cv_func_re_compile_pattern_working="guessing no" ;; + # Otherwise obey --enable-cross-guesses. + *) gl_cv_func_re_compile_pattern_working="$gl_cross_guess_normal" ;; esac ]) ]) diff --git a/m4/rpmatch.m4 b/m4/rpmatch.m4 index d10a005..0642058 100644 --- a/m4/rpmatch.m4 +++ b/m4/rpmatch.m4 @@ -1,5 +1,5 @@ # rpmatch.m4 serial 10 -dnl Copyright (C) 2002-2003, 2007-2019 Free Software Foundation, Inc. +dnl Copyright (C) 2002-2003, 2007-2020 Free Software Foundation, Inc. dnl This file is free software; the Free Software Foundation dnl gives unlimited permission to copy and/or distribute it, dnl with or without modifications, as long as this notice is preserved. diff --git a/m4/safe-read.m4 b/m4/safe-read.m4 index d133e05..5e2ca07 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-2019 Free Software Foundation, +dnl Copyright (C) 2002-2003, 2005-2006, 2009-2020 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 2cc814e..af0c43d 100644 --- a/m4/sched_h.m4 +++ b/m4/sched_h.m4 @@ -1,5 +1,5 @@ # sched_h.m4 serial 12 -dnl Copyright (C) 2008-2019 Free Software Foundation, Inc. +dnl Copyright (C) 2008-2020 Free Software Foundation, Inc. dnl This file is free software; the Free Software Foundation dnl gives unlimited permission to copy and/or distribute it, dnl with or without modifications, as long as this notice is preserved. diff --git a/m4/select.m4 b/m4/select.m4 index 531c817..90d2bb9 100644 --- a/m4/select.m4 +++ b/m4/select.m4 @@ -1,5 +1,5 @@ -# select.m4 serial 10 -dnl Copyright (C) 2009-2019 Free Software Foundation, Inc. +# select.m4 serial 12 +dnl Copyright (C) 2009-2020 Free Software Foundation, Inc. dnl This file is free software; the Free Software Foundation dnl gives unlimited permission to copy and/or distribute it, dnl with or without modifications, as long as this notice is preserved. @@ -60,7 +60,8 @@ changequote([,])dnl #endif #include #include -]],[[ +]GL_MDA_DEFINES], +[[ fd_set set; dup2(0, 16); FD_ZERO(&set); @@ -78,8 +79,8 @@ changequote([,])dnl linux-* | linux) 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, assume the worst. - *) gl_cv_func_select_detects_ebadf="guessing no" ;; + # If we don't know, obey --enable-cross-guesses. + *) gl_cv_func_select_detects_ebadf="$gl_cross_guess_normal" ;; esac ]) ]) diff --git a/m4/semaphore.m4 b/m4/semaphore.m4 new file mode 100644 index 0000000..ca20c76 --- /dev/null +++ b/m4/semaphore.m4 @@ -0,0 +1,45 @@ +# semaphore.m4 serial 1 +dnl Copyright (C) 2019-2020 Free Software Foundation, Inc. +dnl This file is free software; the Free Software Foundation +dnl gives unlimited permission to copy and/or distribute it, +dnl with or without modifications, as long as this notice is preserved. + +# Sets LIB_SEMAPHORE to the library needed, in addition to $(LIBMULTITHREAD), +# for getting the functions. + +AC_DEFUN([gl_SEMAPHORE], +[ + AC_REQUIRE([gl_THREADLIB]) + dnl sem_post is + dnl - in libc on macOS, FreeBSD, AIX, IRIX, Solaris 11, Haiku, Cygwin, + dnl - in libpthread on glibc systems, OpenBSD, + dnl - in libpthread or librt on NetBSD, + dnl - in librt on HP-UX 11, OSF/1, Solaris 10. + dnl On the platforms where -lpthread is needed, it is contained in + dnl $LIBMULTITHREAD. Therefore, the only library we need to test for is -lrt. + AC_CACHE_CHECK([for library needed for semaphore functions], + [gl_cv_semaphore_lib], + [save_LIBS="$LIBS" + LIBS="$LIBS $LIBMULTITHREAD" + AC_LINK_IFELSE( + [AC_LANG_PROGRAM( + [[#include ]], + [[sem_post ((sem_t *)0);]])], + [gl_cv_semaphore_lib=none], + [LIBS="$LIBS -lrt" + AC_LINK_IFELSE( + [AC_LANG_PROGRAM( + [[#include ]], + [[sem_post ((sem_t *)0);]])], + [gl_cv_semaphore_lib='-lrt'], + [gl_cv_semaphore_lib=none]) + ]) + LIBS="$save_LIBS" + ]) + if test "x$gl_cv_semaphore_lib" = xnone; then + LIB_SEMAPHORE= + else + LIB_SEMAPHORE="$gl_cv_semaphore_lib" + fi + AC_SUBST([LIB_SEMAPHORE]) +]) diff --git a/m4/setenv.m4 b/m4/setenv.m4 index a8f83d6..5dbf913 100644 --- a/m4/setenv.m4 +++ b/m4/setenv.m4 @@ -1,5 +1,5 @@ -# setenv.m4 serial 28 -dnl Copyright (C) 2001-2004, 2006-2019 Free Software Foundation, Inc. +# setenv.m4 serial 30 +dnl Copyright (C) 2001-2004, 2006-2020 Free Software Foundation, Inc. dnl This file is free software; the Free Software Foundation dnl gives unlimited permission to copy and/or distribute it, dnl with or without modifications, as long as this notice is preserved. @@ -39,8 +39,8 @@ AC_DEFUN([gl_FUNC_SETENV], *-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, assume the worst. - *) gl_cv_func_setenv_works="guessing no" ;; + # 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 @@ -106,35 +106,39 @@ int unsetenv (const char *name); dnl OpenBSD 4.7 unsetenv("") does not fail. AC_CACHE_CHECK([whether unsetenv obeys POSIX], [gl_cv_func_unsetenv_works], - [AC_RUN_IFELSE([AC_LANG_PROGRAM([[ - #include - #include - extern char **environ; - ]], [[ - char entry1[] = "a=1"; - char entry2[] = "b=2"; - char *env[] = { entry1, entry2, NULL }; - if (putenv ((char *) "a=1")) return 1; - if (putenv (entry2)) return 2; - entry2[0] = 'a'; - unsetenv ("a"); - if (getenv ("a")) return 3; - if (!unsetenv ("") || errno != EINVAL) return 4; - entry2[0] = 'b'; - environ = env; - if (!getenv ("a")) return 5; - entry2[0] = 'a'; - unsetenv ("a"); - if (getenv ("a")) return 6; - ]])], - [gl_cv_func_unsetenv_works=yes], [gl_cv_func_unsetenv_works=no], - [case "$host_os" in - # Guess yes on glibc systems. - *-gnu*) gl_cv_func_unsetenv_works="guessing yes" ;; - # If we don't know, assume the worst. - *) gl_cv_func_unsetenv_works="guessing no" ;; - esac - ])]) + [AC_RUN_IFELSE( + [AC_LANG_PROGRAM([[ + #include + #include + extern char **environ; + ]GL_MDA_DEFINES], + [[ + char entry1[] = "a=1"; + char entry2[] = "b=2"; + char *env[] = { entry1, entry2, NULL }; + if (putenv ((char *) "a=1")) return 1; + if (putenv (entry2)) return 2; + entry2[0] = 'a'; + unsetenv ("a"); + if (getenv ("a")) return 3; + if (!unsetenv ("") || errno != EINVAL) return 4; + entry2[0] = 'b'; + environ = env; + if (!getenv ("a")) return 5; + entry2[0] = 'a'; + unsetenv ("a"); + if (getenv ("a")) return 6; + ]])], + [gl_cv_func_unsetenv_works=yes], + [gl_cv_func_unsetenv_works=no], + [case "$host_os" in + # Guess yes on glibc systems. + *-gnu*) gl_cv_func_unsetenv_works="guessing yes" ;; + # If we don't know, obey --enable-cross-guesses. + *) gl_cv_func_unsetenv_works="$gl_cross_guess_normal" ;; + esac + ]) + ]) case "$gl_cv_func_unsetenv_works" in *yes) ;; *) diff --git a/m4/setlocale.m4 b/m4/setlocale.m4 index dba68c4..a56bf4e 100644 --- a/m4/setlocale.m4 +++ b/m4/setlocale.m4 @@ -1,5 +1,5 @@ -# setlocale.m4 serial 6 -dnl Copyright (C) 2011-2019 Free Software Foundation, Inc. +# setlocale.m4 serial 7 +dnl Copyright (C) 2011-2020 Free Software Foundation, Inc. dnl This file is free software; the Free Software Foundation dnl gives unlimited permission to copy and/or distribute it, dnl with or without modifications, as long as this notice is preserved. @@ -7,16 +7,20 @@ dnl with or without modifications, as long as this notice is preserved. AC_DEFUN([gl_FUNC_SETLOCALE], [ AC_REQUIRE([gl_LOCALE_H_DEFAULTS]) + AC_REQUIRE([gl_FUNC_SETLOCALE_NULL]) AC_REQUIRE([AC_CANONICAL_HOST]) + + dnl Test whether we need to improve on the general working of setlocale. + NEED_SETLOCALE_IMPROVED=0 case "$host_os" in dnl On native Windows systems, setlocale(category,NULL) does not look at dnl the environment variables LC_ALL, category, and LANG. - mingw*) REPLACE_SETLOCALE=1 ;; + mingw*) NEED_SETLOCALE_IMPROVED=1 ;; dnl On Cygwin 1.5.x, setlocale always succeeds but setlocale(LC_CTYPE,NULL) dnl is then still "C". cygwin*) case `uname -r` in - 1.5.*) REPLACE_SETLOCALE=1 ;; + 1.5.*) NEED_SETLOCALE_IMPROVED=1 ;; esac ;; dnl On Android 4.3, setlocale(category,"C") always fails. @@ -42,10 +46,33 @@ int main () ]) case "$gl_cv_func_setlocale_works" in *yes) ;; - *) REPLACE_SETLOCALE=1 ;; + *) NEED_SETLOCALE_IMPROVED=1 ;; esac ;; esac + AC_DEFINE_UNQUOTED([NEED_SETLOCALE_IMPROVED], [$NEED_SETLOCALE_IMPROVED], + [Define to 1 to enable general improvements of setlocale.]) + + dnl Test whether we need a multithread-safe setlocale(category,NULL). + NEED_SETLOCALE_MTSAFE=0 + if test $SETLOCALE_NULL_ALL_MTSAFE = 0 || test $SETLOCALE_NULL_ONE_MTSAFE = 0; then + NEED_SETLOCALE_MTSAFE=1 + fi + AC_DEFINE_UNQUOTED([NEED_SETLOCALE_MTSAFE], [$NEED_SETLOCALE_MTSAFE], + [Define to 1 to enable a multithread-safety fix of setlocale.]) + + if test $NEED_SETLOCALE_IMPROVED = 1 || test $NEED_SETLOCALE_MTSAFE = 1; then + REPLACE_SETLOCALE=1 + fi + + if test $NEED_SETLOCALE_MTSAFE = 1; then + LIB_SETLOCALE="$LIB_SETLOCALE_NULL" + else + LIB_SETLOCALE= + fi + dnl LIB_SETLOCALE is expected to be '-pthread' or '-lpthread' on AIX with gcc + dnl or xlc, and empty otherwise. + AC_SUBST([LIB_SETLOCALE]) ]) # Prerequisites of lib/setlocale.c. diff --git a/m4/setlocale_null.m4 b/m4/setlocale_null.m4 new file mode 100644 index 0000000..fc1e3e1 --- /dev/null +++ b/m4/setlocale_null.m4 @@ -0,0 +1,98 @@ +# setlocale_null.m4 serial 4 +dnl Copyright (C) 2019-2020 Free Software Foundation, Inc. +dnl This file is free software; the Free Software Foundation +dnl gives unlimited permission to copy and/or distribute it, +dnl with or without modifications, as long as this notice is preserved. + +AC_DEFUN([gl_FUNC_SETLOCALE_NULL], +[ + AC_REQUIRE([AC_CANONICAL_HOST]) + AC_REQUIRE([gl_PTHREADLIB]) + AC_CHECK_HEADERS_ONCE([threads.h]) + + 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* | netbsd* | openbsd* | aix* | haiku* | cygwin*) + 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 ;; + # If we don't know, obey --enable-cross-guesses. + *) + gl_cv_func_setlocale_null_all_mtsafe="$gl_cross_guess_normal" ;; + esac + ]) + dnl On platforms without multithreading, there is no issue. + case "$host_os" in + mingw*) ;; + *) + if test $gl_pthread_api = no && test $ac_cv_header_threads_h = no; then + gl_cv_func_setlocale_null_all_mtsafe="trivially yes" + fi + ;; + esac + case "$gl_cv_func_setlocale_null_all_mtsafe" in + *yes) SETLOCALE_NULL_ALL_MTSAFE=1 ;; + *) SETLOCALE_NULL_ALL_MTSAFE=0 ;; + esac + AC_DEFINE_UNQUOTED([SETLOCALE_NULL_ALL_MTSAFE], [$SETLOCALE_NULL_ALL_MTSAFE], + [Define to 1 if setlocale (LC_ALL, NULL) is multithread-safe.]) + + dnl This is about a single category (not LC_ALL). + AC_CACHE_CHECK([whether setlocale (category, NULL) is multithread-safe], + [gl_cv_func_setlocale_null_one_mtsafe], + [case "$host_os" in + # Guess no on OpenBSD, AIX. + 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* | netbsd* | hpux* | irix* | solaris* | haiku* | cygwin* | mingw*) + gl_cv_func_setlocale_null_one_mtsafe=yes ;; + # If we don't know, obey --enable-cross-guesses. + *) + gl_cv_func_setlocale_null_one_mtsafe="$gl_cross_guess_normal" ;; + esac + ]) + dnl On platforms without multithreading, there is no issue. + case "$host_os" in + mingw*) ;; + *) + if test $gl_pthread_api = no && test $ac_cv_header_threads_h = no; then + gl_cv_func_setlocale_null_one_mtsafe="trivially yes" + fi + ;; + esac + case "$gl_cv_func_setlocale_null_one_mtsafe" in + *yes) SETLOCALE_NULL_ONE_MTSAFE=1 ;; + *) SETLOCALE_NULL_ONE_MTSAFE=0 ;; + esac + AC_DEFINE_UNQUOTED([SETLOCALE_NULL_ONE_MTSAFE], [$SETLOCALE_NULL_ONE_MTSAFE], + [Define to 1 if setlocale (category, NULL) is multithread-safe.]) + + 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= ;; + *) + gl_WEAK_SYMBOLS + case "$gl_cv_have_weak" in + *yes) LIB_SETLOCALE_NULL= ;; + *) LIB_SETLOCALE_NULL="$LIBPTHREAD" ;; + esac + ;; + esac + else + LIB_SETLOCALE_NULL= + fi + dnl LIB_SETLOCALE_NULL is expected to be '-pthread' or '-lpthread' on AIX + dnl with gcc or xlc, and empty otherwise. + AC_SUBST([LIB_SETLOCALE_NULL]) +]) + +# Prerequisites of lib/setlocale-lock.c. +AC_DEFUN([gl_PREREQ_SETLOCALE_LOCK], +[ + gl_VISIBILITY +]) diff --git a/m4/sigaction.m4 b/m4/sigaction.m4 index 6117d1b..9a2d201 100644 --- a/m4/sigaction.m4 +++ b/m4/sigaction.m4 @@ -1,5 +1,5 @@ # sigaction.m4 serial 7 -dnl Copyright (C) 2008-2019 Free Software Foundation, Inc. +dnl Copyright (C) 2008-2020 Free Software Foundation, Inc. dnl This file is free software; the Free Software Foundation dnl gives unlimited permission to copy and/or distribute it, dnl with or without modifications, as long as this notice is preserved. diff --git a/m4/signal_h.m4 b/m4/signal_h.m4 index 3acec64..b262980 100644 --- a/m4/signal_h.m4 +++ b/m4/signal_h.m4 @@ -1,5 +1,5 @@ -# signal_h.m4 serial 18 -dnl Copyright (C) 2007-2019 Free Software Foundation, Inc. +# signal_h.m4 serial 19 +dnl Copyright (C) 2007-2020 Free Software Foundation, Inc. dnl This file is free software; the Free Software Foundation dnl gives unlimited permission to copy and/or distribute it, dnl with or without modifications, as long as this notice is preserved. @@ -34,6 +34,8 @@ AC_DEFUN([gl_SIGNAL_H], ]], [pthread_sigmask sigaction sigaddset sigdelset sigemptyset sigfillset sigismember sigpending sigprocmask]) + + AC_REQUIRE([AC_C_RESTRICT]) ]) AC_DEFUN([gl_CHECK_TYPE_SIGSET_T], diff --git a/m4/signalblocking.m4 b/m4/signalblocking.m4 index d722f65..b7cff8d 100644 --- a/m4/signalblocking.m4 +++ b/m4/signalblocking.m4 @@ -1,5 +1,5 @@ -# signalblocking.m4 serial 14 -dnl Copyright (C) 2001-2002, 2006-2019 Free Software Foundation, Inc. +# signalblocking.m4 serial 17 +dnl Copyright (C) 2001-2002, 2006-2020 Free Software Foundation, Inc. dnl This file is free software; the Free Software Foundation dnl gives unlimited permission to copy and/or distribute it, dnl with or without modifications, as long as this notice is preserved. @@ -13,11 +13,9 @@ AC_DEFUN([gl_SIGNALBLOCKING], [ AC_REQUIRE([gl_SIGNAL_H_DEFAULTS]) AC_REQUIRE([gl_CHECK_TYPE_SIGSET_T]) - if test $gl_cv_type_sigset_t = yes; then - AC_CHECK_FUNC([sigprocmask], [gl_cv_func_sigprocmask=1]) - fi - if test -z "$gl_cv_func_sigprocmask"; then - HAVE_POSIX_SIGNALBLOCKING=0 + HAVE_POSIX_SIGNALBLOCKING=0 + if test "$gl_cv_type_sigset_t" = yes; then + AC_CHECK_FUNC([sigprocmask], [HAVE_POSIX_SIGNALBLOCKING=1]) fi ]) diff --git a/m4/sleep.m4 b/m4/sleep.m4 index 7bab467..d19170e 100644 --- a/m4/sleep.m4 +++ b/m4/sleep.m4 @@ -1,5 +1,5 @@ -# sleep.m4 serial 10 -dnl Copyright (C) 2007-2019 Free Software Foundation, Inc. +# sleep.m4 serial 11 +dnl Copyright (C) 2007-2020 Free Software Foundation, Inc. dnl This file is free software; the Free Software Foundation dnl gives unlimited permission to copy and/or distribute it, dnl with or without modifications, as long as this notice is preserved. @@ -52,8 +52,8 @@ handle_alarm (int sig) *-musl*) gl_cv_func_sleep_works="guessing yes" ;; # Guess no on native Windows. mingw*) gl_cv_func_sleep_works="guessing no" ;; - # If we don't know, assume the worst. - *) gl_cv_func_sleep_works="guessing no" ;; + # If we don't know, obey --enable-cross-guesses. + *) gl_cv_func_sleep_works="$gl_cross_guess_normal" ;; esac ])]) case "$gl_cv_func_sleep_works" in diff --git a/m4/socketlib.m4 b/m4/socketlib.m4 index 90ba20c..48dd7d6 100644 --- a/m4/socketlib.m4 +++ b/m4/socketlib.m4 @@ -1,5 +1,5 @@ -# socketlib.m4 serial 2 -dnl Copyright (C) 2008-2019 Free Software Foundation, Inc. +# socketlib.m4 serial 3 +dnl Copyright (C) 2008-2020 Free Software Foundation, Inc. dnl This file is free software; the Free Software Foundation dnl gives unlimited permission to copy and/or distribute it, dnl with or without modifications, as long as this notice is preserved. @@ -14,21 +14,27 @@ AC_DEFUN([gl_SOCKETLIB], LIBSOCKET= if test $HAVE_WINSOCK2_H = 1; then dnl Native Windows API (not Cygwin). - AC_CACHE_CHECK([if we need to call WSAStartup in winsock2.h and -lws2_32], - [gl_cv_func_wsastartup], [ - gl_save_LIBS="$LIBS" - LIBS="$LIBS -lws2_32" - AC_LINK_IFELSE([AC_LANG_PROGRAM([[ + dnl If the function WSAStartup exists (declared in and + dnl defined through -lws2_32), we need to call it. + AC_CACHE_CHECK([for WSAStartup], + [gl_cv_func_wsastartup], [ + gl_save_LIBS="$LIBS" + LIBS="$LIBS -lws2_32" + AC_LINK_IFELSE( + [AC_LANG_PROGRAM([[ #ifdef HAVE_WINSOCK2_H # include #endif]], [[ - WORD wVersionRequested = MAKEWORD(1, 1); - WSADATA wsaData; - int err = WSAStartup(wVersionRequested, &wsaData); - WSACleanup ();]])], - gl_cv_func_wsastartup=yes, gl_cv_func_wsastartup=no) - LIBS="$gl_save_LIBS" - ]) + WORD wVersionRequested = MAKEWORD(1, 1); + WSADATA wsaData; + int err = WSAStartup(wVersionRequested, &wsaData); + WSACleanup (); + ]]) + ], + [gl_cv_func_wsastartup=yes], + [gl_cv_func_wsastartup=no]) + LIBS="$gl_save_LIBS" + ]) if test "$gl_cv_func_wsastartup" = "yes"; then AC_DEFINE([WINDOWS_SOCKETS], [1], [Define if WSAStartup is needed.]) LIBSOCKET='-lws2_32' diff --git a/m4/sockets.m4 b/m4/sockets.m4 index 06d3b9d..7e53ef2 100644 --- a/m4/sockets.m4 +++ b/m4/sockets.m4 @@ -1,5 +1,5 @@ # sockets.m4 serial 7 -dnl Copyright (C) 2008-2019 Free Software Foundation, Inc. +dnl Copyright (C) 2008-2020 Free Software Foundation, Inc. dnl This file is free software; the Free Software Foundation dnl gives unlimited permission to copy and/or distribute it, dnl with or without modifications, as long as this notice is preserved. diff --git a/m4/socklen.m4 b/m4/socklen.m4 index deb5135..251960b 100644 --- a/m4/socklen.m4 +++ b/m4/socklen.m4 @@ -1,5 +1,5 @@ # socklen.m4 serial 11 -dnl Copyright (C) 2005-2007, 2009-2019 Free Software Foundation, Inc. +dnl Copyright (C) 2005-2007, 2009-2020 Free Software Foundation, Inc. dnl This file is free software; the Free Software Foundation dnl gives unlimited permission to copy and/or distribute it, dnl with or without modifications, as long as this notice is preserved. diff --git a/m4/sockpfaf.m4 b/m4/sockpfaf.m4 index 7b32982..495a355 100644 --- a/m4/sockpfaf.m4 +++ b/m4/sockpfaf.m4 @@ -1,5 +1,5 @@ # sockpfaf.m4 serial 9 -dnl Copyright (C) 2004, 2006, 2009-2019 Free Software Foundation, Inc. +dnl Copyright (C) 2004, 2006, 2009-2020 Free Software Foundation, Inc. dnl This file is free software; the Free Software Foundation dnl gives unlimited permission to copy and/or distribute it, dnl with or without modifications, as long as this notice is preserved. diff --git a/m4/ssize_t.m4 b/m4/ssize_t.m4 index 38bcee1..6c0a588 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-2019 Free Software Foundation, Inc. +dnl Copyright (C) 2001-2003, 2006, 2010-2020 Free Software Foundation, Inc. dnl This file is free software; the Free Software Foundation dnl gives unlimited permission to copy and/or distribute it, dnl with or without modifications, as long as this notice is preserved. diff --git a/m4/stat-time.m4 b/m4/stat-time.m4 index 1685788..0ac3f72 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-2019 Free Software +# Copyright (C) 1998-1999, 2001, 2003, 2005-2007, 2009-2020 Free Software # Foundation, Inc. # This file is free software; the Free Software Foundation diff --git a/m4/stat.m4 b/m4/stat.m4 index 60040d1..db2038f 100644 --- a/m4/stat.m4 +++ b/m4/stat.m4 @@ -1,6 +1,6 @@ -# serial 15 +# serial 17 -# Copyright (C) 2009-2019 Free Software Foundation, Inc. +# Copyright (C) 2009-2020 Free Software Foundation, Inc. # # This file is free software; the Free Software Foundation # gives unlimited permission to copy and/or distribute it, @@ -47,8 +47,8 @@ AC_DEFUN([gl_FUNC_STAT], linux-* | linux) gl_cv_func_stat_file_slash="guessing yes" ;; # Guess yes on glibc systems. *-gnu* | gnu*) gl_cv_func_stat_file_slash="guessing yes" ;; - # If we don't know, assume the worst. - *) gl_cv_func_stat_file_slash="guessing no" ;; + # If we don't know, obey --enable-cross-guesses. + *) gl_cv_func_stat_file_slash="$gl_cross_guess_normal" ;; esac ]) rm -f conftest.tmp conftest.lnk]) @@ -70,5 +70,16 @@ AC_DEFUN([gl_FUNC_STAT], # Prerequisites of lib/stat.c and lib/stat-w32.c. AC_DEFUN([gl_PREREQ_STAT], [ AC_REQUIRE([gl_HEADER_SYS_STAT_H]) + AC_REQUIRE([gl_PREREQ_STAT_W32]) : ]) + +# Prerequisites of lib/stat-w32.c. +AC_DEFUN([gl_PREREQ_STAT_W32], [ + AC_REQUIRE([AC_CANONICAL_HOST]) + case "$host_os" in + mingw*) + AC_CHECK_HEADERS([sdkddkver.h]) + ;; + esac +]) diff --git a/m4/std-gnu11.m4 b/m4/std-gnu11.m4 index 23e7f75..b5ab8ab 100644 --- a/m4/std-gnu11.m4 +++ b/m4/std-gnu11.m4 @@ -6,8 +6,10 @@ # This implementation will be obsolete once we can assume Autoconf 2.70 # or later is installed everywhere a Gnulib program might be developed. +m4_version_prereq([2.70], [], [ -# Copyright (C) 2001-2019 Free Software Foundation, Inc. + +# Copyright (C) 2001-2020 Free Software Foundation, Inc. # This program is free software; you can redistribute it and/or modify # it under the terms of the GNU General Public License as published by @@ -70,7 +72,7 @@ _AS_ECHO_LOG([checking for _AC_LANG compiler version]) set X $ac_compile ac_compiler=$[2] for ac_option in --version -v -V -qversion -version; do - m4_ifdef([_AC_DO_LIMIT],[_AC_DO_LIMIT],[_AC_DO])([$ac_compiler $ac_option >&AS_MESSAGE_LOG_FD]) + _AC_DO_LIMIT([$ac_compiler $ac_option >&AS_MESSAGE_LOG_FD]) done m4_expand_once([_AC_COMPILER_EXEEXT])[]dnl @@ -135,7 +137,7 @@ _AS_ECHO_LOG([checking for _AC_LANG compiler version]) set X $ac_compile ac_compiler=$[2] for ac_option in --version -v -V -qversion; do - m4_ifdef([_AC_DO_LIMIT],[_AC_DO_LIMIT],[_AC_DO])([$ac_compiler $ac_option >&AS_MESSAGE_LOG_FD]) + _AC_DO_LIMIT([$ac_compiler $ac_option >&AS_MESSAGE_LOG_FD]) done m4_expand_once([_AC_COMPILER_EXEEXT])[]dnl @@ -822,3 +824,6 @@ dnl Tru64 N/A (no support) dnl with extended modes being tried first. [[-std=gnu++11 -std=c++11 -std=gnu++0x -std=c++0x -qlanglvl=extended0x -AA]], [$1], [$2])[]dnl ])# _AC_PROG_CXX_CXX11 + + +])# m4_version_prereq diff --git a/m4/stdalign.m4 b/m4/stdalign.m4 index 601fd21..dcf778e 100644 --- a/m4/stdalign.m4 +++ b/m4/stdalign.m4 @@ -1,6 +1,6 @@ # Check for stdalign.h that conforms to C11. -dnl Copyright 2011-2019 Free Software Foundation, Inc. +dnl Copyright 2011-2020 Free Software Foundation, Inc. dnl This file is free software; the Free Software Foundation dnl gives unlimited permission to copy and/or distribute it, dnl with or without modifications, as long as this notice is preserved. diff --git a/m4/stdarg.m4 b/m4/stdarg.m4 index f43fe20..69747f3 100644 --- a/m4/stdarg.m4 +++ b/m4/stdarg.m4 @@ -1,5 +1,5 @@ # stdarg.m4 serial 7 -dnl Copyright (C) 2006, 2008-2019 Free Software Foundation, Inc. +dnl Copyright (C) 2006, 2008-2020 Free Software Foundation, Inc. dnl This file is free software; the Free Software Foundation dnl gives unlimited permission to copy and/or distribute it, dnl with or without modifications, as long as this notice is preserved. diff --git a/m4/stdbool.m4 b/m4/stdbool.m4 index acb8522..6bb087e 100644 --- a/m4/stdbool.m4 +++ b/m4/stdbool.m4 @@ -1,22 +1,36 @@ # Check for stdbool.h that conforms to C99. -dnl Copyright (C) 2002-2006, 2009-2019 Free Software Foundation, Inc. +dnl Copyright (C) 2002-2006, 2009-2020 Free Software Foundation, Inc. dnl This file is free software; the Free Software Foundation dnl gives unlimited permission to copy and/or distribute it, dnl with or without modifications, as long as this notice is preserved. -#serial 7 +#serial 8 # Prepare for substituting if it is not supported. AC_DEFUN([AM_STDBOOL_H], [ AC_REQUIRE([AC_CHECK_HEADER_STDBOOL]) + AC_REQUIRE([AC_CANONICAL_HOST]) - # Define two additional variables used in the Makefile substitution. - + dnl On some platforms, does not exist or does not conform to C99. + dnl On Solaris 10 with CC=cc CXX=CC, exists but is not usable + dnl in C++ mode (and no 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 - STDBOOL_H='' + case "$host_os" in + solaris*) + if test -z "$GCC"; then + STDBOOL_H='stdbool.h' + else + STDBOOL_H='' + fi + ;; + *) + STDBOOL_H='' + ;; + esac else STDBOOL_H='stdbool.h' fi diff --git a/m4/stddef_h.m4 b/m4/stddef_h.m4 index 979e3cf..d8bc8ff 100644 --- a/m4/stddef_h.m4 +++ b/m4/stddef_h.m4 @@ -1,6 +1,6 @@ dnl A placeholder for , for platforms that have issues. -# stddef_h.m4 serial 6 -dnl Copyright (C) 2009-2019 Free Software Foundation, Inc. +# stddef_h.m4 serial 7 +dnl Copyright (C) 2009-2020 Free Software Foundation, Inc. dnl This file is free software; the Free Software Foundation dnl gives unlimited permission to copy and/or distribute it, dnl with or without modifications, as long as this notice is preserved. @@ -19,7 +19,7 @@ AC_DEFUN([gl_STDDEF_H], [AC_LANG_PROGRAM( [[#include unsigned int s = sizeof (max_align_t); - #if defined __GNUC__ || defined __IBM__ALIGNOF__ + #if defined __GNUC__ || defined __clang__ || defined __IBM__ALIGNOF__ int check1[2 * (__alignof__ (double) <= __alignof__ (max_align_t)) - 1]; int check2[2 * (__alignof__ (long double) <= __alignof__ (max_align_t)) - 1]; #endif diff --git a/m4/stdint.m4 b/m4/stdint.m4 index 11d8e8e..d5f5d61 100644 --- a/m4/stdint.m4 +++ b/m4/stdint.m4 @@ -1,5 +1,5 @@ -# stdint.m4 serial 53 -dnl Copyright (C) 2001-2019 Free Software Foundation, Inc. +# stdint.m4 serial 56 +dnl Copyright (C) 2001-2020 Free Software Foundation, Inc. dnl This file is free software; the Free Software Foundation dnl gives unlimited permission to copy and/or distribute it, dnl with or without modifications, as long as this notice is preserved. @@ -17,21 +17,12 @@ AC_DEFUN_ONCE([gl_STDINT_H], AC_REQUIRE([gl_LIMITS_H]) AC_REQUIRE([gt_TYPE_WINT_T]) - dnl Check for long long int and unsigned long long int. - AC_REQUIRE([AC_TYPE_LONG_LONG_INT]) - if test $ac_cv_type_long_long_int = yes; then - HAVE_LONG_LONG_INT=1 - else - HAVE_LONG_LONG_INT=0 - fi - AC_SUBST([HAVE_LONG_LONG_INT]) - AC_REQUIRE([AC_TYPE_UNSIGNED_LONG_LONG_INT]) - if test $ac_cv_type_unsigned_long_long_int = yes; then - HAVE_UNSIGNED_LONG_LONG_INT=1 - else - HAVE_UNSIGNED_LONG_LONG_INT=0 - fi - AC_SUBST([HAVE_UNSIGNED_LONG_LONG_INT]) + dnl For backward compatibility. Some packages may still be testing these + dnl macros. + AC_DEFINE([HAVE_LONG_LONG_INT], [1], + [Define to 1 if the system has the type 'long long int'.]) + AC_DEFINE([HAVE_UNSIGNED_LONG_LONG_INT], [1], + [Define to 1 if the system has the type 'unsigned long long int'.]) dnl Check for , in the same way as gl_WCHAR_H does. AC_CHECK_HEADERS_ONCE([wchar.h]) @@ -161,7 +152,7 @@ uintmax_t j = UINTMAX_MAX; /* Check that SIZE_MAX has the correct type, if possible. */ #if 201112 <= __STDC_VERSION__ int k = _Generic (SIZE_MAX, size_t: 0); -#elif (2 <= __GNUC__ || defined __IBM__TYPEOF__ \ +#elif (2 <= __GNUC__ || 4 <= __clang_major__ || defined __IBM__TYPEOF__ \ || (0x5110 <= __SUNPRO_C && !__STDC__)) extern size_t k; extern __typeof__ (SIZE_MAX) k; @@ -311,9 +302,10 @@ static const char *macro_values[] = HAVE_C99_STDINT_H=1 dnl Now see whether the system works without dnl __STDC_CONSTANT_MACROS/__STDC_LIMIT_MACROS defined. - AC_CACHE_CHECK([whether stdint.h predates C++11], - [gl_cv_header_stdint_predates_cxx11_h], - [gl_cv_header_stdint_predates_cxx11_h=yes + dnl If not, there would be problems when stdint.h is included from C++. + AC_CACHE_CHECK([whether stdint.h works without ISO C predefines], + [gl_cv_header_stdint_without_STDC_macros], + [gl_cv_header_stdint_without_STDC_macros=no AC_COMPILE_IFELSE([ AC_LANG_PROGRAM([[ #define _GL_JUST_INCLUDE_SYSTEM_STDINT_H 1 /* work if build isn't clean */ @@ -324,13 +316,14 @@ gl_STDINT_INCLUDES intmax_t im = INTMAX_MAX; int32_t i32 = INT32_C (0x7fffffff); ]])], - [gl_cv_header_stdint_predates_cxx11_h=no])]) + [gl_cv_header_stdint_without_STDC_macros=yes]) + ]) - if test "$gl_cv_header_stdint_predates_cxx11_h" = yes; then + if test $gl_cv_header_stdint_without_STDC_macros = no; then AC_DEFINE([__STDC_CONSTANT_MACROS], [1], - [Define to 1 if the system predates C++11.]) + [Define to 1 if the system predates C++11.]) AC_DEFINE([__STDC_LIMIT_MACROS], [1], - [Define to 1 if the system predates C++11.]) + [Define to 1 if the system predates C++11.]) fi AC_CACHE_CHECK([whether stdint.h has UINTMAX_WIDTH etc.], [gl_cv_header_stdint_width], diff --git a/m4/stdio_h.m4 b/m4/stdio_h.m4 index 6c9c104..6003a31 100644 --- a/m4/stdio_h.m4 +++ b/m4/stdio_h.m4 @@ -1,5 +1,5 @@ -# stdio_h.m4 serial 49 -dnl Copyright (C) 2007-2019 Free Software Foundation, Inc. +# stdio_h.m4 serial 51 +dnl Copyright (C) 2007-2020 Free Software Foundation, Inc. dnl This file is free software; the Free Software Foundation dnl gives unlimited permission to copy and/or distribute it, dnl with or without modifications, as long as this notice is preserved. @@ -107,6 +107,13 @@ AC_DEFUN([gl_STDIO_H], gl_WARN_ON_USE_PREPARE([[#include ]], [dprintf fpurge fseeko ftello getdelim getline gets pclose popen renameat snprintf tmpfile vdprintf vsnprintf]) + + AC_REQUIRE([AC_C_RESTRICT]) + + AC_CHECK_DECLS_ONCE([fcloseall]) + if test $ac_cv_have_decl_fcloseall = no; then + HAVE_DECL_FCLOSEALL=0 + fi ]) AC_DEFUN([gl_STDIO_MODULE_INDICATOR], @@ -174,6 +181,7 @@ AC_DEFUN([gl_STDIO_H_DEFAULTS], GNULIB_VSNPRINTF=0; AC_SUBST([GNULIB_VSNPRINTF]) GNULIB_VSPRINTF_POSIX=0; AC_SUBST([GNULIB_VSPRINTF_POSIX]) dnl Assume proper GNU behavior unless another module says otherwise. + HAVE_DECL_FCLOSEALL=1; AC_SUBST([HAVE_DECL_FCLOSEALL]) HAVE_DECL_FPURGE=1; AC_SUBST([HAVE_DECL_FPURGE]) HAVE_DECL_FSEEKO=1; AC_SUBST([HAVE_DECL_FSEEKO]) HAVE_DECL_FTELLO=1; AC_SUBST([HAVE_DECL_FTELLO]) diff --git a/m4/stdlib_h.m4 b/m4/stdlib_h.m4 index 6121602..8b3cfe3 100644 --- a/m4/stdlib_h.m4 +++ b/m4/stdlib_h.m4 @@ -1,5 +1,5 @@ -# stdlib_h.m4 serial 48 -dnl Copyright (C) 2007-2019 Free Software Foundation, Inc. +# stdlib_h.m4 serial 52 +dnl Copyright (C) 2007-2020 Free Software Foundation, Inc. dnl This file is free software; the Free Software Foundation dnl gives unlimited permission to copy and/or distribute it, dnl with or without modifications, as long as this notice is preserved. @@ -22,11 +22,28 @@ AC_DEFUN([gl_STDLIB_H], #if HAVE_RANDOM_H # include #endif - ]], [_Exit atoll canonicalize_file_name getloadavg getsubopt grantpt + ]], [_Exit aligned_alloc atoll canonicalize_file_name + getloadavg getsubopt grantpt initstate initstate_r mbtowc mkdtemp mkostemp mkostemps mkstemp mkstemps - posix_openpt ptsname ptsname_r qsort_r random random_r reallocarray - realpath rpmatch secure_getenv setenv setstate setstate_r srandom - srandom_r strtod strtold strtoll strtoull unlockpt unsetenv]) + posix_memalign posix_openpt ptsname ptsname_r qsort_r + random random_r reallocarray realpath rpmatch secure_getenv setenv + setstate setstate_r srandom srandom_r + strtod strtold strtoll strtoull unlockpt unsetenv]) + + AC_REQUIRE([AC_C_RESTRICT]) + + AC_CHECK_DECLS_ONCE([ecvt]) + if test $ac_cv_have_decl_ecvt = no; then + HAVE_DECL_ECVT=0 + fi + AC_CHECK_DECLS_ONCE([fcvt]) + if test $ac_cv_have_decl_fcvt = no; then + HAVE_DECL_FCVT=0 + fi + AC_CHECK_DECLS_ONCE([gcvt]) + if test $ac_cv_have_decl_gcvt = no; then + HAVE_DECL_GCVT=0 + fi ]) AC_DEFUN([gl_STDLIB_MODULE_INDICATOR], @@ -41,6 +58,7 @@ AC_DEFUN([gl_STDLIB_MODULE_INDICATOR], AC_DEFUN([gl_STDLIB_H_DEFAULTS], [ GNULIB__EXIT=0; AC_SUBST([GNULIB__EXIT]) + GNULIB_ALIGNED_ALLOC=0; AC_SUBST([GNULIB_ALIGNED_ALLOC]) GNULIB_ATOLL=0; AC_SUBST([GNULIB_ATOLL]) GNULIB_CALLOC_POSIX=0; AC_SUBST([GNULIB_CALLOC_POSIX]) GNULIB_CANONICALIZE_FILE_NAME=0; AC_SUBST([GNULIB_CANONICALIZE_FILE_NAME]) @@ -54,6 +72,7 @@ AC_DEFUN([gl_STDLIB_H_DEFAULTS], GNULIB_MKOSTEMPS=0; AC_SUBST([GNULIB_MKOSTEMPS]) GNULIB_MKSTEMP=0; AC_SUBST([GNULIB_MKSTEMP]) GNULIB_MKSTEMPS=0; AC_SUBST([GNULIB_MKSTEMPS]) + GNULIB_POSIX_MEMALIGN=0;AC_SUBST([GNULIB_POSIX_MEMALIGN]) GNULIB_POSIX_OPENPT=0; AC_SUBST([GNULIB_POSIX_OPENPT]) GNULIB_PTSNAME=0; AC_SUBST([GNULIB_PTSNAME]) GNULIB_PTSNAME_R=0; AC_SUBST([GNULIB_PTSNAME_R]) @@ -77,8 +96,12 @@ AC_DEFUN([gl_STDLIB_H_DEFAULTS], GNULIB_WCTOMB=0; AC_SUBST([GNULIB_WCTOMB]) dnl Assume proper GNU behavior unless another module says otherwise. HAVE__EXIT=1; AC_SUBST([HAVE__EXIT]) + HAVE_ALIGNED_ALLOC=1; AC_SUBST([HAVE_ALIGNED_ALLOC]) HAVE_ATOLL=1; AC_SUBST([HAVE_ATOLL]) HAVE_CANONICALIZE_FILE_NAME=1; AC_SUBST([HAVE_CANONICALIZE_FILE_NAME]) + HAVE_DECL_ECVT=1; AC_SUBST([HAVE_DECL_ECVT]) + 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_GETSUBOPT=1; AC_SUBST([HAVE_GETSUBOPT]) HAVE_GRANTPT=1; AC_SUBST([HAVE_GRANTPT]) @@ -90,6 +113,7 @@ AC_DEFUN([gl_STDLIB_H_DEFAULTS], HAVE_MKOSTEMPS=1; AC_SUBST([HAVE_MKOSTEMPS]) HAVE_MKSTEMP=1; AC_SUBST([HAVE_MKSTEMP]) HAVE_MKSTEMPS=1; AC_SUBST([HAVE_MKSTEMPS]) + HAVE_POSIX_MEMALIGN=1; AC_SUBST([HAVE_POSIX_MEMALIGN]) HAVE_POSIX_OPENPT=1; AC_SUBST([HAVE_POSIX_OPENPT]) HAVE_PTSNAME=1; AC_SUBST([HAVE_PTSNAME]) HAVE_PTSNAME_R=1; AC_SUBST([HAVE_PTSNAME_R]) @@ -113,12 +137,14 @@ 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_ALIGNED_ALLOC=0; AC_SUBST([REPLACE_ALIGNED_ALLOC]) REPLACE_CALLOC=0; AC_SUBST([REPLACE_CALLOC]) REPLACE_CANONICALIZE_FILE_NAME=0; AC_SUBST([REPLACE_CANONICALIZE_FILE_NAME]) REPLACE_INITSTATE=0; AC_SUBST([REPLACE_INITSTATE]) REPLACE_MALLOC=0; AC_SUBST([REPLACE_MALLOC]) REPLACE_MBTOWC=0; AC_SUBST([REPLACE_MBTOWC]) REPLACE_MKSTEMP=0; AC_SUBST([REPLACE_MKSTEMP]) + REPLACE_POSIX_MEMALIGN=0; AC_SUBST([REPLACE_POSIX_MEMALIGN]) 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 82d7420..6340209 100644 --- a/m4/strdup.m4 +++ b/m4/strdup.m4 @@ -1,6 +1,6 @@ -# strdup.m4 serial 13 +# strdup.m4 serial 14 -dnl Copyright (C) 2002-2019 Free Software Foundation, Inc. +dnl Copyright (C) 2002-2020 Free Software Foundation, Inc. dnl This file is free software; the Free Software Foundation dnl gives unlimited permission to copy and/or distribute it, @@ -9,7 +9,6 @@ dnl with or without modifications, as long as this notice is preserved. AC_DEFUN([gl_FUNC_STRDUP], [ AC_REQUIRE([gl_HEADER_STRING_H_DEFAULTS]) - AC_CHECK_FUNCS_ONCE([strdup]) AC_CHECK_DECLS_ONCE([strdup]) if test $ac_cv_have_decl_strdup = no; then HAVE_DECL_STRDUP=0 @@ -20,11 +19,8 @@ AC_DEFUN([gl_FUNC_STRDUP_POSIX], [ AC_REQUIRE([gl_HEADER_STRING_H_DEFAULTS]) AC_REQUIRE([gl_CHECK_MALLOC_POSIX]) - AC_CHECK_FUNCS_ONCE([strdup]) - if test $ac_cv_func_strdup = yes; then - if test $gl_cv_func_malloc_posix != yes; then - REPLACE_STRDUP=1 - fi + if test $gl_cv_func_malloc_posix != yes; then + REPLACE_STRDUP=1 fi AC_CHECK_DECLS_ONCE([strdup]) if test $ac_cv_have_decl_strdup = no; then diff --git a/m4/strerror.m4 b/m4/strerror.m4 index 2c90f31..fd84ce8 100644 --- a/m4/strerror.m4 +++ b/m4/strerror.m4 @@ -1,5 +1,5 @@ -# strerror.m4 serial 20 -dnl Copyright (C) 2002, 2007-2019 Free Software Foundation, Inc. +# strerror.m4 serial 21 +dnl Copyright (C) 2002, 2007-2020 Free Software Foundation, Inc. dnl This file is free software; the Free Software Foundation dnl gives unlimited permission to copy and/or distribute it, dnl with or without modifications, as long as this notice is preserved. @@ -28,8 +28,8 @@ AC_DEFUN([gl_FUNC_STRERROR], *-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, assume the worst. - *) gl_cv_func_working_strerror="guessing no" ;; + # If we don't know, obey --enable-cross-guesses. + *) gl_cv_func_working_strerror="$gl_cross_guess_normal" ;; esac ]) ]) @@ -86,8 +86,8 @@ AC_DEFUN([gl_FUNC_STRERROR_0], *-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, assume the worst. - *) gl_cv_func_strerror_0_works="guessing no" ;; + # 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 dafc46d..d431f23 100644 --- a/m4/strerror_r.m4 +++ b/m4/strerror_r.m4 @@ -1,5 +1,5 @@ -# strerror_r.m4 serial 19 -dnl Copyright (C) 2002, 2007-2019 Free Software Foundation, Inc. +# strerror_r.m4 serial 20 +dnl Copyright (C) 2002, 2007-2020 Free Software Foundation, Inc. dnl This file is free software; the Free Software Foundation dnl gives unlimited permission to copy and/or distribute it, dnl with or without modifications, as long as this notice is preserved. @@ -163,7 +163,7 @@ changequote([,])dnl [gl_cv_func_strerror_r_works=no], [dnl Guess no on all platforms that have __xpg_strerror_r, dnl at least until fixed glibc and cygwin are more common. - gl_cv_func_strerror_r_works="guessing no" + gl_cv_func_strerror_r_works="$gl_cross_guess_normal" ]) ]) fi diff --git a/m4/string_h.m4 b/m4/string_h.m4 index 0c0e3a7..29796b8 100644 --- a/m4/string_h.m4 +++ b/m4/string_h.m4 @@ -1,11 +1,11 @@ # Configure a GNU-like replacement for . -# Copyright (C) 2007-2019 Free Software Foundation, Inc. +# Copyright (C) 2007-2020 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 22 +# serial 27 # Written by Paul Eggert. @@ -18,7 +18,6 @@ AC_DEFUN([gl_HEADER_STRING_H], AC_DEFUN([gl_HEADER_STRING_H_BODY], [ - AC_REQUIRE([AC_C_RESTRICT]) AC_REQUIRE([gl_HEADER_STRING_H_DEFAULTS]) gl_NEXT_HEADERS([string.h]) @@ -29,7 +28,9 @@ AC_DEFUN([gl_HEADER_STRING_H_BODY], ]], [ffsl ffsll memmem mempcpy memrchr rawmemchr stpcpy stpncpy strchrnul strdup strncat strndup strnlen strpbrk strsep strcasestr strtok_r - strerror_r strsignal strverscmp]) + strerror_r strerrorname_np sigabbrev_np sigdescr_np strsignal strverscmp]) + + AC_REQUIRE([AC_C_RESTRICT]) ]) AC_DEFUN([gl_STRING_MODULE_INDICATOR], @@ -43,50 +44,52 @@ AC_DEFUN([gl_STRING_MODULE_INDICATOR], AC_DEFUN([gl_HEADER_STRING_H_DEFAULTS], [ - GNULIB_EXPLICIT_BZERO=0; AC_SUBST([GNULIB_EXPLICIT_BZERO]) - GNULIB_FFSL=0; AC_SUBST([GNULIB_FFSL]) - GNULIB_FFSLL=0; AC_SUBST([GNULIB_FFSLL]) - GNULIB_MEMCHR=0; AC_SUBST([GNULIB_MEMCHR]) - GNULIB_MEMMEM=0; AC_SUBST([GNULIB_MEMMEM]) - GNULIB_MEMPCPY=0; AC_SUBST([GNULIB_MEMPCPY]) - GNULIB_MEMRCHR=0; AC_SUBST([GNULIB_MEMRCHR]) - GNULIB_RAWMEMCHR=0; AC_SUBST([GNULIB_RAWMEMCHR]) - GNULIB_STPCPY=0; AC_SUBST([GNULIB_STPCPY]) - GNULIB_STPNCPY=0; AC_SUBST([GNULIB_STPNCPY]) - GNULIB_STRCHRNUL=0; AC_SUBST([GNULIB_STRCHRNUL]) - GNULIB_STRDUP=0; AC_SUBST([GNULIB_STRDUP]) - GNULIB_STRNCAT=0; AC_SUBST([GNULIB_STRNCAT]) - GNULIB_STRNDUP=0; AC_SUBST([GNULIB_STRNDUP]) - GNULIB_STRNLEN=0; AC_SUBST([GNULIB_STRNLEN]) - GNULIB_STRPBRK=0; AC_SUBST([GNULIB_STRPBRK]) - GNULIB_STRSEP=0; AC_SUBST([GNULIB_STRSEP]) - GNULIB_STRSTR=0; AC_SUBST([GNULIB_STRSTR]) - GNULIB_STRCASESTR=0; AC_SUBST([GNULIB_STRCASESTR]) - GNULIB_STRTOK_R=0; AC_SUBST([GNULIB_STRTOK_R]) - GNULIB_MBSLEN=0; AC_SUBST([GNULIB_MBSLEN]) - GNULIB_MBSNLEN=0; AC_SUBST([GNULIB_MBSNLEN]) - GNULIB_MBSCHR=0; AC_SUBST([GNULIB_MBSCHR]) - GNULIB_MBSRCHR=0; AC_SUBST([GNULIB_MBSRCHR]) - GNULIB_MBSSTR=0; AC_SUBST([GNULIB_MBSSTR]) - GNULIB_MBSCASECMP=0; AC_SUBST([GNULIB_MBSCASECMP]) - GNULIB_MBSNCASECMP=0; AC_SUBST([GNULIB_MBSNCASECMP]) - GNULIB_MBSPCASECMP=0; AC_SUBST([GNULIB_MBSPCASECMP]) - GNULIB_MBSCASESTR=0; AC_SUBST([GNULIB_MBSCASESTR]) - GNULIB_MBSCSPN=0; AC_SUBST([GNULIB_MBSCSPN]) - GNULIB_MBSPBRK=0; AC_SUBST([GNULIB_MBSPBRK]) - GNULIB_MBSSPN=0; AC_SUBST([GNULIB_MBSSPN]) - GNULIB_MBSSEP=0; AC_SUBST([GNULIB_MBSSEP]) - GNULIB_MBSTOK_R=0; AC_SUBST([GNULIB_MBSTOK_R]) - GNULIB_STRERROR=0; AC_SUBST([GNULIB_STRERROR]) - GNULIB_STRERROR_R=0; AC_SUBST([GNULIB_STRERROR_R]) - GNULIB_STRSIGNAL=0; AC_SUBST([GNULIB_STRSIGNAL]) - GNULIB_STRVERSCMP=0; AC_SUBST([GNULIB_STRVERSCMP]) - HAVE_MBSLEN=0; AC_SUBST([HAVE_MBSLEN]) + GNULIB_EXPLICIT_BZERO=0; AC_SUBST([GNULIB_EXPLICIT_BZERO]) + GNULIB_FFSL=0; AC_SUBST([GNULIB_FFSL]) + GNULIB_FFSLL=0; AC_SUBST([GNULIB_FFSLL]) + GNULIB_MEMCHR=0; AC_SUBST([GNULIB_MEMCHR]) + GNULIB_MEMMEM=0; AC_SUBST([GNULIB_MEMMEM]) + GNULIB_MEMPCPY=0; AC_SUBST([GNULIB_MEMPCPY]) + GNULIB_MEMRCHR=0; AC_SUBST([GNULIB_MEMRCHR]) + GNULIB_RAWMEMCHR=0; AC_SUBST([GNULIB_RAWMEMCHR]) + GNULIB_STPCPY=0; AC_SUBST([GNULIB_STPCPY]) + GNULIB_STPNCPY=0; AC_SUBST([GNULIB_STPNCPY]) + GNULIB_STRCHRNUL=0; AC_SUBST([GNULIB_STRCHRNUL]) + GNULIB_STRDUP=0; AC_SUBST([GNULIB_STRDUP]) + GNULIB_STRNCAT=0; AC_SUBST([GNULIB_STRNCAT]) + GNULIB_STRNDUP=0; AC_SUBST([GNULIB_STRNDUP]) + GNULIB_STRNLEN=0; AC_SUBST([GNULIB_STRNLEN]) + GNULIB_STRPBRK=0; AC_SUBST([GNULIB_STRPBRK]) + GNULIB_STRSEP=0; AC_SUBST([GNULIB_STRSEP]) + GNULIB_STRSTR=0; AC_SUBST([GNULIB_STRSTR]) + GNULIB_STRCASESTR=0; AC_SUBST([GNULIB_STRCASESTR]) + GNULIB_STRTOK_R=0; AC_SUBST([GNULIB_STRTOK_R]) + GNULIB_MBSLEN=0; AC_SUBST([GNULIB_MBSLEN]) + GNULIB_MBSNLEN=0; AC_SUBST([GNULIB_MBSNLEN]) + GNULIB_MBSCHR=0; AC_SUBST([GNULIB_MBSCHR]) + GNULIB_MBSRCHR=0; AC_SUBST([GNULIB_MBSRCHR]) + GNULIB_MBSSTR=0; AC_SUBST([GNULIB_MBSSTR]) + GNULIB_MBSCASECMP=0; AC_SUBST([GNULIB_MBSCASECMP]) + GNULIB_MBSNCASECMP=0; AC_SUBST([GNULIB_MBSNCASECMP]) + GNULIB_MBSPCASECMP=0; AC_SUBST([GNULIB_MBSPCASECMP]) + GNULIB_MBSCASESTR=0; AC_SUBST([GNULIB_MBSCASESTR]) + GNULIB_MBSCSPN=0; AC_SUBST([GNULIB_MBSCSPN]) + GNULIB_MBSPBRK=0; AC_SUBST([GNULIB_MBSPBRK]) + GNULIB_MBSSPN=0; AC_SUBST([GNULIB_MBSSPN]) + GNULIB_MBSSEP=0; AC_SUBST([GNULIB_MBSSEP]) + GNULIB_MBSTOK_R=0; AC_SUBST([GNULIB_MBSTOK_R]) + GNULIB_STRERROR=0; AC_SUBST([GNULIB_STRERROR]) + GNULIB_STRERROR_R=0; AC_SUBST([GNULIB_STRERROR_R]) + GNULIB_STRERRORNAME_NP=0; AC_SUBST([GNULIB_STRERRORNAME_NP]) + GNULIB_SIGABBREV_NP=0; AC_SUBST([GNULIB_SIGABBREV_NP]) + GNULIB_SIGDESCR_NP=0; AC_SUBST([GNULIB_SIGDESCR_NP]) + GNULIB_STRSIGNAL=0; AC_SUBST([GNULIB_STRSIGNAL]) + GNULIB_STRVERSCMP=0; AC_SUBST([GNULIB_STRVERSCMP]) + HAVE_MBSLEN=0; AC_SUBST([HAVE_MBSLEN]) dnl Assume proper GNU behavior unless another module says otherwise. HAVE_EXPLICIT_BZERO=1; AC_SUBST([HAVE_EXPLICIT_BZERO]) HAVE_FFSL=1; AC_SUBST([HAVE_FFSL]) HAVE_FFSLL=1; AC_SUBST([HAVE_FFSLL]) - HAVE_MEMCHR=1; AC_SUBST([HAVE_MEMCHR]) HAVE_DECL_MEMMEM=1; AC_SUBST([HAVE_DECL_MEMMEM]) HAVE_MEMPCPY=1; AC_SUBST([HAVE_MEMPCPY]) HAVE_DECL_MEMRCHR=1; AC_SUBST([HAVE_DECL_MEMRCHR]) @@ -102,6 +105,9 @@ AC_DEFUN([gl_HEADER_STRING_H_DEFAULTS], HAVE_STRCASESTR=1; AC_SUBST([HAVE_STRCASESTR]) HAVE_DECL_STRTOK_R=1; AC_SUBST([HAVE_DECL_STRTOK_R]) HAVE_DECL_STRERROR_R=1; AC_SUBST([HAVE_DECL_STRERROR_R]) + HAVE_STRERRORNAME_NP=1; AC_SUBST([HAVE_STRERRORNAME_NP]) + HAVE_SIGABBREV_NP=1; AC_SUBST([HAVE_SIGABBREV_NP]) + HAVE_SIGDESCR_NP=1; AC_SUBST([HAVE_SIGDESCR_NP]) HAVE_DECL_STRSIGNAL=1; AC_SUBST([HAVE_DECL_STRSIGNAL]) HAVE_STRVERSCMP=1; AC_SUBST([HAVE_STRVERSCMP]) REPLACE_MEMCHR=0; AC_SUBST([REPLACE_MEMCHR]) @@ -117,6 +123,7 @@ AC_DEFUN([gl_HEADER_STRING_H_DEFAULTS], REPLACE_STRTOK_R=0; AC_SUBST([REPLACE_STRTOK_R]) REPLACE_STRERROR=0; AC_SUBST([REPLACE_STRERROR]) REPLACE_STRERROR_R=0; AC_SUBST([REPLACE_STRERROR_R]) + REPLACE_STRERRORNAME_NP=0; AC_SUBST([REPLACE_STRERRORNAME_NP]) REPLACE_STRSIGNAL=0; AC_SUBST([REPLACE_STRSIGNAL]) UNDEFINE_STRTOK_R=0; AC_SUBST([UNDEFINE_STRTOK_R]) ]) diff --git a/m4/strndup.m4 b/m4/strndup.m4 index 325af5d..006a31a 100644 --- a/m4/strndup.m4 +++ b/m4/strndup.m4 @@ -1,5 +1,5 @@ # strndup.m4 serial 22 -dnl Copyright (C) 2002-2003, 2005-2019 Free Software Foundation, Inc. +dnl Copyright (C) 2002-2003, 2005-2020 Free Software Foundation, Inc. dnl This file is free software; the Free Software Foundation dnl gives unlimited permission to copy and/or distribute it, dnl with or without modifications, as long as this notice is preserved. diff --git a/m4/strnlen.m4 b/m4/strnlen.m4 index c283c3e..71b8e1b 100644 --- a/m4/strnlen.m4 +++ b/m4/strnlen.m4 @@ -1,5 +1,5 @@ # strnlen.m4 serial 13 -dnl Copyright (C) 2002-2003, 2005-2007, 2009-2019 Free Software Foundation, +dnl Copyright (C) 2002-2003, 2005-2007, 2009-2020 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/strtoll.m4 b/m4/strtoll.m4 index 3ba7e22..edcde3b 100644 --- a/m4/strtoll.m4 +++ b/m4/strtoll.m4 @@ -1,5 +1,5 @@ -# strtoll.m4 serial 7 -dnl Copyright (C) 2002, 2004, 2006, 2008-2019 Free Software Foundation, Inc. +# strtoll.m4 serial 8 +dnl Copyright (C) 2002, 2004, 2006, 2008-2020 Free Software Foundation, Inc. dnl This file is free software; the Free Software Foundation dnl gives unlimited permission to copy and/or distribute it, dnl with or without modifications, as long as this notice is preserved. @@ -7,14 +7,9 @@ dnl with or without modifications, as long as this notice is preserved. AC_DEFUN([gl_FUNC_STRTOLL], [ AC_REQUIRE([gl_STDLIB_H_DEFAULTS]) - dnl We don't need (and can't compile) the replacement strtoll - dnl unless the type 'long long int' exists. - AC_REQUIRE([AC_TYPE_LONG_LONG_INT]) - if test "$ac_cv_type_long_long_int" = yes; then - AC_CHECK_FUNCS([strtoll]) - if test $ac_cv_func_strtoll = no; then - HAVE_STRTOLL=0 - fi + AC_CHECK_FUNCS([strtoll]) + if test $ac_cv_func_strtoll = no; then + HAVE_STRTOLL=0 fi ]) diff --git a/m4/strtoull.m4 b/m4/strtoull.m4 index 532139c..b40210d 100644 --- a/m4/strtoull.m4 +++ b/m4/strtoull.m4 @@ -1,5 +1,5 @@ -# strtoull.m4 serial 7 -dnl Copyright (C) 2002, 2004, 2006, 2008-2019 Free Software Foundation, Inc. +# strtoull.m4 serial 8 +dnl Copyright (C) 2002, 2004, 2006, 2008-2020 Free Software Foundation, Inc. dnl This file is free software; the Free Software Foundation dnl gives unlimited permission to copy and/or distribute it, dnl with or without modifications, as long as this notice is preserved. @@ -7,14 +7,9 @@ dnl with or without modifications, as long as this notice is preserved. AC_DEFUN([gl_FUNC_STRTOULL], [ AC_REQUIRE([gl_STDLIB_H_DEFAULTS]) - dnl We don't need (and can't compile) the replacement strtoull - dnl unless the type 'unsigned long long int' exists. - AC_REQUIRE([AC_TYPE_UNSIGNED_LONG_LONG_INT]) - if test "$ac_cv_type_unsigned_long_long_int" = yes; then - AC_CHECK_FUNCS([strtoull]) - if test $ac_cv_func_strtoull = no; then - HAVE_STRTOULL=0 - fi + AC_CHECK_FUNCS([strtoull]) + if test $ac_cv_func_strtoull = no; then + HAVE_STRTOULL=0 fi ]) diff --git a/m4/symlink.m4 b/m4/symlink.m4 index 508e94d..9cfdf93 100644 --- a/m4/symlink.m4 +++ b/m4/symlink.m4 @@ -1,7 +1,7 @@ -# serial 8 +# serial 9 # See if we need to provide symlink replacement. -dnl Copyright (C) 2009-2019 Free Software Foundation, Inc. +dnl Copyright (C) 2009-2020 Free Software Foundation, Inc. dnl This file is free software; the Free Software Foundation dnl gives unlimited permission to copy and/or distribute it, dnl with or without modifications, as long as this notice is preserved. @@ -40,8 +40,8 @@ AC_DEFUN([gl_FUNC_SYMLINK], linux-* | linux) gl_cv_func_symlink_works="guessing yes" ;; # Guess yes on glibc systems. *-gnu* | gnu*) gl_cv_func_symlink_works="guessing yes" ;; - # If we don't know, assume the worst. - *) gl_cv_func_symlink_works="guessing no" ;; + # If we don't know, obey --enable-cross-guesses. + *) gl_cv_func_symlink_works="$gl_cross_guess_normal" ;; esac ]) rm -f conftest.f conftest.link conftest.lnk2]) diff --git a/m4/sys_ioctl_h.m4 b/m4/sys_ioctl_h.m4 index 5400421..98d24e8 100644 --- a/m4/sys_ioctl_h.m4 +++ b/m4/sys_ioctl_h.m4 @@ -1,5 +1,5 @@ -# sys_ioctl_h.m4 serial 10 -dnl Copyright (C) 2008-2019 Free Software Foundation, Inc. +# sys_ioctl_h.m4 serial 12 +dnl Copyright (C) 2008-2020 Free Software Foundation, Inc. dnl This file is free software; the Free Software Foundation dnl gives unlimited permission to copy and/or distribute it, dnl with or without modifications, as long as this notice is preserved. @@ -22,8 +22,8 @@ AC_DEFUN([gl_SYS_IOCTL_H], [dnl We cannot use AC_CHECK_DECL because it produces its own messages. AC_COMPILE_IFELSE( [AC_LANG_PROGRAM( - [AC_INCLUDES_DEFAULT([#include ])], - [(void) ioctl;])], + [[#include ]], + [[(void) ioctl;]])], [gl_cv_decl_ioctl_in_sys_ioctl_h=yes], [gl_cv_decl_ioctl_in_sys_ioctl_h=no]) ]) diff --git a/m4/sys_random_h.m4 b/m4/sys_random_h.m4 new file mode 100644 index 0000000..8c5d537 --- /dev/null +++ b/m4/sys_random_h.m4 @@ -0,0 +1,53 @@ +# sys_random_h.m4 serial 5 +dnl Copyright (C) 2020 Free Software Foundation, Inc. +dnl This file is free software; the Free Software Foundation +dnl gives unlimited permission to copy and/or distribute it, +dnl with or without modifications, as long as this notice is preserved. + +AC_DEFUN([gl_HEADER_SYS_RANDOM], +[ + AC_REQUIRE([gl_SYS_RANDOM_H_DEFAULTS]) + dnl is always overridden, because of GNULIB_POSIXCHECK. + gl_CHECK_NEXT_HEADERS([sys/random.h]) + if test $ac_cv_header_sys_random_h = yes; then + HAVE_SYS_RANDOM_H=1 + else + HAVE_SYS_RANDOM_H=0 + fi + AC_SUBST([HAVE_SYS_RANDOM_H]) + + m4_ifdef([gl_UNISTD_H_DEFAULTS], [AC_REQUIRE([gl_UNISTD_H_DEFAULTS])]) + if test $ac_cv_header_sys_random_h = yes; then + UNISTD_H_HAVE_SYS_RANDOM_H=1 + fi + + 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([[ +#if HAVE_SYS_RANDOM_H +/* Additional includes are needed before on uClibc + and Mac OS X. */ +# include +# include +# include +#endif + ]], + [getrandom]) +]) + +AC_DEFUN([gl_SYS_RANDOM_MODULE_INDICATOR], +[ + dnl Use AC_REQUIRE here, so that the default settings are expanded once only. + AC_REQUIRE([gl_SYS_RANDOM_H_DEFAULTS]) + gl_MODULE_INDICATOR_SET_VARIABLE([$1]) + dnl Define it also as a C macro, for the benefit of the unit tests. + gl_MODULE_INDICATOR_FOR_TESTS([$1]) +]) + +AC_DEFUN([gl_SYS_RANDOM_H_DEFAULTS], +[ + GNULIB_GETRANDOM=0; AC_SUBST([GNULIB_GETRANDOM]) + dnl Assume proper GNU behavior unless another module says otherwise. + HAVE_GETRANDOM=1; AC_SUBST([HAVE_GETRANDOM]) + REPLACE_GETRANDOM=0; AC_SUBST([REPLACE_GETRANDOM]) +]) diff --git a/m4/sys_select_h.m4 b/m4/sys_select_h.m4 index 918212a..fa19bb6 100644 --- a/m4/sys_select_h.m4 +++ b/m4/sys_select_h.m4 @@ -1,5 +1,5 @@ # sys_select_h.m4 serial 20 -dnl Copyright (C) 2006-2019 Free Software Foundation, Inc. +dnl Copyright (C) 2006-2020 Free Software Foundation, Inc. dnl This file is free software; the Free Software Foundation dnl gives unlimited permission to copy and/or distribute it, dnl with or without modifications, as long as this notice is preserved. diff --git a/m4/sys_socket_h.m4 b/m4/sys_socket_h.m4 index d0a9020..bf902f0 100644 --- a/m4/sys_socket_h.m4 +++ b/m4/sys_socket_h.m4 @@ -1,5 +1,5 @@ -# sys_socket_h.m4 serial 24 -dnl Copyright (C) 2005-2019 Free Software Foundation, Inc. +# sys_socket_h.m4 serial 25 +dnl Copyright (C) 2005-2020 Free Software Foundation, Inc. dnl This file is free software; the Free Software Foundation dnl gives unlimited permission to copy and/or distribute it, dnl with or without modifications, as long as this notice is preserved. @@ -95,6 +95,8 @@ AC_DEFUN([gl_HEADER_SYS_SOCKET], #include ]], [socket connect accept bind getpeername getsockname getsockopt listen recv send recvfrom sendto setsockopt shutdown accept4]) + + AC_REQUIRE([AC_C_RESTRICT]) ]) AC_DEFUN([gl_PREREQ_SYS_H_SOCKET], diff --git a/m4/sys_stat_h.m4 b/m4/sys_stat_h.m4 index 361ac3f..929144d 100644 --- a/m4/sys_stat_h.m4 +++ b/m4/sys_stat_h.m4 @@ -1,5 +1,5 @@ -# sys_stat_h.m4 serial 31 -*- Autoconf -*- -dnl Copyright (C) 2006-2019 Free Software Foundation, Inc. +# sys_stat_h.m4 serial 34 -*- Autoconf -*- +dnl Copyright (C) 2006-2020 Free Software Foundation, Inc. dnl This file is free software; the Free Software Foundation dnl gives unlimited permission to copy and/or distribute it, dnl with or without modifications, as long as this notice is preserved. @@ -46,9 +46,11 @@ AC_DEFUN([gl_HEADER_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 - ]], [fchmodat fstat fstatat futimens lchmod lstat mkdirat mkfifo mkfifoat - mknod mknodat stat utimensat]) -]) # gl_HEADER_SYS_STAT_H + ]], [fchmodat fstat fstatat futimens getumask lchmod lstat + mkdirat mkfifo mkfifoat mknod mknodat stat utimensat]) + + AC_REQUIRE([AC_C_RESTRICT]) +]) AC_DEFUN([gl_SYS_STAT_MODULE_INDICATOR], [ @@ -66,6 +68,7 @@ AC_DEFUN([gl_SYS_STAT_H_DEFAULTS], GNULIB_FSTAT=0; AC_SUBST([GNULIB_FSTAT]) GNULIB_FSTATAT=0; AC_SUBST([GNULIB_FSTATAT]) GNULIB_FUTIMENS=0; AC_SUBST([GNULIB_FUTIMENS]) + GNULIB_GETUMASK=0; AC_SUBST([GNULIB_GETUMASK]) GNULIB_LCHMOD=0; AC_SUBST([GNULIB_LCHMOD]) GNULIB_LSTAT=0; AC_SUBST([GNULIB_LSTAT]) GNULIB_MKDIRAT=0; AC_SUBST([GNULIB_MKDIRAT]) @@ -80,6 +83,7 @@ AC_DEFUN([gl_SYS_STAT_H_DEFAULTS], HAVE_FCHMODAT=1; AC_SUBST([HAVE_FCHMODAT]) HAVE_FSTATAT=1; AC_SUBST([HAVE_FSTATAT]) HAVE_FUTIMENS=1; AC_SUBST([HAVE_FUTIMENS]) + HAVE_GETUMASK=1; AC_SUBST([HAVE_GETUMASK]) HAVE_LCHMOD=1; AC_SUBST([HAVE_LCHMOD]) HAVE_LSTAT=1; AC_SUBST([HAVE_LSTAT]) HAVE_MKDIRAT=1; AC_SUBST([HAVE_MKDIRAT]) @@ -88,6 +92,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_FCHMODAT=0; AC_SUBST([REPLACE_FCHMODAT]) REPLACE_FSTAT=0; AC_SUBST([REPLACE_FSTAT]) REPLACE_FSTATAT=0; AC_SUBST([REPLACE_FSTATAT]) REPLACE_FUTIMENS=0; AC_SUBST([REPLACE_FUTIMENS]) diff --git a/m4/sys_time_h.m4 b/m4/sys_time_h.m4 index 3d9233a..8fc8599 100644 --- a/m4/sys_time_h.m4 +++ b/m4/sys_time_h.m4 @@ -1,7 +1,7 @@ # Configure a replacement for . # serial 9 -# Copyright (C) 2007, 2009-2019 Free Software Foundation, Inc. +# Copyright (C) 2007, 2009-2020 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 be06559..419b857 100644 --- a/m4/sys_types_h.m4 +++ b/m4/sys_types_h.m4 @@ -1,5 +1,5 @@ -# sys_types_h.m4 serial 9 -dnl Copyright (C) 2011-2019 Free Software Foundation, Inc. +# sys_types_h.m4 serial 10 +dnl Copyright (C) 2011-2020 Free Software Foundation, Inc. dnl This file is free software; the Free Software Foundation dnl gives unlimited permission to copy and/or distribute it, dnl with or without modifications, as long as this notice is preserved. @@ -37,7 +37,7 @@ AC_DEFUN([gl_SYS_TYPES_H_DEFAULTS], # This works around a buggy version in autoconf <= 2.69. # See -m4_version_prereq([2.70], [], [ +m4_version_prereq([2.69c], [], [ # This is taken from the following Autoconf patch: # https://git.savannah.gnu.org/cgit/autoconf.git/commit/?id=e17a30e987d7ee695fb4294a82d987ec3dc9b974 diff --git a/m4/sys_uio_h.m4 b/m4/sys_uio_h.m4 index 8b8ba6d..a255dea 100644 --- a/m4/sys_uio_h.m4 +++ b/m4/sys_uio_h.m4 @@ -1,5 +1,5 @@ # sys_uio_h.m4 serial 1 -dnl Copyright (C) 2011-2019 Free Software Foundation, Inc. +dnl Copyright (C) 2011-2020 Free Software Foundation, Inc. dnl This file is free software; the Free Software Foundation dnl gives unlimited permission to copy and/or distribute it, dnl with or without modifications, as long as this notice is preserved. diff --git a/m4/tempname.m4 b/m4/tempname.m4 index 664a632..da439f0 100644 --- a/m4/tempname.m4 +++ b/m4/tempname.m4 @@ -1,6 +1,6 @@ #serial 5 -# Copyright (C) 2006-2007, 2009-2019 Free Software Foundation, Inc. +# Copyright (C) 2006-2007, 2009-2020 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 decf6a8..d1e62b8 100644 --- a/m4/thread.m4 +++ b/m4/thread.m4 @@ -1,5 +1,5 @@ # thread.m4 serial 3 -dnl Copyright (C) 2008-2019 Free Software Foundation, Inc. +dnl Copyright (C) 2008-2020 Free Software Foundation, Inc. dnl This file is free software; the Free Software Foundation dnl gives unlimited permission to copy and/or distribute it, dnl with or without modifications, as long as this notice is preserved. diff --git a/m4/threadlib.m4 b/m4/threadlib.m4 index 045d9da..e03c34f 100644 --- a/m4/threadlib.m4 +++ b/m4/threadlib.m4 @@ -1,5 +1,5 @@ -# threadlib.m4 serial 20 -dnl Copyright (C) 2005-2019 Free Software Foundation, Inc. +# threadlib.m4 serial 29 +dnl Copyright (C) 2005-2020 Free Software Foundation, Inc. dnl This file is free software; the Free Software Foundation dnl gives unlimited permission to copy and/or distribute it, dnl with or without modifications, as long as this notice is preserved. @@ -8,6 +8,344 @@ dnl From Bruno Haible. AC_PREREQ([2.60]) +dnl The general structure of the multithreading modules in gnulib is that we +dnl have three set of modules: +dnl +dnl * POSIX API: +dnl pthread, which combines +dnl pthread-h +dnl pthread-thread +dnl pthread-once +dnl pthread-mutex +dnl pthread-rwlock +dnl pthread-cond +dnl pthread-tss +dnl pthread-spin +dnl sched_yield +dnl +dnl * ISO C API: +dnl threads, which combines +dnl threads-h +dnl thrd +dnl mtx +dnl cnd +dnl tss +dnl +dnl * Gnulib API, with an implementation that can be chosen at configure +dnl time through the option --enable-threads=... +dnl thread +dnl lock +dnl cond +dnl tls +dnl yield +dnl +dnl They are independent, except for the fact that +dnl - the implementation of the ISO C API may use the POSIX (or some other +dnl platform dependent) API, +dnl - the implementation of the Gnulib API may use the POSIX or ISO C or +dnl some other platform dependent API, depending on the --enable-threads +dnl option. +dnl +dnl This file contains macros for all of these APIs! + +dnl ============================================================================ +dnl Macros for all thread APIs + +AC_DEFUN([gl_ANYTHREADLIB_EARLY], +[ + AC_REQUIRE([AC_CANONICAL_HOST]) + if test -z "$gl_anythreadlib_early_done"; then + case "$host_os" in + osf*) + # On OSF/1, the compiler needs the flag -D_REENTRANT so that it + # groks . cc also understands the flag -pthread, but + # we don't use it because 1. gcc-2.95 doesn't understand -pthread, + # 2. putting a flag into CPPFLAGS that has an effect on the linker + # causes the AC_LINK_IFELSE test below to succeed unexpectedly, + # leading to wrong values of LIBTHREAD and LTLIBTHREAD. + CPPFLAGS="$CPPFLAGS -D_REENTRANT" + ;; + esac + # Some systems optimize for single-threaded programs by default, and + # need special flags to disable these optimizations. For example, the + # definition of 'errno' in . + case "$host_os" in + aix* | freebsd*) CPPFLAGS="$CPPFLAGS -D_THREAD_SAFE" ;; + solaris*) CPPFLAGS="$CPPFLAGS -D_REENTRANT" ;; + esac + gl_anythreadlib_early_done=done + fi +]) + +dnl Checks whether the compiler and linker support weak declarations of symbols. + +AC_DEFUN([gl_WEAK_SYMBOLS], +[ + AC_REQUIRE([AC_CANONICAL_HOST]) + AC_CACHE_CHECK([whether imported symbols can be declared weak], + [gl_cv_have_weak], + [gl_cv_have_weak=no + dnl First, test whether the compiler accepts it syntactically. + AC_LINK_IFELSE( + [AC_LANG_PROGRAM( + [[extern void xyzzy (); +#pragma weak xyzzy]], + [[xyzzy();]])], + [gl_cv_have_weak=maybe]) + if test $gl_cv_have_weak = maybe; then + dnl Second, test whether it actually works. On Cygwin 1.7.2, with + dnl gcc 4.3, symbols declared weak always evaluate to the address 0. + AC_RUN_IFELSE( + [AC_LANG_SOURCE([[ +#include +#pragma weak fputs +int main () +{ + return (fputs == NULL); +}]])], + [gl_cv_have_weak=yes], + [gl_cv_have_weak=no], + [dnl When cross-compiling, assume that only ELF platforms support + dnl weak symbols. + AC_EGREP_CPP([Extensible Linking Format], + [#ifdef __ELF__ + Extensible Linking Format + #endif + ], + [gl_cv_have_weak="guessing yes"], + [gl_cv_have_weak="guessing no"]) + ]) + fi + dnl But when linking statically, weak symbols don't work. + case " $LDFLAGS " in + *" -static "*) gl_cv_have_weak=no ;; + esac + dnl Test for a bug in FreeBSD 11: A link error occurs when using a weak + dnl symbol and linking against a shared library that has a dependency on + dnl the shared library that defines the symbol. + case "$gl_cv_have_weak" in + *yes) + case "$host_os" in + freebsd* | dragonfly*) + : > conftest1.c + $CC $CPPFLAGS $CFLAGS $LDFLAGS -fPIC -shared -o libempty.so conftest1.c -lpthread >&AS_MESSAGE_LOG_FD 2>&1 + cat < conftest2.c +#include +#pragma weak pthread_mutexattr_gettype +int main () +{ + return (pthread_mutexattr_gettype != NULL); +} +EOF + $CC $CPPFLAGS $CFLAGS $LDFLAGS -o conftest conftest2.c libempty.so >&AS_MESSAGE_LOG_FD 2>&1 \ + || gl_cv_have_weak=no + rm -f conftest1.c libempty.so conftest2.c conftest + ;; + esac + ;; + esac + ]) + case "$gl_cv_have_weak" in + *yes) + AC_DEFINE([HAVE_WEAK_SYMBOLS], [1], + [Define to 1 if the compiler and linker support weak declarations of symbols.]) + ;; + esac +]) + +dnl ============================================================================ +dnl Macros for the POSIX API + +dnl gl_PTHREADLIB +dnl ------------- +dnl Tests for the libraries needs for using the POSIX threads API. +dnl Sets the variable LIBPTHREAD to the linker options for use in a Makefile. +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 sched_yield() function. +dnl Adds to CPPFLAGS the flag -D_REENTRANT or -D_THREAD_SAFE if needed for +dnl multithread-safe programs. +dnl Defines the C macro HAVE_PTHREAD_API if (at least parts of) the POSIX +dnl threads API is available. + +dnl The guts of gl_PTHREADLIB. Needs to be expanded only once. + +AC_DEFUN([gl_PTHREADLIB_BODY], +[ + AC_REQUIRE([gl_ANYTHREADLIB_EARLY]) + if test -z "$gl_pthreadlib_body_done"; then + gl_pthread_api=no + LIBPTHREAD= + LIBPMULTITHREAD= + # On OSF/1, the compiler needs the flag -pthread or -D_REENTRANT so that + # it groks . It's added above, in gl_ANYTHREADLIB_EARLY. + AC_CHECK_HEADER([pthread.h], + [gl_have_pthread_h=yes], [gl_have_pthread_h=no]) + if test "$gl_have_pthread_h" = yes; then + # Other possible tests: + # -lpthreads (FSU threads, PCthreads) + # -lgthreads + # Test whether both pthread_mutex_lock and pthread_mutexattr_init exist + # in libc. IRIX 6.5 has the first one in both libc and libpthread, but + # the second one only in libpthread, and lock.c needs it. + # + # If -pthread works, prefer it to -lpthread, since Ubuntu 14.04 + # needs -pthread for some reason. See: + # https://lists.gnu.org/r/bug-gnulib/2014-09/msg00023.html + save_LIBS=$LIBS + for gl_pthread in '' '-pthread'; do + LIBS="$LIBS $gl_pthread" + AC_LINK_IFELSE( + [AC_LANG_PROGRAM( + [[#include + pthread_mutex_t m; + pthread_mutexattr_t ma; + ]], + [[pthread_mutex_lock (&m); + pthread_mutexattr_init (&ma);]])], + [gl_pthread_api=yes + LIBPTHREAD=$gl_pthread + LIBPMULTITHREAD=$gl_pthread]) + LIBS=$save_LIBS + test $gl_pthread_api = yes && break + done + + # Test for libpthread by looking for pthread_kill. (Not pthread_self, + # since it is defined as a macro on OSF/1.) + if test $gl_pthread_api = yes && test -z "$LIBPTHREAD"; then + # The program links fine without libpthread. But it may actually + # need to link with libpthread in order to create multiple threads. + AC_CHECK_LIB([pthread], [pthread_kill], + [LIBPMULTITHREAD=-lpthread + # On Solaris and HP-UX, most pthread functions exist also in libc. + # Therefore pthread_in_use() needs to actually try to create a + # thread: pthread_create from libc will fail, whereas + # pthread_create will actually create a thread. + # 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*) + AC_DEFINE([PTHREAD_IN_USE_DETECTION_HARD], [1], + [Define if the pthread_in_use() detection is hard.]) + esac + ]) + elif test $gl_pthread_api != yes; then + # Some library is needed. Try libpthread and libc_r. + AC_CHECK_LIB([pthread], [pthread_kill], + [gl_pthread_api=yes + LIBPTHREAD=-lpthread + LIBPMULTITHREAD=-lpthread]) + if test $gl_pthread_api != yes; then + # For FreeBSD 4. + AC_CHECK_LIB([c_r], [pthread_kill], + [gl_pthread_api=yes + LIBPTHREAD=-lc_r + LIBPMULTITHREAD=-lc_r]) + fi + fi + fi + AC_MSG_CHECKING([whether POSIX threads API is available]) + AC_MSG_RESULT([$gl_pthread_api]) + AC_SUBST([LIBPTHREAD]) + AC_SUBST([LIBPMULTITHREAD]) + if test $gl_pthread_api = yes; then + AC_DEFINE([HAVE_PTHREAD_API], [1], + [Define if you have the header and the POSIX threads API.]) + fi + + dnl On some systems, sched_yield is in librt, rather than in libpthread. + AC_LINK_IFELSE( + [AC_LANG_PROGRAM( + [[#include ]], + [[sched_yield ();]])], + [LIB_SCHED_YIELD= + ], + [dnl Solaris 7...10 has sched_yield in librt, not in libpthread or libc. + AC_CHECK_LIB([rt], [sched_yield], [LIB_SCHED_YIELD=-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_SUBST([LIB_SCHED_YIELD]) + + gl_pthreadlib_body_done=done + fi +]) + +AC_DEFUN([gl_PTHREADLIB], +[ + AC_REQUIRE([gl_ANYTHREADLIB_EARLY]) + gl_PTHREADLIB_BODY +]) + +dnl ============================================================================ +dnl Macros for the ISO C API + +dnl gl_STDTHREADLIB +dnl --------------- +dnl Tests for the libraries needs for using the ISO C threads API. +dnl Sets the variable LIBSTDTHREAD to the linker options for use in a Makefile. +dnl Adds to CPPFLAGS the flag -D_REENTRANT or -D_THREAD_SAFE if needed for +dnl multithread-safe programs. +dnl Defines the C macro HAVE_THREADS_H if (at least parts of) the ISO C threads +dnl API is available. + +dnl The guts of gl_STDTHREADLIB. Needs to be expanded only once. + +AC_DEFUN([gl_STDTHREADLIB_BODY], +[ + AC_REQUIRE([gl_ANYTHREADLIB_EARLY]) + AC_REQUIRE([AC_CANONICAL_HOST]) + if test -z "$gl_stdthreadlib_body_done"; then + AC_CHECK_HEADERS_ONCE([threads.h]) + + case "$host_os" in + mingw*) + LIBSTDTHREAD= + ;; + *) + gl_PTHREADLIB_BODY + if test $ac_cv_header_threads_h = yes; then + dnl glibc >= 2.29 has thrd_create in libpthread. + dnl FreeBSD >= 10 has thrd_create in libstdthreads; this library depends + dnl on libpthread (for the symbol 'pthread_mutexattr_gettype'). + dnl AIX >= 7.1 and Solaris >= 11.4 have thrd_create in libc. + AC_CHECK_FUNCS([thrd_create]) + if test $ac_cv_func_thrd_create = yes; then + LIBSTDTHREAD= + else + AC_CHECK_LIB([stdthreads], [thrd_create], [ + LIBSTDTHREAD='-lstdthreads -lpthread' + ], [ + dnl Guess that thrd_create is in libpthread. + LIBSTDTHREAD="$LIBPMULTITHREAD" + ]) + fi + else + dnl Libraries needed by thrd.c, mtx.c, cnd.c, tss.c. + LIBSTDTHREAD="$LIBPMULTITHREAD $LIB_SCHED_YIELD" + fi + ;; + esac + AC_SUBST([LIBSTDTHREAD]) + + AC_MSG_CHECKING([whether ISO C threads API is available]) + AC_MSG_RESULT([$ac_cv_header_threads_h]) + gl_stdthreadlib_body_done=done + fi +]) + +AC_DEFUN([gl_STDTHREADLIB], +[ + AC_REQUIRE([gl_ANYTHREADLIB_EARLY]) + gl_STDTHREADLIB_BODY +]) + +dnl ============================================================================ +dnl Macros for the Gnulib API + dnl gl_THREADLIB dnl ------------ dnl Tests for a multithreading library to be used. @@ -16,7 +354,13 @@ dnl (it must be placed before the invocation of gl_THREADLIB_EARLY!), then the dnl default is 'no', otherwise it is system dependent. In both cases, the user dnl can change the choice through the options --enable-threads=choice or dnl --disable-threads. -dnl Defines at most one of the macros USE_POSIX_THREADS, USE_WINDOWS_THREADS. +dnl Defines at most one of the macros USE_ISOC_THREADS, USE_POSIX_THREADS, +dnl USE_ISOC_AND_POSIX_THREADS, USE_WINDOWS_THREADS. +dnl The choice --enable-threads=isoc+posix is available only on platforms that +dnl have both the ISO C and the POSIX threads APIs. It has the effect of using +dnl the ISO C API for most things and the POSIX API only for creating and +dnl controlling threads (because there is no equivalent to pthread_atfork in +dnl the ISO C API). dnl Sets the variables LIBTHREAD and LTLIBTHREAD to the linker options for use dnl in a Makefile (LIBTHREAD for use without libtool, LTLIBTHREAD for use with dnl libtool). @@ -54,8 +398,8 @@ AC_DEFUN([gl_THREADLIB_EARLY_BODY], [m4_divert_text([DEFAULTS], [gl_use_threads_default=])]) m4_divert_text([DEFAULTS], [gl_use_winpthreads_default=]) AC_ARG_ENABLE([threads], -AC_HELP_STRING([--enable-threads={posix|windows}], [specify multithreading API])m4_ifdef([gl_THREADLIB_DEFAULT_NO], [], [ -AC_HELP_STRING([--disable-threads], [build without multithread safety])]), +AS_HELP_STRING([--enable-threads={isoc|posix|isoc+posix|windows}], [specify multithreading API])m4_ifdef([gl_THREADLIB_DEFAULT_NO], [], [ +AS_HELP_STRING([--disable-threads], [build without multithread safety])]), [gl_use_threads=$enableval], [if test -n "$gl_use_threads_default"; then gl_use_threads="$gl_use_threads_default" @@ -88,26 +432,12 @@ changequote(,)dnl changequote([,])dnl fi ]) - if test "$gl_use_threads" = yes || test "$gl_use_threads" = posix; then - # For using : - case "$host_os" in - osf*) - # On OSF/1, the compiler needs the flag -D_REENTRANT so that it - # groks . cc also understands the flag -pthread, but - # we don't use it because 1. gcc-2.95 doesn't understand -pthread, - # 2. putting a flag into CPPFLAGS that has an effect on the linker - # causes the AC_LINK_IFELSE test below to succeed unexpectedly, - # leading to wrong values of LIBTHREAD and LTLIBTHREAD. - CPPFLAGS="$CPPFLAGS -D_REENTRANT" - ;; - esac - # Some systems optimize for single-threaded programs by default, and - # need special flags to disable these optimizations. For example, the - # definition of 'errno' in . - case "$host_os" in - aix* | freebsd*) CPPFLAGS="$CPPFLAGS -D_THREAD_SAFE" ;; - solaris*) CPPFLAGS="$CPPFLAGS -D_REENTRANT" ;; - esac + if test "$gl_use_threads" = yes \ + || test "$gl_use_threads" = isoc \ + || test "$gl_use_threads" = posix \ + || test "$gl_use_threads" = isoc+posix; then + # For using or : + gl_ANYTHREADLIB_EARLY fi ]) @@ -123,45 +453,7 @@ AC_DEFUN([gl_THREADLIB_BODY], LTLIBMULTITHREAD= if test "$gl_use_threads" != no; then dnl Check whether the compiler and linker support weak declarations. - AC_CACHE_CHECK([whether imported symbols can be declared weak], - [gl_cv_have_weak], - [gl_cv_have_weak=no - dnl First, test whether the compiler accepts it syntactically. - AC_LINK_IFELSE( - [AC_LANG_PROGRAM( - [[extern void xyzzy (); -#pragma weak xyzzy]], - [[xyzzy();]])], - [gl_cv_have_weak=maybe]) - if test $gl_cv_have_weak = maybe; then - dnl Second, test whether it actually works. On Cygwin 1.7.2, with - dnl gcc 4.3, symbols declared weak always evaluate to the address 0. - AC_RUN_IFELSE( - [AC_LANG_SOURCE([[ -#include -#pragma weak fputs -int main () -{ - return (fputs == NULL); -}]])], - [gl_cv_have_weak=yes], - [gl_cv_have_weak=no], - [dnl When cross-compiling, assume that only ELF platforms support - dnl weak symbols. - AC_EGREP_CPP([Extensible Linking Format], - [#ifdef __ELF__ - Extensible Linking Format - #endif - ], - [gl_cv_have_weak="guessing yes"], - [gl_cv_have_weak="guessing no"]) - ]) - fi - dnl But when linking statically, weak symbols don't work. - case " $LDFLAGS " in - *" -static "*) gl_cv_have_weak=no ;; - esac - ]) + gl_WEAK_SYMBOLS if case "$gl_cv_have_weak" in *yes) true;; *) false;; esac; then dnl If we use weak symbols to implement pthread_in_use / pth_in_use / dnl thread_in_use, we also need to test whether the ISO C 11 thrd_create @@ -169,75 +461,23 @@ int main () AC_CHECK_HEADERS_ONCE([threads.h]) : fi - if test "$gl_use_threads" = yes || test "$gl_use_threads" = posix; then - # On OSF/1, the compiler needs the flag -pthread or -D_REENTRANT so that - # it groks . It's added above, in gl_THREADLIB_EARLY_BODY. - AC_CHECK_HEADER([pthread.h], - [gl_have_pthread_h=yes], [gl_have_pthread_h=no]) - if test "$gl_have_pthread_h" = yes; then - # Other possible tests: - # -lpthreads (FSU threads, PCthreads) - # -lgthreads - gl_have_pthread= - # Test whether both pthread_mutex_lock and pthread_mutexattr_init exist - # in libc. IRIX 6.5 has the first one in both libc and libpthread, but - # the second one only in libpthread, and lock.c needs it. - # - # If -pthread works, prefer it to -lpthread, since Ubuntu 14.04 - # needs -pthread for some reason. See: - # https://lists.gnu.org/r/bug-gnulib/2014-09/msg00023.html - save_LIBS=$LIBS - for gl_pthread in '' '-pthread'; do - LIBS="$LIBS $gl_pthread" - AC_LINK_IFELSE( - [AC_LANG_PROGRAM( - [[#include - pthread_mutex_t m; - pthread_mutexattr_t ma; - ]], - [[pthread_mutex_lock (&m); - pthread_mutexattr_init (&ma);]])], - [gl_have_pthread=yes - LIBTHREAD=$gl_pthread LTLIBTHREAD=$gl_pthread - LIBMULTITHREAD=$gl_pthread LTLIBMULTITHREAD=$gl_pthread]) - LIBS=$save_LIBS - test -n "$gl_have_pthread" && break - done - - # Test for libpthread by looking for pthread_kill. (Not pthread_self, - # since it is defined as a macro on OSF/1.) - if test -n "$gl_have_pthread" && test -z "$LIBTHREAD"; then - # The program links fine without libpthread. But it may actually - # need to link with libpthread in order to create multiple threads. - AC_CHECK_LIB([pthread], [pthread_kill], - [LIBMULTITHREAD=-lpthread LTLIBMULTITHREAD=-lpthread - # On Solaris and HP-UX, most pthread functions exist also in libc. - # Therefore pthread_in_use() needs to actually try to create a - # thread: pthread_create from libc will fail, whereas - # pthread_create will actually create a thread. - # 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*) - AC_DEFINE([PTHREAD_IN_USE_DETECTION_HARD], [1], - [Define if the pthread_in_use() detection is hard.]) - esac - ]) - elif test -z "$gl_have_pthread"; then - # Some library is needed. Try libpthread and libc_r. - AC_CHECK_LIB([pthread], [pthread_kill], - [gl_have_pthread=yes - LIBTHREAD=-lpthread LTLIBTHREAD=-lpthread - LIBMULTITHREAD=-lpthread LTLIBMULTITHREAD=-lpthread]) - if test -z "$gl_have_pthread"; then - # For FreeBSD 4. - AC_CHECK_LIB([c_r], [pthread_kill], - [gl_have_pthread=yes - LIBTHREAD=-lc_r LTLIBTHREAD=-lc_r - LIBMULTITHREAD=-lc_r LTLIBMULTITHREAD=-lc_r]) - fi - fi - if test -n "$gl_have_pthread"; then + if test "$gl_use_threads" = isoc || test "$gl_use_threads" = isoc+posix; then + AC_CHECK_HEADERS_ONCE([threads.h]) + gl_have_isoc_threads="$ac_cv_header_threads_h" + fi + if test "$gl_use_threads" = yes \ + || test "$gl_use_threads" = posix \ + || test "$gl_use_threads" = isoc+posix; then + gl_PTHREADLIB_BODY + LIBTHREAD=$LIBPTHREAD LTLIBTHREAD=$LIBPTHREAD + LIBMULTITHREAD=$LIBPMULTITHREAD LTLIBMULTITHREAD=$LIBPMULTITHREAD + if test $gl_pthread_api = yes; then + if test "$gl_use_threads" = isoc+posix && test "$gl_have_isoc_threads" = yes; then + gl_threads_api='isoc+posix' + AC_DEFINE([USE_ISOC_AND_POSIX_THREADS], [1], + [Define if the combination of the ISO C and POSIX multithreading APIs can be used.]) + LIBTHREAD= LTLIBTHREAD= + else gl_threads_api=posix AC_DEFINE([USE_POSIX_THREADS], [1], [Define if the POSIX multithreading library can be used.]) @@ -245,14 +485,34 @@ int main () if case "$gl_cv_have_weak" in *yes) true;; *) false;; esac; then AC_DEFINE([USE_POSIX_THREADS_WEAK], [1], [Define if references to the POSIX multithreading library should be made weak.]) - LIBTHREAD= - LTLIBTHREAD= + LIBTHREAD= LTLIBTHREAD= + else + case "$host_os" in + freebsd* | dragonfly*) + if test "x$LIBTHREAD" != "x$LIBMULTITHREAD"; then + dnl If weak symbols can't tell whether pthread_create(), pthread_key_create() + dnl etc. will succeed, we need a runtime test. + AC_DEFINE([PTHREAD_IN_USE_DETECTION_HARD], [1], + [Define if the pthread_in_use() detection is hard.]) + fi + ;; + esac fi fi fi fi fi - if test -z "$gl_have_pthread"; then + if test $gl_threads_api = none; then + if test "$gl_use_threads" = isoc && test "$gl_have_isoc_threads" = yes; then + gl_STDTHREADLIB_BODY + LIBTHREAD=$LIBSTDTHREAD LTLIBTHREAD=$LIBSTDTHREAD + LIBMULTITHREAD=$LIBSTDTHREAD LTLIBMULTITHREAD=$LIBSTDTHREAD + gl_threads_api=isoc + AC_DEFINE([USE_ISOC_THREADS], [1], + [Define if the ISO C multithreading library can be used.]) + fi + fi + if test $gl_threads_api = none; then case "$gl_use_threads" in yes | windows | win32) # The 'win32' is for backward compatibility. if { case "$host_os" in @@ -306,6 +566,9 @@ AC_DEFUN([gl_AVOID_WINPTHREAD], [ ]) +dnl ============================================================================ + + dnl Survey of platforms: dnl dnl Platform Available Compiler Supports test-lock diff --git a/m4/time_h.m4 b/m4/time_h.m4 index f08f29b..a15c09d 100644 --- a/m4/time_h.m4 +++ b/m4/time_h.m4 @@ -1,8 +1,8 @@ # Configure a more-standard replacement for . -# Copyright (C) 2000-2001, 2003-2007, 2009-2019 Free Software Foundation, Inc. +# Copyright (C) 2000-2001, 2003-2007, 2009-2020 Free Software Foundation, Inc. -# serial 11 +# serial 12 # This file is free software; the Free Software Foundation # gives unlimited permission to copy and/or distribute it, @@ -19,10 +19,12 @@ AC_DEFUN([gl_HEADER_TIME_H], AC_DEFUN([gl_HEADER_TIME_H_BODY], [ - AC_REQUIRE([AC_C_RESTRICT]) AC_REQUIRE([gl_HEADER_TIME_H_DEFAULTS]) + gl_NEXT_HEADERS([time.h]) AC_REQUIRE([gl_CHECK_TYPE_STRUCT_TIMESPEC]) + + AC_REQUIRE([AC_C_RESTRICT]) ]) dnl Check whether 'struct timespec' is declared @@ -119,7 +121,6 @@ AC_DEFUN([gl_HEADER_TIME_H_DEFAULTS], HAVE_NANOSLEEP=1; AC_SUBST([HAVE_NANOSLEEP]) HAVE_STRPTIME=1; AC_SUBST([HAVE_STRPTIME]) HAVE_TIMEGM=1; AC_SUBST([HAVE_TIMEGM]) - HAVE_TZSET=1; AC_SUBST([HAVE_TZSET]) dnl Even GNU libc does not have timezone_t yet. HAVE_TIMEZONE_T=0; AC_SUBST([HAVE_TIMEZONE_T]) dnl If another module says to replace or to not replace, do that. diff --git a/m4/unistd_h.m4 b/m4/unistd_h.m4 index a3b3905..b26d2c8 100644 --- a/m4/unistd_h.m4 +++ b/m4/unistd_h.m4 @@ -1,5 +1,5 @@ -# unistd_h.m4 serial 75 -dnl Copyright (C) 2006-2019 Free Software Foundation, Inc. +# unistd_h.m4 serial 83 +dnl Copyright (C) 2006-2020 Free Software Foundation, Inc. dnl This file is free software; the Free Software Foundation dnl gives unlimited permission to copy and/or distribute it, dnl with or without modifications, as long as this notice is preserved. @@ -41,13 +41,21 @@ AC_DEFUN([gl_UNISTD_H], # include # endif #endif - ]], [chdir chown dup dup2 dup3 environ euidaccess faccessat fchdir fchownat - fdatasync fsync ftruncate getcwd getdomainname getdtablesize getgroups - gethostname getlogin getlogin_r getpagesize getpass + ]], [access chdir chown copy_file_range dup dup2 dup3 environ euidaccess + faccessat fchdir + fchownat fdatasync fsync ftruncate getcwd getdomainname getdtablesize + getentropy getgroups gethostname getlogin getlogin_r getpagesize getpass getusershell setusershell endusershell group_member isatty lchown link linkat lseek pipe pipe2 pread pwrite readlink readlinkat rmdir sethostname sleep symlink symlinkat truncate ttyname_r unlink unlinkat usleep]) + + AC_REQUIRE([AC_C_RESTRICT]) + + AC_CHECK_DECLS_ONCE([execvpe]) + if test $ac_cv_have_decl_execvpe = no; then + HAVE_DECL_EXECVPE=0 + fi ]) AC_DEFUN([gl_UNISTD_MODULE_INDICATOR], @@ -61,6 +69,7 @@ AC_DEFUN([gl_UNISTD_MODULE_INDICATOR], AC_DEFUN([gl_UNISTD_H_DEFAULTS], [ + GNULIB_ACCESS=0; AC_SUBST([GNULIB_ACCESS]) GNULIB_CHDIR=0; AC_SUBST([GNULIB_CHDIR]) GNULIB_CHOWN=0; AC_SUBST([GNULIB_CHOWN]) GNULIB_CLOSE=0; AC_SUBST([GNULIB_CLOSE]) @@ -79,10 +88,12 @@ AC_DEFUN([gl_UNISTD_H_DEFAULTS], GNULIB_GETCWD=0; AC_SUBST([GNULIB_GETCWD]) GNULIB_GETDOMAINNAME=0; AC_SUBST([GNULIB_GETDOMAINNAME]) GNULIB_GETDTABLESIZE=0; AC_SUBST([GNULIB_GETDTABLESIZE]) + GNULIB_GETENTROPY=0; AC_SUBST([GNULIB_GETENTROPY]) GNULIB_GETGROUPS=0; AC_SUBST([GNULIB_GETGROUPS]) GNULIB_GETHOSTNAME=0; AC_SUBST([GNULIB_GETHOSTNAME]) GNULIB_GETLOGIN=0; AC_SUBST([GNULIB_GETLOGIN]) GNULIB_GETLOGIN_R=0; AC_SUBST([GNULIB_GETLOGIN_R]) + GNULIB_GETOPT_POSIX=0; AC_SUBST([GNULIB_GETOPT_POSIX]) GNULIB_GETPAGESIZE=0; AC_SUBST([GNULIB_GETPAGESIZE]) GNULIB_GETPASS=0; AC_SUBST([GNULIB_GETPASS]) GNULIB_GETUSERSHELL=0; AC_SUBST([GNULIB_GETUSERSHELL]) @@ -115,7 +126,6 @@ AC_DEFUN([gl_UNISTD_H_DEFAULTS], dnl Assume proper GNU behavior unless another module says otherwise. HAVE_CHOWN=1; AC_SUBST([HAVE_CHOWN]) HAVE_COPY_FILE_RANGE=1; AC_SUBST([HAVE_COPY_FILE_RANGE]) - HAVE_DUP2=1; AC_SUBST([HAVE_DUP2]) HAVE_DUP3=1; AC_SUBST([HAVE_DUP3]) HAVE_EUIDACCESS=1; AC_SUBST([HAVE_EUIDACCESS]) HAVE_FACCESSAT=1; AC_SUBST([HAVE_FACCESSAT]) @@ -125,6 +135,7 @@ AC_DEFUN([gl_UNISTD_H_DEFAULTS], HAVE_FSYNC=1; AC_SUBST([HAVE_FSYNC]) HAVE_FTRUNCATE=1; AC_SUBST([HAVE_FTRUNCATE]) HAVE_GETDTABLESIZE=1; AC_SUBST([HAVE_GETDTABLESIZE]) + HAVE_GETENTROPY=1; AC_SUBST([HAVE_GETENTROPY]) HAVE_GETGROUPS=1; AC_SUBST([HAVE_GETGROUPS]) HAVE_GETHOSTNAME=1; AC_SUBST([HAVE_GETHOSTNAME]) HAVE_GETLOGIN=1; AC_SUBST([HAVE_GETLOGIN]) @@ -147,6 +158,7 @@ AC_DEFUN([gl_UNISTD_H_DEFAULTS], HAVE_UNLINKAT=1; AC_SUBST([HAVE_UNLINKAT]) HAVE_USLEEP=1; AC_SUBST([HAVE_USLEEP]) HAVE_DECL_ENVIRON=1; AC_SUBST([HAVE_DECL_ENVIRON]) + HAVE_DECL_EXECVPE=1; AC_SUBST([HAVE_DECL_EXECVPE]) HAVE_DECL_FCHDIR=1; AC_SUBST([HAVE_DECL_FCHDIR]) HAVE_DECL_FDATASYNC=1; AC_SUBST([HAVE_DECL_FDATASYNC]) HAVE_DECL_GETDOMAINNAME=1; AC_SUBST([HAVE_DECL_GETDOMAINNAME]) @@ -159,6 +171,7 @@ AC_DEFUN([gl_UNISTD_H_DEFAULTS], HAVE_DECL_TTYNAME_R=1; AC_SUBST([HAVE_DECL_TTYNAME_R]) HAVE_OS_H=0; AC_SUBST([HAVE_OS_H]) HAVE_SYS_PARAM_H=0; AC_SUBST([HAVE_SYS_PARAM_H]) + REPLACE_ACCESS=0; AC_SUBST([REPLACE_ACCESS]) REPLACE_CHOWN=0; AC_SUBST([REPLACE_CHOWN]) REPLACE_CLOSE=0; AC_SUBST([REPLACE_CLOSE]) REPLACE_DUP=0; AC_SUBST([REPLACE_DUP]) @@ -193,6 +206,7 @@ AC_DEFUN([gl_UNISTD_H_DEFAULTS], REPLACE_UNLINKAT=0; AC_SUBST([REPLACE_UNLINKAT]) REPLACE_USLEEP=0; AC_SUBST([REPLACE_USLEEP]) REPLACE_WRITE=0; AC_SUBST([REPLACE_WRITE]) + UNISTD_H_HAVE_SYS_RANDOM_H=0; AC_SUBST([UNISTD_H_HAVE_SYS_RANDOM_H]) UNISTD_H_HAVE_WINSOCK2_H=0; AC_SUBST([UNISTD_H_HAVE_WINSOCK2_H]) UNISTD_H_HAVE_WINSOCK2_H_AND_USE_SOCKETS=0; AC_SUBST([UNISTD_H_HAVE_WINSOCK2_H_AND_USE_SOCKETS]) diff --git a/m4/unlink.m4 b/m4/unlink.m4 index 69fd1af..69d8ba5 100644 --- a/m4/unlink.m4 +++ b/m4/unlink.m4 @@ -1,5 +1,5 @@ -# unlink.m4 serial 13 -dnl Copyright (C) 2009-2019 Free Software Foundation, Inc. +# unlink.m4 serial 15 +dnl Copyright (C) 2009-2020 Free Software Foundation, Inc. dnl This file is free software; the Free Software Foundation dnl gives unlimited permission to copy and/or distribute it, dnl with or without modifications, as long as this notice is preserved. @@ -26,7 +26,7 @@ AC_DEFUN([gl_FUNC_UNLINK], # include #endif #include - ]], + ]GL_MDA_DEFINES], [[int result = 0; if (!unlink ("conftest.file/")) result |= 1; @@ -49,8 +49,8 @@ AC_DEFUN([gl_FUNC_UNLINK], *-gnu*) gl_cv_func_unlink_honors_slashes="guessing yes" ;; # Guess no on native Windows. mingw*) gl_cv_func_unlink_honors_slashes="guessing no" ;; - # If we don't know, assume the worst. - *) gl_cv_func_unlink_honors_slashes="guessing no" ;; + # If we don't know, obey --enable-cross-guesses. + *) gl_cv_func_unlink_honors_slashes="$gl_cross_guess_normal" ;; esac ]) rm -f conftest.file conftest.lnk]) @@ -98,6 +98,7 @@ AC_DEFUN([gl_FUNC_UNLINK], # include # include #endif + ]GL_MDA_DEFINES[ int main () { int result = 0; @@ -110,8 +111,8 @@ AC_DEFUN([gl_FUNC_UNLINK], ]])], [gl_cv_func_unlink_parent_fails=yes], [gl_cv_func_unlink_parent_fails=no], - [# If we don't know, assume the worst. - gl_cv_func_unlink_parent_fails="guessing no" + [# If we don't know, obey --enable-cross-guesses. + gl_cv_func_unlink_parent_fails="$gl_cross_guess_normal" ]) unset GL_SUBDIR_FOR_UNLINK rm -rf "$tmp" diff --git a/m4/unlinkdir.m4 b/m4/unlinkdir.m4 index 7a9c027..271083d 100644 --- a/m4/unlinkdir.m4 +++ b/m4/unlinkdir.m4 @@ -1,6 +1,6 @@ # serial 7 -# Copyright (C) 2005-2007, 2009-2019 Free Software Foundation, Inc. +# Copyright (C) 2005-2007, 2009-2020 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 4a6bff0..4d4137a 100644 --- a/m4/usleep.m4 +++ b/m4/usleep.m4 @@ -1,5 +1,5 @@ -# usleep.m4 serial 6 -dnl Copyright (C) 2009-2019 Free Software Foundation, Inc. +# usleep.m4 serial 7 +dnl Copyright (C) 2009-2020 Free Software Foundation, Inc. dnl This file is free software; the Free Software Foundation dnl gives unlimited permission to copy and/or distribute it, dnl with or without modifications, as long as this notice is preserved. @@ -35,8 +35,8 @@ AC_DEFUN([gl_FUNC_USLEEP], *-musl*) 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, assume the worst. - *) gl_cv_func_usleep_works="guessing no" ;; + # If we don't know, obey --enable-cross-guesses. + *) gl_cv_func_usleep_works="$gl_cross_guess_normal" ;; esac ])]) case "$gl_cv_func_usleep_works" in diff --git a/m4/version-etc.m4 b/m4/version-etc.m4 index 4b2c4ff..a2455e8 100644 --- a/m4/version-etc.m4 +++ b/m4/version-etc.m4 @@ -1,5 +1,5 @@ # version-etc.m4 serial 1 -# Copyright (C) 2009-2019 Free Software Foundation, Inc. +# Copyright (C) 2009-2020 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 new file mode 100644 index 0000000..9f493ba --- /dev/null +++ b/m4/visibility.m4 @@ -0,0 +1,77 @@ +# visibility.m4 serial 6 +dnl Copyright (C) 2005, 2008, 2010-2020 Free Software Foundation, Inc. +dnl This file is free software; the Free Software Foundation +dnl gives unlimited permission to copy and/or distribute it, +dnl with or without modifications, as long as this notice is preserved. + +dnl From Bruno Haible. + +dnl Tests whether the compiler supports the command-line option +dnl -fvisibility=hidden and the function and variable attributes +dnl __attribute__((__visibility__("hidden"))) and +dnl __attribute__((__visibility__("default"))). +dnl Does *not* test for __visibility__("protected") - which has tricky +dnl semantics (see the 'vismain' test in glibc) and does not exist e.g. on +dnl Mac OS X. +dnl Does *not* test for __visibility__("internal") - which has processor +dnl dependent semantics. +dnl Does *not* test for #pragma GCC visibility push(hidden) - which is +dnl "really only recommended for legacy code". +dnl Set the variable CFLAG_VISIBILITY. +dnl Defines and sets the variable HAVE_VISIBILITY. + +AC_DEFUN([gl_VISIBILITY], +[ + AC_REQUIRE([AC_PROG_CC]) + CFLAG_VISIBILITY= + HAVE_VISIBILITY=0 + if test -n "$GCC"; then + dnl First, check whether -Werror can be added to the command line, or + dnl whether it leads to an error because of some other option that the + dnl user has put into $CC $CFLAGS $CPPFLAGS. + AC_CACHE_CHECK([whether the -Werror option is usable], + [gl_cv_cc_vis_werror], + [gl_save_CFLAGS="$CFLAGS" + CFLAGS="$CFLAGS -Werror" + AC_COMPILE_IFELSE( + [AC_LANG_PROGRAM([[]], [[]])], + [gl_cv_cc_vis_werror=yes], + [gl_cv_cc_vis_werror=no]) + CFLAGS="$gl_save_CFLAGS" + ]) + dnl Now check whether visibility declarations are supported. + AC_CACHE_CHECK([for simple visibility declarations], + [gl_cv_cc_visibility], + [gl_save_CFLAGS="$CFLAGS" + CFLAGS="$CFLAGS -fvisibility=hidden" + dnl We use the option -Werror and a function dummyfunc, because on some + dnl platforms (Cygwin 1.7) the use of -fvisibility triggers a warning + dnl "visibility attribute not supported in this configuration; ignored" + dnl at the first function definition in every compilation unit, and we + dnl don't want to use the option in this case. + if test $gl_cv_cc_vis_werror = yes; then + CFLAGS="$CFLAGS -Werror" + fi + AC_COMPILE_IFELSE( + [AC_LANG_PROGRAM( + [[extern __attribute__((__visibility__("hidden"))) int hiddenvar; + extern __attribute__((__visibility__("default"))) int exportedvar; + extern __attribute__((__visibility__("hidden"))) int hiddenfunc (void); + extern __attribute__((__visibility__("default"))) int exportedfunc (void); + void dummyfunc (void) {} + ]], + [[]])], + [gl_cv_cc_visibility=yes], + [gl_cv_cc_visibility=no]) + CFLAGS="$gl_save_CFLAGS" + ]) + if test $gl_cv_cc_visibility = yes; then + CFLAG_VISIBILITY="-fvisibility=hidden" + HAVE_VISIBILITY=1 + fi + fi + AC_SUBST([CFLAG_VISIBILITY]) + AC_SUBST([HAVE_VISIBILITY]) + AC_DEFINE_UNQUOTED([HAVE_VISIBILITY], [$HAVE_VISIBILITY], + [Define to 1 or 0, depending whether the compiler supports simple visibility declarations.]) +]) diff --git a/m4/warn-on-use.m4 b/m4/warn-on-use.m4 index 7ebe2d3..1d2bcdf 100644 --- a/m4/warn-on-use.m4 +++ b/m4/warn-on-use.m4 @@ -1,5 +1,5 @@ -# warn-on-use.m4 serial 6 -dnl Copyright (C) 2010-2019 Free Software Foundation, Inc. +# warn-on-use.m4 serial 9 +dnl Copyright (C) 2010-2020 Free Software Foundation, Inc. dnl This file is free software; the Free Software Foundation dnl gives unlimited permission to copy and/or distribute it, dnl with or without modifications, as long as this notice is preserved. @@ -30,17 +30,15 @@ AC_DEFUN([gl_WARN_ON_USE_PREPARE], [AH_TEMPLATE([HAVE_RAW_DECL_]AS_TR_CPP(m4_defn([gl_decl])), [Define to 1 if ]m4_defn([gl_decl])[ is declared even after undefining macros.])])dnl -dnl FIXME: gl_Symbol must be used unquoted until we can assume -dnl autoconf 2.64 or newer. for gl_func in m4_flatten([$2]); do AS_VAR_PUSHDEF([gl_Symbol], [gl_cv_have_raw_decl_$gl_func])dnl AC_CACHE_CHECK([whether $gl_func is declared without a macro], - gl_Symbol, + [gl_Symbol], [AC_COMPILE_IFELSE([AC_LANG_PROGRAM([$1], -[@%:@undef $gl_func - (void) $gl_func;])], - [AS_VAR_SET(gl_Symbol, [yes])], [AS_VAR_SET(gl_Symbol, [no])])]) - AS_VAR_IF(gl_Symbol, [yes], +[[#undef $gl_func + (void) $gl_func;]])], + [AS_VAR_SET([gl_Symbol], [yes])], [AS_VAR_SET([gl_Symbol], [no])])]) + AS_VAR_IF([gl_Symbol], [yes], [AC_DEFINE_UNQUOTED(AS_TR_CPP([HAVE_RAW_DECL_$gl_func]), [1]) dnl shortcut - if the raw declaration exists, then set a cache dnl variable to allow skipping any later AC_CHECK_DECL efforts diff --git a/m4/warnings.m4 b/m4/warnings.m4 index 235cac6..d4e4b07 100644 --- a/m4/warnings.m4 +++ b/m4/warnings.m4 @@ -1,5 +1,5 @@ -# warnings.m4 serial 14 -dnl Copyright (C) 2008-2019 Free Software Foundation, Inc. +# warnings.m4 serial 16 +dnl Copyright (C) 2008-2020 Free Software Foundation, Inc. dnl This file is free software; the Free Software Foundation dnl gives unlimited permission to copy and/or distribute it, dnl with or without modifications, as long as this notice is preserved. @@ -23,8 +23,6 @@ m4_ifdef([AS_VAR_APPEND], # The effects of this macro depend on the current language (_AC_LANG). AC_DEFUN([gl_COMPILER_OPTION_IF], [ -dnl FIXME: gl_Warn must be used unquoted until we can assume Autoconf -dnl 2.64 or newer. AS_VAR_PUSHDEF([gl_Warn], [gl_cv_warn_[]_AC_LANG_ABBREV[]_$1])dnl AS_VAR_PUSHDEF([gl_Flags], [_AC_LANG_PREFIX[]FLAGS])dnl AS_LITERAL_IF([$1], @@ -34,13 +32,13 @@ case $gl_positive in -Wno-*) gl_positive=-W`expr "X$gl_positive" : 'X-Wno-\(.*\)'` ;; esac m4_pushdef([gl_Positive], [$gl_positive])])dnl -AC_CACHE_CHECK([whether _AC_LANG compiler handles $1], m4_defn([gl_Warn]), [ +AC_CACHE_CHECK([whether _AC_LANG compiler handles $1], [gl_Warn], [ gl_save_compiler_FLAGS="$gl_Flags" gl_AS_VAR_APPEND(m4_defn([gl_Flags]), [" $gl_unknown_warnings_are_errors ]m4_defn([gl_Positive])["]) - AC_LINK_IFELSE([m4_default([$4], [AC_LANG_PROGRAM([])])], - [AS_VAR_SET(gl_Warn, [yes])], - [AS_VAR_SET(gl_Warn, [no])]) + AC_LINK_IFELSE([m4_default([$4], [AC_LANG_PROGRAM([[]])])], + [AS_VAR_SET([gl_Warn], [yes])], + [AS_VAR_SET([gl_Warn], [no])]) gl_Flags="$gl_save_compiler_FLAGS" ]) AS_VAR_IF(gl_Warn, [yes], [$2], [$3]) @@ -59,8 +57,7 @@ AC_DEFUN([gl_UNKNOWN_WARNINGS_ARE_ERRORS], [_AC_LANG_DISPATCH([$0], _AC_LANG, $@)]) # Specialization for _AC_LANG = C. This macro can be AC_REQUIREd. -# Use of m4_defun rather than AC_DEFUN works around a bug in autoconf < 2.63b. -m4_defun([gl_UNKNOWN_WARNINGS_ARE_ERRORS(C)], +AC_DEFUN([gl_UNKNOWN_WARNINGS_ARE_ERRORS(C)], [ AC_LANG_PUSH([C]) gl_UNKNOWN_WARNINGS_ARE_ERRORS_IMPL @@ -68,8 +65,7 @@ m4_defun([gl_UNKNOWN_WARNINGS_ARE_ERRORS(C)], ]) # Specialization for _AC_LANG = C++. This macro can be AC_REQUIREd. -# Use of m4_defun rather than AC_DEFUN works around a bug in autoconf < 2.63b. -m4_defun([gl_UNKNOWN_WARNINGS_ARE_ERRORS(C++)], +AC_DEFUN([gl_UNKNOWN_WARNINGS_ARE_ERRORS(C++)], [ AC_LANG_PUSH([C++]) gl_UNKNOWN_WARNINGS_ARE_ERRORS_IMPL @@ -77,8 +73,7 @@ m4_defun([gl_UNKNOWN_WARNINGS_ARE_ERRORS(C++)], ]) # Specialization for _AC_LANG = Objective C. This macro can be AC_REQUIREd. -# Use of m4_defun rather than AC_DEFUN works around a bug in autoconf < 2.63b. -m4_defun([gl_UNKNOWN_WARNINGS_ARE_ERRORS(Objective C)], +AC_DEFUN([gl_UNKNOWN_WARNINGS_ARE_ERRORS(Objective C)], [ AC_LANG_PUSH([Objective C]) gl_UNKNOWN_WARNINGS_ARE_ERRORS_IMPL diff --git a/m4/wchar_h.m4 b/m4/wchar_h.m4 index cd20e7a..e0a4060 100644 --- a/m4/wchar_h.m4 +++ b/m4/wchar_h.m4 @@ -1,13 +1,13 @@ dnl A placeholder for ISO C99 , for platforms that have issues. -dnl Copyright (C) 2007-2019 Free Software Foundation, Inc. +dnl Copyright (C) 2007-2020 Free Software Foundation, Inc. dnl This file is free software; the Free Software Foundation dnl gives unlimited permission to copy and/or distribute it, dnl with or without modifications, as long as this notice is preserved. dnl Written by Eric Blake. -# wchar_h.m4 serial 43 +# wchar_h.m4 serial 48 AC_DEFUN([gl_WCHAR_H], [ @@ -52,11 +52,30 @@ AC_DEFUN([gl_WCHAR_H], #include ]], [btowc wctob mbsinit mbrtowc mbrlen mbsrtowcs mbsnrtowcs wcrtomb - wcsrtombs wcsnrtombs wcwidth wmemchr wmemcmp wmemcpy wmemmove wmemset + wcsrtombs wcsnrtombs wcwidth + wmemchr wmemcmp wmemcpy wmemmove wmempcpy wmemset wcslen wcsnlen wcscpy wcpcpy wcsncpy wcpncpy wcscat wcsncat wcscmp wcsncmp wcscasecmp wcsncasecmp wcscoll wcsxfrm wcsdup wcschr wcsrchr wcscspn wcsspn wcspbrk wcsstr wcstok wcswidth wcsftime ]) + + AC_REQUIRE([AC_C_RESTRICT]) + + AC_CHECK_DECLS([wcsdup], [], [], [[ +/* Tru64 with Desktop Toolkit C has a bug: must be included before + . + BSD/OS 4.0.1 has a bug: , and must be + included before . */ +#if !(defined __GLIBC__ && !defined __UCLIBC__) +# include +# include +# include +#endif +#include + ]]) + if test $ac_cv_have_decl_wcsdup = no; then + HAVE_DECL_WCSDUP=0 + fi ]) dnl Check whether is usable at all. @@ -67,11 +86,14 @@ AC_DEFUN([gl_WCHAR_H_INLINE_OK], dnl and . In summary, dnl glibc version 2.5 or older, together with gcc version 4.3 or newer and dnl the option -std=c99 or -std=gnu99, leads to a broken . + AC_REQUIRE([AC_CANONICAL_HOST]) AC_CACHE_CHECK([whether uses 'inline' correctly], [gl_cv_header_wchar_h_correct_inline], [gl_cv_header_wchar_h_correct_inline=yes - AC_LANG_CONFTEST([ - AC_LANG_SOURCE([[#define wcstod renamed_wcstod + case "$host_os" in + *-gnu* | gnu*) + AC_LANG_CONFTEST([ + AC_LANG_SOURCE([[#define wcstod renamed_wcstod /* Tru64 with Desktop Toolkit C has a bug: must be included before . BSD/OS 4.0.1 has a bug: , and must be @@ -83,17 +105,17 @@ AC_DEFUN([gl_WCHAR_H_INLINE_OK], extern int zero (void); int main () { return zero(); } ]])]) - dnl Do not rename the object file from conftest.$ac_objext to - dnl conftest1.$ac_objext, as this will cause the link to fail on - dnl z/OS when using the XPLINK object format (due to duplicate - dnl CSECT names). Instead, temporarily redefine $ac_compile so - dnl that the object file has the latter name from the start. - save_ac_compile="$ac_compile" - ac_compile=`echo "$save_ac_compile" | sed s/conftest/conftest1/` - if echo '#include "conftest.c"' >conftest1.c && - AC_TRY_EVAL([ac_compile]); then - AC_LANG_CONFTEST([ - AC_LANG_SOURCE([[#define wcstod renamed_wcstod + dnl Do not rename the object file from conftest.$ac_objext to + dnl conftest1.$ac_objext, as this will cause the link to fail on + dnl z/OS when using the XPLINK object format (due to duplicate + dnl CSECT names). Instead, temporarily redefine $ac_compile so + dnl that the object file has the latter name from the start. + save_ac_compile="$ac_compile" + ac_compile=`echo "$save_ac_compile" | sed s/conftest/conftest1/` + if echo '#include "conftest.c"' >conftest1.c \ + && AC_TRY_EVAL([ac_compile]); then + AC_LANG_CONFTEST([ + AC_LANG_SOURCE([[#define wcstod renamed_wcstod /* Tru64 with Desktop Toolkit C has a bug: must be included before . BSD/OS 4.0.1 has a bug: , and must be @@ -104,19 +126,21 @@ int main () { return zero(); } #include int zero (void) { return 0; } ]])]) - dnl See note above about renaming object files. - ac_compile=`echo "$save_ac_compile" | sed s/conftest/conftest2/` - if echo '#include "conftest.c"' >conftest2.c && - AC_TRY_EVAL([ac_compile]); then - if $CC -o conftest$ac_exeext $CFLAGS $LDFLAGS conftest1.$ac_objext conftest2.$ac_objext $LIBS >&AS_MESSAGE_LOG_FD 2>&1; then - : - else - gl_cv_header_wchar_h_correct_inline=no + dnl See note above about renaming object files. + ac_compile=`echo "$save_ac_compile" | sed s/conftest/conftest2/` + if echo '#include "conftest.c"' >conftest2.c \ + && AC_TRY_EVAL([ac_compile]); then + if $CC -o conftest$ac_exeext $CFLAGS $LDFLAGS conftest1.$ac_objext conftest2.$ac_objext $LIBS >&AS_MESSAGE_LOG_FD 2>&1; then + : + else + gl_cv_header_wchar_h_correct_inline=no + fi + fi fi - fi - fi - ac_compile="$save_ac_compile" - rm -f conftest[12].c conftest[12].$ac_objext conftest$ac_exeext + ac_compile="$save_ac_compile" + rm -f conftest[12].c conftest[12].$ac_objext conftest$ac_exeext + ;; + esac ]) if test $gl_cv_header_wchar_h_correct_inline = no; then AC_MSG_ERROR([ cannot be used with this compiler ($CC $CFLAGS $CPPFLAGS). @@ -157,6 +181,7 @@ AC_DEFUN([gl_WCHAR_H_DEFAULTS], GNULIB_WMEMCMP=0; AC_SUBST([GNULIB_WMEMCMP]) GNULIB_WMEMCPY=0; AC_SUBST([GNULIB_WMEMCPY]) GNULIB_WMEMMOVE=0; AC_SUBST([GNULIB_WMEMMOVE]) + GNULIB_WMEMPCPY=0; AC_SUBST([GNULIB_WMEMPCPY]) GNULIB_WMEMSET=0; AC_SUBST([GNULIB_WMEMSET]) GNULIB_WCSLEN=0; AC_SUBST([GNULIB_WCSLEN]) GNULIB_WCSNLEN=0; AC_SUBST([GNULIB_WCSNLEN]) @@ -196,6 +221,7 @@ AC_DEFUN([gl_WCHAR_H_DEFAULTS], HAVE_WMEMCMP=1; AC_SUBST([HAVE_WMEMCMP]) HAVE_WMEMCPY=1; AC_SUBST([HAVE_WMEMCPY]) HAVE_WMEMMOVE=1; AC_SUBST([HAVE_WMEMMOVE]) + HAVE_WMEMPCPY=1; AC_SUBST([HAVE_WMEMPCPY]) HAVE_WMEMSET=1; AC_SUBST([HAVE_WMEMSET]) HAVE_WCSLEN=1; AC_SUBST([HAVE_WCSLEN]) HAVE_WCSNLEN=1; AC_SUBST([HAVE_WCSNLEN]) @@ -222,6 +248,7 @@ AC_DEFUN([gl_WCHAR_H_DEFAULTS], HAVE_WCSWIDTH=1; AC_SUBST([HAVE_WCSWIDTH]) HAVE_WCSFTIME=1; AC_SUBST([HAVE_WCSFTIME]) HAVE_DECL_WCTOB=1; AC_SUBST([HAVE_DECL_WCTOB]) + HAVE_DECL_WCSDUP=1; AC_SUBST([HAVE_DECL_WCSDUP]) HAVE_DECL_WCWIDTH=1; AC_SUBST([HAVE_DECL_WCWIDTH]) REPLACE_MBSTATE_T=0; AC_SUBST([REPLACE_MBSTATE_T]) REPLACE_BTOWC=0; AC_SUBST([REPLACE_BTOWC]) @@ -237,4 +264,5 @@ AC_DEFUN([gl_WCHAR_H_DEFAULTS], REPLACE_WCWIDTH=0; AC_SUBST([REPLACE_WCWIDTH]) REPLACE_WCSWIDTH=0; AC_SUBST([REPLACE_WCSWIDTH]) REPLACE_WCSFTIME=0; AC_SUBST([REPLACE_WCSFTIME]) + REPLACE_WCSTOK=0; AC_SUBST([REPLACE_WCSTOK]) ]) diff --git a/m4/wchar_t.m4 b/m4/wchar_t.m4 index 5db5815..e48d464 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-2019 Free Software Foundation, Inc. +dnl Copyright (C) 2002-2003, 2008-2020 Free Software Foundation, Inc. dnl This file is free software; the Free Software Foundation dnl gives unlimited permission to copy and/or distribute it, dnl with or without modifications, as long as this notice is preserved. diff --git a/m4/wcrtomb.m4 b/m4/wcrtomb.m4 index fec22f3..c45fd98 100644 --- a/m4/wcrtomb.m4 +++ b/m4/wcrtomb.m4 @@ -1,5 +1,5 @@ -# wcrtomb.m4 serial 14 -dnl Copyright (C) 2008-2019 Free Software Foundation, Inc. +# wcrtomb.m4 serial 16 +dnl Copyright (C) 2008-2020 Free Software Foundation, Inc. dnl This file is free software; the Free Software Foundation dnl gives unlimited permission to copy and/or distribute it, dnl with or without modifications, as long as this notice is preserved. @@ -31,9 +31,11 @@ AC_DEFUN([gl_FUNC_WCRTOMB], REPLACE_WCRTOMB=1 fi else - if test $REPLACE_MBSTATE_T = 1; then - REPLACE_WCRTOMB=1 - fi + dnl We don't actually need to override wcrtomb when redefining the semantics + dnl of the mbstate_t type. Tested on 32-bit AIX. + dnl if test $REPLACE_MBSTATE_T = 1; then + dnl REPLACE_WCRTOMB=1 + dnl fi if test $REPLACE_WCRTOMB = 0; then dnl On Android 4.3, wcrtomb produces wrong characters in the C locale. dnl On AIX 4.3, OSF/1 5.1 and Solaris <= 11.3, wcrtomb (NULL, 0, NULL) @@ -79,7 +81,9 @@ int main () ]) case "$gl_cv_func_wcrtomb_works" in *yes) ;; - *) REPLACE_WCRTOMB=1 ;; + *) AC_DEFINE([WCRTOMB_C_LOCALE_BUG], [1], + [Define if the wcrtomb function does not work in the C locale.]) + REPLACE_WCRTOMB=1 ;; esac fi if test $REPLACE_WCRTOMB = 0; then @@ -90,12 +94,10 @@ int main () dnl is present. changequote(,)dnl case "$host_os" in - # Guess no on AIX 4, OSF/1 and Solaris. - aix4* | osf* | solaris*) gl_cv_func_wcrtomb_retval="guessing no" ;; - # Guess yes on native Windows. - mingw*) gl_cv_func_wcrtomb_retval="guessing yes" ;; - # Guess yes otherwise. - *) gl_cv_func_wcrtomb_retval="guessing yes" ;; + # Guess no on AIX 4, OSF/1, Solaris, native Windows. + aix4* | osf* | solaris* | mingw*) gl_cv_func_wcrtomb_retval="guessing no" ;; + # Guess yes otherwise. + *) gl_cv_func_wcrtomb_retval="guessing yes" ;; esac changequote([,])dnl if test $LOCALE_FR != none || test $LOCALE_FR_UTF8 != none || test $LOCALE_JA != none || test $LOCALE_ZH_CN != none; then @@ -111,6 +113,7 @@ changequote([,])dnl #include #include #include +#include int main () { int result = 0; @@ -123,6 +126,12 @@ int main () { if (wcrtomb (NULL, 0, NULL) != 1) result |= 2; + { + wchar_t wc = (wchar_t) 0xBADFACE; + if (mbtowc (&wc, "\303\274", 2) == 2) + if (wcrtomb (NULL, wc, NULL) != 1) + result |= 2; + } } if (setlocale (LC_ALL, "$LOCALE_JA") != NULL) { @@ -143,7 +152,9 @@ int main () ]) case "$gl_cv_func_wcrtomb_retval" in *yes) ;; - *) REPLACE_WCRTOMB=1 ;; + *) AC_DEFINE([WCRTOMB_RETVAL_BUG], [1], + [Define if the wcrtomb function has an incorrect return value.]) + REPLACE_WCRTOMB=1 ;; esac fi fi diff --git a/m4/wctob.m4 b/m4/wctob.m4 index 05c1237..8013326 100644 --- a/m4/wctob.m4 +++ b/m4/wctob.m4 @@ -1,5 +1,5 @@ -# wctob.m4 serial 11 -dnl Copyright (C) 2008-2019 Free Software Foundation, Inc. +# wctob.m4 serial 12 +dnl Copyright (C) 2008-2020 Free Software Foundation, Inc. dnl This file is free software; the Free Software Foundation dnl gives unlimited permission to copy and/or distribute it, dnl with or without modifications, as long as this notice is preserved. @@ -74,6 +74,7 @@ int main () AC_RUN_IFELSE( [AC_LANG_SOURCE([[ #include +#include #include /* Tru64 with Desktop Toolkit C has a bug: must be included before . diff --git a/m4/wctomb.m4 b/m4/wctomb.m4 index 79d29f1..8e8c6a2 100644 --- a/m4/wctomb.m4 +++ b/m4/wctomb.m4 @@ -1,5 +1,5 @@ # wctomb.m4 serial 2 -dnl Copyright (C) 2011-2019 Free Software Foundation, Inc. +dnl Copyright (C) 2011-2020 Free Software Foundation, Inc. dnl This file is free software; the Free Software Foundation dnl gives unlimited permission to copy and/or distribute it, dnl with or without modifications, as long as this notice is preserved. diff --git a/m4/wctype_h.m4 b/m4/wctype_h.m4 index 6903d75..a3cfc83 100644 --- a/m4/wctype_h.m4 +++ b/m4/wctype_h.m4 @@ -1,8 +1,8 @@ -# wctype_h.m4 serial 21 +# wctype_h.m4 serial 25 dnl A placeholder for ISO C99 , for platforms that lack it. -dnl Copyright (C) 2006-2019 Free Software Foundation, Inc. +dnl Copyright (C) 2006-2020 Free Software Foundation, Inc. dnl This file is free software; the Free Software Foundation dnl gives unlimited permission to copy and/or distribute it, dnl with or without modifications, as long as this notice is preserved. @@ -57,7 +57,7 @@ AC_DEFUN([gl_WCTYPE_H], AC_COMPILE_IFELSE([AC_LANG_PROGRAM([[#include #if __GNU_LIBRARY__ == 1 Linux libc5 i18n is broken. - #endif]], [])], + #endif]], [[]])], [gl_cv_func_iswcntrl_works="guessing yes"], [gl_cv_func_iswcntrl_works="guessing no"]) ]) @@ -69,10 +69,14 @@ AC_DEFUN([gl_WCTYPE_H], fi AC_SUBST([HAVE_WCTYPE_H]) - case "$gl_cv_func_iswcntrl_works" in - *yes) REPLACE_ISWCNTRL=0 ;; - *) REPLACE_ISWCNTRL=1 ;; - esac + if test $GNULIB_OVERRIDES_WINT_T = 1; then + REPLACE_ISWCNTRL=1 + else + case "$gl_cv_func_iswcntrl_works" in + *yes) REPLACE_ISWCNTRL=0 ;; + *) REPLACE_ISWCNTRL=1 ;; + esac + fi AC_SUBST([REPLACE_ISWCNTRL]) if test $HAVE_ISWCNTRL = 0 || test $REPLACE_ISWCNTRL = 1; then @@ -200,6 +204,8 @@ AC_DEFUN([gl_WCTYPE_MODULE_INDICATOR], AC_DEFUN([gl_WCTYPE_H_DEFAULTS], [ GNULIB_ISWBLANK=0; AC_SUBST([GNULIB_ISWBLANK]) + GNULIB_ISWDIGIT=0; AC_SUBST([GNULIB_ISWDIGIT]) + GNULIB_ISWXDIGIT=0; AC_SUBST([GNULIB_ISWXDIGIT]) GNULIB_WCTYPE=0; AC_SUBST([GNULIB_WCTYPE]) GNULIB_ISWCTYPE=0; AC_SUBST([GNULIB_ISWCTYPE]) GNULIB_WCTRANS=0; AC_SUBST([GNULIB_WCTRANS]) @@ -209,4 +215,6 @@ AC_DEFUN([gl_WCTYPE_H_DEFAULTS], HAVE_WCTYPE_T=1; AC_SUBST([HAVE_WCTYPE_T]) HAVE_WCTRANS_T=1; AC_SUBST([HAVE_WCTRANS_T]) REPLACE_ISWBLANK=0; AC_SUBST([REPLACE_ISWBLANK]) + REPLACE_ISWDIGIT=0; AC_SUBST([REPLACE_ISWDIGIT]) + REPLACE_ISWXDIGIT=0; AC_SUBST([REPLACE_ISWXDIGIT]) ]) diff --git a/m4/wint_t.m4 b/m4/wint_t.m4 index 61e8a23..cf9764d 100644 --- a/m4/wint_t.m4 +++ b/m4/wint_t.m4 @@ -1,5 +1,5 @@ -# wint_t.m4 serial 7 -dnl Copyright (C) 2003, 2007-2019 Free Software Foundation, Inc. +# wint_t.m4 serial 9 +dnl Copyright (C) 2003, 2007-2020 Free Software Foundation, Inc. dnl This file is free software; the Free Software Foundation dnl gives unlimited permission to copy and/or distribute it, dnl with or without modifications, as long as this notice is preserved. @@ -32,10 +32,10 @@ AC_DEFUN([gt_TYPE_WINT_T], dnl Determine whether gnulib's or would, if present, dnl override 'wint_t'. - AC_CACHE_CHECK([whether wint_t is too small], - [gl_cv_type_wint_t_too_small], + AC_CACHE_CHECK([whether wint_t is large enough], + [gl_cv_type_wint_t_large_enough], [AC_COMPILE_IFELSE( - [AC_LANG_PROGRAM([[ + [AC_LANG_PROGRAM([[ /* Tru64 with Desktop Toolkit C has a bug: must be included before . BSD/OS 4.0.1 has a bug: , and must be @@ -46,11 +46,11 @@ AC_DEFUN([gt_TYPE_WINT_T], # include #endif #include - int verify[sizeof (wint_t) < sizeof (int) ? -1 : 1]; - ]])], - [gl_cv_type_wint_t_too_small=no], - [gl_cv_type_wint_t_too_small=yes])]) - if test $gl_cv_type_wint_t_too_small = yes; then + int verify[sizeof (wint_t) < sizeof (int) ? -1 : 1]; + ]])], + [gl_cv_type_wint_t_large_enough=yes], + [gl_cv_type_wint_t_large_enough=no])]) + if test $gl_cv_type_wint_t_large_enough = no; then GNULIB_OVERRIDES_WINT_T=1 else GNULIB_OVERRIDES_WINT_T=0 diff --git a/m4/xalloc.m4 b/m4/xalloc.m4 index dfff943..a556870 100644 --- a/m4/xalloc.m4 +++ b/m4/xalloc.m4 @@ -1,5 +1,5 @@ # xalloc.m4 serial 18 -dnl Copyright (C) 2002-2006, 2009-2019 Free Software Foundation, Inc. +dnl Copyright (C) 2002-2006, 2009-2020 Free Software Foundation, Inc. dnl This file is free software; the Free Software Foundation dnl gives unlimited permission to copy and/or distribute it, dnl with or without modifications, as long as this notice is preserved. diff --git a/m4/xstrndup.m4 b/m4/xstrndup.m4 index 32dc51b..3846f91 100644 --- a/m4/xstrndup.m4 +++ b/m4/xstrndup.m4 @@ -1,5 +1,5 @@ # xstrndup.m4 serial 2 -dnl Copyright (C) 2003, 2009-2019 Free Software Foundation, Inc. +dnl Copyright (C) 2003, 2009-2020 Free Software Foundation, Inc. dnl This file is free software; the Free Software Foundation dnl gives unlimited permission to copy and/or distribute it, dnl with or without modifications, as long as this notice is preserved. diff --git a/m4/xstrtol.m4 b/m4/xstrtol.m4 index ee86a56..4e32f04 100644 --- a/m4/xstrtol.m4 +++ b/m4/xstrtol.m4 @@ -1,5 +1,5 @@ #serial 11 -dnl Copyright (C) 2002-2007, 2009-2019 Free Software Foundation, Inc. +dnl Copyright (C) 2002-2007, 2009-2020 Free Software Foundation, Inc. dnl This file is free software; the Free Software Foundation dnl gives unlimited permission to copy and/or distribute it, dnl with or without modifications, as long as this notice is preserved. diff --git a/m4/yield.m4 b/m4/yield.m4 index 59c8c38..5ccd39a 100644 --- a/m4/yield.m4 +++ b/m4/yield.m4 @@ -1,19 +1,18 @@ -# yield.m4 serial 3 -dnl Copyright (C) 2005-2019 Free Software Foundation, Inc. +# yield.m4 serial 4 +dnl Copyright (C) 2005-2020 Free Software Foundation, Inc. dnl This file is free software; the Free Software Foundation dnl gives unlimited permission to copy and/or distribute it, dnl with or without modifications, as long as this notice is preserved. AC_DEFUN([gl_YIELD], [ + AC_REQUIRE([gl_PTHREADLIB]) AC_REQUIRE([gl_THREADLIB]) - dnl On some systems, sched_yield is in librt, rather than in libpthread. - YIELD_LIB= + if test $gl_threads_api = posix; then - dnl Solaris 7...10 has sched_yield in librt, not in libpthread or libc. - AC_CHECK_LIB([rt], [sched_yield], [YIELD_LIB=-lrt], - [dnl Solaris 2.5.1, 2.6 has sched_yield in libposix4, not librt. - AC_CHECK_LIB([posix4], [sched_yield], [YIELD_LIB=-lposix4])]) + YIELD_LIB="$LIB_SCHED_YIELD" + else + YIELD_LIB= fi AC_SUBST([YIELD_LIB]) ]) diff --git a/m4/zzgnulib.m4 b/m4/zzgnulib.m4 new file mode 100644 index 0000000..98fa68f --- /dev/null +++ b/m4/zzgnulib.m4 @@ -0,0 +1,23 @@ +# zzgnulib.m4 serial 1 +dnl Copyright (C) 2020 Free Software Foundation, Inc. +dnl This file is free software; the Free Software Foundation +dnl gives unlimited permission to copy and/or distribute it, +dnl with or without modifications, as long as this notice is preserved. + +dnl This file must be named something that sorts after all other +dnl package- or gnulib-provided .m4 files - at least for those packages +dnl that redefine AC_PROG_CC. + +dnl Redefine AC_PROG_CC so that it ends with invocations of gl_COMPILER_CLANG +dnl and gl_COMPILER_PREPARE_CHECK_DECL. +m4_define([AC_PROG_CC], + m4_defn([AC_PROG_CC])[ +gl_COMPILER_CLANG +gl_COMPILER_PREPARE_CHECK_DECL +]) + +# gl_ZZGNULIB +# ----------- +# Witness macro that this file has been included. Needed to force +# Automake to include this file after all other gnulib .m4 files. +AC_DEFUN([gl_ZZGNULIB]) diff --git a/maint.mk b/maint.mk index 16e9360..2a0d2b4 100644 --- a/maint.mk +++ b/maint.mk @@ -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-2019 Free Software Foundation, Inc. +## Copyright (C) 2001-2020 Free Software Foundation, Inc. ## ## This program is free software: you can redistribute it and/or modify ## it under the terms of the GNU General Public License as published by @@ -442,7 +442,7 @@ sc_prohibit_gnu_make_extensions: $(SED) -ne '/Makefile/{s/\.in$$//;p;}' | \ while read m; do \ $(MAKE) -qp -f $$m .DUMMY-TARGET 2>/dev/null | \ - $(AWK) -v file=$$m -e '$($@_awk_)' || exit 1; \ + $(AWK) -v file=$$m -e '$($@_awk_)' || exit 1; \ done; \ fi @@ -649,7 +649,7 @@ sc_prohibit_safe_read_without_use: sc_prohibit_argmatch_without_use: @h='argmatch.h' \ - re='(\<(ARRAY_CARDINALITY|X?ARGMATCH(|_TO_ARGUMENT|_VERIFY))\>|\<(invalid_arg|argmatch(_exit_fn|_(in)?valid)?) *\()' \ + re='(\<(ARGMATCH_DEFINE_GROUP|ARRAY_CARDINALITY|X?ARGMATCH(|_TO_ARGUMENT|_VERIFY))\>|\<(invalid_arg|argmatch(_exit_fn|_(in)?valid)?) *\()' \ $(_sc_header_without_use) sc_prohibit_canonicalize_without_use: @@ -915,7 +915,7 @@ sc_prohibit_always-defined_macros: dummy /dev/null \ && { printf '$(ME): define the above' \ ' via some gnulib .h file\n' 1>&2; \ - exit 1; } \ + exit 1; } \ || :; \ fi # ================================================================== diff --git a/parted.spec b/parted.spec index 6904e1e..40824d4 100644 --- a/parted.spec +++ b/parted.spec @@ -1,18 +1,12 @@ -# Default to disabling device-mapper and SELinux +# Default to disabling device-mapper %define use_devmapper 0 -%define use_selinux 0 -%define use_sepol 0 # Enable device-mapper support if we find devmapper %define use_devmapper %(pkg-config --libs devmapper >/dev/null 2>&1; [ $? -eq 0 ] && echo 1) -# Enable SELinux if we find libselinux and libsepol -%define use_selinux %([ -r %{_libdir}/libselinux.a ] && echo 1) -%define use_sepol %([ -r %{_libdir}/libsepol.so ] && echo 1) - Summary: The GNU disk partition manipulation program Name: parted -Version: 3.2.153.3-5236 +Version: 3.3.52.5-2334-dirty Release: 1 Source: ftp://ftp.gnu.org/gnu/%{name}/%{name}-%{version}.tar.bz2 Buildroot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) @@ -22,7 +16,7 @@ Group: Applications/System BuildRequires: e2fsprogs-devel readline-devel ncurses-devel gperf BuildRequires: automake libtool gettext-devel texinfo pkgconfig -BuildRequires: device-mapper-devel, libselinux-devel libsepol-devel +BuildRequires: device-mapper-devel Prereq: /sbin/install-info @@ -52,11 +46,6 @@ Parted library, you need to install this package. --enable-device-mapper \ %else --disable-devmapper \ -%endif -%if "%{use_selinux}" == "1" && "%{use_sepol}" == "1" - --enable-selinux \ -%else - --disable-selinux \ %endif --enable-part-static \ --enable-pc98=no \ diff --git a/parted.spec.in b/parted.spec.in index bdbe218..d0e2b11 100644 --- a/parted.spec.in +++ b/parted.spec.in @@ -1,15 +1,9 @@ -# Default to disabling device-mapper and SELinux +# Default to disabling device-mapper %define use_devmapper 0 -%define use_selinux 0 -%define use_sepol 0 # Enable device-mapper support if we find devmapper %define use_devmapper %(pkg-config --libs devmapper >/dev/null 2>&1; [ $? -eq 0 ] && echo 1) -# Enable SELinux if we find libselinux and libsepol -%define use_selinux %([ -r %{_libdir}/libselinux.a ] && echo 1) -%define use_sepol %([ -r %{_libdir}/libsepol.so ] && echo 1) - Summary: The GNU disk partition manipulation program Name: @PACKAGE@ Version: @VERSION@ @@ -22,7 +16,7 @@ Group: Applications/System BuildRequires: e2fsprogs-devel readline-devel ncurses-devel gperf BuildRequires: automake libtool gettext-devel texinfo pkgconfig -BuildRequires: device-mapper-devel, libselinux-devel libsepol-devel +BuildRequires: device-mapper-devel Prereq: /sbin/install-info @@ -52,11 +46,6 @@ Parted library, you need to install this package. --enable-device-mapper \ %else --disable-devmapper \ -%endif -%if "%{use_selinux}" == "1" && "%{use_sepol}" == "1" - --enable-selinux \ -%else - --disable-selinux \ %endif --enable-part-static \ --enable-pc98=no \ diff --git a/parted/Makefile.in b/parted/Makefile.in index 178723f..842cc86 100644 --- a/parted/Makefile.in +++ b/parted/Makefile.in @@ -97,9 +97,9 @@ am__aclocal_m4_deps = $(top_srcdir)/m4/00gnulib.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/calloc.m4 $(top_srcdir)/m4/canonicalize.m4 \ - $(top_srcdir)/m4/close.m4 $(top_srcdir)/m4/codeset.m4 \ - $(top_srcdir)/m4/config-h.m4 $(top_srcdir)/m4/configmake.m4 \ - $(top_srcdir)/m4/ctype.m4 $(top_srcdir)/m4/dirname.m4 \ + $(top_srcdir)/m4/clock_time.m4 $(top_srcdir)/m4/close.m4 \ + $(top_srcdir)/m4/codeset.m4 $(top_srcdir)/m4/config-h.m4 \ + $(top_srcdir)/m4/configmake.m4 $(top_srcdir)/m4/ctype.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 \ @@ -111,15 +111,13 @@ am__aclocal_m4_deps = $(top_srcdir)/m4/00gnulib.m4 \ $(top_srcdir)/m4/fsync.m4 $(top_srcdir)/m4/ftruncate.m4 \ $(top_srcdir)/m4/getcwd.m4 $(top_srcdir)/m4/getdtablesize.m4 \ $(top_srcdir)/m4/getopt.m4 $(top_srcdir)/m4/getpagesize.m4 \ - $(top_srcdir)/m4/getprogname.m4 $(top_srcdir)/m4/gettext.m4 \ - $(top_srcdir)/m4/gettimeofday.m4 $(top_srcdir)/m4/glibc21.m4 \ - $(top_srcdir)/m4/gnulib-common.m4 \ - $(top_srcdir)/m4/gnulib-comp.m4 \ - $(top_srcdir)/m4/host-cpu-c-abi.m4 $(top_srcdir)/m4/iconv.m4 \ + $(top_srcdir)/m4/getprogname.m4 $(top_srcdir)/m4/getrandom.m4 \ + $(top_srcdir)/m4/gettext.m4 $(top_srcdir)/m4/gettimeofday.m4 \ + $(top_srcdir)/m4/glibc21.m4 $(top_srcdir)/m4/gnulib-common.m4 \ + $(top_srcdir)/m4/gnulib-comp.m4 $(top_srcdir)/m4/iconv.m4 \ $(top_srcdir)/m4/include_next.m4 $(top_srcdir)/m4/inet_pton.m4 \ $(top_srcdir)/m4/intl-thread-locale.m4 \ - $(top_srcdir)/m4/intlmacosx.m4 \ - $(top_srcdir)/m4/inttypes-pri.m4 $(top_srcdir)/m4/inttypes.m4 \ + $(top_srcdir)/m4/intlmacosx.m4 $(top_srcdir)/m4/inttypes.m4 \ $(top_srcdir)/m4/ioctl.m4 $(top_srcdir)/m4/isblank.m4 \ $(top_srcdir)/m4/langinfo_h.m4 $(top_srcdir)/m4/largefile.m4 \ $(top_srcdir)/m4/lcmessage.m4 $(top_srcdir)/m4/lib-ignore.m4 \ @@ -129,25 +127,26 @@ am__aclocal_m4_deps = $(top_srcdir)/m4/00gnulib.m4 \ $(top_srcdir)/m4/locale-fr.m4 $(top_srcdir)/m4/locale-ja.m4 \ $(top_srcdir)/m4/locale-tr.m4 $(top_srcdir)/m4/locale-zh.m4 \ $(top_srcdir)/m4/locale_h.m4 $(top_srcdir)/m4/localeconv.m4 \ - $(top_srcdir)/m4/localename.m4 \ - $(top_srcdir)/m4/localtime-buffer.m4 $(top_srcdir)/m4/lock.m4 \ - $(top_srcdir)/m4/longlong.m4 $(top_srcdir)/m4/lseek.m4 \ - $(top_srcdir)/m4/lstat.m4 $(top_srcdir)/m4/ltoptions.m4 \ - $(top_srcdir)/m4/ltsugar.m4 $(top_srcdir)/m4/ltversion.m4 \ - $(top_srcdir)/m4/lt~obsolete.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/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/localename.m4 $(top_srcdir)/m4/lock.m4 \ + $(top_srcdir)/m4/lseek.m4 $(top_srcdir)/m4/lstat.m4 \ + $(top_srcdir)/m4/ltoptions.m4 $(top_srcdir)/m4/ltsugar.m4 \ + $(top_srcdir)/m4/ltversion.m4 $(top_srcdir)/m4/lt~obsolete.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/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/nanosleep.m4 $(top_srcdir)/m4/netinet_in_h.m4 \ + $(top_srcdir)/m4/musl.m4 $(top_srcdir)/m4/nanosleep.m4 \ + $(top_srcdir)/m4/netinet_in_h.m4 \ $(top_srcdir)/m4/nl_langinfo.m4 $(top_srcdir)/m4/nls.m4 \ $(top_srcdir)/m4/nocrash.m4 $(top_srcdir)/m4/o-direct.m4 \ $(top_srcdir)/m4/off_t.m4 $(top_srcdir)/m4/open-cloexec.m4 \ - $(top_srcdir)/m4/open.m4 $(top_srcdir)/m4/pathmax.m4 \ - $(top_srcdir)/m4/perror.m4 $(top_srcdir)/m4/pipe.m4 \ + $(top_srcdir)/m4/open-slash.m4 $(top_srcdir)/m4/open.m4 \ + $(top_srcdir)/m4/pathmax.m4 $(top_srcdir)/m4/perror.m4 \ + $(top_srcdir)/m4/pid_t.m4 $(top_srcdir)/m4/pipe.m4 \ $(top_srcdir)/m4/po.m4 $(top_srcdir)/m4/priv-set.m4 \ $(top_srcdir)/m4/progtest.m4 \ $(top_srcdir)/m4/pthread-thread.m4 \ @@ -159,9 +158,10 @@ am__aclocal_m4_deps = $(top_srcdir)/m4/00gnulib.m4 \ $(top_srcdir)/m4/readlink.m4 $(top_srcdir)/m4/realloc.m4 \ $(top_srcdir)/m4/regex.m4 $(top_srcdir)/m4/rpmatch.m4 \ $(top_srcdir)/m4/safe-read.m4 $(top_srcdir)/m4/sched_h.m4 \ - $(top_srcdir)/m4/select.m4 $(top_srcdir)/m4/setenv.m4 \ - $(top_srcdir)/m4/setlocale.m4 $(top_srcdir)/m4/sigaction.m4 \ - $(top_srcdir)/m4/signal_h.m4 \ + $(top_srcdir)/m4/select.m4 $(top_srcdir)/m4/semaphore.m4 \ + $(top_srcdir)/m4/setenv.m4 $(top_srcdir)/m4/setlocale.m4 \ + $(top_srcdir)/m4/setlocale_null.m4 \ + $(top_srcdir)/m4/sigaction.m4 $(top_srcdir)/m4/signal_h.m4 \ $(top_srcdir)/m4/signalblocking.m4 $(top_srcdir)/m4/sleep.m4 \ $(top_srcdir)/m4/socketlib.m4 $(top_srcdir)/m4/sockets.m4 \ $(top_srcdir)/m4/socklen.m4 $(top_srcdir)/m4/sockpfaf.m4 \ @@ -176,6 +176,7 @@ am__aclocal_m4_deps = $(top_srcdir)/m4/00gnulib.m4 \ $(top_srcdir)/m4/strnlen.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 \ @@ -184,14 +185,15 @@ am__aclocal_m4_deps = $(top_srcdir)/m4/00gnulib.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/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/xstrndup.m4 $(top_srcdir)/m4/xstrtol.m4 \ - $(top_srcdir)/m4/yield.m4 $(top_srcdir)/configure.ac + $(top_srcdir)/m4/yield.m4 $(top_srcdir)/m4/zzgnulib.m4 \ + $(top_srcdir)/configure.ac am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \ $(ACLOCAL_M4) DIST_COMMON = $(srcdir)/Makefile.am $(am__DIST_COMMON) @@ -312,6 +314,7 @@ BUILDINFO = @BUILDINFO@ CC = @CC@ CCDEPMODE = @CCDEPMODE@ CFLAGS = @CFLAGS@ +CFLAG_VISIBILITY = @CFLAG_VISIBILITY@ CHECK_CFLAGS = @CHECK_CFLAGS@ CHECK_LIBS = @CHECK_LIBS@ CONFIG_INCLUDE = @CONFIG_INCLUDE@ @@ -346,6 +349,8 @@ GMSGFMT = @GMSGFMT@ GMSGFMT_015 = @GMSGFMT_015@ GNULIB_ACCEPT = @GNULIB_ACCEPT@ GNULIB_ACCEPT4 = @GNULIB_ACCEPT4@ +GNULIB_ACCESS = @GNULIB_ACCESS@ +GNULIB_ALIGNED_ALLOC = @GNULIB_ALIGNED_ALLOC@ GNULIB_ATOLL = @GNULIB_ATOLL@ GNULIB_BIND = @GNULIB_BIND@ GNULIB_BTOWC = @GNULIB_BTOWC@ @@ -356,6 +361,7 @@ GNULIB_CHOWN = @GNULIB_CHOWN@ GNULIB_CLOSE = @GNULIB_CLOSE@ GNULIB_CONNECT = @GNULIB_CONNECT@ GNULIB_COPY_FILE_RANGE = @GNULIB_COPY_FILE_RANGE@ +GNULIB_CREAT = @GNULIB_CREAT@ GNULIB_CTIME = @GNULIB_CTIME@ GNULIB_DPRINTF = @GNULIB_DPRINTF@ GNULIB_DUP = @GNULIB_DUP@ @@ -403,19 +409,23 @@ GNULIB_GETCWD = @GNULIB_GETCWD@ GNULIB_GETDELIM = @GNULIB_GETDELIM@ GNULIB_GETDOMAINNAME = @GNULIB_GETDOMAINNAME@ GNULIB_GETDTABLESIZE = @GNULIB_GETDTABLESIZE@ +GNULIB_GETENTROPY = @GNULIB_GETENTROPY@ GNULIB_GETGROUPS = @GNULIB_GETGROUPS@ GNULIB_GETHOSTNAME = @GNULIB_GETHOSTNAME@ GNULIB_GETLINE = @GNULIB_GETLINE@ GNULIB_GETLOADAVG = @GNULIB_GETLOADAVG@ GNULIB_GETLOGIN = @GNULIB_GETLOGIN@ GNULIB_GETLOGIN_R = @GNULIB_GETLOGIN_R@ +GNULIB_GETOPT_POSIX = @GNULIB_GETOPT_POSIX@ GNULIB_GETPAGESIZE = @GNULIB_GETPAGESIZE@ GNULIB_GETPASS = @GNULIB_GETPASS@ GNULIB_GETPEERNAME = @GNULIB_GETPEERNAME@ +GNULIB_GETRANDOM = @GNULIB_GETRANDOM@ GNULIB_GETSOCKNAME = @GNULIB_GETSOCKNAME@ GNULIB_GETSOCKOPT = @GNULIB_GETSOCKOPT@ GNULIB_GETSUBOPT = @GNULIB_GETSUBOPT@ GNULIB_GETTIMEOFDAY = @GNULIB_GETTIMEOFDAY@ +GNULIB_GETUMASK = @GNULIB_GETUMASK@ GNULIB_GETUSERSHELL = @GNULIB_GETUSERSHELL@ GNULIB_GL_UNISTD_H_GETOPT = @GNULIB_GL_UNISTD_H_GETOPT@ GNULIB_GRANTPT = @GNULIB_GRANTPT@ @@ -429,6 +439,8 @@ GNULIB_ISATTY = @GNULIB_ISATTY@ GNULIB_ISBLANK = @GNULIB_ISBLANK@ GNULIB_ISWBLANK = @GNULIB_ISWBLANK@ GNULIB_ISWCTYPE = @GNULIB_ISWCTYPE@ +GNULIB_ISWDIGIT = @GNULIB_ISWDIGIT@ +GNULIB_ISWXDIGIT = @GNULIB_ISWXDIGIT@ GNULIB_LCHMOD = @GNULIB_LCHMOD@ GNULIB_LCHOWN = @GNULIB_LCHOWN@ GNULIB_LINK = @GNULIB_LINK@ @@ -489,6 +501,7 @@ GNULIB_PERROR = @GNULIB_PERROR@ GNULIB_PIPE = @GNULIB_PIPE@ GNULIB_PIPE2 = @GNULIB_PIPE2@ GNULIB_POPEN = @GNULIB_POPEN@ +GNULIB_POSIX_MEMALIGN = @GNULIB_POSIX_MEMALIGN@ GNULIB_POSIX_OPENPT = @GNULIB_POSIX_OPENPT@ GNULIB_PREAD = @GNULIB_PREAD@ GNULIB_PRINTF = @GNULIB_PRINTF@ @@ -537,9 +550,12 @@ GNULIB_SENDTO = @GNULIB_SENDTO@ GNULIB_SETENV = @GNULIB_SETENV@ GNULIB_SETHOSTNAME = @GNULIB_SETHOSTNAME@ GNULIB_SETLOCALE = @GNULIB_SETLOCALE@ +GNULIB_SETLOCALE_NULL = @GNULIB_SETLOCALE_NULL@ GNULIB_SETSOCKOPT = @GNULIB_SETSOCKOPT@ GNULIB_SHUTDOWN = @GNULIB_SHUTDOWN@ +GNULIB_SIGABBREV_NP = @GNULIB_SIGABBREV_NP@ GNULIB_SIGACTION = @GNULIB_SIGACTION@ +GNULIB_SIGDESCR_NP = @GNULIB_SIGDESCR_NP@ GNULIB_SIGNAL_H_SIGPIPE = @GNULIB_SIGNAL_H_SIGPIPE@ GNULIB_SIGPROCMASK = @GNULIB_SIGPROCMASK@ GNULIB_SLEEP = @GNULIB_SLEEP@ @@ -555,6 +571,7 @@ GNULIB_STRCASESTR = @GNULIB_STRCASESTR@ GNULIB_STRCHRNUL = @GNULIB_STRCHRNUL@ GNULIB_STRDUP = @GNULIB_STRDUP@ GNULIB_STRERROR = @GNULIB_STRERROR@ +GNULIB_STRERRORNAME_NP = @GNULIB_STRERRORNAME_NP@ GNULIB_STRERROR_R = @GNULIB_STRERROR_R@ GNULIB_STRFTIME = @GNULIB_STRFTIME@ GNULIB_STRNCAT = @GNULIB_STRNCAT@ @@ -638,11 +655,13 @@ GNULIB_WMEMCHR = @GNULIB_WMEMCHR@ GNULIB_WMEMCMP = @GNULIB_WMEMCMP@ GNULIB_WMEMCPY = @GNULIB_WMEMCPY@ GNULIB_WMEMMOVE = @GNULIB_WMEMMOVE@ +GNULIB_WMEMPCPY = @GNULIB_WMEMPCPY@ GNULIB_WMEMSET = @GNULIB_WMEMSET@ GNULIB_WRITE = @GNULIB_WRITE@ GNULIB__EXIT = @GNULIB__EXIT@ GREP = @GREP@ HAVE_ACCEPT4 = @HAVE_ACCEPT4@ +HAVE_ALIGNED_ALLOC = @HAVE_ALIGNED_ALLOC@ HAVE_ALLOCA_H = @HAVE_ALLOCA_H@ HAVE_ARPA_INET_H = @HAVE_ARPA_INET_H@ HAVE_ATOLL = @HAVE_ATOLL@ @@ -652,12 +671,17 @@ HAVE_CANONICALIZE_FILE_NAME = @HAVE_CANONICALIZE_FILE_NAME@ HAVE_CHOWN = @HAVE_CHOWN@ HAVE_COPY_FILE_RANGE = @HAVE_COPY_FILE_RANGE@ HAVE_CRTDEFS_H = @HAVE_CRTDEFS_H@ +HAVE_DECL_ECVT = @HAVE_DECL_ECVT@ HAVE_DECL_ENVIRON = @HAVE_DECL_ENVIRON@ +HAVE_DECL_EXECVPE = @HAVE_DECL_EXECVPE@ HAVE_DECL_FCHDIR = @HAVE_DECL_FCHDIR@ +HAVE_DECL_FCLOSEALL = @HAVE_DECL_FCLOSEALL@ +HAVE_DECL_FCVT = @HAVE_DECL_FCVT@ HAVE_DECL_FDATASYNC = @HAVE_DECL_FDATASYNC@ HAVE_DECL_FPURGE = @HAVE_DECL_FPURGE@ HAVE_DECL_FSEEKO = @HAVE_DECL_FSEEKO@ HAVE_DECL_FTELLO = @HAVE_DECL_FTELLO@ +HAVE_DECL_GCVT = @HAVE_DECL_GCVT@ HAVE_DECL_GETDELIM = @HAVE_DECL_GETDELIM@ HAVE_DECL_GETDOMAINNAME = @HAVE_DECL_GETDOMAINNAME@ HAVE_DECL_GETLINE = @HAVE_DECL_GETLINE@ @@ -691,10 +715,10 @@ HAVE_DECL_TRUNCATE = @HAVE_DECL_TRUNCATE@ HAVE_DECL_TTYNAME_R = @HAVE_DECL_TTYNAME_R@ HAVE_DECL_UNSETENV = @HAVE_DECL_UNSETENV@ HAVE_DECL_VSNPRINTF = @HAVE_DECL_VSNPRINTF@ +HAVE_DECL_WCSDUP = @HAVE_DECL_WCSDUP@ HAVE_DECL_WCTOB = @HAVE_DECL_WCTOB@ HAVE_DECL_WCWIDTH = @HAVE_DECL_WCWIDTH@ HAVE_DPRINTF = @HAVE_DPRINTF@ -HAVE_DUP2 = @HAVE_DUP2@ HAVE_DUP3 = @HAVE_DUP3@ HAVE_DUPLOCALE = @HAVE_DUPLOCALE@ HAVE_EUIDACCESS = @HAVE_EUIDACCESS@ @@ -716,14 +740,17 @@ HAVE_FTELLO = @HAVE_FTELLO@ HAVE_FTRUNCATE = @HAVE_FTRUNCATE@ HAVE_FUTIMENS = @HAVE_FUTIMENS@ HAVE_GETDTABLESIZE = @HAVE_GETDTABLESIZE@ +HAVE_GETENTROPY = @HAVE_GETENTROPY@ HAVE_GETGROUPS = @HAVE_GETGROUPS@ HAVE_GETHOSTNAME = @HAVE_GETHOSTNAME@ HAVE_GETLOGIN = @HAVE_GETLOGIN@ HAVE_GETOPT_H = @HAVE_GETOPT_H@ HAVE_GETPAGESIZE = @HAVE_GETPAGESIZE@ HAVE_GETPASS = @HAVE_GETPASS@ +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_IMAXDIV_T = @HAVE_IMAXDIV_T@ @@ -742,7 +769,6 @@ HAVE_LCHMOD = @HAVE_LCHMOD@ HAVE_LCHOWN = @HAVE_LCHOWN@ HAVE_LINK = @HAVE_LINK@ HAVE_LINKAT = @HAVE_LINKAT@ -HAVE_LONG_LONG_INT = @HAVE_LONG_LONG_INT@ HAVE_LSTAT = @HAVE_LSTAT@ HAVE_MAX_ALIGN_T = @HAVE_MAX_ALIGN_T@ HAVE_MBRLEN = @HAVE_MBRLEN@ @@ -752,7 +778,6 @@ HAVE_MBSLEN = @HAVE_MBSLEN@ HAVE_MBSNRTOWCS = @HAVE_MBSNRTOWCS@ HAVE_MBSRTOWCS = @HAVE_MBSRTOWCS@ HAVE_MBTOWC = @HAVE_MBTOWC@ -HAVE_MEMCHR = @HAVE_MEMCHR@ HAVE_MEMPCPY = @HAVE_MEMPCPY@ HAVE_MKDIRAT = @HAVE_MKDIRAT@ HAVE_MKDTEMP = @HAVE_MKDTEMP@ @@ -775,6 +800,7 @@ HAVE_PCLOSE = @HAVE_PCLOSE@ HAVE_PIPE = @HAVE_PIPE@ HAVE_PIPE2 = @HAVE_PIPE2@ HAVE_POPEN = @HAVE_POPEN@ +HAVE_POSIX_MEMALIGN = @HAVE_POSIX_MEMALIGN@ HAVE_POSIX_OPENPT = @HAVE_POSIX_OPENPT@ HAVE_POSIX_SIGNALBLOCKING = @HAVE_POSIX_SIGNALBLOCKING@ HAVE_PREAD = @HAVE_PREAD@ @@ -860,7 +886,9 @@ HAVE_SECURE_GETENV = @HAVE_SECURE_GETENV@ HAVE_SETENV = @HAVE_SETENV@ HAVE_SETHOSTNAME = @HAVE_SETHOSTNAME@ HAVE_SETSTATE = @HAVE_SETSTATE@ +HAVE_SIGABBREV_NP = @HAVE_SIGABBREV_NP@ HAVE_SIGACTION = @HAVE_SIGACTION@ +HAVE_SIGDESCR_NP = @HAVE_SIGDESCR_NP@ HAVE_SIGHANDLER_T = @HAVE_SIGHANDLER_T@ HAVE_SIGINFO_T = @HAVE_SIGINFO_T@ HAVE_SIGNED_SIG_ATOMIC_T = @HAVE_SIGNED_SIG_ATOMIC_T@ @@ -873,6 +901,7 @@ HAVE_STPCPY = @HAVE_STPCPY@ HAVE_STPNCPY = @HAVE_STPNCPY@ HAVE_STRCASESTR = @HAVE_STRCASESTR@ HAVE_STRCHRNUL = @HAVE_STRCHRNUL@ +HAVE_STRERRORNAME_NP = @HAVE_STRERRORNAME_NP@ HAVE_STRPBRK = @HAVE_STRPBRK@ HAVE_STRPTIME = @HAVE_STRPTIME@ HAVE_STRSEP = @HAVE_STRSEP@ @@ -895,6 +924,7 @@ HAVE_SYS_INTTYPES_H = @HAVE_SYS_INTTYPES_H@ HAVE_SYS_IOCTL_H = @HAVE_SYS_IOCTL_H@ HAVE_SYS_LOADAVG_H = @HAVE_SYS_LOADAVG_H@ HAVE_SYS_PARAM_H = @HAVE_SYS_PARAM_H@ +HAVE_SYS_RANDOM_H = @HAVE_SYS_RANDOM_H@ HAVE_SYS_SELECT_H = @HAVE_SYS_SELECT_H@ HAVE_SYS_SOCKET_H = @HAVE_SYS_SOCKET_H@ HAVE_SYS_TIME_H = @HAVE_SYS_TIME_H@ @@ -903,15 +933,14 @@ HAVE_SYS_UIO_H = @HAVE_SYS_UIO_H@ HAVE_TIMEGM = @HAVE_TIMEGM@ HAVE_TIMEZONE_T = @HAVE_TIMEZONE_T@ HAVE_TYPE_VOLATILE_SIG_ATOMIC_T = @HAVE_TYPE_VOLATILE_SIG_ATOMIC_T@ -HAVE_TZSET = @HAVE_TZSET@ HAVE_UNISTD_H = @HAVE_UNISTD_H@ HAVE_UNLINKAT = @HAVE_UNLINKAT@ HAVE_UNLOCKPT = @HAVE_UNLOCKPT@ -HAVE_UNSIGNED_LONG_LONG_INT = @HAVE_UNSIGNED_LONG_LONG_INT@ HAVE_USLEEP = @HAVE_USLEEP@ HAVE_UTIMENSAT = @HAVE_UTIMENSAT@ HAVE_VASPRINTF = @HAVE_VASPRINTF@ HAVE_VDPRINTF = @HAVE_VDPRINTF@ +HAVE_VISIBILITY = @HAVE_VISIBILITY@ HAVE_WCHAR_H = @HAVE_WCHAR_H@ HAVE_WCHAR_T = @HAVE_WCHAR_T@ HAVE_WCPCPY = @HAVE_WCPCPY@ @@ -950,6 +979,7 @@ HAVE_WMEMCHR = @HAVE_WMEMCHR@ HAVE_WMEMCMP = @HAVE_WMEMCMP@ HAVE_WMEMCPY = @HAVE_WMEMCPY@ HAVE_WMEMMOVE = @HAVE_WMEMMOVE@ +HAVE_WMEMPCPY = @HAVE_WMEMPCPY@ HAVE_WMEMSET = @HAVE_WMEMSET@ HAVE_WS2TCPIP_H = @HAVE_WS2TCPIP_H@ HAVE_XLOCALE_H = @HAVE_XLOCALE_H@ @@ -975,16 +1005,28 @@ LIBICONV = @LIBICONV@ LIBINTL = @LIBINTL@ LIBMULTITHREAD = @LIBMULTITHREAD@ LIBOBJS = @LIBOBJS@ +LIBPMULTITHREAD = @LIBPMULTITHREAD@ +LIBPTHREAD = @LIBPTHREAD@ LIBS = @LIBS@ LIBSOCKET = @LIBSOCKET@ +LIBSTDTHREAD = @LIBSTDTHREAD@ LIBTESTS_LIBDEPS = @LIBTESTS_LIBDEPS@ LIBTHREAD = @LIBTHREAD@ LIBTOOL = @LIBTOOL@ LIB_BLKID = @LIB_BLKID@ +LIB_CLOCK_GETTIME = @LIB_CLOCK_GETTIME@ +LIB_GETRANDOM = @LIB_GETRANDOM@ +LIB_HARD_LOCALE = @LIB_HARD_LOCALE@ +LIB_MBRTOWC = @LIB_MBRTOWC@ LIB_NANOSLEEP = @LIB_NANOSLEEP@ +LIB_NL_LANGINFO = @LIB_NL_LANGINFO@ LIB_PTHREAD = @LIB_PTHREAD@ LIB_PTHREAD_SIGMASK = @LIB_PTHREAD_SIGMASK@ +LIB_SCHED_YIELD = @LIB_SCHED_YIELD@ LIB_SELECT = @LIB_SELECT@ +LIB_SEMAPHORE = @LIB_SEMAPHORE@ +LIB_SETLOCALE = @LIB_SETLOCALE@ +LIB_SETLOCALE_NULL = @LIB_SETLOCALE_NULL@ LIMITS_H = @LIMITS_H@ LIPO = @LIPO@ LN_S = @LN_S@ @@ -1033,6 +1075,7 @@ NEXT_AS_FIRST_DIRECTIVE_STDIO_H = @NEXT_AS_FIRST_DIRECTIVE_STDIO_H@ NEXT_AS_FIRST_DIRECTIVE_STDLIB_H = @NEXT_AS_FIRST_DIRECTIVE_STDLIB_H@ NEXT_AS_FIRST_DIRECTIVE_STRING_H = @NEXT_AS_FIRST_DIRECTIVE_STRING_H@ NEXT_AS_FIRST_DIRECTIVE_SYS_IOCTL_H = @NEXT_AS_FIRST_DIRECTIVE_SYS_IOCTL_H@ +NEXT_AS_FIRST_DIRECTIVE_SYS_RANDOM_H = @NEXT_AS_FIRST_DIRECTIVE_SYS_RANDOM_H@ NEXT_AS_FIRST_DIRECTIVE_SYS_SELECT_H = @NEXT_AS_FIRST_DIRECTIVE_SYS_SELECT_H@ NEXT_AS_FIRST_DIRECTIVE_SYS_SOCKET_H = @NEXT_AS_FIRST_DIRECTIVE_SYS_SOCKET_H@ NEXT_AS_FIRST_DIRECTIVE_SYS_STAT_H = @NEXT_AS_FIRST_DIRECTIVE_SYS_STAT_H@ @@ -1062,6 +1105,7 @@ NEXT_STDIO_H = @NEXT_STDIO_H@ NEXT_STDLIB_H = @NEXT_STDLIB_H@ NEXT_STRING_H = @NEXT_STRING_H@ NEXT_SYS_IOCTL_H = @NEXT_SYS_IOCTL_H@ +NEXT_SYS_RANDOM_H = @NEXT_SYS_RANDOM_H@ NEXT_SYS_SELECT_H = @NEXT_SYS_SELECT_H@ NEXT_SYS_SOCKET_H = @NEXT_SYS_SOCKET_H@ NEXT_SYS_STAT_H = @NEXT_SYS_STAT_H@ @@ -1098,21 +1142,24 @@ POSUB = @POSUB@ PRAGMA_COLUMNS = @PRAGMA_COLUMNS@ PRAGMA_SYSTEM_HEADER = @PRAGMA_SYSTEM_HEADER@ PRIPTR_PREFIX = @PRIPTR_PREFIX@ -PRI_MACROS_BROKEN = @PRI_MACROS_BROKEN@ PTHREAD_H_DEFINES_STRUCT_TIMESPEC = @PTHREAD_H_DEFINES_STRUCT_TIMESPEC@ PTRDIFF_T_SUFFIX = @PTRDIFF_T_SUFFIX@ RANLIB = @RANLIB@ +REPLACE_ACCESS = @REPLACE_ACCESS@ +REPLACE_ALIGNED_ALLOC = @REPLACE_ALIGNED_ALLOC@ REPLACE_BTOWC = @REPLACE_BTOWC@ REPLACE_CALLOC = @REPLACE_CALLOC@ REPLACE_CANONICALIZE_FILE_NAME = @REPLACE_CANONICALIZE_FILE_NAME@ REPLACE_CHOWN = @REPLACE_CHOWN@ REPLACE_CLOSE = @REPLACE_CLOSE@ +REPLACE_CREAT = @REPLACE_CREAT@ REPLACE_CTIME = @REPLACE_CTIME@ REPLACE_DPRINTF = @REPLACE_DPRINTF@ REPLACE_DUP = @REPLACE_DUP@ REPLACE_DUP2 = @REPLACE_DUP2@ REPLACE_DUPLOCALE = @REPLACE_DUPLOCALE@ REPLACE_FACCESSAT = @REPLACE_FACCESSAT@ +REPLACE_FCHMODAT = @REPLACE_FCHMODAT@ REPLACE_FCHOWNAT = @REPLACE_FCHOWNAT@ REPLACE_FCLOSE = @REPLACE_FCLOSE@ REPLACE_FCNTL = @REPLACE_FCNTL@ @@ -1140,6 +1187,7 @@ REPLACE_GETLINE = @REPLACE_GETLINE@ REPLACE_GETLOGIN_R = @REPLACE_GETLOGIN_R@ REPLACE_GETPAGESIZE = @REPLACE_GETPAGESIZE@ REPLACE_GETPASS = @REPLACE_GETPASS@ +REPLACE_GETRANDOM = @REPLACE_GETRANDOM@ REPLACE_GETTIMEOFDAY = @REPLACE_GETTIMEOFDAY@ REPLACE_GMTIME = @REPLACE_GMTIME@ REPLACE_INET_NTOP = @REPLACE_INET_NTOP@ @@ -1149,6 +1197,8 @@ REPLACE_IOCTL = @REPLACE_IOCTL@ REPLACE_ISATTY = @REPLACE_ISATTY@ REPLACE_ISWBLANK = @REPLACE_ISWBLANK@ REPLACE_ISWCNTRL = @REPLACE_ISWCNTRL@ +REPLACE_ISWDIGIT = @REPLACE_ISWDIGIT@ +REPLACE_ISWXDIGIT = @REPLACE_ISWXDIGIT@ REPLACE_LCHOWN = @REPLACE_LCHOWN@ REPLACE_LINK = @REPLACE_LINK@ REPLACE_LINKAT = @REPLACE_LINKAT@ @@ -1181,6 +1231,7 @@ REPLACE_OPEN = @REPLACE_OPEN@ REPLACE_OPENAT = @REPLACE_OPENAT@ REPLACE_PERROR = @REPLACE_PERROR@ REPLACE_POPEN = @REPLACE_POPEN@ +REPLACE_POSIX_MEMALIGN = @REPLACE_POSIX_MEMALIGN@ REPLACE_PREAD = @REPLACE_PREAD@ REPLACE_PRINTF = @REPLACE_PRINTF@ REPLACE_PSELECT = @REPLACE_PSELECT@ @@ -1269,6 +1320,7 @@ REPLACE_STRCASESTR = @REPLACE_STRCASESTR@ REPLACE_STRCHRNUL = @REPLACE_STRCHRNUL@ REPLACE_STRDUP = @REPLACE_STRDUP@ REPLACE_STRERROR = @REPLACE_STRERROR@ +REPLACE_STRERRORNAME_NP = @REPLACE_STRERRORNAME_NP@ REPLACE_STRERROR_R = @REPLACE_STRERROR_R@ REPLACE_STRFTIME = @REPLACE_STRFTIME@ REPLACE_STRNCAT = @REPLACE_STRNCAT@ @@ -1306,13 +1358,13 @@ REPLACE_WCRTOMB = @REPLACE_WCRTOMB@ REPLACE_WCSFTIME = @REPLACE_WCSFTIME@ REPLACE_WCSNRTOMBS = @REPLACE_WCSNRTOMBS@ REPLACE_WCSRTOMBS = @REPLACE_WCSRTOMBS@ +REPLACE_WCSTOK = @REPLACE_WCSTOK@ REPLACE_WCSWIDTH = @REPLACE_WCSWIDTH@ REPLACE_WCTOB = @REPLACE_WCTOB@ REPLACE_WCTOMB = @REPLACE_WCTOMB@ REPLACE_WCWIDTH = @REPLACE_WCWIDTH@ REPLACE_WRITE = @REPLACE_WRITE@ SED = @SED@ -SELINUX_LIBS = @SELINUX_LIBS@ SET_MAKE = @SET_MAKE@ SHELL = @SHELL@ SIG_ATOMIC_T_SUFFIX = @SIG_ATOMIC_T_SUFFIX@ @@ -1331,6 +1383,7 @@ UINT32_MAX_LT_UINTMAX_MAX = @UINT32_MAX_LT_UINTMAX_MAX@ UINT64_MAX_EQ_ULONG_MAX = @UINT64_MAX_EQ_ULONG_MAX@ UNDEFINE_STRTOK_R = @UNDEFINE_STRTOK_R@ UNISTD_H_DEFINES_STRUCT_TIMESPEC = @UNISTD_H_DEFINES_STRUCT_TIMESPEC@ +UNISTD_H_HAVE_SYS_RANDOM_H = @UNISTD_H_HAVE_SYS_RANDOM_H@ UNISTD_H_HAVE_WINSOCK2_H = @UNISTD_H_HAVE_WINSOCK2_H@ UNISTD_H_HAVE_WINSOCK2_H_AND_USE_SOCKETS = @UNISTD_H_HAVE_WINSOCK2_H_AND_USE_SOCKETS@ USE_NLS = @USE_NLS@ diff --git a/parted/command.c b/parted/command.c index 5014d71..d028202 100644 --- a/parted/command.c +++ b/parted/command.c @@ -1,7 +1,7 @@ /* parted - a frontend to libparted - Copyright (C) 1999-2000, 2007, 2009-2014, 2019 Free Software Foundation, - Inc. + Copyright (C) 1999-2000, 2007, 2009-2014, 2019-2021 Free Software + Foundation, Inc. This 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/command.h b/parted/command.h index fa78ae4..323f8a2 100644 --- a/parted/command.h +++ b/parted/command.h @@ -1,7 +1,7 @@ /* parted - a frontend to libparted - Copyright (C) 1999-2000, 2007, 2009-2014, 2019 Free Software Foundation, - Inc. + Copyright (C) 1999-2000, 2007, 2009-2014, 2019-2021 Free Software + Foundation, Inc. This 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/parted.c b/parted/parted.c index 9dcdb05..e84e66d 100644 --- a/parted/parted.c +++ b/parted/parted.c @@ -1,6 +1,7 @@ /* parted - a frontend to libparted - Copyright (C) 1999-2003, 2005-2014, 2019 Free Software Foundation, Inc. + Copyright (C) 1999-2003, 2005-2014, 2019-2021 Free Software Foundation, + Inc. This program is free software; you can redistribute it and/or modify it under the terms of the GNU General Public License as published by @@ -1545,6 +1546,8 @@ do_resizepart (PedDevice** dev, PedDisk** diskp) PedGeometry *range_end = NULL; PedConstraint* constraint; int rc = 0; + char* end_input = NULL; + char* end_size = NULL; if (!disk) { disk = ped_disk_new (*dev); @@ -1560,12 +1563,25 @@ do_resizepart (PedDevice** dev, PedDisk** diskp) if (!command_line_get_partition (_("Partition number?"), disk, &part)) goto error; + + /* Save the optional End value if the partition is busy. */ + if (ped_partition_is_busy(part)) { + if (command_line_get_word_count()) + end_size = command_line_pop_word(); + } + + /* If the partition is busy this may clear the command_line and prompt the user */ if (!_partition_warn_busy (part)) goto error; + /* Push the End value back onto the command_line, if it exists */ + if (end_size) { + command_line_push_word(end_size); + free(end_size); + } + start = part->geom.start; end = oldend = part->geom.end; - char *end_input; if (!command_line_get_sector (_("End?"), *dev, &end, &range_end, &end_input)) goto error; _adjust_end_if_iec(&start, &end, range_end, end_input); diff --git a/parted/strlist.c b/parted/strlist.c index 7ed4e9e..e2a8bd1 100644 --- a/parted/strlist.c +++ b/parted/strlist.c @@ -1,7 +1,7 @@ /* parted - a frontend to libparted - Copyright (C) 1999-2001, 2007, 2009-2014, 2019 Free Software Foundation, - Inc. + Copyright (C) 1999-2001, 2007, 2009-2014, 2019-2021 Free Software + Foundation, Inc. This 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/strlist.h b/parted/strlist.h index c5d8bb0..40a8973 100644 --- a/parted/strlist.h +++ b/parted/strlist.h @@ -1,7 +1,7 @@ /* parted - a frontend to libparted - Copyright (C) 1999-2001, 2007, 2009-2014, 2019 Free Software Foundation, - Inc. + Copyright (C) 1999-2001, 2007, 2009-2014, 2019-2021 Free Software + Foundation, Inc. This 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.c b/parted/table.c index 21ebbb0..e754ac7 100644 --- a/parted/table.c +++ b/parted/table.c @@ -3,7 +3,7 @@ */ /* parted - a frontend to libparted - Copyright (C) 2006-2014, 2019 Free Software Foundation, Inc. + Copyright (C) 2006-2014, 2019-2021 Free Software Foundation, Inc. This 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 3fe0794..298a2b1 100644 --- a/parted/table.h +++ b/parted/table.h @@ -1,6 +1,7 @@ /* parted - a frontend to libparted - Copyright (C) 2006-2007, 2009-2014, 2019 Free Software Foundation, Inc. + Copyright (C) 2006-2007, 2009-2014, 2019-2021 Free Software Foundation, + Inc. This 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/ui.c b/parted/ui.c index 7b5374d..973bd26 100644 --- a/parted/ui.c +++ b/parted/ui.c @@ -1,6 +1,7 @@ /* parted - a frontend to libparted - Copyright (C) 1999-2002, 2006-2014, 2019 Free Software Foundation, Inc. + Copyright (C) 1999-2002, 2006-2014, 2019-2021 Free Software Foundation, + Inc. This program is free software; you can redistribute it and/or modify it under the terms of the GNU General Public License as published by @@ -909,11 +910,11 @@ command_line_get_word (const char* prompt, const char* def, int command_line_get_integer (const char* prompt, int* value) { - char def_str [10]; + char def_str [20]; char* input; long ret; - snprintf (def_str, 10, "%d", *value); + snprintf (def_str, 20, "%d", *value); input = command_line_get_word (prompt, *value ? def_str : NULL, NULL, 1); if (!input) @@ -1138,7 +1139,7 @@ command_line_get_disk_flag (const char* prompt, const PedDisk* disk, PedDiskFlag* flag) { StrList* opts = NULL; - PedPartitionFlag walk = 0; + PedDiskFlag walk = 0; char* flag_name; while ( (walk = ped_disk_flag_next (walk)) ) { diff --git a/parted/ui.h b/parted/ui.h index 6192ee5..3b07782 100644 --- a/parted/ui.h +++ b/parted/ui.h @@ -1,6 +1,7 @@ /* parted - a frontend to libparted - Copyright (C) 1999-2001, 2007-2014, 2019 Free Software Foundation, Inc. + Copyright (C) 1999-2001, 2007-2014, 2019-2021 Free Software Foundation, + Inc. This 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/partprobe/Makefile.in b/partprobe/Makefile.in index 57792b0..458e55f 100644 --- a/partprobe/Makefile.in +++ b/partprobe/Makefile.in @@ -96,9 +96,9 @@ am__aclocal_m4_deps = $(top_srcdir)/m4/00gnulib.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/calloc.m4 $(top_srcdir)/m4/canonicalize.m4 \ - $(top_srcdir)/m4/close.m4 $(top_srcdir)/m4/codeset.m4 \ - $(top_srcdir)/m4/config-h.m4 $(top_srcdir)/m4/configmake.m4 \ - $(top_srcdir)/m4/ctype.m4 $(top_srcdir)/m4/dirname.m4 \ + $(top_srcdir)/m4/clock_time.m4 $(top_srcdir)/m4/close.m4 \ + $(top_srcdir)/m4/codeset.m4 $(top_srcdir)/m4/config-h.m4 \ + $(top_srcdir)/m4/configmake.m4 $(top_srcdir)/m4/ctype.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 \ @@ -110,15 +110,13 @@ am__aclocal_m4_deps = $(top_srcdir)/m4/00gnulib.m4 \ $(top_srcdir)/m4/fsync.m4 $(top_srcdir)/m4/ftruncate.m4 \ $(top_srcdir)/m4/getcwd.m4 $(top_srcdir)/m4/getdtablesize.m4 \ $(top_srcdir)/m4/getopt.m4 $(top_srcdir)/m4/getpagesize.m4 \ - $(top_srcdir)/m4/getprogname.m4 $(top_srcdir)/m4/gettext.m4 \ - $(top_srcdir)/m4/gettimeofday.m4 $(top_srcdir)/m4/glibc21.m4 \ - $(top_srcdir)/m4/gnulib-common.m4 \ - $(top_srcdir)/m4/gnulib-comp.m4 \ - $(top_srcdir)/m4/host-cpu-c-abi.m4 $(top_srcdir)/m4/iconv.m4 \ + $(top_srcdir)/m4/getprogname.m4 $(top_srcdir)/m4/getrandom.m4 \ + $(top_srcdir)/m4/gettext.m4 $(top_srcdir)/m4/gettimeofday.m4 \ + $(top_srcdir)/m4/glibc21.m4 $(top_srcdir)/m4/gnulib-common.m4 \ + $(top_srcdir)/m4/gnulib-comp.m4 $(top_srcdir)/m4/iconv.m4 \ $(top_srcdir)/m4/include_next.m4 $(top_srcdir)/m4/inet_pton.m4 \ $(top_srcdir)/m4/intl-thread-locale.m4 \ - $(top_srcdir)/m4/intlmacosx.m4 \ - $(top_srcdir)/m4/inttypes-pri.m4 $(top_srcdir)/m4/inttypes.m4 \ + $(top_srcdir)/m4/intlmacosx.m4 $(top_srcdir)/m4/inttypes.m4 \ $(top_srcdir)/m4/ioctl.m4 $(top_srcdir)/m4/isblank.m4 \ $(top_srcdir)/m4/langinfo_h.m4 $(top_srcdir)/m4/largefile.m4 \ $(top_srcdir)/m4/lcmessage.m4 $(top_srcdir)/m4/lib-ignore.m4 \ @@ -128,25 +126,26 @@ am__aclocal_m4_deps = $(top_srcdir)/m4/00gnulib.m4 \ $(top_srcdir)/m4/locale-fr.m4 $(top_srcdir)/m4/locale-ja.m4 \ $(top_srcdir)/m4/locale-tr.m4 $(top_srcdir)/m4/locale-zh.m4 \ $(top_srcdir)/m4/locale_h.m4 $(top_srcdir)/m4/localeconv.m4 \ - $(top_srcdir)/m4/localename.m4 \ - $(top_srcdir)/m4/localtime-buffer.m4 $(top_srcdir)/m4/lock.m4 \ - $(top_srcdir)/m4/longlong.m4 $(top_srcdir)/m4/lseek.m4 \ - $(top_srcdir)/m4/lstat.m4 $(top_srcdir)/m4/ltoptions.m4 \ - $(top_srcdir)/m4/ltsugar.m4 $(top_srcdir)/m4/ltversion.m4 \ - $(top_srcdir)/m4/lt~obsolete.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/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/localename.m4 $(top_srcdir)/m4/lock.m4 \ + $(top_srcdir)/m4/lseek.m4 $(top_srcdir)/m4/lstat.m4 \ + $(top_srcdir)/m4/ltoptions.m4 $(top_srcdir)/m4/ltsugar.m4 \ + $(top_srcdir)/m4/ltversion.m4 $(top_srcdir)/m4/lt~obsolete.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/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/nanosleep.m4 $(top_srcdir)/m4/netinet_in_h.m4 \ + $(top_srcdir)/m4/musl.m4 $(top_srcdir)/m4/nanosleep.m4 \ + $(top_srcdir)/m4/netinet_in_h.m4 \ $(top_srcdir)/m4/nl_langinfo.m4 $(top_srcdir)/m4/nls.m4 \ $(top_srcdir)/m4/nocrash.m4 $(top_srcdir)/m4/o-direct.m4 \ $(top_srcdir)/m4/off_t.m4 $(top_srcdir)/m4/open-cloexec.m4 \ - $(top_srcdir)/m4/open.m4 $(top_srcdir)/m4/pathmax.m4 \ - $(top_srcdir)/m4/perror.m4 $(top_srcdir)/m4/pipe.m4 \ + $(top_srcdir)/m4/open-slash.m4 $(top_srcdir)/m4/open.m4 \ + $(top_srcdir)/m4/pathmax.m4 $(top_srcdir)/m4/perror.m4 \ + $(top_srcdir)/m4/pid_t.m4 $(top_srcdir)/m4/pipe.m4 \ $(top_srcdir)/m4/po.m4 $(top_srcdir)/m4/priv-set.m4 \ $(top_srcdir)/m4/progtest.m4 \ $(top_srcdir)/m4/pthread-thread.m4 \ @@ -158,9 +157,10 @@ am__aclocal_m4_deps = $(top_srcdir)/m4/00gnulib.m4 \ $(top_srcdir)/m4/readlink.m4 $(top_srcdir)/m4/realloc.m4 \ $(top_srcdir)/m4/regex.m4 $(top_srcdir)/m4/rpmatch.m4 \ $(top_srcdir)/m4/safe-read.m4 $(top_srcdir)/m4/sched_h.m4 \ - $(top_srcdir)/m4/select.m4 $(top_srcdir)/m4/setenv.m4 \ - $(top_srcdir)/m4/setlocale.m4 $(top_srcdir)/m4/sigaction.m4 \ - $(top_srcdir)/m4/signal_h.m4 \ + $(top_srcdir)/m4/select.m4 $(top_srcdir)/m4/semaphore.m4 \ + $(top_srcdir)/m4/setenv.m4 $(top_srcdir)/m4/setlocale.m4 \ + $(top_srcdir)/m4/setlocale_null.m4 \ + $(top_srcdir)/m4/sigaction.m4 $(top_srcdir)/m4/signal_h.m4 \ $(top_srcdir)/m4/signalblocking.m4 $(top_srcdir)/m4/sleep.m4 \ $(top_srcdir)/m4/socketlib.m4 $(top_srcdir)/m4/sockets.m4 \ $(top_srcdir)/m4/socklen.m4 $(top_srcdir)/m4/sockpfaf.m4 \ @@ -175,6 +175,7 @@ am__aclocal_m4_deps = $(top_srcdir)/m4/00gnulib.m4 \ $(top_srcdir)/m4/strnlen.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 \ @@ -183,14 +184,15 @@ am__aclocal_m4_deps = $(top_srcdir)/m4/00gnulib.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/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/xstrndup.m4 $(top_srcdir)/m4/xstrtol.m4 \ - $(top_srcdir)/m4/yield.m4 $(top_srcdir)/configure.ac + $(top_srcdir)/m4/yield.m4 $(top_srcdir)/m4/zzgnulib.m4 \ + $(top_srcdir)/configure.ac am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \ $(ACLOCAL_M4) DIST_COMMON = $(srcdir)/Makefile.am $(am__DIST_COMMON) @@ -299,6 +301,7 @@ BUILDINFO = @BUILDINFO@ CC = @CC@ CCDEPMODE = @CCDEPMODE@ CFLAGS = @CFLAGS@ +CFLAG_VISIBILITY = @CFLAG_VISIBILITY@ CHECK_CFLAGS = @CHECK_CFLAGS@ CHECK_LIBS = @CHECK_LIBS@ CONFIG_INCLUDE = @CONFIG_INCLUDE@ @@ -333,6 +336,8 @@ GMSGFMT = @GMSGFMT@ GMSGFMT_015 = @GMSGFMT_015@ GNULIB_ACCEPT = @GNULIB_ACCEPT@ GNULIB_ACCEPT4 = @GNULIB_ACCEPT4@ +GNULIB_ACCESS = @GNULIB_ACCESS@ +GNULIB_ALIGNED_ALLOC = @GNULIB_ALIGNED_ALLOC@ GNULIB_ATOLL = @GNULIB_ATOLL@ GNULIB_BIND = @GNULIB_BIND@ GNULIB_BTOWC = @GNULIB_BTOWC@ @@ -343,6 +348,7 @@ GNULIB_CHOWN = @GNULIB_CHOWN@ GNULIB_CLOSE = @GNULIB_CLOSE@ GNULIB_CONNECT = @GNULIB_CONNECT@ GNULIB_COPY_FILE_RANGE = @GNULIB_COPY_FILE_RANGE@ +GNULIB_CREAT = @GNULIB_CREAT@ GNULIB_CTIME = @GNULIB_CTIME@ GNULIB_DPRINTF = @GNULIB_DPRINTF@ GNULIB_DUP = @GNULIB_DUP@ @@ -390,19 +396,23 @@ GNULIB_GETCWD = @GNULIB_GETCWD@ GNULIB_GETDELIM = @GNULIB_GETDELIM@ GNULIB_GETDOMAINNAME = @GNULIB_GETDOMAINNAME@ GNULIB_GETDTABLESIZE = @GNULIB_GETDTABLESIZE@ +GNULIB_GETENTROPY = @GNULIB_GETENTROPY@ GNULIB_GETGROUPS = @GNULIB_GETGROUPS@ GNULIB_GETHOSTNAME = @GNULIB_GETHOSTNAME@ GNULIB_GETLINE = @GNULIB_GETLINE@ GNULIB_GETLOADAVG = @GNULIB_GETLOADAVG@ GNULIB_GETLOGIN = @GNULIB_GETLOGIN@ GNULIB_GETLOGIN_R = @GNULIB_GETLOGIN_R@ +GNULIB_GETOPT_POSIX = @GNULIB_GETOPT_POSIX@ GNULIB_GETPAGESIZE = @GNULIB_GETPAGESIZE@ GNULIB_GETPASS = @GNULIB_GETPASS@ GNULIB_GETPEERNAME = @GNULIB_GETPEERNAME@ +GNULIB_GETRANDOM = @GNULIB_GETRANDOM@ GNULIB_GETSOCKNAME = @GNULIB_GETSOCKNAME@ GNULIB_GETSOCKOPT = @GNULIB_GETSOCKOPT@ GNULIB_GETSUBOPT = @GNULIB_GETSUBOPT@ GNULIB_GETTIMEOFDAY = @GNULIB_GETTIMEOFDAY@ +GNULIB_GETUMASK = @GNULIB_GETUMASK@ GNULIB_GETUSERSHELL = @GNULIB_GETUSERSHELL@ GNULIB_GL_UNISTD_H_GETOPT = @GNULIB_GL_UNISTD_H_GETOPT@ GNULIB_GRANTPT = @GNULIB_GRANTPT@ @@ -416,6 +426,8 @@ GNULIB_ISATTY = @GNULIB_ISATTY@ GNULIB_ISBLANK = @GNULIB_ISBLANK@ GNULIB_ISWBLANK = @GNULIB_ISWBLANK@ GNULIB_ISWCTYPE = @GNULIB_ISWCTYPE@ +GNULIB_ISWDIGIT = @GNULIB_ISWDIGIT@ +GNULIB_ISWXDIGIT = @GNULIB_ISWXDIGIT@ GNULIB_LCHMOD = @GNULIB_LCHMOD@ GNULIB_LCHOWN = @GNULIB_LCHOWN@ GNULIB_LINK = @GNULIB_LINK@ @@ -476,6 +488,7 @@ GNULIB_PERROR = @GNULIB_PERROR@ GNULIB_PIPE = @GNULIB_PIPE@ GNULIB_PIPE2 = @GNULIB_PIPE2@ GNULIB_POPEN = @GNULIB_POPEN@ +GNULIB_POSIX_MEMALIGN = @GNULIB_POSIX_MEMALIGN@ GNULIB_POSIX_OPENPT = @GNULIB_POSIX_OPENPT@ GNULIB_PREAD = @GNULIB_PREAD@ GNULIB_PRINTF = @GNULIB_PRINTF@ @@ -524,9 +537,12 @@ GNULIB_SENDTO = @GNULIB_SENDTO@ GNULIB_SETENV = @GNULIB_SETENV@ GNULIB_SETHOSTNAME = @GNULIB_SETHOSTNAME@ GNULIB_SETLOCALE = @GNULIB_SETLOCALE@ +GNULIB_SETLOCALE_NULL = @GNULIB_SETLOCALE_NULL@ GNULIB_SETSOCKOPT = @GNULIB_SETSOCKOPT@ GNULIB_SHUTDOWN = @GNULIB_SHUTDOWN@ +GNULIB_SIGABBREV_NP = @GNULIB_SIGABBREV_NP@ GNULIB_SIGACTION = @GNULIB_SIGACTION@ +GNULIB_SIGDESCR_NP = @GNULIB_SIGDESCR_NP@ GNULIB_SIGNAL_H_SIGPIPE = @GNULIB_SIGNAL_H_SIGPIPE@ GNULIB_SIGPROCMASK = @GNULIB_SIGPROCMASK@ GNULIB_SLEEP = @GNULIB_SLEEP@ @@ -542,6 +558,7 @@ GNULIB_STRCASESTR = @GNULIB_STRCASESTR@ GNULIB_STRCHRNUL = @GNULIB_STRCHRNUL@ GNULIB_STRDUP = @GNULIB_STRDUP@ GNULIB_STRERROR = @GNULIB_STRERROR@ +GNULIB_STRERRORNAME_NP = @GNULIB_STRERRORNAME_NP@ GNULIB_STRERROR_R = @GNULIB_STRERROR_R@ GNULIB_STRFTIME = @GNULIB_STRFTIME@ GNULIB_STRNCAT = @GNULIB_STRNCAT@ @@ -625,11 +642,13 @@ GNULIB_WMEMCHR = @GNULIB_WMEMCHR@ GNULIB_WMEMCMP = @GNULIB_WMEMCMP@ GNULIB_WMEMCPY = @GNULIB_WMEMCPY@ GNULIB_WMEMMOVE = @GNULIB_WMEMMOVE@ +GNULIB_WMEMPCPY = @GNULIB_WMEMPCPY@ GNULIB_WMEMSET = @GNULIB_WMEMSET@ GNULIB_WRITE = @GNULIB_WRITE@ GNULIB__EXIT = @GNULIB__EXIT@ GREP = @GREP@ HAVE_ACCEPT4 = @HAVE_ACCEPT4@ +HAVE_ALIGNED_ALLOC = @HAVE_ALIGNED_ALLOC@ HAVE_ALLOCA_H = @HAVE_ALLOCA_H@ HAVE_ARPA_INET_H = @HAVE_ARPA_INET_H@ HAVE_ATOLL = @HAVE_ATOLL@ @@ -639,12 +658,17 @@ HAVE_CANONICALIZE_FILE_NAME = @HAVE_CANONICALIZE_FILE_NAME@ HAVE_CHOWN = @HAVE_CHOWN@ HAVE_COPY_FILE_RANGE = @HAVE_COPY_FILE_RANGE@ HAVE_CRTDEFS_H = @HAVE_CRTDEFS_H@ +HAVE_DECL_ECVT = @HAVE_DECL_ECVT@ HAVE_DECL_ENVIRON = @HAVE_DECL_ENVIRON@ +HAVE_DECL_EXECVPE = @HAVE_DECL_EXECVPE@ HAVE_DECL_FCHDIR = @HAVE_DECL_FCHDIR@ +HAVE_DECL_FCLOSEALL = @HAVE_DECL_FCLOSEALL@ +HAVE_DECL_FCVT = @HAVE_DECL_FCVT@ HAVE_DECL_FDATASYNC = @HAVE_DECL_FDATASYNC@ HAVE_DECL_FPURGE = @HAVE_DECL_FPURGE@ HAVE_DECL_FSEEKO = @HAVE_DECL_FSEEKO@ HAVE_DECL_FTELLO = @HAVE_DECL_FTELLO@ +HAVE_DECL_GCVT = @HAVE_DECL_GCVT@ HAVE_DECL_GETDELIM = @HAVE_DECL_GETDELIM@ HAVE_DECL_GETDOMAINNAME = @HAVE_DECL_GETDOMAINNAME@ HAVE_DECL_GETLINE = @HAVE_DECL_GETLINE@ @@ -678,10 +702,10 @@ HAVE_DECL_TRUNCATE = @HAVE_DECL_TRUNCATE@ HAVE_DECL_TTYNAME_R = @HAVE_DECL_TTYNAME_R@ HAVE_DECL_UNSETENV = @HAVE_DECL_UNSETENV@ HAVE_DECL_VSNPRINTF = @HAVE_DECL_VSNPRINTF@ +HAVE_DECL_WCSDUP = @HAVE_DECL_WCSDUP@ HAVE_DECL_WCTOB = @HAVE_DECL_WCTOB@ HAVE_DECL_WCWIDTH = @HAVE_DECL_WCWIDTH@ HAVE_DPRINTF = @HAVE_DPRINTF@ -HAVE_DUP2 = @HAVE_DUP2@ HAVE_DUP3 = @HAVE_DUP3@ HAVE_DUPLOCALE = @HAVE_DUPLOCALE@ HAVE_EUIDACCESS = @HAVE_EUIDACCESS@ @@ -703,14 +727,17 @@ HAVE_FTELLO = @HAVE_FTELLO@ HAVE_FTRUNCATE = @HAVE_FTRUNCATE@ HAVE_FUTIMENS = @HAVE_FUTIMENS@ HAVE_GETDTABLESIZE = @HAVE_GETDTABLESIZE@ +HAVE_GETENTROPY = @HAVE_GETENTROPY@ HAVE_GETGROUPS = @HAVE_GETGROUPS@ HAVE_GETHOSTNAME = @HAVE_GETHOSTNAME@ HAVE_GETLOGIN = @HAVE_GETLOGIN@ HAVE_GETOPT_H = @HAVE_GETOPT_H@ HAVE_GETPAGESIZE = @HAVE_GETPAGESIZE@ HAVE_GETPASS = @HAVE_GETPASS@ +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_IMAXDIV_T = @HAVE_IMAXDIV_T@ @@ -729,7 +756,6 @@ HAVE_LCHMOD = @HAVE_LCHMOD@ HAVE_LCHOWN = @HAVE_LCHOWN@ HAVE_LINK = @HAVE_LINK@ HAVE_LINKAT = @HAVE_LINKAT@ -HAVE_LONG_LONG_INT = @HAVE_LONG_LONG_INT@ HAVE_LSTAT = @HAVE_LSTAT@ HAVE_MAX_ALIGN_T = @HAVE_MAX_ALIGN_T@ HAVE_MBRLEN = @HAVE_MBRLEN@ @@ -739,7 +765,6 @@ HAVE_MBSLEN = @HAVE_MBSLEN@ HAVE_MBSNRTOWCS = @HAVE_MBSNRTOWCS@ HAVE_MBSRTOWCS = @HAVE_MBSRTOWCS@ HAVE_MBTOWC = @HAVE_MBTOWC@ -HAVE_MEMCHR = @HAVE_MEMCHR@ HAVE_MEMPCPY = @HAVE_MEMPCPY@ HAVE_MKDIRAT = @HAVE_MKDIRAT@ HAVE_MKDTEMP = @HAVE_MKDTEMP@ @@ -762,6 +787,7 @@ HAVE_PCLOSE = @HAVE_PCLOSE@ HAVE_PIPE = @HAVE_PIPE@ HAVE_PIPE2 = @HAVE_PIPE2@ HAVE_POPEN = @HAVE_POPEN@ +HAVE_POSIX_MEMALIGN = @HAVE_POSIX_MEMALIGN@ HAVE_POSIX_OPENPT = @HAVE_POSIX_OPENPT@ HAVE_POSIX_SIGNALBLOCKING = @HAVE_POSIX_SIGNALBLOCKING@ HAVE_PREAD = @HAVE_PREAD@ @@ -847,7 +873,9 @@ HAVE_SECURE_GETENV = @HAVE_SECURE_GETENV@ HAVE_SETENV = @HAVE_SETENV@ HAVE_SETHOSTNAME = @HAVE_SETHOSTNAME@ HAVE_SETSTATE = @HAVE_SETSTATE@ +HAVE_SIGABBREV_NP = @HAVE_SIGABBREV_NP@ HAVE_SIGACTION = @HAVE_SIGACTION@ +HAVE_SIGDESCR_NP = @HAVE_SIGDESCR_NP@ HAVE_SIGHANDLER_T = @HAVE_SIGHANDLER_T@ HAVE_SIGINFO_T = @HAVE_SIGINFO_T@ HAVE_SIGNED_SIG_ATOMIC_T = @HAVE_SIGNED_SIG_ATOMIC_T@ @@ -860,6 +888,7 @@ HAVE_STPCPY = @HAVE_STPCPY@ HAVE_STPNCPY = @HAVE_STPNCPY@ HAVE_STRCASESTR = @HAVE_STRCASESTR@ HAVE_STRCHRNUL = @HAVE_STRCHRNUL@ +HAVE_STRERRORNAME_NP = @HAVE_STRERRORNAME_NP@ HAVE_STRPBRK = @HAVE_STRPBRK@ HAVE_STRPTIME = @HAVE_STRPTIME@ HAVE_STRSEP = @HAVE_STRSEP@ @@ -882,6 +911,7 @@ HAVE_SYS_INTTYPES_H = @HAVE_SYS_INTTYPES_H@ HAVE_SYS_IOCTL_H = @HAVE_SYS_IOCTL_H@ HAVE_SYS_LOADAVG_H = @HAVE_SYS_LOADAVG_H@ HAVE_SYS_PARAM_H = @HAVE_SYS_PARAM_H@ +HAVE_SYS_RANDOM_H = @HAVE_SYS_RANDOM_H@ HAVE_SYS_SELECT_H = @HAVE_SYS_SELECT_H@ HAVE_SYS_SOCKET_H = @HAVE_SYS_SOCKET_H@ HAVE_SYS_TIME_H = @HAVE_SYS_TIME_H@ @@ -890,15 +920,14 @@ HAVE_SYS_UIO_H = @HAVE_SYS_UIO_H@ HAVE_TIMEGM = @HAVE_TIMEGM@ HAVE_TIMEZONE_T = @HAVE_TIMEZONE_T@ HAVE_TYPE_VOLATILE_SIG_ATOMIC_T = @HAVE_TYPE_VOLATILE_SIG_ATOMIC_T@ -HAVE_TZSET = @HAVE_TZSET@ HAVE_UNISTD_H = @HAVE_UNISTD_H@ HAVE_UNLINKAT = @HAVE_UNLINKAT@ HAVE_UNLOCKPT = @HAVE_UNLOCKPT@ -HAVE_UNSIGNED_LONG_LONG_INT = @HAVE_UNSIGNED_LONG_LONG_INT@ HAVE_USLEEP = @HAVE_USLEEP@ HAVE_UTIMENSAT = @HAVE_UTIMENSAT@ HAVE_VASPRINTF = @HAVE_VASPRINTF@ HAVE_VDPRINTF = @HAVE_VDPRINTF@ +HAVE_VISIBILITY = @HAVE_VISIBILITY@ HAVE_WCHAR_H = @HAVE_WCHAR_H@ HAVE_WCHAR_T = @HAVE_WCHAR_T@ HAVE_WCPCPY = @HAVE_WCPCPY@ @@ -937,6 +966,7 @@ HAVE_WMEMCHR = @HAVE_WMEMCHR@ HAVE_WMEMCMP = @HAVE_WMEMCMP@ HAVE_WMEMCPY = @HAVE_WMEMCPY@ HAVE_WMEMMOVE = @HAVE_WMEMMOVE@ +HAVE_WMEMPCPY = @HAVE_WMEMPCPY@ HAVE_WMEMSET = @HAVE_WMEMSET@ HAVE_WS2TCPIP_H = @HAVE_WS2TCPIP_H@ HAVE_XLOCALE_H = @HAVE_XLOCALE_H@ @@ -962,16 +992,28 @@ LIBICONV = @LIBICONV@ LIBINTL = @LIBINTL@ LIBMULTITHREAD = @LIBMULTITHREAD@ LIBOBJS = @LIBOBJS@ +LIBPMULTITHREAD = @LIBPMULTITHREAD@ +LIBPTHREAD = @LIBPTHREAD@ LIBS = @LIBS@ LIBSOCKET = @LIBSOCKET@ +LIBSTDTHREAD = @LIBSTDTHREAD@ LIBTESTS_LIBDEPS = @LIBTESTS_LIBDEPS@ LIBTHREAD = @LIBTHREAD@ LIBTOOL = @LIBTOOL@ LIB_BLKID = @LIB_BLKID@ +LIB_CLOCK_GETTIME = @LIB_CLOCK_GETTIME@ +LIB_GETRANDOM = @LIB_GETRANDOM@ +LIB_HARD_LOCALE = @LIB_HARD_LOCALE@ +LIB_MBRTOWC = @LIB_MBRTOWC@ LIB_NANOSLEEP = @LIB_NANOSLEEP@ +LIB_NL_LANGINFO = @LIB_NL_LANGINFO@ LIB_PTHREAD = @LIB_PTHREAD@ LIB_PTHREAD_SIGMASK = @LIB_PTHREAD_SIGMASK@ +LIB_SCHED_YIELD = @LIB_SCHED_YIELD@ LIB_SELECT = @LIB_SELECT@ +LIB_SEMAPHORE = @LIB_SEMAPHORE@ +LIB_SETLOCALE = @LIB_SETLOCALE@ +LIB_SETLOCALE_NULL = @LIB_SETLOCALE_NULL@ LIMITS_H = @LIMITS_H@ LIPO = @LIPO@ LN_S = @LN_S@ @@ -1020,6 +1062,7 @@ NEXT_AS_FIRST_DIRECTIVE_STDIO_H = @NEXT_AS_FIRST_DIRECTIVE_STDIO_H@ NEXT_AS_FIRST_DIRECTIVE_STDLIB_H = @NEXT_AS_FIRST_DIRECTIVE_STDLIB_H@ NEXT_AS_FIRST_DIRECTIVE_STRING_H = @NEXT_AS_FIRST_DIRECTIVE_STRING_H@ NEXT_AS_FIRST_DIRECTIVE_SYS_IOCTL_H = @NEXT_AS_FIRST_DIRECTIVE_SYS_IOCTL_H@ +NEXT_AS_FIRST_DIRECTIVE_SYS_RANDOM_H = @NEXT_AS_FIRST_DIRECTIVE_SYS_RANDOM_H@ NEXT_AS_FIRST_DIRECTIVE_SYS_SELECT_H = @NEXT_AS_FIRST_DIRECTIVE_SYS_SELECT_H@ NEXT_AS_FIRST_DIRECTIVE_SYS_SOCKET_H = @NEXT_AS_FIRST_DIRECTIVE_SYS_SOCKET_H@ NEXT_AS_FIRST_DIRECTIVE_SYS_STAT_H = @NEXT_AS_FIRST_DIRECTIVE_SYS_STAT_H@ @@ -1049,6 +1092,7 @@ NEXT_STDIO_H = @NEXT_STDIO_H@ NEXT_STDLIB_H = @NEXT_STDLIB_H@ NEXT_STRING_H = @NEXT_STRING_H@ NEXT_SYS_IOCTL_H = @NEXT_SYS_IOCTL_H@ +NEXT_SYS_RANDOM_H = @NEXT_SYS_RANDOM_H@ NEXT_SYS_SELECT_H = @NEXT_SYS_SELECT_H@ NEXT_SYS_SOCKET_H = @NEXT_SYS_SOCKET_H@ NEXT_SYS_STAT_H = @NEXT_SYS_STAT_H@ @@ -1085,21 +1129,24 @@ POSUB = @POSUB@ PRAGMA_COLUMNS = @PRAGMA_COLUMNS@ PRAGMA_SYSTEM_HEADER = @PRAGMA_SYSTEM_HEADER@ PRIPTR_PREFIX = @PRIPTR_PREFIX@ -PRI_MACROS_BROKEN = @PRI_MACROS_BROKEN@ PTHREAD_H_DEFINES_STRUCT_TIMESPEC = @PTHREAD_H_DEFINES_STRUCT_TIMESPEC@ PTRDIFF_T_SUFFIX = @PTRDIFF_T_SUFFIX@ RANLIB = @RANLIB@ +REPLACE_ACCESS = @REPLACE_ACCESS@ +REPLACE_ALIGNED_ALLOC = @REPLACE_ALIGNED_ALLOC@ REPLACE_BTOWC = @REPLACE_BTOWC@ REPLACE_CALLOC = @REPLACE_CALLOC@ REPLACE_CANONICALIZE_FILE_NAME = @REPLACE_CANONICALIZE_FILE_NAME@ REPLACE_CHOWN = @REPLACE_CHOWN@ REPLACE_CLOSE = @REPLACE_CLOSE@ +REPLACE_CREAT = @REPLACE_CREAT@ REPLACE_CTIME = @REPLACE_CTIME@ REPLACE_DPRINTF = @REPLACE_DPRINTF@ REPLACE_DUP = @REPLACE_DUP@ REPLACE_DUP2 = @REPLACE_DUP2@ REPLACE_DUPLOCALE = @REPLACE_DUPLOCALE@ REPLACE_FACCESSAT = @REPLACE_FACCESSAT@ +REPLACE_FCHMODAT = @REPLACE_FCHMODAT@ REPLACE_FCHOWNAT = @REPLACE_FCHOWNAT@ REPLACE_FCLOSE = @REPLACE_FCLOSE@ REPLACE_FCNTL = @REPLACE_FCNTL@ @@ -1127,6 +1174,7 @@ REPLACE_GETLINE = @REPLACE_GETLINE@ REPLACE_GETLOGIN_R = @REPLACE_GETLOGIN_R@ REPLACE_GETPAGESIZE = @REPLACE_GETPAGESIZE@ REPLACE_GETPASS = @REPLACE_GETPASS@ +REPLACE_GETRANDOM = @REPLACE_GETRANDOM@ REPLACE_GETTIMEOFDAY = @REPLACE_GETTIMEOFDAY@ REPLACE_GMTIME = @REPLACE_GMTIME@ REPLACE_INET_NTOP = @REPLACE_INET_NTOP@ @@ -1136,6 +1184,8 @@ REPLACE_IOCTL = @REPLACE_IOCTL@ REPLACE_ISATTY = @REPLACE_ISATTY@ REPLACE_ISWBLANK = @REPLACE_ISWBLANK@ REPLACE_ISWCNTRL = @REPLACE_ISWCNTRL@ +REPLACE_ISWDIGIT = @REPLACE_ISWDIGIT@ +REPLACE_ISWXDIGIT = @REPLACE_ISWXDIGIT@ REPLACE_LCHOWN = @REPLACE_LCHOWN@ REPLACE_LINK = @REPLACE_LINK@ REPLACE_LINKAT = @REPLACE_LINKAT@ @@ -1168,6 +1218,7 @@ REPLACE_OPEN = @REPLACE_OPEN@ REPLACE_OPENAT = @REPLACE_OPENAT@ REPLACE_PERROR = @REPLACE_PERROR@ REPLACE_POPEN = @REPLACE_POPEN@ +REPLACE_POSIX_MEMALIGN = @REPLACE_POSIX_MEMALIGN@ REPLACE_PREAD = @REPLACE_PREAD@ REPLACE_PRINTF = @REPLACE_PRINTF@ REPLACE_PSELECT = @REPLACE_PSELECT@ @@ -1256,6 +1307,7 @@ REPLACE_STRCASESTR = @REPLACE_STRCASESTR@ REPLACE_STRCHRNUL = @REPLACE_STRCHRNUL@ REPLACE_STRDUP = @REPLACE_STRDUP@ REPLACE_STRERROR = @REPLACE_STRERROR@ +REPLACE_STRERRORNAME_NP = @REPLACE_STRERRORNAME_NP@ REPLACE_STRERROR_R = @REPLACE_STRERROR_R@ REPLACE_STRFTIME = @REPLACE_STRFTIME@ REPLACE_STRNCAT = @REPLACE_STRNCAT@ @@ -1293,13 +1345,13 @@ REPLACE_WCRTOMB = @REPLACE_WCRTOMB@ REPLACE_WCSFTIME = @REPLACE_WCSFTIME@ REPLACE_WCSNRTOMBS = @REPLACE_WCSNRTOMBS@ REPLACE_WCSRTOMBS = @REPLACE_WCSRTOMBS@ +REPLACE_WCSTOK = @REPLACE_WCSTOK@ REPLACE_WCSWIDTH = @REPLACE_WCSWIDTH@ REPLACE_WCTOB = @REPLACE_WCTOB@ REPLACE_WCTOMB = @REPLACE_WCTOMB@ REPLACE_WCWIDTH = @REPLACE_WCWIDTH@ REPLACE_WRITE = @REPLACE_WRITE@ SED = @SED@ -SELINUX_LIBS = @SELINUX_LIBS@ SET_MAKE = @SET_MAKE@ SHELL = @SHELL@ SIG_ATOMIC_T_SUFFIX = @SIG_ATOMIC_T_SUFFIX@ @@ -1318,6 +1370,7 @@ UINT32_MAX_LT_UINTMAX_MAX = @UINT32_MAX_LT_UINTMAX_MAX@ UINT64_MAX_EQ_ULONG_MAX = @UINT64_MAX_EQ_ULONG_MAX@ UNDEFINE_STRTOK_R = @UNDEFINE_STRTOK_R@ UNISTD_H_DEFINES_STRUCT_TIMESPEC = @UNISTD_H_DEFINES_STRUCT_TIMESPEC@ +UNISTD_H_HAVE_SYS_RANDOM_H = @UNISTD_H_HAVE_SYS_RANDOM_H@ UNISTD_H_HAVE_WINSOCK2_H = @UNISTD_H_HAVE_WINSOCK2_H@ UNISTD_H_HAVE_WINSOCK2_H_AND_USE_SOCKETS = @UNISTD_H_HAVE_WINSOCK2_H_AND_USE_SOCKETS@ USE_NLS = @USE_NLS@ diff --git a/partprobe/partprobe.c b/partprobe/partprobe.c index 686d76c..cee8e22 100644 --- a/partprobe/partprobe.c +++ b/partprobe/partprobe.c @@ -1,6 +1,7 @@ /* partprobe - informs the OS kernel of partition layout - Copyright (C) 2001-2002, 2007-2014, 2019 Free Software Foundation, Inc. + Copyright (C) 2001-2002, 2007-2014, 2019-2021 Free Software Foundation, + Inc. This 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/po/POTFILES.in b/po/POTFILES.in index 166b652..828a8d7 100644 --- a/po/POTFILES.in +++ b/po/POTFILES.in @@ -1,5 +1,5 @@ # libparted -# Copyright (C) 1999-2001, 2006-2014, 2019 Free Software Foundation, Inc. +# Copyright (C) 1999-2001, 2006-2014, 2019-2021 Free Software Foundation, Inc. # This file may be modified and/or copied without restriction. # list of files containing translatable strings @@ -15,7 +15,6 @@ lib/regcomp.c lib/rpmatch.c lib/version-etc.c lib/xalloc-die.c -lib/xstrtol-error.c libparted/arch/beos.c partprobe/partprobe.c diff --git a/po/ca.gmo b/po/ca.gmo index 63db9e2f6653291f8e53d248e0733c607f4db75b..84f43ead3f307f2d337a440508bd3ac2babb6e96 100644 GIT binary patch delta 3076 zcmYk-c~F&A7{~GFg2=8S0tyN$vWO`vxgf}r3pg%0Stz-0xj>qtWvE=&6hp&a6fvjC za&j_hoM<%5F`IN6K`{TYgotcNvdC$G?d7t+==Ufi2^K7Z` zHg#;X%V>2(SK`MuW*6{qFn?$*VZQPE*p}<)aI+BXh66DbvvDeR!adjx>oFc1F$#ai zB(!$E`I51tnb$_pnaFq%7UDr1iMP-n2emg-E}1wEN1zg|#vWLY1^6YVVoV2LLV1|S z^;%S-Cs8kO8>eFn4(It+6k#@off^(uYr>xTBI->#F{p_LqTXmKMq@dq;7+7yb{qrn zBqrl&R7GxLFSJNs;z_7^ACo-aX3>em3Y>;}aX8+?TpYwKIk*x@+CD%&vNNa$Uc{q# z1$EzU>YasOqbk~gYC9-Qe|67=X>0QV>~1jWA+r+hdTR8W?jrexemlf zF%o-YA##f?$5^aHeeVF0iycAjl{4sv=TM1UKvv7Hb)o($#a;Ick<1drbu{+D1Wd=V zuB%ZAzl;6xBkYGaQ3=ITMsl{1sO#yd2W>$;xYoUX2erh<8HQxhF#D7rtCvxGZ z^PfUT4^Bf(_#|pcrlD?}N6k}l{tl7sb6 z(tND{BszMtr!foX<7nKEESKHDWDMd@DyAbv~h2z4yaV=-RG$1#r&r(rev zV>1TgZJfaK?LHlnvO;Fp#HE;zJ5ZH5hdKDbHIu`$l`si4aUn9NEknJ) zKJ1PsaRy#NRU(I{E5RLDpz*%cU%Nep*|i&UP!BA|Yd8~iTt-o6-S`^L!e3B{j3;{~ zIvaK0d~A;;cn4SGTo1o=1I(V_`och8>60^jmFt&5{dF!g8Q?p%4E2Nb7AE1Rs0n|< zD7=Ru7|ze2HeY9KhjFOmmxdI{3NQ%ET-TtMa5Jj(r(OT{($NG%2l)~yK$0{sQZ;)Y z^^0}|hhYmwV#Z*f1*kQiidupts08a!oA&^=#nZ?(vqs#GchIPecRjC94z^(^rNU!4 z8RJM(mf;)Ni1}Db7J8HSPzg2jN4q+pMc>D@A&n;9X@444$WUW0i0QLD0 z4A%M2p`%Sy=zcKHy`F?x!^s$kv)s=Yq7qn&F}MPCe-$dxYSgK4Q1_oeJ@^djzDCz` z`kd$6H*}Oy6KaBM?iX&jSzfcwrV=H?u8OiTSMq& z9HJ)?pa*YpJRvdO_4G=K(S+JgAFcaUTTAU_LdBjy#1qdDvxySo1wu{R@g<^&C?oWW ziNri&2cfoy(7EcW3tFBY%gS1WNOp_9bHv8{xTXAQC2=@A;)cNx8hjh))sR`GWzq4T1)jhIhtc4mjh5|1pEu7JWKBY delta 3328 zcmYk;d2AGA7{~EOw!AQ(*yh#YdrKQ?Mn8v_AB2>bz<`28`1anff$@B8k~JI_4xz5|=q ze)N(n_DhGBy9~!(q6=}Yr7;)rXc8YBtyAssBy2@L2issC4#eR&3YX$z_yKmsW7rKF zF$3>mZ%k`z&o>l17!xzIXw2k`a-4#n;{-JAj7flrs9dJvbex4sbU*gMV>lUq#Xgvu zW+yZgi|E&)5m)OC(O<6inX-R(vAjbjVTm|={M zM^$)rj0V><=dl>CBkRTFv$R#(aX1J|F%fH#xy>$2!b8sZSEvMzBRQIO+@79we_V?m z)FM5Iy0Js3M-)3vgX)>fsM0?`mCl`QpOEi37*&}<)H5x@1e}ISti-L#>G} zybSm=)A`W$jAAKn#uEGu=i@+5R$@Cak?Wf{jT!hRlC-&snz$|HC`J#eGGRW(;6BGj z9814bUpw*Va1MPx&cvfQ3sc!jT2o$RY7@mgd<$cRG)~dbc5?T(7spU!$jm@xx(f9u z)}prC2GkukAj`#^KuvrVxu!{HcHO`jv~UqF#C51jG@%mo450p#^#!wPwVy;S#wOGS z?_)E%sIRumpQsZ@lkFnhj!NVPD$#@j`@BSKM?V#BV^{RKcn1vRwM)NxkiEvf8$|uv zFmR3m?aM~ww5k>y}~s0p_qZ&g!|I`1HA@g2docnr1uPNOP#1zTgr5Zi93 zN0^JMe0j`i>_<)T6DpA_NV2BKQ1&p+M!nhA;RxJ|>3GTU3hEjEgL(vMOriuwq89HY zY=z~>Iy6D7#n>(yhSFpYx8Lo(NXy4iDXzz3I2Vh!s@#M7@g^4IPPU5f=prhy4x{W< z{v_(fb^xd2aqNicqwRkU`y$1OnGzbxbOY*6cc3b96qWHQoPrlH13PmymAn97$HAz5 zeF9aX)0l?M*bVQZ=E-2IsG?m^{StI*|Icv-=3^3H_)v=}=!`FO`ZcI$xdsz)qw{?& zDuFu8#Cp{EpP&-`6tz3PK%IXXwYaZh%NUKDYTzBz5ALBdOenG^XoLDb6*b-gb%88Y z!d+3{=ORz?;T8iEC-f*E9Xo04aXLysN5+eM=x*wWo`f#2IsSK2W=u~%NK7JhsMtER zZnea8yh^CpGYA!XG2taDh#EqNmgOd54iP0@BC?4xVh6E}s3)|)x)3^wbXi_+=4FC% z{C9MvwT@U#=xMVkOf~U5@dBY^3Nh_ri~p>}&$Q{@yUOV;#|ebi85_)OA+$|*5xe8< zlhgCUv>qL-=!eHjK8F*zcGvi^oOmVvRB~qVGFmeUEq)!T#M*}~`zfipfQUF_m8f<2 z=-3$lFge@xM*K{2X3{EWaBuv2a;EFGxI3kL>Jr9!5Ns9`iWj7$XKbaFL;U}U#YBcWsCtPU+l!JN;5ZJG~RJqM={xZuOvAkAfWhCkk zTIGQX{{YLHy+mL8y_I~1mIo>qTY;$M3sqN?Sw3%d#BW7HLBCZM4lNFQgApqlvLew? zm9-)iUdoRfvbz1?&Y7JzKJ52K1EI>i3ErrGgf-ApP?%TX;m;}\n" "Language-Team: Catalan \n" @@ -96,11 +96,11 @@ msgstr "" #. If you don't know what to put here, please see #. #. and use glyphs suitable for your language. -#: lib/quotearg.c:362 +#: lib/quotearg.c:355 msgid "`" msgstr "" -#: lib/quotearg.c:363 +#: lib/quotearg.c:356 msgid "'" msgstr "" @@ -341,79 +341,64 @@ msgstr "" msgid "memory exhausted" msgstr "" -#: lib/xstrtol-error.c:63 -#, c-format -msgid "invalid %s%s argument '%s'" -msgstr "" - -#: lib/xstrtol-error.c:68 -#, c-format -msgid "invalid suffix in %s%s argument '%s'" -msgstr "" - -#: lib/xstrtol-error.c:72 -#, c-format -msgid "%s%s argument '%s' too large" -msgstr "" - -#: libparted/arch/beos.c:245 +#: libparted/arch/beos.c:246 msgid "Disk Image" msgstr "" -#: libparted/arch/beos.c:346 libparted/arch/gnu.c:277 +#: libparted/arch/beos.c:347 libparted/arch/gnu.c:277 #: libparted/arch/linux.c:1731 #, c-format msgid "Error opening %s: %s" msgstr "Error obrint %s: %s" -#: libparted/arch/beos.c:357 libparted/arch/gnu.c:287 +#: libparted/arch/beos.c:358 libparted/arch/gnu.c:287 #: libparted/arch/linux.c:1742 #, c-format msgid "Unable to open %s read-write (%s). %s has been opened read-only." msgstr "" "No s'ha pogut obrir %s lectura/escritura (%s). %s s'ha obert només lectura. " -#: libparted/arch/beos.c:419 libparted/arch/linux.c:1907 +#: libparted/arch/beos.c:420 libparted/arch/linux.c:1907 #, c-format msgid "%s during seek for read on %s" msgstr "%s mentre es preparava per llegir a %s" -#: libparted/arch/beos.c:452 libparted/arch/gnu.c:465 libparted/arch/gnu.c:564 -#: libparted/arch/gnu.c:692 libparted/arch/linux.c:1867 +#: libparted/arch/beos.c:453 libparted/arch/gnu.c:425 libparted/arch/gnu.c:524 +#: libparted/arch/gnu.c:652 libparted/arch/linux.c:1867 #: libparted/arch/linux.c:1949 #, c-format msgid "%s during read on %s" msgstr "%s mentre s'estava llegint a %s" -#: libparted/arch/beos.c:488 libparted/arch/gnu.c:525 +#: libparted/arch/beos.c:489 libparted/arch/gnu.c:485 #: libparted/arch/linux.c:2026 #, c-format msgid "Can't write to %s, because it is opened read-only." msgstr "No s'ha pogut escriure a %s, ja que era obert per només lectura" -#: libparted/arch/beos.c:504 libparted/arch/linux.c:2051 +#: libparted/arch/beos.c:505 libparted/arch/linux.c:2051 #, c-format msgid "%s during seek for write on %s" msgstr "%s mentre es preparava per escruire a %s" -#: libparted/arch/beos.c:541 libparted/arch/gnu.c:601 libparted/arch/gnu.c:646 -#: libparted/arch/gnu.c:723 libparted/arch/linux.c:1999 +#: libparted/arch/beos.c:542 libparted/arch/gnu.c:561 libparted/arch/gnu.c:606 +#: libparted/arch/gnu.c:683 libparted/arch/linux.c:1999 #: libparted/arch/linux.c:2094 libparted/arch/linux.c:2167 #, c-format msgid "%s during write on %s" msgstr "%s mentre s'estava escrivint a %s" -#: partprobe/partprobe.c:148 +#: partprobe/partprobe.c:149 #, c-format msgid "Try `%s --help' for more information.\n" msgstr "" -#: partprobe/partprobe.c:152 +#: partprobe/partprobe.c:153 #, c-format msgid "Usage: %s [OPTION] [DEVICE]...\n" msgstr "" -#: partprobe/partprobe.c:153 +#: partprobe/partprobe.c:154 msgid "" "Inform the operating system about partition table changes.\n" "\n" @@ -423,13 +408,13 @@ msgid "" " -v, --version output version information and exit\n" msgstr "" -#: partprobe/partprobe.c:161 +#: partprobe/partprobe.c:162 msgid "" "\n" "When no DEVICE is given, probe all partitions.\n" msgstr "" -#: partprobe/partprobe.c:165 +#: partprobe/partprobe.c:166 #, c-format msgid "" "\n" @@ -445,44 +430,7 @@ msgstr "No s'ha pogut obrir %s" msgid "Unable to probe store." msgstr "No s'ha pogut provar d'emmagatzemar." -#: libparted/arch/gnu.c:368 -#, fuzzy -msgid "" -"The partition table cannot be re-read. This means you need to reboot before " -"mounting any modified partitions. You also need to reinstall your boot " -"loader before you reboot (which may require mounting modified partitions). " -"It is impossible do both things! So you'll need to boot off a rescue disk, " -"and reinstall your boot loader from the rescue disk. Read section 4 of the " -"Parted User documentation for more information." -msgstr "" -"La taula de particions no s'ha pogut rellegir, per tant es necessita fer " -"reboot abans de muntar una partició modificada. També es necessita " -"reinstal·lar el carregador d'arrencada abans de reinicialitzar ( que pot " -"necessitar el muntatge de les particions modificades ). No és possible fer " -"les dues coses! Per tant, necessites arrencar amb un disquet de rescat i " -"reinstal·lar el carregador d'arrencada des del disc de rescat. Llegeix la " -"secció 4 de la documentació de l'Usuari de Parted per més informació. " - -#: libparted/arch/gnu.c:385 -#, fuzzy, 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 computer " -"before doing anything with %s." -msgstr "" -"La taula de particions a %s (%s).Aixó vol dir que Linux no reconeixerà cap " -"de les modificacions fetes. S'ha de re-arrencar la màquina abans de fer res " -"amb %s." - -#: libparted/arch/gnu.c:396 parted/parted.c:2318 -msgid "" -"You should reinstall your boot loader before rebooting. Read section 4 of " -"the Parted User documentation for more information." -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ó." - -#: libparted/arch/gnu.c:788 +#: libparted/arch/gnu.c:748 #, c-format msgid "%s trying to sync %s to disk" msgstr "%s intentant de sincronitzar %s al dics" @@ -789,15 +737,15 @@ msgstr "metadata" msgid "free" msgstr "lliure" -#: libparted/disk.c:2355 parted/ui.c:1258 parted/ui.c:1286 +#: libparted/disk.c:2355 parted/ui.c:1259 parted/ui.c:1287 msgid "extended" msgstr "extesa" -#: libparted/disk.c:2357 parted/ui.c:1262 parted/ui.c:1290 +#: libparted/disk.c:2357 parted/ui.c:1263 parted/ui.c:1291 msgid "logical" msgstr "lògica" -#: libparted/disk.c:2359 parted/ui.c:1254 parted/ui.c:1282 +#: libparted/disk.c:2359 parted/ui.c:1255 parted/ui.c:1283 msgid "primary" msgstr "primària" @@ -875,64 +823,73 @@ msgstr "" msgid "esp" msgstr "Sí" -#: libparted/disk.c:2415 +#: libparted/disk.c:2411 +msgid "chromeos_kernel" +msgstr "" + +#: libparted/disk.c:2413 +#, fuzzy +msgid "bls_boot" +msgstr "boot" + +#: libparted/disk.c:2419 #, fuzzy, c-format msgid "Unknown partition flag, %d." msgstr "Flag desconegut a %d." -#: libparted/exception.c:78 +#: libparted/exception.c:79 msgid "Information" msgstr "Informació" -#: libparted/exception.c:79 +#: libparted/exception.c:80 msgid "Warning" msgstr "Perill" -#: libparted/exception.c:80 +#: libparted/exception.c:81 msgid "Error" msgstr "Error" -#: libparted/exception.c:81 +#: libparted/exception.c:82 msgid "Fatal" msgstr "Fatal" -#: libparted/exception.c:82 +#: libparted/exception.c:83 msgid "Bug" msgstr "Bug" -#: libparted/exception.c:83 +#: libparted/exception.c:84 msgid "No Implementation" msgstr "No Implementat" -#: libparted/exception.c:87 +#: libparted/exception.c:88 msgid "Fix" msgstr "Fix" -#: libparted/exception.c:88 +#: libparted/exception.c:89 msgid "Yes" msgstr "Sí" -#: libparted/exception.c:89 +#: libparted/exception.c:90 msgid "No" msgstr "No" -#: libparted/exception.c:90 +#: libparted/exception.c:91 msgid "OK" msgstr "D'accord" -#: libparted/exception.c:91 +#: libparted/exception.c:92 msgid "Retry" msgstr "Reintentar" -#: libparted/exception.c:92 +#: libparted/exception.c:93 msgid "Ignore" msgstr "Ignorar" -#: libparted/exception.c:93 +#: libparted/exception.c:94 msgid "Cancel" msgstr "Cancel·lar" -#: libparted/exception.c:133 +#: libparted/exception.c:134 #, c-format msgid "" "A bug has been detected in GNU Parted. Refer to the web site of parted " @@ -941,33 +898,33 @@ msgid "" "containing at least the version (%s) and the following message: " msgstr "" -#: libparted/labels/aix.c:91 +#: libparted/labels/aix.c:92 #, fuzzy msgid "Support for reading AIX disk labels is is not implemented yet." msgstr "" "El suport per crear sistemes de fitxers de %s encara no està implementat." -#: libparted/labels/aix.c:102 +#: libparted/labels/aix.c:103 #, fuzzy msgid "Support for writing AIX disk labels is is not implemented yet." msgstr "" "El suport per crear sistemes de fitxers de %s encara no està implementat." -#: libparted/labels/aix.c:115 +#: libparted/labels/aix.c:116 #, fuzzy msgid "" "Support for adding partitions to AIX disk labels is not implemented yet." msgstr "" "El suport per crear sistemes de fitxers de %s encara no està implementat." -#: libparted/labels/aix.c:125 +#: libparted/labels/aix.c:126 #, fuzzy msgid "" "Support for duplicating partitions in AIX disk labels is not implemented yet." msgstr "" "El suport per crear sistemes de fitxers de %s encara no està implementat." -#: libparted/labels/aix.c:143 +#: libparted/labels/aix.c:144 #, fuzzy msgid "" "Support for setting system type of partitions in AIX disk labels is not " @@ -975,7 +932,7 @@ msgid "" msgstr "" "El suport per crear sistemes de fitxers de %s encara no està implementat." -#: libparted/labels/aix.c:153 +#: libparted/labels/aix.c:154 #, fuzzy msgid "Support for setting flags in AIX disk labels is not implemented yet." msgstr "" @@ -1065,11 +1022,11 @@ msgid "" "partitions, if XGM is the first one it counts for two)." msgstr "" -#: libparted/labels/atari.c:1657 libparted/labels/bsd.c:567 -#: libparted/labels/dasd.c:894 libparted/labels/dos.c:2276 -#: libparted/labels/dvh.c:770 libparted/labels/gpt.c:2050 -#: libparted/labels/loop.c:243 libparted/labels/mac.c:1423 -#: libparted/labels/pc98.c:701 libparted/labels/rdb.c:1054 +#: libparted/labels/atari.c:1657 libparted/labels/bsd.c:563 +#: libparted/labels/dasd.c:895 libparted/labels/dos.c:2283 +#: libparted/labels/dvh.c:770 libparted/labels/gpt.c:2140 +#: 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 "No s'ha pogut satisfer les limitacions a la partició" @@ -1086,44 +1043,44 @@ msgstr "" msgid "Unable to allocate a partition number." msgstr "S'esperava un múmero de partició." -#: libparted/labels/bsd.c:592 +#: libparted/labels/bsd.c:588 #, fuzzy msgid "Unable to allocate a bsd disklabel slot." msgstr "No s'ha pogut reservar una etiqueta bsd" -#: libparted/labels/dasd.c:625 +#: libparted/labels/dasd.c:626 msgid "The partition table of DASD-LDL device cannot be changed.\n" msgstr "" -#: libparted/labels/dasd.c:920 +#: libparted/labels/dasd.c:921 #, fuzzy msgid "Unable to allocate a dasd disklabel slot" msgstr "No s'ha pogut reservar una etiqueta bsd" -#: libparted/labels/dos.c:1003 +#: libparted/labels/dos.c:1006 #, 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:1031 +#: libparted/labels/dos.c:1034 #, c-format msgid "Invalid partition table - recursive partition on %s." msgstr "Taula de particions invàlida - partició recursiva a %s." -#: libparted/labels/dos.c:1560 +#: libparted/labels/dos.c:1557 msgid "Extended partitions cannot be hidden on msdos disk labels." msgstr "" -#: libparted/labels/dos.c:1572 +#: libparted/labels/dos.c:1569 #, 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:2258 +#: libparted/labels/dos.c:2265 msgid "Parted can't resize partitions managed by Windows Dynamic Disk." msgstr "" -#: libparted/labels/dos.c:2514 +#: libparted/labels/dos.c:2521 #, fuzzy msgid "cannot create any more partitions" msgstr "No es pot crear cap més partició." @@ -1271,12 +1228,12 @@ msgstr "" msgid "Disk geometry does not match a DASD device of type 3390." msgstr "" -#: libparted/labels/gpt.c:531 +#: libparted/labels/gpt.c:541 #, fuzzy msgid "device is too small for GPT" msgstr "Sistema de fitxers massa petit per ext2." -#: libparted/labels/gpt.c:733 +#: libparted/labels/gpt.c:743 #, fuzzy, c-format msgid "" "The format of the GPT partition table is version %x, which is newer than " @@ -1285,7 +1242,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:769 +#: libparted/labels/gpt.c:779 #, c-format msgid "" "Not all of the space available to %s appears to be used, you can fix the GPT " @@ -1293,7 +1250,7 @@ msgid "" "setting? " msgstr "" -#: libparted/labels/gpt.c:1008 +#: libparted/labels/gpt.c:1024 #, fuzzy msgid "" "The backup GPT table is not at the end of the disk, as it should be. Fix, " @@ -1303,7 +1260,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:1026 +#: libparted/labels/gpt.c:1042 #, fuzzy msgid "" "Both the primary and backup GPT tables are corrupt. Try making a fresh " @@ -1313,7 +1270,7 @@ msgstr "" "taula actualitzada, i fent servir la opció de rescat de Parted per " "reconstruïr les particions." -#: libparted/labels/gpt.c:1037 +#: libparted/labels/gpt.c:1053 #, fuzzy msgid "" "The backup GPT table is corrupt, but the primary appears OK, so that will be " @@ -1322,7 +1279,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:1049 +#: libparted/labels/gpt.c:1065 #, fuzzy msgid "" "The primary GPT table is corrupt, but the backup appears OK, so that will be " @@ -1331,11 +1288,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:1073 +#: libparted/labels/gpt.c:1089 msgid "primary partition table array CRC mismatch" msgstr "" -#: libparted/labels/gpt.c:1936 libparted/labels/gpt.c:1963 +#: libparted/labels/gpt.c:2026 libparted/labels/gpt.c:2053 #, fuzzy msgid "failed to translate partition name" msgstr "No s'ha pogut determinar si la partició està muntada." @@ -1370,26 +1327,21 @@ msgid "The data region doesn't start at the start of the partition." msgstr "La regió de dades no comença al principi de la partició" #: libparted/labels/mac.c:572 -#, fuzzy -msgid "The boot region doesn't start at the start of the partition." -msgstr "La regió d'arrencada no comemça al principi de la partició" - -#: libparted/labels/mac.c:586 msgid "The partition's boot region doesn't occupy the entire partition." msgstr "La regió d'arrencada de la partició no ocupa la partició sencera." -#: libparted/labels/mac.c:597 +#: libparted/labels/mac.c:583 msgid "The partition's data region doesn't occupy the entire partition." msgstr "La regió de dades de la partició no ocupa la partició sencera." -#: libparted/labels/mac.c:649 +#: libparted/labels/mac.c:635 #, c-format msgid "" "Weird block size on device descriptor: %d bytes is not divisible by 512." msgstr "" "La mida de bloc extrany al dispositiu: %d bytes no és divisible per 512." -#: libparted/labels/mac.c:662 +#: libparted/labels/mac.c:648 #, c-format msgid "" "The driver descriptor says the physical block size is %d bytes, but Linux " @@ -1398,11 +1350,11 @@ msgstr "" "El controlador diu que el tamany de bloc físic és de %d bytes, però Linux " "troba que és de %d bytes." -#: libparted/labels/mac.c:715 +#: libparted/labels/mac.c:701 msgid "No valid partition map found." msgstr "No s'ha trobat un mapa de particions vàlid." -#: libparted/labels/mac.c:789 +#: libparted/labels/mac.c:775 #, fuzzy, c-format msgid "" "Conflicting partition map entry sizes! Entry 1 says it is %d, but entry %d " @@ -1411,12 +1363,12 @@ msgstr "" "Conflicte de mida de entrada del mapa de particions! La entrada 1 diu que és " "%d, però la entrada %d diu que és %d!" -#: libparted/labels/mac.c:820 +#: libparted/labels/mac.c:806 #, fuzzy msgid "Weird! There are 2 partitions map entries!" msgstr "Estrany - 2 entrades de mapes de particions!" -#: libparted/labels/mac.c:1359 +#: libparted/labels/mac.c:1345 msgid "" "Changing the name of a root or swap partition will prevent Linux from " "recognising it as such." @@ -1424,18 +1376,18 @@ msgstr "" "Canviar el nom d'una partició root o swap impedirà que Linux les reconeixi " "com a tals." -#: libparted/labels/mac.c:1458 +#: libparted/labels/mac.c:1444 #, fuzzy msgid "Can't add another partition -- the partition map is too small!" msgstr "" "No es pot afegir una altra partició - el mapa de particions és massa petit!" -#: libparted/labels/pc98.c:284 +#: libparted/labels/pc98.c:285 #, fuzzy, c-format msgid "Invalid partition table on %s." msgstr "Taula de particions invàlida a %s" -#: libparted/labels/pc98.c:337 libparted/labels/pc98.c:415 +#: libparted/labels/pc98.c:338 libparted/labels/pc98.c:416 #, fuzzy, c-format msgid "" "Partition %d isn't aligned to cylinder boundaries. This is still " @@ -1444,7 +1396,7 @@ msgstr "" "La partició %d no està aliniada als límits dels cilindres. Cal afegir suport " "per aquesta característica." -#: libparted/labels/pc98.c:733 +#: libparted/labels/pc98.c:729 msgid "Can't add another partition." msgstr "No es pot afegir un altra partició." @@ -1617,39 +1569,39 @@ msgstr "" msgid "Could not write VTOC FMT9 DSCB." msgstr "" -#: libparted/libparted.c:242 +#: libparted/libparted.c:247 msgid "Out of memory." msgstr "Sense memòria." -#: libparted/unit.c:139 +#: libparted/unit.c:140 msgid "Cannot get unit size for special unit 'COMPACT'." msgstr "" -#: libparted/unit.c:385 +#: libparted/unit.c:386 #, c-format msgid "\"%s\" has invalid syntax for locations." msgstr "" -#: libparted/unit.c:393 +#: libparted/unit.c:394 #, c-format msgid "The maximum head value is %d." msgstr "" -#: libparted/unit.c:400 +#: libparted/unit.c:401 #, c-format msgid "The maximum sector value is %d." msgstr "" -#: libparted/unit.c:412 libparted/unit.c:564 +#: libparted/unit.c:413 libparted/unit.c:565 #, c-format msgid "The location %s is outside of the device %s." msgstr "" -#: libparted/unit.c:526 +#: libparted/unit.c:527 msgid "Invalid number." msgstr "" -#: libparted/unit.c:532 +#: libparted/unit.c:533 msgid "Use a smaller unit instead of a value < 1" msgstr "" @@ -1659,18 +1611,18 @@ msgstr "" msgid "%s : Failed to allocate partition block\n" msgstr "" -#: libparted/fs/amiga/affs.c:79 libparted/fs/amiga/apfs.c:71 +#: 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 "" -#: libparted/fs/amiga/affs.c:84 libparted/fs/amiga/apfs.c:76 +#: libparted/fs/amiga/affs.c:83 libparted/fs/amiga/apfs.c:76 #, c-format msgid "%s : Couldn't read boot block %llu\n" msgstr "" -#: libparted/fs/amiga/affs.c:98 libparted/fs/amiga/apfs.c:87 +#: 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" @@ -1696,22 +1648,22 @@ msgstr "" msgid "%s : Couldn't write block %d\n" msgstr "%s mentre s'estava escrivint a %s" -#: libparted/fs/amiga/amiga.c:278 +#: libparted/fs/amiga/amiga.c:279 #, c-format msgid "%s : Failed to allocate disk_specific rdb block\n" msgstr "" -#: libparted/fs/amiga/amiga.c:289 +#: libparted/fs/amiga/amiga.c:290 #, c-format msgid "%s : Didn't find rdb block, should never happen\n" msgstr "" -#: libparted/fs/amiga/amiga.c:318 +#: libparted/fs/amiga/amiga.c:319 #, c-format msgid "%s : Failed to read partition block %llu\n" msgstr "" -#: libparted/fs/fat/fat.c:148 libparted/fs/r/fat/fat.c:811 +#: libparted/fs/fat/fat.c:149 #, fuzzy msgid "" "GNU Parted was miscompiled: the FAT boot sector should be 512 bytes. FAT " @@ -1813,7 +1765,7 @@ msgid "" "geometry." msgstr "" -#: libparted/fs/r/fat/bootsector.c:399 +#: libparted/fs/r/fat/bootsector.c:398 #, c-format msgid "" "The information sector has the wrong signature (%x). Select cancel for now, " @@ -1840,14 +1792,14 @@ msgstr "" "El començament delta de cluster = %d, que no és multiple de la mida de " "cluster %d. " -#: libparted/fs/r/fat/count.c:144 +#: libparted/fs/r/fat/count.c:84 #, c-format msgid "Bad directory entry for %s: first cluster is the end of file marker." msgstr "" "Entrada de directori incorrecta per %s: el primer clúster és el final de la " "marca de fitxer." -#: libparted/fs/r/fat/count.c:157 +#: libparted/fs/r/fat/count.c:97 #, c-format msgid "" "Bad FAT: unterminated chain for %s. You should run dosfsck or scandisk." @@ -1855,7 +1807,7 @@ msgstr "" "FAT incorrecta: cadena sense acabar per %s. Has de executar dosfsck o " "scandisk." -#: libparted/fs/r/fat/count.c:166 +#: libparted/fs/r/fat/count.c:106 #, fuzzy, c-format msgid "" "Bad FAT: cluster %d outside file system in chain for %s. You should run " @@ -1864,7 +1816,7 @@ msgstr "" "FAT incorrecta: clúster %d fora del sistema de fitxers a la cadena per %s. " "Has de executar dosfsck o scandisk." -#: libparted/fs/r/fat/count.c:176 +#: libparted/fs/r/fat/count.c:116 #, c-format msgid "" "Bad FAT: cluster %d is cross-linked for %s. You should run dosfsck or " @@ -1873,26 +1825,17 @@ msgstr "" "FAT incorrecta: clúster %d té un enllaç creuat per %s. Has d'executar " "dosfsck o scandisk." -#: libparted/fs/r/fat/count.c:195 +#: libparted/fs/r/fat/count.c:135 #, fuzzy, c-format msgid "%s is %dk, but it has %d clusters (%dk)." msgstr "%s és %dk, però té %d clústers (%dk)." -#: libparted/fs/r/fat/count.c:258 -#, c-format -msgid "" -"The file %s is marked as a system file. This means moving it could cause " -"some programs to stop working." -msgstr "" -"El fitxer %s està marcat com un sistema de fitxers. Això vol dir que si el " -"moveu por ocasionar que alguns programes no funcionin." - -#: libparted/fs/r/fat/fat.c:243 +#: libparted/fs/r/fat/fat.c:244 #, fuzzy, c-format msgid "Partition too big/small for a %s file system." msgstr "Partició massa gran/petita per un sistema de fitxers %s" -#: libparted/fs/r/fat/fat.c:409 +#: 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." @@ -1900,11 +1843,11 @@ msgstr "" "Les FATs no coincideixen. Si no saps què vols dir aixó, llavors selecciona " "cancelar, executa scandisk al sistema de fitxers, i després torna." -#: libparted/fs/r/fat/fat.c:449 +#: libparted/fs/r/fat/fat.c:450 msgid "There are no possible configurations for this FAT type." msgstr "No hi ha configuracions possibles per aquest tipus de FAT." -#: libparted/fs/r/fat/fat.c:461 +#: libparted/fs/r/fat/fat.c:462 #, c-format msgid "" "File system doesn't have expected sizes for Windows to like it. Cluster " @@ -1916,7 +1859,7 @@ msgstr "" "(hauria de ser de %d); la mida de FAT és de %d sectors ( hauria de ser de %d " "sectors)." -#: libparted/fs/r/fat/fat.c:484 +#: libparted/fs/r/fat/fat.c:485 #, c-format msgid "" "File system is reporting the free space as %d clusters, not %d clusters." @@ -1924,7 +1867,7 @@ msgstr "" "El sistema de fitxers diu que la mida de l'espai lliure en clústers és de " "%d, no de %d clústers." -#: libparted/fs/r/fat/resize.c:158 +#: libparted/fs/r/fat/resize.c:159 #, fuzzy msgid "" "There's not enough room in the root directory for all of the files. Either " @@ -1933,17 +1876,17 @@ msgstr "" "No hi ha espai suficient al directori root, per a tots els fitxers. O bé, " "cancel·lar, o bé, Ignorar perdent els fitxers. " -#: libparted/fs/r/fat/resize.c:302 +#: libparted/fs/r/fat/resize.c:303 msgid "Error writing to the root directory." msgstr "Error escribint al directori root." -#: libparted/fs/r/fat/resize.c:495 +#: libparted/fs/r/fat/resize.c:479 #, fuzzy msgid "If you leave your file system as FAT16, then you will have no problems." msgstr "" "Si deixes el sistema de fitxers com FAT16, llavors no tindràs problemes" -#: libparted/fs/r/fat/resize.c:498 +#: 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 " @@ -1954,7 +1897,7 @@ msgstr "" "vols fer aixó, hauries de consultar el manual de Parted ( o el manual de la " "teva distribució)." -#: libparted/fs/r/fat/resize.c:506 +#: libparted/fs/r/fat/resize.c:490 msgid "" "If you leave your file system as FAT32, then you will not introduce any new " "problems." @@ -1962,7 +1905,7 @@ msgstr "" "Si deixes el teu sistema de fitxers com a FAT32, llavors no tindràs més " "problemes." -#: libparted/fs/r/fat/resize.c:510 +#: 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 " @@ -1976,35 +1919,35 @@ msgstr "" "teva distribució). També, convertint a FAT32 faràs que MS DOS, MS Windows " "95a i Windows NT no puguin llegir el sistema de fitxers " -#: libparted/fs/r/fat/resize.c:524 +#: libparted/fs/r/fat/resize.c:508 #, c-format msgid "%s %s %s" msgstr "%s %s %s" -#: libparted/fs/r/fat/resize.c:525 +#: libparted/fs/r/fat/resize.c:509 msgid "Would you like to use FAT32?" msgstr "Vol fer servir FAT32?" -#: libparted/fs/r/fat/resize.c:556 libparted/fs/r/fat/resize.c:572 +#: 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:557 +#: libparted/fs/r/fat/resize.c:541 msgid "" "The file system can only be resized to this size by converting to FAT16." msgstr "" "El sistema de fitxers només pot ser redimensionada a aquesta mida covertint-" "la a FAT16." -#: libparted/fs/r/fat/resize.c:573 +#: libparted/fs/r/fat/resize.c:557 msgid "" "The file system can only be resized to this size by converting to FAT32." msgstr "" "El sistema de fitxers només pot ser redimensionada a aquesta mida covertint-" "la a FAT32." -#: libparted/fs/r/fat/resize.c:586 +#: libparted/fs/r/fat/resize.c:570 #, fuzzy msgid "" "GNU Parted cannot resize this partition to this size. We're working on it!" @@ -2012,7 +1955,7 @@ msgstr "" "GNU Parted no por redimensionar aquesta partició a aquesta mida. Estem " "treballant en aixó!" -#: libparted/fs/r/fat/table.c:136 +#: 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 " @@ -2021,44 +1964,44 @@ msgstr "" "La FAT %d del medi %x no coincideix amb sector boot del medi %x. Hauries " "d'executar scandisk." -#: libparted/fs/r/fat/table.c:268 +#: libparted/fs/r/fat/table.c:269 #, fuzzy, c-format msgid "fat_table_set: cluster %ld outside file system" msgstr "fat_table_set: clúster %ld fora del sistema de fitxers" -#: libparted/fs/r/fat/table.c:300 +#: libparted/fs/r/fat/table.c:301 #, fuzzy, c-format msgid "fat_table_get: cluster %ld outside file system" msgstr "fat_table_get: clúster %ld fora del sistema de fitxers" -#: libparted/fs/r/fat/table.c:342 +#: libparted/fs/r/fat/table.c:343 msgid "fat_table_alloc_cluster: no free clusters" msgstr "fat_table_alloc_cluster: no hi ha clústers lliures" -#: libparted/fs/r/filesys.c:151 +#: libparted/fs/r/filesys.c:152 msgid "Could not detect file system." msgstr "No s'ha pogut detectar el sistema de fitxers." -#: libparted/fs/r/filesys.c:158 libparted/fs/r/filesys.c:285 +#: libparted/fs/r/filesys.c:159 libparted/fs/r/filesys.c:284 #, fuzzy, c-format msgid "resizing %s file systems is not supported" msgstr "" "El suport per redimensionar sistemes de fitxers de %s encara no està " "implementat." -#: libparted/fs/r/filesys.c:170 +#: libparted/fs/r/filesys.c:171 #, fuzzy msgid "The file system is bigger than its volume!" msgstr "El sistema de fitxers és més gran que ho és el volum!" -#: libparted/fs/r/hfs/advfs.c:121 libparted/fs/r/hfs/advfs_plus.c:121 -#: libparted/fs/r/hfs/reloc.c:413 libparted/fs/r/hfs/reloc.c:507 -#: libparted/fs/r/hfs/reloc_plus.c:538 libparted/fs/r/hfs/reloc_plus.c:656 -#: libparted/fs/r/hfs/reloc_plus.c:769 +#: 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:285 +#: libparted/fs/r/hfs/advfs_plus.c:287 msgid "Bad blocks could not be read." msgstr "" @@ -2116,90 +2059,90 @@ msgstr "" msgid "Trying to write HFS+ file with CNID %X behind EOF." msgstr "" -#: libparted/fs/r/hfs/hfs.c:232 +#: libparted/fs/r/hfs/hfs.c:212 msgid "Sorry, HFS cannot be resized that way yet." msgstr "" -#: libparted/fs/r/hfs/hfs.c:250 libparted/fs/r/hfs/hfs.c:629 +#: libparted/fs/r/hfs/hfs.c:230 libparted/fs/r/hfs/hfs.c:573 msgid "shrinking" msgstr "encongint" -#: libparted/fs/r/hfs/hfs.c:262 libparted/fs/r/hfs/hfs.c:641 +#: 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:281 +#: 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:320 +#: libparted/fs/r/hfs/hfs.c:300 #, fuzzy msgid "writing HFS Master Directory Block" msgstr "Error escribint al directori root." -#: libparted/fs/r/hfs/hfs.c:468 +#: 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:478 +#: libparted/fs/r/hfs/hfs.c:422 #, c-format msgid "Version %d of HFS+ isn't supported." msgstr "" -#: libparted/fs/r/hfs/hfs.c:489 +#: libparted/fs/r/hfs/hfs.c:433 #, c-format msgid "Version %d of HFSX isn't supported." msgstr "" -#: libparted/fs/r/hfs/hfs.c:672 +#: 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:720 +#: libparted/fs/r/hfs/hfs.c:664 #, fuzzy msgid "Error while writing the allocation file." msgstr "Error escribint al directori root." -#: libparted/fs/r/hfs/hfs.c:735 +#: 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:750 +#: libparted/fs/r/hfs/hfs.c:694 msgid "writing HFS+ Volume Header" msgstr "" -#: libparted/fs/r/hfs/hfs.c:850 +#: 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:904 +#: 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:940 +#: libparted/fs/r/hfs/hfs.c:883 msgid "Sorry, HFS+ cannot be resized that way yet." msgstr "" -#: libparted/fs/r/hfs/hfs.c:975 +#: libparted/fs/r/hfs/hfs.c:918 msgid "shrinking embedded HFS+ volume" msgstr "" -#: libparted/fs/r/hfs/hfs.c:992 +#: libparted/fs/r/hfs/hfs.c:935 msgid "Resizing the HFS+ volume has failed." msgstr "" -#: libparted/fs/r/hfs/hfs.c:999 +#: libparted/fs/r/hfs/hfs.c:942 #, fuzzy msgid "shrinking HFS wrapper" msgstr "encongint" -#: libparted/fs/r/hfs/hfs.c:1008 +#: libparted/fs/r/hfs/hfs.c:951 msgid "Updating the HFS wrapper has failed." msgstr "" -#: libparted/fs/r/hfs/hfs.c:1110 libparted/fs/r/hfs/hfs.c:1195 +#: 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 " @@ -2270,73 +2213,73 @@ msgstr "" msgid "An extent has not been relocated." msgstr "" -#: libparted/fs/r/hfs/reloc.c:250 libparted/fs/r/hfs/reloc_plus.c:307 +#: 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:380 +#: 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:474 +#: 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:516 libparted/fs/r/hfs/reloc_plus.c:666 +#: 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:573 libparted/fs/r/hfs/reloc_plus.c:844 +#: libparted/fs/r/hfs/reloc.c:579 libparted/fs/r/hfs/reloc_plus.c:849 #, fuzzy msgid "Could not cache the file system in memory." msgstr "No s'ha pogut detectar el sistema de fitxers." -#: libparted/fs/r/hfs/reloc.c:634 libparted/fs/r/hfs/reloc_plus.c:905 +#: 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:648 libparted/fs/r/hfs/reloc_plus.c:921 +#: 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:494 +#: 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:617 +#: 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:125 +#: parted/parted.c:126 msgid "displays this help message" msgstr "mostra aquest missatge d'ajuda" -#: parted/parted.c:126 +#: parted/parted.c:127 msgid "lists partition layout on all block devices" msgstr "" -#: parted/parted.c:127 +#: parted/parted.c:128 msgid "displays machine parseable output" msgstr "" -#: parted/parted.c:128 +#: parted/parted.c:129 msgid "never prompts for user intervention" msgstr "mai pregunta a l'usuari" -#: parted/parted.c:129 +#: parted/parted.c:130 msgid "displays the version" msgstr "mostra la versió" -#: parted/parted.c:130 +#: parted/parted.c:131 #, fuzzy msgid "alignment for new partitions" msgstr "No es poden copiar particions exteses." -#: parted/parted.c:142 +#: parted/parted.c:143 #, fuzzy msgid "" "NUMBER is the partition number used by Linux. On MS-DOS disk labels, the " @@ -2346,57 +2289,57 @@ 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:145 +#: parted/parted.c:146 msgid "LABEL-TYPE is one of: " msgstr "TIPUS-ETI és una d'aquestes: " -#: parted/parted.c:146 parted/parted.c:147 +#: parted/parted.c:147 parted/parted.c:148 msgid "FLAG is one of: " msgstr "FLAG és una d'aquests:" -#: parted/parted.c:148 +#: parted/parted.c:149 #, fuzzy msgid "UNIT is one of: " msgstr "FLAG és una d'aquests:" -#: parted/parted.c:149 +#: parted/parted.c:150 msgid "desired alignment: minimum or optimal" msgstr "" -#: parted/parted.c:150 +#: parted/parted.c:151 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:152 +#: parted/parted.c:153 msgid "FS-TYPE is one of: " msgstr "TIPUS-SF és un d'aquests: " -#: parted/parted.c:153 +#: parted/parted.c:154 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:156 +#: parted/parted.c:157 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:159 +#: parted/parted.c:160 msgid "STATE is one of: on, off\n" msgstr "ESTAT és un d'aquests: on, off\n" -#: parted/parted.c:160 +#: parted/parted.c:161 msgid "DEVICE is usually /dev/hda or /dev/sda\n" msgstr "DISPOS és, normalment, /dev/hda o /dev/sda\n" -#: parted/parted.c:161 +#: parted/parted.c:162 msgid "NAME is any word you want\n" msgstr "NOM és qualsevol paraula que vulguis\n" -#: parted/parted.c:164 +#: parted/parted.c:165 #, fuzzy msgid "" "Copyright (C) 1998 - 2006 Free Software Foundation, Inc.\n" @@ -2417,155 +2360,155 @@ msgstr "" "General Pública GNU.\n" "\n" -#: parted/parted.c:212 +#: parted/parted.c:213 #, c-format msgid "%0.f%%\t(time left %.2d:%.2d)" msgstr "%0.f%%\t(temps que queda %.2d:%.2d)" -#: parted/parted.c:231 +#: parted/parted.c:232 #, c-format msgid "Partition %s is being used. Are you sure you want to continue?" msgstr "" -#: parted/parted.c:252 +#: parted/parted.c:253 #, c-format msgid "Partition(s) on %s are being used." msgstr "La(s) partició(ns) a %s s'està utilitzant." -#: parted/parted.c:264 +#: parted/parted.c:265 #, 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:525 +#: parted/parted.c:526 msgid "New disk label type?" msgstr "Nou tipus d'etiqueta?" -#: parted/parted.c:662 +#: parted/parted.c:663 msgid "Partition type?" msgstr "Tipus de partició?" -#: parted/parted.c:680 parted/parted.c:884 +#: parted/parted.c:681 parted/parted.c:885 msgid "Partition name?" msgstr "Nom de la partició?" -#: parted/parted.c:690 +#: parted/parted.c:691 msgid "File system type?" msgstr "Sistema de fitxers?" -#: parted/parted.c:695 parted/parted.c:1498 +#: parted/parted.c:696 parted/parted.c:1499 msgid "Start?" msgstr "Inici?" -#: parted/parted.c:698 parted/parted.c:1500 parted/parted.c:1569 +#: parted/parted.c:699 parted/parted.c:1501 parted/parted.c:1585 msgid "End?" msgstr "Fi?" -#: parted/parted.c:766 +#: parted/parted.c:767 #, 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:775 +#: parted/parted.c:776 msgid "" "\n" "Is this still acceptable to you?" msgstr "" -#: parted/parted.c:798 +#: parted/parted.c:799 #, c-format msgid "" "The resulting partition is not properly aligned for best performance: %s" msgstr "" -#: parted/parted.c:800 parted/parted.c:1723 +#: parted/parted.c:801 parted/parted.c:1739 msgid "unknown (malloc failed)" msgstr "" -#: parted/parted.c:876 +#: parted/parted.c:877 #, 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:881 parted/parted.c:1561 parted/parted.c:1612 -#: parted/parted.c:1706 parted/parted.c:1781 +#: parted/parted.c:882 parted/parted.c:1564 parted/parted.c:1628 +#: parted/parted.c:1722 parted/parted.c:1797 msgid "Partition number?" msgstr "Número de partició?" -#: parted/parted.c:975 +#: parted/parted.c:976 #, c-format msgid "BIOS cylinder,head,sector geometry: %d,%d,%d. Each cylinder is %s.\n" msgstr "" -#: parted/parted.c:1017 +#: parted/parted.c:1018 #, c-format msgid "Model: %s (%s)\n" msgstr "" -#: parted/parted.c:1019 +#: parted/parted.c:1020 #, fuzzy, c-format msgid "Disk %s: %s\n" msgstr "Tipus d'etiqueta: %s\n" -#: parted/parted.c:1020 +#: parted/parted.c:1021 #, c-format msgid "Sector size (logical/physical): %lldB/%lldB\n" msgstr "" -#: parted/parted.c:1032 +#: parted/parted.c:1033 #, fuzzy, c-format msgid "Partition Table: %s\n" msgstr "Nom de la partició?" -#: parted/parted.c:1033 +#: parted/parted.c:1034 #, fuzzy, c-format msgid "Disk Flags: %s\n" msgstr "Tipus d'etiqueta: %s\n" -#: parted/parted.c:1153 parted/parted.c:1156 +#: parted/parted.c:1154 parted/parted.c:1157 msgid "Number" msgstr "" -#: parted/parted.c:1153 parted/parted.c:1156 +#: parted/parted.c:1154 parted/parted.c:1157 #, fuzzy msgid "Start" msgstr "Inici?" -#: parted/parted.c:1154 parted/parted.c:1157 +#: parted/parted.c:1155 parted/parted.c:1158 #, fuzzy msgid "End" msgstr "Fi?" -#: parted/parted.c:1157 +#: parted/parted.c:1158 msgid "Size" msgstr "" -#: parted/parted.c:1161 +#: parted/parted.c:1162 msgid "Type" msgstr "" -#: parted/parted.c:1163 +#: parted/parted.c:1164 #, fuzzy msgid "File system" msgstr "Sistema de fitxers?" -#: parted/parted.c:1166 +#: parted/parted.c:1167 msgid "Name" msgstr "" -#: parted/parted.c:1168 +#: parted/parted.c:1169 msgid "Flags" msgstr "Flags" -#: parted/parted.c:1225 +#: parted/parted.c:1226 msgid "Free Space" msgstr "" -#: parted/parted.c:1385 +#: parted/parted.c:1386 #, fuzzy, c-format msgid "" "A %s %s partition was found at %s -> %s. Do you want to add it to the " @@ -2574,82 +2517,82 @@ msgstr "" "Una partició %s %s ha estat trobada a %.3fMb -> %.3fMb. Vols afegir-la a la " "taula de particions?" -#: parted/parted.c:1428 +#: parted/parted.c:1429 #, fuzzy msgid "searching for file systems" msgstr "sistema de fitxers creixent" -#: parted/parted.c:1535 +#: parted/parted.c:1536 msgid "The resize command has been removed in parted 3.0" msgstr "" -#: parted/parted.c:1583 +#: parted/parted.c:1599 msgid "" "Shrinking a partition can cause data loss, are you sure you want to continue?" msgstr "" -#: parted/parted.c:1636 +#: parted/parted.c:1652 msgid "New device?" msgstr "Nou dispositiu?" -#: parted/parted.c:1704 +#: parted/parted.c:1720 msgid "alignment type(min/opt)" msgstr "" -#: parted/parted.c:1719 +#: parted/parted.c:1735 #, c-format msgid "%d aligned\n" msgstr "" -#: parted/parted.c:1721 +#: parted/parted.c:1737 #, c-format msgid "%d not aligned: %s\n" msgstr "" -#: parted/parted.c:1746 parted/parted.c:1783 +#: parted/parted.c:1762 parted/parted.c:1799 #, fuzzy msgid "Flag to Invert?" msgstr "Flag a canviar?" -#: parted/parted.c:1751 parted/parted.c:1788 +#: parted/parted.c:1767 parted/parted.c:1804 msgid "New state?" msgstr "Nou estat?" -#: parted/parted.c:1834 +#: parted/parted.c:1850 msgid "Unit?" msgstr "" -#: parted/parted.c:1969 +#: parted/parted.c:1985 #, fuzzy msgid "align-check" msgstr "comprova" -#: parted/parted.c:1972 +#: parted/parted.c:1988 msgid "" "align-check TYPE N check partition N for TYPE(min|opt) " "alignment" msgstr "" -#: parted/parted.c:1980 +#: parted/parted.c:1996 msgid "help" msgstr "ajuda" -#: parted/parted.c:1983 +#: parted/parted.c:1999 #, fuzzy msgid "" "help [COMMAND] print general help, or help on " "COMMAND" msgstr "Ajuda [ORDRE] imprimeix ajuda general, o ajuda d'ORDRE" -#: parted/parted.c:1989 +#: parted/parted.c:2005 msgid "mklabel" msgstr "mklabel" -#: parted/parted.c:1989 +#: parted/parted.c:2005 msgid "mktable" msgstr "" -#: parted/parted.c:1992 +#: parted/parted.c:2008 #, fuzzy msgid "" "mklabel,mktable LABEL-TYPE create a new disklabel (partition " @@ -2657,16 +2600,16 @@ msgid "" msgstr "" "mklabel TIPUS-ETI crea una nova etiqueta de disc (taula de partició)" -#: parted/parted.c:1998 +#: parted/parted.c:2014 msgid "mkpart" msgstr "mkpart" -#: parted/parted.c:2001 +#: parted/parted.c:2017 #, 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:2007 +#: parted/parted.c:2023 #, fuzzy msgid "" "'mkpart' makes a partition without creating a new file system on the " @@ -2675,196 +2618,204 @@ 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:2012 +#: parted/parted.c:2028 msgid "name" msgstr "name" -#: parted/parted.c:2015 +#: parted/parted.c:2031 #, fuzzy msgid "name NUMBER NAME name partition NUMBER as NAME" msgstr "name MINOR NOM anomena la partició MINOR NOM" -#: parted/parted.c:2020 +#: parted/parted.c:2036 msgid "print" msgstr "print" -#: parted/parted.c:2023 +#: parted/parted.c:2039 msgid "" "print [devices|free|list,all|NUMBER] display the partition table, " "available devices, free space, all found partitions, or a particular " "partition" msgstr "" -#: parted/parted.c:2028 +#: parted/parted.c:2044 msgid "" "Without arguments, 'print' displays the entire partition table. However with " "the following arguments it performs various other actions.\n" msgstr "" -#: parted/parted.c:2030 +#: parted/parted.c:2046 msgid " devices : display all active block devices\n" msgstr "" -#: parted/parted.c:2031 +#: parted/parted.c:2047 msgid "" " free : display information about free unpartitioned space on the " "current block device\n" msgstr "" -#: parted/parted.c:2033 +#: parted/parted.c:2049 msgid "" " list, all : display the partition tables of all active block devices\n" msgstr "" -#: parted/parted.c:2034 +#: parted/parted.c:2050 msgid "" " NUMBER : display more detailed information about this particular " "partition\n" msgstr "" -#: parted/parted.c:2039 +#: parted/parted.c:2055 msgid "quit" msgstr "quit" -#: parted/parted.c:2042 +#: parted/parted.c:2058 #, fuzzy msgid "quit exit program" msgstr "quit surt del programa" -#: parted/parted.c:2047 +#: parted/parted.c:2063 msgid "rescue" msgstr "rescatar" -#: parted/parted.c:2050 +#: parted/parted.c:2066 #, 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:2056 +#: parted/parted.c:2072 msgid "resize" msgstr "resize" -#: parted/parted.c:2059 +#: parted/parted.c:2075 msgid "The resize command was removed in parted 3.0\n" msgstr "" -#: parted/parted.c:2062 +#: parted/parted.c:2078 #, fuzzy msgid "resizepart" msgstr "resize" -#: parted/parted.c:2065 +#: parted/parted.c:2081 #, fuzzy msgid "resizepart NUMBER END resize partition NUMBER" msgstr "rm MINOR suprimeix la partició MINOR" -#: parted/parted.c:2070 +#: parted/parted.c:2086 msgid "rm" msgstr "rm" -#: parted/parted.c:2073 +#: parted/parted.c:2089 #, fuzzy msgid "rm NUMBER delete partition NUMBER" msgstr "rm MINOR suprimeix la partició MINOR" -#: parted/parted.c:2078 +#: parted/parted.c:2094 msgid "select" msgstr "select" -#: parted/parted.c:2081 +#: parted/parted.c:2097 #, fuzzy msgid "select DEVICE choose the device to edit" msgstr "select DISPOSITIU escollir el dispositiu a editar" -#: parted/parted.c:2086 +#: parted/parted.c:2102 msgid "disk_set" msgstr "" -#: parted/parted.c:2089 +#: parted/parted.c:2105 msgid "" "disk_set FLAG STATE change the FLAG on selected device" msgstr "" -#: parted/parted.c:2094 +#: parted/parted.c:2110 msgid "disk_toggle" msgstr "" -#: parted/parted.c:2097 +#: parted/parted.c:2113 msgid "" "disk_toggle [FLAG] toggle the state of FLAG on " "selected device" msgstr "" -#: parted/parted.c:2103 +#: parted/parted.c:2119 msgid "set" msgstr "set" -#: parted/parted.c:2106 +#: parted/parted.c:2122 #, 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:2112 +#: parted/parted.c:2128 msgid "toggle" msgstr "" -#: parted/parted.c:2115 +#: parted/parted.c:2131 msgid "" "toggle [NUMBER [FLAG]] toggle the state of FLAG on " "partition NUMBER" msgstr "" -#: parted/parted.c:2121 +#: parted/parted.c:2137 msgid "unit" msgstr "" -#: parted/parted.c:2124 +#: parted/parted.c:2140 #, fuzzy msgid "unit UNIT set the default unit to UNIT" msgstr "quit surt del programa" -#: parted/parted.c:2129 +#: parted/parted.c:2145 msgid "version" msgstr "" -#: parted/parted.c:2132 +#: parted/parted.c:2148 msgid "" "version display the version number and " "copyright information of GNU Parted" msgstr "" -#: parted/parted.c:2136 +#: parted/parted.c:2152 msgid "" "'version' displays copyright and version information corresponding to this " "copy of GNU Parted\n" msgstr "" -#: parted/parted.c:2204 +#: parted/parted.c:2220 #, c-format msgid "Usage: %s [-hlmsv] [-a] [DEVICE [COMMAND [PARAMETERS]]...]\n" msgstr "" -#: parted/parted.c:2248 +#: parted/parted.c:2264 msgid "No device found" msgstr "No s'ha trobat el dispositiu" -#: parted/parted.c:2285 +#: parted/parted.c:2301 msgid "WARNING: You are not superuser. Watch out for permissions.\n" msgstr "" -#: parted/parted.c:2325 +#: parted/parted.c:2334 +msgid "" +"You should reinstall your boot loader before rebooting. Read section 4 of " +"the Parted User documentation for more information." +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:2341 #, fuzzy msgid "You may need to update /etc/fstab.\n" msgstr "No us oblideu d'actualitzar /etc/fstab si cal.\n" -#: parted/ui.c:164 +#: parted/ui.c:165 msgid "Welcome to GNU Parted! Type 'help' to view a list of commands.\n" msgstr "" -#: parted/ui.c:167 +#: parted/ui.c:168 #, fuzzy msgid "" "Usage: parted [OPTION]... [DEVICE [COMMAND [PARAMETERS]...]...]\n" @@ -2877,7 +2828,7 @@ msgstr "" "ORDRES, s'executa en\n" "mode interactiu.\n" -#: parted/ui.c:172 +#: parted/ui.c:173 #, c-format msgid "" "\n" @@ -2911,216 +2862,217 @@ msgid "" "consider important.\n" msgstr "" -#: parted/ui.c:293 +#: parted/ui.c:294 msgid "" "\n" "Command History:\n" msgstr "" -#: parted/ui.c:356 +#: parted/ui.c:357 msgid "" "\n" "Error: SEGV_MAPERR (Address not mapped to object)\n" msgstr "" -#: parted/ui.c:362 +#: parted/ui.c:363 msgid "" "\n" "Error: SEGV_ACCERR (Invalid permissions for mapped object)\n" msgstr "" -#: parted/ui.c:367 +#: parted/ui.c:368 msgid "" "\n" "Error: A general SIGSEGV signal was encountered.\n" msgstr "" -#: parted/ui.c:391 +#: parted/ui.c:392 msgid "" "\n" "Error: FPE_INTDIV (Integer: divide by zero)" msgstr "" -#: parted/ui.c:396 +#: parted/ui.c:397 msgid "" "\n" "Error: FPE_INTOVF (Integer: overflow)" msgstr "" -#: parted/ui.c:401 +#: parted/ui.c:402 msgid "" "\n" "Error: FPE_FLTDIV (Float: divide by zero)" msgstr "" -#: parted/ui.c:406 +#: parted/ui.c:407 msgid "" "\n" "Error: FPE_FLTOVF (Float: overflow)" msgstr "" -#: parted/ui.c:411 +#: parted/ui.c:412 msgid "" "\n" "Error: FPE_FLTUND (Float: underflow)" msgstr "" -#: parted/ui.c:416 +#: parted/ui.c:417 msgid "" "\n" "Error: FPE_FLTRES (Float: inexact result)" msgstr "" -#: parted/ui.c:421 +#: parted/ui.c:422 msgid "" "\n" "Error: FPE_FLTINV (Float: invalid operation)" msgstr "" -#: parted/ui.c:426 +#: parted/ui.c:427 msgid "" "\n" "Error: FPE_FLTSUB (Float: subscript out of range)" msgstr "" -#: parted/ui.c:431 +#: parted/ui.c:432 msgid "" "\n" "Error: A general SIGFPE signal was encountered." msgstr "" -#: parted/ui.c:455 +#: parted/ui.c:456 msgid "" "\n" "Error: ILL_ILLOPC (Illegal Opcode)" msgstr "" -#: parted/ui.c:460 +#: parted/ui.c:461 msgid "" "\n" "Error: ILL_ILLOPN (Illegal Operand)" msgstr "" -#: parted/ui.c:465 +#: parted/ui.c:466 msgid "" "\n" "Error: ILL_ILLADR (Illegal addressing mode)" msgstr "" -#: parted/ui.c:470 +#: parted/ui.c:471 msgid "" "\n" "Error: ILL_ILLTRP (Illegal Trap)" msgstr "" -#: parted/ui.c:475 +#: parted/ui.c:476 msgid "" "\n" "Error: ILL_PRVOPC (Privileged Opcode)" msgstr "" -#: parted/ui.c:480 +#: parted/ui.c:481 msgid "" "\n" "Error: ILL_PRVREG (Privileged Register)" msgstr "" -#: parted/ui.c:485 +#: parted/ui.c:486 msgid "" "\n" "Error: ILL_COPROC (Coprocessor Error)" msgstr "" -#: parted/ui.c:490 +#: parted/ui.c:491 msgid "" "\n" "Error: ILL_BADSTK (Internal Stack Error)" msgstr "" -#: parted/ui.c:495 +#: parted/ui.c:496 msgid "" "\n" "Error: A general SIGILL signal was encountered." msgstr "" -#: parted/ui.c:888 +#: parted/ui.c:889 #, fuzzy, c-format msgid "invalid token: %s" msgstr "Taula de particions invàlida a %s" -#: parted/ui.c:1069 +#: parted/ui.c:1070 msgid "Expecting a partition number." msgstr "S'esperava un múmero de partició." -#: parted/ui.c:1078 +#: parted/ui.c:1079 msgid "Partition doesn't exist." msgstr "La partició no existeix." -#: parted/ui.c:1098 +#: parted/ui.c:1099 msgid "Expecting a file system type." msgstr "S'esperava un tipus de sistema de fitxers." -#: parted/ui.c:1105 +#: parted/ui.c:1106 #, c-format msgid "Unknown file system type \"%s\"." msgstr "Tipus de sistema de fitxers desconegut \"%s\"." -#: parted/ui.c:1126 +#: parted/ui.c:1127 msgid "Expecting a disk label type." msgstr "S'esperava un tipus de etiqueta de dics." -#: parted/ui.c:1157 parted/ui.c:1193 +#: parted/ui.c:1158 parted/ui.c:1194 msgid "No flags supported" msgstr "" -#: parted/ui.c:1267 +#: parted/ui.c:1268 msgid "Can't create any more partitions." msgstr "No es pot crear cap més partició." -#: parted/ui.c:1277 +#: parted/ui.c:1278 msgid "Expecting a partition type." msgstr "S'esperava un tipus de partició." -#: parted/ui.c:1426 +#: parted/ui.c:1427 msgid "on" msgstr "on" -#: parted/ui.c:1427 +#: parted/ui.c:1428 msgid "off" msgstr "off" -#: parted/ui.c:1444 +#: parted/ui.c:1445 msgid "optimal" msgstr "" -#: parted/ui.c:1445 +#: parted/ui.c:1446 msgid "minimal" msgstr "" -#: parted/ui.c:1578 +#: parted/ui.c:1579 msgid "OPTIONs:" msgstr "OPCIONS:" -#: parted/ui.c:1583 +#: parted/ui.c:1584 msgid "COMMANDs:" msgstr "ORDRES:" -#: parted/ui.c:1586 +#: parted/ui.c:1587 #, c-format msgid "" "\n" "Report bugs to %s\n" msgstr "" -#: parted/ui.c:1593 +#: parted/ui.c:1594 #, c-format msgid "Using %s\n" msgstr "Utilitzant %s\n" -#: parted/ui.c:1673 +#: parted/ui.c:1674 msgid "This command does not make sense in non-interactive mode.\n" msgstr "" +#, c-format #~ msgid "" #~ "The sector size on %s is %d bytes. Parted is known not to work properly " #~ "with drives with sector sizes other than %d bytes" @@ -3128,6 +3080,7 @@ msgstr "" #~ "La mida del sector a %s és de %d bytes. Parted no funcionarà correctament " #~ "amb discs d'una mida de sector diferent de %d bytes" +#, c-format #~ msgid "Device %s has dodgey geometry." #~ msgstr "El dispositiu %s té una geometria incorrecte." @@ -3137,12 +3090,15 @@ msgstr "" #~ msgid "SCSI" #~ msgstr "SCSI" +#, c-format #~ msgid "Device %s is neither a SCSI nor IDE drive." #~ msgstr "El dispositiu %s no és ni SCSI ni IDE" +#, c-format #~ msgid "Error reading %s (%s) to determine if partition is mounted." #~ msgstr "Error al llegir %s (%s) per determinar si la partició està muntada." +#, c-format #~ msgid "" #~ "The kernel was unable to re-read the partition table on %s (%s). This " #~ "means Linux won't know anything nothing about the modifications you made " @@ -3153,6 +3109,34 @@ msgstr "" #~ "dir que Linux no reconeixerà cap de les modificacions fetes. Heu " #~ "d'arrencar la màquina abans de fer res amb %s." +#~ msgid "" +#~ "The partition table was unable to be reread, as such, you need to reboot " +#~ "before mounting any modified partitions. You also need to reinstall your " +#~ "boot loader before you reboot (which may require mounting modified " +#~ "partitions). It is impossible do both things! So you'll need to boot " +#~ "off a rescue disk, and reinstall your boot loader from the rescue disk. " +#~ "Read section 4 of the Parted User documentation for more information." +#~ msgstr "" +#~ "La taula de particions no s'ha pogut rellegir, per tant es necessita fer " +#~ "reboot abans de muntar una partició modificada. També es necessita " +#~ "reinstal·lar el carregador d'arrencada abans de reinicialitzar ( que pot " +#~ "necessitar el muntatge de les particions modificades ). No és possible " +#~ "fer les dues coses! Per tant, necessites arrencar amb un disquet de " +#~ "rescat i reinstal·lar el carregador d'arrencada des del disc de rescat. " +#~ "Llegeix la secció 4 de la documentació de l'Usuari de Parted per més " +#~ "informació. " + +#, c-format +#~ msgid "" +#~ "The partition table on %s (%s). This means the Hurd knows nothing about " +#~ "any modifications you made. You should reboot your computer before doing " +#~ "anything with %s." +#~ msgstr "" +#~ "La taula de particions a %s (%s).Aixó vol dir que Linux no reconeixerà " +#~ "cap de les modificacions fetes. S'ha de re-arrencar la màquina abans de " +#~ "fer res amb %s." + +#, c-format #~ msgid "" #~ "The partition table on %s is inconsistent. There are many reasons why " #~ "this might be the case. However, the most likely reason is that Linux " @@ -3175,6 +3159,7 @@ msgstr "" #~ "continuar ( i arregleu Linux després). Si no, seleccioneu Cancel·lar ( i " #~ "arregleu Linux i/o la BIOS ara mateix)." +#, c-format #~ msgid "" #~ "The partition table on %s is inconsistent. There are many reasons why " #~ "this might be the case. Often, the reason is that Linux detected the " @@ -3203,6 +3188,7 @@ msgstr "" #~ "més segur és Ignorar, però si s'ignora pot causar problemes (que es " #~ "podren arreglar)amb alguns carregadors d'arrencada." +#, c-format #~ msgid "" #~ "%s contains GPT signatures, indicating that it has a GPT table. However, " #~ "it does not have a valid fake msdos partition table, as it should. " @@ -3217,10 +3203,15 @@ msgstr "" #~ "taula GPT i ara feu servir una taula de particions msdos. És aquesta una " #~ "partició GPT? " +#~ msgid "The boot region doesn't start at the start of the partition" +#~ msgstr "La regió d'arrencada no comemça al principi de la partició" + +#, c-format #~ msgid "Support for opening %s file systems is not implemented yet." #~ msgstr "" #~ "El suport per obrir sistemes de fitxers de %s encara no està implementat." +#, c-format #~ msgid "Support for checking %s file systems is not implemented yet." #~ msgstr "" #~ "El suport per comprovar sistemes de fitxers de %s encara no està " @@ -3232,6 +3223,7 @@ msgstr "" #~ msgid "Can't copy onto an overlapping partition." #~ msgstr "No es pot copiar a una partició solapada." +#, c-format #~ msgid "" #~ "Direct support for copying file systems is not yet implemented for %s. " #~ "However, support for resizing implemented. Therefore, the file system " @@ -3245,10 +3237,12 @@ msgstr "" #~ "nova partició és, com a mínim, tant gran com la antiga. Per tant, o es " #~ "contrau la partició que es vol copiar o es copia a una partició més gran." +#, c-format #~ msgid "Support for copying %s file systems is not implemented yet." #~ msgstr "" #~ "Suport per copiar sistemes de fitxers %s encara no està implementat." +#, c-format #~ msgid "" #~ "A bug has been detected in GNU parted. Please email a bug report to bug-" #~ "parted@gnu.org containing the version (%s) and the following message:" @@ -3256,6 +3250,7 @@ msgstr "" #~ "S'ha detectat un bug a GNU Parted. Si-us-plau, envieu un e-mail a bug-" #~ "parted@gnu.org que contingui la versió (%s) i el següent missatge:" +#, c-format #~ msgid "Attempt to read sectors %ld-%ld outside of partition on %s" #~ msgstr "S'ha intentat llegir sectors %ld-%ld fora de la partició a %s" @@ -3308,11 +3303,13 @@ msgstr "" #~ msgid "adding groups" #~ msgstr "afegint grups" +#, c-format #~ msgid "Your filesystem is too occupied to resize it to %i blocks. Sorry." #~ msgstr "" #~ "El sistema de fitxers està massa ocupat en redimensionar-se a %i blocs.Ho " #~ "sento." +#, c-format #~ msgid "" #~ "Your filesystem has too much occupied inodes to resize it to %i blocks. " #~ "Sorry." @@ -3325,9 +3322,11 @@ msgstr "" #~ "S'ha trobat blocs amb enllaços creuats! Millor que primer s'executi " #~ "e2fsck!" +#, c-format #~ msgid "Block %i has no reference? Weird" #~ msgstr "El bloc %i no té referència? Extrany" +#, c-format #~ msgid "Block %i shouldn't have been marked!" #~ msgstr "El bloc %i no hauria d'estar marcat!" @@ -3353,6 +3352,7 @@ msgstr "" #~ "El sistema de fitxers té una signatura invàlida per a un sistema de " #~ "fitxers FAT." +#, 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." @@ -3360,6 +3360,7 @@ msgstr "" #~ "Aquest sistema de fitxers té una mida de sector lògic de %d. GNU Parted " #~ "no treballarà correctament amb mides de sectors diferents de 512 bytes." +#, c-format #~ msgid "" #~ "The FATs aren't big enough to describe all clusters! Each FAT is %d " #~ "sectors. There are %d clusters, which would require each FAT to be %d " @@ -3371,6 +3372,14 @@ msgstr "" #~ "tingui %d sectors. Això és molt extrany. Ens podries escriure un e-mail " #~ "a: bug-parted@gnu.org" +#, c-format +#~ msgid "" +#~ "The file %s is marked as a system file. This means moving it could cause " +#~ "some programs to stop working." +#~ msgstr "" +#~ "El fitxer %s està marcat com un sistema de fitxers. Això vol dir que si " +#~ "el moveu por ocasionar que alguns programes no funcionin." + #~ msgid "Too many bad pages." #~ msgstr "Massa pàgines incorrectes." @@ -3389,6 +3398,7 @@ msgstr "" #~ msgid "Destination partition number?" #~ msgstr "Número de partició destí?" +#, c-format #~ msgid "" #~ "You requested to create a partition at %.3f-%.3fMb. The closest Parted " #~ "can manage is %.3f-%.3fMb." @@ -3409,6 +3419,7 @@ msgstr "" #~ "No es por moure una partició a ella mateixa. Vols redimensionar-la, " #~ "potser?" +#, c-format #~ msgid "" #~ "You requested to move the partition to %.3f-%.3fMb. The closest Parted " #~ "can manage is %.3f-%.3fMb." @@ -3416,24 +3427,30 @@ msgstr "" #~ "Has demanat de moure una partició a %.3f-%.3fMb. El més proper que Parted " #~ "pot manegar és %.3f-%.3fMb." +#, c-format #~ msgid "Minor: %d\n" #~ msgstr "Minor: %d\n" #~ msgid "Flags: " #~ msgstr "Flags:" +#, c-format #~ msgid "File System: %s\n" #~ msgstr "Sistema de fitxers:%s\n" +#, c-format #~ msgid "Size: %10.3fMb (%d%%)\n" #~ msgstr "Mida: %10.3fMb (%d%%)\n" +#, c-format #~ msgid "Minimum size: %10.3fMb (%d%%)\n" #~ msgstr "Mida mínima: %10.3fMb (%d%%)\n" +#, c-format #~ msgid "Maximum size: %10.3fMb (%d%%)\n" #~ msgstr "Mida màxima: %10.3fMb (%d%%)\n" +#, c-format #~ msgid "Disk geometry for %s: 0.000-%.3f megabytes\n" #~ msgstr "La geometria del disc per %s: 0.000-%.3f megabytes\n" @@ -3449,6 +3466,7 @@ msgstr "" #~ msgid "Name " #~ msgstr "Nom " +#, c-format #~ msgid "" #~ "You requested to resize the partition to %.3f-%.3fMb. The closest Parted " #~ "can manage is %.3f-%.3fMb." @@ -3508,6 +3526,7 @@ msgstr "" #~ "resize MINOR INICI FI redimensiona el sistema de fitxers a la " #~ "partició MINOR" +#, c-format #~ msgid "" #~ "You found a bug in GNU Parted. Please email a bug report to bug-" #~ "parted@gnu.org containing the version (%s), and the following message:\n" @@ -3527,6 +3546,7 @@ msgstr "" #~ "FAT. D'altra manera, assegura't que el sistema operatiu i la BIOS tenen " #~ "la mateixa geometria abans de canviar de mida qualservol partició FAT." +#, c-format #~ msgid "" #~ "The operating system thinks the geometry on %s is %d/%d/%d. Therefore, " #~ "cylinder 1024 ends at %.3fM.%s" @@ -3534,5 +3554,6 @@ msgstr "" #~ "El sistema operatiu creu que la geometria a %s és %d/%d/%d. El cilindre " #~ "1024 acaba a %.3fM.%s" +#, c-format #~ msgid "The operating system thinks the geometry on %s is %d/%d/%d.%s" #~ msgstr "El sistema operatiu creu que la geometria a %s és %d/%d/%d.%s" diff --git a/po/cs.gmo b/po/cs.gmo index 31b927d62b6bade819334a27cbedacb681afe6be..e808b01e2826ed9b5409ba3a15ff6c275a5e9ee7 100644 GIT binary patch delta 9711 zcmajkcYKf6-^cNjMPf!Ik`Tm5Vhcft6|rZm)QG6PC9Tn-_@ZjW-m^k9V%18`Qd%`z zZLMF2mMTBGceS|Py>bwG+ z#HCCltYM7DJWCQy!$Ra7ljrJR*b|Izbz>^gUI%r-6s&+#P@mg~^ue6QCip$ZVO6eP z3e!*>o`7932W#U4OymA0n(nrxVK(Z5@1q9)8y3L8TE-N@P~_UCqO%K@qdo=I!FA3P zSeE*2)Q$gk#&TDkKM>VE1FLXz9sHyd> zV`m^9gQ-tIb!0y3#<>`RXE7c>M~`kC%%^pOrl^q*#xghq*%oFaF2+sRA8RtdYzeav zd*M>l=f1`?^s8q(Fc^cVPeRSy0!+fgs3m+ayAcu$-=UD5xe2n$n2Q}dd;Mm4Ac_lU^)E2`Gd1abK71W%W%8{YM{fg zJbGRx(WcspY7>Y7-AfbzliH zxn`HuWA2iCM?+b5MrjOa$t+-H)MHl%i(wP=!H(#Q$>@hY@e}NedVJ&90KuxGW+nr< zv{{Rl@dm1+rnNfi;ZJ_TTMpI3KFD&JiP#VKA+v6ZwlRiDF&&ZFH488hFJei&fzkLA z`e7+HP+^R4R>4Em>!CjX9aiK1rW#vXyDU{!2@8rc9GgS$~n70#oV1uTxAp|1BWu0+4?%)c+m`tEil zS*Xpk3k%^X^v3tF1b%?J(3j|sKchPS5H-@U9&`rlp>}x}EQ@n78*{J#w(DuHo9rRc zg}P&POvTzb*LfI=QNNF|_yDyDV^|kbGaPH-anuZb=jtKPaC7RdFc?>$W@J0+yth#U z@q9<3kv&GOZP8x#Kx3>(y(3n_bPUDis43iuTB^bO-(u$#EBS+(@?vA6|&#VP1NI4qpw}_(a1H;K2&=^s$Gh9 zIE(ra`~mNyu5+Ddx(Sv`({a{6m4rvu+(b=%RDb&|mx9kxe**`o{aJf~InEC;lJ+nT zYDA4NmZxF}uBX0gpfNKsc95Nk1E{@l3(MmZO!SbHVNuSvVYjMRlm}5WdSX z6E%f@qdFEp)V?RSV{7VnQ6sB1%noQcCQ#pl{Lg&DAGU|-%EimzHuOZ0yh9R%w=f!i zMQyh55xjn}1J1*#uI@L|e%r;P)^-#IVg^>h8O|N3>s>(&;Gt_zA7xAn>T5cF%Er3+dUDF1*td1a@ZQx^C75RJp;9QS2=T0-yKI$d*>{M;7zQIzoVu;oR`OD zY&3@XFG=zl4FUKgR>HrW5o7IcPDFL2FSf%$SRHp^bNm=JL!s&R&9@mfpcB{_ub~DO zm|>T+73%X7JR~tBn^8ADkLuy~sF4<7p^IY`48w-#gWXW)ry%>tOvdT>Ir?Gh^VWgL zo;1TzOEnTTGwE0XJ#$DjmD{m2oOc}|$~$5=?18#L4mQHw?)W|DkEo74z&7|8 zHA6}4Jl%L0dgCZm2ghQVp8rWC`rtCuh*!J%DO3l}pr-T^uEeXT^G8gyKf%VL>RVA4 z-j15dJXD82z#e$r)vLZ>I}(fe&wm_=E-(T0!O5r#twgPP7V1JrFbPkhM&$jX{oPOi zwRwAB2&SQ)mhq_TE=PTS4W{5G*Zwkwmi$bubn6!9`dX zk76u-kF~Mv4EsXqj5bW(a^dDAL9^^G z?vBlrM)#+{D5*gR%AiEfmQt?&YBZHg_hnVCiB96kS~7u)B13l`!)F6xbT09&H>5*(gqk#Jq2}v z4Ce-nq<#)H17D*?7PZE<4|dLW<~Yw{dCt3!+Cv4`+C31xmiezmLxO79zs2ls}@*PugThnu;1g1_t0VERGvI zB!MKm@G>4p?SaKvc9(yOy{P+cwm0gB&8crgy~*xjM=ZU?zCVVcHrY&!!1-7Nw_#Dt z!=Csyjz>?aY&(^i&ef0|Al|_%*wu@F!EUu*A_a5Uy|kyHMsyVG;%O|!c@JEB z(Of&yPz>RC3~Gj(VyK?~G?HK%CZcYfi4E{o)GP8DR={H0?c)@Se9-hkb?|xACS8nr zzK>xa^xt7;Y7lA$voRbWp*|nHQ~$E^u+}76i^f<6J0g#$8IIaaf1x_|H|hdGyX=hB zKyT^|u>>|ojjS_jNylOgPIqp@Na`P8JpP0gxW9?n%`{_sEQo)jE?n?+yJm$@YaNF5 zu@h>BW?@M@>W*K+?$o{Z*jI5+tU~=5R>V740}Jf6OBjb9t;u{6jW7%A;Q=g;_faGH z6SWln`|M^)LR~N!b%SxJrPzRawI0DJyoG+~x1W~}7DmnB>!^;L+t2*_ll)FYV|;?O zvC#qhypF^G>g%x(zJ@w~FY1Ozus2>uZN^%8_P1Xq4xoM+M`GPK?7xsUqB`~!&O!f! z%>QkYCCq;!K7YvG_yA6)eg_-kpu_h4umRJlU&L|P=!kVUsw3r(S|?#7^~+cjf5jGF zv>oG7r#|RSzL2n(=eV7+1sF-g0o2r9#W;L`nvrTJ>`40J0P62zU5t9men<4iI@CYH zx#)e;4k!~lQ-2RzVE8Hf-vv@Jfx2fW$rzG9k$SY3M`!C~A+LK&|;zr+GJjz#dbRWC91eV0k=^$#@5YG4720Wz!C; zQ6G!i6KkE>7)5M36x3R+Lzc^&LtS9z zIr}uM#tPK8InQHR>ffR^r~i5T?k|ZN>2Pd=D{&&;z*5-lf_-0%zy=-~rjY2y`>`tC zLX9ZkqP<~l)Q!4fIA)-xbUqftEY$gXP*Z*l>)|J;&06$5zHo3V`eCv6t->INl>UxcF048EV+=7L02bRP)F7f;a zk({SN9l3#tcnke8@&nsm71fcNsP-nP3%16-*cl7pc5I4!-SHosf1o<_1UsSkhxXN+ z{2}wN8^1_{H@<|SI2|K#HR^+hQ6oL>>OY`H@+)depI{dHd}PnxijAmmclEDO1HF&h zYmZPJ4)sSJRLOqsVSM28^umkl0QRFH5OrWIcE@q3sXl{)@e=Anb*|a>Lo3vXMx!39O!UG% z{P`Gf5_5=fHB!=v)5IfUotM6UUCDDMbK<+?8ALhqA@~!)(wPTDJZ<}l@5yHpk>vW1 z)?0{Ash=e@Gb(KfFWO`A4NM|hkZWmF26%CQKN|B3_Hp^YTvHod=-Q&mSvE6=`XPK3 zE8|ikkx+TVVivj2taYk+0(m1>pH6)%(Zk~!M*ZW&A9Xe*fVOXJYF@+n)GN7qU-IoP zFO08K??$K$B=l453w#q>6Q{^krV(B9GyBEm8O^~TXgEXcAZK6Xmnr-$M!ZGntN9M` zv~1+O$5aYnb-YECCRfqp_y0>ljd1MP5!T-w&W^xoVI5FPKI+t6mh~GAB4{k&*}MZMbeRjdhHe> zFHiI(e@OU{A0$*>!QnQ|f5pxvFHGA}Vm+~$dP8?yq|)}!GJ{HO*RTe^Bo=7>PY?;5 zToQ-jVfR5_oJ5;mtF_5jx%NE#lQxz9jo+3)s6qtV17<2NCYrh9|3sfE%dw$EdGhCpUx~Yf%0glyv6bWhjYsfp z{F~@Wz7aQIhSpytoyyY^?2>J??Q-oau^o}gu}Sy>9w(-d*C)mjD%*$@mw!&)T#f%I zl{q$;$fj);u~_#Hb0>7+Kq2xPxSM#6Jb)-d{1>5;Y%w{`r@X}Z6R4EIRQ#E^M|2}9 z(iTQMEi=ipiSdM|Dt|h2BoWHk#2Vr@ZHG{0F0RLLqJkPI zJuLZu7xA|U=QKfoyoAg3{Xdmt81XXkDv?G+bHdXyfMg`~;zVPj9rdD558_VR(ujdX zYw9l%LBuCSZ=wY4zBq^&LsTT5mam`gzh17T4?fQa8sJ6OR*JgH>%_CPv=@puvCyx%biTXJv@9EzQA zAvVB+C=EV~Bd`js>wvf5WbUu#Qy56aC6o)MwAUjs8Y9SyusW6?_fm6>Ph&Ikizp5J z#Tduc+&J5~4CVNvCVwB3xWB5yQPP79Y>v5T;XG`O8&QVr6v_yFhjLugG`+tE z%FsGdMqoA8!?P$2`5fiOksMSX6R|7yz@XgNPeE?59%b6gu?fD9EDQBJF2O%>3f{-~ zvLw_M9E;zeoHwYm45?Bslm?Vz44y|Bxi9brj7`^5I3b&k(c36T;GlH??vG<71D#` z?z&|IP}W2q$_VX1Y2XFygAFqDkdMU{mUseJpzTuV5zOhsH-n9 z8r!f?>S87);&7~j#TbRNjrZVQ@)aoO4`C&@;r?n71zC-IP=>k^D}-gC`k*{EvyokD zGuFXxF&x8hQmQsaqTDbRWyIoe2qs}J`cWEk9%Upip)~k=3^t??$IACT_!IT!pkv9l-*u!6PA4RfL)%7yx1RUCoR@bM@;y%ihb3S@Pw zr%|4UPw`Q#lBGv-Gs<FQ;w>nPZ~=0NI*#qJ=`DJM zhM?pDWOmd>tcTyDj7Zh7`nY(Mjs%BLke*FMncG6MV=cBI--<2qRgA^&P=>JjI6YMf zD2wkVT!$l2M&L_K!N~D?ggawb^6uCMXCfUAs&y3P0w+)w*{c|d=TL6=AC%SqBeL#P zuL=6`S&TC0Cy{%p=!v@CjWQLRaV{RiFL5Bxat}!iW!F%xUK zmFkZ-p^U&Xl#afF!3+xZX7Fk-JgW%zBK( z$FLc0MQQlUD69Sxl*Rp&(=TYfqFBx*eNhgjaW{Wsri*Q3guSim?MeiE@F9*cu~z z`o`^18aN82r(Ud$ORyn6gyFakrJ)Cqb*J9LJMab;ij3S*WAHcy)|`3;Wv*UB8Je>g zk5{lB)(Yt7z9m*A?}f=Y5ZmKS<0BZlj`1uGXa5C^z~o~6W=%z=Ca5wg)MUraC@r6e z((`PTA-&hsmti#dYLo_SHv4ztNb>zCH;5|XC4(_2=MObzp)_m~4nPOCl;?jl1-bDl ztc0hrI=+E2r0=4f_%lk6e>ZvJt@;LSQHHb=uE6dn$G?i{_=d@=mFnx(!p77$!U*oK zI#U>pnNopEQ5v!e``{Xs3tmJy@ja9V{)!E;$}D|eGrWO30i{EEI1~#|7VmznkL4&& z%LNR|g|AYO8~=f0u<~vCh7+(qc{a*WK8`%%Y8ysjquKg9A^{td4?<~BF79Gc&Bn2` zB$budfcksp=&60!cybQo-;NzWQz45eVXl4(vM@zXz|Ob_)9^CN+GsjYzhDMoD*0_F zPt8-9i0_#F;dkldyP!NpIVe-O2<5!pcQO8Q!H=o95$oKo8!!fA$roa8+<>x*Kfqp? zHlNol7NIP@H&Je!v_KE-aEu`LpiET&r6YG5_h20PC76Lb zQHJ;m%E&}6)Hm#mEyyPt@4y7|4JaKuj`8?Cw!-?0^!^N#5erVGAggp4$_TuOFP|sU zSb%xB5$j^jCHl=4k8-0l?1$q}re;01$355)FX2FpU8=u+voVK!5%M-xU*cGtvP^$V z?!~6^{C`Cui5*eP^$!@GQEoUF=i?Tvf~oiGx$J_&$@`*=*m9JfpF^37AFv0;mg$kp zLRm9j?20>4M(}eC{r=yA@##s$5RAlyC_P<{6Y)(PjU89=9gg!c2G3v#Uc!Pf-fXM% zoWHbM`y)z&;vdkz$n?Wh@(q}VuVb(+h01GmOH+-*j0MI;C{wfqB$0$++Y>f#XTr<{F2G9qO`omI&Ckk zOwWr@R(W8({(fJLQREv@MrsGj6qaKIzGU*#>zV)GsCbhK8JgE0(hUfISidk@U|;HQ zLTSiiY>o#|hW2f2ihp85Z1RYHWp~CImb?t*MqglWOy8(qWC0vPz6BfOk0@&_`f=UxU_%Nu z;;dH%npAVZk8O|R;OC>MAPYvBQ`jW1&pyok&2Cyc-aPwR#)!A9g8 zFbWS~B|MIG@MV;ay@N8Pzhi6euWD}Bi!B{3^2yj0??CCpMxsaTCQ@C>%VcTuJ!Y`30@Hke305EIa|oAIwgVFeW%@IjOz>_K;>A-7;v zoQIjX7(3tzOvS6nB2vkF^{crP%JIEW=6)cKLnltegE#;i?Ne$hPTj}&yD1!{qCd8M zR<~>>&L>}uA7Hcny65US{d}jRG@uyoz$dU9CLYl5iEQ+cFF`N>I}41d)ZTb{^)(DV%&n58*|$$it56p>Bcia(sW}6xFI+&-q6v zBNls1cXS|5CEtl1F&I;!zeM_D8Wjg|0e+2ru;fMk*gT7U$s>;IKP(Kw4D!`jfUo0t z?0rIy;2KOMKa7p>6HLaim-I-s#dLZ8r&4%;9jj0-*x_Y8*E2Ajd=u8kCsEeK5#yI= zkvBf6e|OA8dAxSua6FCm&^o1m@=3=wz@W35;8 zg@OtN27X8_cRL! zkj}vXp1=m!>$HBMjKMDC(@}2x5GLa(ln(uba>J%)^w)bYl&5PF%7_+Yuoi{I6y$`p zC_{b}J7WcU@K;=p?$`C#=x@fbH}vt5SegA%C=HB8X-I37>yJbWr(#Wc-(UpBpVb#k!l~r#FcO!bjMOTuiyJTo_nw;Diki`!}yIkVA)&xmAVq;0M4FBZYJj4Dq zc$ARd%Jz^Z^vO$Awd9x`*VR2w`8eSsTFdvpn}RH+RU9ZiUW682+vIO}Q%L?Iz93}y z1`-RXe~`F-laU%rT{zL6$R>WJ&Wo~5AY>F|lb2CL?k|tKT1)ICWV?&FMD!xcIdO+M znKZOD=JOX~I`vbCa$WuRXJ1Ou#M9=yZ~xxIH!9^J)Zaj?qa6Ik?5s#*2L?#o5|%53l9*9#82#;NR&|an*-%dDBHcn`@~H4RiJF!h(CzKlCYhU z`A_G78afYsTIAQZKBn*z{!DBjTA4cGUXJ|_28c7n9-=RG?_gt;x7`hdY{?oGZxp_h z`R84t#&Pg-Qp2{Avb-#0yNz;7T~x~{KS|6mx%{p8PC~Zs#-7GB+)LyUwN2f0j@wT> zLY^Qeu?5%jv5$%)=AgNuYW<8$u>~=ia7tpf#h6a;whnE!oJ#}=d4z8!8c~)v9IqF( zkC5#_P3Ut!`^R&NdWwQ<^YJ4r3T6B!GiI9doj8~MIrxM*z7geRlpC7-F?^l6C_=U< z@>;|mv%dwts&}d9DMyCt8UNj;ax4y|vXF?Qyw}tV&8c&SPGI5n9G*#_VvINsz^CtDlxA8`cnIq@+e+Y;(8;xt?vM)UiJs`apryc@BN=t=}1<>NzkG(p)$88;dy;7;xzHS**}~5EtESGhbXVcRc7Dgv<$5iar=S-xJ9 zTS-aVFQ#cQ4{)o@KMT75LMXUiKs_ZAs>v_wq+DPAZ$~y(Cphzo=w71ff1fS*hS%nU7 zzRPJje3rxVmHPayLTj44z}4QevhrlN%i-bEE_QpSTW-IVYX=IPR<0x9b6GyS&}9{Q z?de`eq0jQ$md|e&StYhNpM%R@$sV}tWOjCV(DFNS3S6Ay@z{PV$7Ok4?Yu6B^M7wq zY6mQji7pHCI z*#11rpGUiV@s>5(wzx%W?su&Zp&r=NrZKEuS1(^~fV14b{1kfOq~`DD*#R%tqPGRM z!|C!`)4X;e*OgKF`=qj%nS+B_)cxIQGp4r3Vix~zWUZtGpS1hB8I&sy3V5AXzQ-={ zS_E0vGwKIU1Z+P5VF_HN+>J}_-V13CZ}!YNME_c z&G;nvb~VWz*dQ^h-Hpt+T)JI9hu@W9bxcj`-YzYbe^y$Tj85t8QoE+6?#eEW=@~V_ zQCz;kd2DTN`L?qCd)w@qx%cTx!O?ag$M#BRXSghTmdA1IK9|Ru;mBvvv1rS;utLiZ zvLfZM_Ewf{aZI7hQ@$a^syO80tUTK)s#xRl1w2+^#dfKiRaCLvXXm*6`Vh~twfS_X ze9N^ZU8+y;J3MyvfHf`PnQj+5{JY}zUkDElbLEs4*sR8iLmtkU<*|!dzO<@*o6j$k z6DY_JShmwyzOA5Q`@b|OC*XAXS=&5E{?L6`(G_dlMfMCDy{*uiRd{SIE%KBfWUXGi zj;skk>)vihL#!fOZs+HwT;GvTGq@TREE75^lNCDHRamzAWMa@t%B8W_`d(aGameA6 z{#<|Cf4?g$X_%{ER_IYLF5g1`>>PVW`L=kus|@7-^ko*)C&!p+u{dv5`G(v&d0w9X z@-0k*JO(_j(y9o$<_|c_4xStt%=*WmF`P2rp3trTF~E9#|KBW!7P!Y%T)xfnxN|KQ zfs7(|&r7k)+|J+)Clg%kau&FyV~k0t{jt2E?0mbxZL#(W7#AORPq7Nib{>k2_7zub PpK;xQ@A~2SU9tZKeP=\n" "Language-Team: Czech \n" @@ -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 #. #. and use glyphs suitable for your language. -#: lib/quotearg.c:362 +#: lib/quotearg.c:355 msgid "`" msgstr "„" -#: lib/quotearg.c:363 +#: lib/quotearg.c:356 msgid "'" msgstr "”" @@ -367,79 +367,64 @@ msgstr "" msgid "memory exhausted" msgstr "doÅ¡la paměť" -#: lib/xstrtol-error.c:63 -#, fuzzy, c-format -msgid "invalid %s%s argument '%s'" -msgstr "neplatný token: %s" - -#: lib/xstrtol-error.c:68 -#, c-format -msgid "invalid suffix in %s%s argument '%s'" -msgstr "" - -#: lib/xstrtol-error.c:72 -#, c-format -msgid "%s%s argument '%s' too large" -msgstr "" - -#: libparted/arch/beos.c:245 +#: libparted/arch/beos.c:246 msgid "Disk Image" msgstr "Obraz disku" -#: libparted/arch/beos.c:346 libparted/arch/gnu.c:277 +#: libparted/arch/beos.c:347 libparted/arch/gnu.c:277 #: libparted/arch/linux.c:1731 #, c-format msgid "Error opening %s: %s" msgstr "Chyba při otevírání %s: %s" -#: libparted/arch/beos.c:357 libparted/arch/gnu.c:287 +#: libparted/arch/beos.c:358 libparted/arch/gnu.c:287 #: libparted/arch/linux.c:1742 #, c-format msgid "Unable to open %s read-write (%s). %s has been opened read-only." msgstr "" "Nemohu otevřít %s pro čtení/zápis (%s). %s bylo otevřeno jen pro čtení." -#: libparted/arch/beos.c:419 libparted/arch/linux.c:1907 +#: libparted/arch/beos.c:420 libparted/arch/linux.c:1907 #, c-format msgid "%s during seek for read on %s" msgstr "%s při seek pro čtení %s" -#: libparted/arch/beos.c:452 libparted/arch/gnu.c:465 libparted/arch/gnu.c:564 -#: libparted/arch/gnu.c:692 libparted/arch/linux.c:1867 +#: libparted/arch/beos.c:453 libparted/arch/gnu.c:425 libparted/arch/gnu.c:524 +#: libparted/arch/gnu.c:652 libparted/arch/linux.c:1867 #: libparted/arch/linux.c:1949 #, c-format msgid "%s during read on %s" msgstr "%s při čtení %s" -#: libparted/arch/beos.c:488 libparted/arch/gnu.c:525 +#: libparted/arch/beos.c:489 libparted/arch/gnu.c:485 #: libparted/arch/linux.c:2026 #, c-format msgid "Can't write to %s, because it is opened read-only." msgstr "Nemohu zapisovat na %s, protože je otevřen jen pro čtení." -#: libparted/arch/beos.c:504 libparted/arch/linux.c:2051 +#: libparted/arch/beos.c:505 libparted/arch/linux.c:2051 #, c-format msgid "%s during seek for write on %s" msgstr "%s při seek pro zápis na %s" -#: libparted/arch/beos.c:541 libparted/arch/gnu.c:601 libparted/arch/gnu.c:646 -#: libparted/arch/gnu.c:723 libparted/arch/linux.c:1999 +#: libparted/arch/beos.c:542 libparted/arch/gnu.c:561 libparted/arch/gnu.c:606 +#: libparted/arch/gnu.c:683 libparted/arch/linux.c:1999 #: libparted/arch/linux.c:2094 libparted/arch/linux.c:2167 #, c-format msgid "%s during write on %s" msgstr "%s při zápisu na %s" -#: partprobe/partprobe.c:148 +#: partprobe/partprobe.c:149 #, c-format msgid "Try `%s --help' for more information.\n" msgstr "Pro více informací zkuste `%s --help'.\n" -#: partprobe/partprobe.c:152 +#: partprobe/partprobe.c:153 #, c-format msgid "Usage: %s [OPTION] [DEVICE]...\n" msgstr "použití: %s [PŘEPÍNAČ] [ZAŘÍZENÍ]...\n" -#: partprobe/partprobe.c:153 +#: partprobe/partprobe.c:154 msgid "" "Inform the operating system about partition table changes.\n" "\n" @@ -455,7 +440,7 @@ msgstr "" " -h, --help zobrazit tuto nápovědu a skončit\n" " -v, --version vypsat informace o verzi a skončit\n" -#: partprobe/partprobe.c:161 +#: partprobe/partprobe.c:162 msgid "" "\n" "When no DEVICE is given, probe all partitions.\n" @@ -463,7 +448,7 @@ msgstr "" "\n" "Když není zadáno ZAŘÍZENÍ, prozkoumat vÅ¡echny oddíly.\n" -#: partprobe/partprobe.c:165 +#: partprobe/partprobe.c:166 #, c-format msgid "" "\n" @@ -481,42 +466,7 @@ msgstr "Nemohu otevřít %s." msgid "Unable to probe store." msgstr "Nemohu prozkoumat úložný prostor." -#: libparted/arch/gnu.c:368 -msgid "" -"The partition table cannot be re-read. This means you need to reboot before " -"mounting any modified partitions. You also need to reinstall your boot " -"loader before you reboot (which may require mounting modified partitions). " -"It is impossible do both things! So you'll need to boot off a rescue disk, " -"and reinstall your boot loader from the rescue disk. Read section 4 of the " -"Parted User documentation for more information." -msgstr "" -"Nebylo možné znovu načíst tabulku oddílů. To znamená, že budete muset před " -"připojením změněných oddílů restartovat počítač. Také musíte před restartem " -"reinstalovat svůj zavaděč systému (což může vyžadovat připojení změněných " -"oddílů). Nelze provést obojí! Takže budete muset zavést systém ze " -"záchranného disku a reinstalovat svůj zavaděč systému odtud. Pro více " -"informací si přečtěte oddíl 4 Uživatelské dokumentace Parted." - -#: libparted/arch/gnu.c:385 -#, 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 computer " -"before doing anything with %s." -msgstr "" -"Tabulku oddílů na %s nelze znovu načíst (%s). To znamená, že Hurd neví nic o " -"změnách, které jste provedli. Než budete cokoli dělat s %s, měli byste " -"restartovat svůj počítač." - -#: libparted/arch/gnu.c:396 parted/parted.c:2318 -msgid "" -"You should reinstall your boot loader before rebooting. Read section 4 of " -"the Parted User documentation for more information." -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." - -#: libparted/arch/gnu.c:788 +#: libparted/arch/gnu.c:748 #, c-format msgid "%s trying to sync %s to disk" msgstr "%s při pokusu sync %s na disk" @@ -829,15 +779,15 @@ msgstr "metadata" msgid "free" msgstr "volné" -#: libparted/disk.c:2355 parted/ui.c:1258 parted/ui.c:1286 +#: libparted/disk.c:2355 parted/ui.c:1259 parted/ui.c:1287 msgid "extended" msgstr "rozšířený" -#: libparted/disk.c:2357 parted/ui.c:1262 parted/ui.c:1290 +#: libparted/disk.c:2357 parted/ui.c:1263 parted/ui.c:1291 msgid "logical" msgstr "logický" -#: libparted/disk.c:2359 parted/ui.c:1254 parted/ui.c:1282 +#: libparted/disk.c:2359 parted/ui.c:1255 parted/ui.c:1283 msgid "primary" msgstr "primární" @@ -915,64 +865,73 @@ msgstr "" msgid "esp" msgstr "Ano" -#: libparted/disk.c:2415 +#: libparted/disk.c:2411 +msgid "chromeos_kernel" +msgstr "" + +#: libparted/disk.c:2413 +#, fuzzy +msgid "bls_boot" +msgstr "boot" + +#: libparted/disk.c:2419 #, c-format msgid "Unknown partition flag, %d." msgstr "Neznámý příznak oddílu, %d." -#: libparted/exception.c:78 +#: libparted/exception.c:79 msgid "Information" msgstr "Informace" -#: libparted/exception.c:79 +#: libparted/exception.c:80 msgid "Warning" msgstr "Varování" -#: libparted/exception.c:80 +#: libparted/exception.c:81 msgid "Error" msgstr "Chyba" -#: libparted/exception.c:81 +#: libparted/exception.c:82 msgid "Fatal" msgstr "Fatální" -#: libparted/exception.c:82 +#: libparted/exception.c:83 msgid "Bug" msgstr "Chyba" -#: libparted/exception.c:83 +#: libparted/exception.c:84 msgid "No Implementation" msgstr "Neimplementováno" -#: libparted/exception.c:87 +#: libparted/exception.c:88 msgid "Fix" msgstr "Opravit" -#: libparted/exception.c:88 +#: libparted/exception.c:89 msgid "Yes" msgstr "Ano" -#: libparted/exception.c:89 +#: libparted/exception.c:90 msgid "No" msgstr "Ne" -#: libparted/exception.c:90 +#: libparted/exception.c:91 msgid "OK" msgstr "OK" -#: libparted/exception.c:91 +#: libparted/exception.c:92 msgid "Retry" msgstr "Znovu" -#: libparted/exception.c:92 +#: libparted/exception.c:93 msgid "Ignore" msgstr "Ignorovat" -#: libparted/exception.c:93 +#: libparted/exception.c:94 msgid "Cancel" msgstr "ZruÅ¡it" -#: libparted/exception.c:133 +#: libparted/exception.c:134 #, fuzzy, c-format msgid "" "A bug has been detected in GNU Parted. Refer to the web site of parted " @@ -985,29 +944,29 @@ msgstr "" "parted.html! PoÅ¡lete prosím e-mailem hlášení o chybě na bug-parted@gnu.org " "obsahující alespoň verzi (%s) a následující zprávu:" -#: libparted/labels/aix.c:91 +#: libparted/labels/aix.c:92 msgid "Support for reading AIX disk labels is is not implemented yet." msgstr "Podpora pro čtení jmenovek disku AIXu jeÅ¡tě není implementována." -#: libparted/labels/aix.c:102 +#: libparted/labels/aix.c:103 msgid "Support for writing AIX disk labels is is not implemented yet." msgstr "Podpora pro zápis jmenovek disku AIXu jeÅ¡tě není implementována." -#: libparted/labels/aix.c:115 +#: libparted/labels/aix.c:116 msgid "" "Support for adding partitions to AIX disk labels is not implemented yet." msgstr "" "Podpora pro přidávání oddílů do jmenovek disku AIXu jeÅ¡tě není " "implementována." -#: libparted/labels/aix.c:125 +#: libparted/labels/aix.c:126 msgid "" "Support for duplicating partitions in AIX disk labels is not implemented yet." msgstr "" "Podpora pro duplikování oddílů ve jmenovkách disku AIXu jeÅ¡tě není " "implementována." -#: libparted/labels/aix.c:143 +#: libparted/labels/aix.c:144 msgid "" "Support for setting system type of partitions in AIX disk labels is not " "implemented yet." @@ -1015,7 +974,7 @@ msgstr "" "Podpora pro nastavování typu systému oddílů ve jmenovkách disku AIXu jeÅ¡tě " "není implementována." -#: libparted/labels/aix.c:153 +#: libparted/labels/aix.c:154 msgid "Support for setting flags in AIX disk labels is not implemented yet." msgstr "" "Podpora pro nastavování přepínačů ve jmenovkách disku AIXu jeÅ¡tě není " @@ -1107,11 +1066,11 @@ msgid "" "partitions, if XGM is the first one it counts for two)." msgstr "" -#: libparted/labels/atari.c:1657 libparted/labels/bsd.c:567 -#: libparted/labels/dasd.c:894 libparted/labels/dos.c:2276 -#: libparted/labels/dvh.c:770 libparted/labels/gpt.c:2050 -#: libparted/labels/loop.c:243 libparted/labels/mac.c:1423 -#: libparted/labels/pc98.c:701 libparted/labels/rdb.c:1054 +#: libparted/labels/atari.c:1657 libparted/labels/bsd.c:563 +#: libparted/labels/dasd.c:895 libparted/labels/dos.c:2283 +#: libparted/labels/dvh.c:770 libparted/labels/gpt.c:2140 +#: 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 "Nemohu splnit vÅ¡echna omezení na oddíl." @@ -1127,43 +1086,43 @@ msgstr "" msgid "Unable to allocate a partition number." msgstr "Nemohu alokovat číslo oddílu." -#: libparted/labels/bsd.c:592 +#: libparted/labels/bsd.c:588 msgid "Unable to allocate a bsd disklabel slot." msgstr "Nemohu alokovat položku jmenovky disku bsd." -#: libparted/labels/dasd.c:625 +#: libparted/labels/dasd.c:626 msgid "The partition table of DASD-LDL device cannot be changed.\n" msgstr "" -#: libparted/labels/dasd.c:920 +#: libparted/labels/dasd.c:921 msgid "Unable to allocate a dasd disklabel slot" msgstr "Nemohu alokovat položku jmenovky disku dasd" -#: libparted/labels/dos.c:1003 +#: libparted/labels/dos.c:1006 #, 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:1031 +#: libparted/labels/dos.c:1034 #, c-format msgid "Invalid partition table - recursive partition on %s." msgstr "Neplatná tabulka oddílů - rekurzivní oddíl na %s." -#: libparted/labels/dos.c:1560 +#: libparted/labels/dos.c:1557 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:1572 +#: libparted/labels/dos.c:1569 #, 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:2258 +#: libparted/labels/dos.c:2265 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:2514 +#: libparted/labels/dos.c:2521 #, fuzzy msgid "cannot create any more partitions" msgstr "Nemohu vytvářet další oddíly." @@ -1304,12 +1263,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:531 +#: libparted/labels/gpt.c:541 #, fuzzy msgid "device is too small for GPT" msgstr "Zařízení pro %lu bloků příliÅ¡ malé." -#: libparted/labels/gpt.c:733 +#: libparted/labels/gpt.c:743 #, fuzzy, c-format msgid "" "The format of the GPT partition table is version %x, which is newer than " @@ -1318,7 +1277,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:769 +#: libparted/labels/gpt.c:779 #, c-format msgid "" "Not all of the space available to %s appears to be used, you can fix the GPT " @@ -1329,7 +1288,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:1008 +#: libparted/labels/gpt.c:1024 #, fuzzy msgid "" "The backup GPT table is not at the end of the disk, as it should be. Fix, " @@ -1339,7 +1298,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:1026 +#: libparted/labels/gpt.c:1042 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 +1306,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:1037 +#: libparted/labels/gpt.c:1053 #, fuzzy msgid "" "The backup GPT table is corrupt, but the primary appears OK, so that will be " @@ -1356,7 +1315,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:1049 +#: libparted/labels/gpt.c:1065 msgid "" "The primary GPT table is corrupt, but the backup appears OK, so that will be " "used." @@ -1364,11 +1323,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:1073 +#: libparted/labels/gpt.c:1089 msgid "primary partition table array CRC mismatch" msgstr "" -#: libparted/labels/gpt.c:1936 libparted/labels/gpt.c:1963 +#: libparted/labels/gpt.c:2026 libparted/labels/gpt.c:2053 #, fuzzy msgid "failed to translate partition name" msgstr "Nemohu alokovat číslo oddílu." @@ -1402,25 +1361,21 @@ msgid "The data region doesn't start at the start of the partition." msgstr "Datový region nezačíná na začátku oddílu." #: libparted/labels/mac.c:572 -msgid "The boot region doesn't start at the start of the partition." -msgstr "Zaváděcí region nezačíná na začátku oddílu." - -#: libparted/labels/mac.c:586 msgid "The partition's boot region doesn't occupy the entire partition." msgstr "Zaváděcí region oddílu nezabírá celý oddíl." -#: libparted/labels/mac.c:597 +#: libparted/labels/mac.c:583 msgid "The partition's data region doesn't occupy the entire partition." msgstr "Datový region oddílu nezabírá celý oddíl." -#: libparted/labels/mac.c:649 +#: libparted/labels/mac.c:635 #, c-format msgid "" "Weird block size on device descriptor: %d bytes is not divisible by 512." msgstr "" "Podivná velikost bloku v deskriptoru zařízení: %d bajtů není dělitelné 512." -#: libparted/labels/mac.c:662 +#: libparted/labels/mac.c:648 #, c-format msgid "" "The driver descriptor says the physical block size is %d bytes, but Linux " @@ -1429,11 +1384,11 @@ msgstr "" "Deskriptor ovladače říká, že fyzická velikost bloku je %d bajtů ale Linux " "říká, že je to %d bajtů." -#: libparted/labels/mac.c:715 +#: libparted/labels/mac.c:701 msgid "No valid partition map found." msgstr "Nenalezena platná mapa oddílů." -#: libparted/labels/mac.c:789 +#: libparted/labels/mac.c:775 #, c-format msgid "" "Conflicting partition map entry sizes! Entry 1 says it is %d, but entry %d " @@ -1442,11 +1397,11 @@ msgstr "" "Kolidující velikosti položek mapy oddílů! Položka 1 říká, že je to %d, ale " "položka %d říká, že je to %d!" -#: libparted/labels/mac.c:820 +#: libparted/labels/mac.c:806 msgid "Weird! There are 2 partitions map entries!" msgstr "Podivné! Existují 2 položky mapy oddílu!" -#: libparted/labels/mac.c:1359 +#: libparted/labels/mac.c:1345 msgid "" "Changing the name of a root or swap partition will prevent Linux from " "recognising it as such." @@ -1454,16 +1409,16 @@ msgstr "" "Změna názvu kořenového nebo odkládacího oddílu zabrání Linuxu v jeho " "rozpoznání." -#: libparted/labels/mac.c:1458 +#: libparted/labels/mac.c:1444 msgid "Can't add another partition -- the partition map is too small!" msgstr "Nemohu přidat další oddíl — mapa oddílů je příliÅ¡ malá!" -#: libparted/labels/pc98.c:284 +#: libparted/labels/pc98.c:285 #, c-format msgid "Invalid partition table on %s." msgstr "Neplatná tabulka oddílů na %s." -#: libparted/labels/pc98.c:337 libparted/labels/pc98.c:415 +#: libparted/labels/pc98.c:338 libparted/labels/pc98.c:416 #, c-format msgid "" "Partition %d isn't aligned to cylinder boundaries. This is still " @@ -1471,7 +1426,7 @@ msgid "" msgstr "" "Oddíl %d není zarovnán na hranice cylindru. To pořád jeÅ¡tě není podporováno." -#: libparted/labels/pc98.c:733 +#: libparted/labels/pc98.c:729 msgid "Can't add another partition." msgstr "Nemohu přidat další oddíl." @@ -1642,39 +1597,39 @@ msgstr "Nemohu zapisovat FMT7 DSCB VTOC." msgid "Could not write VTOC FMT9 DSCB." msgstr "Nemohu zapisovat FMT1 DSCB VTOC." -#: libparted/libparted.c:242 +#: libparted/libparted.c:247 msgid "Out of memory." msgstr "Nedostatek paměti." -#: libparted/unit.c:139 +#: libparted/unit.c:140 msgid "Cannot get unit size for special unit 'COMPACT'." msgstr "Nemohu získat velikost jednotky pro speciální jednotku 'COMPACT'." -#: libparted/unit.c:385 +#: libparted/unit.c:386 #, c-format msgid "\"%s\" has invalid syntax for locations." msgstr "\"%s\" má neplatnou syntax umístění." -#: libparted/unit.c:393 +#: libparted/unit.c:394 #, c-format msgid "The maximum head value is %d." msgstr "Maximální hodnota hlavy je %d." -#: libparted/unit.c:400 +#: libparted/unit.c:401 #, c-format msgid "The maximum sector value is %d." msgstr "Maximální hodnota sektoru je %d." -#: libparted/unit.c:412 libparted/unit.c:564 +#: libparted/unit.c:413 libparted/unit.c:565 #, c-format msgid "The location %s is outside of the device %s." msgstr "Umístění %s je mimo zařízení %s." -#: libparted/unit.c:526 +#: libparted/unit.c:527 msgid "Invalid number." msgstr "Neplatné číslo." -#: libparted/unit.c:532 +#: libparted/unit.c:533 msgid "Use a smaller unit instead of a value < 1" msgstr "" @@ -1684,18 +1639,18 @@ msgstr "" msgid "%s : Failed to allocate partition block\n" msgstr "%s : Nemohu alokovat blok oddílu\n" -#: libparted/fs/amiga/affs.c:79 libparted/fs/amiga/apfs.c:71 +#: 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 : Nemohu alokovat blok\n" -#: libparted/fs/amiga/affs.c:84 libparted/fs/amiga/apfs.c:76 +#: 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 : Nemohu číst zaváděcí blok %llu\n" -#: libparted/fs/amiga/affs.c:98 libparted/fs/amiga/apfs.c:87 +#: 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" @@ -1721,22 +1676,22 @@ msgstr "%s : Å patný kontrolní součet bloku %llu typu %s\n" msgid "%s : Couldn't write block %d\n" msgstr "%s : Nemohu zapsat blok %d\n" -#: libparted/fs/amiga/amiga.c:278 +#: libparted/fs/amiga/amiga.c:279 #, c-format msgid "%s : Failed to allocate disk_specific rdb block\n" msgstr "%s : Nemohu alokovat disk_specific blok rdb\n" -#: libparted/fs/amiga/amiga.c:289 +#: libparted/fs/amiga/amiga.c:290 #, c-format msgid "%s : Didn't find rdb block, should never happen\n" msgstr "%s : NenaÅ¡eljsem blok rdb, to by se nemělo nikdy stát\n" -#: libparted/fs/amiga/amiga.c:318 +#: libparted/fs/amiga/amiga.c:319 #, c-format msgid "%s : Failed to read partition block %llu\n" msgstr "%s : Nemohučíst blok oddílu %llu\n" -#: libparted/fs/fat/fat.c:148 libparted/fs/r/fat/fat.c:811 +#: libparted/fs/fat/fat.c:149 msgid "" "GNU Parted was miscompiled: the FAT boot sector should be 512 bytes. FAT " "support will be disabled." @@ -1831,7 +1786,7 @@ msgstr "" "systému souborů bude nastavena tak, aby odpovídala geometrii CHS tabulky " "oddílů." -#: libparted/fs/r/fat/bootsector.c:399 +#: libparted/fs/r/fat/bootsector.c:398 #, c-format msgid "" "The information sector has the wrong signature (%x). Select cancel for now, " @@ -1856,12 +1811,12 @@ msgid "" "Cluster start delta = %d, which is not a multiple of the cluster size %d." msgstr "Změna začátku clusteru = %d, což není násobek velikosti clusteru %d." -#: libparted/fs/r/fat/count.c:144 +#: libparted/fs/r/fat/count.c:84 #, c-format msgid "Bad directory entry for %s: first cluster is the end of file marker." msgstr "Å patná položka adresáře pro %s: první cluster je značka konce souboru." -#: libparted/fs/r/fat/count.c:157 +#: libparted/fs/r/fat/count.c:97 #, c-format msgid "" "Bad FAT: unterminated chain for %s. You should run dosfsck or scandisk." @@ -1869,7 +1824,7 @@ msgstr "" "Å patná FAT: neukončený řetězec pro %s. Měli byste spustit dosfsck nebo " "scandisk." -#: libparted/fs/r/fat/count.c:166 +#: libparted/fs/r/fat/count.c:106 #, c-format msgid "" "Bad FAT: cluster %d outside file system in chain for %s. You should run " @@ -1878,7 +1833,7 @@ msgstr "" "Å patná FAT: cluster %d je mimo systém souborů v řetězci pro %s. Měli byste " "spustit dosfsck nebo scandisk." -#: libparted/fs/r/fat/count.c:176 +#: libparted/fs/r/fat/count.c:116 #, c-format msgid "" "Bad FAT: cluster %d is cross-linked for %s. You should run dosfsck or " @@ -1887,26 +1842,17 @@ msgstr "" "Å patná FAT: cluster %d pro %s má křížové odkazy. Měli byste spustit dosfsck " "nebo scandisk." -#: libparted/fs/r/fat/count.c:195 +#: libparted/fs/r/fat/count.c:135 #, c-format msgid "%s is %dk, but it has %d clusters (%dk)." msgstr "%s je %dk, ale má %d clusterů (%dk)." -#: libparted/fs/r/fat/count.c:258 -#, c-format -msgid "" -"The file %s is marked as a system file. This means moving it could cause " -"some programs to stop working." -msgstr "" -"Soubor %s je označen jako systémový soubor. To znamená, že jeho přesun může " -"způsobit, že některé programy přestanou fungovat." - -#: libparted/fs/r/fat/fat.c:243 +#: libparted/fs/r/fat/fat.c:244 #, c-format msgid "Partition too big/small for a %s file system." msgstr "Oddíl je příliÅ¡ velký/malý pro systém souborů %s." -#: libparted/fs/r/fat/fat.c:409 +#: 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." @@ -1914,11 +1860,11 @@ msgstr "" "Tabulky FAT si neodpovídají. Pokud nevíte, co to znamená, zvolte ZruÅ¡it, " "spusÅ¥te na systému souborů scandisk a pak se vraÅ¥te." -#: libparted/fs/r/fat/fat.c:449 +#: libparted/fs/r/fat/fat.c:450 msgid "There are no possible configurations for this FAT type." msgstr "Pro tento typ FAT neexistuje možná konfigurace." -#: libparted/fs/r/fat/fat.c:461 +#: libparted/fs/r/fat/fat.c:462 #, c-format msgid "" "File system doesn't have expected sizes for Windows to like it. Cluster " @@ -1929,13 +1875,13 @@ msgstr "" "clusteru je %dk (očekáváno %dk); počet clusterů je %d (očekáváno %d); " "velikost FAT je %d sektorů (očekáváno %d)." -#: libparted/fs/r/fat/fat.c:484 +#: libparted/fs/r/fat/fat.c:485 #, c-format msgid "" "File system is reporting the free space as %d clusters, not %d clusters." msgstr "Systém souborů oznamuje volné místo jako %d clusterů, ne %d clusterů." -#: libparted/fs/r/fat/resize.c:158 +#: 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." @@ -1943,16 +1889,16 @@ msgstr "" "V kořenovém adresáři není dostatek místa pro vÅ¡echny souborů. Zvolte buď " "ZruÅ¡it, nebo Ignorovat pro ztrátu těchto souborů." -#: libparted/fs/r/fat/resize.c:302 +#: libparted/fs/r/fat/resize.c:303 msgid "Error writing to the root directory." msgstr "Chyba při zápisu do kořenového adresáře." -#: libparted/fs/r/fat/resize.c:495 +#: libparted/fs/r/fat/resize.c:479 msgid "If you leave your file system as FAT16, then you will have no problems." msgstr "" "Pokud svůj systém souborů ponecháte jako FAT16, nebudete mít žádné problémy." -#: libparted/fs/r/fat/resize.c:498 +#: 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 " @@ -1962,7 +1908,7 @@ msgstr "" "musíte reinstalovat zavaděč systému MS Windows. Pokud to chcete udělat, měli " "byste si přečíst manuál Partedu (nebo manuál své distribuce)." -#: libparted/fs/r/fat/resize.c:506 +#: libparted/fs/r/fat/resize.c:490 msgid "" "If you leave your file system as FAT32, then you will not introduce any new " "problems." @@ -1970,7 +1916,7 @@ msgstr "" "Pokud svůj systém souborů ponecháte jako FAT16, nezpůsobíte žádné nové " "problémy." -#: libparted/fs/r/fat/resize.c:510 +#: 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 " @@ -1984,42 +1930,42 @@ msgstr "" "FAT32 také učiní systém souborů nečitelným pro MS DOS, MS Windows 95a a MS " "Windows NT." -#: libparted/fs/r/fat/resize.c:524 +#: libparted/fs/r/fat/resize.c:508 #, c-format msgid "%s %s %s" msgstr "%s %s %s" -#: libparted/fs/r/fat/resize.c:525 +#: libparted/fs/r/fat/resize.c:509 msgid "Would you like to use FAT32?" msgstr "Chcete použít FAT32?" -#: libparted/fs/r/fat/resize.c:556 libparted/fs/r/fat/resize.c:572 +#: 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:557 +#: libparted/fs/r/fat/resize.c:541 msgid "" "The file system can only be resized to this size by converting to FAT16." msgstr "" "Velikost systému souborů může být na tuto hodnotu změněna jen převodem na " "FAT16." -#: libparted/fs/r/fat/resize.c:573 +#: libparted/fs/r/fat/resize.c:557 msgid "" "The file system can only be resized to this size by converting to FAT32." msgstr "" "Velikost systému souborů může být na tuto hodnotu změněna jen převodem na " "FAT32." -#: libparted/fs/r/fat/resize.c:586 +#: 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 neumí změnit velikost tohoto oddílu na tuto hodnotu. Pracujeme na " "tom!" -#: libparted/fs/r/fat/table.c:136 +#: 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 " @@ -2028,42 +1974,42 @@ msgstr "" "FAT %d media %x neodpovídá media %x zaváděcího sektoru. Pravděpodobně byste " "měli spustit scandisk." -#: libparted/fs/r/fat/table.c:268 +#: libparted/fs/r/fat/table.c:269 #, c-format msgid "fat_table_set: cluster %ld outside file system" msgstr "fat_table_set: cluster %ld mimo systém souborů" -#: libparted/fs/r/fat/table.c:300 +#: libparted/fs/r/fat/table.c:301 #, c-format msgid "fat_table_get: cluster %ld outside file system" msgstr "fat_table_get: cluster %ld mimo systém souborů" -#: libparted/fs/r/fat/table.c:342 +#: libparted/fs/r/fat/table.c:343 msgid "fat_table_alloc_cluster: no free clusters" msgstr "fat_table_alloc_cluster: nejsou volné clustery" -#: libparted/fs/r/filesys.c:151 +#: libparted/fs/r/filesys.c:152 msgid "Could not detect file system." msgstr "Nemohu detekovat systém souborů." -#: libparted/fs/r/filesys.c:158 libparted/fs/r/filesys.c:285 +#: libparted/fs/r/filesys.c:159 libparted/fs/r/filesys.c:284 #, fuzzy, c-format msgid "resizing %s file systems is not supported" msgstr "" "Podpora pro změnu velikosti souborových systémů %s jeÅ¡tě není implementována." -#: libparted/fs/r/filesys.c:170 +#: libparted/fs/r/filesys.c:171 msgid "The file system is bigger than its volume!" msgstr "Systém souborů je větší než jeho obsah!" -#: libparted/fs/r/hfs/advfs.c:121 libparted/fs/r/hfs/advfs_plus.c:121 -#: libparted/fs/r/hfs/reloc.c:413 libparted/fs/r/hfs/reloc.c:507 -#: libparted/fs/r/hfs/reloc_plus.c:538 libparted/fs/r/hfs/reloc_plus.c:656 -#: libparted/fs/r/hfs/reloc_plus.c:769 +#: 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 "Systém souborů obsahuje chyby." -#: libparted/fs/r/hfs/advfs_plus.c:285 +#: libparted/fs/r/hfs/advfs_plus.c:287 msgid "Bad blocks could not be read." msgstr "Nelze číst Å¡patné bloky." @@ -2125,61 +2071,61 @@ msgstr "Nemohu najít sektor %lli souboru HFS+ s CNID %X." msgid "Trying to write HFS+ file with CNID %X behind EOF." msgstr "Pokus zapisovat do souboru HFS+ s CNID %X za konec souboru." -#: libparted/fs/r/hfs/hfs.c:232 +#: libparted/fs/r/hfs/hfs.c:212 msgid "Sorry, HFS cannot be resized that way yet." msgstr "Lituji, HFS zatím nelze takto měnit velikost." -#: libparted/fs/r/hfs/hfs.c:250 libparted/fs/r/hfs/hfs.c:629 +#: libparted/fs/r/hfs/hfs.c:230 libparted/fs/r/hfs/hfs.c:573 msgid "shrinking" msgstr "zmenÅ¡uji" -#: libparted/fs/r/hfs/hfs.c:262 libparted/fs/r/hfs/hfs.c:641 +#: libparted/fs/r/hfs/hfs.c:242 libparted/fs/r/hfs/hfs.c:585 msgid "Data relocation has failed." msgstr "Přesun dat selhal." -#: libparted/fs/r/hfs/hfs.c:281 +#: libparted/fs/r/hfs/hfs.c:261 msgid "Data relocation left some data in the end of the volume." msgstr "Přesun dat nechal na konci svazku nějaká data." -#: libparted/fs/r/hfs/hfs.c:320 +#: libparted/fs/r/hfs/hfs.c:300 msgid "writing HFS Master Directory Block" msgstr "zapisuhi blok hlavního adresáře HFS" -#: libparted/fs/r/hfs/hfs.c:468 +#: libparted/fs/r/hfs/hfs.c:412 msgid "No valid HFS[+X] signature has been found while opening." msgstr "Při otevírání nebyl nalezen platný podpis HFS[+X]." -#: libparted/fs/r/hfs/hfs.c:478 +#: libparted/fs/r/hfs/hfs.c:422 #, c-format msgid "Version %d of HFS+ isn't supported." msgstr "Verze %d HFS+ není podporována." -#: libparted/fs/r/hfs/hfs.c:489 +#: libparted/fs/r/hfs/hfs.c:433 #, c-format msgid "Version %d of HFSX isn't supported." msgstr "Verze %d HFSX není podporována." -#: libparted/fs/r/hfs/hfs.c:672 +#: libparted/fs/r/hfs/hfs.c:616 msgid "Data relocation left some data at the end of the volume." msgstr "Přesun dat nechal na konci svazku nějaká data." -#: libparted/fs/r/hfs/hfs.c:720 +#: libparted/fs/r/hfs/hfs.c:664 msgid "Error while writing the allocation file." msgstr "Chyba při zápisu do souboru alokací." -#: libparted/fs/r/hfs/hfs.c:735 +#: libparted/fs/r/hfs/hfs.c:679 msgid "Error while writing the compatibility part of the allocation file." msgstr "Chyba při zápisu do části pro kompatibilitu souboru alokací." -#: libparted/fs/r/hfs/hfs.c:750 +#: libparted/fs/r/hfs/hfs.c:694 msgid "writing HFS+ Volume Header" msgstr "zapisuji hlavičku svazku HFS+" -#: libparted/fs/r/hfs/hfs.c:850 +#: libparted/fs/r/hfs/hfs.c:794 msgid "An error occurred while looking for the mandatory bad blocks file." msgstr "Při hledání povinného souboru Å¡patných bloků doÅ¡lo k chybě." -#: libparted/fs/r/hfs/hfs.c:904 +#: 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." @@ -2187,27 +2133,27 @@ msgstr "" "V obalu HFS je zřejmě chyba: soubor Å¡patných bloků neobsahuje vložený svazek " "HFS+." -#: libparted/fs/r/hfs/hfs.c:940 +#: libparted/fs/r/hfs/hfs.c:883 msgid "Sorry, HFS+ cannot be resized that way yet." msgstr "Lituji, HFS+ zatím nelze takto měnit velikost." -#: libparted/fs/r/hfs/hfs.c:975 +#: libparted/fs/r/hfs/hfs.c:918 msgid "shrinking embedded HFS+ volume" msgstr "zmenÅ¡uji vložený svazek HFS+" -#: libparted/fs/r/hfs/hfs.c:992 +#: libparted/fs/r/hfs/hfs.c:935 msgid "Resizing the HFS+ volume has failed." msgstr "Změna velikosti svazku HFS+ selhala." -#: libparted/fs/r/hfs/hfs.c:999 +#: libparted/fs/r/hfs/hfs.c:942 msgid "shrinking HFS wrapper" msgstr "zmenÅ¡uji obal HFS" -#: libparted/fs/r/hfs/hfs.c:1008 +#: libparted/fs/r/hfs/hfs.c:951 msgid "Updating the HFS wrapper has failed." msgstr "Aktualizace obalu HFS selhala." -#: libparted/fs/r/hfs/hfs.c:1110 libparted/fs/r/hfs/hfs.c:1195 +#: 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 " @@ -2285,7 +2231,7 @@ msgstr "" msgid "An extent has not been relocated." msgstr "Rozsah nebyl přesunut." -#: libparted/fs/r/hfs/reloc.c:250 libparted/fs/r/hfs/reloc_plus.c:307 +#: 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!" @@ -2293,16 +2239,16 @@ msgstr "" "Odkaz na rozsah přichází z místa, ze kterého by neměla. Měli byste " "zkontrolovat systém souborů!" -#: libparted/fs/r/hfs/reloc.c:380 +#: libparted/fs/r/hfs/reloc.c:382 msgid "This HFS volume has no catalog file. This is very unusual!" msgstr "Tento svazek HFS nemá soubor katalogu. To je velice neobvyklé!" -#: libparted/fs/r/hfs/reloc.c:474 +#: libparted/fs/r/hfs/reloc.c:479 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é!" -#: libparted/fs/r/hfs/reloc.c:516 libparted/fs/r/hfs/reloc_plus.c:666 +#: 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." @@ -2310,53 +2256,53 @@ msgstr "" "Soubor přetečení rozsahů by neměl obsahovat své vlastní rozsahy! Měli byste " "zkontrolovat systém souborů." -#: libparted/fs/r/hfs/reloc.c:573 libparted/fs/r/hfs/reloc_plus.c:844 +#: 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 "Nemohu keÅ¡ovat systém souborů v paměti." -#: libparted/fs/r/hfs/reloc.c:634 libparted/fs/r/hfs/reloc_plus.c:905 +#: libparted/fs/r/hfs/reloc.c:640 libparted/fs/r/hfs/reloc_plus.c:910 msgid "Bad blocks list could not be loaded." msgstr "Seznam Å¡patných bloků nelze načíst." -#: libparted/fs/r/hfs/reloc.c:648 libparted/fs/r/hfs/reloc_plus.c:921 +#: libparted/fs/r/hfs/reloc.c:654 libparted/fs/r/hfs/reloc_plus.c:926 msgid "An error occurred during extent relocation." msgstr "Při přesunu rozsahu doÅ¡lo k chybě." -#: libparted/fs/r/hfs/reloc_plus.c:494 +#: libparted/fs/r/hfs/reloc_plus.c:495 msgid "This HFS+ volume has no catalog file. This is very unusual!" msgstr "Tento svazek HFS+ nemá soubor katalogu. To je velice neobvyklé!" -#: libparted/fs/r/hfs/reloc_plus.c:617 +#: libparted/fs/r/hfs/reloc_plus.c:620 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:125 +#: parted/parted.c:126 msgid "displays this help message" msgstr "zobrazí tuto zprávu nápovědy" -#: parted/parted.c:126 +#: parted/parted.c:127 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:127 +#: parted/parted.c:128 msgid "displays machine parseable output" msgstr "zobrazí strojově zpracovatelný výstup" -#: parted/parted.c:128 +#: parted/parted.c:129 msgid "never prompts for user intervention" msgstr "nikdy nežádá o intervenci uživatele" -#: parted/parted.c:129 +#: parted/parted.c:130 msgid "displays the version" msgstr "zobrazí verzi" -#: parted/parted.c:130 +#: parted/parted.c:131 #, fuzzy msgid "alignment for new partitions" msgstr "Nemohu vytvářet další oddíly." -#: parted/parted.c:142 +#: parted/parted.c:143 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" @@ -2364,31 +2310,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:145 +#: parted/parted.c:146 msgid "LABEL-TYPE is one of: " msgstr "TYP-JMENOVKY je jeden z: " -#: parted/parted.c:146 parted/parted.c:147 +#: parted/parted.c:147 parted/parted.c:148 msgid "FLAG is one of: " msgstr "PŘEPÍNAČ je jeden z: " -#: parted/parted.c:148 +#: parted/parted.c:149 msgid "UNIT is one of: " msgstr "JEDNOTKA je jedna z: " -#: parted/parted.c:149 +#: parted/parted.c:150 msgid "desired alignment: minimum or optimal" msgstr "" -#: parted/parted.c:150 +#: parted/parted.c:151 msgid "PART-TYPE is one of: primary, logical, extended\n" msgstr "TYP-ODDÍLU je jeden z: primary, logical, extended\n" -#: parted/parted.c:152 +#: parted/parted.c:153 msgid "FS-TYPE is one of: " msgstr "TYP-FS je jeden z: " -#: parted/parted.c:153 +#: parted/parted.c:154 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 +2343,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:156 +#: parted/parted.c:157 #, fuzzy msgid "" "END is disk location, such as 4GB or 10%. Negative value counts from the " @@ -2406,19 +2352,19 @@ 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:159 +#: parted/parted.c:160 msgid "STATE is one of: on, off\n" msgstr "STAV je jeden z: on, off\n" -#: parted/parted.c:160 +#: parted/parted.c:161 msgid "DEVICE is usually /dev/hda or /dev/sda\n" msgstr "ZAŘÍZENÍ je obvykle /dev/hda nebo /dev/sda\n" -#: parted/parted.c:161 +#: parted/parted.c:162 msgid "NAME is any word you want\n" msgstr "NÁZEV je libovolné slovo\n" -#: parted/parted.c:164 +#: parted/parted.c:165 msgid "" "Copyright (C) 1998 - 2006 Free Software Foundation, Inc.\n" "This program is free software, covered by the GNU General Public License.\n" @@ -2438,23 +2384,23 @@ msgstr "" "podrobnosti najdete v GNU General Public License.\n" "\n" -#: parted/parted.c:212 +#: parted/parted.c:213 #, c-format msgid "%0.f%%\t(time left %.2d:%.2d)" msgstr "%0.f%%\t(zbylý čas %.2d:%.2d)" -#: parted/parted.c:231 +#: parted/parted.c:232 #, 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:252 +#: parted/parted.c:253 #, c-format msgid "Partition(s) on %s are being used." msgstr "Oddíl(a) na %s jsou používány." -#: parted/parted.c:264 +#: parted/parted.c:265 #, c-format msgid "" "The existing disk label on %s will be destroyed and all data on this disk " @@ -2463,31 +2409,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:525 +#: parted/parted.c:526 msgid "New disk label type?" msgstr "Typ nové jmenovky disku?" -#: parted/parted.c:662 +#: parted/parted.c:663 msgid "Partition type?" msgstr "Typ oddílu?" -#: parted/parted.c:680 parted/parted.c:884 +#: parted/parted.c:681 parted/parted.c:885 msgid "Partition name?" msgstr "Název oddílu?" -#: parted/parted.c:690 +#: parted/parted.c:691 msgid "File system type?" msgstr "Typ souborového systému?" -#: parted/parted.c:695 parted/parted.c:1498 +#: parted/parted.c:696 parted/parted.c:1499 msgid "Start?" msgstr "Začátek?" -#: parted/parted.c:698 parted/parted.c:1500 parted/parted.c:1569 +#: parted/parted.c:699 parted/parted.c:1501 parted/parted.c:1585 msgid "End?" msgstr "Konec?" -#: parted/parted.c:766 +#: parted/parted.c:767 #, fuzzy, c-format msgid "" "You requested a partition from %s to %s (sectors %llu..%llu).\n" @@ -2497,99 +2443,99 @@ msgstr "" "Nejbližší umístění, které zvládneme, je %s až %s. Je to pro vás jeÅ¡tě " "přijatelné?" -#: parted/parted.c:775 +#: parted/parted.c:776 msgid "" "\n" "Is this still acceptable to you?" msgstr "" -#: parted/parted.c:798 +#: parted/parted.c:799 #, c-format msgid "" "The resulting partition is not properly aligned for best performance: %s" msgstr "" -#: parted/parted.c:800 parted/parted.c:1723 +#: parted/parted.c:801 parted/parted.c:1739 msgid "unknown (malloc failed)" msgstr "" -#: parted/parted.c:876 +#: parted/parted.c:877 #, fuzzy, c-format msgid "%s disk labels do not support partition name." msgstr "Jmenovky disku %s nepodporují rozšířené oddíly." -#: parted/parted.c:881 parted/parted.c:1561 parted/parted.c:1612 -#: parted/parted.c:1706 parted/parted.c:1781 +#: parted/parted.c:882 parted/parted.c:1564 parted/parted.c:1628 +#: parted/parted.c:1722 parted/parted.c:1797 msgid "Partition number?" msgstr "Číslo oddílu?" -#: parted/parted.c:975 +#: parted/parted.c:976 #, 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:1017 +#: parted/parted.c:1018 #, c-format msgid "Model: %s (%s)\n" msgstr "Model: %s (%s)\n" -#: parted/parted.c:1019 +#: parted/parted.c:1020 #, c-format msgid "Disk %s: %s\n" msgstr "Disk %s: %s\n" -#: parted/parted.c:1020 +#: parted/parted.c:1021 #, c-format msgid "Sector size (logical/physical): %lldB/%lldB\n" msgstr "Sector size (logical/physical): %lldB/%lldB\n" -#: parted/parted.c:1032 +#: parted/parted.c:1033 #, c-format msgid "Partition Table: %s\n" msgstr "Tabulka oddílů: %s\n" -#: parted/parted.c:1033 +#: parted/parted.c:1034 #, fuzzy, c-format msgid "Disk Flags: %s\n" msgstr "Disk %s: %s\n" -#: parted/parted.c:1153 parted/parted.c:1156 +#: parted/parted.c:1154 parted/parted.c:1157 msgid "Number" msgstr "Číslo" -#: parted/parted.c:1153 parted/parted.c:1156 +#: parted/parted.c:1154 parted/parted.c:1157 msgid "Start" msgstr "Začátek" -#: parted/parted.c:1154 parted/parted.c:1157 +#: parted/parted.c:1155 parted/parted.c:1158 msgid "End" msgstr "Konec" -#: parted/parted.c:1157 +#: parted/parted.c:1158 msgid "Size" msgstr "Velikost" -#: parted/parted.c:1161 +#: parted/parted.c:1162 msgid "Type" msgstr "Typ" -#: parted/parted.c:1163 +#: parted/parted.c:1164 msgid "File system" msgstr "Systém souborů" -#: parted/parted.c:1166 +#: parted/parted.c:1167 msgid "Name" msgstr "Název" -#: parted/parted.c:1168 +#: parted/parted.c:1169 msgid "Flags" msgstr "Přepínače" -#: parted/parted.c:1225 +#: parted/parted.c:1226 msgid "Free Space" msgstr "Volné místo" -#: parted/parted.c:1385 +#: parted/parted.c:1386 #, c-format msgid "" "A %s %s partition was found at %s -> %s. Do you want to add it to the " @@ -2597,65 +2543,65 @@ msgid "" msgstr "" "Byl nalezen oddíl %s %s na %s -> %s. Chcete jej přidat do tabulky oddílů?" -#: parted/parted.c:1428 +#: parted/parted.c:1429 msgid "searching for file systems" msgstr "hledám systémy souborů" -#: parted/parted.c:1535 +#: parted/parted.c:1536 msgid "The resize command has been removed in parted 3.0" msgstr "" -#: parted/parted.c:1583 +#: parted/parted.c:1599 msgid "" "Shrinking a partition can cause data loss, are you sure you want to continue?" msgstr "" -#: parted/parted.c:1636 +#: parted/parted.c:1652 msgid "New device?" msgstr "Nové zařízení?" -#: parted/parted.c:1704 +#: parted/parted.c:1720 msgid "alignment type(min/opt)" msgstr "" -#: parted/parted.c:1719 +#: parted/parted.c:1735 #, c-format msgid "%d aligned\n" msgstr "" -#: parted/parted.c:1721 +#: parted/parted.c:1737 #, c-format msgid "%d not aligned: %s\n" msgstr "" -#: parted/parted.c:1746 parted/parted.c:1783 +#: parted/parted.c:1762 parted/parted.c:1799 msgid "Flag to Invert?" msgstr "Přepínač, který změnit?" -#: parted/parted.c:1751 parted/parted.c:1788 +#: parted/parted.c:1767 parted/parted.c:1804 msgid "New state?" msgstr "Nový stav?" -#: parted/parted.c:1834 +#: parted/parted.c:1850 msgid "Unit?" msgstr "Jednotka?" -#: parted/parted.c:1969 +#: parted/parted.c:1985 #, fuzzy msgid "align-check" msgstr "check" -#: parted/parted.c:1972 +#: parted/parted.c:1988 msgid "" "align-check TYPE N check partition N for TYPE(min|opt) " "alignment" msgstr "" -#: parted/parted.c:1980 +#: parted/parted.c:1996 msgid "help" msgstr "help" -#: parted/parted.c:1983 +#: parted/parted.c:1999 msgid "" "help [COMMAND] print general help, or help on " "COMMAND" @@ -2663,15 +2609,15 @@ msgstr "" "help [PŘÍKAZ] vypsat obecnou nápovědu nebo " "nápovědu o PŘÍKAZu" -#: parted/parted.c:1989 +#: parted/parted.c:2005 msgid "mklabel" msgstr "mklabel" -#: parted/parted.c:1989 +#: parted/parted.c:2005 msgid "mktable" msgstr "mktable" -#: parted/parted.c:1992 +#: parted/parted.c:2008 msgid "" "mklabel,mktable LABEL-TYPE create a new disklabel (partition " "table)" @@ -2679,15 +2625,15 @@ msgstr "" "mklabel,mktable TYP-JMENOVKY vytvořit novou jmenovku disku " "(tabulku oddílů)" -#: parted/parted.c:1998 +#: parted/parted.c:2014 msgid "mkpart" msgstr "mkpart" -#: parted/parted.c:2001 +#: parted/parted.c:2017 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:2007 +#: parted/parted.c:2023 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" @@ -2695,19 +2641,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:2012 +#: parted/parted.c:2028 msgid "name" msgstr "name" -#: parted/parted.c:2015 +#: parted/parted.c:2031 msgid "name NUMBER NAME name partition NUMBER as NAME" msgstr "name ČÍSLO NÁZEV pojmenovat oddíl ČÍSLO NÁZEV" -#: parted/parted.c:2020 +#: parted/parted.c:2036 msgid "print" msgstr "print" -#: parted/parted.c:2023 +#: parted/parted.c:2039 msgid "" "print [devices|free|list,all|NUMBER] display the partition table, " "available devices, free space, all found partitions, or a particular " @@ -2716,7 +2662,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:2028 +#: parted/parted.c:2044 msgid "" "Without arguments, 'print' displays the entire partition table. However with " "the following arguments it performs various other actions.\n" @@ -2724,11 +2670,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:2030 +#: parted/parted.c:2046 msgid " devices : display all active block devices\n" msgstr " devices : zobrazit vÅ¡echna aktivní bloková zařízení\n" -#: parted/parted.c:2031 +#: parted/parted.c:2047 msgid "" " free : display information about free unpartitioned space on the " "current block device\n" @@ -2736,32 +2682,32 @@ msgstr "" " free : zobrazit informace o volném místě mimo oddíly na aktuálním " "blokovém zařízení\n" -#: parted/parted.c:2033 +#: parted/parted.c:2049 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:2034 +#: parted/parted.c:2050 msgid "" " NUMBER : display more detailed information about this particular " "partition\n" msgstr "" " ČÍSLO : zobrazit podrobnější informace o tomto konkrétním oddílu\n" -#: parted/parted.c:2039 +#: parted/parted.c:2055 msgid "quit" msgstr "quit" -#: parted/parted.c:2042 +#: parted/parted.c:2058 msgid "quit exit program" msgstr "quit ukončit program" -#: parted/parted.c:2047 +#: parted/parted.c:2063 msgid "rescue" msgstr "rescue" -#: parted/parted.c:2050 +#: parted/parted.c:2066 msgid "" "rescue START END rescue a lost partition near START " "and END" @@ -2769,57 +2715,57 @@ msgstr "" "rescue ZAČÁTEK KONEC zachránit ztracený oddíl poblíž " "ZAČÁTKU a KONCE" -#: parted/parted.c:2056 +#: parted/parted.c:2072 msgid "resize" msgstr "resize" -#: parted/parted.c:2059 +#: parted/parted.c:2075 msgid "The resize command was removed in parted 3.0\n" msgstr "" -#: parted/parted.c:2062 +#: parted/parted.c:2078 #, fuzzy msgid "resizepart" msgstr "resize" -#: parted/parted.c:2065 +#: parted/parted.c:2081 #, fuzzy msgid "resizepart NUMBER END resize partition NUMBER" msgstr "move ČÍSLO ZAČÁTEK KONEC přesunout oddíl ČÍSLO" -#: parted/parted.c:2070 +#: parted/parted.c:2086 msgid "rm" msgstr "rm" -#: parted/parted.c:2073 +#: parted/parted.c:2089 msgid "rm NUMBER delete partition NUMBER" msgstr "rm ČÍSLO odstranit oddíl ČÍSLO" -#: parted/parted.c:2078 +#: parted/parted.c:2094 msgid "select" msgstr "select" -#: parted/parted.c:2081 +#: parted/parted.c:2097 msgid "select DEVICE choose the device to edit" msgstr "select ZAŘÍZENÍ zvolit upravované zařízení" -#: parted/parted.c:2086 +#: parted/parted.c:2102 msgid "disk_set" msgstr "" -#: parted/parted.c:2089 +#: parted/parted.c:2105 #, 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:2094 +#: parted/parted.c:2110 #, fuzzy msgid "disk_toggle" msgstr "toggle" -#: parted/parted.c:2097 +#: parted/parted.c:2113 #, fuzzy msgid "" "disk_toggle [FLAG] toggle the state of FLAG on " @@ -2828,21 +2774,21 @@ msgstr "" "toggle [ČÍSLO [PŘEPÍNAČ]] přepnout stav PŘEPÍNAČE na oddílu " "ČÍSLO" -#: parted/parted.c:2103 +#: parted/parted.c:2119 msgid "set" msgstr "set" -#: parted/parted.c:2106 +#: parted/parted.c:2122 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:2112 +#: parted/parted.c:2128 msgid "toggle" msgstr "toggle" -#: parted/parted.c:2115 +#: parted/parted.c:2131 msgid "" "toggle [NUMBER [FLAG]] toggle the state of FLAG on " "partition NUMBER" @@ -2850,21 +2796,21 @@ msgstr "" "toggle [ČÍSLO [PŘEPÍNAČ]] přepnout stav PŘEPÍNAČE na oddílu " "ČÍSLO" -#: parted/parted.c:2121 +#: parted/parted.c:2137 msgid "unit" msgstr "unit" -#: parted/parted.c:2124 +#: parted/parted.c:2140 msgid "unit UNIT set the default unit to UNIT" msgstr "" "unit JEDNOTKA nastavit implicitní jednotku na " "JEDNOTKA" -#: parted/parted.c:2129 +#: parted/parted.c:2145 msgid "version" msgstr "version" -#: parted/parted.c:2132 +#: parted/parted.c:2148 msgid "" "version display the version number and " "copyright information of GNU Parted" @@ -2872,7 +2818,7 @@ msgstr "" "version zobrazit číslo verze a informace o " "copyrightu GNU Parted" -#: parted/parted.c:2136 +#: parted/parted.c:2152 msgid "" "'version' displays copyright and version information corresponding to this " "copy of GNU Parted\n" @@ -2880,29 +2826,37 @@ msgstr "" "'version' zobrazí informace o copyrightu a informace o verzi odpovídající " "této kopii GNU Parted\n" -#: parted/parted.c:2204 +#: parted/parted.c:2220 #, fuzzy, c-format msgid "Usage: %s [-hlmsv] [-a] [DEVICE [COMMAND [PARAMETERS]]...]\n" msgstr "Použití: %s [-hlmsv] [ZAŘÍZENÍ [PŘÍKAZ [PARAMETRY]]...]\n" -#: parted/parted.c:2248 +#: parted/parted.c:2264 msgid "No device found" msgstr "Nenalezeno žádné zařízení" -#: parted/parted.c:2285 +#: parted/parted.c:2301 #, 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:2325 +#: parted/parted.c:2334 +msgid "" +"You should reinstall your boot loader before rebooting. Read section 4 of " +"the Parted User documentation for more information." +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:2341 msgid "You may need to update /etc/fstab.\n" msgstr "Možná budete potřebovat aktualizovat /etc/fstab.\n" -#: parted/ui.c:164 +#: parted/ui.c:165 msgid "Welcome to GNU Parted! Type 'help' to view a list of commands.\n" msgstr "Vítá vás GNU Parted! Zobrazte seznam příkazů napsáním 'help'.\n" -#: parted/ui.c:167 +#: parted/ui.c:168 msgid "" "Usage: parted [OPTION]... [DEVICE [COMMAND [PARAMETERS]...]...]\n" "Apply COMMANDs with PARAMETERS to DEVICE. If no COMMAND(s) are given, run " @@ -2913,7 +2867,7 @@ msgstr "" "Provést PŘÍKAZy s PARAMETRY na ZAŘÍZENÍ. Není-li zadán PŘÍKAZ, spustit\n" "v interaktivním režimu.\n" -#: parted/ui.c:172 +#: parted/ui.c:173 #, c-format msgid "" "\n" @@ -2976,7 +2930,7 @@ msgstr "" "Také přidejte další informace o vaší konfiguraci, které\n" "považujete za důležité.\n" -#: parted/ui.c:293 +#: parted/ui.c:294 msgid "" "\n" "Command History:\n" @@ -2984,7 +2938,7 @@ msgstr "" "\n" "Historie příkazů:\n" -#: parted/ui.c:356 +#: parted/ui.c:357 msgid "" "\n" "Error: SEGV_MAPERR (Address not mapped to object)\n" @@ -2992,7 +2946,7 @@ msgstr "" "\n" "Chyba: SEGV_MAPERR (Adresa nepřiřazena objektu)\n" -#: parted/ui.c:362 +#: parted/ui.c:363 msgid "" "\n" "Error: SEGV_ACCERR (Invalid permissions for mapped object)\n" @@ -3000,7 +2954,7 @@ msgstr "" "\n" "Chyba: SEGV_ACCERR (Neplatné oprávnění namapovaného objektu)\n" -#: parted/ui.c:367 +#: parted/ui.c:368 msgid "" "\n" "Error: A general SIGSEGV signal was encountered.\n" @@ -3008,7 +2962,7 @@ msgstr "" "\n" "Chyba: Byl přijat obecný signál SIGSEGV.\n" -#: parted/ui.c:391 +#: parted/ui.c:392 msgid "" "\n" "Error: FPE_INTDIV (Integer: divide by zero)" @@ -3016,7 +2970,7 @@ msgstr "" "\n" "Chyba: FPE_INTDIV (Celá čísla: dělení nulou)" -#: parted/ui.c:396 +#: parted/ui.c:397 msgid "" "\n" "Error: FPE_INTOVF (Integer: overflow)" @@ -3024,7 +2978,7 @@ msgstr "" "\n" "Chyba: FPE_INTOVF (Celá čísla: přetečení)" -#: parted/ui.c:401 +#: parted/ui.c:402 msgid "" "\n" "Error: FPE_FLTDIV (Float: divide by zero)" @@ -3032,7 +2986,7 @@ msgstr "" "\n" "Chyba: FPE_FLTDIV (Plovoucí: dělení nulou)" -#: parted/ui.c:406 +#: parted/ui.c:407 msgid "" "\n" "Error: FPE_FLTOVF (Float: overflow)" @@ -3040,7 +2994,7 @@ msgstr "" "\n" "Chyba: FPE_FLTOVF (Plovoucí: přetečení)" -#: parted/ui.c:411 +#: parted/ui.c:412 msgid "" "\n" "Error: FPE_FLTUND (Float: underflow)" @@ -3048,7 +3002,7 @@ msgstr "" "\n" "Chyba: FPE_FLTUND (Plovoucí: podtečení)" -#: parted/ui.c:416 +#: parted/ui.c:417 msgid "" "\n" "Error: FPE_FLTRES (Float: inexact result)" @@ -3056,7 +3010,7 @@ msgstr "" "\n" "Chyba: FPE_FLTRES (Plovoucí: nepřesný výsledek)" -#: parted/ui.c:421 +#: parted/ui.c:422 msgid "" "\n" "Error: FPE_FLTINV (Float: invalid operation)" @@ -3064,7 +3018,7 @@ msgstr "" "\n" "Chyba: FPE_FLTINV (Plovoucí: neplatný výsledek)" -#: parted/ui.c:426 +#: parted/ui.c:427 msgid "" "\n" "Error: FPE_FLTSUB (Float: subscript out of range)" @@ -3072,7 +3026,7 @@ msgstr "" "\n" "Chyba: FPE_FLTSUB (Plovoucí: index mimo rozsah)" -#: parted/ui.c:431 +#: parted/ui.c:432 msgid "" "\n" "Error: A general SIGFPE signal was encountered." @@ -3080,7 +3034,7 @@ msgstr "" "\n" "Chyba: Byl přijat obecný signál SIGFPE." -#: parted/ui.c:455 +#: parted/ui.c:456 msgid "" "\n" "Error: ILL_ILLOPC (Illegal Opcode)" @@ -3088,7 +3042,7 @@ msgstr "" "\n" "Chyba: ILL_ILLOPC (Neplatný kód operace)" -#: parted/ui.c:460 +#: parted/ui.c:461 msgid "" "\n" "Error: ILL_ILLOPN (Illegal Operand)" @@ -3096,7 +3050,7 @@ msgstr "" "\n" "Chyba: ILL_ILLOPN (Neplatný parametr)" -#: parted/ui.c:465 +#: parted/ui.c:466 msgid "" "\n" "Error: ILL_ILLADR (Illegal addressing mode)" @@ -3104,7 +3058,7 @@ msgstr "" "\n" "Chyba: ILL_ILLADR (Neplatný režim adresování)" -#: parted/ui.c:470 +#: parted/ui.c:471 msgid "" "\n" "Error: ILL_ILLTRP (Illegal Trap)" @@ -3112,7 +3066,7 @@ msgstr "" "\n" "Chyba: ILL_ILLTRP (Neplatné zachycení)" -#: parted/ui.c:475 +#: parted/ui.c:476 msgid "" "\n" "Error: ILL_PRVOPC (Privileged Opcode)" @@ -3120,7 +3074,7 @@ msgstr "" "\n" "Chyba: ILL_PRVOPC (Privilegovaný kód operace)" -#: parted/ui.c:480 +#: parted/ui.c:481 msgid "" "\n" "Error: ILL_PRVREG (Privileged Register)" @@ -3128,7 +3082,7 @@ msgstr "" "\n" "Chyba: ILL_PRVREG (Privilegovaný registr)" -#: parted/ui.c:485 +#: parted/ui.c:486 msgid "" "\n" "Error: ILL_COPROC (Coprocessor Error)" @@ -3136,7 +3090,7 @@ msgstr "" "\n" "Chyba: ILL_COPROC (Chyba koprocesoru)" -#: parted/ui.c:490 +#: parted/ui.c:491 msgid "" "\n" "Error: ILL_BADSTK (Internal Stack Error)" @@ -3144,7 +3098,7 @@ msgstr "" "\n" "Chyba: ILL_BADSTK (Interní chyba zásobníku)" -#: parted/ui.c:495 +#: parted/ui.c:496 msgid "" "\n" "Error: A general SIGILL signal was encountered." @@ -3152,69 +3106,69 @@ msgstr "" "\n" "Chyba: Byl přijat obecný signál SIGILL." -#: parted/ui.c:888 +#: parted/ui.c:889 #, c-format msgid "invalid token: %s" msgstr "neplatný token: %s" -#: parted/ui.c:1069 +#: parted/ui.c:1070 msgid "Expecting a partition number." msgstr "Očekávám číslo oddílu." -#: parted/ui.c:1078 +#: parted/ui.c:1079 msgid "Partition doesn't exist." msgstr "Oddíl neexistuje." -#: parted/ui.c:1098 +#: parted/ui.c:1099 msgid "Expecting a file system type." msgstr "Očekávám typ systému souborů." -#: parted/ui.c:1105 +#: parted/ui.c:1106 #, c-format msgid "Unknown file system type \"%s\"." msgstr "Neznámý typ systému souborů \"%s\"." -#: parted/ui.c:1126 +#: parted/ui.c:1127 msgid "Expecting a disk label type." msgstr "Očekávám typ jmenovky disku." -#: parted/ui.c:1157 parted/ui.c:1193 +#: parted/ui.c:1158 parted/ui.c:1194 msgid "No flags supported" msgstr "" -#: parted/ui.c:1267 +#: parted/ui.c:1268 msgid "Can't create any more partitions." msgstr "Nemohu vytvářet další oddíly." -#: parted/ui.c:1277 +#: parted/ui.c:1278 msgid "Expecting a partition type." msgstr "Očekávám typ oddílu." -#: parted/ui.c:1426 +#: parted/ui.c:1427 msgid "on" msgstr "on" -#: parted/ui.c:1427 +#: parted/ui.c:1428 msgid "off" msgstr "off" -#: parted/ui.c:1444 +#: parted/ui.c:1445 msgid "optimal" msgstr "" -#: parted/ui.c:1445 +#: parted/ui.c:1446 msgid "minimal" msgstr "" -#: parted/ui.c:1578 +#: parted/ui.c:1579 msgid "OPTIONs:" msgstr "PŘEPÍNAČe:" -#: parted/ui.c:1583 +#: parted/ui.c:1584 msgid "COMMANDs:" msgstr "PŘÍKAZy:" -#: parted/ui.c:1586 +#: parted/ui.c:1587 #, fuzzy, c-format msgid "" "\n" @@ -3223,30 +3177,36 @@ msgstr "" "\n" "Chyby hlaste na <%s>.\n" -#: parted/ui.c:1593 +#: parted/ui.c:1594 #, c-format msgid "Using %s\n" msgstr "Používám %s\n" -#: parted/ui.c:1673 +#: parted/ui.c:1674 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" +#, c-format #~ msgid "%s: option `--%s' doesn't allow an argument\n" #~ msgstr "%s: přepínač `--%s' nepovoluje parametr\n" +#, c-format #~ msgid "%s: unrecognized option `--%s'\n" #~ msgstr "%s: neznámý přepínač `--%s'\n" +#, c-format #~ msgid "%s: illegal option -- %c\n" #~ msgstr "%s: neplatný přepínač -- %c\n" +#, c-format #~ msgid "%s: option `-W %s' is ambiguous\n" #~ msgstr "%s: přepínač `-W %s' není jednoznačný\n" +#, c-format #~ msgid "%s: option `-W %s' doesn't allow an argument\n" #~ msgstr "%s: přepínač `-W %s' nepovoluje parametr\n" +#, c-format #~ msgid "" #~ "Usage: %s [OPTION]\n" #~ " or: %s DEVICE MINOR\n" @@ -3268,12 +3228,40 @@ msgstr "Tento příkaz nedává smysl v neinteraktivním režimu.\n" #~ msgid " --version output version information and exit\n" #~ msgstr " --version vypsat informace o verzi a skončit\n" +#, c-format #~ msgid "too few arguments" #~ msgstr "příliÅ¡ málo parametrů" +#, c-format #~ msgid "too many arguments" #~ msgstr "příliÅ¡ mnoho parametrů" +#~ msgid "" +#~ "The partition table cannot be re-read. This means you need to reboot " +#~ "before mounting any modified partitions. You also need to reinstall your " +#~ "boot loader before you reboot (which may require mounting modified " +#~ "partitions). It is impossible do both things! So you'll need to boot " +#~ "off a rescue disk, and reinstall your boot loader from the rescue disk. " +#~ "Read section 4 of the Parted User documentation for more information." +#~ msgstr "" +#~ "Nebylo možné znovu načíst tabulku oddílů. To znamená, že budete muset " +#~ "před připojením změněných oddílů restartovat počítač. Také musíte před " +#~ "restartem reinstalovat svůj zavaděč systému (což může vyžadovat připojení " +#~ "změněných oddílů). Nelze provést obojí! Takže budete muset zavést systém " +#~ "ze záchranného disku a reinstalovat svůj zavaděč systému odtud. Pro více " +#~ "informací si přečtěte oddíl 4 Uživatelské dokumentace Parted." + +#, 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 " +#~ "computer before doing anything with %s." +#~ msgstr "" +#~ "Tabulku oddílů na %s nelze znovu načíst (%s). To znamená, že Hurd neví " +#~ "nic o změnách, které jste provedli. Než budete cokoli dělat s %s, měli " +#~ "byste restartovat svůj počítač." + +#, c-format #~ msgid "" #~ "Device %s has a logical sector size of %lld. Not all parts of GNU Parted " #~ "support this at the moment, and the working code is HIGHLY EXPERIMENTAL.\n" @@ -3282,6 +3270,7 @@ msgstr "Tento příkaz nedává smysl v neinteraktivním režimu.\n" #~ "Parted to momentálně podporují, a fungující kód je VELICE " #~ "EXPERIMENTÁLNÍ.\n" +#, c-format #~ msgid "" #~ "parted was unable to re-read the partition table on %s (%s). This means " #~ "Linux won't know anything about the modifications you made. " @@ -3289,6 +3278,7 @@ msgstr "Tento příkaz nedává smysl v neinteraktivním režimu.\n" #~ "parted nemohl znovu načíst tabulku oddílů na %s (%s). To znamená, že " #~ "Linux nebude vědět nic o změnách, které jste provedli." +#, c-format #~ msgid "" #~ "The kernel was unable to re-read the partition table on %s (%s). This " #~ "means Linux won't know anything about the modifications you made until " @@ -3300,14 +3290,17 @@ msgstr "Tento příkaz nedává smysl v neinteraktivním režimu.\n" #~ "nerestartujete systém. Měli byste svůj počítač restartovat, než budete s " #~ "%s něco dělat." +#, c-format #~ msgid "Support for opening %s file systems is not implemented yet." #~ msgstr "" #~ "Podpora pro otevírání souborových systémů %s jeÅ¡tě není implementována." +#, c-format #~ msgid "Support for creating %s file systems is not implemented yet." #~ msgstr "" #~ "Podpora pro vytváření souborových systémů %s jeÅ¡tě není implementována." +#, c-format #~ msgid "Support for checking %s file systems is not implemented yet." #~ msgstr "" #~ "Podpora pro kontrolu souborových systémů %s jeÅ¡tě není implementována." @@ -3321,6 +3314,7 @@ msgstr "Tento příkaz nedává smysl v neinteraktivním režimu.\n" #~ msgid "Can't copy onto an overlapping partition." #~ msgstr "Nemohu kopírovat do překrývajícího se oddílu." +#, c-format #~ msgid "" #~ "Direct support for copying file systems is not yet implemented for %s. " #~ "However, support for resizing is implemented. Therefore, the file system " @@ -3334,6 +3328,7 @@ msgstr "Tento příkaz nedává smysl v neinteraktivním režimu.\n" #~ "starý. Takže buď zmenÅ¡ete oddíl, který se pokoušíte zkopírovat, nebo " #~ "kopírujte do většího oddílu." +#, c-format #~ msgid "Support for copying %s file systems is not implemented yet." #~ msgstr "" #~ "Podpora pro kopírování souborových systémů %s jeÅ¡tě není implementována." @@ -3379,12 +3374,14 @@ msgstr "Tento příkaz nedává smysl v neinteraktivním režimu.\n" #~ msgid "copying" #~ msgstr "kopíruji" +#, c-format #~ msgid "Couldn't resolve symbol %s. Error: %s." #~ msgstr "Nemohu nalézt symbol %s. Chyba: %s." #~ msgid "GNU Parted found an invalid libreiserfs library." #~ msgstr "GNU Parted nalezl neplatnou knihovnu libreiserfs." +#, c-format #~ msgid "" #~ "GNU Parted has detected libreiserfs interface version mismatch. Found %d-" #~ "%d, required %d. ReiserFS support will be disabled." @@ -3398,6 +3395,7 @@ msgstr "Tento příkaz nedává smysl v neinteraktivním režimu.\n" #~ msgid "This is not an ECKD disk! This disk type is not supported!" #~ msgstr "Toto není disk ECKD! Tento typ disku není podporován!" +#, c-format #~ msgid "" #~ "%s contains GPT signatures, indicating that it has a GPT table. However, " #~ "it does not have a valid fake msdos partition table, as it should. " @@ -3411,6 +3409,9 @@ msgstr "Tento příkaz nedává smysl v neinteraktivním režimu.\n" #~ "jste možná odstranili tabulku oddílů GPT a nyní používáte tabulku oddílů " #~ "msdos. Je toto tabulka oddílů GPT?" +#~ msgid "The boot region doesn't start at the start of the partition." +#~ msgstr "Zaváděcí region nezačíná na začátku oddílu." + #~ msgid "Inconsistent group descriptors!" #~ msgstr "Nekonzistentní deskriptory skupin!" @@ -3455,11 +3456,13 @@ msgstr "Tento příkaz nedává smysl v neinteraktivním režimu.\n" #~ msgid "adding groups" #~ msgstr "přidávám skupiny" +#, c-format #~ msgid "Your file system is too full to resize it to %i blocks. Sorry." #~ msgstr "" #~ "Váš systém souborů je příliÅ¡ plný na to, abych mohl změnit jeho velikost " #~ "na %i bloků. Lituji." +#, c-format #~ msgid "" #~ "Your file system has too many occupied inodes to resize it to %i blocks. " #~ "Sorry." @@ -3497,9 +3500,11 @@ msgstr "Tento příkaz nedává smysl v neinteraktivním režimu.\n" #~ msgid "Cross-linked blocks found! Better go run e2fsck first!" #~ msgstr "Nalezeny bloky s křížovými odkazy! RadÅ¡i nejdřív spusÅ¥te e2fsck!" +#, c-format #~ msgid "Block %i has no reference? Weird." #~ msgstr "Blok %i nemá odkaz? Divné." +#, c-format #~ msgid "Block %i shouldn't have been marked (%d, %d)!" #~ msgstr "Blok %i by neměl být označen (%d, %d)!" @@ -3522,6 +3527,7 @@ msgstr "Tento příkaz nedává smysl v neinteraktivním režimu.\n" #~ msgid "File system too small for ext2." #~ msgstr "Systém souborů příliÅ¡ malý pro ext2." +#, 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." @@ -3529,6 +3535,14 @@ msgstr "Tento příkaz nedává smysl v neinteraktivním režimu.\n" #~ "Systém souborů má logickou velikost sektoru %d. Ví se, že GNU Parted " #~ "nepracuje správně s velikostí sektoru jinou než 512 bajtů." +#, c-format +#~ msgid "" +#~ "The file %s is marked as a system file. This means moving it could cause " +#~ "some programs to stop working." +#~ msgstr "" +#~ "Soubor %s je označen jako systémový soubor. To znamená, že jeho přesun " +#~ "může způsobit, že některé programy přestanou fungovat." + #~ msgid "Too many bad pages." #~ msgstr "PříliÅ¡ mnoho Å¡patných stránek." @@ -3559,12 +3573,15 @@ msgstr "Tento příkaz nedává smysl v neinteraktivním režimu.\n" #~ msgid "Can't move a partition onto itself. Try using resize, perhaps?" #~ msgstr "Nemohu přesunout oddíl na sebe. Možná zkuste použít resize?" +#, c-format #~ msgid "Minor: %d\n" #~ msgstr "Minor: %d\n" +#, c-format #~ msgid "Flags: %s\n" #~ msgstr "Přepínače: %s\n" +#, c-format #~ msgid "File System: %s\n" #~ msgstr "Systém souborů: %s\n" diff --git a/po/da.gmo b/po/da.gmo index 98c9d1cdce7aae068e2ebf99aafd652f28d12cde..d314564916a2adb8f97ed0e0068eea6a5751df5e 100644 GIT binary patch delta 8255 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⪼4fGoYY=BGK@+To&9OSRL^a$R z|BC%kpJ!}uv*!IUj`9T5a{*(}+DImriX+IRt=EvgteSmTHyntxWv#%5_%cS}+o%q{ zKn%tFAe#kty0up*@|la3ib$p|13D4u5~Xq!nLRw?!*ST7uCU0R3wgL z0iME0OzCeX&>0n>k*EPqL+$c1)E-)c4I(V-A=G<&+2QqqWS$_SwRj#CqBl_yxrQ+q zInWFw3EALQreiU-q`VVb;|bIRK0z(v52(FTe~@Xv8#bqW4{Bf@3@WpXj6%B|HRH!o z4V=JD_%2q%622vkybPmp5h@}Zu?p@)4PXzdou{xCoyz)w&OevY;9E7TJGh@3%|J=8b~74jvh&vQMhxRDhp``UKDNVy z!-&5s-lAe8R=L}}n2U-`A?m>(s^NpE89wWjU&ZT`KfqS_COa$%e?l!?^ARSJ8K@;5 zj@7XMcc3RoCL9WS??{D>3iSxogQHOqnTR#*Ns=?Qsaue<@r92v!;YDN{SQEyW(C@Sj!m}0(~8Q7TeB22*zs7M~ihIj(o;yK6bn4<4LVJfE)HwK|zd>-}SCFG2- zBBz;#N1)bl24>=1)Dj&+EzMEq{^HZ@Cs>2*q{Ycav%SR1#A!@0YW3U66b7Xqs z-*FY@^6 zn27JVf+kcqsc1n(J-0b<+9LbU%0Rua)^P*!C0UzMpXC+Q3HUYY{Trw?Zd^!P*cz*1 zXVgTpQIYG18n`#;JTM2fOXp)PTVp&IxS^_g8moqz+2O}!8GTmakSLadID;U;_n^?pB3 z__r`?Fsi%=)!{N!q#i^j60{DG8AHXBsF78jX}1(}*idf1l)6P89^NUauTOO`w{of}ukcy8{GfOV9EV5QAM&cu=4)^2!2+Mi_ zee~q=n$PQEnTgQnj*ZLB8uxT8#*Vzd30vWdn1+`zi~g-BzgeRps0T~1H9q3hzu=TF zpg#wAgOkbZC!_D&nqxxO6VTnMgKjz*A85i?Ivtn#cO=~#~9>j<6HPj}ZzSKAq)$tr0glAEEslhU{ zSF&(0<%y_?2ltTaP3BeXi;?%4(2u}2l$W3yI)Huf8rH(}<>uGu92`w~E)Kz0urWrh z;8?~KERW#FF=}&HU1|OWm5vki{jVdV8&@$wFRn6XI*xJlJBCo3?-(ZGo2b2V9kmDA ztu`~8f{B#xcRb+uisRQ|32*&1{7mM-bky4BVmq9LKjLQR{+hLBw;#g#)IWndvd>^O z{3}++51sO-sDXZtH?igeW^Y*!n*Oq}CH-3y$i(3sRba>|KZOeY>o^dbt}|;l6}4ph zumN61h5Sdyatcg|F zaq6fJYR2)XhFc+@ywwrw;y%=bj$%DLk5Tx)s9paps=eA9S^p+%jz$~J?rjq?FJz*= z)4q-qQD2A8aV0jSyc;v|2Axi9K7&Bgs#f{H-nhfM@xP#q+qBG4VH;$T$7?slAxibxqIU@%BV2gz>K z$WLQ?yn;uu;TH2#>lCWPzo0hRdF+H2F$1e@HD5tCHlgf6EnyJV;p3=*Jcr}(98S~y zq({t8tEJeMiYHJ5cn2q7#5NPcN!X0C7ZviAPW|)Pl=20P!q4z?`~|fKE^jvzjM!nG zYm2Jyjq&tvO(hda#eCe2_hSo8*=f%DzNk&+L(RMrYhVy-;r*!R*W+;fJ&wd1sNFtj zmpKtPU?Js8csCBEvqbv0Hj{~D6CTGo+<0k^*-YK{nxB4Um`(jzT#mnCB`$x|{8Q^! z)Kc{So$0`jKFaT7rwGd$w$FSW^Vv9bVSSIuxbc5Dn(5zqhD;)Uh-Y}=H++urnFHp? zU3SnMwJ+gJ>LY${eh(vJczfdej~|j{15|U{E7JM@HU4 zjV$$XGvYCrMEO;0kJm64TRdUbx&+nX66}Jzum)aq`~agVU&2_tfm*7l!{)c-w8O-| z5fy!$iqWXGcA++z7rWx4*b3iAeI>V04aPlb4yC7(kbsj z9jz~*B6%9s&IQz7cn2Hfb<~~+*8Zc}6dBloifq&f^Dzd?Q4OxaBHV~taIo=5HacW@YffSP&AGa3l%Kaz}=U^F(xaj4LiV0h-J1~%dp+=4yv z2d6&$Su=nxm`Qz4RAgr3qc{ikesjL*?${Dlo`f;Ej5Jy_URX?d$=))bPrX5 zP`efhIge1%R@5q0C9fms_O+FALsEazUMf>?04~PN(9#xB@dL?y;ynH`uBBXtZLwD9 zXp5+z4trg@a0#g%dA?U`gHzw1JSScFs!rXfe5ghMh^vNew73BRxzi2`!3?sq#=nXlY!Oj#QibvqMMYlH&hCX*(rd@u)5K z8mSNYEurt?I`kb&ZnN`53;de9gGoP05o$41jwHK(J z7ZKVPKfZbvRW(9C#kU!kPp%QEn41Ski^%_moCe|l_gR~AEAlh&6&#GCuot!={pY2B z#f=J;wT$un%B@P$PEstjSDZ&5Ql0bWy{P~8uOpdb!(FzBAjQ&;0nrrC+RrI zrCgWvEqQ(%@yqacEu-S6QS$|*@u(jdx<-=2>lp=_KhONmn=ObtOC2cT`;$^5>M{+Df{MvR3!8bsxAYIMZjz7nYWGX*!PD|ub|A>|?eM!01Dx(pqh`$O<5<(Z^T z+u^G{`MIR!lopdFlGoJ} zXE}M5f7V}IE2zuCO<3;SpMukk9z;{ogTnk{i&|Yx3w<{}I&?C( z-LZn)wbg@mATPhfZ5QNuy}p2*@3za`spalGSDI~)E%x~BQg@!$Z&&&%Y_HqxvI9OI z$oGXGE%cSU?NVQbH{kIW*?Hbd3NBBfhsS2;l?OZlkI(C;ok_f$SK{~G(Spb859F1U z*p;C(Gh%{j-D$P$++t5bv0a*1NljUW=guDfOY7}uerUjEoSxFzKEL0ixww3GzAsR0 z2Z|Y&Khd_w_%wkw^mls>;TiY}3++6*spl`K;4P1TR!3$LdTvI1bYZ!#l=l^lf8Gpz zHe+bjvBmCC?}0JF{}(U2ZL(jZxg%(Le@I2S%bw-+&Gp;FR|B&1@_iM7JHl0v7Yd;O=gBPS40m%}D2uosr!=vrB4v*Yxyb-DcL!sy-&bdWClH$~e}4*VgKx zZCmO@&C2uIo>{Zpc9Glb@w!T``rV=2)zMR36}Ep?UWv{6l?PbVJ=)-`OJ?V7@z0>0*?OPFo~2b9H9#a4_<3mMi4{8Qy<}mAQn&8L<6q(PDRr QKfpKY(z0Lp-QCgu2X)B7!2kdN diff --git a/po/da.po b/po/da.po index fc87fe5..fa99ae1 100644 --- a/po/da.po +++ b/po/da.po @@ -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: 2019-10-10 16:35-0700\n" +"POT-Creation-Date: 2021-01-27 16:00-0800\n" "PO-Revision-Date: 2011-06-03 23:23+0200\n" "Last-Translator: Keld Simonsen \n" "Language-Team: Danish \n" @@ -96,11 +96,11 @@ msgstr "%s: flaget kr #. If you don't know what to put here, please see #. #. and use glyphs suitable for your language. -#: lib/quotearg.c:362 +#: lib/quotearg.c:355 msgid "`" msgstr "'" -#: lib/quotearg.c:363 +#: lib/quotearg.c:356 msgid "'" msgstr "'" @@ -370,32 +370,17 @@ msgstr "" msgid "memory exhausted" msgstr "slut på hukommelse" -#: lib/xstrtol-error.c:63 -#, fuzzy, c-format -msgid "invalid %s%s argument '%s'" -msgstr "ugyldigt %s%s-argument '%s'" - -#: lib/xstrtol-error.c:68 -#, fuzzy, c-format -msgid "invalid suffix in %s%s argument '%s'" -msgstr "ugyldigt suffiks i %s%s-argumentet '%s'" - -#: lib/xstrtol-error.c:72 -#, fuzzy, c-format -msgid "%s%s argument '%s' too large" -msgstr "%s%s-argumentet '%s' er for stort" - -#: libparted/arch/beos.c:245 +#: libparted/arch/beos.c:246 msgid "Disk Image" msgstr "Diskafbildning" -#: libparted/arch/beos.c:346 libparted/arch/gnu.c:277 +#: libparted/arch/beos.c:347 libparted/arch/gnu.c:277 #: libparted/arch/linux.c:1731 #, c-format msgid "Error opening %s: %s" msgstr "En fejl opstod da %s åbnedes: %s" -#: libparted/arch/beos.c:357 libparted/arch/gnu.c:287 +#: libparted/arch/beos.c:358 libparted/arch/gnu.c:287 #: libparted/arch/linux.c:1742 #, c-format msgid "Unable to open %s read-write (%s). %s has been opened read-only." @@ -403,47 +388,47 @@ msgstr "" "Kunne ikke åbne %s for både læsning og skrivning (%s). %s åbnedes i " "læsetilstand." -#: libparted/arch/beos.c:419 libparted/arch/linux.c:1907 +#: libparted/arch/beos.c:420 libparted/arch/linux.c:1907 #, c-format msgid "%s during seek for read on %s" msgstr "%s under positionering for at læse på %s" -#: libparted/arch/beos.c:452 libparted/arch/gnu.c:465 libparted/arch/gnu.c:564 -#: libparted/arch/gnu.c:692 libparted/arch/linux.c:1867 +#: libparted/arch/beos.c:453 libparted/arch/gnu.c:425 libparted/arch/gnu.c:524 +#: libparted/arch/gnu.c:652 libparted/arch/linux.c:1867 #: libparted/arch/linux.c:1949 #, c-format msgid "%s during read on %s" msgstr "%s under læsning på %s" -#: libparted/arch/beos.c:488 libparted/arch/gnu.c:525 +#: libparted/arch/beos.c:489 libparted/arch/gnu.c:485 #: libparted/arch/linux.c:2026 #, c-format msgid "Can't write to %s, because it is opened read-only." msgstr "Kan ikke skrive til %s eftersom den kun er åbnet i læsetilstand." -#: libparted/arch/beos.c:504 libparted/arch/linux.c:2051 +#: libparted/arch/beos.c:505 libparted/arch/linux.c:2051 #, c-format msgid "%s during seek for write on %s" msgstr "%s under positionering for at skrive på %s" -#: libparted/arch/beos.c:541 libparted/arch/gnu.c:601 libparted/arch/gnu.c:646 -#: libparted/arch/gnu.c:723 libparted/arch/linux.c:1999 +#: libparted/arch/beos.c:542 libparted/arch/gnu.c:561 libparted/arch/gnu.c:606 +#: libparted/arch/gnu.c:683 libparted/arch/linux.c:1999 #: libparted/arch/linux.c:2094 libparted/arch/linux.c:2167 #, c-format msgid "%s during write on %s" msgstr "%s under skrivning på %s" -#: partprobe/partprobe.c:148 +#: partprobe/partprobe.c:149 #, c-format msgid "Try `%s --help' for more information.\n" msgstr "Prøv '%s --help' for mere information.\n" -#: partprobe/partprobe.c:152 +#: partprobe/partprobe.c:153 #, c-format msgid "Usage: %s [OPTION] [DEVICE]...\n" msgstr "Brug: %s [FLAG] [ENHED]...\n" -#: partprobe/partprobe.c:153 +#: partprobe/partprobe.c:154 msgid "" "Inform the operating system about partition table changes.\n" "\n" @@ -459,7 +444,7 @@ msgstr "" " -h, --help vis denne hjælpetekst og afslut\n" " -v, --version vis versionsinformation og afslut\n" -#: partprobe/partprobe.c:161 +#: partprobe/partprobe.c:162 msgid "" "\n" "When no DEVICE is given, probe all partitions.\n" @@ -467,7 +452,7 @@ msgstr "" "\n" "Når ingen ENHED er sngivet, så undersøg alle partitioner.\n" -#: partprobe/partprobe.c:165 +#: partprobe/partprobe.c:166 #, c-format msgid "" "\n" @@ -486,43 +471,7 @@ msgstr "Kunne ikke msgid "Unable to probe store." msgstr "Kunne ikke undersøge lageret." -#: libparted/arch/gnu.c:368 -msgid "" -"The partition table cannot be re-read. This means you need to reboot before " -"mounting any modified partitions. You also need to reinstall your boot " -"loader before you reboot (which may require mounting modified partitions). " -"It is impossible do both things! So you'll need to boot off a rescue disk, " -"and reinstall your boot loader from the rescue disk. Read section 4 of the " -"Parted User documentation for more information." -msgstr "" -"Partitionstabellen kan ikke genindlæses. Dette betyder at du skal starte " -"maskinen op igen inden du kan montere nogen ændrede partitioner. Du skal " -"også geninstallere opstartsprogrammet inden du genstarter (hvilket kan " -"indebære montering af ændrede partitioner). Det er umuligt at gøre begge " -"dele! Så du skal starte fra en redningsdiskette og geninstallere " -"opstartsprogrammet fra redningsdisketten. Læs kapitel 4 i Parteds " -"brugermanual for mere information." - -#: libparted/arch/gnu.c:385 -#, 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 computer " -"before doing anything with %s." -msgstr "" -"Partitionstabellen på %s kan ikke genindlæses (%s). Det betyder at Hurd ikke " -"véd noget som helst om de ændringer du lavede. Du bør genstarte maskinen " -"inden du gør noget som helst med %s." - -#: libparted/arch/gnu.c:396 parted/parted.c:2318 -msgid "" -"You should reinstall your boot loader before rebooting. Read section 4 of " -"the Parted User documentation for more information." -msgstr "" -"Du bør geninstallere opstartsprogrammet inden du genopstarter. Læs sektion 4 " -"i Parteds brugermanual for mere information." - -#: libparted/arch/gnu.c:788 +#: libparted/arch/gnu.c:748 #, c-format msgid "%s trying to sync %s to disk" msgstr "%s prøver at synkronisere %s med disk" @@ -843,15 +792,15 @@ msgstr "metadata" msgid "free" msgstr "ledigt" -#: libparted/disk.c:2355 parted/ui.c:1258 parted/ui.c:1286 +#: libparted/disk.c:2355 parted/ui.c:1259 parted/ui.c:1287 msgid "extended" msgstr "udvidet" -#: libparted/disk.c:2357 parted/ui.c:1262 parted/ui.c:1290 +#: libparted/disk.c:2357 parted/ui.c:1263 parted/ui.c:1291 msgid "logical" msgstr "logisk" -#: libparted/disk.c:2359 parted/ui.c:1254 parted/ui.c:1282 +#: libparted/disk.c:2359 parted/ui.c:1255 parted/ui.c:1283 msgid "primary" msgstr "primær" @@ -929,64 +878,73 @@ msgstr "" msgid "esp" msgstr "Ja" -#: libparted/disk.c:2415 +#: libparted/disk.c:2411 +msgid "chromeos_kernel" +msgstr "" + +#: libparted/disk.c:2413 +#, fuzzy +msgid "bls_boot" +msgstr "start" + +#: libparted/disk.c:2419 #, c-format msgid "Unknown partition flag, %d." msgstr "Ukendt partitionsflag, %d." -#: libparted/exception.c:78 +#: libparted/exception.c:79 msgid "Information" msgstr "Information" -#: libparted/exception.c:79 +#: libparted/exception.c:80 msgid "Warning" msgstr "Advarsel" -#: libparted/exception.c:80 +#: libparted/exception.c:81 msgid "Error" msgstr "Fejl" -#: libparted/exception.c:81 +#: libparted/exception.c:82 msgid "Fatal" msgstr "Fatal" -#: libparted/exception.c:82 +#: libparted/exception.c:83 msgid "Bug" msgstr "Programfejl" -#: libparted/exception.c:83 +#: libparted/exception.c:84 msgid "No Implementation" msgstr "Ikke implementeret" -#: libparted/exception.c:87 +#: libparted/exception.c:88 msgid "Fix" msgstr "Reparér" -#: libparted/exception.c:88 +#: libparted/exception.c:89 msgid "Yes" msgstr "Ja" -#: libparted/exception.c:89 +#: libparted/exception.c:90 msgid "No" msgstr "Nej" -#: libparted/exception.c:90 +#: libparted/exception.c:91 msgid "OK" msgstr "O.k." -#: libparted/exception.c:91 +#: libparted/exception.c:92 msgid "Retry" msgstr "Forsøg igen" -#: libparted/exception.c:92 +#: libparted/exception.c:93 msgid "Ignore" msgstr "Ignorér" -#: libparted/exception.c:93 +#: libparted/exception.c:94 msgid "Cancel" msgstr "Annullér" -#: libparted/exception.c:133 +#: libparted/exception.c:134 #, c-format msgid "" "A bug has been detected in GNU Parted. Refer to the web site of parted " @@ -999,30 +957,30 @@ msgstr "" "nyttigt for fejlrapportering! Send en fejlrapport med e-post til %s hvor du " "angiver versionsnumret (%s) og følgende meddelelse:" -#: libparted/labels/aix.c:91 +#: libparted/labels/aix.c:92 msgid "Support for reading AIX disk labels is is not implemented yet." msgstr "" "Understøttelse for at læse AIX disketiketter er ikke implementeret endnu." -#: libparted/labels/aix.c:102 +#: libparted/labels/aix.c:103 msgid "Support for writing AIX disk labels is is not implemented yet." msgstr "" "Understøttelse for at skrive AIX disketiketter er ikke implementeret endnu." -#: libparted/labels/aix.c:115 +#: libparted/labels/aix.c:116 msgid "" "Support for adding partitions to AIX disk labels is not implemented yet." msgstr "" "Understøttelse for at tilføje AIX disketiketter er ikke implementeret endnu." -#: libparted/labels/aix.c:125 +#: libparted/labels/aix.c:126 msgid "" "Support for duplicating partitions in AIX disk labels is not implemented yet." msgstr "" "Understøttelse for at duplikere AIX disketiketter er ikke implementeret " "endnu." -#: libparted/labels/aix.c:143 +#: libparted/labels/aix.c:144 msgid "" "Support for setting system type of partitions in AIX disk labels is not " "implemented yet." @@ -1030,7 +988,7 @@ msgstr "" "Understøttelse for at sætte systemtype på partitioner i AIX disketiketter er " "ikke implementeret endnu." -#: libparted/labels/aix.c:153 +#: libparted/labels/aix.c:154 msgid "Support for setting flags in AIX disk labels is not implemented yet." msgstr "" "Understøttelse for at sætte flag i AIX disketiketter er ikke implementeret " @@ -1121,11 +1079,11 @@ msgid "" "partitions, if XGM is the first one it counts for two)." msgstr "" -#: libparted/labels/atari.c:1657 libparted/labels/bsd.c:567 -#: libparted/labels/dasd.c:894 libparted/labels/dos.c:2276 -#: libparted/labels/dvh.c:770 libparted/labels/gpt.c:2050 -#: libparted/labels/loop.c:243 libparted/labels/mac.c:1423 -#: libparted/labels/pc98.c:701 libparted/labels/rdb.c:1054 +#: libparted/labels/atari.c:1657 libparted/labels/bsd.c:563 +#: libparted/labels/dasd.c:895 libparted/labels/dos.c:2283 +#: libparted/labels/dvh.c:770 libparted/labels/gpt.c:2140 +#: 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 "Kunne ikke opfylde alle begrænsninger på partitionen." @@ -1141,44 +1099,44 @@ msgstr "" msgid "Unable to allocate a partition number." msgstr "Kan ikke tildele et partitionsnummer." -#: libparted/labels/bsd.c:592 +#: libparted/labels/bsd.c:588 msgid "Unable to allocate a bsd disklabel slot." msgstr "Kan ikke tildele en plads til bsd-disketikette." -#: libparted/labels/dasd.c:625 +#: libparted/labels/dasd.c:626 msgid "The partition table of DASD-LDL device cannot be changed.\n" msgstr "" -#: libparted/labels/dasd.c:920 +#: libparted/labels/dasd.c:921 msgid "Unable to allocate a dasd disklabel slot" msgstr "Kan ikke tildele en plads til dasd-disketikette" -#: libparted/labels/dos.c:1003 +#: libparted/labels/dos.c:1006 #, c-format msgid "Invalid partition table on %s -- wrong signature %x." msgstr "Ugyldig partitionstabel på %s - fejlagtig signatur %x." -#: libparted/labels/dos.c:1031 +#: libparted/labels/dos.c:1034 #, c-format msgid "Invalid partition table - recursive partition on %s." msgstr "Ugyldig partitionstabel - rekursiv partition på %s." -#: libparted/labels/dos.c:1560 +#: libparted/labels/dos.c:1557 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:1572 +#: libparted/labels/dos.c:1569 #, 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:2258 +#: libparted/labels/dos.c:2265 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:2514 +#: libparted/labels/dos.c:2521 #, fuzzy msgid "cannot create any more partitions" msgstr "Kan ikke tilføje flere partitioner." @@ -1323,11 +1281,11 @@ msgstr "Kunne ikke f msgid "Disk geometry does not match a DASD device of type 3390." msgstr "" -#: libparted/labels/gpt.c:531 +#: libparted/labels/gpt.c:541 msgid "device is too small for GPT" msgstr "" -#: libparted/labels/gpt.c:733 +#: libparted/labels/gpt.c:743 #, c-format msgid "" "The format of the GPT partition table is version %x, which is newer than " @@ -1336,7 +1294,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:769 +#: libparted/labels/gpt.c:779 #, c-format msgid "" "Not all of the space available to %s appears to be used, you can fix the GPT " @@ -1347,7 +1305,7 @@ msgstr "" "GPT til at bruge al pladsen (%llu blokke mere), eller fortsæt med at bruge " "den aktuelle indstilling? " -#: libparted/labels/gpt.c:1008 +#: libparted/labels/gpt.c:1024 #, fuzzy msgid "" "The backup GPT table is not at the end of the disk, as it should be. Fix, " @@ -1358,7 +1316,7 @@ msgstr "" "Skal det rettes ved at flytte sikkerhedskopien til slutningen (og fjerne den " "gamle sikkerhedskopi)?" -#: libparted/labels/gpt.c:1026 +#: libparted/labels/gpt.c:1042 msgid "" "Both the primary and backup GPT tables are corrupt. Try making a fresh " "table, and using Parted's rescue feature to recover partitions." @@ -1366,7 +1324,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:1037 +#: libparted/labels/gpt.c:1053 msgid "" "The backup GPT table is corrupt, but the primary appears OK, so that will be " "used." @@ -1374,7 +1332,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:1049 +#: libparted/labels/gpt.c:1065 msgid "" "The primary GPT table is corrupt, but the backup appears OK, so that will be " "used." @@ -1382,11 +1340,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:1073 +#: libparted/labels/gpt.c:1089 msgid "primary partition table array CRC mismatch" msgstr "Uoverensstemmelse for CRC på primær partitionstabel" -#: libparted/labels/gpt.c:1936 libparted/labels/gpt.c:1963 +#: libparted/labels/gpt.c:2026 libparted/labels/gpt.c:2053 #, fuzzy msgid "failed to translate partition name" msgstr "Kan ikke tildele et partitionsnummer." @@ -1420,18 +1378,14 @@ msgid "The data region doesn't start at the start of the partition." msgstr "Dataområdet begynder ikke ved partitionens begyndelse." #: libparted/labels/mac.c:572 -msgid "The boot region doesn't start at the start of the partition." -msgstr "Startområdet begynder ikke ved partitionens begyndelse" - -#: libparted/labels/mac.c:586 msgid "The partition's boot region doesn't occupy the entire partition." msgstr "Partitionens opstartområde optager ikke hele partitionens plads." -#: libparted/labels/mac.c:597 +#: libparted/labels/mac.c:583 msgid "The partition's data region doesn't occupy the entire partition." msgstr "Partitionens dataområde optager ikke hele partitionens plads." -#: libparted/labels/mac.c:649 +#: libparted/labels/mac.c:635 #, c-format msgid "" "Weird block size on device descriptor: %d bytes is not divisible by 512." @@ -1439,7 +1393,7 @@ msgstr "" "Mærkelig blokstørrelse på enhedens beskriver: %d byte er ikke helt delbart " "med 512." -#: libparted/labels/mac.c:662 +#: libparted/labels/mac.c:648 #, c-format msgid "" "The driver descriptor says the physical block size is %d bytes, but Linux " @@ -1448,11 +1402,11 @@ msgstr "" "Enhedens beskriver påstår at den fysiske blokstørrelse er %d byte, men Linux " "påstår at den er %d byte." -#: libparted/labels/mac.c:715 +#: libparted/labels/mac.c:701 msgid "No valid partition map found." msgstr "Ingen gyldig partitionstabel kunne findes." -#: libparted/labels/mac.c:789 +#: libparted/labels/mac.c:775 #, c-format msgid "" "Conflicting partition map entry sizes! Entry 1 says it is %d, but entry %d " @@ -1461,11 +1415,11 @@ msgstr "" "Konfliktende størrelsesdata i partitionstabellen! Post 1 påstår den er %d, " "mens post %d påstår den er %d!" -#: libparted/labels/mac.c:820 +#: libparted/labels/mac.c:806 msgid "Weird! There are 2 partitions map entries!" msgstr "Mærkeligt! Der er 2 poster i partitionstabellen!" -#: libparted/labels/mac.c:1359 +#: libparted/labels/mac.c:1345 msgid "" "Changing the name of a root or swap partition will prevent Linux from " "recognising it as such." @@ -1473,16 +1427,16 @@ msgstr "" "At ændre navnet på en rod- eller swappartition gør at Linux ikke kan " "genkende dem." -#: libparted/labels/mac.c:1458 +#: libparted/labels/mac.c:1444 msgid "Can't add another partition -- the partition map is too small!" msgstr "Kan ikke tilføje endnu en partition - partitionstabellen er for lille!" -#: libparted/labels/pc98.c:284 +#: libparted/labels/pc98.c:285 #, c-format msgid "Invalid partition table on %s." msgstr "Ugyldig partitionstabel på %s." -#: libparted/labels/pc98.c:337 libparted/labels/pc98.c:415 +#: libparted/labels/pc98.c:338 libparted/labels/pc98.c:416 #, c-format msgid "" "Partition %d isn't aligned to cylinder boundaries. This is still " @@ -1491,7 +1445,7 @@ msgstr "" "Partitionen %d ligger ikke på hel cylindergrænse. Dette er stadig ikke " "understøttelset." -#: libparted/labels/pc98.c:733 +#: libparted/labels/pc98.c:729 msgid "Can't add another partition." msgstr "Kan ikke tilføje endnu en partition." @@ -1667,39 +1621,39 @@ msgstr "Kunne ikke skrive VTOC FMT7 DSCB." msgid "Could not write VTOC FMT9 DSCB." msgstr "Kunne ikke skrive VTOC FMT1 DSCB." -#: libparted/libparted.c:242 +#: libparted/libparted.c:247 msgid "Out of memory." msgstr "Ikke mere hukommelse." -#: libparted/unit.c:139 +#: libparted/unit.c:140 msgid "Cannot get unit size for special unit 'COMPACT'." msgstr "Kan ikke få fat på enhedsstørrelse på specialenhed 'COMPACT'." -#: libparted/unit.c:385 +#: libparted/unit.c:386 #, c-format msgid "\"%s\" has invalid syntax for locations." msgstr "'%s' indeholder en ugyldig syntaks for placeringer." -#: libparted/unit.c:393 +#: libparted/unit.c:394 #, c-format msgid "The maximum head value is %d." msgstr "Den maksimale værdi for hoved er %d." -#: libparted/unit.c:400 +#: libparted/unit.c:401 #, c-format msgid "The maximum sector value is %d." msgstr "Den maksimale sektor-værdi er %d." -#: libparted/unit.c:412 libparted/unit.c:564 +#: libparted/unit.c:413 libparted/unit.c:565 #, c-format msgid "The location %s is outside of the device %s." msgstr "Placeringen %s er udenfor enheden %s." -#: libparted/unit.c:526 +#: libparted/unit.c:527 msgid "Invalid number." msgstr "Ugyldigt nummer." -#: libparted/unit.c:532 +#: libparted/unit.c:533 msgid "Use a smaller unit instead of a value < 1" msgstr "" @@ -1709,18 +1663,18 @@ msgstr "" msgid "%s : Failed to allocate partition block\n" msgstr "%s : Mislykkedes med at allokere partitionsblok\n" -#: libparted/fs/amiga/affs.c:79 libparted/fs/amiga/apfs.c:71 +#: 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 : Mislykkedes med at allokere blok\n" -#: libparted/fs/amiga/affs.c:84 libparted/fs/amiga/apfs.c:76 +#: 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 : Kunne ikke læse startblok %llu\n" -#: libparted/fs/amiga/affs.c:98 libparted/fs/amiga/apfs.c:87 +#: 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" @@ -1746,22 +1700,22 @@ msgstr "%s : Fejlagtig kontrolsum p msgid "%s : Couldn't write block %d\n" msgstr "%s : Kunne ikke skrive blok %d\n" -#: libparted/fs/amiga/amiga.c:278 +#: libparted/fs/amiga/amiga.c:279 #, c-format msgid "%s : Failed to allocate disk_specific rdb block\n" msgstr "%s : Mislykkedes med at allokere dikspecifik rdb-blok\n" -#: libparted/fs/amiga/amiga.c:289 +#: libparted/fs/amiga/amiga.c:290 #, c-format msgid "%s : Didn't find rdb block, should never happen\n" msgstr "%s :Fandt ikke rdb-blok, dette burde aldig kunne ske\n" -#: libparted/fs/amiga/amiga.c:318 +#: libparted/fs/amiga/amiga.c:319 #, c-format msgid "%s : Failed to read partition block %llu\n" msgstr "%s : Mislykkedes med at læse partitionsblok %llu\n" -#: libparted/fs/fat/fat.c:148 libparted/fs/r/fat/fat.c:811 +#: libparted/fs/fat/fat.c:149 msgid "" "GNU Parted was miscompiled: the FAT boot sector should be 512 bytes. FAT " "support will be disabled." @@ -1857,7 +1811,7 @@ msgstr "" "vil filsystemets CHS-geometri bilve sat til at matche partitionstabellens " "CHS-geometri." -#: libparted/fs/r/fat/bootsector.c:399 +#: libparted/fs/r/fat/bootsector.c:398 #, c-format msgid "" "The information sector has the wrong signature (%x). Select cancel for now, " @@ -1880,59 +1834,52 @@ msgid "" "Cluster start delta = %d, which is not a multiple of the cluster size %d." msgstr "" -#: libparted/fs/r/fat/count.c:144 +#: 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:157 +#: 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:166 +#: 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:176 +#: 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:195 +#: libparted/fs/r/fat/count.c:135 #, c-format msgid "%s is %dk, but it has %d clusters (%dk)." msgstr "" -#: libparted/fs/r/fat/count.c:258 -#, c-format -msgid "" -"The file %s is marked as a system file. This means moving it could cause " -"some programs to stop working." -msgstr "" - -#: libparted/fs/r/fat/fat.c:243 +#: libparted/fs/r/fat/fat.c:244 #, fuzzy, c-format msgid "Partition too big/small for a %s file system." msgstr "Partition %d er %s, men filsystemet er %s." -#: libparted/fs/r/fat/fat.c:409 +#: 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:449 +#: libparted/fs/r/fat/fat.c:450 msgid "There are no possible configurations for this FAT type." msgstr "" -#: libparted/fs/r/fat/fat.c:461 +#: libparted/fs/r/fat/fat.c:462 #, c-format msgid "" "File system doesn't have expected sizes for Windows to like it. Cluster " @@ -1940,40 +1887,40 @@ msgid "" "FATs is %d sectors (%d expected)." msgstr "" -#: libparted/fs/r/fat/fat.c:484 +#: libparted/fs/r/fat/fat.c:485 #, c-format msgid "" "File system is reporting the free space as %d clusters, not %d clusters." msgstr "" -#: libparted/fs/r/fat/resize.c:158 +#: 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:302 +#: libparted/fs/r/fat/resize.c:303 msgid "Error writing to the root directory." msgstr "" -#: libparted/fs/r/fat/resize.c:495 +#: libparted/fs/r/fat/resize.c:479 msgid "If you leave your file system as FAT16, then you will have no problems." msgstr "" -#: libparted/fs/r/fat/resize.c:498 +#: 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:506 +#: 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 "" -#: libparted/fs/r/fat/resize.c:510 +#: 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 " @@ -1982,79 +1929,79 @@ msgid "" "Windows 95a, and MS Windows NT." msgstr "" -#: libparted/fs/r/fat/resize.c:524 +#: libparted/fs/r/fat/resize.c:508 #, c-format msgid "%s %s %s" msgstr "" -#: libparted/fs/r/fat/resize.c:525 +#: libparted/fs/r/fat/resize.c:509 msgid "Would you like to use FAT32?" msgstr "" -#: libparted/fs/r/fat/resize.c:556 libparted/fs/r/fat/resize.c:572 +#: libparted/fs/r/fat/resize.c:540 libparted/fs/r/fat/resize.c:556 #, c-format msgid "%s %s" msgstr "" -#: libparted/fs/r/fat/resize.c:557 +#: libparted/fs/r/fat/resize.c:541 msgid "" "The file system can only be resized to this size by converting to FAT16." msgstr "" -#: libparted/fs/r/fat/resize.c:573 +#: libparted/fs/r/fat/resize.c:557 msgid "" "The file system can only be resized to this size by converting to FAT32." msgstr "" -#: libparted/fs/r/fat/resize.c:586 +#: libparted/fs/r/fat/resize.c:570 msgid "" "GNU Parted cannot resize this partition to this size. We're working on it!" msgstr "" -#: libparted/fs/r/fat/table.c:136 +#: 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:268 +#: libparted/fs/r/fat/table.c:269 #, c-format msgid "fat_table_set: cluster %ld outside file system" msgstr "" -#: libparted/fs/r/fat/table.c:300 +#: libparted/fs/r/fat/table.c:301 #, c-format msgid "fat_table_get: cluster %ld outside file system" msgstr "" -#: libparted/fs/r/fat/table.c:342 +#: libparted/fs/r/fat/table.c:343 msgid "fat_table_alloc_cluster: no free clusters" msgstr "" -#: libparted/fs/r/filesys.c:151 +#: libparted/fs/r/filesys.c:152 #, fuzzy msgid "Could not detect file system." msgstr "Kunne ikke tage status på enheden %s - %s." -#: libparted/fs/r/filesys.c:158 libparted/fs/r/filesys.c:285 +#: libparted/fs/r/filesys.c:159 libparted/fs/r/filesys.c:284 #, fuzzy, c-format msgid "resizing %s file systems is not supported" msgstr "Forventer en filsystemstype." -#: libparted/fs/r/filesys.c:170 +#: libparted/fs/r/filesys.c:171 #, fuzzy msgid "The file system is bigger than its volume!" msgstr "Disk-etiketten beskriver en disk større end %s." -#: libparted/fs/r/hfs/advfs.c:121 libparted/fs/r/hfs/advfs_plus.c:121 -#: libparted/fs/r/hfs/reloc.c:413 libparted/fs/r/hfs/reloc.c:507 -#: libparted/fs/r/hfs/reloc_plus.c:538 libparted/fs/r/hfs/reloc_plus.c:656 -#: libparted/fs/r/hfs/reloc_plus.c:769 +#: 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:285 +#: libparted/fs/r/hfs/advfs_plus.c:287 msgid "Bad blocks could not be read." msgstr "" @@ -2112,88 +2059,88 @@ msgstr "" msgid "Trying to write HFS+ file with CNID %X behind EOF." msgstr "" -#: libparted/fs/r/hfs/hfs.c:232 +#: libparted/fs/r/hfs/hfs.c:212 msgid "Sorry, HFS cannot be resized that way yet." msgstr "" -#: libparted/fs/r/hfs/hfs.c:250 libparted/fs/r/hfs/hfs.c:629 +#: libparted/fs/r/hfs/hfs.c:230 libparted/fs/r/hfs/hfs.c:573 msgid "shrinking" msgstr "" -#: libparted/fs/r/hfs/hfs.c:262 libparted/fs/r/hfs/hfs.c:641 +#: libparted/fs/r/hfs/hfs.c:242 libparted/fs/r/hfs/hfs.c:585 #, fuzzy msgid "Data relocation has failed." msgstr "Hukommelsesallokeringen mislykkedes" -#: libparted/fs/r/hfs/hfs.c:281 +#: 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:320 +#: libparted/fs/r/hfs/hfs.c:300 msgid "writing HFS Master Directory Block" msgstr "" -#: libparted/fs/r/hfs/hfs.c:468 +#: 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:478 +#: libparted/fs/r/hfs/hfs.c:422 #, c-format msgid "Version %d of HFS+ isn't supported." msgstr "" -#: libparted/fs/r/hfs/hfs.c:489 +#: libparted/fs/r/hfs/hfs.c:433 #, c-format msgid "Version %d of HFSX isn't supported." msgstr "" -#: libparted/fs/r/hfs/hfs.c:672 +#: 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:720 +#: libparted/fs/r/hfs/hfs.c:664 msgid "Error while writing the allocation file." msgstr "" -#: libparted/fs/r/hfs/hfs.c:735 +#: 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:750 +#: libparted/fs/r/hfs/hfs.c:694 msgid "writing HFS+ Volume Header" msgstr "" -#: libparted/fs/r/hfs/hfs.c:850 +#: 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:904 +#: 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:940 +#: libparted/fs/r/hfs/hfs.c:883 msgid "Sorry, HFS+ cannot be resized that way yet." msgstr "" -#: libparted/fs/r/hfs/hfs.c:975 +#: libparted/fs/r/hfs/hfs.c:918 msgid "shrinking embedded HFS+ volume" msgstr "" -#: libparted/fs/r/hfs/hfs.c:992 +#: libparted/fs/r/hfs/hfs.c:935 msgid "Resizing the HFS+ volume has failed." msgstr "" -#: libparted/fs/r/hfs/hfs.c:999 +#: libparted/fs/r/hfs/hfs.c:942 msgid "shrinking HFS wrapper" msgstr "" -#: libparted/fs/r/hfs/hfs.c:1008 +#: libparted/fs/r/hfs/hfs.c:951 msgid "Updating the HFS wrapper has failed." msgstr "" -#: libparted/fs/r/hfs/hfs.c:1110 libparted/fs/r/hfs/hfs.c:1195 +#: 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 " @@ -2258,71 +2205,71 @@ msgstr "" msgid "An extent has not been relocated." msgstr "" -#: libparted/fs/r/hfs/reloc.c:250 libparted/fs/r/hfs/reloc_plus.c:307 +#: 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:380 +#: 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:474 +#: 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:516 libparted/fs/r/hfs/reloc_plus.c:666 +#: 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:573 libparted/fs/r/hfs/reloc_plus.c:844 +#: 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:634 libparted/fs/r/hfs/reloc_plus.c:905 +#: 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:648 libparted/fs/r/hfs/reloc_plus.c:921 +#: 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:494 +#: 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:617 +#: 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:125 +#: parted/parted.c:126 msgid "displays this help message" msgstr "viser denne hjælpetekst" -#: parted/parted.c:126 +#: parted/parted.c:127 msgid "lists partition layout on all block devices" msgstr "lister partitionslayout for alle blokenheder" -#: parted/parted.c:127 +#: parted/parted.c:128 msgid "displays machine parseable output" msgstr "viser udskriften på maskintolkningsbar måde" -#: parted/parted.c:128 +#: parted/parted.c:129 msgid "never prompts for user intervention" msgstr "spørger aldrig brugeren om alternativer" -#: parted/parted.c:129 +#: parted/parted.c:130 msgid "displays the version" msgstr "viser versionen" -#: parted/parted.c:130 +#: parted/parted.c:131 msgid "alignment for new partitions" msgstr "justering for nye partitioner" -#: parted/parted.c:142 +#: parted/parted.c:143 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" @@ -2331,31 +2278,31 @@ msgstr "" "er de primære partitioner numrerede fra 1 til 4, og de logiske partitioner " "fra 5 og opad.\n" -#: parted/parted.c:145 +#: parted/parted.c:146 msgid "LABEL-TYPE is one of: " msgstr "LABEL-TYPE er en af:" -#: parted/parted.c:146 parted/parted.c:147 +#: parted/parted.c:147 parted/parted.c:148 msgid "FLAG is one of: " msgstr "FLAG er et af: " -#: parted/parted.c:148 +#: parted/parted.c:149 msgid "UNIT is one of: " msgstr "ENHED er et af: " -#: parted/parted.c:149 +#: parted/parted.c:150 msgid "desired alignment: minimum or optimal" msgstr "ønsket tilpasning: mindste eller bedste" -#: parted/parted.c:150 +#: parted/parted.c:151 msgid "PART-TYPE is one of: primary, logical, extended\n" msgstr "PART-TYPE er en af: primær, logisk, udvidet\n" -#: parted/parted.c:152 +#: parted/parted.c:153 msgid "FS-TYPE is one of: " msgstr "FS-TYPE er en af: " -#: parted/parted.c:153 +#: parted/parted.c:154 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 " @@ -2365,7 +2312,7 @@ msgstr "" "regnes fra slutningen på disken. For eksempel angiver -1s præcist den sidste " "sektor.\n" -#: parted/parted.c:156 +#: parted/parted.c:157 #, fuzzy msgid "" "END is disk location, such as 4GB or 10%. Negative value counts from the " @@ -2375,19 +2322,19 @@ msgstr "" "regnes fra slutningen på disken. For eksempel angiver -1s præcist den sidste " "sektor.\n" -#: parted/parted.c:159 +#: parted/parted.c:160 msgid "STATE is one of: on, off\n" msgstr "TILSTAND er en af: på, af\n" -#: parted/parted.c:160 +#: parted/parted.c:161 msgid "DEVICE is usually /dev/hda or /dev/sda\n" msgstr "ENHED er normalt /dev/hda eller /dev/sda\n" -#: parted/parted.c:161 +#: parted/parted.c:162 msgid "NAME is any word you want\n" msgstr "NAVN er et vilkårligt ord\n" -#: parted/parted.c:164 +#: parted/parted.c:165 msgid "" "Copyright (C) 1998 - 2006 Free Software Foundation, Inc.\n" "This program is free software, covered by the GNU General Public License.\n" @@ -2406,24 +2353,24 @@ msgstr "" "SALGBARHED eller EGNETHED FOR NOGET SPECIELT FORMÅL. Se GNU General\n" "Public License for yderligere information.\n" -#: parted/parted.c:212 +#: parted/parted.c:213 #, c-format msgid "%0.f%%\t(time left %.2d:%.2d)" msgstr "%0.f%%\t(tid tilbage %.2d:%.2d)" -#: parted/parted.c:231 +#: parted/parted.c:232 #, 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:252 +#: parted/parted.c:253 #, c-format msgid "Partition(s) on %s are being used." msgstr "Partitionen på %s er i brug." -#: parted/parted.c:264 +#: parted/parted.c:265 #, c-format msgid "" "The existing disk label on %s will be destroyed and all data on this disk " @@ -2432,31 +2379,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:525 +#: parted/parted.c:526 msgid "New disk label type?" msgstr "Type på ny disketikette?" -#: parted/parted.c:662 +#: parted/parted.c:663 msgid "Partition type?" msgstr "Type på partitionen" -#: parted/parted.c:680 parted/parted.c:884 +#: parted/parted.c:681 parted/parted.c:885 msgid "Partition name?" msgstr "Navn på partitionen?" -#: parted/parted.c:690 +#: parted/parted.c:691 msgid "File system type?" msgstr "Type på filsystemet?" -#: parted/parted.c:695 parted/parted.c:1498 +#: parted/parted.c:696 parted/parted.c:1499 msgid "Start?" msgstr "Start?" -#: parted/parted.c:698 parted/parted.c:1500 parted/parted.c:1569 +#: parted/parted.c:699 parted/parted.c:1501 parted/parted.c:1585 msgid "End?" msgstr "Slut?" -#: parted/parted.c:766 +#: parted/parted.c:767 #, fuzzy, c-format msgid "" "You requested a partition from %s to %s (sectors %llu..%llu).\n" @@ -2465,7 +2412,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:775 +#: parted/parted.c:776 msgid "" "\n" "Is this still acceptable to you?" @@ -2473,94 +2420,94 @@ msgstr "" "\n" "Er dette stadigvæk acceptabelt for dig?" -#: parted/parted.c:798 +#: parted/parted.c:799 #, 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:800 parted/parted.c:1723 +#: parted/parted.c:801 parted/parted.c:1739 msgid "unknown (malloc failed)" msgstr "" -#: parted/parted.c:876 +#: parted/parted.c:877 #, fuzzy, c-format msgid "%s disk labels do not support partition name." msgstr "Filallokeringstabeller for %s understøtter ikke udvidede partitioner." -#: parted/parted.c:881 parted/parted.c:1561 parted/parted.c:1612 -#: parted/parted.c:1706 parted/parted.c:1781 +#: parted/parted.c:882 parted/parted.c:1564 parted/parted.c:1628 +#: parted/parted.c:1722 parted/parted.c:1797 msgid "Partition number?" msgstr "Nummer på partitionen?" -#: parted/parted.c:975 +#: parted/parted.c:976 #, 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:1017 +#: parted/parted.c:1018 #, c-format msgid "Model: %s (%s)\n" msgstr "Model: %s (%s)\n" -#: parted/parted.c:1019 +#: parted/parted.c:1020 #, c-format msgid "Disk %s: %s\n" msgstr "Disk %s: %s\n" -#: parted/parted.c:1020 +#: parted/parted.c:1021 #, c-format msgid "Sector size (logical/physical): %lldB/%lldB\n" msgstr "Sektorstørrelse (logisk/fysisk): %lldB/%lldB\n" -#: parted/parted.c:1032 +#: parted/parted.c:1033 #, c-format msgid "Partition Table: %s\n" msgstr "Partitionstabel: %s\n" -#: parted/parted.c:1033 +#: parted/parted.c:1034 #, fuzzy, c-format msgid "Disk Flags: %s\n" msgstr "Disk %s: %s\n" -#: parted/parted.c:1153 parted/parted.c:1156 +#: parted/parted.c:1154 parted/parted.c:1157 msgid "Number" msgstr "Nummer" -#: parted/parted.c:1153 parted/parted.c:1156 +#: parted/parted.c:1154 parted/parted.c:1157 msgid "Start" msgstr "Start" -#: parted/parted.c:1154 parted/parted.c:1157 +#: parted/parted.c:1155 parted/parted.c:1158 msgid "End" msgstr "Slut" -#: parted/parted.c:1157 +#: parted/parted.c:1158 msgid "Size" msgstr "Størrelse" -#: parted/parted.c:1161 +#: parted/parted.c:1162 msgid "Type" msgstr "Type" -#: parted/parted.c:1163 +#: parted/parted.c:1164 msgid "File system" msgstr "Filsystem" -#: parted/parted.c:1166 +#: parted/parted.c:1167 msgid "Name" msgstr "Name" -#: parted/parted.c:1168 +#: parted/parted.c:1169 msgid "Flags" msgstr "Flag" -#: parted/parted.c:1225 +#: parted/parted.c:1226 msgid "Free Space" msgstr "Fri plads" -#: parted/parted.c:1385 +#: parted/parted.c:1386 #, c-format msgid "" "A %s %s partition was found at %s -> %s. Do you want to add it to the " @@ -2569,54 +2516,54 @@ msgstr "" "En %s %s partition blev fundet på %s -> %s. Ønsker du at tilføje den til " "partitionstabellen?" -#: parted/parted.c:1428 +#: parted/parted.c:1429 msgid "searching for file systems" msgstr "leder efter filsystemer" -#: parted/parted.c:1535 +#: parted/parted.c:1536 msgid "The resize command has been removed in parted 3.0" msgstr "" -#: parted/parted.c:1583 +#: parted/parted.c:1599 msgid "" "Shrinking a partition can cause data loss, are you sure you want to continue?" msgstr "" -#: parted/parted.c:1636 +#: parted/parted.c:1652 msgid "New device?" msgstr "Ny enhed?" -#: parted/parted.c:1704 +#: parted/parted.c:1720 msgid "alignment type(min/opt)" msgstr "justeringstype (min/opt)" -#: parted/parted.c:1719 +#: parted/parted.c:1735 #, c-format msgid "%d aligned\n" msgstr "%d justeret\n" -#: parted/parted.c:1721 +#: parted/parted.c:1737 #, fuzzy, c-format msgid "%d not aligned: %s\n" msgstr "%d ikke justeret\n" -#: parted/parted.c:1746 parted/parted.c:1783 +#: parted/parted.c:1762 parted/parted.c:1799 msgid "Flag to Invert?" msgstr "Flag at invertere?" -#: parted/parted.c:1751 parted/parted.c:1788 +#: parted/parted.c:1767 parted/parted.c:1804 msgid "New state?" msgstr "Ny tilstand?" -#: parted/parted.c:1834 +#: parted/parted.c:1850 msgid "Unit?" msgstr "Enhed?" -#: parted/parted.c:1969 +#: parted/parted.c:1985 msgid "align-check" msgstr "align-check" -#: parted/parted.c:1972 +#: parted/parted.c:1988 #, fuzzy msgid "" "align-check TYPE N check partition N for TYPE(min|opt) " @@ -2625,11 +2572,11 @@ msgstr "" "align-check TYPE N tjek partition N for TYPE(min|opt) " "justering" -#: parted/parted.c:1980 +#: parted/parted.c:1996 msgid "help" msgstr "hjælp" -#: parted/parted.c:1983 +#: parted/parted.c:1999 msgid "" "help [COMMAND] print general help, or help on " "COMMAND" @@ -2637,15 +2584,15 @@ msgstr "" "hjælp [KOMMANDO] udskriver generel hjælp, eller " "speciel hjælp for KOMMANDO" -#: parted/parted.c:1989 +#: parted/parted.c:2005 msgid "mklabel" msgstr "mklabel" -#: parted/parted.c:1989 +#: parted/parted.c:2005 msgid "mktable" msgstr "mktable" -#: parted/parted.c:1992 +#: parted/parted.c:2008 msgid "" "mklabel,mktable LABEL-TYPE create a new disklabel (partition " "table)" @@ -2653,15 +2600,15 @@ msgstr "" "mklabel,mktable ETIKETTE-TYPE opret en ny disketikette " "(partitionstabel)" -#: parted/parted.c:1998 +#: parted/parted.c:2014 msgid "mkpart" msgstr "mkpart" -#: parted/parted.c:2001 +#: parted/parted.c:2017 msgid "mkpart PART-TYPE [FS-TYPE] START END make a partition" msgstr "mkpart PARTITIONSTYPE [FS-TYPE] START SLUT lav en partition" -#: parted/parted.c:2007 +#: parted/parted.c:2023 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" @@ -2669,20 +2616,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:2012 +#: parted/parted.c:2028 msgid "name" msgstr "name" -#: parted/parted.c:2015 +#: parted/parted.c:2031 msgid "name NUMBER NAME name partition NUMBER as NAME" msgstr "" "name NUMMER NAVN navngiv partition NUMMER som NAVN" -#: parted/parted.c:2020 +#: parted/parted.c:2036 msgid "print" msgstr "print" -#: parted/parted.c:2023 +#: parted/parted.c:2039 msgid "" "print [devices|free|list,all|NUMBER] display the partition table, " "available devices, free space, all found partitions, or a particular " @@ -2692,7 +2639,7 @@ msgstr "" "tilgængelige enheder, ledig plads, alle partitioner som blev fundet, eller " "en specifik partition" -#: parted/parted.c:2028 +#: parted/parted.c:2044 msgid "" "Without arguments, 'print' displays the entire partition table. However with " "the following arguments it performs various other actions.\n" @@ -2701,11 +2648,11 @@ msgstr "" "en partition er angivet vil mere detaljeret information om denne partition " "blive vist.\n" -#: parted/parted.c:2030 +#: parted/parted.c:2046 msgid " devices : display all active block devices\n" msgstr " devices : vis alle aktive blokenheder\n" -#: parted/parted.c:2031 +#: parted/parted.c:2047 msgid "" " free : display information about free unpartitioned space on the " "current block device\n" @@ -2713,31 +2660,31 @@ msgstr "" " free : vis information om ledig upartitioneret plads på den aktuelle " "blokenhed\n" -#: parted/parted.c:2033 +#: parted/parted.c:2049 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:2034 +#: parted/parted.c:2050 msgid "" " NUMBER : display more detailed information about this particular " "partition\n" msgstr "" " NUMMER : vis mere detaljeret information om denne specifikke partition\n" -#: parted/parted.c:2039 +#: parted/parted.c:2055 msgid "quit" msgstr "quit" -#: parted/parted.c:2042 +#: parted/parted.c:2058 msgid "quit exit program" msgstr "quit afslut programmet" -#: parted/parted.c:2047 +#: parted/parted.c:2063 msgid "rescue" msgstr "rescue" -#: parted/parted.c:2050 +#: parted/parted.c:2066 msgid "" "rescue START END rescue a lost partition near START " "and END" @@ -2745,56 +2692,56 @@ msgstr "" "rescue START SLUT red tabte partitioner nær ved START " "og SLUT" -#: parted/parted.c:2056 +#: parted/parted.c:2072 msgid "resize" msgstr "" -#: parted/parted.c:2059 +#: parted/parted.c:2075 msgid "The resize command was removed in parted 3.0\n" msgstr "" -#: parted/parted.c:2062 +#: parted/parted.c:2078 msgid "resizepart" msgstr "" -#: parted/parted.c:2065 +#: parted/parted.c:2081 #, fuzzy msgid "resizepart NUMBER END resize partition NUMBER" msgstr "rm NUMMER slet partition NUMMER" -#: parted/parted.c:2070 +#: parted/parted.c:2086 msgid "rm" msgstr "rm" -#: parted/parted.c:2073 +#: parted/parted.c:2089 msgid "rm NUMBER delete partition NUMBER" msgstr "rm NUMMER slet partition NUMMER" -#: parted/parted.c:2078 +#: parted/parted.c:2094 msgid "select" msgstr "vælg" -#: parted/parted.c:2081 +#: parted/parted.c:2097 msgid "select DEVICE choose the device to edit" msgstr "vælg ENHED vælg enhed at redigere" -#: parted/parted.c:2086 +#: parted/parted.c:2102 msgid "disk_set" msgstr "" -#: parted/parted.c:2089 +#: parted/parted.c:2105 #, 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:2094 +#: parted/parted.c:2110 #, fuzzy msgid "disk_toggle" msgstr "skift" -#: parted/parted.c:2097 +#: parted/parted.c:2113 #, fuzzy msgid "" "disk_toggle [FLAG] toggle the state of FLAG on " @@ -2803,21 +2750,21 @@ msgstr "" "skift [NUMMER [FLAG]] væxla tilstandet for FLAG på " "partition NUMMER" -#: parted/parted.c:2103 +#: parted/parted.c:2119 msgid "set" msgstr "sæt" -#: parted/parted.c:2106 +#: parted/parted.c:2122 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:2112 +#: parted/parted.c:2128 msgid "toggle" msgstr "skift" -#: parted/parted.c:2115 +#: parted/parted.c:2131 msgid "" "toggle [NUMBER [FLAG]] toggle the state of FLAG on " "partition NUMBER" @@ -2825,19 +2772,19 @@ msgstr "" "skift [NUMMER [FLAG]] væxla tilstandet for FLAG på " "partition NUMMER" -#: parted/parted.c:2121 +#: parted/parted.c:2137 msgid "unit" msgstr "unit" -#: parted/parted.c:2124 +#: parted/parted.c:2140 msgid "unit UNIT set the default unit to UNIT" msgstr "enhed ENHED sæt standardenheden til ENHED" -#: parted/parted.c:2129 +#: parted/parted.c:2145 msgid "version" msgstr "version" -#: parted/parted.c:2132 +#: parted/parted.c:2148 msgid "" "version display the version number and " "copyright information of GNU Parted" @@ -2845,7 +2792,7 @@ msgstr "" "version vis versionsnummeret og " "ophavsretlig information om GNU Parted" -#: parted/parted.c:2136 +#: parted/parted.c:2152 msgid "" "'version' displays copyright and version information corresponding to this " "copy of GNU Parted\n" @@ -2853,32 +2800,40 @@ msgstr "" "'version' viser information om version og ophavsret for denne kopi af GNU " "Parted\n" -#: parted/parted.c:2204 +#: parted/parted.c:2220 #, c-format msgid "Usage: %s [-hlmsv] [-a] [DEVICE [COMMAND [PARAMETERS]]...]\n" msgstr "Usage: %s [-hlmsv] [-a] [ENHED [KOMMANDO [PARAMETRE]]...]\n" -#: parted/parted.c:2248 +#: parted/parted.c:2264 msgid "No device found" msgstr "Ingen enhed fundet" -#: parted/parted.c:2285 +#: parted/parted.c:2301 #, 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:2325 +#: parted/parted.c:2334 +msgid "" +"You should reinstall your boot loader before rebooting. Read section 4 of " +"the Parted User documentation for more information." +msgstr "" +"Du bør geninstallere opstartsprogrammet inden du genopstarter. Læs sektion 4 " +"i Parteds brugermanual for mere information." + +#: parted/parted.c:2341 msgid "You may need to update /etc/fstab.\n" msgstr "Glem ikke at opdatere /etc/fstab, om nødvendigt.\n" -#: parted/ui.c:164 +#: parted/ui.c:165 msgid "Welcome to GNU Parted! Type 'help' to view a list of commands.\n" msgstr "" "Velkommen til GNU Parted! Skriv 'hjælp' for at vise en liste med " "kommandoer.\n" -#: parted/ui.c:167 +#: parted/ui.c:168 msgid "" "Usage: parted [OPTION]... [DEVICE [COMMAND [PARAMETERS]...]...]\n" "Apply COMMANDs with PARAMETERS to DEVICE. If no COMMAND(s) are given, run " @@ -2889,7 +2844,7 @@ msgstr "" "Kør KOMMANDO med PARAMETRE på ENHED. Hvis ingen KOMMANDOER angives køres\n" "programmet i interaktiv tilstand.\n" -#: parted/ui.c:172 +#: parted/ui.c:173 #, c-format msgid "" "\n" @@ -2952,7 +2907,7 @@ msgstr "" "Inkludér også yderligere information om din konfiguration som\n" "du mener er vigtigt at vide.\n" -#: parted/ui.c:293 +#: parted/ui.c:294 msgid "" "\n" "Command History:\n" @@ -2960,7 +2915,7 @@ msgstr "" "\n" "Kommandohistorik:\n" -#: parted/ui.c:356 +#: parted/ui.c:357 msgid "" "\n" "Error: SEGV_MAPERR (Address not mapped to object)\n" @@ -2968,7 +2923,7 @@ msgstr "" "\n" "Fejl: SEGV_MAPERR (Adresse ikke mappet to objekt)\n" -#: parted/ui.c:362 +#: parted/ui.c:363 msgid "" "\n" "Error: SEGV_ACCERR (Invalid permissions for mapped object)\n" @@ -2976,7 +2931,7 @@ msgstr "" "\n" "Fejl: SEGV_ACCERR (Ugyldige rettigheder for mappet object)\n" -#: parted/ui.c:367 +#: parted/ui.c:368 msgid "" "\n" "Error: A general SIGSEGV signal was encountered.\n" @@ -2984,7 +2939,7 @@ msgstr "" "\n" "Fejl: Et generelt SIGSEGV-signal indtraf.\n" -#: parted/ui.c:391 +#: parted/ui.c:392 msgid "" "\n" "Error: FPE_INTDIV (Integer: divide by zero)" @@ -2992,7 +2947,7 @@ msgstr "" "\n" "Fejl: FPE_INTDIV (heltal: division med nul)" -#: parted/ui.c:396 +#: parted/ui.c:397 msgid "" "\n" "Error: FPE_INTOVF (Integer: overflow)" @@ -3000,7 +2955,7 @@ msgstr "" "\n" "Fejl: FPE_INTOVF (Integer: overløb)" -#: parted/ui.c:401 +#: parted/ui.c:402 msgid "" "\n" "Error: FPE_FLTDIV (Float: divide by zero)" @@ -3008,7 +2963,7 @@ msgstr "" "\n" "Fejl: FPE_FLTDIV (Float: division med nul)" -#: parted/ui.c:406 +#: parted/ui.c:407 msgid "" "\n" "Error: FPE_FLTOVF (Float: overflow)" @@ -3016,7 +2971,7 @@ msgstr "" "\n" "Fejl: FPE_FLTOVF (Float: overløb)" -#: parted/ui.c:411 +#: parted/ui.c:412 msgid "" "\n" "Error: FPE_FLTUND (Float: underflow)" @@ -3024,7 +2979,7 @@ msgstr "" "\n" "Fejl: FPE_FLTUND (Float: underløb)" -#: parted/ui.c:416 +#: parted/ui.c:417 msgid "" "\n" "Error: FPE_FLTRES (Float: inexact result)" @@ -3032,7 +2987,7 @@ msgstr "" "\n" "Fejl: FPE_FLTRES (Float: unøjagtigt resultat)" -#: parted/ui.c:421 +#: parted/ui.c:422 msgid "" "\n" "Error: FPE_FLTINV (Float: invalid operation)" @@ -3040,7 +2995,7 @@ msgstr "" "\n" "Fejl: FPE_FLTINV (Float: ugyldig operation)" -#: parted/ui.c:426 +#: parted/ui.c:427 msgid "" "\n" "Error: FPE_FLTSUB (Float: subscript out of range)" @@ -3048,7 +3003,7 @@ msgstr "" "\n" "Fejl: FPE_FLTSUB (Float: subskript uden for område)" -#: parted/ui.c:431 +#: parted/ui.c:432 msgid "" "\n" "Error: A general SIGFPE signal was encountered." @@ -3056,7 +3011,7 @@ msgstr "" "\n" "Fejl: Et generelt SIGFPE-signal indtraf." -#: parted/ui.c:455 +#: parted/ui.c:456 msgid "" "\n" "Error: ILL_ILLOPC (Illegal Opcode)" @@ -3064,7 +3019,7 @@ msgstr "" "\n" "Fejl: ILL_ILLOPC (Ugyldig Opcode)" -#: parted/ui.c:460 +#: parted/ui.c:461 msgid "" "\n" "Error: ILL_ILLOPN (Illegal Operand)" @@ -3072,7 +3027,7 @@ msgstr "" "\n" "Fejl: ILL_ILLOPN (Ugyldig Operand)" -#: parted/ui.c:465 +#: parted/ui.c:466 msgid "" "\n" "Error: ILL_ILLADR (Illegal addressing mode)" @@ -3080,7 +3035,7 @@ msgstr "" "\n" "Fejl: ILL_ILLADR (Ugyldig adressingstilstand)" -#: parted/ui.c:470 +#: parted/ui.c:471 msgid "" "\n" "Error: ILL_ILLTRP (Illegal Trap)" @@ -3088,7 +3043,7 @@ msgstr "" "\n" "Fejl: ILL_ILLTRP (Ugyldig Fælde)" -#: parted/ui.c:475 +#: parted/ui.c:476 msgid "" "\n" "Error: ILL_PRVOPC (Privileged Opcode)" @@ -3096,7 +3051,7 @@ msgstr "" "\n" "Fejl: ILL_PRVOPC (Privilligeret Opkode)" -#: parted/ui.c:480 +#: parted/ui.c:481 msgid "" "\n" "Error: ILL_PRVREG (Privileged Register)" @@ -3104,7 +3059,7 @@ msgstr "" "\n" "Fejl: ILL_PRVREG (Privilligeret Register)" -#: parted/ui.c:485 +#: parted/ui.c:486 msgid "" "\n" "Error: ILL_COPROC (Coprocessor Error)" @@ -3112,7 +3067,7 @@ msgstr "" "\n" "Fejl: ILL_COPROC (Coprocessor fejl)" -#: parted/ui.c:490 +#: parted/ui.c:491 msgid "" "\n" "Error: ILL_BADSTK (Internal Stack Error)" @@ -3120,7 +3075,7 @@ msgstr "" "\n" "Fejl: ILL_BADSTK (Intern stakfejl)" -#: parted/ui.c:495 +#: parted/ui.c:496 msgid "" "\n" "Error: A general SIGILL signal was encountered." @@ -3128,69 +3083,69 @@ msgstr "" "\n" "Fejl: Et generelt SIGILL-signal indtraf." -#: parted/ui.c:888 +#: parted/ui.c:889 #, c-format msgid "invalid token: %s" msgstr "ugyldigt token: %s" -#: parted/ui.c:1069 +#: parted/ui.c:1070 msgid "Expecting a partition number." msgstr "Forventer et partitionsnummer." -#: parted/ui.c:1078 +#: parted/ui.c:1079 msgid "Partition doesn't exist." msgstr "Partitionen findes ikke." -#: parted/ui.c:1098 +#: parted/ui.c:1099 msgid "Expecting a file system type." msgstr "Forventer en filsystemstype." -#: parted/ui.c:1105 +#: parted/ui.c:1106 #, c-format msgid "Unknown file system type \"%s\"." msgstr "Ukendt filsystemstype '%s'." -#: parted/ui.c:1126 +#: parted/ui.c:1127 msgid "Expecting a disk label type." msgstr "Forventer en disketikettetype." -#: parted/ui.c:1157 parted/ui.c:1193 +#: parted/ui.c:1158 parted/ui.c:1194 msgid "No flags supported" msgstr "" -#: parted/ui.c:1267 +#: parted/ui.c:1268 msgid "Can't create any more partitions." msgstr "Kan ikke tilføje flere partitioner." -#: parted/ui.c:1277 +#: parted/ui.c:1278 msgid "Expecting a partition type." msgstr "Forventer eN partitionstype." -#: parted/ui.c:1426 +#: parted/ui.c:1427 msgid "on" msgstr "på" -#: parted/ui.c:1427 +#: parted/ui.c:1428 msgid "off" msgstr "fra" -#: parted/ui.c:1444 +#: parted/ui.c:1445 msgid "optimal" msgstr "optimal" -#: parted/ui.c:1445 +#: parted/ui.c:1446 msgid "minimal" msgstr "minimal" -#: parted/ui.c:1578 +#: parted/ui.c:1579 msgid "OPTIONs:" msgstr "FLAG:" -#: parted/ui.c:1583 +#: parted/ui.c:1584 msgid "COMMANDs:" msgstr "KOMMANDOer:" -#: parted/ui.c:1586 +#: parted/ui.c:1587 #, c-format msgid "" "\n" @@ -3199,33 +3154,78 @@ msgstr "" "\n" "Rapportér fejl til %s\n" -#: parted/ui.c:1593 +#: parted/ui.c:1594 #, c-format msgid "Using %s\n" msgstr "Bruger %s\n" -#: parted/ui.c:1673 +#: parted/ui.c:1674 msgid "This command does not make sense in non-interactive mode.\n" msgstr "Denne kommando er meningsløs i ikke-interaktiv tilstand.\n" +#, c-format #~ msgid "%s: option '--%s' doesn't allow an argument\n" #~ msgstr "%s: flaget '--%s' tillader intet argument\n" +#, c-format #~ msgid "%s: unrecognized option '--%s'\n" #~ msgstr "%s: ukendt flag '--%s'\n" +#, c-format #~ msgid "%s: option '-W %s' doesn't allow an argument\n" #~ msgstr "%s: flaget '-W %s' tillader intet argument\n" +#, c-format #~ msgid "%s: option '-W %s' requires an argument\n" #~ msgstr "%s: flaget '-W %s' kræver et argument\n" +#, c-format #~ msgid "%s home page: \n" #~ msgstr "Hjemmeside for %s: \n" +#, c-format +#~ msgid "invalid %s%s argument `%s'" +#~ msgstr "ugyldigt %s%s-argument '%s'" + +#, c-format +#~ msgid "invalid suffix in %s%s argument `%s'" +#~ msgstr "ugyldigt suffiks i %s%s-argumentet '%s'" + +#, c-format +#~ msgid "%s%s argument `%s' too large" +#~ msgstr "%s%s-argumentet '%s' er for stort" + +#~ msgid "" +#~ "The partition table cannot be re-read. This means you need to reboot " +#~ "before mounting any modified partitions. You also need to reinstall your " +#~ "boot loader before you reboot (which may require mounting modified " +#~ "partitions). It is impossible do both things! So you'll need to boot " +#~ "off a rescue disk, and reinstall your boot loader from the rescue disk. " +#~ "Read section 4 of the Parted User documentation for more information." +#~ msgstr "" +#~ "Partitionstabellen kan ikke genindlæses. Dette betyder at du skal starte " +#~ "maskinen op igen inden du kan montere nogen ændrede partitioner. Du skal " +#~ "også geninstallere opstartsprogrammet inden du genstarter (hvilket kan " +#~ "indebære montering af ændrede partitioner). Det er umuligt at gøre begge " +#~ "dele! Så du skal starte fra en redningsdiskette og geninstallere " +#~ "opstartsprogrammet fra redningsdisketten. Læs kapitel 4 i Parteds " +#~ "brugermanual for mere information." + +#, 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 " +#~ "computer before doing anything with %s." +#~ msgstr "" +#~ "Partitionstabellen på %s kan ikke genindlæses (%s). Det betyder at Hurd " +#~ "ikke véd noget som helst om de ændringer du lavede. Du bør genstarte " +#~ "maskinen inden du gør noget som helst med %s." + +#, c-format #~ msgid "Failed to add partition %d (%s)" #~ msgstr "Mislykkedes med at tilføje partition %d (%s)" +#, c-format #~ msgid "" #~ "parted was unable to re-read the partition table on %s (%s). This means " #~ "Linux won't know anything about the modifications you made. " @@ -3233,6 +3233,7 @@ msgstr "Denne kommando er meningsl #~ "parted kunne ikke genindlæse partitionstabellen på %s (%s). Det betyder " #~ "at Linux ikke véd noget som helst om de ændringer du lavede. " +#, c-format #~ msgid "" #~ "%s contains GPT signatures, indicating that it has a GPT table. However, " #~ "it does not have a valid fake msdos partition table, as it should. " @@ -3246,6 +3247,10 @@ msgstr "Denne kommando er meningsl #~ "partitionstabeller. Eller måske slettede du GPT-tabellen, og bruger nu en " #~ "msdos-partitionstabel. Er dette en GPT-tabel?" +#~ msgid "The boot region doesn't start at the start of the partition." +#~ msgstr "Startområdet begynder ikke ved partitionens begyndelse" + +#, 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." diff --git a/po/de.gmo b/po/de.gmo index 1048f9c1bf4430d3ad33d045108f47fe3529ac12..3248691fc8d85a72cbd8092b4804d508fc0e3b4f 100644 GIT binary patch delta 17787 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⁢JJrldw>S;(sQ|tQqZ+?mV*! za)VCU&J;7l?#OYOOse$AOiXfQyPuh(0~jpMrK!a zTb=ncp5oBct?ry-W7yHISl_L&%`Kmf?`ZK=@VElJVUvn^pH58jU6~XS%TX-_d9R33a;$bRNKp@O$Pqo7x->@uZMVV zEw~pHAKNU>dv#&m&i!KAv1?>ZG3^uG*5+pYxcFu<@p1gmjBnh$L8F+sCUJ4$y?Vy< z;R$g4}~uckaIo2Z~!N=H4i7>Ed1Yq@0Jf|DS1RV*WYv`t9&9+d#(Z ze@XcJ?K1OrCebgMJ2P*x%sJhoLpfGk-cq%GE=OjjOrR`XJ4Z8K3Gzme>0~llqJONM zjqfMMVs*>pX7L=+-7IzF?PV-v>{h1ms2rT2=(Mw^_ZGeHC(d1zBo) z@8kvLUJJG~&7B!!iP-W}kmX{~mfK;Lw*$5;FJ#FM+LBq!a>bInwuEJ5ZjF+bVO!>v zwA2nX``gp, 1999, 2000, 2001, 2002. # Martin Ereth , 2007. -# Mario Blättermann , 2014. +# Mario Blättermann , 2014, 2021. msgid "" msgstr "" -"Project-Id-Version: parted-3.1.90\n" +"Project-Id-Version: parted-3.3.52\n" "Report-Msgid-Bugs-To: bug-parted@gnu.org\n" -"POT-Creation-Date: 2019-10-10 16:35-0700\n" -"PO-Revision-Date: 2014-07-03 21:25+0100\n" +"POT-Creation-Date: 2021-01-27 16:00-0800\n" +"PO-Revision-Date: 2021-01-18 19:59+0100\n" "Last-Translator: Mario Blättermann \n" "Language-Team: German \n" "Language: de\n" @@ -17,7 +17,8 @@ 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 1.5.4\n" +"X-Generator: Lokalize 20.12.1\n" +"Plural-Forms: nplurals=2; plural=(n != 1);\n" #: lib/argmatch.c:132 #, c-format @@ -42,29 +43,29 @@ msgid "Unknown system error" msgstr "Unbekannter Systemfehler" #: lib/getopt.c:278 -#, fuzzy, c-format +#, c-format msgid "%s: option '%s%s' is ambiguous\n" -msgstr "%s: Die Option »-W %s« ist mehrdeutig\n" +msgstr "%s: Die Option »%s%s« ist mehrdeutig\n" #: lib/getopt.c:284 -#, fuzzy, c-format +#, c-format msgid "%s: option '%s%s' is ambiguous; possibilities:" -msgstr "%s: Die Option »%s« ist mehrdeutig; Möglichkeiten:" +msgstr "%s: Die Option »%s%s« ist mehrdeutig; Möglichkeiten:" #: lib/getopt.c:319 -#, fuzzy, c-format +#, c-format msgid "%s: unrecognized option '%s%s'\n" -msgstr "%s: unbekannte Option »%c%s«\n" +msgstr "%s: unbekannte Option »%s%s«\n" #: lib/getopt.c:345 -#, fuzzy, c-format +#, c-format msgid "%s: option '%s%s' doesn't allow an argument\n" -msgstr "%s: Die Option »%c%s« erlaubt kein Argument\n" +msgstr "%s: Die Option »%s%s« erlaubt kein Argument\n" #: lib/getopt.c:360 -#, fuzzy, c-format +#, c-format msgid "%s: option '%s%s' requires an argument\n" -msgstr "%s: Die Option »%s« benötigt ein Argument\n" +msgstr "%s: Die Option »%s%s« benötigt ein Argument\n" #: lib/getopt.c:621 #, c-format @@ -97,11 +98,11 @@ msgstr "%s: Die Option benötigt ein Argument -- »%c«\n" #. If you don't know what to put here, please see #. #. and use glyphs suitable for your language. -#: lib/quotearg.c:362 +#: lib/quotearg.c:355 msgid "`" msgstr "»" -#: lib/quotearg.c:363 +#: lib/quotearg.c:356 msgid "'" msgstr "«" @@ -134,9 +135,8 @@ msgid "Invalid back reference" msgstr "Ungültige Zurück-Referenz" #: lib/regcomp.c:156 -#, fuzzy msgid "Unmatched [, [^, [:, [., or [=" -msgstr "Nicht gefunden: [ oder [^" +msgstr "Nicht gefunden: [, [^, [:, [., oder [=" #: lib/regcomp.c:159 msgid "Unmatched ( or \\(" @@ -217,19 +217,16 @@ msgstr "(C)" #. 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" -"Lizenz GPLv3+: GNU GPL Version 3 oder neuer \n" +"Lizenz GPLv3+: GNU GPL Version 3 oder neuer <%s>\n" "Dies ist freie Software: Es ist Ihnen freigestellt, sie zu verändern und zu " "verbreiten.\n" "Es gibt in dem gesetzlichen gegebenen Umfang KEINE GARANTIE.\n" -"\n" #. TRANSLATORS: %s denotes an author name. #: lib/version-etc.c:105 @@ -342,11 +339,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" -"Melden Sie Fehler an: %s\n" +msgstr "Melden Sie Fehler an: %s\n" #: lib/version-etc.c:251 #, c-format @@ -359,40 +354,25 @@ msgid "%s home page: <%s>\n" msgstr "Webseite von %s: <%s>\n" #: lib/version-etc.c:260 -#, fuzzy, c-format +#, c-format msgid "General help using GNU software: <%s>\n" -msgstr "Allgemeine Hilfe zu GNU-Software: \n" +msgstr "Allgemeine Hilfe zu GNU-Software: <%s>\n" #: lib/xalloc-die.c:34 msgid "memory exhausted" msgstr "Speicher erschöpft" -#: lib/xstrtol-error.c:63 -#, c-format -msgid "invalid %s%s argument '%s'" -msgstr "Ungültiges %s%s-Argument »%s«" - -#: lib/xstrtol-error.c:68 -#, c-format -msgid "invalid suffix in %s%s argument '%s'" -msgstr "Ungültiges Suffix im %s%s-Argument »%s«" - -#: lib/xstrtol-error.c:72 -#, c-format -msgid "%s%s argument '%s' too large" -msgstr "%s%s Argument »%s« zu groß" - -#: libparted/arch/beos.c:245 +#: libparted/arch/beos.c:246 msgid "Disk Image" msgstr "Speicherabbild" -#: libparted/arch/beos.c:346 libparted/arch/gnu.c:277 +#: libparted/arch/beos.c:347 libparted/arch/gnu.c:277 #: libparted/arch/linux.c:1731 #, c-format msgid "Error opening %s: %s" msgstr "Fehler beim Öffnen von %s: %s" -#: libparted/arch/beos.c:357 libparted/arch/gnu.c:287 +#: libparted/arch/beos.c:358 libparted/arch/gnu.c:287 #: libparted/arch/linux.c:1742 #, c-format msgid "Unable to open %s read-write (%s). %s has been opened read-only." @@ -400,48 +380,48 @@ msgstr "" "%s kann nicht zum Schreiben geöffnet werden (%s). %s wurde nur lesbar " "geöffnet." -#: libparted/arch/beos.c:419 libparted/arch/linux.c:1907 +#: libparted/arch/beos.c:420 libparted/arch/linux.c:1907 #, c-format msgid "%s during seek for read on %s" msgstr "%s, während %s zum Lesen positioniert wurde" -#: libparted/arch/beos.c:452 libparted/arch/gnu.c:465 libparted/arch/gnu.c:564 -#: libparted/arch/gnu.c:692 libparted/arch/linux.c:1867 +#: libparted/arch/beos.c:453 libparted/arch/gnu.c:425 libparted/arch/gnu.c:524 +#: libparted/arch/gnu.c:652 libparted/arch/linux.c:1867 #: libparted/arch/linux.c:1949 #, c-format msgid "%s during read on %s" msgstr "%s, während von %s gelesen wurde" -#: libparted/arch/beos.c:488 libparted/arch/gnu.c:525 +#: libparted/arch/beos.c:489 libparted/arch/gnu.c:485 #: libparted/arch/linux.c:2026 #, c-format msgid "Can't write to %s, because it is opened read-only." msgstr "" "Auf %s kann nicht geschrieben werden, weil es nur-lesend geöffnet wurde." -#: libparted/arch/beos.c:504 libparted/arch/linux.c:2051 +#: libparted/arch/beos.c:505 libparted/arch/linux.c:2051 #, c-format msgid "%s during seek for write on %s" msgstr "%s, während %s zum Schreiben positioniert wurde" -#: libparted/arch/beos.c:541 libparted/arch/gnu.c:601 libparted/arch/gnu.c:646 -#: libparted/arch/gnu.c:723 libparted/arch/linux.c:1999 +#: libparted/arch/beos.c:542 libparted/arch/gnu.c:561 libparted/arch/gnu.c:606 +#: libparted/arch/gnu.c:683 libparted/arch/linux.c:1999 #: libparted/arch/linux.c:2094 libparted/arch/linux.c:2167 #, c-format msgid "%s during write on %s" msgstr "%s, während auf %s geschrieben wurde" -#: partprobe/partprobe.c:148 +#: partprobe/partprobe.c:149 #, c-format msgid "Try `%s --help' for more information.\n" msgstr "Rufen Sie »%s --help« auf, um mehr Informationen zu erhalten.\n" -#: partprobe/partprobe.c:152 +#: partprobe/partprobe.c:153 #, c-format msgid "Usage: %s [OPTION] [DEVICE]...\n" msgstr "Aufruf: %s [OPTION] [GERÄT] …\n" -#: partprobe/partprobe.c:153 +#: partprobe/partprobe.c:154 msgid "" "Inform the operating system about partition table changes.\n" "\n" @@ -457,7 +437,7 @@ msgstr "" " -h, --help diese Hilfe anzeigen und beenden\n" " -v, --version Versionsangaben ausgeben und beenden\n" -#: partprobe/partprobe.c:161 +#: partprobe/partprobe.c:162 msgid "" "\n" "When no DEVICE is given, probe all partitions.\n" @@ -465,7 +445,7 @@ msgstr "" "\n" "Ohne GERÄT, alle Partitionen testen.\n" -#: partprobe/partprobe.c:165 +#: partprobe/partprobe.c:166 #, c-format msgid "" "\n" @@ -483,43 +463,7 @@ msgstr "%s kann nicht geöffnet werden." msgid "Unable to probe store." msgstr "Der Speicher konnte nicht untersucht werden." -#: libparted/arch/gnu.c:368 -msgid "" -"The partition table cannot be re-read. This means you need to reboot before " -"mounting any modified partitions. You also need to reinstall your boot " -"loader before you reboot (which may require mounting modified partitions). " -"It is impossible do both things! So you'll need to boot off a rescue disk, " -"and reinstall your boot loader from the rescue disk. Read section 4 of the " -"Parted User documentation for more information." -msgstr "" -"Die Partitionstabelle konnte nicht neu gelesen werden. Sie müssen also den " -"Rechner neu hochfahren, bevor Sie geänderte Partitionen einhängen. Sie " -"müssen auch Ihren Bootlader vor dem Booten neu installieren (was u.U. das " -"Einhängen geänderter Partitionen erfordert). Man kann nicht beides tun! Also " -"müssen Sie von einer Rettungsdiskette booten und Ihren Bootlader von dort " -"neu installieren. Lesen Sie Abschnitt 4 der Benutzerdokumentation von Parted " -"für mehr Informationen." - -#: libparted/arch/gnu.c:385 -#, 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 computer " -"before doing anything with %s." -msgstr "" -"Die Partitionstabelle auf %s konnte nicht neu eingelesen werden (%s). Das " -"bedeutet, dass das Hurd nichts über Ihre Änderungen weiß. Sie sollten den " -"Computer neu starten, bevor Sie irgend etwas mit %s machen." - -#: libparted/arch/gnu.c:396 parted/parted.c:2318 -msgid "" -"You should reinstall your boot loader before rebooting. Read section 4 of " -"the Parted User documentation for more information." -msgstr "" -"Vor einem Neustart sollten Sie Ihren Bootlader neu installieren. Lesen Sie " -"den Abschnitt 4 der Benutzerdokumentation von Parted für mehr Informationen." - -#: libparted/arch/gnu.c:788 +#: libparted/arch/gnu.c:748 #, c-format msgid "%s trying to sync %s to disk" msgstr "%s beim Versuch, %s auf die Platte zu speichern (sync)" @@ -609,9 +553,8 @@ msgid "Generic SD/MMC Storage Card" msgstr "Generisch SD/MMC-Speicherkarte" #: libparted/arch/linux.c:1422 -#, fuzzy msgid "NVMe Device" -msgstr "Neues Gerät?" +msgstr "NVMe-Gerät" #: libparted/arch/linux.c:1483 msgid "DAC960 RAID controller" @@ -639,7 +582,7 @@ msgstr "Compaq Smart Array" #: libparted/arch/linux.c:1520 msgid "NVDIMM Device" -msgstr "" +msgstr "NVDIMM-Gerät" #: libparted/arch/linux.c:1525 msgid "ATARAID Controller" @@ -680,7 +623,7 @@ msgstr "Linux Software-RAID-Verbund" #: libparted/arch/linux.c:1588 msgid "RAM Drive" -msgstr "" +msgstr "RAM-Gerät" #: libparted/arch/linux.c:1595 msgid "ped_device_new() Unsupported device type" @@ -844,15 +787,15 @@ msgstr "Metadaten" msgid "free" msgstr "frei" -#: libparted/disk.c:2355 parted/ui.c:1258 parted/ui.c:1286 +#: libparted/disk.c:2355 parted/ui.c:1259 parted/ui.c:1287 msgid "extended" msgstr "erweitert" -#: libparted/disk.c:2357 parted/ui.c:1262 parted/ui.c:1290 +#: libparted/disk.c:2357 parted/ui.c:1263 parted/ui.c:1291 msgid "logical" msgstr "logisch" -#: libparted/disk.c:2359 parted/ui.c:1254 parted/ui.c:1282 +#: libparted/disk.c:2359 parted/ui.c:1255 parted/ui.c:1283 msgid "primary" msgstr "primär" @@ -928,64 +871,72 @@ msgstr "irst" msgid "esp" msgstr "esp" -#: libparted/disk.c:2415 +#: libparted/disk.c:2411 +msgid "chromeos_kernel" +msgstr "chromeos_kernel" + +#: libparted/disk.c:2413 +msgid "bls_boot" +msgstr "bls_boot" + +#: libparted/disk.c:2419 #, c-format msgid "Unknown partition flag, %d." msgstr "Unbekanntes Partitionsflag %d." -#: libparted/exception.c:78 +#: libparted/exception.c:79 msgid "Information" msgstr "Information" -#: libparted/exception.c:79 +#: libparted/exception.c:80 msgid "Warning" msgstr "Warnung" -#: libparted/exception.c:80 +#: libparted/exception.c:81 msgid "Error" msgstr "Fehler" -#: libparted/exception.c:81 +#: libparted/exception.c:82 msgid "Fatal" msgstr "Fataler Fehler" -#: libparted/exception.c:82 +#: libparted/exception.c:83 msgid "Bug" msgstr "Bug" -#: libparted/exception.c:83 +#: libparted/exception.c:84 msgid "No Implementation" msgstr "Keine Implementierung" -#: libparted/exception.c:87 +#: libparted/exception.c:88 msgid "Fix" msgstr "Fix" -#: libparted/exception.c:88 +#: libparted/exception.c:89 msgid "Yes" msgstr "Ja" -#: libparted/exception.c:89 +#: libparted/exception.c:90 msgid "No" msgstr "Nein" -#: libparted/exception.c:90 +#: libparted/exception.c:91 msgid "OK" msgstr "OK" -#: libparted/exception.c:91 +#: libparted/exception.c:92 msgid "Retry" msgstr "Wiederholen" -#: libparted/exception.c:92 +#: libparted/exception.c:93 msgid "Ignore" msgstr "Ignorieren" -#: libparted/exception.c:93 +#: libparted/exception.c:94 msgid "Cancel" msgstr "Abbrechen" -#: libparted/exception.c:133 +#: libparted/exception.c:134 #, c-format msgid "" "A bug has been detected in GNU Parted. Refer to the web site of parted " @@ -998,33 +949,33 @@ msgstr "" "einen Fehlerbericht sein könnte. Bitte senden Sie einen Fehlerbericht an %s " "unter Angabe der Version (%s) und der folgenden Meldung: " -#: libparted/labels/aix.c:91 +#: libparted/labels/aix.c:92 msgid "Support for reading AIX disk labels is is not implemented yet." msgstr "" "Unterstützung für das Lesen von AIX-Partitionstabellen ist noch nicht " "implementiert." -#: libparted/labels/aix.c:102 +#: libparted/labels/aix.c:103 msgid "Support for writing AIX disk labels is is not implemented yet." msgstr "" "Unterstützung für das Schreiben von AIX-Partitionstabellen ist noch nicht " "implementiert." -#: libparted/labels/aix.c:115 +#: libparted/labels/aix.c:116 msgid "" "Support for adding partitions to AIX disk labels is not implemented yet." msgstr "" "Unterstützung für das Hinzufügen von Partitionen zu AIX-Partitionstabellen " "ist noch nicht implementiert." -#: libparted/labels/aix.c:125 +#: libparted/labels/aix.c:126 msgid "" "Support for duplicating partitions in AIX disk labels is not implemented yet." msgstr "" "Unterstützung für das Duplizieren von Partitionen in AIX-Partitionstabellen " "ist noch nicht implementiert." -#: libparted/labels/aix.c:143 +#: libparted/labels/aix.c:144 msgid "" "Support for setting system type of partitions in AIX disk labels is not " "implemented yet." @@ -1032,42 +983,48 @@ msgstr "" "Unterstützung für das Setzen des Systemtyps von Partitionen in AIX-" "Partitionstabellen ist noch nicht implementiert." -#: libparted/labels/aix.c:153 +#: libparted/labels/aix.c:154 msgid "Support for setting flags in AIX disk labels is not implemented yet." msgstr "" "Unterstützung für das Setzen von Flags in AIX-Partitionstabellen ist noch " "nicht implementiert." #: libparted/labels/atari.c:273 -#, 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 kann das HFS-Dateisystem nicht auf Festplatten mit einer Sektorgröße " -"ungleich %d Bytes verwenden." +"Atari-Partitionstabellen auf Festplatten mit einer Sektorgröße ungleich %d " +"Bytes können nicht verwendet werden." #: libparted/labels/atari.c:285 #, c-format msgid "Can't use Atari partition tables on disks with more than %d sectors." msgstr "" +"Atari-Partitionstabellen auf Festplatten mit mehr als %d Sektoren können " +"nicht verwendet werden." #: libparted/labels/atari.c:398 msgid "" "Too many Atari partitions detected. Maybe there is a loop in the XGM linked " "list. Aborting." msgstr "" +"Es wurden zu viele Atari-Partitionen erkannt. Möglicherweise ist eine " +"Schleife in der XGM-Linkliste. Abbruch." #: libparted/labels/atari.c:596 #, c-format msgid "No data partition found in the ARS at sector %lli." -msgstr "" +msgstr "Keine Datenpartition gefunden im ARS bei Sektor %lli." #: libparted/labels/atari.c:617 #, c-format msgid "" "The entry of the next logical ARS is not of type XGM in ARS at sector %lli." msgstr "" +"Der Eintrag des nächsten logischen ARS ist nicht vom Typ XGM im ARS bei " +"Sektor %lli." #: libparted/labels/atari.c:648 #, c-format @@ -1075,31 +1032,36 @@ msgid "" "There doesn't seem to be an Atari partition table on this disk (%s), or it " "is corrupted." msgstr "" +"Die Partitionstabelle auf dieser Festplatte (%s) scheint keine Atari-" +"Partitionstabelle zu sein, oder sie ist beschädigt." #: libparted/labels/atari.c:878 #, c-format msgid "No room at sector %lli to store ARS of logical partition %d." msgstr "" +"Kein Platz bei Sektor %lli zum Speichern des ARS der logischen Partition %d." #: libparted/labels/atari.c:885 #, c-format msgid "No room at sector %lli to store ARS." -msgstr "" +msgstr "Kein Platz bei Sektor %lli zum Speichern des ARS." #: libparted/labels/atari.c:962 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 "" +"Die in der Partitionstabelle gespeicherte Sektorenanzahl entspricht nicht " +"der Größe Ihres Gerätes. Wollen Sie die Partitionstabelle korrigieren?" #: libparted/labels/atari.c:1003 #, c-format msgid "No room at sector %lli to store BSL." -msgstr "" +msgstr "Kein Platz bei Sektor %lli zum Speichern des BSL." #: libparted/labels/atari.c:1111 msgid "There were remaining partitions after filling the main AHDI table." -msgstr "" +msgstr "Nach dem Füllen der Haupt-AHDI-Tabelle waren Partitionen übrig." #: libparted/labels/atari.c:1130 msgid "" @@ -1107,14 +1069,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 "" +"Die Haupt-AHDI-Tabelle wurde mit allen Partitionen gefüllt, aber die ICD-" +"Tabelle ist nicht leer, so dass weitere Partitionen unbekannter Größe und " +"Position von ICD-kompatibler Software erkannt werden. Wollen Sie die ICD-" +"Tabelle ungültig machen?" #: libparted/labels/atari.c:1164 msgid "ICD entries can't contain extended or logical partitions." -msgstr "" +msgstr "ICD-Einträge können erweiterte oder logische Partitionen enthalten." #: libparted/labels/atari.c:1186 msgid "There were remaining partitions after filling the tables." -msgstr "" +msgstr "Nach dem Füllen der Tabellen waren Partitionen übrig." #: libparted/labels/atari.c:1226 #, c-format @@ -1122,12 +1088,15 @@ 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 "" +"Sie können eine erweiterte XGM-Partition nicht im ICD-Modus verwenden (mehr " +"als %d primäre Partitionen; falls XGM die erste Partition ist, zählt sie " +"doppelt)." -#: libparted/labels/atari.c:1657 libparted/labels/bsd.c:567 -#: libparted/labels/dasd.c:894 libparted/labels/dos.c:2276 -#: libparted/labels/dvh.c:770 libparted/labels/gpt.c:2050 -#: libparted/labels/loop.c:243 libparted/labels/mac.c:1423 -#: libparted/labels/pc98.c:701 libparted/labels/rdb.c:1054 +#: libparted/labels/atari.c:1657 libparted/labels/bsd.c:563 +#: libparted/labels/dasd.c:895 libparted/labels/dos.c:2283 +#: libparted/labels/dvh.c:770 libparted/labels/gpt.c:2140 +#: 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 "Es können nicht alle Anforderungen an die Partition erfüllt werden." @@ -1138,51 +1107,55 @@ 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 "" +"Sie können nicht mehr als %d primäre Partition (ICD-Modus) verwenden, wenn " +"Sie eine erweiterte XGM-Partition verwenden. Falls XGM die erste Partition " +"ist, zählt sie doppelt." #: libparted/labels/atari.c:1823 libparted/labels/rdb.c:1082 msgid "Unable to allocate a partition number." msgstr "Die Partitionsnummer konnte nicht zugewiesen werden." -#: libparted/labels/bsd.c:592 +#: libparted/labels/bsd.c:588 msgid "Unable to allocate a bsd disklabel slot." msgstr "BSD-Disklabel-Zeilen können nicht belegt werden." -#: libparted/labels/dasd.c:625 +#: libparted/labels/dasd.c:626 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:920 +#: libparted/labels/dasd.c:921 msgid "Unable to allocate a dasd disklabel slot" msgstr "dasd-Disklabel-Zeilen können nicht belegt werden" -#: libparted/labels/dos.c:1003 +#: libparted/labels/dos.c:1006 #, c-format msgid "Invalid partition table on %s -- wrong signature %x." msgstr "Ungültige Partitionstabelle auf %s -- falsche Signatur %x." -#: libparted/labels/dos.c:1031 +#: libparted/labels/dos.c:1034 #, c-format msgid "Invalid partition table - recursive partition on %s." msgstr "Ungültige Partitionstabelle - Rekursive Partition auf %s." -#: libparted/labels/dos.c:1560 +#: libparted/labels/dos.c:1557 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:1572 -#, fuzzy +#: libparted/labels/dos.c:1569 msgid "Extended partitions cannot be recovery partitions on msdos disk labels." msgstr "" -"Erweiterte Partitionen können in MS-DOS-Disk-Labels nicht versteckt werden." +"Erweiterte Partitionen können in MS-DOS-Disk-Labels keine " +"Wiederherstellungspartitionen sein." -#: libparted/labels/dos.c:2258 +#: libparted/labels/dos.c:2265 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:2514 +#: libparted/labels/dos.c:2521 msgid "cannot create any more partitions" msgstr "Es können keine weiteren Partitionen erzeugt werden." @@ -1279,7 +1252,7 @@ msgstr "Das angegebene Gerät ist kein gültiges DASD-Gerät" #: libparted/labels/fdasd.c:188 msgid "VOLSER not found on device" -msgstr "" +msgstr "VOLSER wurde auf dem Gerät nicht gefunden" #: libparted/labels/fdasd.c:191 libparted/labels/vtoc.c:179 msgid "Fatal error" @@ -1310,9 +1283,8 @@ msgstr "" "überein!" #: libparted/labels/fdasd.c:1020 -#, fuzzy msgid "Could not retrieve disk size." -msgstr "Die Festplatteninformationen konnten nicht gelesen werden." +msgstr "Die Festplattengröße konnte nicht ermittelt werden." #: libparted/labels/fdasd.c:1029 msgid "Could not retrieve disk geometry information." @@ -1325,12 +1297,13 @@ msgstr "Die Blöckgröße konnte nicht gelesen werden." #: libparted/labels/fdasd.c:1045 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:531 +#: libparted/labels/gpt.c:541 msgid "device is too small for GPT" msgstr "Gerät ist für GPT zu klein" -#: libparted/labels/gpt.c:733 +#: libparted/labels/gpt.c:743 #, c-format msgid "" "The format of the GPT partition table is version %x, which is newer than " @@ -1339,7 +1312,7 @@ msgstr "" "Das Format der GPT-Partitionstabelle (%x) ist neuer als das von Parted " "verstandene. Bitte melden Sie das." -#: libparted/labels/gpt.c:769 +#: libparted/labels/gpt.c:779 #, c-format msgid "" "Not all of the space available to %s appears to be used, you can fix the GPT " @@ -1350,7 +1323,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:1008 +#: libparted/labels/gpt.c:1024 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)?" @@ -1359,7 +1332,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:1026 +#: libparted/labels/gpt.c:1042 msgid "" "Both the primary and backup GPT tables are corrupt. Try making a fresh " "table, and using Parted's rescue feature to recover partitions." @@ -1368,7 +1341,7 @@ msgstr "" "Sie, eine neue Tabelle anzulegen und die Partititionen mit Hilfe von " "Parted's Rettungsmöglichkeiten zu restaurieren." -#: libparted/labels/gpt.c:1037 +#: libparted/labels/gpt.c:1053 msgid "" "The backup GPT table is corrupt, but the primary appears OK, so that will be " "used." @@ -1376,7 +1349,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:1049 +#: libparted/labels/gpt.c:1065 msgid "" "The primary GPT table is corrupt, but the backup appears OK, so that will be " "used." @@ -1384,11 +1357,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:1073 +#: libparted/labels/gpt.c:1089 msgid "primary partition table array CRC mismatch" msgstr "Array der primären Partitionstabelle und CRC stimmen nicht überein" -#: libparted/labels/gpt.c:1936 libparted/labels/gpt.c:1963 +#: libparted/labels/gpt.c:2026 libparted/labels/gpt.c:2053 msgid "failed to translate partition name" msgstr "Der Partitionsname konnte nicht übersetzt werden." @@ -1421,18 +1394,14 @@ msgid "The data region doesn't start at the start of the partition." msgstr "Die Datenregion beginnt nicht am Anfang der Partition." #: libparted/labels/mac.c:572 -msgid "The boot region doesn't start at the start of the partition." -msgstr "Die Bootregion beginnt nicht am Anfang der Partition." - -#: libparted/labels/mac.c:586 msgid "The partition's boot region doesn't occupy the entire partition." msgstr "Die Bootregion der Partition belegt nicht die ganze Partition." -#: libparted/labels/mac.c:597 +#: libparted/labels/mac.c:583 msgid "The partition's data region doesn't occupy the entire partition." msgstr "Die Datenregion der Partition belegt nicht die ganze Partition." -#: libparted/labels/mac.c:649 +#: libparted/labels/mac.c:635 #, c-format msgid "" "Weird block size on device descriptor: %d bytes is not divisible by 512." @@ -1440,7 +1409,7 @@ msgstr "" "Seltsame Blockgröße auf dem Gerätedeskriptor: %d Bytes ist nicht durch 512 " "teilbar." -#: libparted/labels/mac.c:662 +#: libparted/labels/mac.c:648 #, c-format msgid "" "The driver descriptor says the physical block size is %d bytes, but Linux " @@ -1449,11 +1418,11 @@ msgstr "" "Der Treiberdeskriptor sagt, dass die physische Blockgröße %d Bytes ist. " "Linux sagt, dass es %d Bytes sind." -#: libparted/labels/mac.c:715 +#: libparted/labels/mac.c:701 msgid "No valid partition map found." msgstr "Keine gültige Partitionskarte gefunden." -#: libparted/labels/mac.c:789 +#: libparted/labels/mac.c:775 #, c-format msgid "" "Conflicting partition map entry sizes! Entry 1 says it is %d, but entry %d " @@ -1462,11 +1431,11 @@ msgstr "" "Widersprüchliche Größen in den Partitionskarteneinträgen! Eintrag 1 sagt, " "dass es %d Bytes sind, Eintrag %d sagt aber, dass es %d Bytes sind!" -#: libparted/labels/mac.c:820 +#: libparted/labels/mac.c:806 msgid "Weird! There are 2 partitions map entries!" msgstr "Seltsam! Es gibt 2 Partitionskarteneinträge!" -#: libparted/labels/mac.c:1359 +#: libparted/labels/mac.c:1345 msgid "" "Changing the name of a root or swap partition will prevent Linux from " "recognising it as such." @@ -1474,18 +1443,18 @@ msgstr "" "Eine Änderung des Namens der Root- oder Swap-Partition verhindert, dass " "Linux sie als solche erkennt." -#: libparted/labels/mac.c:1458 +#: libparted/labels/mac.c:1444 msgid "Can't add another partition -- the partition map is too small!" msgstr "" "Eine weitere Partition kann nicht hinzugefügt werden -- die Partitionskarte " "ist zu klein!" -#: libparted/labels/pc98.c:284 +#: libparted/labels/pc98.c:285 #, c-format msgid "Invalid partition table on %s." msgstr "Ungültige Partitionstabelle auf %s." -#: libparted/labels/pc98.c:337 libparted/labels/pc98.c:415 +#: libparted/labels/pc98.c:338 libparted/labels/pc98.c:416 #, c-format msgid "" "Partition %d isn't aligned to cylinder boundaries. This is still " @@ -1494,7 +1463,7 @@ msgstr "" "Partition %d ist nicht an den Zylindergrenzen ausgerichtet. Dies wird immer " "noch nicht unterstützt." -#: libparted/labels/pc98.c:733 +#: libparted/labels/pc98.c:729 msgid "Can't add another partition." msgstr "Es kann keine weitere Partition hinzugefügt werden." @@ -1672,40 +1641,40 @@ msgstr "VTOC FMT7 DSCB kann nicht geschrieben werden." msgid "Could not write VTOC FMT9 DSCB." msgstr "VTOC FMT9 DSCB kann nicht geschrieben werden." -#: libparted/libparted.c:242 +#: libparted/libparted.c:247 msgid "Out of memory." msgstr "Speicher erschöpft." -#: libparted/unit.c:139 +#: libparted/unit.c:140 msgid "Cannot get unit size for special unit 'COMPACT'." msgstr "" "Die Größe der speziellen Einheit »COMPACT« konnte nicht ermittelt werden." -#: libparted/unit.c:385 +#: libparted/unit.c:386 #, c-format msgid "\"%s\" has invalid syntax for locations." msgstr "»%s« hat eine ungültige Syntax für Orte." -#: libparted/unit.c:393 +#: libparted/unit.c:394 #, c-format msgid "The maximum head value is %d." msgstr "Die maximale Zahl der Köpfe ist %d." -#: libparted/unit.c:400 +#: libparted/unit.c:401 #, c-format msgid "The maximum sector value is %d." msgstr "Die maximale Zahl der Sektoren ist %d." -#: libparted/unit.c:412 libparted/unit.c:564 +#: libparted/unit.c:413 libparted/unit.c:565 #, c-format msgid "The location %s is outside of the device %s." msgstr "Der Ort %s ist außerhalb des Geräts %s." -#: libparted/unit.c:526 +#: libparted/unit.c:527 msgid "Invalid number." msgstr "Ungültige Nummer." -#: libparted/unit.c:532 +#: libparted/unit.c:533 msgid "Use a smaller unit instead of a value < 1" msgstr "Verwenden Sie eine kleinere Einheit anstelle eines Wertes < 1." @@ -1715,18 +1684,18 @@ msgstr "Verwenden Sie eine kleinere Einheit anstelle eines Wertes < 1." msgid "%s : Failed to allocate partition block\n" msgstr "%s : Der Partitionsblock konnte nicht belegt werden\n" -#: libparted/fs/amiga/affs.c:79 libparted/fs/amiga/apfs.c:71 +#: 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 : Der Block konnte nicht belegt werden\n" -#: libparted/fs/amiga/affs.c:84 libparted/fs/amiga/apfs.c:76 +#: 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 : Der Boot-Block %llu konnte nicht gelesen werden\n" -#: libparted/fs/amiga/affs.c:98 libparted/fs/amiga/apfs.c:87 +#: 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" @@ -1752,24 +1721,24 @@ msgstr "%s : Falsche Prüfsumme bei Block %llu vom Typ %s\n" msgid "%s : Couldn't write block %d\n" msgstr "%s : Block %d konnte nicht geschrieben werden\n" -#: libparted/fs/amiga/amiga.c:278 +#: libparted/fs/amiga/amiga.c:279 #, c-format msgid "%s : Failed to allocate disk_specific rdb block\n" msgstr "" "%s : Der Festplatten-spezifische rdb-Block konnte nicht belegt werden\n" -#: libparted/fs/amiga/amiga.c:289 +#: libparted/fs/amiga/amiga.c:290 #, c-format msgid "%s : Didn't find rdb block, should never happen\n" msgstr "" "%s : rdb-Block konnte nicht gefunden werden. Das sollte niemals passieren\n" -#: libparted/fs/amiga/amiga.c:318 +#: libparted/fs/amiga/amiga.c:319 #, c-format msgid "%s : Failed to read partition block %llu\n" msgstr "%s : Der Partitionsblock %llu kann nicht gelesen werden\n" -#: libparted/fs/fat/fat.c:148 libparted/fs/r/fat/fat.c:811 +#: libparted/fs/fat/fat.c:149 msgid "" "GNU Parted was miscompiled: the FAT boot sector should be 512 bytes. FAT " "support will be disabled." @@ -1868,7 +1837,7 @@ msgstr "" "Reparieren auswählen, wird die CHS-Geometrie des Dateisystems so gesetzt, " "dass sie mit der CHS-Geometrie der Partitionstabelle übereinstimmt." -#: libparted/fs/r/fat/bootsector.c:399 +#: libparted/fs/r/fat/bootsector.c:398 #, c-format msgid "" "The information sector has the wrong signature (%x). Select cancel for now, " @@ -1893,14 +1862,14 @@ msgid "" "Cluster start delta = %d, which is not a multiple of the cluster size %d." msgstr "Clusteranfang delta = %d ist kein Vielfaches der Clustergröße %d." -#: libparted/fs/r/fat/count.c:144 +#: libparted/fs/r/fat/count.c:84 #, c-format msgid "Bad directory entry for %s: first cluster is the end of file marker." msgstr "" "Falscher Verzeichniseintrag für %s: Erster Cluster ist am Ende des " "Dateimarkers." -#: libparted/fs/r/fat/count.c:157 +#: libparted/fs/r/fat/count.c:97 #, c-format msgid "" "Bad FAT: unterminated chain for %s. You should run dosfsck or scandisk." @@ -1908,7 +1877,7 @@ msgstr "" "Schlechte FAT: unbeendete Kette für %s. Sie sollten dosfsck oder Scandisk " "ausführen." -#: libparted/fs/r/fat/count.c:166 +#: libparted/fs/r/fat/count.c:106 #, c-format msgid "" "Bad FAT: cluster %d outside file system in chain for %s. You should run " @@ -1917,7 +1886,7 @@ msgstr "" "Schlechte FAT: Cluster %d ist außerhalb des Dateisystems in Kette %s. Sie " "sollten dosfsck oder Scandisk ausführen." -#: libparted/fs/r/fat/count.c:176 +#: libparted/fs/r/fat/count.c:116 #, c-format msgid "" "Bad FAT: cluster %d is cross-linked for %s. You should run dosfsck or " @@ -1926,26 +1895,17 @@ msgstr "" "Schlechte FAT: Cluster %d ist querverbunden für %s. Sie sollten dosfsck oder " "Scandisk ausführen." -#: libparted/fs/r/fat/count.c:195 +#: libparted/fs/r/fat/count.c:135 #, c-format msgid "%s is %dk, but it has %d clusters (%dk)." msgstr "%s ist %dk, hat aber %d Cluster (%dk)." -#: libparted/fs/r/fat/count.c:258 -#, c-format -msgid "" -"The file %s is marked as a system file. This means moving it could cause " -"some programs to stop working." -msgstr "" -"Die Datei %s ist als Systemdatei markiert. Das bedeutet, dass nach dem " -"Verschieben einige Programme nicht mehr funktionieren könnten." - -#: libparted/fs/r/fat/fat.c:243 +#: libparted/fs/r/fat/fat.c:244 #, c-format msgid "Partition too big/small for a %s file system." msgstr "Die Partition ist für ein %s-Dateisystem zu groß/klein." -#: libparted/fs/r/fat/fat.c:409 +#: 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." @@ -1954,11 +1914,11 @@ msgstr "" "brechen Sie ab, rufen Scandisk für das Dateisystem auf und versuchen es noch " "einmal." -#: libparted/fs/r/fat/fat.c:449 +#: libparted/fs/r/fat/fat.c:450 msgid "There are no possible configurations for this FAT type." msgstr "Es gibt keine möglichen Konfigurationen für diesen FAT-Typ." -#: libparted/fs/r/fat/fat.c:461 +#: libparted/fs/r/fat/fat.c:462 #, c-format msgid "" "File system doesn't have expected sizes for Windows to like it. Cluster " @@ -1969,13 +1929,13 @@ msgstr "" "%dk (%dk erwartet); die Clusterzahl ist %d (%d erwartet); die FAT-Größe ist " "%d Sektoren (%d erwartet)." -#: libparted/fs/r/fat/fat.c:484 +#: libparted/fs/r/fat/fat.c:485 #, c-format msgid "" "File system is reporting the free space as %d clusters, not %d clusters." msgstr "Dateisystem meldet freien Platz als %d Cluster, nicht %d Cluster." -#: libparted/fs/r/fat/resize.c:158 +#: 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." @@ -1983,16 +1943,16 @@ msgstr "" "Es gibt im Root-Verzeichnis nicht genügend Platz für alle Dateien. Entweder " "abbrechen, oder ignorieren und die Dateien verlieren." -#: libparted/fs/r/fat/resize.c:302 +#: libparted/fs/r/fat/resize.c:303 msgid "Error writing to the root directory." msgstr "Fehler beim Schreiben in das Root-Verzeichnis." -#: libparted/fs/r/fat/resize.c:495 +#: libparted/fs/r/fat/resize.c:479 msgid "If you leave your file system as FAT16, then you will have no problems." msgstr "" "Wenn Sie Ihr Dateisystem als FAT16 belassen, werden Sie keine Probleme haben." -#: libparted/fs/r/fat/resize.c:498 +#: 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 " @@ -2003,7 +1963,7 @@ msgstr "" "Sie das tun wollen, sollten Sie das Handbuch von Parted lesen (oder das " "Handbuch Ihrer Distribution)." -#: libparted/fs/r/fat/resize.c:506 +#: libparted/fs/r/fat/resize.c:490 msgid "" "If you leave your file system as FAT32, then you will not introduce any new " "problems." @@ -2011,7 +1971,7 @@ msgstr "" "Wenn Sie Ihr Dateisystem als FAT32 belassen, werden Sie keine neuen Probleme " "herbeiführen." -#: libparted/fs/r/fat/resize.c:510 +#: 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 " @@ -2026,42 +1986,42 @@ msgstr "" "Dateisystem nicht mehr von MS-DOS, MS-Windows 95a und MS-Windows NT gelesen " "werden." -#: libparted/fs/r/fat/resize.c:524 +#: libparted/fs/r/fat/resize.c:508 #, c-format msgid "%s %s %s" msgstr "%s %s %s" -#: libparted/fs/r/fat/resize.c:525 +#: libparted/fs/r/fat/resize.c:509 msgid "Would you like to use FAT32?" msgstr "Wollen Sie FAT32 verwenden?" -#: libparted/fs/r/fat/resize.c:556 libparted/fs/r/fat/resize.c:572 +#: 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:557 +#: libparted/fs/r/fat/resize.c:541 msgid "" "The file system can only be resized to this size by converting to FAT16." msgstr "" "Das Dateisystem kann nur durch Konvertierung zu FAT16 in der Größe verändert " "werden." -#: libparted/fs/r/fat/resize.c:573 +#: libparted/fs/r/fat/resize.c:557 msgid "" "The file system can only be resized to this size by converting to FAT32." msgstr "" "Das Dateisystem kann nur durch Konvertierung zu FAT32 in der Größe verändert " "werden." -#: libparted/fs/r/fat/resize.c:586 +#: 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 kann diese Partition nicht auf diese Größe verändern. Wir " "arbeiten daran!" -#: libparted/fs/r/fat/table.c:136 +#: 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 " @@ -2070,41 +2030,41 @@ msgstr "" "FAT %d Medium %x stimmt nicht mit dem Bootsektor von Medium %x überein. Sie " "sollten Scandisk ausführen." -#: libparted/fs/r/fat/table.c:268 +#: libparted/fs/r/fat/table.c:269 #, c-format msgid "fat_table_set: cluster %ld outside file system" msgstr "fat_table_set: Cluster %ld ist außerhalb des Dateisystems" -#: libparted/fs/r/fat/table.c:300 +#: libparted/fs/r/fat/table.c:301 #, c-format msgid "fat_table_get: cluster %ld outside file system" msgstr "fat_table_get: Cluster %ld ist außerhalb des Dateisystems" -#: libparted/fs/r/fat/table.c:342 +#: libparted/fs/r/fat/table.c:343 msgid "fat_table_alloc_cluster: no free clusters" msgstr "fat_table_alloc_cluster: Keine freien Cluster" -#: libparted/fs/r/filesys.c:151 +#: libparted/fs/r/filesys.c:152 msgid "Could not detect file system." msgstr "Dateisystem wurde nicht erkannt." -#: libparted/fs/r/filesys.c:158 libparted/fs/r/filesys.c:285 +#: libparted/fs/r/filesys.c:159 libparted/fs/r/filesys.c:284 #, c-format msgid "resizing %s file systems is not supported" msgstr "Größenänderung von %s-Dateisystemen ist noch nicht implementiert." -#: libparted/fs/r/filesys.c:170 +#: libparted/fs/r/filesys.c:171 msgid "The file system is bigger than its volume!" msgstr "Das Dateisystem ist größer als sein Datenträger!" -#: libparted/fs/r/hfs/advfs.c:121 libparted/fs/r/hfs/advfs_plus.c:121 -#: libparted/fs/r/hfs/reloc.c:413 libparted/fs/r/hfs/reloc.c:507 -#: libparted/fs/r/hfs/reloc_plus.c:538 libparted/fs/r/hfs/reloc_plus.c:656 -#: libparted/fs/r/hfs/reloc_plus.c:769 +#: 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 "Das Dateisystem enthält Fehler." -#: libparted/fs/r/hfs/advfs_plus.c:285 +#: libparted/fs/r/hfs/advfs_plus.c:287 msgid "Bad blocks could not be read." msgstr "Fehlerhafte Blöcke konnten nicht gelesen werden." @@ -2119,12 +2079,12 @@ msgstr "" "Dateisystem überprüfen!" #: 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 "" -"Es wurde versucht, einen erweiterten Block von 0x%X nach 0X%X zu " +"Es wurde versucht, einen erweiterten Block von 0x%X nach 0x%X zu " "verschieben, aber ein anderer existiert bereits an dieser Stelle. Das sollte " "nicht passieren!" @@ -2178,67 +2138,67 @@ msgid "Trying to write HFS+ file with CNID %X behind EOF." msgstr "" "Die HFS+-Datei mit der CNID %X kann nicht hinter dem Ende geschrieben werden." -#: libparted/fs/r/hfs/hfs.c:232 +#: libparted/fs/r/hfs/hfs.c:212 msgid "Sorry, HFS cannot be resized that way yet." msgstr "Entschuldigung, HFS kann so noch nicht in der Größe verändert werden." -#: libparted/fs/r/hfs/hfs.c:250 libparted/fs/r/hfs/hfs.c:629 +#: libparted/fs/r/hfs/hfs.c:230 libparted/fs/r/hfs/hfs.c:573 msgid "shrinking" msgstr "verkleinern" -#: libparted/fs/r/hfs/hfs.c:262 libparted/fs/r/hfs/hfs.c:641 +#: libparted/fs/r/hfs/hfs.c:242 libparted/fs/r/hfs/hfs.c:585 msgid "Data relocation has failed." msgstr "Die Umlagerung der Daten ist fehlgeschlagen." -#: libparted/fs/r/hfs/hfs.c:281 +#: libparted/fs/r/hfs/hfs.c:261 msgid "Data relocation left some data in the end of the volume." msgstr "" "Die Umlagerung der Daten hat einige Daten am Ende des Datenträgers " "hinterlassen." -#: libparted/fs/r/hfs/hfs.c:320 +#: libparted/fs/r/hfs/hfs.c:300 msgid "writing HFS Master Directory Block" msgstr "Schreiben des HFS Master Directory Block" -#: libparted/fs/r/hfs/hfs.c:468 +#: libparted/fs/r/hfs/hfs.c:412 msgid "No valid HFS[+X] signature has been found while opening." msgstr "Beim Öffnen wurde keine gültige HFS[+X]-Signatur gefunden." -#: libparted/fs/r/hfs/hfs.c:478 +#: libparted/fs/r/hfs/hfs.c:422 #, c-format msgid "Version %d of HFS+ isn't supported." msgstr "Die HFS+-Version %d ist nicht unterstützt." -#: libparted/fs/r/hfs/hfs.c:489 +#: libparted/fs/r/hfs/hfs.c:433 #, c-format msgid "Version %d of HFSX isn't supported." msgstr "Die HFSX-Version %d ist nicht unterstützt." -#: libparted/fs/r/hfs/hfs.c:672 +#: libparted/fs/r/hfs/hfs.c:616 msgid "Data relocation left some data at the end of the volume." msgstr "" "Die Umlagerung der Daten hat einige Daten am Ende des Datenträgers " "hinterlassen." -#: libparted/fs/r/hfs/hfs.c:720 +#: libparted/fs/r/hfs/hfs.c:664 msgid "Error while writing the allocation file." msgstr "Fehler beim Schreiben der Belegungsdatei." -#: libparted/fs/r/hfs/hfs.c:735 +#: libparted/fs/r/hfs/hfs.c:679 msgid "Error while writing the compatibility part of the allocation file." msgstr "Fehler beim Schreiben des Kompatibilitätsteils der Belegungsdatei." -#: libparted/fs/r/hfs/hfs.c:750 +#: libparted/fs/r/hfs/hfs.c:694 msgid "writing HFS+ Volume Header" msgstr "Schreiben des HFS+-Datenträger-Kopfes" -#: libparted/fs/r/hfs/hfs.c:850 +#: libparted/fs/r/hfs/hfs.c:794 msgid "An error occurred while looking for the mandatory bad blocks file." msgstr "" "Beim Suchen nach der notwendigen Datei, die fehlerhafte Blöcke enthält, trat " "ein Fehler auf." -#: libparted/fs/r/hfs/hfs.c:904 +#: 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." @@ -2246,27 +2206,27 @@ msgstr "" "Es scheint, als wäre im HFS-Wrapper ein Fehler: die Datei der fehlerhaften " "Blöcke enthält nicht den eingebetteten HFS+-Datenträger." -#: libparted/fs/r/hfs/hfs.c:940 +#: libparted/fs/r/hfs/hfs.c:883 msgid "Sorry, HFS+ cannot be resized that way yet." msgstr "Entschuldigung, HFS+ kann so nicht in der Größe verändert werden." -#: libparted/fs/r/hfs/hfs.c:975 +#: libparted/fs/r/hfs/hfs.c:918 msgid "shrinking embedded HFS+ volume" msgstr "Verkleinern des eingebetteten HFS+-Datenträgers" -#: libparted/fs/r/hfs/hfs.c:992 +#: libparted/fs/r/hfs/hfs.c:935 msgid "Resizing the HFS+ volume has failed." msgstr "Verkleinern des HFS+-Datenträgers ist fehlgeschlagen." -#: libparted/fs/r/hfs/hfs.c:999 +#: libparted/fs/r/hfs/hfs.c:942 msgid "shrinking HFS wrapper" msgstr "Verkleinern des HFS-Wrappers" -#: libparted/fs/r/hfs/hfs.c:1008 +#: libparted/fs/r/hfs/hfs.c:951 msgid "Updating the HFS wrapper has failed." msgstr "Aktualisieren des HFS-Wrappers ist fehlgeschlagen." -#: libparted/fs/r/hfs/hfs.c:1110 libparted/fs/r/hfs/hfs.c:1195 +#: 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 " @@ -2288,7 +2248,6 @@ msgstr "" "(%i Bytes)." #: 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." @@ -2346,7 +2305,7 @@ msgstr "" msgid "An extent has not been relocated." msgstr "Eine Erweiterung wurde nicht umgelagert." -#: libparted/fs/r/hfs/reloc.c:250 libparted/fs/r/hfs/reloc_plus.c:307 +#: 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!" @@ -2354,17 +2313,17 @@ msgstr "" "Ein Verweis einer Erweiterung kam von einem Ort, von dem er nicht kommen " "sollte. Sie sollten das Dateisystem überprüfen lassen!" -#: libparted/fs/r/hfs/reloc.c:380 +#: libparted/fs/r/hfs/reloc.c:382 msgid "This HFS volume has no catalog file. This is very unusual!" msgstr "Dieser HFS-Datenträger hat keine Katalog-Datei. Das ist sehr unüblich!" -#: libparted/fs/r/hfs/reloc.c:474 +#: libparted/fs/r/hfs/reloc.c:479 msgid "This HFS volume has no extents overflow file. This is quite unusual!" msgstr "" "Dieser HFS-Datenträger hat keine Überlaufdatei für Erweiterungen. Das ist " "schon ungewöhnlich!" -#: libparted/fs/r/hfs/reloc.c:516 libparted/fs/r/hfs/reloc_plus.c:666 +#: 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." @@ -2372,54 +2331,54 @@ msgstr "" "Die Überlaufdatei der Erweiterungen sollte nicht seine eigenen Erweiterungen " "enthalten! Sie sollten das Dateisystem überprüfen lassen." -#: libparted/fs/r/hfs/reloc.c:573 libparted/fs/r/hfs/reloc_plus.c:844 +#: 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 "Das Dateisystem konnte nicht zwischengespeichert werden." -#: libparted/fs/r/hfs/reloc.c:634 libparted/fs/r/hfs/reloc_plus.c:905 +#: libparted/fs/r/hfs/reloc.c:640 libparted/fs/r/hfs/reloc_plus.c:910 msgid "Bad blocks list could not be loaded." msgstr "Die Liste der schlechten Blöcke konnte nicht geladen werden." -#: libparted/fs/r/hfs/reloc.c:648 libparted/fs/r/hfs/reloc_plus.c:921 +#: libparted/fs/r/hfs/reloc.c:654 libparted/fs/r/hfs/reloc_plus.c:926 msgid "An error occurred during extent relocation." msgstr "Während der Umlagerung der Erweiterungen trat ein Fehler auf." -#: libparted/fs/r/hfs/reloc_plus.c:494 +#: libparted/fs/r/hfs/reloc_plus.c:495 msgid "This HFS+ volume has no catalog file. This is very unusual!" msgstr "" "Dieser HFS+-Datenträger hat keine Katalog-Datei. Das ist sehr ungewöhnlich!" -#: libparted/fs/r/hfs/reloc_plus.c:617 +#: libparted/fs/r/hfs/reloc_plus.c:620 msgid "This HFS+ volume has no extents overflow file. This is quite unusual!" msgstr "" "Dieser HFS-Datenträger hat keine Überlaufdatei für Erweiterungen. Das ist " "schon ungewöhnlich!" -#: parted/parted.c:125 +#: parted/parted.c:126 msgid "displays this help message" msgstr "zeigt diese Hilfe" -#: parted/parted.c:126 +#: parted/parted.c:127 msgid "lists partition layout on all block devices" msgstr "zeigt das Partitionslayout aller blockorientierten Geräte" -#: parted/parted.c:127 +#: parted/parted.c:128 msgid "displays machine parseable output" msgstr "zeigt maschinenlesbare Ausgaben" -#: parted/parted.c:128 +#: parted/parted.c:129 msgid "never prompts for user intervention" msgstr "bittet nie um Eingriff des Benutzers" -#: parted/parted.c:129 +#: parted/parted.c:130 msgid "displays the version" msgstr "zeigt die Version" -#: parted/parted.c:130 +#: parted/parted.c:131 msgid "alignment for new partitions" msgstr "Ausrichtung für neue Partitionen" -#: parted/parted.c:142 +#: parted/parted.c:143 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" @@ -2428,31 +2387,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:145 +#: parted/parted.c:146 msgid "LABEL-TYPE is one of: " msgstr "LABEL-TYP ist eines von: " -#: parted/parted.c:146 parted/parted.c:147 +#: parted/parted.c:147 parted/parted.c:148 msgid "FLAG is one of: " msgstr "FLAG ist eines von: " -#: parted/parted.c:148 +#: parted/parted.c:149 msgid "UNIT is one of: " msgstr "EINHEIT ist eines von: " -#: parted/parted.c:149 +#: parted/parted.c:150 msgid "desired alignment: minimum or optimal" msgstr "Gewünschte Ausrichtung: minimum oder optimal" -#: parted/parted.c:150 +#: parted/parted.c:151 msgid "PART-TYPE is one of: primary, logical, extended\n" msgstr "PART-TYP ist eines von: primär, logisch, erweitert\n" -#: parted/parted.c:152 +#: parted/parted.c:153 msgid "FS-TYPE is one of: " msgstr "FS-TYP ist eines von: " -#: parted/parted.c:153 +#: parted/parted.c:154 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 " @@ -2462,7 +2421,7 @@ msgstr "" "Werte zählen vom Ende der Festplatte aus. Beispielsweise steht -1s für genau " "den letzen Sektor.\n" -#: parted/parted.c:156 +#: parted/parted.c:157 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" @@ -2471,19 +2430,19 @@ msgstr "" "zählen vom Ende der Festplatte aus. Beispielsweise steht -1s für genau den " "letzten Sektor.\n" -#: parted/parted.c:159 +#: parted/parted.c:160 msgid "STATE is one of: on, off\n" msgstr "STATUS ist eines von: an, aus\n" -#: parted/parted.c:160 +#: parted/parted.c:161 msgid "DEVICE is usually /dev/hda or /dev/sda\n" msgstr "GERÄT ist normalerweise /dev/hda oder /dev/sda\n" -#: parted/parted.c:161 +#: parted/parted.c:162 msgid "NAME is any word you want\n" msgstr "NAME ist ein beliebiges Wort Ihrer Wahl\n" -#: parted/parted.c:164 +#: parted/parted.c:165 msgid "" "Copyright (C) 1998 - 2006 Free Software Foundation, Inc.\n" "This program is free software, covered by the GNU General Public License.\n" @@ -2504,24 +2463,24 @@ msgstr "" "\"GNU General Public License\" können weitere Einzelheiten nachgelesen\n" "werden.\n" -#: parted/parted.c:212 +#: parted/parted.c:213 #, c-format msgid "%0.f%%\t(time left %.2d:%.2d)" msgstr "%0.f%%\t(Restzeit %.2d:%.2d)" -#: parted/parted.c:231 +#: parted/parted.c:232 #, 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:252 +#: parted/parted.c:253 #, c-format msgid "Partition(s) on %s are being used." msgstr "Partition(en) auf %s werden verwendet." -#: parted/parted.c:264 +#: parted/parted.c:265 #, c-format msgid "" "The existing disk label on %s will be destroyed and all data on this disk " @@ -2530,31 +2489,31 @@ msgstr "" "Die bestehende Partitionstabelle und alle Daten auf %s werden gelöscht. " "Wollen Sie fortfahren?" -#: parted/parted.c:525 +#: parted/parted.c:526 msgid "New disk label type?" msgstr "Neuer Disk-Label-Typ?" -#: parted/parted.c:662 +#: parted/parted.c:663 msgid "Partition type?" msgstr "Partitionstyp?" -#: parted/parted.c:680 parted/parted.c:884 +#: parted/parted.c:681 parted/parted.c:885 msgid "Partition name?" msgstr "Partitionsname?" -#: parted/parted.c:690 +#: parted/parted.c:691 msgid "File system type?" msgstr "Dateisystemtyp?" -#: parted/parted.c:695 parted/parted.c:1498 +#: parted/parted.c:696 parted/parted.c:1499 msgid "Start?" msgstr "Anfang?" -#: parted/parted.c:698 parted/parted.c:1500 parted/parted.c:1569 +#: parted/parted.c:699 parted/parted.c:1501 parted/parted.c:1585 msgid "End?" msgstr "Ende?" -#: parted/parted.c:766 +#: parted/parted.c:767 #, c-format msgid "" "You requested a partition from %s to %s (sectors %llu..%llu).\n" @@ -2564,7 +2523,7 @@ msgstr "" "Das Beste, was Parted bieten kann, ist von %s nach %s (Sektoren %llu..%llu)." "%s" -#: parted/parted.c:775 +#: parted/parted.c:776 msgid "" "\n" "Is this still acceptable to you?" @@ -2572,96 +2531,97 @@ msgstr "" "\n" "Ist dies noch akzeptabel für Sie?" -#: parted/parted.c:798 -#, fuzzy, c-format +#: parted/parted.c:799 +#, c-format msgid "" "The resulting partition is not properly aligned for best performance: %s" msgstr "" -"Die Partition ist nicht sauber ausgerichtet, gemessen an bester Performance." +"Die Partition ist nicht sauber ausgerichtet, gemessen an bester Performance: " +"%s" -#: parted/parted.c:800 parted/parted.c:1723 +#: parted/parted.c:801 parted/parted.c:1739 msgid "unknown (malloc failed)" -msgstr "" +msgstr "unbekannt (»malloc« fehlgeschlagen)" -#: parted/parted.c:876 -#, fuzzy, c-format +#: parted/parted.c:877 +#, c-format msgid "%s disk labels do not support partition name." -msgstr "%s-Disk-Labels unterstützen keine erweiterten Partitionen." +msgstr "%s-Disk-Labels unterstützen keine Partitionsnamen." -#: parted/parted.c:881 parted/parted.c:1561 parted/parted.c:1612 -#: parted/parted.c:1706 parted/parted.c:1781 +#: parted/parted.c:882 parted/parted.c:1564 parted/parted.c:1628 +#: parted/parted.c:1722 parted/parted.c:1797 msgid "Partition number?" msgstr "Partitionsnummer?" -#: parted/parted.c:975 +#: parted/parted.c:976 #, 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:1017 +#: parted/parted.c:1018 #, c-format msgid "Model: %s (%s)\n" msgstr "Modell: %s (%s)\n" -#: parted/parted.c:1019 +#: parted/parted.c:1020 #, c-format msgid "Disk %s: %s\n" msgstr "Festplatte %s: %s\n" -#: parted/parted.c:1020 +#: parted/parted.c:1021 #, c-format msgid "Sector size (logical/physical): %lldB/%lldB\n" msgstr "Sektorgröße (logisch/physisch): %lldB/%lldB\n" -#: parted/parted.c:1032 +#: parted/parted.c:1033 #, c-format msgid "Partition Table: %s\n" msgstr "Partitionstabelle: %s\n" -#: parted/parted.c:1033 +#: parted/parted.c:1034 #, c-format msgid "Disk Flags: %s\n" msgstr "Disk-Flags: %s\n" -#: parted/parted.c:1153 parted/parted.c:1156 +#: parted/parted.c:1154 parted/parted.c:1157 msgid "Number" msgstr "Nummer" -#: parted/parted.c:1153 parted/parted.c:1156 +#: parted/parted.c:1154 parted/parted.c:1157 msgid "Start" msgstr "Anfang" -#: parted/parted.c:1154 parted/parted.c:1157 +#: parted/parted.c:1155 parted/parted.c:1158 msgid "End" msgstr "Ende" -#: parted/parted.c:1157 +#: parted/parted.c:1158 msgid "Size" msgstr "Größe" -#: parted/parted.c:1161 +#: parted/parted.c:1162 msgid "Type" msgstr "Typ" -#: parted/parted.c:1163 +#: parted/parted.c:1164 msgid "File system" msgstr "Dateisystem" -#: parted/parted.c:1166 +#: parted/parted.c:1167 msgid "Name" msgstr "Name" -#: parted/parted.c:1168 +#: parted/parted.c:1169 msgid "Flags" msgstr "Flags" -#: parted/parted.c:1225 +#: parted/parted.c:1226 msgid "Free Space" msgstr "Freier Platz" -#: parted/parted.c:1385 +#: parted/parted.c:1386 #, c-format msgid "" "A %s %s partition was found at %s -> %s. Do you want to add it to the " @@ -2670,84 +2630,83 @@ msgstr "" "Eine %s %s-Partition wurde bei %s -> %s gefunden. Wollen Sie diese Partition " "zur Partitionstabelle hinzufügen?" -#: parted/parted.c:1428 +#: parted/parted.c:1429 msgid "searching for file systems" msgstr "Suche nach Dateisystemen" -#: parted/parted.c:1535 +#: parted/parted.c:1536 msgid "The resize command has been removed in parted 3.0" msgstr "Der resize-Befehl wurde in parted 3.0 entfernt." -#: parted/parted.c:1583 +#: parted/parted.c:1599 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:1636 +#: parted/parted.c:1652 msgid "New device?" msgstr "Neues Gerät?" -#: parted/parted.c:1704 +#: parted/parted.c:1720 msgid "alignment type(min/opt)" msgstr "Ausrichtungstyp (min/opt)" -#: parted/parted.c:1719 +#: parted/parted.c:1735 #, c-format msgid "%d aligned\n" msgstr "%d ausgerichtet\n" -#: parted/parted.c:1721 -#, fuzzy, c-format +#: parted/parted.c:1737 +#, c-format msgid "%d not aligned: %s\n" -msgstr "%d nicht ausgerichtet\n" +msgstr "%d nicht ausgerichtet: %s\n" -#: parted/parted.c:1746 parted/parted.c:1783 +#: parted/parted.c:1762 parted/parted.c:1799 msgid "Flag to Invert?" msgstr "Umzukehrendes Flag?" -#: parted/parted.c:1751 parted/parted.c:1788 +#: parted/parted.c:1767 parted/parted.c:1804 msgid "New state?" msgstr "Neuer Zustand?" -#: parted/parted.c:1834 +#: parted/parted.c:1850 msgid "Unit?" msgstr "Einheit?" -#: parted/parted.c:1969 +#: parted/parted.c:1985 msgid "align-check" msgstr "align-check" -#: parted/parted.c:1972 -#, fuzzy +#: parted/parted.c:1988 msgid "" "align-check TYPE N check partition N for TYPE(min|opt) " "alignment" msgstr "" -"align-check TYP N Partition N auf TYP (min|opt) der " +"align-check TYP N Partition N auf TYP (min|opt) der " "Ausrichtung prüfen" -#: parted/parted.c:1980 +#: parted/parted.c:1996 msgid "help" msgstr "help" -#: parted/parted.c:1983 +#: parted/parted.c:1999 msgid "" "help [COMMAND] print general help, or help on " "COMMAND" msgstr "" "help [BEFEHL] Allgemeine Hilfe, oder Hilfe zu BEFEHL" -#: parted/parted.c:1989 +#: parted/parted.c:2005 msgid "mklabel" msgstr "mklabel" -#: parted/parted.c:1989 +#: parted/parted.c:2005 msgid "mktable" msgstr "mktable" -#: parted/parted.c:1992 +#: parted/parted.c:2008 msgid "" "mklabel,mktable LABEL-TYPE create a new disklabel (partition " "table)" @@ -2755,15 +2714,15 @@ msgstr "" "mklabel,mktable LABEL-TYP Neues Disklabel (Partitionstabelle) " "erzeugen" -#: parted/parted.c:1998 +#: parted/parted.c:2014 msgid "mkpart" msgstr "mkpart" -#: parted/parted.c:2001 +#: parted/parted.c:2017 msgid "mkpart PART-TYPE [FS-TYPE] START END make a partition" msgstr "mkpart PART-TYP [FS-TYP] ANFANG ENDE Partition erzeugen" -#: parted/parted.c:2007 +#: parted/parted.c:2023 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" @@ -2772,20 +2731,20 @@ msgstr "" "Partition zu erzeugen. FS-TYP kann angegeben werden, um eine geeignete " "Partitions-ID zu setzen.\n" -#: parted/parted.c:2012 +#: parted/parted.c:2028 msgid "name" msgstr "name" -#: parted/parted.c:2015 +#: parted/parted.c:2031 msgid "name NUMBER NAME name partition NUMBER as NAME" msgstr "" "name NUMMER NAME Partition NUMMER mit NAME benennen" -#: parted/parted.c:2020 +#: parted/parted.c:2036 msgid "print" msgstr "print" -#: parted/parted.c:2023 +#: parted/parted.c:2039 msgid "" "print [devices|free|list,all|NUMBER] display the partition table, " "available devices, free space, all found partitions, or a particular " @@ -2795,7 +2754,7 @@ msgstr "" "Geräte, freien Speicher, alle Paritionen oder eine bestimmte Partition " "anzeigen" -#: parted/parted.c:2028 +#: parted/parted.c:2044 msgid "" "Without arguments, 'print' displays the entire partition table. However with " "the following arguments it performs various other actions.\n" @@ -2803,11 +2762,11 @@ msgstr "" "Ohne Argumente zeigt »print« die komplette Partitionstabelle an. Mit den " "folgenden Argumenten verrichtet es die zahlreichen anderen Aktionen.\n" -#: parted/parted.c:2030 +#: parted/parted.c:2046 msgid " devices : display all active block devices\n" msgstr " devices : zeigt alle aktiven blockorientierten Geräte an\n" -#: parted/parted.c:2031 +#: parted/parted.c:2047 msgid "" " free : display information about free unpartitioned space on the " "current block device\n" @@ -2816,33 +2775,33 @@ msgstr "" "dem\n" " aktuellen blockorientierten Gerät an\n" -#: parted/parted.c:2033 +#: parted/parted.c:2049 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:2034 +#: parted/parted.c:2050 msgid "" " NUMBER : display more detailed information about this particular " "partition\n" msgstr "" " NUMMER : zeigt detailliertere Informationen über diese Partition an\n" -#: parted/parted.c:2039 +#: parted/parted.c:2055 msgid "quit" msgstr "quit" -#: parted/parted.c:2042 +#: parted/parted.c:2058 msgid "quit exit program" msgstr "quit Programm beenden" -#: parted/parted.c:2047 +#: parted/parted.c:2063 msgid "rescue" msgstr "rescue" -#: parted/parted.c:2050 +#: parted/parted.c:2066 msgid "" "rescue START END rescue a lost partition near START " "and END" @@ -2850,56 +2809,56 @@ msgstr "" "rescue ANFANG ENDE Eine verlorene Partitionen zwischen " "ANFANG und ENDE retten" -#: parted/parted.c:2056 +#: parted/parted.c:2072 msgid "resize" msgstr "resize" -#: parted/parted.c:2059 +#: parted/parted.c:2075 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:2062 +#: parted/parted.c:2078 msgid "resizepart" msgstr "resizepart" -#: parted/parted.c:2065 +#: parted/parted.c:2081 msgid "resizepart NUMBER END resize partition NUMBER" msgstr "" "resizepart NUMMER ENDE Größe der Partition NUMMER ändern" -#: parted/parted.c:2070 +#: parted/parted.c:2086 msgid "rm" msgstr "rm" -#: parted/parted.c:2073 +#: parted/parted.c:2089 msgid "rm NUMBER delete partition NUMBER" msgstr "rm NUMMER Partition NUMMER löschen" -#: parted/parted.c:2078 +#: parted/parted.c:2094 msgid "select" msgstr "select" -#: parted/parted.c:2081 +#: parted/parted.c:2097 msgid "select DEVICE choose the device to edit" msgstr "" "select GERÄT Wählen Sie ein GERÄT zur Bearbeitung" -#: parted/parted.c:2086 +#: parted/parted.c:2102 msgid "disk_set" msgstr "disk_set" -#: parted/parted.c:2089 +#: parted/parted.c:2105 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:2094 +#: parted/parted.c:2110 msgid "disk_toggle" msgstr "disk_toggle" -#: parted/parted.c:2097 +#: parted/parted.c:2113 msgid "" "disk_toggle [FLAG] toggle the state of FLAG on " "selected device" @@ -2907,22 +2866,22 @@ msgstr "" "disk_toggle [FLAG] Umschalten des FLAGs auf dem " "gewählten Gerät" -#: parted/parted.c:2103 +#: parted/parted.c:2119 msgid "set" msgstr "set" -#: parted/parted.c:2106 +#: parted/parted.c:2122 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:2112 +#: parted/parted.c:2128 msgid "toggle" msgstr "toggle" -#: parted/parted.c:2115 +#: parted/parted.c:2131 msgid "" "toggle [NUMBER [FLAG]] toggle the state of FLAG on " "partition NUMBER" @@ -2930,20 +2889,20 @@ msgstr "" "toggle [NUMMER [FLAG]] Umschalten des FLAGs von Partition " "NUMMER" -#: parted/parted.c:2121 +#: parted/parted.c:2137 msgid "unit" msgstr "unit" -#: parted/parted.c:2124 +#: parted/parted.c:2140 msgid "unit UNIT set the default unit to UNIT" msgstr "" "unit EINHEIT die Standardgröße auf EINHEIT setzen" -#: parted/parted.c:2129 +#: parted/parted.c:2145 msgid "version" msgstr "version" -#: parted/parted.c:2132 +#: parted/parted.c:2148 msgid "" "version display the version number and " "copyright information of GNU Parted" @@ -2952,7 +2911,7 @@ msgstr "" "Informationen\n" " von GNU Parted an" -#: parted/parted.c:2136 +#: parted/parted.c:2152 msgid "" "'version' displays copyright and version information corresponding to this " "copy of GNU Parted\n" @@ -2960,31 +2919,39 @@ msgstr "" "»version« zeigt die Versions- und Copyright-Informationen zu dieser Kopie " "von GNU Parted an\n" -#: parted/parted.c:2204 +#: parted/parted.c:2220 #, c-format msgid "Usage: %s [-hlmsv] [-a] [DEVICE [COMMAND [PARAMETERS]]...]\n" msgstr "Aufruf: %s [-hlmsv] [-a] [GERÄT [BEFEHL [PARAMETER]] …]\n" -#: parted/parted.c:2248 +#: parted/parted.c:2264 msgid "No device found" msgstr "Kein Gerät gefunden" -#: parted/parted.c:2285 +#: parted/parted.c:2301 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:2325 +#: parted/parted.c:2334 +msgid "" +"You should reinstall your boot loader before rebooting. Read section 4 of " +"the Parted User documentation for more information." +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:2341 msgid "You may need to update /etc/fstab.\n" msgstr "Möglicherweise müssen Sie /etc/fstab anpassen.\n" -#: parted/ui.c:164 +#: parted/ui.c:165 msgid "Welcome to GNU Parted! Type 'help' to view a list of commands.\n" msgstr "" "Willkommen zu GNU Parted! Rufen Sie »help« auf, um eine Liste der " "verfügbaren Befehle zu erhalten.\n" -#: parted/ui.c:167 +#: parted/ui.c:168 msgid "" "Usage: parted [OPTION]... [DEVICE [COMMAND [PARAMETERS]...]...]\n" "Apply COMMANDs with PARAMETERS to DEVICE. If no COMMAND(s) are given, run " @@ -2996,7 +2963,7 @@ msgstr "" "sind,\n" "interaktiv arbeiten.\n" -#: parted/ui.c:172 +#: parted/ui.c:173 #, c-format msgid "" "\n" @@ -3062,7 +3029,7 @@ msgstr "" "Nehmen Sie auch noch weitere Informationen über Ihr System auf, die Sie als " "wichtig empfinden.\n" -#: parted/ui.c:293 +#: parted/ui.c:294 msgid "" "\n" "Command History:\n" @@ -3070,7 +3037,7 @@ msgstr "" "\n" "Befehlsfolge:\n" -#: parted/ui.c:356 +#: parted/ui.c:357 msgid "" "\n" "Error: SEGV_MAPERR (Address not mapped to object)\n" @@ -3078,7 +3045,7 @@ msgstr "" "\n" "Fehler: SEGV_MAPERR (Adresse nicht an ein Objekt gebunden)\n" -#: parted/ui.c:362 +#: parted/ui.c:363 msgid "" "\n" "Error: SEGV_ACCERR (Invalid permissions for mapped object)\n" @@ -3086,7 +3053,7 @@ msgstr "" "\n" "Fehler: SEGV_ACCERR (Ungültige Berechtigung für gebundenes Objekt)\n" -#: parted/ui.c:367 +#: parted/ui.c:368 msgid "" "\n" "Error: A general SIGSEGV signal was encountered.\n" @@ -3094,7 +3061,7 @@ msgstr "" "\n" "Fehler: Ein generelles SIGSEGV-Signal wurde empfangen.\n" -#: parted/ui.c:391 +#: parted/ui.c:392 msgid "" "\n" "Error: FPE_INTDIV (Integer: divide by zero)" @@ -3102,7 +3069,7 @@ msgstr "" "\n" "Fehler: FPE_INTDIV (Ganzzahl: Division durch Null)" -#: parted/ui.c:396 +#: parted/ui.c:397 msgid "" "\n" "Error: FPE_INTOVF (Integer: overflow)" @@ -3110,7 +3077,7 @@ msgstr "" "\n" "Fehler: FPE_INTOVF (Ganzzahl: Überlauf)" -#: parted/ui.c:401 +#: parted/ui.c:402 msgid "" "\n" "Error: FPE_FLTDIV (Float: divide by zero)" @@ -3118,7 +3085,7 @@ msgstr "" "\n" "Fehler: FPE_FLTDIV (Fließkommazahl: Division durch Null)" -#: parted/ui.c:406 +#: parted/ui.c:407 msgid "" "\n" "Error: FPE_FLTOVF (Float: overflow)" @@ -3126,7 +3093,7 @@ msgstr "" "\n" "Fehler: FPE_FLTOVF (Fließkommazahl: Überlauf)" -#: parted/ui.c:411 +#: parted/ui.c:412 msgid "" "\n" "Error: FPE_FLTUND (Float: underflow)" @@ -3134,7 +3101,7 @@ msgstr "" "\n" "Fehler: FPE_FLTUND (Fließkommazahl: Unterlauf)" -#: parted/ui.c:416 +#: parted/ui.c:417 msgid "" "\n" "Error: FPE_FLTRES (Float: inexact result)" @@ -3142,7 +3109,7 @@ msgstr "" "\n" "Fehler: FPE_FLTRES (Fließkommazahl: ungenaues Ergebnis)" -#: parted/ui.c:421 +#: parted/ui.c:422 msgid "" "\n" "Error: FPE_FLTINV (Float: invalid operation)" @@ -3150,7 +3117,7 @@ msgstr "" "\n" "Fehler: FPE_FLTINV (Fließkommazahl: ungültige Operation)" -#: parted/ui.c:426 +#: parted/ui.c:427 msgid "" "\n" "Error: FPE_FLTSUB (Float: subscript out of range)" @@ -3158,7 +3125,7 @@ msgstr "" "\n" "Fehler: FPE_FLTSUB (Fließkommazahl: Index außerhalb des zulässigen Bereichs)" -#: parted/ui.c:431 +#: parted/ui.c:432 msgid "" "\n" "Error: A general SIGFPE signal was encountered." @@ -3166,7 +3133,7 @@ msgstr "" "\n" "Fehler: Ein generelles SIGFPE-Signal wurde empfangen." -#: parted/ui.c:455 +#: parted/ui.c:456 msgid "" "\n" "Error: ILL_ILLOPC (Illegal Opcode)" @@ -3174,7 +3141,7 @@ msgstr "" "\n" "Fehler: ILL_ILLOPC (Nicht erlaubter Opcode)" -#: parted/ui.c:460 +#: parted/ui.c:461 msgid "" "\n" "Error: ILL_ILLOPN (Illegal Operand)" @@ -3182,7 +3149,7 @@ msgstr "" "\n" "Fehler: ILL_ILLOPN (Nicht erlaubter Operand)" -#: parted/ui.c:465 +#: parted/ui.c:466 msgid "" "\n" "Error: ILL_ILLADR (Illegal addressing mode)" @@ -3190,7 +3157,7 @@ msgstr "" "\n" "Fehler: ILL_ILLADR (Nicht erlaubter Adressierungsmodus)" -#: parted/ui.c:470 +#: parted/ui.c:471 msgid "" "\n" "Error: ILL_ILLTRP (Illegal Trap)" @@ -3198,7 +3165,7 @@ msgstr "" "\n" "Fehler: ILL_ILLTRP (Nicht erlaubte Falle)" -#: parted/ui.c:475 +#: parted/ui.c:476 msgid "" "\n" "Error: ILL_PRVOPC (Privileged Opcode)" @@ -3206,7 +3173,7 @@ msgstr "" "\n" "Fehler: ILL_PRVOPC (Privilegierter Opcode)" -#: parted/ui.c:480 +#: parted/ui.c:481 msgid "" "\n" "Error: ILL_PRVREG (Privileged Register)" @@ -3214,7 +3181,7 @@ msgstr "" "\n" "Fehler: ILL_PRVREG (Privilegiertes Register)" -#: parted/ui.c:485 +#: parted/ui.c:486 msgid "" "\n" "Error: ILL_COPROC (Coprocessor Error)" @@ -3222,7 +3189,7 @@ msgstr "" "\n" "Fehler: ILL_COPROC (Coprozessor-Fehler)" -#: parted/ui.c:490 +#: parted/ui.c:491 msgid "" "\n" "Error: ILL_BADSTK (Internal Stack Error)" @@ -3230,7 +3197,7 @@ msgstr "" "\n" "Fehler: ILL_BADSTK (Interner Stack-Fehler)" -#: parted/ui.c:495 +#: parted/ui.c:496 msgid "" "\n" "Error: A general SIGILL signal was encountered." @@ -3238,69 +3205,69 @@ msgstr "" "\n" "Fehler: Ein generelles SIGILL-Signal wurde empfangen." -#: parted/ui.c:888 +#: parted/ui.c:889 #, c-format msgid "invalid token: %s" msgstr "Unbekanntes Zeichen: %s" -#: parted/ui.c:1069 +#: parted/ui.c:1070 msgid "Expecting a partition number." msgstr "Es wird eine Partitionsnummer erwartet." -#: parted/ui.c:1078 +#: parted/ui.c:1079 msgid "Partition doesn't exist." msgstr "Die Partition existiert nicht." -#: parted/ui.c:1098 +#: parted/ui.c:1099 msgid "Expecting a file system type." msgstr "Es wird ein Dateisystemtyp erwartet." -#: parted/ui.c:1105 +#: parted/ui.c:1106 #, c-format msgid "Unknown file system type \"%s\"." msgstr "Unbekannter Dateisystemtyp »%s«." -#: parted/ui.c:1126 +#: parted/ui.c:1127 msgid "Expecting a disk label type." msgstr "Es wird ein Disklabeltyp erwartet." -#: parted/ui.c:1157 parted/ui.c:1193 +#: parted/ui.c:1158 parted/ui.c:1194 msgid "No flags supported" -msgstr "" +msgstr "Keine Unterstützung für Flags" -#: parted/ui.c:1267 +#: parted/ui.c:1268 msgid "Can't create any more partitions." msgstr "Weitere Partitionen können nicht mehr erzeugt werden." -#: parted/ui.c:1277 +#: parted/ui.c:1278 msgid "Expecting a partition type." msgstr "Es wird ein Partitionstyp erwartet." -#: parted/ui.c:1426 +#: parted/ui.c:1427 msgid "on" msgstr "an" -#: parted/ui.c:1427 +#: parted/ui.c:1428 msgid "off" msgstr "aus" -#: parted/ui.c:1444 +#: parted/ui.c:1445 msgid "optimal" msgstr "optimal" -#: parted/ui.c:1445 +#: parted/ui.c:1446 msgid "minimal" msgstr "minimal" -#: parted/ui.c:1578 +#: parted/ui.c:1579 msgid "OPTIONs:" msgstr "OPTIONEN:" -#: parted/ui.c:1583 +#: parted/ui.c:1584 msgid "COMMANDs:" msgstr "BEFEHLE:" -#: parted/ui.c:1586 +#: parted/ui.c:1587 #, c-format msgid "" "\n" @@ -3309,58 +3276,11 @@ msgstr "" "\n" "Melden Sie Fehler an %s\n" -#: parted/ui.c:1593 +#: parted/ui.c:1594 #, c-format msgid "Using %s\n" msgstr "%s wird verwendet\n" -#: parted/ui.c:1673 +#: parted/ui.c:1674 msgid "This command does not make sense in non-interactive mode.\n" msgstr "Dieser Befehl ergibt im nicht-interaktiven Modus keinen Sinn.\n" - -#~ msgid "%s: option '--%s' doesn't allow an argument\n" -#~ msgstr "%s: Die Option »%s« erlaubt kein Argument\n" - -#~ msgid "%s: unrecognized option '--%s'\n" -#~ msgstr "%s: Unbekannte Option »--%s«\n" - -#~ msgid "%s: option '-W %s' doesn't allow an argument\n" -#~ msgstr "%s: Die Option »-W %s« erlaubt kein Argument\n" - -#~ msgid "%s: option '-W %s' requires an argument\n" -#~ msgstr "%s: Die Option »-W %s« benötigt ein Argument\n" - -#~ msgid "%s home page: \n" -#~ msgstr "Webseite von %s: \n" - -#~ 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." -#~ msgstr "" -#~ "Dieses Dateisystem hat eine logische Sektorgröße von %d. GNU Parted " -#~ "funktioniert mit anderen Sektorgrößen als 512 Bytes nicht richtig." - -#~ msgid "Failed to add partition %d (%s)" -#~ msgstr "Partition %d konnte nicht hinzugefügt werden (%s)" - -#~ msgid "" -#~ "parted was unable to re-read the partition table on %s (%s). This means " -#~ "Linux won't know anything about the modifications you made. " -#~ msgstr "" -#~ "Parted konnte die Partitionstabelle von %s nicht neu einlesen (%s). Das " -#~ "bedeutet, dass Linux bis zum Neustart nichts über Ihrer Modifikationen " -#~ "weiß. " - -#~ msgid "" -#~ "%s contains GPT signatures, indicating that it has a GPT table. However, " -#~ "it does not have a valid fake msdos partition table, as it should. " -#~ "Perhaps it was corrupted -- possibly by a program that doesn't understand " -#~ "GPT partition tables. Or perhaps you deleted the GPT table, and are now " -#~ "using an msdos partition table. Is this a GPT partition table?" -#~ msgstr "" -#~ "%s enthält GPT-Signaturen, die anzeigen, dass es eine GPT-Tabelle hat. Es " -#~ "ist jedoch keine gültige vorgetäuschte MSDOS-Partitionstabelle vorhanden, " -#~ "die erforderlich wäre. Vielleicht wurde diese zerstört -- eventuell durch " -#~ "ein Programm, das GPT-Partitionstabellen nicht versteht. Oder vielleicht " -#~ "haben Sie die GPT-Tabelle gelöscht, und verwenden jetzt eine MS-DOS-" -#~ "Partitions-Tabelle. Ist dies eine GPT-Partitionstabelle?" diff --git a/po/es.gmo b/po/es.gmo index 8432a33309ea3cd5353dde3e7c99d78e985be2f1..b7be4eaba308a946f95e08c800bc7d7cc9dfb3ec 100644 GIT binary patch delta 4639 zcmYk=3sjfo0mt#@FBf6n5Jgesj)@{dh-P^ED|kT(O%WYJkoSdYV&V;bnPF*Cv&dB{ zRw!ysZAogHZDX3LVQM+onLFF+l*>b=$63+Y&e^`d_kB9+J^lDR&-?%TKKB<+br*fr z%|7RE;ep!>*A>!-oD4Q5%4bY*C*3vXY*+98IpiaA9e;*5F$LQ&9h1V1iNzV%4_9CY z*5e4ggx#@IH)EnP0b`7DjGsaTH%c)XS72Yn zgL&9QoQG=YAm-qQ_!NfqFeU(B!cf{bJ1OLGV=s=vf1w)A=xIzmPQeMd4AsHosD?jB zKgLFSBQ3)O>UFk$6g6WvP#wFCBQd|1F}YZa;k0kAQYgY3s0ZZq_Ikb$)!;^Cs>~sz zZ{`AOioZaOq+^sZff$BC7=fQ+6yAe(k;ySpj4BD!Q3IU84@Xl}K|yXszH1I)7M{mq z4B|ued=8GrS5Y(d4-CUtddKRRbX0>msE(9l2V90naUG7rOg72@Tpr8(YwCA#Lk+az zaO@xFt?_)+T0V#DGxHbJh`&ZPa2qG%cQ_ZvvR<8WFJ8kVnCs);Gp$;}Yl(~+6PX4r z&FUn_>tQuFGPzM}ZALn4zQg_)!H(3_k49$Q6k;GQLyfQ!HN_iHr{hIzhYhHXH)0n& zhD@6I0M&sn9SZv5*BFAgP`kSg(=dtolm)1f)u4`B9gfD+I0ysT5bEe)RJ{cAu@>2P z=9>NdE~+CjY%F!m8AKtKf*Tr@dJSrmG~#x=gnlfixAFi^!<%>? z`Wg0PxC*t#H&B~-G_A3Z&1~GH&rt*MF^$PO|G^ZPMU&>>bqDprX-2L66&#GM zsF{hq*O>O$7qwSXQ4Qu{C@!*}SD*&C1{tF{h3e2P44{3}F@vLpVYnWbqk4D;HMQTP zHdhx~*XB#Y5FCwK^NFbMS6Ek~mZl1|8J|F%nrBfRe%{u%qoW7yvLEb2{lho$emshL z@NMMem~T-J>cvrMhta6d<4_&xYwJ@`4Hckfs@UG2V_k@9XK^O;uflR}=z(kO7uKOh zy1{<29@X$3)YR@rHGJ553~M;&Cs7?8Gt_HfK57OQqc-D8%)+;k17>awW&YVeCW0O0 z$84N{HK?_0LH3>b3f=Dw^UiNJCUgH`b$>;0oaNf&@E5Ld`sajH~x+4(QSIeuWHjL+neGH)XdCAeZCPB@hyzUKcS}f zdt8nF9KMSuumpRI^WKDyV;J>Q*bT2>hR*+26oR-BHQxIm9&b_~f_hLQ^QMtGxDemL zB8;QeskjzdCDVeMxsY6Mk35PY)VEk)Ks~P>SKtpAM*C*zB>t?zYMkt&5f+SRnWjAc z_`v^QDCV)S9k3ADE@lp@WA&)DzlxgbAFvnp&-eaL$i`sm<*1QYpl0q#bUIVmPoW(i z!*D!-(Rcv|VJqqZz3GjPQ#`6e1CecEhN5Pm5}8bM7`tE_Y7>SqP4vlRp*p+?wP%{A zGXHE~^9?sCmOu+sG0p-7yI+9OrC z1RdOl-=G?(dC2>%_6&woe*>fOJ=9*gh8g%Js-4JEcVLc*p`f)&MD=h02H;S8Kg-s~ zpc)#7?J?heUWg;8m!M{9I}X5CP|rD!>i9?Y^UJ7?Ty^UXy({w`+!@ugo~Q>!TN6+n z>}MT>df*V$_lBXCY$WP?rKpA%pa%2^>U)*ewdkX+YZUFfM@+lEH_=kCIo<06tLRTA zl66EI=nq8KJ09j4)Uqrm+BdqM@NnOjuh{a7c+{4EiOvar^sqNxvobU8Z!=Xdlkr4v zzW2xmQc1=UU0prgKfixPc|R#5^GFiW^{|I|#QGB)^AWX=?Hx{yd;ON5+2jbBL*mHe zL>uZf(R5ajy`-8nko(Ada)=xwFOj7rjJ!_{6J5M&-2L;kThsh==}6p5I5qAYtsm;T zLK57Pcf8^$pS1OZRx#F=fAN!hzoYy|Qb1ZrGx#`Q>$z<{tSwr3=B}CUJ3W;!xwBN^sv`Fg9p`Q&h@_L1#L*enwU`_y z7swQ%BlR1yi;N_?CXlscj4JjzfaN63);pq~tR~w@6d6Etog&YSrH&;~aJ( zMYcW+i*0#@m6xRZI#%^jdoRW+-X&S2yDD6}Jxrmso%R1PPocK92wxxpw!Q!#Bb`Y& z$tA1E8S>-x`i}*iL8g;u$$9cJ=|wWgt7JW?A^AjCFxjU@HD-gK_0(N`BYt4C92X=%v+0Gu=b9{>OV delta 6013 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 TyA\n" "Language-Team: Spanish \n" @@ -95,11 +95,11 @@ msgstr "" #. If you don't know what to put here, please see #. #. and use glyphs suitable for your language. -#: lib/quotearg.c:362 +#: lib/quotearg.c:355 msgid "`" msgstr "" -#: lib/quotearg.c:363 +#: lib/quotearg.c:356 msgid "'" msgstr "" @@ -340,33 +340,18 @@ msgstr "" msgid "memory exhausted" msgstr "" -#: lib/xstrtol-error.c:63 -#, c-format -msgid "invalid %s%s argument '%s'" -msgstr "" - -#: lib/xstrtol-error.c:68 -#, c-format -msgid "invalid suffix in %s%s argument '%s'" -msgstr "" - -#: lib/xstrtol-error.c:72 -#, c-format -msgid "%s%s argument '%s' too large" -msgstr "" - -#: libparted/arch/beos.c:245 +#: libparted/arch/beos.c:246 msgid "Disk Image" msgstr "" # o también "al abrir" -#: libparted/arch/beos.c:346 libparted/arch/gnu.c:277 +#: libparted/arch/beos.c:347 libparted/arch/gnu.c:277 #: libparted/arch/linux.c:1731 #, c-format msgid "Error opening %s: %s" msgstr "Error al abrir %s: %s" -#: libparted/arch/beos.c:357 libparted/arch/gnu.c:287 +#: libparted/arch/beos.c:358 libparted/arch/gnu.c:287 #: libparted/arch/linux.c:1742 #, c-format msgid "Unable to open %s read-write (%s). %s has been opened read-only." @@ -374,48 +359,48 @@ msgstr "" "No se puede abrir %s en modo lectura-escritura (%s). %s ha sido abierto en " "modo de sólo lectura." -#: libparted/arch/beos.c:419 libparted/arch/linux.c:1907 +#: libparted/arch/beos.c:420 libparted/arch/linux.c:1907 #, c-format msgid "%s during seek for read on %s" msgstr "%s durante la preparación para lectura en %s" -#: libparted/arch/beos.c:452 libparted/arch/gnu.c:465 libparted/arch/gnu.c:564 -#: libparted/arch/gnu.c:692 libparted/arch/linux.c:1867 +#: libparted/arch/beos.c:453 libparted/arch/gnu.c:425 libparted/arch/gnu.c:524 +#: libparted/arch/gnu.c:652 libparted/arch/linux.c:1867 #: libparted/arch/linux.c:1949 #, c-format msgid "%s during read on %s" msgstr "%s durante la lectura en %s" # para sólo lectura. -#: libparted/arch/beos.c:488 libparted/arch/gnu.c:525 +#: libparted/arch/beos.c:489 libparted/arch/gnu.c:485 #: libparted/arch/linux.c:2026 #, c-format msgid "Can't write to %s, because it is opened read-only." msgstr "No se puede escribir en %s, porque está abierto para sólo lectura." -#: libparted/arch/beos.c:504 libparted/arch/linux.c:2051 +#: libparted/arch/beos.c:505 libparted/arch/linux.c:2051 #, c-format msgid "%s during seek for write on %s" msgstr "%s durante la preparación para escribir en %s" -#: libparted/arch/beos.c:541 libparted/arch/gnu.c:601 libparted/arch/gnu.c:646 -#: libparted/arch/gnu.c:723 libparted/arch/linux.c:1999 +#: libparted/arch/beos.c:542 libparted/arch/gnu.c:561 libparted/arch/gnu.c:606 +#: libparted/arch/gnu.c:683 libparted/arch/linux.c:1999 #: libparted/arch/linux.c:2094 libparted/arch/linux.c:2167 #, c-format msgid "%s during write on %s" msgstr "%s durante la escritura en %s" -#: partprobe/partprobe.c:148 +#: partprobe/partprobe.c:149 #, c-format msgid "Try `%s --help' for more information.\n" msgstr "" -#: partprobe/partprobe.c:152 +#: partprobe/partprobe.c:153 #, c-format msgid "Usage: %s [OPTION] [DEVICE]...\n" msgstr "" -#: partprobe/partprobe.c:153 +#: partprobe/partprobe.c:154 msgid "" "Inform the operating system about partition table changes.\n" "\n" @@ -425,13 +410,13 @@ msgid "" " -v, --version output version information and exit\n" msgstr "" -#: partprobe/partprobe.c:161 +#: partprobe/partprobe.c:162 msgid "" "\n" "When no DEVICE is given, probe all partitions.\n" msgstr "" -#: partprobe/partprobe.c:165 +#: partprobe/partprobe.c:166 #, c-format msgid "" "\n" @@ -448,45 +433,7 @@ msgstr "No se puede abrir %s." msgid "Unable to probe store." msgstr "No se puede probar el guardar." -# cargador "de" aranque (no del) -#: libparted/arch/gnu.c:368 -msgid "" -"The partition table cannot be re-read. This means you need to reboot before " -"mounting any modified partitions. You also need to reinstall your boot " -"loader before you reboot (which may require mounting modified partitions). " -"It is impossible do both things! So you'll need to boot off a rescue disk, " -"and reinstall your boot loader from the rescue disk. Read section 4 of the " -"Parted User documentation for more information." -msgstr "" -"No se pudo releer la tabla de particiones, por lo tanto es necesario " -"reiniciar antes de montar alguna partición modificada. ¡También necesita " -"reinstalar su cargador de arranque antes de reiniciar (que puede requerir " -"montar las particiones modificadas). ¡Es imposible hacer ambas cosas! Así " -"que necesitará arrancar con un disco de rescate y reinstalar su cargador de " -"arranque desde el disco de rescate. Lea la sección 4 de la documentación " -"del Usuario de Parted para obtener más información." - -#: libparted/arch/gnu.c:385 -#, 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 computer " -"before doing anything with %s." -msgstr "" -"La tabla de particiones en %s no puede ser releida(%s). Esto significa que " -"Hurd (o Linux) no reconocerá las modificaciones que hizo. Debe reiniciar su " -"computadora antes de hacer nada con %s." - -# boot loader -> cargador de arranque. -#: libparted/arch/gnu.c:396 parted/parted.c:2318 -msgid "" -"You should reinstall your boot loader before rebooting. Read section 4 of " -"the Parted User documentation for more information." -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." - -#: libparted/arch/gnu.c:788 +#: libparted/arch/gnu.c:748 #, c-format msgid "%s trying to sync %s to disk" msgstr "%s intentando sincronizar %s al disco" @@ -804,15 +751,15 @@ msgstr "metadata" msgid "free" msgstr "libre" -#: libparted/disk.c:2355 parted/ui.c:1258 parted/ui.c:1286 +#: libparted/disk.c:2355 parted/ui.c:1259 parted/ui.c:1287 msgid "extended" msgstr "extendida" -#: libparted/disk.c:2357 parted/ui.c:1262 parted/ui.c:1290 +#: libparted/disk.c:2357 parted/ui.c:1263 parted/ui.c:1291 msgid "logical" msgstr "lógica" -#: libparted/disk.c:2359 parted/ui.c:1254 parted/ui.c:1282 +#: libparted/disk.c:2359 parted/ui.c:1255 parted/ui.c:1283 msgid "primary" msgstr "primaria" @@ -890,64 +837,73 @@ msgstr "" msgid "esp" msgstr "Sí" -#: libparted/disk.c:2415 +#: libparted/disk.c:2411 +msgid "chromeos_kernel" +msgstr "" + +#: libparted/disk.c:2413 +#, fuzzy +msgid "bls_boot" +msgstr "arranque" + +#: libparted/disk.c:2419 #, c-format msgid "Unknown partition flag, %d." msgstr "Modificador de particiones desconocido, %d." -#: libparted/exception.c:78 +#: libparted/exception.c:79 msgid "Information" msgstr "Información" -#: libparted/exception.c:79 +#: libparted/exception.c:80 msgid "Warning" msgstr "Aviso" -#: libparted/exception.c:80 +#: libparted/exception.c:81 msgid "Error" msgstr "Error" -#: libparted/exception.c:81 +#: libparted/exception.c:82 msgid "Fatal" msgstr "Fatal" -#: libparted/exception.c:82 +#: libparted/exception.c:83 msgid "Bug" msgstr "Bicho" -#: libparted/exception.c:83 +#: libparted/exception.c:84 msgid "No Implementation" msgstr "Sin Implementación" -#: libparted/exception.c:87 +#: libparted/exception.c:88 msgid "Fix" msgstr "Arreglar" -#: libparted/exception.c:88 +#: libparted/exception.c:89 msgid "Yes" msgstr "Sí" -#: libparted/exception.c:89 +#: libparted/exception.c:90 msgid "No" msgstr "No" -#: libparted/exception.c:90 +#: libparted/exception.c:91 msgid "OK" msgstr "De acuerdo" -#: libparted/exception.c:91 +#: libparted/exception.c:92 msgid "Retry" msgstr "Reintentar" -#: libparted/exception.c:92 +#: libparted/exception.c:93 msgid "Ignore" msgstr "Descartar" -#: libparted/exception.c:93 +#: libparted/exception.c:94 msgid "Cancel" msgstr "Cancelar" -#: libparted/exception.c:133 +#: libparted/exception.c:134 #, c-format msgid "" "A bug has been detected in GNU Parted. Refer to the web site of parted " @@ -956,33 +912,33 @@ msgid "" "containing at least the version (%s) and the following message: " msgstr "" -#: libparted/labels/aix.c:91 +#: libparted/labels/aix.c:92 #, fuzzy msgid "Support for reading AIX disk labels is is not implemented yet." msgstr "" "El soporte para crear el sistema de ficheros %s aún no está implementado." -#: libparted/labels/aix.c:102 +#: libparted/labels/aix.c:103 #, fuzzy msgid "Support for writing AIX disk labels is is not implemented yet." msgstr "" "El soporte para crear el sistema de ficheros %s aún no está implementado." -#: libparted/labels/aix.c:115 +#: libparted/labels/aix.c:116 #, fuzzy msgid "" "Support for adding partitions to AIX disk labels is not implemented yet." msgstr "" "El soporte para crear el sistema de ficheros %s aún no está implementado." -#: libparted/labels/aix.c:125 +#: libparted/labels/aix.c:126 #, fuzzy msgid "" "Support for duplicating partitions in AIX disk labels is not implemented yet." msgstr "" "El soporte para crear el sistema de ficheros %s aún no está implementado." -#: libparted/labels/aix.c:143 +#: libparted/labels/aix.c:144 #, fuzzy msgid "" "Support for setting system type of partitions in AIX disk labels is not " @@ -990,7 +946,7 @@ msgid "" msgstr "" "El soporte para crear el sistema de ficheros %s aún no está implementado." -#: libparted/labels/aix.c:153 +#: libparted/labels/aix.c:154 #, fuzzy msgid "Support for setting flags in AIX disk labels is not implemented yet." msgstr "" @@ -1082,11 +1038,11 @@ msgstr "" # No se pueden, con N. # no pongas dos espacios seguidos -#: libparted/labels/atari.c:1657 libparted/labels/bsd.c:567 -#: libparted/labels/dasd.c:894 libparted/labels/dos.c:2276 -#: libparted/labels/dvh.c:770 libparted/labels/gpt.c:2050 -#: libparted/labels/loop.c:243 libparted/labels/mac.c:1423 -#: libparted/labels/pc98.c:701 libparted/labels/rdb.c:1054 +#: libparted/labels/atari.c:1657 libparted/labels/bsd.c:563 +#: libparted/labels/dasd.c:895 libparted/labels/dos.c:2283 +#: libparted/labels/dvh.c:770 libparted/labels/gpt.c:2140 +#: 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 "No se pueden satisfacer todas las restricciones en la partición." @@ -1102,48 +1058,48 @@ msgstr "" msgid "Unable to allocate a partition number." msgstr "No se puede asignar un número de partición." -#: libparted/labels/bsd.c:592 +#: libparted/labels/bsd.c:588 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:625 +#: libparted/labels/dasd.c:626 msgid "The partition table of DASD-LDL device cannot be changed.\n" msgstr "" -#: libparted/labels/dasd.c:920 +#: libparted/labels/dasd.c:921 #, fuzzy msgid "Unable to allocate a dasd disklabel slot" msgstr "No se puede asignar una ranura de la etiqueta de disco bsd" # te doy permiso para poner inválida -#: libparted/labels/dos.c:1003 +#: libparted/labels/dos.c:1006 #, 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:1031 +#: libparted/labels/dos.c:1034 #, 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:1560 +#: libparted/labels/dos.c:1557 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:1572 +#: libparted/labels/dos.c:1569 #, fuzzy msgid "Extended partitions cannot be recovery partitions on msdos disk labels." msgstr "" "No pueden esconderse particiones extendidas en etiquetas de disco msdos." -#: libparted/labels/dos.c:2258 +#: libparted/labels/dos.c:2265 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:2514 +#: libparted/labels/dos.c:2521 #, fuzzy msgid "cannot create any more partitions" msgstr "No se puede crear más particiones." @@ -1298,12 +1254,12 @@ msgstr "" msgid "Disk geometry does not match a DASD device of type 3390." msgstr "" -#: libparted/labels/gpt.c:531 +#: libparted/labels/gpt.c:541 #, fuzzy msgid "device is too small for GPT" msgstr "Sistema de ficheros demasiado pequeño para ext2." -#: libparted/labels/gpt.c:733 +#: libparted/labels/gpt.c:743 #, fuzzy, c-format msgid "" "The format of the GPT partition table is version %x, which is newer than " @@ -1313,7 +1269,7 @@ msgstr "" "nuevo que lo que Parted puede reconocer. Por favor, díganoslo a bug-" "parted@gnu.org" -#: libparted/labels/gpt.c:769 +#: libparted/labels/gpt.c:779 #, c-format msgid "" "Not all of the space available to %s appears to be used, you can fix the GPT " @@ -1321,7 +1277,7 @@ msgid "" "setting? " msgstr "" -#: libparted/labels/gpt.c:1008 +#: libparted/labels/gpt.c:1024 #, fuzzy msgid "" "The backup GPT table is not at the end of the disk, as it should be. Fix, " @@ -1331,7 +1287,7 @@ msgstr "" "quiere decir que otro sistema operativo cree que el disco es más pequeño. " "¿Lo quiere arreglar moviendo la copia al final (y borrando la copia vieja)?" -#: libparted/labels/gpt.c:1026 +#: libparted/labels/gpt.c:1042 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 +1296,7 @@ msgstr "" "una tabla actualizada, y utilice la opción de rescate de Parted para " "reconstruir las particiones." -#: libparted/labels/gpt.c:1037 +#: libparted/labels/gpt.c:1053 #, fuzzy msgid "" "The backup GPT table is corrupt, but the primary appears OK, so that will be " @@ -1349,7 +1305,7 @@ msgstr "" "La tabla primaria GPT está corrupta, pero la copia de respaldo parece " "correcta, por lo tanto se usará esta." -#: libparted/labels/gpt.c:1049 +#: libparted/labels/gpt.c:1065 msgid "" "The primary GPT table is corrupt, but the backup appears OK, so that will be " "used." @@ -1357,11 +1313,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:1073 +#: libparted/labels/gpt.c:1089 msgid "primary partition table array CRC mismatch" msgstr "" -#: libparted/labels/gpt.c:1936 libparted/labels/gpt.c:1963 +#: libparted/labels/gpt.c:2026 libparted/labels/gpt.c:2053 #, fuzzy msgid "failed to translate partition name" msgstr "No se puede asignar un número de partición." @@ -1397,18 +1353,14 @@ msgid "The data region doesn't start at the start of the partition." msgstr "La región de datos no empieza al principio de la partición." #: libparted/labels/mac.c:572 -msgid "The boot region doesn't start at the start of the partition." -msgstr "La región de arranque no empieza al principio de la partición." - -#: libparted/labels/mac.c:586 msgid "The partition's boot region doesn't occupy the entire partition." msgstr "La región de arranque de la partición no ocupa toda la partición." -#: libparted/labels/mac.c:597 +#: libparted/labels/mac.c:583 msgid "The partition's data region doesn't occupy the entire partition." msgstr "La región de datos de la partición no ocupa toda la partición." -#: libparted/labels/mac.c:649 +#: libparted/labels/mac.c:635 #, c-format msgid "" "Weird block size on device descriptor: %d bytes is not divisible by 512." @@ -1416,7 +1368,7 @@ msgstr "" "Tamaño de bloque extraño en el descriptor del dispositivo: %d bytes no es " "divisible por 512." -#: libparted/labels/mac.c:662 +#: libparted/labels/mac.c:648 #, c-format msgid "" "The driver descriptor says the physical block size is %d bytes, but Linux " @@ -1425,11 +1377,11 @@ msgstr "" "El descriptor del controlador dice que el tamaño del bloque físico es de %d " "bytes, pero Linux dice que es de %d bytes." -#: libparted/labels/mac.c:715 +#: libparted/labels/mac.c:701 msgid "No valid partition map found." msgstr "Se encontró una tabla de particiones inválida." -#: libparted/labels/mac.c:789 +#: libparted/labels/mac.c:775 #, c-format msgid "" "Conflicting partition map entry sizes! Entry 1 says it is %d, but entry %d " @@ -1438,11 +1390,11 @@ msgstr "" "¡Conflicto en el tamaño de la entrada de la tabla de particiones! ¡La " "entrada 1 dice que es %d, pero la entrada %d dice que es %d!" -#: libparted/labels/mac.c:820 +#: libparted/labels/mac.c:806 msgid "Weird! There are 2 partitions map entries!" msgstr "¡Extraño! ¡Hay 2 entradas de tabla de particiones!" -#: libparted/labels/mac.c:1359 +#: libparted/labels/mac.c:1345 msgid "" "Changing the name of a root or swap partition will prevent Linux from " "recognising it as such." @@ -1450,18 +1402,18 @@ msgstr "" "Cambiando el nombre de una partición raíz o de intercambio impedirán a Linux " "de reconocela como tal." -#: libparted/labels/mac.c:1458 +#: libparted/labels/mac.c:1444 msgid "Can't add another partition -- the partition map is too small!" msgstr "" "¡No se puede añadir otra partición -- la tabla de las particiones es " "demasiado pequeña!" -#: libparted/labels/pc98.c:284 +#: libparted/labels/pc98.c:285 #, c-format msgid "Invalid partition table on %s." msgstr "Tabla de partición inválida en %s." -#: libparted/labels/pc98.c:337 libparted/labels/pc98.c:415 +#: libparted/labels/pc98.c:338 libparted/labels/pc98.c:416 #, c-format msgid "" "Partition %d isn't aligned to cylinder boundaries. This is still " @@ -1471,7 +1423,7 @@ msgstr "" "añadirle soporte." # No se puede. -#: libparted/labels/pc98.c:733 +#: libparted/labels/pc98.c:729 msgid "Can't add another partition." msgstr "No se puede añadir otra partición." @@ -1646,39 +1598,39 @@ msgstr "" msgid "Could not write VTOC FMT9 DSCB." msgstr "" -#: libparted/libparted.c:242 +#: libparted/libparted.c:247 msgid "Out of memory." msgstr "No hay memoria." -#: libparted/unit.c:139 +#: libparted/unit.c:140 msgid "Cannot get unit size for special unit 'COMPACT'." msgstr "" -#: libparted/unit.c:385 +#: libparted/unit.c:386 #, c-format msgid "\"%s\" has invalid syntax for locations." msgstr "" -#: libparted/unit.c:393 +#: libparted/unit.c:394 #, c-format msgid "The maximum head value is %d." msgstr "" -#: libparted/unit.c:400 +#: libparted/unit.c:401 #, c-format msgid "The maximum sector value is %d." msgstr "" -#: libparted/unit.c:412 libparted/unit.c:564 +#: libparted/unit.c:413 libparted/unit.c:565 #, c-format msgid "The location %s is outside of the device %s." msgstr "" -#: libparted/unit.c:526 +#: libparted/unit.c:527 msgid "Invalid number." msgstr "" -#: libparted/unit.c:532 +#: libparted/unit.c:533 msgid "Use a smaller unit instead of a value < 1" msgstr "" @@ -1688,18 +1640,18 @@ msgstr "" msgid "%s : Failed to allocate partition block\n" msgstr "Fallo al escribir el bloque de la partición en %d." -#: libparted/fs/amiga/affs.c:79 libparted/fs/amiga/apfs.c:71 +#: 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 "" -#: libparted/fs/amiga/affs.c:84 libparted/fs/amiga/apfs.c:76 +#: libparted/fs/amiga/affs.c:83 libparted/fs/amiga/apfs.c:76 #, fuzzy, c-format msgid "%s : Couldn't read boot block %llu\n" msgstr "%s : Bucle detectado en el bloque %d." -#: libparted/fs/amiga/affs.c:98 libparted/fs/amiga/apfs.c:87 +#: libparted/fs/amiga/affs.c:97 libparted/fs/amiga/apfs.c:87 #: libparted/fs/amiga/asfs.c:90 libparted/fs/amiga/asfs.c:104 #, fuzzy, c-format msgid "%s : Couldn't read root block %llu\n" @@ -1725,22 +1677,22 @@ msgstr "%s : Suma de comprobaci msgid "%s : Couldn't write block %d\n" msgstr "%s : Bucle detectado en el bloque %d." -#: libparted/fs/amiga/amiga.c:278 +#: libparted/fs/amiga/amiga.c:279 #, c-format msgid "%s : Failed to allocate disk_specific rdb block\n" msgstr "" -#: libparted/fs/amiga/amiga.c:289 +#: libparted/fs/amiga/amiga.c:290 #, fuzzy, c-format msgid "%s : Didn't find rdb block, should never happen\n" msgstr "%s : No se encuentra el bloque rdb, nunca debería ocurrir." -#: libparted/fs/amiga/amiga.c:318 +#: libparted/fs/amiga/amiga.c:319 #, fuzzy, c-format msgid "%s : Failed to read partition block %llu\n" msgstr "Fallo al escribir el bloque de la partición en %d." -#: libparted/fs/fat/fat.c:148 libparted/fs/r/fat/fat.c:811 +#: libparted/fs/fat/fat.c:149 msgid "" "GNU Parted was miscompiled: the FAT boot sector should be 512 bytes. FAT " "support will be disabled." @@ -1838,7 +1790,7 @@ msgid "" "geometry." msgstr "" -#: libparted/fs/r/fat/bootsector.c:399 +#: libparted/fs/r/fat/bootsector.c:398 #, c-format msgid "" "The information sector has the wrong signature (%x). Select cancel for now, " @@ -1865,14 +1817,14 @@ msgstr "" "El inicio delta del cluster = %d, que no es un múltiplo del tamaño de " "cluster %d." -#: libparted/fs/r/fat/count.c:144 +#: libparted/fs/r/fat/count.c:84 #, c-format msgid "Bad directory entry for %s: first cluster is the end of file marker." msgstr "" "Entrada de directorio incorrecta para %s: el primer cluster es el final de " "la marca del fichero." -#: libparted/fs/r/fat/count.c:157 +#: libparted/fs/r/fat/count.c:97 #, c-format msgid "" "Bad FAT: unterminated chain for %s. You should run dosfsck or scandisk." @@ -1880,7 +1832,7 @@ msgstr "" "FAT incorrecta: cadena no terminada para %s. Debería ejecutar dosfsck o " "scandisck." -#: libparted/fs/r/fat/count.c:166 +#: libparted/fs/r/fat/count.c:106 #, c-format msgid "" "Bad FAT: cluster %d outside file system in chain for %s. You should run " @@ -1889,7 +1841,7 @@ msgstr "" "FAT incorrecta: el cluster %d está fuera del sistema de ficheros en la " "cadena para %s. Debería ejecutar dosfsck o scandisk." -#: libparted/fs/r/fat/count.c:176 +#: libparted/fs/r/fat/count.c:116 #, c-format msgid "" "Bad FAT: cluster %d is cross-linked for %s. You should run dosfsck or " @@ -1898,26 +1850,17 @@ msgstr "" "FAT incorrecta: el cluster %d tiene enlaces cruzados para %s. Debería " "ejecutar dosfsck o scandisck." -#: libparted/fs/r/fat/count.c:195 +#: libparted/fs/r/fat/count.c:135 #, c-format msgid "%s is %dk, but it has %d clusters (%dk)." msgstr "%s es %dk, pero tiene %d clusters (%dk)." -#: libparted/fs/r/fat/count.c:258 -#, c-format -msgid "" -"The file %s is marked as a system file. This means moving it could cause " -"some programs to stop working." -msgstr "" -"El fichero %s está marcado como un fichero del sistema. Esto quiere decir " -"que si lo mueve puede ocurrir que algunos programas no funcionen." - -#: libparted/fs/r/fat/fat.c:243 +#: libparted/fs/r/fat/fat.c:244 #, c-format msgid "Partition too big/small for a %s file system." msgstr "Partición demasiado grande/pequeña para un sistema de ficheros %s." -#: libparted/fs/r/fat/fat.c:409 +#: 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." @@ -1925,11 +1868,11 @@ msgstr "" "Las FATs no son iguales. Si no sabe que significa esto, seleccione " "cancelar, ejecute scandisk en el sistema de ficheros, y después vuelva." -#: libparted/fs/r/fat/fat.c:449 +#: libparted/fs/r/fat/fat.c:450 msgid "There are no possible configurations for this FAT type." msgstr "No hay configuraciones posibles para este tipo de FAT." -#: libparted/fs/r/fat/fat.c:461 +#: libparted/fs/r/fat/fat.c:462 #, c-format msgid "" "File system doesn't have expected sizes for Windows to like it. Cluster " @@ -1941,7 +1884,7 @@ msgstr "" "clusters es de %d (se esperaba %d); el tamaño de la FAT es de %d sectores " "(se esperaba %d)." -#: libparted/fs/r/fat/fat.c:484 +#: libparted/fs/r/fat/fat.c:485 #, c-format msgid "" "File system is reporting the free space as %d clusters, not %d clusters." @@ -1949,7 +1892,7 @@ msgstr "" "El sistema de ficheros está informando que el espacio libre de clusters es " "de %d, no de %d clusters." -#: libparted/fs/r/fat/resize.c:158 +#: 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." @@ -1957,16 +1900,16 @@ msgstr "" "No hay espacio suficiente en el directorio root para todos los ficheros. " "Puede cancelar o descartar perdiendo los ficheros." -#: libparted/fs/r/fat/resize.c:302 +#: libparted/fs/r/fat/resize.c:303 msgid "Error writing to the root directory." msgstr "Error al escribir en el directorio root." -#: libparted/fs/r/fat/resize.c:495 +#: libparted/fs/r/fat/resize.c:479 msgid "If you leave your file system as FAT16, then you will have no problems." msgstr "" "Si deja su sistema de ficheros como FAT16, entonces no tendrá problemas." -#: libparted/fs/r/fat/resize.c:498 +#: 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 " @@ -1976,7 +1919,7 @@ msgstr "" "debería re-instalar el cargador de arranque de MS Windows. Si quiere hacer " "esto, debería consultar el manual de Parted (o el manual de su distribución)." -#: libparted/fs/r/fat/resize.c:506 +#: libparted/fs/r/fat/resize.c:490 msgid "" "If you leave your file system as FAT32, then you will not introduce any new " "problems." @@ -1984,7 +1927,7 @@ msgstr "" "Si deja su sistema de ficheros como FAT32, entonces no tendrá nuevos " "problemas." -#: libparted/fs/r/fat/resize.c:510 +#: 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 " @@ -1998,42 +1941,42 @@ msgstr "" "También, la conversión a FAT32 hará ilegible el sistema de ficheros para MS " "DOS, MS Windows 95a y MS Windows NT." -#: libparted/fs/r/fat/resize.c:524 +#: libparted/fs/r/fat/resize.c:508 #, c-format msgid "%s %s %s" msgstr "%s %s %s" -#: libparted/fs/r/fat/resize.c:525 +#: libparted/fs/r/fat/resize.c:509 msgid "Would you like to use FAT32?" msgstr "¿Le gustaría usar FAT32?" -#: libparted/fs/r/fat/resize.c:556 libparted/fs/r/fat/resize.c:572 +#: 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:557 +#: libparted/fs/r/fat/resize.c:541 msgid "" "The file system can only be resized to this size by converting to FAT16." msgstr "" "El sistema de ficheros sólo puede ser redimensionado a este tamaño para " "convertirlo a FAT16." -#: libparted/fs/r/fat/resize.c:573 +#: libparted/fs/r/fat/resize.c:557 msgid "" "The file system can only be resized to this size by converting to FAT32." msgstr "" "El sistema de ficheros sólo puede ser redimensionado a este tamaño para " "convertirlo a FAT32." -#: libparted/fs/r/fat/resize.c:586 +#: 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 no puede redimensionar esta partición a ese tamaño. ¡Estamos " "trabajando en ello!" -#: libparted/fs/r/fat/table.c:136 +#: 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 " @@ -2042,43 +1985,43 @@ msgstr "" "La FAT %d del medio %x no coincide con los sectores de arranque del medio " "%x. Debería, probablemente, ejecutar scandisk." -#: libparted/fs/r/fat/table.c:268 +#: libparted/fs/r/fat/table.c:269 #, fuzzy, c-format msgid "fat_table_set: cluster %ld outside file system" msgstr "fat_table_set: el cluster %ld está fuera del sistema de ficheros" -#: libparted/fs/r/fat/table.c:300 +#: libparted/fs/r/fat/table.c:301 #, fuzzy, c-format msgid "fat_table_get: cluster %ld outside file system" msgstr "fat_table_get: el cluster %ld está fuera del sistema de ficheros" -#: libparted/fs/r/fat/table.c:342 +#: libparted/fs/r/fat/table.c:343 msgid "fat_table_alloc_cluster: no free clusters" msgstr "fat_table_alloc_cluster: no quedan clusters libres" -#: libparted/fs/r/filesys.c:151 +#: libparted/fs/r/filesys.c:152 msgid "Could not detect file system." msgstr "No se puede detectar el sistema de ficheros." -#: libparted/fs/r/filesys.c:158 libparted/fs/r/filesys.c:285 +#: libparted/fs/r/filesys.c:159 libparted/fs/r/filesys.c:284 #, fuzzy, c-format msgid "resizing %s file systems is not supported" msgstr "" "El soporte para redimensionar el sistema de ficheros %s aún no está " "implementado." -#: libparted/fs/r/filesys.c:170 +#: libparted/fs/r/filesys.c:171 msgid "The file system is bigger than its volume!" msgstr "¡El sistema de ficheros es más grande que su volumen!" -#: libparted/fs/r/hfs/advfs.c:121 libparted/fs/r/hfs/advfs_plus.c:121 -#: libparted/fs/r/hfs/reloc.c:413 libparted/fs/r/hfs/reloc.c:507 -#: libparted/fs/r/hfs/reloc_plus.c:538 libparted/fs/r/hfs/reloc_plus.c:656 -#: libparted/fs/r/hfs/reloc_plus.c:769 +#: 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 "El sistema de ficheros contiene errores." -#: libparted/fs/r/hfs/advfs_plus.c:285 +#: libparted/fs/r/hfs/advfs_plus.c:287 msgid "Bad blocks could not be read." msgstr "No pueden leerse los bloques incorrectos." @@ -2140,90 +2083,90 @@ msgstr "" msgid "Trying to write HFS+ file with CNID %X behind EOF." msgstr "" -#: libparted/fs/r/hfs/hfs.c:232 +#: libparted/fs/r/hfs/hfs.c:212 msgid "Sorry, HFS cannot be resized that way yet." msgstr "" -#: libparted/fs/r/hfs/hfs.c:250 libparted/fs/r/hfs/hfs.c:629 +#: libparted/fs/r/hfs/hfs.c:230 libparted/fs/r/hfs/hfs.c:573 msgid "shrinking" msgstr "contrayendo" -#: libparted/fs/r/hfs/hfs.c:262 libparted/fs/r/hfs/hfs.c:641 +#: 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:281 +#: 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:320 +#: libparted/fs/r/hfs/hfs.c:300 #, fuzzy msgid "writing HFS Master Directory Block" msgstr "Error al escribir en el directorio raíz." -#: libparted/fs/r/hfs/hfs.c:468 +#: 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:478 +#: libparted/fs/r/hfs/hfs.c:422 #, c-format msgid "Version %d of HFS+ isn't supported." msgstr "" -#: libparted/fs/r/hfs/hfs.c:489 +#: libparted/fs/r/hfs/hfs.c:433 #, c-format msgid "Version %d of HFSX isn't supported." msgstr "" -#: libparted/fs/r/hfs/hfs.c:672 +#: 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:720 +#: libparted/fs/r/hfs/hfs.c:664 #, fuzzy msgid "Error while writing the allocation file." msgstr "Error al escribir en el directorio raíz." -#: libparted/fs/r/hfs/hfs.c:735 +#: 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:750 +#: libparted/fs/r/hfs/hfs.c:694 msgid "writing HFS+ Volume Header" msgstr "" -#: libparted/fs/r/hfs/hfs.c:850 +#: 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:904 +#: 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:940 +#: libparted/fs/r/hfs/hfs.c:883 msgid "Sorry, HFS+ cannot be resized that way yet." msgstr "" -#: libparted/fs/r/hfs/hfs.c:975 +#: libparted/fs/r/hfs/hfs.c:918 msgid "shrinking embedded HFS+ volume" msgstr "" -#: libparted/fs/r/hfs/hfs.c:992 +#: libparted/fs/r/hfs/hfs.c:935 msgid "Resizing the HFS+ volume has failed." msgstr "" -#: libparted/fs/r/hfs/hfs.c:999 +#: libparted/fs/r/hfs/hfs.c:942 #, fuzzy msgid "shrinking HFS wrapper" msgstr "contrayendo" -#: libparted/fs/r/hfs/hfs.c:1008 +#: libparted/fs/r/hfs/hfs.c:951 msgid "Updating the HFS wrapper has failed." msgstr "" -#: libparted/fs/r/hfs/hfs.c:1110 libparted/fs/r/hfs/hfs.c:1195 +#: 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 " @@ -2294,74 +2237,74 @@ msgstr "" msgid "An extent has not been relocated." msgstr "" -#: libparted/fs/r/hfs/reloc.c:250 libparted/fs/r/hfs/reloc_plus.c:307 +#: 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:380 +#: 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:474 +#: 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:516 libparted/fs/r/hfs/reloc_plus.c:666 +#: 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:573 libparted/fs/r/hfs/reloc_plus.c:844 +#: libparted/fs/r/hfs/reloc.c:579 libparted/fs/r/hfs/reloc_plus.c:849 #, fuzzy msgid "Could not cache the file system in memory." msgstr "No se puede detectar el sistema de ficheros." -#: libparted/fs/r/hfs/reloc.c:634 libparted/fs/r/hfs/reloc_plus.c:905 +#: 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:648 libparted/fs/r/hfs/reloc_plus.c:921 +#: libparted/fs/r/hfs/reloc.c:654 libparted/fs/r/hfs/reloc_plus.c:926 msgid "An error occurred during extent relocation." msgstr "Ocurrió un error durante la relocalización de la extensión." -#: libparted/fs/r/hfs/reloc_plus.c:494 +#: 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:617 +#: 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:125 +#: parted/parted.c:126 msgid "displays this help message" msgstr "mostrar este mensaje de ayuda" -#: parted/parted.c:126 +#: parted/parted.c:127 msgid "lists partition layout on all block devices" msgstr "" -#: parted/parted.c:127 +#: parted/parted.c:128 msgid "displays machine parseable output" msgstr "" -#: parted/parted.c:128 +#: parted/parted.c:129 msgid "never prompts for user intervention" msgstr "no pedir nunca la intervención del usuario" -#: parted/parted.c:129 +#: parted/parted.c:130 msgid "displays the version" msgstr "mostrar la versión" # No se puede. -#: parted/parted.c:130 +#: parted/parted.c:131 #, fuzzy msgid "alignment for new partitions" msgstr "No se puede crear más particiones." -#: parted/parted.c:142 +#: parted/parted.c:143 #, fuzzy msgid "" "NUMBER is the partition number used by Linux. On MS-DOS disk labels, the " @@ -2371,60 +2314,60 @@ msgstr "" "disco msdos, las particiones primarias van del 1 al 4, y las particiones " "lógicas de 5 en adelante.\n" -#: parted/parted.c:145 +#: parted/parted.c:146 msgid "LABEL-TYPE is one of: " msgstr "TIPO_ETIQUETA es uno de: " -#: parted/parted.c:146 parted/parted.c:147 +#: parted/parted.c:147 parted/parted.c:148 msgid "FLAG is one of: " msgstr "FLAG es uno de: " -#: parted/parted.c:148 +#: parted/parted.c:149 #, fuzzy msgid "UNIT is one of: " msgstr "FLAG es uno de: " -#: parted/parted.c:149 +#: parted/parted.c:150 msgid "desired alignment: minimum or optimal" msgstr "" -#: parted/parted.c:150 +#: parted/parted.c:151 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:152 +#: parted/parted.c:153 msgid "FS-TYPE is one of: " msgstr "TIPO-SF es uno de: " -#: parted/parted.c:153 +#: parted/parted.c:154 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:156 +#: parted/parted.c:157 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:159 +#: parted/parted.c:160 msgid "STATE is one of: on, off\n" msgstr "ESTADO es uno de: on, off\n" -#: parted/parted.c:160 +#: parted/parted.c:161 msgid "DEVICE is usually /dev/hda or /dev/sda\n" msgstr "DISPOSITIVO es normalmente /dev/hda o /dev/sda\n" -#: parted/parted.c:161 +#: parted/parted.c:162 msgid "NAME is any word you want\n" msgstr "NOMBRE es cualquier palabra que quiera\n" # 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:164 +#: parted/parted.c:165 #, fuzzy msgid "" "Copyright (C) 1998 - 2006 Free Software Foundation, Inc.\n" @@ -2446,55 +2389,55 @@ msgstr "" "para obtener más detalles.\n" "\n" -#: parted/parted.c:212 +#: parted/parted.c:213 #, c-format msgid "%0.f%%\t(time left %.2d:%.2d)" msgstr "%0.f%%\t(tiempo que queda %.2d:%.2d)" -#: parted/parted.c:231 +#: parted/parted.c:232 #, fuzzy, c-format msgid "Partition %s is being used. Are you sure you want to continue?" msgstr "" "La partición %s está usandose. Debe desmontarla antes de modificarla con " "Parted." -#: parted/parted.c:252 +#: parted/parted.c:253 #, 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:264 +#: parted/parted.c:265 #, 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:525 +#: parted/parted.c:526 msgid "New disk label type?" msgstr "¿Nuevo tipo de etiqueta de disco?" -#: parted/parted.c:662 +#: parted/parted.c:663 msgid "Partition type?" msgstr "¿Tipo de partición?" -#: parted/parted.c:680 parted/parted.c:884 +#: parted/parted.c:681 parted/parted.c:885 msgid "Partition name?" msgstr "¿Nombre de la partición?" -#: parted/parted.c:690 +#: parted/parted.c:691 msgid "File system type?" msgstr "¿Tipo de sistema de ficheros?" -#: parted/parted.c:695 parted/parted.c:1498 +#: parted/parted.c:696 parted/parted.c:1499 msgid "Start?" msgstr "¿Inicio?" -#: parted/parted.c:698 parted/parted.c:1500 parted/parted.c:1569 +#: parted/parted.c:699 parted/parted.c:1501 parted/parted.c:1585 msgid "End?" msgstr "¿Fin?" -#: parted/parted.c:766 +#: parted/parted.c:767 #, fuzzy, c-format msgid "" "You requested a partition from %s to %s (sectors %llu..%llu).\n" @@ -2503,99 +2446,99 @@ msgstr "" "Pidió redimensionar la partición para %s - %s. Lo más cerca que Parted puede " "manejar es %s - %s." -#: parted/parted.c:775 +#: parted/parted.c:776 msgid "" "\n" "Is this still acceptable to you?" msgstr "" -#: parted/parted.c:798 +#: parted/parted.c:799 #, c-format msgid "" "The resulting partition is not properly aligned for best performance: %s" msgstr "" -#: parted/parted.c:800 parted/parted.c:1723 +#: parted/parted.c:801 parted/parted.c:1739 msgid "unknown (malloc failed)" msgstr "" -#: parted/parted.c:876 +#: parted/parted.c:877 #, fuzzy, c-format msgid "%s disk labels do not support partition name." msgstr "Las etiquetas de disco de %s no soportan particiones extendidas." -#: parted/parted.c:881 parted/parted.c:1561 parted/parted.c:1612 -#: parted/parted.c:1706 parted/parted.c:1781 +#: parted/parted.c:882 parted/parted.c:1564 parted/parted.c:1628 +#: parted/parted.c:1722 parted/parted.c:1797 msgid "Partition number?" msgstr "¿Número de la partición?" -#: parted/parted.c:975 +#: parted/parted.c:976 #, c-format msgid "BIOS cylinder,head,sector geometry: %d,%d,%d. Each cylinder is %s.\n" msgstr "" -#: parted/parted.c:1017 +#: parted/parted.c:1018 #, c-format msgid "Model: %s (%s)\n" msgstr "" -#: parted/parted.c:1019 +#: parted/parted.c:1020 #, fuzzy, c-format msgid "Disk %s: %s\n" msgstr "Tipo de etiqueta de disco: %s\n" -#: parted/parted.c:1020 +#: parted/parted.c:1021 #, c-format msgid "Sector size (logical/physical): %lldB/%lldB\n" msgstr "" -#: parted/parted.c:1032 +#: parted/parted.c:1033 #, fuzzy, c-format msgid "Partition Table: %s\n" msgstr "¿Nombre de la partición?" -#: parted/parted.c:1033 +#: parted/parted.c:1034 #, fuzzy, c-format msgid "Disk Flags: %s\n" msgstr "Tipo de etiqueta de disco: %s\n" -#: parted/parted.c:1153 parted/parted.c:1156 +#: parted/parted.c:1154 parted/parted.c:1157 msgid "Number" msgstr "Numero" -#: parted/parted.c:1153 parted/parted.c:1156 +#: parted/parted.c:1154 parted/parted.c:1157 msgid "Start" msgstr "Inicio" -#: parted/parted.c:1154 parted/parted.c:1157 +#: parted/parted.c:1155 parted/parted.c:1158 msgid "End" msgstr "Fin" -#: parted/parted.c:1157 +#: parted/parted.c:1158 msgid "Size" msgstr "Tamaño" -#: parted/parted.c:1161 +#: parted/parted.c:1162 msgid "Type" msgstr "Typo" -#: parted/parted.c:1163 +#: parted/parted.c:1164 msgid "File system" msgstr "Sistema de ficheros" -#: parted/parted.c:1166 +#: parted/parted.c:1167 msgid "Name" msgstr "Nombre" -#: parted/parted.c:1168 +#: parted/parted.c:1169 msgid "Flags" msgstr "Banderas" -#: parted/parted.c:1225 +#: parted/parted.c:1226 msgid "Free Space" msgstr "" -#: parted/parted.c:1385 +#: parted/parted.c:1386 #, c-format msgid "" "A %s %s partition was found at %s -> %s. Do you want to add it to the " @@ -2604,66 +2547,66 @@ msgstr "" "Ha sido encontrada una partición %s %s en %s -> %s. ¿Quiere añadirla a la " "tabla de particiones?" -#: parted/parted.c:1428 +#: parted/parted.c:1429 msgid "searching for file systems" msgstr "buscando los sistemas de ficheros" -#: parted/parted.c:1535 +#: parted/parted.c:1536 msgid "The resize command has been removed in parted 3.0" msgstr "" -#: parted/parted.c:1583 +#: parted/parted.c:1599 msgid "" "Shrinking a partition can cause data loss, are you sure you want to continue?" msgstr "" -#: parted/parted.c:1636 +#: parted/parted.c:1652 msgid "New device?" msgstr "¿Nuevo dispositivo?" -#: parted/parted.c:1704 +#: parted/parted.c:1720 msgid "alignment type(min/opt)" msgstr "" -#: parted/parted.c:1719 +#: parted/parted.c:1735 #, c-format msgid "%d aligned\n" msgstr "" -#: parted/parted.c:1721 +#: parted/parted.c:1737 #, c-format msgid "%d not aligned: %s\n" msgstr "" -#: parted/parted.c:1746 parted/parted.c:1783 +#: parted/parted.c:1762 parted/parted.c:1799 #, fuzzy msgid "Flag to Invert?" msgstr "¿Bandera a cambiar?" -#: parted/parted.c:1751 parted/parted.c:1788 +#: parted/parted.c:1767 parted/parted.c:1804 msgid "New state?" msgstr "¿Nuevo estado?" -#: parted/parted.c:1834 +#: parted/parted.c:1850 msgid "Unit?" msgstr "¿Unidad?" -#: parted/parted.c:1969 +#: parted/parted.c:1985 #, fuzzy msgid "align-check" msgstr "comprobar" -#: parted/parted.c:1972 +#: parted/parted.c:1988 msgid "" "align-check TYPE N check partition N for TYPE(min|opt) " "alignment" msgstr "" -#: parted/parted.c:1980 +#: parted/parted.c:1996 msgid "help" msgstr "help" -#: parted/parted.c:1983 +#: parted/parted.c:1999 #, fuzzy msgid "" "help [COMMAND] print general help, or help on " @@ -2672,15 +2615,15 @@ msgstr "" "help [ORDEN] muestra la ayuda general, o la ayuda sobre la " "ORDEN" -#: parted/parted.c:1989 +#: parted/parted.c:2005 msgid "mklabel" msgstr "mklabel" -#: parted/parted.c:1989 +#: parted/parted.c:2005 msgid "mktable" msgstr "" -#: parted/parted.c:1992 +#: parted/parted.c:2008 #, fuzzy msgid "" "mklabel,mktable LABEL-TYPE create a new disklabel (partition " @@ -2689,15 +2632,15 @@ msgstr "" "mklabel TIPO-ETIQUETA crea una nueva etiqueta de disco (en la tabla " "de partición)" -#: parted/parted.c:1998 +#: parted/parted.c:2014 msgid "mkpart" msgstr "mkpart" -#: parted/parted.c:2001 +#: parted/parted.c:2017 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:2007 +#: parted/parted.c:2023 #, fuzzy msgid "" "'mkpart' makes a partition without creating a new file system on the " @@ -2707,27 +2650,27 @@ msgstr "" "partición. Debe ser especificado el TIPO-SF para asignar una ID de " "partición.\n" -#: parted/parted.c:2012 +#: parted/parted.c:2028 msgid "name" msgstr "name" -#: parted/parted.c:2015 +#: parted/parted.c:2031 #, fuzzy msgid "name NUMBER NAME name partition NUMBER as NAME" msgstr "name NUMERO NOMBRE nombra la partición NUMERO como NOMBRE" -#: parted/parted.c:2020 +#: parted/parted.c:2036 msgid "print" msgstr "print" -#: parted/parted.c:2023 +#: parted/parted.c:2039 msgid "" "print [devices|free|list,all|NUMBER] display the partition table, " "available devices, free space, all found partitions, or a particular " "partition" msgstr "" -#: parted/parted.c:2028 +#: parted/parted.c:2044 #, fuzzy msgid "" "Without arguments, 'print' displays the entire partition table. However with " @@ -2737,41 +2680,41 @@ msgstr "" "da un número de partición, se muestra la información más detallada\n" "sobre esa particion.\n" -#: parted/parted.c:2030 +#: parted/parted.c:2046 msgid " devices : display all active block devices\n" msgstr "" -#: parted/parted.c:2031 +#: parted/parted.c:2047 msgid "" " free : display information about free unpartitioned space on the " "current block device\n" msgstr "" -#: parted/parted.c:2033 +#: parted/parted.c:2049 msgid "" " list, all : display the partition tables of all active block devices\n" msgstr "" -#: parted/parted.c:2034 +#: parted/parted.c:2050 msgid "" " NUMBER : display more detailed information about this particular " "partition\n" msgstr "" -#: parted/parted.c:2039 +#: parted/parted.c:2055 msgid "quit" msgstr "quit" -#: parted/parted.c:2042 +#: parted/parted.c:2058 #, fuzzy msgid "quit exit program" msgstr "quit sale del programa" -#: parted/parted.c:2047 +#: parted/parted.c:2063 msgid "rescue" msgstr "rescue" -#: parted/parted.c:2050 +#: parted/parted.c:2066 #, fuzzy msgid "" "rescue START END rescue a lost partition near START " @@ -2779,133 +2722,142 @@ msgid "" msgstr "" "rescue INICIO FIN recupera las particiones perdidas entre INICIO y FIN" -#: parted/parted.c:2056 +#: parted/parted.c:2072 msgid "resize" msgstr "resize" -#: parted/parted.c:2059 +#: parted/parted.c:2075 msgid "The resize command was removed in parted 3.0\n" msgstr "" -#: parted/parted.c:2062 +#: parted/parted.c:2078 #, fuzzy msgid "resizepart" msgstr "resize" -#: parted/parted.c:2065 +#: parted/parted.c:2081 #, fuzzy msgid "resizepart NUMBER END resize partition NUMBER" msgstr "rm NUMERO borra la partición NUMERO" -#: parted/parted.c:2070 +#: parted/parted.c:2086 msgid "rm" msgstr "rm" -#: parted/parted.c:2073 +#: parted/parted.c:2089 #, fuzzy msgid "rm NUMBER delete partition NUMBER" msgstr "rm NUMERO borra la partición NUMERO" -#: parted/parted.c:2078 +#: parted/parted.c:2094 msgid "select" msgstr "select" -#: parted/parted.c:2081 +#: parted/parted.c:2097 #, fuzzy msgid "select DEVICE choose the device to edit" msgstr "select DISPOSITIVO elegir el dispositivo a editar" -#: parted/parted.c:2086 +#: parted/parted.c:2102 msgid "disk_set" msgstr "" -#: parted/parted.c:2089 +#: parted/parted.c:2105 msgid "" "disk_set FLAG STATE change the FLAG on selected device" msgstr "" -#: parted/parted.c:2094 +#: parted/parted.c:2110 msgid "disk_toggle" msgstr "" -#: parted/parted.c:2097 +#: parted/parted.c:2113 msgid "" "disk_toggle [FLAG] toggle the state of FLAG on " "selected device" msgstr "" -#: parted/parted.c:2103 +#: parted/parted.c:2119 msgid "set" msgstr "set" -#: parted/parted.c:2106 +#: parted/parted.c:2122 #, fuzzy msgid "" "set NUMBER FLAG STATE change the FLAG on partition NUMBER" msgstr "" "set NUMERO MODIF ESTADO cambia un modificador de la partición NUMERO" -#: parted/parted.c:2112 +#: parted/parted.c:2128 msgid "toggle" msgstr "" -#: parted/parted.c:2115 +#: parted/parted.c:2131 #, fuzzy msgid "" "toggle [NUMBER [FLAG]] toggle the state of FLAG on " "partition NUMBER" msgstr "rm NUMERO borra la partición NUMERO" -#: parted/parted.c:2121 +#: parted/parted.c:2137 msgid "unit" msgstr "unit" -#: parted/parted.c:2124 +#: parted/parted.c:2140 #, fuzzy msgid "unit UNIT set the default unit to UNIT" msgstr "" "unit UNIDAD configura la unidad por defecto para UNIDAD" -#: parted/parted.c:2129 +#: parted/parted.c:2145 msgid "version" msgstr "" -#: parted/parted.c:2132 +#: parted/parted.c:2148 msgid "" "version display the version number and " "copyright information of GNU Parted" msgstr "" -#: parted/parted.c:2136 +#: parted/parted.c:2152 msgid "" "'version' displays copyright and version information corresponding to this " "copy of GNU Parted\n" msgstr "" -#: parted/parted.c:2204 +#: parted/parted.c:2220 #, c-format msgid "Usage: %s [-hlmsv] [-a] [DEVICE [COMMAND [PARAMETERS]]...]\n" msgstr "" -#: parted/parted.c:2248 +#: parted/parted.c:2264 msgid "No device found" msgstr "No se encontró el dispositivo" -#: parted/parted.c:2285 +#: parted/parted.c:2301 msgid "WARNING: You are not superuser. Watch out for permissions.\n" msgstr "" -#: parted/parted.c:2325 +# boot loader -> cargador de arranque. +#: parted/parted.c:2334 +msgid "" +"You should reinstall your boot loader before rebooting. Read section 4 of " +"the Parted User documentation for more information." +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:2341 #, fuzzy msgid "You may need to update /etc/fstab.\n" msgstr "No se olvide de actualizar /etc/fstab, si es necesario.\n" -#: parted/ui.c:164 +#: parted/ui.c:165 msgid "Welcome to GNU Parted! Type 'help' to view a list of commands.\n" msgstr "" # Uso: o Modo de empleo: -#: parted/ui.c:167 +#: parted/ui.c:168 #, fuzzy msgid "" "Usage: parted [OPTION]... [DEVICE [COMMAND [PARAMETERS]...]...]\n" @@ -2918,7 +2870,7 @@ msgstr "" "ORDEN(es), se ejecuta en\n" "modo interactivo.\n" -#: parted/ui.c:172 +#: parted/ui.c:173 #, c-format msgid "" "\n" @@ -2952,219 +2904,220 @@ msgid "" "consider important.\n" msgstr "" -#: parted/ui.c:293 +#: parted/ui.c:294 msgid "" "\n" "Command History:\n" msgstr "" -#: parted/ui.c:356 +#: parted/ui.c:357 msgid "" "\n" "Error: SEGV_MAPERR (Address not mapped to object)\n" msgstr "" -#: parted/ui.c:362 +#: parted/ui.c:363 msgid "" "\n" "Error: SEGV_ACCERR (Invalid permissions for mapped object)\n" msgstr "" -#: parted/ui.c:367 +#: parted/ui.c:368 msgid "" "\n" "Error: A general SIGSEGV signal was encountered.\n" msgstr "" -#: parted/ui.c:391 +#: parted/ui.c:392 msgid "" "\n" "Error: FPE_INTDIV (Integer: divide by zero)" msgstr "" -#: parted/ui.c:396 +#: parted/ui.c:397 msgid "" "\n" "Error: FPE_INTOVF (Integer: overflow)" msgstr "" -#: parted/ui.c:401 +#: parted/ui.c:402 msgid "" "\n" "Error: FPE_FLTDIV (Float: divide by zero)" msgstr "" -#: parted/ui.c:406 +#: parted/ui.c:407 msgid "" "\n" "Error: FPE_FLTOVF (Float: overflow)" msgstr "" -#: parted/ui.c:411 +#: parted/ui.c:412 msgid "" "\n" "Error: FPE_FLTUND (Float: underflow)" msgstr "" -#: parted/ui.c:416 +#: parted/ui.c:417 msgid "" "\n" "Error: FPE_FLTRES (Float: inexact result)" msgstr "" -#: parted/ui.c:421 +#: parted/ui.c:422 msgid "" "\n" "Error: FPE_FLTINV (Float: invalid operation)" msgstr "" -#: parted/ui.c:426 +#: parted/ui.c:427 msgid "" "\n" "Error: FPE_FLTSUB (Float: subscript out of range)" msgstr "" -#: parted/ui.c:431 +#: parted/ui.c:432 msgid "" "\n" "Error: A general SIGFPE signal was encountered." msgstr "" -#: parted/ui.c:455 +#: parted/ui.c:456 msgid "" "\n" "Error: ILL_ILLOPC (Illegal Opcode)" msgstr "" -#: parted/ui.c:460 +#: parted/ui.c:461 msgid "" "\n" "Error: ILL_ILLOPN (Illegal Operand)" msgstr "" -#: parted/ui.c:465 +#: parted/ui.c:466 msgid "" "\n" "Error: ILL_ILLADR (Illegal addressing mode)" msgstr "" -#: parted/ui.c:470 +#: parted/ui.c:471 msgid "" "\n" "Error: ILL_ILLTRP (Illegal Trap)" msgstr "" -#: parted/ui.c:475 +#: parted/ui.c:476 msgid "" "\n" "Error: ILL_PRVOPC (Privileged Opcode)" msgstr "" -#: parted/ui.c:480 +#: parted/ui.c:481 msgid "" "\n" "Error: ILL_PRVREG (Privileged Register)" msgstr "" -#: parted/ui.c:485 +#: parted/ui.c:486 msgid "" "\n" "Error: ILL_COPROC (Coprocessor Error)" msgstr "" -#: parted/ui.c:490 +#: parted/ui.c:491 msgid "" "\n" "Error: ILL_BADSTK (Internal Stack Error)" msgstr "" -#: parted/ui.c:495 +#: parted/ui.c:496 msgid "" "\n" "Error: A general SIGILL signal was encountered." msgstr "" -#: parted/ui.c:888 +#: parted/ui.c:889 #, c-format msgid "invalid token: %s" msgstr "" -#: parted/ui.c:1069 +#: parted/ui.c:1070 msgid "Expecting a partition number." msgstr "Se esperaba un número de partición." -#: parted/ui.c:1078 +#: parted/ui.c:1079 msgid "Partition doesn't exist." msgstr "La partición no existe." -#: parted/ui.c:1098 +#: parted/ui.c:1099 msgid "Expecting a file system type." msgstr "Se esperaba un tipo de sistema de ficheros." -#: parted/ui.c:1105 +#: parted/ui.c:1106 #, c-format msgid "Unknown file system type \"%s\"." msgstr "Tipo de sistema de ficheros \"%s\" desconocido." -#: parted/ui.c:1126 +#: parted/ui.c:1127 msgid "Expecting a disk label type." msgstr "Se esperaba un tipo de etiqueta de disco." -#: parted/ui.c:1157 parted/ui.c:1193 +#: parted/ui.c:1158 parted/ui.c:1194 msgid "No flags supported" msgstr "" # No se puede. -#: parted/ui.c:1267 +#: parted/ui.c:1268 msgid "Can't create any more partitions." msgstr "No se puede crear más particiones." -#: parted/ui.c:1277 +#: parted/ui.c:1278 msgid "Expecting a partition type." msgstr "Se esperaba un tipo de partición." -#: parted/ui.c:1426 +#: parted/ui.c:1427 msgid "on" msgstr "on" -#: parted/ui.c:1427 +#: parted/ui.c:1428 msgid "off" msgstr "off" -#: parted/ui.c:1444 +#: parted/ui.c:1445 msgid "optimal" msgstr "" -#: parted/ui.c:1445 +#: parted/ui.c:1446 msgid "minimal" msgstr "" -#: parted/ui.c:1578 +#: parted/ui.c:1579 msgid "OPTIONs:" msgstr "OPCIÓNes:" # Comando es una barbaridad. En es@li.org usamos "orden". -#: parted/ui.c:1583 +#: parted/ui.c:1584 msgid "COMMANDs:" msgstr "ORDENes:" -#: parted/ui.c:1586 +#: parted/ui.c:1587 #, c-format msgid "" "\n" "Report bugs to %s\n" msgstr "" -#: parted/ui.c:1593 +#: parted/ui.c:1594 #, c-format msgid "Using %s\n" msgstr "Usando %s\n" -#: parted/ui.c:1673 +#: parted/ui.c:1674 msgid "This command does not make sense in non-interactive mode.\n" msgstr "" # drives -> unidades +#, c-format #~ msgid "" #~ "The sector size on %s is %d bytes. Parted is known not to work properly " #~ "with drives with sector sizes other than %d bytes." @@ -3176,6 +3129,7 @@ msgstr "" #~ msgid "IDE" #~ msgstr "IDE" +#, c-format #~ msgid "" #~ "The kernel was unable to re-read the partition table on %s (%s). This " #~ "means Linux won't know anything about the modifications you made until " @@ -3186,6 +3140,34 @@ msgstr "" #~ "significa que Linux no reconocerá las modificaciones que hizo. Debe " #~ "reiniciarlo antes de hacer cualquier uso con %s." +# cargador "de" aranque (no del) +#~ msgid "" +#~ "The partition table cannot be re-read. This means you need to reboot " +#~ "before mounting any modified partitions. You also need to reinstall your " +#~ "boot loader before you reboot (which may require mounting modified " +#~ "partitions). It is impossible do both things! So you'll need to boot " +#~ "off a rescue disk, and reinstall your boot loader from the rescue disk. " +#~ "Read section 4 of the Parted User documentation for more information." +#~ msgstr "" +#~ "No se pudo releer la tabla de particiones, por lo tanto es necesario " +#~ "reiniciar antes de montar alguna partición modificada. ¡También necesita " +#~ "reinstalar su cargador de arranque antes de reiniciar (que puede requerir " +#~ "montar las particiones modificadas). ¡Es imposible hacer ambas cosas! " +#~ "Así que necesitará arrancar con un disco de rescate y reinstalar su " +#~ "cargador de arranque desde el disco de rescate. Lea la sección 4 de la " +#~ "documentación del Usuario de Parted para obtener más información." + +#, 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 " +#~ "computer before doing anything with %s." +#~ msgstr "" +#~ "La tabla de particiones en %s no puede ser releida(%s). Esto significa " +#~ "que Hurd (o Linux) no reconocerá las modificaciones que hizo. Debe " +#~ "reiniciar su computadora antes de hacer nada con %s." + +#, c-format #~ msgid "" #~ "%s contains GPT signatures, indicating that it has a GPT table. However, " #~ "it does not have a valid fake msdos partition table, as it should. " @@ -3200,10 +3182,15 @@ msgstr "" #~ "la tabla GPT y ahora está usando una tabla de particiones msdos. ¿Es " #~ "esta una tabla de partición GPT?" +#~ msgid "The boot region doesn't start at the start of the partition." +#~ msgstr "La región de arranque no empieza al principio de la partición." + +#, c-format #~ msgid "Support for opening %s file systems is not implemented yet." #~ msgstr "" #~ "El soporte para abrir el sistema de ficheros %s aún no está implementado." +#, c-format #~ msgid "Support for checking %s file systems is not implemented yet." #~ msgstr "" #~ "El soporte para comprobar el sistema de ficheros %s aún no está " @@ -3218,6 +3205,7 @@ msgstr "" #~ msgid "Can't copy onto an overlapping partition." #~ msgstr "No se puede copiar sobre una partición superpuesta." +#, c-format #~ msgid "" #~ "Direct support for copying file systems is not yet implemented for %s. " #~ "However, support for resizing is implemented. Therefore, the file system " @@ -3232,11 +3220,13 @@ msgstr "" #~ "la partición que está intentando copiar o copie en una partición más " #~ "grande." +#, c-format #~ msgid "Support for copying %s file systems is not implemented yet." #~ msgstr "" #~ "El soporte para copiar el sistema de ficheros %s aún no está implementado." # bicho :-) +#, c-format #~ msgid "" #~ "A bug has been detected in GNU parted. Please email a bug report to bug-" #~ "parted@gnu.org containing the version (%s) and the following message:" @@ -3244,6 +3234,7 @@ msgstr "" #~ "Si detectó un bicho en GNU parted. Por favor, envíe un informe del bicho " #~ "a bug-parted@gnu.org conteniendo la versión (%s) y el mensaje siguiente:" +#, c-format #~ msgid "Attempt to read sectors %ld-%ld outside of partition on %s." #~ msgstr "" #~ "Se intentaron leer los sectores %ld-%ld fuera de la partición en %s." @@ -3305,11 +3296,13 @@ msgstr "" #~ msgid "adding groups" #~ msgstr "añadiendo grupos" +#, c-format #~ msgid "Your file system is too full to resize it to %i blocks. Sorry." #~ msgstr "" #~ "Su sistema de ficheros está demasiado lleno para redimensionarlo a %i " #~ "bloques. Disculpe." +#, c-format #~ msgid "" #~ "Your file system has too many occupied inodes to resize it to %i blocks. " #~ "Sorry." @@ -3338,9 +3331,11 @@ msgstr "" #~ "¡Se encontraron bloques con referencia cruzada! ¡Mejor ejecutar primero " #~ "e2fsck!" +#, c-format #~ msgid "Block %i has no reference? Weird." #~ msgstr "¿El bloque %i no tiene una referencia? Estraño." +#, c-format #~ msgid "Block %i shouldn't have been marked!" #~ msgstr "¡El bloque %i no debería haber sido marcado!" @@ -3361,6 +3356,7 @@ msgstr "" #~ msgid "writing per-group metadata" #~ msgstr "escribiendo metadatos por-grupo" +#, 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." @@ -3369,6 +3365,14 @@ msgstr "" #~ "Parted es conocido por no funcionar adecuadamente con tamaños de sector " #~ "distintos de 512 bytes." +#, c-format +#~ msgid "" +#~ "The file %s is marked as a system file. This means moving it could cause " +#~ "some programs to stop working." +#~ msgstr "" +#~ "El fichero %s está marcado como un fichero del sistema. Esto quiere " +#~ "decir que si lo mueve puede ocurrir que algunos programas no funcionen." + #~ msgid "Too many bad pages." #~ msgstr "Demasiadas páginas incorrectas." @@ -3387,6 +3391,7 @@ msgstr "" #~ msgid "File system?" #~ msgstr "¿Sistema de ficheros?" +#, c-format #~ msgid "" #~ "You requested to create a partition at %s - %s. The closest Parted can " #~ "manage is %s - %s." @@ -3409,6 +3414,7 @@ msgstr "" #~ "No se puede mover una partición sobre sí misma. ¿Pruebe a usar " #~ "redimensionar, quizás?" +#, c-format #~ msgid "" #~ "You requested to move the partition to %s - %s. The closest Parted can " #~ "manage is %s - %s." @@ -3416,25 +3422,31 @@ msgstr "" #~ "Pidió mover la partición a %s - %s. Lo más cerca que Parted puede manejar " #~ "es %s - %s." +#, c-format #~ msgid "Minor: %d\n" #~ msgstr "Minor: %d\n" +#, c-format #~ msgid "Flags: " #~ msgstr "Banderas: " +#, c-format #~ msgid "File System: %s\n" #~ msgstr "Sistema de ficheros: %s\n" -#, fuzzy +#, fuzzy, c-format #~ msgid "Size: " #~ msgstr "Tamaño: %10.3fMb (%d%%)\n" +#, c-format #~ msgid "Minimum size: " #~ msgstr "Tamaño mínimo: " +#, c-format #~ msgid "Maximum size: " #~ msgstr "Tamaño máximo: " +#, c-format #~ msgid "Disk geometry for %s: %s - %s\n" #~ msgstr "Geometría de disco para %s: %s - %s\n" @@ -3491,6 +3503,7 @@ msgstr "" #~ "resize NUMERO INICIO FIN redimensiona el sistema de ficheros y la " #~ "partición NUMERO" +#, c-format #~ msgid "" #~ "You found a bug in GNU Parted. Please email a bug report to bug-" #~ "parted@gnu.org containing the version (%s), and the following message:\n" diff --git a/po/fr.gmo b/po/fr.gmo index 010149f5c1a23efd09ed95944ebda183df4e5a49..354cb0f2d3f9879d141c9c986d85e102a5b1d4fc 100644 GIT binary patch delta 11322 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 b{eIh+Ieq8-jiC!>1p0*Ux)$iOCENc2E#5ah delta 13124 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\n" "Language-Team: French \n" @@ -102,11 +102,11 @@ msgstr "%s : cette option requiert un argument -- « %c »\n" #. If you don't know what to put here, please see #. #. and use glyphs suitable for your language. -#: lib/quotearg.c:362 +#: lib/quotearg.c:355 msgid "`" msgstr "«" -#: lib/quotearg.c:363 +#: lib/quotearg.c:356 msgid "'" msgstr "»" @@ -374,32 +374,17 @@ msgstr "Aide générale des logiciels GNU : \n" msgid "memory exhausted" msgstr "mémoire épuisée" -#: lib/xstrtol-error.c:63 -#, c-format -msgid "invalid %s%s argument '%s'" -msgstr "invalide %s%s pour l’argument « %s »" - -#: lib/xstrtol-error.c:68 -#, c-format -msgid "invalid suffix in %s%s argument '%s'" -msgstr "suffixe invalide dans %s%s pour l’argument « %s »" - -#: lib/xstrtol-error.c:72 -#, c-format -msgid "%s%s argument '%s' too large" -msgstr "%s%s argument « %s » trop grand" - -#: libparted/arch/beos.c:245 +#: libparted/arch/beos.c:246 msgid "Disk Image" msgstr "Image Disque" -#: libparted/arch/beos.c:346 libparted/arch/gnu.c:277 +#: libparted/arch/beos.c:347 libparted/arch/gnu.c:277 #: libparted/arch/linux.c:1731 #, c-format msgid "Error opening %s: %s" msgstr "Erreur pendant l’ouverture de %s : %s" -#: libparted/arch/beos.c:357 libparted/arch/gnu.c:287 +#: libparted/arch/beos.c:358 libparted/arch/gnu.c:287 #: libparted/arch/linux.c:1742 #, c-format msgid "Unable to open %s read-write (%s). %s has been opened read-only." @@ -407,47 +392,47 @@ msgstr "" "Impossible d’ouvrir %s en lecture-écriture (%s). %s a été ouvert en lecture " "seule." -#: libparted/arch/beos.c:419 libparted/arch/linux.c:1907 +#: libparted/arch/beos.c:420 libparted/arch/linux.c:1907 #, c-format msgid "%s during seek for read on %s" msgstr "%s lors d’un positionnement pour lecture sur %s" -#: libparted/arch/beos.c:452 libparted/arch/gnu.c:465 libparted/arch/gnu.c:564 -#: libparted/arch/gnu.c:692 libparted/arch/linux.c:1867 +#: libparted/arch/beos.c:453 libparted/arch/gnu.c:425 libparted/arch/gnu.c:524 +#: libparted/arch/gnu.c:652 libparted/arch/linux.c:1867 #: libparted/arch/linux.c:1949 #, c-format msgid "%s during read on %s" msgstr "%s lors de la lecture sur %s" -#: libparted/arch/beos.c:488 libparted/arch/gnu.c:525 +#: libparted/arch/beos.c:489 libparted/arch/gnu.c:485 #: libparted/arch/linux.c:2026 #, c-format msgid "Can't write to %s, because it is opened read-only." msgstr "Impossible d’écrire sur %s car il est ouvert en lecture seule." -#: libparted/arch/beos.c:504 libparted/arch/linux.c:2051 +#: libparted/arch/beos.c:505 libparted/arch/linux.c:2051 #, c-format msgid "%s during seek for write on %s" msgstr "%s lors d’un positionnement pour écriture sur %s" -#: libparted/arch/beos.c:541 libparted/arch/gnu.c:601 libparted/arch/gnu.c:646 -#: libparted/arch/gnu.c:723 libparted/arch/linux.c:1999 +#: libparted/arch/beos.c:542 libparted/arch/gnu.c:561 libparted/arch/gnu.c:606 +#: libparted/arch/gnu.c:683 libparted/arch/linux.c:1999 #: libparted/arch/linux.c:2094 libparted/arch/linux.c:2167 #, c-format msgid "%s during write on %s" msgstr "%s lors de l’écriture sur %s" -#: partprobe/partprobe.c:148 +#: partprobe/partprobe.c:149 #, c-format msgid "Try `%s --help' for more information.\n" msgstr "Essayez « %s --help » pour plus d’informations.\n" -#: partprobe/partprobe.c:152 +#: partprobe/partprobe.c:153 #, c-format msgid "Usage: %s [OPTION] [DEVICE]...\n" msgstr "Usage : %s [OPTION] [PÉRIPHÉRIQUE]…\n" -#: partprobe/partprobe.c:153 +#: partprobe/partprobe.c:154 msgid "" "Inform the operating system about partition table changes.\n" "\n" @@ -464,7 +449,7 @@ msgstr "" " -h, --help affiche l’aide et quitte\n" " -v, --version affiche les informations de version et quitte\n" -#: partprobe/partprobe.c:161 +#: partprobe/partprobe.c:162 msgid "" "\n" "When no DEVICE is given, probe all partitions.\n" @@ -472,7 +457,7 @@ msgstr "" "\n" "Quand aucun PÉRIPHÉRIQUE n’est précisé, teste toutes les partitions.\n" -#: partprobe/partprobe.c:165 +#: partprobe/partprobe.c:166 #, c-format msgid "" "\n" @@ -490,45 +475,7 @@ msgstr "Impossible d’ouvrir %s." msgid "Unable to probe store." msgstr "Impossible de tester le stockage." -#: libparted/arch/gnu.c:368 -msgid "" -"The partition table cannot be re-read. This means you need to reboot before " -"mounting any modified partitions. You also need to reinstall your boot " -"loader before you reboot (which may require mounting modified partitions). " -"It is impossible do both things! So you'll need to boot off a rescue disk, " -"and reinstall your boot loader from the rescue disk. Read section 4 of the " -"Parted User documentation for more information." -msgstr "" -"La table de partition ne peut être relue, vous avez donc besoin de " -"redémarrer avant de monter toute partition modifiée. Vous devez aussi " -"réinstaller le gestionnaire de démarrage avant de redémarrer (ce qui peut " -"nécessiter de monter les partitions modifiées). Il est impossible de faire " -"ces deux choses à la fois ! C’est pourquoi vous aurez besoin de démarrer à " -"partir d’un disque de secours et de réinstaller le gestionnaire de démarrage " -"à partir de ce disque. Consultez la section 4 de la documentation " -"utilisateur de Parted pour plus de détails." - -#: libparted/arch/gnu.c:385 -#, 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 computer " -"before doing anything with %s." -msgstr "" -"La table de partition sur %s ne peut être relue (%s). Cela signifie que Hurd " -"ne connaît rien des modifications effectuées. Vous devriez redémarrer " -"l’ordinateur avant de faire quoi que ce soit avec %s." - -#: libparted/arch/gnu.c:396 parted/parted.c:2318 -msgid "" -"You should reinstall your boot loader before rebooting. Read section 4 of " -"the Parted User documentation for more information." -msgstr "" -"Vous devriez réinstaller le gestionnaire de démarrage avant de redémarrer. " -"Consultez la section 4 de la documentation utilisateur de Parted pour plus " -"d’informations." - -#: libparted/arch/gnu.c:788 +#: libparted/arch/gnu.c:748 #, c-format msgid "%s trying to sync %s to disk" msgstr "%s essaie de synchroniser %s sur le disque" @@ -859,15 +806,15 @@ msgstr "méta-données" msgid "free" msgstr "libre" -#: libparted/disk.c:2355 parted/ui.c:1258 parted/ui.c:1286 +#: libparted/disk.c:2355 parted/ui.c:1259 parted/ui.c:1287 msgid "extended" msgstr "étendue" -#: libparted/disk.c:2357 parted/ui.c:1262 parted/ui.c:1290 +#: libparted/disk.c:2357 parted/ui.c:1263 parted/ui.c:1291 msgid "logical" msgstr "logique" -#: libparted/disk.c:2359 parted/ui.c:1254 parted/ui.c:1282 +#: libparted/disk.c:2359 parted/ui.c:1255 parted/ui.c:1283 msgid "primary" msgstr "primaire" @@ -943,64 +890,73 @@ msgstr "irst" msgid "esp" msgstr "esp" -#: libparted/disk.c:2415 +#: libparted/disk.c:2411 +msgid "chromeos_kernel" +msgstr "" + +#: libparted/disk.c:2413 +#, fuzzy +msgid "bls_boot" +msgstr "pmbr_boot" + +#: libparted/disk.c:2419 #, c-format msgid "Unknown partition flag, %d." msgstr "Drapeau de partition inconnu, %d." -#: libparted/exception.c:78 +#: libparted/exception.c:79 msgid "Information" msgstr "Information" -#: libparted/exception.c:79 +#: libparted/exception.c:80 msgid "Warning" msgstr "Avertissement" -#: libparted/exception.c:80 +#: libparted/exception.c:81 msgid "Error" msgstr "Erreur" -#: libparted/exception.c:81 +#: libparted/exception.c:82 msgid "Fatal" msgstr "Fatale" -#: libparted/exception.c:82 +#: libparted/exception.c:83 msgid "Bug" msgstr "Bug" -#: libparted/exception.c:83 +#: libparted/exception.c:84 msgid "No Implementation" msgstr "Pas d’implémentation" -#: libparted/exception.c:87 +#: libparted/exception.c:88 msgid "Fix" msgstr "Réparer" -#: libparted/exception.c:88 +#: libparted/exception.c:89 msgid "Yes" msgstr "Oui" -#: libparted/exception.c:89 +#: libparted/exception.c:90 msgid "No" msgstr "Non" -#: libparted/exception.c:90 +#: libparted/exception.c:91 msgid "OK" msgstr "OK" -#: libparted/exception.c:91 +#: libparted/exception.c:92 msgid "Retry" msgstr "Réessayer" -#: libparted/exception.c:92 +#: libparted/exception.c:93 msgid "Ignore" msgstr "Ignorer" -#: libparted/exception.c:93 +#: libparted/exception.c:94 msgid "Cancel" msgstr "Annuler" -#: libparted/exception.c:133 +#: libparted/exception.c:134 #, c-format msgid "" "A bug has been detected in GNU Parted. Refer to the web site of parted " @@ -1014,32 +970,32 @@ msgstr "" "rapportez celle-ci à %s en précisant au moins la version (%s) et le message " "suivant : " -#: libparted/labels/aix.c:91 +#: libparted/labels/aix.c:92 msgid "Support for reading AIX disk labels is is not implemented yet." msgstr "" "La prise en charge en lecture du système de fichiers AIX n’est pas encore " "implanté." -#: libparted/labels/aix.c:102 +#: libparted/labels/aix.c:103 msgid "Support for writing AIX disk labels is is not implemented yet." msgstr "" "La prise en charge de l’écriture du système de fichiers AIX n’est pas encore " "implanté." -#: libparted/labels/aix.c:115 +#: libparted/labels/aix.c:116 msgid "" "Support for adding partitions to AIX disk labels is not implemented yet." msgstr "" "La prise en charge de la création de partitions AIX n’est pas encore " "implanté." -#: libparted/labels/aix.c:125 +#: libparted/labels/aix.c:126 msgid "" "Support for duplicating partitions in AIX disk labels is not implemented yet." msgstr "" "La prise en charge de la copie de partitions AIX n’est pas encore implanté." -#: libparted/labels/aix.c:143 +#: libparted/labels/aix.c:144 msgid "" "Support for setting system type of partitions in AIX disk labels is not " "implemented yet." @@ -1047,7 +1003,7 @@ msgstr "" "La prise en charge du type de système de configuration des partitions dans " "les étiquettes de disque AIX n’est pas encore implanté." -#: libparted/labels/aix.c:153 +#: libparted/labels/aix.c:154 msgid "Support for setting flags in AIX disk labels is not implemented yet." msgstr "" "La prise en charge de la modification des drapeaux dans les étiquettes de " @@ -1138,11 +1094,11 @@ msgid "" "partitions, if XGM is the first one it counts for two)." msgstr "" -#: libparted/labels/atari.c:1657 libparted/labels/bsd.c:567 -#: libparted/labels/dasd.c:894 libparted/labels/dos.c:2276 -#: libparted/labels/dvh.c:770 libparted/labels/gpt.c:2050 -#: libparted/labels/loop.c:243 libparted/labels/mac.c:1423 -#: libparted/labels/pc98.c:701 libparted/labels/rdb.c:1054 +#: libparted/labels/atari.c:1657 libparted/labels/bsd.c:563 +#: libparted/labels/dasd.c:895 libparted/labels/dos.c:2283 +#: libparted/labels/dvh.c:770 libparted/labels/gpt.c:2140 +#: 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 "Impossible de satisfaire toutes les contraintes sur la partition." @@ -1158,47 +1114,47 @@ msgstr "" msgid "Unable to allocate a partition number." msgstr "Impossible d’allouer un numéro de partition." -#: libparted/labels/bsd.c:592 +#: libparted/labels/bsd.c:588 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:625 +#: libparted/labels/dasd.c:626 msgid "The partition table of DASD-LDL device cannot be changed.\n" msgstr "" -#: libparted/labels/dasd.c:920 +#: libparted/labels/dasd.c:921 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:1003 +#: libparted/labels/dos.c:1006 #, 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:1031 +#: libparted/labels/dos.c:1034 #, c-format msgid "Invalid partition table - recursive partition on %s." msgstr "Table de partition invalide - partition récursive sur %s." -#: libparted/labels/dos.c:1560 +#: libparted/labels/dos.c:1557 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:1572 +#: libparted/labels/dos.c:1569 #, fuzzy msgid "Extended partitions cannot be recovery partitions on msdos disk labels." msgstr "" "Les partitions étendues ne peuvent être cachées sur les disques étiquetés MS-" "DOS." -#: libparted/labels/dos.c:2258 +#: libparted/labels/dos.c:2265 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:2514 +#: libparted/labels/dos.c:2521 msgid "cannot create any more partitions" msgstr "impossible de créer davantage de partitions" @@ -1343,11 +1299,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:531 +#: libparted/labels/gpt.c:541 msgid "device is too small for GPT" msgstr "périphérique trop petit pour GPT" -#: libparted/labels/gpt.c:733 +#: libparted/labels/gpt.c:743 #, c-format msgid "" "The format of the GPT partition table is version %x, which is newer than " @@ -1356,7 +1312,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:769 +#: libparted/labels/gpt.c:779 #, c-format msgid "" "Not all of the space available to %s appears to be used, you can fix the GPT " @@ -1367,7 +1323,7 @@ msgstr "" "voulez-vous ajuster la table GPT pour utiliser tout l’espace (%llu blocs en " "plus) ou continuer ainsi ?" -#: libparted/labels/gpt.c:1008 +#: libparted/labels/gpt.c:1024 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)?" @@ -1376,7 +1332,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:1026 +#: libparted/labels/gpt.c:1042 msgid "" "Both the primary and backup GPT tables are corrupt. Try making a fresh " "table, and using Parted's rescue feature to recover partitions." @@ -1385,7 +1341,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:1037 +#: libparted/labels/gpt.c:1053 msgid "" "The backup GPT table is corrupt, but the primary appears OK, so that will be " "used." @@ -1393,7 +1349,7 @@ msgstr "" "La sauvegarde de table GPT est corrompue mais l’originale semble valide et " "sera donc utilisée." -#: libparted/labels/gpt.c:1049 +#: libparted/labels/gpt.c:1065 msgid "" "The primary GPT table is corrupt, but the backup appears OK, so that will be " "used." @@ -1401,11 +1357,11 @@ msgstr "" "La table primaire GPT est corrompue mais sa sauvegarde semble valide, elle " "sera donc utilisée." -#: libparted/labels/gpt.c:1073 +#: libparted/labels/gpt.c:1089 msgid "primary partition table array CRC mismatch" msgstr "erreur CRC sur la table primaire de partitions" -#: libparted/labels/gpt.c:1936 libparted/labels/gpt.c:1963 +#: libparted/labels/gpt.c:2026 libparted/labels/gpt.c:2053 msgid "failed to translate partition name" msgstr "échec de traduction du nom de partition" @@ -1438,20 +1394,16 @@ msgid "The data region doesn't start at the start of the partition." msgstr "La zone de données ne commence pas au début de la partition." #: libparted/labels/mac.c:572 -msgid "The boot region doesn't start at the start of the partition." -msgstr "La zone d’amorce n’est pas au début de la partition." - -#: libparted/labels/mac.c:586 msgid "The partition's boot region doesn't occupy the entire partition." msgstr "" "La zone d’amorce de la partition ne couvre pas entièrement la partition." -#: libparted/labels/mac.c:597 +#: libparted/labels/mac.c:583 msgid "The partition's data region doesn't occupy the entire partition." msgstr "" "La zone de données de la partition ne couvre pas entièrement la partition." -#: libparted/labels/mac.c:649 +#: libparted/labels/mac.c:635 #, c-format msgid "" "Weird block size on device descriptor: %d bytes is not divisible by 512." @@ -1459,7 +1411,7 @@ msgstr "" "Taille bizarre de bloc sur le descripteur de périphérique : %d octets n’est " "pas divisible par 512." -#: libparted/labels/mac.c:662 +#: libparted/labels/mac.c:648 #, c-format msgid "" "The driver descriptor says the physical block size is %d bytes, but Linux " @@ -1468,11 +1420,11 @@ msgstr "" "Le descripteur du pilote indique une taille physique de bloc de %d octets, " "mais Linux lui indique %d octets." -#: libparted/labels/mac.c:715 +#: libparted/labels/mac.c:701 msgid "No valid partition map found." msgstr "Aucune table de partitions valide n’a été trouvée." -#: libparted/labels/mac.c:789 +#: libparted/labels/mac.c:775 #, c-format msgid "" "Conflicting partition map entry sizes! Entry 1 says it is %d, but entry %d " @@ -1481,11 +1433,11 @@ msgstr "" "Tailles conflictuelles des entrées de la table de partition ! L’entrée 1 " "indique %d alors que l’entrée %d indique %d !" -#: libparted/labels/mac.c:820 +#: libparted/labels/mac.c:806 msgid "Weird! There are 2 partitions map entries!" msgstr "Bizarre - Il y a 2 entrées de table de partitions !" -#: libparted/labels/mac.c:1359 +#: libparted/labels/mac.c:1345 msgid "" "Changing the name of a root or swap partition will prevent Linux from " "recognising it as such." @@ -1493,18 +1445,18 @@ msgstr "" "Changer le nom d’une partition racine (root) ou d’échange (swap) empêchera " "Linux de les reconnaître en tant que telles." -#: libparted/labels/mac.c:1458 +#: libparted/labels/mac.c:1444 msgid "Can't add another partition -- the partition map is too small!" msgstr "" "Impossible d’ajouter une autre partition - la table de partition est trop " "petite !" -#: libparted/labels/pc98.c:284 +#: libparted/labels/pc98.c:285 #, c-format msgid "Invalid partition table on %s." msgstr "Table de partition invalide sur %s." -#: libparted/labels/pc98.c:337 libparted/labels/pc98.c:415 +#: libparted/labels/pc98.c:338 libparted/labels/pc98.c:416 #, c-format msgid "" "Partition %d isn't aligned to cylinder boundaries. This is still " @@ -1513,7 +1465,7 @@ msgstr "" "La partition %d n’est pas alignée sur une frontière de cylindre. Ce cas de " "figure n’est pas pris en charge." -#: libparted/labels/pc98.c:733 +#: libparted/labels/pc98.c:729 msgid "Can't add another partition." msgstr "Impossible d’ajouter une autre partition." @@ -1691,39 +1643,39 @@ msgstr "Impossible d’écrire la table de volume VTOC FMT7 DSCB." msgid "Could not write VTOC FMT9 DSCB." msgstr "Impossible d’écrire VTOC FMT9 DSCB." -#: libparted/libparted.c:242 +#: libparted/libparted.c:247 msgid "Out of memory." msgstr "Mémoire insuffisante." -#: libparted/unit.c:139 +#: libparted/unit.c:140 msgid "Cannot get unit size for special unit 'COMPACT'." msgstr "Impossible d’obtenir la taille de l’unité spéciale « COMPACT »." -#: libparted/unit.c:385 +#: libparted/unit.c:386 #, c-format msgid "\"%s\" has invalid syntax for locations." msgstr "« %s » a une syntaxe de localisation invalide." -#: libparted/unit.c:393 +#: libparted/unit.c:394 #, c-format msgid "The maximum head value is %d." msgstr "Le nombre maximum de têtes est %d." -#: libparted/unit.c:400 +#: libparted/unit.c:401 #, c-format msgid "The maximum sector value is %d." msgstr "Le nombre maximum de secteurs est %d." -#: libparted/unit.c:412 libparted/unit.c:564 +#: libparted/unit.c:413 libparted/unit.c:565 #, c-format msgid "The location %s is outside of the device %s." msgstr "La localisation %s est en dehors du périphérique %s." -#: libparted/unit.c:526 +#: libparted/unit.c:527 msgid "Invalid number." msgstr "Nombre invalide." -#: libparted/unit.c:532 +#: libparted/unit.c:533 msgid "Use a smaller unit instead of a value < 1" msgstr "Utiliser une unité plus petite à la place d’une valeur inférieure à 1" @@ -1733,18 +1685,18 @@ msgstr "Utiliser une unité plus petite à la place d’une valeur inférieure msgid "%s : Failed to allocate partition block\n" msgstr "%s : Impossible d’allouer un bloc de partition\n" -#: libparted/fs/amiga/affs.c:79 libparted/fs/amiga/apfs.c:71 +#: 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 : Impossible d’allouer un bloc\n" -#: libparted/fs/amiga/affs.c:84 libparted/fs/amiga/apfs.c:76 +#: 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 : Impossible de lire le bloc de démarrage %llu\n" -#: libparted/fs/amiga/affs.c:98 libparted/fs/amiga/apfs.c:87 +#: 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" @@ -1770,23 +1722,23 @@ msgstr "%s : Mauvaise somme de contrôle sur le bloc %llu de type %s\n" msgid "%s : Couldn't write block %d\n" msgstr "%s : impossible d’écrire le bloc %d\n" -#: libparted/fs/amiga/amiga.c:278 +#: libparted/fs/amiga/amiga.c:279 #, c-format msgid "%s : Failed to allocate disk_specific rdb block\n" msgstr "%s : impossible d’allouer le bloc RDB spécifique\n" -#: libparted/fs/amiga/amiga.c:289 +#: libparted/fs/amiga/amiga.c:290 #, c-format msgid "%s : Didn't find rdb block, should never happen\n" msgstr "" "%s : impossible de trouver le bloc RDB, cela ne devrait jamais arriver\n" -#: libparted/fs/amiga/amiga.c:318 +#: libparted/fs/amiga/amiga.c:319 #, c-format msgid "%s : Failed to read partition block %llu\n" msgstr "%s : Impossible de lire les blocs de la partition %llu\n" -#: libparted/fs/fat/fat.c:148 libparted/fs/r/fat/fat.c:811 +#: libparted/fs/fat/fat.c:149 msgid "" "GNU Parted was miscompiled: the FAT boot sector should be 512 bytes. FAT " "support will be disabled." @@ -1900,7 +1852,7 @@ msgstr "" "système de fichiers sera modifiée de manière à concorder avec la géométrie " "CHS de la table des partitions." -#: libparted/fs/r/fat/bootsector.c:399 +#: libparted/fs/r/fat/bootsector.c:398 #, c-format msgid "" "The information sector has the wrong signature (%x). Select cancel for now, " @@ -1927,14 +1879,14 @@ msgstr "" "Delta de départ du cluster = %d , lequel n’est pas un multiple de la taille " "d’un cluster %d." -#: libparted/fs/r/fat/count.c:144 +#: libparted/fs/r/fat/count.c:84 #, c-format msgid "Bad directory entry for %s: first cluster is the end of file marker." msgstr "" "Entrée de répertoire erronée pour %s : le premier cluster est à la fin du " "marqueur de fichiers." -#: libparted/fs/r/fat/count.c:157 +#: libparted/fs/r/fat/count.c:97 #, c-format msgid "" "Bad FAT: unterminated chain for %s. You should run dosfsck or scandisk." @@ -1942,7 +1894,7 @@ msgstr "" "Table FAT erronée : chaîne non terminée pour %s. Vous devriez exécuter " "dosfsck ou scandisk." -#: libparted/fs/r/fat/count.c:166 +#: libparted/fs/r/fat/count.c:106 #, c-format msgid "" "Bad FAT: cluster %d outside file system in chain for %s. You should run " @@ -1951,7 +1903,7 @@ msgstr "" "Table FAT erronée : le cluster %d est en dehors du système de fichiers dans " "la chaîne associée à %s. Vous devriez exécuter dosfsck ou scandisk." -#: libparted/fs/r/fat/count.c:176 +#: libparted/fs/r/fat/count.c:116 #, c-format msgid "" "Bad FAT: cluster %d is cross-linked for %s. You should run dosfsck or " @@ -1960,27 +1912,18 @@ msgstr "" "Table FAT erronée : le cluster %d a des liens croisés pour %s. Vous devriez " "exécuter dosfsck ou scandisk." -#: libparted/fs/r/fat/count.c:195 +#: libparted/fs/r/fat/count.c:135 #, c-format msgid "%s is %dk, but it has %d clusters (%dk)." msgstr "%s est %dk, mais il a %d clusters (%dk)." -#: libparted/fs/r/fat/count.c:258 -#, c-format -msgid "" -"The file %s is marked as a system file. This means moving it could cause " -"some programs to stop working." -msgstr "" -"Le fichier %s est marqué comme fichier système. Cela signifie que son " -"déplacement pourrait amener certains programmes à cesser de fonctionner." - -#: libparted/fs/r/fat/fat.c:243 +#: libparted/fs/r/fat/fat.c:244 #, c-format msgid "Partition too big/small for a %s file system." msgstr "" "La partition est trop grande ou trop petite pour un système de fichiers %s." -#: libparted/fs/r/fat/fat.c:409 +#: 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." @@ -1989,11 +1932,11 @@ msgstr "" "alors sélectionnez « annuler » (cancel) et exécutez scandisk sur le système " "de fichiers, puis réessayez." -#: libparted/fs/r/fat/fat.c:449 +#: libparted/fs/r/fat/fat.c:450 msgid "There are no possible configurations for this FAT type." msgstr "Il n’y a pas de configuration possible pour ce type FAT." -#: libparted/fs/r/fat/fat.c:461 +#: libparted/fs/r/fat/fat.c:462 #, c-format msgid "" "File system doesn't have expected sizes for Windows to like it. Cluster " @@ -2004,7 +1947,7 @@ msgstr "" "Windows. La taille du cluster est %dk (%dk attendu). Le nombre de clusters " "est %d (%d attendu). La taille des FAT est de %d secteurs (%d attendu)." -#: libparted/fs/r/fat/fat.c:484 +#: libparted/fs/r/fat/fat.c:485 #, c-format msgid "" "File system is reporting the free space as %d clusters, not %d clusters." @@ -2012,7 +1955,7 @@ msgstr "" "Le système de fichiers annonce un espace libre de %d clusters et non pas %d " "clusters." -#: libparted/fs/r/fat/resize.c:158 +#: 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." @@ -2021,17 +1964,17 @@ msgstr "" "fichiers. Soit annuler (cancel), soit ignorer (ignore) avec perte de " "fichiers." -#: libparted/fs/r/fat/resize.c:302 +#: libparted/fs/r/fat/resize.c:303 msgid "Error writing to the root directory." msgstr "Erreur d’écriture du répertoire racine (root)." -#: libparted/fs/r/fat/resize.c:495 +#: libparted/fs/r/fat/resize.c:479 msgid "If you leave your file system as FAT16, then you will have no problems." msgstr "" "Si vous conservez votre système de fichiers en FAT16, vous n’aurez pas de " "problème." -#: libparted/fs/r/fat/resize.c:498 +#: 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 " @@ -2042,7 +1985,7 @@ msgstr "" "de démarrage de MS Windows. Si vous désirez faire cela, vous devriez " "consulter le manuel de Parted (ou le manuel de votre distribution)." -#: libparted/fs/r/fat/resize.c:506 +#: libparted/fs/r/fat/resize.c:490 msgid "" "If you leave your file system as FAT32, then you will not introduce any new " "problems." @@ -2050,7 +1993,7 @@ msgstr "" "Si vous conservez votre système de fichiers en FAT32 alors vous " "n’introduirez pas de nouveaux problèmes." -#: libparted/fs/r/fat/resize.c:510 +#: 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 " @@ -2065,42 +2008,42 @@ msgstr "" "FAT32 rendra le système de fichiers illisible par MS DOS, MS Windows 95a et " "MS Windows NT." -#: libparted/fs/r/fat/resize.c:524 +#: libparted/fs/r/fat/resize.c:508 #, c-format msgid "%s %s %s" msgstr "%s %s %s" -#: libparted/fs/r/fat/resize.c:525 +#: libparted/fs/r/fat/resize.c:509 msgid "Would you like to use FAT32?" msgstr "Voulez-vous utiliser FAT32 ?" -#: libparted/fs/r/fat/resize.c:556 libparted/fs/r/fat/resize.c:572 +#: 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:557 +#: libparted/fs/r/fat/resize.c:541 msgid "" "The file system can only be resized to this size by converting to FAT16." msgstr "" "Le système de fichiers peut seulement être redimensionné à cette taille en " "le convertissant en FAT16." -#: libparted/fs/r/fat/resize.c:573 +#: libparted/fs/r/fat/resize.c:557 msgid "" "The file system can only be resized to this size by converting to FAT32." msgstr "" "Le système de fichiers peut seulement être redimensionné à cette taille en " "le convertissant en FAT32." -#: libparted/fs/r/fat/resize.c:586 +#: 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 ne peut redimensionner cette partition à cette taille. Nous y " "travaillons !" -#: libparted/fs/r/fat/table.c:136 +#: 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 " @@ -2109,43 +2052,43 @@ msgstr "" "La table FAT %d du média %x ne concorde pas avec le secteur d’amorce du " "média %x. Vous devriez probablement exécuter scandisk." -#: libparted/fs/r/fat/table.c:268 +#: libparted/fs/r/fat/table.c:269 #, c-format msgid "fat_table_set: cluster %ld outside file system" msgstr "fat_table_set : cluster %ld en dehors du système de fichiers" -#: libparted/fs/r/fat/table.c:300 +#: libparted/fs/r/fat/table.c:301 #, c-format msgid "fat_table_get: cluster %ld outside file system" msgstr "fat_table_get : cluster %ld en dehors du système de fichiers" -#: libparted/fs/r/fat/table.c:342 +#: libparted/fs/r/fat/table.c:343 msgid "fat_table_alloc_cluster: no free clusters" msgstr "fat_table_alloc_cluster : pas de cluster disponible" -#: libparted/fs/r/filesys.c:151 +#: libparted/fs/r/filesys.c:152 msgid "Could not detect file system." msgstr "Impossible de détecter le système de fichiers." -#: libparted/fs/r/filesys.c:158 libparted/fs/r/filesys.c:285 +#: libparted/fs/r/filesys.c:159 libparted/fs/r/filesys.c:284 #, c-format msgid "resizing %s file systems is not supported" msgstr "" "la modification de la taille du système de fichiers %s n’est pas prise en " "charge" -#: libparted/fs/r/filesys.c:170 +#: libparted/fs/r/filesys.c:171 msgid "The file system is bigger than its volume!" msgstr "Le système de fichiers est plus gros que le volume physique !" -#: libparted/fs/r/hfs/advfs.c:121 libparted/fs/r/hfs/advfs_plus.c:121 -#: libparted/fs/r/hfs/reloc.c:413 libparted/fs/r/hfs/reloc.c:507 -#: libparted/fs/r/hfs/reloc_plus.c:538 libparted/fs/r/hfs/reloc_plus.c:656 -#: libparted/fs/r/hfs/reloc_plus.c:769 +#: 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 "Le système de fichiers contient des erreurs." -#: libparted/fs/r/hfs/advfs_plus.c:285 +#: libparted/fs/r/hfs/advfs_plus.c:287 msgid "Bad blocks could not be read." msgstr "Les blocs défectueux ne peuvent pas être lus." @@ -2220,68 +2163,68 @@ msgstr "" "Tentative d’écriture d’un fichier HFS+ ayant un CNID %X après la fin du " "fichier." -#: libparted/fs/r/hfs/hfs.c:232 +#: libparted/fs/r/hfs/hfs.c:212 msgid "Sorry, HFS cannot be resized that way yet." msgstr "" "Désolé, le système de fichiers HFS ne peut être redimensionné de cette " "manière pour le moment." -#: libparted/fs/r/hfs/hfs.c:250 libparted/fs/r/hfs/hfs.c:629 +#: libparted/fs/r/hfs/hfs.c:230 libparted/fs/r/hfs/hfs.c:573 msgid "shrinking" msgstr "réduction en cours" -#: libparted/fs/r/hfs/hfs.c:262 libparted/fs/r/hfs/hfs.c:641 +#: libparted/fs/r/hfs/hfs.c:242 libparted/fs/r/hfs/hfs.c:585 msgid "Data relocation has failed." msgstr "Le déplacement des données a échoué." -#: libparted/fs/r/hfs/hfs.c:281 +#: libparted/fs/r/hfs/hfs.c:261 msgid "Data relocation left some data in the end of the volume." msgstr "" "Le déplacement des données a laissé certaines données à la fin du volume." -#: libparted/fs/r/hfs/hfs.c:320 +#: libparted/fs/r/hfs/hfs.c:300 msgid "writing HFS Master Directory Block" msgstr "écriture du Master Directory Block HFS" -#: libparted/fs/r/hfs/hfs.c:468 +#: libparted/fs/r/hfs/hfs.c:412 msgid "No valid HFS[+X] signature has been found while opening." msgstr "Aucune signature HFS[+X] valide n’a été trouvée lors de l’ouverture." -#: libparted/fs/r/hfs/hfs.c:478 +#: libparted/fs/r/hfs/hfs.c:422 #, c-format msgid "Version %d of HFS+ isn't supported." msgstr "La version %d du système de fichiers HFS+ n’est pas prise en charge." -#: libparted/fs/r/hfs/hfs.c:489 +#: libparted/fs/r/hfs/hfs.c:433 #, c-format msgid "Version %d of HFSX isn't supported." msgstr "La version %d du système de fichiers HFSX n’est pas prise en charge." -#: libparted/fs/r/hfs/hfs.c:672 +#: libparted/fs/r/hfs/hfs.c:616 msgid "Data relocation left some data at the end of the volume." msgstr "" "Le déplacement des données a laissé certaines données à la fin du volume." -#: libparted/fs/r/hfs/hfs.c:720 +#: libparted/fs/r/hfs/hfs.c:664 msgid "Error while writing the allocation file." msgstr "Erreur lors de l’écriture du fichier d’allocation." -#: libparted/fs/r/hfs/hfs.c:735 +#: libparted/fs/r/hfs/hfs.c:679 msgid "Error while writing the compatibility part of the allocation file." msgstr "" "Erreur durant l’écriture de la zone de compatibilité du fichier d’allocation." -#: libparted/fs/r/hfs/hfs.c:750 +#: libparted/fs/r/hfs/hfs.c:694 msgid "writing HFS+ Volume Header" msgstr "écriture de l’entête de volume HFS+" -#: libparted/fs/r/hfs/hfs.c:850 +#: libparted/fs/r/hfs/hfs.c:794 msgid "An error occurred while looking for the mandatory bad blocks file." msgstr "" "Une erreur est survenue lors de la recherche du fichier de gestion des blocs " "défectueux." -#: libparted/fs/r/hfs/hfs.c:904 +#: 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." @@ -2289,29 +2232,29 @@ msgstr "" "Il semble qu’il y ait une erreur dans le gestionnaire HFS : le fichier des " "blocs défectueux contient le volume HFS+." -#: libparted/fs/r/hfs/hfs.c:940 +#: libparted/fs/r/hfs/hfs.c:883 msgid "Sorry, HFS+ cannot be resized that way yet." msgstr "" "Désolé, le système de fichiers HFS+ ne peut être redimensionné de cette " "manière pour le moment." -#: libparted/fs/r/hfs/hfs.c:975 +#: libparted/fs/r/hfs/hfs.c:918 msgid "shrinking embedded HFS+ volume" msgstr "réduction du volume HFS+" -#: libparted/fs/r/hfs/hfs.c:992 +#: libparted/fs/r/hfs/hfs.c:935 msgid "Resizing the HFS+ volume has failed." msgstr "Le redimensionnement du volume HFS+ a échoué." -#: libparted/fs/r/hfs/hfs.c:999 +#: libparted/fs/r/hfs/hfs.c:942 msgid "shrinking HFS wrapper" msgstr "réajustement du conteneur HFS" -#: libparted/fs/r/hfs/hfs.c:1008 +#: libparted/fs/r/hfs/hfs.c:951 msgid "Updating the HFS wrapper has failed." msgstr "La mise à jour du conteneur HFS a échoué." -#: libparted/fs/r/hfs/hfs.c:1110 libparted/fs/r/hfs/hfs.c:1195 +#: 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 " @@ -2395,7 +2338,7 @@ msgstr "" msgid "An extent has not been relocated." msgstr "Une zone n’a pas été réallouée." -#: libparted/fs/r/hfs/reloc.c:250 libparted/fs/r/hfs/reloc_plus.c:307 +#: 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!" @@ -2403,18 +2346,18 @@ msgstr "" "Une référence à une zone correspond à une localisation qui ne devrait pas y " "être associée. Vous devriez vérifier le système de fichiers." -#: libparted/fs/r/hfs/reloc.c:380 +#: libparted/fs/r/hfs/reloc.c:382 msgid "This HFS volume has no catalog file. This is very unusual!" msgstr "" "Ce volume HFS n’a pas de fichier catalogue. C’est vraiment inhabituel !" -#: libparted/fs/r/hfs/reloc.c:474 +#: libparted/fs/r/hfs/reloc.c:479 msgid "This HFS volume has no extents overflow file. This is quite unusual!" msgstr "" "Ce volume HFS n’a pas de fichier de zones additionnelles. C’est plutôt " "inhabituel !" -#: libparted/fs/r/hfs/reloc.c:516 libparted/fs/r/hfs/reloc_plus.c:666 +#: 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." @@ -2422,54 +2365,54 @@ msgstr "" "Le fichier de zones additionnelles ne devrait pas contenir sa propre zone ! " "Vous devriez vérifier le système de fichiers." -#: libparted/fs/r/hfs/reloc.c:573 libparted/fs/r/hfs/reloc_plus.c:844 +#: 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 "Impossible d’indexer le système de fichiers en mémoire." -#: libparted/fs/r/hfs/reloc.c:634 libparted/fs/r/hfs/reloc_plus.c:905 +#: libparted/fs/r/hfs/reloc.c:640 libparted/fs/r/hfs/reloc_plus.c:910 msgid "Bad blocks list could not be loaded." msgstr "La liste des blocs défectueux ne peut être chargée." -#: libparted/fs/r/hfs/reloc.c:648 libparted/fs/r/hfs/reloc_plus.c:921 +#: libparted/fs/r/hfs/reloc.c:654 libparted/fs/r/hfs/reloc_plus.c:926 msgid "An error occurred during extent relocation." msgstr "Une erreur est survenue pendant le déplacement de la zone." -#: libparted/fs/r/hfs/reloc_plus.c:494 +#: libparted/fs/r/hfs/reloc_plus.c:495 msgid "This HFS+ volume has no catalog file. This is very unusual!" msgstr "" "Ce volume HFS+ n’a pas de fichier catalogue. C’est vraiment inhabituel !" -#: libparted/fs/r/hfs/reloc_plus.c:617 +#: libparted/fs/r/hfs/reloc_plus.c:620 msgid "This HFS+ volume has no extents overflow file. This is quite unusual!" msgstr "" "Ce volume HFS+ n’a pas de fichier de zones additionnelles. C’est plutôt " "inhabituel !" -#: parted/parted.c:125 +#: parted/parted.c:126 msgid "displays this help message" msgstr "affiche ce message d’aide" -#: parted/parted.c:126 +#: parted/parted.c:127 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:127 +#: parted/parted.c:128 msgid "displays machine parseable output" msgstr "sortie dans un style lisible par une machine" -#: parted/parted.c:128 +#: parted/parted.c:129 msgid "never prompts for user intervention" msgstr "ne demande jamais l’intervention de l’utilisateur" -#: parted/parted.c:129 +#: parted/parted.c:130 msgid "displays the version" msgstr "affiche la version" -#: parted/parted.c:130 +#: parted/parted.c:131 msgid "alignment for new partitions" msgstr "alignement des nouvelles partitions" -#: parted/parted.c:142 +#: parted/parted.c:143 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" @@ -2478,31 +2421,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:145 +#: parted/parted.c:146 msgid "LABEL-TYPE is one of: " msgstr "LABEL-TYPE est une des valeurs : " -#: parted/parted.c:146 parted/parted.c:147 +#: parted/parted.c:147 parted/parted.c:148 msgid "FLAG is one of: " msgstr "DRAPEAU est une des valeurs : " -#: parted/parted.c:148 +#: parted/parted.c:149 msgid "UNIT is one of: " msgstr "UNITÉ est parmi : " -#: parted/parted.c:149 +#: parted/parted.c:150 msgid "desired alignment: minimum or optimal" msgstr "alignement souhaité : minimum ou optimal" -#: parted/parted.c:150 +#: parted/parted.c:151 msgid "PART-TYPE is one of: primary, logical, extended\n" msgstr "PART-TYPE est une des valeurs : primaire, logique, étendue\n" -#: parted/parted.c:152 +#: parted/parted.c:153 msgid "FS-TYPE is one of: " msgstr "FS-TYPE est parmi : " -#: parted/parted.c:153 +#: parted/parted.c:154 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 " @@ -2512,7 +2455,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:156 +#: parted/parted.c:157 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" @@ -2521,19 +2464,19 @@ msgstr "" "se compte à partir de la fin du disque. Par exemple, -1s spécifie " "précisément le dernier secteur.\n" -#: parted/parted.c:159 +#: parted/parted.c:160 msgid "STATE is one of: on, off\n" msgstr "ÉTAT est une des valeurs : on, off\n" -#: parted/parted.c:160 +#: parted/parted.c:161 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:161 +#: parted/parted.c:162 msgid "NAME is any word you want\n" msgstr "NOM est un mot de votre choix\n" -#: parted/parted.c:164 +#: parted/parted.c:165 msgid "" "Copyright (C) 1998 - 2006 Free Software Foundation, Inc.\n" "This program is free software, covered by the GNU General Public License.\n" @@ -2553,24 +2496,24 @@ msgstr "" "GNU pour plus de détails.\n" "\n" -#: parted/parted.c:212 +#: parted/parted.c:213 #, c-format msgid "%0.f%%\t(time left %.2d:%.2d)" msgstr "%0.f%%\t(temps restant %.2d:%.2d)" -#: parted/parted.c:231 +#: parted/parted.c:232 #, 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:252 +#: parted/parted.c:253 #, 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:264 +#: parted/parted.c:265 #, c-format msgid "" "The existing disk label on %s will be destroyed and all data on this disk " @@ -2579,31 +2522,31 @@ msgstr "" "Le type du disque %s va être effacé et toutes les données vont être perdues. " "Voulez-vous continuer ?" -#: parted/parted.c:525 +#: parted/parted.c:526 msgid "New disk label type?" msgstr "Nouveau type d’étiquette de disque ?" -#: parted/parted.c:662 +#: parted/parted.c:663 msgid "Partition type?" msgstr "Type de partition ?" -#: parted/parted.c:680 parted/parted.c:884 +#: parted/parted.c:681 parted/parted.c:885 msgid "Partition name?" msgstr "Nom de la partition ?" -#: parted/parted.c:690 +#: parted/parted.c:691 msgid "File system type?" msgstr "Type de système de fichiers ?" -#: parted/parted.c:695 parted/parted.c:1498 +#: parted/parted.c:696 parted/parted.c:1499 msgid "Start?" msgstr "Début ?" -#: parted/parted.c:698 parted/parted.c:1500 parted/parted.c:1569 +#: parted/parted.c:699 parted/parted.c:1501 parted/parted.c:1585 msgid "End?" msgstr "Fin ?" -#: parted/parted.c:766 +#: parted/parted.c:767 #, c-format msgid "" "You requested a partition from %s to %s (sectors %llu..%llu).\n" @@ -2612,7 +2555,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:775 +#: parted/parted.c:776 msgid "" "\n" "Is this still acceptable to you?" @@ -2620,7 +2563,7 @@ msgstr "" "\n" "Est-ce acceptable pour vous ?" -#: parted/parted.c:798 +#: parted/parted.c:799 #, fuzzy, c-format msgid "" "The resulting partition is not properly aligned for best performance: %s" @@ -2628,90 +2571,90 @@ msgstr "" "L’alignement de la partition ainsi définie n’est pas optimal au niveau " "performance." -#: parted/parted.c:800 parted/parted.c:1723 +#: parted/parted.c:801 parted/parted.c:1739 msgid "unknown (malloc failed)" msgstr "" -#: parted/parted.c:876 +#: parted/parted.c:877 #, fuzzy, c-format msgid "%s disk labels do not support partition name." msgstr "" "Les étiquettes du disque %s ne prennent pas en charge les partitions " "étendues." -#: parted/parted.c:881 parted/parted.c:1561 parted/parted.c:1612 -#: parted/parted.c:1706 parted/parted.c:1781 +#: parted/parted.c:882 parted/parted.c:1564 parted/parted.c:1628 +#: parted/parted.c:1722 parted/parted.c:1797 msgid "Partition number?" msgstr "Numéro de partition ?" -#: parted/parted.c:975 +#: parted/parted.c:976 #, 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:1017 +#: parted/parted.c:1018 #, c-format msgid "Model: %s (%s)\n" msgstr "Modèle : %s (%s)\n" -#: parted/parted.c:1019 +#: parted/parted.c:1020 #, c-format msgid "Disk %s: %s\n" msgstr "Disque %s : %s\n" -#: parted/parted.c:1020 +#: parted/parted.c:1021 #, c-format msgid "Sector size (logical/physical): %lldB/%lldB\n" msgstr "Taille des secteurs (logiques/physiques) : %lldB/%lldB\n" -#: parted/parted.c:1032 +#: parted/parted.c:1033 #, c-format msgid "Partition Table: %s\n" msgstr "Table de partitions : %s\n" -#: parted/parted.c:1033 +#: parted/parted.c:1034 #, c-format msgid "Disk Flags: %s\n" msgstr "Drapeaux de disque : %s\n" -#: parted/parted.c:1153 parted/parted.c:1156 +#: parted/parted.c:1154 parted/parted.c:1157 msgid "Number" msgstr "Numéro" -#: parted/parted.c:1153 parted/parted.c:1156 +#: parted/parted.c:1154 parted/parted.c:1157 msgid "Start" msgstr "Début" -#: parted/parted.c:1154 parted/parted.c:1157 +#: parted/parted.c:1155 parted/parted.c:1158 msgid "End" msgstr "Fin" -#: parted/parted.c:1157 +#: parted/parted.c:1158 msgid "Size" msgstr "Taille" -#: parted/parted.c:1161 +#: parted/parted.c:1162 msgid "Type" msgstr "Type" -#: parted/parted.c:1163 +#: parted/parted.c:1164 msgid "File system" msgstr "Système de fichiers" -#: parted/parted.c:1166 +#: parted/parted.c:1167 msgid "Name" msgstr "Nom" -#: parted/parted.c:1168 +#: parted/parted.c:1169 msgid "Flags" msgstr "Drapeaux" -#: parted/parted.c:1225 +#: parted/parted.c:1226 msgid "Free Space" msgstr "Espace libre" -#: parted/parted.c:1385 +#: parted/parted.c:1386 #, c-format msgid "" "A %s %s partition was found at %s -> %s. Do you want to add it to the " @@ -2720,56 +2663,56 @@ msgstr "" "Une partition %s %s a été localisée de %s à %s. Voulez-vous l’ajouter à la " "table de partition ?" -#: parted/parted.c:1428 +#: parted/parted.c:1429 msgid "searching for file systems" msgstr "recherche des systèmes de fichiers" -#: parted/parted.c:1535 +#: parted/parted.c:1536 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:1583 +#: parted/parted.c:1599 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:1636 +#: parted/parted.c:1652 msgid "New device?" msgstr "Nouveau périphérique ?" -#: parted/parted.c:1704 +#: parted/parted.c:1720 msgid "alignment type(min/opt)" msgstr "type d’alignement (min/opt)" -#: parted/parted.c:1719 +#: parted/parted.c:1735 #, c-format msgid "%d aligned\n" msgstr "%d aligné(es)\n" -#: parted/parted.c:1721 +#: parted/parted.c:1737 #, fuzzy, c-format msgid "%d not aligned: %s\n" msgstr "%d non aligné(es)\n" -#: parted/parted.c:1746 parted/parted.c:1783 +#: parted/parted.c:1762 parted/parted.c:1799 msgid "Flag to Invert?" msgstr "Drapeaux à basculer ?" -#: parted/parted.c:1751 parted/parted.c:1788 +#: parted/parted.c:1767 parted/parted.c:1804 msgid "New state?" msgstr "Nouvel état ?" -#: parted/parted.c:1834 +#: parted/parted.c:1850 msgid "Unit?" msgstr "Unité ?" -#: parted/parted.c:1969 +#: parted/parted.c:1985 msgid "align-check" msgstr "vérifier-align" -#: parted/parted.c:1972 +#: parted/parted.c:1988 #, fuzzy msgid "" "align-check TYPE N check partition N for TYPE(min|opt) " @@ -2778,11 +2721,11 @@ msgstr "" "vérifier-align TYPE N contrôle l’alignement de TYPE(min|" "opt) de la partition N" -#: parted/parted.c:1980 +#: parted/parted.c:1996 msgid "help" msgstr "aide" -#: parted/parted.c:1983 +#: parted/parted.c:1999 msgid "" "help [COMMAND] print general help, or help on " "COMMAND" @@ -2790,15 +2733,15 @@ msgstr "" "help [COMMANDE] affiche l’aide générale ou l’aide " "concernant la COMMANDE" -#: parted/parted.c:1989 +#: parted/parted.c:2005 msgid "mklabel" msgstr "mklabel" -#: parted/parted.c:1989 +#: parted/parted.c:2005 msgid "mktable" msgstr "mktable" -#: parted/parted.c:1992 +#: parted/parted.c:2008 msgid "" "mklabel,mktable LABEL-TYPE create a new disklabel (partition " "table)" @@ -2806,15 +2749,15 @@ msgstr "" "mklabel,mktable LABEL-TYPE crée une nouvelle étiquette de " "disque (table de partition)" -#: parted/parted.c:1998 +#: parted/parted.c:2014 msgid "mkpart" msgstr "mkpart" -#: parted/parted.c:2001 +#: parted/parted.c:2017 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:2007 +#: parted/parted.c:2023 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" @@ -2823,20 +2766,20 @@ msgstr "" "la partition. FS-TYPE doit être spécifié pour initialiser le type de " "partition approprié.\n" -#: parted/parted.c:2012 +#: parted/parted.c:2028 msgid "name" msgstr "nommer" -#: parted/parted.c:2015 +#: parted/parted.c:2031 msgid "name NUMBER NAME name partition NUMBER as NAME" msgstr "" "name NUMÉRO NOM donner un NOM à la partition NUMÉRO" -#: parted/parted.c:2020 +#: parted/parted.c:2036 msgid "print" msgstr "afficher" -#: parted/parted.c:2023 +#: parted/parted.c:2039 msgid "" "print [devices|free|list,all|NUMBER] display the partition table, " "available devices, free space, all found partitions, or a particular " @@ -2846,7 +2789,7 @@ msgstr "" "les périphériques disponibles, l’espace libre, toutes les partitions ou une " "partition précise" -#: parted/parted.c:2028 +#: parted/parted.c:2044 msgid "" "Without arguments, 'print' displays the entire partition table. However with " "the following arguments it performs various other actions.\n" @@ -2854,11 +2797,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:2030 +#: parted/parted.c:2046 msgid " devices : display all active block devices\n" msgstr " devices : affiche tous les périphériques par blocs actifs\n" -#: parted/parted.c:2031 +#: parted/parted.c:2047 msgid "" " free : display information about free unpartitioned space on the " "current block device\n" @@ -2866,33 +2809,33 @@ msgstr "" " free : affiche l’information sur l’espace libre non partitionné du " "périphérique courant\n" -#: parted/parted.c:2033 +#: parted/parted.c:2049 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:2034 +#: parted/parted.c:2050 msgid "" " NUMBER : display more detailed information about this particular " "partition\n" msgstr "" " NUMÉRO : affiche les informations détaillées sur la partition désignée\n" -#: parted/parted.c:2039 +#: parted/parted.c:2055 msgid "quit" msgstr "quitter" -#: parted/parted.c:2042 +#: parted/parted.c:2058 msgid "quit exit program" msgstr "quit quitter le programme" -#: parted/parted.c:2047 +#: parted/parted.c:2063 msgid "rescue" msgstr "rescue" -#: parted/parted.c:2050 +#: parted/parted.c:2066 msgid "" "rescue START END rescue a lost partition near START " "and END" @@ -2900,55 +2843,55 @@ msgstr "" "rescue DEBUT FIN restaurer une partition perdue " "entre DEBUT et FIN" -#: parted/parted.c:2056 +#: parted/parted.c:2072 msgid "resize" msgstr "redimentionner" -#: parted/parted.c:2059 +#: parted/parted.c:2075 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:2062 +#: parted/parted.c:2078 msgid "resizepart" msgstr "redimpart" -#: parted/parted.c:2065 +#: parted/parted.c:2081 msgid "resizepart NUMBER END resize partition NUMBER" msgstr "redimpart NUMÉRO FIN redim partition NUMÉRO" -#: parted/parted.c:2070 +#: parted/parted.c:2086 msgid "rm" msgstr "rm" -#: parted/parted.c:2073 +#: parted/parted.c:2089 msgid "rm NUMBER delete partition NUMBER" msgstr "rm NUMÉRO détruire partition NUMÉRO" -#: parted/parted.c:2078 +#: parted/parted.c:2094 msgid "select" msgstr "sélectionner" -#: parted/parted.c:2081 +#: parted/parted.c:2097 msgid "select DEVICE choose the device to edit" msgstr "" "choisir PÉRIPHÉRIQUE choisir le périphérique à modifier" -#: parted/parted.c:2086 +#: parted/parted.c:2102 msgid "disk_set" msgstr "disque_choix" -#: parted/parted.c:2089 +#: parted/parted.c:2105 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:2094 +#: parted/parted.c:2110 msgid "disk_toggle" msgstr "disque_basculer" -#: parted/parted.c:2097 +#: parted/parted.c:2113 msgid "" "disk_toggle [FLAG] toggle the state of FLAG on " "selected device" @@ -2956,22 +2899,22 @@ msgstr "" "disque_basculer [DRAPEAU] basculer l’état du drapeau du " "périphérique choisi" -#: parted/parted.c:2103 +#: parted/parted.c:2119 msgid "set" msgstr "positionner" -#: parted/parted.c:2106 +#: parted/parted.c:2122 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:2112 +#: parted/parted.c:2128 msgid "toggle" msgstr "basculer" -#: parted/parted.c:2115 +#: parted/parted.c:2131 msgid "" "toggle [NUMBER [FLAG]] toggle the state of FLAG on " "partition NUMBER" @@ -2979,20 +2922,20 @@ msgstr "" "basculer [NUMÉRO [DRAPEAU]] basculer l’état du DRAPEAU de la " "partition NUMÉRO" -#: parted/parted.c:2121 +#: parted/parted.c:2137 msgid "unit" msgstr "unité" -#: parted/parted.c:2124 +#: parted/parted.c:2140 msgid "unit UNIT set the default unit to UNIT" msgstr "" "unité UNITÉ définie l’unité par défaut à UNITÉ" -#: parted/parted.c:2129 +#: parted/parted.c:2145 msgid "version" msgstr "version" -#: parted/parted.c:2132 +#: parted/parted.c:2148 msgid "" "version display the version number and " "copyright information of GNU Parted" @@ -3000,39 +2943,48 @@ msgstr "" "version affiche la version courante de GNU " "Parted ainsi que l’information sur le copyright" -#: parted/parted.c:2136 +#: parted/parted.c:2152 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:2204 +#: parted/parted.c:2220 #, c-format msgid "Usage: %s [-hlmsv] [-a] [DEVICE [COMMAND [PARAMETERS]]...]\n" msgstr "" "Usage : %s [-hlmsv] [-a ] [PÉRIPHÉRIQUE [COMMANDE [PARAMÈTRES]]" "…]\n" -#: parted/parted.c:2248 +#: parted/parted.c:2264 msgid "No device found" msgstr "Aucun périphérique trouvé" -#: parted/parted.c:2285 +#: parted/parted.c:2301 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:2325 +#: parted/parted.c:2334 +msgid "" +"You should reinstall your boot loader before rebooting. Read section 4 of " +"the Parted User documentation for more information." +msgstr "" +"Vous devriez réinstaller le gestionnaire de démarrage avant de redémarrer. " +"Consultez la section 4 de la documentation utilisateur de Parted pour plus " +"d’informations." + +#: parted/parted.c:2341 msgid "You may need to update /etc/fstab.\n" msgstr "Ne pas oublier de mettre à jour /etc/fstab si nécessaire.\n" -#: parted/ui.c:164 +#: parted/ui.c:165 msgid "Welcome to GNU Parted! Type 'help' to view a list of commands.\n" msgstr "" "Bienvenue sur GNU Parted ! Tapez « help » pour voir la liste des commandes.\n" -#: parted/ui.c:167 +#: parted/ui.c:168 msgid "" "Usage: parted [OPTION]... [DEVICE [COMMAND [PARAMETERS]...]...]\n" "Apply COMMANDs with PARAMETERS to DEVICE. If no COMMAND(s) are given, run " @@ -3044,7 +2996,7 @@ msgstr "" "COMMANDE n’est fournie\n" "l’exécution se fait en mode interactif.\n" -#: parted/ui.c:172 +#: parted/ui.c:173 #, c-format msgid "" "\n" @@ -3107,7 +3059,7 @@ msgstr "" "Plus toutes les informations supplémentaires que vous trouverez importantes " "à propos de votre configuration.\n" -#: parted/ui.c:293 +#: parted/ui.c:294 msgid "" "\n" "Command History:\n" @@ -3115,7 +3067,7 @@ msgstr "" "\n" "Historique des commandes :\n" -#: parted/ui.c:356 +#: parted/ui.c:357 msgid "" "\n" "Error: SEGV_MAPERR (Address not mapped to object)\n" @@ -3123,7 +3075,7 @@ msgstr "" "\n" "Erreur : SEGV_MAPERR (l’adresse n’est pas associée à un objet)\n" -#: parted/ui.c:362 +#: parted/ui.c:363 msgid "" "\n" "Error: SEGV_ACCERR (Invalid permissions for mapped object)\n" @@ -3131,7 +3083,7 @@ msgstr "" "\n" "Erreur : SEGV_ACCERR (permissions invalides pour l’objet associé)\n" -#: parted/ui.c:367 +#: parted/ui.c:368 msgid "" "\n" "Error: A general SIGSEGV signal was encountered.\n" @@ -3139,7 +3091,7 @@ msgstr "" "\n" "Erreur : un signal SIGSEGV général est survenu.\n" -#: parted/ui.c:391 +#: parted/ui.c:392 msgid "" "\n" "Error: FPE_INTDIV (Integer: divide by zero)" @@ -3147,7 +3099,7 @@ msgstr "" "\n" "Erreur : FPE_INTDIV (Entier : division par zéro)" -#: parted/ui.c:396 +#: parted/ui.c:397 msgid "" "\n" "Error: FPE_INTOVF (Integer: overflow)" @@ -3155,7 +3107,7 @@ msgstr "" "\n" "Erreur : FPE_INTOVF (Entier : dépassement)" -#: parted/ui.c:401 +#: parted/ui.c:402 msgid "" "\n" "Error: FPE_FLTDIV (Float: divide by zero)" @@ -3163,7 +3115,7 @@ msgstr "" "\n" "Erreur : FPE_INTDIV (division par zéro en nombres flottants)" -#: parted/ui.c:406 +#: parted/ui.c:407 msgid "" "\n" "Error: FPE_FLTOVF (Float: overflow)" @@ -3171,7 +3123,7 @@ msgstr "" "\n" "Erreur : FPE_FLTOVF (Flottant : dépassement)" -#: parted/ui.c:411 +#: parted/ui.c:412 msgid "" "\n" "Error: FPE_FLTUND (Float: underflow)" @@ -3179,7 +3131,7 @@ msgstr "" "\n" "Erreur : FPE_FLTUND (Flottant: dépassement de précision)" -#: parted/ui.c:416 +#: parted/ui.c:417 msgid "" "\n" "Error: FPE_FLTRES (Float: inexact result)" @@ -3187,7 +3139,7 @@ msgstr "" "\n" "Erreur : PE_FLTRES (Flottant : résultat inexact)" -#: parted/ui.c:421 +#: parted/ui.c:422 msgid "" "\n" "Error: FPE_FLTINV (Float: invalid operation)" @@ -3195,7 +3147,7 @@ msgstr "" "\n" "Erreur : FPE_FLTINV (Flottant : opération invalide)" -#: parted/ui.c:426 +#: parted/ui.c:427 msgid "" "\n" "Error: FPE_FLTSUB (Float: subscript out of range)" @@ -3203,7 +3155,7 @@ msgstr "" "\n" "Erreur : FPE_FLTSUB (Flottant: débordement de plage)" -#: parted/ui.c:431 +#: parted/ui.c:432 msgid "" "\n" "Error: A general SIGFPE signal was encountered." @@ -3211,7 +3163,7 @@ msgstr "" "\n" "Erreur : Un signal SIGFPE général est survenu." -#: parted/ui.c:455 +#: parted/ui.c:456 msgid "" "\n" "Error: ILL_ILLOPC (Illegal Opcode)" @@ -3219,7 +3171,7 @@ msgstr "" "\n" "Erreur : ILL_ILLOPC (Opcode illégal)" -#: parted/ui.c:460 +#: parted/ui.c:461 msgid "" "\n" "Error: ILL_ILLOPN (Illegal Operand)" @@ -3227,7 +3179,7 @@ msgstr "" "\n" "Erreur : ILL_ILLOPN (Opérande illégal)" -#: parted/ui.c:465 +#: parted/ui.c:466 msgid "" "\n" "Error: ILL_ILLADR (Illegal addressing mode)" @@ -3235,7 +3187,7 @@ msgstr "" "\n" "Erreur : ILL_ILLADR (Mode d’adressage illégal)" -#: parted/ui.c:470 +#: parted/ui.c:471 msgid "" "\n" "Error: ILL_ILLTRP (Illegal Trap)" @@ -3243,7 +3195,7 @@ msgstr "" "\n" "Erreur : ILL_ILLTRP (Déroutement illégal)" -#: parted/ui.c:475 +#: parted/ui.c:476 msgid "" "\n" "Error: ILL_PRVOPC (Privileged Opcode)" @@ -3251,7 +3203,7 @@ msgstr "" "\n" "Erreur : ILL_PRVOPC (Opcode privilégié)" -#: parted/ui.c:480 +#: parted/ui.c:481 msgid "" "\n" "Error: ILL_PRVREG (Privileged Register)" @@ -3259,7 +3211,7 @@ msgstr "" "\n" "Erreur : ILL_PRVREG (Registre privilégié)" -#: parted/ui.c:485 +#: parted/ui.c:486 msgid "" "\n" "Error: ILL_COPROC (Coprocessor Error)" @@ -3267,7 +3219,7 @@ msgstr "" "\n" "Erreur : ILL_COPROC (Erreur du coprocesseur)" -#: parted/ui.c:490 +#: parted/ui.c:491 msgid "" "\n" "Error: ILL_BADSTK (Internal Stack Error)" @@ -3275,7 +3227,7 @@ msgstr "" "\n" "Erreur : ILL_BADSTK (Erreur de pile interne)" -#: parted/ui.c:495 +#: parted/ui.c:496 msgid "" "\n" "Error: A general SIGILL signal was encountered." @@ -3283,69 +3235,69 @@ msgstr "" "\n" "Erreur : un signal SIGILL général est survenu." -#: parted/ui.c:888 +#: parted/ui.c:889 #, c-format msgid "invalid token: %s" msgstr "élément incorrect : %s" -#: parted/ui.c:1069 +#: parted/ui.c:1070 msgid "Expecting a partition number." msgstr "Numéro de partition attendu." -#: parted/ui.c:1078 +#: parted/ui.c:1079 msgid "Partition doesn't exist." msgstr "La partition n’existe pas." -#: parted/ui.c:1098 +#: parted/ui.c:1099 msgid "Expecting a file system type." msgstr "Type de système de fichiers attendu." -#: parted/ui.c:1105 +#: parted/ui.c:1106 #, c-format msgid "Unknown file system type \"%s\"." msgstr "Type de système de fichiers inconnu « %s »." -#: parted/ui.c:1126 +#: parted/ui.c:1127 msgid "Expecting a disk label type." msgstr "Type d’étiquette de disque attendu." -#: parted/ui.c:1157 parted/ui.c:1193 +#: parted/ui.c:1158 parted/ui.c:1194 msgid "No flags supported" msgstr "" -#: parted/ui.c:1267 +#: parted/ui.c:1268 msgid "Can't create any more partitions." msgstr "Impossible d’ajouter de nouvelle partition." -#: parted/ui.c:1277 +#: parted/ui.c:1278 msgid "Expecting a partition type." msgstr "Type de partition attendu." -#: parted/ui.c:1426 +#: parted/ui.c:1427 msgid "on" msgstr "on" -#: parted/ui.c:1427 +#: parted/ui.c:1428 msgid "off" msgstr "off" -#: parted/ui.c:1444 +#: parted/ui.c:1445 msgid "optimal" msgstr "optimal" -#: parted/ui.c:1445 +#: parted/ui.c:1446 msgid "minimal" msgstr "minimal" -#: parted/ui.c:1578 +#: parted/ui.c:1579 msgid "OPTIONs:" msgstr "OPTIONS :" -#: parted/ui.c:1583 +#: parted/ui.c:1584 msgid "COMMANDs:" msgstr "COMMANDES :" -#: parted/ui.c:1586 +#: parted/ui.c:1587 #, c-format msgid "" "\n" @@ -3354,30 +3306,78 @@ msgstr "" "\n" "Rapporter les anomalies à %s\n" -#: parted/ui.c:1593 +#: parted/ui.c:1594 #, c-format msgid "Using %s\n" msgstr "Utilisation de %s\n" -#: parted/ui.c:1673 +#: parted/ui.c:1674 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" +#, c-format #~ msgid "%s: option '--%s' doesn't allow an argument\n" #~ msgstr "%s : l’option « --%s » ne prend pas d’argument\n" +#, c-format #~ msgid "%s: unrecognized option '--%s'\n" #~ msgstr "%s : option « --%s » inconnue\n" +#, c-format #~ msgid "%s: option '-W %s' doesn't allow an argument\n" #~ msgstr "%s : l’option « -W %s » ne nécessite pas d’argument\n" +#, c-format #~ msgid "%s: option '-W %s' requires an argument\n" #~ msgstr "%s : l’option « -W %s » requiert un argument\n" +#, c-format #~ msgid "%s home page: \n" #~ msgstr "%s page web : \n" +#, c-format +#~ msgid "invalid %s%s argument '%s'" +#~ msgstr "invalide %s%s pour l’argument « %s »" + +#, c-format +#~ msgid "invalid suffix in %s%s argument '%s'" +#~ msgstr "suffixe invalide dans %s%s pour l’argument « %s »" + +#, c-format +#~ msgid "%s%s argument '%s' too large" +#~ msgstr "%s%s argument « %s » trop grand" + +#~ msgid "" +#~ "The partition table cannot be re-read. This means you need to reboot " +#~ "before mounting any modified partitions. You also need to reinstall your " +#~ "boot loader before you reboot (which may require mounting modified " +#~ "partitions). It is impossible do both things! So you'll need to boot " +#~ "off a rescue disk, and reinstall your boot loader from the rescue disk. " +#~ "Read section 4 of the Parted User documentation for more information." +#~ msgstr "" +#~ "La table de partition ne peut être relue, vous avez donc besoin de " +#~ "redémarrer avant de monter toute partition modifiée. Vous devez aussi " +#~ "réinstaller le gestionnaire de démarrage avant de redémarrer (ce qui peut " +#~ "nécessiter de monter les partitions modifiées). Il est impossible de " +#~ "faire ces deux choses à la fois ! C’est pourquoi vous aurez besoin de " +#~ "démarrer à partir d’un disque de secours et de réinstaller le " +#~ "gestionnaire de démarrage à partir de ce disque. Consultez la section 4 " +#~ "de la documentation utilisateur de Parted pour plus de détails." + +#, 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 " +#~ "computer before doing anything with %s." +#~ msgstr "" +#~ "La table de partition sur %s ne peut être relue (%s). Cela signifie que " +#~ "Hurd ne connaît rien des modifications effectuées. Vous devriez " +#~ "redémarrer l’ordinateur avant de faire quoi que ce soit avec %s." + +#~ msgid "The boot region doesn't start at the start of the partition." +#~ msgstr "La zone d’amorce n’est pas au début de la partition." + +#, 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." @@ -3385,3 +3385,11 @@ msgstr "Cette commande n’a pas de sens en mode non-interactif.\n" #~ "Ce système de fichier a une taille de secteur logique de %d. GNU Parted " #~ "ne traite pas correctement les tailles de secteurs différentes de 512 " #~ "octets." + +#, c-format +#~ msgid "" +#~ "The file %s is marked as a system file. This means moving it could cause " +#~ "some programs to stop working." +#~ msgstr "" +#~ "Le fichier %s est marqué comme fichier système. Cela signifie que son " +#~ "déplacement pourrait amener certains programmes à cesser de fonctionner." diff --git a/po/fur.gmo b/po/fur.gmo index 66dbb02ba8225e65cb4d3710f67c28d1d1031120..3e11fd1e3cfd00a6dd793bb1e2ef6d199de70dc5 100644 GIT binary patch delta 11322 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 Rm0l3&?iP@n>F$>1{ePgSX$=4X delta 12994 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 skL*@GGnqMMe~ap*g%76YZ4S6xyw3D)4{vq\n" "Language-Team: Friulian \n" @@ -97,11 +97,11 @@ msgstr "%s: la opzion e à bisugne di un argoment --'%c'\n" #. If you don't know what to put here, please see #. #. and use glyphs suitable for your language. -#: lib/quotearg.c:362 +#: lib/quotearg.c:355 msgid "`" msgstr "\\" -#: lib/quotearg.c:363 +#: lib/quotearg.c:356 msgid "'" msgstr "\\" @@ -369,32 +369,17 @@ msgstr "" msgid "memory exhausted" msgstr "memorie esauride" -#: lib/xstrtol-error.c:63 -#, c-format -msgid "invalid %s%s argument '%s'" -msgstr "l'argoment \\\"%3$s\\\" di %1$s%2$s nol è valit" - -#: lib/xstrtol-error.c:68 -#, 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" - -#: lib/xstrtol-error.c:72 -#, c-format -msgid "%s%s argument '%s' too large" -msgstr "l'argoment \\\"%3$s\\\" di %1$s%2$s al è masse grant" - -#: libparted/arch/beos.c:245 +#: libparted/arch/beos.c:246 msgid "Disk Image" msgstr "Imagjin disc" -#: libparted/arch/beos.c:346 libparted/arch/gnu.c:277 +#: libparted/arch/beos.c:347 libparted/arch/gnu.c:277 #: libparted/arch/linux.c:1731 #, c-format msgid "Error opening %s: %s" msgstr "Erôr tal vierzi %s: %s" -#: libparted/arch/beos.c:357 libparted/arch/gnu.c:287 +#: libparted/arch/beos.c:358 libparted/arch/gnu.c:287 #: libparted/arch/linux.c:1742 #, c-format msgid "Unable to open %s read-write (%s). %s has been opened read-only." @@ -402,47 +387,47 @@ msgstr "" "Impussibil vierzi %s in leture-scriture (%s). %s al è stât viert in " "modalitât dome-leture." -#: libparted/arch/beos.c:419 libparted/arch/linux.c:1907 +#: libparted/arch/beos.c:420 libparted/arch/linux.c:1907 #, c-format msgid "%s during seek for read on %s" msgstr "%s dulinvie il plaçament pe leture su %s" -#: libparted/arch/beos.c:452 libparted/arch/gnu.c:465 libparted/arch/gnu.c:564 -#: libparted/arch/gnu.c:692 libparted/arch/linux.c:1867 +#: libparted/arch/beos.c:453 libparted/arch/gnu.c:425 libparted/arch/gnu.c:524 +#: libparted/arch/gnu.c:652 libparted/arch/linux.c:1867 #: libparted/arch/linux.c:1949 #, c-format msgid "%s during read on %s" msgstr "%s dulinvie la leture su %s" -#: libparted/arch/beos.c:488 libparted/arch/gnu.c:525 +#: libparted/arch/beos.c:489 libparted/arch/gnu.c:485 #: libparted/arch/linux.c:2026 #, c-format msgid "Can't write to %s, because it is opened read-only." msgstr "Impussibil scrivi su %s parcè che al è viert in modalitât dome-leture." -#: libparted/arch/beos.c:504 libparted/arch/linux.c:2051 +#: libparted/arch/beos.c:505 libparted/arch/linux.c:2051 #, c-format msgid "%s during seek for write on %s" msgstr "%s dulinvie il plaçament pe scriture su %s" -#: libparted/arch/beos.c:541 libparted/arch/gnu.c:601 libparted/arch/gnu.c:646 -#: libparted/arch/gnu.c:723 libparted/arch/linux.c:1999 +#: libparted/arch/beos.c:542 libparted/arch/gnu.c:561 libparted/arch/gnu.c:606 +#: libparted/arch/gnu.c:683 libparted/arch/linux.c:1999 #: libparted/arch/linux.c:2094 libparted/arch/linux.c:2167 #, c-format msgid "%s during write on %s" msgstr "%s dulinvie la scriture su %s" -#: partprobe/partprobe.c:148 +#: partprobe/partprobe.c:149 #, c-format msgid "Try `%s --help' for more information.\n" msgstr "Prove \\\"%s --help\\\" par vê plui informazions.\n" -#: partprobe/partprobe.c:152 +#: partprobe/partprobe.c:153 #, c-format msgid "Usage: %s [OPTION] [DEVICE]...\n" msgstr "Ûs: %s [OPZION] [DISPOSITÎF]...\n" -#: partprobe/partprobe.c:153 +#: partprobe/partprobe.c:154 msgid "" "Inform the operating system about partition table changes.\n" "\n" @@ -458,7 +443,7 @@ msgstr "" " -h, --help mostre chest jutori e jes\n" " -v, --version stampe la version e jes\n" -#: partprobe/partprobe.c:161 +#: partprobe/partprobe.c:162 msgid "" "\n" "When no DEVICE is given, probe all partitions.\n" @@ -467,7 +452,7 @@ msgstr "" "Cuant che nol ven furnît nissun DISPOSITÎF, al scandaie dutis lis " "partizions.\n" -#: partprobe/partprobe.c:165 +#: partprobe/partprobe.c:166 #, c-format msgid "" "\n" @@ -485,43 +470,7 @@ msgstr "Impussibil vierzi %s." msgid "Unable to probe store." msgstr "Impussibil scandaiâ il dispositîf di archiviazion." -#: libparted/arch/gnu.c:368 -msgid "" -"The partition table cannot be re-read. This means you need to reboot before " -"mounting any modified partitions. You also need to reinstall your boot " -"loader before you reboot (which may require mounting modified partitions). " -"It is impossible do both things! So you'll need to boot off a rescue disk, " -"and reinstall your boot loader from the rescue disk. Read section 4 of the " -"Parted User documentation for more information." -msgstr "" -"Impussibil tornâ a lei la tabele des partizions. Chest al significhe che al " -"covente tornâ a inviâ il sisteme prime di montâ cualsisei partizion " -"modificade. Tu varâs ancje di tornâ a instalâ il boot loader prime di tornâ " -"a inviâ il sisteme (che al podarès vê bisugne di montâ lis partizions " -"modificadis). Al è impussibil fâ dutis dôs lis robis! Duncje tu varâs di " -"inviâ un disc di ripristinament e di lì tornâ a instalâ il boot loader. Lei " -"la sezion 4 de documentazion di Parted par vê plui informazions." - -#: libparted/arch/gnu.c:385 -#, 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 computer " -"before doing anything with %s." -msgstr "" -"Impussibil tornâ a lei la tabele des partizions su %s (%s). Chest al " -"significhe che Hurd nol sa nuie su lis modifichis che tu âs fat. Tu âs di " -"tornâ a inviâ il computer prime di fâ alc cun %s." - -#: libparted/arch/gnu.c:396 parted/parted.c:2318 -msgid "" -"You should reinstall your boot loader before rebooting. Read section 4 of " -"the Parted User documentation for more information." -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." - -#: libparted/arch/gnu.c:788 +#: libparted/arch/gnu.c:748 #, c-format msgid "%s trying to sync %s to disk" msgstr "%s tal tentatîf di sincronizâ %s sul disc" @@ -841,15 +790,15 @@ msgstr "metadâts" msgid "free" msgstr "libar" -#: libparted/disk.c:2355 parted/ui.c:1258 parted/ui.c:1286 +#: libparted/disk.c:2355 parted/ui.c:1259 parted/ui.c:1287 msgid "extended" msgstr "estese" -#: libparted/disk.c:2357 parted/ui.c:1262 parted/ui.c:1290 +#: libparted/disk.c:2357 parted/ui.c:1263 parted/ui.c:1291 msgid "logical" msgstr "logjiche" -#: libparted/disk.c:2359 parted/ui.c:1254 parted/ui.c:1282 +#: libparted/disk.c:2359 parted/ui.c:1255 parted/ui.c:1283 msgid "primary" msgstr "primarie" @@ -925,64 +874,73 @@ msgstr "irst" msgid "esp" msgstr "esp" -#: libparted/disk.c:2415 +#: libparted/disk.c:2411 +msgid "chromeos_kernel" +msgstr "" + +#: libparted/disk.c:2413 +#, fuzzy +msgid "bls_boot" +msgstr "pmbr_boot" + +#: libparted/disk.c:2419 #, c-format msgid "Unknown partition flag, %d." msgstr "Opzion/flag di partizion no cognossude, %d." -#: libparted/exception.c:78 +#: libparted/exception.c:79 msgid "Information" msgstr "Informazions" -#: libparted/exception.c:79 +#: libparted/exception.c:80 msgid "Warning" msgstr "Avertiment" -#: libparted/exception.c:80 +#: libparted/exception.c:81 msgid "Error" msgstr "Erôr" -#: libparted/exception.c:81 +#: libparted/exception.c:82 msgid "Fatal" msgstr "Fatâl" -#: libparted/exception.c:82 +#: libparted/exception.c:83 msgid "Bug" msgstr "Bug" -#: libparted/exception.c:83 +#: libparted/exception.c:84 msgid "No Implementation" msgstr "No implementât" -#: libparted/exception.c:87 +#: libparted/exception.c:88 msgid "Fix" msgstr "Comede" -#: libparted/exception.c:88 +#: libparted/exception.c:89 msgid "Yes" msgstr "Sì" -#: libparted/exception.c:89 +#: libparted/exception.c:90 msgid "No" msgstr "No" -#: libparted/exception.c:90 +#: libparted/exception.c:91 msgid "OK" msgstr "Va ben" -#: libparted/exception.c:91 +#: libparted/exception.c:92 msgid "Retry" msgstr "Torne prove" -#: libparted/exception.c:92 +#: libparted/exception.c:93 msgid "Ignore" msgstr "Ignore" -#: libparted/exception.c:93 +#: libparted/exception.c:94 msgid "Cancel" msgstr "Anule" -#: libparted/exception.c:133 +#: libparted/exception.c:134 #, c-format msgid "" "A bug has been detected in GNU Parted. Refer to the web site of parted " @@ -996,33 +954,33 @@ msgstr "" "segnalazion di erôr vie e-mail a %s specificant almancul la version (%s) e " "il messaç chi sot: " -#: libparted/labels/aix.c:91 +#: libparted/labels/aix.c:92 msgid "Support for reading AIX disk labels is is not implemented yet." msgstr "" "Il supuart par lei lis etichetis dai discs AIX nol è stât ancjemò " "implementât." -#: libparted/labels/aix.c:102 +#: libparted/labels/aix.c:103 msgid "Support for writing AIX disk labels is is not implemented yet." msgstr "" "Il supuart par scrivi lis etichetis dai discs AIX nol è stât ancjemò " "implementât." -#: libparted/labels/aix.c:115 +#: libparted/labels/aix.c:116 msgid "" "Support for adding partitions to AIX disk labels is not implemented yet." msgstr "" "Il supuart par zontâ partizions aes etichetis dai discs AIX nol è stât " "ancjemò implementât." -#: libparted/labels/aix.c:125 +#: libparted/labels/aix.c:126 msgid "" "Support for duplicating partitions in AIX disk labels is not implemented yet." msgstr "" "Il supuart par dopleâ partizions tes etichetis dai discs AIX nol è stât " "ancjemò implementât." -#: libparted/labels/aix.c:143 +#: libparted/labels/aix.c:144 msgid "" "Support for setting system type of partitions in AIX disk labels is not " "implemented yet." @@ -1030,7 +988,7 @@ msgstr "" "Il supuart par stabilî il gjenar di sisteme des partizions tes etichetis dai " "discs AIX nol è stât ancjemò implementât." -#: libparted/labels/aix.c:153 +#: libparted/labels/aix.c:154 msgid "Support for setting flags in AIX disk labels is not implemented yet." msgstr "" "Il supuart par stabilî lis opzions/flags tes etichetis dai discs AIX nol è " @@ -1121,11 +1079,11 @@ msgid "" "partitions, if XGM is the first one it counts for two)." msgstr "" -#: libparted/labels/atari.c:1657 libparted/labels/bsd.c:567 -#: libparted/labels/dasd.c:894 libparted/labels/dos.c:2276 -#: libparted/labels/dvh.c:770 libparted/labels/gpt.c:2050 -#: libparted/labels/loop.c:243 libparted/labels/mac.c:1423 -#: libparted/labels/pc98.c:701 libparted/labels/rdb.c:1054 +#: libparted/labels/atari.c:1657 libparted/labels/bsd.c:563 +#: libparted/labels/dasd.c:895 libparted/labels/dos.c:2283 +#: libparted/labels/dvh.c:770 libparted/labels/gpt.c:2140 +#: 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 "Impussibil sodisfâ ducj i vincui su pe partizion." @@ -1141,46 +1099,46 @@ msgstr "" msgid "Unable to allocate a partition number." msgstr "Impussibil assegnâ un numar di partizion." -#: libparted/labels/bsd.c:592 +#: libparted/labels/bsd.c:588 msgid "Unable to allocate a bsd disklabel slot." msgstr "Impussibil assegnâ un toc di spazi par une etichete bsd." -#: libparted/labels/dasd.c:625 +#: libparted/labels/dasd.c:626 msgid "The partition table of DASD-LDL device cannot be changed.\n" msgstr "" -#: libparted/labels/dasd.c:920 +#: libparted/labels/dasd.c:921 msgid "Unable to allocate a dasd disklabel slot" msgstr "Impussibil assegnâ un toc di spazi par une etichete dasd" -#: libparted/labels/dos.c:1003 +#: libparted/labels/dos.c:1006 #, 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:1031 +#: libparted/labels/dos.c:1034 #, c-format msgid "Invalid partition table - recursive partition on %s." msgstr "Tabele des partizion no valide - partizion ricorsive su %s." -#: libparted/labels/dos.c:1560 +#: libparted/labels/dos.c:1557 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:1572 +#: libparted/labels/dos.c:1569 #, 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:2258 +#: libparted/labels/dos.c:2265 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:2514 +#: libparted/labels/dos.c:2521 msgid "cannot create any more partitions" msgstr "impussibil creâ ancjemò partizions" @@ -1325,11 +1283,11 @@ msgstr "Impussibil recuperâ lis informazions su la dimension dal bloc." msgid "Disk geometry does not match a DASD device of type 3390." msgstr "" -#: libparted/labels/gpt.c:531 +#: libparted/labels/gpt.c:541 msgid "device is too small for GPT" msgstr "il dispositîf al è masse piçul par GPT" -#: libparted/labels/gpt.c:733 +#: libparted/labels/gpt.c:743 #, c-format msgid "" "The format of the GPT partition table is version %x, which is newer than " @@ -1338,7 +1296,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:769 +#: libparted/labels/gpt.c:779 #, c-format msgid "" "Not all of the space available to %s appears to be used, you can fix the GPT " @@ -1349,7 +1307,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:1008 +#: libparted/labels/gpt.c:1024 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)?" @@ -1357,7 +1315,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:1026 +#: libparted/labels/gpt.c:1042 msgid "" "Both the primary and backup GPT tables are corrupt. Try making a fresh " "table, and using Parted's rescue feature to recover partitions." @@ -1366,7 +1324,7 @@ msgstr "" "Prove a creâ une gnove tabele, e dopre la funzionalitât di ripristinament " "partizions di Parted." -#: libparted/labels/gpt.c:1037 +#: libparted/labels/gpt.c:1053 msgid "" "The backup GPT table is corrupt, but the primary appears OK, so that will be " "used." @@ -1374,7 +1332,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:1049 +#: libparted/labels/gpt.c:1065 msgid "" "The primary GPT table is corrupt, but the backup appears OK, so that will be " "used." @@ -1382,11 +1340,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:1073 +#: libparted/labels/gpt.c:1089 msgid "primary partition table array CRC mismatch" msgstr "il CRC dal array de tabele des partizions primarie nol corispuint" -#: libparted/labels/gpt.c:1936 libparted/labels/gpt.c:1963 +#: libparted/labels/gpt.c:2026 libparted/labels/gpt.c:2053 msgid "failed to translate partition name" msgstr "no si è rivâts a tradusi il non de partizion" @@ -1419,19 +1377,15 @@ msgid "The data region doesn't start at the start of the partition." msgstr "La regjon dai dâts no scomence al inizi de partizion." #: libparted/labels/mac.c:572 -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." - -#: libparted/labels/mac.c:586 msgid "The partition's boot region doesn't occupy the entire partition." msgstr "" "La regjon di inviament/boot de partizion no ocupe la partizion interie." -#: libparted/labels/mac.c:597 +#: libparted/labels/mac.c:583 msgid "The partition's data region doesn't occupy the entire partition." msgstr "La regjon dai dâts de partizion no ocupe la partizion interie." -#: libparted/labels/mac.c:649 +#: libparted/labels/mac.c:635 #, c-format msgid "" "Weird block size on device descriptor: %d bytes is not divisible by 512." @@ -1439,7 +1393,7 @@ msgstr "" "Dimension dal bloc inusuâl sul descritôr dal dispositîf: %d byte nol è " "divisibil par 512." -#: libparted/labels/mac.c:662 +#: libparted/labels/mac.c:648 #, c-format msgid "" "The driver descriptor says the physical block size is %d bytes, but Linux " @@ -1448,11 +1402,11 @@ msgstr "" "Il descritôr dal driver al dîs che la dimension dal bloc fisic e je di %d " "byte, ma Linux al dîs che e je di %d byte." -#: libparted/labels/mac.c:715 +#: libparted/labels/mac.c:701 msgid "No valid partition map found." msgstr "No je stade cjatade nissune mape des partizions valide." -#: libparted/labels/mac.c:789 +#: libparted/labels/mac.c:775 #, c-format msgid "" "Conflicting partition map entry sizes! Entry 1 says it is %d, but entry %d " @@ -1461,11 +1415,11 @@ msgstr "" "Dimensions dai elements de mape des partizions in conflit! Il prin element " "al dîs di jessi %d, ma l'element %d al dîs di jessi %d!" -#: libparted/labels/mac.c:820 +#: libparted/labels/mac.c:806 msgid "Weird! There are 2 partitions map entries!" msgstr "Inusuâl! A esistin 2 mapis des partizions!" -#: libparted/labels/mac.c:1359 +#: libparted/labels/mac.c:1345 msgid "" "Changing the name of a root or swap partition will prevent Linux from " "recognising it as such." @@ -1473,18 +1427,18 @@ msgstr "" "Cambiant il non di une partizion di root o di swap nol permetarà a Linux di " "ricognossile par ce che e je." -#: libparted/labels/mac.c:1458 +#: libparted/labels/mac.c:1444 msgid "Can't add another partition -- the partition map is too small!" msgstr "" "Impussibil zontâ une altre partizion -- la mape des partizions e je masse " "piçule!" -#: libparted/labels/pc98.c:284 +#: libparted/labels/pc98.c:285 #, c-format msgid "Invalid partition table on %s." msgstr "Tabele des partizions no valide su %s." -#: libparted/labels/pc98.c:337 libparted/labels/pc98.c:415 +#: libparted/labels/pc98.c:338 libparted/labels/pc98.c:416 #, c-format msgid "" "Partition %d isn't aligned to cylinder boundaries. This is still " @@ -1493,7 +1447,7 @@ msgstr "" "La partizion %d no je inlineade cui margjins dal cilindri. Funzionalitât " "ancjemò no supuartade." -#: libparted/labels/pc98.c:733 +#: libparted/labels/pc98.c:729 msgid "Can't add another partition." msgstr "Impussibil zontâ une altre partizion." @@ -1668,39 +1622,39 @@ msgstr "Impussibil scrivi VTOC FMT7 DSCB." msgid "Could not write VTOC FMT9 DSCB." msgstr "Impussibil scrivi VTOC FMT9 DSCB." -#: libparted/libparted.c:242 +#: libparted/libparted.c:247 msgid "Out of memory." msgstr "Memorie insuficiente." -#: libparted/unit.c:139 +#: libparted/unit.c:140 msgid "Cannot get unit size for special unit 'COMPACT'." msgstr "Impussibil otignî la dimension de unitât pe unitât speciâl 'COMPACT'." -#: libparted/unit.c:385 +#: libparted/unit.c:386 #, c-format msgid "\"%s\" has invalid syntax for locations." msgstr "\"%s\" nol à une sintassi valide pes posizions." -#: libparted/unit.c:393 +#: libparted/unit.c:394 #, c-format msgid "The maximum head value is %d." msgstr "Il massim valôr pe testine al è %d." -#: libparted/unit.c:400 +#: libparted/unit.c:401 #, c-format msgid "The maximum sector value is %d." msgstr "Il massim valôr pal setôr al è %d." -#: libparted/unit.c:412 libparted/unit.c:564 +#: libparted/unit.c:413 libparted/unit.c:565 #, c-format msgid "The location %s is outside of the device %s." msgstr "La posizion %s e je fûr dal dispositîf %s." -#: libparted/unit.c:526 +#: libparted/unit.c:527 msgid "Invalid number." msgstr "Numar no valit." -#: libparted/unit.c:532 +#: libparted/unit.c:533 msgid "Use a smaller unit instead of a value < 1" msgstr "Doprâ une unitât plui piçule invezit che un valôr < 1" @@ -1710,18 +1664,18 @@ msgstr "Doprâ une unitât plui piçule invezit che un valôr < 1" msgid "%s : Failed to allocate partition block\n" msgstr "%s : No si è rivâts a assegnâ il bloc de partizion\n" -#: libparted/fs/amiga/affs.c:79 libparted/fs/amiga/apfs.c:71 +#: 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 : No si è rivâts a assegnâ il bloc\n" -#: libparted/fs/amiga/affs.c:84 libparted/fs/amiga/apfs.c:76 +#: 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 : Impussibil lei il bloc di inviament/boot %llu\n" -#: libparted/fs/amiga/affs.c:98 libparted/fs/amiga/apfs.c:87 +#: 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" @@ -1747,22 +1701,22 @@ msgstr "%s : sume di control sbaliade sul bloc %llu di gjenar %s\n" msgid "%s : Couldn't write block %d\n" msgstr "%s : Impussibil scrivi il bloc %d\n" -#: libparted/fs/amiga/amiga.c:278 +#: libparted/fs/amiga/amiga.c:279 #, c-format msgid "%s : Failed to allocate disk_specific rdb block\n" msgstr "%s : no si è rivâts a assegnâ il bloc rdb disk_specific\n" -#: libparted/fs/amiga/amiga.c:289 +#: libparted/fs/amiga/amiga.c:290 #, c-format msgid "%s : Didn't find rdb block, should never happen\n" msgstr "%s : nol è stât cjatât il bloc rdb, nol varès di sucedi mai\n" -#: libparted/fs/amiga/amiga.c:318 +#: libparted/fs/amiga/amiga.c:319 #, c-format msgid "%s : Failed to read partition block %llu\n" msgstr "%s : no si è rivâts a lei il bloc %llu de partizion\n" -#: libparted/fs/fat/fat.c:148 libparted/fs/r/fat/fat.c:811 +#: libparted/fs/fat/fat.c:149 msgid "" "GNU Parted was miscompiled: the FAT boot sector should be 512 bytes. FAT " "support will be disabled." @@ -1871,7 +1825,7 @@ msgstr "" "selezione Comede, la gjeometrie CHS dal file system e vignarà stabilide in " "mût che e corispuindi ae gjeometrie CHS de tabele des partizions." -#: libparted/fs/r/fat/bootsector.c:399 +#: libparted/fs/r/fat/bootsector.c:398 #, c-format msgid "" "The information sector has the wrong signature (%x). Select cancel for now, " @@ -1898,14 +1852,14 @@ msgstr "" "Il spostament dal prin bloc dal cluster al è di %d e nol è un multipli de " "dimension dal cluster %d." -#: libparted/fs/r/fat/count.c:144 +#: libparted/fs/r/fat/count.c:84 #, c-format msgid "Bad directory entry for %s: first cluster is the end of file marker." msgstr "" "Element di directory sbaliât par %s: il prin cluster al è ae fin dal " "marcadôr di file." -#: libparted/fs/r/fat/count.c:157 +#: libparted/fs/r/fat/count.c:97 #, c-format msgid "" "Bad FAT: unterminated chain for %s. You should run dosfsck or scandisk." @@ -1913,7 +1867,7 @@ msgstr "" "FAT sbaliade: la cjadene par %s no je finide. Tu varessis di eseguî dosfsck " "o scandisk." -#: libparted/fs/r/fat/count.c:166 +#: libparted/fs/r/fat/count.c:106 #, c-format msgid "" "Bad FAT: cluster %d outside file system in chain for %s. You should run " @@ -1922,7 +1876,7 @@ msgstr "" "FAT sbaliade: il cluster %d doprât te cjadene par %s al è fûr dal file " "system. Si varès di eseguî dosfsck o scandisk." -#: libparted/fs/r/fat/count.c:176 +#: libparted/fs/r/fat/count.c:116 #, c-format msgid "" "Bad FAT: cluster %d is cross-linked for %s. You should run dosfsck or " @@ -1931,26 +1885,17 @@ msgstr "" "FAT sbaliade: cluster %d cun colegaments incrosâts par %s. Si varès di " "eseguî dosfsck o scandisk." -#: libparted/fs/r/fat/count.c:195 +#: libparted/fs/r/fat/count.c:135 #, c-format msgid "%s is %dk, but it has %d clusters (%dk)." msgstr "%s al è di %dk, ma al à %d cluster (%dk)." -#: libparted/fs/r/fat/count.c:258 -#, c-format -msgid "" -"The file %s is marked as a system file. This means moving it could cause " -"some programs to stop working." -msgstr "" -"Il file %s al è segnât come file di sisteme. Chest al significhe che " -"spostantlu cualchi program al podarès blocâsi." - -#: libparted/fs/r/fat/fat.c:243 +#: libparted/fs/r/fat/fat.c:244 #, c-format msgid "Partition too big/small for a %s file system." msgstr "Partizion masse grande/piçule par un file system %s." -#: libparted/fs/r/fat/fat.c:409 +#: 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." @@ -1958,11 +1903,11 @@ msgstr "" "Lis FAT no corispuindin. Se no si sa ce che al significhe, selezione anule, " "eseguî scandisk sul file system e daspò tornâ achì." -#: libparted/fs/r/fat/fat.c:449 +#: libparted/fs/r/fat/fat.c:450 msgid "There are no possible configurations for this FAT type." msgstr "No'ndi son configurazions pussibilis par chest gjenar di FAT." -#: libparted/fs/r/fat/fat.c:461 +#: libparted/fs/r/fat/fat.c:462 #, c-format msgid "" "File system doesn't have expected sizes for Windows to like it. Cluster " @@ -1973,7 +1918,7 @@ msgstr "" "cluster e je di %dk (si spietave %dk); il numar di cluster al è %d (si " "spietave %d); la dimensions des FAT e je di %d setôrs (si spietave %d)." -#: libparted/fs/r/fat/fat.c:484 +#: libparted/fs/r/fat/fat.c:485 #, c-format msgid "" "File system is reporting the free space as %d clusters, not %d clusters." @@ -1981,7 +1926,7 @@ msgstr "" "Il file system al riferìs che il spazi libar al è di %d cluster invezit che " "%d cluster." -#: libparted/fs/r/fat/resize.c:158 +#: 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." @@ -1989,15 +1934,15 @@ msgstr "" "Nol è vonde spazi inte cartele root par ducj i file. Anule o ignore par " "pierdi i file." -#: libparted/fs/r/fat/resize.c:302 +#: libparted/fs/r/fat/resize.c:303 msgid "Error writing to the root directory." msgstr "Erôr tal scrivi la cartele root." -#: libparted/fs/r/fat/resize.c:495 +#: libparted/fs/r/fat/resize.c:479 msgid "If you leave your file system as FAT16, then you will have no problems." msgstr "Se si lasse il file system come FAT16 no si varà nissun probleme." -#: libparted/fs/r/fat/resize.c:498 +#: 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 " @@ -2008,14 +1953,14 @@ msgstr "" "cussì, al sarès di consultâ il manuâl di Parted (o il manuâl de " "distribuzion)." -#: libparted/fs/r/fat/resize.c:506 +#: 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 "" "Se si lasse il file system come FAT32 no si crearà nissun gnûf probleme." -#: libparted/fs/r/fat/resize.c:510 +#: 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 " @@ -2029,42 +1974,42 @@ msgstr "" "distribuzion). In diplui, convertint a FAT32, MS DOS, MS Windows 95a e MS " "Windows NT no rivaran a lei il file system." -#: libparted/fs/r/fat/resize.c:524 +#: libparted/fs/r/fat/resize.c:508 #, c-format msgid "%s %s %s" msgstr "%s %s %s" -#: libparted/fs/r/fat/resize.c:525 +#: libparted/fs/r/fat/resize.c:509 msgid "Would you like to use FAT32?" msgstr "Doprâ FAT32?" -#: libparted/fs/r/fat/resize.c:556 libparted/fs/r/fat/resize.c:572 +#: 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:557 +#: libparted/fs/r/fat/resize.c:541 msgid "" "The file system can only be resized to this size by converting to FAT16." msgstr "" "Il file system al pues jessi ridimensionât dome a cheste dimension se si " "convertìs a FAT16." -#: libparted/fs/r/fat/resize.c:573 +#: libparted/fs/r/fat/resize.c:557 msgid "" "The file system can only be resized to this size by converting to FAT32." msgstr "" "Il file system al pues jessi ridimensionât dome a cheste dimension se si " "convertìs a FAT32." -#: libparted/fs/r/fat/resize.c:586 +#: 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 nol pues ridimensionâ cheste partizion a cheste dimension. " "Funzion in svilup!" -#: libparted/fs/r/fat/table.c:136 +#: 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 " @@ -2073,41 +2018,41 @@ msgstr "" "FAT %d, il supuart %x nol corispuint al setôr di inviament dal supuart %x. " "Si varès di eseguî scandisk." -#: libparted/fs/r/fat/table.c:268 +#: libparted/fs/r/fat/table.c:269 #, c-format msgid "fat_table_set: cluster %ld outside file system" msgstr "fat_table_set: cluster %ld fûr dal file system" -#: libparted/fs/r/fat/table.c:300 +#: libparted/fs/r/fat/table.c:301 #, c-format msgid "fat_table_get: cluster %ld outside file system" msgstr "fat_table_get: cluster %ld fûr dal file system" -#: libparted/fs/r/fat/table.c:342 +#: libparted/fs/r/fat/table.c:343 msgid "fat_table_alloc_cluster: no free clusters" msgstr "fat_table_alloc_cluster: nissun cluster libar" -#: libparted/fs/r/filesys.c:151 +#: libparted/fs/r/filesys.c:152 msgid "Could not detect file system." msgstr "Impussibil rilevâ il file system." -#: libparted/fs/r/filesys.c:158 libparted/fs/r/filesys.c:285 +#: libparted/fs/r/filesys.c:159 libparted/fs/r/filesys.c:284 #, c-format msgid "resizing %s file systems is not supported" msgstr "il ridimensionâ il file system %s, nol è supuartât" -#: libparted/fs/r/filesys.c:170 +#: libparted/fs/r/filesys.c:171 msgid "The file system is bigger than its volume!" msgstr "Il file system al è plui grant dal so volum!" -#: libparted/fs/r/hfs/advfs.c:121 libparted/fs/r/hfs/advfs_plus.c:121 -#: libparted/fs/r/hfs/reloc.c:413 libparted/fs/r/hfs/reloc.c:507 -#: libparted/fs/r/hfs/reloc_plus.c:538 libparted/fs/r/hfs/reloc_plus.c:656 -#: libparted/fs/r/hfs/reloc_plus.c:769 +#: 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 "Il file system al conten erôrs." -#: libparted/fs/r/hfs/advfs_plus.c:285 +#: libparted/fs/r/hfs/advfs_plus.c:287 msgid "Bad blocks could not be read." msgstr "I blocs ruvinâts no puedin jessi lets." @@ -2169,63 +2114,63 @@ msgstr "Impussibil cjatâ il setôr %lli dal file HFS+ cun CNID %X." msgid "Trying to write HFS+ file with CNID %X behind EOF." msgstr "Si cîr di scrivi il file HFS+ cun CNID %X daûr dal EOF." -#: libparted/fs/r/hfs/hfs.c:232 +#: libparted/fs/r/hfs/hfs.c:212 msgid "Sorry, HFS cannot be resized that way yet." msgstr "HFS nol pues ancjemò jessi ridimensionât in chê maniere." -#: libparted/fs/r/hfs/hfs.c:250 libparted/fs/r/hfs/hfs.c:629 +#: libparted/fs/r/hfs/hfs.c:230 libparted/fs/r/hfs/hfs.c:573 msgid "shrinking" msgstr "daûr a scurtâ" -#: libparted/fs/r/hfs/hfs.c:262 libparted/fs/r/hfs/hfs.c:641 +#: libparted/fs/r/hfs/hfs.c:242 libparted/fs/r/hfs/hfs.c:585 msgid "Data relocation has failed." msgstr "Riposizionament dai dâts falît." -#: libparted/fs/r/hfs/hfs.c:281 +#: libparted/fs/r/hfs/hfs.c:261 msgid "Data relocation left some data in the end of the volume." msgstr "" "Il riposizionament dai dâts indi à lassât cualchidun inte fin dal volum." -#: libparted/fs/r/hfs/hfs.c:320 +#: libparted/fs/r/hfs/hfs.c:300 msgid "writing HFS Master Directory Block" msgstr "scriture dal \"Master Directory Block\" di HFS" -#: libparted/fs/r/hfs/hfs.c:468 +#: libparted/fs/r/hfs/hfs.c:412 msgid "No valid HFS[+X] signature has been found while opening." msgstr "Vierzint no je stade cjatade nissune firme HFS[+X] valide." -#: libparted/fs/r/hfs/hfs.c:478 +#: libparted/fs/r/hfs/hfs.c:422 #, c-format msgid "Version %d of HFS+ isn't supported." msgstr "La version %d di HFS+ no je supuartade." -#: libparted/fs/r/hfs/hfs.c:489 +#: libparted/fs/r/hfs/hfs.c:433 #, c-format msgid "Version %d of HFSX isn't supported." msgstr "La version %d di HFSX no je supuartade." -#: libparted/fs/r/hfs/hfs.c:672 +#: libparted/fs/r/hfs/hfs.c:616 msgid "Data relocation left some data at the end of the volume." msgstr "Il riposizionament dai dâts indi à lassât cualchidun ae fin dal volum." -#: libparted/fs/r/hfs/hfs.c:720 +#: libparted/fs/r/hfs/hfs.c:664 msgid "Error while writing the allocation file." msgstr "Erôr tal scrivi il \"allocation file\"." -#: libparted/fs/r/hfs/hfs.c:735 +#: libparted/fs/r/hfs/hfs.c:679 msgid "Error while writing the compatibility part of the allocation file." msgstr "Erôr tal scrivi la part di compatibilitât dal \"allocation file\"." -#: libparted/fs/r/hfs/hfs.c:750 +#: libparted/fs/r/hfs/hfs.c:694 msgid "writing HFS+ Volume Header" msgstr "scriture de intestazion dal volum di HFS+" -#: libparted/fs/r/hfs/hfs.c:850 +#: libparted/fs/r/hfs/hfs.c:794 msgid "An error occurred while looking for the mandatory bad blocks file." msgstr "" "Si è presentât un erôr intal viodi il file dai blocs ruvinâts obligatori." -#: libparted/fs/r/hfs/hfs.c:904 +#: 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." @@ -2233,27 +2178,27 @@ msgstr "" "Al semee che al sedi un erôr intal wrapper HFS: il file dai blocs ruvinâts " "nol conten il volum HFS+ integrât." -#: libparted/fs/r/hfs/hfs.c:940 +#: libparted/fs/r/hfs/hfs.c:883 msgid "Sorry, HFS+ cannot be resized that way yet." msgstr "HFS+ nol pues ancjemò jessi ridimensionât in chê maniere." -#: libparted/fs/r/hfs/hfs.c:975 +#: libparted/fs/r/hfs/hfs.c:918 msgid "shrinking embedded HFS+ volume" msgstr "daûr a scurtâ il volum HFS+ integrât" -#: libparted/fs/r/hfs/hfs.c:992 +#: libparted/fs/r/hfs/hfs.c:935 msgid "Resizing the HFS+ volume has failed." msgstr "Ridimensionament dal volum HFS+ falît." -#: libparted/fs/r/hfs/hfs.c:999 +#: libparted/fs/r/hfs/hfs.c:942 msgid "shrinking HFS wrapper" msgstr "daûr a scurtâ il wrapper HFS" -#: libparted/fs/r/hfs/hfs.c:1008 +#: libparted/fs/r/hfs/hfs.c:951 msgid "Updating the HFS wrapper has failed." msgstr "No si è rivâts a inzornâ il wrapper HFS." -#: libparted/fs/r/hfs/hfs.c:1110 libparted/fs/r/hfs/hfs.c:1195 +#: 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 " @@ -2335,7 +2280,7 @@ msgstr "" msgid "An extent has not been relocated." msgstr "Un extent nol è stât riposizionât." -#: libparted/fs/r/hfs/reloc.c:250 libparted/fs/r/hfs/reloc_plus.c:307 +#: 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!" @@ -2343,19 +2288,19 @@ msgstr "" "Un riferiment a un extent al ven di un puest che nol varès di stâ. Controle " "il file system!" -#: libparted/fs/r/hfs/reloc.c:380 +#: libparted/fs/r/hfs/reloc.c:382 msgid "This HFS volume has no catalog file. This is very unusual!" msgstr "" "Chest volum HFS nol à il file catalic. Cheste situazion è je une vore " "inusuâl!" -#: libparted/fs/r/hfs/reloc.c:474 +#: libparted/fs/r/hfs/reloc.c:479 msgid "This HFS volume has no extents overflow file. This is quite unusual!" msgstr "" "Chest volum HFS nol à un \"extents overflow file\". Cheste e je une " "situazion vonde inusuâl!" -#: libparted/fs/r/hfs/reloc.c:516 libparted/fs/r/hfs/reloc_plus.c:666 +#: 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." @@ -2363,55 +2308,55 @@ msgstr "" "Il \"extent overflow file\" nol à di contignî i siei extent! Controle il " "file system." -#: libparted/fs/r/hfs/reloc.c:573 libparted/fs/r/hfs/reloc_plus.c:844 +#: 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 "Impussibil cjariâ la cache dal file system in memorie." -#: libparted/fs/r/hfs/reloc.c:634 libparted/fs/r/hfs/reloc_plus.c:905 +#: libparted/fs/r/hfs/reloc.c:640 libparted/fs/r/hfs/reloc_plus.c:910 msgid "Bad blocks list could not be loaded." msgstr "Impussibil cjariâ la liste dai blocs ruvinâts." -#: libparted/fs/r/hfs/reloc.c:648 libparted/fs/r/hfs/reloc_plus.c:921 +#: libparted/fs/r/hfs/reloc.c:654 libparted/fs/r/hfs/reloc_plus.c:926 msgid "An error occurred during extent relocation." msgstr "Al è vignût fûr un erôr tal riposizionâ un extent." -#: libparted/fs/r/hfs/reloc_plus.c:494 +#: libparted/fs/r/hfs/reloc_plus.c:495 msgid "This HFS+ volume has no catalog file. This is very unusual!" msgstr "" "Chest volum HFS+ nol à il file catalic. Cheste situazion è je une vore " "inusuâl!" -#: libparted/fs/r/hfs/reloc_plus.c:617 +#: libparted/fs/r/hfs/reloc_plus.c:620 msgid "This HFS+ volume has no extents overflow file. This is quite unusual!" msgstr "" "Chest volum HFS+ nol à un \"extents overflow file\". Cheste e je une " "situazion vonde inusuâl!" -#: parted/parted.c:125 +#: parted/parted.c:126 msgid "displays this help message" msgstr "al mostre chest messaç di jutori" -#: parted/parted.c:126 +#: parted/parted.c:127 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:127 +#: parted/parted.c:128 msgid "displays machine parseable output" msgstr "al mostre un output che si pues analizâ dal computer" -#: parted/parted.c:128 +#: parted/parted.c:129 msgid "never prompts for user intervention" msgstr "no sta domandâ mai l'intervent dal utent" -#: parted/parted.c:129 +#: parted/parted.c:130 msgid "displays the version" msgstr "al mostre la version" -#: parted/parted.c:130 +#: parted/parted.c:131 msgid "alignment for new partitions" msgstr "inlineament pes gnovis partizions" -#: parted/parted.c:142 +#: parted/parted.c:143 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" @@ -2420,31 +2365,31 @@ msgstr "" "MS-DOS, il numar des partizions primaris di 1 a 4, partizions logjichis di 5 " "indenant.\n" -#: parted/parted.c:145 +#: parted/parted.c:146 msgid "LABEL-TYPE is one of: " msgstr "GJENAR-ETIC al è un di: " -#: parted/parted.c:146 parted/parted.c:147 +#: parted/parted.c:147 parted/parted.c:148 msgid "FLAG is one of: " msgstr "FLAG al è un di: " -#: parted/parted.c:148 +#: parted/parted.c:149 msgid "UNIT is one of: " msgstr "UNITÂT al è un di: " -#: parted/parted.c:149 +#: parted/parted.c:150 msgid "desired alignment: minimum or optimal" msgstr "inlineament desiderât: minim o otimâl" -#: parted/parted.c:150 +#: parted/parted.c:151 msgid "PART-TYPE is one of: primary, logical, extended\n" msgstr "GJENAR-PART al è un di: primary, logical, extended\n" -#: parted/parted.c:152 +#: parted/parted.c:153 msgid "FS-TYPE is one of: " msgstr "GJENAR-FS al è un di: " -#: parted/parted.c:153 +#: parted/parted.c:154 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 " @@ -2454,7 +2399,7 @@ msgstr "" "partissin de fin dal disc. Par esempli: -1s al specifiche in maniere " "precise l'ultin setôr.\n" -#: parted/parted.c:156 +#: parted/parted.c:157 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" @@ -2463,19 +2408,19 @@ msgstr "" "partissin de fin dal disc. Par esempli: -1s al specifiche in maniere " "precise l'ultin setôr.\n" -#: parted/parted.c:159 +#: parted/parted.c:160 msgid "STATE is one of: on, off\n" msgstr "STÂT al è un di: on, off\n" -#: parted/parted.c:160 +#: parted/parted.c:161 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:161 +#: parted/parted.c:162 msgid "NAME is any word you want\n" msgstr "NON al è cualsisei peraule desiderade\n" -#: parted/parted.c:164 +#: parted/parted.c:165 msgid "" "Copyright (C) 1998 - 2006 Free Software Foundation, Inc.\n" "This program is free software, covered by the GNU General Public License.\n" @@ -2496,22 +2441,22 @@ msgstr "" "GNU General Public License par vê plui detais.\n" "\n" -#: parted/parted.c:212 +#: parted/parted.c:213 #, c-format msgid "%0.f%%\t(time left %.2d:%.2d)" msgstr "%0.f%%\t(a restin %.2d:%.2d)" -#: parted/parted.c:231 +#: parted/parted.c:232 #, 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:252 +#: parted/parted.c:253 #, c-format msgid "Partition(s) on %s are being used." msgstr "Lis partizions su %s a son in ûs." -#: parted/parted.c:264 +#: parted/parted.c:265 #, c-format msgid "" "The existing disk label on %s will be destroyed and all data on this disk " @@ -2520,31 +2465,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:525 +#: parted/parted.c:526 msgid "New disk label type?" msgstr "Gnûf gjenar di etichete disc?" -#: parted/parted.c:662 +#: parted/parted.c:663 msgid "Partition type?" msgstr "Gjenar di partizion?" -#: parted/parted.c:680 parted/parted.c:884 +#: parted/parted.c:681 parted/parted.c:885 msgid "Partition name?" msgstr "Non de partizion?" -#: parted/parted.c:690 +#: parted/parted.c:691 msgid "File system type?" msgstr "Gjenar di file system?" -#: parted/parted.c:695 parted/parted.c:1498 +#: parted/parted.c:696 parted/parted.c:1499 msgid "Start?" msgstr "Inizi?" -#: parted/parted.c:698 parted/parted.c:1500 parted/parted.c:1569 +#: parted/parted.c:699 parted/parted.c:1501 parted/parted.c:1585 msgid "End?" msgstr "Fin?" -#: parted/parted.c:766 +#: parted/parted.c:767 #, c-format msgid "" "You requested a partition from %s to %s (sectors %llu..%llu).\n" @@ -2553,7 +2498,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:775 +#: parted/parted.c:776 msgid "" "\n" "Is this still acceptable to you?" @@ -2561,96 +2506,96 @@ msgstr "" "\n" "Ti vadial ben distès cussì?" -#: parted/parted.c:798 +#: parted/parted.c:799 #, fuzzy, 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." -#: parted/parted.c:800 parted/parted.c:1723 +#: parted/parted.c:801 parted/parted.c:1739 msgid "unknown (malloc failed)" msgstr "" -#: parted/parted.c:876 +#: parted/parted.c:877 #, fuzzy, c-format msgid "%s disk labels do not support partition name." msgstr "Lis etichetis dai discs %s no supuartin partizions estesis." -#: parted/parted.c:881 parted/parted.c:1561 parted/parted.c:1612 -#: parted/parted.c:1706 parted/parted.c:1781 +#: parted/parted.c:882 parted/parted.c:1564 parted/parted.c:1628 +#: parted/parted.c:1722 parted/parted.c:1797 msgid "Partition number?" msgstr "Numar di partizion?" -#: parted/parted.c:975 +#: parted/parted.c:976 #, 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:1017 +#: parted/parted.c:1018 #, c-format msgid "Model: %s (%s)\n" msgstr "Model: %s (%s)\n" -#: parted/parted.c:1019 +#: parted/parted.c:1020 #, c-format msgid "Disk %s: %s\n" msgstr "Disc %s: %s\n" -#: parted/parted.c:1020 +#: parted/parted.c:1021 #, c-format msgid "Sector size (logical/physical): %lldB/%lldB\n" msgstr "Dimension dal setôr (logjic/fisic): %lldB/%lldB\n" -#: parted/parted.c:1032 +#: parted/parted.c:1033 #, c-format msgid "Partition Table: %s\n" msgstr "Tabele des partizions: %s\n" -#: parted/parted.c:1033 +#: parted/parted.c:1034 #, c-format msgid "Disk Flags: %s\n" msgstr "Flag dal disc: %s\n" -#: parted/parted.c:1153 parted/parted.c:1156 +#: parted/parted.c:1154 parted/parted.c:1157 msgid "Number" msgstr "Numar" -#: parted/parted.c:1153 parted/parted.c:1156 +#: parted/parted.c:1154 parted/parted.c:1157 msgid "Start" msgstr "Inizi" -#: parted/parted.c:1154 parted/parted.c:1157 +#: parted/parted.c:1155 parted/parted.c:1158 msgid "End" msgstr "Fin" -#: parted/parted.c:1157 +#: parted/parted.c:1158 msgid "Size" msgstr "Dimension" -#: parted/parted.c:1161 +#: parted/parted.c:1162 msgid "Type" msgstr "Gjenar" -#: parted/parted.c:1163 +#: parted/parted.c:1164 msgid "File system" msgstr "File system" -#: parted/parted.c:1166 +#: parted/parted.c:1167 msgid "Name" msgstr "Non" -#: parted/parted.c:1168 +#: parted/parted.c:1169 msgid "Flags" msgstr "Flag" -#: parted/parted.c:1225 +#: parted/parted.c:1226 msgid "Free Space" msgstr "Spazi libar" -#: parted/parted.c:1385 +#: parted/parted.c:1386 #, c-format msgid "" "A %s %s partition was found at %s -> %s. Do you want to add it to the " @@ -2659,55 +2604,55 @@ msgstr "" "E je stade cjatade une partizion %s %s su %s -> %s. Desideristu zontâle ae " "tabele des partizions?" -#: parted/parted.c:1428 +#: parted/parted.c:1429 msgid "searching for file systems" msgstr "ricercje dai file system" -#: parted/parted.c:1535 +#: parted/parted.c:1536 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:1583 +#: parted/parted.c:1599 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:1636 +#: parted/parted.c:1652 msgid "New device?" msgstr "Gnûf dispositîf?" -#: parted/parted.c:1704 +#: parted/parted.c:1720 msgid "alignment type(min/opt)" msgstr "gjenar di inlineament(min/oti)" -#: parted/parted.c:1719 +#: parted/parted.c:1735 #, c-format msgid "%d aligned\n" msgstr "%d inlineade\n" -#: parted/parted.c:1721 +#: parted/parted.c:1737 #, fuzzy, c-format msgid "%d not aligned: %s\n" msgstr "%d no inlineade\n" -#: parted/parted.c:1746 parted/parted.c:1783 +#: parted/parted.c:1762 parted/parted.c:1799 msgid "Flag to Invert?" msgstr "Flag di invertî?" -#: parted/parted.c:1751 parted/parted.c:1788 +#: parted/parted.c:1767 parted/parted.c:1804 msgid "New state?" msgstr "Gnûf stât?" -#: parted/parted.c:1834 +#: parted/parted.c:1850 msgid "Unit?" msgstr "Unitât?" -#: parted/parted.c:1969 +#: parted/parted.c:1985 msgid "align-check" msgstr "align-check" -#: parted/parted.c:1972 +#: parted/parted.c:1988 #, fuzzy msgid "" "align-check TYPE N check partition N for TYPE(min|opt) " @@ -2716,11 +2661,11 @@ msgstr "" "align-check GJENAR N controle la partizion N pal " "inlineament di GJENAR(min|oti)" -#: parted/parted.c:1980 +#: parted/parted.c:1996 msgid "help" msgstr "jutori" -#: parted/parted.c:1983 +#: parted/parted.c:1999 msgid "" "help [COMMAND] print general help, or help on " "COMMAND" @@ -2728,15 +2673,15 @@ msgstr "" "help [COMANT] stampe il jutori gjenerâl o sul " "COMANT" -#: parted/parted.c:1989 +#: parted/parted.c:2005 msgid "mklabel" msgstr "mklabel" -#: parted/parted.c:1989 +#: parted/parted.c:2005 msgid "mktable" msgstr "mktable" -#: parted/parted.c:1992 +#: parted/parted.c:2008 msgid "" "mklabel,mktable LABEL-TYPE create a new disklabel (partition " "table)" @@ -2744,15 +2689,15 @@ msgstr "" "mklabel,mktable GJENAR-ETIC cree une gnove etichete dal disc " "(tabele des partizions)" -#: parted/parted.c:1998 +#: parted/parted.c:2014 msgid "mkpart" msgstr "mkpart" -#: parted/parted.c:2001 +#: parted/parted.c:2017 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:2007 +#: parted/parted.c:2023 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" @@ -2761,20 +2706,20 @@ msgstr "" "partizion. Al pues jessi specificât GJENAR-FS par stabilî un ID di " "partizion adat.\n" -#: parted/parted.c:2012 +#: parted/parted.c:2028 msgid "name" msgstr "non" -#: parted/parted.c:2015 +#: parted/parted.c:2031 msgid "name NUMBER NAME name partition NUMBER as NAME" msgstr "" "name NUMAR NON clame la partizion NUMAR come NON" -#: parted/parted.c:2020 +#: parted/parted.c:2036 msgid "print" msgstr "print" -#: parted/parted.c:2023 +#: parted/parted.c:2039 msgid "" "print [devices|free|list,all|NUMBER] display the partition table, " "available devices, free space, all found partitions, or a particular " @@ -2784,7 +2729,7 @@ msgstr "" "dispositîfs disponibii, il spazi libar, dutis lis partizions cjatadis o une " "partizion in particolâr" -#: parted/parted.c:2028 +#: parted/parted.c:2044 msgid "" "Without arguments, 'print' displays the entire partition table. However with " "the following arguments it performs various other actions.\n" @@ -2792,11 +2737,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:2030 +#: parted/parted.c:2046 msgid " devices : display all active block devices\n" msgstr " devices : mostre ducj i dispositîfs a blocs atîfs\n" -#: parted/parted.c:2031 +#: parted/parted.c:2047 msgid "" " free : display information about free unpartitioned space on the " "current block device\n" @@ -2804,14 +2749,14 @@ msgstr "" " free : mostre lis informazions sul spazi libar no partizionât, sul " "dispositîf a blocs atuâl\n" -#: parted/parted.c:2033 +#: parted/parted.c:2049 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:2034 +#: parted/parted.c:2050 msgid "" " NUMBER : display more detailed information about this particular " "partition\n" @@ -2819,19 +2764,19 @@ msgstr "" " NUMAR : mostre informazions plui detaiadis sun cheste particolâr " "partizion\n" -#: parted/parted.c:2039 +#: parted/parted.c:2055 msgid "quit" msgstr "quit" -#: parted/parted.c:2042 +#: parted/parted.c:2058 msgid "quit exit program" msgstr "quit jes dal program" -#: parted/parted.c:2047 +#: parted/parted.c:2063 msgid "rescue" msgstr "rescue" -#: parted/parted.c:2050 +#: parted/parted.c:2066 msgid "" "rescue START END rescue a lost partition near START " "and END" @@ -2839,56 +2784,56 @@ msgstr "" "rescue INIZI FIN recupere une partizion pierdude " "dongje INIZI e FIN" -#: parted/parted.c:2056 +#: parted/parted.c:2072 msgid "resize" msgstr "resize" -#: parted/parted.c:2059 +#: parted/parted.c:2075 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:2062 +#: parted/parted.c:2078 msgid "resizepart" msgstr "resizepart" -#: parted/parted.c:2065 +#: parted/parted.c:2081 msgid "resizepart NUMBER END resize partition NUMBER" msgstr "" "resizepart NUMAR FIN ridimensione la partizion NUMAR" -#: parted/parted.c:2070 +#: parted/parted.c:2086 msgid "rm" msgstr "rm" -#: parted/parted.c:2073 +#: parted/parted.c:2089 msgid "rm NUMBER delete partition NUMBER" msgstr "rm NUMAR elimine la partizion NUMAR" -#: parted/parted.c:2078 +#: parted/parted.c:2094 msgid "select" msgstr "select" -#: parted/parted.c:2081 +#: parted/parted.c:2097 msgid "select DEVICE choose the device to edit" msgstr "" "select DISPOSITÎF sielç il dispositîf di modificâ" -#: parted/parted.c:2086 +#: parted/parted.c:2102 msgid "disk_set" msgstr "disk_set" -#: parted/parted.c:2089 +#: parted/parted.c:2105 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:2094 +#: parted/parted.c:2110 msgid "disk_toggle" msgstr "disk_toggle" -#: parted/parted.c:2097 +#: parted/parted.c:2113 msgid "" "disk_toggle [FLAG] toggle the state of FLAG on " "selected device" @@ -2896,21 +2841,21 @@ msgstr "" "disk_toggle [FLAG] comute il stât dal FLAG sul " "dispositîf selezionât" -#: parted/parted.c:2103 +#: parted/parted.c:2119 msgid "set" msgstr "set" -#: parted/parted.c:2106 +#: parted/parted.c:2122 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:2112 +#: parted/parted.c:2128 msgid "toggle" msgstr "toggle" -#: parted/parted.c:2115 +#: parted/parted.c:2131 msgid "" "toggle [NUMBER [FLAG]] toggle the state of FLAG on " "partition NUMBER" @@ -2918,21 +2863,21 @@ msgstr "" "toggle [NUMAR [FLAG]] comute il stât di FLAG su pe " "partizion NUMAR" -#: parted/parted.c:2121 +#: parted/parted.c:2137 msgid "unit" msgstr "unit" -#: parted/parted.c:2124 +#: parted/parted.c:2140 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:2129 +#: parted/parted.c:2145 msgid "version" msgstr "version" -#: parted/parted.c:2132 +#: parted/parted.c:2148 msgid "" "version display the version number and " "copyright information of GNU Parted" @@ -2940,7 +2885,7 @@ msgstr "" "version mostre il numar di version e lis " "informazions di copyright di GNU Parted" -#: parted/parted.c:2136 +#: parted/parted.c:2152 msgid "" "'version' displays copyright and version information corresponding to this " "copy of GNU Parted\n" @@ -2948,30 +2893,38 @@ msgstr "" "'version' al mostre lis informazions sul copyright e la version relative a " "cheste copie di GNU Parted\n" -#: parted/parted.c:2204 +#: parted/parted.c:2220 #, c-format msgid "Usage: %s [-hlmsv] [-a] [DEVICE [COMMAND [PARAMETERS]]...]\n" msgstr "" "Ûs: %s [-hlmsv] [-a] [DISPOSITÎF [COMANT [PARAMETRIS]]...]\n" -#: parted/parted.c:2248 +#: parted/parted.c:2264 msgid "No device found" msgstr "Nissun dispositîf cjatât" -#: parted/parted.c:2285 +#: parted/parted.c:2301 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:2325 +#: parted/parted.c:2334 +msgid "" +"You should reinstall your boot loader before rebooting. Read section 4 of " +"the Parted User documentation for more information." +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:2341 msgid "You may need to update /etc/fstab.\n" msgstr "Al podarès coventâ inzornâ /etc/fstab.\n" -#: parted/ui.c:164 +#: parted/ui.c:165 msgid "Welcome to GNU Parted! Type 'help' to view a list of commands.\n" msgstr "" "Benvignûts in GNU Parted! Scrîf 'help' par viodi une liste di comants.\n" -#: parted/ui.c:167 +#: parted/ui.c:168 msgid "" "Usage: parted [OPTION]... [DEVICE [COMMAND [PARAMETERS]...]...]\n" "Apply COMMANDs with PARAMETERS to DEVICE. If no COMMAND(s) are given, run " @@ -2983,7 +2936,7 @@ msgstr "" "COMANT, \n" "al partìs in modalitât interative.\n" -#: parted/ui.c:172 +#: parted/ui.c:173 #, c-format msgid "" "\n" @@ -3046,7 +2999,7 @@ msgstr "" "Inclût ancje cualsisei informazion adizionâl su la tô configurazion che tu\n" "consideris impuartante.\n" -#: parted/ui.c:293 +#: parted/ui.c:294 msgid "" "\n" "Command History:\n" @@ -3054,7 +3007,7 @@ msgstr "" "\n" "Cronologjie comants:\n" -#: parted/ui.c:356 +#: parted/ui.c:357 msgid "" "\n" "Error: SEGV_MAPERR (Address not mapped to object)\n" @@ -3062,7 +3015,7 @@ msgstr "" "\n" "Erôr: SEGV_MAPERR (Direzion no mapade al ogjet)\n" -#: parted/ui.c:362 +#: parted/ui.c:363 msgid "" "\n" "Error: SEGV_ACCERR (Invalid permissions for mapped object)\n" @@ -3070,7 +3023,7 @@ msgstr "" "\n" "Erôr: SEGV_ACCERR (permès no valits pal ogjet mapât)\n" -#: parted/ui.c:367 +#: parted/ui.c:368 msgid "" "\n" "Error: A general SIGSEGV signal was encountered.\n" @@ -3078,7 +3031,7 @@ msgstr "" "\n" "Erôr: si è presentât a un segnâl SIGSEGV gjenerâl.\n" -#: parted/ui.c:391 +#: parted/ui.c:392 msgid "" "\n" "Error: FPE_INTDIV (Integer: divide by zero)" @@ -3086,7 +3039,7 @@ msgstr "" "\n" "Erôr: FPE_INTDIV (intîr: division par zero)" -#: parted/ui.c:396 +#: parted/ui.c:397 msgid "" "\n" "Error: FPE_INTOVF (Integer: overflow)" @@ -3094,7 +3047,7 @@ msgstr "" "\n" "Erôr: FPE_INTOVF (intîr: overflow)" -#: parted/ui.c:401 +#: parted/ui.c:402 msgid "" "\n" "Error: FPE_FLTDIV (Float: divide by zero)" @@ -3102,7 +3055,7 @@ msgstr "" "\n" "Erôr: FPE_FLTDIV (virgule mobile: division par zero)" -#: parted/ui.c:406 +#: parted/ui.c:407 msgid "" "\n" "Error: FPE_FLTOVF (Float: overflow)" @@ -3110,7 +3063,7 @@ msgstr "" "\n" "Erôr: FPE_FLTOVF (virgule mobile: overflow)" -#: parted/ui.c:411 +#: parted/ui.c:412 msgid "" "\n" "Error: FPE_FLTUND (Float: underflow)" @@ -3118,7 +3071,7 @@ msgstr "" "\n" "Erôr: FPE_FLTUND (virgule mobile: underflow)" -#: parted/ui.c:416 +#: parted/ui.c:417 msgid "" "\n" "Error: FPE_FLTRES (Float: inexact result)" @@ -3126,7 +3079,7 @@ msgstr "" "\n" "Erôr: FPE_FLTRES (virgule mobile: risultât inesat)" -#: parted/ui.c:421 +#: parted/ui.c:422 msgid "" "\n" "Error: FPE_FLTINV (Float: invalid operation)" @@ -3134,7 +3087,7 @@ msgstr "" "\n" "Erôr: FPE_FLTINV (virgule mobile: operazion no valide)" -#: parted/ui.c:426 +#: parted/ui.c:427 msgid "" "\n" "Error: FPE_FLTSUB (Float: subscript out of range)" @@ -3142,7 +3095,7 @@ msgstr "" "\n" "Erôr: FPE_FLTSUB (virgule mobile: subscript fûr dai limits)" -#: parted/ui.c:431 +#: parted/ui.c:432 msgid "" "\n" "Error: A general SIGFPE signal was encountered." @@ -3150,7 +3103,7 @@ msgstr "" "\n" "Erôr: si è presentât un segnâl SIGFPE gjenerâl." -#: parted/ui.c:455 +#: parted/ui.c:456 msgid "" "\n" "Error: ILL_ILLOPC (Illegal Opcode)" @@ -3158,7 +3111,7 @@ msgstr "" "\n" "Erôr: ILL_ILLOPC (opcode no consintût)" -#: parted/ui.c:460 +#: parted/ui.c:461 msgid "" "\n" "Error: ILL_ILLOPN (Illegal Operand)" @@ -3166,7 +3119,7 @@ msgstr "" "\n" "Erôr: ILL_ILLOPN (operandi no consintût)" -#: parted/ui.c:465 +#: parted/ui.c:466 msgid "" "\n" "Error: ILL_ILLADR (Illegal addressing mode)" @@ -3174,7 +3127,7 @@ msgstr "" "\n" "Erôr: ILL_ILLADR (modalitât di direzionament no consintude)" -#: parted/ui.c:470 +#: parted/ui.c:471 msgid "" "\n" "Error: ILL_ILLTRP (Illegal Trap)" @@ -3182,7 +3135,7 @@ msgstr "" "\n" "Erôr: ILL_ILLTRP (trap no consintût)" -#: parted/ui.c:475 +#: parted/ui.c:476 msgid "" "\n" "Error: ILL_PRVOPC (Privileged Opcode)" @@ -3190,7 +3143,7 @@ msgstr "" "\n" "Erôr: ILL_PRVOPC (opcode privilegjât)" -#: parted/ui.c:480 +#: parted/ui.c:481 msgid "" "\n" "Error: ILL_PRVREG (Privileged Register)" @@ -3198,7 +3151,7 @@ msgstr "" "\n" "Erôr: ILL_PRVREG (regjistri privilegjât)" -#: parted/ui.c:485 +#: parted/ui.c:486 msgid "" "\n" "Error: ILL_COPROC (Coprocessor Error)" @@ -3206,7 +3159,7 @@ msgstr "" "\n" "Erôr: ILL_COPROC (erôr di coprocessôr)" -#: parted/ui.c:490 +#: parted/ui.c:491 msgid "" "\n" "Error: ILL_BADSTK (Internal Stack Error)" @@ -3214,7 +3167,7 @@ msgstr "" "\n" "Erôr: ILL_BADSTK (erôr di stack interni)" -#: parted/ui.c:495 +#: parted/ui.c:496 msgid "" "\n" "Error: A general SIGILL signal was encountered." @@ -3222,69 +3175,69 @@ msgstr "" "\n" "Erôr: si è presentât un segnâl SIGILL gjenerâl." -#: parted/ui.c:888 +#: parted/ui.c:889 #, c-format msgid "invalid token: %s" msgstr "token no valit: %s" -#: parted/ui.c:1069 +#: parted/ui.c:1070 msgid "Expecting a partition number." msgstr "Si spiete un numar di partizion." -#: parted/ui.c:1078 +#: parted/ui.c:1079 msgid "Partition doesn't exist." msgstr "La partizion no esist." -#: parted/ui.c:1098 +#: parted/ui.c:1099 msgid "Expecting a file system type." msgstr "Si spiete un gjenar di file system." -#: parted/ui.c:1105 +#: parted/ui.c:1106 #, c-format msgid "Unknown file system type \"%s\"." msgstr "Gjenar di file system \"%s\" no cognossût." -#: parted/ui.c:1126 +#: parted/ui.c:1127 msgid "Expecting a disk label type." msgstr "Si spiete un gjenar di etichete di disc." -#: parted/ui.c:1157 parted/ui.c:1193 +#: parted/ui.c:1158 parted/ui.c:1194 msgid "No flags supported" msgstr "" -#: parted/ui.c:1267 +#: parted/ui.c:1268 msgid "Can't create any more partitions." msgstr "impussibil creâ ancjemò altris partizions." -#: parted/ui.c:1277 +#: parted/ui.c:1278 msgid "Expecting a partition type." msgstr "Si spiete un gjenar di partizion." -#: parted/ui.c:1426 +#: parted/ui.c:1427 msgid "on" msgstr "on" -#: parted/ui.c:1427 +#: parted/ui.c:1428 msgid "off" msgstr "off" -#: parted/ui.c:1444 +#: parted/ui.c:1445 msgid "optimal" msgstr "otimâl" -#: parted/ui.c:1445 +#: parted/ui.c:1446 msgid "minimal" msgstr "minimâl" -#: parted/ui.c:1578 +#: parted/ui.c:1579 msgid "OPTIONs:" msgstr "OPZIONs:" -#: parted/ui.c:1583 +#: parted/ui.c:1584 msgid "COMMANDs:" msgstr "COMANTs:" -#: parted/ui.c:1586 +#: parted/ui.c:1587 #, c-format msgid "" "\n" @@ -3293,33 +3246,89 @@ msgstr "" "\n" "segnale i erôrs a %s\n" -#: parted/ui.c:1593 +#: parted/ui.c:1594 #, c-format msgid "Using %s\n" msgstr "Al ven doprât %s\n" -#: parted/ui.c:1673 +#: parted/ui.c:1674 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 "%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: \n" #~ msgstr "Sît web di %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" + +#~ msgid "" +#~ "The partition table cannot be re-read. This means you need to reboot " +#~ "before mounting any modified partitions. You also need to reinstall your " +#~ "boot loader before you reboot (which may require mounting modified " +#~ "partitions). It is impossible do both things! So you'll need to boot " +#~ "off a rescue disk, and reinstall your boot loader from the rescue disk. " +#~ "Read section 4 of the Parted User documentation for more information." +#~ msgstr "" +#~ "Impussibil tornâ a lei la tabele des partizions. Chest al significhe che " +#~ "al covente tornâ a inviâ il sisteme prime di montâ cualsisei partizion " +#~ "modificade. Tu varâs ancje di tornâ a instalâ il boot loader prime di " +#~ "tornâ a inviâ il sisteme (che al podarès vê bisugne di montâ lis " +#~ "partizions modificadis). Al è impussibil fâ dutis dôs lis robis! Duncje " +#~ "tu varâs di inviâ un disc di ripristinament e di lì tornâ a instalâ il " +#~ "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 " +#~ "computer before doing anything with %s." +#~ msgstr "" +#~ "Impussibil tornâ a lei la tabele des partizions su %s (%s). Chest al " +#~ "significhe che Hurd nol sa nuie su lis modifichis che tu âs fat. Tu âs " +#~ "di tornâ a inviâ il computer prime di fâ alc cun %s." + +#~ 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." #~ msgstr "" #~ "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." +#~ msgstr "" +#~ "Il file %s al è segnât come file di sisteme. Chest al significhe che " +#~ "spostantlu cualchi program al podarès blocâsi." diff --git a/po/gl.gmo b/po/gl.gmo index fc275c6f4101328a28d5f48e656f5acf9ddf1fb3..65cbef45a7d82f0da79897a56de597945c698c7f 100644 GIT binary patch delta 6971 zcmYk=34D)79>?*KQ%(sI5^@qE#FdmFA&Iz&Tk5R)ZXN5WQh%haQe`!9wc1)&vF;RY z(QUDgWhtdatF=_OEp4@{l(P2o&5YNYmtWp9^UU)+b3GGm-r}|3O)t+^<$abIQj0Ri zRK<#c#%v=WTv4^g9E~=n0v^Liyo73Z3;i&>iZR?`Dq{>*!-klHnK%jcs2%S5VT`5x z4MrH_G2T3_F%?m$7j?yC9EM4_5cy-?jF2r>7#)DXZN3cA` z@zzXih+S|T_UHZPBQkBNh>bHQ4@cl!+>Clqdb}|Kn1LNJ7n|cEqz~pKCg62!gCP{u z!JeoW&ctloi<+7Hn27cGk<0r{H!`}g1U02cu|J-|EKIFtOgkKd8p$r~gGX^(8K%6t zeP9vO#bC{DR0qzYI`{xnF}jAG`nITcBhaHYeUVH}T!}2JIfTLZHEL~dU?|=}Z}g+F z4+f$ymc#QHfiy8cq1HTtUeGs_g6c?T)QiVD=O;7&TGI_wG{r;M4BgFKd8_4)VFKC z6m{d9sHxhBnwi5`39n!}-gDM#VApaeYKjX{9o>Lh!Vi$iGUrfB{1D4wBpa>AkT~Id;#A2L|TH~-Z+p!4LnkJw|-Uz)g2g5NB^_*T<7KbArmKlc{$U@ZGZ$dvj zirnupr^x7rGpMQm0+}7-&v0d9)Krc@25+XIUi1!D#68HYniHrI|KZ9>PZ*O=xd*D< z8q~<&L$y1N<@EjkK}I78YGgl?7}N_oAYY*Ai+pKjCTfOOV3p$Y^)&$0zZ=EBDN>Q&)_0sNar1Vp8y@FJlwb$PZv7evPbxxsB>bL)J$F9PS~b8<%2D zJb=~k2UJHw+t{hBi`ta!(Hr}q+6}RTg6j_IH>?>Do_=z%YxM!p!;)6Li&OI+E%lYK!bsv{Ygjm=OmoPoN3HtPPBn2T#r z1NasL@CQ`;Tj){4yRJg#rF!g(K^TG>VH9p>7d1r9$W<0D3H`g+y^@N0PG{6WdSMC< zLe3bo0NF0)7^;KiSr6_0)UM2bI+^}dXji_5YzMOq^_ktpT3CToM+Z(8ssoczn{)-H z;$BpTzDLbWIi_tTmPeJhVGrDi+O+-@T4L26%>NKF1F4vXhmdEO<~{9^xfl;qzKL4H zJ-zHm_v2G)kNh#!3+#xeV>0FS$Y9MWOvCsmOLx2Jfo&+SMGjeW!$U?>k<#0q{e7@C zqv(@rote*rp+;)3xkn;W(sj4o-2U7}>3618ONg#YDV=$r$}7d-AnJ?U8)cz{a8I^7uQq%317h_JVY~+FwOoO zvmdhBW)ZeW&wZC^^PD{gUc*8z9KdbZdb-^_w=tV??HTsu8jJMVY{CqTectZ+0@P;v z9Qlw;@JzcGCOV5zQ@hrsTW$^~q z#NRL)V_vpPm4UjRg?dnH)Cjwwo;MWroY|4X1;?T~unaYoZ=jaqEv$vxQ1@LxcDMP;l`Af=GZuv!c_OM^vWJW| zL#nG7i5ltCn2gV(db%F_;TBg8eAWIBMmVY?15g7QgnGe7)SlUfy8k3 zwYfHcB9m8|SQVFe{}HlLuJ{9L`kvs1E3WQIXLHnMQu>7WhIp3H|C}nt6IIBsMx6sn z-cW9$c|;0rnz_0UoEtR%I+L~IvuJR^U08$q{FJ`6l>XEwbcg6b zc+pbn~Cd6s-H3+4x9f?{*CT$BIUBG`5gI&3w^D~U2T^Zsc`Mt!; z#B|~ft$#%>B;YM#H}NR_LS`579I=8JNjyqFkxA#ifv%#v^GoMiXEBD-?okRSuXmQ7 z;h<$G{mX;gQ4}6s!PA@EMioiFT1tP0xxBA?Tn^>mAGY1YOTB6&m1NJz f@+w+4Dx#!{r?OYcox%wrMT-~5mwdVS6QBP9Aapf; delta 8611 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\n" "Language-Team: Galician \n" @@ -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 #. #. and use glyphs suitable for your language. -#: lib/quotearg.c:362 +#: lib/quotearg.c:355 msgid "`" msgstr "«" -#: lib/quotearg.c:363 +#: lib/quotearg.c:356 msgid "'" msgstr "»" @@ -373,32 +373,17 @@ msgstr "Axuda xeral ao usar software GNU: \n" msgid "memory exhausted" msgstr "esgotouse a memoria" -#: lib/xstrtol-error.c:63 -#, c-format -msgid "invalid %s%s argument '%s'" -msgstr "o argumento «%s» de %s%s é incorrecto" - -#: lib/xstrtol-error.c:68 -#, c-format -msgid "invalid suffix in %s%s argument '%s'" -msgstr "sufixo incorrecto %s%s no argumento «%s»" - -#: lib/xstrtol-error.c:72 -#, c-format -msgid "%s%s argument '%s' too large" -msgstr "%s%s argumento «%s» demasiado longo" - -#: libparted/arch/beos.c:245 +#: libparted/arch/beos.c:246 msgid "Disk Image" msgstr "Imaxe de disco" -#: libparted/arch/beos.c:346 libparted/arch/gnu.c:277 +#: libparted/arch/beos.c:347 libparted/arch/gnu.c:277 #: libparted/arch/linux.c:1731 #, c-format msgid "Error opening %s: %s" msgstr "Produciuse un erro ao abrir %s: %s" -#: libparted/arch/beos.c:357 libparted/arch/gnu.c:287 +#: libparted/arch/beos.c:358 libparted/arch/gnu.c:287 #: libparted/arch/linux.c:1742 #, c-format msgid "Unable to open %s read-write (%s). %s has been opened read-only." @@ -406,47 +391,47 @@ msgstr "" "Non foi posíbel abrir %s para lectura-escritura (%s). Abriuse %s para só " "lectura." -#: libparted/arch/beos.c:419 libparted/arch/linux.c:1907 +#: libparted/arch/beos.c:420 libparted/arch/linux.c:1907 #, c-format msgid "%s during seek for read on %s" msgstr "%s mentres se ía á posición na que ler en %s" -#: libparted/arch/beos.c:452 libparted/arch/gnu.c:465 libparted/arch/gnu.c:564 -#: libparted/arch/gnu.c:692 libparted/arch/linux.c:1867 +#: libparted/arch/beos.c:453 libparted/arch/gnu.c:425 libparted/arch/gnu.c:524 +#: libparted/arch/gnu.c:652 libparted/arch/linux.c:1867 #: libparted/arch/linux.c:1949 #, c-format msgid "%s during read on %s" msgstr "%s durante a lectura en %s" -#: libparted/arch/beos.c:488 libparted/arch/gnu.c:525 +#: libparted/arch/beos.c:489 libparted/arch/gnu.c:485 #: libparted/arch/linux.c:2026 #, c-format msgid "Can't write to %s, because it is opened read-only." msgstr "Non foi posíbel escribir en %s, porque está aberto para só lectura." -#: libparted/arch/beos.c:504 libparted/arch/linux.c:2051 +#: libparted/arch/beos.c:505 libparted/arch/linux.c:2051 #, c-format msgid "%s during seek for write on %s" msgstr "%s mentres se ía á posición na que escribir en %s" -#: libparted/arch/beos.c:541 libparted/arch/gnu.c:601 libparted/arch/gnu.c:646 -#: libparted/arch/gnu.c:723 libparted/arch/linux.c:1999 +#: libparted/arch/beos.c:542 libparted/arch/gnu.c:561 libparted/arch/gnu.c:606 +#: libparted/arch/gnu.c:683 libparted/arch/linux.c:1999 #: libparted/arch/linux.c:2094 libparted/arch/linux.c:2167 #, c-format msgid "%s during write on %s" msgstr "%s durante a escritura en %s" -#: partprobe/partprobe.c:148 +#: partprobe/partprobe.c:149 #, c-format msgid "Try `%s --help' for more information.\n" msgstr "Execute «%s --help» para obter máis información.\n" -#: partprobe/partprobe.c:152 +#: partprobe/partprobe.c:153 #, c-format msgid "Usage: %s [OPTION] [DEVICE]...\n" msgstr "Uso: %s [OPCIÓN] [DISPOSITIVO]...\n" -#: partprobe/partprobe.c:153 +#: partprobe/partprobe.c:154 msgid "" "Inform the operating system about partition table changes.\n" "\n" @@ -456,13 +441,13 @@ msgid "" " -v, --version output version information and exit\n" msgstr "" -#: partprobe/partprobe.c:161 +#: partprobe/partprobe.c:162 msgid "" "\n" "When no DEVICE is given, probe all partitions.\n" msgstr "" -#: partprobe/partprobe.c:165 +#: partprobe/partprobe.c:166 #, c-format msgid "" "\n" @@ -480,43 +465,7 @@ msgstr "Non foi posíbel abrir %s." msgid "Unable to probe store." msgstr "" -#: libparted/arch/gnu.c:368 -msgid "" -"The partition table cannot be re-read. This means you need to reboot before " -"mounting any modified partitions. You also need to reinstall your boot " -"loader before you reboot (which may require mounting modified partitions). " -"It is impossible do both things! So you'll need to boot off a rescue disk, " -"and reinstall your boot loader from the rescue disk. Read section 4 of the " -"Parted User documentation for more information." -msgstr "" -"Non foi posíbel volver ler a táboa de particións, así que ten que reiniciar " -"antes de montar calquera partición modificada. Tamén ten que reinstalar o " -"cargador de arranque antes de reiniciar (o que pode precisar a montaxe de " -"particións modificadas). É imposíbel facer ámbalas dúas cousas, así que ha " -"ter que arrancar cun disco de rescate, e reinstalar o cargador de arranque " -"desde o disco de rescate. Lea a sección 4 da documentación de Usuario de " -"Parted para obter máis información." - -#: libparted/arch/gnu.c:385 -#, 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 computer " -"before doing anything with %s." -msgstr "" -"Non é posíbel volver ler a táboa de particións de %s (%s). Isto quere dicir " -"que Hurd non sabe nada sobre as modificacións que vostede fixo. Debería " -"reiniciar o seu computador antes de facer nada con %s." - -#: libparted/arch/gnu.c:396 parted/parted.c:2318 -msgid "" -"You should reinstall your boot loader before rebooting. Read section 4 of " -"the Parted User documentation for more information." -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." - -#: libparted/arch/gnu.c:788 +#: libparted/arch/gnu.c:748 #, c-format msgid "%s trying to sync %s to disk" msgstr "%s tentando sincronizar %s no disco" @@ -826,15 +775,15 @@ msgstr "metadatos" msgid "free" msgstr "libre" -#: libparted/disk.c:2355 parted/ui.c:1258 parted/ui.c:1286 +#: libparted/disk.c:2355 parted/ui.c:1259 parted/ui.c:1287 msgid "extended" msgstr "estendida" -#: libparted/disk.c:2357 parted/ui.c:1262 parted/ui.c:1290 +#: libparted/disk.c:2357 parted/ui.c:1263 parted/ui.c:1291 msgid "logical" msgstr "lóxica" -#: libparted/disk.c:2359 parted/ui.c:1254 parted/ui.c:1282 +#: libparted/disk.c:2359 parted/ui.c:1255 parted/ui.c:1283 msgid "primary" msgstr "primaria" @@ -912,64 +861,73 @@ msgstr "" msgid "esp" msgstr "Si" -#: libparted/disk.c:2415 +#: libparted/disk.c:2411 +msgid "chromeos_kernel" +msgstr "" + +#: libparted/disk.c:2413 +#, fuzzy +msgid "bls_boot" +msgstr "arranque" + +#: libparted/disk.c:2419 #, fuzzy, c-format msgid "Unknown partition flag, %d." msgstr "Modificador de particións descoñecido, %d." -#: libparted/exception.c:78 +#: libparted/exception.c:79 msgid "Information" msgstr "Información" -#: libparted/exception.c:79 +#: libparted/exception.c:80 msgid "Warning" msgstr "Aviso" -#: libparted/exception.c:80 +#: libparted/exception.c:81 msgid "Error" msgstr "Erro" -#: libparted/exception.c:81 +#: libparted/exception.c:82 msgid "Fatal" msgstr "Moi grave" -#: libparted/exception.c:82 +#: libparted/exception.c:83 msgid "Bug" msgstr "Fallo" -#: libparted/exception.c:83 +#: libparted/exception.c:84 msgid "No Implementation" msgstr "Sen implementación" -#: libparted/exception.c:87 +#: libparted/exception.c:88 msgid "Fix" msgstr "Arranxar" -#: libparted/exception.c:88 +#: libparted/exception.c:89 msgid "Yes" msgstr "Si" -#: libparted/exception.c:89 +#: libparted/exception.c:90 msgid "No" msgstr "Non" -#: libparted/exception.c:90 +#: libparted/exception.c:91 msgid "OK" msgstr "Aceptar" -#: libparted/exception.c:91 +#: libparted/exception.c:92 msgid "Retry" msgstr "Reintentar" -#: libparted/exception.c:92 +#: libparted/exception.c:93 msgid "Ignore" msgstr "Ignorar" -#: libparted/exception.c:93 +#: libparted/exception.c:94 msgid "Cancel" msgstr "Cancelar" -#: libparted/exception.c:133 +#: libparted/exception.c:134 #, c-format msgid "" "A bug has been detected in GNU Parted. Refer to the web site of parted " @@ -978,33 +936,33 @@ msgid "" "containing at least the version (%s) and the following message: " msgstr "" -#: libparted/labels/aix.c:91 +#: libparted/labels/aix.c:92 msgid "Support for reading AIX disk labels is is not implemented yet." msgstr "" "A compatibilidade para ler etiquetas de disco AIX aínda non está " "implementada." -#: libparted/labels/aix.c:102 +#: libparted/labels/aix.c:103 msgid "Support for writing AIX disk labels is is not implemented yet." msgstr "" "A compatibilidade para escribir etiquetas de disco AIX aínda non está " "implementada." -#: libparted/labels/aix.c:115 +#: libparted/labels/aix.c:116 msgid "" "Support for adding partitions to AIX disk labels is not implemented yet." msgstr "" "A compatibilidade para engadir particións a etiquetas de disco AIX aínda non " "está implementada." -#: libparted/labels/aix.c:125 +#: libparted/labels/aix.c:126 msgid "" "Support for duplicating partitions in AIX disk labels is not implemented yet." msgstr "" "A compatibilidade para duplicar particións en etiquetas de disco AIX aínda " "non está implementada." -#: libparted/labels/aix.c:143 +#: libparted/labels/aix.c:144 msgid "" "Support for setting system type of partitions in AIX disk labels is not " "implemented yet." @@ -1012,7 +970,7 @@ msgstr "" "A compatibilidade para definir o tipo de sistema de particións en etiquetas " "de disco AIX aínda non está implementada." -#: libparted/labels/aix.c:153 +#: libparted/labels/aix.c:154 msgid "Support for setting flags in AIX disk labels is not implemented yet." msgstr "" @@ -1100,11 +1058,11 @@ msgid "" "partitions, if XGM is the first one it counts for two)." msgstr "" -#: libparted/labels/atari.c:1657 libparted/labels/bsd.c:567 -#: libparted/labels/dasd.c:894 libparted/labels/dos.c:2276 -#: libparted/labels/dvh.c:770 libparted/labels/gpt.c:2050 -#: libparted/labels/loop.c:243 libparted/labels/mac.c:1423 -#: libparted/labels/pc98.c:701 libparted/labels/rdb.c:1054 +#: libparted/labels/atari.c:1657 libparted/labels/bsd.c:563 +#: libparted/labels/dasd.c:895 libparted/labels/dos.c:2283 +#: libparted/labels/dvh.c:770 libparted/labels/gpt.c:2140 +#: 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 "Non foi posíbel satisfacer todas as restricións da partición." @@ -1120,44 +1078,44 @@ msgstr "" msgid "Unable to allocate a partition number." msgstr "Non foi posíbel asignar un número de partición." -#: libparted/labels/bsd.c:592 +#: libparted/labels/bsd.c:588 msgid "Unable to allocate a bsd disklabel slot." msgstr "" -#: libparted/labels/dasd.c:625 +#: libparted/labels/dasd.c:626 msgid "The partition table of DASD-LDL device cannot be changed.\n" msgstr "" -#: libparted/labels/dasd.c:920 +#: libparted/labels/dasd.c:921 msgid "Unable to allocate a dasd disklabel slot" msgstr "" -#: libparted/labels/dos.c:1003 +#: libparted/labels/dos.c:1006 #, 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:1031 +#: libparted/labels/dos.c:1034 #, 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:1560 +#: libparted/labels/dos.c:1557 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:1572 +#: libparted/labels/dos.c:1569 #, 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:2258 +#: libparted/labels/dos.c:2265 msgid "Parted can't resize partitions managed by Windows Dynamic Disk." msgstr "" -#: libparted/labels/dos.c:2514 +#: libparted/labels/dos.c:2521 msgid "cannot create any more partitions" msgstr "non é posíbel crear máis particións" @@ -1299,12 +1257,12 @@ msgstr "" msgid "Disk geometry does not match a DASD device of type 3390." msgstr "" -#: libparted/labels/gpt.c:531 +#: libparted/labels/gpt.c:541 #, fuzzy msgid "device is too small for GPT" msgstr "O sistema de ficheiros é pequeno de máis para ext2." -#: libparted/labels/gpt.c:733 +#: libparted/labels/gpt.c:743 #, c-format msgid "" "The format of the GPT partition table is version %x, which is newer than " @@ -1313,7 +1271,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:769 +#: libparted/labels/gpt.c:779 #, c-format msgid "" "Not all of the space available to %s appears to be used, you can fix the GPT " @@ -1321,7 +1279,7 @@ msgid "" "setting? " msgstr "" -#: libparted/labels/gpt.c:1008 +#: libparted/labels/gpt.c:1024 #, fuzzy msgid "" "The backup GPT table is not at the end of the disk, as it should be. Fix, " @@ -1332,7 +1290,7 @@ msgstr "" "máis pequeno. Quere arranxalo, movendo a copia de seguridade ao final (e " "retirando a copia vella)?" -#: libparted/labels/gpt.c:1026 +#: libparted/labels/gpt.c:1042 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 +1299,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:1037 +#: libparted/labels/gpt.c:1053 msgid "" "The backup GPT table is corrupt, but the primary appears OK, so that will be " "used." @@ -1349,7 +1307,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:1049 +#: libparted/labels/gpt.c:1065 msgid "" "The primary GPT table is corrupt, but the backup appears OK, so that will be " "used." @@ -1357,11 +1315,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:1073 +#: libparted/labels/gpt.c:1089 msgid "primary partition table array CRC mismatch" msgstr "" -#: libparted/labels/gpt.c:1936 libparted/labels/gpt.c:1963 +#: libparted/labels/gpt.c:2026 libparted/labels/gpt.c:2053 #, fuzzy msgid "failed to translate partition name" msgstr "Non foi posíbel asignar un número de partición." @@ -1395,18 +1353,14 @@ msgid "The data region doesn't start at the start of the partition." msgstr "A rexión de datos non comeza no principio da partición." #: libparted/labels/mac.c:572 -msgid "The boot region doesn't start at the start of the partition." -msgstr "A rexión de arranque non comeza no principio da partición." - -#: libparted/labels/mac.c:586 msgid "The partition's boot region doesn't occupy the entire partition." msgstr "A rexión de arranque da partición non ocupa toda a partición." -#: libparted/labels/mac.c:597 +#: libparted/labels/mac.c:583 msgid "The partition's data region doesn't occupy the entire partition." msgstr "A rexión de datos da partición non ocupa toda a partición." -#: libparted/labels/mac.c:649 +#: libparted/labels/mac.c:635 #, c-format msgid "" "Weird block size on device descriptor: %d bytes is not divisible by 512." @@ -1414,7 +1368,7 @@ msgstr "" "Tamaño de bloque estraño no descritor do dispositivo: %d bytes non é " "divisíbel por 512." -#: libparted/labels/mac.c:662 +#: libparted/labels/mac.c:648 #, c-format msgid "" "The driver descriptor says the physical block size is %d bytes, but Linux " @@ -1423,11 +1377,11 @@ msgstr "" "O descritor do controlador di que o tamaño do bloque físico é %d bytes, pero " "Linux di que é de %d bytes." -#: libparted/labels/mac.c:715 +#: libparted/labels/mac.c:701 msgid "No valid partition map found." msgstr "Non se atopou un mapa de particións válido." -#: libparted/labels/mac.c:789 +#: libparted/labels/mac.c:775 #, c-format msgid "" "Conflicting partition map entry sizes! Entry 1 says it is %d, but entry %d " @@ -1436,11 +1390,11 @@ msgstr "" "Tamaños das entradas do mapa de particións conflitivos! A entrada 1 di que é " "de %d, pero a entrada %d di que é %d!" -#: libparted/labels/mac.c:820 +#: libparted/labels/mac.c:806 msgid "Weird! There are 2 partitions map entries!" msgstr "Estraño! Hai 2 entradas de mapa de particións!" -#: libparted/labels/mac.c:1359 +#: libparted/labels/mac.c:1345 msgid "" "Changing the name of a root or swap partition will prevent Linux from " "recognising it as such." @@ -1448,18 +1402,18 @@ msgstr "" "Cambiar o nome dunha partición raíz ou de intercambio ha impedir que Linux a " "recoñeza coma tal." -#: libparted/labels/mac.c:1458 +#: libparted/labels/mac.c:1444 msgid "Can't add another partition -- the partition map is too small!" msgstr "" "Non é posíbel engadir outra partición -- o mapa de particións é pequeno de " "máis!" -#: libparted/labels/pc98.c:284 +#: libparted/labels/pc98.c:285 #, c-format msgid "Invalid partition table on %s." msgstr "Táboa de particións incorrecta en %s." -#: libparted/labels/pc98.c:337 libparted/labels/pc98.c:415 +#: libparted/labels/pc98.c:338 libparted/labels/pc98.c:416 #, c-format msgid "" "Partition %d isn't aligned to cylinder boundaries. This is still " @@ -1468,7 +1422,7 @@ msgstr "" "A partición %d non está aliñada nos límites dos cilindros. Aínda non hai " "compatibilidade para isto." -#: libparted/labels/pc98.c:733 +#: libparted/labels/pc98.c:729 msgid "Can't add another partition." msgstr "Non é posíbel engadir máis particións." @@ -1640,39 +1594,39 @@ msgstr "" msgid "Could not write VTOC FMT9 DSCB." msgstr "Non foi posíbel escribir a etiqueta de volume." -#: libparted/libparted.c:242 +#: libparted/libparted.c:247 msgid "Out of memory." msgstr "Memoria esgotada." -#: libparted/unit.c:139 +#: libparted/unit.c:140 msgid "Cannot get unit size for special unit 'COMPACT'." msgstr "" -#: libparted/unit.c:385 +#: libparted/unit.c:386 #, c-format msgid "\"%s\" has invalid syntax for locations." msgstr "" -#: libparted/unit.c:393 +#: libparted/unit.c:394 #, c-format msgid "The maximum head value is %d." msgstr "" -#: libparted/unit.c:400 +#: libparted/unit.c:401 #, c-format msgid "The maximum sector value is %d." msgstr "" -#: libparted/unit.c:412 libparted/unit.c:564 +#: libparted/unit.c:413 libparted/unit.c:565 #, c-format msgid "The location %s is outside of the device %s." msgstr "A localización de %s está fóra do dispositivo %s." -#: libparted/unit.c:526 +#: libparted/unit.c:527 msgid "Invalid number." msgstr "" -#: libparted/unit.c:532 +#: libparted/unit.c:533 msgid "Use a smaller unit instead of a value < 1" msgstr "" @@ -1682,18 +1636,18 @@ msgstr "" msgid "%s : Failed to allocate partition block\n" msgstr "" -#: libparted/fs/amiga/affs.c:79 libparted/fs/amiga/apfs.c:71 +#: 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 "" -#: libparted/fs/amiga/affs.c:84 libparted/fs/amiga/apfs.c:76 +#: libparted/fs/amiga/affs.c:83 libparted/fs/amiga/apfs.c:76 #, c-format msgid "%s : Couldn't read boot block %llu\n" msgstr "" -#: libparted/fs/amiga/affs.c:98 libparted/fs/amiga/apfs.c:87 +#: 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" @@ -1719,22 +1673,22 @@ msgstr "" msgid "%s : Couldn't write block %d\n" msgstr "%s: non foi posíbel escribir o bloque %d\n" -#: libparted/fs/amiga/amiga.c:278 +#: libparted/fs/amiga/amiga.c:279 #, c-format msgid "%s : Failed to allocate disk_specific rdb block\n" msgstr "" -#: libparted/fs/amiga/amiga.c:289 +#: libparted/fs/amiga/amiga.c:290 #, c-format msgid "%s : Didn't find rdb block, should never happen\n" msgstr "" -#: libparted/fs/amiga/amiga.c:318 +#: libparted/fs/amiga/amiga.c:319 #, c-format msgid "%s : Failed to read partition block %llu\n" msgstr "" -#: libparted/fs/fat/fat.c:148 libparted/fs/r/fat/fat.c:811 +#: libparted/fs/fat/fat.c:149 msgid "" "GNU Parted was miscompiled: the FAT boot sector should be 512 bytes. FAT " "support will be disabled." @@ -1836,7 +1790,7 @@ msgid "" "geometry." msgstr "" -#: libparted/fs/r/fat/bootsector.c:399 +#: libparted/fs/r/fat/bootsector.c:398 #, c-format msgid "" "The information sector has the wrong signature (%x). Select cancel for now, " @@ -1863,14 +1817,14 @@ msgstr "" "Delta do comezo do cluster = %d, que non é un múltiplo do tamaño do cluster " "%d." -#: libparted/fs/r/fat/count.c:144 +#: libparted/fs/r/fat/count.c:84 #, c-format msgid "Bad directory entry for %s: first cluster is the end of file marker." msgstr "" "Entrada de directorio incorrecta para %s: o primeiro cluster é o marcador de " "fin de ficheiro." -#: libparted/fs/r/fat/count.c:157 +#: libparted/fs/r/fat/count.c:97 #, c-format msgid "" "Bad FAT: unterminated chain for %s. You should run dosfsck or scandisk." @@ -1878,7 +1832,7 @@ msgstr "" "FAT incorrecta: cadea non rematada para %s. Debería executar dosfsck ou " "scandisk." -#: libparted/fs/r/fat/count.c:166 +#: libparted/fs/r/fat/count.c:106 #, c-format msgid "" "Bad FAT: cluster %d outside file system in chain for %s. You should run " @@ -1887,7 +1841,7 @@ msgstr "" "FAT incorrecta: o cluster %d está fóra do sistema de ficheiros na cadea para " "%s. Debería executar dosfsck ou scandisk." -#: libparted/fs/r/fat/count.c:176 +#: libparted/fs/r/fat/count.c:116 #, c-format msgid "" "Bad FAT: cluster %d is cross-linked for %s. You should run dosfsck or " @@ -1896,26 +1850,17 @@ msgstr "" "FAT incorrecta: o cluster %d ten ligazóns cruzadas para %s. Debería executar " "dosfsck ou scandisk." -#: libparted/fs/r/fat/count.c:195 +#: libparted/fs/r/fat/count.c:135 #, c-format msgid "%s is %dk, but it has %d clusters (%dk)." msgstr "%s é de %dk, pero ten %d clusters (%dk)." -#: libparted/fs/r/fat/count.c:258 -#, c-format -msgid "" -"The file %s is marked as a system file. This means moving it could cause " -"some programs to stop working." -msgstr "" -"O ficheiro %s está marcado como ficheiro de sistema. Isto significa que " -"movelo podería facer que outros programas deixen de traballar." - -#: libparted/fs/r/fat/fat.c:243 +#: libparted/fs/r/fat/fat.c:244 #, c-format msgid "Partition too big/small for a %s file system." msgstr "A partición é grande/pequena de máis para un sistema de ficheiros %s." -#: libparted/fs/r/fat/fat.c:409 +#: 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." @@ -1923,11 +1868,11 @@ msgstr "" "As FATs non coinciden. Se non sabe o que isto significa, escolla \"Cancelar" "\", empregue \"scandisk\" no sistema de ficheiros, e logo volva." -#: libparted/fs/r/fat/fat.c:449 +#: libparted/fs/r/fat/fat.c:450 msgid "There are no possible configurations for this FAT type." msgstr "Non hai configuracións posíbeis para este tipo de FAT." -#: libparted/fs/r/fat/fat.c:461 +#: libparted/fs/r/fat/fat.c:462 #, c-format msgid "" "File system doesn't have expected sizes for Windows to like it. Cluster " @@ -1938,7 +1883,7 @@ msgstr "" "guste. O tamaño do cluster é %dk (esperábase %dk); o número de clusters é %d " "(esperábanse %d); o tamaño das FATs é de %d sectores (esperábanse %d)." -#: libparted/fs/r/fat/fat.c:484 +#: libparted/fs/r/fat/fat.c:485 #, c-format msgid "" "File system is reporting the free space as %d clusters, not %d clusters." @@ -1946,7 +1891,7 @@ msgstr "" "O sistema de ficheiros di que o espacio libre é de %d clusters, non %d " "clusters." -#: libparted/fs/r/fat/resize.c:158 +#: 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." @@ -1954,15 +1899,15 @@ msgstr "" "Non hai espazo dabondo no directorio raíz para todos os ficheiros. Pode ou " "ben cancelar, ou ben ignorar e perder os ficheiros." -#: libparted/fs/r/fat/resize.c:302 +#: libparted/fs/r/fat/resize.c:303 msgid "Error writing to the root directory." msgstr "Produciuse un erro ao escribir no directorio raíz." -#: libparted/fs/r/fat/resize.c:495 +#: libparted/fs/r/fat/resize.c:479 msgid "If you leave your file system as FAT16, then you will have no problems." msgstr "Se deixa o sistema de ficheiros como FAT16, non ha ter problemas." -#: libparted/fs/r/fat/resize.c:498 +#: 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 " @@ -1972,7 +1917,7 @@ msgstr "" "reinstalar o cargador de arranque de MS Windows. Se quere facelo, debería " "consultar o manual de Parted (ou o manual da súa distribución)." -#: libparted/fs/r/fat/resize.c:506 +#: libparted/fs/r/fat/resize.c:490 msgid "" "If you leave your file system as FAT32, then you will not introduce any new " "problems." @@ -1980,7 +1925,7 @@ msgstr "" "Se deixa o sistema de ficheiros como FAT32, non ha introducir novos " "problemas." -#: libparted/fs/r/fat/resize.c:510 +#: 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 " @@ -1994,40 +1939,40 @@ msgstr "" "conversión a FAT32 fará o sistema de ficheiros ilexíbel para MS DOS, MS " "Windows 95a e MS Windows NT." -#: libparted/fs/r/fat/resize.c:524 +#: libparted/fs/r/fat/resize.c:508 #, c-format msgid "%s %s %s" msgstr "%s %s %s" -#: libparted/fs/r/fat/resize.c:525 +#: libparted/fs/r/fat/resize.c:509 msgid "Would you like to use FAT32?" msgstr "Quere usar FAT32?" -#: libparted/fs/r/fat/resize.c:556 libparted/fs/r/fat/resize.c:572 +#: 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:557 +#: libparted/fs/r/fat/resize.c:541 msgid "" "The file system can only be resized to this size by converting to FAT16." msgstr "" "O sistema de ficheiros só pode alcanzar este tamaño convertendo a FAT16." -#: libparted/fs/r/fat/resize.c:573 +#: libparted/fs/r/fat/resize.c:557 msgid "" "The file system can only be resized to this size by converting to FAT32." msgstr "" "O sistema de ficheiros só pode alcanzar este tamaño convertendo a FAT32." -#: libparted/fs/r/fat/resize.c:586 +#: 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 non pode redimensionar esta partición a este tamaño. Estamos " "traballando niso!" -#: libparted/fs/r/fat/table.c:136 +#: 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 " @@ -2036,42 +1981,42 @@ msgstr "" "Na FAT %d, o soporte %x non coincide co soporte do sector de arranque, %x. " "Seguramente debería executar scandisk." -#: libparted/fs/r/fat/table.c:268 +#: libparted/fs/r/fat/table.c:269 #, c-format msgid "fat_table_set: cluster %ld outside file system" msgstr "fat_table_set: o cluster %ld está fóra do sistema de ficheiros" -#: libparted/fs/r/fat/table.c:300 +#: libparted/fs/r/fat/table.c:301 #, c-format msgid "fat_table_get: cluster %ld outside file system" msgstr "fat_table_get: o cluster %ld está fóra do sistema de ficheiros" -#: libparted/fs/r/fat/table.c:342 +#: libparted/fs/r/fat/table.c:343 msgid "fat_table_alloc_cluster: no free clusters" msgstr "fat_table_alloc_cluster: non hai clusters libres" -#: libparted/fs/r/filesys.c:151 +#: libparted/fs/r/filesys.c:152 msgid "Could not detect file system." msgstr "Non é posíbel detectar un sistema de ficheiros." -#: libparted/fs/r/filesys.c:158 libparted/fs/r/filesys.c:285 +#: libparted/fs/r/filesys.c:159 libparted/fs/r/filesys.c:284 #, c-format msgid "resizing %s file systems is not supported" msgstr "" "non hai compatibilidade para o redimensionamento de sistemas de ficheiros %s" -#: libparted/fs/r/filesys.c:170 +#: libparted/fs/r/filesys.c:171 msgid "The file system is bigger than its volume!" msgstr "O sistema de ficheiros é maior que seu volume!" -#: libparted/fs/r/hfs/advfs.c:121 libparted/fs/r/hfs/advfs_plus.c:121 -#: libparted/fs/r/hfs/reloc.c:413 libparted/fs/r/hfs/reloc.c:507 -#: libparted/fs/r/hfs/reloc_plus.c:538 libparted/fs/r/hfs/reloc_plus.c:656 -#: libparted/fs/r/hfs/reloc_plus.c:769 +#: 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:285 +#: libparted/fs/r/hfs/advfs_plus.c:287 msgid "Bad blocks could not be read." msgstr "" @@ -2129,87 +2074,87 @@ msgstr "" msgid "Trying to write HFS+ file with CNID %X behind EOF." msgstr "" -#: libparted/fs/r/hfs/hfs.c:232 +#: libparted/fs/r/hfs/hfs.c:212 msgid "Sorry, HFS cannot be resized that way yet." msgstr "" -#: libparted/fs/r/hfs/hfs.c:250 libparted/fs/r/hfs/hfs.c:629 +#: libparted/fs/r/hfs/hfs.c:230 libparted/fs/r/hfs/hfs.c:573 msgid "shrinking" msgstr "reducindo" -#: libparted/fs/r/hfs/hfs.c:262 libparted/fs/r/hfs/hfs.c:641 +#: 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:281 +#: 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:320 +#: libparted/fs/r/hfs/hfs.c:300 msgid "writing HFS Master Directory Block" msgstr "" -#: libparted/fs/r/hfs/hfs.c:468 +#: 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:478 +#: libparted/fs/r/hfs/hfs.c:422 #, c-format msgid "Version %d of HFS+ isn't supported." msgstr "" -#: libparted/fs/r/hfs/hfs.c:489 +#: libparted/fs/r/hfs/hfs.c:433 #, c-format msgid "Version %d of HFSX isn't supported." msgstr "" -#: libparted/fs/r/hfs/hfs.c:672 +#: 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:720 +#: libparted/fs/r/hfs/hfs.c:664 msgid "Error while writing the allocation file." msgstr "" -#: libparted/fs/r/hfs/hfs.c:735 +#: 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:750 +#: libparted/fs/r/hfs/hfs.c:694 msgid "writing HFS+ Volume Header" msgstr "" -#: libparted/fs/r/hfs/hfs.c:850 +#: 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:904 +#: 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:940 +#: libparted/fs/r/hfs/hfs.c:883 msgid "Sorry, HFS+ cannot be resized that way yet." msgstr "" -#: libparted/fs/r/hfs/hfs.c:975 +#: libparted/fs/r/hfs/hfs.c:918 msgid "shrinking embedded HFS+ volume" msgstr "" -#: libparted/fs/r/hfs/hfs.c:992 +#: libparted/fs/r/hfs/hfs.c:935 msgid "Resizing the HFS+ volume has failed." msgstr "" -#: libparted/fs/r/hfs/hfs.c:999 +#: libparted/fs/r/hfs/hfs.c:942 msgid "shrinking HFS wrapper" msgstr "" -#: libparted/fs/r/hfs/hfs.c:1008 +#: libparted/fs/r/hfs/hfs.c:951 msgid "Updating the HFS wrapper has failed." msgstr "" -#: libparted/fs/r/hfs/hfs.c:1110 libparted/fs/r/hfs/hfs.c:1195 +#: 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 " @@ -2274,71 +2219,71 @@ msgstr "" msgid "An extent has not been relocated." msgstr "" -#: libparted/fs/r/hfs/reloc.c:250 libparted/fs/r/hfs/reloc_plus.c:307 +#: 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:380 +#: 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:474 +#: 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:516 libparted/fs/r/hfs/reloc_plus.c:666 +#: 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:573 libparted/fs/r/hfs/reloc_plus.c:844 +#: 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:634 libparted/fs/r/hfs/reloc_plus.c:905 +#: 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:648 libparted/fs/r/hfs/reloc_plus.c:921 +#: 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:494 +#: 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:617 +#: 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:125 +#: parted/parted.c:126 msgid "displays this help message" msgstr "mostra esta mensaxe de axuda" -#: parted/parted.c:126 +#: parted/parted.c:127 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:127 +#: parted/parted.c:128 msgid "displays machine parseable output" msgstr "" -#: parted/parted.c:128 +#: parted/parted.c:129 msgid "never prompts for user intervention" msgstr "non pedir nunca a intervención do usuario" -#: parted/parted.c:129 +#: parted/parted.c:130 msgid "displays the version" msgstr "mostra a versión" -#: parted/parted.c:130 +#: parted/parted.c:131 msgid "alignment for new partitions" msgstr "" -#: parted/parted.c:142 +#: parted/parted.c:143 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" @@ -2347,58 +2292,58 @@ 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:145 +#: parted/parted.c:146 msgid "LABEL-TYPE is one of: " msgstr "TIPO-ETIQUETA é un destes: " -#: parted/parted.c:146 parted/parted.c:147 +#: parted/parted.c:147 parted/parted.c:148 msgid "FLAG is one of: " msgstr "MODIF é un destes: " -#: parted/parted.c:148 +#: parted/parted.c:149 msgid "UNIT is one of: " msgstr "" -#: parted/parted.c:149 +#: parted/parted.c:150 msgid "desired alignment: minimum or optimal" msgstr "" -#: parted/parted.c:150 +#: parted/parted.c:151 msgid "PART-TYPE is one of: primary, logical, extended\n" msgstr "" "TIPO-PARTICION é: primary (primaria), logical (lóxica), extended " "(estendida)\n" -#: parted/parted.c:152 +#: parted/parted.c:153 msgid "FS-TYPE is one of: " msgstr "TIPO-SF é un destes: " -#: parted/parted.c:153 +#: parted/parted.c:154 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:156 +#: parted/parted.c:157 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:159 +#: parted/parted.c:160 msgid "STATE is one of: on, off\n" msgstr "ESTADO é un destes: on, off\n" -#: parted/parted.c:160 +#: parted/parted.c:161 msgid "DEVICE is usually /dev/hda or /dev/sda\n" msgstr "DISPOSITIVO adoita ser /dev/hda ou /dev/sda\n" -#: parted/parted.c:161 +#: parted/parted.c:162 msgid "NAME is any word you want\n" msgstr "NOME é calquera palabra que queira\n" -#: parted/parted.c:164 +#: parted/parted.c:165 msgid "" "Copyright (C) 1998 - 2006 Free Software Foundation, Inc.\n" "This program is free software, covered by the GNU General Public License.\n" @@ -2418,152 +2363,152 @@ msgstr "" "Licenza Pública Xeral de GNU para obter máis detalles.\n" "\n" -#: parted/parted.c:212 +#: parted/parted.c:213 #, c-format msgid "%0.f%%\t(time left %.2d:%.2d)" msgstr "%0.f%%\t(tempo restante %.2d:%.2d)" -#: parted/parted.c:231 +#: parted/parted.c:232 #, 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:252 +#: parted/parted.c:253 #, 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:264 +#: parted/parted.c:265 #, 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:525 +#: parted/parted.c:526 msgid "New disk label type?" msgstr "Novo tipo de etiqueta de disco?" -#: parted/parted.c:662 +#: parted/parted.c:663 msgid "Partition type?" msgstr "Tipo de partición?" -#: parted/parted.c:680 parted/parted.c:884 +#: parted/parted.c:681 parted/parted.c:885 msgid "Partition name?" msgstr "Nome da partición?" -#: parted/parted.c:690 +#: parted/parted.c:691 msgid "File system type?" msgstr "Tipo de sistema de ficheiros?" -#: parted/parted.c:695 parted/parted.c:1498 +#: parted/parted.c:696 parted/parted.c:1499 msgid "Start?" msgstr "Inicio?" -#: parted/parted.c:698 parted/parted.c:1500 parted/parted.c:1569 +#: parted/parted.c:699 parted/parted.c:1501 parted/parted.c:1585 msgid "End?" msgstr "Fin?" -#: parted/parted.c:766 +#: parted/parted.c:767 #, 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:775 +#: parted/parted.c:776 msgid "" "\n" "Is this still acceptable to you?" msgstr "" -#: parted/parted.c:798 +#: parted/parted.c:799 #, c-format msgid "" "The resulting partition is not properly aligned for best performance: %s" msgstr "" -#: parted/parted.c:800 parted/parted.c:1723 +#: parted/parted.c:801 parted/parted.c:1739 msgid "unknown (malloc failed)" msgstr "" -#: parted/parted.c:876 +#: parted/parted.c:877 #, 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:881 parted/parted.c:1561 parted/parted.c:1612 -#: parted/parted.c:1706 parted/parted.c:1781 +#: parted/parted.c:882 parted/parted.c:1564 parted/parted.c:1628 +#: parted/parted.c:1722 parted/parted.c:1797 msgid "Partition number?" msgstr "Número de partición?" -#: parted/parted.c:975 +#: parted/parted.c:976 #, c-format msgid "BIOS cylinder,head,sector geometry: %d,%d,%d. Each cylinder is %s.\n" msgstr "" -#: parted/parted.c:1017 +#: parted/parted.c:1018 #, c-format msgid "Model: %s (%s)\n" msgstr "Modelo: %s (%s)\n" -#: parted/parted.c:1019 +#: parted/parted.c:1020 #, c-format msgid "Disk %s: %s\n" msgstr "Disco %s: %s\n" -#: parted/parted.c:1020 +#: parted/parted.c:1021 #, c-format msgid "Sector size (logical/physical): %lldB/%lldB\n" msgstr "" -#: parted/parted.c:1032 +#: parted/parted.c:1033 #, c-format msgid "Partition Table: %s\n" msgstr "Táboa de particións: %s\n" -#: parted/parted.c:1033 +#: parted/parted.c:1034 #, c-format msgid "Disk Flags: %s\n" msgstr "" -#: parted/parted.c:1153 parted/parted.c:1156 +#: parted/parted.c:1154 parted/parted.c:1157 msgid "Number" msgstr "Número" -#: parted/parted.c:1153 parted/parted.c:1156 +#: parted/parted.c:1154 parted/parted.c:1157 msgid "Start" msgstr "Inicio" -#: parted/parted.c:1154 parted/parted.c:1157 +#: parted/parted.c:1155 parted/parted.c:1158 msgid "End" msgstr "Fin" -#: parted/parted.c:1157 +#: parted/parted.c:1158 msgid "Size" msgstr "Tamaño" -#: parted/parted.c:1161 +#: parted/parted.c:1162 msgid "Type" msgstr "Tipo" -#: parted/parted.c:1163 +#: parted/parted.c:1164 msgid "File system" msgstr "Sistema de ficheiros" -#: parted/parted.c:1166 +#: parted/parted.c:1167 msgid "Name" msgstr "Nome" -#: parted/parted.c:1168 +#: parted/parted.c:1169 msgid "Flags" msgstr "Modificadores" -#: parted/parted.c:1225 +#: parted/parted.c:1226 msgid "Free Space" msgstr "Espazo libre" -#: parted/parted.c:1385 +#: parted/parted.c:1386 #, c-format msgid "" "A %s %s partition was found at %s -> %s. Do you want to add it to the " @@ -2572,78 +2517,78 @@ msgstr "" "Atopouse unha partición %s %s en %s -> %s. Quere engadila á táboa de " "particións?" -#: parted/parted.c:1428 +#: parted/parted.c:1429 msgid "searching for file systems" msgstr "buscando sistemas de ficheiros" -#: parted/parted.c:1535 +#: parted/parted.c:1536 msgid "The resize command has been removed in parted 3.0" msgstr "" -#: parted/parted.c:1583 +#: parted/parted.c:1599 msgid "" "Shrinking a partition can cause data loss, are you sure you want to continue?" msgstr "" -#: parted/parted.c:1636 +#: parted/parted.c:1652 msgid "New device?" msgstr "Novo dispositivo?" -#: parted/parted.c:1704 +#: parted/parted.c:1720 msgid "alignment type(min/opt)" msgstr "" -#: parted/parted.c:1719 +#: parted/parted.c:1735 #, c-format msgid "%d aligned\n" msgstr "" -#: parted/parted.c:1721 +#: parted/parted.c:1737 #, c-format msgid "%d not aligned: %s\n" msgstr "" -#: parted/parted.c:1746 parted/parted.c:1783 +#: parted/parted.c:1762 parted/parted.c:1799 msgid "Flag to Invert?" msgstr "" -#: parted/parted.c:1751 parted/parted.c:1788 +#: parted/parted.c:1767 parted/parted.c:1804 msgid "New state?" msgstr "Novo estado?" -#: parted/parted.c:1834 +#: parted/parted.c:1850 msgid "Unit?" msgstr "" -#: parted/parted.c:1969 +#: parted/parted.c:1985 msgid "align-check" msgstr "align-check" -#: parted/parted.c:1972 +#: parted/parted.c:1988 msgid "" "align-check TYPE N check partition N for TYPE(min|opt) " "alignment" msgstr "" -#: parted/parted.c:1980 +#: parted/parted.c:1996 msgid "help" msgstr "help" -#: parted/parted.c:1983 +#: parted/parted.c:1999 msgid "" "help [COMMAND] print general help, or help on " "COMMAND" msgstr "help [ORDE] mostrar axuda xeral, ou axuda sobre a ORDE" -#: parted/parted.c:1989 +#: parted/parted.c:2005 msgid "mklabel" msgstr "mklabel" -#: parted/parted.c:1989 +#: parted/parted.c:2005 msgid "mktable" msgstr "mktable" -#: parted/parted.c:1992 +#: parted/parted.c:2008 msgid "" "mklabel,mktable LABEL-TYPE create a new disklabel (partition " "table)" @@ -2651,15 +2596,15 @@ msgstr "" "mklabel, mktable TIPO-ETIQUETA crear unha nova etiqueta de disco " "(táboa de particións)" -#: parted/parted.c:1998 +#: parted/parted.c:2014 msgid "mkpart" msgstr "mkpart" -#: parted/parted.c:2001 +#: parted/parted.c:2017 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:2007 +#: parted/parted.c:2023 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" @@ -2668,27 +2613,27 @@ msgstr "" "partición. Debe especificarse TIPO-SF para definir un ID de partición " "axeitado.\n" -#: parted/parted.c:2012 +#: parted/parted.c:2028 msgid "name" msgstr "name" -#: parted/parted.c:2015 +#: parted/parted.c:2031 msgid "name NUMBER NAME name partition NUMBER as NAME" msgstr "" "name NÚMERO NOME ponlle o NOME á partición NÚMERO" -#: parted/parted.c:2020 +#: parted/parted.c:2036 msgid "print" msgstr "print" -#: parted/parted.c:2023 +#: parted/parted.c:2039 msgid "" "print [devices|free|list,all|NUMBER] display the partition table, " "available devices, free space, all found partitions, or a particular " "partition" msgstr "" -#: parted/parted.c:2028 +#: parted/parted.c:2044 msgid "" "Without arguments, 'print' displays the entire partition table. However with " "the following arguments it performs various other actions.\n" @@ -2696,40 +2641,40 @@ 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:2030 +#: parted/parted.c:2046 msgid " devices : display all active block devices\n" msgstr "" -#: parted/parted.c:2031 +#: parted/parted.c:2047 msgid "" " free : display information about free unpartitioned space on the " "current block device\n" msgstr "" -#: parted/parted.c:2033 +#: parted/parted.c:2049 msgid "" " list, all : display the partition tables of all active block devices\n" msgstr "" -#: parted/parted.c:2034 +#: parted/parted.c:2050 msgid "" " NUMBER : display more detailed information about this particular " "partition\n" msgstr "" -#: parted/parted.c:2039 +#: parted/parted.c:2055 msgid "quit" msgstr "quit" -#: parted/parted.c:2042 +#: parted/parted.c:2058 msgid "quit exit program" msgstr "quit saír do programa" -#: parted/parted.c:2047 +#: parted/parted.c:2063 msgid "rescue" msgstr "rescue" -#: parted/parted.c:2050 +#: parted/parted.c:2066 msgid "" "rescue START END rescue a lost partition near START " "and END" @@ -2737,126 +2682,134 @@ msgstr "" "rescue INICIO FIN recupera unha partición perdida " "entre INICIO e FIN" -#: parted/parted.c:2056 +#: parted/parted.c:2072 msgid "resize" msgstr "resize" -#: parted/parted.c:2059 +#: parted/parted.c:2075 msgid "The resize command was removed in parted 3.0\n" msgstr "" -#: parted/parted.c:2062 +#: parted/parted.c:2078 #, fuzzy msgid "resizepart" msgstr "resize" -#: parted/parted.c:2065 +#: parted/parted.c:2081 #, fuzzy msgid "resizepart NUMBER END resize partition NUMBER" msgstr "rm NÚMERO eliminar a partición NÚMERO" -#: parted/parted.c:2070 +#: parted/parted.c:2086 msgid "rm" msgstr "rm" -#: parted/parted.c:2073 +#: parted/parted.c:2089 msgid "rm NUMBER delete partition NUMBER" msgstr "rm NÚMERO eliminar a partición NÚMERO" -#: parted/parted.c:2078 +#: parted/parted.c:2094 msgid "select" msgstr "select" -#: parted/parted.c:2081 +#: parted/parted.c:2097 msgid "select DEVICE choose the device to edit" msgstr "" "select DISPOSITIVO escoller o dispositivo a editar" -#: parted/parted.c:2086 +#: parted/parted.c:2102 msgid "disk_set" msgstr "disk_set" -#: parted/parted.c:2089 +#: parted/parted.c:2105 msgid "" "disk_set FLAG STATE change the FLAG on selected device" msgstr "" -#: parted/parted.c:2094 +#: parted/parted.c:2110 msgid "disk_toggle" msgstr "disk_toggle" -#: parted/parted.c:2097 +#: parted/parted.c:2113 msgid "" "disk_toggle [FLAG] toggle the state of FLAG on " "selected device" msgstr "" -#: parted/parted.c:2103 +#: parted/parted.c:2119 msgid "set" msgstr "set" -#: parted/parted.c:2106 +#: parted/parted.c:2122 #, 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:2112 +#: parted/parted.c:2128 msgid "toggle" msgstr "toggle" -#: parted/parted.c:2115 +#: parted/parted.c:2131 msgid "" "toggle [NUMBER [FLAG]] toggle the state of FLAG on " "partition NUMBER" msgstr "" -#: parted/parted.c:2121 +#: parted/parted.c:2137 msgid "unit" msgstr "unit" -#: parted/parted.c:2124 +#: parted/parted.c:2140 msgid "unit UNIT set the default unit to UNIT" msgstr "" -#: parted/parted.c:2129 +#: parted/parted.c:2145 msgid "version" msgstr "version" -#: parted/parted.c:2132 +#: parted/parted.c:2148 msgid "" "version display the version number and " "copyright information of GNU Parted" msgstr "" -#: parted/parted.c:2136 +#: parted/parted.c:2152 msgid "" "'version' displays copyright and version information corresponding to this " "copy of GNU Parted\n" msgstr "" -#: parted/parted.c:2204 +#: parted/parted.c:2220 #, c-format msgid "Usage: %s [-hlmsv] [-a] [DEVICE [COMMAND [PARAMETERS]]...]\n" msgstr "" -#: parted/parted.c:2248 +#: parted/parted.c:2264 msgid "No device found" msgstr "Non se atopou ningún dispositivo" -#: parted/parted.c:2285 +#: parted/parted.c:2301 msgid "WARNING: You are not superuser. Watch out for permissions.\n" msgstr "" -#: parted/parted.c:2325 +#: parted/parted.c:2334 +msgid "" +"You should reinstall your boot loader before rebooting. Read section 4 of " +"the Parted User documentation for more information." +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:2341 msgid "You may need to update /etc/fstab.\n" msgstr "Non esqueza actualizar /etc/fstab, se é necesario.\n" -#: parted/ui.c:164 +#: parted/ui.c:165 msgid "Welcome to GNU Parted! Type 'help' to view a list of commands.\n" msgstr "" -#: parted/ui.c:167 +#: parted/ui.c:168 msgid "" "Usage: parted [OPTION]... [DEVICE [COMMAND [PARAMETERS]...]...]\n" "Apply COMMANDs with PARAMETERS to DEVICE. If no COMMAND(s) are given, run " @@ -2867,7 +2820,7 @@ msgstr "" "Aplica a ORDE cos PARÁMETROS ao DISPOSITIVO. Se non se indica ningunha\n" "ORDE, funciona en modo interactivo.\n" -#: parted/ui.c:172 +#: parted/ui.c:173 #, c-format msgid "" "\n" @@ -2901,201 +2854,201 @@ msgid "" "consider important.\n" msgstr "" -#: parted/ui.c:293 +#: parted/ui.c:294 msgid "" "\n" "Command History:\n" msgstr "" -#: parted/ui.c:356 +#: parted/ui.c:357 msgid "" "\n" "Error: SEGV_MAPERR (Address not mapped to object)\n" msgstr "" -#: parted/ui.c:362 +#: parted/ui.c:363 msgid "" "\n" "Error: SEGV_ACCERR (Invalid permissions for mapped object)\n" msgstr "" -#: parted/ui.c:367 +#: parted/ui.c:368 msgid "" "\n" "Error: A general SIGSEGV signal was encountered.\n" msgstr "" -#: parted/ui.c:391 +#: parted/ui.c:392 msgid "" "\n" "Error: FPE_INTDIV (Integer: divide by zero)" msgstr "" -#: parted/ui.c:396 +#: parted/ui.c:397 msgid "" "\n" "Error: FPE_INTOVF (Integer: overflow)" msgstr "" -#: parted/ui.c:401 +#: parted/ui.c:402 msgid "" "\n" "Error: FPE_FLTDIV (Float: divide by zero)" msgstr "" -#: parted/ui.c:406 +#: parted/ui.c:407 msgid "" "\n" "Error: FPE_FLTOVF (Float: overflow)" msgstr "" -#: parted/ui.c:411 +#: parted/ui.c:412 msgid "" "\n" "Error: FPE_FLTUND (Float: underflow)" msgstr "" -#: parted/ui.c:416 +#: parted/ui.c:417 msgid "" "\n" "Error: FPE_FLTRES (Float: inexact result)" msgstr "" -#: parted/ui.c:421 +#: parted/ui.c:422 msgid "" "\n" "Error: FPE_FLTINV (Float: invalid operation)" msgstr "" -#: parted/ui.c:426 +#: parted/ui.c:427 msgid "" "\n" "Error: FPE_FLTSUB (Float: subscript out of range)" msgstr "" -#: parted/ui.c:431 +#: parted/ui.c:432 msgid "" "\n" "Error: A general SIGFPE signal was encountered." msgstr "" -#: parted/ui.c:455 +#: parted/ui.c:456 msgid "" "\n" "Error: ILL_ILLOPC (Illegal Opcode)" msgstr "" -#: parted/ui.c:460 +#: parted/ui.c:461 msgid "" "\n" "Error: ILL_ILLOPN (Illegal Operand)" msgstr "" -#: parted/ui.c:465 +#: parted/ui.c:466 msgid "" "\n" "Error: ILL_ILLADR (Illegal addressing mode)" msgstr "" -#: parted/ui.c:470 +#: parted/ui.c:471 msgid "" "\n" "Error: ILL_ILLTRP (Illegal Trap)" msgstr "" -#: parted/ui.c:475 +#: parted/ui.c:476 msgid "" "\n" "Error: ILL_PRVOPC (Privileged Opcode)" msgstr "" -#: parted/ui.c:480 +#: parted/ui.c:481 msgid "" "\n" "Error: ILL_PRVREG (Privileged Register)" msgstr "" -#: parted/ui.c:485 +#: parted/ui.c:486 msgid "" "\n" "Error: ILL_COPROC (Coprocessor Error)" msgstr "" -#: parted/ui.c:490 +#: parted/ui.c:491 msgid "" "\n" "Error: ILL_BADSTK (Internal Stack Error)" msgstr "" -#: parted/ui.c:495 +#: parted/ui.c:496 msgid "" "\n" "Error: A general SIGILL signal was encountered." msgstr "" -#: parted/ui.c:888 +#: parted/ui.c:889 #, c-format msgid "invalid token: %s" msgstr "" -#: parted/ui.c:1069 +#: parted/ui.c:1070 msgid "Expecting a partition number." msgstr "Espérase un número de partición." -#: parted/ui.c:1078 +#: parted/ui.c:1079 msgid "Partition doesn't exist." msgstr "A partición non existe." -#: parted/ui.c:1098 +#: parted/ui.c:1099 msgid "Expecting a file system type." msgstr "Espérase un tipo de sistema de ficheiros." -#: parted/ui.c:1105 +#: parted/ui.c:1106 #, c-format msgid "Unknown file system type \"%s\"." msgstr "Tipo de sistema de ficheiros «%s» descoñecido." -#: parted/ui.c:1126 +#: parted/ui.c:1127 msgid "Expecting a disk label type." msgstr "Espérase un tipo de etiqueta de disco." -#: parted/ui.c:1157 parted/ui.c:1193 +#: parted/ui.c:1158 parted/ui.c:1194 msgid "No flags supported" msgstr "" -#: parted/ui.c:1267 +#: parted/ui.c:1268 msgid "Can't create any more partitions." msgstr "Non é posíbel crear máis particións." -#: parted/ui.c:1277 +#: parted/ui.c:1278 msgid "Expecting a partition type." msgstr "Espérase un tipo de partición." -#: parted/ui.c:1426 +#: parted/ui.c:1427 msgid "on" msgstr "on" -#: parted/ui.c:1427 +#: parted/ui.c:1428 msgid "off" msgstr "off" -#: parted/ui.c:1444 +#: parted/ui.c:1445 msgid "optimal" msgstr "" -#: parted/ui.c:1445 +#: parted/ui.c:1446 msgid "minimal" msgstr "" -#: parted/ui.c:1578 +#: parted/ui.c:1579 msgid "OPTIONs:" msgstr "OPCIÓNs:" -#: parted/ui.c:1583 +#: parted/ui.c:1584 msgid "COMMANDs:" msgstr "ORDEs:" -#: parted/ui.c:1586 +#: parted/ui.c:1587 #, c-format msgid "" "\n" @@ -3104,33 +3057,78 @@ msgstr "" "\n" "Envíe os informes de fallo a: %s\n" -#: parted/ui.c:1593 +#: parted/ui.c:1594 #, c-format msgid "Using %s\n" msgstr "Usando %s\n" -#: parted/ui.c:1673 +#: parted/ui.c:1674 msgid "This command does not make sense in non-interactive mode.\n" msgstr "Esta orde non ten sentido nun modo non interactivo.\n" +#, c-format #~ msgid "%s: option '--%s' doesn't allow an argument\n" #~ msgstr "%s: a opción «--%s» non permite ningún argumento\n" +#, c-format #~ msgid "%s: unrecognized option '--%s'\n" #~ msgstr "%s: opción «--%s» non recoñecida\n" +#, c-format #~ msgid "%s: option '-W %s' doesn't allow an argument\n" #~ msgstr "%s: a opción «-W %s» non permite ningún argumento\n" +#, c-format #~ msgid "%s: option '-W %s' requires an argument\n" #~ msgstr "%s: a opción «-W %s» require un argumento\n" +#, c-format #~ msgid "%s home page: \n" #~ msgstr "Páxina web de %s: \n" +#, c-format +#~ msgid "invalid %s%s argument '%s'" +#~ msgstr "o argumento «%s» de %s%s é incorrecto" + +#, c-format +#~ msgid "invalid suffix in %s%s argument '%s'" +#~ msgstr "sufixo incorrecto %s%s no argumento «%s»" + +#, c-format +#~ msgid "%s%s argument '%s' too large" +#~ msgstr "%s%s argumento «%s» demasiado longo" + +#~ msgid "" +#~ "The partition table cannot be re-read. This means you need to reboot " +#~ "before mounting any modified partitions. You also need to reinstall your " +#~ "boot loader before you reboot (which may require mounting modified " +#~ "partitions). It is impossible do both things! So you'll need to boot " +#~ "off a rescue disk, and reinstall your boot loader from the rescue disk. " +#~ "Read section 4 of the Parted User documentation for more information." +#~ msgstr "" +#~ "Non foi posíbel volver ler a táboa de particións, así que ten que " +#~ "reiniciar antes de montar calquera partición modificada. Tamén ten que " +#~ "reinstalar o cargador de arranque antes de reiniciar (o que pode precisar " +#~ "a montaxe de particións modificadas). É imposíbel facer ámbalas dúas " +#~ "cousas, así que ha ter que arrancar cun disco de rescate, e reinstalar o " +#~ "cargador de arranque desde o disco de rescate. Lea a sección 4 da " +#~ "documentación de Usuario de Parted para obter máis información." + +#, 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 " +#~ "computer before doing anything with %s." +#~ msgstr "" +#~ "Non é posíbel volver ler a táboa de particións de %s (%s). Isto quere " +#~ "dicir que Hurd non sabe nada sobre as modificacións que vostede fixo. " +#~ "Debería reiniciar o seu computador antes de facer nada con %s." + +#, c-format #~ msgid "Failed to add partition %d (%s)" #~ msgstr "Produciuse un erro ao engadir a partición %d (%s)" +#, c-format #~ msgid "" #~ "parted was unable to re-read the partition table on %s (%s). This means " #~ "Linux won't know anything about the modifications you made. " @@ -3138,6 +3136,7 @@ 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. " +#, c-format #~ msgid "" #~ "%s contains GPT signatures, indicating that it has a GPT table. However, " #~ "it does not have a valid fake msdos partition table, as it should. " @@ -3152,6 +3151,10 @@ msgstr "Esta orde non ten sentido nun modo non interactivo.\n" #~ "emprega unha táboa de particións msdos. É esta unha táboa de particións " #~ "GPT?" +#~ msgid "The boot region doesn't start at the start of the partition." +#~ msgstr "A rexión de arranque non comeza no principio da partición." + +#, 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." @@ -3160,6 +3163,14 @@ msgstr "Esta orde non ten sentido nun modo non interactivo.\n" #~ "que GNU Parted non traballa correctamente con tamaños de sector distintos " #~ "de 512 bytes." +#, c-format +#~ msgid "" +#~ "The file %s is marked as a system file. This means moving it could cause " +#~ "some programs to stop working." +#~ msgstr "" +#~ "O ficheiro %s está marcado como ficheiro de sistema. Isto significa que " +#~ "movelo podería facer que outros programas deixen de traballar." + #~ msgid "" #~ "The sector size on %s is %d bytes. Parted is known not to work properly " #~ "with drives with sector sizes other than %d bytes" diff --git a/po/hu.gmo b/po/hu.gmo index 07edd42d55f615c35835c512d17e961ece520889..66d5d8a8949e27b4aa83f32f3c1a8d8ae33d525c 100644 GIT binary patch delta 11312 zcmY+~2YgRgAII^Vfh1P!8L~(a1TjK{AZCbJd+*pQwdzmRs_GDGwDzbPHG-&7TT!cc zir9OPYHO?K^UXP4FTJn+^8WqKz5jd9J?Gr}Pdv|tX`VaZdbloS_nhglWpsC(f;iOI zadwa&@mH(k>?+|nRXiMLH)f}PTgq|5(YLfQ2Fp?p#^SgPOX3L(#(!;l5FgTUjj#xg z!!XBjIX{pTrQtLd!`HShQYP&HCk}&XAAvgIJPg1+sL$QNP|V2Lqc8%?;ULs;%P

SoD7a1hynDrGF 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 delta 12995 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 DxUIQz diff --git a/po/hu.po b/po/hu.po index e0fe63e..d0c774f 100644 --- a/po/hu.po +++ b/po/hu.po @@ -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: 2019-10-10 16:35-0700\n" +"POT-Creation-Date: 2021-01-27 16:00-0800\n" "PO-Revision-Date: 2016-05-27 20:34+0200\n" "Last-Translator: Gabor Kelemen \n" "Language-Team: Hungarian \n" @@ -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 #. #. and use glyphs suitable for your language. -#: lib/quotearg.c:362 +#: lib/quotearg.c:355 msgid "`" msgstr "„" -#: lib/quotearg.c:363 +#: lib/quotearg.c:356 msgid "'" msgstr "”" @@ -372,78 +372,63 @@ msgstr "" msgid "memory exhausted" msgstr "elfogyott a memória" -#: lib/xstrtol-error.c:63 -#, c-format -msgid "invalid %s%s argument '%s'" -msgstr "érvénytelen %s%s argumentum: „%s”" - -#: lib/xstrtol-error.c:68 -#, c-format -msgid "invalid suffix in %s%s argument '%s'" -msgstr "érvénytelen utótag a(z) %s%s argumentumban: „%s”" - -#: lib/xstrtol-error.c:72 -#, c-format -msgid "%s%s argument '%s' too large" -msgstr "%s%s: a(z) „%s” argumentum túl nagy" - -#: libparted/arch/beos.c:245 +#: libparted/arch/beos.c:246 msgid "Disk Image" msgstr "Lemezkép" -#: libparted/arch/beos.c:346 libparted/arch/gnu.c:277 +#: libparted/arch/beos.c:347 libparted/arch/gnu.c:277 #: libparted/arch/linux.c:1731 #, c-format msgid "Error opening %s: %s" msgstr "Hiba %s megnyitása közben: %s" -#: libparted/arch/beos.c:357 libparted/arch/gnu.c:287 +#: libparted/arch/beos.c:358 libparted/arch/gnu.c:287 #: libparted/arch/linux.c:1742 #, c-format msgid "Unable to open %s read-write (%s). %s has been opened read-only." msgstr "%s nem nyitható meg írásra/olvasásra (%s). %s most csak olvasható." -#: libparted/arch/beos.c:419 libparted/arch/linux.c:1907 +#: libparted/arch/beos.c:420 libparted/arch/linux.c:1907 #, c-format msgid "%s during seek for read on %s" msgstr "%s olvasáshoz pozicionálás közben ezen: %s" -#: libparted/arch/beos.c:452 libparted/arch/gnu.c:465 libparted/arch/gnu.c:564 -#: libparted/arch/gnu.c:692 libparted/arch/linux.c:1867 +#: libparted/arch/beos.c:453 libparted/arch/gnu.c:425 libparted/arch/gnu.c:524 +#: libparted/arch/gnu.c:652 libparted/arch/linux.c:1867 #: libparted/arch/linux.c:1949 #, c-format msgid "%s during read on %s" msgstr "%s olvasáskor ezen: %s" -#: libparted/arch/beos.c:488 libparted/arch/gnu.c:525 +#: libparted/arch/beos.c:489 libparted/arch/gnu.c:485 #: libparted/arch/linux.c:2026 #, c-format msgid "Can't write to %s, because it is opened read-only." msgstr "%s nem írható, mert csak olvashatóként van megnyitva." -#: libparted/arch/beos.c:504 libparted/arch/linux.c:2051 +#: libparted/arch/beos.c:505 libparted/arch/linux.c:2051 #, c-format msgid "%s during seek for write on %s" msgstr "%s íráshoz pozicionálás közben ezen: %s" -#: libparted/arch/beos.c:541 libparted/arch/gnu.c:601 libparted/arch/gnu.c:646 -#: libparted/arch/gnu.c:723 libparted/arch/linux.c:1999 +#: libparted/arch/beos.c:542 libparted/arch/gnu.c:561 libparted/arch/gnu.c:606 +#: libparted/arch/gnu.c:683 libparted/arch/linux.c:1999 #: libparted/arch/linux.c:2094 libparted/arch/linux.c:2167 #, c-format msgid "%s during write on %s" msgstr "%s írás közben ezen: %s" -#: partprobe/partprobe.c:148 +#: partprobe/partprobe.c:149 #, c-format msgid "Try `%s --help' for more information.\n" msgstr "További információkért adja ki a(z) „%s --help” parancsot.\n" -#: partprobe/partprobe.c:152 +#: partprobe/partprobe.c:153 #, c-format msgid "Usage: %s [OPTION] [DEVICE]...\n" msgstr "Használat: %s [KAPCSOLÓ] [ESZKÖZ]…\n" -#: partprobe/partprobe.c:153 +#: partprobe/partprobe.c:154 msgid "" "Inform the operating system about partition table changes.\n" "\n" @@ -459,7 +444,7 @@ msgstr "" " -h, --help súgó megjelenítése és kilépés\n" " -v, --version verzióinformációk kiírása és kilépés\n" -#: partprobe/partprobe.c:161 +#: partprobe/partprobe.c:162 msgid "" "\n" "When no DEVICE is given, probe all partitions.\n" @@ -467,7 +452,7 @@ msgstr "" "\n" "Ha nincs megadva ESZKÖZ, az összes partíció szondázása.\n" -#: partprobe/partprobe.c:165 +#: partprobe/partprobe.c:166 #, c-format msgid "" "\n" @@ -485,42 +470,7 @@ msgstr "%s nem nyitható meg." msgid "Unable to probe store." msgstr "A tároló nem szondázható." -#: libparted/arch/gnu.c:368 -msgid "" -"The partition table cannot be re-read. This means you need to reboot before " -"mounting any modified partitions. You also need to reinstall your boot " -"loader before you reboot (which may require mounting modified partitions). " -"It is impossible do both things! So you'll need to boot off a rescue disk, " -"and reinstall your boot loader from the rescue disk. Read section 4 of the " -"Parted User documentation for more information." -msgstr "" -"A partíciós tábla nem olvasható újra. Ez azt jelenti, hogy újra kell " -"indítani a rendszert a módosított partíciók csatolása előtt. Az újraindítás " -"előtt újra kell telepíteni a rendszertöltőt is (amihez szükség lehet a " -"módosított partíciók csatolására). Mindkettőt lehetetlen megtenni. Emiatt " -"egy mentő lemezről kell indítani a rendszert, és újratelepíteni a " -"rendszertöltőt a mentő lemezről. További információkért lásd a Parted " -"felhasználói dokumentáció 4. fejezetét." - -#: libparted/arch/gnu.c:385 -#, 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 computer " -"before doing anything with %s." -msgstr "" -"Nem lehet újraolvasni %s partíciós tábláját (%s). A Hurd most nem tud semmit " -"a változásokról. %s bármilyen felhasználása előtt újra kell indítani a gépet." - -#: libparted/arch/gnu.c:396 parted/parted.c:2318 -msgid "" -"You should reinstall your boot loader before rebooting. Read section 4 of " -"the Parted User documentation for more information." -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." - -#: libparted/arch/gnu.c:788 +#: libparted/arch/gnu.c:748 #, c-format msgid "%s trying to sync %s to disk" msgstr "%s megpróbálja lemezre szinkronizálni ezt: %s" @@ -836,15 +786,15 @@ msgstr "metaadatok" msgid "free" msgstr "szabad" -#: libparted/disk.c:2355 parted/ui.c:1258 parted/ui.c:1286 +#: libparted/disk.c:2355 parted/ui.c:1259 parted/ui.c:1287 msgid "extended" msgstr "extended" -#: libparted/disk.c:2357 parted/ui.c:1262 parted/ui.c:1290 +#: libparted/disk.c:2357 parted/ui.c:1263 parted/ui.c:1291 msgid "logical" msgstr "logical" -#: libparted/disk.c:2359 parted/ui.c:1254 parted/ui.c:1282 +#: libparted/disk.c:2359 parted/ui.c:1255 parted/ui.c:1283 msgid "primary" msgstr "primary" @@ -920,64 +870,73 @@ msgstr "irst" msgid "esp" msgstr "esp" -#: libparted/disk.c:2415 +#: libparted/disk.c:2411 +msgid "chromeos_kernel" +msgstr "" + +#: libparted/disk.c:2413 +#, fuzzy +msgid "bls_boot" +msgstr "pmbr_boot" + +#: libparted/disk.c:2419 #, c-format msgid "Unknown partition flag, %d." msgstr "Ismeretlen partíciójelző: %d." -#: libparted/exception.c:78 +#: libparted/exception.c:79 msgid "Information" msgstr "Információ" -#: libparted/exception.c:79 +#: libparted/exception.c:80 msgid "Warning" msgstr "Figyelmeztetés" -#: libparted/exception.c:80 +#: libparted/exception.c:81 msgid "Error" msgstr "Hiba" -#: libparted/exception.c:81 +#: libparted/exception.c:82 msgid "Fatal" msgstr "Végzetes" -#: libparted/exception.c:82 +#: libparted/exception.c:83 msgid "Bug" msgstr "Programhiba" -#: libparted/exception.c:83 +#: libparted/exception.c:84 msgid "No Implementation" msgstr "Nincs megvalósítva" -#: libparted/exception.c:87 +#: libparted/exception.c:88 msgid "Fix" msgstr "Javítás" -#: libparted/exception.c:88 +#: libparted/exception.c:89 msgid "Yes" msgstr "Igen" -#: libparted/exception.c:89 +#: libparted/exception.c:90 msgid "No" msgstr "Nem" -#: libparted/exception.c:90 +#: libparted/exception.c:91 msgid "OK" msgstr "OK" -#: libparted/exception.c:91 +#: libparted/exception.c:92 msgid "Retry" msgstr "Újra" -#: libparted/exception.c:92 +#: libparted/exception.c:93 msgid "Ignore" msgstr "Mellőzés" -#: libparted/exception.c:93 +#: libparted/exception.c:94 msgid "Cancel" msgstr "Megszakítás" -#: libparted/exception.c:133 +#: libparted/exception.c:134 #, c-format msgid "" "A bug has been detected in GNU Parted. Refer to the web site of parted " @@ -990,28 +949,28 @@ msgstr "" "hibajelentést küldje el e-mailben ide: %s, írja meg legalább a verziót (%s), " "és a következő üzenetet:" -#: libparted/labels/aix.c:91 +#: libparted/labels/aix.c:92 msgid "Support for reading AIX disk labels is is not implemented yet." msgstr "Az AIX lemezcímkék olvasásának támogatása még nincs megvalósítva." -#: libparted/labels/aix.c:102 +#: libparted/labels/aix.c:103 msgid "Support for writing AIX disk labels is is not implemented yet." msgstr "Az AIX lemezcímkék írásának támogatása még nincs megvalósítva." -#: libparted/labels/aix.c:115 +#: libparted/labels/aix.c:116 msgid "" "Support for adding partitions to AIX disk labels is not implemented yet." msgstr "" "A partíciók AIX lemezcímkékhez adásának támogatása még nincs megvalósítva." -#: libparted/labels/aix.c:125 +#: libparted/labels/aix.c:126 msgid "" "Support for duplicating partitions in AIX disk labels is not implemented yet." msgstr "" "A partíciók AIX lemezcímkékben duplikálásának támogatása még nincs " "megvalósítva." -#: libparted/labels/aix.c:143 +#: libparted/labels/aix.c:144 msgid "" "Support for setting system type of partitions in AIX disk labels is not " "implemented yet." @@ -1019,7 +978,7 @@ msgstr "" "A partíciók rendszertípusának AIX lemezcímkékben való beállításának " "támogatása még nincs megvalósítva." -#: libparted/labels/aix.c:153 +#: libparted/labels/aix.c:154 msgid "Support for setting flags in AIX disk labels is not implemented yet." msgstr "" "A jelzők AIX lemezcímkékben való beállításának támogatása még nincs " @@ -1110,11 +1069,11 @@ msgid "" "partitions, if XGM is the first one it counts for two)." msgstr "" -#: libparted/labels/atari.c:1657 libparted/labels/bsd.c:567 -#: libparted/labels/dasd.c:894 libparted/labels/dos.c:2276 -#: libparted/labels/dvh.c:770 libparted/labels/gpt.c:2050 -#: libparted/labels/loop.c:243 libparted/labels/mac.c:1423 -#: libparted/labels/pc98.c:701 libparted/labels/rdb.c:1054 +#: libparted/labels/atari.c:1657 libparted/labels/bsd.c:563 +#: libparted/labels/dasd.c:895 libparted/labels/dos.c:2283 +#: libparted/labels/dvh.c:770 libparted/labels/gpt.c:2140 +#: 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 "Nem elégíthető ki minden korlátozás a partíción." @@ -1130,43 +1089,43 @@ msgstr "" msgid "Unable to allocate a partition number." msgstr "Nem foglalható partíciószám." -#: libparted/labels/bsd.c:592 +#: libparted/labels/bsd.c:588 msgid "Unable to allocate a bsd disklabel slot." msgstr "Nem lehet BSD lemezcímke helyet foglalni." -#: libparted/labels/dasd.c:625 +#: libparted/labels/dasd.c:626 msgid "The partition table of DASD-LDL device cannot be changed.\n" msgstr "" -#: libparted/labels/dasd.c:920 +#: libparted/labels/dasd.c:921 msgid "Unable to allocate a dasd disklabel slot" msgstr "Nem lehet dasd lemezcímke helyet foglalni" -#: libparted/labels/dos.c:1003 +#: libparted/labels/dos.c:1006 #, 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:1031 +#: libparted/labels/dos.c:1034 #, 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:1560 +#: libparted/labels/dos.c:1557 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:1572 +#: libparted/labels/dos.c:1569 #, 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:2258 +#: libparted/labels/dos.c:2265 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:2514 +#: libparted/labels/dos.c:2521 msgid "cannot create any more partitions" msgstr "nem lehet több partíciót létrehozni" @@ -1309,11 +1268,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:531 +#: libparted/labels/gpt.c:541 msgid "device is too small for GPT" msgstr "az eszköz túl kicsi a GPT-hez" -#: libparted/labels/gpt.c:733 +#: libparted/labels/gpt.c:743 #, c-format msgid "" "The format of the GPT partition table is version %x, which is newer than " @@ -1322,7 +1281,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:769 +#: libparted/labels/gpt.c:779 #, c-format msgid "" "Not all of the space available to %s appears to be used, you can fix the GPT " @@ -1333,7 +1292,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:1008 +#: libparted/labels/gpt.c:1024 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)?" @@ -1341,7 +1300,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:1026 +#: libparted/labels/gpt.c:1042 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 +1308,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:1037 +#: libparted/labels/gpt.c:1053 msgid "" "The backup GPT table is corrupt, but the primary appears OK, so that will be " "used." @@ -1357,7 +1316,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:1049 +#: libparted/labels/gpt.c:1065 msgid "" "The primary GPT table is corrupt, but the backup appears OK, so that will be " "used." @@ -1365,11 +1324,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:1073 +#: libparted/labels/gpt.c:1089 msgid "primary partition table array CRC mismatch" msgstr "elsődleges partícióstábla-tömb CRC eltérés" -#: libparted/labels/gpt.c:1936 libparted/labels/gpt.c:1963 +#: libparted/labels/gpt.c:2026 libparted/labels/gpt.c:2053 msgid "failed to translate partition name" msgstr "a partíciónév fordítása meghiúsult" @@ -1402,24 +1361,20 @@ msgid "The data region doesn't start at the start of the partition." msgstr "Az adatterület nem a partíció elején kezdődik." #: libparted/labels/mac.c:572 -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." - -#: libparted/labels/mac.c:586 msgid "The partition's boot region doesn't occupy the entire partition." msgstr "A partíció boot területe nem fedi le a teljes partíciót." -#: libparted/labels/mac.c:597 +#: libparted/labels/mac.c:583 msgid "The partition's data region doesn't occupy the entire partition." msgstr "A partíció adatterülete nem fedi le a teljes partíciót." -#: libparted/labels/mac.c:649 +#: libparted/labels/mac.c:635 #, c-format msgid "" "Weird block size on device descriptor: %d bytes is not divisible by 512." msgstr "Fura blokkméret az eszközleírón: %d bájt nem osztható 512-vel." -#: libparted/labels/mac.c:662 +#: libparted/labels/mac.c:648 #, c-format msgid "" "The driver descriptor says the physical block size is %d bytes, but Linux " @@ -1428,11 +1383,11 @@ msgstr "" "Az illesztőprogram-leíró szerint a fizikai blokkméret %d bájt, de az a Linux " "szerint %d bájt." -#: libparted/labels/mac.c:715 +#: libparted/labels/mac.c:701 msgid "No valid partition map found." msgstr "Nincs érvényes partíciótérkép." -#: libparted/labels/mac.c:789 +#: libparted/labels/mac.c:775 #, c-format msgid "" "Conflicting partition map entry sizes! Entry 1 says it is %d, but entry %d " @@ -1441,11 +1396,11 @@ msgstr "" "A partíciótérkép bejegyzésméretei ütköznek. Az 1. bejegyzés szerint %d, %d. " "szerint %d!" -#: libparted/labels/mac.c:820 +#: libparted/labels/mac.c:806 msgid "Weird! There are 2 partitions map entries!" msgstr "Fura! Két partíciótérkép-bejegyzés van!" -#: libparted/labels/mac.c:1359 +#: libparted/labels/mac.c:1345 msgid "" "Changing the name of a root or swap partition will prevent Linux from " "recognising it as such." @@ -1453,23 +1408,23 @@ msgstr "" "Egy gyökér vagy swap partíció nevének megváltoztatása megakadályozza, hogy a " "Linux akként felismerje." -#: libparted/labels/mac.c:1458 +#: libparted/labels/mac.c:1444 msgid "Can't add another partition -- the partition map is too small!" msgstr "Nem vehető fel másik partíció -- a partíciótérkép túl kicsi!" -#: libparted/labels/pc98.c:284 +#: libparted/labels/pc98.c:285 #, c-format msgid "Invalid partition table on %s." msgstr "Érvénytelen partíciós tábla ezen: %s." -#: libparted/labels/pc98.c:337 libparted/labels/pc98.c:415 +#: 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 "%d. partíció nem igazodik a cilinderhatárokhoz. Ez még nem támogatott." -#: libparted/labels/pc98.c:733 +#: libparted/labels/pc98.c:729 msgid "Can't add another partition." msgstr "Nem vehető fel másik partíció." @@ -1643,39 +1598,39 @@ msgstr "A VTOC FMT7 DSCB nem írható." msgid "Could not write VTOC FMT9 DSCB." msgstr "A VTOC FMT9 DSCB nem írható." -#: libparted/libparted.c:242 +#: libparted/libparted.c:247 msgid "Out of memory." msgstr "Elfogyott a memória." -#: libparted/unit.c:139 +#: libparted/unit.c:140 msgid "Cannot get unit size for special unit 'COMPACT'." msgstr "Nem kérhető le az egységméret a speciális „COMPACT” egységhez." -#: libparted/unit.c:385 +#: libparted/unit.c:386 #, c-format msgid "\"%s\" has invalid syntax for locations." msgstr "„%s” érvénytelen szintaxist tartalmaz a helyekhez." -#: libparted/unit.c:393 +#: libparted/unit.c:394 #, c-format msgid "The maximum head value is %d." msgstr "A maximális fej érték %d." -#: libparted/unit.c:400 +#: libparted/unit.c:401 #, c-format msgid "The maximum sector value is %d." msgstr "A maximális szektor érték %d." -#: libparted/unit.c:412 libparted/unit.c:564 +#: libparted/unit.c:413 libparted/unit.c:565 #, c-format msgid "The location %s is outside of the device %s." msgstr "%s hely kívül esik ezen az eszközön: %s." -#: libparted/unit.c:526 +#: libparted/unit.c:527 msgid "Invalid number." msgstr "Érvénytelen szám." -#: libparted/unit.c:532 +#: libparted/unit.c:533 msgid "Use a smaller unit instead of a value < 1" msgstr "Az 1-nél kisebb érték helyett használjon kisebb egységet." @@ -1685,18 +1640,18 @@ msgstr "Az 1-nél kisebb érték helyett használjon kisebb egységet." msgid "%s : Failed to allocate partition block\n" msgstr "%s: Partícióblokk foglalása sikertelen\n" -#: libparted/fs/amiga/affs.c:79 libparted/fs/amiga/apfs.c:71 +#: 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: Blokk foglalása sikertelen\n" -#: libparted/fs/amiga/affs.c:84 libparted/fs/amiga/apfs.c:76 +#: 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: Nem olvasható a(z) %llu. indító blokk\n" -#: libparted/fs/amiga/affs.c:98 libparted/fs/amiga/apfs.c:87 +#: 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" @@ -1722,22 +1677,22 @@ msgstr "%s: Hibás ellenőrzőösszeg a(z) %llu blokkon (típus: %s)\n" msgid "%s : Couldn't write block %d\n" msgstr "%s: Nem írható a(z) %d. blokk\n" -#: libparted/fs/amiga/amiga.c:278 +#: libparted/fs/amiga/amiga.c:279 #, c-format msgid "%s : Failed to allocate disk_specific rdb block\n" msgstr "%s: A disk_specific rdb blokk foglalása sikertelen\n" -#: libparted/fs/amiga/amiga.c:289 +#: libparted/fs/amiga/amiga.c:290 #, c-format msgid "%s : Didn't find rdb block, should never happen\n" msgstr "%s: Nem található rdb blokk, ez nem fordulhatna elő\n" -#: libparted/fs/amiga/amiga.c:318 +#: libparted/fs/amiga/amiga.c:319 #, c-format msgid "%s : Failed to read partition block %llu\n" msgstr "%s: A(z) %llu. partícióblokk foglalása sikertelen\n" -#: libparted/fs/fat/fat.c:148 libparted/fs/r/fat/fat.c:811 +#: libparted/fs/fat/fat.c:149 msgid "" "GNU Parted was miscompiled: the FAT boot sector should be 512 bytes. FAT " "support will be disabled." @@ -1832,7 +1787,7 @@ msgstr "" "CHS geometriája a partíciós tábla CHS geometriájának megfelelően lesz " "beállítva." -#: libparted/fs/r/fat/bootsector.c:399 +#: libparted/fs/r/fat/bootsector.c:398 #, c-format msgid "" "The information sector has the wrong signature (%x). Select cancel for now, " @@ -1857,12 +1812,12 @@ msgid "" "Cluster start delta = %d, which is not a multiple of the cluster size %d." msgstr "A fürt kezdeti eltérése = %d, ami nem a(z) %d fürtméret többszöröse." -#: libparted/fs/r/fat/count.c:144 +#: libparted/fs/r/fat/count.c:84 #, c-format msgid "Bad directory entry for %s: first cluster is the end of file marker." msgstr "Hibás könyvtárbejegyzés ehhez: %s: az első fürt a fájl vége jelző." -#: libparted/fs/r/fat/count.c:157 +#: libparted/fs/r/fat/count.c:97 #, c-format msgid "" "Bad FAT: unterminated chain for %s. You should run dosfsck or scandisk." @@ -1870,7 +1825,7 @@ msgstr "" "Hibás FAT: befejezetlen lánc ehhez: %s. Futtassa a dosfsck vagy a scandisk " "programot." -#: libparted/fs/r/fat/count.c:166 +#: libparted/fs/r/fat/count.c:106 #, c-format msgid "" "Bad FAT: cluster %d outside file system in chain for %s. You should run " @@ -1879,7 +1834,7 @@ msgstr "" "Hibás FAT: a(z) %d. fürt kívül esik a fájlrendszeren %s láncában. Futtassa a " "dosfsck vagy a scandisk programot." -#: libparted/fs/r/fat/count.c:176 +#: libparted/fs/r/fat/count.c:116 #, c-format msgid "" "Bad FAT: cluster %d is cross-linked for %s. You should run dosfsck or " @@ -1888,26 +1843,17 @@ msgstr "" "Hibás FAT: a(z) %d. fürt kereszthivatkozva van ehhez: %s. Futtassa a dosfsck " "vagy a scandisk programot." -#: libparted/fs/r/fat/count.c:195 +#: libparted/fs/r/fat/count.c:135 #, c-format msgid "%s is %dk, but it has %d clusters (%dk)." msgstr "%s %dk, de %d fürtje van (%dk)." -#: libparted/fs/r/fat/count.c:258 -#, c-format -msgid "" -"The file %s is marked as a system file. This means moving it could cause " -"some programs to stop working." -msgstr "" -"%s rendszerfájlként van meg jelölve. Áthelyezése után előfordulhat, hogy " -"egyes programok leállnak." - -#: libparted/fs/r/fat/fat.c:243 +#: libparted/fs/r/fat/fat.c:244 #, c-format msgid "Partition too big/small for a %s file system." msgstr "A partíció túl nagy vagy túl kicsi egy %s fájlrendszerhez." -#: libparted/fs/r/fat/fat.c:409 +#: 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." @@ -1916,11 +1862,11 @@ msgstr "" "Megszakítást, futtassa a scandisk programot a fájlrendszeren, és próbálja " "újra." -#: libparted/fs/r/fat/fat.c:449 +#: libparted/fs/r/fat/fat.c:450 msgid "There are no possible configurations for this FAT type." msgstr "Ehhez a FAT típushoz nincsenek lehetséges beállítások." -#: libparted/fs/r/fat/fat.c:461 +#: libparted/fs/r/fat/fat.c:462 #, c-format msgid "" "File system doesn't have expected sizes for Windows to like it. Cluster " @@ -1930,13 +1876,13 @@ msgstr "" "A fájlrendszer méretei nem a Windows által elvártak. A fürtméret %dk (várt: " "%dk), a fürtök száma %d (várt: %d), a FAT-ek mérete %d szektor (várt: %d)." -#: libparted/fs/r/fat/fat.c:484 +#: libparted/fs/r/fat/fat.c:485 #, c-format msgid "" "File system is reporting the free space as %d clusters, not %d clusters." msgstr "A fájlrendszer szerint a szabad hely %d fürt, nem pedig %d fürt." -#: libparted/fs/r/fat/resize.c:158 +#: 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." @@ -1944,15 +1890,15 @@ msgstr "" "Nincs elég hely a gyökérkönyvtárban az összes fájlnak. Szakítsa meg, vagy a " "fájlok elvesztéséhez válassza a Mellőzést." -#: libparted/fs/r/fat/resize.c:302 +#: libparted/fs/r/fat/resize.c:303 msgid "Error writing to the root directory." msgstr "Hiba a gyökérkönyvtárba írás közben." -#: libparted/fs/r/fat/resize.c:495 +#: libparted/fs/r/fat/resize.c:479 msgid "If you leave your file system as FAT16, then you will have no problems." msgstr "Ha a fájlrendszert FAT16-ként hagyja, nem lesz gond." -#: libparted/fs/r/fat/resize.c:498 +#: 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 " @@ -1962,13 +1908,13 @@ msgstr "" "újra kell telepíteni az MS Windows rendszertöltőjét. Ha ezt szeretné, nézze " "meg a Parted (vagy a disztribúciója) kézikönyvét." -#: libparted/fs/r/fat/resize.c:506 +#: 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 "Ha a fájlrendszert FAT32-ként hagyja, nem lesz újabb gond." -#: libparted/fs/r/fat/resize.c:510 +#: 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 " @@ -1982,37 +1928,37 @@ msgstr "" "olvashatatlanná teszi a fájlrendszert az MS DOS, MS Windows 95a és MS " "Windows NT számára." -#: libparted/fs/r/fat/resize.c:524 +#: libparted/fs/r/fat/resize.c:508 #, c-format msgid "%s %s %s" msgstr "%s %s %s" -#: libparted/fs/r/fat/resize.c:525 +#: libparted/fs/r/fat/resize.c:509 msgid "Would you like to use FAT32?" msgstr "Szeretne FAT32-t használni?" -#: libparted/fs/r/fat/resize.c:556 libparted/fs/r/fat/resize.c:572 +#: 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:557 +#: libparted/fs/r/fat/resize.c:541 msgid "" "The file system can only be resized to this size by converting to FAT16." msgstr "A fájlrendszer csak FAT16-ra alakítással méretezhető át ekkorára." -#: libparted/fs/r/fat/resize.c:573 +#: libparted/fs/r/fat/resize.c:557 msgid "" "The file system can only be resized to this size by converting to FAT32." msgstr "A fájlrendszer csak FAT32-re alakítással méretezhető át ekkorára." -#: libparted/fs/r/fat/resize.c:586 +#: libparted/fs/r/fat/resize.c:570 msgid "" "GNU Parted cannot resize this partition to this size. We're working on it!" msgstr "" "A GNU Parted nem tudja ezt a partíciót ekkorára méretezni. Dolgozunk rajta!" -#: libparted/fs/r/fat/table.c:136 +#: 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 " @@ -2021,41 +1967,41 @@ msgstr "" "A(z) %d. FAT %x. médiája nem egyezik a boot szektor %x médiájával. " "Valószínűleg futtatni kellene a scandisk-et." -#: libparted/fs/r/fat/table.c:268 +#: libparted/fs/r/fat/table.c:269 #, c-format msgid "fat_table_set: cluster %ld outside file system" msgstr "fat_table_set: a(z) %ld. fürt kívül esik a fájlrendszeren" -#: libparted/fs/r/fat/table.c:300 +#: libparted/fs/r/fat/table.c:301 #, c-format msgid "fat_table_get: cluster %ld outside file system" msgstr "fat_table_get: a(z) %ld. fürt kívül esik a fájlrendszeren" -#: libparted/fs/r/fat/table.c:342 +#: libparted/fs/r/fat/table.c:343 msgid "fat_table_alloc_cluster: no free clusters" msgstr "fat_table_alloc_cluster: nincs szabad fürt" -#: libparted/fs/r/filesys.c:151 +#: libparted/fs/r/filesys.c:152 msgid "Could not detect file system." msgstr "Nem észlelhető fájlrendszer." -#: libparted/fs/r/filesys.c:158 libparted/fs/r/filesys.c:285 +#: libparted/fs/r/filesys.c:159 libparted/fs/r/filesys.c:284 #, c-format msgid "resizing %s file systems is not supported" msgstr "%s fájlrendszerek átméretezése nem támogatott" -#: libparted/fs/r/filesys.c:170 +#: libparted/fs/r/filesys.c:171 msgid "The file system is bigger than its volume!" msgstr "A fájlrendszer nagyobb, mint a kötet!" -#: libparted/fs/r/hfs/advfs.c:121 libparted/fs/r/hfs/advfs_plus.c:121 -#: libparted/fs/r/hfs/reloc.c:413 libparted/fs/r/hfs/reloc.c:507 -#: libparted/fs/r/hfs/reloc_plus.c:538 libparted/fs/r/hfs/reloc_plus.c:656 -#: libparted/fs/r/hfs/reloc_plus.c:769 +#: 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 "A fájlrendszeren hibák vannak." -#: libparted/fs/r/hfs/advfs_plus.c:285 +#: libparted/fs/r/hfs/advfs_plus.c:287 msgid "Bad blocks could not be read." msgstr "A hibás blokkok nem olvashatók." @@ -2119,61 +2065,61 @@ msgstr "Nem található a(z) %2$X CNID-jű HFS+ fájl %1$lli. szektora." msgid "Trying to write HFS+ file with CNID %X behind EOF." msgstr "Kísérlet a(z) %X CNID-jű HFS+ fájl írására a fájl végén túl." -#: libparted/fs/r/hfs/hfs.c:232 +#: libparted/fs/r/hfs/hfs.c:212 msgid "Sorry, HFS cannot be resized that way yet." msgstr "Elnézést, a HFS így még nem méretezhető át." -#: libparted/fs/r/hfs/hfs.c:250 libparted/fs/r/hfs/hfs.c:629 +#: libparted/fs/r/hfs/hfs.c:230 libparted/fs/r/hfs/hfs.c:573 msgid "shrinking" msgstr "zsugorítás" -#: libparted/fs/r/hfs/hfs.c:262 libparted/fs/r/hfs/hfs.c:641 +#: libparted/fs/r/hfs/hfs.c:242 libparted/fs/r/hfs/hfs.c:585 msgid "Data relocation has failed." msgstr "Sikertelen adatáthelyezés." -#: libparted/fs/r/hfs/hfs.c:281 +#: libparted/fs/r/hfs/hfs.c:261 msgid "Data relocation left some data in the end of the volume." msgstr "Az adatáthelyezés adatokat hagyott a kötet végén." -#: libparted/fs/r/hfs/hfs.c:320 +#: libparted/fs/r/hfs/hfs.c:300 msgid "writing HFS Master Directory Block" msgstr "HFS elsődleges könyvtárblokk írása" -#: libparted/fs/r/hfs/hfs.c:468 +#: libparted/fs/r/hfs/hfs.c:412 msgid "No valid HFS[+X] signature has been found while opening." msgstr "Nem található érvényes HFS[+X] aláírás megnyitáskor." -#: libparted/fs/r/hfs/hfs.c:478 +#: libparted/fs/r/hfs/hfs.c:422 #, c-format msgid "Version %d of HFS+ isn't supported." msgstr "A HFS+ %d. verziója nem támogatott." -#: libparted/fs/r/hfs/hfs.c:489 +#: libparted/fs/r/hfs/hfs.c:433 #, c-format msgid "Version %d of HFSX isn't supported." msgstr "A HFSX %d. verziója nem támogatott." -#: libparted/fs/r/hfs/hfs.c:672 +#: libparted/fs/r/hfs/hfs.c:616 msgid "Data relocation left some data at the end of the volume." msgstr "Az adatáthelyezés adatokat hagyott a kötet végén." -#: libparted/fs/r/hfs/hfs.c:720 +#: libparted/fs/r/hfs/hfs.c:664 msgid "Error while writing the allocation file." msgstr "Hiba a foglalási fájl írásakor." -#: libparted/fs/r/hfs/hfs.c:735 +#: libparted/fs/r/hfs/hfs.c:679 msgid "Error while writing the compatibility part of the allocation file." msgstr "Hiba a foglalási fájl kompatibilitási részének írásakor." -#: libparted/fs/r/hfs/hfs.c:750 +#: libparted/fs/r/hfs/hfs.c:694 msgid "writing HFS+ Volume Header" msgstr "HFS+ kötetfejléc írása" -#: libparted/fs/r/hfs/hfs.c:850 +#: libparted/fs/r/hfs/hfs.c:794 msgid "An error occurred while looking for the mandatory bad blocks file." msgstr "Hiba történt a hibás blokkok kötelező fájljának keresése közben." -#: libparted/fs/r/hfs/hfs.c:904 +#: 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." @@ -2181,27 +2127,27 @@ msgstr "" "Úgy tűnik, a HFS átalakító hibás: a hibás blokkok fájlja nem tartalmazza a " "beágyazott HFS+ kötetet." -#: libparted/fs/r/hfs/hfs.c:940 +#: libparted/fs/r/hfs/hfs.c:883 msgid "Sorry, HFS+ cannot be resized that way yet." msgstr "Elnézést, a HFS+ így még nem méretezhető át." -#: libparted/fs/r/hfs/hfs.c:975 +#: libparted/fs/r/hfs/hfs.c:918 msgid "shrinking embedded HFS+ volume" msgstr "beágyazott HFS+ kötet zsugorítása" -#: libparted/fs/r/hfs/hfs.c:992 +#: libparted/fs/r/hfs/hfs.c:935 msgid "Resizing the HFS+ volume has failed." msgstr "A HFS+ kötet átméretezése meghiúsult." -#: libparted/fs/r/hfs/hfs.c:999 +#: libparted/fs/r/hfs/hfs.c:942 msgid "shrinking HFS wrapper" msgstr "HFS átalakító zsugorítása" -#: libparted/fs/r/hfs/hfs.c:1008 +#: libparted/fs/r/hfs/hfs.c:951 msgid "Updating the HFS wrapper has failed." msgstr "A HFS átalakító frissítése meghiúsult." -#: libparted/fs/r/hfs/hfs.c:1110 libparted/fs/r/hfs/hfs.c:1195 +#: 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 " @@ -2277,7 +2223,7 @@ msgstr "" msgid "An extent has not been relocated." msgstr "Egy extent nem lett áthelyezve." -#: libparted/fs/r/hfs/reloc.c:250 libparted/fs/r/hfs/reloc_plus.c:307 +#: 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!" @@ -2285,16 +2231,16 @@ msgstr "" "Egy extenthivatkozás nem létező helyről érkezik. Ellenőrizni kellene a " "fájlrendszert!" -#: libparted/fs/r/hfs/reloc.c:380 +#: libparted/fs/r/hfs/reloc.c:382 msgid "This HFS volume has no catalog file. This is very unusual!" msgstr "Ennek a HFS+ kötetnek nincs katalógusfájlja. Ez nagyon szokatlan!" -#: libparted/fs/r/hfs/reloc.c:474 +#: libparted/fs/r/hfs/reloc.c:479 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!" -#: libparted/fs/r/hfs/reloc.c:516 libparted/fs/r/hfs/reloc_plus.c:666 +#: 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." @@ -2302,52 +2248,52 @@ msgstr "" "Az extenttúlcsordulási fájl nem tartalmazhatja a saját extentjeit! " "Ellenőrizni kellene a fájlrendszert." -#: libparted/fs/r/hfs/reloc.c:573 libparted/fs/r/hfs/reloc_plus.c:844 +#: 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 "Nem sikerült a fájlrendszert a memóriába gyorsítótárazni." -#: libparted/fs/r/hfs/reloc.c:634 libparted/fs/r/hfs/reloc_plus.c:905 +#: libparted/fs/r/hfs/reloc.c:640 libparted/fs/r/hfs/reloc_plus.c:910 msgid "Bad blocks list could not be loaded." msgstr "A hibás blokkok listája nem tölthető be." -#: libparted/fs/r/hfs/reloc.c:648 libparted/fs/r/hfs/reloc_plus.c:921 +#: libparted/fs/r/hfs/reloc.c:654 libparted/fs/r/hfs/reloc_plus.c:926 msgid "An error occurred during extent relocation." msgstr "Hiba történt az extent áthelyezéskor." -#: libparted/fs/r/hfs/reloc_plus.c:494 +#: libparted/fs/r/hfs/reloc_plus.c:495 msgid "This HFS+ volume has no catalog file. This is very unusual!" msgstr "Ennek a HFS+ kötetnek nincs katalógusfájlja. Ez nagyon szokatlan!" -#: libparted/fs/r/hfs/reloc_plus.c:617 +#: libparted/fs/r/hfs/reloc_plus.c:620 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:125 +#: parted/parted.c:126 msgid "displays this help message" msgstr "ezen súgóüzenet megjelenítése" -#: parted/parted.c:126 +#: parted/parted.c:127 msgid "lists partition layout on all block devices" msgstr "minden blokkos eszköz partícióelrendezésének kiírása" -#: parted/parted.c:127 +#: parted/parted.c:128 msgid "displays machine parseable output" msgstr "gépileg feldolgozható kimenet megjelenítése" -#: parted/parted.c:128 +#: parted/parted.c:129 msgid "never prompts for user intervention" msgstr "soha ne kérdezzen" -#: parted/parted.c:129 +#: parted/parted.c:130 msgid "displays the version" msgstr "verzió megjelenítése" -#: parted/parted.c:130 +#: parted/parted.c:131 msgid "alignment for new partitions" msgstr "új partíciók igazítása" -#: parted/parted.c:142 +#: parted/parted.c:143 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,31 +2302,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:145 +#: parted/parted.c:146 msgid "LABEL-TYPE is one of: " msgstr "A CÍMKETÍPUS ezek egyike: " -#: parted/parted.c:146 parted/parted.c:147 +#: parted/parted.c:147 parted/parted.c:148 msgid "FLAG is one of: " msgstr "A JELZŐ ezek egyike: " -#: parted/parted.c:148 +#: parted/parted.c:149 msgid "UNIT is one of: " msgstr "Az EGYSÉG ezek egyike: " -#: parted/parted.c:149 +#: parted/parted.c:150 msgid "desired alignment: minimum or optimal" msgstr "kívánt igazítás: minimum vagy optimal" -#: parted/parted.c:150 +#: parted/parted.c:151 msgid "PART-TYPE is one of: primary, logical, extended\n" msgstr "A PART-TÍPUS ezek egyike: primary, logical, extended\n" -#: parted/parted.c:152 +#: parted/parted.c:153 msgid "FS-TYPE is one of: " msgstr "Az FS-TÍPUS ezek egyike: " -#: parted/parted.c:153 +#: parted/parted.c:154 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 " @@ -2389,7 +2335,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:156 +#: parted/parted.c:157 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" @@ -2397,19 +2343,19 @@ 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:159 +#: parted/parted.c:160 msgid "STATE is one of: on, off\n" msgstr "Az ÁLLAPOT ezek egyike: on, off\n" -#: parted/parted.c:160 +#: parted/parted.c:161 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:161 +#: parted/parted.c:162 msgid "NAME is any word you want\n" msgstr "A NÉV tetszőleges\n" -#: parted/parted.c:164 +#: parted/parted.c:165 msgid "" "Copyright (C) 1998 - 2006 Free Software Foundation, Inc.\n" "This program is free software, covered by the GNU General Public License.\n" @@ -2430,22 +2376,22 @@ msgstr "" "További részletekért tanulmányozza a GNU GPL licencet.\n" "\n" -#: parted/parted.c:212 +#: parted/parted.c:213 #, c-format msgid "%0.f%%\t(time left %.2d:%.2d)" msgstr "%0.f%%\t(hátralévő idő: %.2d:%.2d)" -#: parted/parted.c:231 +#: parted/parted.c:232 #, 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:252 +#: parted/parted.c:253 #, c-format msgid "Partition(s) on %s are being used." msgstr "%s partíciói használatban vannak." -#: parted/parted.c:264 +#: parted/parted.c:265 #, c-format msgid "" "The existing disk label on %s will be destroyed and all data on this disk " @@ -2454,31 +2400,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:525 +#: parted/parted.c:526 msgid "New disk label type?" msgstr "Az új lemezcímke típusa?" -#: parted/parted.c:662 +#: parted/parted.c:663 msgid "Partition type?" msgstr "A partíció típusa?" -#: parted/parted.c:680 parted/parted.c:884 +#: parted/parted.c:681 parted/parted.c:885 msgid "Partition name?" msgstr "A partíció neve?" -#: parted/parted.c:690 +#: parted/parted.c:691 msgid "File system type?" msgstr "A fájlrendszer típusa?" -#: parted/parted.c:695 parted/parted.c:1498 +#: parted/parted.c:696 parted/parted.c:1499 msgid "Start?" msgstr "Kezdete?" -#: parted/parted.c:698 parted/parted.c:1500 parted/parted.c:1569 +#: parted/parted.c:699 parted/parted.c:1501 parted/parted.c:1585 msgid "End?" msgstr "Vége?" -#: parted/parted.c:766 +#: parted/parted.c:767 #, c-format msgid "" "You requested a partition from %s to %s (sectors %llu..%llu).\n" @@ -2487,7 +2433,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:775 +#: parted/parted.c:776 msgid "" "\n" "Is this still acceptable to you?" @@ -2495,7 +2441,7 @@ msgstr "" "\n" "Ez elfogadható?" -#: parted/parted.c:798 +#: parted/parted.c:799 #, fuzzy, c-format msgid "" "The resulting partition is not properly aligned for best performance: %s" @@ -2503,87 +2449,87 @@ msgstr "" "Az eredményül kapott partíció igazítása nem megfelelő a legjobb " "teljesítményhez." -#: parted/parted.c:800 parted/parted.c:1723 +#: parted/parted.c:801 parted/parted.c:1739 msgid "unknown (malloc failed)" msgstr "" -#: parted/parted.c:876 +#: parted/parted.c:877 #, 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:881 parted/parted.c:1561 parted/parted.c:1612 -#: parted/parted.c:1706 parted/parted.c:1781 +#: parted/parted.c:882 parted/parted.c:1564 parted/parted.c:1628 +#: parted/parted.c:1722 parted/parted.c:1797 msgid "Partition number?" msgstr "A partíció száma?" -#: parted/parted.c:975 +#: parted/parted.c:976 #, 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:1017 +#: parted/parted.c:1018 #, c-format msgid "Model: %s (%s)\n" msgstr "Típus: %s (%s)\n" -#: parted/parted.c:1019 +#: parted/parted.c:1020 #, c-format msgid "Disk %s: %s\n" msgstr "%s lemez: %s\n" -#: parted/parted.c:1020 +#: parted/parted.c:1021 #, c-format msgid "Sector size (logical/physical): %lldB/%lldB\n" msgstr "Szektorméret (logikai/fizikai): %lldB/%lldB\n" -#: parted/parted.c:1032 +#: parted/parted.c:1033 #, c-format msgid "Partition Table: %s\n" msgstr "Partíciós tábla: %s\n" -#: parted/parted.c:1033 +#: parted/parted.c:1034 #, c-format msgid "Disk Flags: %s\n" msgstr "Lemezjelzők: %s\n" -#: parted/parted.c:1153 parted/parted.c:1156 +#: parted/parted.c:1154 parted/parted.c:1157 msgid "Number" msgstr "Szám" -#: parted/parted.c:1153 parted/parted.c:1156 +#: parted/parted.c:1154 parted/parted.c:1157 msgid "Start" msgstr "Kezdet" -#: parted/parted.c:1154 parted/parted.c:1157 +#: parted/parted.c:1155 parted/parted.c:1158 msgid "End" msgstr "Vég" -#: parted/parted.c:1157 +#: parted/parted.c:1158 msgid "Size" msgstr "Méret" -#: parted/parted.c:1161 +#: parted/parted.c:1162 msgid "Type" msgstr "Típus" -#: parted/parted.c:1163 +#: parted/parted.c:1164 msgid "File system" msgstr "Fájlrendszer" -#: parted/parted.c:1166 +#: parted/parted.c:1167 msgid "Name" msgstr "Név" -#: parted/parted.c:1168 +#: parted/parted.c:1169 msgid "Flags" msgstr "Jelzők" -#: parted/parted.c:1225 +#: parted/parted.c:1226 msgid "Free Space" msgstr "Szabad hely" -#: parted/parted.c:1385 +#: parted/parted.c:1386 #, c-format msgid "" "A %s %s partition was found at %s -> %s. Do you want to add it to the " @@ -2592,55 +2538,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:1428 +#: parted/parted.c:1429 msgid "searching for file systems" msgstr "fájlrendszerek keresése" -#: parted/parted.c:1535 +#: parted/parted.c:1536 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:1583 +#: parted/parted.c:1599 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:1636 +#: parted/parted.c:1652 msgid "New device?" msgstr "Új eszköz?" -#: parted/parted.c:1704 +#: parted/parted.c:1720 msgid "alignment type(min/opt)" msgstr "igazítás típusa (min/opt)" -#: parted/parted.c:1719 +#: parted/parted.c:1735 #, c-format msgid "%d aligned\n" msgstr "%d igazítva\n" -#: parted/parted.c:1721 +#: parted/parted.c:1737 #, fuzzy, c-format msgid "%d not aligned: %s\n" msgstr "%d nem igazított\n" -#: parted/parted.c:1746 parted/parted.c:1783 +#: parted/parted.c:1762 parted/parted.c:1799 msgid "Flag to Invert?" msgstr "A megfordítandó jelző?" -#: parted/parted.c:1751 parted/parted.c:1788 +#: parted/parted.c:1767 parted/parted.c:1804 msgid "New state?" msgstr "Új állapot?" -#: parted/parted.c:1834 +#: parted/parted.c:1850 msgid "Unit?" msgstr "Egység?" -#: parted/parted.c:1969 +#: parted/parted.c:1985 msgid "align-check" msgstr "align-check" -#: parted/parted.c:1972 +#: parted/parted.c:1988 #, fuzzy msgid "" "align-check TYPE N check partition N for TYPE(min|opt) " @@ -2649,11 +2595,11 @@ msgstr "" "align-check TÍPUS N TÍPUS(min|opt) igazítás keresése " "az N. partíción" -#: parted/parted.c:1980 +#: parted/parted.c:1996 msgid "help" msgstr "help" -#: parted/parted.c:1983 +#: parted/parted.c:1999 msgid "" "help [COMMAND] print general help, or help on " "COMMAND" @@ -2661,15 +2607,15 @@ msgstr "" "help [PARANCS] általános súgó vagy a PARANCS " "súgójának kiírása" -#: parted/parted.c:1989 +#: parted/parted.c:2005 msgid "mklabel" msgstr "mklabel" -#: parted/parted.c:1989 +#: parted/parted.c:2005 msgid "mktable" msgstr "mktable" -#: parted/parted.c:1992 +#: parted/parted.c:2008 msgid "" "mklabel,mktable LABEL-TYPE create a new disklabel (partition " "table)" @@ -2677,15 +2623,15 @@ msgstr "" "mklabel,mktable CÍMKETÍPUS új lemezcímke (partíciós tábla) " "létrehozása" -#: parted/parted.c:1998 +#: parted/parted.c:2014 msgid "mkpart" msgstr "mkpart" -#: parted/parted.c:2001 +#: parted/parted.c:2017 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:2007 +#: parted/parted.c:2023 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" @@ -2693,21 +2639,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:2012 +#: parted/parted.c:2028 msgid "name" msgstr "name" -#: parted/parted.c:2015 +#: parted/parted.c:2031 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:2020 +#: parted/parted.c:2036 msgid "print" msgstr "print" -#: parted/parted.c:2023 +#: parted/parted.c:2039 msgid "" "print [devices|free|list,all|NUMBER] display the partition table, " "available devices, free space, all found partitions, or a particular " @@ -2717,7 +2663,7 @@ msgstr "" "eszközök, szabad hely, minden megtalált partíció vagy egy adott partíció " "megjelenítése" -#: parted/parted.c:2028 +#: parted/parted.c:2044 msgid "" "Without arguments, 'print' displays the entire partition table. However with " "the following arguments it performs various other actions.\n" @@ -2725,11 +2671,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:2030 +#: parted/parted.c:2046 msgid " devices : display all active block devices\n" msgstr " devices : az összes aktív blokkos eszköz megjelenítése\n" -#: parted/parted.c:2031 +#: parted/parted.c:2047 msgid "" " free : display information about free unpartitioned space on the " "current block device\n" @@ -2737,32 +2683,32 @@ 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:2033 +#: parted/parted.c:2049 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:2034 +#: parted/parted.c:2050 msgid "" " NUMBER : display more detailed information about this particular " "partition\n" msgstr "" " SZÁM : részletesebb információk megjelenítése az adott partícióról\n" -#: parted/parted.c:2039 +#: parted/parted.c:2055 msgid "quit" msgstr "quit" -#: parted/parted.c:2042 +#: parted/parted.c:2058 msgid "quit exit program" msgstr "quit kilépés a programból" -#: parted/parted.c:2047 +#: parted/parted.c:2063 msgid "rescue" msgstr "rescue" -#: parted/parted.c:2050 +#: parted/parted.c:2066 msgid "" "rescue START END rescue a lost partition near START " "and END" @@ -2770,56 +2716,56 @@ msgstr "" "rescue KEZDET VÉG a KEZDET és VÉG környéki partíció " "helyreállítása" -#: parted/parted.c:2056 +#: parted/parted.c:2072 msgid "resize" msgstr "resize" -#: parted/parted.c:2059 +#: parted/parted.c:2075 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:2062 +#: parted/parted.c:2078 msgid "resizepart" msgstr "resizepart" -#: parted/parted.c:2065 +#: parted/parted.c:2081 msgid "resizepart NUMBER END resize partition NUMBER" msgstr "" "resizepart SZÁM VÉG a SZÁM. partíció átméretezése" -#: parted/parted.c:2070 +#: parted/parted.c:2086 msgid "rm" msgstr "rm" -#: parted/parted.c:2073 +#: parted/parted.c:2089 msgid "rm NUMBER delete partition NUMBER" msgstr "rm SZÁM a SZÁM. partíció törlése" -#: parted/parted.c:2078 +#: parted/parted.c:2094 msgid "select" msgstr "select" -#: parted/parted.c:2081 +#: parted/parted.c:2097 msgid "select DEVICE choose the device to edit" msgstr "" "select ESZKÖZ a szerkesztendő eszköz kiválasztása" -#: parted/parted.c:2086 +#: parted/parted.c:2102 msgid "disk_set" msgstr "disk_set" -#: parted/parted.c:2089 +#: parted/parted.c:2105 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:2094 +#: parted/parted.c:2110 msgid "disk_toggle" msgstr "disk_toggle" -#: parted/parted.c:2097 +#: parted/parted.c:2113 msgid "" "disk_toggle [FLAG] toggle the state of FLAG on " "selected device" @@ -2827,21 +2773,21 @@ msgstr "" "disk_toggle [JELZŐ] a JELZŐ állapotának átváltása a " "kijelölt eszközön" -#: parted/parted.c:2103 +#: parted/parted.c:2119 msgid "set" msgstr "set" -#: parted/parted.c:2106 +#: parted/parted.c:2122 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:2112 +#: parted/parted.c:2128 msgid "toggle" msgstr "toggle" -#: parted/parted.c:2115 +#: parted/parted.c:2131 msgid "" "toggle [NUMBER [FLAG]] toggle the state of FLAG on " "partition NUMBER" @@ -2849,21 +2795,21 @@ msgstr "" "toggle [SZÁM [JELZŐ]] a JELZŐ állapotának átváltása a " "SZÁM. partíción" -#: parted/parted.c:2121 +#: parted/parted.c:2137 msgid "unit" msgstr "unit" -#: parted/parted.c:2124 +#: parted/parted.c:2140 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:2129 +#: parted/parted.c:2145 msgid "version" msgstr "version" -#: parted/parted.c:2132 +#: parted/parted.c:2148 msgid "" "version display the version number and " "copyright information of GNU Parted" @@ -2871,7 +2817,7 @@ msgstr "" "version megjeleníti a GNU Parted " "verziószámát és a szerzői jogi információkat" -#: parted/parted.c:2136 +#: parted/parted.c:2152 msgid "" "'version' displays copyright and version information corresponding to this " "copy of GNU Parted\n" @@ -2879,31 +2825,39 @@ 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:2204 +#: parted/parted.c:2220 #, c-format msgid "Usage: %s [-hlmsv] [-a] [DEVICE [COMMAND [PARAMETERS]]...]\n" msgstr "" "Használat: %s [-hlmsv] [-a] [ESZKÖZ [PARANCS [PARAMÉTEREK]]...]\n" -#: parted/parted.c:2248 +#: parted/parted.c:2264 msgid "No device found" msgstr "Nem található eszköz" -#: parted/parted.c:2285 +#: parted/parted.c:2301 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:2325 +#: parted/parted.c:2334 +msgid "" +"You should reinstall your boot loader before rebooting. Read section 4 of " +"the Parted User documentation for more information." +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:2341 msgid "You may need to update /etc/fstab.\n" msgstr "Szükség lehet az /etc/fstab frissítésére.\n" -#: parted/ui.c:164 +#: parted/ui.c:165 msgid "Welcome to GNU Parted! Type 'help' to view a list of commands.\n" msgstr "" "Üdvözli a GNU Parted! Írja be a 'help' szót a parancsok listájának " "megnézéséhez.\n" -#: parted/ui.c:167 +#: parted/ui.c:168 msgid "" "Usage: parted [OPTION]... [DEVICE [COMMAND [PARAMETERS]...]...]\n" "Apply COMMANDs with PARAMETERS to DEVICE. If no COMMAND(s) are given, run " @@ -2915,7 +2869,7 @@ msgstr "" "megadva\n" "PARANCS, interaktív módban fut.\n" -#: parted/ui.c:172 +#: parted/ui.c:173 #, c-format msgid "" "\n" @@ -2978,7 +2932,7 @@ msgstr "" "A rendszerével kapcsolatos, fontosnak tűnő információkat is\n" "csatolja.\n" -#: parted/ui.c:293 +#: parted/ui.c:294 msgid "" "\n" "Command History:\n" @@ -2986,7 +2940,7 @@ msgstr "" "\n" "Parancselőzmények:\n" -#: parted/ui.c:356 +#: parted/ui.c:357 msgid "" "\n" "Error: SEGV_MAPERR (Address not mapped to object)\n" @@ -2994,7 +2948,7 @@ msgstr "" "\n" "Hiba: SEGV_MAPERR (Cím nincs leképezve objektumra)\n" -#: parted/ui.c:362 +#: parted/ui.c:363 msgid "" "\n" "Error: SEGV_ACCERR (Invalid permissions for mapped object)\n" @@ -3002,7 +2956,7 @@ msgstr "" "\n" "Hiba: SEGV_ACCERR (Érvénytelen jogosultságok a leképezett objektumhoz)\n" -#: parted/ui.c:367 +#: parted/ui.c:368 msgid "" "\n" "Error: A general SIGSEGV signal was encountered.\n" @@ -3010,7 +2964,7 @@ msgstr "" "\n" "Hiba: Általános SIGSEGV szignál.\n" -#: parted/ui.c:391 +#: parted/ui.c:392 msgid "" "\n" "Error: FPE_INTDIV (Integer: divide by zero)" @@ -3018,7 +2972,7 @@ msgstr "" "\n" "Hiba: FPE_INTDIV (egész: osztás nullával)" -#: parted/ui.c:396 +#: parted/ui.c:397 msgid "" "\n" "Error: FPE_INTOVF (Integer: overflow)" @@ -3026,7 +2980,7 @@ msgstr "" "\n" "Hiba: FPE_INTOVF (egész: túlcsordulás)" -#: parted/ui.c:401 +#: parted/ui.c:402 msgid "" "\n" "Error: FPE_FLTDIV (Float: divide by zero)" @@ -3034,7 +2988,7 @@ msgstr "" "\n" "Hiba: FPE_FLTDIV (lebegőpontos: osztás nullával)" -#: parted/ui.c:406 +#: parted/ui.c:407 msgid "" "\n" "Error: FPE_FLTOVF (Float: overflow)" @@ -3042,7 +2996,7 @@ msgstr "" "\n" "Hiba: FPE_FLTOVF (lebegőpontos: túlcsordulás)" -#: parted/ui.c:411 +#: parted/ui.c:412 msgid "" "\n" "Error: FPE_FLTUND (Float: underflow)" @@ -3050,7 +3004,7 @@ msgstr "" "\n" "Hiba: FPE_FLTUND (lebegőpontos: alulcsordulás)" -#: parted/ui.c:416 +#: parted/ui.c:417 msgid "" "\n" "Error: FPE_FLTRES (Float: inexact result)" @@ -3058,7 +3012,7 @@ msgstr "" "\n" "Hiba: FPE_FLTRES (lebegőpontos: pontatlan eredmény)" -#: parted/ui.c:421 +#: parted/ui.c:422 msgid "" "\n" "Error: FPE_FLTINV (Float: invalid operation)" @@ -3066,7 +3020,7 @@ msgstr "" "\n" "Hiba: FPE_FLTINV (lebegőpontos: érvénytelen művelet)" -#: parted/ui.c:426 +#: parted/ui.c:427 msgid "" "\n" "Error: FPE_FLTSUB (Float: subscript out of range)" @@ -3074,7 +3028,7 @@ msgstr "" "\n" "Hiba: FPE_FLTSUB (lebegőpontos: kívül esik a tartományon)" -#: parted/ui.c:431 +#: parted/ui.c:432 msgid "" "\n" "Error: A general SIGFPE signal was encountered." @@ -3082,7 +3036,7 @@ msgstr "" "\n" "Hiba: Általános SIGFPE szignál érkezett." -#: parted/ui.c:455 +#: parted/ui.c:456 msgid "" "\n" "Error: ILL_ILLOPC (Illegal Opcode)" @@ -3090,7 +3044,7 @@ msgstr "" "\n" "Hiba: ILL_ILLOPC (Érvénytelen műveletkód)" -#: parted/ui.c:460 +#: parted/ui.c:461 msgid "" "\n" "Error: ILL_ILLOPN (Illegal Operand)" @@ -3098,7 +3052,7 @@ msgstr "" "\n" "Hiba: ILL_ILLOPN (Érvénytelen operandus)" -#: parted/ui.c:465 +#: parted/ui.c:466 msgid "" "\n" "Error: ILL_ILLADR (Illegal addressing mode)" @@ -3106,7 +3060,7 @@ msgstr "" "\n" "Hiba: ILL_ILLADR (Érvénytelen címzési mód)" -#: parted/ui.c:470 +#: parted/ui.c:471 msgid "" "\n" "Error: ILL_ILLTRP (Illegal Trap)" @@ -3114,7 +3068,7 @@ msgstr "" "\n" "Hiba: ILL_ILLTRP (Érvénytelen trap)" -#: parted/ui.c:475 +#: parted/ui.c:476 msgid "" "\n" "Error: ILL_PRVOPC (Privileged Opcode)" @@ -3122,7 +3076,7 @@ msgstr "" "\n" "Hiba: ILL_PRVOPC (Privilegizált műveletkód)" -#: parted/ui.c:480 +#: parted/ui.c:481 msgid "" "\n" "Error: ILL_PRVREG (Privileged Register)" @@ -3130,7 +3084,7 @@ msgstr "" "\n" "Hiba: ILL_PRVREG (Privilegizált regiszter)" -#: parted/ui.c:485 +#: parted/ui.c:486 msgid "" "\n" "Error: ILL_COPROC (Coprocessor Error)" @@ -3138,7 +3092,7 @@ msgstr "" "\n" "Hiba: ILL_COPROC (Koprocesszor hiba)" -#: parted/ui.c:490 +#: parted/ui.c:491 msgid "" "\n" "Error: ILL_BADSTK (Internal Stack Error)" @@ -3146,7 +3100,7 @@ msgstr "" "\n" "Hiba: ILL_BADSTK (Belső veremhiba)" -#: parted/ui.c:495 +#: parted/ui.c:496 msgid "" "\n" "Error: A general SIGILL signal was encountered." @@ -3154,69 +3108,69 @@ msgstr "" "\n" "Hiba: Általános SIGILL szignál érkezett." -#: parted/ui.c:888 +#: parted/ui.c:889 #, c-format msgid "invalid token: %s" msgstr "érvénytelen jelsor: %s" -#: parted/ui.c:1069 +#: parted/ui.c:1070 msgid "Expecting a partition number." msgstr "Egy partíciószám szükséges." -#: parted/ui.c:1078 +#: parted/ui.c:1079 msgid "Partition doesn't exist." msgstr "A partíció nem létezik." -#: parted/ui.c:1098 +#: parted/ui.c:1099 msgid "Expecting a file system type." msgstr "Egy fájlrendszertípus szükséges." -#: parted/ui.c:1105 +#: parted/ui.c:1106 #, c-format msgid "Unknown file system type \"%s\"." msgstr "Ismeretlen „%s” fájlrendszertípus." -#: parted/ui.c:1126 +#: parted/ui.c:1127 msgid "Expecting a disk label type." msgstr "Egy lemezcímketípus szükséges." -#: parted/ui.c:1157 parted/ui.c:1193 +#: parted/ui.c:1158 parted/ui.c:1194 msgid "No flags supported" msgstr "" -#: parted/ui.c:1267 +#: parted/ui.c:1268 msgid "Can't create any more partitions." msgstr "Nem lehet több partíciót létrehozni." -#: parted/ui.c:1277 +#: parted/ui.c:1278 msgid "Expecting a partition type." msgstr "Egy partíciótípus szükséges." -#: parted/ui.c:1426 +#: parted/ui.c:1427 msgid "on" msgstr "on" -#: parted/ui.c:1427 +#: parted/ui.c:1428 msgid "off" msgstr "off" -#: parted/ui.c:1444 +#: parted/ui.c:1445 msgid "optimal" msgstr "optimal" -#: parted/ui.c:1445 +#: parted/ui.c:1446 msgid "minimal" msgstr "minimal" -#: parted/ui.c:1578 +#: parted/ui.c:1579 msgid "OPTIONs:" msgstr "KAPCSOLÓK:" -#: parted/ui.c:1583 +#: parted/ui.c:1584 msgid "COMMANDs:" msgstr "PARANCSOK:" -#: parted/ui.c:1586 +#: parted/ui.c:1587 #, c-format msgid "" "\n" @@ -3225,33 +3179,88 @@ msgstr "" "\n" "A hibák a(z) %s címen jelenthetők.\n" -#: parted/ui.c:1593 +#: parted/ui.c:1594 #, c-format msgid "Using %s\n" msgstr "%s használatával\n" -#: parted/ui.c:1673 +#: parted/ui.c:1674 msgid "This command does not make sense in non-interactive mode.\n" msgstr "Ennek a parancsnak nincs értelme nem interaktív módban.\n" +#, c-format #~ msgid "%s: option '--%s' doesn't allow an argument\n" #~ msgstr "%s: a(z) „--%s” kapcsoló nem enged meg argumentumot\n" +#, c-format #~ msgid "%s: unrecognized option '--%s'\n" #~ msgstr "%s: a(z) „--%s” kapcsoló ismeretlen\n" +#, c-format #~ msgid "%s: option '-W %s' doesn't allow an argument\n" #~ msgstr "%s: a „-W %s” kapcsoló nem enged meg argumentumot\n" +#, c-format #~ msgid "%s: option '-W %s' requires an argument\n" #~ msgstr "%s: a(z) „-W %s” kapcsolóhoz argumentum szükséges\n" +#, c-format #~ msgid "%s home page: \n" #~ msgstr "A(z) %s honlapja: \n" +#, c-format +#~ msgid "invalid %s%s argument '%s'" +#~ msgstr "érvénytelen %s%s argumentum: „%s”" + +#, c-format +#~ msgid "invalid suffix in %s%s argument '%s'" +#~ msgstr "érvénytelen utótag a(z) %s%s argumentumban: „%s”" + +#, c-format +#~ msgid "%s%s argument '%s' too large" +#~ msgstr "%s%s: a(z) „%s” argumentum túl nagy" + +#~ msgid "" +#~ "The partition table cannot be re-read. This means you need to reboot " +#~ "before mounting any modified partitions. You also need to reinstall your " +#~ "boot loader before you reboot (which may require mounting modified " +#~ "partitions). It is impossible do both things! So you'll need to boot " +#~ "off a rescue disk, and reinstall your boot loader from the rescue disk. " +#~ "Read section 4 of the Parted User documentation for more information." +#~ msgstr "" +#~ "A partíciós tábla nem olvasható újra. Ez azt jelenti, hogy újra kell " +#~ "indítani a rendszert a módosított partíciók csatolása előtt. Az " +#~ "újraindítás előtt újra kell telepíteni a rendszertöltőt is (amihez " +#~ "szükség lehet a módosított partíciók csatolására). Mindkettőt lehetetlen " +#~ "megtenni. Emiatt egy mentő lemezről kell indítani a rendszert, és " +#~ "újratelepíteni a rendszertöltőt a mentő lemezről. További információkért " +#~ "lásd a Parted felhasználói dokumentáció 4. fejezeté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 " +#~ "computer before doing anything with %s." +#~ msgstr "" +#~ "Nem lehet újraolvasni %s partíciós tábláját (%s). A Hurd most nem tud " +#~ "semmit a változásokról. %s bármilyen felhasználása előtt újra kell " +#~ "indítani a gépet." + +#~ 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." + +#, 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." #~ msgstr "" #~ "A fájlrendszer logikai szektormérete %d. A GNU Parted nem működik jól 512 " #~ "bájttól eltérő szektorméretekkel." + +#, c-format +#~ msgid "" +#~ "The file %s is marked as a system file. This means moving it could cause " +#~ "some programs to stop working." +#~ msgstr "" +#~ "%s rendszerfájlként van meg jelölve. Áthelyezése után előfordulhat, hogy " +#~ "egyes programok leállnak." diff --git a/po/id.gmo b/po/id.gmo index b4982d9814b245f32c8a3d644e1ce73a86514aca..591fdc8a23f8d02d67299fb3e13d375c6d344fdb 100644 GIT binary patch delta 10422 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 Vj`^)x=FJE>ndzNz@N7cp{{g_aruYB= delta 11935 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 z\n" "Language-Team: Indonesian \n" @@ -97,11 +97,11 @@ msgstr "%s: pilihan membutuhkan sebuah argumen -- %c\n" #. If you don't know what to put here, please see #. #. and use glyphs suitable for your language. -#: lib/quotearg.c:362 +#: lib/quotearg.c:355 msgid "`" msgstr "U+2018" -#: lib/quotearg.c:363 +#: lib/quotearg.c:356 msgid "'" msgstr "U+2019" @@ -371,32 +371,17 @@ msgstr "" msgid "memory exhausted" msgstr "kehabisan memory" -#: lib/xstrtol-error.c:63 -#, fuzzy, c-format -msgid "invalid %s%s argument '%s'" -msgstr "argumen `%s' tidak sah %s%s" - -#: lib/xstrtol-error.c:68 -#, fuzzy, c-format -msgid "invalid suffix in %s%s argument '%s'" -msgstr "akhiran tidak sah di %s%s argumen `%s'" - -#: lib/xstrtol-error.c:72 -#, fuzzy, c-format -msgid "%s%s argument '%s' too large" -msgstr "%s%s argumen `%s' terlalu besar" - -#: libparted/arch/beos.c:245 +#: libparted/arch/beos.c:246 msgid "Disk Image" msgstr "Salinan dari disk" -#: libparted/arch/beos.c:346 libparted/arch/gnu.c:277 +#: libparted/arch/beos.c:347 libparted/arch/gnu.c:277 #: libparted/arch/linux.c:1731 #, c-format msgid "Error opening %s: %s" msgstr "Error membuka %s: %s" -#: libparted/arch/beos.c:357 libparted/arch/gnu.c:287 +#: libparted/arch/beos.c:358 libparted/arch/gnu.c:287 #: libparted/arch/linux.c:1742 #, c-format msgid "Unable to open %s read-write (%s). %s has been opened read-only." @@ -404,47 +389,47 @@ msgstr "" "Tidak dapat membuka %s dengan mode read-write (%s). %s telah dibuka read-" "only." -#: libparted/arch/beos.c:419 libparted/arch/linux.c:1907 +#: libparted/arch/beos.c:420 libparted/arch/linux.c:1907 #, c-format msgid "%s during seek for read on %s" msgstr "%s selama pencarian untuk dibaca pada %s" -#: libparted/arch/beos.c:452 libparted/arch/gnu.c:465 libparted/arch/gnu.c:564 -#: libparted/arch/gnu.c:692 libparted/arch/linux.c:1867 +#: libparted/arch/beos.c:453 libparted/arch/gnu.c:425 libparted/arch/gnu.c:524 +#: libparted/arch/gnu.c:652 libparted/arch/linux.c:1867 #: libparted/arch/linux.c:1949 #, c-format msgid "%s during read on %s" msgstr "%s selama pembacaan pada %s" -#: libparted/arch/beos.c:488 libparted/arch/gnu.c:525 +#: libparted/arch/beos.c:489 libparted/arch/gnu.c:485 #: libparted/arch/linux.c:2026 #, c-format msgid "Can't write to %s, because it is opened read-only." msgstr "Tidak dapat menulis pada %s, karena ini dibuka secara read-only." -#: libparted/arch/beos.c:504 libparted/arch/linux.c:2051 +#: libparted/arch/beos.c:505 libparted/arch/linux.c:2051 #, c-format msgid "%s during seek for write on %s" msgstr "%s selama pencarian untuk menulis pada %s" -#: libparted/arch/beos.c:541 libparted/arch/gnu.c:601 libparted/arch/gnu.c:646 -#: libparted/arch/gnu.c:723 libparted/arch/linux.c:1999 +#: libparted/arch/beos.c:542 libparted/arch/gnu.c:561 libparted/arch/gnu.c:606 +#: libparted/arch/gnu.c:683 libparted/arch/linux.c:1999 #: libparted/arch/linux.c:2094 libparted/arch/linux.c:2167 #, c-format msgid "%s during write on %s" msgstr "%s selama penulisan pada %s" -#: partprobe/partprobe.c:148 +#: partprobe/partprobe.c:149 #, c-format msgid "Try `%s --help' for more information.\n" msgstr "Coba `%s --help' untuk informasi lebih lanjut.\n" -#: partprobe/partprobe.c:152 +#: partprobe/partprobe.c:153 #, c-format msgid "Usage: %s [OPTION] [DEVICE]...\n" msgstr "Penggunaan: %s [OPSI] [PERANGKAT]...\n" -#: partprobe/partprobe.c:153 +#: partprobe/partprobe.c:154 msgid "" "Inform the operating system about partition table changes.\n" "\n" @@ -460,7 +445,7 @@ msgstr "" " -h, --help tampilkan bantuan ini dan keluar\n" " -v, --version keluarkan informasi versi dan keluar\n" -#: partprobe/partprobe.c:161 +#: partprobe/partprobe.c:162 msgid "" "\n" "When no DEVICE is given, probe all partitions.\n" @@ -468,7 +453,7 @@ msgstr "" "\n" "Jika tak ada PERANGKAT yang diberikan, pindai seluruh partisi.\n" -#: partprobe/partprobe.c:165 +#: partprobe/partprobe.c:166 #, c-format msgid "" "\n" @@ -486,44 +471,7 @@ msgstr "Tidak dapat membuka %s." msgid "Unable to probe store." msgstr "Tidak dapat memprobe store." -#: libparted/arch/gnu.c:368 -msgid "" -"The partition table cannot be re-read. This means you need to reboot before " -"mounting any modified partitions. You also need to reinstall your boot " -"loader before you reboot (which may require mounting modified partitions). " -"It is impossible do both things! So you'll need to boot off a rescue disk, " -"and reinstall your boot loader from the rescue disk. Read section 4 of the " -"Parted User documentation for more information." -msgstr "" -"Tabel partisi tidak dapat dibaca ulang. Ini berarti anda perlu untuk me-" -"reboot terlebih dahulu sebelum me-mount semua partisi yang dimodifikasi. " -"Anda juga perlu menginstall kembali bootloader anda sebelum me-reboot " -"komputer anda (yang memerlukan untuk me-mount partisi yang dimodifikasi). " -"Ini tidak mungkin untuk melakukan keduanya secara sekaligus! Jadi anda perlu " -"membuat sebuah disket penolong (rescue), dan menginstall bootloader anda " -"dari disket penolong tersebut. Baca bagian 4 dari dokumentasi pengguna " -"Parted untuk informasi lebih lanjut." - -#: libparted/arch/gnu.c:385 -#, 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 computer " -"before doing anything with %s." -msgstr "" -"Tabel partisi pada %s tidak dapat dibaca kembali (%s). Ini berarti hurd " -"tidak tahu apa-apa tentang modifikasi yang anda buat. Anda seharusnya " -"mereboot komputer anda sebelum melakukan apapun dengan %s." - -#: libparted/arch/gnu.c:396 parted/parted.c:2318 -msgid "" -"You should reinstall your boot loader before rebooting. Read section 4 of " -"the Parted User documentation for more information." -msgstr "" -"Anda seharusnya menginstall ulang boot loader anda sebelum merebootnya. Baca " -"bagian 4 dari Parted dokumentasi pengguna untuk informasi lebih lanjut." - -#: libparted/arch/gnu.c:788 +#: libparted/arch/gnu.c:748 #, c-format msgid "%s trying to sync %s to disk" msgstr "%s mencoba untuk mensinkronisasi %s pada disk" @@ -843,15 +791,15 @@ msgstr "metadata" msgid "free" msgstr "free" -#: libparted/disk.c:2355 parted/ui.c:1258 parted/ui.c:1286 +#: libparted/disk.c:2355 parted/ui.c:1259 parted/ui.c:1287 msgid "extended" msgstr "extended" -#: libparted/disk.c:2357 parted/ui.c:1262 parted/ui.c:1290 +#: libparted/disk.c:2357 parted/ui.c:1263 parted/ui.c:1291 msgid "logical" msgstr "logical" -#: libparted/disk.c:2359 parted/ui.c:1254 parted/ui.c:1282 +#: libparted/disk.c:2359 parted/ui.c:1255 parted/ui.c:1283 msgid "primary" msgstr "primary" @@ -929,64 +877,73 @@ msgstr "" msgid "esp" msgstr "Ya" -#: libparted/disk.c:2415 +#: libparted/disk.c:2411 +msgid "chromeos_kernel" +msgstr "" + +#: libparted/disk.c:2413 +#, fuzzy +msgid "bls_boot" +msgstr "boot" + +#: libparted/disk.c:2419 #, c-format msgid "Unknown partition flag, %d." msgstr "flag partisi tidak diketahui, %d." -#: libparted/exception.c:78 +#: libparted/exception.c:79 msgid "Information" msgstr "Informasi" -#: libparted/exception.c:79 +#: libparted/exception.c:80 msgid "Warning" msgstr "Peringatan" -#: libparted/exception.c:80 +#: libparted/exception.c:81 msgid "Error" msgstr "Error" -#: libparted/exception.c:81 +#: libparted/exception.c:82 msgid "Fatal" msgstr "Fatal" -#: libparted/exception.c:82 +#: libparted/exception.c:83 msgid "Bug" msgstr "Bug" -#: libparted/exception.c:83 +#: libparted/exception.c:84 msgid "No Implementation" msgstr "Tidak ada Implementasi" -#: libparted/exception.c:87 +#: libparted/exception.c:88 msgid "Fix" msgstr "Betulkan" -#: libparted/exception.c:88 +#: libparted/exception.c:89 msgid "Yes" msgstr "Ya" -#: libparted/exception.c:89 +#: libparted/exception.c:90 msgid "No" msgstr "Tidak" -#: libparted/exception.c:90 +#: libparted/exception.c:91 msgid "OK" msgstr "OK" -#: libparted/exception.c:91 +#: libparted/exception.c:92 msgid "Retry" msgstr "Coba" -#: libparted/exception.c:92 +#: libparted/exception.c:93 msgid "Ignore" msgstr "Hiraukan" -#: libparted/exception.c:93 +#: libparted/exception.c:94 msgid "Cancel" msgstr "Batal" -#: libparted/exception.c:133 +#: libparted/exception.c:134 #, fuzzy, c-format msgid "" "A bug has been detected in GNU Parted. Refer to the web site of parted " @@ -1000,27 +957,27 @@ msgstr "" "laporan bug ke bug-parted@gnu.org berisi setidaknya versi (%s) dan pesan " "berikut ini:" -#: libparted/labels/aix.c:91 +#: libparted/labels/aix.c:92 msgid "Support for reading AIX disk labels is is not implemented yet." msgstr "Support untuk membaca AIX disk label belum diimplementasikan." -#: libparted/labels/aix.c:102 +#: libparted/labels/aix.c:103 msgid "Support for writing AIX disk labels is is not implemented yet." msgstr "Support untuk menulis AIX disk label belum diimplementasikan." -#: libparted/labels/aix.c:115 +#: libparted/labels/aix.c:116 msgid "" "Support for adding partitions to AIX disk labels is not implemented yet." msgstr "" "Support untuk menambah partisi di AIX disk label belum diimplementasikan." -#: libparted/labels/aix.c:125 +#: libparted/labels/aix.c:126 msgid "" "Support for duplicating partitions in AIX disk labels is not implemented yet." msgstr "" "Support untuk menduplikasi partisi di AIX disk label belum diimplementasikan." -#: libparted/labels/aix.c:143 +#: libparted/labels/aix.c:144 msgid "" "Support for setting system type of partitions in AIX disk labels is not " "implemented yet." @@ -1028,7 +985,7 @@ msgstr "" "Support untuk menset tipe partisi sistem di AIX disk label belum " "diimplementasikan." -#: libparted/labels/aix.c:153 +#: libparted/labels/aix.c:154 msgid "Support for setting flags in AIX disk labels is not implemented yet." msgstr "Support untuk menset tanda di AIX disk label belum diimplementasikan." @@ -1118,11 +1075,11 @@ msgid "" "partitions, if XGM is the first one it counts for two)." msgstr "" -#: libparted/labels/atari.c:1657 libparted/labels/bsd.c:567 -#: libparted/labels/dasd.c:894 libparted/labels/dos.c:2276 -#: libparted/labels/dvh.c:770 libparted/labels/gpt.c:2050 -#: libparted/labels/loop.c:243 libparted/labels/mac.c:1423 -#: libparted/labels/pc98.c:701 libparted/labels/rdb.c:1054 +#: libparted/labels/atari.c:1657 libparted/labels/bsd.c:563 +#: libparted/labels/dasd.c:895 libparted/labels/dos.c:2283 +#: libparted/labels/dvh.c:770 libparted/labels/gpt.c:2140 +#: 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 "Tidak dapat memenuhi semua constraints pada partisi." @@ -1138,43 +1095,43 @@ msgstr "" msgid "Unable to allocate a partition number." msgstr "Tidak dapat mengalokasikan sebuah nomor partisi." -#: libparted/labels/bsd.c:592 +#: libparted/labels/bsd.c:588 msgid "Unable to allocate a bsd disklabel slot." msgstr "Tidak dapat mengalokasikan sebuah slot untuk bsd disklabel." -#: libparted/labels/dasd.c:625 +#: libparted/labels/dasd.c:626 msgid "The partition table of DASD-LDL device cannot be changed.\n" msgstr "" -#: libparted/labels/dasd.c:920 +#: libparted/labels/dasd.c:921 msgid "Unable to allocate a dasd disklabel slot" msgstr "Tidak dapat mengalokasikan sebuah DASD slot disklabel." -#: libparted/labels/dos.c:1003 +#: libparted/labels/dos.c:1006 #, c-format msgid "Invalid partition table on %s -- wrong signature %x." msgstr "Table partisi tidak valid pada %s -- signature salah %x." -#: libparted/labels/dos.c:1031 +#: libparted/labels/dos.c:1034 #, c-format msgid "Invalid partition table - recursive partition on %s." msgstr "Table partisi tidak valid - rekursif partisi pada %s." -#: libparted/labels/dos.c:1560 +#: libparted/labels/dos.c:1557 msgid "Extended partitions cannot be hidden on msdos disk labels." msgstr "Partisi extended tidak dapat disembunyikan pada msdos disk labels." -#: libparted/labels/dos.c:1572 +#: libparted/labels/dos.c:1569 #, fuzzy msgid "Extended partitions cannot be recovery partitions on msdos disk labels." msgstr "Partisi extended tidak dapat disembunyikan pada msdos disk labels." -#: libparted/labels/dos.c:2258 +#: libparted/labels/dos.c:2265 msgid "Parted can't resize partitions managed by Windows Dynamic Disk." msgstr "" "Parted tidak dapat men-resize partisi yang diatur oleh Windows Dynamic Disk." -#: libparted/labels/dos.c:2514 +#: libparted/labels/dos.c:2521 #, fuzzy msgid "cannot create any more partitions" msgstr "Tidak dapat membuat partisi lagi." @@ -1317,12 +1274,12 @@ msgstr "Tak dapat menerima infomrasi ukuran blok." msgid "Disk geometry does not match a DASD device of type 3390." msgstr "" -#: libparted/labels/gpt.c:531 +#: libparted/labels/gpt.c:541 #, fuzzy msgid "device is too small for GPT" msgstr "Perangkat terlalu kecil untuk %lu blok." -#: libparted/labels/gpt.c:733 +#: libparted/labels/gpt.c:743 #, fuzzy, c-format msgid "" "The format of the GPT partition table is version %x, which is newer than " @@ -1332,7 +1289,7 @@ msgstr "" "dari format yang Parted dapat mengenalnya. Tolong beritahu kami! bug-" "parted@gnu.org" -#: libparted/labels/gpt.c:769 +#: libparted/labels/gpt.c:779 #, c-format msgid "" "Not all of the space available to %s appears to be used, you can fix the GPT " @@ -1343,7 +1300,7 @@ msgstr "" "dapat membetulkan GPT untuk menggunakan semuar ruang kosong yang tersedia " "(kosong %llu blocks) atau melanjutkan dengan konfigurasi saat ini?" -#: libparted/labels/gpt.c:1008 +#: libparted/labels/gpt.c:1024 #, fuzzy msgid "" "The backup GPT table is not at the end of the disk, as it should be. Fix, " @@ -1354,7 +1311,7 @@ msgstr "" "lebih kecil. Betulkan, dengan memindahkan tabel backup ke akhir dari disk " "(dan menghapus backup yang lama)?" -#: libparted/labels/gpt.c:1026 +#: libparted/labels/gpt.c:1042 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 +1320,7 @@ msgstr "" "sebuah tabel yang baru, dan gunakan Parted's rescue feature untuk merecover " "partisi." -#: libparted/labels/gpt.c:1037 +#: libparted/labels/gpt.c:1053 msgid "" "The backup GPT table is corrupt, but the primary appears OK, so that will be " "used." @@ -1371,7 +1328,7 @@ msgstr "" "Tabel GPT cadangan telah terkorupsi, tetapi yang utama kelihatan BAIK, jadi " "ini yang akan digunakan" -#: libparted/labels/gpt.c:1049 +#: libparted/labels/gpt.c:1065 msgid "" "The primary GPT table is corrupt, but the backup appears OK, so that will be " "used." @@ -1379,11 +1336,11 @@ msgstr "" "Tabel GPT primer telah terkorupsi, tetapi backup-nya kelihatan BAIK, jadi " "ini yang akan digunakan" -#: libparted/labels/gpt.c:1073 +#: libparted/labels/gpt.c:1089 msgid "primary partition table array CRC mismatch" msgstr "kumpulan CRC tabel partisi utama tidak cocok" -#: libparted/labels/gpt.c:1936 libparted/labels/gpt.c:1963 +#: libparted/labels/gpt.c:2026 libparted/labels/gpt.c:2053 #, fuzzy msgid "failed to translate partition name" msgstr "Tidak dapat mengalokasikan sebuah nomor partisi." @@ -1417,25 +1374,21 @@ msgid "The data region doesn't start at the start of the partition." msgstr "Daerah data tidak dimulai pada awal dari partisi." #: libparted/labels/mac.c:572 -msgid "The boot region doesn't start at the start of the partition." -msgstr "Daerah boot tidak dimulai pada awal dari partisi." - -#: libparted/labels/mac.c:586 msgid "The partition's boot region doesn't occupy the entire partition." msgstr "Daerah boot partisi tidak menggunakan seluruh partisi." -#: libparted/labels/mac.c:597 +#: libparted/labels/mac.c:583 msgid "The partition's data region doesn't occupy the entire partition." msgstr "Daerah data partisi tidak menggunakan seluruh partisi." -#: libparted/labels/mac.c:649 +#: libparted/labels/mac.c:635 #, c-format msgid "" "Weird block size on device descriptor: %d bytes is not divisible by 512." msgstr "" "Ukuran block aneh pada deskripsi perangkat: %d bytes tidak terbagi oleh 512." -#: libparted/labels/mac.c:662 +#: libparted/labels/mac.c:648 #, c-format msgid "" "The driver descriptor says the physical block size is %d bytes, but Linux " @@ -1444,11 +1397,11 @@ msgstr "" "driver descriptor mengatakan bahwa ukuran physical block adalah %d bytes, " "tetapi Linux mengatakan ukurannya %d bytes." -#: libparted/labels/mac.c:715 +#: libparted/labels/mac.c:701 msgid "No valid partition map found." msgstr "Tidak ditemukan map partisi yang valid." -#: libparted/labels/mac.c:789 +#: libparted/labels/mac.c:775 #, c-format msgid "" "Conflicting partition map entry sizes! Entry 1 says it is %d, but entry %d " @@ -1457,11 +1410,11 @@ msgstr "" "Konflik masukan ukuran peta partisi! Masukan 1 mengatakan %d, tetapi " "masukan %d mengatakan %d!" -#: libparted/labels/mac.c:820 +#: libparted/labels/mac.c:806 msgid "Weird! There are 2 partitions map entries!" msgstr "Aneh! Ada 2 masukan map partisi!" -#: libparted/labels/mac.c:1359 +#: libparted/labels/mac.c:1345 msgid "" "Changing the name of a root or swap partition will prevent Linux from " "recognising it as such." @@ -1469,16 +1422,16 @@ msgstr "" "Mengubah nama dari root atau partisi swap akan membuat Linux tidak dapat " "mengenalinya." -#: libparted/labels/mac.c:1458 +#: libparted/labels/mac.c:1444 msgid "Can't add another partition -- the partition map is too small!" msgstr "Tidak dapat lagi menambah partisi -- peta partisi terlalu kecil!" -#: libparted/labels/pc98.c:284 +#: libparted/labels/pc98.c:285 #, c-format msgid "Invalid partition table on %s." msgstr "Tabel partisi tidak valid pada %s." -#: libparted/labels/pc98.c:337 libparted/labels/pc98.c:415 +#: libparted/labels/pc98.c:338 libparted/labels/pc98.c:416 #, c-format msgid "" "Partition %d isn't aligned to cylinder boundaries. This is still " @@ -1486,7 +1439,7 @@ msgid "" msgstr "" "Partisi %d tidak di align ke cylinder boundaries. Ini tetap tidak disupport" -#: libparted/labels/pc98.c:733 +#: libparted/labels/pc98.c:729 msgid "Can't add another partition." msgstr "Tidak dapat menambah partisi yang lain." @@ -1663,39 +1616,39 @@ msgstr "Tidak dapat menulis VTOC FMT7 DSCB." msgid "Could not write VTOC FMT9 DSCB." msgstr "Tidak dapat menulis VTOC FMT1 DSCB." -#: libparted/libparted.c:242 +#: libparted/libparted.c:247 msgid "Out of memory." msgstr "Kehabisan memori" -#: libparted/unit.c:139 +#: libparted/unit.c:140 msgid "Cannot get unit size for special unit 'COMPACT'." msgstr "Tidak dapat mendapatkan ukuran unit untuk spesial unit 'COMPAT'." -#: libparted/unit.c:385 +#: libparted/unit.c:386 #, c-format msgid "\"%s\" has invalid syntax for locations." msgstr "\"%s\" memiliki syntax yang tidak valid untuk lokasi." -#: libparted/unit.c:393 +#: libparted/unit.c:394 #, c-format msgid "The maximum head value is %d." msgstr "Nilai head maksimum adalah %d." -#: libparted/unit.c:400 +#: libparted/unit.c:401 #, c-format msgid "The maximum sector value is %d." msgstr "Nilai maksimum dari sektor adalah %d." -#: libparted/unit.c:412 libparted/unit.c:564 +#: libparted/unit.c:413 libparted/unit.c:565 #, c-format msgid "The location %s is outside of the device %s." msgstr "Lokasi %s terletak diluar dari perangkat %s." -#: libparted/unit.c:526 +#: libparted/unit.c:527 msgid "Invalid number." msgstr "nomor tidak valid." -#: libparted/unit.c:532 +#: libparted/unit.c:533 msgid "Use a smaller unit instead of a value < 1" msgstr "" @@ -1705,18 +1658,18 @@ msgstr "" msgid "%s : Failed to allocate partition block\n" msgstr "%s : Gagal untuk mengalokasikan blok partisi\n" -#: libparted/fs/amiga/affs.c:79 libparted/fs/amiga/apfs.c:71 +#: 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 : Gagal untuk mengalokasikan blok\n" -#: libparted/fs/amiga/affs.c:84 libparted/fs/amiga/apfs.c:76 +#: 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 : Tidak dapat membaca boot blok %llu\n" -#: libparted/fs/amiga/affs.c:98 libparted/fs/amiga/apfs.c:87 +#: 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" @@ -1742,22 +1695,22 @@ msgstr "%s : Checksum pada block %llu dengan tipe %s tidak baik\n" msgid "%s : Couldn't write block %d\n" msgstr "%s : Tidak dapat menulis blok %d\n" -#: libparted/fs/amiga/amiga.c:278 +#: libparted/fs/amiga/amiga.c:279 #, c-format msgid "%s : Failed to allocate disk_specific rdb block\n" msgstr "%s : Gagal untuk mengalokasikan disk_specific rdb blok\n" -#: libparted/fs/amiga/amiga.c:289 +#: libparted/fs/amiga/amiga.c:290 #, c-format msgid "%s : Didn't find rdb block, should never happen\n" msgstr "%s : Tidak dapa menemukan rdb blok, seharusnya tidak pernah terjadi\n" -#: libparted/fs/amiga/amiga.c:318 +#: libparted/fs/amiga/amiga.c:319 #, c-format msgid "%s : Failed to read partition block %llu\n" msgstr "%s : Gagal untuk menbaca blok partisi %llu\n" -#: libparted/fs/fat/fat.c:148 libparted/fs/r/fat/fat.c:811 +#: libparted/fs/fat/fat.c:149 msgid "" "GNU Parted was miscompiled: the FAT boot sector should be 512 bytes. FAT " "support will be disabled." @@ -1855,7 +1808,7 @@ msgstr "" "Betulkan, file system CHS geomtry akan diset sehingga cocok dengan tabel " "partisi dari CHS geometry." -#: libparted/fs/r/fat/bootsector.c:399 +#: libparted/fs/r/fat/bootsector.c:398 #, c-format msgid "" "The information sector has the wrong signature (%x). Select cancel for now, " @@ -1881,14 +1834,14 @@ msgid "" msgstr "" "Cluster awal delta = %d, dimana bukan kelipatan dari ukuran cluster %d." -#: libparted/fs/r/fat/count.c:144 +#: libparted/fs/r/fat/count.c:84 #, c-format msgid "Bad directory entry for %s: first cluster is the end of file marker." msgstr "" "Bad directory entry untuk %s: cluster pertama merupakan akhir dari file " "marker" -#: libparted/fs/r/fat/count.c:157 +#: libparted/fs/r/fat/count.c:97 #, c-format msgid "" "Bad FAT: unterminated chain for %s. You should run dosfsck or scandisk." @@ -1896,7 +1849,7 @@ msgstr "" "Bad FAT: unterminated chain untuk %s. Anda seharusnya menjalankan dosfsck " "atau scandisk." -#: libparted/fs/r/fat/count.c:166 +#: libparted/fs/r/fat/count.c:106 #, c-format msgid "" "Bad FAT: cluster %d outside file system in chain for %s. You should run " @@ -1905,7 +1858,7 @@ msgstr "" "Bad FAT: cluster %d diluar dari file system dalam rantai untuk %s. Anda " "seharusnya menjalankan dosfsck atau scandisk." -#: libparted/fs/r/fat/count.c:176 +#: libparted/fs/r/fat/count.c:116 #, c-format msgid "" "Bad FAT: cluster %d is cross-linked for %s. You should run dosfsck or " @@ -1914,26 +1867,17 @@ msgstr "" "Bad FAT: cluster %d adalah cross-linked untuk %s. Anda seharusnya " "menjalankan dosfsck atan scandisk." -#: libparted/fs/r/fat/count.c:195 +#: libparted/fs/r/fat/count.c:135 #, c-format msgid "%s is %dk, but it has %d clusters (%dk)." msgstr "%s adalah %dk, tetapi ini memiliki %d clusters (%dk)." -#: libparted/fs/r/fat/count.c:258 -#, c-format -msgid "" -"The file %s is marked as a system file. This means moving it could cause " -"some programs to stop working." -msgstr "" -"File %s ditandai sebagai sistem file. Ini berarti memindahkannya dapat " -"menyebabkan beberapa aplikasi untuk tidak dapat bekerja." - -#: libparted/fs/r/fat/fat.c:243 +#: libparted/fs/r/fat/fat.c:244 #, c-format msgid "Partition too big/small for a %s file system." msgstr "Partisi terlalu besar/kecil untuk sebuah file system %s." -#: libparted/fs/r/fat/fat.c:409 +#: 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." @@ -1941,11 +1885,11 @@ msgstr "" "FAT tidak cocok. Jika anda tidak tahu apa artinya ini, maka pilih cancel, " "jalankan scandisk pada file system, dan coba lagi." -#: libparted/fs/r/fat/fat.c:449 +#: libparted/fs/r/fat/fat.c:450 msgid "There are no possible configurations for this FAT type." msgstr "Tidak ada konfigurasi yang mungkin untuk tipe FAT ini." -#: libparted/fs/r/fat/fat.c:461 +#: libparted/fs/r/fat/fat.c:462 #, c-format msgid "" "File system doesn't have expected sizes for Windows to like it. Cluster " @@ -1956,14 +1900,14 @@ msgstr "" "Ukuran cluster adalah %dk (%dk diperkirakan); jumlah dari cluster adalah %d " "(%d diperkirakan); ukuran dari FATs adalah %d sektor (%d diperkirakan)." -#: libparted/fs/r/fat/fat.c:484 +#: libparted/fs/r/fat/fat.c:485 #, c-format msgid "" "File system is reporting the free space as %d clusters, not %d clusters." msgstr "" "File system melaporkan ruang kosong sebagai %d clusters, bukan %d clusters." -#: libparted/fs/r/fat/resize.c:158 +#: 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." @@ -1971,17 +1915,17 @@ msgstr "" "Tidak terdapat ruangan yang cukup untuk direktori root untuk semua file. " "Pilih cancel, atau ignore untuk menggagalkan files." -#: libparted/fs/r/fat/resize.c:302 +#: libparted/fs/r/fat/resize.c:303 msgid "Error writing to the root directory." msgstr "Error menulis pada direktori root." -#: libparted/fs/r/fat/resize.c:495 +#: libparted/fs/r/fat/resize.c:479 msgid "If you leave your file system as FAT16, then you will have no problems." msgstr "" "Jika anda meninggalkan file system anda sebagai FAT16, maka anda mungkin " "tidak akan menemui masalah" -#: libparted/fs/r/fat/resize.c:498 +#: 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 " @@ -1992,7 +1936,7 @@ msgstr "" "anda ingin melakukan ini, anda seharusnya berkonsultasi terlebih dahulu pada " "manual dari Parted (atau manual dari distribusi anda)." -#: libparted/fs/r/fat/resize.c:506 +#: libparted/fs/r/fat/resize.c:490 msgid "" "If you leave your file system as FAT32, then you will not introduce any new " "problems." @@ -2000,7 +1944,7 @@ msgstr "" "Jika anda meninggalkan file system sebagai FAT32, mungkin anda tidak menemui " "masalah baru." -#: libparted/fs/r/fat/resize.c:510 +#: 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 " @@ -2015,41 +1959,41 @@ msgstr "" "ke FAT32 akan membuat file system tidak dapat dibaca oleh MS DOS, MS Windows " "95a, dan MS Windows NT." -#: libparted/fs/r/fat/resize.c:524 +#: libparted/fs/r/fat/resize.c:508 #, c-format msgid "%s %s %s" msgstr "%s %s %s" -#: libparted/fs/r/fat/resize.c:525 +#: libparted/fs/r/fat/resize.c:509 msgid "Would you like to use FAT32?" msgstr "Maukah anda menggunakan FAT32?" -#: libparted/fs/r/fat/resize.c:556 libparted/fs/r/fat/resize.c:572 +#: 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:557 +#: libparted/fs/r/fat/resize.c:541 msgid "" "The file system can only be resized to this size by converting to FAT16." msgstr "" "File system hanya dapat diresize ke ukuran ini dengan mengubahnya ke FAT16." -#: libparted/fs/r/fat/resize.c:573 +#: libparted/fs/r/fat/resize.c:557 msgid "" "The file system can only be resized to this size by converting to FAT32." msgstr "" "The file system hanya dapat di-resize untuk ukuran ini hanya dengan " "mengubahnya menjadi FAT32." -#: libparted/fs/r/fat/resize.c:586 +#: 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 tidak dapat men-resize partisi ini untuk ukuran ini. Kita sedang " "mengusahkannya untuk bisa!" -#: libparted/fs/r/fat/table.c:136 +#: 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 " @@ -2058,41 +2002,41 @@ msgstr "" "FAT %d media %x tidak cocok dengan boot sector's media %x. Anda seharusnya " "menjalankan scandisk." -#: libparted/fs/r/fat/table.c:268 +#: libparted/fs/r/fat/table.c:269 #, c-format msgid "fat_table_set: cluster %ld outside file system" msgstr "fat_table_set: cluster %ld diluar file system" -#: libparted/fs/r/fat/table.c:300 +#: libparted/fs/r/fat/table.c:301 #, c-format msgid "fat_table_get: cluster %ld outside file system" msgstr "fat_table_get: cluster %ld diluar file system" -#: libparted/fs/r/fat/table.c:342 +#: libparted/fs/r/fat/table.c:343 msgid "fat_table_alloc_cluster: no free clusters" msgstr "fat_table_alloc_cluster: tidak ada cluster yang kosong" -#: libparted/fs/r/filesys.c:151 +#: libparted/fs/r/filesys.c:152 msgid "Could not detect file system." msgstr "Tidak dapat mendeteksi filesystem." -#: libparted/fs/r/filesys.c:158 libparted/fs/r/filesys.c:285 +#: libparted/fs/r/filesys.c:159 libparted/fs/r/filesys.c:284 #, fuzzy, c-format msgid "resizing %s file systems is not supported" msgstr "Support untuk men-resize filesystem %s belum diimplementasikan." -#: libparted/fs/r/filesys.c:170 +#: libparted/fs/r/filesys.c:171 msgid "The file system is bigger than its volume!" msgstr "File system lebih besar dari volumenya!" -#: libparted/fs/r/hfs/advfs.c:121 libparted/fs/r/hfs/advfs_plus.c:121 -#: libparted/fs/r/hfs/reloc.c:413 libparted/fs/r/hfs/reloc.c:507 -#: libparted/fs/r/hfs/reloc_plus.c:538 libparted/fs/r/hfs/reloc_plus.c:656 -#: libparted/fs/r/hfs/reloc_plus.c:769 +#: 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 "File system memiliki kerusakan." -#: libparted/fs/r/hfs/advfs_plus.c:285 +#: libparted/fs/r/hfs/advfs_plus.c:287 msgid "Bad blocks could not be read." msgstr "Bad blocks tidak dapat dibaca." @@ -2154,61 +2098,61 @@ msgstr "Tidak dapat menemukan sekto %lli dari file HFS+ dengan CNID %X." msgid "Trying to write HFS+ file with CNID %X behind EOF." msgstr "Mencoba untuk menulis file HFS+ dengan CNID %X dibelakang EOF." -#: libparted/fs/r/hfs/hfs.c:232 +#: libparted/fs/r/hfs/hfs.c:212 msgid "Sorry, HFS cannot be resized that way yet." msgstr "Maaf, HFS tidak dapat di-resize." -#: libparted/fs/r/hfs/hfs.c:250 libparted/fs/r/hfs/hfs.c:629 +#: libparted/fs/r/hfs/hfs.c:230 libparted/fs/r/hfs/hfs.c:573 msgid "shrinking" msgstr "mengecilkan" -#: libparted/fs/r/hfs/hfs.c:262 libparted/fs/r/hfs/hfs.c:641 +#: libparted/fs/r/hfs/hfs.c:242 libparted/fs/r/hfs/hfs.c:585 msgid "Data relocation has failed." msgstr "Data relocation telah gagal." -#: libparted/fs/r/hfs/hfs.c:281 +#: libparted/fs/r/hfs/hfs.c:261 msgid "Data relocation left some data in the end of the volume." msgstr "Data relocation meninggalkan beberapa data pada akhir dari volume." -#: libparted/fs/r/hfs/hfs.c:320 +#: libparted/fs/r/hfs/hfs.c:300 msgid "writing HFS Master Directory Block" msgstr "menulis HFS Master Directory Block" -#: libparted/fs/r/hfs/hfs.c:468 +#: libparted/fs/r/hfs/hfs.c:412 msgid "No valid HFS[+X] signature has been found while opening." msgstr "Tanda tangan HFS[+X] tidak valid telah ditemukan ketika membuka." -#: libparted/fs/r/hfs/hfs.c:478 +#: libparted/fs/r/hfs/hfs.c:422 #, c-format msgid "Version %d of HFS+ isn't supported." msgstr "HFS+ versi %d tidak disupport." -#: libparted/fs/r/hfs/hfs.c:489 +#: libparted/fs/r/hfs/hfs.c:433 #, c-format msgid "Version %d of HFSX isn't supported." msgstr "HFS+ versi %d tidak disupport." -#: libparted/fs/r/hfs/hfs.c:672 +#: libparted/fs/r/hfs/hfs.c:616 msgid "Data relocation left some data at the end of the volume." msgstr "Data relocation meninggalkan beberapa data pada akhir dari volume." -#: libparted/fs/r/hfs/hfs.c:720 +#: libparted/fs/r/hfs/hfs.c:664 msgid "Error while writing the allocation file." msgstr "Error ketika menulis alokasi file." -#: libparted/fs/r/hfs/hfs.c:735 +#: libparted/fs/r/hfs/hfs.c:679 msgid "Error while writing the compatibility part of the allocation file." msgstr "Error ketika menulis bagian kompatibilitas dari alokasi file." -#: libparted/fs/r/hfs/hfs.c:750 +#: libparted/fs/r/hfs/hfs.c:694 msgid "writing HFS+ Volume Header" msgstr "menulis HFS+ Volume Header" -#: libparted/fs/r/hfs/hfs.c:850 +#: libparted/fs/r/hfs/hfs.c:794 msgid "An error occurred while looking for the mandatory bad blocks file." msgstr "Sebuah error terjadi ketika mencari mandatory bad blocks file." -#: libparted/fs/r/hfs/hfs.c:904 +#: 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." @@ -2216,27 +2160,27 @@ msgstr "" "Kelihatannya terjadi kesalahan dalam HFS wrapper: file bad blocks tidak " "berisi embedded HFS+ volume." -#: libparted/fs/r/hfs/hfs.c:940 +#: libparted/fs/r/hfs/hfs.c:883 msgid "Sorry, HFS+ cannot be resized that way yet." msgstr "Maaf, HFS+ tidak dapat di-resize dengan cara itu saat ini." -#: libparted/fs/r/hfs/hfs.c:975 +#: libparted/fs/r/hfs/hfs.c:918 msgid "shrinking embedded HFS+ volume" msgstr "mengecilkan embedded HFS+ volume" -#: libparted/fs/r/hfs/hfs.c:992 +#: libparted/fs/r/hfs/hfs.c:935 msgid "Resizing the HFS+ volume has failed." msgstr "Resizing dari HFS+ volume telah gagal." -#: libparted/fs/r/hfs/hfs.c:999 +#: libparted/fs/r/hfs/hfs.c:942 msgid "shrinking HFS wrapper" msgstr "mengecilkan HFS wrapper" -#: libparted/fs/r/hfs/hfs.c:1008 +#: libparted/fs/r/hfs/hfs.c:951 msgid "Updating the HFS wrapper has failed." msgstr "Update dari HFS wrapper telah gagal." -#: libparted/fs/r/hfs/hfs.c:1110 libparted/fs/r/hfs/hfs.c:1195 +#: 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 " @@ -2315,7 +2259,7 @@ msgstr "" msgid "An extent has not been relocated." msgstr "Sebuah extent tidak dapat direlokasikan." -#: libparted/fs/r/hfs/reloc.c:250 libparted/fs/r/hfs/reloc_plus.c:307 +#: 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!" @@ -2323,15 +2267,15 @@ msgstr "" "Sebuah referensi untuk sebuah extent datang dari tempat yang tidak " "seharusnya. Anda harus mengecheck filesystem!" -#: libparted/fs/r/hfs/reloc.c:380 +#: libparted/fs/r/hfs/reloc.c:382 msgid "This HFS volume has no catalog file. This is very unusual!" msgstr "HFS volume tidak memiliki catalog file. Ini sangat tidak biasa!" -#: libparted/fs/r/hfs/reloc.c:474 +#: libparted/fs/r/hfs/reloc.c:479 msgid "This HFS volume has no extents overflow file. This is quite unusual!" msgstr "HFS+ volume ini tidak memiliki extent overflow file. Ini tidak biasa!" -#: libparted/fs/r/hfs/reloc.c:516 libparted/fs/r/hfs/reloc_plus.c:666 +#: 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." @@ -2339,51 +2283,51 @@ msgstr "" "Extent overflow file seharusnya tidak berisi extentnya sendiri! Anda " "seharusnya mengecheck filesystem." -#: libparted/fs/r/hfs/reloc.c:573 libparted/fs/r/hfs/reloc_plus.c:844 +#: 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 "Tidak dapat men-cache filesystem dalam memori." -#: libparted/fs/r/hfs/reloc.c:634 libparted/fs/r/hfs/reloc_plus.c:905 +#: libparted/fs/r/hfs/reloc.c:640 libparted/fs/r/hfs/reloc_plus.c:910 msgid "Bad blocks list could not be loaded." msgstr "Daftar bad blocks tidak dapat diload." -#: libparted/fs/r/hfs/reloc.c:648 libparted/fs/r/hfs/reloc_plus.c:921 +#: libparted/fs/r/hfs/reloc.c:654 libparted/fs/r/hfs/reloc_plus.c:926 msgid "An error occurred during extent relocation." msgstr "Terjadi error ketika extent relocation." -#: libparted/fs/r/hfs/reloc_plus.c:494 +#: libparted/fs/r/hfs/reloc_plus.c:495 msgid "This HFS+ volume has no catalog file. This is very unusual!" msgstr "HFS+ volume tidak memiliki catalog file. Ini sangat tidak biasa!" -#: libparted/fs/r/hfs/reloc_plus.c:617 +#: libparted/fs/r/hfs/reloc_plus.c:620 msgid "This HFS+ volume has no extents overflow file. This is quite unusual!" msgstr "HFS+ volume tidak memiliki extent overflow file. Ini tidak biasa!" -#: parted/parted.c:125 +#: parted/parted.c:126 msgid "displays this help message" msgstr "tampilkan pesan bantuan ini" -#: parted/parted.c:126 +#: parted/parted.c:127 msgid "lists partition layout on all block devices" msgstr "tampilkan layout partisi di seluruh perangkat blok" -#: parted/parted.c:127 +#: parted/parted.c:128 msgid "displays machine parseable output" msgstr "tampilkan keluaran mesin yang dapat diinputkan (parseable)" -#: parted/parted.c:128 +#: parted/parted.c:129 msgid "never prompts for user intervention" msgstr "jangan menanyakan intervensi pengguna" -#: parted/parted.c:129 +#: parted/parted.c:130 msgid "displays the version" msgstr "tampilkan versi dari program ini" -#: parted/parted.c:130 +#: parted/parted.c:131 msgid "alignment for new partitions" msgstr "penyesuaian untuk partisi baru" -#: parted/parted.c:142 +#: parted/parted.c:143 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" @@ -2392,31 +2336,31 @@ msgstr "" "label, penomoran partisi utama (primary) dari 1 sampai 4, partisi logical " "dari 5 keatas.\n" -#: parted/parted.c:145 +#: parted/parted.c:146 msgid "LABEL-TYPE is one of: " msgstr "TIPE-LABEL adalah salah satu dari: " -#: parted/parted.c:146 parted/parted.c:147 +#: parted/parted.c:147 parted/parted.c:148 msgid "FLAG is one of: " msgstr "TANDA adalah salah satu dari: " -#: parted/parted.c:148 +#: parted/parted.c:149 msgid "UNIT is one of: " msgstr "SATUAN adalah salah satu dari: " -#: parted/parted.c:149 +#: parted/parted.c:150 msgid "desired alignment: minimum or optimal" msgstr "penyesuaian yang diinginkan: minimal atau optimal" -#: parted/parted.c:150 +#: parted/parted.c:151 msgid "PART-TYPE is one of: primary, logical, extended\n" msgstr "TIPE-PART adalah salah satu dari: primary, logical, extended\n" -#: parted/parted.c:152 +#: parted/parted.c:153 msgid "FS-TYPE is one of: " msgstr "TIPE-FS adalah salah satu dari: " -#: parted/parted.c:153 +#: parted/parted.c:154 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 " @@ -2426,7 +2370,7 @@ msgstr "" "dihitung dari akhir alamat disk. sebagai contoh, =-1s menyatakan lokasi " "sektor terakhir.\n" -#: parted/parted.c:156 +#: parted/parted.c:157 #, fuzzy msgid "" "END is disk location, such as 4GB or 10%. Negative value counts from the " @@ -2436,19 +2380,19 @@ msgstr "" "dihitung dari akhir alamat disk. sebagai contoh, =-1s menyatakan lokasi " "sektor terakhir.\n" -#: parted/parted.c:159 +#: parted/parted.c:160 msgid "STATE is one of: on, off\n" msgstr "STATUS adalah salah satu dari: on, off\n" -#: parted/parted.c:160 +#: parted/parted.c:161 msgid "DEVICE is usually /dev/hda or /dev/sda\n" msgstr "PERANGKAT biasanya menggunakan nama /dev/hda atau /dev/sda\n" -#: parted/parted.c:161 +#: parted/parted.c:162 msgid "NAME is any word you want\n" msgstr "NAMA adalah kata apapun yang anda inginkan\n" -#: parted/parted.c:164 +#: parted/parted.c:165 msgid "" "Copyright (C) 1998 - 2006 Free Software Foundation, Inc.\n" "This program is free software, covered by the GNU General Public License.\n" @@ -2469,24 +2413,24 @@ msgstr "" "GNU General Public License untuk informasi yang lebih detail.\n" "\n" -#: parted/parted.c:212 +#: parted/parted.c:213 #, c-format msgid "%0.f%%\t(time left %.2d:%.2d)" msgstr "%0.f%%\t(waktu tersisa %.2d:%.2d)" -#: parted/parted.c:231 +#: parted/parted.c:232 #, fuzzy, c-format msgid "Partition %s is being used. Are you sure you want to continue?" msgstr "" "Partisi %s sedang digunakan. Anda harus meng-umount terlebih dahulu sebelum " "memodifikasinya dengan menggunakan Parted." -#: parted/parted.c:252 +#: parted/parted.c:253 #, c-format msgid "Partition(s) on %s are being used." msgstr "Partisi pada %s sedang digunakan." -#: parted/parted.c:264 +#: parted/parted.c:265 #, c-format msgid "" "The existing disk label on %s will be destroyed and all data on this disk " @@ -2495,31 +2439,31 @@ msgstr "" "Disk label yang ada di %s akan dihapus dan seluruh data di disk ini akan " "hilang. Apakah anda ingin melanjutkan?" -#: parted/parted.c:525 +#: parted/parted.c:526 msgid "New disk label type?" msgstr "Tipe disk label baru?" -#: parted/parted.c:662 +#: parted/parted.c:663 msgid "Partition type?" msgstr "Tipe partisi?" -#: parted/parted.c:680 parted/parted.c:884 +#: parted/parted.c:681 parted/parted.c:885 msgid "Partition name?" msgstr "Nama partisi?" -#: parted/parted.c:690 +#: parted/parted.c:691 msgid "File system type?" msgstr "Tipe file system?" -#: parted/parted.c:695 parted/parted.c:1498 +#: parted/parted.c:696 parted/parted.c:1499 msgid "Start?" msgstr "Awal?" -#: parted/parted.c:698 parted/parted.c:1500 parted/parted.c:1569 +#: parted/parted.c:699 parted/parted.c:1501 parted/parted.c:1585 msgid "End?" msgstr "Akhir?" -#: parted/parted.c:766 +#: parted/parted.c:767 #, fuzzy, c-format msgid "" "You requested a partition from %s to %s (sectors %llu..%llu).\n" @@ -2528,7 +2472,7 @@ msgstr "" "Anda meminta sebuah partisi dari %s sampai %s.\n" "Lokasi terdekat yang dapat kami tangani adalah %s sampai %s.%s" -#: parted/parted.c:775 +#: parted/parted.c:776 msgid "" "\n" "Is this still acceptable to you?" @@ -2536,94 +2480,94 @@ msgstr "" "\n" "Apakah ini masih dapat anda terima?" -#: parted/parted.c:798 +#: parted/parted.c:799 #, c-format msgid "" "The resulting partition is not properly aligned for best performance: %s" msgstr "" -#: parted/parted.c:800 parted/parted.c:1723 +#: parted/parted.c:801 parted/parted.c:1739 msgid "unknown (malloc failed)" msgstr "" -#: parted/parted.c:876 +#: parted/parted.c:877 #, fuzzy, c-format msgid "%s disk labels do not support partition name." msgstr "%s disk label tidak mensupport partisi extended." -#: parted/parted.c:881 parted/parted.c:1561 parted/parted.c:1612 -#: parted/parted.c:1706 parted/parted.c:1781 +#: parted/parted.c:882 parted/parted.c:1564 parted/parted.c:1628 +#: parted/parted.c:1722 parted/parted.c:1797 msgid "Partition number?" msgstr "Nomor partisi?" -#: parted/parted.c:975 +#: parted/parted.c:976 #, c-format msgid "BIOS cylinder,head,sector geometry: %d,%d,%d. Each cylinder is %s.\n" msgstr "" "BIOS cylinder,head,sector geometry: %d,%d,%d. Setiap cylinder adalah %s.\n" -#: parted/parted.c:1017 +#: parted/parted.c:1018 #, c-format msgid "Model: %s (%s)\n" msgstr "Model: %s (%s)\n" -#: parted/parted.c:1019 +#: parted/parted.c:1020 #, c-format msgid "Disk %s: %s\n" msgstr "Disk %s: %s\n" -#: parted/parted.c:1020 +#: parted/parted.c:1021 #, c-format msgid "Sector size (logical/physical): %lldB/%lldB\n" msgstr "Ukuran sektor (logical/physical): %lldB/%lldB\n" -#: parted/parted.c:1032 +#: parted/parted.c:1033 #, c-format msgid "Partition Table: %s\n" msgstr "Tabel Partisi: %s\n" -#: parted/parted.c:1033 +#: parted/parted.c:1034 #, fuzzy, c-format msgid "Disk Flags: %s\n" msgstr "Disk %s: %s\n" -#: parted/parted.c:1153 parted/parted.c:1156 +#: parted/parted.c:1154 parted/parted.c:1157 msgid "Number" msgstr "Nomor" -#: parted/parted.c:1153 parted/parted.c:1156 +#: parted/parted.c:1154 parted/parted.c:1157 msgid "Start" msgstr "Awal" -#: parted/parted.c:1154 parted/parted.c:1157 +#: parted/parted.c:1155 parted/parted.c:1158 msgid "End" msgstr "Akhir" -#: parted/parted.c:1157 +#: parted/parted.c:1158 msgid "Size" msgstr "Ukuran" -#: parted/parted.c:1161 +#: parted/parted.c:1162 msgid "Type" msgstr "Tipe" -#: parted/parted.c:1163 +#: parted/parted.c:1164 msgid "File system" msgstr "File system" -#: parted/parted.c:1166 +#: parted/parted.c:1167 msgid "Name" msgstr "Nama" -#: parted/parted.c:1168 +#: parted/parted.c:1169 msgid "Flags" msgstr "Tanda" -#: parted/parted.c:1225 +#: parted/parted.c:1226 msgid "Free Space" msgstr "Ruang Kosong" -#: parted/parted.c:1385 +#: parted/parted.c:1386 #, c-format msgid "" "A %s %s partition was found at %s -> %s. Do you want to add it to the " @@ -2632,54 +2576,54 @@ msgstr "" "Sebuah %s %s partisi ditemukan pada %s -> %s. Anda ingin menambahkan ini " "pada tabel partisi?" -#: parted/parted.c:1428 +#: parted/parted.c:1429 msgid "searching for file systems" msgstr "mencari untuk file systems" -#: parted/parted.c:1535 +#: parted/parted.c:1536 msgid "The resize command has been removed in parted 3.0" msgstr "" -#: parted/parted.c:1583 +#: parted/parted.c:1599 msgid "" "Shrinking a partition can cause data loss, are you sure you want to continue?" msgstr "" -#: parted/parted.c:1636 +#: parted/parted.c:1652 msgid "New device?" msgstr "Perangkat baru?" -#: parted/parted.c:1704 +#: parted/parted.c:1720 msgid "alignment type(min/opt)" msgstr "tipe penyesuaian(min/opt)" -#: parted/parted.c:1719 +#: parted/parted.c:1735 #, c-format msgid "%d aligned\n" msgstr "" -#: parted/parted.c:1721 +#: parted/parted.c:1737 #, c-format msgid "%d not aligned: %s\n" msgstr "" -#: parted/parted.c:1746 parted/parted.c:1783 +#: parted/parted.c:1762 parted/parted.c:1799 msgid "Flag to Invert?" msgstr "Tanda yang akan dirubah?" -#: parted/parted.c:1751 parted/parted.c:1788 +#: parted/parted.c:1767 parted/parted.c:1804 msgid "New state?" msgstr "Status baru?" -#: parted/parted.c:1834 +#: parted/parted.c:1850 msgid "Unit?" msgstr "Satuan?" -#: parted/parted.c:1969 +#: parted/parted.c:1985 msgid "align-check" msgstr "pemeriksaan-penyesuaian" -#: parted/parted.c:1972 +#: parted/parted.c:1988 #, fuzzy msgid "" "align-check TYPE N check partition N for TYPE(min|opt) " @@ -2688,11 +2632,11 @@ msgstr "" "pemeriksaan-penyesuaian TIPE N periksa partisi N untuk " "penyesuaian TIPE(min|opt)" -#: parted/parted.c:1980 +#: parted/parted.c:1996 msgid "help" msgstr "bantuan" -#: parted/parted.c:1983 +#: parted/parted.c:1999 msgid "" "help [COMMAND] print general help, or help on " "COMMAND" @@ -2700,15 +2644,15 @@ msgstr "" "bantuan [PERINTAH] menampilkan bantuan umum, atau " "bantuan pada PERINTAH" -#: parted/parted.c:1989 +#: parted/parted.c:2005 msgid "mklabel" msgstr "mklabel" -#: parted/parted.c:1989 +#: parted/parted.c:2005 msgid "mktable" msgstr "mktable" -#: parted/parted.c:1992 +#: parted/parted.c:2008 msgid "" "mklabel,mktable LABEL-TYPE create a new disklabel (partition " "table)" @@ -2716,15 +2660,15 @@ msgstr "" "mklabel,mktable TIPE-LABEL membuat sebuah disklabel baru " "(tabel partisi)" -#: parted/parted.c:1998 +#: parted/parted.c:2014 msgid "mkpart" msgstr "mkpart" -#: parted/parted.c:2001 +#: parted/parted.c:2017 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:2007 +#: parted/parted.c:2023 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" @@ -2732,21 +2676,21 @@ msgstr "" "'mkpart' membuat sebuah partisi tanpa membuat sebuah file system baru pada " "partisi. TIPE-FS mungkin dispesifikasikan untuk mengeset ID partisi.\n" -#: parted/parted.c:2012 +#: parted/parted.c:2028 msgid "name" msgstr "nama" -#: parted/parted.c:2015 +#: parted/parted.c:2031 msgid "name NUMBER NAME name partition NUMBER as NAME" msgstr "" "nama NOMOR NAMA memberi nama partisi NOMOR dengan " "NAMA" -#: parted/parted.c:2020 +#: parted/parted.c:2036 msgid "print" msgstr "cetak" -#: parted/parted.c:2023 +#: parted/parted.c:2039 msgid "" "print [devices|free|list,all|NUMBER] display the partition table, " "available devices, free space, all found partitions, or a particular " @@ -2756,7 +2700,7 @@ msgstr "" "yang bisa dipakai, ruang kosong, seluruh partisi yang ditemukan, atau untuk " "partisi tertentu" -#: parted/parted.c:2028 +#: parted/parted.c:2044 msgid "" "Without arguments, 'print' displays the entire partition table. However with " "the following arguments it performs various other actions.\n" @@ -2764,11 +2708,11 @@ msgstr "" "Tanpa argumen, 'print' menampilkan seluruh tabel partisi. Akan tetapi dengan " "diikuti argument ini akan melakukan beberapa aksi yang berbeda.\n" -#: parted/parted.c:2030 +#: parted/parted.c:2046 msgid " devices : display all active block devices\n" msgstr " devices : menampilkan seluruh perangkat blok yang aktif\n" -#: parted/parted.c:2031 +#: parted/parted.c:2047 msgid "" " free : display information about free unpartitioned space on the " "current block device\n" @@ -2776,14 +2720,14 @@ msgstr "" " free : menampilkan informasi tentang ruang partisi kosong di perngkat " "blok yang sedang dipakai\n" -#: parted/parted.c:2033 +#: parted/parted.c:2049 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:2034 +#: parted/parted.c:2050 msgid "" " NUMBER : display more detailed information about this particular " "partition\n" @@ -2791,19 +2735,19 @@ msgstr "" " NUMBER : tampilkan informasi yang lebih detail tentang partisi yang " "terpilih\n" -#: parted/parted.c:2039 +#: parted/parted.c:2055 msgid "quit" msgstr "berhenti" -#: parted/parted.c:2042 +#: parted/parted.c:2058 msgid "quit exit program" msgstr "berhenti keluar dari program" -#: parted/parted.c:2047 +#: parted/parted.c:2063 msgid "rescue" msgstr "selamatkan" -#: parted/parted.c:2050 +#: parted/parted.c:2066 msgid "" "rescue START END rescue a lost partition near START " "and END" @@ -2811,58 +2755,58 @@ msgstr "" "selamatkan AWAL AKHIR menyelamatkan partisi yang hilang " "didekat alamat AWAL dan AKHIR" -#: parted/parted.c:2056 +#: parted/parted.c:2072 msgid "resize" msgstr "resize" -#: parted/parted.c:2059 +#: parted/parted.c:2075 msgid "The resize command was removed in parted 3.0\n" msgstr "" -#: parted/parted.c:2062 +#: parted/parted.c:2078 #, fuzzy msgid "resizepart" msgstr "resize" -#: parted/parted.c:2065 +#: parted/parted.c:2081 #, fuzzy msgid "resizepart NUMBER END resize partition NUMBER" msgstr "pindah NOMOR AWAL AKHIR memindahkan partisi NOMOR" -#: parted/parted.c:2070 +#: parted/parted.c:2086 msgid "rm" msgstr "hapus" -#: parted/parted.c:2073 +#: parted/parted.c:2089 msgid "rm NUMBER delete partition NUMBER" msgstr "hapus NOMOR hapus partisi NOMOR" -#: parted/parted.c:2078 +#: parted/parted.c:2094 msgid "select" msgstr "pilih" -#: parted/parted.c:2081 +#: parted/parted.c:2097 msgid "select DEVICE choose the device to edit" msgstr "" "pilih PERANGKAT pilih perangkat yang akan di edit" -#: parted/parted.c:2086 +#: parted/parted.c:2102 msgid "disk_set" msgstr "" -#: parted/parted.c:2089 +#: parted/parted.c:2105 #, fuzzy msgid "" "disk_set FLAG STATE change the FLAG on selected device" msgstr "" "set NOMOR FLAG STATUS merubah tanda pada partisi NOMOR" -#: parted/parted.c:2094 +#: parted/parted.c:2110 #, fuzzy msgid "disk_toggle" msgstr "ubah" -#: parted/parted.c:2097 +#: parted/parted.c:2113 #, fuzzy msgid "" "disk_toggle [FLAG] toggle the state of FLAG on " @@ -2871,21 +2815,21 @@ msgstr "" "ubah [NOMOR [TANDA]] ubah keadaan dari TANDA di partisi " "NOMOR" -#: parted/parted.c:2103 +#: parted/parted.c:2119 msgid "set" msgstr "set" -#: parted/parted.c:2106 +#: parted/parted.c:2122 msgid "" "set NUMBER FLAG STATE change the FLAG on partition NUMBER" msgstr "" "set NOMOR FLAG STATUS merubah tanda pada partisi NOMOR" -#: parted/parted.c:2112 +#: parted/parted.c:2128 msgid "toggle" msgstr "ubah" -#: parted/parted.c:2115 +#: parted/parted.c:2131 msgid "" "toggle [NUMBER [FLAG]] toggle the state of FLAG on " "partition NUMBER" @@ -2893,20 +2837,20 @@ msgstr "" "ubah [NOMOR [TANDA]] ubah keadaan dari TANDA di partisi " "NOMOR" -#: parted/parted.c:2121 +#: parted/parted.c:2137 msgid "unit" msgstr "satuan" -#: parted/parted.c:2124 +#: parted/parted.c:2140 msgid "unit UNIT set the default unit to UNIT" msgstr "" "satuan SATUAN mengeset satuan baku pada SATUAN" -#: parted/parted.c:2129 +#: parted/parted.c:2145 msgid "version" msgstr "versi" -#: parted/parted.c:2132 +#: parted/parted.c:2148 msgid "" "version display the version number and " "copyright information of GNU Parted" @@ -2914,7 +2858,7 @@ msgstr "" "versi menampilkan versi dari GNU Parted " "dan informasi hak cipta" -#: parted/parted.c:2136 +#: parted/parted.c:2152 msgid "" "'version' displays copyright and version information corresponding to this " "copy of GNU Parted\n" @@ -2922,33 +2866,41 @@ msgstr "" "'versi' menampilkan hak cipta dan informasi versi sesuai dengan kopi dari " "GNU Parted ini\n" -#: parted/parted.c:2204 +#: parted/parted.c:2220 #, c-format msgid "Usage: %s [-hlmsv] [-a] [DEVICE [COMMAND [PARAMETERS]]...]\n" msgstr "" "Penggunaan: %s [-hlmsv] [-a] [PERANGKAT [PERINTAH " "[PARAMETER]]...]\n" -#: parted/parted.c:2248 +#: parted/parted.c:2264 msgid "No device found" msgstr "Tidak ditemukan perangkat" -#: parted/parted.c:2285 +#: parted/parted.c:2301 #, fuzzy msgid "WARNING: You are not superuser. Watch out for permissions.\n" msgstr "PERINGATAN: Anda bukan superuser. Perhatikan permisi anda." -#: parted/parted.c:2325 +#: parted/parted.c:2334 +msgid "" +"You should reinstall your boot loader before rebooting. Read section 4 of " +"the Parted User documentation for more information." +msgstr "" +"Anda seharusnya menginstall ulang boot loader anda sebelum merebootnya. Baca " +"bagian 4 dari Parted dokumentasi pengguna untuk informasi lebih lanjut." + +#: parted/parted.c:2341 msgid "You may need to update /etc/fstab.\n" msgstr "Anda mungkin perlu untuk memperbarui /etc/fstab.\n" -#: parted/ui.c:164 +#: parted/ui.c:165 msgid "Welcome to GNU Parted! Type 'help' to view a list of commands.\n" msgstr "" "Selamat datang di GNU Parted| Ketik 'bantuan' untuk melihat daftar dari " "perintah yang tersedia.\n" -#: parted/ui.c:167 +#: parted/ui.c:168 msgid "" "Usage: parted [OPTION]... [DEVICE [COMMAND [PARAMETERS]...]...]\n" "Apply COMMANDs with PARAMETERS to DEVICE. If no COMMAND(s) are given, run " @@ -2960,7 +2912,7 @@ msgstr "" "diberikan,\n" "maka parted akan berjalan dengan menggunakan mode interaktif.\n" -#: parted/ui.c:172 +#: parted/ui.c:173 #, c-format msgid "" "\n" @@ -3024,7 +2976,7 @@ msgstr "" "dan beberapa informasi tambahan mengenai setting yang telah\n" "anda lakukan yang menurut anda penting.\n" -#: parted/ui.c:293 +#: parted/ui.c:294 msgid "" "\n" "Command History:\n" @@ -3032,7 +2984,7 @@ msgstr "" "\n" "Perintah yang pernah dijalankan:\n" -#: parted/ui.c:356 +#: parted/ui.c:357 msgid "" "\n" "Error: SEGV_MAPERR (Address not mapped to object)\n" @@ -3040,7 +2992,7 @@ msgstr "" "\n" "Error: SEGV_MAPPER (Alamat tidak di map ke objek)\n" -#: parted/ui.c:362 +#: parted/ui.c:363 msgid "" "\n" "Error: SEGV_ACCERR (Invalid permissions for mapped object)\n" @@ -3048,7 +3000,7 @@ msgstr "" "\n" "Error: SEGV_ACCER (Permisi tidak sah untuk objek yang dimap)\n" -#: parted/ui.c:367 +#: parted/ui.c:368 msgid "" "\n" "Error: A general SIGSEGV signal was encountered.\n" @@ -3056,7 +3008,7 @@ msgstr "" "\n" "Error: Sebuah sinyal SIGSEGV umum telah ditemui.\n" -#: parted/ui.c:391 +#: parted/ui.c:392 msgid "" "\n" "Error: FPE_INTDIV (Integer: divide by zero)" @@ -3064,7 +3016,7 @@ msgstr "" "\n" "Error: FPE_INTDIV (Integer: dibagi dengan nol)" -#: parted/ui.c:396 +#: parted/ui.c:397 msgid "" "\n" "Error: FPE_INTOVF (Integer: overflow)" @@ -3072,7 +3024,7 @@ msgstr "" "\n" "Error: FPE_INTOVF (Integer: overflow)" -#: parted/ui.c:401 +#: parted/ui.c:402 msgid "" "\n" "Error: FPE_FLTDIV (Float: divide by zero)" @@ -3080,7 +3032,7 @@ msgstr "" "\n" "Error: FPE_FLTDIV (Float: dibagi dengan nol)" -#: parted/ui.c:406 +#: parted/ui.c:407 msgid "" "\n" "Error: FPE_FLTOVF (Float: overflow)" @@ -3088,7 +3040,7 @@ msgstr "" "\n" "Error: FPE_FLTOVF (Float: overflow)" -#: parted/ui.c:411 +#: parted/ui.c:412 msgid "" "\n" "Error: FPE_FLTUND (Float: underflow)" @@ -3096,7 +3048,7 @@ msgstr "" "\n" "Error: FPE_FLTUND (Float: underflow)" -#: parted/ui.c:416 +#: parted/ui.c:417 msgid "" "\n" "Error: FPE_FLTRES (Float: inexact result)" @@ -3104,7 +3056,7 @@ msgstr "" "\n" "Error: FPE_FLTRES (Float: hasil tidak eksak)" -#: parted/ui.c:421 +#: parted/ui.c:422 msgid "" "\n" "Error: FPE_FLTINV (Float: invalid operation)" @@ -3112,7 +3064,7 @@ msgstr "" "\n" "Error: FPE_FLTINV (Float: operasi tidak valid)" -#: parted/ui.c:426 +#: parted/ui.c:427 msgid "" "\n" "Error: FPE_FLTSUB (Float: subscript out of range)" @@ -3120,7 +3072,7 @@ msgstr "" "\n" "Error: FPE_FLTSUB (Float: subscript diluar dari jangkauan)" -#: parted/ui.c:431 +#: parted/ui.c:432 msgid "" "\n" "Error: A general SIGFPE signal was encountered." @@ -3128,7 +3080,7 @@ msgstr "" "\n" "Error: Sebuah sinyal SIGFPE umum telah ditemukan." -#: parted/ui.c:455 +#: parted/ui.c:456 msgid "" "\n" "Error: ILL_ILLOPC (Illegal Opcode)" @@ -3136,7 +3088,7 @@ msgstr "" "\n" "Error: ILL_ILLOPC (Illegal Opcode)" -#: parted/ui.c:460 +#: parted/ui.c:461 msgid "" "\n" "Error: ILL_ILLOPN (Illegal Operand)" @@ -3144,7 +3096,7 @@ msgstr "" "\n" "Error: ILL_ILLOPN (Illegal Operand)" -#: parted/ui.c:465 +#: parted/ui.c:466 msgid "" "\n" "Error: ILL_ILLADR (Illegal addressing mode)" @@ -3152,7 +3104,7 @@ msgstr "" "\n" "Error: ILL_ILLADDR (Illegal mode pengalamatan)" -#: parted/ui.c:470 +#: parted/ui.c:471 msgid "" "\n" "Error: ILL_ILLTRP (Illegal Trap)" @@ -3160,7 +3112,7 @@ msgstr "" "\n" "Error: ILL_ILLTRP (Illegal Trap)" -#: parted/ui.c:475 +#: parted/ui.c:476 msgid "" "\n" "Error: ILL_PRVOPC (Privileged Opcode)" @@ -3168,7 +3120,7 @@ msgstr "" "\n" "Error: ILL_PRVOPC (Privileged Opcode)" -#: parted/ui.c:480 +#: parted/ui.c:481 msgid "" "\n" "Error: ILL_PRVREG (Privileged Register)" @@ -3176,7 +3128,7 @@ msgstr "" "\n" "Error: ILL_PRVREG (Privileged Register)" -#: parted/ui.c:485 +#: parted/ui.c:486 msgid "" "\n" "Error: ILL_COPROC (Coprocessor Error)" @@ -3184,7 +3136,7 @@ msgstr "" "\n" "Error: ILL_COPROC (Coprocessor Error)" -#: parted/ui.c:490 +#: parted/ui.c:491 msgid "" "\n" "Error: ILL_BADSTK (Internal Stack Error)" @@ -3192,7 +3144,7 @@ msgstr "" "\n" "Error: ILL_BADSTK (Internal Stack Error)" -#: parted/ui.c:495 +#: parted/ui.c:496 msgid "" "\n" "Error: A general SIGILL signal was encountered." @@ -3200,69 +3152,69 @@ msgstr "" "\n" "Error: Sebuah sinyal SIGILL umum telah ditemukan." -#: parted/ui.c:888 +#: parted/ui.c:889 #, c-format msgid "invalid token: %s" msgstr "token tidak valid: %s" -#: parted/ui.c:1069 +#: parted/ui.c:1070 msgid "Expecting a partition number." msgstr "Memperkirakan sebuah nomor partisi." -#: parted/ui.c:1078 +#: parted/ui.c:1079 msgid "Partition doesn't exist." msgstr "Partisi tidak ada." -#: parted/ui.c:1098 +#: parted/ui.c:1099 msgid "Expecting a file system type." msgstr "Memperkirakan sebuah tipe filesystem." -#: parted/ui.c:1105 +#: parted/ui.c:1106 #, c-format msgid "Unknown file system type \"%s\"." msgstr "Tipe filesystem tidak diketahui \"%s\"." -#: parted/ui.c:1126 +#: parted/ui.c:1127 msgid "Expecting a disk label type." msgstr "Memperkirakan sebuah tipe disk label." -#: parted/ui.c:1157 parted/ui.c:1193 +#: parted/ui.c:1158 parted/ui.c:1194 msgid "No flags supported" msgstr "" -#: parted/ui.c:1267 +#: parted/ui.c:1268 msgid "Can't create any more partitions." msgstr "Tidak dapat membuat partisi lagi." -#: parted/ui.c:1277 +#: parted/ui.c:1278 msgid "Expecting a partition type." msgstr "Memperkirakan sebuah tipe partisi." -#: parted/ui.c:1426 +#: parted/ui.c:1427 msgid "on" msgstr "nyala" -#: parted/ui.c:1427 +#: parted/ui.c:1428 msgid "off" msgstr "mati" -#: parted/ui.c:1444 +#: parted/ui.c:1445 msgid "optimal" msgstr "optimal" -#: parted/ui.c:1445 +#: parted/ui.c:1446 msgid "minimal" msgstr "minimal" -#: parted/ui.c:1578 +#: parted/ui.c:1579 msgid "OPTIONs:" msgstr "PILIHAN:" -#: parted/ui.c:1583 +#: parted/ui.c:1584 msgid "COMMANDs:" msgstr "PERINTAH:" -#: parted/ui.c:1586 +#: parted/ui.c:1587 #, fuzzy, c-format msgid "" "\n" @@ -3271,33 +3223,52 @@ msgstr "" "\n" "Laporkan bugs ke: %s\n" -#: parted/ui.c:1593 +#: parted/ui.c:1594 #, c-format msgid "Using %s\n" msgstr "Menggunakan perangkat %s\n" -#: parted/ui.c:1673 +#: parted/ui.c:1674 msgid "This command does not make sense in non-interactive mode.\n" msgstr "Perintah ini tidak mempunyai arti dalam mode non-interaktif.\n" +#, c-format #~ msgid "%s: option `--%s' doesn't allow an argument\n" #~ msgstr "%s: pilihan `--%s' tidak memperbolehkan adanya argumen\n" +#, c-format #~ msgid "%s: unrecognized option `--%s'\n" #~ msgstr "%s: pilihan `--%s' tidak dikenali\n" +#, c-format #~ msgid "%s: illegal option -- %c\n" #~ msgstr "%s: pilihan -- %c tidak valid\n" +#, c-format #~ msgid "%s: option `-W %s' is ambiguous\n" #~ msgstr "%s: pilihan `-W %s' adalah abigu\n" +#, c-format #~ msgid "%s: option `-W %s' doesn't allow an argument\n" #~ msgstr "%s: pilihan `-W %s' tidak memperbolehkan adanya sebuah argument\n" +#, c-format #~ msgid "%s home page: \n" #~ msgstr "%s halaman rumah: \n" +#, c-format +#~ msgid "invalid %s%s argument `%s'" +#~ msgstr "argumen `%s' tidak sah %s%s" + +#, c-format +#~ msgid "invalid suffix in %s%s argument `%s'" +#~ msgstr "akhiran tidak sah di %s%s argumen `%s'" + +#, c-format +#~ msgid "%s%s argument `%s' too large" +#~ msgstr "%s%s argumen `%s' terlalu besar" + +#, c-format #~ msgid "" #~ "Usage: %s [OPTION]\n" #~ " or: %s DEVICE MINOR\n" @@ -3319,15 +3290,46 @@ msgstr "Perintah ini tidak mempunyai arti dalam mode non-interaktif.\n" #~ msgid " --version output version information and exit\n" #~ msgstr " --version menampilkan informasi versi dan keluar\n" +#, c-format #~ msgid "too few arguments" #~ msgstr "argumen terlalu sedikit" +#, c-format #~ msgid "too many arguments" #~ msgstr "Terlalu banyak argument." +#, c-format #~ msgid "invalid minor device number: %s" #~ msgstr "nomor divais minor tidak sah: %s" +#~ msgid "" +#~ "The partition table cannot be re-read. This means you need to reboot " +#~ "before mounting any modified partitions. You also need to reinstall your " +#~ "boot loader before you reboot (which may require mounting modified " +#~ "partitions). It is impossible do both things! So you'll need to boot " +#~ "off a rescue disk, and reinstall your boot loader from the rescue disk. " +#~ "Read section 4 of the Parted User documentation for more information." +#~ msgstr "" +#~ "Tabel partisi tidak dapat dibaca ulang. Ini berarti anda perlu untuk me-" +#~ "reboot terlebih dahulu sebelum me-mount semua partisi yang dimodifikasi. " +#~ "Anda juga perlu menginstall kembali bootloader anda sebelum me-reboot " +#~ "komputer anda (yang memerlukan untuk me-mount partisi yang dimodifikasi). " +#~ "Ini tidak mungkin untuk melakukan keduanya secara sekaligus! Jadi anda " +#~ "perlu membuat sebuah disket penolong (rescue), dan menginstall bootloader " +#~ "anda dari disket penolong tersebut. Baca bagian 4 dari dokumentasi " +#~ "pengguna Parted untuk informasi lebih lanjut." + +#, 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 " +#~ "computer before doing anything with %s." +#~ msgstr "" +#~ "Tabel partisi pada %s tidak dapat dibaca kembali (%s). Ini berarti hurd " +#~ "tidak tahu apa-apa tentang modifikasi yang anda buat. Anda seharusnya " +#~ "mereboot komputer anda sebelum melakukan apapun dengan %s." + +#, c-format #~ msgid "" #~ "Could not determine minimum io size for %s: %s.\n" #~ "Using the default size (%lld)." @@ -3335,6 +3337,7 @@ msgstr "Perintah ini tidak mempunyai arti dalam mode non-interaktif.\n" #~ "Tidak dapat menentukan ukuran sektor minimum untuk %s: %s.\n" #~ "Menggunakan ukuran sektor baku (%lld)." +#, c-format #~ msgid "" #~ "Device %s has a logical sector size of %lld. Not all parts of GNU Parted " #~ "support this at the moment, and the working code is HIGHLY EXPERIMENTAL.\n" @@ -3343,6 +3346,7 @@ msgstr "Perintah ini tidak mempunyai arti dalam mode non-interaktif.\n" #~ "GNU Parted support akan hal ini pada saat ini, dan kode program yang " #~ "digunakan saat ini masih TAHAP PERCOBAAN.\n" +#, c-format #~ msgid "" #~ "parted was unable to re-read the partition table on %s (%s). This means " #~ "Linux won't know anything about the modifications you made. " @@ -3351,6 +3355,7 @@ msgstr "Perintah ini tidak mempunyai arti dalam mode non-interaktif.\n" #~ "berarti Linux tidak akan tahu apapun tentang modifikasi yang telah anda " #~ "buat." +#, 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." @@ -3359,12 +3364,15 @@ msgstr "Perintah ini tidak mempunyai arti dalam mode non-interaktif.\n" #~ "Hasilnya, ini mungkin tidak merefleksikan semua perubahan yang anda " #~ "lakukan sampai anda melakukan reboot." +#, c-format #~ msgid "Support for opening %s file systems is not implemented yet." #~ msgstr "Support untuk membuka file systems %s belum diimplementasikan." +#, c-format #~ msgid "Support for creating %s file systems is not implemented yet." #~ msgstr "Support untuk membuat file systems %s belum diimplementasikan." +#, c-format #~ msgid "Support for checking %s file systems is not implemented yet." #~ msgstr "Support untuk mengecheck file systems %s belum diimplementasikan." @@ -3377,6 +3385,7 @@ msgstr "Perintah ini tidak mempunyai arti dalam mode non-interaktif.\n" #~ msgid "Can't copy onto an overlapping partition." #~ msgstr "Tidak dapat menyalin kedalam partisi yang overlap." +#, c-format #~ msgid "" #~ "Direct support for copying file systems is not yet implemented for %s. " #~ "However, support for resizing is implemented. Therefore, the file system " @@ -3390,6 +3399,7 @@ msgstr "Perintah ini tidak mempunyai arti dalam mode non-interaktif.\n" #~ "sama besar dengan partisi lama. Jadi, bisa dilakukan dengan mengecilkan " #~ "partisi yang akan disalin, atau menyalin ke partisi yang lebih besar." +#, c-format #~ msgid "Support for copying %s file systems is not implemented yet." #~ msgstr "Support untuk menyalin filesystem %s belum diimplementasikan." @@ -3437,12 +3447,14 @@ msgstr "Perintah ini tidak mempunyai arti dalam mode non-interaktif.\n" #~ msgid "copying" #~ msgstr "menyalin" +#, c-format #~ msgid "Couldn't resolve symbol %s. Error: %s." #~ msgstr "Tidak dapat menresolv simbol %s. Error: %s." #~ msgid "GNU Parted found an invalid libreiserfs library." #~ msgstr "GNU Parted menemukan sebuah library libreiserfs yang tidak valid." +#, c-format #~ msgid "" #~ "GNU Parted has detected libreiserfs interface version mismatch. Found %d-" #~ "%d, required %d. ReiserFS support will be disabled." @@ -3453,6 +3465,7 @@ msgstr "Perintah ini tidak mempunyai arti dalam mode non-interaktif.\n" #~ msgid "This is not an ECKD disk! This disk type is not supported!" #~ msgstr "Ini bukan cakram ECKD! Tipe cakram ini tak didukung!" +#, c-format #~ msgid "" #~ "%s contains GPT signatures, indicating that it has a GPT table. However, " #~ "it does not have a valid fake msdos partition table, as it should. " @@ -3467,6 +3480,9 @@ msgstr "Perintah ini tidak mempunyai arti dalam mode non-interaktif.\n" #~ "dan sekarang menggunakan sebuah tabel partisi msdos. Apakah ini sebuah " #~ "tabel partisi GPT?" +#~ msgid "The boot region doesn't start at the start of the partition." +#~ msgstr "Daerah boot tidak dimulai pada awal dari partisi." + #~ msgid "Inconsistent group descriptors!" #~ msgstr "group descriptors tidak konsistent!" @@ -3521,11 +3537,13 @@ msgstr "Perintah ini tidak mempunyai arti dalam mode non-interaktif.\n" #~ msgid "adding groups" #~ msgstr "menambahkan groups" +#, c-format #~ msgid "Your file system is too full to resize it to %i blocks. Sorry." #~ msgstr "" #~ "File system anda terlalu penuh untuk men-resize-nya menjadi %i blocks. " #~ "Maaf." +#, c-format #~ msgid "" #~ "Your file system has too many occupied inodes to resize it to %i blocks. " #~ "Sorry." @@ -3567,9 +3585,11 @@ msgstr "Perintah ini tidak mempunyai arti dalam mode non-interaktif.\n" #~ "Cross-linked blocks ditemukan! Lebih baik menjalankan e2fsck terlebih " #~ "daulu!" +#, c-format #~ msgid "Block %i has no reference? Weird." #~ msgstr "Block %i tidak memiliki reference? Aneh." +#, c-format #~ msgid "Block %i shouldn't have been marked (%d, %d)!" #~ msgstr "Block %i seharusnya tidak memiliki tanda (%d, %d)!" @@ -3592,6 +3612,7 @@ msgstr "Perintah ini tidak mempunyai arti dalam mode non-interaktif.\n" #~ msgid "File system too small for ext2." #~ msgstr "File system terlalu kecil untuk ext2." +#, 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." @@ -3599,6 +3620,14 @@ msgstr "Perintah ini tidak mempunyai arti dalam mode non-interaktif.\n" #~ "File system ini memiliki sektor logical yang berukuran %d. GNU Parted " #~ "tidak bekerja dengan baik dengan ukuran sektor selain 512 bytes." +#, c-format +#~ msgid "" +#~ "The file %s is marked as a system file. This means moving it could cause " +#~ "some programs to stop working." +#~ msgstr "" +#~ "File %s ditandai sebagai sistem file. Ini berarti memindahkannya dapat " +#~ "menyebabkan beberapa aplikasi untuk tidak dapat bekerja." + #~ msgid "Too many bad pages." #~ msgstr "Terlalu banyak bad pages." @@ -3612,6 +3641,7 @@ msgstr "Perintah ini tidak mempunyai arti dalam mode non-interaktif.\n" #~ "Filesystem yang ada akan dihapus dan seluruh data yang ada di partisi " #~ "tersebut akan hilang. Apakah anda ingin melanjutkan?" +#, c-format #~ msgid "" #~ "WARNING: you are attempting to use %s to operate on (%s) a file system.\n" #~ "%s's file system manipulation code is not as robust as what you'll find " @@ -3651,12 +3681,15 @@ msgstr "Perintah ini tidak mempunyai arti dalam mode non-interaktif.\n" #~ "Tidak dapat memindahkan partisi ke partisi itu sendiri. Coba menggunakan " #~ "resize, mungkin?" +#, c-format #~ msgid "Minor: %d\n" #~ msgstr "Minor: %d\n" +#, c-format #~ msgid "Flags: %s\n" #~ msgstr "Tanda: %s\n" +#, c-format #~ msgid "File System: %s\n" #~ msgstr "File System: %s\n" diff --git a/po/it.gmo b/po/it.gmo index 29ca846860be3e45d218e3ab1e5cabc2cb949443..24391af65095941a288138344bf2e65e2761b740 100644 GIT binary patch delta 11320 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 O_5V7*AmPf|QvU;h`HKSp diff --git a/po/it.po b/po/it.po index b01bb19..b4235ef 100644 --- a/po/it.po +++ b/po/it.po @@ -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: 2019-10-10 16:35-0700\n" +"POT-Creation-Date: 2021-01-27 16:00-0800\n" "PO-Revision-Date: 2014-07-10 09:57+0100\n" "Last-Translator: Milo Casagrande \n" "Language-Team: Italian \n" @@ -98,11 +98,11 @@ msgstr "%s: l'opzione richiede un argomento -- \"%c\"\n" #. If you don't know what to put here, please see #. #. and use glyphs suitable for your language. -#: lib/quotearg.c:362 +#: lib/quotearg.c:355 msgid "`" msgstr "\"" -#: lib/quotearg.c:363 +#: lib/quotearg.c:356 msgid "'" msgstr "\"" @@ -372,32 +372,17 @@ msgstr "Aiuto per l'utilizzo di software GNU: \n" msgid "memory exhausted" msgstr "memoria esaurita" -#: lib/xstrtol-error.c:63 -#, c-format -msgid "invalid %s%s argument '%s'" -msgstr "l'argomento \"%3$s\" di %1$s%2$s non è valido" - -#: lib/xstrtol-error.c:68 -#, c-format -msgid "invalid suffix in %s%s argument '%s'" -msgstr "il suffisso nell'argomento \"%3$s\" di %1$s%2$s non è valido" - -#: lib/xstrtol-error.c:72 -#, c-format -msgid "%s%s argument '%s' too large" -msgstr "l'argomento \"%3$s\" di %1$s%2$s è troppo grande" - -#: libparted/arch/beos.c:245 +#: libparted/arch/beos.c:246 msgid "Disk Image" msgstr "Immagine disco" -#: libparted/arch/beos.c:346 libparted/arch/gnu.c:277 +#: libparted/arch/beos.c:347 libparted/arch/gnu.c:277 #: libparted/arch/linux.c:1731 #, c-format msgid "Error opening %s: %s" msgstr "Errore nell'aprire %s: %s" -#: libparted/arch/beos.c:357 libparted/arch/gnu.c:287 +#: libparted/arch/beos.c:358 libparted/arch/gnu.c:287 #: libparted/arch/linux.c:1742 #, c-format msgid "Unable to open %s read-write (%s). %s has been opened read-only." @@ -405,47 +390,47 @@ msgstr "" "Impossibile aprire %s in lettura-scrittura (%s). %s è stato aperto in sola " "lettura." -#: libparted/arch/beos.c:419 libparted/arch/linux.c:1907 +#: libparted/arch/beos.c:420 libparted/arch/linux.c:1907 #, c-format msgid "%s during seek for read on %s" msgstr "%s durante il posizionamento per la lettura su %s" -#: libparted/arch/beos.c:452 libparted/arch/gnu.c:465 libparted/arch/gnu.c:564 -#: libparted/arch/gnu.c:692 libparted/arch/linux.c:1867 +#: libparted/arch/beos.c:453 libparted/arch/gnu.c:425 libparted/arch/gnu.c:524 +#: libparted/arch/gnu.c:652 libparted/arch/linux.c:1867 #: libparted/arch/linux.c:1949 #, c-format msgid "%s during read on %s" msgstr "%s durante la lettura su %s" -#: libparted/arch/beos.c:488 libparted/arch/gnu.c:525 +#: libparted/arch/beos.c:489 libparted/arch/gnu.c:485 #: libparted/arch/linux.c:2026 #, c-format msgid "Can't write to %s, because it is opened read-only." msgstr "Impossibile scrivere su %s poiché è stato aperto in sola lettura." -#: libparted/arch/beos.c:504 libparted/arch/linux.c:2051 +#: libparted/arch/beos.c:505 libparted/arch/linux.c:2051 #, c-format msgid "%s during seek for write on %s" msgstr "%s durante il posizionamento per la scrittura su %s" -#: libparted/arch/beos.c:541 libparted/arch/gnu.c:601 libparted/arch/gnu.c:646 -#: libparted/arch/gnu.c:723 libparted/arch/linux.c:1999 +#: libparted/arch/beos.c:542 libparted/arch/gnu.c:561 libparted/arch/gnu.c:606 +#: libparted/arch/gnu.c:683 libparted/arch/linux.c:1999 #: libparted/arch/linux.c:2094 libparted/arch/linux.c:2167 #, c-format msgid "%s during write on %s" msgstr "%s durante la scrittura su %s" -#: partprobe/partprobe.c:148 +#: partprobe/partprobe.c:149 #, c-format msgid "Try `%s --help' for more information.\n" msgstr "Usare \"%s --help\" per ulteriori informazioni.\n" -#: partprobe/partprobe.c:152 +#: partprobe/partprobe.c:153 #, c-format msgid "Usage: %s [OPTION] [DEVICE]...\n" msgstr "Uso: %s [OPZIONI] [DEVICE]...\n" -#: partprobe/partprobe.c:153 +#: partprobe/partprobe.c:154 msgid "" "Inform the operating system about partition table changes.\n" "\n" @@ -462,7 +447,7 @@ msgstr "" " -h, --help Visualizza questo aiuto ed esce\n" " -v, --version Stampa la versione ed esce\n" -#: partprobe/partprobe.c:161 +#: partprobe/partprobe.c:162 msgid "" "\n" "When no DEVICE is given, probe all partitions.\n" @@ -470,7 +455,7 @@ msgstr "" "\n" "Quando non viene fornito alcun DEVICE, rileva tutte le partizioni.\n" -#: partprobe/partprobe.c:165 +#: partprobe/partprobe.c:166 #, c-format msgid "" "\n" @@ -488,43 +473,7 @@ msgstr "Impossibile aprire %s." msgid "Unable to probe store." msgstr "Impossibile rilevare il dispositivo di archiviazione." -#: libparted/arch/gnu.c:368 -msgid "" -"The partition table cannot be re-read. This means you need to reboot before " -"mounting any modified partitions. You also need to reinstall your boot " -"loader before you reboot (which may require mounting modified partitions). " -"It is impossible do both things! So you'll need to boot off a rescue disk, " -"and reinstall your boot loader from the rescue disk. Read section 4 of the " -"Parted User documentation for more information." -msgstr "" -"Impossibile rileggere la tabella delle partizioni; per poter montare le " -"partizioni modificate è necessario riavviare il computer. Prima del riavvio " -"è anche necessario installare nuovamente il \"boot loader\" (potrebbe " -"richiedere di montare le partizioni modificate). Poiché non è possibile " -"svolgere entrambe le operazioni, avviare il computer da un disco di " -"ripristino e installare il \"boot loader\" da tale disco. Per maggiori " -"informazioni, consultare la sezione 4 della documentazione di Parted." - -#: libparted/arch/gnu.c:385 -#, 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 computer " -"before doing anything with %s." -msgstr "" -"La tabella delle partizioni su %s (%s) non può essere riletta. Questo " -"significa che le modifiche effettuate non saranno note a Hurd. Riavviare il " -"computer prima di fare qualsiasi cosa con %s." - -#: libparted/arch/gnu.c:396 parted/parted.c:2318 -msgid "" -"You should reinstall your boot loader before rebooting. Read section 4 of " -"the Parted User documentation for more information." -msgstr "" -"Prima di riavviare è utile reinstallare il \"boot loader\". Per maggiori " -"informazioni, consultare la sezione 4 della documentazione di Parted." - -#: libparted/arch/gnu.c:788 +#: libparted/arch/gnu.c:748 #, c-format msgid "%s trying to sync %s to disk" msgstr "%s nel tentativo di sincronizzare %s sul disco" @@ -849,15 +798,15 @@ msgstr "metadati" msgid "free" msgstr "libero" -#: libparted/disk.c:2355 parted/ui.c:1258 parted/ui.c:1286 +#: libparted/disk.c:2355 parted/ui.c:1259 parted/ui.c:1287 msgid "extended" msgstr "estesa" -#: libparted/disk.c:2357 parted/ui.c:1262 parted/ui.c:1290 +#: libparted/disk.c:2357 parted/ui.c:1263 parted/ui.c:1291 msgid "logical" msgstr "logica" -#: libparted/disk.c:2359 parted/ui.c:1254 parted/ui.c:1282 +#: libparted/disk.c:2359 parted/ui.c:1255 parted/ui.c:1283 msgid "primary" msgstr "primaria" @@ -933,64 +882,73 @@ msgstr "irst" msgid "esp" msgstr "esp" -#: libparted/disk.c:2415 +#: libparted/disk.c:2411 +msgid "chromeos_kernel" +msgstr "" + +#: libparted/disk.c:2413 +#, fuzzy +msgid "bls_boot" +msgstr "pmbr_boot" + +#: libparted/disk.c:2419 #, c-format msgid "Unknown partition flag, %d." msgstr "Flag di partizione %d sconosciuto." -#: libparted/exception.c:78 +#: libparted/exception.c:79 msgid "Information" msgstr "Informazioni" -#: libparted/exception.c:79 +#: libparted/exception.c:80 msgid "Warning" msgstr "Avviso" -#: libparted/exception.c:80 +#: libparted/exception.c:81 msgid "Error" msgstr "Errore" -#: libparted/exception.c:81 +#: libparted/exception.c:82 msgid "Fatal" msgstr "Irrimediabile" -#: libparted/exception.c:82 +#: libparted/exception.c:83 msgid "Bug" msgstr "Bug" -#: libparted/exception.c:83 +#: libparted/exception.c:84 msgid "No Implementation" msgstr "Non implementato" -#: libparted/exception.c:87 +#: libparted/exception.c:88 msgid "Fix" msgstr "Ripara" -#: libparted/exception.c:88 +#: libparted/exception.c:89 msgid "Yes" msgstr "Sì" -#: libparted/exception.c:89 +#: libparted/exception.c:90 msgid "No" msgstr "No" -#: libparted/exception.c:90 +#: libparted/exception.c:91 msgid "OK" msgstr "OK" -#: libparted/exception.c:91 +#: libparted/exception.c:92 msgid "Retry" msgstr "Riprova" -#: libparted/exception.c:92 +#: libparted/exception.c:93 msgid "Ignore" msgstr "Ignora" -#: libparted/exception.c:93 +#: libparted/exception.c:94 msgid "Cancel" msgstr "Annulla" -#: libparted/exception.c:133 +#: libparted/exception.c:134 #, c-format msgid "" "A bug has been detected in GNU Parted. Refer to the web site of parted " @@ -1003,33 +961,33 @@ msgstr "" "comunicare nelle segnalazioni. Segnalare un bug a %s specificando almeno la " "versione (%s) e il seguente messaggio: " -#: libparted/labels/aix.c:91 +#: libparted/labels/aix.c:92 msgid "Support for reading AIX disk labels is is not implemented yet." msgstr "" "Il supporto per leggere etichette dei dischi AIX non è ancora stato " "implementato." -#: libparted/labels/aix.c:102 +#: libparted/labels/aix.c:103 msgid "Support for writing AIX disk labels is is not implemented yet." msgstr "" "Il supporto per scrivere etichette dei dischi AIX non è ancora stato " "implementato." -#: libparted/labels/aix.c:115 +#: libparted/labels/aix.c:116 msgid "" "Support for adding partitions to AIX disk labels is not implemented yet." msgstr "" "Il supporto per aggiungere partizioni alle etichette dei dischi AIX non è " "ancora stato implementato." -#: libparted/labels/aix.c:125 +#: libparted/labels/aix.c:126 msgid "" "Support for duplicating partitions in AIX disk labels is not implemented yet." msgstr "" "Il supporto per duplicare partizioni in etichette dei dischi AIX non è " "ancora stato implementato." -#: libparted/labels/aix.c:143 +#: libparted/labels/aix.c:144 msgid "" "Support for setting system type of partitions in AIX disk labels is not " "implemented yet." @@ -1037,7 +995,7 @@ msgstr "" "Il supporto per impostare il tipo di sistema delle partizioni in etichette " "dei dischi AIX non è ancora stato implementato." -#: libparted/labels/aix.c:153 +#: libparted/labels/aix.c:154 msgid "Support for setting flags in AIX disk labels is not implemented yet." msgstr "" "Il supporto per impostare i flag in etichette dei dischi AIX non è ancora " @@ -1128,11 +1086,11 @@ msgid "" "partitions, if XGM is the first one it counts for two)." msgstr "" -#: libparted/labels/atari.c:1657 libparted/labels/bsd.c:567 -#: libparted/labels/dasd.c:894 libparted/labels/dos.c:2276 -#: libparted/labels/dvh.c:770 libparted/labels/gpt.c:2050 -#: libparted/labels/loop.c:243 libparted/labels/mac.c:1423 -#: libparted/labels/pc98.c:701 libparted/labels/rdb.c:1054 +#: libparted/labels/atari.c:1657 libparted/labels/bsd.c:563 +#: libparted/labels/dasd.c:895 libparted/labels/dos.c:2283 +#: libparted/labels/dvh.c:770 libparted/labels/gpt.c:2140 +#: 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 "Impossibile soddisfare tutti i vincoli sulla partizione." @@ -1148,42 +1106,42 @@ msgstr "" msgid "Unable to allocate a partition number." msgstr "Impossibile allocare un numero di partizione." -#: libparted/labels/bsd.c:592 +#: libparted/labels/bsd.c:588 msgid "Unable to allocate a bsd disklabel slot." msgstr "Impossibile allocare uno spazio per un'etichetta bsd." -#: libparted/labels/dasd.c:625 +#: libparted/labels/dasd.c:626 msgid "The partition table of DASD-LDL device cannot be changed.\n" msgstr "" -#: libparted/labels/dasd.c:920 +#: libparted/labels/dasd.c:921 msgid "Unable to allocate a dasd disklabel slot" msgstr "Impossibile allocare uno spazio per un'etichetta dasd" -#: libparted/labels/dos.c:1003 +#: libparted/labels/dos.c:1006 #, 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:1031 +#: libparted/labels/dos.c:1034 #, c-format msgid "Invalid partition table - recursive partition on %s." msgstr "Tabella della partizioni non valida - partizione ricorsiva su %s." -#: libparted/labels/dos.c:1560 +#: libparted/labels/dos.c:1557 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:1572 +#: libparted/labels/dos.c:1569 #, 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:2258 +#: libparted/labels/dos.c:2265 msgid "Parted can't resize partitions managed by Windows Dynamic Disk." msgstr "Impossibile ridimensionare partizioni gestite da Windows Dynamic Disk." -#: libparted/labels/dos.c:2514 +#: libparted/labels/dos.c:2521 msgid "cannot create any more partitions" msgstr "Non è possibile creare ulteriori partizioni" @@ -1330,11 +1288,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:531 +#: libparted/labels/gpt.c:541 msgid "device is too small for GPT" msgstr "il device è troppo piccolo per GPT" -#: libparted/labels/gpt.c:733 +#: libparted/labels/gpt.c:743 #, c-format msgid "" "The format of the GPT partition table is version %x, which is newer than " @@ -1343,7 +1301,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:769 +#: libparted/labels/gpt.c:779 #, c-format msgid "" "Not all of the space available to %s appears to be used, you can fix the GPT " @@ -1354,7 +1312,7 @@ msgstr "" "affinché utilizzi tutto lo spazio (ulteriori %llu blocchi) o continuare con " "le impostazioni attuali?" -#: libparted/labels/gpt.c:1008 +#: libparted/labels/gpt.c:1024 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)?" @@ -1363,7 +1321,7 @@ msgstr "" "fine del disco. Correggere il problema spostando la copia alla fine (e " "rimuovendo quella vecchia)?" -#: libparted/labels/gpt.c:1026 +#: libparted/labels/gpt.c:1042 msgid "" "Both the primary and backup GPT tables are corrupt. Try making a fresh " "table, and using Parted's rescue feature to recover partitions." @@ -1372,7 +1330,7 @@ msgstr "" "a crearne una nuova e, tramite le funzionalità di ripristino del programma, " "recuperare le partizioni." -#: libparted/labels/gpt.c:1037 +#: libparted/labels/gpt.c:1053 msgid "" "The backup GPT table is corrupt, but the primary appears OK, so that will be " "used." @@ -1380,7 +1338,7 @@ msgstr "" "La tabella GPT di backup è danneggiata, ma quella principale sembra corretta " "e verrà utilizzata." -#: libparted/labels/gpt.c:1049 +#: libparted/labels/gpt.c:1065 msgid "" "The primary GPT table is corrupt, but the backup appears OK, so that will be " "used." @@ -1389,12 +1347,12 @@ msgstr "" "corretta e verrà utilizzata." # (ndt) aiuto!!! idee sul vero significato della frase? -#: libparted/labels/gpt.c:1073 +#: libparted/labels/gpt.c:1089 msgid "primary partition table array CRC mismatch" msgstr "" "CRC non corrispondente nella tabella delle partizioni primaria dell'array" -#: libparted/labels/gpt.c:1936 libparted/labels/gpt.c:1963 +#: libparted/labels/gpt.c:2026 libparted/labels/gpt.c:2053 msgid "failed to translate partition name" msgstr "traduzione nome della partizione non riuscita" @@ -1427,18 +1385,14 @@ msgid "The data region doesn't start at the start of the partition." msgstr "La regione dei dati non comincia all'inizio della partizione." #: libparted/labels/mac.c:572 -msgid "The boot region doesn't start at the start of the partition." -msgstr "La regione di avvio non comincia all'inizio della partizione." - -#: libparted/labels/mac.c:586 msgid "The partition's boot region doesn't occupy the entire partition." msgstr "La regione di avvio della partizione non occupa l'intera partizione." -#: libparted/labels/mac.c:597 +#: libparted/labels/mac.c:583 msgid "The partition's data region doesn't occupy the entire partition." msgstr "La regione dati della partizione non occupa l'intera partizione." -#: libparted/labels/mac.c:649 +#: libparted/labels/mac.c:635 #, c-format msgid "" "Weird block size on device descriptor: %d bytes is not divisible by 512." @@ -1446,7 +1400,7 @@ msgstr "" "Dimensione del blocco nel descrittore del device inusuale: %d byte non è " "divisibile per 512." -#: libparted/labels/mac.c:662 +#: libparted/labels/mac.c:648 #, c-format msgid "" "The driver descriptor says the physical block size is %d bytes, but Linux " @@ -1455,11 +1409,11 @@ msgstr "" "Il descrittore del driver indica che la dimensione del blocco fisico è di %d " "byte, ma Linux indica %d byte." -#: libparted/labels/mac.c:715 +#: libparted/labels/mac.c:701 msgid "No valid partition map found." msgstr "Non è stata trovata alcuna mappa delle partizioni valida." -#: libparted/labels/mac.c:789 +#: libparted/labels/mac.c:775 #, c-format msgid "" "Conflicting partition map entry sizes! Entry 1 says it is %d, but entry %d " @@ -1468,11 +1422,11 @@ msgstr "" "Due elementi della mappa delle partizioni hanno dimensioni diverse. Il primo " "elemento indica di essere %d, mentre l'elemento %d indica %d." -#: libparted/labels/mac.c:820 +#: libparted/labels/mac.c:806 msgid "Weird! There are 2 partitions map entries!" msgstr "Sono presenti due mappe delle partizioni. Situazione inusuale." -#: libparted/labels/mac.c:1359 +#: libparted/labels/mac.c:1345 msgid "" "Changing the name of a root or swap partition will prevent Linux from " "recognising it as such." @@ -1480,18 +1434,18 @@ msgstr "" "Cambiare il nome di una partizione di root o swap non permetterà a Linux di " "riconoscerla come tale." -#: libparted/labels/mac.c:1458 +#: libparted/labels/mac.c:1444 msgid "Can't add another partition -- the partition map is too small!" msgstr "" "Impossibile aggiungere un'altra partizione: la mappa delle partizioni è " "troppo piccola." -#: libparted/labels/pc98.c:284 +#: libparted/labels/pc98.c:285 #, c-format msgid "Invalid partition table on %s." msgstr "Tabella delle partizioni non valida su %s." -#: libparted/labels/pc98.c:337 libparted/labels/pc98.c:415 +#: libparted/labels/pc98.c:338 libparted/labels/pc98.c:416 #, c-format msgid "" "Partition %d isn't aligned to cylinder boundaries. This is still " @@ -1500,7 +1454,7 @@ msgstr "" "La partizione %d non è allineata con l'inizio di un cilindro. Funzionalità " "non ancora supportata." -#: libparted/labels/pc98.c:733 +#: libparted/labels/pc98.c:729 msgid "Can't add another partition." msgstr "Non è possibile aggiungere un'altra partizione." @@ -1675,39 +1629,39 @@ msgstr "Impossibile scrivere VTOC FMT7 DSCB." msgid "Could not write VTOC FMT9 DSCB." msgstr "Impossibile scrivere VTOC FMT9 DSCB." -#: libparted/libparted.c:242 +#: libparted/libparted.c:247 msgid "Out of memory." msgstr "Memoria non sufficiente." -#: libparted/unit.c:139 +#: libparted/unit.c:140 msgid "Cannot get unit size for special unit 'COMPACT'." msgstr "Impossibile ottenere la dimensione dell'unità speciale \"COMPACT\"" -#: libparted/unit.c:385 +#: libparted/unit.c:386 #, c-format msgid "\"%s\" has invalid syntax for locations." msgstr "\"%s\" utilizza una sintassi errata per le posizioni." -#: libparted/unit.c:393 +#: libparted/unit.c:394 #, c-format msgid "The maximum head value is %d." msgstr "Il massimo valore per la testina è %d." -#: libparted/unit.c:400 +#: libparted/unit.c:401 #, c-format msgid "The maximum sector value is %d." msgstr "Il massimo valore per il settore è %d." -#: libparted/unit.c:412 libparted/unit.c:564 +#: libparted/unit.c:413 libparted/unit.c:565 #, c-format msgid "The location %s is outside of the device %s." msgstr "La posizione %s è esterna al device %s." -#: libparted/unit.c:526 +#: libparted/unit.c:527 msgid "Invalid number." msgstr "Numero non valido." -#: libparted/unit.c:532 +#: libparted/unit.c:533 msgid "Use a smaller unit instead of a value < 1" msgstr "Usare un'unità più piccola al posto di un valore < 1" @@ -1717,18 +1671,18 @@ msgstr "Usare un'unità più piccola al posto di un valore < 1" msgid "%s : Failed to allocate partition block\n" msgstr "%s: allocazione blocco di partizione non riuscita\n" -#: libparted/fs/amiga/affs.c:79 libparted/fs/amiga/apfs.c:71 +#: 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: allocazione del blocco non riuscita\n" -#: libparted/fs/amiga/affs.c:84 libparted/fs/amiga/apfs.c:76 +#: 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: impossibile leggere il blocco di avvio %llu\n" -#: libparted/fs/amiga/affs.c:98 libparted/fs/amiga/apfs.c:87 +#: 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" @@ -1755,22 +1709,22 @@ msgid "%s : Couldn't write block %d\n" msgstr "%s: impossibile scrivere il blocco %d\n" # (ndt) disk_specific ??? -#: libparted/fs/amiga/amiga.c:278 +#: libparted/fs/amiga/amiga.c:279 #, c-format msgid "%s : Failed to allocate disk_specific rdb block\n" msgstr "%s: allocazione del blocco rdb disk_specific non riuscita\n" -#: libparted/fs/amiga/amiga.c:289 +#: libparted/fs/amiga/amiga.c:290 #, c-format msgid "%s : Didn't find rdb block, should never happen\n" msgstr "%s: blocco rdb non trovato, non dovrebbe accadere\n" -#: libparted/fs/amiga/amiga.c:318 +#: libparted/fs/amiga/amiga.c:319 #, c-format msgid "%s : Failed to read partition block %llu\n" msgstr "%s: lettura del blocco di partizione %llu non riuscita\n" -#: libparted/fs/fat/fat.c:148 libparted/fs/r/fat/fat.c:811 +#: libparted/fs/fat/fat.c:149 msgid "" "GNU Parted was miscompiled: the FAT boot sector should be 512 bytes. FAT " "support will be disabled." @@ -1875,7 +1829,7 @@ msgstr "" "impostare la geometria CHS del file system affinché corrisponda alla " "geometria CHS della tabella delle partizioni." -#: libparted/fs/r/fat/bootsector.c:399 +#: libparted/fs/r/fat/bootsector.c:398 #, c-format msgid "" "The information sector has the wrong signature (%x). Select cancel for now, " @@ -1902,14 +1856,14 @@ msgstr "" "Lo spostamento del primo blocco del cluster è %d e non è un multiplo della " "dimensione del cluster %d." -#: libparted/fs/r/fat/count.c:144 +#: libparted/fs/r/fat/count.c:84 #, c-format msgid "Bad directory entry for %s: first cluster is the end of file marker." msgstr "" "Elemento di directory errato per %s: il primo cluster è la fine del " "marcatore di file." -#: libparted/fs/r/fat/count.c:157 +#: libparted/fs/r/fat/count.c:97 #, c-format msgid "" "Bad FAT: unterminated chain for %s. You should run dosfsck or scandisk." @@ -1917,7 +1871,7 @@ msgstr "" "FAT errata: catena per %s non terminata. Eseguire \"dosfsck\" oppure " "\"scandisk\"." -#: libparted/fs/r/fat/count.c:166 +#: libparted/fs/r/fat/count.c:106 #, c-format msgid "" "Bad FAT: cluster %d outside file system in chain for %s. You should run " @@ -1926,7 +1880,7 @@ msgstr "" "FAT errata: cluster %d usato nella catena %s fuori dal file system. Eseguire " "\"dosfsck\" oppure \"scandisk\"." -#: libparted/fs/r/fat/count.c:176 +#: libparted/fs/r/fat/count.c:116 #, c-format msgid "" "Bad FAT: cluster %d is cross-linked for %s. You should run dosfsck or " @@ -1935,26 +1889,17 @@ msgstr "" "FAT errata: cluster %d con collegamenti incrociati per %s. Eseguire \"dosfsck" "\" oppure \"scandisk\"." -#: libparted/fs/r/fat/count.c:195 +#: libparted/fs/r/fat/count.c:135 #, c-format msgid "%s is %dk, but it has %d clusters (%dk)." msgstr "%s è %dk, ma contiene %d cluster (%dk)." -#: libparted/fs/r/fat/count.c:258 -#, c-format -msgid "" -"The file %s is marked as a system file. This means moving it could cause " -"some programs to stop working." -msgstr "" -"Il file %s è indicato come file di sistema; spostandolo, alcuni programmi " -"potrebbero bloccarsi." - -#: libparted/fs/r/fat/fat.c:243 +#: libparted/fs/r/fat/fat.c:244 #, c-format msgid "Partition too big/small for a %s file system." msgstr "Partizione troppo grande o troppo piccola per il file system %s." -#: libparted/fs/r/fat/fat.c:409 +#: 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." @@ -1962,11 +1907,11 @@ msgstr "" "Le FAT non coincidono. Se non se ne conosce il significato, selezionare " "\"Annulla\", eseguire \"scandisk\", quindi ritornare a questo punto." -#: libparted/fs/r/fat/fat.c:449 +#: libparted/fs/r/fat/fat.c:450 msgid "There are no possible configurations for this FAT type." msgstr "Non ci sono configurazioni possibili per questo tipo di FAT." -#: libparted/fs/r/fat/fat.c:461 +#: libparted/fs/r/fat/fat.c:462 #, c-format msgid "" "File system doesn't have expected sizes for Windows to like it. Cluster " @@ -1977,13 +1922,13 @@ msgstr "" "del cluster è %dk (atteso %dk); il numero di cluster è %d (atteso %d); la " "dimensione delle FAT è %d settori (atteso %d)." -#: libparted/fs/r/fat/fat.c:484 +#: libparted/fs/r/fat/fat.c:485 #, c-format msgid "" "File system is reporting the free space as %d clusters, not %d clusters." msgstr "Il file system riporta uno spazio libero di %d cluster anziché %d." -#: libparted/fs/r/fat/resize.c:158 +#: 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." @@ -1991,15 +1936,15 @@ msgstr "" "Non c'è sufficiente spazio nella directory principale per tutti i file. " "Annullare oppure ignorare per perdere i file." -#: libparted/fs/r/fat/resize.c:302 +#: libparted/fs/r/fat/resize.c:303 msgid "Error writing to the root directory." msgstr "Errore nello scrivere nella directory principale." -#: libparted/fs/r/fat/resize.c:495 +#: libparted/fs/r/fat/resize.c:479 msgid "If you leave your file system as FAT16, then you will have no problems." msgstr "Lasciare il file system come FAT16 non causerà alcun problema." -#: libparted/fs/r/fat/resize.c:498 +#: 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 " @@ -2009,13 +1954,13 @@ msgstr "" "reinstallare il boot loader di Windows. Per continuare, consultare il " "manuale di Parted (o della propria distribuzione)." -#: libparted/fs/r/fat/resize.c:506 +#: 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 "Lasciare il file system come FAT32 non introdurrà alcun problema." -#: libparted/fs/r/fat/resize.c:510 +#: 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 " @@ -2028,42 +1973,42 @@ msgstr "" "(o della propria distribuzione). Inoltre, la conversione a FAT32 renderà il " "file system non utilizzabile con MS-DOS, MS Windows 95a e MS Windows NT." -#: libparted/fs/r/fat/resize.c:524 +#: libparted/fs/r/fat/resize.c:508 #, c-format msgid "%s %s %s" msgstr "%s %s %s" -#: libparted/fs/r/fat/resize.c:525 +#: libparted/fs/r/fat/resize.c:509 msgid "Would you like to use FAT32?" msgstr "Usare FAT32?" -#: libparted/fs/r/fat/resize.c:556 libparted/fs/r/fat/resize.c:572 +#: 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:557 +#: libparted/fs/r/fat/resize.c:541 msgid "" "The file system can only be resized to this size by converting to FAT16." msgstr "" "Il file system può solo essere portato a questa dimensione se si converte a " "FAT16." -#: libparted/fs/r/fat/resize.c:573 +#: libparted/fs/r/fat/resize.c:557 msgid "" "The file system can only be resized to this size by converting to FAT32." msgstr "" "Il file system può solo essere portato a questa dimensione se si converte a " "FAT32." -#: libparted/fs/r/fat/resize.c:586 +#: libparted/fs/r/fat/resize.c:570 msgid "" "GNU Parted cannot resize this partition to this size. We're working on it!" msgstr "" "Impossibile ridimensionare questa partizione a questa dimensione. Funzione " "in fase di sviluppo." -#: libparted/fs/r/fat/table.c:136 +#: 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 " @@ -2072,41 +2017,41 @@ msgstr "" "FAT %d, il supporto %x non coincide con quello specificato nel settore di " "avvio di %x. Eseguire \"scandisk\"." -#: libparted/fs/r/fat/table.c:268 +#: libparted/fs/r/fat/table.c:269 #, c-format msgid "fat_table_set: cluster %ld outside file system" msgstr "fat_table_set: cluster %ld al di fuori del file system" -#: libparted/fs/r/fat/table.c:300 +#: libparted/fs/r/fat/table.c:301 #, c-format msgid "fat_table_get: cluster %ld outside file system" msgstr "fat_table_get: cluster %ld al di fuori del file system" -#: libparted/fs/r/fat/table.c:342 +#: libparted/fs/r/fat/table.c:343 msgid "fat_table_alloc_cluster: no free clusters" msgstr "fat_table_alloc_cluster: cluster esauriti" -#: libparted/fs/r/filesys.c:151 +#: libparted/fs/r/filesys.c:152 msgid "Could not detect file system." msgstr "Impossibile rilevare il file system." -#: libparted/fs/r/filesys.c:158 libparted/fs/r/filesys.c:285 +#: libparted/fs/r/filesys.c:159 libparted/fs/r/filesys.c:284 #, c-format msgid "resizing %s file systems is not supported" msgstr "La ridimensione del file system %s non è supportata" -#: libparted/fs/r/filesys.c:170 +#: libparted/fs/r/filesys.c:171 msgid "The file system is bigger than its volume!" msgstr "Il file system è più ampio del suo volume." -#: libparted/fs/r/hfs/advfs.c:121 libparted/fs/r/hfs/advfs_plus.c:121 -#: libparted/fs/r/hfs/reloc.c:413 libparted/fs/r/hfs/reloc.c:507 -#: libparted/fs/r/hfs/reloc_plus.c:538 libparted/fs/r/hfs/reloc_plus.c:656 -#: libparted/fs/r/hfs/reloc_plus.c:769 +#: 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 "Il file system contiene errori." -#: libparted/fs/r/hfs/advfs_plus.c:285 +#: libparted/fs/r/hfs/advfs_plus.c:287 msgid "Bad blocks could not be read." msgstr "I blocchi danneggiati non possono essere letti." @@ -2169,63 +2114,63 @@ msgstr "Impossibile trovare il settore %lli del file HFS+ con CNID %X." msgid "Trying to write HFS+ file with CNID %X behind EOF." msgstr "Tentativo di scrivere file HFS+ con CNID %X oltre EOF." -#: libparted/fs/r/hfs/hfs.c:232 +#: libparted/fs/r/hfs/hfs.c:212 msgid "Sorry, HFS cannot be resized that way yet." msgstr "HFS non può ancora essere ridimensionato in quel modo." -#: libparted/fs/r/hfs/hfs.c:250 libparted/fs/r/hfs/hfs.c:629 +#: libparted/fs/r/hfs/hfs.c:230 libparted/fs/r/hfs/hfs.c:573 msgid "shrinking" msgstr "riduzione" -#: libparted/fs/r/hfs/hfs.c:262 libparted/fs/r/hfs/hfs.c:641 +#: libparted/fs/r/hfs/hfs.c:242 libparted/fs/r/hfs/hfs.c:585 msgid "Data relocation has failed." msgstr "Riposizionamento dei dati non riuscito." -#: libparted/fs/r/hfs/hfs.c:281 +#: libparted/fs/r/hfs/hfs.c:261 msgid "Data relocation left some data in the end of the volume." msgstr "" "Il riposizionamento dei dati ne ha lasciati alcuni alla fine del volume." -#: libparted/fs/r/hfs/hfs.c:320 +#: libparted/fs/r/hfs/hfs.c:300 msgid "writing HFS Master Directory Block" msgstr "scrittura del \"Master Directory Block\" HFS" -#: libparted/fs/r/hfs/hfs.c:468 +#: libparted/fs/r/hfs/hfs.c:412 msgid "No valid HFS[+X] signature has been found while opening." msgstr "All'apertura non è stata trovata alcuna firma HFS[+X] valida." -#: libparted/fs/r/hfs/hfs.c:478 +#: libparted/fs/r/hfs/hfs.c:422 #, c-format msgid "Version %d of HFS+ isn't supported." msgstr "La versione %d di HFS+ non è supportata." -#: libparted/fs/r/hfs/hfs.c:489 +#: libparted/fs/r/hfs/hfs.c:433 #, c-format msgid "Version %d of HFSX isn't supported." msgstr "La versione %d di HFSX non è supportata." -#: libparted/fs/r/hfs/hfs.c:672 +#: libparted/fs/r/hfs/hfs.c:616 msgid "Data relocation left some data at the end of the volume." msgstr "" "Il riposizionamento dei dati ne ha lasciati alcuni alla fine del volume." -#: libparted/fs/r/hfs/hfs.c:720 +#: libparted/fs/r/hfs/hfs.c:664 msgid "Error while writing the allocation file." msgstr "Errore nello scrivere l'\"Allocation File\"." -#: libparted/fs/r/hfs/hfs.c:735 +#: libparted/fs/r/hfs/hfs.c:679 msgid "Error while writing the compatibility part of the allocation file." msgstr "Errore nello scrivere la parte compatibile dell'\"Allocation File\"." -#: libparted/fs/r/hfs/hfs.c:750 +#: libparted/fs/r/hfs/hfs.c:694 msgid "writing HFS+ Volume Header" msgstr "scrittura del \"Volume Header\" HFS+" -#: libparted/fs/r/hfs/hfs.c:850 +#: libparted/fs/r/hfs/hfs.c:794 msgid "An error occurred while looking for the mandatory bad blocks file." msgstr "Errore nella ricerca del file obbligatorio per i blocchi danneggiati." -#: libparted/fs/r/hfs/hfs.c:904 +#: 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." @@ -2233,28 +2178,28 @@ msgstr "" "Sembra esserci un errore nel wrapper HFS: il file dei blocchi danneggiati " "non contiene il volume HFS+ integrato." -#: libparted/fs/r/hfs/hfs.c:940 +#: libparted/fs/r/hfs/hfs.c:883 msgid "Sorry, HFS+ cannot be resized that way yet." msgstr "HFS+ non può ancora essere ridimensionato in quel modo." -#: libparted/fs/r/hfs/hfs.c:975 +#: libparted/fs/r/hfs/hfs.c:918 msgid "shrinking embedded HFS+ volume" msgstr "riduzione del volume HFS+ integrato" -#: libparted/fs/r/hfs/hfs.c:992 +#: libparted/fs/r/hfs/hfs.c:935 msgid "Resizing the HFS+ volume has failed." msgstr "Ridimensionamento del volume HFS+ non riuscito." -#: libparted/fs/r/hfs/hfs.c:999 +#: libparted/fs/r/hfs/hfs.c:942 msgid "shrinking HFS wrapper" msgstr "riduzione del wrapper HFS" -#: libparted/fs/r/hfs/hfs.c:1008 +#: libparted/fs/r/hfs/hfs.c:951 msgid "Updating the HFS wrapper has failed." msgstr "Aggiornamento del wrapper HFS non riuscito." # (ndt) mah... -#: libparted/fs/r/hfs/hfs.c:1110 libparted/fs/r/hfs/hfs.c:1195 +#: 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 " @@ -2338,7 +2283,7 @@ msgstr "" msgid "An extent has not been relocated." msgstr "Un extent non è stato riposizionato." -#: libparted/fs/r/hfs/reloc.c:250 libparted/fs/r/hfs/reloc_plus.c:307 +#: 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!" @@ -2347,18 +2292,18 @@ msgstr "" "il file system." # (ndt) preferisco lasciarli in inglese, sono delle 'parti' della struttura di HFS -#: libparted/fs/r/hfs/reloc.c:380 +#: libparted/fs/r/hfs/reloc.c:382 msgid "This HFS volume has no catalog file. This is very unusual!" msgstr "" "Questo volume HFS non possiede un \"Catalog File\". Situazione inusuale." -#: libparted/fs/r/hfs/reloc.c:474 +#: libparted/fs/r/hfs/reloc.c:479 msgid "This HFS volume has no extents overflow file. This is quite unusual!" msgstr "" "Questo volume HFS non possiede un \"Extent Overflow File\". Situazione " "abbastanza inusuale." -#: libparted/fs/r/hfs/reloc.c:516 libparted/fs/r/hfs/reloc_plus.c:666 +#: 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." @@ -2366,53 +2311,53 @@ msgstr "" "L'\"Extent Overflow File\" non deve contenere i propri extent. Controllare " "il file system." -#: libparted/fs/r/hfs/reloc.c:573 libparted/fs/r/hfs/reloc_plus.c:844 +#: 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 "Impossibile caricare il file system in memoria." -#: libparted/fs/r/hfs/reloc.c:634 libparted/fs/r/hfs/reloc_plus.c:905 +#: libparted/fs/r/hfs/reloc.c:640 libparted/fs/r/hfs/reloc_plus.c:910 msgid "Bad blocks list could not be loaded." msgstr "Impossibile caricare l'elenco dei blocchi danneggiati." -#: libparted/fs/r/hfs/reloc.c:648 libparted/fs/r/hfs/reloc_plus.c:921 +#: libparted/fs/r/hfs/reloc.c:654 libparted/fs/r/hfs/reloc_plus.c:926 msgid "An error occurred during extent relocation." msgstr "Si è verificato un errore nel riallocare l'extent." -#: libparted/fs/r/hfs/reloc_plus.c:494 +#: libparted/fs/r/hfs/reloc_plus.c:495 msgid "This HFS+ volume has no catalog file. This is very unusual!" msgstr "Questo volume HFS non ha un \"Catalog File\". Situazione inusuale." -#: libparted/fs/r/hfs/reloc_plus.c:617 +#: libparted/fs/r/hfs/reloc_plus.c:620 msgid "This HFS+ volume has no extents overflow file. This is quite unusual!" msgstr "" "Questo volume HFS+ non possiede un \"Extent Overflow File\". Situazione " "abbastanza inusuale." -#: parted/parted.c:125 +#: parted/parted.c:126 msgid "displays this help message" msgstr "Mostra questo messaggio di aiuto" -#: parted/parted.c:126 +#: parted/parted.c:127 msgid "lists partition layout on all block devices" msgstr "Elenca la disposizione delle partizioni su tutti i device a blocchi" -#: parted/parted.c:127 +#: parted/parted.c:128 msgid "displays machine parseable output" msgstr "Mostra un output analizzabile dal computer" -#: parted/parted.c:128 +#: parted/parted.c:129 msgid "never prompts for user intervention" msgstr "Non chiede mai l'intervento dell'utente" -#: parted/parted.c:129 +#: parted/parted.c:130 msgid "displays the version" msgstr "Stampa la versione" -#: parted/parted.c:130 +#: parted/parted.c:131 msgid "alignment for new partitions" msgstr "allineamento per le nuove partizioni" -#: parted/parted.c:142 +#: parted/parted.c:143 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" @@ -2420,32 +2365,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:145 +#: parted/parted.c:146 msgid "LABEL-TYPE is one of: " msgstr "TIPO_ETIC è uno di: " -#: parted/parted.c:146 parted/parted.c:147 +#: parted/parted.c:147 parted/parted.c:148 msgid "FLAG is one of: " msgstr "FLAG è uno di: " -#: parted/parted.c:148 +#: parted/parted.c:149 msgid "UNIT is one of: " msgstr "UNITÀ è uno di: " # (ndt) da tradurre? -#: parted/parted.c:149 +#: parted/parted.c:150 msgid "desired alignment: minimum or optimal" msgstr "allineamento richiesto: minimo od ottimale" -#: parted/parted.c:150 +#: parted/parted.c:151 msgid "PART-TYPE is one of: primary, logical, extended\n" msgstr "TIPO_PART è uno di: primary, logical, extended\n" -#: parted/parted.c:152 +#: parted/parted.c:153 msgid "FS-TYPE is one of: " msgstr "TIPO_FS è uno di: " -#: parted/parted.c:153 +#: parted/parted.c:154 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 " @@ -2455,7 +2400,7 @@ msgstr "" "sono relativi alla fine del disco. Per esempio, -1s indica esattamente " "l'ultimo settore.\n" -#: parted/parted.c:156 +#: parted/parted.c:157 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" @@ -2464,19 +2409,19 @@ msgstr "" "relativi alla fine del disco. Per esempio, -1s indica esattamente l'ultimo " "settore.\n" -#: parted/parted.c:159 +#: parted/parted.c:160 msgid "STATE is one of: on, off\n" msgstr "STATO è uno di: on, off\n" -#: parted/parted.c:160 +#: parted/parted.c:161 msgid "DEVICE is usually /dev/hda or /dev/sda\n" msgstr "DEVICE è normalmente /dev/hda o /dev/sda\n" -#: parted/parted.c:161 +#: parted/parted.c:162 msgid "NAME is any word you want\n" msgstr "NOME è una qualsiasi parola\n" -#: parted/parted.c:164 +#: parted/parted.c:165 msgid "" "Copyright (C) 1998 - 2006 Free Software Foundation, Inc.\n" "This program is free software, covered by the GNU General Public License.\n" @@ -2497,23 +2442,23 @@ msgstr "" "consultare la GNU General Public License.\n" "\n" -#: parted/parted.c:212 +#: parted/parted.c:213 #, c-format msgid "%0.f%%\t(time left %.2d:%.2d)" msgstr "%0.f%%\t(tempo rimasto %.2d.%.2d)" -#: parted/parted.c:231 +#: parted/parted.c:232 #, 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:252 +#: parted/parted.c:253 #, c-format msgid "Partition(s) on %s are being used." msgstr "Le partizioni su %s sono in uso." -#: parted/parted.c:264 +#: parted/parted.c:265 #, c-format msgid "" "The existing disk label on %s will be destroyed and all data on this disk " @@ -2522,31 +2467,31 @@ msgstr "" "L'etichetta del disco su %s verrà eliminata e tutti i dati su questo disco " "saranno persi. Continuare?" -#: parted/parted.c:525 +#: parted/parted.c:526 msgid "New disk label type?" msgstr "Tipo dell'etichetta del nuovo disco?" -#: parted/parted.c:662 +#: parted/parted.c:663 msgid "Partition type?" msgstr "Tipo di partizione?" -#: parted/parted.c:680 parted/parted.c:884 +#: parted/parted.c:681 parted/parted.c:885 msgid "Partition name?" msgstr "Nome della partizione?" -#: parted/parted.c:690 +#: parted/parted.c:691 msgid "File system type?" msgstr "Tipo di file system?" -#: parted/parted.c:695 parted/parted.c:1498 +#: parted/parted.c:696 parted/parted.c:1499 msgid "Start?" msgstr "Inizio?" -#: parted/parted.c:698 parted/parted.c:1500 parted/parted.c:1569 +#: parted/parted.c:699 parted/parted.c:1501 parted/parted.c:1585 msgid "End?" msgstr "Fine?" -#: parted/parted.c:766 +#: parted/parted.c:767 #, c-format msgid "" "You requested a partition from %s to %s (sectors %llu..%llu).\n" @@ -2555,7 +2500,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:775 +#: parted/parted.c:776 msgid "" "\n" "Is this still acceptable to you?" @@ -2563,7 +2508,7 @@ msgstr "" "\n" "È accettabile?" -#: parted/parted.c:798 +#: parted/parted.c:799 #, fuzzy, c-format msgid "" "The resulting partition is not properly aligned for best performance: %s" @@ -2571,89 +2516,89 @@ msgstr "" "La partizione risultante non è allineata correttamente per garantire " "prestazioni ottimali." -#: parted/parted.c:800 parted/parted.c:1723 +#: parted/parted.c:801 parted/parted.c:1739 msgid "unknown (malloc failed)" msgstr "" -#: parted/parted.c:876 +#: parted/parted.c:877 #, 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:881 parted/parted.c:1561 parted/parted.c:1612 -#: parted/parted.c:1706 parted/parted.c:1781 +#: parted/parted.c:882 parted/parted.c:1564 parted/parted.c:1628 +#: parted/parted.c:1722 parted/parted.c:1797 msgid "Partition number?" msgstr "Partizione numero?" -#: parted/parted.c:975 +#: parted/parted.c:976 #, 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:1017 +#: parted/parted.c:1018 #, c-format msgid "Model: %s (%s)\n" msgstr "Modello: %s (%s)\n" -#: parted/parted.c:1019 +#: parted/parted.c:1020 #, c-format msgid "Disk %s: %s\n" msgstr "Disco %s: %s\n" -#: parted/parted.c:1020 +#: parted/parted.c:1021 #, c-format msgid "Sector size (logical/physical): %lldB/%lldB\n" msgstr "Dimensione del settore (logica/fisica): %lldB/%lldB\n" -#: parted/parted.c:1032 +#: parted/parted.c:1033 #, c-format msgid "Partition Table: %s\n" msgstr "Tabella delle partizioni: %s\n" -#: parted/parted.c:1033 +#: parted/parted.c:1034 #, c-format msgid "Disk Flags: %s\n" msgstr "Flag del disco: %s\n" -#: parted/parted.c:1153 parted/parted.c:1156 +#: parted/parted.c:1154 parted/parted.c:1157 msgid "Number" msgstr "Numero" -#: parted/parted.c:1153 parted/parted.c:1156 +#: parted/parted.c:1154 parted/parted.c:1157 msgid "Start" msgstr "Inizio" -#: parted/parted.c:1154 parted/parted.c:1157 +#: parted/parted.c:1155 parted/parted.c:1158 msgid "End" msgstr "Fine" -#: parted/parted.c:1157 +#: parted/parted.c:1158 msgid "Size" msgstr "Dimensione" -#: parted/parted.c:1161 +#: parted/parted.c:1162 msgid "Type" msgstr "Tipo" -#: parted/parted.c:1163 +#: parted/parted.c:1164 msgid "File system" msgstr "File system" -#: parted/parted.c:1166 +#: parted/parted.c:1167 msgid "Name" msgstr "Nome" -#: parted/parted.c:1168 +#: parted/parted.c:1169 msgid "Flags" msgstr "Flag" -#: parted/parted.c:1225 +#: parted/parted.c:1226 msgid "Free Space" msgstr "Spazio libero" -#: parted/parted.c:1385 +#: parted/parted.c:1386 #, c-format msgid "" "A %s %s partition was found at %s -> %s. Do you want to add it to the " @@ -2662,57 +2607,57 @@ msgstr "" "È stata trovata una partizione %s %s su %s -> %s. Aggiungerla alla tabella " "delle partizioni?" -#: parted/parted.c:1428 +#: parted/parted.c:1429 msgid "searching for file systems" msgstr "ricerca file system" -#: parted/parted.c:1535 +#: parted/parted.c:1536 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:1583 +#: parted/parted.c:1599 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:1636 +#: parted/parted.c:1652 msgid "New device?" msgstr "Nuovo device?" -#: parted/parted.c:1704 +#: parted/parted.c:1720 msgid "alignment type(min/opt)" msgstr "tipo di allineamento (min/ott)" # (ndt) sembra che quel numero sia il numero della partizione -#: parted/parted.c:1719 +#: parted/parted.c:1735 #, c-format msgid "%d aligned\n" msgstr "%d allineata\n" -#: parted/parted.c:1721 +#: parted/parted.c:1737 #, fuzzy, c-format msgid "%d not aligned: %s\n" msgstr "%d non allineata\n" -#: parted/parted.c:1746 parted/parted.c:1783 +#: parted/parted.c:1762 parted/parted.c:1799 msgid "Flag to Invert?" msgstr "Flag da invertire?" -#: parted/parted.c:1751 parted/parted.c:1788 +#: parted/parted.c:1767 parted/parted.c:1804 msgid "New state?" msgstr "Nuovo stato?" -#: parted/parted.c:1834 +#: parted/parted.c:1850 msgid "Unit?" msgstr "Unità?" -#: parted/parted.c:1969 +#: parted/parted.c:1985 msgid "align-check" msgstr "align-check" -#: parted/parted.c:1972 +#: parted/parted.c:1988 #, fuzzy msgid "" "align-check TYPE N check partition N for TYPE(min|opt) " @@ -2721,11 +2666,11 @@ msgstr "" "align-check TIPO N Controlla la partizione N per " "l'allineamento TIPO(min|ott)" -#: parted/parted.c:1980 +#: parted/parted.c:1996 msgid "help" msgstr "help" -#: parted/parted.c:1983 +#: parted/parted.c:1999 msgid "" "help [COMMAND] print general help, or help on " "COMMAND" @@ -2733,15 +2678,15 @@ msgstr "" "help [COMANDO] Mostra l'aiuto generale o sul " "COMANDO" -#: parted/parted.c:1989 +#: parted/parted.c:2005 msgid "mklabel" msgstr "mklabel" -#: parted/parted.c:1989 +#: parted/parted.c:2005 msgid "mktable" msgstr "mktable" -#: parted/parted.c:1992 +#: parted/parted.c:2008 msgid "" "mklabel,mktable LABEL-TYPE create a new disklabel (partition " "table)" @@ -2749,15 +2694,15 @@ msgstr "" "mklabel,mktable TIPO_ETIC Crea una nuova etichetta del disco " "(tabella delle partizioni)" -#: parted/parted.c:1998 +#: parted/parted.c:2014 msgid "mkpart" msgstr "mkpart" -#: parted/parted.c:2001 +#: parted/parted.c:2017 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:2007 +#: parted/parted.c:2023 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" @@ -2765,21 +2710,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:2012 +#: parted/parted.c:2028 msgid "name" msgstr "name" -#: parted/parted.c:2015 +#: parted/parted.c:2031 msgid "name NUMBER NAME name partition NUMBER as NAME" msgstr "" "name NUMERO NOME Chiama la partizione NUMERO come " "NOME" -#: parted/parted.c:2020 +#: parted/parted.c:2036 msgid "print" msgstr "print" -#: parted/parted.c:2023 +#: parted/parted.c:2039 msgid "" "print [devices|free|list,all|NUMBER] display the partition table, " "available devices, free space, all found partitions, or a particular " @@ -2789,7 +2734,7 @@ msgstr "" "partizioni, i device disponibili, lo spazio libero, tutte le partizioni " "trovate o una particolare partizione" -#: parted/parted.c:2028 +#: parted/parted.c:2044 msgid "" "Without arguments, 'print' displays the entire partition table. However with " "the following arguments it performs various other actions.\n" @@ -2797,11 +2742,11 @@ msgstr "" "Senza argomenti, \"print\" visualizza l'intera tabella delle partizioni. Con " "i seguenti argomenti esegue diverse altre azioni.\n" -#: parted/parted.c:2030 +#: parted/parted.c:2046 msgid " devices : display all active block devices\n" msgstr " devices : mostra tutti i device a blocchi attivi\n" -#: parted/parted.c:2031 +#: parted/parted.c:2047 msgid "" " free : display information about free unpartitioned space on the " "current block device\n" @@ -2809,14 +2754,14 @@ msgstr "" " free : visualizza informazioni riguardo lo spazio libero non " "partizionato sul device a blocchi corrente\n" -#: parted/parted.c:2033 +#: parted/parted.c:2049 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:2034 +#: parted/parted.c:2050 msgid "" " NUMBER : display more detailed information about this particular " "partition\n" @@ -2824,19 +2769,19 @@ msgstr "" " NUMERO : visualizza informazioni dettagliate riguardo questa " "particolare partizione\n" -#: parted/parted.c:2039 +#: parted/parted.c:2055 msgid "quit" msgstr "quit" -#: parted/parted.c:2042 +#: parted/parted.c:2058 msgid "quit exit program" msgstr "quit Esce dal programma" -#: parted/parted.c:2047 +#: parted/parted.c:2063 msgid "rescue" msgstr "rescue" -#: parted/parted.c:2050 +#: parted/parted.c:2066 msgid "" "rescue START END rescue a lost partition near START " "and END" @@ -2844,56 +2789,56 @@ msgstr "" "rescue INIZIO FINE Ripristina una partizione persa " "vicino a INIZIO e FINE" -#: parted/parted.c:2056 +#: parted/parted.c:2072 msgid "resize" msgstr "resize" -#: parted/parted.c:2059 +#: parted/parted.c:2075 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:2062 +#: parted/parted.c:2078 msgid "resizepart" msgstr "resizepart" -#: parted/parted.c:2065 +#: parted/parted.c:2081 msgid "resizepart NUMBER END resize partition NUMBER" msgstr "" "resizepart NUMERO FINE Ridimensiona la partizione NUMERO" -#: parted/parted.c:2070 +#: parted/parted.c:2086 msgid "rm" msgstr "rm" -#: parted/parted.c:2073 +#: parted/parted.c:2089 msgid "rm NUMBER delete partition NUMBER" msgstr "rm NUMERO Elimina la partizione NUMERO" -#: parted/parted.c:2078 +#: parted/parted.c:2094 msgid "select" msgstr "select" -#: parted/parted.c:2081 +#: parted/parted.c:2097 msgid "select DEVICE choose the device to edit" msgstr "" "select DEVICE Sceglie il device da modificare" -#: parted/parted.c:2086 +#: parted/parted.c:2102 msgid "disk_set" msgstr "disk_set" -#: parted/parted.c:2089 +#: parted/parted.c:2105 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:2094 +#: parted/parted.c:2110 msgid "disk_toggle" msgstr "disk_toggle" -#: parted/parted.c:2097 +#: parted/parted.c:2113 msgid "" "disk_toggle [FLAG] toggle the state of FLAG on " "selected device" @@ -2902,22 +2847,22 @@ msgstr "" "device\n" " selezionato" -#: parted/parted.c:2103 +#: parted/parted.c:2119 msgid "set" msgstr "set" -#: parted/parted.c:2106 +#: parted/parted.c:2122 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:2112 +#: parted/parted.c:2128 msgid "toggle" msgstr "toggle" -#: parted/parted.c:2115 +#: parted/parted.c:2131 msgid "" "toggle [NUMBER [FLAG]] toggle the state of FLAG on " "partition NUMBER" @@ -2925,20 +2870,20 @@ msgstr "" "toggle [NUMERO [FLAG]] Commuta lo stato del FLAG sulla\n" " partizione NUMERO" -#: parted/parted.c:2121 +#: parted/parted.c:2137 msgid "unit" msgstr "unit" -#: parted/parted.c:2124 +#: parted/parted.c:2140 msgid "unit UNIT set the default unit to UNIT" msgstr "" "unit UNITÀ Imposta l'unità predefinita a UNITÀ" -#: parted/parted.c:2129 +#: parted/parted.c:2145 msgid "version" msgstr "version" -#: parted/parted.c:2132 +#: parted/parted.c:2148 msgid "" "version display the version number and " "copyright information of GNU Parted" @@ -2947,7 +2892,7 @@ msgstr "" "informazioni\n" " sul copyright di GNU Parted" -#: parted/parted.c:2136 +#: parted/parted.c:2152 msgid "" "'version' displays copyright and version information corresponding to this " "copy of GNU Parted\n" @@ -2955,31 +2900,39 @@ msgstr "" "\"version\" visualizza informazioni sul copyright e la versione di questa " "copia di GNU Parted\n" -#: parted/parted.c:2204 +#: parted/parted.c:2220 #, c-format msgid "Usage: %s [-hlmsv] [-a] [DEVICE [COMMAND [PARAMETERS]]...]\n" msgstr "" "Uso: %s [-hlmsv] [-a] [DEVICE [COMANDO [PARAMETRI]]...]\n" -#: parted/parted.c:2248 +#: parted/parted.c:2264 msgid "No device found" msgstr "Nessun device trovato" -#: parted/parted.c:2285 +#: parted/parted.c:2301 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:2325 +#: parted/parted.c:2334 +msgid "" +"You should reinstall your boot loader before rebooting. Read section 4 of " +"the Parted User documentation for more information." +msgstr "" +"Prima di riavviare è utile reinstallare il \"boot loader\". Per maggiori " +"informazioni, consultare la sezione 4 della documentazione di Parted." + +#: parted/parted.c:2341 msgid "You may need to update /etc/fstab.\n" msgstr "Potrebbe essere necessario aggiornare /etc/fstab.\n" -#: parted/ui.c:164 +#: parted/ui.c:165 msgid "Welcome to GNU Parted! Type 'help' to view a list of commands.\n" msgstr "Benvenuti in GNU Parted. Digitare \"help\" per l'elenco dei comandi.\n" -#: parted/ui.c:167 +#: parted/ui.c:168 msgid "" "Usage: parted [OPTION]... [DEVICE [COMMAND [PARAMETERS]...]...]\n" "Apply COMMANDs with PARAMETERS to DEVICE. If no COMMAND(s) are given, run " @@ -2990,7 +2943,7 @@ msgstr "" "Esegue COMANDO con i PARAMETRI sul DEVICE. Se non c'è alcun COMANDO\n" "parte in modalità interattiva.\n" -#: parted/ui.c:172 +#: parted/ui.c:173 #, c-format msgid "" "\n" @@ -3053,7 +3006,7 @@ msgstr "" "Includere anche qualsiasi altra informazione riguardo la propria\n" "configurazione da considerarsi importante.\n" -#: parted/ui.c:293 +#: parted/ui.c:294 msgid "" "\n" "Command History:\n" @@ -3061,7 +3014,7 @@ msgstr "" "\n" "Cronologia comandi:\n" -#: parted/ui.c:356 +#: parted/ui.c:357 msgid "" "\n" "Error: SEGV_MAPERR (Address not mapped to object)\n" @@ -3069,7 +3022,7 @@ msgstr "" "\n" "Errore: SEGV_MAPERR (indirizzo non mappato all'oggetto)\n" -#: parted/ui.c:362 +#: parted/ui.c:363 msgid "" "\n" "Error: SEGV_ACCERR (Invalid permissions for mapped object)\n" @@ -3077,7 +3030,7 @@ msgstr "" "\n" "Errore: SEGV_ACCERR (permessi non validi per l'oggetto mappato)\n" -#: parted/ui.c:367 +#: parted/ui.c:368 msgid "" "\n" "Error: A general SIGSEGV signal was encountered.\n" @@ -3085,7 +3038,7 @@ msgstr "" "\n" "Errore: incontrato un segnale SIGSEGV generico.\n" -#: parted/ui.c:391 +#: parted/ui.c:392 msgid "" "\n" "Error: FPE_INTDIV (Integer: divide by zero)" @@ -3093,7 +3046,7 @@ msgstr "" "\n" "Errore: FPE_INTDIV (intero: divisione per zero)" -#: parted/ui.c:396 +#: parted/ui.c:397 msgid "" "\n" "Error: FPE_INTOVF (Integer: overflow)" @@ -3101,7 +3054,7 @@ msgstr "" "\n" "Errore: FPE_INTOVF (intero: overflow)" -#: parted/ui.c:401 +#: parted/ui.c:402 msgid "" "\n" "Error: FPE_FLTDIV (Float: divide by zero)" @@ -3109,7 +3062,7 @@ msgstr "" "\n" "Errore: FPE_FLTDIV (float: divisione per zero)" -#: parted/ui.c:406 +#: parted/ui.c:407 msgid "" "\n" "Error: FPE_FLTOVF (Float: overflow)" @@ -3117,7 +3070,7 @@ msgstr "" "\n" "Errore: FPE_FLTOVF (float: overflow)" -#: parted/ui.c:411 +#: parted/ui.c:412 msgid "" "\n" "Error: FPE_FLTUND (Float: underflow)" @@ -3125,7 +3078,7 @@ msgstr "" "\n" "Errore: FPE_FLTUND (float: underflow)" -#: parted/ui.c:416 +#: parted/ui.c:417 msgid "" "\n" "Error: FPE_FLTRES (Float: inexact result)" @@ -3133,7 +3086,7 @@ msgstr "" "\n" "Errore: FPE_FLTRES (float: risultato inesatto)" -#: parted/ui.c:421 +#: parted/ui.c:422 msgid "" "\n" "Error: FPE_FLTINV (Float: invalid operation)" @@ -3141,7 +3094,7 @@ msgstr "" "\n" "Errore: FPE_FLTINV (float: operazione non valida)" -#: parted/ui.c:426 +#: parted/ui.c:427 msgid "" "\n" "Error: FPE_FLTSUB (Float: subscript out of range)" @@ -3149,7 +3102,7 @@ msgstr "" "\n" "Errore: FPE_FLTSUB (float: subscript fuori dal limite)" -#: parted/ui.c:431 +#: parted/ui.c:432 msgid "" "\n" "Error: A general SIGFPE signal was encountered." @@ -3157,7 +3110,7 @@ msgstr "" "\n" "Errore: incontrato un segnale SIGFPE generico." -#: parted/ui.c:455 +#: parted/ui.c:456 msgid "" "\n" "Error: ILL_ILLOPC (Illegal Opcode)" @@ -3165,7 +3118,7 @@ msgstr "" "\n" "Errore: ILL_ILLOPC (opcode non consentito)" -#: parted/ui.c:460 +#: parted/ui.c:461 msgid "" "\n" "Error: ILL_ILLOPN (Illegal Operand)" @@ -3173,7 +3126,7 @@ msgstr "" "\n" "Errore: ILL_ILLOPN (operando non consentito)" -#: parted/ui.c:465 +#: parted/ui.c:466 msgid "" "\n" "Error: ILL_ILLADR (Illegal addressing mode)" @@ -3181,7 +3134,7 @@ msgstr "" "\n" "Errore: ILL_ILLADR (modalità di indirizzamento non consentita)" -#: parted/ui.c:470 +#: parted/ui.c:471 msgid "" "\n" "Error: ILL_ILLTRP (Illegal Trap)" @@ -3189,7 +3142,7 @@ msgstr "" "\n" "Errore: ILL_ILLTRP (trap non consentita)" -#: parted/ui.c:475 +#: parted/ui.c:476 msgid "" "\n" "Error: ILL_PRVOPC (Privileged Opcode)" @@ -3197,7 +3150,7 @@ msgstr "" "\n" "Errore: ILL_PRVOPC (opcode privilegiato)" -#: parted/ui.c:480 +#: parted/ui.c:481 msgid "" "\n" "Error: ILL_PRVREG (Privileged Register)" @@ -3205,7 +3158,7 @@ msgstr "" "\n" "Errore: ILL_PRVREG (registro privilegiato)" -#: parted/ui.c:485 +#: parted/ui.c:486 msgid "" "\n" "Error: ILL_COPROC (Coprocessor Error)" @@ -3213,7 +3166,7 @@ msgstr "" "\n" "Errore: ILL_COPROC (errore del coprocessore)" -#: parted/ui.c:490 +#: parted/ui.c:491 msgid "" "\n" "Error: ILL_BADSTK (Internal Stack Error)" @@ -3221,7 +3174,7 @@ msgstr "" "\n" "Errore: ILL_BADSTK (errore dello stack interno)" -#: parted/ui.c:495 +#: parted/ui.c:496 msgid "" "\n" "Error: A general SIGILL signal was encountered." @@ -3229,69 +3182,69 @@ msgstr "" "\n" "Errore: incontrato un segnale SIGILL generico." -#: parted/ui.c:888 +#: parted/ui.c:889 #, c-format msgid "invalid token: %s" msgstr "token non valido: %s" -#: parted/ui.c:1069 +#: parted/ui.c:1070 msgid "Expecting a partition number." msgstr "Atteso un numero di partizione." -#: parted/ui.c:1078 +#: parted/ui.c:1079 msgid "Partition doesn't exist." msgstr "La partizione non esiste." -#: parted/ui.c:1098 +#: parted/ui.c:1099 msgid "Expecting a file system type." msgstr "Atteso un tipo di file system." -#: parted/ui.c:1105 +#: parted/ui.c:1106 #, c-format msgid "Unknown file system type \"%s\"." msgstr "Tipo di file system \"%s\" sconosciuto." -#: parted/ui.c:1126 +#: parted/ui.c:1127 msgid "Expecting a disk label type." msgstr "Atteso un tipo di etichetta disco." -#: parted/ui.c:1157 parted/ui.c:1193 +#: parted/ui.c:1158 parted/ui.c:1194 msgid "No flags supported" msgstr "" -#: parted/ui.c:1267 +#: parted/ui.c:1268 msgid "Can't create any more partitions." msgstr "Non è possibile creare ulteriori partizioni." -#: parted/ui.c:1277 +#: parted/ui.c:1278 msgid "Expecting a partition type." msgstr "Atteso un tipo di partizione." -#: parted/ui.c:1426 +#: parted/ui.c:1427 msgid "on" msgstr "on" -#: parted/ui.c:1427 +#: parted/ui.c:1428 msgid "off" msgstr "off" -#: parted/ui.c:1444 +#: parted/ui.c:1445 msgid "optimal" msgstr "ottimale" -#: parted/ui.c:1445 +#: parted/ui.c:1446 msgid "minimal" msgstr "minimale" -#: parted/ui.c:1578 +#: parted/ui.c:1579 msgid "OPTIONs:" msgstr "OPZIONI:" -#: parted/ui.c:1583 +#: parted/ui.c:1584 msgid "COMMANDs:" msgstr "COMANDI:" -#: parted/ui.c:1586 +#: parted/ui.c:1587 #, c-format msgid "" "\n" @@ -3301,33 +3254,89 @@ msgstr "" "Segnalare i bug a %s\n" # '%s' = dev->path -#: parted/ui.c:1593 +#: parted/ui.c:1594 #, c-format msgid "Using %s\n" msgstr "Viene usato %s\n" -#: parted/ui.c:1673 +#: parted/ui.c:1674 msgid "This command does not make sense in non-interactive mode.\n" msgstr "Questo comando non ha senso nella modalità non interattiva.\n" +#, c-format #~ msgid "%s: option '--%s' doesn't allow an argument\n" #~ msgstr "%s: l'opzione \"--%s\" non accetta un argomento\n" +#, c-format #~ msgid "%s: unrecognized option '--%s'\n" #~ msgstr "%s: opzione \"--%s\" non riconosciuta\n" +#, c-format #~ msgid "%s: option '-W %s' doesn't allow an argument\n" #~ msgstr "%s: l'opzione \"-W %s\" non accetta un argomento\n" +#, c-format #~ msgid "%s: option '-W %s' requires an argument\n" #~ msgstr "%s: l'opzione \"-W %s\" richiede un argomento\n" +#, c-format #~ msgid "%s home page: \n" #~ msgstr "Sito web di %s: \n" +#, c-format +#~ msgid "invalid %s%s argument '%s'" +#~ msgstr "l'argomento \"%3$s\" di %1$s%2$s non è valido" + +#, c-format +#~ msgid "invalid suffix in %s%s argument '%s'" +#~ msgstr "il suffisso nell'argomento \"%3$s\" di %1$s%2$s non è valido" + +#, c-format +#~ msgid "%s%s argument '%s' too large" +#~ msgstr "l'argomento \"%3$s\" di %1$s%2$s è troppo grande" + +#~ msgid "" +#~ "The partition table cannot be re-read. This means you need to reboot " +#~ "before mounting any modified partitions. You also need to reinstall your " +#~ "boot loader before you reboot (which may require mounting modified " +#~ "partitions). It is impossible do both things! So you'll need to boot " +#~ "off a rescue disk, and reinstall your boot loader from the rescue disk. " +#~ "Read section 4 of the Parted User documentation for more information." +#~ msgstr "" +#~ "Impossibile rileggere la tabella delle partizioni; per poter montare le " +#~ "partizioni modificate è necessario riavviare il computer. Prima del " +#~ "riavvio è anche necessario installare nuovamente il \"boot loader" +#~ "\" (potrebbe richiedere di montare le partizioni modificate). Poiché non " +#~ "è possibile svolgere entrambe le operazioni, avviare il computer da un " +#~ "disco di ripristino e installare il \"boot loader\" da tale disco. Per " +#~ "maggiori informazioni, consultare la sezione 4 della documentazione di " +#~ "Parted." + +#, 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 " +#~ "computer before doing anything with %s." +#~ msgstr "" +#~ "La tabella delle partizioni su %s (%s) non può essere riletta. Questo " +#~ "significa che le modifiche effettuate non saranno note a Hurd. Riavviare " +#~ "il computer prima di fare qualsiasi cosa con %s." + +#~ msgid "The boot region doesn't start at the start of the partition." +#~ msgstr "La regione di avvio non comincia all'inizio della partizione." + +#, 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." #~ msgstr "" #~ "Il file system ha dei settori logici con dimensione %d. Il programma non " #~ "funziona correttamente con settori di dimensione diversa da 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." +#~ msgstr "" +#~ "Il file %s è indicato come file di sistema; spostandolo, alcuni programmi " +#~ "potrebbero bloccarsi." diff --git a/po/ja.gmo b/po/ja.gmo index ad0605ab9c09350b8f3afd6e1db90679fb005093..4e62880f9d9a64311980ea8cb088290e0cce98d2 100644 GIT binary patch delta 17996 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, 1999-2014. +# Hiroshi Takekawa , 1999, 2019, 2021. # msgid "" msgstr "" -"Project-Id-Version: parted 3.1.90\n" +"Project-Id-Version: GNU parted 3.3.52\n" "Report-Msgid-Bugs-To: bug-parted@gnu.org\n" -"POT-Creation-Date: 2019-10-10 16:35-0700\n" -"PO-Revision-Date: 2014-07-04 18:30+0900\n" +"POT-Creation-Date: 2021-01-27 16:00-0800\n" +"PO-Revision-Date: 2021-01-19 19:40+0900\n" "Last-Translator: Hiroshi Takekawa \n" "Language-Team: Japanese \n" "Language: ja\n" @@ -40,29 +40,29 @@ msgid "Unknown system error" msgstr "不明なシステムエラー" #: lib/getopt.c:278 -#, fuzzy, c-format +#, c-format msgid "%s: option '%s%s' is ambiguous\n" -msgstr "%s: オプション '-W %s' はいくつかの意味にとれてしまいます\n" +msgstr "%s: オプション '%s%s' は曖昧です\n" #: lib/getopt.c:284 -#, fuzzy, c-format +#, c-format msgid "%s: option '%s%s' is ambiguous; possibilities:" -msgstr "%s: オプション '%s' は曖昧です。可能性としては次のものがあります:" +msgstr "%s: オプション '%s%s' は曖昧です。可能性としては次のものがあります:" #: lib/getopt.c:319 -#, fuzzy, c-format +#, c-format msgid "%s: unrecognized option '%s%s'\n" -msgstr "%s: '%c%s' は認識できないオプションです\n" +msgstr "%s: '%s%s' は認識できないオプションです\n" #: lib/getopt.c:345 -#, fuzzy, c-format +#, c-format msgid "%s: option '%s%s' doesn't allow an argument\n" -msgstr "%s: オプション '%c%s' は引数を受けとりません\n" +msgstr "%s: オプション '%s%s' は引数を受けとりません\n" #: lib/getopt.c:360 -#, fuzzy, c-format +#, c-format msgid "%s: option '%s%s' requires an argument\n" -msgstr "%s: オプション '--%s' には引数が必要です\n" +msgstr "%s: オプション '%s%s' には引数が必要です\n" #: lib/getopt.c:621 #, c-format @@ -95,11 +95,11 @@ msgstr "%s: '%c' には引数が必要です\n" #. If you don't know what to put here, please see #. #. and use glyphs suitable for your language. -#: lib/quotearg.c:362 +#: lib/quotearg.c:355 msgid "`" msgstr "`" -#: lib/quotearg.c:363 +#: lib/quotearg.c:356 msgid "'" msgstr "'" @@ -132,9 +132,8 @@ msgid "Invalid back reference" msgstr "不正な後方参照" #: lib/regcomp.c:156 -#, fuzzy msgid "Unmatched [, [^, [:, [., or [=" -msgstr "対応のない [ あるいは [^" +msgstr "対応のない [, [^, [:, [. あるいは [=" #: lib/regcomp.c:159 msgid "Unmatched ( or \\(" @@ -215,15 +214,13 @@ msgstr "(C)" #. 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" -"ライセンス GPLv3+: GNU GPL バージョン 3 あるいはそれ以降のバージョン \n" +"ライセンス GPLv3+: GNU GPL バージョン 3 あるいはそれ以降のバージョン <%s>。\n" "このソフトウェアはフリーソフトウェアです。自由に変更、再配布ができます。\n" "法律が許すかぎり、全くの無保証です。\n" "\n" @@ -341,11 +338,11 @@ 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" "バグレポートは %s へ。\n" +"翻訳については translation-team-ja@lists.sourceforge.net へ。\n" #: lib/version-etc.c:251 #, c-format @@ -358,40 +355,25 @@ msgid "%s home page: <%s>\n" msgstr "%s ホームページ: <%s>\n" #: lib/version-etc.c:260 -#, fuzzy, c-format +#, c-format msgid "General help using GNU software: <%s>\n" -msgstr "GNU ソフトウェアの一般的なヘルプは: \n" +msgstr "GNU ソフトウェアの一般的なヘルプは: <%s>\n" #: lib/xalloc-die.c:34 msgid "memory exhausted" msgstr "メモリ不足" -#: lib/xstrtol-error.c:63 -#, c-format -msgid "invalid %s%s argument '%s'" -msgstr "不正な %s%s の引数 '%s' です" - -#: lib/xstrtol-error.c:68 -#, c-format -msgid "invalid suffix in %s%s argument '%s'" -msgstr "不正な接尾辞が %s%s の引数 `%s' にあります" - -#: lib/xstrtol-error.c:72 -#, c-format -msgid "%s%s argument '%s' too large" -msgstr "%s%s の引数 `%s' は大きすぎます" - -#: libparted/arch/beos.c:245 +#: libparted/arch/beos.c:246 msgid "Disk Image" msgstr "ディスクイメージ" -#: libparted/arch/beos.c:346 libparted/arch/gnu.c:277 +#: libparted/arch/beos.c:347 libparted/arch/gnu.c:277 #: libparted/arch/linux.c:1731 #, c-format msgid "Error opening %s: %s" msgstr "%s をオープン中にエラー: %s" -#: libparted/arch/beos.c:357 libparted/arch/gnu.c:287 +#: libparted/arch/beos.c:358 libparted/arch/gnu.c:287 #: libparted/arch/linux.c:1742 #, c-format msgid "Unable to open %s read-write (%s). %s has been opened read-only." @@ -399,47 +381,47 @@ msgstr "" "%s を読み書き可能な状態にオープンできません(%s)。%s は読み込みのみ可能な状態" "でオープンされました。" -#: libparted/arch/beos.c:419 libparted/arch/linux.c:1907 +#: libparted/arch/beos.c:420 libparted/arch/linux.c:1907 #, c-format msgid "%s during seek for read on %s" msgstr "%s: %s から読み込み中のシークでエラーが発生しました。" -#: libparted/arch/beos.c:452 libparted/arch/gnu.c:465 libparted/arch/gnu.c:564 -#: libparted/arch/gnu.c:692 libparted/arch/linux.c:1867 +#: libparted/arch/beos.c:453 libparted/arch/gnu.c:425 libparted/arch/gnu.c:524 +#: libparted/arch/gnu.c:652 libparted/arch/linux.c:1867 #: libparted/arch/linux.c:1949 #, c-format msgid "%s during read on %s" msgstr "%s: %s から読み込み中にエラーが発生しました。" -#: libparted/arch/beos.c:488 libparted/arch/gnu.c:525 +#: libparted/arch/beos.c:489 libparted/arch/gnu.c:485 #: libparted/arch/linux.c:2026 #, c-format msgid "Can't write to %s, because it is opened read-only." msgstr "読み込みのみが可能なようにオープンされているので、%sに書きこめません。" -#: libparted/arch/beos.c:504 libparted/arch/linux.c:2051 +#: libparted/arch/beos.c:505 libparted/arch/linux.c:2051 #, c-format msgid "%s during seek for write on %s" msgstr "%s: %s に書きこみ中のシークでエラーが発生しました。" -#: libparted/arch/beos.c:541 libparted/arch/gnu.c:601 libparted/arch/gnu.c:646 -#: libparted/arch/gnu.c:723 libparted/arch/linux.c:1999 +#: libparted/arch/beos.c:542 libparted/arch/gnu.c:561 libparted/arch/gnu.c:606 +#: libparted/arch/gnu.c:683 libparted/arch/linux.c:1999 #: libparted/arch/linux.c:2094 libparted/arch/linux.c:2167 #, c-format msgid "%s during write on %s" msgstr "%s: %s に書きこみ中にエラーが発生しました。" -#: partprobe/partprobe.c:148 +#: partprobe/partprobe.c:149 #, c-format msgid "Try `%s --help' for more information.\n" msgstr "より詳しく知るには `%s --help' を使ってみてください。\n" -#: partprobe/partprobe.c:152 +#: partprobe/partprobe.c:153 #, c-format msgid "Usage: %s [OPTION] [DEVICE]...\n" msgstr "使い方: %s [オプション] [デバイス]...\n" -#: partprobe/partprobe.c:153 +#: partprobe/partprobe.c:154 msgid "" "Inform the operating system about partition table changes.\n" "\n" @@ -455,7 +437,7 @@ msgstr "" " -h, --help このヘルプを表示して終了\n" " -v, --version バージョン情報を表示して終了\n" -#: partprobe/partprobe.c:161 +#: partprobe/partprobe.c:162 msgid "" "\n" "When no DEVICE is given, probe all partitions.\n" @@ -463,7 +445,7 @@ msgstr "" "\n" "デバイスの指定がない場合は、全パーティションを調べます。\n" -#: partprobe/partprobe.c:165 +#: partprobe/partprobe.c:166 #, c-format msgid "" "\n" @@ -481,42 +463,7 @@ msgstr "%s を開けません。" msgid "Unable to probe store." msgstr "デバイスのプローブに失敗しました。" -#: libparted/arch/gnu.c:368 -msgid "" -"The partition table cannot be re-read. This means you need to reboot before " -"mounting any modified partitions. You also need to reinstall your boot " -"loader before you reboot (which may require mounting modified partitions). " -"It is impossible do both things! So you'll need to boot off a rescue disk, " -"and reinstall your boot loader from the rescue disk. Read section 4 of the " -"Parted User documentation for more information." -msgstr "" -"カーネルはパーティションテーブルの再読み込みができませんでしたので、変更を加" -"えたパーティションを mount する前に再起動する必要があります。また、再起動する" -"前にブートローダを再インストールする必要があります(このことは、変更したパー" -"ティションの mount が必要となるかもしれません)。でもそれらを両方同時にはでき" -"ません! レスキューディスクを使ってブートして、ブートローダをいれなおしてくだ" -"さい。より詳しいことは Parted のユーザドキュメントの4章を読んでください。" - -#: libparted/arch/gnu.c:385 -#, 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 computer " -"before doing anything with %s." -msgstr "" -"カーネルは %s のパーティションテーブルの内容を再読み込みできません(%s)。これ" -"は Hurd はあなたが行った変更を関知していないことを意味しています。%s に対して" -"何か操作をする前にコンピュータを再起動するべきです。" - -#: libparted/arch/gnu.c:396 parted/parted.c:2318 -msgid "" -"You should reinstall your boot loader before rebooting. Read section 4 of " -"the Parted User documentation for more information." -msgstr "" -"再起動する前にブートローダをいれなおすべきです。詳細は Parted ユーザドキュメ" -"ントの4章を読んでください。" - -#: libparted/arch/gnu.c:788 +#: libparted/arch/gnu.c:748 #, c-format msgid "%s trying to sync %s to disk" msgstr "%s: %s を同期中にエラーが発生しました。" @@ -606,9 +553,8 @@ msgid "Generic SD/MMC Storage Card" msgstr "SD/MMC カード" #: libparted/arch/linux.c:1422 -#, fuzzy msgid "NVMe Device" -msgstr "新しいデバイス?" +msgstr "NVMeデバイス" #: libparted/arch/linux.c:1483 msgid "DAC960 RAID controller" @@ -636,7 +582,7 @@ msgstr "Compaq Smart Array" #: libparted/arch/linux.c:1520 msgid "NVDIMM Device" -msgstr "" +msgstr "NVDIMMデバイス" #: libparted/arch/linux.c:1525 msgid "ATARAID Controller" @@ -677,7 +623,7 @@ msgstr "Linux Software RAID Array" #: libparted/arch/linux.c:1588 msgid "RAM Drive" -msgstr "" +msgstr "RAMドライブ" #: libparted/arch/linux.c:1595 msgid "ped_device_new() Unsupported device type" @@ -835,15 +781,15 @@ msgstr "メタ情報" msgid "free" msgstr "空き" -#: libparted/disk.c:2355 parted/ui.c:1258 parted/ui.c:1286 +#: libparted/disk.c:2355 parted/ui.c:1259 parted/ui.c:1287 msgid "extended" msgstr "拡張" -#: libparted/disk.c:2357 parted/ui.c:1262 parted/ui.c:1290 +#: libparted/disk.c:2357 parted/ui.c:1263 parted/ui.c:1291 msgid "logical" msgstr "論理" -#: libparted/disk.c:2359 parted/ui.c:1254 parted/ui.c:1282 +#: libparted/disk.c:2359 parted/ui.c:1255 parted/ui.c:1283 msgid "primary" msgstr "プライマリ" @@ -919,64 +865,72 @@ msgstr "irst" msgid "esp" msgstr "esp" -#: libparted/disk.c:2415 +#: libparted/disk.c:2411 +msgid "chromeos_kernel" +msgstr "chromeos_kernel" + +#: libparted/disk.c:2413 +msgid "bls_boot" +msgstr "bls_boot" + +#: libparted/disk.c:2419 #, c-format msgid "Unknown partition flag, %d." msgstr "%d は不明なパーティションフラグです。" -#: libparted/exception.c:78 +#: libparted/exception.c:79 msgid "Information" msgstr "通知" -#: libparted/exception.c:79 +#: libparted/exception.c:80 msgid "Warning" msgstr "警告" -#: libparted/exception.c:80 +#: libparted/exception.c:81 msgid "Error" msgstr "エラー" -#: libparted/exception.c:81 +#: libparted/exception.c:82 msgid "Fatal" msgstr "致命的エラー" -#: libparted/exception.c:82 +#: libparted/exception.c:83 msgid "Bug" msgstr "バグ" -#: libparted/exception.c:83 +#: libparted/exception.c:84 msgid "No Implementation" msgstr "未実装" -#: libparted/exception.c:87 +#: libparted/exception.c:88 msgid "Fix" msgstr "修正" -#: libparted/exception.c:88 +#: libparted/exception.c:89 msgid "Yes" msgstr "はい(Y)" -#: libparted/exception.c:89 +#: libparted/exception.c:90 msgid "No" msgstr "いいえ(N)" -#: libparted/exception.c:90 +#: libparted/exception.c:91 msgid "OK" msgstr "OK" -#: libparted/exception.c:91 +#: libparted/exception.c:92 msgid "Retry" msgstr "やりなおし(R)" -#: libparted/exception.c:92 +#: libparted/exception.c:93 msgid "Ignore" msgstr "無視(I)" -#: libparted/exception.c:93 +#: libparted/exception.c:94 msgid "Cancel" msgstr "取消(C)" -#: libparted/exception.c:133 +#: libparted/exception.c:134 #, c-format msgid "" "A bug has been detected in GNU Parted. Refer to the web site of parted " @@ -989,64 +943,67 @@ msgstr "" "あります。%s に最低限どのバージョンか (%s) と以下のメッセージを含めてメールで" "送ってください: " -#: libparted/labels/aix.c:91 +#: libparted/labels/aix.c:92 msgid "Support for reading AIX disk labels is is not implemented yet." msgstr "AIX ディスクラベルの読み込みは未実装です。" -#: libparted/labels/aix.c:102 +#: libparted/labels/aix.c:103 msgid "Support for writing AIX disk labels is is not implemented yet." msgstr "AIX ディスクラベルの書き込みは未実装です。" -#: libparted/labels/aix.c:115 +#: libparted/labels/aix.c:116 msgid "" "Support for adding partitions to AIX disk labels is not implemented yet." msgstr "AIX ディスクラベルへのパーティションの追加は未実装です。" -#: libparted/labels/aix.c:125 +#: libparted/labels/aix.c:126 msgid "" "Support for duplicating partitions in AIX disk labels is not implemented yet." msgstr "AIX ディスクラベルでのパーティションの複製は未実装です。" -#: libparted/labels/aix.c:143 +#: 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:153 +#: libparted/labels/aix.c:154 msgid "Support for setting flags in AIX disk labels is not implemented yet." msgstr "AIX ディスクラベルのフラグの設定は未実装です。" #: libparted/labels/atari.c:273 -#, 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 は、セクタサイズが %d バイトでないディスクでは HFS ファイルシステムを" -"使えません。" +"セクタサイズが %d バイトでないディスクでは Atari パーティションテーブルは使え" +"ません。" #: libparted/labels/atari.c:285 #, c-format msgid "Can't use Atari partition tables on disks with more than %d sectors." msgstr "" +"セクタ数が %d より多いディスクでは Atari パーティションテーブルは使えません。" #: libparted/labels/atari.c:398 msgid "" "Too many Atari partitions detected. Maybe there is a loop in the XGM linked " "list. Aborting." msgstr "" +"多すぎる Atari パーティションが検出されました。もしかしたら XGM リンクリスト" +"にループがあるのかもしれません。中止します。" #: libparted/labels/atari.c:596 #, c-format msgid "No data partition found in the ARS at sector %lli." -msgstr "" +msgstr "データパーティションがセクタ %lli にある ARS に見つかりませんでした。" #: libparted/labels/atari.c:617 #, c-format msgid "" "The entry of the next logical ARS is not of type XGM in ARS at sector %lli." -msgstr "" +msgstr "セクタ %lli にある ARS の中の次の論理ARSエントリがXGMではありません。" #: libparted/labels/atari.c:648 #, c-format @@ -1054,31 +1011,35 @@ msgid "" "There doesn't seem to be an Atari partition table on this disk (%s), or it " "is corrupted." msgstr "" +"このディスク (%s) に Atari パーティションテーブルがないか破損しています。" #: libparted/labels/atari.c:878 #, c-format msgid "No room at sector %lli to store ARS of logical partition %d." msgstr "" +"セクタ %lli に論理パーティション %d の ARS を保存する領域がありません。" #: libparted/labels/atari.c:885 #, c-format msgid "No room at sector %lli to store ARS." -msgstr "" +msgstr "セクタ %lli に ARS を保存する領域がありません。" #: libparted/labels/atari.c:962 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:1003 #, c-format msgid "No room at sector %lli to store BSL." -msgstr "" +msgstr "セクタ %lli に BSL を保存する領域がありません。" #: libparted/labels/atari.c:1111 msgid "There were remaining partitions after filling the main AHDI table." -msgstr "" +msgstr "メイン AHDI テーブルを埋めた後に残っているパーティションがあります。" #: libparted/labels/atari.c:1130 msgid "" @@ -1086,14 +1047,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 "" +"メイン AHDI テーブルは全てのパーティションで埋まりましたが ICD テーブルが空で" +"ないため、余分に不明なサイズと位置のパーティションが ICD 互換ソフトウェアに" +"よって検出されます。ICD テーブルを無効にしますか？" #: libparted/labels/atari.c:1164 msgid "ICD entries can't contain extended or logical partitions." msgstr "" +"ICD エントリは拡張パーティションや論理パーティションを含むことができません。" #: libparted/labels/atari.c:1186 msgid "There were remaining partitions after filling the tables." -msgstr "" +msgstr "テーブルを埋めてもパーティションに余りがあります。" #: libparted/labels/atari.c:1226 #, c-format @@ -1101,12 +1066,14 @@ 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 "" +"拡張 XGM パーティションは ICD モードでは使えません (XGM が最初のパーティショ" +"ンの場合は2つとして数えられ、%d 以上のプライマリパーティションとなります)。" -#: libparted/labels/atari.c:1657 libparted/labels/bsd.c:567 -#: libparted/labels/dasd.c:894 libparted/labels/dos.c:2276 -#: libparted/labels/dvh.c:770 libparted/labels/gpt.c:2050 -#: libparted/labels/loop.c:243 libparted/labels/mac.c:1423 -#: libparted/labels/pc98.c:701 libparted/labels/rdb.c:1054 +#: libparted/labels/atari.c:1657 libparted/labels/bsd.c:563 +#: libparted/labels/dasd.c:895 libparted/labels/dos.c:2283 +#: libparted/labels/dvh.c:770 libparted/labels/gpt.c:2140 +#: 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 "このパーティションで全ての制約を満たせません。" @@ -1117,51 +1084,55 @@ 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 "" +"拡張 XGM パーティションを使う場合、%d 個以上のプライマリパーティションを ICD " +"モードで使うことができません。XGM が最初のパーティションの場合はそれは2つとし" +"て数えられます。" #: libparted/labels/atari.c:1823 libparted/labels/rdb.c:1082 msgid "Unable to allocate a partition number." msgstr "パーティション番号を割り当てられません。" -#: libparted/labels/bsd.c:592 +#: libparted/labels/bsd.c:588 msgid "Unable to allocate a bsd disklabel slot." msgstr "BSDディスクラベルのスロットを確保できません。" -#: libparted/labels/dasd.c:625 +#: libparted/labels/dasd.c:626 msgid "The partition table of DASD-LDL device cannot be changed.\n" -msgstr "" +msgstr "DASD-LDL パーティションテーブルのデバイスは変更できません。\n" -#: libparted/labels/dasd.c:920 +#: libparted/labels/dasd.c:921 msgid "Unable to allocate a dasd disklabel slot" msgstr "dasd ディスクラベルのスロットを確保できません。" -#: libparted/labels/dos.c:1003 +#: libparted/labels/dos.c:1006 #, c-format msgid "Invalid partition table on %s -- wrong signature %x." msgstr "" "%s のパーティションテーブルが不正です。%x というシグネチャはあやまりです。" -#: libparted/labels/dos.c:1031 +#: libparted/labels/dos.c:1034 #, c-format msgid "Invalid partition table - recursive partition on %s." msgstr "" "パーティションテーブルが不正です。再帰的なパーティションが %s にあります。" -#: libparted/labels/dos.c:1560 +#: libparted/labels/dos.c:1557 msgid "Extended partitions cannot be hidden on msdos disk labels." msgstr "MSDOS ディスクラベルで拡張パーティションは隠せません。" -#: libparted/labels/dos.c:1572 -#, fuzzy +#: libparted/labels/dos.c:1569 msgid "Extended partitions cannot be recovery partitions on msdos disk labels." -msgstr "MSDOS ディスクラベルで拡張パーティションは隠せません。" +msgstr "" +"MSDOS ディスクラベルで拡張パーティションはリカバリパーティションにできませ" +"ん。" -#: libparted/labels/dos.c:2258 +#: libparted/labels/dos.c:2265 msgid "Parted can't resize partitions managed by Windows Dynamic Disk." msgstr "" "ダイナミックディスクに使われているパーティションは Parted ではリサイズできま" "せん。" -#: libparted/labels/dos.c:2514 +#: libparted/labels/dos.c:2521 msgid "cannot create any more partitions" msgstr "パーティションを追加できません。" @@ -1259,7 +1230,7 @@ msgstr "指定されたデバイスは有効な DASD デバイスではありま #: libparted/labels/fdasd.c:188 msgid "VOLSER not found on device" -msgstr "" +msgstr "VOLSER がデバイスに見つかりませんでした" #: libparted/labels/fdasd.c:191 libparted/labels/vtoc.c:179 msgid "Fatal error" @@ -1290,9 +1261,8 @@ msgstr "" "しません!" #: libparted/labels/fdasd.c:1020 -#, fuzzy msgid "Could not retrieve disk size." -msgstr "ディスク情報が取得できません。" +msgstr "ディスクサイズが取得できません。" #: libparted/labels/fdasd.c:1029 msgid "Could not retrieve disk geometry information." @@ -1304,13 +1274,13 @@ msgstr "ブロックサイズ情報が取得できません。" #: libparted/labels/fdasd.c:1045 msgid "Disk geometry does not match a DASD device of type 3390." -msgstr "" +msgstr "Disk ジオメトリがタイプ 3390 の DASDデバイスと一致しません。" -#: libparted/labels/gpt.c:531 +#: libparted/labels/gpt.c:541 msgid "device is too small for GPT" msgstr "デバイスは GPT を使うには小さすぎます" -#: libparted/labels/gpt.c:733 +#: libparted/labels/gpt.c:743 #, c-format msgid "" "The format of the GPT partition table is version %x, which is newer than " @@ -1319,7 +1289,7 @@ msgstr "" "GPT パーティションテーブルのフォーマットのバージョンが %x で parted の理解で" "きるものより新しいです。報告してください。" -#: libparted/labels/gpt.c:769 +#: libparted/labels/gpt.c:779 #, c-format msgid "" "Not all of the space available to %s appears to be used, you can fix the GPT " @@ -1330,7 +1300,7 @@ msgstr "" "可能にするか(%llu ブロック増えます)、このままで続行することができますが、どう" "しますか？" -#: libparted/labels/gpt.c:1008 +#: libparted/labels/gpt.c:1024 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)?" @@ -1338,7 +1308,7 @@ msgstr "" "あるべき GPT テーブルのバックアップがディスクの最後にありません。バックアップ" "を最後に持ってきて（古いバックアップを削除して）修復しますか？" -#: libparted/labels/gpt.c:1026 +#: libparted/labels/gpt.c:1042 msgid "" "Both the primary and backup GPT tables are corrupt. Try making a fresh " "table, and using Parted's rescue feature to recover partitions." @@ -1346,7 +1316,7 @@ msgstr "" "プライマリ GPT テーブルとバックアップの両方が壊れています。新たにテーブルを作" "りなおして、Parted の修復機能を用いてパーティションの修復を試みます。" -#: libparted/labels/gpt.c:1037 +#: libparted/labels/gpt.c:1053 msgid "" "The backup GPT table is corrupt, but the primary appears OK, so that will be " "used." @@ -1354,7 +1324,7 @@ msgstr "" "バックアップ GPT テーブルは壊れていますが、プライマリは問題ないようなので、そ" "ちらを使います。" -#: libparted/labels/gpt.c:1049 +#: libparted/labels/gpt.c:1065 msgid "" "The primary GPT table is corrupt, but the backup appears OK, so that will be " "used." @@ -1362,11 +1332,11 @@ msgstr "" "プライマリ GPT テーブルは壊れていますが、バックアップは問題ないようなので、そ" "ちらを使います。" -#: libparted/labels/gpt.c:1073 +#: libparted/labels/gpt.c:1089 msgid "primary partition table array CRC mismatch" msgstr "プライマリパーティションテーブルの CRC が一致しません" -#: libparted/labels/gpt.c:1936 libparted/labels/gpt.c:1963 +#: libparted/labels/gpt.c:2026 libparted/labels/gpt.c:2053 msgid "failed to translate partition name" msgstr "パーティション名を変換できません" @@ -1399,18 +1369,14 @@ msgid "The data region doesn't start at the start of the partition." msgstr "データ領域がパーティションの開始位置から始まってません。" #: libparted/labels/mac.c:572 -msgid "The boot region doesn't start at the start of the partition." -msgstr "ブート領域がパーティションの開始位置から始まってません。" - -#: libparted/labels/mac.c:586 msgid "The partition's boot region doesn't occupy the entire partition." msgstr "パーティションのブート領域が、パーティション全体を占有してません。" -#: libparted/labels/mac.c:597 +#: libparted/labels/mac.c:583 msgid "The partition's data region doesn't occupy the entire partition." msgstr "パーティションのデータ領域が、パーティション全体を占有してません。" -#: libparted/labels/mac.c:649 +#: libparted/labels/mac.c:635 #, c-format msgid "" "Weird block size on device descriptor: %d bytes is not divisible by 512." @@ -1418,7 +1384,7 @@ msgstr "" "デバイスディスクリプタに書いてあるブロックサイズはおかしいです。%d バイトは " "512 で割り切れません。" -#: libparted/labels/mac.c:662 +#: libparted/labels/mac.c:648 #, c-format msgid "" "The driver descriptor says the physical block size is %d bytes, but Linux " @@ -1427,11 +1393,11 @@ msgstr "" "ドライバは物理ブロックサイズが %d バイトであると言っていますが、Linux は %d " "バイトだと言っています。" -#: libparted/labels/mac.c:715 +#: libparted/labels/mac.c:701 msgid "No valid partition map found." msgstr "正しいパーティションマップが見つかりません。" -#: libparted/labels/mac.c:789 +#: libparted/labels/mac.c:775 #, c-format msgid "" "Conflicting partition map entry sizes! Entry 1 says it is %d, but entry %d " @@ -1440,11 +1406,11 @@ msgstr "" "パーティションマップのエントリのサイズが一致しません。エントリ 1 によれば %d " "ですが、エントリ %d によれば %d です。" -#: libparted/labels/mac.c:820 +#: libparted/labels/mac.c:806 msgid "Weird! There are 2 partitions map entries!" msgstr "おかしいです。パーティションマップエントリが2つあります。" -#: libparted/labels/mac.c:1359 +#: libparted/labels/mac.c:1345 msgid "" "Changing the name of a root or swap partition will prevent Linux from " "recognising it as such." @@ -1452,16 +1418,16 @@ msgstr "" "root に使われているパーティションや swap パーティションの名前を変更すると " "Linux がそれらをそうと認識できなくなります。" -#: libparted/labels/mac.c:1458 +#: libparted/labels/mac.c:1444 msgid "Can't add another partition -- the partition map is too small!" msgstr "パーティションを追加できません。パーティションマップが小さすぎます。" -#: libparted/labels/pc98.c:284 +#: libparted/labels/pc98.c:285 #, c-format msgid "Invalid partition table on %s." msgstr "%s のパーティションテーブルが不正です。" -#: libparted/labels/pc98.c:337 libparted/labels/pc98.c:415 +#: libparted/labels/pc98.c:338 libparted/labels/pc98.c:416 #, c-format msgid "" "Partition %d isn't aligned to cylinder boundaries. This is still " @@ -1470,7 +1436,7 @@ msgstr "" "パーティション %d はシリンダ境界上にありません。これはまだサポートされていま" "せん。" -#: libparted/labels/pc98.c:733 +#: libparted/labels/pc98.c:729 msgid "Can't add another partition." msgstr "パーティションを追加できません。" @@ -1646,39 +1612,39 @@ msgstr "VTOC FMT7 DSCB が書けません。" msgid "Could not write VTOC FMT9 DSCB." msgstr "VTOC FMT9 DSCB が書けません。" -#: libparted/libparted.c:242 +#: libparted/libparted.c:247 msgid "Out of memory." msgstr "メモリ不足です。" -#: libparted/unit.c:139 +#: libparted/unit.c:140 msgid "Cannot get unit size for special unit 'COMPACT'." msgstr "特別な単位である 'COMPACT' の単位あたりのサイズを得られません。" -#: libparted/unit.c:385 +#: libparted/unit.c:386 #, c-format msgid "\"%s\" has invalid syntax for locations." msgstr "\"%s\" には位置について誤りがあります。" -#: libparted/unit.c:393 +#: libparted/unit.c:394 #, c-format msgid "The maximum head value is %d." msgstr "最大ヘッド値は %d です。" -#: libparted/unit.c:400 +#: libparted/unit.c:401 #, c-format msgid "The maximum sector value is %d." msgstr "最大セクタ値は %d です。" -#: libparted/unit.c:412 libparted/unit.c:564 +#: 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:526 +#: libparted/unit.c:527 msgid "Invalid number." msgstr "不正な値です。" -#: libparted/unit.c:532 +#: libparted/unit.c:533 msgid "Use a smaller unit instead of a value < 1" msgstr "1未満の値の変わりに、より小さなユニットを使ってください" @@ -1688,18 +1654,18 @@ msgstr "1未満の値の変わりに、より小さなユニットを使って msgid "%s : Failed to allocate partition block\n" msgstr "%s : パーティションブロックの確保に失敗しました。\n" -#: libparted/fs/amiga/affs.c:79 libparted/fs/amiga/apfs.c:71 +#: 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:84 libparted/fs/amiga/apfs.c:76 +#: 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:98 libparted/fs/amiga/apfs.c:87 +#: 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" @@ -1725,22 +1691,22 @@ msgstr "%s : ブロック %llu (タイプ %s) のチェックサムが不正で msgid "%s : Couldn't write block %d\n" msgstr "%s : ブロック %d に書きこめません\n" -#: libparted/fs/amiga/amiga.c:278 +#: 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:289 +#: 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:318 +#: 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:148 libparted/fs/r/fat/fat.c:811 +#: libparted/fs/fat/fat.c:149 msgid "" "GNU Parted was miscompiled: the FAT boot sector should be 512 bytes. FAT " "support will be disabled." @@ -1840,7 +1806,7 @@ msgstr "" "ムの CHS geometry はそのままになります。修正(F)を選べば、ファイルシステムの " "CHS geometry は、パーティションの CHS geometry と合うよう修正されます。" -#: libparted/fs/r/fat/bootsector.c:399 +#: libparted/fs/r/fat/bootsector.c:398 #, c-format msgid "" "The information sector has the wrong signature (%x). Select cancel for now, " @@ -1865,14 +1831,14 @@ msgid "" "Cluster start delta = %d, which is not a multiple of the cluster size %d." msgstr "クラスタ開始デルタが %d で、クラスタサイズ %d の倍数ではありません。" -#: libparted/fs/r/fat/count.c:144 +#: libparted/fs/r/fat/count.c:84 #, c-format msgid "Bad directory entry for %s: first cluster is the end of file marker." msgstr "" "%s のディレクトリエントリは不正です: 最初のクラスタがファイルの終端を示してい" "ます。" -#: libparted/fs/r/fat/count.c:157 +#: libparted/fs/r/fat/count.c:97 #, c-format msgid "" "Bad FAT: unterminated chain for %s. You should run dosfsck or scandisk." @@ -1880,7 +1846,7 @@ msgstr "" "不正な FAT: %s のチェインが終端していません。dosfsck や scandisk を走らせるべ" "きです。" -#: libparted/fs/r/fat/count.c:166 +#: libparted/fs/r/fat/count.c:106 #, c-format msgid "" "Bad FAT: cluster %d outside file system in chain for %s. You should run " @@ -1889,7 +1855,7 @@ msgstr "" "不正な FAT: クラスタ %d は %s のチェインにありますが、ファイルシステムの外に" "あります。dosfsck や scandisk を走らせるべきです。" -#: libparted/fs/r/fat/count.c:176 +#: libparted/fs/r/fat/count.c:116 #, c-format msgid "" "Bad FAT: cluster %d is cross-linked for %s. You should run dosfsck or " @@ -1898,27 +1864,18 @@ msgstr "" "不正な FAT: クラスタ %d は %s でクロスリンクしています。dosfsck や scandisk " "を走らせるべきです。" -#: libparted/fs/r/fat/count.c:195 +#: libparted/fs/r/fat/count.c:135 #, c-format msgid "%s is %dk, but it has %d clusters (%dk)." msgstr "%s は %dk ですが、%d クラスタ (%dk 分) あります。" -#: libparted/fs/r/fat/count.c:258 -#, c-format -msgid "" -"The file %s is marked as a system file. This means moving it could cause " -"some programs to stop working." -msgstr "" -"ファイル %s はシステムファイルです。このファイルを移動させると動かなくなるプ" -"ログラムがあるかもしれません。" - -#: libparted/fs/r/fat/fat.c:243 +#: 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:409 +#: 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." @@ -1927,11 +1884,11 @@ msgstr "" "ンセルして scandisk をこのファイルシステムに対して実行して、もう一度実行して" "ください。" -#: libparted/fs/r/fat/fat.c:449 +#: 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:461 +#: libparted/fs/r/fat/fat.c:462 #, c-format msgid "" "File system doesn't have expected sizes for Windows to like it. Cluster " @@ -1942,7 +1899,7 @@ msgstr "" "タサイズは %dk (想定 %dk)で、クラスタ数は %d (想定 %d)、FAT のサイズは %d セ" "クタ (想定 %d)です。" -#: libparted/fs/r/fat/fat.c:484 +#: libparted/fs/r/fat/fat.c:485 #, c-format msgid "" "File system is reporting the free space as %d clusters, not %d clusters." @@ -1950,7 +1907,7 @@ msgstr "" "ファイルシステムの情報によれば空き容量は %d クラスタで、 %d クラスタではあり" "ません。" -#: libparted/fs/r/fat/resize.c:158 +#: 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." @@ -1958,15 +1915,15 @@ msgstr "" "全てのファイルを置くだけの空きがルートディレクトリにありません。キャンセルす" "るか、ファイルを失ってもいい場合は無視してください。" -#: libparted/fs/r/fat/resize.c:302 +#: libparted/fs/r/fat/resize.c:303 msgid "Error writing to the root directory." msgstr "ルートディレクトリへの書きこみ中にエラーが発生しました。" -#: libparted/fs/r/fat/resize.c:495 +#: 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:498 +#: 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 " @@ -1977,13 +1934,13 @@ msgstr "" "場合は、 Parted のマニュアルかディトリビューションのマニュアルを参照してくだ" "さい。" -#: libparted/fs/r/fat/resize.c:506 +#: 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:510 +#: 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 " @@ -1997,40 +1954,40 @@ msgstr "" "さい。また、FAT32 に変換すると、そのファイルシステムは MS DOS、MS Windows " "95a、MS Windows NT で読めなくなります。" -#: libparted/fs/r/fat/resize.c:524 +#: libparted/fs/r/fat/resize.c:508 #, c-format msgid "%s %s %s" msgstr "%s %s %s" -#: libparted/fs/r/fat/resize.c:525 +#: libparted/fs/r/fat/resize.c:509 msgid "Would you like to use FAT32?" msgstr "FAT32 にしたいですか？" -#: libparted/fs/r/fat/resize.c:556 libparted/fs/r/fat/resize.c:572 +#: 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:557 +#: 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:573 +#: 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:586 +#: 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:136 +#: 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 " @@ -2039,41 +1996,41 @@ msgstr "" "FAT %d メディア %x はブートセクタのメディア %x と一致しません。scandisk を走" "らせるべきです。" -#: libparted/fs/r/fat/table.c:268 +#: 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:300 +#: 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:342 +#: 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:151 +#: libparted/fs/r/filesys.c:152 msgid "Could not detect file system." msgstr "ファイルシステムが見つけられません。" -#: libparted/fs/r/filesys.c:158 libparted/fs/r/filesys.c:285 +#: libparted/fs/r/filesys.c:159 libparted/fs/r/filesys.c:284 #, c-format msgid "resizing %s file systems is not supported" msgstr "ファイルシステム %s のリサイズはサポートしていません" -#: libparted/fs/r/filesys.c:170 +#: libparted/fs/r/filesys.c:171 msgid "The file system is bigger than its volume!" msgstr "ファイルシステムがボリュームより大きいです！" -#: libparted/fs/r/hfs/advfs.c:121 libparted/fs/r/hfs/advfs_plus.c:121 -#: libparted/fs/r/hfs/reloc.c:413 libparted/fs/r/hfs/reloc.c:507 -#: libparted/fs/r/hfs/reloc_plus.c:538 libparted/fs/r/hfs/reloc_plus.c:656 -#: libparted/fs/r/hfs/reloc_plus.c:769 +#: 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:285 +#: libparted/fs/r/hfs/advfs_plus.c:287 msgid "Bad blocks could not be read." msgstr "バッドブロックが読みだせません。" @@ -2087,7 +2044,7 @@ msgstr "" "のがあります。ファイルシステムのチェックを実行すべきです！" #: 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!" @@ -2135,61 +2092,61 @@ msgstr "CNID %2$X の HFS+ ファイルに含まれるセクタ %1$lli が見つ msgid "Trying to write HFS+ file with CNID %X behind EOF." msgstr "CNID %X の HFS+ ファイルを EOF を越えて書きこもうとしました。" -#: libparted/fs/r/hfs/hfs.c:232 +#: libparted/fs/r/hfs/hfs.c:212 msgid "Sorry, HFS cannot be resized that way yet." msgstr "残念ながら、まだ HFS はそのようにリサイズすることはできません。" -#: libparted/fs/r/hfs/hfs.c:250 libparted/fs/r/hfs/hfs.c:629 +#: libparted/fs/r/hfs/hfs.c:230 libparted/fs/r/hfs/hfs.c:573 msgid "shrinking" msgstr "縮小中" -#: libparted/fs/r/hfs/hfs.c:262 libparted/fs/r/hfs/hfs.c:641 +#: 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:281 +#: 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:320 +#: libparted/fs/r/hfs/hfs.c:300 msgid "writing HFS Master Directory Block" msgstr "HFS マスターディレクトリブロックを書込中" -#: libparted/fs/r/hfs/hfs.c:468 +#: libparted/fs/r/hfs/hfs.c:412 msgid "No valid HFS[+X] signature has been found while opening." msgstr "オープン中に正しい HFS[+X] のシグネチャが見つかりませんでした。" -#: libparted/fs/r/hfs/hfs.c:478 +#: libparted/fs/r/hfs/hfs.c:422 #, c-format msgid "Version %d of HFS+ isn't supported." msgstr "Version %d の HFS+ はサポートしていません。" -#: libparted/fs/r/hfs/hfs.c:489 +#: libparted/fs/r/hfs/hfs.c:433 #, c-format msgid "Version %d of HFSX isn't supported." msgstr "Version %d の HFSX はサポートしていません。" -#: libparted/fs/r/hfs/hfs.c:672 +#: 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:720 +#: libparted/fs/r/hfs/hfs.c:664 msgid "Error while writing the allocation file." msgstr "allocation ファイルの書込中にエラーが発生しました。" -#: libparted/fs/r/hfs/hfs.c:735 +#: libparted/fs/r/hfs/hfs.c:679 msgid "Error while writing the compatibility part of the allocation file." msgstr "allocation ファイルの互換性部分に書込中にエラーが発生しました。" -#: libparted/fs/r/hfs/hfs.c:750 +#: libparted/fs/r/hfs/hfs.c:694 msgid "writing HFS+ Volume Header" msgstr "HFS+ ボリュームヘッダの書込中" -#: libparted/fs/r/hfs/hfs.c:850 +#: 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:904 +#: 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." @@ -2197,27 +2154,27 @@ msgstr "" "HFS ラッパーにエラーがあるようです：バッドブロックファイルに埋めこみ HFS+ ボ" "リュームが含まれていません。" -#: libparted/fs/r/hfs/hfs.c:940 +#: libparted/fs/r/hfs/hfs.c:883 msgid "Sorry, HFS+ cannot be resized that way yet." msgstr "残念ながら、まだ HFS+ はそのようにリサイズすることはできません。" -#: libparted/fs/r/hfs/hfs.c:975 +#: libparted/fs/r/hfs/hfs.c:918 msgid "shrinking embedded HFS+ volume" msgstr "埋めこみ HFS+ ボリュームを縮小中" -#: libparted/fs/r/hfs/hfs.c:992 +#: libparted/fs/r/hfs/hfs.c:935 msgid "Resizing the HFS+ volume has failed." msgstr "HFS+ ボリュームのリサイズに失敗しました。" -#: libparted/fs/r/hfs/hfs.c:999 +#: libparted/fs/r/hfs/hfs.c:942 msgid "shrinking HFS wrapper" msgstr "HFS ラッパーを縮小中" -#: libparted/fs/r/hfs/hfs.c:1008 +#: libparted/fs/r/hfs/hfs.c:951 msgid "Updating the HFS wrapper has failed." msgstr "HFS ラッパーの更新に失敗しました。" -#: libparted/fs/r/hfs/hfs.c:1110 libparted/fs/r/hfs/hfs.c:1195 +#: 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 " @@ -2239,7 +2196,6 @@ msgstr "" "りました。" #: 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." @@ -2297,7 +2253,7 @@ msgstr "" msgid "An extent has not been relocated." msgstr "extent は再配置されませんでした。" -#: libparted/fs/r/hfs/reloc.c:250 libparted/fs/r/hfs/reloc_plus.c:307 +#: 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!" @@ -2305,18 +2261,18 @@ msgstr "" "あるべきではないところから extent への参照があります。ファイルシステムの" "チェックを実行するべきです！" -#: libparted/fs/r/hfs/reloc.c:380 +#: libparted/fs/r/hfs/reloc.c:382 msgid "This HFS volume has no catalog file. This is very unusual!" msgstr "" "この HFS ボリュームにはカタログファイルがありません。滅多にないことです！" -#: libparted/fs/r/hfs/reloc.c:474 +#: libparted/fs/r/hfs/reloc.c:479 msgid "This HFS volume has no extents overflow file. This is quite unusual!" msgstr "" "この HFS ボリュームには extent オーバーフローファイルがありません。滅多にあり" "えないことです！" -#: libparted/fs/r/hfs/reloc.c:516 libparted/fs/r/hfs/reloc_plus.c:666 +#: 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." @@ -2324,54 +2280,54 @@ msgstr "" "extent オーバーフローファイルは、その extent 自身を含んではいけません！ファイ" "ルシステムのチェックを実行するべきです。" -#: libparted/fs/r/hfs/reloc.c:573 libparted/fs/r/hfs/reloc_plus.c:844 +#: 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:634 libparted/fs/r/hfs/reloc_plus.c:905 +#: 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:648 libparted/fs/r/hfs/reloc_plus.c:921 +#: libparted/fs/r/hfs/reloc.c:654 libparted/fs/r/hfs/reloc_plus.c:926 msgid "An error occurred during extent relocation." msgstr "extent の再配置中にエラーが発生しました。" -#: libparted/fs/r/hfs/reloc_plus.c:494 +#: libparted/fs/r/hfs/reloc_plus.c:495 msgid "This HFS+ volume has no catalog file. This is very unusual!" msgstr "" "この HFS+ ボリュームにはカタログファイルがありません。滅多にないことです！" -#: libparted/fs/r/hfs/reloc_plus.c:617 +#: libparted/fs/r/hfs/reloc_plus.c:620 msgid "This HFS+ volume has no extents overflow file. This is quite unusual!" msgstr "" "この HFS+ ボリュームには extent オーバーフローファイルがありません。滅多にあ" "りえないことです！" -#: parted/parted.c:125 +#: parted/parted.c:126 msgid "displays this help message" msgstr "このヘルプを表示する" -#: parted/parted.c:126 +#: parted/parted.c:127 msgid "lists partition layout on all block devices" msgstr "全ブロックデバイスのパーティションレイアウトを表示" -#: parted/parted.c:127 +#: parted/parted.c:128 msgid "displays machine parseable output" msgstr "機械が解釈可能な出力をする" -#: parted/parted.c:128 +#: parted/parted.c:129 msgid "never prompts for user intervention" msgstr "ユーザに介入させない" -#: parted/parted.c:129 +#: parted/parted.c:130 msgid "displays the version" msgstr "バージョンを表示する" -#: parted/parted.c:130 +#: parted/parted.c:131 msgid "alignment for new partitions" msgstr "新規パーティションのアライメント" -#: parted/parted.c:142 +#: parted/parted.c:143 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" @@ -2380,32 +2336,32 @@ msgstr "" "ディスクラベルでは、基本パーティション番号は 1 から 4 までで、論理パーティ" "ションは 5 以降となります。\n" -#: parted/parted.c:145 +#: parted/parted.c:146 msgid "LABEL-TYPE is one of: " msgstr "ラベルの種類は次のうちから選びます: " -#: parted/parted.c:146 parted/parted.c:147 +#: parted/parted.c:147 parted/parted.c:148 msgid "FLAG is one of: " msgstr "フラグは次のうちから選びます: " -#: parted/parted.c:148 +#: parted/parted.c:149 msgid "UNIT is one of: " msgstr "UNIT は次のうちから選びます: " -#: parted/parted.c:149 +#: parted/parted.c:150 msgid "desired alignment: minimum or optimal" msgstr "望ましいアライメント: minimum(最小) か optimal(最適)" -#: parted/parted.c:150 +#: parted/parted.c:151 msgid "PART-TYPE is one of: primary, logical, extended\n" msgstr "" "パーティションの種類は次のうちのどれかとなります: プライマリ、論理、拡張\n" -#: parted/parted.c:152 +#: parted/parted.c:153 msgid "FS-TYPE is one of: " msgstr "ファイルシステムの種類は次のうちから選びます: " -#: parted/parted.c:153 +#: parted/parted.c:154 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 " @@ -2414,7 +2370,7 @@ msgstr "" "START と END は、ディスク上の位置を 4GB や 10% などで表わします。負の値はディ" "スクの終わりからの値になります。例えば、-1s は、最後のセクタを指します。\n" -#: parted/parted.c:156 +#: parted/parted.c:157 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" @@ -2422,19 +2378,19 @@ msgstr "" "END は、ディスク上の位置を 4GB や 10% などで表わします。負の値はディスクの終" "わりからの値になります。例えば、-1s は、最後のセクタを指します。\n" -#: parted/parted.c:159 +#: parted/parted.c:160 msgid "STATE is one of: on, off\n" msgstr "状態は on か off のどちらか\n" -#: parted/parted.c:160 +#: parted/parted.c:161 msgid "DEVICE is usually /dev/hda or /dev/sda\n" msgstr "デバイスはたいてい /dev/hda か /dev/sda です。\n" -#: parted/parted.c:161 +#: parted/parted.c:162 msgid "NAME is any word you want\n" msgstr "名前の部分は任意の単語\n" -#: parted/parted.c:164 +#: parted/parted.c:165 msgid "" "Copyright (C) 1998 - 2006 Free Software Foundation, Inc.\n" "This program is free software, covered by the GNU General Public License.\n" @@ -2454,22 +2410,22 @@ msgstr "" "いかなる保証も行ないません。詳細についてはGNU 一般公有使用許諾書をお読みくだ" "さい。\n" -#: parted/parted.c:212 +#: parted/parted.c:213 #, c-format msgid "%0.f%%\t(time left %.2d:%.2d)" msgstr "%0.f%%\t(残り時間 %.2d:%.2d)" -#: parted/parted.c:231 +#: parted/parted.c:232 #, c-format msgid "Partition %s is being used. Are you sure you want to continue?" msgstr "パーティション %s は使用中です。それでも実行しますか？" -#: parted/parted.c:252 +#: parted/parted.c:253 #, c-format msgid "Partition(s) on %s are being used." msgstr "%s のパーティションが使用中です。" -#: parted/parted.c:264 +#: parted/parted.c:265 #, c-format msgid "" "The existing disk label on %s will be destroyed and all data on this disk " @@ -2478,31 +2434,31 @@ msgstr "" "いま存在している %s のディスクラベルは破壊され、このディスクの全データが失わ" "れます。続行しますか？" -#: parted/parted.c:525 +#: parted/parted.c:526 msgid "New disk label type?" msgstr "新しいディスクラベル?" -#: parted/parted.c:662 +#: parted/parted.c:663 msgid "Partition type?" msgstr "パーティションの種類?" -#: parted/parted.c:680 parted/parted.c:884 +#: parted/parted.c:681 parted/parted.c:885 msgid "Partition name?" msgstr "パーティションの名前?" -#: parted/parted.c:690 +#: parted/parted.c:691 msgid "File system type?" msgstr "ファイルシステムの種類?" -#: parted/parted.c:695 parted/parted.c:1498 +#: parted/parted.c:696 parted/parted.c:1499 msgid "Start?" msgstr "開始?" -#: parted/parted.c:698 parted/parted.c:1500 parted/parted.c:1569 +#: parted/parted.c:699 parted/parted.c:1501 parted/parted.c:1585 msgid "End?" msgstr "終了?" -#: parted/parted.c:766 +#: parted/parted.c:767 #, c-format msgid "" "You requested a partition from %s to %s (sectors %llu..%llu).\n" @@ -2511,7 +2467,7 @@ msgstr "" "%s から %s (%llu から %llu セクタ)までのパーティションを指定されました。\n" "可能な中で最も近いものは %s から %s (%llu から %llu セクタ)になります。%s" -#: parted/parted.c:775 +#: parted/parted.c:776 msgid "" "\n" "Is this still acceptable to you?" @@ -2519,95 +2475,95 @@ msgstr "" "\n" "それでもかまいませんか？" -#: parted/parted.c:798 -#, fuzzy, c-format +#: parted/parted.c:799 +#, c-format msgid "" "The resulting partition is not properly aligned for best performance: %s" msgstr "" "操作の結果できるパーティションはアライメントが正しくないためにパフォーマンス" -"がでません。" +"がでません: %s" -#: parted/parted.c:800 parted/parted.c:1723 +#: parted/parted.c:801 parted/parted.c:1739 msgid "unknown (malloc failed)" -msgstr "" +msgstr "不明 (malloc 失敗)" -#: parted/parted.c:876 -#, fuzzy, c-format +#: parted/parted.c:877 +#, c-format msgid "%s disk labels do not support partition name." -msgstr "%s のディスクラベルは拡張パーティションをサポートしていません。" +msgstr "%s のディスクラベルはパーティション名をサポートしていません。" -#: parted/parted.c:881 parted/parted.c:1561 parted/parted.c:1612 -#: parted/parted.c:1706 parted/parted.c:1781 +#: parted/parted.c:882 parted/parted.c:1564 parted/parted.c:1628 +#: parted/parted.c:1722 parted/parted.c:1797 msgid "Partition number?" msgstr "パーティション番号?" -#: parted/parted.c:975 +#: parted/parted.c:976 #, 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:1017 +#: parted/parted.c:1018 #, c-format msgid "Model: %s (%s)\n" msgstr "モデル: %s (%s)\n" -#: parted/parted.c:1019 +#: parted/parted.c:1020 #, c-format msgid "Disk %s: %s\n" msgstr "ディスク %s: %s\n" -#: parted/parted.c:1020 +#: parted/parted.c:1021 #, c-format msgid "Sector size (logical/physical): %lldB/%lldB\n" msgstr "セクタサイズ (論理/物理): %lldB/%lldB\n" -#: parted/parted.c:1032 +#: parted/parted.c:1033 #, c-format msgid "Partition Table: %s\n" msgstr "パーティションテーブル: %s\n" -#: parted/parted.c:1033 +#: parted/parted.c:1034 #, c-format msgid "Disk Flags: %s\n" msgstr "ディスクフラグ: %s\n" -#: parted/parted.c:1153 parted/parted.c:1156 +#: parted/parted.c:1154 parted/parted.c:1157 msgid "Number" msgstr "番号" -#: parted/parted.c:1153 parted/parted.c:1156 +#: parted/parted.c:1154 parted/parted.c:1157 msgid "Start" msgstr "開始" -#: parted/parted.c:1154 parted/parted.c:1157 +#: parted/parted.c:1155 parted/parted.c:1158 msgid "End" msgstr "終了" -#: parted/parted.c:1157 +#: parted/parted.c:1158 msgid "Size" msgstr "サイズ" -#: parted/parted.c:1161 +#: parted/parted.c:1162 msgid "Type" msgstr "タイプ" -#: parted/parted.c:1163 +#: parted/parted.c:1164 msgid "File system" msgstr "ファイルシステム" -#: parted/parted.c:1166 +#: parted/parted.c:1167 msgid "Name" msgstr "名前" -#: parted/parted.c:1168 +#: parted/parted.c:1169 msgid "Flags" msgstr "フラグ" -#: parted/parted.c:1225 +#: parted/parted.c:1226 msgid "Free Space" msgstr "空き容量" -#: parted/parted.c:1385 +#: parted/parted.c:1386 #, c-format msgid "" "A %s %s partition was found at %s -> %s. Do you want to add it to the " @@ -2616,57 +2572,56 @@ msgstr "" "%s %s パーティションが %s → %s の場所に発見されました。このパーティションを" "パーティションテーブルに追加しますか？" -#: parted/parted.c:1428 +#: parted/parted.c:1429 msgid "searching for file systems" msgstr "ファイルシステムを探しています" -#: parted/parted.c:1535 +#: parted/parted.c:1536 msgid "The resize command has been removed in parted 3.0" msgstr "resize コマンドは parted 3.0 で削除されました" -#: parted/parted.c:1583 +#: parted/parted.c:1599 msgid "" "Shrinking a partition can cause data loss, are you sure you want to continue?" msgstr "" "パーティションを縮小するとデータを失うかもしれませんが、それでも実行します" "か？" -#: parted/parted.c:1636 +#: parted/parted.c:1652 msgid "New device?" msgstr "新しいデバイス?" -#: parted/parted.c:1704 +#: parted/parted.c:1720 msgid "alignment type(min/opt)" msgstr "アライメントタイプ(min/opt)" -#: parted/parted.c:1719 +#: parted/parted.c:1735 #, c-format msgid "%d aligned\n" msgstr "%d アライメント済\n" -#: parted/parted.c:1721 -#, fuzzy, c-format +#: parted/parted.c:1737 +#, c-format msgid "%d not aligned: %s\n" -msgstr "%d 未アライメント\n" +msgstr "%d 未アライメント: %s\n" -#: parted/parted.c:1746 parted/parted.c:1783 +#: parted/parted.c:1762 parted/parted.c:1799 msgid "Flag to Invert?" msgstr "反転するフラグ?" -#: parted/parted.c:1751 parted/parted.c:1788 +#: parted/parted.c:1767 parted/parted.c:1804 msgid "New state?" msgstr "新しい状態?" -#: parted/parted.c:1834 +#: parted/parted.c:1850 msgid "Unit?" msgstr "単位は?" -#: parted/parted.c:1969 +#: parted/parted.c:1985 msgid "align-check" msgstr "align-check" -#: parted/parted.c:1972 -#, fuzzy +#: parted/parted.c:1988 msgid "" "align-check TYPE N check partition N for TYPE(min|opt) " "alignment" @@ -2674,43 +2629,43 @@ msgstr "" "align-check TYPE N パーティション N のアライメント(TYPE: min|opt)" "をチェックする" -#: parted/parted.c:1980 +#: parted/parted.c:1996 msgid "help" msgstr "help" -#: parted/parted.c:1983 +#: parted/parted.c:1999 msgid "" "help [COMMAND] print general help, or help on " "COMMAND" msgstr "" "help [コマンド] ヘルプ表示。コマンド指定でそのヘルプを表示" -#: parted/parted.c:1989 +#: parted/parted.c:2005 msgid "mklabel" msgstr "mklabel" -#: parted/parted.c:1989 +#: parted/parted.c:2005 msgid "mktable" msgstr "mktable" -#: parted/parted.c:1992 +#: parted/parted.c:2008 msgid "" "mklabel,mktable LABEL-TYPE create a new disklabel (partition " "table)" msgstr "" "mklabel,mktable ラベルの種類 新しいラベル(パーティションテーブル)を作る" -#: parted/parted.c:1998 +#: parted/parted.c:2014 msgid "mkpart" msgstr "mkpart" -#: parted/parted.c:2001 +#: parted/parted.c:2017 msgid "mkpart PART-TYPE [FS-TYPE] START END make a partition" msgstr "" -"mkpart パーティションの種類 [ファイルシステムの種類] 開始 終了\n" -"　　　　　　　　　　　　パーティションを作る" +"このファイルシステムの論理セクタサイズは %d です. セクタサイズが 512 バイト" +"以外では GNU Parted はうまく動かないことが知られています。" -#: parted/parted.c:2007 +#: parted/parted.c:2023 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,19 +2673,19 @@ msgstr "" "mkpart はパーティションだけ作り、新しいファイルシステムは作りません。ファイル" "システムの種類を指定すると、正しいIDが設定されます。\n" -#: parted/parted.c:2012 +#: parted/parted.c:2028 msgid "name" msgstr "name" -#: parted/parted.c:2015 +#: parted/parted.c:2031 msgid "name NUMBER NAME name partition NUMBER as NAME" msgstr "name NUMBER 名前 パーティションに名前をつける" -#: parted/parted.c:2020 +#: parted/parted.c:2036 msgid "print" msgstr "print" -#: parted/parted.c:2023 +#: parted/parted.c:2039 msgid "" "print [devices|free|list,all|NUMBER] display the partition table, " "available devices, free space, all found partitions, or a particular " @@ -2742,7 +2697,7 @@ msgstr "" "　　　　　　　　　　　 見つかった全てのパーティション、あるいは特定のパー" "ティションについて表示する" -#: parted/parted.c:2028 +#: parted/parted.c:2044 msgid "" "Without arguments, 'print' displays the entire partition table. However with " "the following arguments it performs various other actions.\n" @@ -2750,11 +2705,11 @@ msgstr "" "引数をつけない場合、'print' コマンドは、全パーティションテーブルを表示しま" "す。次の引数をつけることが可能です。\n" -#: parted/parted.c:2030 +#: parted/parted.c:2046 msgid " devices : display all active block devices\n" msgstr " devices : 全てのアクティブなブロックデバイスを表示\n" -#: parted/parted.c:2031 +#: parted/parted.c:2047 msgid "" " free : display information about free unpartitioned space on the " "current block device\n" @@ -2762,31 +2717,31 @@ msgstr "" " free : カレントブロックデバイスのパーティションに含まれていない空き領" "域情報を表示\n" -#: parted/parted.c:2033 +#: parted/parted.c:2049 msgid "" " list, all : display the partition tables of all active block devices\n" msgstr "" " list, all : アクティブな全ブロックデバイスのパーティションテーブルを表示\n" -#: parted/parted.c:2034 +#: parted/parted.c:2050 msgid "" " NUMBER : display more detailed information about this particular " "partition\n" msgstr " NUMBER : 指定したパーティションについてより詳しい情報を表示\n" -#: parted/parted.c:2039 +#: parted/parted.c:2055 msgid "quit" msgstr "quit" -#: parted/parted.c:2042 +#: parted/parted.c:2058 msgid "quit exit program" msgstr "quit プログラムを終了する" -#: parted/parted.c:2047 +#: parted/parted.c:2063 msgid "rescue" msgstr "rescue" -#: parted/parted.c:2050 +#: parted/parted.c:2066 msgid "" "rescue START END rescue a lost partition near START " "and END" @@ -2794,127 +2749,135 @@ msgstr "" "rescue 開始 終了 開始、終了で指定した範囲付近にあるパーティショ" "ンを復活させる" -#: parted/parted.c:2056 +#: parted/parted.c:2072 msgid "resize" msgstr "resize" -#: parted/parted.c:2059 +#: parted/parted.c:2075 msgid "The resize command was removed in parted 3.0\n" msgstr "resize コマンドは parted 3.0 で削除されました\n" -#: parted/parted.c:2062 +#: parted/parted.c:2078 msgid "resizepart" msgstr "resizepart" -#: parted/parted.c:2065 +#: parted/parted.c:2081 msgid "resizepart NUMBER END resize partition NUMBER" msgstr "" "resizepart NUMBER END パーティション NUMBER を END にリサイズする" -#: parted/parted.c:2070 +#: parted/parted.c:2086 msgid "rm" msgstr "rm" -#: parted/parted.c:2073 +#: parted/parted.c:2089 msgid "rm NUMBER delete partition NUMBER" msgstr "rm NUMBER パーティションを削除する" -#: parted/parted.c:2078 +#: parted/parted.c:2094 msgid "select" msgstr "select" -#: parted/parted.c:2081 +#: parted/parted.c:2097 msgid "select DEVICE choose the device to edit" msgstr "select デバイス 操作するデバイスを選択" -#: parted/parted.c:2086 +#: parted/parted.c:2102 msgid "disk_set" msgstr "disk_set" -#: parted/parted.c:2089 +#: parted/parted.c:2105 msgid "" "disk_set FLAG STATE change the FLAG on selected device" msgstr "disk_set FLAG STATE 選択したデバイスの FLAG を変更" -#: parted/parted.c:2094 +#: parted/parted.c:2110 msgid "disk_toggle" msgstr "disk_toggle" -#: parted/parted.c:2097 +#: parted/parted.c:2113 msgid "" "disk_toggle [FLAG] toggle the state of FLAG on " "selected device" msgstr "disk_toggle [FLAG] 選択したデバイスの FLAG の状態をトグル" -#: parted/parted.c:2103 +#: parted/parted.c:2119 msgid "set" msgstr "set" -#: parted/parted.c:2106 +#: parted/parted.c:2122 msgid "" "set NUMBER FLAG STATE change the FLAG on partition NUMBER" msgstr "set NUMBER フラグ 状態 ファイルシステムのフラグと状態を設定する" -#: parted/parted.c:2112 +#: parted/parted.c:2128 msgid "toggle" msgstr "toggle" -#: parted/parted.c:2115 +#: parted/parted.c:2131 msgid "" "toggle [NUMBER [FLAG]] toggle the state of FLAG on " "partition NUMBER" msgstr "toggle [NUMBER [FLAG]] パーティションのフラグの状態を反転する" -#: parted/parted.c:2121 +#: parted/parted.c:2137 msgid "unit" msgstr "unit" -#: parted/parted.c:2124 +#: parted/parted.c:2140 msgid "unit UNIT set the default unit to UNIT" msgstr "unit UNIT デフォルトの単位を UNIT にする" -#: parted/parted.c:2129 +#: parted/parted.c:2145 msgid "version" msgstr "version" -#: parted/parted.c:2132 +#: parted/parted.c:2148 msgid "" "version display the version number and " "copyright information of GNU Parted" msgstr "" "version GNU Parted のバージョンと著作権情報を表示" -#: parted/parted.c:2136 +#: parted/parted.c:2152 msgid "" "'version' displays copyright and version information corresponding to this " "copy of GNU Parted\n" msgstr "" "version は、実行中の GNU Parted のバージョンと著作権情報を表示します。\n" -#: parted/parted.c:2204 +#: parted/parted.c:2220 #, c-format msgid "Usage: %s [-hlmsv] [-a] [DEVICE [COMMAND [PARAMETERS]]...]\n" msgstr "" "使い方: %s [-hlmsv] [-a<アライン>] [デバイス [コマンド [パラメータ]]...]\n" -#: parted/parted.c:2248 +#: parted/parted.c:2264 msgid "No device found" msgstr "デバイスがみつかりません。" -#: parted/parted.c:2285 +#: parted/parted.c:2301 msgid "WARNING: You are not superuser. Watch out for permissions.\n" msgstr "警告: 管理者権限がありません。パーミッションに注意してください。\n" -#: parted/parted.c:2325 +#: parted/parted.c:2334 +msgid "" +"You should reinstall your boot loader before rebooting. Read section 4 of " +"the Parted User documentation for more information." +msgstr "" +"再起動する前にブートローダをいれなおすべきです。詳細は Parted ユーザドキュメ" +"ントの4章を読んでください。" + +#: parted/parted.c:2341 msgid "You may need to update /etc/fstab.\n" msgstr "必要であれば /etc/fstab を更新するのを忘れないようにしてください。\n" -#: parted/ui.c:164 +#: parted/ui.c:165 msgid "Welcome to GNU Parted! Type 'help' to view a list of commands.\n" msgstr "" "GNU Parted へようこそ！ コマンド一覧を見るには 'help' と入力してください。\n" -#: parted/ui.c:167 +#: parted/ui.c:168 msgid "" "Usage: parted [OPTION]... [DEVICE [COMMAND [PARAMETERS]...]...]\n" "Apply COMMANDs with PARAMETERS to DEVICE. If no COMMAND(s) are given, run " @@ -2925,7 +2888,7 @@ msgstr "" "デバイスに対してパラメータに従ってコマンドを実行します。もしコマンドが指定さ" "れなければ、対話モードに入ります。\n" -#: parted/ui.c:172 +#: parted/ui.c:173 #, c-format msgid "" "\n" @@ -2989,7 +2952,7 @@ msgstr "" "その他重要と思う情報を記述してください。\n" "\n" -#: parted/ui.c:293 +#: parted/ui.c:294 msgid "" "\n" "Command History:\n" @@ -2997,7 +2960,7 @@ msgstr "" "\n" "コマンド履歴:\n" -#: parted/ui.c:356 +#: parted/ui.c:357 msgid "" "\n" "Error: SEGV_MAPERR (Address not mapped to object)\n" @@ -3005,7 +2968,7 @@ msgstr "" "\n" "エラー: SEGV_MAPERR (アドレスがオブジェクトに変換されませんでした)\n" -#: parted/ui.c:362 +#: parted/ui.c:363 msgid "" "\n" "Error: SEGV_ACCERR (Invalid permissions for mapped object)\n" @@ -3013,7 +2976,7 @@ msgstr "" "\n" "エラー: SEGV_ACCERR (マップされたオブジェクトのパーミッションが不正です)\n" -#: parted/ui.c:367 +#: parted/ui.c:368 msgid "" "\n" "Error: A general SIGSEGV signal was encountered.\n" @@ -3021,7 +2984,7 @@ msgstr "" "\n" "エラー: SIGSEGV シグナルを受けとりました。\n" -#: parted/ui.c:391 +#: parted/ui.c:392 msgid "" "\n" "Error: FPE_INTDIV (Integer: divide by zero)" @@ -3029,7 +2992,7 @@ msgstr "" "\n" "エラー: FPE_INTDIV (整数: 0による除算)" -#: parted/ui.c:396 +#: parted/ui.c:397 msgid "" "\n" "Error: FPE_INTOVF (Integer: overflow)" @@ -3037,7 +3000,7 @@ msgstr "" "\n" "エラー: FPE_INTOVF (整数: オーバーフロー)" -#: parted/ui.c:401 +#: parted/ui.c:402 msgid "" "\n" "Error: FPE_FLTDIV (Float: divide by zero)" @@ -3045,7 +3008,7 @@ msgstr "" "\n" "エラー: FPE_FLTDIV (浮動小数点: 0による除算)" -#: parted/ui.c:406 +#: parted/ui.c:407 msgid "" "\n" "Error: FPE_FLTOVF (Float: overflow)" @@ -3053,7 +3016,7 @@ msgstr "" "\n" "エラー: FPE_FLTOVF (浮動小数点: オーバーフロー)" -#: parted/ui.c:411 +#: parted/ui.c:412 msgid "" "\n" "Error: FPE_FLTUND (Float: underflow)" @@ -3061,7 +3024,7 @@ msgstr "" "\n" "エラー: FPE_FLTUND (浮動小数点: アンダーフロー)" -#: parted/ui.c:416 +#: parted/ui.c:417 msgid "" "\n" "Error: FPE_FLTRES (Float: inexact result)" @@ -3069,7 +3032,7 @@ msgstr "" "\n" "エラー: FPE_FLTRES (浮動小数点: 正しくない結果)" -#: parted/ui.c:421 +#: parted/ui.c:422 msgid "" "\n" "Error: FPE_FLTINV (Float: invalid operation)" @@ -3078,7 +3041,7 @@ msgstr "" "\n" "エラー: FPE_FLTINV (浮動小数点: 不正な操作)" -#: parted/ui.c:426 +#: parted/ui.c:427 msgid "" "\n" "Error: FPE_FLTSUB (Float: subscript out of range)" @@ -3086,7 +3049,7 @@ msgstr "" "\n" "エラー: FPE_FLTSUB (浮動小数点: 添字が範囲を越えました)" -#: parted/ui.c:431 +#: parted/ui.c:432 msgid "" "\n" "Error: A general SIGFPE signal was encountered." @@ -3094,7 +3057,7 @@ msgstr "" "\n" "エラー: SIGFPE シグナルを受けとりました。" -#: parted/ui.c:455 +#: parted/ui.c:456 msgid "" "\n" "Error: ILL_ILLOPC (Illegal Opcode)" @@ -3102,7 +3065,7 @@ msgstr "" "\n" "エラー: ILL_ILLOPC (不正なオペコード)" -#: parted/ui.c:460 +#: parted/ui.c:461 msgid "" "\n" "Error: ILL_ILLOPN (Illegal Operand)" @@ -3110,7 +3073,7 @@ msgstr "" "\n" "エラー: ILL_ILLOPN (不正なオペランド)" -#: parted/ui.c:465 +#: parted/ui.c:466 msgid "" "\n" "Error: ILL_ILLADR (Illegal addressing mode)" @@ -3118,7 +3081,7 @@ msgstr "" "\n" "エラー: ILL_ILLADR (不正なアドレスモード)" -#: parted/ui.c:470 +#: parted/ui.c:471 msgid "" "\n" "Error: ILL_ILLTRP (Illegal Trap)" @@ -3126,7 +3089,7 @@ msgstr "" "\n" "エラー: ILL_ILLTRP (不正なトラップ)" -#: parted/ui.c:475 +#: parted/ui.c:476 msgid "" "\n" "Error: ILL_PRVOPC (Privileged Opcode)" @@ -3134,7 +3097,7 @@ msgstr "" "\n" "エラー: ILL_PRVOPC (特権が必要なオペコード)" -#: parted/ui.c:480 +#: parted/ui.c:481 msgid "" "\n" "Error: ILL_PRVREG (Privileged Register)" @@ -3142,7 +3105,7 @@ msgstr "" "\n" "エラー: ILL_PRVREG (特権が必要なレジスタ)" -#: parted/ui.c:485 +#: parted/ui.c:486 msgid "" "\n" "Error: ILL_COPROC (Coprocessor Error)" @@ -3150,7 +3113,7 @@ msgstr "" "\n" "エラー: ILL_COPROC (コプロセッサエラー)" -#: parted/ui.c:490 +#: parted/ui.c:491 msgid "" "\n" "Error: ILL_BADSTK (Internal Stack Error)" @@ -3158,7 +3121,7 @@ msgstr "" "\n" "エラー: ILL_BADSTK (インターナルスタックエラー)" -#: parted/ui.c:495 +#: parted/ui.c:496 msgid "" "\n" "Error: A general SIGILL signal was encountered." @@ -3166,69 +3129,69 @@ msgstr "" "\n" "エラー: SIGILL シグナルを受けとりました。" -#: parted/ui.c:888 +#: parted/ui.c:889 #, c-format msgid "invalid token: %s" msgstr "不正なトークンです: %s" -#: parted/ui.c:1069 +#: parted/ui.c:1070 msgid "Expecting a partition number." msgstr "パーティション番号を入力してください。" -#: parted/ui.c:1078 +#: parted/ui.c:1079 msgid "Partition doesn't exist." msgstr "パーティションがありません。" -#: parted/ui.c:1098 +#: parted/ui.c:1099 msgid "Expecting a file system type." msgstr "ファイルシステムの種類を入力してください。" -#: parted/ui.c:1105 +#: parted/ui.c:1106 #, c-format msgid "Unknown file system type \"%s\"." msgstr "ファイルシステムの種類 \"%s\" は不明です。" -#: parted/ui.c:1126 +#: parted/ui.c:1127 msgid "Expecting a disk label type." msgstr "ディスクラベルの種類を入力してください。" -#: parted/ui.c:1157 parted/ui.c:1193 +#: parted/ui.c:1158 parted/ui.c:1194 msgid "No flags supported" -msgstr "" +msgstr "フラグがサポートされていません" -#: parted/ui.c:1267 +#: parted/ui.c:1268 msgid "Can't create any more partitions." msgstr "パーティションを追加できません。" -#: parted/ui.c:1277 +#: parted/ui.c:1278 msgid "Expecting a partition type." msgstr "パーティションの種類を入力してください。" -#: parted/ui.c:1426 +#: parted/ui.c:1427 msgid "on" msgstr "on" -#: parted/ui.c:1427 +#: parted/ui.c:1428 msgid "off" msgstr "off" -#: parted/ui.c:1444 +#: parted/ui.c:1445 msgid "optimal" msgstr "最適(optimal)" -#: parted/ui.c:1445 +#: parted/ui.c:1446 msgid "minimal" msgstr "最小(minimal)" -#: parted/ui.c:1578 +#: parted/ui.c:1579 msgid "OPTIONs:" msgstr "オプション" -#: parted/ui.c:1583 +#: parted/ui.c:1584 msgid "COMMANDs:" msgstr "コマンド:" -#: parted/ui.c:1586 +#: parted/ui.c:1587 #, c-format msgid "" "\n" @@ -3237,33 +3200,11 @@ msgstr "" "\n" "バグレポートは %s へ。\n" -#: parted/ui.c:1593 +#: parted/ui.c:1594 #, c-format msgid "Using %s\n" msgstr "%s を使用\n" -#: parted/ui.c:1673 +#: parted/ui.c:1674 msgid "This command does not make sense in non-interactive mode.\n" msgstr "このコマンドは対話操作モードでなければ意味がありません。\n" - -#~ msgid "%s: option '--%s' doesn't allow an argument\n" -#~ msgstr "%s: オプション '--%s' は引数を受けとりません\n" - -#~ msgid "%s: unrecognized option '--%s'\n" -#~ msgstr "%s: '--%s' は認識できないオプションです\n" - -#~ msgid "%s: option '-W %s' doesn't allow an argument\n" -#~ msgstr "%s: オプション '-W %s' は引数を受けとりません\n" - -#~ msgid "%s: option '-W %s' requires an argument\n" -#~ msgstr "%s: オプション '-W %s' には引数が必要です\n" - -#~ msgid "%s home page: \n" -#~ msgstr "%s ホームページ: \n" - -#~ 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." -#~ msgstr "" -#~ "このファイルシステムの論理セクタサイズは %d です. セクタサイズが 512 バイ" -#~ "ト以外では GNU Parted はうまく動かないことが知られています。" diff --git a/po/ko.gmo b/po/ko.gmo index 53372e4f312406306b3aba8fce2dde313cf63323..67592b033651b784f12cbad3519e06f9d86efe35 100644 GIT binary patch delta 17472 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 diff --git a/po/ko.po b/po/ko.po index ed536f3..6c45dfe 100644 --- a/po/ko.po +++ b/po/ko.po @@ -1,13 +1,13 @@ # Korean translation for the parted package. # This file is distributed under the same license as the parted package. -# Seong-ho Cho , 2016. +# Seong-ho Cho , 2016, 2021. # msgid "" msgstr "" -"Project-Id-Version: parted 3.1.90\n" +"Project-Id-Version: parted 3.3.52\n" "Report-Msgid-Bugs-To: bug-parted@gnu.org\n" -"POT-Creation-Date: 2019-10-10 16:35-0700\n" -"PO-Revision-Date: 2016-03-20 22:41+0900\n" +"POT-Creation-Date: 2021-01-27 16:00-0800\n" +"PO-Revision-Date: 2021-01-19 15:31+0900\n" "Last-Translator: Seong-ho Cho \n" "Language-Team: Korean \n" "Language: ko\n" @@ -15,7 +15,7 @@ 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: Gtranslator 2.91.7\n" +"X-Generator: Poedit 2.2.1\n" "Plural-Forms: nplurals=1; plural=0;\n" #: lib/argmatch.c:132 @@ -41,29 +41,29 @@ msgid "Unknown system error" msgstr "알 수 없는 시스템 오류" #: lib/getopt.c:278 -#, fuzzy, c-format +#, c-format msgid "%s: option '%s%s' is ambiguous\n" -msgstr "%s: ‘-W %s’ 옵션은 애매합니다\n" +msgstr "%s: '%s%s' 옵션은 애매합니다\n" #: lib/getopt.c:284 -#, fuzzy, c-format +#, c-format msgid "%s: option '%s%s' is ambiguous; possibilities:" -msgstr "%s: ‘%s’ 옵션은 애매합니다. 대신 쓸 수 있는 옵션은 다음과 같습니다:" +msgstr "%s: ‘%s%s’ 옵션은 애매합니다. 쓸 수 있는 옵션은 다음과 같습니다:" #: lib/getopt.c:319 -#, fuzzy, c-format +#, c-format msgid "%s: unrecognized option '%s%s'\n" -msgstr "%s: 인식할 수 없는 ‘%c%s’ 옵션\n" +msgstr "%s: 인식할 수 없는 ‘%s%s’ 옵션\n" #: lib/getopt.c:345 -#, fuzzy, c-format +#, c-format msgid "%s: option '%s%s' doesn't allow an argument\n" -msgstr "%s: ‘%c%s’ 옵션은 인자를 허용하지 않습니다\n" +msgstr "%s: ‘%s%s’ 옵션은 인자를 허용하지 않습니다\n" #: lib/getopt.c:360 -#, fuzzy, c-format +#, c-format msgid "%s: option '%s%s' requires an argument\n" -msgstr "%s: ‘--%s’ 옵션은 인자가 필요합니다\n" +msgstr "%s: ‘%s%s’ 옵션은 인자가 필요합니다\n" #: lib/getopt.c:621 #, c-format @@ -96,11 +96,11 @@ msgstr "%s: 옵션에 인자가 필요합니다 -- ‘%c’\n" #. If you don't know what to put here, please see #. #. and use glyphs suitable for your language. -#: lib/quotearg.c:362 +#: lib/quotearg.c:355 msgid "`" msgstr "`" -#: lib/quotearg.c:363 +#: lib/quotearg.c:356 msgid "'" msgstr "‘" @@ -133,9 +133,8 @@ msgid "Invalid back reference" msgstr "잘못된 역 참조" #: lib/regcomp.c:156 -#, fuzzy msgid "Unmatched [, [^, [:, [., or [=" -msgstr "일치하지 않는 [ 또는 [^" +msgstr "일치하지 않는 [ 또는 [^, [:, [., [=" #: lib/regcomp.c:159 msgid "Unmatched ( or \\(" @@ -216,18 +215,16 @@ msgstr "(C)" #. 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" -"License GPLv3+: GNU GPL version 3 or later .\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" -"\n" +"라이선스 GPLv3+: GNU GPL 버전 3 이상 <%s>.\n" +"이 프로그램은 자유 소프트웨어입니다: 자유롭게 바꾸거나 재배포할 수 있습니" +"다.\n" +"법이 허용하는 한도까지 보증할 수 없습니다.\n" #. TRANSLATORS: %s denotes an author name. #: lib/version-etc.c:105 @@ -342,11 +339,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" -"버그 ë³´ê³  주소: %s\n" +msgstr "버그 ë³´ê³  주소: %s\n" #: lib/version-etc.c:251 #, c-format @@ -359,40 +354,25 @@ msgid "%s home page: <%s>\n" msgstr "%s 홈페이지: <%s>\n" #: lib/version-etc.c:260 -#, fuzzy, c-format +#, c-format msgid "General help using GNU software: <%s>\n" -msgstr "GNU 프로그램 활용 일반 도움말: \n" +msgstr "GNU 프로그램 활용 일반 도움말: <%s>\n" #: lib/xalloc-die.c:34 msgid "memory exhausted" msgstr "메모리가 부족합니다" -#: lib/xstrtol-error.c:63 -#, c-format -msgid "invalid %s%s argument '%s'" -msgstr "잘못된 %s%s 인자 ‘%s’" - -#: lib/xstrtol-error.c:68 -#, c-format -msgid "invalid suffix in %s%s argument '%s'" -msgstr "%s%s 인자의 '%s'에 잘못된 접미부" - -#: lib/xstrtol-error.c:72 -#, c-format -msgid "%s%s argument '%s' too large" -msgstr "%s%s 인자의 ‘%s’이(가) 너무 큽니다" - -#: libparted/arch/beos.c:245 +#: libparted/arch/beos.c:246 msgid "Disk Image" msgstr "디스크 이미지" -#: libparted/arch/beos.c:346 libparted/arch/gnu.c:277 +#: libparted/arch/beos.c:347 libparted/arch/gnu.c:277 #: libparted/arch/linux.c:1731 #, c-format msgid "Error opening %s: %s" msgstr "%s 열기 오류: %s" -#: libparted/arch/beos.c:357 libparted/arch/gnu.c:287 +#: libparted/arch/beos.c:358 libparted/arch/gnu.c:287 #: libparted/arch/linux.c:1742 #, c-format msgid "Unable to open %s read-write (%s). %s has been opened read-only." @@ -400,47 +380,47 @@ msgstr "" "%s을(를) 읽기/쓰기 용도로 열 수 없습니다(%s). %s을(를) 읽기 전용으로 열었습니" "다." -#: libparted/arch/beos.c:419 libparted/arch/linux.c:1907 +#: libparted/arch/beos.c:420 libparted/arch/linux.c:1907 #, c-format msgid "%s during seek for read on %s" msgstr "%2$s 읽기 용도로 탐색 중 %1$s" -#: libparted/arch/beos.c:452 libparted/arch/gnu.c:465 libparted/arch/gnu.c:564 -#: libparted/arch/gnu.c:692 libparted/arch/linux.c:1867 +#: libparted/arch/beos.c:453 libparted/arch/gnu.c:425 libparted/arch/gnu.c:524 +#: libparted/arch/gnu.c:652 libparted/arch/linux.c:1867 #: libparted/arch/linux.c:1949 #, c-format msgid "%s during read on %s" msgstr "%2$s을(를) 읽는 중 %1$s" -#: libparted/arch/beos.c:488 libparted/arch/gnu.c:525 +#: libparted/arch/beos.c:489 libparted/arch/gnu.c:485 #: libparted/arch/linux.c:2026 #, c-format msgid "Can't write to %s, because it is opened read-only." msgstr "읽기 전용으로 열어 %s에 쓸 수 없습니다." -#: libparted/arch/beos.c:504 libparted/arch/linux.c:2051 +#: libparted/arch/beos.c:505 libparted/arch/linux.c:2051 #, c-format msgid "%s during seek for write on %s" msgstr "%2$s에 기록 용도로 탐색 중 %1$s" -#: libparted/arch/beos.c:541 libparted/arch/gnu.c:601 libparted/arch/gnu.c:646 -#: libparted/arch/gnu.c:723 libparted/arch/linux.c:1999 +#: libparted/arch/beos.c:542 libparted/arch/gnu.c:561 libparted/arch/gnu.c:606 +#: libparted/arch/gnu.c:683 libparted/arch/linux.c:1999 #: libparted/arch/linux.c:2094 libparted/arch/linux.c:2167 #, c-format msgid "%s during write on %s" msgstr "%2$s에 기록 중 %1$s" -#: partprobe/partprobe.c:148 +#: partprobe/partprobe.c:149 #, c-format msgid "Try `%s --help' for more information.\n" msgstr "자세한 정보는 ‘%s --help’를 입력하십시오.\n" -#: partprobe/partprobe.c:152 +#: partprobe/partprobe.c:153 #, c-format msgid "Usage: %s [OPTION] [DEVICE]...\n" msgstr "사용법: %s [<옵션>] [<장치>]...\n" -#: partprobe/partprobe.c:153 +#: partprobe/partprobe.c:154 msgid "" "Inform the operating system about partition table changes.\n" "\n" @@ -456,7 +436,7 @@ msgstr "" " -h, —help 이 도움말을 나타낸 후 빠져나갑니다\n" " -v, —version 버전 정보를 출력한 후 빠져나갑니다\n" -#: partprobe/partprobe.c:161 +#: partprobe/partprobe.c:162 msgid "" "\n" "When no DEVICE is given, probe all partitions.\n" @@ -464,7 +444,7 @@ msgstr "" "\n" "<장치> 값이 없으면, 모든 분할 영역을 찾습니다.\n" -#: partprobe/partprobe.c:165 +#: partprobe/partprobe.c:166 #, c-format msgid "" "\n" @@ -482,40 +462,7 @@ msgstr "%s을(를) 열 수 없습니다." msgid "Unable to probe store." msgstr "저장 장치를 찾을 수 없습니다." -#: libparted/arch/gnu.c:368 -msgid "" -"The partition table cannot be re-read. This means you need to reboot before " -"mounting any modified partitions. You also need to reinstall your boot " -"loader before you reboot (which may require mounting modified partitions). " -"It is impossible do both things! So you'll need to boot off a rescue disk, " -"and reinstall your boot loader from the rescue disk. Read section 4 of the " -"Parted User documentation for more information." -msgstr "" -"분할 영역 테이블을 다시 읽을 수 없습니다. 수정한 분할 영역을 마운트하기 전에 " -"다시 부팅해야 합니다. 다시 부팅하기 전에 부트 로더를 다시 설치해야 합니다(수" -"정한 분할 영역을 마운트하려면 필요합니다). 두 가지를 다 처리할 수 없습니다. " -"복구 디스크로 부팅하고 복구 디스크로 부트 로더를 다시 설치해야 합니다. 자세" -"한 정보는 Parted 사용자 문서 4장을 살펴보십시오." - -#: libparted/arch/gnu.c:385 -#, 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 computer " -"before doing anything with %s." -msgstr "" -"%s의 분할 영역 테이블을 다시 읽을 수 없습니다(%s). Hurd에서 수정 내역을 파악" -"하지 못합니다. %s(으)로 무언가를 진행하기 전에 컴퓨터를 다시 부팅해야 합니다." - -#: libparted/arch/gnu.c:396 parted/parted.c:2318 -msgid "" -"You should reinstall your boot loader before rebooting. Read section 4 of " -"the Parted User documentation for more information." -msgstr "" -"다시 부팅하기 전 부트 로더를 다시 설치해야 합니다. 자세한 정보는 Parted 사용" -"자 문서 4장을 살펴보십시오." - -#: libparted/arch/gnu.c:788 +#: libparted/arch/gnu.c:748 #, c-format msgid "%s trying to sync %s to disk" msgstr "%s에서 디스크로 %s 동기화를 시도합니다" @@ -603,9 +550,8 @@ msgid "Generic SD/MMC Storage Card" msgstr "일반 SD/MMC 저장소 카드" #: libparted/arch/linux.c:1422 -#, fuzzy msgid "NVMe Device" -msgstr "새 장치?" +msgstr "NVMe 장치" #: libparted/arch/linux.c:1483 msgid "DAC960 RAID controller" @@ -633,7 +579,7 @@ msgstr "컴팩 스마트 어레이" #: libparted/arch/linux.c:1520 msgid "NVDIMM Device" -msgstr "" +msgstr "NVDIMM 장치" #: libparted/arch/linux.c:1525 msgid "ATARAID Controller" @@ -674,7 +620,7 @@ msgstr "리눅스 소프트웨어 RAID 어레이" #: libparted/arch/linux.c:1588 msgid "RAM Drive" -msgstr "" +msgstr "RAM 드라이브" #: libparted/arch/linux.c:1595 msgid "ped_device_new() Unsupported device type" @@ -829,15 +775,15 @@ msgstr "metadata" msgid "free" msgstr "free" -#: libparted/disk.c:2355 parted/ui.c:1258 parted/ui.c:1286 +#: libparted/disk.c:2355 parted/ui.c:1259 parted/ui.c:1287 msgid "extended" msgstr "extended" -#: libparted/disk.c:2357 parted/ui.c:1262 parted/ui.c:1290 +#: libparted/disk.c:2357 parted/ui.c:1263 parted/ui.c:1291 msgid "logical" msgstr "logical" -#: libparted/disk.c:2359 parted/ui.c:1254 parted/ui.c:1282 +#: libparted/disk.c:2359 parted/ui.c:1255 parted/ui.c:1283 msgid "primary" msgstr "primary" @@ -913,64 +859,72 @@ msgstr "irst" msgid "esp" msgstr "esp" -#: libparted/disk.c:2415 +#: libparted/disk.c:2411 +msgid "chromeos_kernel" +msgstr "chromeos_kernel" + +#: libparted/disk.c:2413 +msgid "bls_boot" +msgstr "bls_boot" + +#: libparted/disk.c:2419 #, c-format msgid "Unknown partition flag, %d." msgstr "알 수 없는 분할 영역의 %d 플래그입니다." -#: libparted/exception.c:78 +#: libparted/exception.c:79 msgid "Information" msgstr "정보" -#: libparted/exception.c:79 +#: libparted/exception.c:80 msgid "Warning" msgstr "경고" -#: libparted/exception.c:80 +#: libparted/exception.c:81 msgid "Error" msgstr "오류" -#: libparted/exception.c:81 +#: libparted/exception.c:82 msgid "Fatal" msgstr "실패" -#: libparted/exception.c:82 +#: libparted/exception.c:83 msgid "Bug" msgstr "버그" -#: libparted/exception.c:83 +#: libparted/exception.c:84 msgid "No Implementation" msgstr "기능 없음" -#: libparted/exception.c:87 +#: libparted/exception.c:88 msgid "Fix" msgstr "고침" -#: libparted/exception.c:88 +#: libparted/exception.c:89 msgid "Yes" msgstr "예" -#: libparted/exception.c:89 +#: libparted/exception.c:90 msgid "No" msgstr "아니요" -#: libparted/exception.c:90 +#: libparted/exception.c:91 msgid "OK" msgstr "확인" -#: libparted/exception.c:91 +#: libparted/exception.c:92 msgid "Retry" msgstr "다시 시도" -#: libparted/exception.c:92 +#: libparted/exception.c:93 msgid "Ignore" msgstr "무시" -#: libparted/exception.c:93 +#: libparted/exception.c:94 msgid "Cancel" msgstr "취소" -#: libparted/exception.c:133 +#: libparted/exception.c:134 #, c-format msgid "" "A bug has been detected in GNU Parted. Refer to the web site of parted " @@ -982,96 +936,100 @@ msgstr "" "html Parted 웹사이트에서 버그 제출에 유용한 정보를 찾아보십시오! %s에게 버전" "(%s) 정보와 다음 메시지를 넣어 버그 보고서를 메일로 보내주십시오:" -#: libparted/labels/aix.c:91 +#: libparted/labels/aix.c:92 msgid "Support for reading AIX disk labels is is not implemented yet." msgstr "AIC 디스크 레이블의 읽기 지원 기능이 없습니다." -#: libparted/labels/aix.c:102 +#: libparted/labels/aix.c:103 msgid "Support for writing AIX disk labels is is not implemented yet." msgstr "AIX 디스크 레이블 기록 지원 기능이 없습니다." -#: libparted/labels/aix.c:115 +#: libparted/labels/aix.c:116 msgid "" "Support for adding partitions to AIX disk labels is not implemented yet." msgstr "AIX 디스크 레이블의 분할 영역 추가 지원 기능이 없습니다." -#: libparted/labels/aix.c:125 +#: libparted/labels/aix.c:126 msgid "" "Support for duplicating partitions in AIX disk labels is not implemented yet." msgstr "AIX 디스크 레이블의 분할 영역 복제 지원 기능이 없습니다." -#: libparted/labels/aix.c:143 +#: 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:153 +#: libparted/labels/aix.c:154 msgid "Support for setting flags in AIX disk labels is not implemented yet." msgstr "AIX 디스크 레이블의 설정 플래그 지원 기능이 없습니다." #: libparted/labels/atari.c:273 -#, 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에서 섹터 크기가 %d 바이트가 아닌 HFS 파일 시스템 디스크를 사용할 수 없" -"습니다." +"Parted에서 섹터 크기가 %d 바이트가 아닌 아타리 분할 영역 테이블을 사용할 수 " +"없습니다." #: libparted/labels/atari.c:285 #, c-format msgid "Can't use Atari partition tables on disks with more than %d sectors." -msgstr "" +msgstr "디스크의 아타리 분할 테이블에서는 %d 섹터 이상 사용할 수 없습니다." #: libparted/labels/atari.c:398 msgid "" "Too many Atari partitions detected. Maybe there is a loop in the XGM linked " "list. Aborting." msgstr "" +"아타리 분할 영역이 너무 많습니다. 아마도 XGM 연결 리스트에 루프가 있는 것 같" +"습니다. 중단함." #: libparted/labels/atari.c:596 #, c-format msgid "No data partition found in the ARS at sector %lli." -msgstr "" +msgstr "%lli번 섹터의 ARS에 데이터 분할 영역이 없습니다." #: libparted/labels/atari.c:617 #, c-format msgid "" "The entry of the next logical ARS is not of type XGM in ARS at sector %lli." -msgstr "" +msgstr "다음 논리 ARS 항목은 %lli번 섹터 ARS의 XGM 형식이 아닙니다." #: libparted/labels/atari.c:648 #, c-format msgid "" "There doesn't seem to be an Atari partition table on this disk (%s), or it " "is corrupted." -msgstr "" +msgstr "이 디스크(%s)에 아타리 분할 영역이 없거나 손상을 입은 것 같습니다." #: libparted/labels/atari.c:878 #, c-format msgid "No room at sector %lli to store ARS of logical partition %d." -msgstr "" +msgstr "%lli번 섹터에 %d번 논리 분할 영역의 ARS를 저장할 공간이 없습니다." #: libparted/labels/atari.c:885 #, c-format msgid "No room at sector %lli to store ARS." -msgstr "" +msgstr "%lli번 섹터에 ARS를 저장할 공간이 없습니다." #: libparted/labels/atari.c:962 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:1003 #, c-format msgid "No room at sector %lli to store BSL." -msgstr "" +msgstr "%lli번 섹터에 BSL을 저장할 공간이 없습니다." #: libparted/labels/atari.c:1111 msgid "There were remaining partitions after filling the main AHDI table." -msgstr "" +msgstr "주 AHDI 케이블을 채운 후 분할 영역이 남아있습니다." #: libparted/labels/atari.c:1130 msgid "" @@ -1079,14 +1037,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 "" +"주 AHDI 테이블을 모든 분할 영역으로 채웠지만 ICD 테이블이 비어있지 않아 알 " +"수 없는 크기의 더 많은 분할 영역과 위치를 ICD 호환 프로그램에서 찾을 수 있습" +"니다. ICD 테이블을 갱신하시겠습니까?" #: libparted/labels/atari.c:1164 msgid "ICD entries can't contain extended or logical partitions." -msgstr "" +msgstr "ICD 항목에 확장, 논리 분할 영역을 넣을 수 없습니다." #: libparted/labels/atari.c:1186 msgid "There were remaining partitions after filling the tables." -msgstr "" +msgstr "테이블을 채운 다음 분할 영역이 남아있습니다." #: libparted/labels/atari.c:1226 #, c-format @@ -1094,12 +1055,14 @@ 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 "" +"ICD 모드에서 확장 XGM 분할 영역을 사용할 수 없습니다 (XGM 분할 영역이 처음에 " +"둘 배치했을 때 주 분할 영역 %d개 이상)." -#: libparted/labels/atari.c:1657 libparted/labels/bsd.c:567 -#: libparted/labels/dasd.c:894 libparted/labels/dos.c:2276 -#: libparted/labels/dvh.c:770 libparted/labels/gpt.c:2050 -#: libparted/labels/loop.c:243 libparted/labels/mac.c:1423 -#: libparted/labels/pc98.c:701 libparted/labels/rdb.c:1054 +#: libparted/labels/atari.c:1657 libparted/labels/bsd.c:563 +#: libparted/labels/dasd.c:895 libparted/labels/dos.c:2283 +#: libparted/labels/dvh.c:770 libparted/labels/gpt.c:2140 +#: 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 "분할 영역의 모든 제약 조건을 만족할 수 없습니다." @@ -1110,49 +1073,52 @@ 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 "" +"XGM 확장 분할 영역을 사용할 경우 (ICD 모드에서) 주 분할 영역 %d개 이상 사용" +"할 수 없습니다. XGM " #: libparted/labels/atari.c:1823 libparted/labels/rdb.c:1082 msgid "Unable to allocate a partition number." msgstr "분할 영역 번호를 할당할 수 없습니다." -#: libparted/labels/bsd.c:592 +#: libparted/labels/bsd.c:588 msgid "Unable to allocate a bsd disklabel slot." msgstr "BSD 디스크 레이블 슬롯을 할당할 수 없습니다." -#: libparted/labels/dasd.c:625 +#: libparted/labels/dasd.c:626 msgid "The partition table of DASD-LDL device cannot be changed.\n" -msgstr "" +msgstr "DASD-LDL 장치의 분할 테이블을 바꿀 수 없습니다.\n" -#: libparted/labels/dasd.c:920 +#: libparted/labels/dasd.c:921 msgid "Unable to allocate a dasd disklabel slot" msgstr "DASD 디스크 레이블 슬롯을 할당할 수 없습니다." -#: libparted/labels/dos.c:1003 +#: libparted/labels/dos.c:1006 #, c-format msgid "Invalid partition table on %s -- wrong signature %x." msgstr "%s에 잘못된 분할 영역 테이블 -- 잘못된 %x 서명." -#: libparted/labels/dos.c:1031 +#: libparted/labels/dos.c:1034 #, c-format msgid "Invalid partition table - recursive partition on %s." msgstr "잘못된 분할 영역 테이블 - %s에 재귀 분할 영역." -#: libparted/labels/dos.c:1560 +#: libparted/labels/dos.c:1557 msgid "Extended partitions cannot be hidden on msdos disk labels." msgstr "확장 분할 영역은 MSDOS 디스크 레이블에서 숨길 수 없습니다." -#: libparted/labels/dos.c:1572 -#, fuzzy +#: libparted/labels/dos.c:1569 msgid "Extended partitions cannot be recovery partitions on msdos disk labels." -msgstr "확장 분할 영역은 MSDOS 디스크 레이블에서 숨길 수 없습니다." +msgstr "" +"확장 분할 영역은 MSDOS 디스크 레이블에서 복구 분할 영역으로 지정할 수 없습니" +"다." -#: libparted/labels/dos.c:2258 +#: libparted/labels/dos.c:2265 msgid "Parted can't resize partitions managed by Windows Dynamic Disk." msgstr "" "Parted에서는 윈도우 동적 디스크에서 관리하는 분할 영역의 크기를 조절할 수 없" "습니다." -#: libparted/labels/dos.c:2514 +#: libparted/labels/dos.c:2521 msgid "cannot create any more partitions" msgstr "분할 영역을 더 만들 수 없습니다." @@ -1248,7 +1214,7 @@ msgstr "지정 장치는 유효한 DASD 장치가 아닙니다" #: libparted/labels/fdasd.c:188 msgid "VOLSER not found on device" -msgstr "" +msgstr "장치에 VOLSER이 없습니다" #: libparted/labels/fdasd.c:191 libparted/labels/vtoc.c:179 msgid "Fatal error" @@ -1278,9 +1244,8 @@ msgstr "" "현재 API 버전 ‘%d’이(가) DASD 드라이버 API 버전 ‘%d’와(ê³¼) 일치하지 않습니다!" #: libparted/labels/fdasd.c:1020 -#, fuzzy msgid "Could not retrieve disk size." -msgstr "디스크 정보를 가져올 수 없습니다." +msgstr "디스크 크기 정보를 가져올 수 없습니다." #: libparted/labels/fdasd.c:1029 msgid "Could not retrieve disk geometry information." @@ -1292,13 +1257,13 @@ msgstr "블록 크기 정보를 가져올 수 없습니다." #: libparted/labels/fdasd.c:1045 msgid "Disk geometry does not match a DASD device of type 3390." -msgstr "" +msgstr "디스크 구조 정보가 3390 형식의 DASD 장치에 맞지 않습니다." -#: libparted/labels/gpt.c:531 +#: libparted/labels/gpt.c:541 msgid "device is too small for GPT" msgstr "GPT를 설정하기에는 장치 용량이 너무 작습니다" -#: libparted/labels/gpt.c:733 +#: libparted/labels/gpt.c:743 #, c-format msgid "" "The format of the GPT partition table is version %x, which is newer than " @@ -1307,7 +1272,7 @@ msgstr "" "GPT 분할 영역 테이블 형식은 Parted에서 인식할 수 있는 버전보다 높은 %x 버전" "을 지니고 있습니다. 보고해주십시오!" -#: libparted/labels/gpt.c:769 +#: libparted/labels/gpt.c:779 #, c-format msgid "" "Not all of the space available to %s appears to be used, you can fix the GPT " @@ -1318,7 +1283,7 @@ msgstr "" "%llu 블록)을 사용할 수 있도록 GPT를 수정할 수 있습니다. 아니면 현재 설정 상태" "로 계속 진행하시겠습니까?" -#: libparted/labels/gpt.c:1008 +#: libparted/labels/gpt.c:1024 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)?" @@ -1327,7 +1292,7 @@ msgstr "" "다. 백업 영역을 마지막으로 이동하(ê³  이전 백업을 제거하)여 문제를 수정하시겠" "습니까?" -#: libparted/labels/gpt.c:1026 +#: libparted/labels/gpt.c:1042 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 +1300,7 @@ msgstr "" "주 GPT 테이블과 백업 GPT 테이블이 깨졌습니다. 분할 영역을 복구하려면 테이블" "을 새로 만들고 Parted의 복구 기능을 사용하십시오." -#: libparted/labels/gpt.c:1037 +#: libparted/labels/gpt.c:1053 msgid "" "The backup GPT table is corrupt, but the primary appears OK, so that will be " "used." @@ -1343,7 +1308,7 @@ msgstr "" "백업 GPT 테이블이 깨졌지만, 주 GPT 테이블은 문제가 없으므로 주 GPT 테이블을 " "사용하겠습니다." -#: libparted/labels/gpt.c:1049 +#: libparted/labels/gpt.c:1065 msgid "" "The primary GPT table is corrupt, but the backup appears OK, so that will be " "used." @@ -1351,11 +1316,11 @@ msgstr "" "주 GPT 테이블이 깨졌지만, 백업 GPT 테이블은 문제가 없으므로 백업 GPT 테이블" "을 사용하겠습니다." -#: libparted/labels/gpt.c:1073 +#: libparted/labels/gpt.c:1089 msgid "primary partition table array CRC mismatch" msgstr "주 분할 영역 테이블 어레이 CRC가 일치하지 않습니다" -#: libparted/labels/gpt.c:1936 libparted/labels/gpt.c:1963 +#: libparted/labels/gpt.c:2026 libparted/labels/gpt.c:2053 msgid "failed to translate partition name" msgstr "분할 영역 이름 해석에 실패했습니다." @@ -1388,25 +1353,21 @@ msgid "The data region doesn't start at the start of the partition." msgstr "데이터 영역이 분할 영역 시작 지점에서 시작하지 않았습니다." #: libparted/labels/mac.c:572 -msgid "The boot region doesn't start at the start of the partition." -msgstr "부트 영역이 분할 영역 시작 지점에서 시작하지 않았습니다." - -#: libparted/labels/mac.c:586 msgid "The partition's boot region doesn't occupy the entire partition." msgstr "분할 영역의 부트 영역이 전체 분할 영역을 차지하지 않았습니다." -#: libparted/labels/mac.c:597 +#: libparted/labels/mac.c:583 msgid "The partition's data region doesn't occupy the entire partition." msgstr "분할 영역의 데이터 영역이 전체 분할 영역을 차지하지 않았습니다." -#: libparted/labels/mac.c:649 +#: 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:662 +#: libparted/labels/mac.c:648 #, c-format msgid "" "The driver descriptor says the physical block size is %d bytes, but Linux " @@ -1415,11 +1376,11 @@ msgstr "" "드라이버 서술자에서 실제 블록 사이즈는 %d 바이트라고 하지만, 리눅스에서는 %d " "바이트라고 합니다." -#: libparted/labels/mac.c:715 +#: libparted/labels/mac.c:701 msgid "No valid partition map found." msgstr "올바른 분할 영역 맵이 없습니다." -#: libparted/labels/mac.c:789 +#: libparted/labels/mac.c:775 #, c-format msgid "" "Conflicting partition map entry sizes! Entry 1 says it is %d, but entry %d " @@ -1428,11 +1389,11 @@ msgstr "" "분할 영역 맵 항목 크기가 맞지 않습니다! 1번 항목은 %d라고 하지만 %d번 항목은 " "%d라고 합니다!" -#: libparted/labels/mac.c:820 +#: libparted/labels/mac.c:806 msgid "Weird! There are 2 partitions map entries!" msgstr "이상합니다! 분할 영역 맵 항목이 두 개 있습니다!" -#: libparted/labels/mac.c:1359 +#: libparted/labels/mac.c:1345 msgid "" "Changing the name of a root or swap partition will prevent Linux from " "recognising it as such." @@ -1440,16 +1401,16 @@ msgstr "" "루트 분할 영역 또는 스왑 분할 영역의 이름을 바꾸면, 리눅스에서 해당 분할 영역" "을 인식하지 못합니다." -#: libparted/labels/mac.c:1458 +#: libparted/labels/mac.c:1444 msgid "Can't add another partition -- the partition map is too small!" msgstr "다른 분할 영역을 추가할 수 없습니다 -- 분할 영역 맵이 너무 작습니다!" -#: libparted/labels/pc98.c:284 +#: libparted/labels/pc98.c:285 #, c-format msgid "Invalid partition table on %s." msgstr "%s에 잘못된 분할 영역 테이블이 있습니다." -#: libparted/labels/pc98.c:337 libparted/labels/pc98.c:415 +#: libparted/labels/pc98.c:338 libparted/labels/pc98.c:416 #, c-format msgid "" "Partition %d isn't aligned to cylinder boundaries. This is still " @@ -1458,7 +1419,7 @@ msgstr "" "%d번 분할 영역을 실린더 범위 내로 정렬하지 않았습니다. 여전히 지원하지 않습" "니다." -#: libparted/labels/pc98.c:733 +#: libparted/labels/pc98.c:729 msgid "Can't add another partition." msgstr "다른 분할 영역을 추가할 수 없습니다." @@ -1632,39 +1593,39 @@ msgstr "VTOC FMT7 DSCB를 쓸 수 없습니다." msgid "Could not write VTOC FMT9 DSCB." msgstr "VTOC FMT9 DSCB를 쓸 수 없습니다." -#: libparted/libparted.c:242 +#: libparted/libparted.c:247 msgid "Out of memory." msgstr "메모리가 부족합니다." -#: libparted/unit.c:139 +#: libparted/unit.c:140 msgid "Cannot get unit size for special unit 'COMPACT'." msgstr "'COMPACT' 특수 단위의 단위 크기를 가져올 수 없습니다." -#: libparted/unit.c:385 +#: libparted/unit.c:386 #, c-format msgid "\"%s\" has invalid syntax for locations." msgstr "\"%s\"은(는) 잘못된 위치 문법입니다." -#: libparted/unit.c:393 +#: libparted/unit.c:394 #, c-format msgid "The maximum head value is %d." msgstr "최대 헤드 값은 %d입니다." -#: libparted/unit.c:400 +#: libparted/unit.c:401 #, c-format msgid "The maximum sector value is %d." msgstr "최대 섹터 값은 %d입니다." -#: libparted/unit.c:412 libparted/unit.c:564 +#: 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:526 +#: libparted/unit.c:527 msgid "Invalid number." msgstr "잘못된 숫자 값." -#: libparted/unit.c:532 +#: libparted/unit.c:533 msgid "Use a smaller unit instead of a value < 1" msgstr "1보다 작은 값을 사용하는 대신 작은 단위를 사용하십시오" @@ -1674,18 +1635,18 @@ msgstr "1보다 작은 값을 사용하는 대신 작은 단위를 사용하십 msgid "%s : Failed to allocate partition block\n" msgstr "%s : 분할 영역 블록 할당에 실패했습니다\n" -#: libparted/fs/amiga/affs.c:79 libparted/fs/amiga/apfs.c:71 +#: 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:84 libparted/fs/amiga/apfs.c:76 +#: 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:98 libparted/fs/amiga/apfs.c:87 +#: 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" @@ -1711,22 +1672,22 @@ msgstr "%1$s : %3$s 형식의 %2$llu 블록에 잘못된 검사합 값이 있습 msgid "%s : Couldn't write block %d\n" msgstr "%s : %d 블록을 쓸 수 없습니다\n" -#: libparted/fs/amiga/amiga.c:278 +#: 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:289 +#: 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:318 +#: 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:148 libparted/fs/r/fat/fat.c:811 +#: libparted/fs/fat/fat.c:149 msgid "" "GNU Parted was miscompiled: the FAT boot sector should be 512 bytes. FAT " "support will be disabled." @@ -1818,7 +1779,7 @@ msgstr "" "일 시스템의 실린더, 헤드, 섹터 크기를 바꾸지 않습니다. 수정을 선택하면, 실린" "더, 헤드, 섹터 크기를 분할 영역 테이블의 실린더, 헤드, 섹터 크기에 맞춥니다." -#: libparted/fs/r/fat/bootsector.c:399 +#: libparted/fs/r/fat/bootsector.c:398 #, c-format msgid "" "The information sector has the wrong signature (%x). Select cancel for now, " @@ -1842,12 +1803,12 @@ msgid "" "Cluster start delta = %d, which is not a multiple of the cluster size %d." msgstr "클러스터 시작 델타 값 = %d은(는) 클러스터 크기 %d의 배수가 아닙니다." -#: libparted/fs/r/fat/count.c:144 +#: libparted/fs/r/fat/count.c:84 #, c-format msgid "Bad directory entry for %s: first cluster is the end of file marker." msgstr "%s의 잘못된 디렉터리 항목: 첫번째 클러스터는 파일 마커의 끝입니다." -#: libparted/fs/r/fat/count.c:157 +#: libparted/fs/r/fat/count.c:97 #, c-format msgid "" "Bad FAT: unterminated chain for %s. You should run dosfsck or scandisk." @@ -1855,7 +1816,7 @@ msgstr "" "잘못된 FAT: %s에 끝나지 않은 체인이 있습니다. dosfsck 또는 scandisk를 실행하" "십시오." -#: libparted/fs/r/fat/count.c:166 +#: libparted/fs/r/fat/count.c:106 #, c-format msgid "" "Bad FAT: cluster %d outside file system in chain for %s. You should run " @@ -1864,7 +1825,7 @@ msgstr "" "잘못된 FAT: %d번 클러스터가 %s 체인의 파일 시스템 바깥 영역에 있습니다. " "dosfsck 또는 scandisk를 실행하십시오." -#: libparted/fs/r/fat/count.c:176 +#: libparted/fs/r/fat/count.c:116 #, c-format msgid "" "Bad FAT: cluster %d is cross-linked for %s. You should run dosfsck or " @@ -1873,26 +1834,17 @@ msgstr "" "잘못된 FAT: %d번 클러스터가 %s와(ê³¼) 교차 연결 상태입니다. dosfsck 또는 " "scandisk를 실행하십시오." -#: libparted/fs/r/fat/count.c:195 +#: libparted/fs/r/fat/count.c:135 #, c-format msgid "%s is %dk, but it has %d clusters (%dk)." msgstr "%s은(는) %dk지만, 클러스터 %d개가 있습니다(%dk)." -#: libparted/fs/r/fat/count.c:258 -#, c-format -msgid "" -"The file %s is marked as a system file. This means moving it could cause " -"some programs to stop working." -msgstr "" -"%s 파일은 시스템 파일입니다. 이 파일을 옮기면 일부 프로그램의 동작이 멈춥니" -"다." - -#: libparted/fs/r/fat/fat.c:243 +#: 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:409 +#: 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." @@ -1900,11 +1852,11 @@ msgstr "" "FAT 정보가 일치하지 않습니다. 무슨 의미인지 모르겠다면, 취소를 선택하고 파" "일 시스템에서 scandisk를 실행한 후 다시 돌아오십시오." -#: libparted/fs/r/fat/fat.c:449 +#: 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:461 +#: libparted/fs/r/fat/fat.c:462 #, c-format msgid "" "File system doesn't have expected sizes for Windows to like it. Cluster " @@ -1915,14 +1867,14 @@ msgstr "" "하지만) %1$dk 입니다. 또한 클러스트 갯수는(%4$dk여야 하지만) %3$dk개 입니다. " "FAT의 섹터 갯수는(%6$d개여야 하지만) %5$d개입니다." -#: libparted/fs/r/fat/fat.c:484 +#: libparted/fs/r/fat/fat.c:485 #, c-format msgid "" "File system is reporting the free space as %d clusters, not %d clusters." msgstr "" "파일 시스템 여분 공간 클러스터 갯수가 %2$d개가 아닌 %1$d개로 나타납니다." -#: libparted/fs/r/fat/resize.c:158 +#: 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." @@ -1930,15 +1882,15 @@ msgstr "" "모든 파일에 대한 루트 디렉터리 공간이 충분하지 않습니다. 취소를 누르십시오. " "또는 무시를 누르시면 파일이 없어집니다." -#: libparted/fs/r/fat/resize.c:302 +#: libparted/fs/r/fat/resize.c:303 msgid "Error writing to the root directory." msgstr "루트 디렉터리 기록 중 오류." -#: libparted/fs/r/fat/resize.c:495 +#: 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:498 +#: 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 " @@ -1947,13 +1899,13 @@ msgstr "" "FAT16으로 변환하고 MS 윈도우를 설치하면 MS 윈도우 부트로더도 다시 설치해야합" "니다. 이렇게 하려면 Parted 설명서(또는 배포판 설명서)를 참고하십시오." -#: libparted/fs/r/fat/resize.c:506 +#: 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:510 +#: 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 " @@ -1966,38 +1918,38 @@ msgstr "" "고하십시오. 또한 FAT32로 변환하면 MS DOS, MS 윈도우, MS 윈도우 NT에서 파일 시" "스템을 인식할 수 없습니다." -#: libparted/fs/r/fat/resize.c:524 +#: libparted/fs/r/fat/resize.c:508 #, c-format msgid "%s %s %s" msgstr "%s %s %s" -#: libparted/fs/r/fat/resize.c:525 +#: libparted/fs/r/fat/resize.c:509 msgid "Would you like to use FAT32?" msgstr "FAT32를 사용하시겠습니까?" -#: libparted/fs/r/fat/resize.c:556 libparted/fs/r/fat/resize.c:572 +#: 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:557 +#: 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:573 +#: 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:586 +#: 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:136 +#: 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 " @@ -2006,41 +1958,41 @@ msgstr "" "%d FAT의 %x 미디어는 부트 섹터의 %x 미디어와 일치하지 않습니다. scandisk를 실" "행하십시오." -#: libparted/fs/r/fat/table.c:268 +#: 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:300 +#: 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:342 +#: 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:151 +#: libparted/fs/r/filesys.c:152 msgid "Could not detect file system." msgstr "파일 시스템을 발견할 수 없습니다." -#: libparted/fs/r/filesys.c:158 libparted/fs/r/filesys.c:285 +#: libparted/fs/r/filesys.c:159 libparted/fs/r/filesys.c:284 #, c-format msgid "resizing %s file systems is not supported" msgstr "%s 파일 시스템 크기 조절 기능을 지원하지 않습니다" -#: libparted/fs/r/filesys.c:170 +#: libparted/fs/r/filesys.c:171 msgid "The file system is bigger than its volume!" msgstr "파일 시스템은 이 볼륨보다 커야합니다!" -#: libparted/fs/r/hfs/advfs.c:121 libparted/fs/r/hfs/advfs_plus.c:121 -#: libparted/fs/r/hfs/reloc.c:413 libparted/fs/r/hfs/reloc.c:507 -#: libparted/fs/r/hfs/reloc_plus.c:538 libparted/fs/r/hfs/reloc_plus.c:656 -#: libparted/fs/r/hfs/reloc_plus.c:769 +#: 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:285 +#: libparted/fs/r/hfs/advfs_plus.c:287 msgid "Bad blocks could not be read." msgstr "불량 블록을 읽을 수 없습니다." @@ -2054,13 +2006,13 @@ msgstr "" "가 있습니다. 파일 시스템을 검사하십시오!" #: 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 "" -"Ox%X번 블록에서 Ox%X번 블록으로 범위 정보 이동을 시도했지만, 현재 위치에 다" -"른 범위 정보가 있습니다. 이 동작을 시도하면 안됩니다!" +"0x%X번 블록에서 0x%X번 블록으로 범위 정보 이동을 시도했지만, 이 위치에 다른 " +"범위 정보가 있습니다. 이 동작을 시도하면 안됩니다!" #: libparted/fs/r/hfs/file.c:143 #, c-format @@ -2102,61 +2054,61 @@ msgstr "%2$X CNID로 HFS+ 파일의 %1$lli 섹터를 찾을 수 없습니다." msgid "Trying to write HFS+ file with CNID %X behind EOF." msgstr "EOF 이전의 %X CNID로 HFS+ 파일에 기록하려 합니다." -#: libparted/fs/r/hfs/hfs.c:232 +#: libparted/fs/r/hfs/hfs.c:212 msgid "Sorry, HFS cannot be resized that way yet." msgstr "죄송하지만, HFS 크기를 이 방식으로 조절할 수 없습니다." -#: libparted/fs/r/hfs/hfs.c:250 libparted/fs/r/hfs/hfs.c:629 +#: libparted/fs/r/hfs/hfs.c:230 libparted/fs/r/hfs/hfs.c:573 msgid "shrinking" msgstr "크기 줄이는 중" -#: libparted/fs/r/hfs/hfs.c:262 libparted/fs/r/hfs/hfs.c:641 +#: 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:281 +#: 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:320 +#: libparted/fs/r/hfs/hfs.c:300 msgid "writing HFS Master Directory Block" msgstr "HFS 마스터 디렉터리 블록 기록 중" -#: libparted/fs/r/hfs/hfs.c:468 +#: libparted/fs/r/hfs/hfs.c:412 msgid "No valid HFS[+X] signature has been found while opening." msgstr "여는 중 유효한 HFS[+X] 서명을 찾지 못했습니다." -#: libparted/fs/r/hfs/hfs.c:478 +#: 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:489 +#: 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:672 +#: 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:720 +#: libparted/fs/r/hfs/hfs.c:664 msgid "Error while writing the allocation file." msgstr "할당 파일을 기록하는 중 오류가 발생했습니다." -#: libparted/fs/r/hfs/hfs.c:735 +#: 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:750 +#: libparted/fs/r/hfs/hfs.c:694 msgid "writing HFS+ Volume Header" msgstr "HFS+ 볼륨 헤더 기록 중" -#: libparted/fs/r/hfs/hfs.c:850 +#: 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:904 +#: 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." @@ -2164,27 +2116,27 @@ msgstr "" "HFS 래퍼에 오류가 있는 것 같습니다. 불량 블록 파일에 내장 HFS+ 볼륨 정보가 없" "습니다." -#: libparted/fs/r/hfs/hfs.c:940 +#: libparted/fs/r/hfs/hfs.c:883 msgid "Sorry, HFS+ cannot be resized that way yet." msgstr "죄송하지만, HFS+ 크기를 이 방식으로 조절할 수 없습니다." -#: libparted/fs/r/hfs/hfs.c:975 +#: libparted/fs/r/hfs/hfs.c:918 msgid "shrinking embedded HFS+ volume" msgstr "내장 HFS+ 볼륨 크기 줄이는 중" -#: libparted/fs/r/hfs/hfs.c:992 +#: libparted/fs/r/hfs/hfs.c:935 msgid "Resizing the HFS+ volume has failed." msgstr "HFS+ 볼륨 크기 조절에 실패했습니다." -#: libparted/fs/r/hfs/hfs.c:999 +#: libparted/fs/r/hfs/hfs.c:942 msgid "shrinking HFS wrapper" msgstr "HFS 래퍼 크기 줄이는 중" -#: libparted/fs/r/hfs/hfs.c:1008 +#: libparted/fs/r/hfs/hfs.c:951 msgid "Updating the HFS wrapper has failed." msgstr "HFS 래퍼 업데이트에 실패했습니다." -#: libparted/fs/r/hfs/hfs.c:1110 libparted/fs/r/hfs/hfs.c:1195 +#: 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 " @@ -2205,12 +2157,11 @@ msgstr "" "저널을 재현하는 동안 트랜잭션 블록 크기가 잘못됨을 발견했습니다(%i바이트)." #: 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 "" -"볼륨 외에 있는 저널을 지원하지 않습니다. 저널을 비활성화한 후 Parted를 다시 " +"볼륨 밖에 있는 저널을 지원하지 않습니다. 저널을 비활성화한 후 Parted를 다시 " "실행하십시오." #: libparted/fs/r/hfs/journal.c:271 @@ -2261,22 +2212,22 @@ msgstr "" msgid "An extent has not been relocated." msgstr "범위 정보를 다시 배치하지 않았습니다." -#: libparted/fs/r/hfs/reloc.c:250 libparted/fs/r/hfs/reloc_plus.c:307 +#: 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:380 +#: libparted/fs/r/hfs/reloc.c:382 msgid "This HFS volume has no catalog file. This is very unusual!" msgstr "HFS 볼륨에 카탈로그 파일이 없습니다. 상당히 드문 일입니다!" -#: libparted/fs/r/hfs/reloc.c:474 +#: libparted/fs/r/hfs/reloc.c:479 msgid "This HFS volume has no extents overflow file. This is quite unusual!" msgstr "HFS 볼륨에 범위 정보 오버플로우 파일이 없습니다. 상당히 드문 일입니다!" -#: libparted/fs/r/hfs/reloc.c:516 libparted/fs/r/hfs/reloc_plus.c:666 +#: 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." @@ -2284,52 +2235,52 @@ msgstr "" "자체 범위 정보에 범위 정보 오버플로우 파일이 들어있으면 안됩니다! 파일 시스템" "을 검사하십시오." -#: libparted/fs/r/hfs/reloc.c:573 libparted/fs/r/hfs/reloc_plus.c:844 +#: 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:634 libparted/fs/r/hfs/reloc_plus.c:905 +#: 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:648 libparted/fs/r/hfs/reloc_plus.c:921 +#: 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:494 +#: libparted/fs/r/hfs/reloc_plus.c:495 msgid "This HFS+ volume has no catalog file. This is very unusual!" msgstr "HFS+ 볼륨에 카탈로그 파일이 없습니다. 상당히 드문 일입니다!" -#: libparted/fs/r/hfs/reloc_plus.c:617 +#: libparted/fs/r/hfs/reloc_plus.c:620 msgid "This HFS+ volume has no extents overflow file. This is quite unusual!" msgstr "" "HFS+ 볼륨에 범위 정보 오버플로우 파일이 없습니다. 상당히 드문 일입니다!" -#: parted/parted.c:125 +#: parted/parted.c:126 msgid "displays this help message" msgstr "도움말 메시지를 나타냅니다" -#: parted/parted.c:126 +#: parted/parted.c:127 msgid "lists partition layout on all block devices" msgstr "모든 블록 장치의 분할 영역 배치를 나타냅니다" -#: parted/parted.c:127 +#: parted/parted.c:128 msgid "displays machine parseable output" msgstr "기계 해석 가능한 출력을 나타냅니다" -#: parted/parted.c:128 +#: parted/parted.c:129 msgid "never prompts for user intervention" msgstr "사용자 개입 여부를 묻지 않음" -#: parted/parted.c:129 +#: parted/parted.c:130 msgid "displays the version" msgstr "버전 정보를 나타냅니다" -#: parted/parted.c:130 +#: parted/parted.c:131 msgid "alignment for new partitions" msgstr "새 분할 영역의 정렬 방식" -#: parted/parted.c:142 +#: parted/parted.c:143 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" @@ -2337,31 +2288,31 @@ msgstr "" "<번호>는 리눅스에서 사용하는 분할 영역 번호입니다. MS-DOS 디스크 레이블에서, " "주 분할 영역 번호는 1부터 4까지, 논리 분할 영역은 5 이후입니다.\n" -#: parted/parted.c:145 +#: parted/parted.c:146 msgid "LABEL-TYPE is one of: " msgstr "<레이블 형식>은 다음 중 하나입니다:" -#: parted/parted.c:146 parted/parted.c:147 +#: parted/parted.c:147 parted/parted.c:148 msgid "FLAG is one of: " msgstr "<플래그>는 다음 중 하나입니다:" -#: parted/parted.c:148 +#: parted/parted.c:149 msgid "UNIT is one of: " msgstr "<단위>는 다음 중 하나입니다:" -#: parted/parted.c:149 +#: parted/parted.c:150 msgid "desired alignment: minimum or optimal" msgstr "적절한 정렬값: minimum 또는 optimal" -#: parted/parted.c:150 +#: parted/parted.c:151 msgid "PART-TYPE is one of: primary, logical, extended\n" msgstr "<분할 영역 형식>은 다음 중 하나입니다: primary, logical, extended\n" -#: parted/parted.c:152 +#: parted/parted.c:153 msgid "FS-TYPE is one of: " msgstr "<파일 시스템 형식> 은 다음 중 하나입니다:" -#: parted/parted.c:153 +#: parted/parted.c:154 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 " @@ -2370,7 +2321,7 @@ msgstr "" "<시작>ê³¼ <끝>은 4GB 또는 10% 같은 디스크 위치입니다. 음수 값은 디스크 뒷부분" "부터 계산한 값입니다. 예를 들면, -1은 정확히 마지막 섹터를 가리킵니다.\n" -#: parted/parted.c:156 +#: parted/parted.c:157 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" @@ -2378,19 +2329,19 @@ msgstr "" "<끝>은 4GB 또는 10% 같은 디스크 위치입니다. 음수 값은 디스크 뒷부분부터 계산" "한 값입니다. 예를 들면, -1은 정확히 마지막 섹터를 가리킵니다.\n" -#: parted/parted.c:159 +#: parted/parted.c:160 msgid "STATE is one of: on, off\n" msgstr "<상태>는 on, off 둘 중 하나입니다\n" -#: parted/parted.c:160 +#: parted/parted.c:161 msgid "DEVICE is usually /dev/hda or /dev/sda\n" msgstr "<장치>는 보통 /dev/hda 또는 /dev/sda입니다\n" -#: parted/parted.c:161 +#: parted/parted.c:162 msgid "NAME is any word you want\n" msgstr "<이름>은 원하는 어떤 단어든 들어갑니다\n" -#: parted/parted.c:164 +#: parted/parted.c:165 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 +2361,22 @@ msgstr "" "GNU General Public License for more details.\n" "\n" -#: parted/parted.c:212 +#: parted/parted.c:213 #, c-format msgid "%0.f%%\t(time left %.2d:%.2d)" msgstr "%0.f%%\t(남은 시간: %.2d:%.2d)" -#: parted/parted.c:231 +#: parted/parted.c:232 #, c-format msgid "Partition %s is being used. Are you sure you want to continue?" msgstr "%s 분할 영역을 사용중입니다. 정말 계속하시겠습니까?" -#: parted/parted.c:252 +#: parted/parted.c:253 #, c-format msgid "Partition(s) on %s are being used." msgstr "%s의 분할 공간을 사용 중입니다." -#: parted/parted.c:264 +#: parted/parted.c:265 #, c-format msgid "" "The existing disk label on %s will be destroyed and all data on this disk " @@ -2434,31 +2385,31 @@ msgstr "" "%s의 기존 디스크 레이블을 없애며 디스크의 모든 데이터가 사라집니다. 계속하시" "겠습니까?" -#: parted/parted.c:525 +#: parted/parted.c:526 msgid "New disk label type?" msgstr "새 디스크 레이블 형식?" -#: parted/parted.c:662 +#: parted/parted.c:663 msgid "Partition type?" msgstr "분할 영역 형식?" -#: parted/parted.c:680 parted/parted.c:884 +#: parted/parted.c:681 parted/parted.c:885 msgid "Partition name?" msgstr "분할 영역 이름?" -#: parted/parted.c:690 +#: parted/parted.c:691 msgid "File system type?" msgstr "파일 시스템 형식?" -#: parted/parted.c:695 parted/parted.c:1498 +#: parted/parted.c:696 parted/parted.c:1499 msgid "Start?" msgstr "시작점?" -#: parted/parted.c:698 parted/parted.c:1500 parted/parted.c:1569 +#: parted/parted.c:699 parted/parted.c:1501 parted/parted.c:1585 msgid "End?" msgstr "끝점?" -#: parted/parted.c:766 +#: parted/parted.c:767 #, c-format msgid "" "You requested a partition from %s to %s (sectors %llu..%llu).\n" @@ -2467,7 +2418,7 @@ msgstr "" "%s부터 %s까지(%llu..%llu 섹터) 영역 분할을 요청했습니다.\n" "관리할 수 있는 가까운 위치는 %s부터 %s까지(%llu..%llu 섹터)입니다.%s" -#: parted/parted.c:775 +#: parted/parted.c:776 msgid "" "\n" "Is this still acceptable to you?" @@ -2475,94 +2426,94 @@ msgstr "" "\n" "여전히 만족합니까?" -#: parted/parted.c:798 -#, fuzzy, c-format +#: parted/parted.c:799 +#, c-format msgid "" "The resulting partition is not properly aligned for best performance: %s" msgstr "" -"최적 성능을 목적으로 분할 영역 배치 과정에서 제대로 정렬하지 않았습니다." +"최적 성능을 목적으로 분할 영역 배치 과정에서 제대로 정렬하지 않았습니다: %s" -#: parted/parted.c:800 parted/parted.c:1723 +#: parted/parted.c:801 parted/parted.c:1739 msgid "unknown (malloc failed)" -msgstr "" +msgstr "알 수 없음(malloc 실패)" -#: parted/parted.c:876 -#, fuzzy, c-format +#: parted/parted.c:877 +#, c-format msgid "%s disk labels do not support partition name." -msgstr "%s 디스크 레이블은 확장 분할 영역을 지원하지 않습니다." +msgstr "%s 디스크 레이블은 분할 영역 이름을 지원하지 않습니다." -#: parted/parted.c:881 parted/parted.c:1561 parted/parted.c:1612 -#: parted/parted.c:1706 parted/parted.c:1781 +#: parted/parted.c:882 parted/parted.c:1564 parted/parted.c:1628 +#: parted/parted.c:1722 parted/parted.c:1797 msgid "Partition number?" msgstr "분할 영역 번호?" -#: parted/parted.c:975 +#: parted/parted.c:976 #, 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:1017 +#: parted/parted.c:1018 #, c-format msgid "Model: %s (%s)\n" msgstr "모델: %s (%s)\n" -#: parted/parted.c:1019 +#: parted/parted.c:1020 #, c-format msgid "Disk %s: %s\n" msgstr "%s 디스크: %s\n" -#: parted/parted.c:1020 +#: parted/parted.c:1021 #, c-format msgid "Sector size (logical/physical): %lldB/%lldB\n" msgstr "섹터 크기(논리/실제): %lld/B%lldB\n" -#: parted/parted.c:1032 +#: parted/parted.c:1033 #, c-format msgid "Partition Table: %s\n" msgstr "분할 영역 테이블: %s\n" -#: parted/parted.c:1033 +#: parted/parted.c:1034 #, c-format msgid "Disk Flags: %s\n" msgstr "디스크 플래그: %s\n" -#: parted/parted.c:1153 parted/parted.c:1156 +#: parted/parted.c:1154 parted/parted.c:1157 msgid "Number" msgstr "번호" -#: parted/parted.c:1153 parted/parted.c:1156 +#: parted/parted.c:1154 parted/parted.c:1157 msgid "Start" msgstr "시작" -#: parted/parted.c:1154 parted/parted.c:1157 +#: parted/parted.c:1155 parted/parted.c:1158 msgid "End" msgstr "끝" -#: parted/parted.c:1157 +#: parted/parted.c:1158 msgid "Size" msgstr "크기" -#: parted/parted.c:1161 +#: parted/parted.c:1162 msgid "Type" msgstr "형식" -#: parted/parted.c:1163 +#: parted/parted.c:1164 msgid "File system" msgstr "파일 시스템" -#: parted/parted.c:1166 +#: parted/parted.c:1167 msgid "Name" msgstr "이름" -#: parted/parted.c:1168 +#: parted/parted.c:1169 msgid "Flags" msgstr "플래그" -#: parted/parted.c:1225 +#: parted/parted.c:1226 msgid "Free Space" msgstr "여분 공간" -#: parted/parted.c:1385 +#: parted/parted.c:1386 #, c-format msgid "" "A %s %s partition was found at %s -> %s. Do you want to add it to the " @@ -2571,68 +2522,69 @@ msgstr "" "%s %s 분할 영역을 %s->%s에서 찾았습니다. 이 분할 영역을 분할 영역 테이블에 추" "가하시겠습니까?" -#: parted/parted.c:1428 +#: parted/parted.c:1429 msgid "searching for file systems" msgstr "파일 시스템 검색 중" -#: parted/parted.c:1535 +#: parted/parted.c:1536 msgid "The resize command has been removed in parted 3.0" msgstr "Parted 3.0에서 resize 명령을 제거했습니다" -#: parted/parted.c:1583 +#: parted/parted.c:1599 msgid "" "Shrinking a partition can cause data loss, are you sure you want to continue?" msgstr "" "분할 영역 공간을 줄이면 데이터를 잃을 수 있습니다. 정말로 계속하시겠습니까?" -#: parted/parted.c:1636 +#: parted/parted.c:1652 msgid "New device?" msgstr "새 장치?" -#: parted/parted.c:1704 +#: parted/parted.c:1720 msgid "alignment type(min/opt)" msgstr "정렬 형식(min/opt)" -#: parted/parted.c:1719 +#: parted/parted.c:1735 #, c-format msgid "%d aligned\n" msgstr "분할 영역 %d은(는) 정렬 상태임\n" -#: parted/parted.c:1721 -#, fuzzy, c-format +#: parted/parted.c:1737 +#, c-format msgid "%d not aligned: %s\n" -msgstr "분할 영역 %d은(는) 정렬 상태 아님\n" +msgstr "" +"%d번을 정렬하지 않음: %s\n" +"\n" -#: parted/parted.c:1746 parted/parted.c:1783 +#: parted/parted.c:1762 parted/parted.c:1799 msgid "Flag to Invert?" msgstr "반전할 플래그?" -#: parted/parted.c:1751 parted/parted.c:1788 +#: parted/parted.c:1767 parted/parted.c:1804 msgid "New state?" msgstr "새 상태?" -#: parted/parted.c:1834 +#: parted/parted.c:1850 msgid "Unit?" msgstr "단위?" -#: parted/parted.c:1969 +#: parted/parted.c:1985 msgid "align-check" msgstr "align-check" -#: parted/parted.c:1972 -#, fuzzy +#: parted/parted.c:1988 msgid "" "align-check TYPE N check partition N for TYPE(min|opt) " "alignment" msgstr "" -"align-check <형식> <번호> <번호> 분할 영역의 지정 <형" -"식>(min|opt) 정렬 상태를 검사합니다" +"align-check <형식> <번호> <번호> 분할 영역의 지정 <형식" +">(min|opt) 정렬 상태를 검사합니다" -#: parted/parted.c:1980 +#: parted/parted.c:1996 msgid "help" msgstr "help" -#: parted/parted.c:1983 +#: parted/parted.c:1999 msgid "" "help [COMMAND] print general help, or help on " "COMMAND" @@ -2640,15 +2592,15 @@ msgstr "" "help [<명령>] 일반 도움말 또는 <명령> 도움말을 출력" "합니다" -#: parted/parted.c:1989 +#: parted/parted.c:2005 msgid "mklabel" msgstr "mklabel" -#: parted/parted.c:1989 +#: parted/parted.c:2005 msgid "mktable" msgstr "mktable" -#: parted/parted.c:1992 +#: parted/parted.c:2008 msgid "" "mklabel,mktable LABEL-TYPE create a new disklabel (partition " "table)" @@ -2656,17 +2608,17 @@ msgstr "" "mklabel,mktable <레이블 형식> 새 디스크 레이블(분할 영역 테이블)" "을 만듭니다" -#: parted/parted.c:1998 +#: parted/parted.c:2014 msgid "mkpart" msgstr "mkpart" -#: parted/parted.c:2001 +#: parted/parted.c:2017 msgid "mkpart PART-TYPE [FS-TYPE] START END make a partition" msgstr "" "mkpart <분할 영역 형식> [<파일 시스템 형식>] <시작> <끝> 분할 영역을 만듭" "니다" -#: parted/parted.c:2007 +#: parted/parted.c:2023 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" @@ -2674,21 +2626,21 @@ msgstr "" "‘mkpart’는 분할 영역에 새 파일 시스템을 만들지 않고 분할 영역을 만듭니다. <파" "일 시스템 형식>에 적당한 분할 영역 ID를 설정해야 합니다.\n" -#: parted/parted.c:2012 +#: parted/parted.c:2028 msgid "name" msgstr "name" -#: parted/parted.c:2015 +#: parted/parted.c:2031 msgid "name NUMBER NAME name partition NUMBER as NAME" msgstr "" "name <번호> <이름> <번호> 분할 영역의 이름을 <이름>으" "로 지정합니다" -#: parted/parted.c:2020 +#: parted/parted.c:2036 msgid "print" msgstr "print" -#: parted/parted.c:2023 +#: parted/parted.c:2039 msgid "" "print [devices|free|list,all|NUMBER] display the partition table, " "available devices, free space, all found partitions, or a particular " @@ -2697,7 +2649,7 @@ msgstr "" "print [devices|free|list,all|<번호>] 분할 영역 테이블, 존재 장치, 여분 ê³µ" "간, 발견한 모든 분할 영역 또는 지정 분할 영역을 나타냅니다" -#: parted/parted.c:2028 +#: parted/parted.c:2044 msgid "" "Without arguments, 'print' displays the entire partition table. However with " "the following arguments it performs various other actions.\n" @@ -2705,11 +2657,11 @@ msgstr "" "‘print’ 명령에 인자를 빼면 전체 분할 영역 테이블을 나타냅니다. 하지만 다음 인" "자 값을 넣으면 다양한 다른 동작을 수행합니다.\n" -#: parted/parted.c:2030 +#: parted/parted.c:2046 msgid " devices : display all active block devices\n" msgstr " devices : 모든 활성 블록 장치를 나타냅니다\n" -#: parted/parted.c:2031 +#: parted/parted.c:2047 msgid "" " free : display information about free unpartitioned space on the " "current block device\n" @@ -2717,30 +2669,30 @@ msgstr "" " free : 현재 블록 장치에서 분할 영역으로 지정하지 않은 여분의 공간 정보" "를 나타냅니다\n" -#: parted/parted.c:2033 +#: parted/parted.c:2049 msgid "" " list, all : display the partition tables of all active block devices\n" msgstr " list, all : 모든 활성 블록 장치의 분할 영역 테이블을 나타냅니다\n" -#: parted/parted.c:2034 +#: parted/parted.c:2050 msgid "" " NUMBER : display more detailed information about this particular " "partition\n" msgstr " <번호> : 이 분할 영역의 자세한 정보를 나타냅니다\n" -#: parted/parted.c:2039 +#: parted/parted.c:2055 msgid "quit" msgstr "quit" -#: parted/parted.c:2042 +#: parted/parted.c:2058 msgid "quit exit program" msgstr "quit 프로그램을 ë¹ ì ¸ 나갑니다" -#: parted/parted.c:2047 +#: parted/parted.c:2063 msgid "rescue" msgstr "rescue" -#: parted/parted.c:2050 +#: parted/parted.c:2066 msgid "" "rescue START END rescue a lost partition near START " "and END" @@ -2748,56 +2700,56 @@ msgstr "" "rescue <시작> <끝> <시작> 및 <끝> 영역 주변의 소실 분" "할 영역을 복원합니다" -#: parted/parted.c:2056 +#: parted/parted.c:2072 msgid "resize" msgstr "resize" -#: parted/parted.c:2059 +#: parted/parted.c:2075 msgid "The resize command was removed in parted 3.0\n" msgstr "Parted 3.0에서 resize 명령을 제거했습니다\n" -#: parted/parted.c:2062 +#: parted/parted.c:2078 msgid "resizepart" msgstr "resizepart" -#: parted/parted.c:2065 +#: parted/parted.c:2081 msgid "resizepart NUMBER END resize partition NUMBER" msgstr "" "resizepart <번호> <끝> <번호> 분할 영역의 크기를 조절합니" "다" -#: parted/parted.c:2070 +#: parted/parted.c:2086 msgid "rm" msgstr "rm" -#: parted/parted.c:2073 +#: parted/parted.c:2089 msgid "rm NUMBER delete partition NUMBER" msgstr "rm <번호> <번호> 분할 영역을 삭제합니다" -#: parted/parted.c:2078 +#: parted/parted.c:2094 msgid "select" msgstr "select" -#: parted/parted.c:2081 +#: parted/parted.c:2097 msgid "select DEVICE choose the device to edit" msgstr "select <장치> 편집할 장치를 선택합니다" -#: parted/parted.c:2086 +#: parted/parted.c:2102 msgid "disk_set" msgstr "disk_set" -#: parted/parted.c:2089 +#: parted/parted.c:2105 msgid "" "disk_set FLAG STATE change the FLAG on selected device" msgstr "" "disk_set <플래그> <상태> 선택한 장치의 <플래그> 값을 바" "꿉니다" -#: parted/parted.c:2094 +#: parted/parted.c:2110 msgid "disk_toggle" msgstr "disk_toggle" -#: parted/parted.c:2097 +#: parted/parted.c:2113 msgid "" "disk_toggle [FLAG] toggle the state of FLAG on " "selected device" @@ -2805,22 +2757,22 @@ msgstr "" "disk_toggle [<플래그>] 선택한 장치의 <플래그> 상태를 전" "환합니다" -#: parted/parted.c:2103 +#: parted/parted.c:2119 msgid "set" msgstr "set" -#: parted/parted.c:2106 +#: parted/parted.c:2122 msgid "" "set NUMBER FLAG STATE change the FLAG on partition NUMBER" msgstr "" "set <번호> <플래그> <상태> <번호> 분할 영역의 <플래그> 값" "을 바꿉니다" -#: parted/parted.c:2112 +#: parted/parted.c:2128 msgid "toggle" msgstr "toggle" -#: parted/parted.c:2115 +#: parted/parted.c:2131 msgid "" "toggle [NUMBER [FLAG]] toggle the state of FLAG on " "partition NUMBER" @@ -2828,21 +2780,21 @@ msgstr "" "toggle [<번호> [<플래그>]] <번호> 분할 영역의 <플래그> 상태" "를 전환합니다" -#: parted/parted.c:2121 +#: parted/parted.c:2137 msgid "unit" msgstr "unit" -#: parted/parted.c:2124 +#: parted/parted.c:2140 msgid "unit UNIT set the default unit to UNIT" msgstr "" "unit <단위> 기본 단위를 <단위> 값으로 설정합니" "다" -#: parted/parted.c:2129 +#: parted/parted.c:2145 msgid "version" msgstr "version" -#: parted/parted.c:2132 +#: parted/parted.c:2148 msgid "" "version display the version number and " "copyright information of GNU Parted" @@ -2850,7 +2802,7 @@ msgstr "" "version GNU Parted의 버전 번호와 저작 정보" "를 나타냅니다" -#: parted/parted.c:2136 +#: parted/parted.c:2152 msgid "" "'version' displays copyright and version information corresponding to this " "copy of GNU Parted\n" @@ -2858,29 +2810,37 @@ msgstr "" "‘version’ 명령은 GNU Parted 사본과 관련된 저작 정보와 버전 정보를 나타냅니" "다\n" -#: parted/parted.c:2204 +#: parted/parted.c:2220 #, c-format msgid "Usage: %s [-hlmsv] [-a] [DEVICE [COMMAND [PARAMETERS]]...]\n" msgstr "사용법: %s [-hlmsv] [-a<정렬방식>] [<장치> [<명령> [<매개변수>]]...]\n" -#: parted/parted.c:2248 +#: parted/parted.c:2264 msgid "No device found" msgstr "장치가 없습니다" -#: parted/parted.c:2285 +#: parted/parted.c:2301 msgid "WARNING: You are not superuser. Watch out for permissions.\n" msgstr "경고: 관리자가 아닙니다. 권한을 확인하십시오.\n" -#: parted/parted.c:2325 +#: parted/parted.c:2334 +msgid "" +"You should reinstall your boot loader before rebooting. Read section 4 of " +"the Parted User documentation for more information." +msgstr "" +"다시 부팅하기 전 부트 로더를 다시 설치해야 합니다. 자세한 정보는 Parted 사용" +"자 문서 4장을 살펴보십시오." + +#: parted/parted.c:2341 msgid "You may need to update /etc/fstab.\n" msgstr "/etc/fstab 정보를 업데이트해야 합니다.\n" -#: parted/ui.c:164 +#: parted/ui.c:165 msgid "Welcome to GNU Parted! Type 'help' to view a list of commands.\n" msgstr "" "GNU Parted 사용을 환영합니다! 명령 목록을 보려면 ‘help’를 입력하십시오.\n" -#: parted/ui.c:167 +#: parted/ui.c:168 msgid "" "Usage: parted [OPTION]... [DEVICE [COMMAND [PARAMETERS]...]...]\n" "Apply COMMANDs with PARAMETERS to DEVICE. If no COMMAND(s) are given, run " @@ -2891,7 +2851,7 @@ msgstr "" "<매개변수>를 붙인 <명령>을 <장치>에 적용합니다. <명령>이 없으면\n" "대화식 모드로 실행합니다.\n" -#: parted/ui.c:172 +#: parted/ui.c:173 #, c-format msgid "" "\n" @@ -2953,7 +2913,7 @@ msgstr "" "그리고 여러분이 입력한 다음 명령 기록을 넣으십시오.\n" "또한 중요하다고 생각하는 추가 설정 정보도 넣으십시오.\n" -#: parted/ui.c:293 +#: parted/ui.c:294 msgid "" "\n" "Command History:\n" @@ -2961,7 +2921,7 @@ msgstr "" "\n" "명령 기록:\n" -#: parted/ui.c:356 +#: parted/ui.c:357 msgid "" "\n" "Error: SEGV_MAPERR (Address not mapped to object)\n" @@ -2969,7 +2929,7 @@ msgstr "" "\n" "오류: SEGV_MAPERR (객체에 주소를 매핑하지 않음)\n" -#: parted/ui.c:362 +#: parted/ui.c:363 msgid "" "\n" "Error: SEGV_ACCERR (Invalid permissions for mapped object)\n" @@ -2977,7 +2937,7 @@ msgstr "" "\n" "오류: SEGV_ACCERR (매핑할 오브젝트에 접근할 권한 없음)\n" -#: parted/ui.c:367 +#: parted/ui.c:368 msgid "" "\n" "Error: A general SIGSEGV signal was encountered.\n" @@ -2985,7 +2945,7 @@ msgstr "" "\n" "오류: 일반 SIGSEGV 시그널이 발생했습니다.\n" -#: parted/ui.c:391 +#: parted/ui.c:392 msgid "" "\n" "Error: FPE_INTDIV (Integer: divide by zero)" @@ -2993,7 +2953,7 @@ msgstr "" "\n" "오류: FPE_INTDIV (정수: 0 나누기 오류)" -#: parted/ui.c:396 +#: parted/ui.c:397 msgid "" "\n" "Error: FPE_INTOVF (Integer: overflow)" @@ -3001,7 +2961,7 @@ msgstr "" "\n" "오류: FPE_INTOVF (정수: 오버플로우)" -#: parted/ui.c:401 +#: parted/ui.c:402 msgid "" "\n" "Error: FPE_FLTDIV (Float: divide by zero)" @@ -3009,7 +2969,7 @@ msgstr "" "\n" "오류: FPE_FLTDIV (실수: 0 나누기 오류)" -#: parted/ui.c:406 +#: parted/ui.c:407 msgid "" "\n" "Error: FPE_FLTOVF (Float: overflow)" @@ -3017,7 +2977,7 @@ msgstr "" "\n" "오류: FPE_FLTOVF (실수: 오버플로우)" -#: parted/ui.c:411 +#: parted/ui.c:412 msgid "" "\n" "Error: FPE_FLTUND (Float: underflow)" @@ -3025,7 +2985,7 @@ msgstr "" "\n" "오류: FPE_FLTUND (실수: 언더플로우)" -#: parted/ui.c:416 +#: parted/ui.c:417 msgid "" "\n" "Error: FPE_FLTRES (Float: inexact result)" @@ -3033,7 +2993,7 @@ msgstr "" "\n" "오류: FPE_FLTRES (실수: 부정확한 ê²°ê³¼)" -#: parted/ui.c:421 +#: parted/ui.c:422 msgid "" "\n" "Error: FPE_FLTINV (Float: invalid operation)" @@ -3041,7 +3001,7 @@ msgstr "" "\n" "오류: FPE_FLTINV (실수: 잘못된 연산)" -#: parted/ui.c:426 +#: parted/ui.c:427 msgid "" "\n" "Error: FPE_FLTSUB (Float: subscript out of range)" @@ -3049,7 +3009,7 @@ msgstr "" "\n" "오류: FPE_FLTSUB (실수: 아래 첨자 범위 벗어남)" -#: parted/ui.c:431 +#: parted/ui.c:432 msgid "" "\n" "Error: A general SIGFPE signal was encountered." @@ -3057,7 +3017,7 @@ msgstr "" "\n" "오류: 일반 SIGFPE 시그널이 발생했습니다." -#: parted/ui.c:455 +#: parted/ui.c:456 msgid "" "\n" "Error: ILL_ILLOPC (Illegal Opcode)" @@ -3065,7 +3025,7 @@ msgstr "" "\n" "오류: ILL_ILLOPC (잘못된 기계어 코드)" -#: parted/ui.c:460 +#: parted/ui.c:461 msgid "" "\n" "Error: ILL_ILLOPN (Illegal Operand)" @@ -3073,7 +3033,7 @@ msgstr "" "\n" "오류: ILL_ILLOPN (잘못된 기계어 인자)" -#: parted/ui.c:465 +#: parted/ui.c:466 msgid "" "\n" "Error: ILL_ILLADR (Illegal addressing mode)" @@ -3081,7 +3041,7 @@ msgstr "" "\n" "오류: ILL_ILLADR (잘못된 주소 모드)" -#: parted/ui.c:470 +#: parted/ui.c:471 msgid "" "\n" "Error: ILL_ILLTRP (Illegal Trap)" @@ -3089,7 +3049,7 @@ msgstr "" "\n" "오류: ILL_ILLTRP (잘못된 트랩 처리)" -#: parted/ui.c:475 +#: parted/ui.c:476 msgid "" "\n" "Error: ILL_PRVOPC (Privileged Opcode)" @@ -3097,7 +3057,7 @@ msgstr "" "\n" "오류: ILL_PRVOPC (권한이 필요한 기계어 코드)" -#: parted/ui.c:480 +#: parted/ui.c:481 msgid "" "\n" "Error: ILL_PRVREG (Privileged Register)" @@ -3105,7 +3065,7 @@ msgstr "" "\n" "오류: ILL_PRVREG (권한이 필요한 레지스터 접근)" -#: parted/ui.c:485 +#: parted/ui.c:486 msgid "" "\n" "Error: ILL_COPROC (Coprocessor Error)" @@ -3113,7 +3073,7 @@ msgstr "" "\n" "오류: ILL_COPROC (코프로세서 오류)" -#: parted/ui.c:490 +#: parted/ui.c:491 msgid "" "\n" "Error: ILL_BADSTK (Internal Stack Error)" @@ -3121,7 +3081,7 @@ msgstr "" "\n" "오류: ILL_BADSTK (내부 스택 오류)" -#: parted/ui.c:495 +#: parted/ui.c:496 msgid "" "\n" "Error: A general SIGILL signal was encountered." @@ -3129,69 +3089,69 @@ msgstr "" "\n" "오류: 일반 SIGILL 시그널이 발생했습니다." -#: parted/ui.c:888 +#: parted/ui.c:889 #, c-format msgid "invalid token: %s" msgstr "잘못된 토큰: %s" -#: parted/ui.c:1069 +#: parted/ui.c:1070 msgid "Expecting a partition number." msgstr "분할 영역 번호가 필요합니다." -#: parted/ui.c:1078 +#: parted/ui.c:1079 msgid "Partition doesn't exist." msgstr "분할 영역이 없습니다." -#: parted/ui.c:1098 +#: parted/ui.c:1099 msgid "Expecting a file system type." msgstr "파일 시스템 형식이 필요합니다." -#: parted/ui.c:1105 +#: parted/ui.c:1106 #, c-format msgid "Unknown file system type \"%s\"." msgstr "알 수 없는 파일 시스템 형식 “%s”." -#: parted/ui.c:1126 +#: parted/ui.c:1127 msgid "Expecting a disk label type." msgstr "디스크 레이블 형식이 필요합니다." -#: parted/ui.c:1157 parted/ui.c:1193 +#: parted/ui.c:1158 parted/ui.c:1194 msgid "No flags supported" -msgstr "" +msgstr "지원하는 플래그 없음" -#: parted/ui.c:1267 +#: parted/ui.c:1268 msgid "Can't create any more partitions." msgstr "더 이상의 분할 영역을 만들 수 없습니다." -#: parted/ui.c:1277 +#: parted/ui.c:1278 msgid "Expecting a partition type." msgstr "분할 영역 형식이 필요합니다." -#: parted/ui.c:1426 +#: parted/ui.c:1427 msgid "on" msgstr "on" -#: parted/ui.c:1427 +#: parted/ui.c:1428 msgid "off" msgstr "off" -#: parted/ui.c:1444 +#: parted/ui.c:1445 msgid "optimal" msgstr "optimal" -#: parted/ui.c:1445 +#: parted/ui.c:1446 msgid "minimal" msgstr "minimal" -#: parted/ui.c:1578 +#: parted/ui.c:1579 msgid "OPTIONs:" msgstr "옵션:" -#: parted/ui.c:1583 +#: parted/ui.c:1584 msgid "COMMANDs:" msgstr "명령:" -#: parted/ui.c:1586 +#: parted/ui.c:1587 #, c-format msgid "" "\n" @@ -3200,12 +3160,12 @@ msgstr "" "\n" "%s에 버그를 보고하십시오\n" -#: parted/ui.c:1593 +#: parted/ui.c:1594 #, c-format msgid "Using %s\n" msgstr "%s 사용법\n" -#: parted/ui.c:1673 +#: parted/ui.c:1674 msgid "This command does not make sense in non-interactive mode.\n" msgstr "이 명령은 비 대화식 모드에서 동작하지 않습니다.\n" @@ -3224,9 +3184,51 @@ msgstr "이 명령은 비 대화식 모드에서 동작하지 않습니다.\n" #~ msgid "%s home page: \n" #~ msgstr "%s 홈페이지: \n" +#~ msgid "invalid %s%s argument '%s'" +#~ msgstr "잘못된 %s%s 인자 ‘%s’" + +#~ msgid "invalid suffix in %s%s argument '%s'" +#~ msgstr "%s%s 인자의 '%s'에 잘못된 접미부" + +#~ msgid "%s%s argument '%s' too large" +#~ msgstr "%s%s 인자의 ‘%s’이(가) 너무 큽니다" + +#~ msgid "" +#~ "The partition table cannot be re-read. This means you need to reboot " +#~ "before mounting any modified partitions. You also need to reinstall your " +#~ "boot loader before you reboot (which may require mounting modified " +#~ "partitions). It is impossible do both things! So you'll need to boot " +#~ "off a rescue disk, and reinstall your boot loader from the rescue disk. " +#~ "Read section 4 of the Parted User documentation for more information." +#~ msgstr "" +#~ "분할 영역 테이블을 다시 읽을 수 없습니다. 수정한 분할 영역을 마운트하기 전" +#~ "에 다시 부팅해야 합니다. 다시 부팅하기 전에 부트 로더를 다시 설치해야 합니" +#~ "다(수정한 분할 영역을 마운트하려면 필요합니다). 두 가지를 다 처리할 수 없" +#~ "습니다. 복구 디스크로 부팅하고 복구 디스크로 부트 로더를 다시 설치해야 합" +#~ "니다. 자세한 정보는 Parted 사용자 문서 4장을 살펴보십시오." + +#~ 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 " +#~ "computer before doing anything with %s." +#~ msgstr "" +#~ "%s의 분할 영역 테이블을 다시 읽을 수 없습니다(%s). Hurd에서 수정 내역을 파" +#~ "악하지 못합니다. %s(으)로 무언가를 진행하기 전에 컴퓨터를 다시 부팅해야 합" +#~ "니다." + +#~ msgid "The boot region doesn't start at the start of the partition." +#~ msgstr "부트 영역이 분할 영역 시작 지점에서 시작하지 않았습니다." + #~ 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." #~ msgstr "" #~ "이 파일 시스템의 논리 섹터 크기가 %d 바이트 입니다. GNU Parted에서는 섹터 " #~ "크기가 512 바이트 이상인 경우 제대로 동작하지 않습니다." + +#~ msgid "" +#~ "The file %s is marked as a system file. This means moving it could cause " +#~ "some programs to stop working." +#~ msgstr "" +#~ "%s 파일은 시스템 파일입니다. 이 파일을 옮기면 일부 프로그램의 동작이 멈춥" +#~ "니다." diff --git a/po/nl.gmo b/po/nl.gmo index 4b459837d717ceb1f22cce9ed59d13cf9c75f699..5707c0eea880deebbbc0f458def784a278d19789 100644 GIT binary patch delta 14410 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 F_#dy10tNs8 delta 13357 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%0AjYHh-*MDPExv@;P`(|$x7G9h0)~*U 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, 2005, 2006, 2007, 2010, 2011, 2012, 2014. +# Benno Schulenberg , 2005, 2006, 2007, 2010, 2011, 2012, 2014, 2021. # Erwin Poeze , 2010. # Ivo Timmermans , 2000. msgid "" msgstr "" -"Project-Id-Version: parted 3.1.90\n" +"Project-Id-Version: parted 3.3.52\n" "Report-Msgid-Bugs-To: bug-parted@gnu.org\n" -"POT-Creation-Date: 2019-10-10 16:35-0700\n" -"PO-Revision-Date: 2014-07-03 21:51+0200\n" -"Last-Translator: Benno Schulenberg \n" +"POT-Creation-Date: 2021-01-27 16:00-0800\n" +"PO-Revision-Date: 2021-01-19 11:14+0100\n" +"Last-Translator: Benno Schulenberg \n" "Language-Team: Dutch \n" "Language: nl\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" "X-Bugs: Report translation errors to the Language-Team address.\n" -"X-Generator: Lokalize 1.0\n" "Plural-Forms: nplurals=2; plural=(n != 1);\n" #: lib/argmatch.c:132 @@ -46,29 +45,29 @@ msgid "Unknown system error" msgstr "Onbekende systeemfout" #: lib/getopt.c:278 -#, fuzzy, c-format +#, c-format msgid "%s: option '%s%s' is ambiguous\n" -msgstr "%s: optie '-W %s' is niet eenduidig\n" +msgstr "%s: optie '%s%s' is niet eenduidig\n" #: lib/getopt.c:284 -#, fuzzy, c-format +#, c-format msgid "%s: option '%s%s' is ambiguous; possibilities:" -msgstr "%s: optie '%s' is niet eenduidig; mogelijkheden zijn:" +msgstr "%s: optie '%s%s' is niet eenduidig; mogelijkheden zijn:" #: lib/getopt.c:319 -#, fuzzy, c-format +#, c-format msgid "%s: unrecognized option '%s%s'\n" -msgstr "%s: onbekende optie '%c%s'\n" +msgstr "%s: onbekende optie '%s%s'\n" #: lib/getopt.c:345 -#, fuzzy, c-format +#, c-format msgid "%s: option '%s%s' doesn't allow an argument\n" -msgstr "%s: optie '%c%s' staat geen argument toe\n" +msgstr "%s: optie '%s%s' staat geen argument toe\n" #: lib/getopt.c:360 -#, fuzzy, c-format +#, c-format msgid "%s: option '%s%s' requires an argument\n" -msgstr "%s: optie '--%s' vereist een argument\n" +msgstr "%s: optie '%s%s' vereist een argument\n" #: lib/getopt.c:621 #, c-format @@ -101,11 +100,11 @@ msgstr "%s: optie vereist een argument -- '%c'\n" #. If you don't know what to put here, please see #. #. and use glyphs suitable for your language. -#: lib/quotearg.c:362 +#: lib/quotearg.c:355 msgid "`" msgstr "‘" -#: lib/quotearg.c:363 +#: lib/quotearg.c:356 msgid "'" msgstr "’" @@ -138,9 +137,8 @@ msgid "Invalid back reference" msgstr "Ongeldige terugverwijzing" #: lib/regcomp.c:156 -#, fuzzy msgid "Unmatched [, [^, [:, [., or [=" -msgstr "Ongepaarde [ of [^" +msgstr "Ongepaarde [, [^, [:, [., of [=" #: lib/regcomp.c:159 msgid "Unmatched ( or \\(" @@ -221,17 +219,17 @@ 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" "Dit is vrije software: u mag het vrijelijk wijzigen en verder verspreiden.\n" -"De precieze licentie is GPLv3+: GNU GPL versie 3 of later;\n" -"zie http://gnu.org/licenses/gpl.html voor de volledige tekst.\n" -"Er is GEEN GARANTIE, voor zover de wet dit toestaat.\n" +"De precieze licentie is GPL-3+: GNU General Public License versie 3 of " +"later.\n" +"Zie <%s> voor de volledige (Engelse) tekst.\n" +"Deze software kent GEEN GARANTIE, voor zover de wet dit toestaat.\n" "\n" #. TRANSLATORS: %s denotes an author name. @@ -347,10 +345,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" "Rapporteer gebreken in het programma aan <%s>;\n" "meld fouten in de vertaling aan .\n" @@ -367,41 +364,25 @@ msgid "%s home page: <%s>\n" msgstr "Webpagina van %s: <%s>\n" #: lib/version-etc.c:260 -#, fuzzy, c-format +#, c-format msgid "General help using GNU software: <%s>\n" -msgstr "" -"Algemene hulp bij gebruik van GNU-software: \n" +msgstr "Algemene hulp bij gebruik van GNU-software: <%s>\n" #: lib/xalloc-die.c:34 msgid "memory exhausted" msgstr "onvoldoende geheugen beschikbaar" -#: lib/xstrtol-error.c:63 -#, c-format -msgid "invalid %s%s argument '%s'" -msgstr "ongeldig argument '%3$s' van %1$s%2$s" - -#: lib/xstrtol-error.c:68 -#, c-format -msgid "invalid suffix in %s%s argument '%s'" -msgstr "ongeldig achtervoegsel in argument '%3$s' van %1$s%2$s" - -#: lib/xstrtol-error.c:72 -#, c-format -msgid "%s%s argument '%s' too large" -msgstr "argument '%3$s' van %1$s%2$s is te groot" - -#: libparted/arch/beos.c:245 +#: libparted/arch/beos.c:246 msgid "Disk Image" msgstr "Schijfimage" -#: libparted/arch/beos.c:346 libparted/arch/gnu.c:277 +#: libparted/arch/beos.c:347 libparted/arch/gnu.c:277 #: libparted/arch/linux.c:1731 #, c-format msgid "Error opening %s: %s" msgstr "Fout tijdens openen van %s: %s" -#: libparted/arch/beos.c:357 libparted/arch/gnu.c:287 +#: libparted/arch/beos.c:358 libparted/arch/gnu.c:287 #: libparted/arch/linux.c:1742 #, c-format msgid "Unable to open %s read-write (%s). %s has been opened read-only." @@ -409,47 +390,47 @@ msgstr "" "Kan %s niet openen voor lezen-en-schrijven (%s); %s is geopend voor alleen-" "lezen." -#: libparted/arch/beos.c:419 libparted/arch/linux.c:1907 +#: libparted/arch/beos.c:420 libparted/arch/linux.c:1907 #, c-format msgid "%s during seek for read on %s" msgstr "%s tijdens een 'seek' bij het lezen van %s" -#: libparted/arch/beos.c:452 libparted/arch/gnu.c:465 libparted/arch/gnu.c:564 -#: libparted/arch/gnu.c:692 libparted/arch/linux.c:1867 +#: libparted/arch/beos.c:453 libparted/arch/gnu.c:425 libparted/arch/gnu.c:524 +#: libparted/arch/gnu.c:652 libparted/arch/linux.c:1867 #: libparted/arch/linux.c:1949 #, c-format msgid "%s during read on %s" msgstr "%s tijdens lezen van %s" -#: libparted/arch/beos.c:488 libparted/arch/gnu.c:525 +#: libparted/arch/beos.c:489 libparted/arch/gnu.c:485 #: libparted/arch/linux.c:2026 #, c-format msgid "Can't write to %s, because it is opened read-only." msgstr "Kan niet naar %s schrijven, omdat het geopend is voor alleen-lezen." -#: libparted/arch/beos.c:504 libparted/arch/linux.c:2051 +#: libparted/arch/beos.c:505 libparted/arch/linux.c:2051 #, c-format msgid "%s during seek for write on %s" msgstr "%s tijdens een 'seek' bij het schrijven naar %s" -#: libparted/arch/beos.c:541 libparted/arch/gnu.c:601 libparted/arch/gnu.c:646 -#: libparted/arch/gnu.c:723 libparted/arch/linux.c:1999 +#: libparted/arch/beos.c:542 libparted/arch/gnu.c:561 libparted/arch/gnu.c:606 +#: libparted/arch/gnu.c:683 libparted/arch/linux.c:1999 #: libparted/arch/linux.c:2094 libparted/arch/linux.c:2167 #, c-format msgid "%s during write on %s" msgstr "%s tijdens schrijven naar %s" -#: partprobe/partprobe.c:148 +#: partprobe/partprobe.c:149 #, c-format msgid "Try `%s --help' for more information.\n" msgstr "Typ '%s --help' voor meer informatie.\n" -#: partprobe/partprobe.c:152 +#: partprobe/partprobe.c:153 #, c-format msgid "Usage: %s [OPTION] [DEVICE]...\n" msgstr "Gebruik: %s [OPTIE] [APPARAAT]...\n" -#: partprobe/partprobe.c:153 +#: partprobe/partprobe.c:154 msgid "" "Inform the operating system about partition table changes.\n" "\n" @@ -465,7 +446,7 @@ msgstr "" " -h, --help deze hulptekst tonen en stoppen\n" " -v, --version programmaversie tonen en stoppen\n" -#: partprobe/partprobe.c:161 +#: partprobe/partprobe.c:162 msgid "" "\n" "When no DEVICE is given, probe all partitions.\n" @@ -473,7 +454,7 @@ msgstr "" "\n" "Zonder APPARAAT worden alle beschikbare apparaten onderzocht.\n" -#: partprobe/partprobe.c:165 +#: partprobe/partprobe.c:166 #, c-format msgid "" "\n" @@ -492,43 +473,7 @@ msgstr "Kan %s niet openen." msgid "Unable to probe store." msgstr "Kan de logische opbouw van het apparaat niet achterhalen." -#: libparted/arch/gnu.c:368 -msgid "" -"The partition table cannot be re-read. This means you need to reboot before " -"mounting any modified partitions. You also need to reinstall your boot " -"loader before you reboot (which may require mounting modified partitions). " -"It is impossible do both things! So you'll need to boot off a rescue disk, " -"and reinstall your boot loader from the rescue disk. Read section 4 of the " -"Parted User documentation for more information." -msgstr "" -"De kernel kan de partitietabel niet herinlezen. Dit betekent dat u uw " -"computer moet herstarten alvorens veranderde partities te gebruiken. Maar " -"voor het herstarten moet u ook uw opstartlader opnieuw installeren, wat " -"mogelijk het aankoppelen van veranderde partitities vereist. De twee dingen " -"zijn niet samen mogelijk! U zult dus van een reddingsdiskette of van een CD " -"moeten herstarten, en vanaf daar uw opstartlader moeten herinstalleren. " -"Lees eventueel sectie 4 van de Parted-gebruikersdocumentatie." - -#: libparted/arch/gnu.c:385 -#, 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 computer " -"before doing anything with %s." -msgstr "" -"De kernel kan de partitietabel op %s niet herinlezen (%s). Dit betekent dat " -"de Hurd geen weet heeft van de veranderingen die u net hebt gemaakt. U " -"dient uw computer te herstarten alvorens iets met %s te doen." - -#: libparted/arch/gnu.c:396 parted/parted.c:2318 -msgid "" -"You should reinstall your boot loader before rebooting. Read section 4 of " -"the Parted User documentation for more information." -msgstr "" -"Alvorens te herstarten dient u uw opstartlader opnieuw te installeren. Lees " -"sectie 4 van de Parted-gebruikersdocumentatie voor meer informatie." - -#: libparted/arch/gnu.c:788 +#: libparted/arch/gnu.c:748 #, c-format msgid "%s trying to sync %s to disk" msgstr "%s: bezig met synchroniseren van %s naar schijf" @@ -617,9 +562,8 @@ msgid "Generic SD/MMC Storage Card" msgstr "Algemeen SD/MMC-geheugenkaart" #: libparted/arch/linux.c:1422 -#, fuzzy msgid "NVMe Device" -msgstr "Nieuw apparaat?" +msgstr "NVMe-apparaat" #: libparted/arch/linux.c:1483 msgid "DAC960 RAID controller" @@ -647,7 +591,7 @@ msgstr "Compaq Smart Array-stuurapparaat" #: libparted/arch/linux.c:1520 msgid "NVDIMM Device" -msgstr "" +msgstr "NVDIMM-apparaat" #: libparted/arch/linux.c:1525 msgid "ATARAID Controller" @@ -688,7 +632,7 @@ msgstr "Linux-Software-RAID-array" #: libparted/arch/linux.c:1588 msgid "RAM Drive" -msgstr "" +msgstr "RAM-schijf" #: libparted/arch/linux.c:1595 msgid "ped_device_new() Unsupported device type" @@ -850,15 +794,15 @@ msgstr "metagegevens" msgid "free" msgstr "vrij" -#: libparted/disk.c:2355 parted/ui.c:1258 parted/ui.c:1286 +#: libparted/disk.c:2355 parted/ui.c:1259 parted/ui.c:1287 msgid "extended" msgstr "uitgebreid" -#: libparted/disk.c:2357 parted/ui.c:1262 parted/ui.c:1290 +#: libparted/disk.c:2357 parted/ui.c:1263 parted/ui.c:1291 msgid "logical" msgstr "logisch" -#: libparted/disk.c:2359 parted/ui.c:1254 parted/ui.c:1282 +#: libparted/disk.c:2359 parted/ui.c:1255 parted/ui.c:1283 msgid "primary" msgstr "primair" @@ -934,64 +878,72 @@ msgstr "irst" msgid "esp" msgstr "esp" -#: libparted/disk.c:2415 +#: libparted/disk.c:2411 +msgid "chromeos_kernel" +msgstr "chromeos_kernel" + +#: libparted/disk.c:2413 +msgid "bls_boot" +msgstr "bls_boot" + +#: libparted/disk.c:2419 #, c-format msgid "Unknown partition flag, %d." msgstr "Onbekende partitievlag %d." -#: libparted/exception.c:78 +#: libparted/exception.c:79 msgid "Information" msgstr "Opmerking" -#: libparted/exception.c:79 +#: libparted/exception.c:80 msgid "Warning" msgstr "Waarschuwing" -#: libparted/exception.c:80 +#: libparted/exception.c:81 msgid "Error" msgstr "Fout" -#: libparted/exception.c:81 +#: libparted/exception.c:82 msgid "Fatal" msgstr "Fataal" -#: libparted/exception.c:82 +#: libparted/exception.c:83 msgid "Bug" msgstr "Programmeerfout" -#: libparted/exception.c:83 +#: libparted/exception.c:84 msgid "No Implementation" msgstr "Niet-geïmplementeerd" -#: libparted/exception.c:87 +#: libparted/exception.c:88 msgid "Fix" msgstr "Repareren" -#: libparted/exception.c:88 +#: libparted/exception.c:89 msgid "Yes" msgstr "Ja" -#: libparted/exception.c:89 +#: libparted/exception.c:90 msgid "No" msgstr "Nee" -#: libparted/exception.c:90 +#: libparted/exception.c:91 msgid "OK" msgstr "OK" -#: libparted/exception.c:91 +#: libparted/exception.c:92 msgid "Retry" msgstr "Opnieuw proberen" -#: libparted/exception.c:92 +#: libparted/exception.c:93 msgid "Ignore" msgstr "Negeren" -#: libparted/exception.c:93 +#: libparted/exception.c:94 msgid "Cancel" msgstr "Annuleren" -#: libparted/exception.c:133 +#: libparted/exception.c:134 #, c-format msgid "" "A bug has been detected in GNU Parted. Refer to the web site of parted " @@ -1006,27 +958,27 @@ msgstr "" "Stuur een foutrapportage (naar %s) die in elk geval\n" "het versienummer (%s) noemt en de volgende boodschap: " -#: libparted/labels/aix.c:91 +#: libparted/labels/aix.c:92 msgid "Support for reading AIX disk labels is is not implemented yet." msgstr "Het lezen van AIX-schijflabels is nog niet geïmplementeerd." -#: libparted/labels/aix.c:102 +#: libparted/labels/aix.c:103 msgid "Support for writing AIX disk labels is is not implemented yet." msgstr "Het schrijven van AIX-schijflabels is nog niet geïmplementeerd." -#: libparted/labels/aix.c:115 +#: libparted/labels/aix.c:116 msgid "" "Support for adding partitions to AIX disk labels is not implemented yet." msgstr "" "Het toevoegen van partities aan AIX-schijflabels is nog niet geïmplementeerd." -#: libparted/labels/aix.c:125 +#: libparted/labels/aix.c:126 msgid "" "Support for duplicating partitions in AIX disk labels is not implemented yet." msgstr "" "Het klonen van partities in AIX-schijflabels is nog niet geïmplementeerd." -#: libparted/labels/aix.c:143 +#: libparted/labels/aix.c:144 msgid "" "Support for setting system type of partitions in AIX disk labels is not " "implemented yet." @@ -1034,19 +986,17 @@ msgstr "" "Het instellen van het systeemtype in AIX-schijflabels is nog niet " "geïmplementeerd." -#: libparted/labels/aix.c:153 +#: libparted/labels/aix.c:154 msgid "Support for setting flags in AIX disk labels is not implemented yet." msgstr "" "Het zetten van vlaggen in AIX-schijflabels is nog niet geïmplementeerd." #: libparted/labels/atari.c:273 -#, 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 kan geen HFS-bestandssystemen bewerken op schijven met een andere " -"sectorgrootte dan %d bytes." #: libparted/labels/atari.c:285 #, c-format @@ -1110,9 +1060,8 @@ msgid "" msgstr "" #: libparted/labels/atari.c:1164 -#, fuzzy msgid "ICD entries can't contain extended or logical partitions." -msgstr "Kan een uitgebreide partitie niet kopiëren." +msgstr "" #: libparted/labels/atari.c:1186 msgid "There were remaining partitions after filling the tables." @@ -1125,11 +1074,11 @@ msgid "" "partitions, if XGM is the first one it counts for two)." msgstr "" -#: libparted/labels/atari.c:1657 libparted/labels/bsd.c:567 -#: libparted/labels/dasd.c:894 libparted/labels/dos.c:2276 -#: libparted/labels/dvh.c:770 libparted/labels/gpt.c:2050 -#: libparted/labels/loop.c:243 libparted/labels/mac.c:1423 -#: libparted/labels/pc98.c:701 libparted/labels/rdb.c:1054 +#: libparted/labels/atari.c:1657 libparted/labels/bsd.c:563 +#: libparted/labels/dasd.c:895 libparted/labels/dos.c:2283 +#: libparted/labels/dvh.c:770 libparted/labels/gpt.c:2140 +#: 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 "Kan niet aan alle voorwaarden voor deze partitie voldoen." @@ -1145,46 +1094,47 @@ msgstr "" msgid "Unable to allocate a partition number." msgstr "Geen partitienummer meer beschikbaar." -#: libparted/labels/bsd.c:592 +#: libparted/labels/bsd.c:588 msgid "Unable to allocate a bsd disklabel slot." msgstr "Kan in het BSD-schijflabel geen plekje meer reserveren." -#: libparted/labels/dasd.c:625 +#: libparted/labels/dasd.c:626 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:920 +#: libparted/labels/dasd.c:921 msgid "Unable to allocate a dasd disklabel slot" msgstr "Kan in het DASD-schijflabel geen plekje meer reserveren." -#: libparted/labels/dos.c:1003 +#: libparted/labels/dos.c:1006 #, c-format msgid "Invalid partition table on %s -- wrong signature %x." msgstr "Ongeldige partitietabel op %s -- onjuiste vingerafdruk %x." -#: libparted/labels/dos.c:1031 +#: libparted/labels/dos.c:1034 #, c-format msgid "Invalid partition table - recursive partition on %s." msgstr "Ongeldige partitietabel -- recursieve partitie op %s." -#: libparted/labels/dos.c:1560 +#: libparted/labels/dos.c:1557 msgid "Extended partitions cannot be hidden on msdos disk labels." msgstr "" "Uitgebreide partities kunnen op MSDOS-schijflabels niet verborgen zijn." -#: libparted/labels/dos.c:1572 -#, fuzzy +#: libparted/labels/dos.c:1569 msgid "Extended partitions cannot be recovery partitions on msdos disk labels." msgstr "" -"Uitgebreide partities kunnen op MSDOS-schijflabels niet verborgen zijn." +"Uitgebreide partities kunnen op MSDOS-schijflabels geen herstelpartities " +"zijn." -#: libparted/labels/dos.c:2258 +#: libparted/labels/dos.c:2265 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:2514 +#: libparted/labels/dos.c:2521 msgid "cannot create any more partitions" msgstr "kan geen nieuwe partities meer maken" @@ -1280,7 +1230,7 @@ msgstr "Het opgegeven apparaat is geen geldig DASD-apparaat" #: libparted/labels/fdasd.c:188 msgid "VOLSER not found on device" -msgstr "" +msgstr "VOLSER is niet gevonden op apparaat" #: libparted/labels/fdasd.c:191 libparted/labels/vtoc.c:179 msgid "Fatal error" @@ -1311,9 +1261,8 @@ msgstr "" "stuurprogramma!" #: libparted/labels/fdasd.c:1020 -#, fuzzy msgid "Could not retrieve disk size." -msgstr "Kan geen schijfinformatie verkrijgen." +msgstr "Kan schijfgrootte niet verkrijgen." #: libparted/labels/fdasd.c:1029 msgid "Could not retrieve disk geometry information." @@ -1325,13 +1274,13 @@ msgstr "Kan blokgrootte niet verkrijgen." #: libparted/labels/fdasd.c:1045 msgid "Disk geometry does not match a DASD device of type 3390." -msgstr "" +msgstr "Schijfgeometrie komt niet overeen met een DASD-apparaat van type 3390." -#: libparted/labels/gpt.c:531 +#: libparted/labels/gpt.c:541 msgid "device is too small for GPT" msgstr "Het apparaat is te klein voor GPT." -#: libparted/labels/gpt.c:733 +#: libparted/labels/gpt.c:743 #, c-format msgid "" "The format of the GPT partition table is version %x, which is newer than " @@ -1340,7 +1289,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:769 +#: libparted/labels/gpt.c:779 #, c-format msgid "" "Not all of the space available to %s appears to be used, you can fix the GPT " @@ -1351,7 +1300,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:1008 +#: libparted/labels/gpt.c:1024 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)?" @@ -1361,7 +1310,7 @@ msgstr "" "naar het einde te verplaatsen (en de oude reservekopie te verwijderen). " "Reparatie uitvoeren?" -#: libparted/labels/gpt.c:1026 +#: libparted/labels/gpt.c:1042 msgid "" "Both the primary and backup GPT tables are corrupt. Try making a fresh " "table, and using Parted's rescue feature to recover partitions." @@ -1370,7 +1319,7 @@ msgstr "" "een nieuw schijflabel aan, en probeer dan met de 'red'-opdracht de " "kwijtgeraakte partities te herstellen." -#: libparted/labels/gpt.c:1037 +#: libparted/labels/gpt.c:1053 msgid "" "The backup GPT table is corrupt, but the primary appears OK, so that will be " "used." @@ -1378,7 +1327,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:1049 +#: libparted/labels/gpt.c:1065 msgid "" "The primary GPT table is corrupt, but the backup appears OK, so that will be " "used." @@ -1386,11 +1335,11 @@ msgstr "" "De primaire GPT-tabel is beschadigd, maar de reservekopie lijkt goed. Deze " "laatste zal worden gebruikt." -#: libparted/labels/gpt.c:1073 +#: libparted/labels/gpt.c:1089 msgid "primary partition table array CRC mismatch" msgstr "CRC-verschil in hoofdpartitietabel-array" -#: libparted/labels/gpt.c:1936 libparted/labels/gpt.c:1963 +#: libparted/labels/gpt.c:2026 libparted/labels/gpt.c:2053 msgid "failed to translate partition name" msgstr "vertalen van partitienaam is mislukt" @@ -1423,18 +1372,14 @@ msgid "The data region doesn't start at the start of the partition." msgstr "Het gegevensgebied begint niet bij het begin van de partitie." #: libparted/labels/mac.c:572 -msgid "The boot region doesn't start at the start of the partition." -msgstr "Het opstartgebied begint niet bij het begin van de partitie." - -#: libparted/labels/mac.c:586 msgid "The partition's boot region doesn't occupy the entire partition." msgstr "Het opstartgebied beslaat niet de gehele partitie." -#: libparted/labels/mac.c:597 +#: libparted/labels/mac.c:583 msgid "The partition's data region doesn't occupy the entire partition." msgstr "Het gegevensgebied beslaat niet de gehele partitie." -#: libparted/labels/mac.c:649 +#: libparted/labels/mac.c:635 #, c-format msgid "" "Weird block size on device descriptor: %d bytes is not divisible by 512." @@ -1442,7 +1387,7 @@ msgstr "" "Vreemde blokgrootte in apparaatbeschrijving: %d bytes is niet deelbaar door " "512." -#: libparted/labels/mac.c:662 +#: libparted/labels/mac.c:648 #, c-format msgid "" "The driver descriptor says the physical block size is %d bytes, but Linux " @@ -1451,11 +1396,11 @@ msgstr "" "De beschrijving van het stuurprogramma zegt dat de fysieke blokgrootte %d " "bytes is, maar Linux zegt dat het %d bytes is." -#: libparted/labels/mac.c:715 +#: libparted/labels/mac.c:701 msgid "No valid partition map found." msgstr "Geen geldige partitietabel gevonden." -#: libparted/labels/mac.c:789 +#: libparted/labels/mac.c:775 #, c-format msgid "" "Conflicting partition map entry sizes! Entry 1 says it is %d, but entry %d " @@ -1464,11 +1409,11 @@ msgstr "" "Tegenstrijdige groottes van partitietabelitems!\n" "Item 1 zegt dat het %d is, maar item %d zegt dat het %d is!" -#: libparted/labels/mac.c:820 +#: libparted/labels/mac.c:806 msgid "Weird! There are 2 partitions map entries!" msgstr "Vreemd: twee partitietabelitems!" -#: libparted/labels/mac.c:1359 +#: libparted/labels/mac.c:1345 msgid "" "Changing the name of a root or swap partition will prevent Linux from " "recognising it as such." @@ -1476,17 +1421,17 @@ msgstr "" "Het veranderen van de naam van een root- of swappartitie zal verhinderen dat " "Linux deze als zodanig herkent." -#: libparted/labels/mac.c:1458 +#: libparted/labels/mac.c:1444 msgid "Can't add another partition -- the partition map is too small!" msgstr "" "Kan geen nieuwe primaire partitie toevoegen: de partitietabel is te klein!" -#: libparted/labels/pc98.c:284 +#: libparted/labels/pc98.c:285 #, c-format msgid "Invalid partition table on %s." msgstr "Ongeldige partitietabel op %s." -#: libparted/labels/pc98.c:337 libparted/labels/pc98.c:415 +#: libparted/labels/pc98.c:338 libparted/labels/pc98.c:416 #, c-format msgid "" "Partition %d isn't aligned to cylinder boundaries. This is still " @@ -1495,7 +1440,7 @@ msgstr "" "Partitie %d is niet uitgelijnd op cilindergrenzen. Dit wordt nog niet " "ondersteund." -#: libparted/labels/pc98.c:733 +#: libparted/labels/pc98.c:729 msgid "Can't add another partition." msgstr "Kan niet nog een partitie toevoegen." @@ -1670,39 +1615,39 @@ msgstr "Kan een FMT7 DSCB niet schrijven." msgid "Could not write VTOC FMT9 DSCB." msgstr "Kan een FMT9 DSCB niet schrijven." -#: libparted/libparted.c:242 +#: libparted/libparted.c:247 msgid "Out of memory." msgstr "Onvoldoende geheugen beschikbaar." -#: libparted/unit.c:139 +#: libparted/unit.c:140 msgid "Cannot get unit size for special unit 'COMPACT'." msgstr "Kan grootte van speciale eenheid 'COMPACT' niet achterhalen." -#: libparted/unit.c:385 +#: libparted/unit.c:386 #, c-format msgid "\"%s\" has invalid syntax for locations." -msgstr "\"%s\" heeft een voor locaties ongeldige syntaxis." +msgstr "\"%s\" heeft een voor locaties ongeldige syntax." -#: libparted/unit.c:393 +#: libparted/unit.c:394 #, c-format msgid "The maximum head value is %d." msgstr "De maximum waarde voor de kop is %d." -#: libparted/unit.c:400 +#: libparted/unit.c:401 #, c-format msgid "The maximum sector value is %d." msgstr "De maximum waarde voor de sector is %d." -#: libparted/unit.c:412 libparted/unit.c:564 +#: libparted/unit.c:413 libparted/unit.c:565 #, c-format msgid "The location %s is outside of the device %s." msgstr "Locatie %s ligt buiten het apparaat %s." -#: libparted/unit.c:526 +#: libparted/unit.c:527 msgid "Invalid number." msgstr "Ongeldig nummer." -#: libparted/unit.c:532 +#: libparted/unit.c:533 msgid "Use a smaller unit instead of a value < 1" msgstr "Gebruik een kleinere eenheid in plaats van een waarde kleiner dan 1" @@ -1712,18 +1657,18 @@ msgstr "Gebruik een kleinere eenheid in plaats van een waarde kleiner dan 1" msgid "%s : Failed to allocate partition block\n" msgstr "%s : Geheugen reserveren voor partitieblok is mislukt\n" -#: libparted/fs/amiga/affs.c:79 libparted/fs/amiga/apfs.c:71 +#: 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 : Geheugen reserveren voor blok is mislukt\n" -#: libparted/fs/amiga/affs.c:84 libparted/fs/amiga/apfs.c:76 +#: 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 : Kan opstartblok %llu niet lezen\n" -#: libparted/fs/amiga/affs.c:98 libparted/fs/amiga/apfs.c:87 +#: 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" @@ -1749,22 +1694,22 @@ msgstr "%s : Onjuiste controlesom op blok %llu van type %s\n" msgid "%s : Couldn't write block %d\n" msgstr "%s : Kan blok %d niet schrijven\n" -#: libparted/fs/amiga/amiga.c:278 +#: libparted/fs/amiga/amiga.c:279 #, c-format msgid "%s : Failed to allocate disk_specific rdb block\n" msgstr "%s : Geheugen reserveren voor schijfspecifiek 'rdb'-blok is mislukt\n" -#: libparted/fs/amiga/amiga.c:289 +#: libparted/fs/amiga/amiga.c:290 #, c-format msgid "%s : Didn't find rdb block, should never happen\n" msgstr "%s : Geen 'rdb'-blok gevonden -- zou nooit mogen gebeuren\n" -#: libparted/fs/amiga/amiga.c:318 +#: libparted/fs/amiga/amiga.c:319 #, c-format msgid "%s : Failed to read partition block %llu\n" msgstr "%s : Kan partitieblok %llu niet lezen\n" -#: libparted/fs/fat/fat.c:148 libparted/fs/r/fat/fat.c:811 +#: libparted/fs/fat/fat.c:149 msgid "" "GNU Parted was miscompiled: the FAT boot sector should be 512 bytes. FAT " "support will be disabled." @@ -1866,7 +1811,7 @@ msgstr "" "bestandssysteem onveranderd gelaten. Als u 'Repareren' kiest, wordt deze " "opbouw gelijkgemaakt aan die in de partitietabel." -#: libparted/fs/r/fat/bootsector.c:399 +#: libparted/fs/r/fat/bootsector.c:398 #, c-format msgid "" "The information sector has the wrong signature (%x). Select cancel for now, " @@ -1893,13 +1838,13 @@ msgid "" msgstr "" "Clusterbegin-delta = %d, en dat is geen veelvoud van de clustergrootte %d." -#: libparted/fs/r/fat/count.c:144 +#: libparted/fs/r/fat/count.c:84 #, c-format msgid "Bad directory entry for %s: first cluster is the end of file marker." msgstr "" "Foutief mapitem voor %s: de eerste cluster is een bestandseinde-markering." -#: libparted/fs/r/fat/count.c:157 +#: libparted/fs/r/fat/count.c:97 #, c-format msgid "" "Bad FAT: unterminated chain for %s. You should run dosfsck or scandisk." @@ -1907,7 +1852,7 @@ msgstr "" "Onjuiste FAT: onbeëindigde keten voor %s. Voer eerst 'dosfsck' of " "'scandisk' uit." -#: libparted/fs/r/fat/count.c:166 +#: libparted/fs/r/fat/count.c:106 #, c-format msgid "" "Bad FAT: cluster %d outside file system in chain for %s. You should run " @@ -1916,7 +1861,7 @@ msgstr "" "Onjuiste FAT: cluster %d in de keten voor %s ligt buiten het " "bestandssysteem. Voer eerst 'dosfsck' of 'scandisk' uit." -#: libparted/fs/r/fat/count.c:176 +#: libparted/fs/r/fat/count.c:116 #, c-format msgid "" "Bad FAT: cluster %d is cross-linked for %s. You should run dosfsck or " @@ -1925,26 +1870,17 @@ msgstr "" "Onjuiste FAT: cluster %d is voor %s kruiselings gekoppeld. Voer eerst " "'dosfsck' of 'scandisk' uit." -#: libparted/fs/r/fat/count.c:195 +#: libparted/fs/r/fat/count.c:135 #, c-format msgid "%s is %dk, but it has %d clusters (%dk)." msgstr "%s is %dk, maar heeft %d clusters (%dk)." -#: libparted/fs/r/fat/count.c:258 -#, c-format -msgid "" -"The file %s is marked as a system file. This means moving it could cause " -"some programs to stop working." -msgstr "" -"Het bestand %s is gemarkeerd als een systeembestand. Als het verplaatst " -"wordt, zullen sommige programma's misschien niet meer werken." - -#: libparted/fs/r/fat/fat.c:243 +#: libparted/fs/r/fat/fat.c:244 #, c-format msgid "Partition too big/small for a %s file system." msgstr "Partitie is te klein of te groot voor een %s-bestandssysteem." -#: libparted/fs/r/fat/fat.c:409 +#: 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." @@ -1953,11 +1889,11 @@ msgstr "" "dan 'Annuleren', voer 'scandisk' uit op het bestandssysteem, en kom dan weer " "terug." -#: libparted/fs/r/fat/fat.c:449 +#: libparted/fs/r/fat/fat.c:450 msgid "There are no possible configurations for this FAT type." msgstr "Er zijn geen mogelijke configuraties voor dit type FAT." -#: libparted/fs/r/fat/fat.c:461 +#: libparted/fs/r/fat/fat.c:462 #, c-format msgid "" "File system doesn't have expected sizes for Windows to like it. Cluster " @@ -1968,7 +1904,7 @@ msgstr "" "clustergrootte is %dk (%dk verwacht); het aantal clusters is %d (%d " "verwacht); de grootte van de FAT's is %d sectoren (%d verwacht)." -#: libparted/fs/r/fat/fat.c:484 +#: libparted/fs/r/fat/fat.c:485 #, c-format msgid "" "File system is reporting the free space as %d clusters, not %d clusters." @@ -1976,7 +1912,7 @@ msgstr "" "Het bestandssysteem geeft de beschikbare ruimte aan als %d clusters, niet %d " "clusters." -#: libparted/fs/r/fat/resize.c:158 +#: 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." @@ -1984,16 +1920,16 @@ msgstr "" "Er is niet genoeg ruimte in de hoofdmap voor alle bestanden. Kies 'Negeren' " "om de overtallige bestanden te verwijderen." -#: libparted/fs/r/fat/resize.c:302 +#: libparted/fs/r/fat/resize.c:303 msgid "Error writing to the root directory." msgstr "Fout tijdens schrijven naar de hoofdmap." -#: libparted/fs/r/fat/resize.c:495 +#: libparted/fs/r/fat/resize.c:479 msgid "If you leave your file system as FAT16, then you will have no problems." msgstr "" "Als u het bestandssysteem als FAT16 laat, zult u geen problemen hebben." -#: libparted/fs/r/fat/resize.c:498 +#: 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 " @@ -2004,7 +1940,7 @@ msgstr "" "installeren. Als u dit wilt doen, raadpleeg dan de Parted-documentatie (of " "de documentatie van uw distributie)." -#: libparted/fs/r/fat/resize.c:506 +#: libparted/fs/r/fat/resize.c:490 msgid "" "If you leave your file system as FAT32, then you will not introduce any new " "problems." @@ -2012,7 +1948,7 @@ msgstr "" "Als u het bestandssysteem als FAT32 laat, zult u geen nieuwe problemen " "introduceren." -#: libparted/fs/r/fat/resize.c:510 +#: 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 " @@ -2026,42 +1962,42 @@ msgstr "" "de documentatie van uw distributie). Maar bedenk: converteren naar FAT32 " "maakt het bestandssysteem onleesbaar voor MSDOS, Windows 95a en Windows NT." -#: libparted/fs/r/fat/resize.c:524 +#: libparted/fs/r/fat/resize.c:508 #, c-format msgid "%s %s %s" msgstr "%s %s %s" -#: libparted/fs/r/fat/resize.c:525 +#: libparted/fs/r/fat/resize.c:509 msgid "Would you like to use FAT32?" msgstr "Wilt u FAT32 gebruiken?" -#: libparted/fs/r/fat/resize.c:556 libparted/fs/r/fat/resize.c:572 +#: 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:557 +#: libparted/fs/r/fat/resize.c:541 msgid "" "The file system can only be resized to this size by converting to FAT16." msgstr "" "Het bestandssysteem kan alleen naar deze grootte veranderd worden door te " "converteren naar FAT16." -#: libparted/fs/r/fat/resize.c:573 +#: libparted/fs/r/fat/resize.c:557 msgid "" "The file system can only be resized to this size by converting to FAT32." msgstr "" "Het bestandssysteem kan alleen naar deze grootte veranderd worden door te " "converteren naar FAT32." -#: libparted/fs/r/fat/resize.c:586 +#: 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 kan de partitiegrootte niet naar deze afmetingen veranderen. We " "zijn er mee bezig!" -#: libparted/fs/r/fat/table.c:136 +#: 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 " @@ -2070,42 +2006,42 @@ msgstr "" "FAT %d medium %x komt niet overeen met medium %x uit de opstartsector. U " "kunt beter eerst 'scandisk' uitvoeren." -#: libparted/fs/r/fat/table.c:268 +#: libparted/fs/r/fat/table.c:269 #, c-format msgid "fat_table_set: cluster %ld outside file system" msgstr "fat_table_set(): cluster %ld ligt buiten het bestandssysteem" -#: libparted/fs/r/fat/table.c:300 +#: libparted/fs/r/fat/table.c:301 #, c-format msgid "fat_table_get: cluster %ld outside file system" msgstr "fat_table_get(): cluster %ld ligt buiten het bestandssysteem" -#: libparted/fs/r/fat/table.c:342 +#: libparted/fs/r/fat/table.c:343 msgid "fat_table_alloc_cluster: no free clusters" msgstr "fat_table_alloc_cluster(): geen beschikbare clusters" -#: libparted/fs/r/filesys.c:151 +#: libparted/fs/r/filesys.c:152 msgid "Could not detect file system." msgstr "Kan geen bestandssysteem vinden." -#: libparted/fs/r/filesys.c:158 libparted/fs/r/filesys.c:285 +#: libparted/fs/r/filesys.c:159 libparted/fs/r/filesys.c:284 #, c-format msgid "resizing %s file systems is not supported" msgstr "" "het van grootte veranderen van %s-bestandssystemen wordt niet ondersteund" -#: libparted/fs/r/filesys.c:170 +#: libparted/fs/r/filesys.c:171 msgid "The file system is bigger than its volume!" msgstr "Het bestandssysteem is groter dan de partitie!" -#: libparted/fs/r/hfs/advfs.c:121 libparted/fs/r/hfs/advfs_plus.c:121 -#: libparted/fs/r/hfs/reloc.c:413 libparted/fs/r/hfs/reloc.c:507 -#: libparted/fs/r/hfs/reloc_plus.c:538 libparted/fs/r/hfs/reloc_plus.c:656 -#: libparted/fs/r/hfs/reloc_plus.c:769 +#: 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 "Het bestandssysteem bevat fouten." -#: libparted/fs/r/hfs/advfs_plus.c:285 +#: libparted/fs/r/hfs/advfs_plus.c:287 msgid "Bad blocks could not be read." msgstr "Slechte blokken konden niet gelezen worden." @@ -2120,12 +2056,12 @@ msgstr "" "uit!" #: 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 "" -"Poging tot het verplaatsen van een 'extent' van blok 0x%X naar blok Ox%X, " +"Poging tot het verplaatsen van een 'extent' van blok 0x%X naar blok 0x%X, " "maar er bestaat al een 'extent' op die positie. Dit hoort nooit te gebeuren!" #: libparted/fs/r/hfs/file.c:143 @@ -2172,67 +2108,67 @@ msgid "Trying to write HFS+ file with CNID %X behind EOF." msgstr "" "Poging tot schrijven van HFS+-bestand met CNID %X voorbij einde-van-bestand." -#: libparted/fs/r/hfs/hfs.c:232 +#: libparted/fs/r/hfs/hfs.c:212 msgid "Sorry, HFS cannot be resized that way yet." msgstr "Sorry, HFS kan nog niet op deze manier van grootte veranderd worden." -#: libparted/fs/r/hfs/hfs.c:250 libparted/fs/r/hfs/hfs.c:629 +#: libparted/fs/r/hfs/hfs.c:230 libparted/fs/r/hfs/hfs.c:573 msgid "shrinking" msgstr "bezig met verkleinen" -#: libparted/fs/r/hfs/hfs.c:262 libparted/fs/r/hfs/hfs.c:641 +#: libparted/fs/r/hfs/hfs.c:242 libparted/fs/r/hfs/hfs.c:585 msgid "Data relocation has failed." msgstr "De gegevensverplaatsing is mislukt." -#: libparted/fs/r/hfs/hfs.c:281 +#: libparted/fs/r/hfs/hfs.c:261 msgid "Data relocation left some data in the end of the volume." msgstr "" "De gegevensverplaatsing heeft enkele gegevens aan het einde van het volumen " "achtergelaten." -#: libparted/fs/r/hfs/hfs.c:320 +#: libparted/fs/r/hfs/hfs.c:300 msgid "writing HFS Master Directory Block" msgstr "bezig met schrijven van HFS-hoofdmapblok" -#: libparted/fs/r/hfs/hfs.c:468 +#: libparted/fs/r/hfs/hfs.c:412 msgid "No valid HFS[+X] signature has been found while opening." msgstr "Geen geldige HFS[+X]-vingerafdruk gevonden tijdens openen." -#: libparted/fs/r/hfs/hfs.c:478 +#: libparted/fs/r/hfs/hfs.c:422 #, c-format msgid "Version %d of HFS+ isn't supported." msgstr "Versie %d van HFS+ wordt niet ondersteund." -#: libparted/fs/r/hfs/hfs.c:489 +#: libparted/fs/r/hfs/hfs.c:433 #, c-format msgid "Version %d of HFSX isn't supported." msgstr "Versie %d van HFSX wordt niet ondersteund." -#: libparted/fs/r/hfs/hfs.c:672 +#: libparted/fs/r/hfs/hfs.c:616 msgid "Data relocation left some data at the end of the volume." msgstr "" "De gegevensverplaatsing heeft enkele gegevens aan het einde van het volumen " "achtergelaten." -#: libparted/fs/r/hfs/hfs.c:720 +#: libparted/fs/r/hfs/hfs.c:664 msgid "Error while writing the allocation file." msgstr "Fout tijdens schrijven van het reserveringsbestand." -#: libparted/fs/r/hfs/hfs.c:735 +#: libparted/fs/r/hfs/hfs.c:679 msgid "Error while writing the compatibility part of the allocation file." msgstr "" "Fout tijdens schrijven van het compatibiliteitsdeel van het " "reserveringsbestand." -#: libparted/fs/r/hfs/hfs.c:750 +#: libparted/fs/r/hfs/hfs.c:694 msgid "writing HFS+ Volume Header" msgstr "bezig met schrijven van HFS+-volumenkop" -#: libparted/fs/r/hfs/hfs.c:850 +#: libparted/fs/r/hfs/hfs.c:794 msgid "An error occurred while looking for the mandatory bad blocks file." msgstr "Fout tijdens zoeken naar het vereiste slechte-blokkenbestand." -#: libparted/fs/r/hfs/hfs.c:904 +#: 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." @@ -2240,27 +2176,27 @@ msgstr "" "Er schijnt een fout in de HFS-wikkel te zitten: het slechte-blokkenbestand " "bevat geen ingebed HFS+-volumen." -#: libparted/fs/r/hfs/hfs.c:940 +#: libparted/fs/r/hfs/hfs.c:883 msgid "Sorry, HFS+ cannot be resized that way yet." msgstr "Sorry, HFS+ kan nog niet op deze manier van grootte veranderd worden." -#: libparted/fs/r/hfs/hfs.c:975 +#: libparted/fs/r/hfs/hfs.c:918 msgid "shrinking embedded HFS+ volume" msgstr "bezig met verkleinen van een ingebed HFS+-volumen" -#: libparted/fs/r/hfs/hfs.c:992 +#: libparted/fs/r/hfs/hfs.c:935 msgid "Resizing the HFS+ volume has failed." msgstr "Het van grootte veranderen van het HFS+-volumen is mislukt." -#: libparted/fs/r/hfs/hfs.c:999 +#: libparted/fs/r/hfs/hfs.c:942 msgid "shrinking HFS wrapper" msgstr "bezig met verkleinen van HFS-wikkel" -#: libparted/fs/r/hfs/hfs.c:1008 +#: libparted/fs/r/hfs/hfs.c:951 msgid "Updating the HFS wrapper has failed." msgstr "Het bijwerken van de HFS-wikkel is mislukt." -#: libparted/fs/r/hfs/hfs.c:1110 libparted/fs/r/hfs/hfs.c:1195 +#: 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 " @@ -2282,7 +2218,6 @@ msgstr "" "het journal." #: 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." @@ -2341,7 +2276,7 @@ msgstr "" msgid "An extent has not been relocated." msgstr "Een 'extent' is niet verplaatst." -#: libparted/fs/r/hfs/reloc.c:250 libparted/fs/r/hfs/reloc_plus.c:307 +#: 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!" @@ -2349,18 +2284,18 @@ msgstr "" "Er wordt gerefereerd aan een 'extent' vanuit een onmogelijke plaats. Voer " "een bestandssyteemcontrole uit!" -#: libparted/fs/r/hfs/reloc.c:380 +#: libparted/fs/r/hfs/reloc.c:382 msgid "This HFS volume has no catalog file. This is very unusual!" msgstr "" "Dit HFS-volumen heeft geen catalogusbestand. Dit is zeer ongebruikelijk!" -#: libparted/fs/r/hfs/reloc.c:474 +#: libparted/fs/r/hfs/reloc.c:479 msgid "This HFS volume has no extents overflow file. This is quite unusual!" msgstr "" "Dit HFS-volumen heeft geen 'extents-overflow'-bestand. Dit is zeer " "ongebruikelijk!" -#: libparted/fs/r/hfs/reloc.c:516 libparted/fs/r/hfs/reloc_plus.c:666 +#: 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." @@ -2368,54 +2303,54 @@ msgstr "" "Het 'extents-overflow'-bestand hoort niet zijn eigen 'extents' te bevatten. " "Voer een bestandssyteemcontrole uit!" -#: libparted/fs/r/hfs/reloc.c:573 libparted/fs/r/hfs/reloc_plus.c:844 +#: 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 "Kan het bestandssysteem niet tijdelijk opslaan in het geheugen." -#: libparted/fs/r/hfs/reloc.c:634 libparted/fs/r/hfs/reloc_plus.c:905 +#: libparted/fs/r/hfs/reloc.c:640 libparted/fs/r/hfs/reloc_plus.c:910 msgid "Bad blocks list could not be loaded." msgstr "De lijst met slechte blokken kan niet geladen worden." -#: libparted/fs/r/hfs/reloc.c:648 libparted/fs/r/hfs/reloc_plus.c:921 +#: libparted/fs/r/hfs/reloc.c:654 libparted/fs/r/hfs/reloc_plus.c:926 msgid "An error occurred during extent relocation." msgstr "Er is een fout opgetreden tijdens het verplaatsen van een 'extent'." -#: libparted/fs/r/hfs/reloc_plus.c:494 +#: libparted/fs/r/hfs/reloc_plus.c:495 msgid "This HFS+ volume has no catalog file. This is very unusual!" msgstr "" "Dit HFS+-volumen heeft geen catalogusbestand. Dit is zeer ongebruikelijk!" -#: libparted/fs/r/hfs/reloc_plus.c:617 +#: libparted/fs/r/hfs/reloc_plus.c:620 msgid "This HFS+ volume has no extents overflow file. This is quite unusual!" msgstr "" "Dit HFS+-volumen heeft geen 'extents-overflow'-bestand. Dit is zeer " "ongebruikelijk!" -#: parted/parted.c:125 +#: parted/parted.c:126 msgid "displays this help message" msgstr "deze hulptekst tonen" -#: parted/parted.c:126 +#: parted/parted.c:127 msgid "lists partition layout on all block devices" msgstr "de partietabellen van alle apparaten tonen" -#: parted/parted.c:127 +#: parted/parted.c:128 msgid "displays machine parseable output" msgstr "computerverwerkbare uitvoer produceren" -#: parted/parted.c:128 +#: parted/parted.c:129 msgid "never prompts for user intervention" msgstr "nooit vragen stellen" -#: parted/parted.c:129 +#: parted/parted.c:130 msgid "displays the version" msgstr "de programmaversie tonen" -#: parted/parted.c:130 +#: parted/parted.c:131 msgid "alignment for new partitions" msgstr "uitlijning voor nieuwe partities" -#: parted/parted.c:142 +#: parted/parted.c:143 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" @@ -2424,31 +2359,31 @@ msgstr "" "schijflabels zijn de primaire partities genummerd van 1 tot 4, de logische " "partities vanaf 5 en hoger.\n" -#: parted/parted.c:145 +#: parted/parted.c:146 msgid "LABEL-TYPE is one of: " msgstr "LABEL-TYPE is een van: " -#: parted/parted.c:146 parted/parted.c:147 +#: parted/parted.c:147 parted/parted.c:148 msgid "FLAG is one of: " msgstr "VLAG is een van: " -#: parted/parted.c:148 +#: parted/parted.c:149 msgid "UNIT is one of: " msgstr "EENHEID is een van: " -#: parted/parted.c:149 +#: parted/parted.c:150 msgid "desired alignment: minimum or optimal" msgstr "gewenste uitlijning: minimaal of optimaal" -#: parted/parted.c:150 +#: parted/parted.c:151 msgid "PART-TYPE is one of: primary, logical, extended\n" msgstr "PART-TYPE is een van: primair, logisch, uitgebreid\n" -#: parted/parted.c:152 +#: parted/parted.c:153 msgid "FS-TYPE is one of: " msgstr "BS-SOORT is een van: " -#: parted/parted.c:153 +#: parted/parted.c:154 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 " @@ -2458,7 +2393,7 @@ msgstr "" "tellen vanaf het einde van de schijf. Bijvoorbeeld, -1s geeft precies de " "laatste sector aan.\n" -#: parted/parted.c:156 +#: parted/parted.c:157 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" @@ -2467,19 +2402,19 @@ msgstr "" "vanaf het einde van de schijf. Bijvoorbeeld, -1s geeft precies de laatste " "sector aan.\n" -#: parted/parted.c:159 +#: parted/parted.c:160 msgid "STATE is one of: on, off\n" msgstr "TOESTAND is één van: aan, uit\n" -#: parted/parted.c:160 +#: parted/parted.c:161 msgid "DEVICE is usually /dev/hda or /dev/sda\n" msgstr "APPARAAT is gewoonlijk /dev/hda of /dev/sda\n" -#: parted/parted.c:161 +#: parted/parted.c:162 msgid "NAME is any word you want\n" msgstr "NAAM is elk woord dat u wilt\n" -#: parted/parted.c:164 +#: parted/parted.c:165 msgid "" "Copyright (C) 1998 - 2006 Free Software Foundation, Inc.\n" "This program is free software, covered by the GNU General Public License.\n" @@ -2499,22 +2434,22 @@ msgstr "" "van VERKOOPBAARHEID of GESCHIKTHEID VOOR EEN BEPAALD DOEL.\n" "Zie de GNU General Public License voor meer details.\n" -#: parted/parted.c:212 +#: parted/parted.c:213 #, c-format msgid "%0.f%%\t(time left %.2d:%.2d)" msgstr "%0.f%%\t(resterende tijd: %.2d:%.2d)" -#: parted/parted.c:231 +#: parted/parted.c:232 #, 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:252 +#: parted/parted.c:253 #, c-format msgid "Partition(s) on %s are being used." msgstr "Partitie(s) op %s zijn in gebruik." -#: parted/parted.c:264 +#: parted/parted.c:265 #, c-format msgid "" "The existing disk label on %s will be destroyed and all data on this disk " @@ -2523,31 +2458,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:525 +#: parted/parted.c:526 msgid "New disk label type?" msgstr "Type van nieuw schijflabel?" -#: parted/parted.c:662 +#: parted/parted.c:663 msgid "Partition type?" msgstr "Partitietype?" -#: parted/parted.c:680 parted/parted.c:884 +#: parted/parted.c:681 parted/parted.c:885 msgid "Partition name?" msgstr "Naam van partitie?" -#: parted/parted.c:690 +#: parted/parted.c:691 msgid "File system type?" msgstr "Bestandssysteemsoort?" -#: parted/parted.c:695 parted/parted.c:1498 +#: parted/parted.c:696 parted/parted.c:1499 msgid "Start?" msgstr "Begin?" -#: parted/parted.c:698 parted/parted.c:1500 parted/parted.c:1569 +#: parted/parted.c:699 parted/parted.c:1501 parted/parted.c:1585 msgid "End?" msgstr "Einde?" -#: parted/parted.c:766 +#: parted/parted.c:767 #, c-format msgid "" "You requested a partition from %s to %s (sectors %llu..%llu).\n" @@ -2556,7 +2491,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:775 +#: parted/parted.c:776 msgid "" "\n" "Is this still acceptable to you?" @@ -2564,96 +2499,97 @@ msgstr "" "\n" "Is dit nog acceptabel?" -#: parted/parted.c:798 -#, fuzzy, c-format +#: parted/parted.c:799 +#, c-format msgid "" "The resulting partition is not properly aligned for best performance: %s" msgstr "" -"De resulterende partitie is niet correct uitgelijnd voor optimale prestaties." +"De resulterende partitie is niet correct uitgelijnd voor optimale " +"prestaties: %s" -#: parted/parted.c:800 parted/parted.c:1723 +#: parted/parted.c:801 parted/parted.c:1739 msgid "unknown (malloc failed)" -msgstr "" +msgstr "onbekend (onvoldoende geheugen beschikbaar)" -#: parted/parted.c:876 -#, fuzzy, c-format +#: parted/parted.c:877 +#, c-format msgid "%s disk labels do not support partition name." -msgstr "%s-schijflabels kennen geen uitgebreide partities." +msgstr "%s-schijflabels kennen geen partitienamen." -#: parted/parted.c:881 parted/parted.c:1561 parted/parted.c:1612 -#: parted/parted.c:1706 parted/parted.c:1781 +#: parted/parted.c:882 parted/parted.c:1564 parted/parted.c:1628 +#: parted/parted.c:1722 parted/parted.c:1797 msgid "Partition number?" msgstr "Nummer van partitie?" -#: parted/parted.c:975 +#: parted/parted.c:976 #, 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:1017 +#: parted/parted.c:1018 #, c-format msgid "Model: %s (%s)\n" msgstr "Model: %s (%s)\n" -#: parted/parted.c:1019 +#: parted/parted.c:1020 #, c-format msgid "Disk %s: %s\n" msgstr "Schijf %s: %s\n" -#: parted/parted.c:1020 +#: parted/parted.c:1021 #, c-format msgid "Sector size (logical/physical): %lldB/%lldB\n" msgstr "Sectorgrootte (logisch/fysiek): %lldB/%lldB\n" -#: parted/parted.c:1032 +#: parted/parted.c:1033 #, c-format msgid "Partition Table: %s\n" msgstr "Partitietabel: %s\n" -#: parted/parted.c:1033 +#: parted/parted.c:1034 #, c-format msgid "Disk Flags: %s\n" msgstr "Schijfvlaggen: %s\n" -#: parted/parted.c:1153 parted/parted.c:1156 +#: parted/parted.c:1154 parted/parted.c:1157 msgid "Number" msgstr "Nummer" -#: parted/parted.c:1153 parted/parted.c:1156 +#: parted/parted.c:1154 parted/parted.c:1157 msgid "Start" msgstr "Begin" -#: parted/parted.c:1154 parted/parted.c:1157 +#: parted/parted.c:1155 parted/parted.c:1158 msgid "End" msgstr "Einde" -#: parted/parted.c:1157 +#: parted/parted.c:1158 msgid "Size" msgstr "Grootte" -#: parted/parted.c:1161 +#: parted/parted.c:1162 msgid "Type" msgstr "Type" -#: parted/parted.c:1163 +#: parted/parted.c:1164 msgid "File system" msgstr "Bestandssysteem" -#: parted/parted.c:1166 +#: parted/parted.c:1167 msgid "Name" msgstr "Naam" -#: parted/parted.c:1168 +#: parted/parted.c:1169 msgid "Flags" msgstr "Vlaggen" -#: parted/parted.c:1225 +#: parted/parted.c:1226 msgid "Free Space" msgstr "Vrije ruimte" -#: parted/parted.c:1385 +#: parted/parted.c:1386 #, c-format msgid "" "A %s %s partition was found at %s -> %s. Do you want to add it to the " @@ -2662,57 +2598,56 @@ msgstr "" "Er is een %s %s-partitie gevonden van %s tot %s. Wilt u deze aan de " "partitietabel toevoegen?" -#: parted/parted.c:1428 +#: parted/parted.c:1429 msgid "searching for file systems" msgstr "bezig met zoeken naar bestandssystemen" -#: parted/parted.c:1535 +#: parted/parted.c:1536 msgid "The resize command has been removed in parted 3.0" msgstr "De 'grootte'-opdracht is verwijderd in Parted 3.0." -#: parted/parted.c:1583 +#: parted/parted.c:1599 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:1636 +#: parted/parted.c:1652 msgid "New device?" msgstr "Nieuw apparaat?" -#: parted/parted.c:1704 +#: parted/parted.c:1720 msgid "alignment type(min/opt)" msgstr "uitlijningssoort (min/opt)" -#: parted/parted.c:1719 +#: parted/parted.c:1735 #, c-format msgid "%d aligned\n" msgstr "%d is uitgelijnd\n" -#: parted/parted.c:1721 -#, fuzzy, c-format +#: parted/parted.c:1737 +#, c-format msgid "%d not aligned: %s\n" -msgstr "%d is niet uitgelijnd\n" +msgstr "%d is niet uitgelijnd: %s\n" -#: parted/parted.c:1746 parted/parted.c:1783 +#: parted/parted.c:1762 parted/parted.c:1799 msgid "Flag to Invert?" msgstr "Om te zetten vlag?" -#: parted/parted.c:1751 parted/parted.c:1788 +#: parted/parted.c:1767 parted/parted.c:1804 msgid "New state?" msgstr "Nieuwe toestand?" -#: parted/parted.c:1834 +#: parted/parted.c:1850 msgid "Unit?" msgstr "Eenheid?" -#: parted/parted.c:1969 +#: parted/parted.c:1985 msgid "align-check" msgstr "uitlijncontrole" -#: parted/parted.c:1972 -#, fuzzy +#: parted/parted.c:1988 msgid "" "align-check TYPE N check partition N for TYPE(min|opt) " "alignment" @@ -2720,41 +2655,41 @@ msgstr "" "uitlijncontrole SOORT N partitie N controleren op SOORT(min|opt)-" "uitlijning" -#: parted/parted.c:1980 +#: parted/parted.c:1996 msgid "help" msgstr "hulp" -#: parted/parted.c:1983 +#: parted/parted.c:1999 msgid "" "help [COMMAND] print general help, or help on " "COMMAND" msgstr "" "help [OPDRACHT] enige algemene hulp geven (of hulp bij OPDRACHT)" -#: parted/parted.c:1989 +#: parted/parted.c:2005 msgid "mklabel" msgstr "maaklabel" -#: parted/parted.c:1989 +#: parted/parted.c:2005 msgid "mktable" msgstr "maaktabel" -#: parted/parted.c:1992 +#: parted/parted.c:2008 msgid "" "mklabel,mktable LABEL-TYPE create a new disklabel (partition " "table)" msgstr "" "maaklabel LABEL-TYPE nieuw schijflabel maken (met lege partitietabel)" -#: parted/parted.c:1998 +#: parted/parted.c:2014 msgid "mkpart" msgstr "maakpart" -#: parted/parted.c:2001 +#: parted/parted.c:2017 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:2007 +#: parted/parted.c:2023 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" @@ -2763,19 +2698,19 @@ msgstr "" "maken. BS-SOORT mag gebruikt worden om het een geschikt partitiekenmerk te " "geven.\n" -#: parted/parted.c:2012 +#: parted/parted.c:2028 msgid "name" msgstr "noem" -#: parted/parted.c:2015 +#: parted/parted.c:2031 msgid "name NUMBER NAME name partition NUMBER as NAME" msgstr "noem NUMMER NAAM partitie NUMMER deze NAAM geven" -#: parted/parted.c:2020 +#: parted/parted.c:2036 msgid "print" msgstr "toon" -#: parted/parted.c:2023 +#: parted/parted.c:2039 msgid "" "print [devices|free|list,all|NUMBER] display the partition table, " "available devices, free space, all found partitions, or a particular " @@ -2785,7 +2720,7 @@ msgstr "" "beschikbare apparaten, of vrije ruimte, of tabellen van alle apparaten, of " "een specifieke partitie)" -#: parted/parted.c:2028 +#: parted/parted.c:2044 msgid "" "Without arguments, 'print' displays the entire partition table. However with " "the following arguments it performs various other actions.\n" @@ -2793,42 +2728,42 @@ msgstr "" "Zonder argumenten toont 'toon' de volledige partitietabel, maar met\n" "de volgende argumenten wordt meer specifieke informatie getoond:\n" -#: parted/parted.c:2030 +#: parted/parted.c:2046 msgid " devices : display all active block devices\n" msgstr " devices : alle actieve blokapparaten tonen\n" -#: parted/parted.c:2031 +#: parted/parted.c:2047 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:2033 +#: parted/parted.c:2049 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:2034 +#: parted/parted.c:2050 msgid "" " NUMBER : display more detailed information about this particular " "partition\n" msgstr " NUMMER : meer details over partitie NUMMER tonen\n" -#: parted/parted.c:2039 +#: parted/parted.c:2055 msgid "quit" msgstr "einde" -#: parted/parted.c:2042 +#: parted/parted.c:2058 msgid "quit exit program" msgstr "einde programma afsluiten" -#: parted/parted.c:2047 +#: parted/parted.c:2063 msgid "rescue" msgstr "red" -#: parted/parted.c:2050 +#: parted/parted.c:2066 msgid "" "rescue START END rescue a lost partition near START " "and END" @@ -2836,101 +2771,101 @@ msgstr "" "red BEGIN EINDE een verloren partitie (met geschat begin en " "einde) proberen te herstellen" -#: parted/parted.c:2056 +#: parted/parted.c:2072 msgid "resize" msgstr "grootte" -#: parted/parted.c:2059 +#: parted/parted.c:2075 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:2062 +#: parted/parted.c:2078 msgid "resizepart" msgstr "rekoptot" -#: parted/parted.c:2065 +#: parted/parted.c:2081 msgid "resizepart NUMBER END resize partition NUMBER" msgstr "" "rekoptot NUMMER EINDE partitie NUMMER krimpen/oprekken tot nieuw EINDE" -#: parted/parted.c:2070 +#: parted/parted.c:2086 msgid "rm" msgstr "verwijder" -#: parted/parted.c:2073 +#: parted/parted.c:2089 msgid "rm NUMBER delete partition NUMBER" msgstr "verwijder NUMMER partitie NUMMER verwijderen" -#: parted/parted.c:2078 +#: parted/parted.c:2094 msgid "select" msgstr "kies" -#: parted/parted.c:2081 +#: parted/parted.c:2097 msgid "select DEVICE choose the device to edit" msgstr "kies APPARAAT dit APPARAAT kiezen om te bewerken" -#: parted/parted.c:2086 +#: parted/parted.c:2102 msgid "disk_set" msgstr "schijf_zet" -#: parted/parted.c:2089 +#: parted/parted.c:2105 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:2094 +#: parted/parted.c:2110 msgid "disk_toggle" msgstr "schijf_zetom" -#: parted/parted.c:2097 +#: parted/parted.c:2113 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:2103 +#: parted/parted.c:2119 msgid "set" msgstr "zet" -#: parted/parted.c:2106 +#: parted/parted.c:2122 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:2112 +#: parted/parted.c:2128 msgid "toggle" msgstr "zetom" -#: parted/parted.c:2115 +#: parted/parted.c:2131 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:2121 +#: parted/parted.c:2137 msgid "unit" msgstr "eenheid" -#: parted/parted.c:2124 +#: parted/parted.c:2140 msgid "unit UNIT set the default unit to UNIT" msgstr "eenheid EENHEID standaard deze EENHEID gebruiken" -#: parted/parted.c:2129 +#: parted/parted.c:2145 msgid "version" msgstr "versie" -#: parted/parted.c:2132 +#: parted/parted.c:2148 msgid "" "version display the version number and " "copyright information of GNU Parted" msgstr "" "versie versienummer en copyright van deze Parted tonen" -#: parted/parted.c:2136 +#: parted/parted.c:2152 msgid "" "'version' displays copyright and version information corresponding to this " "copy of GNU Parted\n" @@ -2938,31 +2873,39 @@ msgstr "" "'versie' toont informatie over het auteursrecht en de versie van deze GNU " "Parted\n" -#: parted/parted.c:2204 +#: parted/parted.c:2220 #, c-format msgid "Usage: %s [-hlmsv] [-a] [DEVICE [COMMAND [PARAMETERS]]...]\n" msgstr "" "Gebruik: %s [-hlmsv] [-aUITLIJNING] [APPARAAT [OPDRACHT [PARAMETERS]]...]\n" -#: parted/parted.c:2248 +#: parted/parted.c:2264 msgid "No device found" msgstr "Geen apparaat gevonden" -#: parted/parted.c:2285 +#: parted/parted.c:2301 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:2325 +#: parted/parted.c:2334 +msgid "" +"You should reinstall your boot loader before rebooting. Read section 4 of " +"the Parted User documentation for more information." +msgstr "" +"Alvorens te herstarten dient u uw opstartlader opnieuw te installeren. Lees " +"sectie 4 van de Parted-gebruikersdocumentatie voor meer informatie." + +#: parted/parted.c:2341 msgid "You may need to update /etc/fstab.\n" msgstr "Het kan nodig zijn /etc/fstab bij te werken.\n" -#: parted/ui.c:164 +#: parted/ui.c:165 msgid "Welcome to GNU Parted! Type 'help' to view a list of commands.\n" msgstr "Welkom bij GNU Parted! Typ 'help' voor een opdrachtenoverzicht.\n" -#: parted/ui.c:167 +#: parted/ui.c:168 msgid "" "Usage: parted [OPTION]... [DEVICE [COMMAND [PARAMETERS]...]...]\n" "Apply COMMANDs with PARAMETERS to DEVICE. If no COMMAND(s) are given, run " @@ -2974,7 +2917,7 @@ msgstr "" "Dit voert OPDRACHT met ARGUMENTEN uit op APPARAAT.\n" "Als er geen OPDRACHT gegeven is, wordt interactieve modus gestart.\n" -#: parted/ui.c:172 +#: parted/ui.c:173 #, c-format msgid "" "\n" @@ -3035,7 +2978,7 @@ msgstr "" "en de hierna volgende opdrachtengeschiedenis, plus verdere\n" "relevante informatie over de configuratie van uw systeem.\n" -#: parted/ui.c:293 +#: parted/ui.c:294 msgid "" "\n" "Command History:\n" @@ -3043,7 +2986,7 @@ msgstr "" "\n" "Opdrachtengeschiedenis:\n" -#: parted/ui.c:356 +#: parted/ui.c:357 msgid "" "\n" "Error: SEGV_MAPERR (Address not mapped to object)\n" @@ -3051,7 +2994,7 @@ msgstr "" "\n" "Fout: SEGV_MAPERR (Adres niet verbonden met object)\n" -#: parted/ui.c:362 +#: parted/ui.c:363 msgid "" "\n" "Error: SEGV_ACCERR (Invalid permissions for mapped object)\n" @@ -3059,7 +3002,7 @@ msgstr "" "\n" "Fout: SEGV_ACCERR (Ongeldige toegangsrechten voor object)\n" -#: parted/ui.c:367 +#: parted/ui.c:368 msgid "" "\n" "Error: A general SIGSEGV signal was encountered.\n" @@ -3067,7 +3010,7 @@ msgstr "" "\n" "Fout: een niet-specifiek SIGSEGV-signaal werd ontvangen.\n" -#: parted/ui.c:391 +#: parted/ui.c:392 msgid "" "\n" "Error: FPE_INTDIV (Integer: divide by zero)" @@ -3075,7 +3018,7 @@ msgstr "" "\n" "Fout: FPE_INTDIV (Deling door nul)" -#: parted/ui.c:396 +#: parted/ui.c:397 msgid "" "\n" "Error: FPE_INTOVF (Integer: overflow)" @@ -3083,7 +3026,7 @@ msgstr "" "\n" "Fout: FPE_INTOVF (Overloop)" -#: parted/ui.c:401 +#: parted/ui.c:402 msgid "" "\n" "Error: FPE_FLTDIV (Float: divide by zero)" @@ -3091,7 +3034,7 @@ msgstr "" "\n" "Fout: FPE_FLTDIV (Deling door nul)" -#: parted/ui.c:406 +#: parted/ui.c:407 msgid "" "\n" "Error: FPE_FLTOVF (Float: overflow)" @@ -3099,7 +3042,7 @@ msgstr "" "\n" "Fout: FPE_FLTOVF (Overloop)" -#: parted/ui.c:411 +#: parted/ui.c:412 msgid "" "\n" "Error: FPE_FLTUND (Float: underflow)" @@ -3107,7 +3050,7 @@ msgstr "" "\n" "Fout: FPE_FLTUND (Onderloop)" -#: parted/ui.c:416 +#: parted/ui.c:417 msgid "" "\n" "Error: FPE_FLTRES (Float: inexact result)" @@ -3115,7 +3058,7 @@ msgstr "" "\n" "Fout: FPE_FLTRES (Inexact resultaat)" -#: parted/ui.c:421 +#: parted/ui.c:422 msgid "" "\n" "Error: FPE_FLTINV (Float: invalid operation)" @@ -3123,7 +3066,7 @@ msgstr "" "\n" "Fout: FPE_FLTINV (Ongeldige operatie)" -#: parted/ui.c:426 +#: parted/ui.c:427 msgid "" "\n" "Error: FPE_FLTSUB (Float: subscript out of range)" @@ -3131,7 +3074,7 @@ msgstr "" "\n" "Fout: FPE_FLTSUB (Index buiten bereik)" -#: parted/ui.c:431 +#: parted/ui.c:432 msgid "" "\n" "Error: A general SIGFPE signal was encountered." @@ -3139,7 +3082,7 @@ msgstr "" "\n" "Fout: een niet-specifiek SIGFPE-signaal werd ontvangen." -#: parted/ui.c:455 +#: parted/ui.c:456 msgid "" "\n" "Error: ILL_ILLOPC (Illegal Opcode)" @@ -3147,7 +3090,7 @@ msgstr "" "\n" "Fout: ILL_ILLOPC (Ongeldige opcode)" -#: parted/ui.c:460 +#: parted/ui.c:461 msgid "" "\n" "Error: ILL_ILLOPN (Illegal Operand)" @@ -3155,7 +3098,7 @@ msgstr "" "\n" "Fout: ILL_ILLOPN (Ongeldige parameter)" -#: parted/ui.c:465 +#: parted/ui.c:466 msgid "" "\n" "Error: ILL_ILLADR (Illegal addressing mode)" @@ -3163,7 +3106,7 @@ msgstr "" "\n" "Fout: ILL_ILLADR (Ongeldige adresseringsmodus)" -#: parted/ui.c:470 +#: parted/ui.c:471 msgid "" "\n" "Error: ILL_ILLTRP (Illegal Trap)" @@ -3171,7 +3114,7 @@ msgstr "" "\n" "Fout: ILL_ILLTRP (Ongeldige 'trap'-instructie)" -#: parted/ui.c:475 +#: parted/ui.c:476 msgid "" "\n" "Error: ILL_PRVOPC (Privileged Opcode)" @@ -3179,7 +3122,7 @@ msgstr "" "\n" "Fout: ILL_PRVOPC (Instructie alleen toegankelijk voor geprivilegieerden)" -#: parted/ui.c:480 +#: parted/ui.c:481 msgid "" "\n" "Error: ILL_PRVREG (Privileged Register)" @@ -3187,7 +3130,7 @@ msgstr "" "\n" "Fout: ILL_PRVREG (Register alleen toegankelijk voor geprivilegieerden)" -#: parted/ui.c:485 +#: parted/ui.c:486 msgid "" "\n" "Error: ILL_COPROC (Coprocessor Error)" @@ -3195,7 +3138,7 @@ msgstr "" "\n" "Fout: ILL_COPROC (Coprocessorfout)" -#: parted/ui.c:490 +#: parted/ui.c:491 msgid "" "\n" "Error: ILL_BADSTK (Internal Stack Error)" @@ -3203,7 +3146,7 @@ msgstr "" "\n" "Fout: ILL_BADSTK (Interne stack-fout)" -#: parted/ui.c:495 +#: parted/ui.c:496 msgid "" "\n" "Error: A general SIGILL signal was encountered." @@ -3211,69 +3154,69 @@ msgstr "" "\n" "Fout: een niet-specifiek SIGILL-signaal werd ontvangen." -#: parted/ui.c:888 +#: parted/ui.c:889 #, c-format msgid "invalid token: %s" msgstr "ongeldig symbool: %s" -#: parted/ui.c:1069 +#: parted/ui.c:1070 msgid "Expecting a partition number." msgstr "Een partitienummer wordt verwacht." -#: parted/ui.c:1078 +#: parted/ui.c:1079 msgid "Partition doesn't exist." msgstr "Partitie bestaat niet." -#: parted/ui.c:1098 +#: parted/ui.c:1099 msgid "Expecting a file system type." msgstr "Een bestandssysteemsoort wordt verwacht." -#: parted/ui.c:1105 +#: parted/ui.c:1106 #, c-format msgid "Unknown file system type \"%s\"." msgstr "Onbekende bestandssysteemsoort '%s'." -#: parted/ui.c:1126 +#: parted/ui.c:1127 msgid "Expecting a disk label type." msgstr "Een schijflabeltype wordt verwacht." -#: parted/ui.c:1157 parted/ui.c:1193 +#: parted/ui.c:1158 parted/ui.c:1194 msgid "No flags supported" -msgstr "" +msgstr "Vlaggen worden niet ondersteund." -#: parted/ui.c:1267 +#: parted/ui.c:1268 msgid "Can't create any more partitions." msgstr "Kan geen nieuwe partities meer maken." -#: parted/ui.c:1277 +#: parted/ui.c:1278 msgid "Expecting a partition type." msgstr "Een partitietype wordt verwacht." -#: parted/ui.c:1426 +#: parted/ui.c:1427 msgid "on" msgstr "aan" -#: parted/ui.c:1427 +#: parted/ui.c:1428 msgid "off" msgstr "uit" -#: parted/ui.c:1444 +#: parted/ui.c:1445 msgid "optimal" msgstr "optimaal" -#: parted/ui.c:1445 +#: parted/ui.c:1446 msgid "minimal" msgstr "minimaal" -#: parted/ui.c:1578 +#: parted/ui.c:1579 msgid "OPTIONs:" msgstr "OPTIEs:" -#: parted/ui.c:1583 +#: parted/ui.c:1584 msgid "COMMANDs:" msgstr "OPDRACHTen:" -#: parted/ui.c:1586 +#: parted/ui.c:1587 #, c-format msgid "" "\n" @@ -3283,12 +3226,12 @@ msgstr "" "Rapporteer gebreken in het programma aan <%s>;\n" "meld fouten in de vertaling aan .\n" -#: parted/ui.c:1593 +#: parted/ui.c:1594 #, c-format msgid "Using %s\n" msgstr "Apparaat %s wordt gebruikt.\n" -#: parted/ui.c:1673 +#: parted/ui.c:1674 msgid "This command does not make sense in non-interactive mode.\n" msgstr "Deze opdracht is zonder betekenis in niet-interactieve modus.\n" @@ -3307,6 +3250,44 @@ msgstr "Deze opdracht is zonder betekenis in niet-interactieve modus.\n" #~ msgid "%s home page: \n" #~ msgstr "Webpagina van %s: \n" +#~ msgid "invalid %s%s argument '%s'" +#~ msgstr "ongeldig argument '%3$s' van %1$s%2$s" + +#~ msgid "invalid suffix in %s%s argument '%s'" +#~ msgstr "ongeldig achtervoegsel in argument '%3$s' van %1$s%2$s" + +#~ msgid "%s%s argument '%s' too large" +#~ msgstr "argument '%3$s' van %1$s%2$s is te groot" + +#~ msgid "" +#~ "The partition table cannot be re-read. This means you need to reboot " +#~ "before mounting any modified partitions. You also need to reinstall your " +#~ "boot loader before you reboot (which may require mounting modified " +#~ "partitions). It is impossible do both things! So you'll need to boot " +#~ "off a rescue disk, and reinstall your boot loader from the rescue disk. " +#~ "Read section 4 of the Parted User documentation for more information." +#~ msgstr "" +#~ "De kernel kan de partitietabel niet herinlezen. Dit betekent dat u uw " +#~ "computer moet herstarten alvorens veranderde partities te gebruiken. " +#~ "Maar voor het herstarten moet u ook uw opstartlader opnieuw installeren, " +#~ "wat mogelijk het aankoppelen van veranderde partitities vereist. De twee " +#~ "dingen zijn niet samen mogelijk! U zult dus van een reddingsdiskette of " +#~ "van een CD moeten herstarten, en vanaf daar uw opstartlader moeten " +#~ "herinstalleren. Lees eventueel sectie 4 van de Parted-" +#~ "gebruikersdocumentatie." + +#~ 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 " +#~ "computer before doing anything with %s." +#~ msgstr "" +#~ "De kernel kan de partitietabel op %s niet herinlezen (%s). Dit betekent " +#~ "dat de Hurd geen weet heeft van de veranderingen die u net hebt gemaakt. " +#~ "U dient uw computer te herstarten alvorens iets met %s te doen." + +#~ msgid "The boot region doesn't start at the start of the partition." +#~ msgstr "Het opstartgebied begint niet bij het begin van de partitie." + #~ 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." @@ -3314,6 +3295,13 @@ msgstr "Deze opdracht is zonder betekenis in niet-interactieve modus.\n" #~ "Dit bestandssysteem heeft een logische sectorgrootte van %d. GNU Parted " #~ "werkt niet goed met sectorgroottes anders dan 512 bytes." +#~ msgid "" +#~ "The file %s is marked as a system file. This means moving it could cause " +#~ "some programs to stop working." +#~ msgstr "" +#~ "Het bestand %s is gemarkeerd als een systeembestand. Als het verplaatst " +#~ "wordt, zullen sommige programma's misschien niet meer werken." + #~ msgid "Failed to add partition %d (%s)" #~ msgstr "Toevoegen van partitie %d is mislukt (%s)" diff --git a/po/nn.gmo b/po/nn.gmo index 0aa90dc042f8e6bfef9f8c77988f852f72ff08a3..597c9d582c260386e3635507fe92f4c0f89e0667 100644 GIT binary patch delta 3111 zcmYk;3rv+|9LMnoxrm%|kc)T}1X9mY)DC#VP*DUGfz&{0!wWj?BH<-(p^t#|(4&+|U#yzl#e|IhzD z(iUvl8vH&brp>T*5QB)G7-Kr|Mjv);IUZ+z1jcb(iU~Le$6^f@Vk`E;%b1BbF$*7I z8m1?5EgX%0T!7p!Xo3t$}t*up>o=bv#|q}a2F27xFlm{VGim> zYf*_E!fE&wDq(N3^B@&i%l%CigDHG)3d`{hDxoLX4Z#Z36Rk#FxE1wer?EeF;&8l; z6wjoj8WW3N9EO>w%FI9?ER)rfcoC=sPl8lax$($RrVP2jOH!|RoZB;bAjGS^^FI=!$DXcWz1jrG{+?a zozfjd7sv17cs!0H@D_4SlaS7O<6w6BULlgRDMR&6E%w5?bn356Rx-gdnysix?6hAv zj`19y#8G$_^YBM&D&4)L-|_8$|szQOtzax(Zdw zjmX28MpW1DLyBMyV>5>F4o)CjCFG+amS8oi#9?a>wsSl)+iAjE*1?a_U(7ELGEiyT zk>t!DSd4C3ntn2KQ6*i5<8U+f#uLc3&1uwI(P`&zq7wKS$rsiVvBwRlrE9eFEvWNaQPxQu@F_U zX&9sTzkt#?eo8F%3rOnTh8aS5sk>ydwEJ3C$YB*x&!sJGx# z)LU~KDW-`DI88VLRoPNh(=M~~+XB?Tj)@~o%)vNb-dR|Uv#|q}U>E9_t_OQ#5_h|b z1F#x@!ZMu5k3b1FqbhU>6R|H(6OUP_UK);?4~(Jy_ZSp15ugY1#yTacAPasv-lJ)D!1n0+yo^uC~W3P))bq9yi#}x1%b(FUUY$dmdHN3&=y7OQ>J8 zZX_q;&v!DeL4Cdg$=U2jmfc)NHQzm?`o={E_Qe8B#xi@n5VJY1Mltl;NL7oJf-qvASL)7`TACi4FQ$91Uh#ZPj~N2bhjT#X&5AG(Ceyh(ch zhcW2KL?fysyKxGhK_%3UYMMu=jMHgtt)(BUFc$~nHdH0saU~u>HD@0#rq2^mOOu28 z<(rK0djID$P= zH8A^#{O2^X+g@z9Vok!cs-+e1nn5v64`6jwQ2SA^RkrKNN9VJ7#A5iyVpZquAxx} zLLRrb&ntGmBNT9ZqxOVmy0bkmFgJwY#W!n1>)fent&D~f|KGNS4!K9gZe^-Ibj6() p^;+nmJ0p2F$BT$vL! zdgBNjj#F?b29WU*W;2bRbR5Llcob(~UUy@r;bP3hJ*b?X#9BOvO85^Pgnjaislf`= zKzE}OdlskQm#BnGdZZtu4(l1;I5e)}#8I4ymrx1Sup5kZs3&Se-FO%3$xdJ&{0vL* zPt3x>`NmL0Q-Z_LkE+ak9D)H<;+wFL@y!7>@HFaUJD zbm(0>s7kCw9>zR`n)Od1#V`kO4IanuaXQ&5p>a%zrPzSYI*%&#$fC5ZxRc}8aSATB zX?G@QOrYZ&s>JzBWs)@ktj7D0d1X$aN_!T^;?LL#hmtj889!=u)S~(qq7qn&aSu6$amoPpW^qD-&#BtaGD^LSZLfz0sy_yhaVa#&{>V|EeYf;y)_s(xZ zJy6m+e+V_sOPHhef0#xV9mnzQ3`&Ek3x=g{dlxoP)0l~G;#|z*v9)ZLc}B2~<5kE#%ty%UGk@bu z9K@&^ILPj5+<}wvEMAFySvnnYA>N4fI2{jTVlfRfGM!N!YWamw8L!7Od=WM9=cq}T z>rY)`icvS7jjG@csMW9pwR$!n#Wc^LCgD4%%6^TSw3(x*zfKHh(Kcfh&cgjzgTG-d zPUfy!1?y2?ygk?nU&MFt2+qfKd<16TIh=|^$X*p{!fyBicE)37dbo_$n z(a#(>GbUZ4e^_f8XgV+6hu5R#Kpi`kd^4&dM^I0E2D{*QsDyv>j&sJRCtWYp`O8q} zixV_d>T=Yqtw)vgX5`^b6Y9&h1IfvpLM8mCcRq(1M$V=JnGWVw)a2WSye;z_cE_{W z1Hbi-|H2}U6S;hSl+j4k6HGuQFbDhKB3z9T`~xqbZv171F=5P~$T?htntZ=_mRB0{ z1jl!xe&26W+8X31CXOMk|3ftT(=mXlIu9$b7j8gRW-sc0vA0l(b>u*krz@rsN4?Vt zI0vU-U)+kS=s^tP^QcMMpQWMm7JF*_SJEh;V;1U0E-J$?YLe_nU3dtUKs##SBd8C_ zNw5F3cleFFDuHU$g*BeF-uXG6 zi%?H`6DpxwP_M4hJKyH@uSF&F0P22Q@ERt2s%&7k6RsNGmc(6NTZw2(5W2|@qL@&k z4Q4{8G^uS9driaHL=h1nmJymscM{rEn+J(S#O=fyVhGVl zJWOmP9w+jMLPFbAE!Pn=?jx$z<81@+UZRcATj!C@9Yh1sLTI~|&{s!WD0!(%(a^GU2mmt zFu@1H+?I55^LuZgRYLrKyC?Zz?iJa0(G^S{&K;exF8NJv{~lX7zLD5WXictc@7;A@ zkEKInHW0HRCmM7ctP``2jjfEu-H>ezw78?Jo!_j}t`lY-xjhhWvVpi=7HMs1u*;m* zm}_H^kZYGmBTZ2!6tnS&jm0C&?H!S5kRP|dFz{mbu=)P0qplMVM8f`QPTZ}uV@k^= z`pZiBXUobf$By@xPADyH-#cV#ub^Ye$c@@yixZ0l8Urym8rK-s4S1Q67%?t15{!iZ%gx4GTKRp{eqkG1!%c3~X+K}_boRdx CkDIIj diff --git a/po/nn.po b/po/nn.po index a498363..b8a3616 100644 --- a/po/nn.po +++ b/po/nn.po @@ -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: 2019-10-10 16:35-0700\n" +"POT-Creation-Date: 2021-01-27 16:00-0800\n" "PO-Revision-Date: 2003-07-04 19:03+0200\n" "Last-Translator: Kjetil Torgrim Homme \n" "Language-Team: Norwegian Nynorsk \n" @@ -95,11 +95,11 @@ msgstr "" #. If you don't know what to put here, please see #. #. and use glyphs suitable for your language. -#: lib/quotearg.c:362 +#: lib/quotearg.c:355 msgid "`" msgstr "" -#: lib/quotearg.c:363 +#: lib/quotearg.c:356 msgid "'" msgstr "" @@ -340,32 +340,17 @@ msgstr "" msgid "memory exhausted" msgstr "" -#: lib/xstrtol-error.c:63 -#, c-format -msgid "invalid %s%s argument '%s'" -msgstr "" - -#: lib/xstrtol-error.c:68 -#, c-format -msgid "invalid suffix in %s%s argument '%s'" -msgstr "" - -#: lib/xstrtol-error.c:72 -#, c-format -msgid "%s%s argument '%s' too large" -msgstr "" - -#: libparted/arch/beos.c:245 +#: libparted/arch/beos.c:246 msgid "Disk Image" msgstr "" -#: libparted/arch/beos.c:346 libparted/arch/gnu.c:277 +#: libparted/arch/beos.c:347 libparted/arch/gnu.c:277 #: libparted/arch/linux.c:1731 #, c-format msgid "Error opening %s: %s" msgstr "Feil ved opning av %s: %s" -#: libparted/arch/beos.c:357 libparted/arch/gnu.c:287 +#: libparted/arch/beos.c:358 libparted/arch/gnu.c:287 #: libparted/arch/linux.c:1742 #, c-format msgid "Unable to open %s read-write (%s). %s has been opened read-only." @@ -373,47 +358,47 @@ msgstr "" "Kunne ikkje opna %s for både lesing og skriving (%s). %s er berre opna for " "lesing." -#: libparted/arch/beos.c:419 libparted/arch/linux.c:1907 +#: libparted/arch/beos.c:420 libparted/arch/linux.c:1907 #, c-format msgid "%s during seek for read on %s" msgstr "%s under posisjonering før lesing av %s" -#: libparted/arch/beos.c:452 libparted/arch/gnu.c:465 libparted/arch/gnu.c:564 -#: libparted/arch/gnu.c:692 libparted/arch/linux.c:1867 +#: libparted/arch/beos.c:453 libparted/arch/gnu.c:425 libparted/arch/gnu.c:524 +#: libparted/arch/gnu.c:652 libparted/arch/linux.c:1867 #: libparted/arch/linux.c:1949 #, c-format msgid "%s during read on %s" msgstr "%s under lesing av %s" -#: libparted/arch/beos.c:488 libparted/arch/gnu.c:525 +#: libparted/arch/beos.c:489 libparted/arch/gnu.c:485 #: libparted/arch/linux.c:2026 #, c-format msgid "Can't write to %s, because it is opened read-only." msgstr "Kan ikkje skriva til %s, sidan han berre er opna for lesing." -#: libparted/arch/beos.c:504 libparted/arch/linux.c:2051 +#: libparted/arch/beos.c:505 libparted/arch/linux.c:2051 #, c-format msgid "%s during seek for write on %s" msgstr "%s under posisjonering før skriving til %s" -#: libparted/arch/beos.c:541 libparted/arch/gnu.c:601 libparted/arch/gnu.c:646 -#: libparted/arch/gnu.c:723 libparted/arch/linux.c:1999 +#: libparted/arch/beos.c:542 libparted/arch/gnu.c:561 libparted/arch/gnu.c:606 +#: libparted/arch/gnu.c:683 libparted/arch/linux.c:1999 #: libparted/arch/linux.c:2094 libparted/arch/linux.c:2167 #, c-format msgid "%s during write on %s" msgstr "%s under skriving til %s" -#: partprobe/partprobe.c:148 +#: partprobe/partprobe.c:149 #, c-format msgid "Try `%s --help' for more information.\n" msgstr "" -#: partprobe/partprobe.c:152 +#: partprobe/partprobe.c:153 #, c-format msgid "Usage: %s [OPTION] [DEVICE]...\n" msgstr "" -#: partprobe/partprobe.c:153 +#: partprobe/partprobe.c:154 msgid "" "Inform the operating system about partition table changes.\n" "\n" @@ -423,13 +408,13 @@ msgid "" " -v, --version output version information and exit\n" msgstr "" -#: partprobe/partprobe.c:161 +#: partprobe/partprobe.c:162 msgid "" "\n" "When no DEVICE is given, probe all partitions.\n" msgstr "" -#: partprobe/partprobe.c:165 +#: partprobe/partprobe.c:166 #, c-format msgid "" "\n" @@ -445,43 +430,7 @@ msgstr "Kunne ikkje opna %s." msgid "Unable to probe store." msgstr "Kunne ikkje undersøkja lagringsmediet." -#: libparted/arch/gnu.c:368 -#, fuzzy -msgid "" -"The partition table cannot be re-read. This means you need to reboot before " -"mounting any modified partitions. You also need to reinstall your boot " -"loader before you reboot (which may require mounting modified partitions). " -"It is impossible do both things! So you'll need to boot off a rescue disk, " -"and reinstall your boot loader from the rescue disk. Read section 4 of the " -"Parted User documentation for more information." -msgstr "" -"Kjerna klarte ikkje å lesa partisjonstabellen på nytt, så du må starta om " -"maskina før du kan montera endra partisjonar. Du må også installera boot-" -"lastaren på nytt før omstarten (som kanskje krever at du monterer " -"partisjonane du har endra). Det er umogleg å gjera båe delar! Start frå " -"ein redningsdiskett, og reinstallera boot-lastaren frå redningsmiljøet. Les " -"del 4 i brukarhandboka for meir informasjon." - -#: libparted/arch/gnu.c:385 -#, fuzzy, 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 computer " -"before doing anything with %s." -msgstr "" -"Partisjonstabellen på %s (%s). Det tyder at Hurd ikkje veit noko om " -"endringar du har gjort. Datamaskinen må startast på nytt før du gjer noko " -"med %s." - -#: libparted/arch/gnu.c:396 parted/parted.c:2318 -msgid "" -"You should reinstall your boot loader before rebooting. Read section 4 of " -"the Parted User documentation for more information." -msgstr "" -"Du må installera boot-lastaren på nytt før neste omstart. Les del 4 i " -"brukarhandboka for meir informasjon." - -#: libparted/arch/gnu.c:788 +#: libparted/arch/gnu.c:748 #, c-format msgid "%s trying to sync %s to disk" msgstr "Fekk feilmeldinga «%s» ved forsøk på å synkronisera %s til disk" @@ -791,15 +740,15 @@ msgstr "metadata" msgid "free" msgstr "ledig" -#: libparted/disk.c:2355 parted/ui.c:1258 parted/ui.c:1286 +#: libparted/disk.c:2355 parted/ui.c:1259 parted/ui.c:1287 msgid "extended" msgstr "utviding" -#: libparted/disk.c:2357 parted/ui.c:1262 parted/ui.c:1290 +#: libparted/disk.c:2357 parted/ui.c:1263 parted/ui.c:1291 msgid "logical" msgstr "logisk" -#: libparted/disk.c:2359 parted/ui.c:1254 parted/ui.c:1282 +#: libparted/disk.c:2359 parted/ui.c:1255 parted/ui.c:1283 msgid "primary" msgstr "primær" @@ -877,64 +826,73 @@ msgstr "" msgid "esp" msgstr "Ja" -#: libparted/disk.c:2415 +#: libparted/disk.c:2411 +msgid "chromeos_kernel" +msgstr "" + +#: libparted/disk.c:2413 +#, fuzzy +msgid "bls_boot" +msgstr "boot" + +#: libparted/disk.c:2419 #, fuzzy, c-format msgid "Unknown partition flag, %d." msgstr "Ukjent partisjonsflagg, %d." -#: libparted/exception.c:78 +#: libparted/exception.c:79 msgid "Information" msgstr "Informasjon" -#: libparted/exception.c:79 +#: libparted/exception.c:80 msgid "Warning" msgstr "Åtvaring" -#: libparted/exception.c:80 +#: libparted/exception.c:81 msgid "Error" msgstr "Feil" -#: libparted/exception.c:81 +#: libparted/exception.c:82 msgid "Fatal" msgstr "Kritisk" -#: libparted/exception.c:82 +#: libparted/exception.c:83 msgid "Bug" msgstr "Programfeil" -#: libparted/exception.c:83 +#: libparted/exception.c:84 msgid "No Implementation" msgstr "Ikkje laga" -#: libparted/exception.c:87 +#: libparted/exception.c:88 msgid "Fix" msgstr "Rett opp" -#: libparted/exception.c:88 +#: libparted/exception.c:89 msgid "Yes" msgstr "Ja" -#: libparted/exception.c:89 +#: libparted/exception.c:90 msgid "No" msgstr "Nei" -#: libparted/exception.c:90 +#: libparted/exception.c:91 msgid "OK" msgstr "OK" -#: libparted/exception.c:91 +#: libparted/exception.c:92 msgid "Retry" msgstr "Prøv igjen" -#: libparted/exception.c:92 +#: libparted/exception.c:93 msgid "Ignore" msgstr "Oversjå" -#: libparted/exception.c:93 +#: libparted/exception.c:94 msgid "Cancel" msgstr "Avbryt" -#: libparted/exception.c:133 +#: libparted/exception.c:134 #, c-format msgid "" "A bug has been detected in GNU Parted. Refer to the web site of parted " @@ -943,36 +901,36 @@ msgid "" "containing at least the version (%s) and the following message: " msgstr "" -#: libparted/labels/aix.c:91 +#: libparted/labels/aix.c:92 #, fuzzy msgid "Support for reading AIX disk labels is is not implemented yet." msgstr "Støtte for å laga %s-filsystem er ikkje lagt inn enno." -#: libparted/labels/aix.c:102 +#: libparted/labels/aix.c:103 #, fuzzy msgid "Support for writing AIX disk labels is is not implemented yet." msgstr "Støtte for å laga %s-filsystem er ikkje lagt inn enno." -#: libparted/labels/aix.c:115 +#: libparted/labels/aix.c:116 #, fuzzy msgid "" "Support for adding partitions to AIX disk labels is not implemented yet." msgstr "Støtte for å laga %s-filsystem er ikkje lagt inn enno." -#: libparted/labels/aix.c:125 +#: libparted/labels/aix.c:126 #, fuzzy msgid "" "Support for duplicating partitions in AIX disk labels is not implemented yet." msgstr "Støtte for å laga %s-filsystem er ikkje lagt inn enno." -#: libparted/labels/aix.c:143 +#: libparted/labels/aix.c:144 #, fuzzy msgid "" "Support for setting system type of partitions in AIX disk labels is not " "implemented yet." msgstr "Støtte for å laga %s-filsystem er ikkje lagt inn enno." -#: libparted/labels/aix.c:153 +#: libparted/labels/aix.c:154 #, fuzzy msgid "Support for setting flags in AIX disk labels is not implemented yet." msgstr "Støtte for å laga %s-filsystem er ikkje lagt inn enno." @@ -1061,11 +1019,11 @@ msgid "" "partitions, if XGM is the first one it counts for two)." msgstr "" -#: libparted/labels/atari.c:1657 libparted/labels/bsd.c:567 -#: libparted/labels/dasd.c:894 libparted/labels/dos.c:2276 -#: libparted/labels/dvh.c:770 libparted/labels/gpt.c:2050 -#: libparted/labels/loop.c:243 libparted/labels/mac.c:1423 -#: libparted/labels/pc98.c:701 libparted/labels/rdb.c:1054 +#: libparted/labels/atari.c:1657 libparted/labels/bsd.c:563 +#: libparted/labels/dasd.c:895 libparted/labels/dos.c:2283 +#: libparted/labels/dvh.c:770 libparted/labels/gpt.c:2140 +#: 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 "Kunne ikkje oppfylla alle dei tekniske krava til partisjonen." @@ -1082,44 +1040,44 @@ msgstr "" msgid "Unable to allocate a partition number." msgstr "Forventa eit partisjonsnummer." -#: libparted/labels/bsd.c:592 +#: libparted/labels/bsd.c:588 #, fuzzy msgid "Unable to allocate a bsd disklabel slot." msgstr "Kunne ikkje tilordna plass i BSD-disklabel." -#: libparted/labels/dasd.c:625 +#: libparted/labels/dasd.c:626 msgid "The partition table of DASD-LDL device cannot be changed.\n" msgstr "" -#: libparted/labels/dasd.c:920 +#: libparted/labels/dasd.c:921 #, fuzzy msgid "Unable to allocate a dasd disklabel slot" msgstr "Kunne ikkje tilordna plass i BSD-disklabel." -#: libparted/labels/dos.c:1003 +#: libparted/labels/dos.c:1006 #, fuzzy, c-format msgid "Invalid partition table on %s -- wrong signature %x." msgstr "Ugyldig partisjonstabell på %s - feil signatur %x" -#: libparted/labels/dos.c:1031 +#: libparted/labels/dos.c:1034 #, c-format msgid "Invalid partition table - recursive partition on %s." msgstr "Ugyldig partisjonstabell - rekursiv partisjon på %s." -#: libparted/labels/dos.c:1560 +#: libparted/labels/dos.c:1557 msgid "Extended partitions cannot be hidden on msdos disk labels." msgstr "" -#: libparted/labels/dos.c:1572 +#: libparted/labels/dos.c:1569 #, fuzzy msgid "Extended partitions cannot be recovery partitions on msdos disk labels." msgstr "Ugyldig partisjonstabell - rekursiv partisjon på %s." -#: libparted/labels/dos.c:2258 +#: libparted/labels/dos.c:2265 msgid "Parted can't resize partitions managed by Windows Dynamic Disk." msgstr "" -#: libparted/labels/dos.c:2514 +#: libparted/labels/dos.c:2521 #, fuzzy msgid "cannot create any more partitions" msgstr "Kan ikkje laga fleire partisjonar." @@ -1268,12 +1226,12 @@ msgstr "" msgid "Disk geometry does not match a DASD device of type 3390." msgstr "" -#: libparted/labels/gpt.c:531 +#: libparted/labels/gpt.c:541 #, fuzzy msgid "device is too small for GPT" msgstr "Filsystemet er for lite for ext2." -#: libparted/labels/gpt.c:733 +#: libparted/labels/gpt.c:743 #, fuzzy, c-format msgid "" "The format of the GPT partition table is version %x, which is newer than " @@ -1283,7 +1241,7 @@ msgstr "" "Parted kan kjenna att. Ver venleg å seia i frå med ein epost til (skriv helst på engelsk)" -#: libparted/labels/gpt.c:769 +#: libparted/labels/gpt.c:779 #, c-format msgid "" "Not all of the space available to %s appears to be used, you can fix the GPT " @@ -1291,7 +1249,7 @@ msgid "" "setting? " msgstr "" -#: libparted/labels/gpt.c:1008 +#: libparted/labels/gpt.c:1024 #, fuzzy msgid "" "The backup GPT table is not at the end of the disk, as it should be. Fix, " @@ -1302,7 +1260,7 @@ msgstr "" "dette rettast ved å flytta kopien til slutten av disken (og sletta den gamle " "kopien)?" -#: libparted/labels/gpt.c:1026 +#: libparted/labels/gpt.c:1042 #, fuzzy msgid "" "Both the primary and backup GPT tables are corrupt. Try making a fresh " @@ -1311,7 +1269,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:1037 +#: libparted/labels/gpt.c:1053 #, fuzzy msgid "" "The backup GPT table is corrupt, but the primary appears OK, so that will be " @@ -1320,7 +1278,7 @@ msgstr "" "GPT-tabellen er korrupt, men sikringskopien ser frisk ut, så kopien vert " "brukt." -#: libparted/labels/gpt.c:1049 +#: libparted/labels/gpt.c:1065 #, fuzzy msgid "" "The primary GPT table is corrupt, but the backup appears OK, so that will be " @@ -1329,11 +1287,11 @@ msgstr "" "GPT-tabellen er korrupt, men sikringskopien ser frisk ut, så kopien vert " "brukt." -#: libparted/labels/gpt.c:1073 +#: libparted/labels/gpt.c:1089 msgid "primary partition table array CRC mismatch" msgstr "" -#: libparted/labels/gpt.c:1936 libparted/labels/gpt.c:1963 +#: libparted/labels/gpt.c:2026 libparted/labels/gpt.c:2053 #, fuzzy msgid "failed to translate partition name" msgstr "Kva partisjonsnummer er målet?" @@ -1368,19 +1326,14 @@ msgid "The data region doesn't start at the start of the partition." msgstr "Dataregionen startar ikkje på starten av partisjonen" #: libparted/labels/mac.c:572 -#, fuzzy -msgid "The boot region doesn't start at the start of the partition." -msgstr "Bootregionen startar ikkje på starten av partisjonen" - -#: libparted/labels/mac.c:586 msgid "The partition's boot region doesn't occupy the entire partition." msgstr "Bootregionen fyller ikkje heile partisjonen." -#: libparted/labels/mac.c:597 +#: libparted/labels/mac.c:583 msgid "The partition's data region doesn't occupy the entire partition." msgstr "Dataregionen fyller ikkje heile partisjonen." -#: libparted/labels/mac.c:649 +#: libparted/labels/mac.c:635 #, c-format msgid "" "Weird block size on device descriptor: %d bytes is not divisible by 512." @@ -1388,7 +1341,7 @@ msgstr "" "Merkeleg blokkstorleik på einingsdeskriptor: %d oktettar er ikkje deleleg på " "512." -#: libparted/labels/mac.c:662 +#: libparted/labels/mac.c:648 #, c-format msgid "" "The driver descriptor says the physical block size is %d bytes, but Linux " @@ -1397,11 +1350,11 @@ msgstr "" "Drivardeskriptoren seier at den fysiske blokkstorleiken er %d oktettar, men " "Linux seier at han er %d oktettar." -#: libparted/labels/mac.c:715 +#: libparted/labels/mac.c:701 msgid "No valid partition map found." msgstr "Fann ikkje noko gyldig partisjonskart." -#: libparted/labels/mac.c:789 +#: libparted/labels/mac.c:775 #, fuzzy, c-format msgid "" "Conflicting partition map entry sizes! Entry 1 says it is %d, but entry %d " @@ -1410,12 +1363,12 @@ msgstr "" "Motstridande storleikar i partisjonskartet! Oppføring 1 seier at han er %d, " "men oppføring %d seier at han er %d!" -#: libparted/labels/mac.c:820 +#: libparted/labels/mac.c:806 #, fuzzy msgid "Weird! There are 2 partitions map entries!" msgstr "Merkeleg - to partisjonskartoppføringar!" -#: libparted/labels/mac.c:1359 +#: libparted/labels/mac.c:1345 msgid "" "Changing the name of a root or swap partition will prevent Linux from " "recognising it as such." @@ -1423,17 +1376,17 @@ msgstr "" "Endrar du namnet på ein rot- eller swap-partisjon, vil ikkje Linux lenger " "kjenna han igjen." -#: libparted/labels/mac.c:1458 +#: libparted/labels/mac.c:1444 #, fuzzy msgid "Can't add another partition -- the partition map is too small!" msgstr "Kan ikkje leggja til ein partisjon til - partisjonskartet er for lite!" -#: libparted/labels/pc98.c:284 +#: libparted/labels/pc98.c:285 #, fuzzy, c-format msgid "Invalid partition table on %s." msgstr "Ugyldig partisjonstabell på %s" -#: libparted/labels/pc98.c:337 libparted/labels/pc98.c:415 +#: libparted/labels/pc98.c:338 libparted/labels/pc98.c:416 #, fuzzy, c-format msgid "" "Partition %d isn't aligned to cylinder boundaries. This is still " @@ -1442,7 +1395,7 @@ msgstr "" "Partisjon %d ligg ikkje nøyaktig på grensa mellom to sylinderar. Det " "manglar støtte for dette." -#: libparted/labels/pc98.c:733 +#: libparted/labels/pc98.c:729 msgid "Can't add another partition." msgstr "Kan ikkje leggja til ein partisjon til." @@ -1615,39 +1568,39 @@ msgstr "" msgid "Could not write VTOC FMT9 DSCB." msgstr "" -#: libparted/libparted.c:242 +#: libparted/libparted.c:247 msgid "Out of memory." msgstr "Tom for minne." -#: libparted/unit.c:139 +#: libparted/unit.c:140 msgid "Cannot get unit size for special unit 'COMPACT'." msgstr "" -#: libparted/unit.c:385 +#: libparted/unit.c:386 #, c-format msgid "\"%s\" has invalid syntax for locations." msgstr "" -#: libparted/unit.c:393 +#: libparted/unit.c:394 #, c-format msgid "The maximum head value is %d." msgstr "" -#: libparted/unit.c:400 +#: libparted/unit.c:401 #, c-format msgid "The maximum sector value is %d." msgstr "" -#: libparted/unit.c:412 libparted/unit.c:564 +#: libparted/unit.c:413 libparted/unit.c:565 #, c-format msgid "The location %s is outside of the device %s." msgstr "" -#: libparted/unit.c:526 +#: libparted/unit.c:527 msgid "Invalid number." msgstr "" -#: libparted/unit.c:532 +#: libparted/unit.c:533 msgid "Use a smaller unit instead of a value < 1" msgstr "" @@ -1657,18 +1610,18 @@ msgstr "" msgid "%s : Failed to allocate partition block\n" msgstr "" -#: libparted/fs/amiga/affs.c:79 libparted/fs/amiga/apfs.c:71 +#: 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 "" -#: libparted/fs/amiga/affs.c:84 libparted/fs/amiga/apfs.c:76 +#: libparted/fs/amiga/affs.c:83 libparted/fs/amiga/apfs.c:76 #, c-format msgid "%s : Couldn't read boot block %llu\n" msgstr "" -#: libparted/fs/amiga/affs.c:98 libparted/fs/amiga/apfs.c:87 +#: 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" @@ -1694,22 +1647,22 @@ msgstr "" msgid "%s : Couldn't write block %d\n" msgstr "%s under skriving til %s" -#: libparted/fs/amiga/amiga.c:278 +#: libparted/fs/amiga/amiga.c:279 #, c-format msgid "%s : Failed to allocate disk_specific rdb block\n" msgstr "" -#: libparted/fs/amiga/amiga.c:289 +#: libparted/fs/amiga/amiga.c:290 #, c-format msgid "%s : Didn't find rdb block, should never happen\n" msgstr "" -#: libparted/fs/amiga/amiga.c:318 +#: libparted/fs/amiga/amiga.c:319 #, c-format msgid "%s : Failed to read partition block %llu\n" msgstr "" -#: libparted/fs/fat/fat.c:148 libparted/fs/r/fat/fat.c:811 +#: libparted/fs/fat/fat.c:149 #, fuzzy msgid "" "GNU Parted was miscompiled: the FAT boot sector should be 512 bytes. FAT " @@ -1805,7 +1758,7 @@ msgid "" "geometry." msgstr "" -#: libparted/fs/r/fat/bootsector.c:399 +#: libparted/fs/r/fat/bootsector.c:398 #, c-format msgid "" "The information sector has the wrong signature (%x). Select cancel for now, " @@ -1832,21 +1785,21 @@ msgstr "" "Allokeringseininga sitt startdelta er %d, og det er ikkje eit multiplum av " "storleiken %d." -#: libparted/fs/r/fat/count.c:144 +#: libparted/fs/r/fat/count.c:84 #, c-format msgid "Bad directory entry for %s: first cluster is the end of file marker." msgstr "" "Feil i katalogoppføringa for %s: første allokeringseininga markerer slutt på " "fila." -#: libparted/fs/r/fat/count.c:157 +#: libparted/fs/r/fat/count.c:97 #, c-format msgid "" "Bad FAT: unterminated chain for %s. You should run dosfsck or scandisk." msgstr "" "Feil på FAT: endelaus kjede for %s. Du bør køyre dosfsck eller scandisk." -#: libparted/fs/r/fat/count.c:166 +#: libparted/fs/r/fat/count.c:106 #, fuzzy, c-format msgid "" "Bad FAT: cluster %d outside file system in chain for %s. You should run " @@ -1855,7 +1808,7 @@ msgstr "" "Feil på FAT: allokeringseining %d er utanfor filsystemet i kjeda for %s. Du " "bør køyra dosfsck eller scandisk." -#: libparted/fs/r/fat/count.c:176 +#: libparted/fs/r/fat/count.c:116 #, c-format msgid "" "Bad FAT: cluster %d is cross-linked for %s. You should run dosfsck or " @@ -1864,26 +1817,17 @@ msgstr "" "Feil på FAT: allokeringseining %d er krysslenka for %s. Du bør køyre " "dosfsck eller scandisk." -#: libparted/fs/r/fat/count.c:195 +#: libparted/fs/r/fat/count.c:135 #, c-format msgid "%s is %dk, but it has %d clusters (%dk)." msgstr "%s er %d KiB, men har %d allokeringseiningar (%d KiB)." -#: libparted/fs/r/fat/count.c:258 -#, c-format -msgid "" -"The file %s is marked as a system file. This means moving it could cause " -"some programs to stop working." -msgstr "" -"Fila %s er klassifisert som ei systemfil. Å flytta denne fila kan føra til " -"at nokon program sluttar å fungera." - -#: libparted/fs/r/fat/fat.c:243 +#: libparted/fs/r/fat/fat.c:244 #, fuzzy, c-format msgid "Partition too big/small for a %s file system." msgstr "Partisjonen er for liten eller stor for eit %s-filsystem" -#: libparted/fs/r/fat/fat.c:409 +#: 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." @@ -1891,11 +1835,11 @@ msgstr "" "FAT-ane stemmer ikkje overeins. Viss du ikkje veit kva dette tyder, vel " "avbryt, køyr scandisk på filsystem, og kom attende." -#: libparted/fs/r/fat/fat.c:449 +#: libparted/fs/r/fat/fat.c:450 msgid "There are no possible configurations for this FAT type." msgstr "Der er ingen moglege konfigurasjonar for denne FAT-typen." -#: libparted/fs/r/fat/fat.c:461 +#: libparted/fs/r/fat/fat.c:462 #, c-format msgid "" "File system doesn't have expected sizes for Windows to like it. Cluster " @@ -1906,14 +1850,14 @@ msgstr "" "er %d KiB (%d KiB er forventa), talet på allokeringseiningar er %d (%d er " "forventa), FAT-ane er på %d sektorar (%d er forventa)." -#: libparted/fs/r/fat/fat.c:484 +#: libparted/fs/r/fat/fat.c:485 #, c-format msgid "" "File system is reporting the free space as %d clusters, not %d clusters." msgstr "" "Filsystemet rapporterer %d allokeringseiningar med ledig plass, ikkje %d." -#: libparted/fs/r/fat/resize.c:158 +#: libparted/fs/r/fat/resize.c:159 #, fuzzy msgid "" "There's not enough room in the root directory for all of the files. Either " @@ -1922,16 +1866,16 @@ msgstr "" "Der er ikkje plass i toppkatalogen til alle filene. Vel anten avbryt, eller " "oversjå feilen for å misse alle filene." -#: libparted/fs/r/fat/resize.c:302 +#: libparted/fs/r/fat/resize.c:303 msgid "Error writing to the root directory." msgstr "Feil ved skriving til toppkatalogen." -#: libparted/fs/r/fat/resize.c:495 +#: libparted/fs/r/fat/resize.c:479 #, fuzzy msgid "If you leave your file system as FAT16, then you will have no problems." msgstr "Viss du let filsystemet vera FAT16, vil du ikkje ha nokon problem." -#: libparted/fs/r/fat/resize.c:498 +#: 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 " @@ -1942,13 +1886,13 @@ msgstr "" "du vil gjera dette, bør du lesa Parted-manualen (eller manualen som høyrer " "til distribusjonen din)." -#: libparted/fs/r/fat/resize.c:506 +#: 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 "Viss du let filsystemet vera FAT32, vil du ikkje få nokon nye problem." -#: libparted/fs/r/fat/resize.c:510 +#: 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 " @@ -1962,38 +1906,38 @@ msgstr "" "til distribusjonen din). FAT32 er også uleseleg for MS-DOS, MS Windows 95a " "og NT." -#: libparted/fs/r/fat/resize.c:524 +#: libparted/fs/r/fat/resize.c:508 #, c-format msgid "%s %s %s" msgstr "%s %s %s" -#: libparted/fs/r/fat/resize.c:525 +#: libparted/fs/r/fat/resize.c:509 msgid "Would you like to use FAT32?" msgstr "Ønskjer du å bruka FAT32?" -#: libparted/fs/r/fat/resize.c:556 libparted/fs/r/fat/resize.c:572 +#: 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:557 +#: libparted/fs/r/fat/resize.c:541 msgid "" "The file system can only be resized to this size by converting to FAT16." msgstr "Filsystemet kan kun få denne storleiken ved å konvertera til FAT16." -#: libparted/fs/r/fat/resize.c:573 +#: libparted/fs/r/fat/resize.c:557 msgid "" "The file system can only be resized to this size by converting to FAT32." msgstr "Filsystemet kan kun få denne storleiken ved å konvertera til FAT32." -#: libparted/fs/r/fat/resize.c:586 +#: libparted/fs/r/fat/resize.c:570 #, fuzzy msgid "" "GNU Parted cannot resize this partition to this size. We're working on it!" msgstr "" "GNU Parted kan ikkje endra storleiken til dette. Vi arbeider med saka!" -#: libparted/fs/r/fat/table.c:136 +#: 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 " @@ -2002,42 +1946,42 @@ msgstr "" "FAT %d media %x stemmer ikkje overeins med bootsektorens media %x. Du bør " "sannsynlegvis køyra scandisk." -#: libparted/fs/r/fat/table.c:268 +#: libparted/fs/r/fat/table.c:269 #, fuzzy, c-format msgid "fat_table_set: cluster %ld outside file system" msgstr "fat_table_set: allokeringseining %ld utanfor filsystemet" -#: libparted/fs/r/fat/table.c:300 +#: libparted/fs/r/fat/table.c:301 #, fuzzy, c-format msgid "fat_table_get: cluster %ld outside file system" msgstr "fat_table_get: allokeringseining %ld utanfor filsystemet" -#: libparted/fs/r/fat/table.c:342 +#: libparted/fs/r/fat/table.c:343 msgid "fat_table_alloc_cluster: no free clusters" msgstr "fat_table_alloc_cluster: ingen ledige allokeringseiningar" -#: libparted/fs/r/filesys.c:151 +#: libparted/fs/r/filesys.c:152 msgid "Could not detect file system." msgstr "Kan ikkje kjenna igjen noko filsystem." -#: libparted/fs/r/filesys.c:158 libparted/fs/r/filesys.c:285 +#: libparted/fs/r/filesys.c:159 libparted/fs/r/filesys.c:284 #, 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." -#: libparted/fs/r/filesys.c:170 +#: libparted/fs/r/filesys.c:171 #, fuzzy msgid "The file system is bigger than its volume!" msgstr "Filsystemet er større enn volumet det ligg på!" -#: libparted/fs/r/hfs/advfs.c:121 libparted/fs/r/hfs/advfs_plus.c:121 -#: libparted/fs/r/hfs/reloc.c:413 libparted/fs/r/hfs/reloc.c:507 -#: libparted/fs/r/hfs/reloc_plus.c:538 libparted/fs/r/hfs/reloc_plus.c:656 -#: libparted/fs/r/hfs/reloc_plus.c:769 +#: 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:285 +#: libparted/fs/r/hfs/advfs_plus.c:287 msgid "Bad blocks could not be read." msgstr "" @@ -2095,90 +2039,90 @@ msgstr "" msgid "Trying to write HFS+ file with CNID %X behind EOF." msgstr "" -#: libparted/fs/r/hfs/hfs.c:232 +#: libparted/fs/r/hfs/hfs.c:212 msgid "Sorry, HFS cannot be resized that way yet." msgstr "" -#: libparted/fs/r/hfs/hfs.c:250 libparted/fs/r/hfs/hfs.c:629 +#: libparted/fs/r/hfs/hfs.c:230 libparted/fs/r/hfs/hfs.c:573 msgid "shrinking" msgstr "krympar" -#: libparted/fs/r/hfs/hfs.c:262 libparted/fs/r/hfs/hfs.c:641 +#: 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:281 +#: 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:320 +#: libparted/fs/r/hfs/hfs.c:300 #, fuzzy msgid "writing HFS Master Directory Block" msgstr "Feil ved skriving til toppkatalogen." -#: libparted/fs/r/hfs/hfs.c:468 +#: 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:478 +#: libparted/fs/r/hfs/hfs.c:422 #, c-format msgid "Version %d of HFS+ isn't supported." msgstr "" -#: libparted/fs/r/hfs/hfs.c:489 +#: libparted/fs/r/hfs/hfs.c:433 #, c-format msgid "Version %d of HFSX isn't supported." msgstr "" -#: libparted/fs/r/hfs/hfs.c:672 +#: 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:720 +#: libparted/fs/r/hfs/hfs.c:664 #, fuzzy msgid "Error while writing the allocation file." msgstr "Feil ved skriving til toppkatalogen." -#: libparted/fs/r/hfs/hfs.c:735 +#: 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:750 +#: libparted/fs/r/hfs/hfs.c:694 msgid "writing HFS+ Volume Header" msgstr "" -#: libparted/fs/r/hfs/hfs.c:850 +#: 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:904 +#: 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:940 +#: libparted/fs/r/hfs/hfs.c:883 msgid "Sorry, HFS+ cannot be resized that way yet." msgstr "" -#: libparted/fs/r/hfs/hfs.c:975 +#: libparted/fs/r/hfs/hfs.c:918 msgid "shrinking embedded HFS+ volume" msgstr "" -#: libparted/fs/r/hfs/hfs.c:992 +#: libparted/fs/r/hfs/hfs.c:935 msgid "Resizing the HFS+ volume has failed." msgstr "" -#: libparted/fs/r/hfs/hfs.c:999 +#: libparted/fs/r/hfs/hfs.c:942 #, fuzzy msgid "shrinking HFS wrapper" msgstr "krympar" -#: libparted/fs/r/hfs/hfs.c:1008 +#: libparted/fs/r/hfs/hfs.c:951 msgid "Updating the HFS wrapper has failed." msgstr "" -#: libparted/fs/r/hfs/hfs.c:1110 libparted/fs/r/hfs/hfs.c:1195 +#: 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 " @@ -2249,73 +2193,73 @@ msgstr "" msgid "An extent has not been relocated." msgstr "" -#: libparted/fs/r/hfs/reloc.c:250 libparted/fs/r/hfs/reloc_plus.c:307 +#: 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:380 +#: 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:474 +#: 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:516 libparted/fs/r/hfs/reloc_plus.c:666 +#: 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:573 libparted/fs/r/hfs/reloc_plus.c:844 +#: libparted/fs/r/hfs/reloc.c:579 libparted/fs/r/hfs/reloc_plus.c:849 #, fuzzy msgid "Could not cache the file system in memory." msgstr "Kan ikkje kjenna igjen noko filsystem." -#: libparted/fs/r/hfs/reloc.c:634 libparted/fs/r/hfs/reloc_plus.c:905 +#: 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:648 libparted/fs/r/hfs/reloc_plus.c:921 +#: 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:494 +#: 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:617 +#: 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:125 +#: parted/parted.c:126 msgid "displays this help message" msgstr "vis denne hjelpeteksten" -#: parted/parted.c:126 +#: parted/parted.c:127 msgid "lists partition layout on all block devices" msgstr "" -#: parted/parted.c:127 +#: parted/parted.c:128 msgid "displays machine parseable output" msgstr "" -#: parted/parted.c:128 +#: parted/parted.c:129 msgid "never prompts for user intervention" msgstr "spør aldri brukaren" -#: parted/parted.c:129 +#: parted/parted.c:130 msgid "displays the version" msgstr "vis programversjon" -#: parted/parted.c:130 +#: parted/parted.c:131 #, fuzzy msgid "alignment for new partitions" msgstr "Kan ikkje kopiera utvidingspartisjonar." -#: parted/parted.c:142 +#: parted/parted.c:143 #, fuzzy msgid "" "NUMBER is the partition number used by Linux. On MS-DOS disk labels, the " @@ -2325,32 +2269,32 @@ msgstr "" "primærpartisjonar nummerert 1-4, og logiske partisjonar går frå 5 og " "oppover.\n" -#: parted/parted.c:145 +#: parted/parted.c:146 msgid "LABEL-TYPE is one of: " msgstr "LABEL-TYPE er ein av: " -#: parted/parted.c:146 parted/parted.c:147 +#: parted/parted.c:147 parted/parted.c:148 msgid "FLAG is one of: " msgstr "FLAGG er eitt av: " -#: parted/parted.c:148 +#: parted/parted.c:149 #, fuzzy msgid "UNIT is one of: " msgstr "FLAGG er eitt av: " -#: parted/parted.c:149 +#: parted/parted.c:150 msgid "desired alignment: minimum or optimal" msgstr "" -#: parted/parted.c:150 +#: parted/parted.c:151 msgid "PART-TYPE is one of: primary, logical, extended\n" msgstr "PART-TYPE er ein av: primær, logisk, utviding\n" -#: parted/parted.c:152 +#: parted/parted.c:153 msgid "FS-TYPE is one of: " msgstr "FS-TYPE er ein av: " -#: parted/parted.c:153 +#: parted/parted.c:154 #, fuzzy msgid "" "START and END are disk locations, such as 4GB or 10%. Negative values count " @@ -2359,25 +2303,25 @@ msgid "" msgstr "" "START og SLUTT er i mebibytes. Negative verdiar tel frå slutten av disken.\n" -#: parted/parted.c:156 +#: parted/parted.c:157 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:159 +#: parted/parted.c:160 msgid "STATE is one of: on, off\n" msgstr "STATUS er ein av: av, på\n" -#: parted/parted.c:160 +#: parted/parted.c:161 msgid "DEVICE is usually /dev/hda or /dev/sda\n" msgstr "EINING er vanlegvis /dev/hda eller /dev/sda\n" -#: parted/parted.c:161 +#: parted/parted.c:162 msgid "NAME is any word you want\n" msgstr "NAMN er eit valfritt ord\n" -#: parted/parted.c:164 +#: parted/parted.c:165 #, fuzzy msgid "" "Copyright (C) 1998 - 2006 Free Software Foundation, Inc.\n" @@ -2400,155 +2344,155 @@ msgstr "" "eller BRUK TIL NOKO FORMÅL. Sjå GNU General Public License for detaljar.\n" "\n" -#: parted/parted.c:212 +#: parted/parted.c:213 #, c-format msgid "%0.f%%\t(time left %.2d:%.2d)" msgstr "%0.f%%\t(tid att %.2d:%.2d)" -#: parted/parted.c:231 +#: parted/parted.c:232 #, 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:252 +#: parted/parted.c:253 #, c-format msgid "Partition(s) on %s are being used." msgstr "Partisjon(ane) på %s er i bruk." -#: parted/parted.c:264 +#: parted/parted.c:265 #, 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:525 +#: parted/parted.c:526 msgid "New disk label type?" msgstr "Ny disklabel-type?" -#: parted/parted.c:662 +#: parted/parted.c:663 msgid "Partition type?" msgstr "Partisjonstype?" -#: parted/parted.c:680 parted/parted.c:884 +#: parted/parted.c:681 parted/parted.c:885 msgid "Partition name?" msgstr "Partisjonsnamn?" -#: parted/parted.c:690 +#: parted/parted.c:691 msgid "File system type?" msgstr "Filsystemtype?" -#: parted/parted.c:695 parted/parted.c:1498 +#: parted/parted.c:696 parted/parted.c:1499 msgid "Start?" msgstr "Start?" -#: parted/parted.c:698 parted/parted.c:1500 parted/parted.c:1569 +#: parted/parted.c:699 parted/parted.c:1501 parted/parted.c:1585 msgid "End?" msgstr "Slutt?" -#: parted/parted.c:766 +#: parted/parted.c:767 #, 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:775 +#: parted/parted.c:776 msgid "" "\n" "Is this still acceptable to you?" msgstr "" -#: parted/parted.c:798 +#: parted/parted.c:799 #, c-format msgid "" "The resulting partition is not properly aligned for best performance: %s" msgstr "" -#: parted/parted.c:800 parted/parted.c:1723 +#: parted/parted.c:801 parted/parted.c:1739 msgid "unknown (malloc failed)" msgstr "" -#: parted/parted.c:876 +#: parted/parted.c:877 #, fuzzy, c-format msgid "%s disk labels do not support partition name." msgstr "Ein %s-disklabel støttar ikkje utvidingspartisjonar." -#: parted/parted.c:881 parted/parted.c:1561 parted/parted.c:1612 -#: parted/parted.c:1706 parted/parted.c:1781 +#: parted/parted.c:882 parted/parted.c:1564 parted/parted.c:1628 +#: parted/parted.c:1722 parted/parted.c:1797 msgid "Partition number?" msgstr "Partisjonsnummer?" -#: parted/parted.c:975 +#: parted/parted.c:976 #, c-format msgid "BIOS cylinder,head,sector geometry: %d,%d,%d. Each cylinder is %s.\n" msgstr "" -#: parted/parted.c:1017 +#: parted/parted.c:1018 #, c-format msgid "Model: %s (%s)\n" msgstr "" -#: parted/parted.c:1019 +#: parted/parted.c:1020 #, fuzzy, c-format msgid "Disk %s: %s\n" msgstr "Disklabel-type: %s\n" -#: parted/parted.c:1020 +#: parted/parted.c:1021 #, c-format msgid "Sector size (logical/physical): %lldB/%lldB\n" msgstr "" -#: parted/parted.c:1032 +#: parted/parted.c:1033 #, fuzzy, c-format msgid "Partition Table: %s\n" msgstr "Partisjonsnamn?" -#: parted/parted.c:1033 +#: parted/parted.c:1034 #, fuzzy, c-format msgid "Disk Flags: %s\n" msgstr "Disklabel-type: %s\n" -#: parted/parted.c:1153 parted/parted.c:1156 +#: parted/parted.c:1154 parted/parted.c:1157 msgid "Number" msgstr "" -#: parted/parted.c:1153 parted/parted.c:1156 +#: parted/parted.c:1154 parted/parted.c:1157 #, fuzzy msgid "Start" msgstr "Start?" -#: parted/parted.c:1154 parted/parted.c:1157 +#: parted/parted.c:1155 parted/parted.c:1158 #, fuzzy msgid "End" msgstr "Slutt?" -#: parted/parted.c:1157 +#: parted/parted.c:1158 msgid "Size" msgstr "" -#: parted/parted.c:1161 +#: parted/parted.c:1162 msgid "Type" msgstr "" -#: parted/parted.c:1163 +#: parted/parted.c:1164 #, fuzzy msgid "File system" msgstr "Filsystem?" -#: parted/parted.c:1166 +#: parted/parted.c:1167 msgid "Name" msgstr "" -#: parted/parted.c:1168 +#: parted/parted.c:1169 msgid "Flags" msgstr "Flagg" -#: parted/parted.c:1225 +#: parted/parted.c:1226 msgid "Free Space" msgstr "" -#: parted/parted.c:1385 +#: parted/parted.c:1386 #, fuzzy, c-format msgid "" "A %s %s partition was found at %s -> %s. Do you want to add it to the " @@ -2557,66 +2501,66 @@ msgstr "" "Ein %s %s-partisjon vart funnen på %.3f MiB -> %.3f MiB. Ønskjer du å " "leggja han til i partisjonstabellen?" -#: parted/parted.c:1428 +#: parted/parted.c:1429 msgid "searching for file systems" msgstr "leitar etter filsystem" -#: parted/parted.c:1535 +#: parted/parted.c:1536 msgid "The resize command has been removed in parted 3.0" msgstr "" -#: parted/parted.c:1583 +#: parted/parted.c:1599 msgid "" "Shrinking a partition can cause data loss, are you sure you want to continue?" msgstr "" -#: parted/parted.c:1636 +#: parted/parted.c:1652 msgid "New device?" msgstr "Ny eining?" -#: parted/parted.c:1704 +#: parted/parted.c:1720 msgid "alignment type(min/opt)" msgstr "" -#: parted/parted.c:1719 +#: parted/parted.c:1735 #, c-format msgid "%d aligned\n" msgstr "" -#: parted/parted.c:1721 +#: parted/parted.c:1737 #, c-format msgid "%d not aligned: %s\n" msgstr "" -#: parted/parted.c:1746 parted/parted.c:1783 +#: parted/parted.c:1762 parted/parted.c:1799 #, fuzzy msgid "Flag to Invert?" msgstr "Flagg som skal endrast?" -#: parted/parted.c:1751 parted/parted.c:1788 +#: parted/parted.c:1767 parted/parted.c:1804 msgid "New state?" msgstr "Ny status?" -#: parted/parted.c:1834 +#: parted/parted.c:1850 msgid "Unit?" msgstr "" -#: parted/parted.c:1969 +#: parted/parted.c:1985 #, fuzzy msgid "align-check" msgstr "check" -#: parted/parted.c:1972 +#: parted/parted.c:1988 msgid "" "align-check TYPE N check partition N for TYPE(min|opt) " "alignment" msgstr "" -#: parted/parted.c:1980 +#: parted/parted.c:1996 msgid "help" msgstr "help" -#: parted/parted.c:1983 +#: parted/parted.c:1999 #, fuzzy msgid "" "help [COMMAND] print general help, or help on " @@ -2624,31 +2568,31 @@ msgid "" msgstr "" "help [KOMMANDO] gjev generell hjelp, eller hjelp om KOMMANDO" -#: parted/parted.c:1989 +#: parted/parted.c:2005 msgid "mklabel" msgstr "mklabel" -#: parted/parted.c:1989 +#: parted/parted.c:2005 msgid "mktable" msgstr "" -#: parted/parted.c:1992 +#: parted/parted.c:2008 #, fuzzy msgid "" "mklabel,mktable LABEL-TYPE create a new disklabel (partition " "table)" msgstr "mklabel LABEL-TYPE lag ny disklabel (partisjonstabell)" -#: parted/parted.c:1998 +#: parted/parted.c:2014 msgid "mkpart" msgstr "mkpart" -#: parted/parted.c:2001 +#: parted/parted.c:2017 #, 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:2007 +#: parted/parted.c:2023 #, fuzzy msgid "" "'mkpart' makes a partition without creating a new file system on the " @@ -2657,27 +2601,27 @@ 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:2012 +#: parted/parted.c:2028 msgid "name" msgstr "name" -#: parted/parted.c:2015 +#: parted/parted.c:2031 #, fuzzy msgid "name NUMBER NAME name partition NUMBER as NAME" msgstr "name NR NAMN gje partisjonen NR namnet NAMN" -#: parted/parted.c:2020 +#: parted/parted.c:2036 msgid "print" msgstr "print" -#: parted/parted.c:2023 +#: parted/parted.c:2039 msgid "" "print [devices|free|list,all|NUMBER] display the partition table, " "available devices, free space, all found partitions, or a particular " "partition" msgstr "" -#: parted/parted.c:2028 +#: parted/parted.c:2044 #, fuzzy msgid "" "Without arguments, 'print' displays the entire partition table. However with " @@ -2687,41 +2631,41 @@ msgstr "" "partisjonsnummer er oppgjeve, vil meir detaljert informasjon om\n" "partisjonen verta vist.\n" -#: parted/parted.c:2030 +#: parted/parted.c:2046 msgid " devices : display all active block devices\n" msgstr "" -#: parted/parted.c:2031 +#: parted/parted.c:2047 msgid "" " free : display information about free unpartitioned space on the " "current block device\n" msgstr "" -#: parted/parted.c:2033 +#: parted/parted.c:2049 msgid "" " list, all : display the partition tables of all active block devices\n" msgstr "" -#: parted/parted.c:2034 +#: parted/parted.c:2050 msgid "" " NUMBER : display more detailed information about this particular " "partition\n" msgstr "" -#: parted/parted.c:2039 +#: parted/parted.c:2055 msgid "quit" msgstr "quit" -#: parted/parted.c:2042 +#: parted/parted.c:2058 #, fuzzy msgid "quit exit program" msgstr "quit avslutt programmet" -#: parted/parted.c:2047 +#: parted/parted.c:2063 msgid "rescue" msgstr "rescue" -#: parted/parted.c:2050 +#: parted/parted.c:2066 #, fuzzy msgid "" "rescue START END rescue a lost partition near START " @@ -2729,129 +2673,137 @@ msgid "" msgstr "" "rescue START SLUTT redd tapte partisjonar nær START og SLUTT" -#: parted/parted.c:2056 +#: parted/parted.c:2072 msgid "resize" msgstr "resize" -#: parted/parted.c:2059 +#: parted/parted.c:2075 msgid "The resize command was removed in parted 3.0\n" msgstr "" -#: parted/parted.c:2062 +#: parted/parted.c:2078 #, fuzzy msgid "resizepart" msgstr "resize" -#: parted/parted.c:2065 +#: parted/parted.c:2081 #, fuzzy msgid "resizepart NUMBER END resize partition NUMBER" msgstr "rm NR slett partisjonen NR" -#: parted/parted.c:2070 +#: parted/parted.c:2086 msgid "rm" msgstr "rm" -#: parted/parted.c:2073 +#: parted/parted.c:2089 #, fuzzy msgid "rm NUMBER delete partition NUMBER" msgstr "rm NR slett partisjonen NR" -#: parted/parted.c:2078 +#: parted/parted.c:2094 msgid "select" msgstr "select" -#: parted/parted.c:2081 +#: parted/parted.c:2097 #, fuzzy msgid "select DEVICE choose the device to edit" msgstr "select EINING vel eininga du vil gjera endringar på" -#: parted/parted.c:2086 +#: parted/parted.c:2102 msgid "disk_set" msgstr "" -#: parted/parted.c:2089 +#: parted/parted.c:2105 msgid "" "disk_set FLAG STATE change the FLAG on selected device" msgstr "" -#: parted/parted.c:2094 +#: parted/parted.c:2110 msgid "disk_toggle" msgstr "" -#: parted/parted.c:2097 +#: parted/parted.c:2113 msgid "" "disk_toggle [FLAG] toggle the state of FLAG on " "selected device" msgstr "" -#: parted/parted.c:2103 +#: parted/parted.c:2119 msgid "set" msgstr "set" -#: parted/parted.c:2106 +#: parted/parted.c:2122 #, 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:2112 +#: parted/parted.c:2128 msgid "toggle" msgstr "" -#: parted/parted.c:2115 +#: parted/parted.c:2131 msgid "" "toggle [NUMBER [FLAG]] toggle the state of FLAG on " "partition NUMBER" msgstr "" -#: parted/parted.c:2121 +#: parted/parted.c:2137 msgid "unit" msgstr "" -#: parted/parted.c:2124 +#: parted/parted.c:2140 #, fuzzy msgid "unit UNIT set the default unit to UNIT" msgstr "quit avslutt programmet" -#: parted/parted.c:2129 +#: parted/parted.c:2145 msgid "version" msgstr "" -#: parted/parted.c:2132 +#: parted/parted.c:2148 msgid "" "version display the version number and " "copyright information of GNU Parted" msgstr "" -#: parted/parted.c:2136 +#: parted/parted.c:2152 msgid "" "'version' displays copyright and version information corresponding to this " "copy of GNU Parted\n" msgstr "" -#: parted/parted.c:2204 +#: parted/parted.c:2220 #, c-format msgid "Usage: %s [-hlmsv] [-a] [DEVICE [COMMAND [PARAMETERS]]...]\n" msgstr "" -#: parted/parted.c:2248 +#: parted/parted.c:2264 msgid "No device found" msgstr "Ingen diskar funne" -#: parted/parted.c:2285 +#: parted/parted.c:2301 msgid "WARNING: You are not superuser. Watch out for permissions.\n" msgstr "" -#: parted/parted.c:2325 +#: parted/parted.c:2334 +msgid "" +"You should reinstall your boot loader before rebooting. Read section 4 of " +"the Parted User documentation for more information." +msgstr "" +"Du må installera boot-lastaren på nytt før neste omstart. Les del 4 i " +"brukarhandboka for meir informasjon." + +#: parted/parted.c:2341 #, fuzzy msgid "You may need to update /etc/fstab.\n" msgstr "Gløym ikkje å oppdatera /etc/fstab, om naudsynt.\n" -#: parted/ui.c:164 +#: parted/ui.c:165 msgid "Welcome to GNU Parted! Type 'help' to view a list of commands.\n" msgstr "" -#: parted/ui.c:167 +#: parted/ui.c:168 #, fuzzy msgid "" "Usage: parted [OPTION]... [DEVICE [COMMAND [PARAMETERS]...]...]\n" @@ -2863,7 +2815,7 @@ msgstr "" "Utfør KOMMANDO med PARAMETER på EINING. Dersom ingen KOMMANDO er gjeven,\n" "køyrer GNU Parted i interaktiv modus.\n" -#: parted/ui.c:172 +#: parted/ui.c:173 #, c-format msgid "" "\n" @@ -2897,216 +2849,217 @@ msgid "" "consider important.\n" msgstr "" -#: parted/ui.c:293 +#: parted/ui.c:294 msgid "" "\n" "Command History:\n" msgstr "" -#: parted/ui.c:356 +#: parted/ui.c:357 msgid "" "\n" "Error: SEGV_MAPERR (Address not mapped to object)\n" msgstr "" -#: parted/ui.c:362 +#: parted/ui.c:363 msgid "" "\n" "Error: SEGV_ACCERR (Invalid permissions for mapped object)\n" msgstr "" -#: parted/ui.c:367 +#: parted/ui.c:368 msgid "" "\n" "Error: A general SIGSEGV signal was encountered.\n" msgstr "" -#: parted/ui.c:391 +#: parted/ui.c:392 msgid "" "\n" "Error: FPE_INTDIV (Integer: divide by zero)" msgstr "" -#: parted/ui.c:396 +#: parted/ui.c:397 msgid "" "\n" "Error: FPE_INTOVF (Integer: overflow)" msgstr "" -#: parted/ui.c:401 +#: parted/ui.c:402 msgid "" "\n" "Error: FPE_FLTDIV (Float: divide by zero)" msgstr "" -#: parted/ui.c:406 +#: parted/ui.c:407 msgid "" "\n" "Error: FPE_FLTOVF (Float: overflow)" msgstr "" -#: parted/ui.c:411 +#: parted/ui.c:412 msgid "" "\n" "Error: FPE_FLTUND (Float: underflow)" msgstr "" -#: parted/ui.c:416 +#: parted/ui.c:417 msgid "" "\n" "Error: FPE_FLTRES (Float: inexact result)" msgstr "" -#: parted/ui.c:421 +#: parted/ui.c:422 msgid "" "\n" "Error: FPE_FLTINV (Float: invalid operation)" msgstr "" -#: parted/ui.c:426 +#: parted/ui.c:427 msgid "" "\n" "Error: FPE_FLTSUB (Float: subscript out of range)" msgstr "" -#: parted/ui.c:431 +#: parted/ui.c:432 msgid "" "\n" "Error: A general SIGFPE signal was encountered." msgstr "" -#: parted/ui.c:455 +#: parted/ui.c:456 msgid "" "\n" "Error: ILL_ILLOPC (Illegal Opcode)" msgstr "" -#: parted/ui.c:460 +#: parted/ui.c:461 msgid "" "\n" "Error: ILL_ILLOPN (Illegal Operand)" msgstr "" -#: parted/ui.c:465 +#: parted/ui.c:466 msgid "" "\n" "Error: ILL_ILLADR (Illegal addressing mode)" msgstr "" -#: parted/ui.c:470 +#: parted/ui.c:471 msgid "" "\n" "Error: ILL_ILLTRP (Illegal Trap)" msgstr "" -#: parted/ui.c:475 +#: parted/ui.c:476 msgid "" "\n" "Error: ILL_PRVOPC (Privileged Opcode)" msgstr "" -#: parted/ui.c:480 +#: parted/ui.c:481 msgid "" "\n" "Error: ILL_PRVREG (Privileged Register)" msgstr "" -#: parted/ui.c:485 +#: parted/ui.c:486 msgid "" "\n" "Error: ILL_COPROC (Coprocessor Error)" msgstr "" -#: parted/ui.c:490 +#: parted/ui.c:491 msgid "" "\n" "Error: ILL_BADSTK (Internal Stack Error)" msgstr "" -#: parted/ui.c:495 +#: parted/ui.c:496 msgid "" "\n" "Error: A general SIGILL signal was encountered." msgstr "" -#: parted/ui.c:888 +#: parted/ui.c:889 #, fuzzy, c-format msgid "invalid token: %s" msgstr "Ugyldig partisjonstabell på %s" -#: parted/ui.c:1069 +#: parted/ui.c:1070 msgid "Expecting a partition number." msgstr "Forventa eit partisjonsnummer." -#: parted/ui.c:1078 +#: parted/ui.c:1079 msgid "Partition doesn't exist." msgstr "Partisjonen finst ikkje." -#: parted/ui.c:1098 +#: parted/ui.c:1099 msgid "Expecting a file system type." msgstr "Forventa ei filsystemtype." -#: parted/ui.c:1105 +#: parted/ui.c:1106 #, c-format msgid "Unknown file system type \"%s\"." msgstr "Filsystemtypen «%s» er ukjend." -#: parted/ui.c:1126 +#: parted/ui.c:1127 msgid "Expecting a disk label type." msgstr "Forventa ein disklabel-type." -#: parted/ui.c:1157 parted/ui.c:1193 +#: parted/ui.c:1158 parted/ui.c:1194 msgid "No flags supported" msgstr "" -#: parted/ui.c:1267 +#: parted/ui.c:1268 msgid "Can't create any more partitions." msgstr "Kan ikkje laga fleire partisjonar." -#: parted/ui.c:1277 +#: parted/ui.c:1278 msgid "Expecting a partition type." msgstr "Forventa ein partisjonstype." -#: parted/ui.c:1426 +#: parted/ui.c:1427 msgid "on" msgstr "på" -#: parted/ui.c:1427 +#: parted/ui.c:1428 msgid "off" msgstr "av" -#: parted/ui.c:1444 +#: parted/ui.c:1445 msgid "optimal" msgstr "" -#: parted/ui.c:1445 +#: parted/ui.c:1446 msgid "minimal" msgstr "" -#: parted/ui.c:1578 +#: parted/ui.c:1579 msgid "OPTIONs:" msgstr "FLAGG:" -#: parted/ui.c:1583 +#: parted/ui.c:1584 msgid "COMMANDs:" msgstr "KOMMANDOar:" -#: parted/ui.c:1586 +#: parted/ui.c:1587 #, c-format msgid "" "\n" "Report bugs to %s\n" msgstr "" -#: parted/ui.c:1593 +#: parted/ui.c:1594 #, c-format msgid "Using %s\n" msgstr "Brukar %s\n" -#: parted/ui.c:1673 +#: parted/ui.c:1674 msgid "This command does not make sense in non-interactive mode.\n" msgstr "" +#, c-format #~ msgid "" #~ "The sector size on %s is %d bytes. Parted is known not to work properly " #~ "with drives with sector sizes other than %d bytes" @@ -3114,6 +3067,7 @@ msgstr "" #~ "Sektorane på %s er %d oktettar store. Parted fungerer berre skikkeleg på " #~ "diskar som har ein sektorstorleik på %d oktettar" +#, c-format #~ msgid "Device %s has dodgey geometry." #~ msgstr "Eininga %s har tvilsam geometri." @@ -3123,9 +3077,11 @@ msgstr "" #~ msgid "SCSI" #~ msgstr "SCSI" +#, c-format #~ msgid "Device %s is neither a SCSI nor IDE drive." #~ msgstr "Eininga %s er korkje ein SCSI- eller IDE-disk." +#, c-format #~ msgid "Error reading %s (%s) to determine if partition is mounted." #~ msgstr "Feil ved lesing av %s (%s) for å avgjera om partisjonen er montert." @@ -3138,6 +3094,7 @@ msgstr "" #~ "etc/mtab. Forsikra deg om at du ikkje prøver å endra på monterte " #~ "filsystem (sjølv om dei er montert med kun lesetilgang)" +#, c-format #~ msgid "" #~ "The kernel was unable to re-read the partition table on %s (%s). This " #~ "means Linux won't know anything nothing about the modifications you made " @@ -3148,6 +3105,32 @@ msgstr "" #~ "tyder at Linux ikkje veit om endringane du har gjort. Du må ta omstart " #~ "på maskinen din før du gjer noko med %s." +#~ msgid "" +#~ "The partition table was unable to be reread, as such, you need to reboot " +#~ "before mounting any modified partitions. You also need to reinstall your " +#~ "boot loader before you reboot (which may require mounting modified " +#~ "partitions). It is impossible do both things! So you'll need to boot " +#~ "off a rescue disk, and reinstall your boot loader from the rescue disk. " +#~ "Read section 4 of the Parted User documentation for more information." +#~ msgstr "" +#~ "Kjerna klarte ikkje å lesa partisjonstabellen på nytt, så du må starta om " +#~ "maskina før du kan montera endra partisjonar. Du må også installera boot-" +#~ "lastaren på nytt før omstarten (som kanskje krever at du monterer " +#~ "partisjonane du har endra). Det er umogleg å gjera båe delar! Start frå " +#~ "ein redningsdiskett, og reinstallera boot-lastaren frå redningsmiljøet. " +#~ "Les del 4 i brukarhandboka for meir informasjon." + +#, c-format +#~ msgid "" +#~ "The partition table on %s (%s). This means the Hurd knows nothing about " +#~ "any modifications you made. You should reboot your computer before doing " +#~ "anything with %s." +#~ msgstr "" +#~ "Partisjonstabellen på %s (%s). Det tyder at Hurd ikkje veit noko om " +#~ "endringar du har gjort. Datamaskinen må startast på nytt før du gjer " +#~ "noko med %s." + +#, c-format #~ msgid "" #~ "The partition table on %s is inconsistent. There are many reasons why " #~ "this might be the case. However, the most likely reason is that Linux " @@ -3168,6 +3151,7 @@ msgstr "" #~ "foreslår er rett, kan du velja Ignorer for å halda fram (og fiksa Linux " #~ "seinare). Viss ikkje, vel Avbryt (og fiks Linux og/eller BIOS-en no)." +#, c-format #~ msgid "" #~ "The partition table on %s is inconsistent. There are many reasons why " #~ "this might be the case. Often, the reason is that Linux detected the " @@ -3193,6 +3177,7 @@ msgstr "" #~ "feil BIOS-geometri. Det er trygt å oversjå denne feilen, men du kan kome " #~ "bort i problem med boot-lastaren (som kan rettast opp)." +#, c-format #~ msgid "" #~ "%s contains GPT signatures, indicating that it has a GPT table. However, " #~ "it does not have a valid fake msdos partition table, as it should. " @@ -3206,9 +3191,14 @@ msgstr "" #~ "partisjonstabellar. Eller kanskje du har sletta GPT-tabellen og brukar " #~ "no ein MSDOS-partisjonstabell. Er dette ein GPT-partisjonstabell?" +#~ msgid "The boot region doesn't start at the start of the partition" +#~ msgstr "Bootregionen startar ikkje på starten av partisjonen" + +#, c-format #~ msgid "Support for opening %s file systems is not implemented yet." #~ msgstr "Støtte for å opna %s-filsystem er ikkje lagt inn enno." +#, c-format #~ msgid "Support for checking %s file systems is not implemented yet." #~ msgstr "Støtte for å sjekka %s-filsystem for feil er ikkje lagt inn enno." @@ -3221,6 +3211,7 @@ msgstr "" #~ msgid "Can't copy onto an overlapping partition." #~ msgstr "Kan ikkje kopiera inn i ein overlappande partisjon." +#, c-format #~ msgid "" #~ "Direct support for copying file systems is not yet implemented for %s. " #~ "However, support for resizing implemented. Therefore, the file system " @@ -3233,9 +3224,11 @@ msgstr "" #~ "partisjonen er minst like stor som den gamle. Du må altså anten krympa " #~ "partisjonen du prøver å kopiera, eller kopiera til ein større partisjon." +#, c-format #~ msgid "Support for copying %s file systems is not implemented yet." #~ msgstr "Støtte for å kopiera %s-filsystem er ikkje lagt inn enno." +#, c-format #~ msgid "" #~ "A bug has been detected in GNU parted. Please email a bug report to bug-" #~ "parted@gnu.org containing the version (%s) and the following message:" @@ -3244,6 +3237,7 @@ msgstr "" #~ "til bug-parted@gnu.org der du oppgjev versjonsnummeret (%s) og fylgjande " #~ "melding:" +#, c-format #~ msgid "Attempt to read sectors %ld-%ld outside of partition on %s" #~ msgstr "Prøvde å lesa sektorane %ld-%ld utanfor partisjonen på %s" @@ -3297,11 +3291,13 @@ msgstr "" #~ msgid "adding groups" #~ msgstr "legg til grupper" +#, c-format #~ msgid "Your filesystem is too occupied to resize it to %i blocks. Sorry." #~ msgstr "" #~ "Filsystemet er for fullt til at ein kan endra storleiken til %i blokker. " #~ "Beklagar." +#, c-format #~ msgid "" #~ "Your filesystem has too much occupied inodes to resize it to %i blocks. " #~ "Sorry." @@ -3317,9 +3313,11 @@ msgstr "" #~ msgid "Cross-linked blocks found! better go run e2fsck first!" #~ msgstr "Krysslenka blokker funne! Køyr e2fsck først!" +#, c-format #~ msgid "Block %i has no reference? Weird" #~ msgstr "Blokk %i har ingen referansar til seg? Rart" +#, c-format #~ msgid "Block %i shouldn't have been marked!" #~ msgstr "Blokk %i burde ikkje ha vore merka!" @@ -3342,6 +3340,7 @@ msgstr "" #~ msgid "File system has an invalid signature for a FAT file systems." #~ msgstr "Filsystemet har ein ugyldig signatur til å vera eit FAT-filsystem." +#, 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." @@ -3349,6 +3348,14 @@ msgstr "" #~ "Dette filsystemet har ein logisk sektorstorleik på %d. GNU Parted " #~ "fungerer berre skikkeleg når sektorstorleiken er 512 oktettar." +#, c-format +#~ msgid "" +#~ "The file %s is marked as a system file. This means moving it could cause " +#~ "some programs to stop working." +#~ msgstr "" +#~ "Fila %s er klassifisert som ei systemfil. Å flytta denne fila kan føra " +#~ "til at nokon program sluttar å fungera." + #~ msgid "Too many bad pages." #~ msgstr "For mange dårlege sider." @@ -3358,6 +3365,7 @@ msgstr "" #~ msgid "Source partition number?" #~ msgstr "Kva partisjonsnummer skal vera kjelda?" +#, c-format #~ msgid "" #~ "You requested to create a partition at %.3f-%.3fMb. The closest Parted " #~ "can manage is %.3f-%.3fMb." @@ -3376,6 +3384,7 @@ msgstr "" #~ "Kan ikkje flytta ein partisjon til seg sjølv. Kanskje du vil prøva å " #~ "endra storleik?" +#, c-format #~ msgid "" #~ "You requested to move the partition to %.3f-%.3fMb. The closest Parted " #~ "can manage is %.3f-%.3fMb." @@ -3383,24 +3392,30 @@ msgstr "" #~ "Du bad om å flytta partisjonen til %.3f-%.3f MiB. Det nærmaste Parted " #~ "kan klara er %.3f-%.3f MiB." +#, c-format #~ msgid "Minor: %d\n" #~ msgstr "Nummer: %d\n" #~ msgid "Flags: " #~ msgstr "Flagg: " +#, c-format #~ msgid "File System: %s\n" #~ msgstr "Filsystem: %s\n" +#, c-format #~ msgid "Size: %10.3fMb (%d%%)\n" #~ msgstr "Storleik: %10.3fMiB (%d%%)\n" +#, c-format #~ msgid "Minimum size: %10.3fMb (%d%%)\n" #~ msgstr "Minste storleik: %10.3fMiB (%d%%)\n" +#, c-format #~ msgid "Maximum size: %10.3fMb (%d%%)\n" #~ msgstr "Største storleik: %10.3fMiB (%d%%)\n" +#, c-format #~ msgid "Disk geometry for %s: 0.000-%.3f megabytes\n" #~ msgstr "Diskgeometri for %s: 0.000-%.3f mebibytes\n" @@ -3416,6 +3431,7 @@ msgstr "" #~ msgid "Name " #~ msgstr "Namn " +#, c-format #~ msgid "" #~ "You requested to resize the partition to %.3f-%.3fMb. The closest Parted " #~ "can manage is %.3f-%.3fMb." @@ -3472,6 +3488,7 @@ msgstr "" #~ "resize NR START SLUTT endra storleik på filsystemet på " #~ "partisjonen NR" +#, c-format #~ msgid "" #~ "You found a bug in GNU Parted. Please email a bug report to bug-" #~ "parted@gnu.org containing the version (%s), and the following message:\n" @@ -3492,6 +3509,7 @@ msgstr "" #~ "formeining om diskgeomtetri før du endrar storleik på nokon av FAT-" #~ "partisjonane." +#, c-format #~ msgid "" #~ "The operating system thinks the geometry on %s is %d/%d/%d. Therefore, " #~ "cylinder 1024 ends at %.3fM.%s" @@ -3499,5 +3517,6 @@ msgstr "" #~ "Operativsystemet trur geometrien på %s er %d/%d/%d, altså endar sylinder " #~ "1024 på %.3f MiB.%s" +#, c-format #~ msgid "The operating system thinks the geometry on %s is %d/%d/%d.%s" #~ msgstr "Operativsystemet meiner at geometrien til %s er %d/%d/%d.%s" diff --git a/po/parted.pot b/po/parted.pot index 3983597..a12c0c3 100644 --- a/po/parted.pot +++ b/po/parted.pot @@ -6,9 +6,9 @@ #, fuzzy msgid "" msgstr "" -"Project-Id-Version: GNU parted 3.3\n" +"Project-Id-Version: GNU parted 3.4\n" "Report-Msgid-Bugs-To: bug-parted@gnu.org\n" -"POT-Creation-Date: 2019-10-10 16:35-0700\n" +"POT-Creation-Date: 2021-01-27 16:00-0800\n" "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" "Last-Translator: FULL NAME \n" "Language-Team: LANGUAGE \n" @@ -95,11 +95,11 @@ msgstr "" #. If you don't know what to put here, please see #. #. and use glyphs suitable for your language. -#: lib/quotearg.c:362 +#: lib/quotearg.c:355 msgid "`" msgstr "" -#: lib/quotearg.c:363 +#: lib/quotearg.c:356 msgid "'" msgstr "" @@ -340,78 +340,63 @@ msgstr "" msgid "memory exhausted" msgstr "" -#: lib/xstrtol-error.c:63 -#, c-format -msgid "invalid %s%s argument '%s'" -msgstr "" - -#: lib/xstrtol-error.c:68 -#, c-format -msgid "invalid suffix in %s%s argument '%s'" -msgstr "" - -#: lib/xstrtol-error.c:72 -#, c-format -msgid "%s%s argument '%s' too large" -msgstr "" - -#: libparted/arch/beos.c:245 +#: libparted/arch/beos.c:246 msgid "Disk Image" msgstr "" -#: libparted/arch/beos.c:346 libparted/arch/gnu.c:277 +#: libparted/arch/beos.c:347 libparted/arch/gnu.c:277 #: libparted/arch/linux.c:1731 #, c-format msgid "Error opening %s: %s" msgstr "" -#: libparted/arch/beos.c:357 libparted/arch/gnu.c:287 +#: libparted/arch/beos.c:358 libparted/arch/gnu.c:287 #: libparted/arch/linux.c:1742 #, c-format msgid "Unable to open %s read-write (%s). %s has been opened read-only." msgstr "" -#: libparted/arch/beos.c:419 libparted/arch/linux.c:1907 +#: libparted/arch/beos.c:420 libparted/arch/linux.c:1907 #, c-format msgid "%s during seek for read on %s" msgstr "" -#: libparted/arch/beos.c:452 libparted/arch/gnu.c:465 libparted/arch/gnu.c:564 -#: libparted/arch/gnu.c:692 libparted/arch/linux.c:1867 +#: libparted/arch/beos.c:453 libparted/arch/gnu.c:425 libparted/arch/gnu.c:524 +#: libparted/arch/gnu.c:652 libparted/arch/linux.c:1867 #: libparted/arch/linux.c:1949 #, c-format msgid "%s during read on %s" msgstr "" -#: libparted/arch/beos.c:488 libparted/arch/gnu.c:525 +#: libparted/arch/beos.c:489 libparted/arch/gnu.c:485 #: libparted/arch/linux.c:2026 #, c-format msgid "Can't write to %s, because it is opened read-only." msgstr "" -#: libparted/arch/beos.c:504 libparted/arch/linux.c:2051 +#: libparted/arch/beos.c:505 libparted/arch/linux.c:2051 #, c-format msgid "%s during seek for write on %s" msgstr "" -#: libparted/arch/beos.c:541 libparted/arch/gnu.c:601 libparted/arch/gnu.c:646 -#: libparted/arch/gnu.c:723 libparted/arch/linux.c:1999 +#: libparted/arch/beos.c:542 libparted/arch/gnu.c:561 libparted/arch/gnu.c:606 +#: libparted/arch/gnu.c:683 libparted/arch/linux.c:1999 #: libparted/arch/linux.c:2094 libparted/arch/linux.c:2167 #, c-format msgid "%s during write on %s" msgstr "" -#: partprobe/partprobe.c:148 +#: partprobe/partprobe.c:149 #, c-format msgid "Try `%s --help' for more information.\n" msgstr "" -#: partprobe/partprobe.c:152 +#: partprobe/partprobe.c:153 #, c-format msgid "Usage: %s [OPTION] [DEVICE]...\n" msgstr "" -#: partprobe/partprobe.c:153 +#: partprobe/partprobe.c:154 msgid "" "Inform the operating system about partition table changes.\n" "\n" @@ -421,13 +406,13 @@ msgid "" " -v, --version output version information and exit\n" msgstr "" -#: partprobe/partprobe.c:161 +#: partprobe/partprobe.c:162 msgid "" "\n" "When no DEVICE is given, probe all partitions.\n" msgstr "" -#: partprobe/partprobe.c:165 +#: partprobe/partprobe.c:166 #, c-format msgid "" "\n" @@ -443,31 +428,7 @@ msgstr "" msgid "Unable to probe store." msgstr "" -#: libparted/arch/gnu.c:368 -msgid "" -"The partition table cannot be re-read. This means you need to reboot before " -"mounting any modified partitions. You also need to reinstall your boot " -"loader before you reboot (which may require mounting modified partitions). " -"It is impossible do both things! So you'll need to boot off a rescue disk, " -"and reinstall your boot loader from the rescue disk. Read section 4 of the " -"Parted User documentation for more information." -msgstr "" - -#: libparted/arch/gnu.c:385 -#, 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 computer " -"before doing anything with %s." -msgstr "" - -#: libparted/arch/gnu.c:396 parted/parted.c:2318 -msgid "" -"You should reinstall your boot loader before rebooting. Read section 4 of " -"the Parted User documentation for more information." -msgstr "" - -#: libparted/arch/gnu.c:788 +#: libparted/arch/gnu.c:748 #, c-format msgid "%s trying to sync %s to disk" msgstr "" @@ -759,15 +720,15 @@ msgstr "" msgid "free" msgstr "" -#: libparted/disk.c:2355 parted/ui.c:1258 parted/ui.c:1286 +#: libparted/disk.c:2355 parted/ui.c:1259 parted/ui.c:1287 msgid "extended" msgstr "" -#: libparted/disk.c:2357 parted/ui.c:1262 parted/ui.c:1290 +#: libparted/disk.c:2357 parted/ui.c:1263 parted/ui.c:1291 msgid "logical" msgstr "" -#: libparted/disk.c:2359 parted/ui.c:1254 parted/ui.c:1282 +#: libparted/disk.c:2359 parted/ui.c:1255 parted/ui.c:1283 msgid "primary" msgstr "" @@ -843,64 +804,72 @@ msgstr "" msgid "esp" msgstr "" -#: libparted/disk.c:2415 +#: libparted/disk.c:2411 +msgid "chromeos_kernel" +msgstr "" + +#: libparted/disk.c:2413 +msgid "bls_boot" +msgstr "" + +#: libparted/disk.c:2419 #, c-format msgid "Unknown partition flag, %d." msgstr "" -#: libparted/exception.c:78 +#: libparted/exception.c:79 msgid "Information" msgstr "" -#: libparted/exception.c:79 +#: libparted/exception.c:80 msgid "Warning" msgstr "" -#: libparted/exception.c:80 +#: libparted/exception.c:81 msgid "Error" msgstr "" -#: libparted/exception.c:81 +#: libparted/exception.c:82 msgid "Fatal" msgstr "" -#: libparted/exception.c:82 +#: libparted/exception.c:83 msgid "Bug" msgstr "" -#: libparted/exception.c:83 +#: libparted/exception.c:84 msgid "No Implementation" msgstr "" -#: libparted/exception.c:87 +#: libparted/exception.c:88 msgid "Fix" msgstr "" -#: libparted/exception.c:88 +#: libparted/exception.c:89 msgid "Yes" msgstr "" -#: libparted/exception.c:89 +#: libparted/exception.c:90 msgid "No" msgstr "" -#: libparted/exception.c:90 +#: libparted/exception.c:91 msgid "OK" msgstr "" -#: libparted/exception.c:91 +#: libparted/exception.c:92 msgid "Retry" msgstr "" -#: libparted/exception.c:92 +#: libparted/exception.c:93 msgid "Ignore" msgstr "" -#: libparted/exception.c:93 +#: libparted/exception.c:94 msgid "Cancel" msgstr "" -#: libparted/exception.c:133 +#: libparted/exception.c:134 #, c-format msgid "" "A bug has been detected in GNU Parted. Refer to the web site of parted " @@ -909,31 +878,31 @@ msgid "" "containing at least the version (%s) and the following message: " msgstr "" -#: libparted/labels/aix.c:91 +#: libparted/labels/aix.c:92 msgid "Support for reading AIX disk labels is is not implemented yet." msgstr "" -#: libparted/labels/aix.c:102 +#: libparted/labels/aix.c:103 msgid "Support for writing AIX disk labels is is not implemented yet." msgstr "" -#: libparted/labels/aix.c:115 +#: libparted/labels/aix.c:116 msgid "" "Support for adding partitions to AIX disk labels is not implemented yet." msgstr "" -#: libparted/labels/aix.c:125 +#: libparted/labels/aix.c:126 msgid "" "Support for duplicating partitions in AIX disk labels is not implemented yet." msgstr "" -#: libparted/labels/aix.c:143 +#: libparted/labels/aix.c:144 msgid "" "Support for setting system type of partitions in AIX disk labels is not " "implemented yet." msgstr "" -#: libparted/labels/aix.c:153 +#: libparted/labels/aix.c:154 msgid "Support for setting flags in AIX disk labels is not implemented yet." msgstr "" @@ -1020,11 +989,11 @@ msgid "" "partitions, if XGM is the first one it counts for two)." msgstr "" -#: libparted/labels/atari.c:1657 libparted/labels/bsd.c:567 -#: libparted/labels/dasd.c:894 libparted/labels/dos.c:2276 -#: libparted/labels/dvh.c:770 libparted/labels/gpt.c:2050 -#: libparted/labels/loop.c:243 libparted/labels/mac.c:1423 -#: libparted/labels/pc98.c:701 libparted/labels/rdb.c:1054 +#: libparted/labels/atari.c:1657 libparted/labels/bsd.c:563 +#: libparted/labels/dasd.c:895 libparted/labels/dos.c:2283 +#: libparted/labels/dvh.c:770 libparted/labels/gpt.c:2140 +#: 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 "" @@ -1040,41 +1009,41 @@ msgstr "" msgid "Unable to allocate a partition number." msgstr "" -#: libparted/labels/bsd.c:592 +#: libparted/labels/bsd.c:588 msgid "Unable to allocate a bsd disklabel slot." msgstr "" -#: libparted/labels/dasd.c:625 +#: libparted/labels/dasd.c:626 msgid "The partition table of DASD-LDL device cannot be changed.\n" msgstr "" -#: libparted/labels/dasd.c:920 +#: libparted/labels/dasd.c:921 msgid "Unable to allocate a dasd disklabel slot" msgstr "" -#: libparted/labels/dos.c:1003 +#: libparted/labels/dos.c:1006 #, c-format msgid "Invalid partition table on %s -- wrong signature %x." msgstr "" -#: libparted/labels/dos.c:1031 +#: libparted/labels/dos.c:1034 #, c-format msgid "Invalid partition table - recursive partition on %s." msgstr "" -#: libparted/labels/dos.c:1560 +#: libparted/labels/dos.c:1557 msgid "Extended partitions cannot be hidden on msdos disk labels." msgstr "" -#: libparted/labels/dos.c:1572 +#: libparted/labels/dos.c:1569 msgid "Extended partitions cannot be recovery partitions on msdos disk labels." msgstr "" -#: libparted/labels/dos.c:2258 +#: libparted/labels/dos.c:2265 msgid "Parted can't resize partitions managed by Windows Dynamic Disk." msgstr "" -#: libparted/labels/dos.c:2514 +#: libparted/labels/dos.c:2521 msgid "cannot create any more partitions" msgstr "" @@ -1212,18 +1181,18 @@ msgstr "" msgid "Disk geometry does not match a DASD device of type 3390." msgstr "" -#: libparted/labels/gpt.c:531 +#: libparted/labels/gpt.c:541 msgid "device is too small for GPT" msgstr "" -#: libparted/labels/gpt.c:733 +#: libparted/labels/gpt.c:743 #, 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:769 +#: libparted/labels/gpt.c:779 #, c-format msgid "" "Not all of the space available to %s appears to be used, you can fix the GPT " @@ -1231,35 +1200,35 @@ msgid "" "setting? " msgstr "" -#: libparted/labels/gpt.c:1008 +#: libparted/labels/gpt.c:1024 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:1026 +#: libparted/labels/gpt.c:1042 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:1037 +#: libparted/labels/gpt.c:1053 msgid "" "The backup GPT table is corrupt, but the primary appears OK, so that will be " "used." msgstr "" -#: libparted/labels/gpt.c:1049 +#: libparted/labels/gpt.c:1065 msgid "" "The primary GPT table is corrupt, but the backup appears OK, so that will be " "used." msgstr "" -#: libparted/labels/gpt.c:1073 +#: libparted/labels/gpt.c:1089 msgid "primary partition table array CRC mismatch" msgstr "" -#: libparted/labels/gpt.c:1936 libparted/labels/gpt.c:1963 +#: libparted/labels/gpt.c:2026 libparted/labels/gpt.c:2053 msgid "failed to translate partition name" msgstr "" @@ -1292,68 +1261,64 @@ msgid "The data region doesn't start at the start of the partition." msgstr "" #: libparted/labels/mac.c:572 -msgid "The boot region doesn't start at the start of the partition." -msgstr "" - -#: libparted/labels/mac.c:586 msgid "The partition's boot region doesn't occupy the entire partition." msgstr "" -#: libparted/labels/mac.c:597 +#: libparted/labels/mac.c:583 msgid "The partition's data region doesn't occupy the entire partition." msgstr "" -#: libparted/labels/mac.c:649 +#: libparted/labels/mac.c:635 #, c-format msgid "" "Weird block size on device descriptor: %d bytes is not divisible by 512." msgstr "" -#: libparted/labels/mac.c:662 +#: 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:715 +#: libparted/labels/mac.c:701 msgid "No valid partition map found." msgstr "" -#: libparted/labels/mac.c:789 +#: 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:820 +#: libparted/labels/mac.c:806 msgid "Weird! There are 2 partitions map entries!" msgstr "" -#: libparted/labels/mac.c:1359 +#: 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:1458 +#: libparted/labels/mac.c:1444 msgid "Can't add another partition -- the partition map is too small!" msgstr "" -#: libparted/labels/pc98.c:284 +#: libparted/labels/pc98.c:285 #, c-format msgid "Invalid partition table on %s." msgstr "" -#: libparted/labels/pc98.c:337 libparted/labels/pc98.c:415 +#: 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:733 +#: libparted/labels/pc98.c:729 msgid "Can't add another partition." msgstr "" @@ -1518,39 +1483,39 @@ msgstr "" msgid "Could not write VTOC FMT9 DSCB." msgstr "" -#: libparted/libparted.c:242 +#: libparted/libparted.c:247 msgid "Out of memory." msgstr "" -#: libparted/unit.c:139 +#: libparted/unit.c:140 msgid "Cannot get unit size for special unit 'COMPACT'." msgstr "" -#: libparted/unit.c:385 +#: libparted/unit.c:386 #, c-format msgid "\"%s\" has invalid syntax for locations." msgstr "" -#: libparted/unit.c:393 +#: libparted/unit.c:394 #, c-format msgid "The maximum head value is %d." msgstr "" -#: libparted/unit.c:400 +#: libparted/unit.c:401 #, c-format msgid "The maximum sector value is %d." msgstr "" -#: libparted/unit.c:412 libparted/unit.c:564 +#: libparted/unit.c:413 libparted/unit.c:565 #, c-format msgid "The location %s is outside of the device %s." msgstr "" -#: libparted/unit.c:526 +#: libparted/unit.c:527 msgid "Invalid number." msgstr "" -#: libparted/unit.c:532 +#: libparted/unit.c:533 msgid "Use a smaller unit instead of a value < 1" msgstr "" @@ -1560,18 +1525,18 @@ msgstr "" msgid "%s : Failed to allocate partition block\n" msgstr "" -#: libparted/fs/amiga/affs.c:79 libparted/fs/amiga/apfs.c:71 +#: 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 "" -#: libparted/fs/amiga/affs.c:84 libparted/fs/amiga/apfs.c:76 +#: libparted/fs/amiga/affs.c:83 libparted/fs/amiga/apfs.c:76 #, c-format msgid "%s : Couldn't read boot block %llu\n" msgstr "" -#: libparted/fs/amiga/affs.c:98 libparted/fs/amiga/apfs.c:87 +#: 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" @@ -1597,22 +1562,22 @@ msgstr "" msgid "%s : Couldn't write block %d\n" msgstr "" -#: libparted/fs/amiga/amiga.c:278 +#: libparted/fs/amiga/amiga.c:279 #, c-format msgid "%s : Failed to allocate disk_specific rdb block\n" msgstr "" -#: libparted/fs/amiga/amiga.c:289 +#: libparted/fs/amiga/amiga.c:290 #, c-format msgid "%s : Didn't find rdb block, should never happen\n" msgstr "" -#: libparted/fs/amiga/amiga.c:318 +#: libparted/fs/amiga/amiga.c:319 #, c-format msgid "%s : Failed to read partition block %llu\n" msgstr "" -#: libparted/fs/fat/fat.c:148 libparted/fs/r/fat/fat.c:811 +#: libparted/fs/fat/fat.c:149 msgid "" "GNU Parted was miscompiled: the FAT boot sector should be 512 bytes. FAT " "support will be disabled." @@ -1694,7 +1659,7 @@ msgid "" "geometry." msgstr "" -#: libparted/fs/r/fat/bootsector.c:399 +#: libparted/fs/r/fat/bootsector.c:398 #, c-format msgid "" "The information sector has the wrong signature (%x). Select cancel for now, " @@ -1714,59 +1679,52 @@ msgid "" "Cluster start delta = %d, which is not a multiple of the cluster size %d." msgstr "" -#: libparted/fs/r/fat/count.c:144 +#: 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:157 +#: 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:166 +#: 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:176 +#: 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:195 +#: libparted/fs/r/fat/count.c:135 #, c-format msgid "%s is %dk, but it has %d clusters (%dk)." msgstr "" -#: libparted/fs/r/fat/count.c:258 -#, c-format -msgid "" -"The file %s is marked as a system file. This means moving it could cause " -"some programs to stop working." -msgstr "" - -#: libparted/fs/r/fat/fat.c:243 +#: libparted/fs/r/fat/fat.c:244 #, c-format msgid "Partition too big/small for a %s file system." msgstr "" -#: libparted/fs/r/fat/fat.c:409 +#: 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:449 +#: libparted/fs/r/fat/fat.c:450 msgid "There are no possible configurations for this FAT type." msgstr "" -#: libparted/fs/r/fat/fat.c:461 +#: libparted/fs/r/fat/fat.c:462 #, c-format msgid "" "File system doesn't have expected sizes for Windows to like it. Cluster " @@ -1774,40 +1732,40 @@ msgid "" "FATs is %d sectors (%d expected)." msgstr "" -#: libparted/fs/r/fat/fat.c:484 +#: libparted/fs/r/fat/fat.c:485 #, c-format msgid "" "File system is reporting the free space as %d clusters, not %d clusters." msgstr "" -#: libparted/fs/r/fat/resize.c:158 +#: 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:302 +#: libparted/fs/r/fat/resize.c:303 msgid "Error writing to the root directory." msgstr "" -#: libparted/fs/r/fat/resize.c:495 +#: libparted/fs/r/fat/resize.c:479 msgid "If you leave your file system as FAT16, then you will have no problems." msgstr "" -#: libparted/fs/r/fat/resize.c:498 +#: 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:506 +#: 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 "" -#: libparted/fs/r/fat/resize.c:510 +#: 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 " @@ -1816,77 +1774,77 @@ msgid "" "Windows 95a, and MS Windows NT." msgstr "" -#: libparted/fs/r/fat/resize.c:524 +#: libparted/fs/r/fat/resize.c:508 #, c-format msgid "%s %s %s" msgstr "" -#: libparted/fs/r/fat/resize.c:525 +#: libparted/fs/r/fat/resize.c:509 msgid "Would you like to use FAT32?" msgstr "" -#: libparted/fs/r/fat/resize.c:556 libparted/fs/r/fat/resize.c:572 +#: libparted/fs/r/fat/resize.c:540 libparted/fs/r/fat/resize.c:556 #, c-format msgid "%s %s" msgstr "" -#: libparted/fs/r/fat/resize.c:557 +#: libparted/fs/r/fat/resize.c:541 msgid "" "The file system can only be resized to this size by converting to FAT16." msgstr "" -#: libparted/fs/r/fat/resize.c:573 +#: libparted/fs/r/fat/resize.c:557 msgid "" "The file system can only be resized to this size by converting to FAT32." msgstr "" -#: libparted/fs/r/fat/resize.c:586 +#: libparted/fs/r/fat/resize.c:570 msgid "" "GNU Parted cannot resize this partition to this size. We're working on it!" msgstr "" -#: libparted/fs/r/fat/table.c:136 +#: 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:268 +#: libparted/fs/r/fat/table.c:269 #, c-format msgid "fat_table_set: cluster %ld outside file system" msgstr "" -#: libparted/fs/r/fat/table.c:300 +#: libparted/fs/r/fat/table.c:301 #, c-format msgid "fat_table_get: cluster %ld outside file system" msgstr "" -#: libparted/fs/r/fat/table.c:342 +#: libparted/fs/r/fat/table.c:343 msgid "fat_table_alloc_cluster: no free clusters" msgstr "" -#: libparted/fs/r/filesys.c:151 +#: libparted/fs/r/filesys.c:152 msgid "Could not detect file system." msgstr "" -#: libparted/fs/r/filesys.c:158 libparted/fs/r/filesys.c:285 +#: libparted/fs/r/filesys.c:159 libparted/fs/r/filesys.c:284 #, c-format msgid "resizing %s file systems is not supported" msgstr "" -#: libparted/fs/r/filesys.c:170 +#: libparted/fs/r/filesys.c:171 msgid "The file system is bigger than its volume!" msgstr "" -#: libparted/fs/r/hfs/advfs.c:121 libparted/fs/r/hfs/advfs_plus.c:121 -#: libparted/fs/r/hfs/reloc.c:413 libparted/fs/r/hfs/reloc.c:507 -#: libparted/fs/r/hfs/reloc_plus.c:538 libparted/fs/r/hfs/reloc_plus.c:656 -#: libparted/fs/r/hfs/reloc_plus.c:769 +#: 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:285 +#: libparted/fs/r/hfs/advfs_plus.c:287 msgid "Bad blocks could not be read." msgstr "" @@ -1944,87 +1902,87 @@ msgstr "" msgid "Trying to write HFS+ file with CNID %X behind EOF." msgstr "" -#: libparted/fs/r/hfs/hfs.c:232 +#: libparted/fs/r/hfs/hfs.c:212 msgid "Sorry, HFS cannot be resized that way yet." msgstr "" -#: libparted/fs/r/hfs/hfs.c:250 libparted/fs/r/hfs/hfs.c:629 +#: libparted/fs/r/hfs/hfs.c:230 libparted/fs/r/hfs/hfs.c:573 msgid "shrinking" msgstr "" -#: libparted/fs/r/hfs/hfs.c:262 libparted/fs/r/hfs/hfs.c:641 +#: 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:281 +#: 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:320 +#: libparted/fs/r/hfs/hfs.c:300 msgid "writing HFS Master Directory Block" msgstr "" -#: libparted/fs/r/hfs/hfs.c:468 +#: 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:478 +#: libparted/fs/r/hfs/hfs.c:422 #, c-format msgid "Version %d of HFS+ isn't supported." msgstr "" -#: libparted/fs/r/hfs/hfs.c:489 +#: libparted/fs/r/hfs/hfs.c:433 #, c-format msgid "Version %d of HFSX isn't supported." msgstr "" -#: libparted/fs/r/hfs/hfs.c:672 +#: 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:720 +#: libparted/fs/r/hfs/hfs.c:664 msgid "Error while writing the allocation file." msgstr "" -#: libparted/fs/r/hfs/hfs.c:735 +#: 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:750 +#: libparted/fs/r/hfs/hfs.c:694 msgid "writing HFS+ Volume Header" msgstr "" -#: libparted/fs/r/hfs/hfs.c:850 +#: 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:904 +#: 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:940 +#: libparted/fs/r/hfs/hfs.c:883 msgid "Sorry, HFS+ cannot be resized that way yet." msgstr "" -#: libparted/fs/r/hfs/hfs.c:975 +#: libparted/fs/r/hfs/hfs.c:918 msgid "shrinking embedded HFS+ volume" msgstr "" -#: libparted/fs/r/hfs/hfs.c:992 +#: libparted/fs/r/hfs/hfs.c:935 msgid "Resizing the HFS+ volume has failed." msgstr "" -#: libparted/fs/r/hfs/hfs.c:999 +#: libparted/fs/r/hfs/hfs.c:942 msgid "shrinking HFS wrapper" msgstr "" -#: libparted/fs/r/hfs/hfs.c:1008 +#: libparted/fs/r/hfs/hfs.c:951 msgid "Updating the HFS wrapper has failed." msgstr "" -#: libparted/fs/r/hfs/hfs.c:1110 libparted/fs/r/hfs/hfs.c:1195 +#: 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 " @@ -2089,126 +2047,126 @@ msgstr "" msgid "An extent has not been relocated." msgstr "" -#: libparted/fs/r/hfs/reloc.c:250 libparted/fs/r/hfs/reloc_plus.c:307 +#: 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:380 +#: 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:474 +#: 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:516 libparted/fs/r/hfs/reloc_plus.c:666 +#: 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:573 libparted/fs/r/hfs/reloc_plus.c:844 +#: 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:634 libparted/fs/r/hfs/reloc_plus.c:905 +#: 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:648 libparted/fs/r/hfs/reloc_plus.c:921 +#: 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:494 +#: 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:617 +#: 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:125 +#: parted/parted.c:126 msgid "displays this help message" msgstr "" -#: parted/parted.c:126 +#: parted/parted.c:127 msgid "lists partition layout on all block devices" msgstr "" -#: parted/parted.c:127 +#: parted/parted.c:128 msgid "displays machine parseable output" msgstr "" -#: parted/parted.c:128 +#: parted/parted.c:129 msgid "never prompts for user intervention" msgstr "" -#: parted/parted.c:129 +#: parted/parted.c:130 msgid "displays the version" msgstr "" -#: parted/parted.c:130 +#: parted/parted.c:131 msgid "alignment for new partitions" msgstr "" -#: parted/parted.c:142 +#: parted/parted.c:143 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:145 +#: parted/parted.c:146 msgid "LABEL-TYPE is one of: " msgstr "" -#: parted/parted.c:146 parted/parted.c:147 +#: parted/parted.c:147 parted/parted.c:148 msgid "FLAG is one of: " msgstr "" -#: parted/parted.c:148 +#: parted/parted.c:149 msgid "UNIT is one of: " msgstr "" -#: parted/parted.c:149 +#: parted/parted.c:150 msgid "desired alignment: minimum or optimal" msgstr "" -#: parted/parted.c:150 +#: parted/parted.c:151 msgid "PART-TYPE is one of: primary, logical, extended\n" msgstr "" -#: parted/parted.c:152 +#: parted/parted.c:153 msgid "FS-TYPE is one of: " msgstr "" -#: parted/parted.c:153 +#: parted/parted.c:154 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:156 +#: parted/parted.c:157 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:159 +#: parted/parted.c:160 msgid "STATE is one of: on, off\n" msgstr "" -#: parted/parted.c:160 +#: parted/parted.c:161 msgid "DEVICE is usually /dev/hda or /dev/sda\n" msgstr "" -#: parted/parted.c:161 +#: parted/parted.c:162 msgid "NAME is any word you want\n" msgstr "" -#: parted/parted.c:164 +#: parted/parted.c:165 msgid "" "Copyright (C) 1998 - 2006 Free Software Foundation, Inc.\n" "This program is free software, covered by the GNU General Public License.\n" @@ -2220,429 +2178,435 @@ msgid "" "\n" msgstr "" -#: parted/parted.c:212 +#: parted/parted.c:213 #, c-format msgid "%0.f%%\t(time left %.2d:%.2d)" msgstr "" -#: parted/parted.c:231 +#: parted/parted.c:232 #, c-format msgid "Partition %s is being used. Are you sure you want to continue?" msgstr "" -#: parted/parted.c:252 +#: parted/parted.c:253 #, c-format msgid "Partition(s) on %s are being used." msgstr "" -#: parted/parted.c:264 +#: parted/parted.c:265 #, 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:525 +#: parted/parted.c:526 msgid "New disk label type?" msgstr "" -#: parted/parted.c:662 +#: parted/parted.c:663 msgid "Partition type?" msgstr "" -#: parted/parted.c:680 parted/parted.c:884 +#: parted/parted.c:681 parted/parted.c:885 msgid "Partition name?" msgstr "" -#: parted/parted.c:690 +#: parted/parted.c:691 msgid "File system type?" msgstr "" -#: parted/parted.c:695 parted/parted.c:1498 +#: parted/parted.c:696 parted/parted.c:1499 msgid "Start?" msgstr "" -#: parted/parted.c:698 parted/parted.c:1500 parted/parted.c:1569 +#: parted/parted.c:699 parted/parted.c:1501 parted/parted.c:1585 msgid "End?" msgstr "" -#: parted/parted.c:766 +#: parted/parted.c:767 #, 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:775 +#: parted/parted.c:776 msgid "" "\n" "Is this still acceptable to you?" msgstr "" -#: parted/parted.c:798 +#: parted/parted.c:799 #, c-format msgid "" "The resulting partition is not properly aligned for best performance: %s" msgstr "" -#: parted/parted.c:800 parted/parted.c:1723 +#: parted/parted.c:801 parted/parted.c:1739 msgid "unknown (malloc failed)" msgstr "" -#: parted/parted.c:876 +#: parted/parted.c:877 #, c-format msgid "%s disk labels do not support partition name." msgstr "" -#: parted/parted.c:881 parted/parted.c:1561 parted/parted.c:1612 -#: parted/parted.c:1706 parted/parted.c:1781 +#: parted/parted.c:882 parted/parted.c:1564 parted/parted.c:1628 +#: parted/parted.c:1722 parted/parted.c:1797 msgid "Partition number?" msgstr "" -#: parted/parted.c:975 +#: parted/parted.c:976 #, c-format msgid "BIOS cylinder,head,sector geometry: %d,%d,%d. Each cylinder is %s.\n" msgstr "" -#: parted/parted.c:1017 +#: parted/parted.c:1018 #, c-format msgid "Model: %s (%s)\n" msgstr "" -#: parted/parted.c:1019 +#: parted/parted.c:1020 #, c-format msgid "Disk %s: %s\n" msgstr "" -#: parted/parted.c:1020 +#: parted/parted.c:1021 #, c-format msgid "Sector size (logical/physical): %lldB/%lldB\n" msgstr "" -#: parted/parted.c:1032 +#: parted/parted.c:1033 #, c-format msgid "Partition Table: %s\n" msgstr "" -#: parted/parted.c:1033 +#: parted/parted.c:1034 #, c-format msgid "Disk Flags: %s\n" msgstr "" -#: parted/parted.c:1153 parted/parted.c:1156 +#: parted/parted.c:1154 parted/parted.c:1157 msgid "Number" msgstr "" -#: parted/parted.c:1153 parted/parted.c:1156 +#: parted/parted.c:1154 parted/parted.c:1157 msgid "Start" msgstr "" -#: parted/parted.c:1154 parted/parted.c:1157 +#: parted/parted.c:1155 parted/parted.c:1158 msgid "End" msgstr "" -#: parted/parted.c:1157 +#: parted/parted.c:1158 msgid "Size" msgstr "" -#: parted/parted.c:1161 +#: parted/parted.c:1162 msgid "Type" msgstr "" -#: parted/parted.c:1163 +#: parted/parted.c:1164 msgid "File system" msgstr "" -#: parted/parted.c:1166 +#: parted/parted.c:1167 msgid "Name" msgstr "" -#: parted/parted.c:1168 +#: parted/parted.c:1169 msgid "Flags" msgstr "" -#: parted/parted.c:1225 +#: parted/parted.c:1226 msgid "Free Space" msgstr "" -#: parted/parted.c:1385 +#: parted/parted.c:1386 #, 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:1428 +#: parted/parted.c:1429 msgid "searching for file systems" msgstr "" -#: parted/parted.c:1535 +#: parted/parted.c:1536 msgid "The resize command has been removed in parted 3.0" msgstr "" -#: parted/parted.c:1583 +#: parted/parted.c:1599 msgid "" "Shrinking a partition can cause data loss, are you sure you want to continue?" msgstr "" -#: parted/parted.c:1636 +#: parted/parted.c:1652 msgid "New device?" msgstr "" -#: parted/parted.c:1704 +#: parted/parted.c:1720 msgid "alignment type(min/opt)" msgstr "" -#: parted/parted.c:1719 +#: parted/parted.c:1735 #, c-format msgid "%d aligned\n" msgstr "" -#: parted/parted.c:1721 +#: parted/parted.c:1737 #, c-format msgid "%d not aligned: %s\n" msgstr "" -#: parted/parted.c:1746 parted/parted.c:1783 +#: parted/parted.c:1762 parted/parted.c:1799 msgid "Flag to Invert?" msgstr "" -#: parted/parted.c:1751 parted/parted.c:1788 +#: parted/parted.c:1767 parted/parted.c:1804 msgid "New state?" msgstr "" -#: parted/parted.c:1834 +#: parted/parted.c:1850 msgid "Unit?" msgstr "" -#: parted/parted.c:1969 +#: parted/parted.c:1985 msgid "align-check" msgstr "" -#: parted/parted.c:1972 +#: parted/parted.c:1988 msgid "" "align-check TYPE N check partition N for TYPE(min|opt) " "alignment" msgstr "" -#: parted/parted.c:1980 +#: parted/parted.c:1996 msgid "help" msgstr "" -#: parted/parted.c:1983 +#: parted/parted.c:1999 msgid "" "help [COMMAND] print general help, or help on " "COMMAND" msgstr "" -#: parted/parted.c:1989 +#: parted/parted.c:2005 msgid "mklabel" msgstr "" -#: parted/parted.c:1989 +#: parted/parted.c:2005 msgid "mktable" msgstr "" -#: parted/parted.c:1992 +#: parted/parted.c:2008 msgid "" "mklabel,mktable LABEL-TYPE create a new disklabel (partition " "table)" msgstr "" -#: parted/parted.c:1998 +#: parted/parted.c:2014 msgid "mkpart" msgstr "" -#: parted/parted.c:2001 +#: parted/parted.c:2017 msgid "mkpart PART-TYPE [FS-TYPE] START END make a partition" msgstr "" -#: parted/parted.c:2007 +#: parted/parted.c:2023 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:2012 +#: parted/parted.c:2028 msgid "name" msgstr "" -#: parted/parted.c:2015 +#: parted/parted.c:2031 msgid "name NUMBER NAME name partition NUMBER as NAME" msgstr "" -#: parted/parted.c:2020 +#: parted/parted.c:2036 msgid "print" msgstr "" -#: parted/parted.c:2023 +#: parted/parted.c:2039 msgid "" "print [devices|free|list,all|NUMBER] display the partition table, " "available devices, free space, all found partitions, or a particular " "partition" msgstr "" -#: parted/parted.c:2028 +#: parted/parted.c:2044 msgid "" "Without arguments, 'print' displays the entire partition table. However with " "the following arguments it performs various other actions.\n" msgstr "" -#: parted/parted.c:2030 +#: parted/parted.c:2046 msgid " devices : display all active block devices\n" msgstr "" -#: parted/parted.c:2031 +#: parted/parted.c:2047 msgid "" " free : display information about free unpartitioned space on the " "current block device\n" msgstr "" -#: parted/parted.c:2033 +#: parted/parted.c:2049 msgid "" " list, all : display the partition tables of all active block devices\n" msgstr "" -#: parted/parted.c:2034 +#: parted/parted.c:2050 msgid "" " NUMBER : display more detailed information about this particular " "partition\n" msgstr "" -#: parted/parted.c:2039 +#: parted/parted.c:2055 msgid "quit" msgstr "" -#: parted/parted.c:2042 +#: parted/parted.c:2058 msgid "quit exit program" msgstr "" -#: parted/parted.c:2047 +#: parted/parted.c:2063 msgid "rescue" msgstr "" -#: parted/parted.c:2050 +#: parted/parted.c:2066 msgid "" "rescue START END rescue a lost partition near START " "and END" msgstr "" -#: parted/parted.c:2056 +#: parted/parted.c:2072 msgid "resize" msgstr "" -#: parted/parted.c:2059 +#: parted/parted.c:2075 msgid "The resize command was removed in parted 3.0\n" msgstr "" -#: parted/parted.c:2062 +#: parted/parted.c:2078 msgid "resizepart" msgstr "" -#: parted/parted.c:2065 +#: parted/parted.c:2081 msgid "resizepart NUMBER END resize partition NUMBER" msgstr "" -#: parted/parted.c:2070 +#: parted/parted.c:2086 msgid "rm" msgstr "" -#: parted/parted.c:2073 +#: parted/parted.c:2089 msgid "rm NUMBER delete partition NUMBER" msgstr "" -#: parted/parted.c:2078 +#: parted/parted.c:2094 msgid "select" msgstr "" -#: parted/parted.c:2081 +#: parted/parted.c:2097 msgid "select DEVICE choose the device to edit" msgstr "" -#: parted/parted.c:2086 +#: parted/parted.c:2102 msgid "disk_set" msgstr "" -#: parted/parted.c:2089 +#: parted/parted.c:2105 msgid "" "disk_set FLAG STATE change the FLAG on selected device" msgstr "" -#: parted/parted.c:2094 +#: parted/parted.c:2110 msgid "disk_toggle" msgstr "" -#: parted/parted.c:2097 +#: parted/parted.c:2113 msgid "" "disk_toggle [FLAG] toggle the state of FLAG on " "selected device" msgstr "" -#: parted/parted.c:2103 +#: parted/parted.c:2119 msgid "set" msgstr "" -#: parted/parted.c:2106 +#: parted/parted.c:2122 msgid "" "set NUMBER FLAG STATE change the FLAG on partition NUMBER" msgstr "" -#: parted/parted.c:2112 +#: parted/parted.c:2128 msgid "toggle" msgstr "" -#: parted/parted.c:2115 +#: parted/parted.c:2131 msgid "" "toggle [NUMBER [FLAG]] toggle the state of FLAG on " "partition NUMBER" msgstr "" -#: parted/parted.c:2121 +#: parted/parted.c:2137 msgid "unit" msgstr "" -#: parted/parted.c:2124 +#: parted/parted.c:2140 msgid "unit UNIT set the default unit to UNIT" msgstr "" -#: parted/parted.c:2129 +#: parted/parted.c:2145 msgid "version" msgstr "" -#: parted/parted.c:2132 +#: parted/parted.c:2148 msgid "" "version display the version number and " "copyright information of GNU Parted" msgstr "" -#: parted/parted.c:2136 +#: parted/parted.c:2152 msgid "" "'version' displays copyright and version information corresponding to this " "copy of GNU Parted\n" msgstr "" -#: parted/parted.c:2204 +#: parted/parted.c:2220 #, c-format msgid "Usage: %s [-hlmsv] [-a] [DEVICE [COMMAND [PARAMETERS]]...]\n" msgstr "" -#: parted/parted.c:2248 +#: parted/parted.c:2264 msgid "No device found" msgstr "" -#: parted/parted.c:2285 +#: parted/parted.c:2301 msgid "WARNING: You are not superuser. Watch out for permissions.\n" msgstr "" -#: parted/parted.c:2325 +#: parted/parted.c:2334 +msgid "" +"You should reinstall your boot loader before rebooting. Read section 4 of " +"the Parted User documentation for more information." +msgstr "" + +#: parted/parted.c:2341 msgid "You may need to update /etc/fstab.\n" msgstr "" -#: parted/ui.c:164 +#: parted/ui.c:165 msgid "Welcome to GNU Parted! Type 'help' to view a list of commands.\n" msgstr "" -#: parted/ui.c:167 +#: parted/ui.c:168 msgid "" "Usage: parted [OPTION]... [DEVICE [COMMAND [PARAMETERS]...]...]\n" "Apply COMMANDs with PARAMETERS to DEVICE. If no COMMAND(s) are given, run " @@ -2650,7 +2614,7 @@ msgid "" "interactive mode.\n" msgstr "" -#: parted/ui.c:172 +#: parted/ui.c:173 #, c-format msgid "" "\n" @@ -2684,212 +2648,212 @@ msgid "" "consider important.\n" msgstr "" -#: parted/ui.c:293 +#: parted/ui.c:294 msgid "" "\n" "Command History:\n" msgstr "" -#: parted/ui.c:356 +#: parted/ui.c:357 msgid "" "\n" "Error: SEGV_MAPERR (Address not mapped to object)\n" msgstr "" -#: parted/ui.c:362 +#: parted/ui.c:363 msgid "" "\n" "Error: SEGV_ACCERR (Invalid permissions for mapped object)\n" msgstr "" -#: parted/ui.c:367 +#: parted/ui.c:368 msgid "" "\n" "Error: A general SIGSEGV signal was encountered.\n" msgstr "" -#: parted/ui.c:391 +#: parted/ui.c:392 msgid "" "\n" "Error: FPE_INTDIV (Integer: divide by zero)" msgstr "" -#: parted/ui.c:396 +#: parted/ui.c:397 msgid "" "\n" "Error: FPE_INTOVF (Integer: overflow)" msgstr "" -#: parted/ui.c:401 +#: parted/ui.c:402 msgid "" "\n" "Error: FPE_FLTDIV (Float: divide by zero)" msgstr "" -#: parted/ui.c:406 +#: parted/ui.c:407 msgid "" "\n" "Error: FPE_FLTOVF (Float: overflow)" msgstr "" -#: parted/ui.c:411 +#: parted/ui.c:412 msgid "" "\n" "Error: FPE_FLTUND (Float: underflow)" msgstr "" -#: parted/ui.c:416 +#: parted/ui.c:417 msgid "" "\n" "Error: FPE_FLTRES (Float: inexact result)" msgstr "" -#: parted/ui.c:421 +#: parted/ui.c:422 msgid "" "\n" "Error: FPE_FLTINV (Float: invalid operation)" msgstr "" -#: parted/ui.c:426 +#: parted/ui.c:427 msgid "" "\n" "Error: FPE_FLTSUB (Float: subscript out of range)" msgstr "" -#: parted/ui.c:431 +#: parted/ui.c:432 msgid "" "\n" "Error: A general SIGFPE signal was encountered." msgstr "" -#: parted/ui.c:455 +#: parted/ui.c:456 msgid "" "\n" "Error: ILL_ILLOPC (Illegal Opcode)" msgstr "" -#: parted/ui.c:460 +#: parted/ui.c:461 msgid "" "\n" "Error: ILL_ILLOPN (Illegal Operand)" msgstr "" -#: parted/ui.c:465 +#: parted/ui.c:466 msgid "" "\n" "Error: ILL_ILLADR (Illegal addressing mode)" msgstr "" -#: parted/ui.c:470 +#: parted/ui.c:471 msgid "" "\n" "Error: ILL_ILLTRP (Illegal Trap)" msgstr "" -#: parted/ui.c:475 +#: parted/ui.c:476 msgid "" "\n" "Error: ILL_PRVOPC (Privileged Opcode)" msgstr "" -#: parted/ui.c:480 +#: parted/ui.c:481 msgid "" "\n" "Error: ILL_PRVREG (Privileged Register)" msgstr "" -#: parted/ui.c:485 +#: parted/ui.c:486 msgid "" "\n" "Error: ILL_COPROC (Coprocessor Error)" msgstr "" -#: parted/ui.c:490 +#: parted/ui.c:491 msgid "" "\n" "Error: ILL_BADSTK (Internal Stack Error)" msgstr "" -#: parted/ui.c:495 +#: parted/ui.c:496 msgid "" "\n" "Error: A general SIGILL signal was encountered." msgstr "" -#: parted/ui.c:888 +#: parted/ui.c:889 #, c-format msgid "invalid token: %s" msgstr "" -#: parted/ui.c:1069 +#: parted/ui.c:1070 msgid "Expecting a partition number." msgstr "" -#: parted/ui.c:1078 +#: parted/ui.c:1079 msgid "Partition doesn't exist." msgstr "" -#: parted/ui.c:1098 +#: parted/ui.c:1099 msgid "Expecting a file system type." msgstr "" -#: parted/ui.c:1105 +#: parted/ui.c:1106 #, c-format msgid "Unknown file system type \"%s\"." msgstr "" -#: parted/ui.c:1126 +#: parted/ui.c:1127 msgid "Expecting a disk label type." msgstr "" -#: parted/ui.c:1157 parted/ui.c:1193 +#: parted/ui.c:1158 parted/ui.c:1194 msgid "No flags supported" msgstr "" -#: parted/ui.c:1267 +#: parted/ui.c:1268 msgid "Can't create any more partitions." msgstr "" -#: parted/ui.c:1277 +#: parted/ui.c:1278 msgid "Expecting a partition type." msgstr "" -#: parted/ui.c:1426 +#: parted/ui.c:1427 msgid "on" msgstr "" -#: parted/ui.c:1427 +#: parted/ui.c:1428 msgid "off" msgstr "" -#: parted/ui.c:1444 +#: parted/ui.c:1445 msgid "optimal" msgstr "" -#: parted/ui.c:1445 +#: parted/ui.c:1446 msgid "minimal" msgstr "" -#: parted/ui.c:1578 +#: parted/ui.c:1579 msgid "OPTIONs:" msgstr "" -#: parted/ui.c:1583 +#: parted/ui.c:1584 msgid "COMMANDs:" msgstr "" -#: parted/ui.c:1586 +#: parted/ui.c:1587 #, c-format msgid "" "\n" "Report bugs to %s\n" msgstr "" -#: parted/ui.c:1593 +#: parted/ui.c:1594 #, c-format msgid "Using %s\n" msgstr "" -#: parted/ui.c:1673 +#: parted/ui.c:1674 msgid "This command does not make sense in non-interactive mode.\n" msgstr "" diff --git a/po/pl.gmo b/po/pl.gmo index 655777568335193f4e7ea119364fd4bb3a4f48b7..ce6307f989006cbb02e47e888f29a7a4d2ded8bd 100644 GIT binary patch delta 17564 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 G{``OZIzuP` delta 13489 zcma*t2Y6If+Q9KUsRRfFLN~yL5JF1`9YP5$bV5f!DU)PECT(J7hL|7@Ql+B<(iK4v z5D^@K6+uy&D1su2f+C6(6$I&s%J+ZgoG82deb4jVXW#tJIk%jC@36bG-wAqgX^`hk z#h}FoN5ufch{DYghH-#&hdNSf7z3LaM*Bd+7=#tc&ueNJ3AkGO88#;$Kw%?ng>g6z z>*0J|?nAlm48~xEW`@BdJw_W6^(jclhB!y(x2p?`Z!ntjFz%KI#-X%rFv@){Y=A4U z1MbHbXyK1s*9s%?QLKX5NE?hPIFR}c9|<~P1hq7b(by7u;`1mKoI-h!rIi|?Xe>j% zGlpP4ER933F^yuAjXc}PN9o8LSO<@wtf^m7 zMyNHdrfB09%r;Q}K*&8RJjL;z* zg{RPAVHYH;=dSCaw&{l`9rfHGF`PsNnl}hDkp*w;LKdoV6{W>73{x#k(dKIBYF|TH z10SLE`~ud-Kw2e>G8*N*&>!VF6Oj?{7|TgW4^E=oP`Qt?m3ElctzC>#!FH4$9LFkn z4P!C1uWCqBWIY>wwbSqy@_VobZe+g7%KqO^qC5qkVQKsx%i(2Qi1#rN=l16vfeSGh z7o#*_1%8EZV|{!+MJ?L5u>tv`$gCQ7upTB3P#qYHHL2ftN)osnWeER;>=5GwK91#C zvNA$Bn1q{97TM1jfeo2A*`|po4M;(0pc~8JMD0x6LEejUf1kmOe z97Ab9CFZX>HpXh0j8gF!ozL@-kU5;GPb@{LXag?7eJG1=#AwyS(O8MR9c8GW#sHj! z($Kjm6}*V0a0^O@cA|{HmnaRoj&0FXc8pql$+(7sG?XC@8LJ)~j`E-gY>d^hDJE;( zD08_E6YwpR2AoG}=q*gb(&G$cDE7g4d=Uqcz;eON{I{}~c8*SAnsagB6d$7rGq z)gEkuC$T>U+0>K_#x~?1McG9QP)2AM2IB>kk-Utdcmt&Y_fd9JWCqWpe&cZxop2L& z$Dfb|ZN!gP|IhJ}t zHDE2uNX8VXH8;3`@vlumJ_Q@NaUt#?-_E7Jir2Kw+^VMq*o^ZBFb?k^gJHx_yL4n8 za*MGCWonuist#pgd-A6-8LQGd8JW>fGX63Y%PC02?~&0rqKecDXDZ6je~nRi3oBy9 zV)d$xL0R?vP#QJ~pT#$HzU@Ty`Od;1%2#0ouE7TA^XSAkSf7I6r&JG`pyXdhx$r}j z9{z@1u+AjakTk49egd|@c^HiEV<;Zd=Z|46@)z(C41QYeE>9g26)0$}?S*B@k3xCi zcc~KBEc<^l ziCDP-qwxgR#=9s(Rc)Gjv9!c$t*{VTdC_M;AnfvM(iplzXf0XSt z2uoqAKA)|1;vmW=qBQ7}*^GZX5-0Qp<>sgxtDro%HcA6xu?IFmnR6$~2ram{5Aw$y$<-}x6#_1>{@-b%P z=U4`lo>PmkFG>URP#QK1Ycm&Xa5pXbz^mVIOVnCfq}_{gTz?t+%KophRJA+?rFzc}yor+F(oaX($a?iv48& zA0#1*Fmk2Zzx|QvHtgElC>2j#rM`lPFo}GP7uAo?Q7HTQ5K0A6FR5?GAe8O>B$mVF zC{wo)WlFcAr!|RpNQl=_THJ88T4Y1DvoV(Pz1RUSX=7ei-}6-LMEL@2i$}2)hOSYc z;f`82CQ|-7%1B*W!}v=gYOQMNK$M0Qpgd?J%2fP-@-A=mit1Sxls8@`R>Jw1f@{&l z>sTKn*QpLAVmYvq3u?-i_ z##)qrutEQG9IKH}+NgfvjKB)yC!nl}XR#0NLKA~Mo77^ekJ95*lnYj1BfNkvtniv) z6yprcK+9(Jz)XxKzg*`(KpBafXkxe5`9}+;V+h{I(ipHsb<7h^BAJ2=lp)%T_3<<8 zig!^eX#a-V1!>rY{05ZsKVwsj+p2caXzWgY6Ncec?2Y%ZKX%)u{wtX0kVWe;ejp)V zu{LiSMiKVGWen|plx;QUEwzYdqU7I0J6^&x9K2mE${pB|{0(f0&333aT!wa`c9-@? zjFtUgZl_wstuclh)36QB(!P%}758u`*87)wVHKe?=$Q7dw$9tCypPt2GNLQ7G48|4 zcomyczY)Ak4Sg$=AswY%g=H9tvnUO?{Eqr*R&}@f%GE=8Beudw?1Bq$7|L9q$56bi z^EWY`{Cy1KxsCQP{;eoz%2GGchB5*(a1d_BX#7iC_dV6n9$1_5Y^;fMum^6$BD|*a zS$owFk8LPx;!kXjUEf!W-u*t~FD=?eK{-5&5qMSSjSu*Ak}r=bcnaHK!+rehLMux7 zK9ogValbl00;R%*SP8#C8Ihl{D*lGS7LP#rYucq59N*Y3D&@$ zP+A)Fu{s}xvS?ak2keJQI1B6JVQhleQ0}XFL`_XAY({tNlZ>c?nzlp(ZY3{F5#nN~Y1MxaC zk{;tW3F&dzr)mwP+mNbV>C{~PPhRZ;YDN%8x=oO6&}U_^2aa)kE4vx*BFP@ zkE?G>Pb^3NX&fp0e;$bn6kNnAcn^nR#OLe?%s?5LBPb6FIiZHMB@UGHD7$DU$`oBe zc~0OLYP;3I^5lDKM`CmGb_}O}V)l{#OHkCESup;+o`wKyZNEBWE*8AM_ki7@;HWsYv4452J-sW=qnL9sX% zr(%CRr^}n2<{u^G=bWGYg;L?O=)$|0i@86j|DoYD4k4d)PWdj@CSUPKHG<7CpM2_% z9==Exeq2&eNI}&L3>PlIY1rYSTJ`UvEXs>0J&U+RgIH~Ckc}@Kwxs1}|GAyh}Y>e$O38kKiDEE7|l9)r{0=B?{>*|8_DEss@w#M&JT3qFZ znxYhx5t)hea4XiqPB+zvjl+2IGjIZK$7|&BUA4&a!AOcTaTr18&=0%SQk%V z6yDM0m2RtT7O(A&TAsZ$Ugt!xFI-4%N=a8szt)RCF3U<6SI^?S5DPdhUTTVyiI)52J_rjcWJR z3uq};B);bP#Wip| z`4secN$eo83;X<~UZueg)C;2wvN?=Mtb~=ZHa5aX^3B+Q z((|Jz&$)w5v8-Y7_*>Y4YJw;ji*jQ+%3L~7=JqX=U9cZz?jkG}|I~CrSyUrYdRTzc z^9h)RQ&2|m3QC1h0qXvK+DQQ(i~no2g#!6%y@i8t7lvTjK-Hi~lr>Tdqp=6ZVHQdQ zmSQ>FhSHI}C=EJ*(xAiG8NWbT0nCFg5OK`W&4-K{Wcgtfa_dSO)QZFDQ>M_=lkQ+b2;dnw{(72Rp zX(D!@JQ<}&Q&6UA54OO4C=b4aG8KQI^t5uA#lMT{pp4{jl;?~=xqk(AlKuZO3E8J- zQC9U8lvNv6+T#Dc-xTEm(@=Um7n5-@%7~rD_IMtpBX#)Ao`wxD9Ot4`yc}h_oOD7s{yab{1tfV|zU-J&>Go%+_dptsnBt9kP6Q2={ITxxc&mg~tkXOEE9e>JlViyH1 zh?9gINyN`OUD;ov{=BElu959d93}q~K8ru&a9pXcnNNN{A;;^)Aj&5aANWfsv-tb3 ze!Iy_q$9DK3&s$#C7;5X#4q}W{iNl1ftW?SN74Z`3KL~j-l^pMp2xo-l zS5iIV9nMd}RFwa<#D9e7xp|u03{I3I0McuyLDMI`Rb&3XZe2#-@!6G z>vP;qJWj0Od^=(S>9zPBQHS&?q5^6E@sxIhcUz-K&q8v+#4(~TA@9FtTpqxqfkxn5> z`J30AR2R9A!$%YnUdkTDf%qelLAvC~CZ9^C2g-3?VOVH>2g>RZrzm?tpMQe%OT-BB zvxrxSUx{*Dze+w+@*R-ldkWk^c)93L;E|^eq5soM7>--;> z!!>UbrHSfe}?!S?d!Hi=0-*ozVDYB7nOpMiK-^l)a`=JXik#0rVbi9r45o>0If+gJi8|kKa89&zLPVEZH zkLe1WcuuDyIloU|BfL-fG&v`8$?*i~1mXzkWw=Jp`43gU@t4lt#J&1tG1k`QO>|i! zY)IJw;!ole@*QxFKEImuD&h*UUY9+lEvs$Gxhcd!@yk7UlRrsxk`o+TOU{w*>Mv1$J_L`+pUuQnVlEe+Anp@c z#^5LYL;v2+9q8s^*L4Q=}Yuh$~zJu*k zEHz@BrnO+aJJ*)yGGk+$v8K!6Fmoufc`I~m;Qh8^qOVP-_%PpJJ;OqLF)2BLzK;gg z3iKrm`y|L)Z`3&7yQ97e@dl<=_Z>=YV)2Hj_bzRlU{AA|84h=zcYS(u-&os)VDEtJ z7QPp1DU-AuE(oi@|y$hDdI1&;9r)?6peH=Qm=zFFuf$mU{S zKlh*@@5JJMIce6sJcr9nwV4IBxB{Cs{okKm?HP71%eNM|>@K?_&&hK}avzyRz@4y8$D`gZoa=Bkd;O~>(Neg;=eZ`eMc_uUQUxQ>eh;d4D9-0Mt zKreSex|yBlD0G?(sK`3xBOOndsgz-IX8Na24-6*@n9SUKcU_mQ zpk&0;9eTLclMC&1JH{FByHcEJd2><^i!aLK4Dg0cspx(1OsenPlyX77h?(sJd>OM2 z2KtibueW$REF9-uw=l_fbK%8+iZRarT;$&4-g;3^cSeT&Nz*PJ|IZ72SG<=(yjPar z3~CnNF2Q?#MU#F*e4lP?8{|FqdKq8xmYJ5ifA2(pi~QR$ z%jR^M#i>OuGu?e)caitwH)6eOws!K}-}*{v->}`iLVbt!br13-f9MS?o1SAeZLXqh zyUk_wbvhCk;$3@ujJM8-M|{@LQ$xKyPj~S3`sR6y_pfhL%eV`Q_fJnRw&mHa-d$&U z_||{7HpDyV!a!f##l4}`2BbQRtp#R*qqxAGmgy)gGV|;;?z+UH}>=uKYazt8C^XU*F`-ApgGTMta(YH#?B!M-v# z;)1+g?^gE4-|gT@(GShDn)wbEt5o7hPb)5Rak=TTrsmkwco;jmC@sq#Z>CstY>e?g z7rXtv&$V-Pwk%Rvqta%!za#y?l>O7w{O!+`F0;Y29XW+G)+}aE7iHM%WYdehA~ybi zSK+c|)7d4(yN?!S zJMyT4mqFn^pR|SvIk4MVEG?rm9tK2BA=k(pvjdSbC8&+ubz(z?32vFE*>ook#t)EYt2EBzqor<;W0FwVpb+$yBAgvluxw|2(;} z!z?!akNW2s;~h(mm$%d}`}b`3^k3Q<*~3!5X!u`{%AW*KTEHXZq*ZmTCG2gD#teG_KH^&XVWd_WxQsYN8AM z^T9N;X!cJpSu>7&TY)t#YyUFU$avqTyCW^W4}VXy`2P6gc);SimKS!mwph*w?d%w0 z`8;4}t1!#iz@6R7St0_KY>BWqmo%zi8MSj!1xuH}aQf)TXGQxz=u380vc$xtvRaqX iA(@$?0!E!>TJpAWs~6xux9mJq$uc{1$-F4bpZ^2IZdtYf diff --git a/po/pl.po b/po/pl.po index 7e50dfe..a2ea90a 100644 --- a/po/pl.po +++ b/po/pl.po @@ -1,15 +1,15 @@ # Polish translations for GNU Parted package. -# Copyright (C) 2003, 2005, 2006, 2007, 2009, 2010, 2011, 2012, 2014 Free Software Foundation, Inc. +# Copyright (C) 2003, 2005, 2006, 2007, 2009, 2010, 2011, 2012, 2014, 2021 Free Software Foundation, Inc. # This file is distributed under the same license as the parted package. # Wojciech Polak , 2003, 2005, 2006. -# Jakub Bogusz , 2006-2012. +# Jakub Bogusz , 2006-2021. # msgid "" msgstr "" -"Project-Id-Version: parted 3.1.90\n" +"Project-Id-Version: parted 3.3.52\n" "Report-Msgid-Bugs-To: bug-parted@gnu.org\n" -"POT-Creation-Date: 2019-10-10 16:35-0700\n" -"PO-Revision-Date: 2014-07-03 21:29+0200\n" +"POT-Creation-Date: 2021-01-27 16:00-0800\n" +"PO-Revision-Date: 2021-01-20 20:40+0100\n" "Last-Translator: Jakub Bogusz \n" "Language-Team: Polish \n" "Language: pl\n" @@ -43,29 +43,29 @@ msgid "Unknown system error" msgstr "Nieznany błąd systemowy" #: lib/getopt.c:278 -#, fuzzy, c-format +#, c-format msgid "%s: option '%s%s' is ambiguous\n" -msgstr "%s: opcja '-W %s' jest niejednoznaczna\n" +msgstr "%s: opcja '%s%s' jest niejednoznaczna\n" #: lib/getopt.c:284 -#, fuzzy, c-format +#, c-format msgid "%s: option '%s%s' is ambiguous; possibilities:" -msgstr "%s: opcja '%s' jest niejednoznaczna; możliwości:" +msgstr "%s: opcja '%s%s' jest niejednoznaczna; możliwości:" #: lib/getopt.c:319 -#, fuzzy, c-format +#, c-format msgid "%s: unrecognized option '%s%s'\n" -msgstr "%s: nieznana opcja '%c%s'\n" +msgstr "%s: nieznana opcja '%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: opcja '%c%s' nie może mieć argumentów\n" +msgstr "%s: opcja '%s%s' nie może mieć argumentów\n" #: lib/getopt.c:360 -#, fuzzy, c-format +#, c-format msgid "%s: option '%s%s' requires an argument\n" -msgstr "%s: opcja '--%s' musi mieć argument\n" +msgstr "%s: opcja '%s%s' musi mieć argument\n" #: lib/getopt.c:621 #, c-format @@ -98,11 +98,11 @@ msgstr "%s: opcja musi mieć argument -- '%c'\n" #. If you don't know what to put here, please see #. #. and use glyphs suitable for your language. -#: lib/quotearg.c:362 +#: lib/quotearg.c:355 msgid "`" msgstr "`" -#: lib/quotearg.c:363 +#: lib/quotearg.c:356 msgid "'" msgstr "'" @@ -135,9 +135,8 @@ msgid "Invalid back reference" msgstr "Błędne odniesienie wstecz" #: lib/regcomp.c:156 -#, fuzzy msgid "Unmatched [, [^, [:, [., or [=" -msgstr "Niesparowane [ lub [^" +msgstr "Niesparowane [, [^, [:, [. lub [=" #: lib/regcomp.c:159 msgid "Unmatched ( or \\(" @@ -218,18 +217,16 @@ msgstr "(C)" #. 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" "Licencja GPLv3+: GNU GPL w wersji 3 lub późniejszej:\n" -"\n" +"<%s>\n" "Ten program jest wolnodostępny: można go modyfikować i rozprowadzać.\n" "NIE MA Å»ADNEJ GWARANCJI w zakresie dopuszczalnym przez prawo.\n" -"\n" #. TRANSLATORS: %s denotes an author name. #: lib/version-etc.c:105 @@ -344,10 +341,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" "Prosimy zgłaszać błędy na adres <%s>.\n" "Błędy w tłumaczeniu prosimy zgłaszać na adres: .\n" @@ -363,42 +359,25 @@ msgid "%s home page: <%s>\n" msgstr "Strona domowa projektu %s: <%s>\n" #: lib/version-etc.c:260 -#, fuzzy, c-format +#, c-format msgid "General help using GNU software: <%s>\n" -msgstr "" -"Ogólna pomoc przy używaniu oprogramowania GNU: .\n" +msgstr "Ogólna pomoc przy używaniu oprogramowania GNU: <%s>.\n" #: lib/xalloc-die.c:34 msgid "memory exhausted" msgstr "pamięć wyczerpana" -#: lib/xstrtol-error.c:63 -#, c-format -msgid "invalid %s%s argument '%s'" -msgstr "nieprawidłowy argument %s%s opcji '%s'" - -#: lib/xstrtol-error.c:68 -#, c-format -msgid "invalid suffix in %s%s argument '%s'" -msgstr "błędny przyrostek argumentu %s%s opcji '%s'" - -#: lib/xstrtol-error.c:72 -#, c-format -msgid "%s%s argument '%s' too large" -msgstr "argument %s%s '%s' jest zbyt duży" - -#: libparted/arch/beos.c:245 +#: libparted/arch/beos.c:246 msgid "Disk Image" msgstr "Obraz dysku" -#: libparted/arch/beos.c:346 libparted/arch/gnu.c:277 +#: libparted/arch/beos.c:347 libparted/arch/gnu.c:277 #: libparted/arch/linux.c:1731 #, c-format msgid "Error opening %s: %s" msgstr "Błąd podczas otwierania %s: %s" -#: libparted/arch/beos.c:357 libparted/arch/gnu.c:287 +#: libparted/arch/beos.c:358 libparted/arch/gnu.c:287 #: libparted/arch/linux.c:1742 #, c-format msgid "Unable to open %s read-write (%s). %s has been opened read-only." @@ -406,47 +385,47 @@ msgstr "" "Nie można otworzyć %s jednocześnie w trybie do odczytu i zapisu (%s). %s " "został otwarty tylko w trybie do odczytu." -#: libparted/arch/beos.c:419 libparted/arch/linux.c:1907 +#: libparted/arch/beos.c:420 libparted/arch/linux.c:1907 #, c-format msgid "%s during seek for read on %s" msgstr "%s podczas ustawiania do odczytu na %s" -#: libparted/arch/beos.c:452 libparted/arch/gnu.c:465 libparted/arch/gnu.c:564 -#: libparted/arch/gnu.c:692 libparted/arch/linux.c:1867 +#: libparted/arch/beos.c:453 libparted/arch/gnu.c:425 libparted/arch/gnu.c:524 +#: libparted/arch/gnu.c:652 libparted/arch/linux.c:1867 #: libparted/arch/linux.c:1949 #, c-format msgid "%s during read on %s" msgstr "%s podczas czytania %s" -#: libparted/arch/beos.c:488 libparted/arch/gnu.c:525 +#: libparted/arch/beos.c:489 libparted/arch/gnu.c:485 #: libparted/arch/linux.c:2026 #, c-format msgid "Can't write to %s, because it is opened read-only." msgstr "Nie można zapisać do %s, ponieważ otwarte jest tylko do czytania." -#: libparted/arch/beos.c:504 libparted/arch/linux.c:2051 +#: libparted/arch/beos.c:505 libparted/arch/linux.c:2051 #, c-format msgid "%s during seek for write on %s" msgstr "%s podczas ustawiania do zapisu na %s" -#: libparted/arch/beos.c:541 libparted/arch/gnu.c:601 libparted/arch/gnu.c:646 -#: libparted/arch/gnu.c:723 libparted/arch/linux.c:1999 +#: libparted/arch/beos.c:542 libparted/arch/gnu.c:561 libparted/arch/gnu.c:606 +#: libparted/arch/gnu.c:683 libparted/arch/linux.c:1999 #: libparted/arch/linux.c:2094 libparted/arch/linux.c:2167 #, c-format msgid "%s during write on %s" msgstr "%s podczas zapisu %s" -#: partprobe/partprobe.c:148 +#: partprobe/partprobe.c:149 #, c-format msgid "Try `%s --help' for more information.\n" msgstr "Polecenie `%s --help' pozwoli uzyskać więcej informacji.\n" -#: partprobe/partprobe.c:152 +#: partprobe/partprobe.c:153 #, c-format msgid "Usage: %s [OPTION] [DEVICE]...\n" msgstr "Składnia: %s [OPCJA] [URZĄDZENIE]...\n" -#: partprobe/partprobe.c:153 +#: partprobe/partprobe.c:154 msgid "" "Inform the operating system about partition table changes.\n" "\n" @@ -462,7 +441,7 @@ msgstr "" " -h, --help wyświetlenie tego opisu i zakończenie\n" " -v, --version wyświetlenie informacji o wersji i zakończenie\n" -#: partprobe/partprobe.c:161 +#: partprobe/partprobe.c:162 msgid "" "\n" "When no DEVICE is given, probe all partitions.\n" @@ -470,7 +449,7 @@ msgstr "" "\n" "Jeśli nie podano URZĄDZENIA, sprawdzane są wszystkie partycje.\n" -#: partprobe/partprobe.c:165 +#: partprobe/partprobe.c:166 #, c-format msgid "" "\n" @@ -490,45 +469,7 @@ msgstr "Nie można otworzyć %s." msgid "Unable to probe store." msgstr "Detekcja geometrii nie powiodła się." -#: libparted/arch/gnu.c:368 -msgid "" -"The partition table cannot be re-read. This means you need to reboot before " -"mounting any modified partitions. You also need to reinstall your boot " -"loader before you reboot (which may require mounting modified partitions). " -"It is impossible do both things! So you'll need to boot off a rescue disk, " -"and reinstall your boot loader from the rescue disk. Read section 4 of the " -"Parted User documentation for more information." -msgstr "" -"Nie można ponownie odczytać tablicy partycji. Należy ponownie uruchomić " -"komputer przed podłączeniem jakichkolwiek zmodyfikowanych partycji. Należy " -"także przeinstalować program ładujący (boot loader) zanim uruchomisz " -"ponownie komputer (co może wymagać podłączenia zmodyfikowanych partycji). " -"Wykonanie dwóch powyższych rzeczy jest niemożliwe! A więc pozostaje Ci " -"uruchomienie dysku/płyty ratunkowej i przeinstalowanie programu ładującego " -"prosto z dysku ratunkowego. Przeczytaj rozdział 4 dokumentacji programu GNU " -"Parted, aby uzyskać więcej informacji na ten temat." - -#: libparted/arch/gnu.c:385 -#, 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 computer " -"before doing anything with %s." -msgstr "" -"Nie można ponownie wczytać tablicy partycji na %s (%s). Oznacza to, że Hurd " -"nie wie o żadnych zmianach jakie zostały wprowadzone. Należy ponownie " -"uruchomić komputer zanim wykonasz jakąkolwiek operację na %s." - -#: libparted/arch/gnu.c:396 parted/parted.c:2318 -msgid "" -"You should reinstall your boot loader before rebooting. Read section 4 of " -"the Parted User documentation for more information." -msgstr "" -"Należy przeinstalować program ładujący (boot loader) przed ponownym " -"uruchomieniem komputera. Przeczytaj rozdział 4 dokumentacji użytkownika " -"Parted, aby uzyskać więcej informacji." - -#: libparted/arch/gnu.c:788 +#: libparted/arch/gnu.c:748 #, c-format msgid "%s trying to sync %s to disk" msgstr "Błąd synchronizacji %s do dysku %s" @@ -618,9 +559,8 @@ msgid "Generic SD/MMC Storage Card" msgstr "Karta pamięci SD/MMC" #: libparted/arch/linux.c:1422 -#, fuzzy msgid "NVMe Device" -msgstr "Nowe urządzenie?" +msgstr "Urządzenie NVMe" #: libparted/arch/linux.c:1483 msgid "DAC960 RAID controller" @@ -648,7 +588,7 @@ msgstr "Compaq Smart Array" #: libparted/arch/linux.c:1520 msgid "NVDIMM Device" -msgstr "" +msgstr "Urządzenie NVDIMM" #: libparted/arch/linux.c:1525 msgid "ATARAID Controller" @@ -689,7 +629,7 @@ msgstr "Linuksowa programowa macierz RAID" #: libparted/arch/linux.c:1588 msgid "RAM Drive" -msgstr "" +msgstr "Ramdysk" #: libparted/arch/linux.c:1595 msgid "ped_device_new() Unsupported device type" @@ -847,15 +787,15 @@ msgstr "metadane" msgid "free" msgstr "wolna" -#: libparted/disk.c:2355 parted/ui.c:1258 parted/ui.c:1286 +#: libparted/disk.c:2355 parted/ui.c:1259 parted/ui.c:1287 msgid "extended" msgstr "rozszerzona" -#: libparted/disk.c:2357 parted/ui.c:1262 parted/ui.c:1290 +#: libparted/disk.c:2357 parted/ui.c:1263 parted/ui.c:1291 msgid "logical" msgstr "logiczna" -#: libparted/disk.c:2359 parted/ui.c:1254 parted/ui.c:1282 +#: libparted/disk.c:2359 parted/ui.c:1255 parted/ui.c:1283 msgid "primary" msgstr "główna" @@ -931,64 +871,72 @@ msgstr "irst" msgid "esp" msgstr "esp" -#: libparted/disk.c:2415 +#: libparted/disk.c:2411 +msgid "chromeos_kernel" +msgstr "chromeos_kernel" + +#: libparted/disk.c:2413 +msgid "bls_boot" +msgstr "bls_boot" + +#: libparted/disk.c:2419 #, c-format msgid "Unknown partition flag, %d." msgstr "Nieznana flaga partycji: %d." -#: libparted/exception.c:78 +#: libparted/exception.c:79 msgid "Information" msgstr "Informacja" -#: libparted/exception.c:79 +#: libparted/exception.c:80 msgid "Warning" msgstr "Ostrzeżenie" -#: libparted/exception.c:80 +#: libparted/exception.c:81 msgid "Error" msgstr "Błąd" -#: libparted/exception.c:81 +#: libparted/exception.c:82 msgid "Fatal" msgstr "Fatalny błąd" -#: libparted/exception.c:82 +#: libparted/exception.c:83 msgid "Bug" msgstr "Błąd" -#: libparted/exception.c:83 +#: libparted/exception.c:84 msgid "No Implementation" msgstr "Brak implementacji" -#: libparted/exception.c:87 +#: libparted/exception.c:88 msgid "Fix" msgstr "Popraw" -#: libparted/exception.c:88 +#: libparted/exception.c:89 msgid "Yes" msgstr "Tak" -#: libparted/exception.c:89 +#: libparted/exception.c:90 msgid "No" msgstr "Nie" -#: libparted/exception.c:90 +#: libparted/exception.c:91 msgid "OK" msgstr "OK" -#: libparted/exception.c:91 +#: libparted/exception.c:92 msgid "Retry" msgstr "Powtórz" -#: libparted/exception.c:92 +#: libparted/exception.c:93 msgid "Ignore" msgstr "Zignoruj" -#: libparted/exception.c:93 +#: libparted/exception.c:94 msgid "Cancel" msgstr "Poniechaj" -#: libparted/exception.c:133 +#: libparted/exception.c:134 #, c-format msgid "" "A bug has been detected in GNU Parted. Refer to the web site of parted " @@ -1001,31 +949,31 @@ msgstr "" "zgłaszania błędów. Proszę wysłać raport na temat błędu na adres %s, " "dołączając przynajmniej numer wersji (%s) oraz następujący komunikat: " -#: libparted/labels/aix.c:91 +#: libparted/labels/aix.c:92 msgid "Support for reading AIX disk labels is is not implemented yet." msgstr "" "Obsługa odczytu etykiet dyskowych AIX jeszcze nie została zaimplementowana." -#: libparted/labels/aix.c:102 +#: libparted/labels/aix.c:103 msgid "Support for writing AIX disk labels is is not implemented yet." msgstr "" "Obsługa zapisu etykiet dyskowych AIX jeszcze nie została zaimplementowana." -#: libparted/labels/aix.c:115 +#: libparted/labels/aix.c:116 msgid "" "Support for adding partitions to AIX disk labels is not implemented yet." msgstr "" "Obsługa dodawania partycji do etykiet dyskowych AIX jeszcze nie została " "zaimplementowana." -#: libparted/labels/aix.c:125 +#: libparted/labels/aix.c:126 msgid "" "Support for duplicating partitions in AIX disk labels is not implemented yet." msgstr "" "Obsługa powielania partycji na etykietach dyskowych AIX jeszcze nie została " "zaimplementowana." -#: libparted/labels/aix.c:143 +#: libparted/labels/aix.c:144 msgid "" "Support for setting system type of partitions in AIX disk labels is not " "implemented yet." @@ -1033,42 +981,47 @@ msgstr "" "Obsługa ustawiania rodzaju systemu partycji na etykietach dyskowych AIX " "jeszcze nie została zaimplementowana." -#: libparted/labels/aix.c:153 +#: libparted/labels/aix.c:154 msgid "Support for setting flags in AIX disk labels is not implemented yet." msgstr "" "Obsługa ustawiania flag na etykietach dyskowych AIX jeszcze nie została " "zaimplementowana." #: libparted/labels/atari.c:273 -#, 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 nie może używać systemów plików HFS na dyskach z rozmiarem sektora " -"innym niż %d bajtów." +"Nie można używać tablic partycji Atari na dyskach z rozmiarem sektora innym " +"niż %d bajtów." #: libparted/labels/atari.c:285 #, c-format msgid "Can't use Atari partition tables on disks with more than %d sectors." msgstr "" +"Nie można używać tablic partycji Atari na dyskach o liczbie sektorów powyżej " +"%d." #: libparted/labels/atari.c:398 msgid "" "Too many Atari partitions detected. Maybe there is a loop in the XGM linked " "list. Aborting." msgstr "" +"Wykryto zbyt dużo partycji Atari. Być może jest pętla w liście XGM. " +"Przerwano." #: libparted/labels/atari.c:596 #, c-format msgid "No data partition found in the ARS at sector %lli." -msgstr "" +msgstr "Nie znaleziono partycji danych w ARS w sektorze %lli." #: libparted/labels/atari.c:617 #, c-format msgid "" "The entry of the next logical ARS is not of type XGM in ARS at sector %lli." msgstr "" +"Wpis następnego logicznego ARS nie jest typu XGM w ARS w sektorze %lli." #: libparted/labels/atari.c:648 #, c-format @@ -1076,31 +1029,35 @@ msgid "" "There doesn't seem to be an Atari partition table on this disk (%s), or it " "is corrupted." msgstr "" +"Wygląda na to, że na tym dysku (%s) nie ma tablicy partycji Atari lub jest " +"uszkodzona." #: libparted/labels/atari.c:878 #, c-format msgid "No room at sector %lli to store ARS of logical partition %d." -msgstr "" +msgstr "Brak miejsca w sektorze %lli, aby zapisać ARS partycji logicznej %d." #: libparted/labels/atari.c:885 #, c-format msgid "No room at sector %lli to store ARS." -msgstr "" +msgstr "Brak miejsca w sektorze %lli, aby zapisać ARS." #: libparted/labels/atari.c:962 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 "" +"Liczba sektorów zapisana w tablicy partycji nie odpowiada rozmiarowi " +"urządzenia. Czy poprawić tablicę partycji?" #: libparted/labels/atari.c:1003 #, c-format msgid "No room at sector %lli to store BSL." -msgstr "" +msgstr "Brak miejsca w sektorze %lli, aby zapisać BSL." #: libparted/labels/atari.c:1111 msgid "There were remaining partitions after filling the main AHDI table." -msgstr "" +msgstr "Pozostały jeszcze partycje po wypełnieniu głównej tablicy AHDI." #: libparted/labels/atari.c:1130 msgid "" @@ -1108,14 +1065,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 "" +"Główna tablica AHDI została wypełniona wszystkimi partycjami, ale tablica " +"ICD nie jest pusta, więc oprogramowanie zgodne z ICD wykryje więcej partycji " +"o nieznanym rozmiarze i położeniu. Czy unieważnić tablicę ICD?" #: libparted/labels/atari.c:1164 msgid "ICD entries can't contain extended or logical partitions." -msgstr "" +msgstr "Wpisy ICD nie mogą zawierać partycji rozszerzonych ani logicznych." #: libparted/labels/atari.c:1186 msgid "There were remaining partitions after filling the tables." -msgstr "" +msgstr "Po wypełnieniu tablic pozostały jeszcze partycje." #: libparted/labels/atari.c:1226 #, c-format @@ -1123,12 +1083,14 @@ 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 "" +"Nie można użyć partycji rozszerzonej XGM w trybie ICD (powyżej %d partycji " +"głównych; jeśli XGM jest pierwszą, liczy się jako dwie)." -#: libparted/labels/atari.c:1657 libparted/labels/bsd.c:567 -#: libparted/labels/dasd.c:894 libparted/labels/dos.c:2276 -#: libparted/labels/dvh.c:770 libparted/labels/gpt.c:2050 -#: libparted/labels/loop.c:243 libparted/labels/mac.c:1423 -#: libparted/labels/pc98.c:701 libparted/labels/rdb.c:1054 +#: libparted/labels/atari.c:1657 libparted/labels/bsd.c:563 +#: libparted/labels/dasd.c:895 libparted/labels/dos.c:2283 +#: libparted/labels/dvh.c:770 libparted/labels/gpt.c:2140 +#: 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 "Nie można zaspokoić wszystkich ograniczeń na partycji." @@ -1139,49 +1101,52 @@ 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 "" +"Nie można użyć więcej niż %d partycji głównych (tryb ICD) w przypadku użycia " +"partycji rozszerzonej XGM. Jeśli XGM jest pierwszą, liczy się jako dwie." #: libparted/labels/atari.c:1823 libparted/labels/rdb.c:1082 msgid "Unable to allocate a partition number." msgstr "Nie można przydzielić numeru partycji." -#: libparted/labels/bsd.c:592 +#: libparted/labels/bsd.c:588 msgid "Unable to allocate a bsd disklabel slot." msgstr "Nie można przydzielić miejsca na etykietę dysku bsd." -#: libparted/labels/dasd.c:625 +#: libparted/labels/dasd.c:626 msgid "The partition table of DASD-LDL device cannot be changed.\n" -msgstr "" +msgstr "Tablica partycji urządzenia DASD-LDL nie może być zmieniona.\n" -#: libparted/labels/dasd.c:920 +#: libparted/labels/dasd.c:921 msgid "Unable to allocate a dasd disklabel slot" msgstr "Nie można przydzielić miejsca na etykiecie dysku dasd." -#: libparted/labels/dos.c:1003 +#: libparted/labels/dos.c:1006 #, 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:1031 +#: libparted/labels/dos.c:1034 #, c-format msgid "Invalid partition table - recursive partition on %s." msgstr "Nieprawidłowa tablica partycji - partycja rekursywna na %s." -#: libparted/labels/dos.c:1560 +#: libparted/labels/dos.c:1557 msgid "Extended partitions cannot be hidden on msdos disk labels." -msgstr "Rozszerzone partycje nie mogą być ukryte dla etykieta dysków msdos." +msgstr "Rozszerzone partycje nie mogą być ukryte na etykietach dysków msdos." -#: libparted/labels/dos.c:1572 -#, fuzzy +#: libparted/labels/dos.c:1569 msgid "Extended partitions cannot be recovery partitions on msdos disk labels." -msgstr "Rozszerzone partycje nie mogą być ukryte dla etykieta dysków msdos." +msgstr "" +"Rozszerzone partycje nie mogą być partycjami odzyskiwania na etykietach " +"dysków msdos." -#: libparted/labels/dos.c:2258 +#: libparted/labels/dos.c:2265 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:2514 +#: libparted/labels/dos.c:2521 msgid "cannot create any more partitions" msgstr "nie można utworzyć więcej partycji" @@ -1279,7 +1244,7 @@ msgstr "Podane urządzenie nie jest poprawnym urządzeniem DASD" #: libparted/labels/fdasd.c:188 msgid "VOLSER not found on device" -msgstr "" +msgstr "Nie znaleziono VOLSER na urządzeniu" #: libparted/labels/fdasd.c:191 libparted/labels/vtoc.c:179 msgid "Fatal error" @@ -1309,9 +1274,8 @@ msgstr "" "Aktualna wersja API '%d' nie zgadza się z wersją API sterownika dasd '%d'!" #: libparted/labels/fdasd.c:1020 -#, fuzzy msgid "Could not retrieve disk size." -msgstr "Nie udało się odczytać informacji o dysku." +msgstr "Nie udało się odczytać rozmiaru dysku." #: libparted/labels/fdasd.c:1029 msgid "Could not retrieve disk geometry information." @@ -1323,13 +1287,13 @@ msgstr "Nie udało się odczytać informacji o rozmiarze bloku." #: libparted/labels/fdasd.c:1045 msgid "Disk geometry does not match a DASD device of type 3390." -msgstr "" +msgstr "Geometria dysku nie pasuje do urządzenia DASD typu 3390." -#: libparted/labels/gpt.c:531 +#: libparted/labels/gpt.c:541 msgid "device is too small for GPT" msgstr "urządzenie jest zbyt małe na GPT" -#: libparted/labels/gpt.c:733 +#: libparted/labels/gpt.c:743 #, c-format msgid "" "The format of the GPT partition table is version %x, which is newer than " @@ -1338,7 +1302,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:769 +#: libparted/labels/gpt.c:779 #, c-format msgid "" "Not all of the space available to %s appears to be used, you can fix the GPT " @@ -1349,7 +1313,7 @@ msgstr "" "użyte zostało całe miejsce (dodatkowe %llu bloków) czy kontynuować przy " "aktualnych ustawieniach? " -#: libparted/labels/gpt.c:1008 +#: libparted/labels/gpt.c:1024 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)?" @@ -1358,7 +1322,7 @@ msgstr "" "naprawić to poprzez przesunięcie kopii zapasowej na koniec (i usunięcie " "starej kopii)?" -#: libparted/labels/gpt.c:1026 +#: libparted/labels/gpt.c:1042 msgid "" "Both the primary and backup GPT tables are corrupt. Try making a fresh " "table, and using Parted's rescue feature to recover partitions." @@ -1366,7 +1330,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:1037 +#: libparted/labels/gpt.c:1053 msgid "" "The backup GPT table is corrupt, but the primary appears OK, so that will be " "used." @@ -1374,7 +1338,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:1049 +#: libparted/labels/gpt.c:1065 msgid "" "The primary GPT table is corrupt, but the backup appears OK, so that will be " "used." @@ -1382,11 +1346,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:1073 +#: libparted/labels/gpt.c:1089 msgid "primary partition table array CRC mismatch" msgstr "niezgodność sumy CRC głównej tablicy partycji" -#: libparted/labels/gpt.c:1936 libparted/labels/gpt.c:1963 +#: libparted/labels/gpt.c:2026 libparted/labels/gpt.c:2053 msgid "failed to translate partition name" msgstr "nie udało się przetłumaczyć nazwy partycji" @@ -1419,18 +1383,14 @@ msgid "The data region doesn't start at the start of the partition." msgstr "Obszar danych nie rozpoczyna się na początku partycji." #: libparted/labels/mac.c:572 -msgid "The boot region doesn't start at the start of the partition." -msgstr "Obszar rozruchowy nie zaczyna się na początku partycji." - -#: libparted/labels/mac.c:586 msgid "The partition's boot region doesn't occupy the entire partition." msgstr "Obszar rozruchowy partycji nie okupuje całej partycji." -#: libparted/labels/mac.c:597 +#: libparted/labels/mac.c:583 msgid "The partition's data region doesn't occupy the entire partition." msgstr "Obszar danych partycji nie okupuje całej partycji." -#: libparted/labels/mac.c:649 +#: libparted/labels/mac.c:635 #, c-format msgid "" "Weird block size on device descriptor: %d bytes is not divisible by 512." @@ -1438,7 +1398,7 @@ msgstr "" "Dziwny rozmiar bloku w deskryptorze urządzenia: %d bajtów nie jest podzielne " "przez 512." -#: libparted/labels/mac.c:662 +#: libparted/labels/mac.c:648 #, c-format msgid "" "The driver descriptor says the physical block size is %d bytes, but Linux " @@ -1447,11 +1407,11 @@ msgstr "" "Deskryptor napędu mówi, że fizyczny rozmiar bloku wynosi %d bajtów, ale " "Linux mówi, że wynosi %d bajtów." -#: libparted/labels/mac.c:715 +#: libparted/labels/mac.c:701 msgid "No valid partition map found." msgstr "Nie znaleziono prawidłowej mapy partycji." -#: libparted/labels/mac.c:789 +#: libparted/labels/mac.c:775 #, c-format msgid "" "Conflicting partition map entry sizes! Entry 1 says it is %d, but entry %d " @@ -1460,27 +1420,27 @@ msgstr "" "Wystąpił konflikt między rozmiarami wpisów mapy partycji! Wpis 1 mówi, że " "jest %d, ale wpis %d mówi, że jest %d!" -#: libparted/labels/mac.c:820 +#: libparted/labels/mac.c:806 msgid "Weird! There are 2 partitions map entries!" msgstr "Dziwne! Istnieją 2 wpisy map partycji!" -#: libparted/labels/mac.c:1359 +#: libparted/labels/mac.c:1345 msgid "" "Changing the name of a root or swap partition will prevent Linux from " "recognising it as such." msgstr "" "Zmiana nazwy partycji root lub wymiany spowoduje, że Linux jej nie rozpozna." -#: libparted/labels/mac.c:1458 +#: libparted/labels/mac.c:1444 msgid "Can't add another partition -- the partition map is too small!" msgstr "Nie można dodać kolejnej partycji -- mapa partycji jest zbyt mała!" -#: libparted/labels/pc98.c:284 +#: libparted/labels/pc98.c:285 #, c-format msgid "Invalid partition table on %s." msgstr "Nieprawidłowa tablica partycji na %s." -#: libparted/labels/pc98.c:337 libparted/labels/pc98.c:415 +#: libparted/labels/pc98.c:338 libparted/labels/pc98.c:416 #, c-format msgid "" "Partition %d isn't aligned to cylinder boundaries. This is still " @@ -1489,7 +1449,7 @@ msgstr "" "Partycja %d nie jest wyrównana do granic cylindra. Nadal nie jest to " "wspierane." -#: libparted/labels/pc98.c:733 +#: libparted/labels/pc98.c:729 msgid "Can't add another partition." msgstr "Nie można dodać kolejnej partycji." @@ -1664,40 +1624,40 @@ msgstr "Nie udało się zapisać VTOC FMT7 DSCB." msgid "Could not write VTOC FMT9 DSCB." msgstr "Nie udało się zapisać VTOC FMT9 DSCB." -#: libparted/libparted.c:242 +#: libparted/libparted.c:247 msgid "Out of memory." msgstr "Brak pamięci." -#: libparted/unit.c:139 +#: libparted/unit.c:140 msgid "Cannot get unit size for special unit 'COMPACT'." msgstr "" "Nie można pobrać rozmiaru jednostki dla specjalnej jednostki 'COMPACT'." -#: libparted/unit.c:385 +#: libparted/unit.c:386 #, c-format msgid "\"%s\" has invalid syntax for locations." msgstr "\"%s\" posiada nieprawidłową składnię dla lokacji." -#: libparted/unit.c:393 +#: libparted/unit.c:394 #, c-format msgid "The maximum head value is %d." msgstr "Maksymalna wartość głowicy wynosi %d." -#: libparted/unit.c:400 +#: libparted/unit.c:401 #, c-format msgid "The maximum sector value is %d." msgstr "Maksymalna wartość sektora wynosi %d." -#: libparted/unit.c:412 libparted/unit.c:564 +#: libparted/unit.c:413 libparted/unit.c:565 #, c-format msgid "The location %s is outside of the device %s." msgstr "Lokacja %s jest poza urządzeniem %s." -#: libparted/unit.c:526 +#: libparted/unit.c:527 msgid "Invalid number." msgstr "Nieprawidłowy numer." -#: libparted/unit.c:532 +#: libparted/unit.c:533 msgid "Use a smaller unit instead of a value < 1" msgstr "Użycie mniejszej jednostki zamiast wartości < 1" @@ -1707,18 +1667,18 @@ msgstr "Użycie mniejszej jednostki zamiast wartości < 1" msgid "%s : Failed to allocate partition block\n" msgstr "%s : Nie powiodło się przydzielanie bloku partycji\n" -#: libparted/fs/amiga/affs.c:79 libparted/fs/amiga/apfs.c:71 +#: 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 : Nie powiodło się przydzielanie bloku\n" -#: libparted/fs/amiga/affs.c:84 libparted/fs/amiga/apfs.c:76 +#: 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 : Nie udało się odczytać bloku startowego %llu\n" -#: libparted/fs/amiga/affs.c:98 libparted/fs/amiga/apfs.c:87 +#: 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" @@ -1744,22 +1704,22 @@ msgstr "%s : Nieprawidłowa suma kontrolna bloku %llu typu %s\n" msgid "%s : Couldn't write block %d\n" msgstr "%s : Nie udało się zapisać bloku %d\n" -#: libparted/fs/amiga/amiga.c:278 +#: libparted/fs/amiga/amiga.c:279 #, c-format msgid "%s : Failed to allocate disk_specific rdb block\n" msgstr "%s : Nie powiodło się przydzielanie bloku rdb disk_specific\n" -#: libparted/fs/amiga/amiga.c:289 +#: libparted/fs/amiga/amiga.c:290 #, c-format msgid "%s : Didn't find rdb block, should never happen\n" msgstr "%s : Nie znaleziono bloku rdb, co nie powinno się zdarzyć\n" -#: libparted/fs/amiga/amiga.c:318 +#: libparted/fs/amiga/amiga.c:319 #, c-format msgid "%s : Failed to read partition block %llu\n" msgstr "%s : Nie powiódł się odczyt bloku partycji %llu\n" -#: libparted/fs/fat/fat.c:148 libparted/fs/r/fat/fat.c:811 +#: libparted/fs/fat/fat.c:149 msgid "" "GNU Parted was miscompiled: the FAT boot sector should be 512 bytes. FAT " "support will be disabled." @@ -1857,7 +1817,7 @@ msgstr "" "naprawić, geometria CHS systemu plików zostanie dopasowana do geometrii CHS " "tablicy partycji." -#: libparted/fs/r/fat/bootsector.c:399 +#: libparted/fs/r/fat/bootsector.c:398 #, c-format msgid "" "The information sector has the wrong signature (%x). Select cancel for now, " @@ -1884,13 +1844,13 @@ msgstr "" "Różnica początku klastra = %d, co nie jest wielokrotnością rozmiaru klastra " "%d." -#: libparted/fs/r/fat/count.c:144 +#: libparted/fs/r/fat/count.c:84 #, c-format msgid "Bad directory entry for %s: first cluster is the end of file marker." msgstr "" "Błędny wpis katalogu dla %s: pierwszy klaster jest znacznikiem końca pliku." -#: libparted/fs/r/fat/count.c:157 +#: libparted/fs/r/fat/count.c:97 #, c-format msgid "" "Bad FAT: unterminated chain for %s. You should run dosfsck or scandisk." @@ -1898,7 +1858,7 @@ msgstr "" "Błędny FAT: nie zakończony łańcuch dla pliku %s. Należy uruchomić program " "dosfsck lub scandisk." -#: libparted/fs/r/fat/count.c:166 +#: libparted/fs/r/fat/count.c:106 #, c-format msgid "" "Bad FAT: cluster %d outside file system in chain for %s. You should run " @@ -1907,7 +1867,7 @@ msgstr "" "Błędny FAT: klaster %d poza systemem plików w łańcuchu dla pliku %s. Należy " "uruchomić program dosfsck lub scandisk." -#: libparted/fs/r/fat/count.c:176 +#: libparted/fs/r/fat/count.c:116 #, c-format msgid "" "Bad FAT: cluster %d is cross-linked for %s. You should run dosfsck or " @@ -1916,26 +1876,17 @@ msgstr "" "Błędny FAT: klaster %d dla pliku %s pokrywa się z innym plikiem. Należy " "uruchomić program dosfsck lub scandisk." -#: libparted/fs/r/fat/count.c:195 +#: libparted/fs/r/fat/count.c:135 #, c-format msgid "%s is %dk, but it has %d clusters (%dk)." msgstr "%s ma %dk, ale ma klastrów: %d (%dk)." -#: libparted/fs/r/fat/count.c:258 -#, c-format -msgid "" -"The file %s is marked as a system file. This means moving it could cause " -"some programs to stop working." -msgstr "" -"Plik %s jest oznaczony jako plik systemowy. Oznacza to, że jego " -"przeniesienie może spowodować, że niektóre programy przestaną działać." - -#: libparted/fs/r/fat/fat.c:243 +#: libparted/fs/r/fat/fat.c:244 #, c-format msgid "Partition too big/small for a %s file system." msgstr "Partycja za duża/za mała dla systemu plików %s." -#: libparted/fs/r/fat/fat.c:409 +#: 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." @@ -1944,11 +1895,11 @@ msgstr "" "operację, uruchomić program scandisk na tym systemie plików i wtedy wrócić " "do Parteda" -#: libparted/fs/r/fat/fat.c:449 +#: libparted/fs/r/fat/fat.c:450 msgid "There are no possible configurations for this FAT type." msgstr "Brak możliwych konfiguracji dla tego rodzaju FAT-u." -#: libparted/fs/r/fat/fat.c:461 +#: libparted/fs/r/fat/fat.c:462 #, c-format msgid "" "File system doesn't have expected sizes for Windows to like it. Cluster " @@ -1959,13 +1910,13 @@ msgstr "" "klastra to %dk (oczekiwano %dk); liczba klastrów to %d (oczekiwano %d); " "rozmiar FAT-ów w sektorach to %d (oczekiwano %d)." -#: libparted/fs/r/fat/fat.c:484 +#: libparted/fs/r/fat/fat.c:485 #, c-format msgid "" "File system is reporting the free space as %d clusters, not %d clusters." msgstr "System plików zgłasza wolne miejsce w klastrach jako %d, a nie %d." -#: libparted/fs/r/fat/resize.c:158 +#: 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." @@ -1973,15 +1924,15 @@ msgstr "" "Za mało miejsca w głównym katalogu na wszystkie pliki. Można anulować lub " "zignorować, co spowoduje utratę plików." -#: libparted/fs/r/fat/resize.c:302 +#: libparted/fs/r/fat/resize.c:303 msgid "Error writing to the root directory." msgstr "Błąd zapisu w katalogu głównym." -#: libparted/fs/r/fat/resize.c:495 +#: libparted/fs/r/fat/resize.c:479 msgid "If you leave your file system as FAT16, then you will have no problems." msgstr "Jeżeli system plików pozostanie jako FAT16, nie będzie problemów." -#: libparted/fs/r/fat/resize.c:498 +#: 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 " @@ -1991,14 +1942,14 @@ msgstr "" "Windows, trzeba przeinstalować rekord startowy MS Windows. W tym celu należy " "zasięgnąć rady w podręczniku Parteda (lub swojej dystrybucji)." -#: libparted/fs/r/fat/resize.c:506 +#: 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 "" "Jeżeli system plików pozostanie jako FAT32, nie powstaną żadne nowe problemy." -#: libparted/fs/r/fat/resize.c:510 +#: 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 " @@ -2012,42 +1963,42 @@ msgstr "" "konwersja do FAT32 uczyni system plików nieczytelnym dla systemów MS DOS, MS " "Windows 95a i MS Windows NT." -#: libparted/fs/r/fat/resize.c:524 +#: libparted/fs/r/fat/resize.c:508 #, c-format msgid "%s %s %s" msgstr "%s %s %s" -#: libparted/fs/r/fat/resize.c:525 +#: libparted/fs/r/fat/resize.c:509 msgid "Would you like to use FAT32?" msgstr "Czy użyć FAT32?" -#: libparted/fs/r/fat/resize.c:556 libparted/fs/r/fat/resize.c:572 +#: 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:557 +#: libparted/fs/r/fat/resize.c:541 msgid "" "The file system can only be resized to this size by converting to FAT16." msgstr "" "System plików można powiększyć do tego rozmiaru tylko konwertując go do " "FAT16." -#: libparted/fs/r/fat/resize.c:573 +#: libparted/fs/r/fat/resize.c:557 msgid "" "The file system can only be resized to this size by converting to FAT32." msgstr "" "System plików można powiększyć do tego rozmiaru tylko konwertując go do " "FAT32." -#: libparted/fs/r/fat/resize.c:586 +#: 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 nie jest w stanie zmienić rozmiaru partycji do tego rozmiaru. " "Pracujemy nad tym!" -#: libparted/fs/r/fat/table.c:136 +#: 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 " @@ -2056,41 +2007,41 @@ msgstr "" "FAT %d nośnik %x nie odpowiada nośnikowi %x w sektorze rozruchowym. Należy " "prawdopodobnie uruchomić program scandisk." -#: libparted/fs/r/fat/table.c:268 +#: libparted/fs/r/fat/table.c:269 #, c-format msgid "fat_table_set: cluster %ld outside file system" msgstr "fat_table_set: klaster %ld poza systemem plików" -#: libparted/fs/r/fat/table.c:300 +#: libparted/fs/r/fat/table.c:301 #, c-format msgid "fat_table_get: cluster %ld outside file system" msgstr "fat_table_get: klaster %ld poza systemem plików" -#: libparted/fs/r/fat/table.c:342 +#: libparted/fs/r/fat/table.c:343 msgid "fat_table_alloc_cluster: no free clusters" msgstr "fat_table_alloc_cluster: brak wolnych klastrów" -#: libparted/fs/r/filesys.c:151 +#: libparted/fs/r/filesys.c:152 msgid "Could not detect file system." msgstr "Nie udało się wykryć systemu plików." -#: libparted/fs/r/filesys.c:158 libparted/fs/r/filesys.c:285 +#: libparted/fs/r/filesys.c:159 libparted/fs/r/filesys.c:284 #, c-format msgid "resizing %s file systems is not supported" msgstr "zmiana rozmiaru systemów plików %s nie jest obsługiwana" -#: libparted/fs/r/filesys.c:170 +#: libparted/fs/r/filesys.c:171 msgid "The file system is bigger than its volume!" msgstr "System plików jest większy niż jego wolumen!" -#: libparted/fs/r/hfs/advfs.c:121 libparted/fs/r/hfs/advfs_plus.c:121 -#: libparted/fs/r/hfs/reloc.c:413 libparted/fs/r/hfs/reloc.c:507 -#: libparted/fs/r/hfs/reloc_plus.c:538 libparted/fs/r/hfs/reloc_plus.c:656 -#: libparted/fs/r/hfs/reloc_plus.c:769 +#: 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 "System plików zawiera błędy." -#: libparted/fs/r/hfs/advfs_plus.c:285 +#: libparted/fs/r/hfs/advfs_plus.c:287 msgid "Bad blocks could not be read." msgstr "Nie można odczytać wadliwych bloków." @@ -2104,7 +2055,7 @@ msgstr "" "istnieje w tym miejscu. Proszę sprawdzić system plików!" #: 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!" @@ -2156,62 +2107,62 @@ msgstr "Nie udało się odnaleźć sektora %lli pliku HFS+ o CNID %X." msgid "Trying to write HFS+ file with CNID %X behind EOF." msgstr "Próba zapisu pliku HFS+ o CNID %X za końcem pliku." -#: libparted/fs/r/hfs/hfs.c:232 +#: libparted/fs/r/hfs/hfs.c:212 msgid "Sorry, HFS cannot be resized that way yet." msgstr "Niestety nie można jeszcze zmienić rozmiaru HFS-a w ten sposób." -#: libparted/fs/r/hfs/hfs.c:250 libparted/fs/r/hfs/hfs.c:629 +#: libparted/fs/r/hfs/hfs.c:230 libparted/fs/r/hfs/hfs.c:573 msgid "shrinking" msgstr "zmniejszanie" -#: libparted/fs/r/hfs/hfs.c:262 libparted/fs/r/hfs/hfs.c:641 +#: libparted/fs/r/hfs/hfs.c:242 libparted/fs/r/hfs/hfs.c:585 msgid "Data relocation has failed." msgstr "Relokacja danych nie powiodła się." -#: libparted/fs/r/hfs/hfs.c:281 +#: libparted/fs/r/hfs/hfs.c:261 msgid "Data relocation left some data in the end of the volume." msgstr "Po relokacji danych pozostała część danych na końcu wolumenu." -#: libparted/fs/r/hfs/hfs.c:320 +#: libparted/fs/r/hfs/hfs.c:300 msgid "writing HFS Master Directory Block" msgstr "zapis głównego bloku katalogu HFS (Master Directory Block)" -#: libparted/fs/r/hfs/hfs.c:468 +#: libparted/fs/r/hfs/hfs.c:412 msgid "No valid HFS[+X] signature has been found while opening." msgstr "Nie znaleziono poprawnej sygnatury HFS[+X] podczas otwierania." -#: libparted/fs/r/hfs/hfs.c:478 +#: libparted/fs/r/hfs/hfs.c:422 #, c-format msgid "Version %d of HFS+ isn't supported." msgstr "Wersja %d systemu plików HFS+ nie jest obsługiwana." -#: libparted/fs/r/hfs/hfs.c:489 +#: libparted/fs/r/hfs/hfs.c:433 #, c-format msgid "Version %d of HFSX isn't supported." msgstr "Wersja %d systemu plików HFSX nie jest obsługiwana." -#: libparted/fs/r/hfs/hfs.c:672 +#: libparted/fs/r/hfs/hfs.c:616 msgid "Data relocation left some data at the end of the volume." msgstr "Po relokacji danych pozostała część danych na końcu wolumenu." -#: libparted/fs/r/hfs/hfs.c:720 +#: libparted/fs/r/hfs/hfs.c:664 msgid "Error while writing the allocation file." msgstr "Błąd podczas zapisu pliku alokacji." -#: libparted/fs/r/hfs/hfs.c:735 +#: libparted/fs/r/hfs/hfs.c:679 msgid "Error while writing the compatibility part of the allocation file." msgstr "" "Błąd podczas zapisu części pliku alokacji przeznaczonej dla kompatybilności." -#: libparted/fs/r/hfs/hfs.c:750 +#: libparted/fs/r/hfs/hfs.c:694 msgid "writing HFS+ Volume Header" msgstr "zapis nagłówka wolumenu HFS+" -#: libparted/fs/r/hfs/hfs.c:850 +#: libparted/fs/r/hfs/hfs.c:794 msgid "An error occurred while looking for the mandatory bad blocks file." msgstr "Podczas szukania obowiązkowego pliku wadliwych bloków wystąpił błąd." -#: libparted/fs/r/hfs/hfs.c:904 +#: 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." @@ -2219,28 +2170,28 @@ msgstr "" "Prawdopodobnie jest błąd w obudowaniu HFS: plik wadliwych bloków nie zawiera " "osadzonego wolumenu HFS+." -#: libparted/fs/r/hfs/hfs.c:940 +#: libparted/fs/r/hfs/hfs.c:883 msgid "Sorry, HFS+ cannot be resized that way yet." msgstr "" "Niestety nie można jeszcze zmienić rozmiaru systemu plików HFS+ w ten sposób." -#: libparted/fs/r/hfs/hfs.c:975 +#: libparted/fs/r/hfs/hfs.c:918 msgid "shrinking embedded HFS+ volume" msgstr "zmniejszanie osadzonego wolumenu HFS+" -#: libparted/fs/r/hfs/hfs.c:992 +#: libparted/fs/r/hfs/hfs.c:935 msgid "Resizing the HFS+ volume has failed." msgstr "Zmiana rozmiaru wolumenu HFS+ nie powiodła się." -#: libparted/fs/r/hfs/hfs.c:999 +#: libparted/fs/r/hfs/hfs.c:942 msgid "shrinking HFS wrapper" msgstr "zmniejszanie obudowania HFS" -#: libparted/fs/r/hfs/hfs.c:1008 +#: libparted/fs/r/hfs/hfs.c:951 msgid "Updating the HFS wrapper has failed." msgstr "Uaktualnianie obudowania HFS nie powiodło się." -#: libparted/fs/r/hfs/hfs.c:1110 libparted/fs/r/hfs/hfs.c:1195 +#: 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 " @@ -2261,7 +2212,6 @@ msgstr "" "Błędny rozmiar bloku transakcji w trakcie odtwarzania kroniki (bajtów: %i)." #: 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." @@ -2320,7 +2270,7 @@ msgstr "" msgid "An extent has not been relocated." msgstr "Ekstent nie został zrelokowany." -#: libparted/fs/r/hfs/reloc.c:250 libparted/fs/r/hfs/reloc_plus.c:307 +#: 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!" @@ -2328,15 +2278,15 @@ msgstr "" "Odwołanie do ekstentu pochodzi z niewłaściwego miejsca. Proszę sprawdzić " "system plików!" -#: libparted/fs/r/hfs/reloc.c:380 +#: libparted/fs/r/hfs/reloc.c:382 msgid "This HFS volume has no catalog file. This is very unusual!" msgstr "Ten wolumen HFS nie ma pliku katalogu. To bardzo niezwykłe!" -#: libparted/fs/r/hfs/reloc.c:474 +#: libparted/fs/r/hfs/reloc.c:479 msgid "This HFS volume has no extents overflow file. This is quite unusual!" msgstr "Ten wolumen HFS nie ma pliku przepełnień ekstenów. To dość niezwykłe!" -#: libparted/fs/r/hfs/reloc.c:516 libparted/fs/r/hfs/reloc_plus.c:666 +#: 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." @@ -2344,52 +2294,52 @@ msgstr "" "Plik przepełnień ekstentów nie powinien zawierać własnych ekstentów! Proszę " "sprawdzić system plików." -#: libparted/fs/r/hfs/reloc.c:573 libparted/fs/r/hfs/reloc_plus.c:844 +#: 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 "Nie udało się zbuforować systemu plików w pamięci." -#: libparted/fs/r/hfs/reloc.c:634 libparted/fs/r/hfs/reloc_plus.c:905 +#: libparted/fs/r/hfs/reloc.c:640 libparted/fs/r/hfs/reloc_plus.c:910 msgid "Bad blocks list could not be loaded." msgstr "Nie udało się wczytać listy wadliwych bloków." -#: libparted/fs/r/hfs/reloc.c:648 libparted/fs/r/hfs/reloc_plus.c:921 +#: libparted/fs/r/hfs/reloc.c:654 libparted/fs/r/hfs/reloc_plus.c:926 msgid "An error occurred during extent relocation." msgstr "Wystąpił błąd w trakcie relokacji ekstentów." -#: libparted/fs/r/hfs/reloc_plus.c:494 +#: libparted/fs/r/hfs/reloc_plus.c:495 msgid "This HFS+ volume has no catalog file. This is very unusual!" msgstr "Ten wolumen HFS+ nie zawiera pliku katalogu. To bardzo niezwykłe!" -#: libparted/fs/r/hfs/reloc_plus.c:617 +#: libparted/fs/r/hfs/reloc_plus.c:620 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:125 +#: parted/parted.c:126 msgid "displays this help message" msgstr "wyświetla tę oto pomoc" -#: parted/parted.c:126 +#: parted/parted.c:127 msgid "lists partition layout on all block devices" msgstr "wypisuje rozkład partycji na wszystkich wykrytych urządzeniach" -#: parted/parted.c:127 +#: parted/parted.c:128 msgid "displays machine parseable output" msgstr "wyświetla dane w formacie czytelnym dla maszyny" -#: parted/parted.c:128 +#: parted/parted.c:129 msgid "never prompts for user intervention" msgstr "nigdy nie prosi użytkownika o interwencję" -#: parted/parted.c:129 +#: parted/parted.c:130 msgid "displays the version" msgstr "wyświetla numer wersji" -#: parted/parted.c:130 +#: parted/parted.c:131 msgid "alignment for new partitions" msgstr "wyrównanie dla nowych partycji" -#: parted/parted.c:142 +#: parted/parted.c:143 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" @@ -2398,33 +2348,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:145 +#: parted/parted.c:146 msgid "LABEL-TYPE is one of: " msgstr "TYP-ETYKIETY stanowi jedną z następujących wartości: " -#: parted/parted.c:146 parted/parted.c:147 +#: parted/parted.c:147 parted/parted.c:148 msgid "FLAG is one of: " msgstr "FLAGA stanowi jedną z następujących wartości: " -#: parted/parted.c:148 +#: parted/parted.c:149 msgid "UNIT is one of: " msgstr "JEDNOSTKA stanowi jedną z następujących wartości: " -#: parted/parted.c:149 +#: parted/parted.c:150 msgid "desired alignment: minimum or optimal" msgstr "pożądane wyrównanie: minimalne lub optymalne" -#: parted/parted.c:150 +#: parted/parted.c:151 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:152 +#: parted/parted.c:153 msgid "FS-TYPE is one of: " msgstr "SYSTEM-PLIKÓW stanowi jedną z następujących wartości: " -#: parted/parted.c:153 +#: parted/parted.c:154 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 +2384,7 @@ msgstr "" "wartości są liczone od końca dysku. Na przykład -1s oznacza dokładnie " "ostatni sektor.\n" -#: parted/parted.c:156 +#: parted/parted.c:157 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 +2392,19 @@ 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:159 +#: parted/parted.c:160 msgid "STATE is one of: on, off\n" msgstr "STAN jest reprezentowany poprzez: włączony, wyłączony\n" -#: parted/parted.c:160 +#: parted/parted.c:161 msgid "DEVICE is usually /dev/hda or /dev/sda\n" msgstr "URZĄDZENIEM jest zwykle /dev/hda lub /dev/sda\n" -#: parted/parted.c:161 +#: parted/parted.c:162 msgid "NAME is any word you want\n" msgstr "NAZWA jest dowolnym słowem jakie chcesz\n" -#: parted/parted.c:164 +#: parted/parted.c:165 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 +2425,22 @@ msgstr "" "w Powszechnej Licencji Publicznej GNU.\n" "\n" -#: parted/parted.c:212 +#: parted/parted.c:213 #, c-format msgid "%0.f%%\t(time left %.2d:%.2d)" msgstr "%0.f%%\t(czas do końca %.2d:%.2d)" -#: parted/parted.c:231 +#: parted/parted.c:232 #, 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:252 +#: parted/parted.c:253 #, c-format msgid "Partition(s) on %s are being used." msgstr "Partycja (partycje) na %s są używane." -#: parted/parted.c:264 +#: parted/parted.c:265 #, c-format msgid "" "The existing disk label on %s will be destroyed and all data on this disk " @@ -2499,31 +2449,31 @@ msgstr "" "Istniejąca etykieta dysku na %s zostanie zniszczona, a wszystkie dane na tym " "dysku zostaną utracone. Kontynuować?" -#: parted/parted.c:525 +#: parted/parted.c:526 msgid "New disk label type?" msgstr "Nowy typ etykiety dysku?" -#: parted/parted.c:662 +#: parted/parted.c:663 msgid "Partition type?" msgstr "Typ partycji?" -#: parted/parted.c:680 parted/parted.c:884 +#: parted/parted.c:681 parted/parted.c:885 msgid "Partition name?" msgstr "Nazwa partycji?" -#: parted/parted.c:690 +#: parted/parted.c:691 msgid "File system type?" msgstr "Typ systemu plików?" -#: parted/parted.c:695 parted/parted.c:1498 +#: parted/parted.c:696 parted/parted.c:1499 msgid "Start?" msgstr "Początek?" -#: parted/parted.c:698 parted/parted.c:1500 parted/parted.c:1569 +#: parted/parted.c:699 parted/parted.c:1501 parted/parted.c:1585 msgid "End?" msgstr "Koniec?" -#: parted/parted.c:766 +#: parted/parted.c:767 #, c-format msgid "" "You requested a partition from %s to %s (sectors %llu..%llu).\n" @@ -2533,7 +2483,7 @@ msgstr "" "Najbliższa z jaką Parted może sobie poradzić jest od %s do %s (sektorów: " "%llu..%llu).%s" -#: parted/parted.c:775 +#: parted/parted.c:776 msgid "" "\n" "Is this still acceptable to you?" @@ -2541,95 +2491,95 @@ msgstr "" "\n" "Czy jest to do przyjęcia?" -#: parted/parted.c:798 -#, fuzzy, c-format +#: parted/parted.c:799 +#, 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." +"Partycja wynikowa nie jest wyrównana właściwie dla najlepszej wydajności: %s" -#: parted/parted.c:800 parted/parted.c:1723 +#: parted/parted.c:801 parted/parted.c:1739 msgid "unknown (malloc failed)" -msgstr "" +msgstr "nieznana (malloc nie powiódł się)" -#: parted/parted.c:876 -#, fuzzy, c-format +#: parted/parted.c:877 +#, c-format msgid "%s disk labels do not support partition name." -msgstr "Etykiety dysku %s nie wspierają rozszerzonych partycji." +msgstr "Etykiety dysku %s nie obsługują nazwy partycji." -#: parted/parted.c:881 parted/parted.c:1561 parted/parted.c:1612 -#: parted/parted.c:1706 parted/parted.c:1781 +#: parted/parted.c:882 parted/parted.c:1564 parted/parted.c:1628 +#: parted/parted.c:1722 parted/parted.c:1797 msgid "Partition number?" msgstr "Numer partycji?" -#: parted/parted.c:975 +#: parted/parted.c:976 #, 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:1017 +#: parted/parted.c:1018 #, c-format msgid "Model: %s (%s)\n" msgstr "Model: %s (%s)\n" -#: parted/parted.c:1019 +#: parted/parted.c:1020 #, c-format msgid "Disk %s: %s\n" msgstr "Dysk %s: %s\n" -#: parted/parted.c:1020 +#: parted/parted.c:1021 #, c-format msgid "Sector size (logical/physical): %lldB/%lldB\n" msgstr "Rozmiar sektora (logiczny/fizyczny): %lldB/%lldB\n" -#: parted/parted.c:1032 +#: parted/parted.c:1033 #, c-format msgid "Partition Table: %s\n" msgstr "Tablica partycji: %s\n" -#: parted/parted.c:1033 +#: parted/parted.c:1034 #, c-format msgid "Disk Flags: %s\n" msgstr "Flagi dysku: %s\n" -#: parted/parted.c:1153 parted/parted.c:1156 +#: parted/parted.c:1154 parted/parted.c:1157 msgid "Number" msgstr "Numer" -#: parted/parted.c:1153 parted/parted.c:1156 +#: parted/parted.c:1154 parted/parted.c:1157 msgid "Start" msgstr "Początek" -#: parted/parted.c:1154 parted/parted.c:1157 +#: parted/parted.c:1155 parted/parted.c:1158 msgid "End" msgstr "Koniec" -#: parted/parted.c:1157 +#: parted/parted.c:1158 msgid "Size" msgstr "Rozmiar" -#: parted/parted.c:1161 +#: parted/parted.c:1162 msgid "Type" msgstr "Typ" -#: parted/parted.c:1163 +#: parted/parted.c:1164 msgid "File system" msgstr "System plików" -#: parted/parted.c:1166 +#: parted/parted.c:1167 msgid "Name" msgstr "Nazwa" -#: parted/parted.c:1168 +#: parted/parted.c:1169 msgid "Flags" msgstr "Flaga" -#: parted/parted.c:1225 +#: parted/parted.c:1226 msgid "Free Space" msgstr "Wolne miejsce" -#: parted/parted.c:1385 +#: parted/parted.c:1386 #, c-format msgid "" "A %s %s partition was found at %s -> %s. Do you want to add it to the " @@ -2638,99 +2588,98 @@ msgstr "" "Partycja %s %s została znaleziona na %s -> %s. Czy chcesz ją dodać do " "tablicy partycji?" -#: parted/parted.c:1428 +#: parted/parted.c:1429 msgid "searching for file systems" msgstr "szukam systemów plików" -#: parted/parted.c:1535 +#: parted/parted.c:1536 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:1583 +#: parted/parted.c:1599 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:1636 +#: parted/parted.c:1652 msgid "New device?" msgstr "Nowe urządzenie?" -#: parted/parted.c:1704 +#: parted/parted.c:1720 msgid "alignment type(min/opt)" msgstr "rodzaj wyrównania(min/opt)" -#: parted/parted.c:1719 +#: parted/parted.c:1735 #, c-format msgid "%d aligned\n" msgstr "%d wyrównana\n" -#: parted/parted.c:1721 -#, fuzzy, c-format +#: parted/parted.c:1737 +#, c-format msgid "%d not aligned: %s\n" -msgstr "%d niewyrównana\n" +msgstr "%d nie wyrównana: %s\n" -#: parted/parted.c:1746 parted/parted.c:1783 +#: parted/parted.c:1762 parted/parted.c:1799 msgid "Flag to Invert?" msgstr "Flaga do przestawienia?" -#: parted/parted.c:1751 parted/parted.c:1788 +#: parted/parted.c:1767 parted/parted.c:1804 msgid "New state?" msgstr "Nowy stan?" -#: parted/parted.c:1834 +#: parted/parted.c:1850 msgid "Unit?" msgstr "Jednostka?" -#: parted/parted.c:1969 +#: parted/parted.c:1985 msgid "align-check" msgstr "sprawdź-wyrównanie" -#: parted/parted.c:1972 -#, fuzzy +#: parted/parted.c:1988 msgid "" "align-check TYPE N check partition N for TYPE(min|opt) " "alignment" msgstr "" -"sprawdź-wyrównanie TYP N sprawdzenie wyrównania TYP(min|" -"opt) partycji N" +"sprawdź-wyrównanie TYP N sprawdzenie wyrównania TYP(min|opt) " +"partycji N" -#: parted/parted.c:1980 +#: parted/parted.c:1996 msgid "help" msgstr "pomoc" -#: parted/parted.c:1983 +#: parted/parted.c:1999 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:1989 +#: parted/parted.c:2005 msgid "mklabel" msgstr "mklabel" -#: parted/parted.c:1989 +#: parted/parted.c:2005 msgid "mktable" msgstr "mktable" -#: parted/parted.c:1992 +#: parted/parted.c:2008 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:1998 +#: parted/parted.c:2014 msgid "mkpart" msgstr "mkpart" -#: parted/parted.c:2001 +#: parted/parted.c:2017 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:2007 +#: parted/parted.c:2023 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" @@ -2739,19 +2688,19 @@ msgstr "" "tej partycji. Opcjonalny SYSTEM-PLIKÓW może zostać podany do określenia " "właściwego identyfikatora partycji.\n" -#: parted/parted.c:2012 +#: parted/parted.c:2028 msgid "name" msgstr "nazwa" -#: parted/parted.c:2015 +#: parted/parted.c:2031 msgid "name NUMBER NAME name partition NUMBER as NAME" msgstr "name NUMER NAZWA nadaje NAZWĘ partycji NUMER" -#: parted/parted.c:2020 +#: parted/parted.c:2036 msgid "print" msgstr "drukuj" -#: parted/parted.c:2023 +#: parted/parted.c:2039 msgid "" "print [devices|free|list,all|NUMBER] display the partition table, " "available devices, free space, all found partitions, or a particular " @@ -2760,7 +2709,7 @@ msgstr "" "print [devices|free|list,all|NUMER] wyświetla tablicę partycji, dostępne " "urządzenia, wolne miejsce, znalezione partycje lub określoną partycję" -#: parted/parted.c:2028 +#: parted/parted.c:2044 msgid "" "Without arguments, 'print' displays the entire partition table. However with " "the following arguments it performs various other actions.\n" @@ -2768,11 +2717,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:2030 +#: parted/parted.c:2046 msgid " devices : display all active block devices\n" msgstr " devices : wyświetla wszystkie aktywne urządzenia blokowe\n" -#: parted/parted.c:2031 +#: parted/parted.c:2047 msgid "" " free : display information about free unpartitioned space on the " "current block device\n" @@ -2780,14 +2729,14 @@ msgstr "" " free : wyświetla informacje o wolnym, niespartycjonowanym miejscu na " "aktualnym urządzeniu blokowym\n" -#: parted/parted.c:2033 +#: parted/parted.c:2049 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:2034 +#: parted/parted.c:2050 msgid "" " NUMBER : display more detailed information about this particular " "partition\n" @@ -2795,19 +2744,19 @@ msgstr "" " NUMER : wyświetla bardziej szczegółowe informacje o określonej " "partycji\n" -#: parted/parted.c:2039 +#: parted/parted.c:2055 msgid "quit" msgstr "koniec" -#: parted/parted.c:2042 +#: parted/parted.c:2058 msgid "quit exit program" msgstr "quit kończy pracę programu" -#: parted/parted.c:2047 +#: parted/parted.c:2063 msgid "rescue" msgstr "uratuj" -#: parted/parted.c:2050 +#: parted/parted.c:2066 msgid "" "rescue START END rescue a lost partition near START " "and END" @@ -2815,90 +2764,90 @@ msgstr "" "rescue POCZĄTEK KONIEC odzyskuje utraconą partycję blisko POCZĄTKU i " "KOŃCA" -#: parted/parted.c:2056 +#: parted/parted.c:2072 msgid "resize" msgstr "zmień-rozmiar" -#: parted/parted.c:2059 +#: parted/parted.c:2075 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:2062 +#: parted/parted.c:2078 msgid "resizepart" msgstr "resizepart" -#: parted/parted.c:2065 +#: parted/parted.c:2081 msgid "resizepart NUMBER END resize partition NUMBER" msgstr "resizepart NUMER KONIEC zmienia rozmiar partycji NUMER" -#: parted/parted.c:2070 +#: parted/parted.c:2086 msgid "rm" msgstr "usuń" -#: parted/parted.c:2073 +#: parted/parted.c:2089 msgid "rm NUMBER delete partition NUMBER" msgstr "rm NUMER usuwa partycję NUMER" -#: parted/parted.c:2078 +#: parted/parted.c:2094 msgid "select" msgstr "wybierz" -#: parted/parted.c:2081 +#: parted/parted.c:2097 msgid "select DEVICE choose the device to edit" msgstr "select URZĄDZENIE wybiera urządzenie do edycji" -#: parted/parted.c:2086 +#: parted/parted.c:2102 msgid "disk_set" msgstr "ustaw_dysk" -#: parted/parted.c:2089 +#: parted/parted.c:2105 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:2094 +#: parted/parted.c:2110 msgid "disk_toggle" msgstr "przełącz_dysk" -#: parted/parted.c:2097 +#: parted/parted.c:2113 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:2103 +#: parted/parted.c:2119 msgid "set" msgstr "ustaw" -#: parted/parted.c:2106 +#: parted/parted.c:2122 msgid "" "set NUMBER FLAG STATE change the FLAG on partition NUMBER" msgstr "set NUMER FLAGA STAN zmienia flagę na partycji NUMER" -#: parted/parted.c:2112 +#: parted/parted.c:2128 msgid "toggle" msgstr "przestaw" -#: parted/parted.c:2115 +#: parted/parted.c:2131 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:2121 +#: parted/parted.c:2137 msgid "unit" msgstr "jednostka" -#: parted/parted.c:2124 +#: parted/parted.c:2140 msgid "unit UNIT set the default unit to UNIT" msgstr "unit JEDNOSTKA ustawia domyślną jednostkę" -#: parted/parted.c:2129 +#: parted/parted.c:2145 msgid "version" msgstr "wersja" -#: parted/parted.c:2132 +#: parted/parted.c:2148 msgid "" "version display the version number and " "copyright information of GNU Parted" @@ -2906,7 +2855,7 @@ msgstr "" "version wyświetla numer wersji GNU Parteda i " "informacje o prawach autorskich" -#: parted/parted.c:2136 +#: parted/parted.c:2152 msgid "" "'version' displays copyright and version information corresponding to this " "copy of GNU Parted\n" @@ -2914,31 +2863,40 @@ msgstr "" "'version' wyświetla informacje o prawach autorskich i wersji dla tej kopii " "GNU Parteda\n" -#: parted/parted.c:2204 +#: parted/parted.c:2220 #, c-format msgid "Usage: %s [-hlmsv] [-a] [DEVICE [COMMAND [PARAMETERS]]...]\n" msgstr "" "Składnia: %s [-hlmsv] [-a] [URZĄDZENIE [POLECENIE " "[PARAMETRY]]...]\n" -#: parted/parted.c:2248 +#: parted/parted.c:2264 msgid "No device found" msgstr "Nie znaleziono urządzenia" -#: parted/parted.c:2285 +#: parted/parted.c:2301 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:2325 +#: parted/parted.c:2334 +msgid "" +"You should reinstall your boot loader before rebooting. Read section 4 of " +"the Parted User documentation for more information." +msgstr "" +"Należy przeinstalować program ładujący (boot loader) przed ponownym " +"uruchomieniem komputera. Przeczytaj rozdział 4 dokumentacji użytkownika " +"Parted, aby uzyskać więcej informacji." + +#: parted/parted.c:2341 msgid "You may need to update /etc/fstab.\n" msgstr "Może wystąpić potrzeba aktualizacji /etc/fstab.\n" -#: parted/ui.c:164 +#: parted/ui.c:165 msgid "Welcome to GNU Parted! Type 'help' to view a list of commands.\n" msgstr "" "Witamy w GNU Partedzie! Listę poleceń można zobaczyć po napisaniu 'help'.\n" -#: parted/ui.c:167 +#: parted/ui.c:168 msgid "" "Usage: parted [OPTION]... [DEVICE [COMMAND [PARAMETERS]...]...]\n" "Apply COMMANDs with PARAMETERS to DEVICE. If no COMMAND(s) are given, run " @@ -2949,7 +2907,7 @@ msgstr "" "Wykonuje POLECENIA z PARAMETRAMI dla URZĄDZENIA. Jeśli nie podano POLECEŃ,\n" "program zostanie uruchomiony w trybie interaktywnym.\n" -#: parted/ui.c:172 +#: parted/ui.c:173 #, c-format msgid "" "\n" @@ -3013,7 +2971,7 @@ msgstr "" "Dołącz także dodatkowe informacje o konfiguracji, które uważasz\n" "za istotne.\n" -#: parted/ui.c:293 +#: parted/ui.c:294 msgid "" "\n" "Command History:\n" @@ -3021,7 +2979,7 @@ msgstr "" "\n" "Historia poleceń:\n" -#: parted/ui.c:356 +#: parted/ui.c:357 msgid "" "\n" "Error: SEGV_MAPERR (Address not mapped to object)\n" @@ -3029,7 +2987,7 @@ msgstr "" "\n" "Błąd: SEGV_MAPERR (Adres nie odwzorowany na obiekcie)\n" -#: parted/ui.c:362 +#: parted/ui.c:363 msgid "" "\n" "Error: SEGV_ACCERR (Invalid permissions for mapped object)\n" @@ -3037,7 +2995,7 @@ msgstr "" "\n" "Błąd: SEGV_ACCERR (Nieprawidłowe uprawnienia dla odwzorowanego obiektu)\n" -#: parted/ui.c:367 +#: parted/ui.c:368 msgid "" "\n" "Error: A general SIGSEGV signal was encountered.\n" @@ -3045,7 +3003,7 @@ msgstr "" "\n" "Błąd: Wystąpił ogólny sygnał SIGSEGV.\n" -#: parted/ui.c:391 +#: parted/ui.c:392 msgid "" "\n" "Error: FPE_INTDIV (Integer: divide by zero)" @@ -3053,7 +3011,7 @@ msgstr "" "\n" "Błąd: FPE_INTDIV (dzielenie przez zero na liczbach całkowitych)" -#: parted/ui.c:396 +#: parted/ui.c:397 msgid "" "\n" "Error: FPE_INTOVF (Integer: overflow)" @@ -3061,7 +3019,7 @@ msgstr "" "\n" "Błąd: FPE_INTOVF (przepełnienie dla liczby całkowitej)" -#: parted/ui.c:401 +#: parted/ui.c:402 msgid "" "\n" "Error: FPE_FLTDIV (Float: divide by zero)" @@ -3069,7 +3027,7 @@ msgstr "" "\n" "Błąd: FPE_FLTDIV (dzielenie przez zero na liczbach zmiennoprzecinkowych)" -#: parted/ui.c:406 +#: parted/ui.c:407 msgid "" "\n" "Error: FPE_FLTOVF (Float: overflow)" @@ -3077,7 +3035,7 @@ msgstr "" "\n" "Błąd: FPE_FLTOVF (przepełnienie dla liczby zmiennoprzecinkowej)" -#: parted/ui.c:411 +#: parted/ui.c:412 msgid "" "\n" "Error: FPE_FLTUND (Float: underflow)" @@ -3085,7 +3043,7 @@ msgstr "" "\n" "Błąd: FPE_FLTUND (niedopełnienie dla liczby zmiennoprzecinkowej)" -#: parted/ui.c:416 +#: parted/ui.c:417 msgid "" "\n" "Error: FPE_FLTRES (Float: inexact result)" @@ -3093,7 +3051,7 @@ msgstr "" "\n" "Błąd: FPE_FLTRES (niedokładny wynik dla liczb zmiennoprzecinkowych)" -#: parted/ui.c:421 +#: parted/ui.c:422 msgid "" "\n" "Error: FPE_FLTINV (Float: invalid operation)" @@ -3101,7 +3059,7 @@ msgstr "" "\n" "Błąd: FPE_FLTINV (nieprawidłowa operacja dla liczb zmiennoprzecinkowych)" -#: parted/ui.c:426 +#: parted/ui.c:427 msgid "" "\n" "Error: FPE_FLTSUB (Float: subscript out of range)" @@ -3109,7 +3067,7 @@ msgstr "" "\n" "Błąd: FPE_FLTSUB (indeks spoza zakresu dla liczb zmiennoprzecinkowych)" -#: parted/ui.c:431 +#: parted/ui.c:432 msgid "" "\n" "Error: A general SIGFPE signal was encountered." @@ -3117,7 +3075,7 @@ msgstr "" "\n" "Błąd: Wystąpił ogólny sygnał SIGFPE." -#: parted/ui.c:455 +#: parted/ui.c:456 msgid "" "\n" "Error: ILL_ILLOPC (Illegal Opcode)" @@ -3125,7 +3083,7 @@ msgstr "" "\n" "Błąd: ILL_ILLOPC (niedozwolony kod instrukcji)" -#: parted/ui.c:460 +#: parted/ui.c:461 msgid "" "\n" "Error: ILL_ILLOPN (Illegal Operand)" @@ -3133,7 +3091,7 @@ msgstr "" "\n" "Błąd: ILL_ILLOPN (niedozwolony operand)" -#: parted/ui.c:465 +#: parted/ui.c:466 msgid "" "\n" "Error: ILL_ILLADR (Illegal addressing mode)" @@ -3141,7 +3099,7 @@ msgstr "" "\n" "Błąd: ILL_ILLADR (niedozwolony tryb adresowania)" -#: parted/ui.c:470 +#: parted/ui.c:471 msgid "" "\n" "Error: ILL_ILLTRP (Illegal Trap)" @@ -3149,7 +3107,7 @@ msgstr "" "\n" "Błąd: ILL_ILLTRP (niedozwolona pułapka)" -#: parted/ui.c:475 +#: parted/ui.c:476 msgid "" "\n" "Error: ILL_PRVOPC (Privileged Opcode)" @@ -3157,7 +3115,7 @@ msgstr "" "\n" "Błąd: ILL_PRVOPC (uprzywilejowany kod instrukcji)" -#: parted/ui.c:480 +#: parted/ui.c:481 msgid "" "\n" "Error: ILL_PRVREG (Privileged Register)" @@ -3165,7 +3123,7 @@ msgstr "" "\n" "Błąd: ILL_PRVREG (uprzywilejowany rejestr)" -#: parted/ui.c:485 +#: parted/ui.c:486 msgid "" "\n" "Error: ILL_COPROC (Coprocessor Error)" @@ -3173,7 +3131,7 @@ msgstr "" "\n" "Błąd: ILL_COPROC (błąd koprocesora)" -#: parted/ui.c:490 +#: parted/ui.c:491 msgid "" "\n" "Error: ILL_BADSTK (Internal Stack Error)" @@ -3181,7 +3139,7 @@ msgstr "" "\n" "Błąd: ILL_BADSTK (wewnętrzny błąd stosu)" -#: parted/ui.c:495 +#: parted/ui.c:496 msgid "" "\n" "Error: A general SIGILL signal was encountered." @@ -3189,69 +3147,69 @@ msgstr "" "\n" "Błąd: Wystąpił ogólny sygnał SIGILL." -#: parted/ui.c:888 +#: parted/ui.c:889 #, c-format msgid "invalid token: %s" msgstr "nieprawidłowy token: %s" -#: parted/ui.c:1069 +#: parted/ui.c:1070 msgid "Expecting a partition number." msgstr "Oczekiwany był numer partycji." -#: parted/ui.c:1078 +#: parted/ui.c:1079 msgid "Partition doesn't exist." msgstr "Partycja nie istnieje." -#: parted/ui.c:1098 +#: parted/ui.c:1099 msgid "Expecting a file system type." msgstr "Oczekiwany był typ systemu plików." -#: parted/ui.c:1105 +#: parted/ui.c:1106 #, c-format msgid "Unknown file system type \"%s\"." msgstr "Nieznany typ systemu plików \"%s\"." -#: parted/ui.c:1126 +#: parted/ui.c:1127 msgid "Expecting a disk label type." msgstr "Oczekiwany był typ etykiety dysku." -#: parted/ui.c:1157 parted/ui.c:1193 +#: parted/ui.c:1158 parted/ui.c:1194 msgid "No flags supported" -msgstr "" +msgstr "Brak obsługiwanych flag" -#: parted/ui.c:1267 +#: parted/ui.c:1268 msgid "Can't create any more partitions." msgstr "Nie można utworzyć więcej partycji." -#: parted/ui.c:1277 +#: parted/ui.c:1278 msgid "Expecting a partition type." msgstr "Oczekiwany był typ partycji." -#: parted/ui.c:1426 +#: parted/ui.c:1427 msgid "on" msgstr "włączone" -#: parted/ui.c:1427 +#: parted/ui.c:1428 msgid "off" msgstr "wyłączone" -#: parted/ui.c:1444 +#: parted/ui.c:1445 msgid "optimal" msgstr "optymalne" -#: parted/ui.c:1445 +#: parted/ui.c:1446 msgid "minimal" msgstr "minimalne" -#: parted/ui.c:1578 +#: parted/ui.c:1579 msgid "OPTIONs:" msgstr "OPCJE:" -#: parted/ui.c:1583 +#: parted/ui.c:1584 msgid "COMMANDs:" msgstr "POLECENIA:" -#: parted/ui.c:1586 +#: parted/ui.c:1587 #, c-format msgid "" "\n" @@ -3262,33 +3220,11 @@ msgstr "" "Błędy w tłumaczeniu prosimy zgłaszać na adres: .\n" -#: parted/ui.c:1593 +#: parted/ui.c:1594 #, c-format msgid "Using %s\n" msgstr "Użycie %s\n" -#: parted/ui.c:1673 +#: parted/ui.c:1674 msgid "This command does not make sense in non-interactive mode.\n" msgstr "To polecenie nie ma sensu w trybie nieinteraktywnym.\n" - -#~ msgid "%s: option '--%s' doesn't allow an argument\n" -#~ msgstr "%s: opcja '--%s' nie może mieć argumentów\n" - -#~ msgid "%s: unrecognized option '--%s'\n" -#~ msgstr "%s: nieznana opcja '--%s'\n" - -#~ msgid "%s: option '-W %s' doesn't allow an argument\n" -#~ msgstr "%s: opcja '-W %s' nie może mieć argumentów\n" - -#~ msgid "%s: option '-W %s' requires an argument\n" -#~ msgstr "%s: opcja '-W %s' musi mieć argument\n" - -#~ msgid "%s home page: \n" -#~ msgstr "Strona domowa projektu %s: .\n" - -#~ 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." -#~ msgstr "" -#~ "Ten system plików posiada rozmiar logicznego sektora %d. GNU Parted nie " -#~ "współpracuje prawidłowo z rozmiarami sektorów innymi niż 512 bajtów." diff --git a/po/pt.gmo b/po/pt.gmo index e0ddaa830545be22b755c03f95e0fec530069362..ccb5d7a62bd9aad5b77b5b56458fdf4f2ff39a2e 100644 GIT binary patch delta 918 zcmXZaOGs346vy#1Iys|;;seb`J~J~@6EPN7#eyd1kS=it)IHLEOY*^yQml zWd!B9}W@^S;VIy58bw)EQ>(n`!niEkmTF|Btp_(X}#Vo`q8m6E`&!$C9 zkOXcbX%jAroPq%(S{bwnOvq(P%b@5&LC|H<|6vXc{J!&@@AAISnc{GH_~~@We^O=k zGH%vmX89(w!}t(4;Ah-|;pU2+sQDAP8%HpPckw*V;%SVxm}RhlAzZ|2T*5(I#?9y^ z%(v|fh7x8+Z~~+F3Qyu2JdPbnv$c2yJ-mqr@CA0^Z(NT~tJy9bz%UkY2VO-LI)iQa z9M9tWR^RLpgA}s^IEH;VkE`)7Hee0quEZu>z&1?dcT^#J+badUoni=XhR+OsLm&`8fQ@nJVTxL z5w-qH@cswtynna~wK&B67Ga=HYf&#^sEu({\n" "Language-Team: Portuguese \n" @@ -96,11 +96,11 @@ msgstr "" #. If you don't know what to put here, please see #. #. and use glyphs suitable for your language. -#: lib/quotearg.c:362 +#: lib/quotearg.c:355 msgid "`" msgstr "" -#: lib/quotearg.c:363 +#: lib/quotearg.c:356 msgid "'" msgstr "" @@ -341,79 +341,64 @@ msgstr "" msgid "memory exhausted" msgstr "" -#: lib/xstrtol-error.c:63 -#, c-format -msgid "invalid %s%s argument '%s'" -msgstr "" - -#: lib/xstrtol-error.c:68 -#, c-format -msgid "invalid suffix in %s%s argument '%s'" -msgstr "" - -#: lib/xstrtol-error.c:72 -#, c-format -msgid "%s%s argument '%s' too large" -msgstr "" - -#: libparted/arch/beos.c:245 +#: libparted/arch/beos.c:246 msgid "Disk Image" msgstr "" -#: libparted/arch/beos.c:346 libparted/arch/gnu.c:277 +#: libparted/arch/beos.c:347 libparted/arch/gnu.c:277 #: libparted/arch/linux.c:1731 #, c-format msgid "Error opening %s: %s" msgstr "Erro abrindo %s: %s" -#: libparted/arch/beos.c:357 libparted/arch/gnu.c:287 +#: libparted/arch/beos.c:358 libparted/arch/gnu.c:287 #: libparted/arch/linux.c:1742 #, c-format msgid "Unable to open %s read-write (%s). %s has been opened read-only." msgstr "" "Não posso abrir %s para gravação (%s). %s foi aberto somente para leitura." -#: libparted/arch/beos.c:419 libparted/arch/linux.c:1907 +#: libparted/arch/beos.c:420 libparted/arch/linux.c:1907 #, c-format msgid "%s during seek for read on %s" msgstr "%s durante procura para leitura em %s" -#: libparted/arch/beos.c:452 libparted/arch/gnu.c:465 libparted/arch/gnu.c:564 -#: libparted/arch/gnu.c:692 libparted/arch/linux.c:1867 +#: libparted/arch/beos.c:453 libparted/arch/gnu.c:425 libparted/arch/gnu.c:524 +#: libparted/arch/gnu.c:652 libparted/arch/linux.c:1867 #: libparted/arch/linux.c:1949 #, c-format msgid "%s during read on %s" msgstr "%s durante leitura em %s" -#: libparted/arch/beos.c:488 libparted/arch/gnu.c:525 +#: libparted/arch/beos.c:489 libparted/arch/gnu.c:485 #: libparted/arch/linux.c:2026 #, c-format msgid "Can't write to %s, because it is opened read-only." msgstr "Não posso gravar em %s, pois ela foi aberta como somente para leitura." -#: libparted/arch/beos.c:504 libparted/arch/linux.c:2051 +#: libparted/arch/beos.c:505 libparted/arch/linux.c:2051 #, c-format msgid "%s during seek for write on %s" msgstr "%s durante procura para escrita em %s" -#: libparted/arch/beos.c:541 libparted/arch/gnu.c:601 libparted/arch/gnu.c:646 -#: libparted/arch/gnu.c:723 libparted/arch/linux.c:1999 +#: libparted/arch/beos.c:542 libparted/arch/gnu.c:561 libparted/arch/gnu.c:606 +#: libparted/arch/gnu.c:683 libparted/arch/linux.c:1999 #: libparted/arch/linux.c:2094 libparted/arch/linux.c:2167 #, c-format msgid "%s during write on %s" msgstr "%s durante escrita em %s" -#: partprobe/partprobe.c:148 +#: partprobe/partprobe.c:149 #, c-format msgid "Try `%s --help' for more information.\n" msgstr "" -#: partprobe/partprobe.c:152 +#: partprobe/partprobe.c:153 #, c-format msgid "Usage: %s [OPTION] [DEVICE]...\n" msgstr "" -#: partprobe/partprobe.c:153 +#: partprobe/partprobe.c:154 msgid "" "Inform the operating system about partition table changes.\n" "\n" @@ -423,13 +408,13 @@ msgid "" " -v, --version output version information and exit\n" msgstr "" -#: partprobe/partprobe.c:161 +#: partprobe/partprobe.c:162 msgid "" "\n" "When no DEVICE is given, probe all partitions.\n" msgstr "" -#: partprobe/partprobe.c:165 +#: partprobe/partprobe.c:166 #, c-format msgid "" "\n" @@ -446,43 +431,7 @@ msgstr "" msgid "Unable to probe store." msgstr "Impossível alinhar a partição." -#: libparted/arch/gnu.c:368 -#, fuzzy -msgid "" -"The partition table cannot be re-read. This means you need to reboot before " -"mounting any modified partitions. You also need to reinstall your boot " -"loader before you reboot (which may require mounting modified partitions). " -"It is impossible do both things! So you'll need to boot off a rescue disk, " -"and reinstall your boot loader from the rescue disk. Read section 4 of the " -"Parted User documentation for more information." -msgstr "" -"O kernel não pôde reler sua tabela de partições, portanto precisa de " -"reiniciar antes de montar qualquer partição modificada. Voce pode também " -"precisar reinstalar seu gestor de boot antes de reinicializar (o que pode " -"requerer a montagem das partições modificadas). É impossível fazer as duas " -"coisas! Leia a secção 4 da documentação do usuário do Parted para mais " -"informações." - -#: libparted/arch/gnu.c:385 -#, fuzzy, 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 computer " -"before doing anything with %s." -msgstr "" -"O kernel não conseguiu reler a tabela de partições de %s (%s). Isto " -"significa que o Linux não sabe nada sobre as modificações que fez. Deverá " -"reinicializar seu computador antes de fazer qualquer uso de %s." - -#: libparted/arch/gnu.c:396 parted/parted.c:2318 -msgid "" -"You should reinstall your boot loader before rebooting. Read section 4 of " -"the Parted User documentation for more information." -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." - -#: libparted/arch/gnu.c:788 +#: libparted/arch/gnu.c:748 #, c-format msgid "%s trying to sync %s to disk" msgstr "" @@ -785,15 +734,15 @@ msgstr "" msgid "free" msgstr "livre" -#: libparted/disk.c:2355 parted/ui.c:1258 parted/ui.c:1286 +#: libparted/disk.c:2355 parted/ui.c:1259 parted/ui.c:1287 msgid "extended" msgstr "extendida" -#: libparted/disk.c:2357 parted/ui.c:1262 parted/ui.c:1290 +#: libparted/disk.c:2357 parted/ui.c:1263 parted/ui.c:1291 msgid "logical" msgstr "lógica" -#: libparted/disk.c:2359 parted/ui.c:1254 parted/ui.c:1282 +#: libparted/disk.c:2359 parted/ui.c:1255 parted/ui.c:1283 msgid "primary" msgstr "primária" @@ -870,64 +819,73 @@ msgstr "" msgid "esp" msgstr "Sim" -#: libparted/disk.c:2415 +#: libparted/disk.c:2411 +msgid "chromeos_kernel" +msgstr "" + +#: libparted/disk.c:2413 +#, fuzzy +msgid "bls_boot" +msgstr "boot" + +#: libparted/disk.c:2419 #, fuzzy, c-format msgid "Unknown partition flag, %d." msgstr "Sinalizador de partição desconhecido, %d." -#: libparted/exception.c:78 +#: libparted/exception.c:79 msgid "Information" msgstr "Informação" -#: libparted/exception.c:79 +#: libparted/exception.c:80 msgid "Warning" msgstr "Aviso" -#: libparted/exception.c:80 +#: libparted/exception.c:81 msgid "Error" msgstr "Erro" -#: libparted/exception.c:81 +#: libparted/exception.c:82 msgid "Fatal" msgstr "Fatal" -#: libparted/exception.c:82 +#: libparted/exception.c:83 msgid "Bug" msgstr "Bug" -#: libparted/exception.c:83 +#: libparted/exception.c:84 msgid "No Implementation" msgstr "Sem Implementação" -#: libparted/exception.c:87 +#: libparted/exception.c:88 msgid "Fix" msgstr "Arranjar" -#: libparted/exception.c:88 +#: libparted/exception.c:89 msgid "Yes" msgstr "Sim" -#: libparted/exception.c:89 +#: libparted/exception.c:90 msgid "No" msgstr "Não" -#: libparted/exception.c:90 +#: libparted/exception.c:91 msgid "OK" msgstr "OK" -#: libparted/exception.c:91 +#: libparted/exception.c:92 msgid "Retry" msgstr "Repetir" -#: libparted/exception.c:92 +#: libparted/exception.c:93 msgid "Ignore" msgstr "Ignorar" -#: libparted/exception.c:93 +#: libparted/exception.c:94 msgid "Cancel" msgstr "Cancelar" -#: libparted/exception.c:133 +#: libparted/exception.c:134 #, c-format msgid "" "A bug has been detected in GNU Parted. Refer to the web site of parted " @@ -936,33 +894,33 @@ msgid "" "containing at least the version (%s) and the following message: " msgstr "" -#: libparted/labels/aix.c:91 +#: libparted/labels/aix.c:92 #, fuzzy msgid "Support for reading AIX disk labels is is not implemented yet." msgstr "" "O suporte para criar sistema de ficheiros %s não foi implementado ainda." -#: libparted/labels/aix.c:102 +#: libparted/labels/aix.c:103 #, fuzzy msgid "Support for writing AIX disk labels is is not implemented yet." msgstr "" "O suporte para criar sistema de ficheiros %s não foi implementado ainda." -#: libparted/labels/aix.c:115 +#: libparted/labels/aix.c:116 #, fuzzy msgid "" "Support for adding partitions to AIX disk labels is not implemented yet." msgstr "" "O suporte para criar sistema de ficheiros %s não foi implementado ainda." -#: libparted/labels/aix.c:125 +#: libparted/labels/aix.c:126 #, fuzzy msgid "" "Support for duplicating partitions in AIX disk labels is not implemented yet." msgstr "" "O suporte para criar sistema de ficheiros %s não foi implementado ainda." -#: libparted/labels/aix.c:143 +#: libparted/labels/aix.c:144 #, fuzzy msgid "" "Support for setting system type of partitions in AIX disk labels is not " @@ -970,7 +928,7 @@ msgid "" msgstr "" "O suporte para criar sistema de ficheiros %s não foi implementado ainda." -#: libparted/labels/aix.c:153 +#: libparted/labels/aix.c:154 #, fuzzy msgid "Support for setting flags in AIX disk labels is not implemented yet." msgstr "" @@ -1060,11 +1018,11 @@ msgid "" "partitions, if XGM is the first one it counts for two)." msgstr "" -#: libparted/labels/atari.c:1657 libparted/labels/bsd.c:567 -#: libparted/labels/dasd.c:894 libparted/labels/dos.c:2276 -#: libparted/labels/dvh.c:770 libparted/labels/gpt.c:2050 -#: libparted/labels/loop.c:243 libparted/labels/mac.c:1423 -#: libparted/labels/pc98.c:701 libparted/labels/rdb.c:1054 +#: libparted/labels/atari.c:1657 libparted/labels/bsd.c:563 +#: libparted/labels/dasd.c:895 libparted/labels/dos.c:2283 +#: libparted/labels/dvh.c:770 libparted/labels/gpt.c:2140 +#: 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 #, fuzzy msgid "Unable to satisfy all constraints on the partition." @@ -1082,45 +1040,45 @@ msgstr "" msgid "Unable to allocate a partition number." msgstr "Impossível alinhar a partição." -#: libparted/labels/bsd.c:592 +#: libparted/labels/bsd.c:588 #, fuzzy msgid "Unable to allocate a bsd disklabel slot." msgstr "Impossível localizar um rotulo de disco bsd" -#: libparted/labels/dasd.c:625 +#: libparted/labels/dasd.c:626 msgid "The partition table of DASD-LDL device cannot be changed.\n" msgstr "" -#: libparted/labels/dasd.c:920 +#: libparted/labels/dasd.c:921 #, fuzzy msgid "Unable to allocate a dasd disklabel slot" msgstr "Impossível localizar um rotulo de disco bsd" -#: libparted/labels/dos.c:1003 +#: libparted/labels/dos.c:1006 #, 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:1031 +#: libparted/labels/dos.c:1034 #, 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:1560 +#: libparted/labels/dos.c:1557 #, 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:1572 +#: libparted/labels/dos.c:1569 #, 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:2258 +#: libparted/labels/dos.c:2265 msgid "Parted can't resize partitions managed by Windows Dynamic Disk." msgstr "" -#: libparted/labels/dos.c:2514 +#: libparted/labels/dos.c:2521 #, fuzzy msgid "cannot create any more partitions" msgstr "Não posso copiar partições extendidas." @@ -1269,18 +1227,18 @@ msgstr "" msgid "Disk geometry does not match a DASD device of type 3390." msgstr "" -#: libparted/labels/gpt.c:531 +#: libparted/labels/gpt.c:541 msgid "device is too small for GPT" msgstr "" -#: libparted/labels/gpt.c:733 +#: libparted/labels/gpt.c:743 #, 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:769 +#: libparted/labels/gpt.c:779 #, c-format msgid "" "Not all of the space available to %s appears to be used, you can fix the GPT " @@ -1288,35 +1246,35 @@ msgid "" "setting? " msgstr "" -#: libparted/labels/gpt.c:1008 +#: libparted/labels/gpt.c:1024 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:1026 +#: libparted/labels/gpt.c:1042 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:1037 +#: libparted/labels/gpt.c:1053 msgid "" "The backup GPT table is corrupt, but the primary appears OK, so that will be " "used." msgstr "" -#: libparted/labels/gpt.c:1049 +#: libparted/labels/gpt.c:1065 msgid "" "The primary GPT table is corrupt, but the backup appears OK, so that will be " "used." msgstr "" -#: libparted/labels/gpt.c:1073 +#: libparted/labels/gpt.c:1089 msgid "primary partition table array CRC mismatch" msgstr "" -#: libparted/labels/gpt.c:1936 libparted/labels/gpt.c:1963 +#: libparted/labels/gpt.c:2026 libparted/labels/gpt.c:2053 #, fuzzy msgid "failed to translate partition name" msgstr "Impossível alinhar a partição." @@ -1351,19 +1309,14 @@ msgid "The data region doesn't start at the start of the partition." msgstr "A região de dados não começa no início da partição" #: libparted/labels/mac.c:572 -#, fuzzy -msgid "The boot region doesn't start at the start of the partition." -msgstr "A região de inicialização não começa no início da partição" - -#: libparted/labels/mac.c:586 msgid "The partition's boot region doesn't occupy the entire partition." msgstr "A região de inicialização da partição não a ocupa inteiramente." -#: libparted/labels/mac.c:597 +#: libparted/labels/mac.c:583 msgid "The partition's data region doesn't occupy the entire partition." msgstr "A região de dados da partição não a ocupa inteiramente." -#: libparted/labels/mac.c:649 +#: libparted/labels/mac.c:635 #, c-format msgid "" "Weird block size on device descriptor: %d bytes is not divisible by 512." @@ -1371,7 +1324,7 @@ msgstr "" "tamanho de bloco estranho no descritor de dispositivo: %d bytes não são " "divisíveis por 512." -#: libparted/labels/mac.c:662 +#: libparted/labels/mac.c:648 #, c-format msgid "" "The driver descriptor says the physical block size is %d bytes, but Linux " @@ -1380,11 +1333,11 @@ msgstr "" "O descritor do driver informa que o tamanho físico de bloco é %d bytes, mas " "o Linux informa que é %d bytes." -#: libparted/labels/mac.c:715 +#: libparted/labels/mac.c:701 msgid "No valid partition map found." msgstr "Nenhum mapa de partições válido foi encontrado." -#: libparted/labels/mac.c:789 +#: libparted/labels/mac.c:775 #, fuzzy, c-format msgid "" "Conflicting partition map entry sizes! Entry 1 says it is %d, but entry %d " @@ -1393,12 +1346,12 @@ msgstr "" "Conflito nos tamanhos de mapa de partição! Entrada 1 informa que é %d, mas " "entrada %d informa que é %d!" -#: libparted/labels/mac.c:820 +#: libparted/labels/mac.c:806 #, fuzzy msgid "Weird! There are 2 partitions map entries!" msgstr "Estranho - 2 entradas no mapa de partição" -#: libparted/labels/mac.c:1359 +#: libparted/labels/mac.c:1345 msgid "" "Changing the name of a root or swap partition will prevent Linux from " "recognising it as such." @@ -1406,18 +1359,18 @@ msgstr "" "Mudar o nome de uma partição root ou swap irá impedir o Linux de reconhecê-" "la como tal." -#: libparted/labels/mac.c:1458 +#: libparted/labels/mac.c:1444 #, fuzzy msgid "Can't add another partition -- the partition map is too small!" msgstr "" "Não posso adicionar outra partição - o mapa de partições é muito pequeno!" -#: libparted/labels/pc98.c:284 +#: libparted/labels/pc98.c:285 #, fuzzy, c-format msgid "Invalid partition table on %s." msgstr "Tabela de partições inválida em %s" -#: libparted/labels/pc98.c:337 libparted/labels/pc98.c:415 +#: libparted/labels/pc98.c:338 libparted/labels/pc98.c:416 #, fuzzy, c-format msgid "" "Partition %d isn't aligned to cylinder boundaries. This is still " @@ -1426,7 +1379,7 @@ msgstr "" "A partição %d não está alinhada com o limite do cilindro. Preciso adicionar " "suporte para isso." -#: libparted/labels/pc98.c:733 +#: libparted/labels/pc98.c:729 msgid "Can't add another partition." msgstr "Não posso adicionar outra partição." @@ -1593,39 +1546,39 @@ msgstr "" msgid "Could not write VTOC FMT9 DSCB." msgstr "" -#: libparted/libparted.c:242 +#: libparted/libparted.c:247 msgid "Out of memory." msgstr "Não há memória." -#: libparted/unit.c:139 +#: libparted/unit.c:140 msgid "Cannot get unit size for special unit 'COMPACT'." msgstr "" -#: libparted/unit.c:385 +#: libparted/unit.c:386 #, c-format msgid "\"%s\" has invalid syntax for locations." msgstr "" -#: libparted/unit.c:393 +#: libparted/unit.c:394 #, c-format msgid "The maximum head value is %d." msgstr "" -#: libparted/unit.c:400 +#: libparted/unit.c:401 #, c-format msgid "The maximum sector value is %d." msgstr "" -#: libparted/unit.c:412 libparted/unit.c:564 +#: libparted/unit.c:413 libparted/unit.c:565 #, fuzzy, c-format msgid "The location %s is outside of the device %s." msgstr "Impossível criar partição fora do dispositivo." -#: libparted/unit.c:526 +#: libparted/unit.c:527 msgid "Invalid number." msgstr "" -#: libparted/unit.c:532 +#: libparted/unit.c:533 msgid "Use a smaller unit instead of a value < 1" msgstr "" @@ -1635,18 +1588,18 @@ msgstr "" msgid "%s : Failed to allocate partition block\n" msgstr "" -#: libparted/fs/amiga/affs.c:79 libparted/fs/amiga/apfs.c:71 +#: 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 "" -#: libparted/fs/amiga/affs.c:84 libparted/fs/amiga/apfs.c:76 +#: libparted/fs/amiga/affs.c:83 libparted/fs/amiga/apfs.c:76 #, c-format msgid "%s : Couldn't read boot block %llu\n" msgstr "" -#: libparted/fs/amiga/affs.c:98 libparted/fs/amiga/apfs.c:87 +#: 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" @@ -1672,22 +1625,22 @@ msgstr "" msgid "%s : Couldn't write block %d\n" msgstr "%s durante escrita em %s" -#: libparted/fs/amiga/amiga.c:278 +#: libparted/fs/amiga/amiga.c:279 #, c-format msgid "%s : Failed to allocate disk_specific rdb block\n" msgstr "" -#: libparted/fs/amiga/amiga.c:289 +#: libparted/fs/amiga/amiga.c:290 #, c-format msgid "%s : Didn't find rdb block, should never happen\n" msgstr "" -#: libparted/fs/amiga/amiga.c:318 +#: libparted/fs/amiga/amiga.c:319 #, c-format msgid "%s : Failed to read partition block %llu\n" msgstr "" -#: libparted/fs/fat/fat.c:148 libparted/fs/r/fat/fat.c:811 +#: libparted/fs/fat/fat.c:149 #, fuzzy msgid "" "GNU Parted was miscompiled: the FAT boot sector should be 512 bytes. FAT " @@ -1778,7 +1731,7 @@ msgid "" "geometry." msgstr "" -#: libparted/fs/r/fat/bootsector.c:399 +#: libparted/fs/r/fat/bootsector.c:398 #, c-format msgid "" "The information sector has the wrong signature (%x). Select cancel for now, " @@ -1805,14 +1758,14 @@ msgstr "" "O cluster inicia em delta = %d, que não é um múltiplo do tamanho de cluster " "%d." -#: libparted/fs/r/fat/count.c:144 +#: libparted/fs/r/fat/count.c:84 #, c-format msgid "Bad directory entry for %s: first cluster is the end of file marker." msgstr "" "Entrada de diretório inválida para %s: o primeiro cluster é o fim do " "marcador de ficheiro." -#: libparted/fs/r/fat/count.c:157 +#: libparted/fs/r/fat/count.c:97 #, c-format msgid "" "Bad FAT: unterminated chain for %s. You should run dosfsck or scandisk." @@ -1820,7 +1773,7 @@ msgstr "" "FAT estragada: cadeia não terminada para %s. Você deveria correr o dosfsck " "ou o scandisk." -#: libparted/fs/r/fat/count.c:166 +#: libparted/fs/r/fat/count.c:106 #, fuzzy, c-format msgid "" "Bad FAT: cluster %d outside file system in chain for %s. You should run " @@ -1829,7 +1782,7 @@ msgstr "" "FAT estragada: cluster %d fora do sistema de ficheiros na cadeia para %s. " "Você deveria correr o dosfsck ou o scandisk." -#: libparted/fs/r/fat/count.c:176 +#: libparted/fs/r/fat/count.c:116 #, c-format msgid "" "Bad FAT: cluster %d is cross-linked for %s. You should run dosfsck or " @@ -1838,24 +1791,17 @@ msgstr "" "FAT estragada: o cluster %d tem uma referência cruzada para %s. Você deveria " "correr o dosfsck ou o scandisk." -#: libparted/fs/r/fat/count.c:195 +#: libparted/fs/r/fat/count.c:135 #, fuzzy, c-format msgid "%s is %dk, but it has %d clusters (%dk)." msgstr "%s é %dk, mas tem %d clusters (%dk)." -#: libparted/fs/r/fat/count.c:258 -#, c-format -msgid "" -"The file %s is marked as a system file. This means moving it could cause " -"some programs to stop working." -msgstr "" - -#: libparted/fs/r/fat/fat.c:243 +#: libparted/fs/r/fat/fat.c:244 #, fuzzy, c-format msgid "Partition too big/small for a %s file system." msgstr "A partição é muito pequena para um sistema de ficheiros FAT" -#: libparted/fs/r/fat/fat.c:409 +#: 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." @@ -1863,11 +1809,11 @@ msgstr "" "As FATs não estão iguais. Se não sabe o que isto significa, seleccione " "cancelar, execute o scandisk no sistema de ficheiros, depois volte." -#: libparted/fs/r/fat/fat.c:449 +#: libparted/fs/r/fat/fat.c:450 msgid "There are no possible configurations for this FAT type." msgstr "Não há configurações possíveis para este tipo de FAT." -#: libparted/fs/r/fat/fat.c:461 +#: libparted/fs/r/fat/fat.c:462 #, c-format msgid "" "File system doesn't have expected sizes for Windows to like it. Cluster " @@ -1878,7 +1824,7 @@ msgstr "" "utilize. O tamanho do cluster é %dk (%dk esperado); número de clusters é %d " "(%d esperado); tamanho da FAT é %d sectores (%d esperado)." -#: libparted/fs/r/fat/fat.c:484 +#: libparted/fs/r/fat/fat.c:485 #, c-format msgid "" "File system is reporting the free space as %d clusters, not %d clusters." @@ -1886,7 +1832,7 @@ msgstr "" "O sistema de ficheiros reporta que o espaço livre é de %d clusters, não de " "%d clusters." -#: libparted/fs/r/fat/resize.c:158 +#: libparted/fs/r/fat/resize.c:159 #, fuzzy msgid "" "There's not enough room in the root directory for all of the files. Either " @@ -1895,16 +1841,16 @@ msgstr "" "Não há espaço suficiente no diretório raiz para todos os ficheiros. Cancele, " "ou ignore para perder os ficheiros." -#: libparted/fs/r/fat/resize.c:302 +#: libparted/fs/r/fat/resize.c:303 msgid "Error writing to the root directory." msgstr "Erro escrevendo no diretório raiz." -#: libparted/fs/r/fat/resize.c:495 +#: libparted/fs/r/fat/resize.c:479 #, fuzzy msgid "If you leave your file system as FAT16, then you will have no problems." msgstr "Se deixar seu sistema de ficheiros como FAT16, não haverá problemas." -#: libparted/fs/r/fat/resize.c:498 +#: 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 " @@ -1914,7 +1860,7 @@ msgstr "" "deverá reinstalar o gestor de boot do MS Windows. Se quiser fazer isso, " "consulte o manual do Parted (ou o manual de sua distribuição)." -#: libparted/fs/r/fat/resize.c:506 +#: libparted/fs/r/fat/resize.c:490 msgid "" "If you leave your file system as FAT32, then you will not introduce any new " "problems." @@ -1922,7 +1868,7 @@ msgstr "" "Se deixar seu sistema de ficheiros como FAT32, você não terá mais nenhum " "problema novo." -#: libparted/fs/r/fat/resize.c:510 +#: 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 " @@ -1936,35 +1882,35 @@ msgstr "" "convertendo para FAT32 fará com que o sistema de ficheiros não seja mais " "reconhecido pelo MS DOS, Windows 95a, e MS Windows NT." -#: libparted/fs/r/fat/resize.c:524 +#: libparted/fs/r/fat/resize.c:508 #, c-format msgid "%s %s %s" msgstr "" -#: libparted/fs/r/fat/resize.c:525 +#: libparted/fs/r/fat/resize.c:509 msgid "Would you like to use FAT32?" msgstr "Você gostaria de usar FAT32?" -#: libparted/fs/r/fat/resize.c:556 libparted/fs/r/fat/resize.c:572 +#: libparted/fs/r/fat/resize.c:540 libparted/fs/r/fat/resize.c:556 #, c-format msgid "%s %s" msgstr "" -#: libparted/fs/r/fat/resize.c:557 +#: libparted/fs/r/fat/resize.c:541 msgid "" "The file system can only be resized to this size by converting to FAT16." msgstr "" "O sistema de ficheiros só pode ser redimensionado para esse tamanho se " "convertido para FAT16." -#: libparted/fs/r/fat/resize.c:573 +#: libparted/fs/r/fat/resize.c:557 msgid "" "The file system can only be resized to this size by converting to FAT32." msgstr "" "O sistema de ficheiros só pode ser redimensionado para esse tamanho se " "convertido para FAT32." -#: libparted/fs/r/fat/resize.c:586 +#: libparted/fs/r/fat/resize.c:570 #, fuzzy msgid "" "GNU Parted cannot resize this partition to this size. We're working on it!" @@ -1972,7 +1918,7 @@ msgstr "" "O GNU Parted não pode redimensionar esta partição para esse tamanho. Estamos " "a trabalhar nisso!" -#: libparted/fs/r/fat/table.c:136 +#: 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 " @@ -1981,43 +1927,43 @@ msgstr "" "FAT %d média %x não coincide com o sector de boot médio %x. Você deveria " "executar o scandisk." -#: libparted/fs/r/fat/table.c:268 +#: libparted/fs/r/fat/table.c:269 #, fuzzy, c-format msgid "fat_table_set: cluster %ld outside file system" msgstr "fat_table_set: cluster %ld fora do sistema de ficheiros" -#: libparted/fs/r/fat/table.c:300 +#: libparted/fs/r/fat/table.c:301 #, fuzzy, c-format msgid "fat_table_get: cluster %ld outside file system" msgstr "fat_table_get: cluster %ld fora do sistema de ficheiros" -#: libparted/fs/r/fat/table.c:342 +#: libparted/fs/r/fat/table.c:343 msgid "fat_table_alloc_cluster: no free clusters" msgstr "fat_table_alloc_cluster: não há clusters livres" -#: libparted/fs/r/filesys.c:151 +#: libparted/fs/r/filesys.c:152 msgid "Could not detect file system." msgstr "Não foi possível detectar o sistema de Ficheiros." -#: libparted/fs/r/filesys.c:158 libparted/fs/r/filesys.c:285 +#: libparted/fs/r/filesys.c:159 libparted/fs/r/filesys.c:284 #, fuzzy, c-format msgid "resizing %s file systems is not supported" msgstr "" "Suporte para redimensionar sistema de ficheiros não implementado para %s." -#: libparted/fs/r/filesys.c:170 +#: libparted/fs/r/filesys.c:171 #, fuzzy msgid "The file system is bigger than its volume!" msgstr "O rotulo do disco afirma que o disco é maior que %s" -#: libparted/fs/r/hfs/advfs.c:121 libparted/fs/r/hfs/advfs_plus.c:121 -#: libparted/fs/r/hfs/reloc.c:413 libparted/fs/r/hfs/reloc.c:507 -#: libparted/fs/r/hfs/reloc_plus.c:538 libparted/fs/r/hfs/reloc_plus.c:656 -#: libparted/fs/r/hfs/reloc_plus.c:769 +#: 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:285 +#: libparted/fs/r/hfs/advfs_plus.c:287 msgid "Bad blocks could not be read." msgstr "" @@ -2075,89 +2021,89 @@ msgstr "" msgid "Trying to write HFS+ file with CNID %X behind EOF." msgstr "" -#: libparted/fs/r/hfs/hfs.c:232 +#: libparted/fs/r/hfs/hfs.c:212 msgid "Sorry, HFS cannot be resized that way yet." msgstr "" -#: libparted/fs/r/hfs/hfs.c:250 libparted/fs/r/hfs/hfs.c:629 +#: libparted/fs/r/hfs/hfs.c:230 libparted/fs/r/hfs/hfs.c:573 msgid "shrinking" msgstr "" -#: libparted/fs/r/hfs/hfs.c:262 libparted/fs/r/hfs/hfs.c:641 +#: 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:281 +#: 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:320 +#: libparted/fs/r/hfs/hfs.c:300 #, fuzzy msgid "writing HFS Master Directory Block" msgstr "Erro escrevendo no diretório raiz." -#: libparted/fs/r/hfs/hfs.c:468 +#: 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:478 +#: libparted/fs/r/hfs/hfs.c:422 #, c-format msgid "Version %d of HFS+ isn't supported." msgstr "" -#: libparted/fs/r/hfs/hfs.c:489 +#: libparted/fs/r/hfs/hfs.c:433 #, c-format msgid "Version %d of HFSX isn't supported." msgstr "" -#: libparted/fs/r/hfs/hfs.c:672 +#: 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:720 +#: libparted/fs/r/hfs/hfs.c:664 #, fuzzy msgid "Error while writing the allocation file." msgstr "Erro escrevendo no diretório raiz." -#: libparted/fs/r/hfs/hfs.c:735 +#: 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:750 +#: libparted/fs/r/hfs/hfs.c:694 msgid "writing HFS+ Volume Header" msgstr "" -#: libparted/fs/r/hfs/hfs.c:850 +#: 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:904 +#: 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:940 +#: libparted/fs/r/hfs/hfs.c:883 msgid "Sorry, HFS+ cannot be resized that way yet." msgstr "" -#: libparted/fs/r/hfs/hfs.c:975 +#: libparted/fs/r/hfs/hfs.c:918 msgid "shrinking embedded HFS+ volume" msgstr "" -#: libparted/fs/r/hfs/hfs.c:992 +#: libparted/fs/r/hfs/hfs.c:935 msgid "Resizing the HFS+ volume has failed." msgstr "" -#: libparted/fs/r/hfs/hfs.c:999 +#: libparted/fs/r/hfs/hfs.c:942 msgid "shrinking HFS wrapper" msgstr "" -#: libparted/fs/r/hfs/hfs.c:1008 +#: libparted/fs/r/hfs/hfs.c:951 msgid "Updating the HFS wrapper has failed." msgstr "" -#: libparted/fs/r/hfs/hfs.c:1110 libparted/fs/r/hfs/hfs.c:1195 +#: 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 " @@ -2228,73 +2174,73 @@ msgstr "" msgid "An extent has not been relocated." msgstr "" -#: libparted/fs/r/hfs/reloc.c:250 libparted/fs/r/hfs/reloc_plus.c:307 +#: 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:380 +#: 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:474 +#: 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:516 libparted/fs/r/hfs/reloc_plus.c:666 +#: 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:573 libparted/fs/r/hfs/reloc_plus.c:844 +#: libparted/fs/r/hfs/reloc.c:579 libparted/fs/r/hfs/reloc_plus.c:849 #, fuzzy msgid "Could not cache the file system in memory." msgstr "Não foi possível detectar o sistema de Ficheiros." -#: libparted/fs/r/hfs/reloc.c:634 libparted/fs/r/hfs/reloc_plus.c:905 +#: 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:648 libparted/fs/r/hfs/reloc_plus.c:921 +#: 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:494 +#: 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:617 +#: 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:125 +#: parted/parted.c:126 msgid "displays this help message" msgstr "mostra esta mensagem de ajuda" -#: parted/parted.c:126 +#: parted/parted.c:127 msgid "lists partition layout on all block devices" msgstr "" -#: parted/parted.c:127 +#: parted/parted.c:128 msgid "displays machine parseable output" msgstr "" -#: parted/parted.c:128 +#: parted/parted.c:129 msgid "never prompts for user intervention" msgstr "nunca pede intervenção do utulizador" -#: parted/parted.c:129 +#: parted/parted.c:130 msgid "displays the version" msgstr "mostra a versão" -#: parted/parted.c:130 +#: parted/parted.c:131 #, fuzzy msgid "alignment for new partitions" msgstr "Não posso copiar partições extendidas." -#: parted/parted.c:142 +#: parted/parted.c:143 #, fuzzy msgid "" "NUMBER is the partition number used by Linux. On MS-DOS disk labels, the " @@ -2303,57 +2249,57 @@ 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:145 +#: parted/parted.c:146 msgid "LABEL-TYPE is one of: " msgstr "TIPO_ROTULO é um de:" -#: parted/parted.c:146 parted/parted.c:147 +#: parted/parted.c:147 parted/parted.c:148 msgid "FLAG is one of: " msgstr "FLAG é um de: " -#: parted/parted.c:148 +#: parted/parted.c:149 #, fuzzy msgid "UNIT is one of: " msgstr "FLAG é um de: " -#: parted/parted.c:149 +#: parted/parted.c:150 msgid "desired alignment: minimum or optimal" msgstr "" -#: parted/parted.c:150 +#: parted/parted.c:151 msgid "PART-TYPE is one of: primary, logical, extended\n" msgstr "TIPO-PART é um de: primary, logical, extended\n" -#: parted/parted.c:152 +#: parted/parted.c:153 msgid "FS-TYPE is one of: " msgstr "TIPO-FS é um de: " -#: parted/parted.c:153 +#: parted/parted.c:154 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:156 +#: parted/parted.c:157 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:159 +#: parted/parted.c:160 msgid "STATE is one of: on, off\n" msgstr "ESTADO é um de: on, off\n" -#: parted/parted.c:160 +#: parted/parted.c:161 msgid "DEVICE is usually /dev/hda or /dev/sda\n" msgstr "DISPOSITIVO é usualmente /dev/hda ou /dev/sda\n" -#: parted/parted.c:161 +#: parted/parted.c:162 msgid "NAME is any word you want\n" msgstr "NAME é qualquer palavra que desejar\n" -#: parted/parted.c:164 +#: parted/parted.c:165 msgid "" "Copyright (C) 1998 - 2006 Free Software Foundation, Inc.\n" "This program is free software, covered by the GNU General Public License.\n" @@ -2365,240 +2311,240 @@ msgid "" "\n" msgstr "" -#: parted/parted.c:212 +#: parted/parted.c:213 #, c-format msgid "%0.f%%\t(time left %.2d:%.2d)" msgstr "" -#: parted/parted.c:231 +#: parted/parted.c:232 #, c-format msgid "Partition %s is being used. Are you sure you want to continue?" msgstr "" -#: parted/parted.c:252 +#: parted/parted.c:253 #, 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:264 +#: parted/parted.c:265 #, 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:525 +#: parted/parted.c:526 #, fuzzy msgid "New disk label type?" msgstr "Tipo de rótulo de disco: %s\n" -#: parted/parted.c:662 +#: parted/parted.c:663 #, fuzzy msgid "Partition type?" msgstr "A partição não existe." -#: parted/parted.c:680 parted/parted.c:884 +#: parted/parted.c:681 parted/parted.c:885 #, fuzzy msgid "Partition name?" msgstr "A partição não existe." -#: parted/parted.c:690 +#: parted/parted.c:691 #, fuzzy msgid "File system type?" msgstr "SistemaFich " -#: parted/parted.c:695 parted/parted.c:1498 +#: parted/parted.c:696 parted/parted.c:1499 msgid "Start?" msgstr "" -#: parted/parted.c:698 parted/parted.c:1500 parted/parted.c:1569 +#: parted/parted.c:699 parted/parted.c:1501 parted/parted.c:1585 msgid "End?" msgstr "" -#: parted/parted.c:766 +#: parted/parted.c:767 #, 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:775 +#: parted/parted.c:776 msgid "" "\n" "Is this still acceptable to you?" msgstr "" -#: parted/parted.c:798 +#: parted/parted.c:799 #, c-format msgid "" "The resulting partition is not properly aligned for best performance: %s" msgstr "" -#: parted/parted.c:800 parted/parted.c:1723 +#: parted/parted.c:801 parted/parted.c:1739 msgid "unknown (malloc failed)" msgstr "" -#: parted/parted.c:876 +#: parted/parted.c:877 #, 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:881 parted/parted.c:1561 parted/parted.c:1612 -#: parted/parted.c:1706 parted/parted.c:1781 +#: parted/parted.c:882 parted/parted.c:1564 parted/parted.c:1628 +#: parted/parted.c:1722 parted/parted.c:1797 #, fuzzy msgid "Partition number?" msgstr "A partição está a ser utilizada." -#: parted/parted.c:975 +#: parted/parted.c:976 #, c-format msgid "BIOS cylinder,head,sector geometry: %d,%d,%d. Each cylinder is %s.\n" msgstr "" -#: parted/parted.c:1017 +#: parted/parted.c:1018 #, c-format msgid "Model: %s (%s)\n" msgstr "" -#: parted/parted.c:1019 +#: parted/parted.c:1020 #, fuzzy, c-format msgid "Disk %s: %s\n" msgstr "Tipo de rótulo de disco: %s\n" -#: parted/parted.c:1020 +#: parted/parted.c:1021 #, c-format msgid "Sector size (logical/physical): %lldB/%lldB\n" msgstr "" -#: parted/parted.c:1032 +#: parted/parted.c:1033 #, fuzzy, c-format msgid "Partition Table: %s\n" msgstr "Tabela de partições inválida em %s" -#: parted/parted.c:1033 +#: parted/parted.c:1034 #, fuzzy, c-format msgid "Disk Flags: %s\n" msgstr "Tipo de rótulo de disco: %s\n" -#: parted/parted.c:1153 parted/parted.c:1156 +#: parted/parted.c:1154 parted/parted.c:1157 msgid "Number" msgstr "" -#: parted/parted.c:1153 parted/parted.c:1156 +#: parted/parted.c:1154 parted/parted.c:1157 msgid "Start" msgstr "" -#: parted/parted.c:1154 parted/parted.c:1157 +#: parted/parted.c:1155 parted/parted.c:1158 msgid "End" msgstr "" -#: parted/parted.c:1157 +#: parted/parted.c:1158 msgid "Size" msgstr "" -#: parted/parted.c:1161 +#: parted/parted.c:1162 msgid "Type" msgstr "" -#: parted/parted.c:1163 +#: parted/parted.c:1164 #, fuzzy msgid "File system" msgstr "SistemaFich " -#: parted/parted.c:1166 +#: parted/parted.c:1167 msgid "Name" msgstr "" -#: parted/parted.c:1168 +#: parted/parted.c:1169 msgid "Flags" msgstr "Sinalizador" -#: parted/parted.c:1225 +#: parted/parted.c:1226 msgid "Free Space" msgstr "" -#: parted/parted.c:1385 +#: parted/parted.c:1386 #, 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:1428 +#: parted/parted.c:1429 msgid "searching for file systems" msgstr "" -#: parted/parted.c:1535 +#: parted/parted.c:1536 msgid "The resize command has been removed in parted 3.0" msgstr "" -#: parted/parted.c:1583 +#: parted/parted.c:1599 msgid "" "Shrinking a partition can cause data loss, are you sure you want to continue?" msgstr "" -#: parted/parted.c:1636 +#: parted/parted.c:1652 #, fuzzy msgid "New device?" msgstr "Nenhum dispositivo encontrado" -#: parted/parted.c:1704 +#: parted/parted.c:1720 msgid "alignment type(min/opt)" msgstr "" -#: parted/parted.c:1719 +#: parted/parted.c:1735 #, c-format msgid "%d aligned\n" msgstr "" -#: parted/parted.c:1721 +#: parted/parted.c:1737 #, c-format msgid "%d not aligned: %s\n" msgstr "" -#: parted/parted.c:1746 parted/parted.c:1783 +#: parted/parted.c:1762 parted/parted.c:1799 msgid "Flag to Invert?" msgstr "" -#: parted/parted.c:1751 parted/parted.c:1788 +#: parted/parted.c:1767 parted/parted.c:1804 msgid "New state?" msgstr "" -#: parted/parted.c:1834 +#: parted/parted.c:1850 msgid "Unit?" msgstr "" -#: parted/parted.c:1969 +#: parted/parted.c:1985 #, fuzzy msgid "align-check" msgstr "check" -#: parted/parted.c:1972 +#: parted/parted.c:1988 #, 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:1980 +#: parted/parted.c:1996 msgid "help" msgstr "help" -#: parted/parted.c:1983 +#: parted/parted.c:1999 #, fuzzy msgid "" "help [COMMAND] print general help, or help on " "COMMAND" msgstr "help [COMANDO] mostra ajuda geral, ou ajuda a COMANDO" -#: parted/parted.c:1989 +#: parted/parted.c:2005 msgid "mklabel" msgstr "mklabel" -#: parted/parted.c:1989 +#: parted/parted.c:2005 msgid "mktable" msgstr "" -#: parted/parted.c:1992 +#: parted/parted.c:2008 #, fuzzy msgid "" "mklabel,mktable LABEL-TYPE create a new disklabel (partition " @@ -2606,16 +2552,16 @@ msgid "" msgstr "" "mklabel TIPO-ROTULO cria um novo rótulo (na tabela de partição)" -#: parted/parted.c:1998 +#: parted/parted.c:2014 msgid "mkpart" msgstr "mkpart" -#: parted/parted.c:2001 +#: parted/parted.c:2017 #, 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:2007 +#: parted/parted.c:2023 #, fuzzy msgid "" "'mkpart' makes a partition without creating a new file system on the " @@ -2626,196 +2572,204 @@ msgstr "" "partição extendida). Este comando é útil se apagou acidentalmente uma " "partição.\n" -#: parted/parted.c:2012 +#: parted/parted.c:2028 msgid "name" msgstr "name" -#: parted/parted.c:2015 +#: parted/parted.c:2031 #, fuzzy msgid "name NUMBER NAME name partition NUMBER as NAME" msgstr "name MINOR NAME renomeia a partição MINOR para NAME" -#: parted/parted.c:2020 +#: parted/parted.c:2036 msgid "print" msgstr "print" -#: parted/parted.c:2023 +#: parted/parted.c:2039 msgid "" "print [devices|free|list,all|NUMBER] display the partition table, " "available devices, free space, all found partitions, or a particular " "partition" msgstr "" -#: parted/parted.c:2028 +#: parted/parted.c:2044 msgid "" "Without arguments, 'print' displays the entire partition table. However with " "the following arguments it performs various other actions.\n" msgstr "" -#: parted/parted.c:2030 +#: parted/parted.c:2046 msgid " devices : display all active block devices\n" msgstr "" -#: parted/parted.c:2031 +#: parted/parted.c:2047 msgid "" " free : display information about free unpartitioned space on the " "current block device\n" msgstr "" -#: parted/parted.c:2033 +#: parted/parted.c:2049 msgid "" " list, all : display the partition tables of all active block devices\n" msgstr "" -#: parted/parted.c:2034 +#: parted/parted.c:2050 msgid "" " NUMBER : display more detailed information about this particular " "partition\n" msgstr "" -#: parted/parted.c:2039 +#: parted/parted.c:2055 msgid "quit" msgstr "quit" -#: parted/parted.c:2042 +#: parted/parted.c:2058 #, fuzzy msgid "quit exit program" msgstr "quit sair do programa" -#: parted/parted.c:2047 +#: parted/parted.c:2063 msgid "rescue" msgstr "" -#: parted/parted.c:2050 +#: parted/parted.c:2066 #, fuzzy msgid "" "rescue START END rescue a lost partition near START " "and END" msgstr "print mostra a tabela de partições" -#: parted/parted.c:2056 +#: parted/parted.c:2072 msgid "resize" msgstr "resize" -#: parted/parted.c:2059 +#: parted/parted.c:2075 msgid "The resize command was removed in parted 3.0\n" msgstr "" -#: parted/parted.c:2062 +#: parted/parted.c:2078 #, fuzzy msgid "resizepart" msgstr "resize" -#: parted/parted.c:2065 +#: parted/parted.c:2081 #, fuzzy msgid "resizepart NUMBER END resize partition NUMBER" msgstr "rm MINOR apaga a partição MINOR" -#: parted/parted.c:2070 +#: parted/parted.c:2086 msgid "rm" msgstr "rm" -#: parted/parted.c:2073 +#: parted/parted.c:2089 #, fuzzy msgid "rm NUMBER delete partition NUMBER" msgstr "rm MINOR apaga a partição MINOR" -#: parted/parted.c:2078 +#: parted/parted.c:2094 msgid "select" msgstr "select" -#: parted/parted.c:2081 +#: parted/parted.c:2097 #, fuzzy msgid "select DEVICE choose the device to edit" msgstr "select DEVICE selecciona o dispositivo a editar" -#: parted/parted.c:2086 +#: parted/parted.c:2102 msgid "disk_set" msgstr "" -#: parted/parted.c:2089 +#: parted/parted.c:2105 msgid "" "disk_set FLAG STATE change the FLAG on selected device" msgstr "" -#: parted/parted.c:2094 +#: parted/parted.c:2110 msgid "disk_toggle" msgstr "" -#: parted/parted.c:2097 +#: parted/parted.c:2113 msgid "" "disk_toggle [FLAG] toggle the state of FLAG on " "selected device" msgstr "" -#: parted/parted.c:2103 +#: parted/parted.c:2119 msgid "set" msgstr "set" -#: parted/parted.c:2106 +#: parted/parted.c:2122 #, 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:2112 +#: parted/parted.c:2128 msgid "toggle" msgstr "" -#: parted/parted.c:2115 +#: parted/parted.c:2131 msgid "" "toggle [NUMBER [FLAG]] toggle the state of FLAG on " "partition NUMBER" msgstr "" -#: parted/parted.c:2121 +#: parted/parted.c:2137 msgid "unit" msgstr "" -#: parted/parted.c:2124 +#: parted/parted.c:2140 #, fuzzy msgid "unit UNIT set the default unit to UNIT" msgstr "print mostra a tabela de partições" -#: parted/parted.c:2129 +#: parted/parted.c:2145 msgid "version" msgstr "" -#: parted/parted.c:2132 +#: parted/parted.c:2148 #, fuzzy msgid "" "version display the version number and " "copyright information of GNU Parted" msgstr "print mostra a tabela de partições" -#: parted/parted.c:2136 +#: parted/parted.c:2152 msgid "" "'version' displays copyright and version information corresponding to this " "copy of GNU Parted\n" msgstr "" -#: parted/parted.c:2204 +#: parted/parted.c:2220 #, c-format msgid "Usage: %s [-hlmsv] [-a] [DEVICE [COMMAND [PARAMETERS]]...]\n" msgstr "" -#: parted/parted.c:2248 +#: parted/parted.c:2264 msgid "No device found" msgstr "Nenhum dispositivo encontrado" -#: parted/parted.c:2285 +#: parted/parted.c:2301 msgid "WARNING: You are not superuser. Watch out for permissions.\n" msgstr "" -#: parted/parted.c:2325 +#: parted/parted.c:2334 +msgid "" +"You should reinstall your boot loader before rebooting. Read section 4 of " +"the Parted User documentation for more information." +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:2341 msgid "You may need to update /etc/fstab.\n" msgstr "" -#: parted/ui.c:164 +#: parted/ui.c:165 msgid "Welcome to GNU Parted! Type 'help' to view a list of commands.\n" msgstr "" -#: parted/ui.c:167 +#: parted/ui.c:168 #, fuzzy msgid "" "Usage: parted [OPTION]... [DEVICE [COMMAND [PARAMETERS]...]...]\n" @@ -2827,7 +2781,7 @@ msgstr "" "Aplica COMANDO com os PARAMETROS no DISPOSITIVO. Se não for dado nenhum\n" "COMANDO, executa em modo interactivo.\n" -#: parted/ui.c:172 +#: parted/ui.c:173 #, c-format msgid "" "\n" @@ -2861,222 +2815,223 @@ msgid "" "consider important.\n" msgstr "" -#: parted/ui.c:293 +#: parted/ui.c:294 msgid "" "\n" "Command History:\n" msgstr "" -#: parted/ui.c:356 +#: parted/ui.c:357 msgid "" "\n" "Error: SEGV_MAPERR (Address not mapped to object)\n" msgstr "" -#: parted/ui.c:362 +#: parted/ui.c:363 msgid "" "\n" "Error: SEGV_ACCERR (Invalid permissions for mapped object)\n" msgstr "" -#: parted/ui.c:367 +#: parted/ui.c:368 msgid "" "\n" "Error: A general SIGSEGV signal was encountered.\n" msgstr "" -#: parted/ui.c:391 +#: parted/ui.c:392 msgid "" "\n" "Error: FPE_INTDIV (Integer: divide by zero)" msgstr "" -#: parted/ui.c:396 +#: parted/ui.c:397 msgid "" "\n" "Error: FPE_INTOVF (Integer: overflow)" msgstr "" -#: parted/ui.c:401 +#: parted/ui.c:402 msgid "" "\n" "Error: FPE_FLTDIV (Float: divide by zero)" msgstr "" -#: parted/ui.c:406 +#: parted/ui.c:407 msgid "" "\n" "Error: FPE_FLTOVF (Float: overflow)" msgstr "" -#: parted/ui.c:411 +#: parted/ui.c:412 msgid "" "\n" "Error: FPE_FLTUND (Float: underflow)" msgstr "" -#: parted/ui.c:416 +#: parted/ui.c:417 msgid "" "\n" "Error: FPE_FLTRES (Float: inexact result)" msgstr "" -#: parted/ui.c:421 +#: parted/ui.c:422 msgid "" "\n" "Error: FPE_FLTINV (Float: invalid operation)" msgstr "" -#: parted/ui.c:426 +#: parted/ui.c:427 msgid "" "\n" "Error: FPE_FLTSUB (Float: subscript out of range)" msgstr "" -#: parted/ui.c:431 +#: parted/ui.c:432 msgid "" "\n" "Error: A general SIGFPE signal was encountered." msgstr "" -#: parted/ui.c:455 +#: parted/ui.c:456 msgid "" "\n" "Error: ILL_ILLOPC (Illegal Opcode)" msgstr "" -#: parted/ui.c:460 +#: parted/ui.c:461 msgid "" "\n" "Error: ILL_ILLOPN (Illegal Operand)" msgstr "" -#: parted/ui.c:465 +#: parted/ui.c:466 msgid "" "\n" "Error: ILL_ILLADR (Illegal addressing mode)" msgstr "" -#: parted/ui.c:470 +#: parted/ui.c:471 msgid "" "\n" "Error: ILL_ILLTRP (Illegal Trap)" msgstr "" -#: parted/ui.c:475 +#: parted/ui.c:476 msgid "" "\n" "Error: ILL_PRVOPC (Privileged Opcode)" msgstr "" -#: parted/ui.c:480 +#: parted/ui.c:481 msgid "" "\n" "Error: ILL_PRVREG (Privileged Register)" msgstr "" -#: parted/ui.c:485 +#: parted/ui.c:486 msgid "" "\n" "Error: ILL_COPROC (Coprocessor Error)" msgstr "" -#: parted/ui.c:490 +#: parted/ui.c:491 msgid "" "\n" "Error: ILL_BADSTK (Internal Stack Error)" msgstr "" -#: parted/ui.c:495 +#: parted/ui.c:496 msgid "" "\n" "Error: A general SIGILL signal was encountered." msgstr "" -#: parted/ui.c:888 +#: parted/ui.c:889 #, fuzzy, c-format msgid "invalid token: %s" msgstr "Tabela de partições inválida em %s" -#: parted/ui.c:1069 +#: parted/ui.c:1070 #, fuzzy msgid "Expecting a partition number." msgstr "A partição destino está a ser utilizada." -#: parted/ui.c:1078 +#: parted/ui.c:1079 msgid "Partition doesn't exist." msgstr "A partição não existe." -#: parted/ui.c:1098 +#: parted/ui.c:1099 #, fuzzy msgid "Expecting a file system type." msgstr "Tipo de sistema de ficheiros desconhecido." -#: parted/ui.c:1105 +#: parted/ui.c:1106 #, fuzzy, c-format msgid "Unknown file system type \"%s\"." msgstr "Tipo de sistema de ficheiros desconhecido." -#: parted/ui.c:1126 +#: parted/ui.c:1127 msgid "Expecting a disk label type." msgstr "" -#: parted/ui.c:1157 parted/ui.c:1193 +#: parted/ui.c:1158 parted/ui.c:1194 msgid "No flags supported" msgstr "" -#: parted/ui.c:1267 +#: parted/ui.c:1268 #, fuzzy msgid "Can't create any more partitions." msgstr "Não posso adicionar outra partição." -#: parted/ui.c:1277 +#: parted/ui.c:1278 #, fuzzy msgid "Expecting a partition type." msgstr "A partição destino não existe." -#: parted/ui.c:1426 +#: parted/ui.c:1427 msgid "on" msgstr "on" -#: parted/ui.c:1427 +#: parted/ui.c:1428 msgid "off" msgstr "" -#: parted/ui.c:1444 +#: parted/ui.c:1445 msgid "optimal" msgstr "" -#: parted/ui.c:1445 +#: parted/ui.c:1446 msgid "minimal" msgstr "" -#: parted/ui.c:1578 +#: parted/ui.c:1579 msgid "OPTIONs:" msgstr "OPÇÕES:" -#: parted/ui.c:1583 +#: parted/ui.c:1584 msgid "COMMANDs:" msgstr "COMANDOs:" -#: parted/ui.c:1586 +#: parted/ui.c:1587 #, c-format msgid "" "\n" "Report bugs to %s\n" msgstr "" -#: parted/ui.c:1593 +#: parted/ui.c:1594 #, fuzzy, c-format msgid "Using %s\n" msgstr "" "\n" "Usando %s\n" -#: parted/ui.c:1673 +#: parted/ui.c:1674 msgid "This command does not make sense in non-interactive mode.\n" msgstr "" +#, c-format #~ msgid "" #~ "The sector size on %s is %d bytes. Parted is known not to work properly " #~ "with drives with sector sizes other than 512 bytes" @@ -3084,6 +3039,7 @@ msgstr "" #~ "O tamanho do sector em %s é %d bytes. O Parted é conhecido por não " #~ "funcionar perfeitamente com discos com sectores diferentes de 512 bytes" +#, c-format #~ msgid "Device %s has dodgey geometry." #~ msgstr "Dispositivo %s tem geometria estranha." @@ -3093,9 +3049,37 @@ msgstr "" #~ msgid "Unknown SCSI" #~ msgstr "SCSI desconhecido" +#, c-format #~ msgid "Device %s is neither a SCSI nor IDE drive." #~ msgstr "O dispositivo %s não é um drive SCSI ou IDE." +#~ msgid "" +#~ "The kernel was unable to re-read your partition table, so you need to " +#~ "reboot before mounting any modified partitions. You also need to " +#~ "reinstall your boot loader before you reboot (which may require mounting " +#~ "modified partitions). It is impossible do both things! So you'll need " +#~ "to boot off a rescue disk, and reinstall your boot loader from the rescue " +#~ "disk. Read section 4 of the Parted User documentation for more " +#~ "information." +#~ msgstr "" +#~ "O kernel não pôde reler sua tabela de partições, portanto precisa de " +#~ "reiniciar antes de montar qualquer partição modificada. Voce pode também " +#~ "precisar reinstalar seu gestor de boot antes de reinicializar (o que pode " +#~ "requerer a montagem das partições modificadas). É impossível fazer as " +#~ "duas coisas! Leia a secção 4 da documentação do usuário do Parted para " +#~ "mais informações." + +#, c-format +#~ msgid "" +#~ "The kernel was unable to re-read the partition table on %s (%s). This " +#~ "means Linux knows nothing about any modifications you made. You should " +#~ "reboot your computer before doing anything with %s." +#~ msgstr "" +#~ "O kernel não conseguiu reler a tabela de partições de %s (%s). Isto " +#~ "significa que o Linux não sabe nada sobre as modificações que fez. Deverá " +#~ "reinicializar seu computador antes de fazer qualquer uso de %s." + +#, c-format #~ msgid "" #~ "The partition table on %s is inconsistent. There are many reasons why " #~ "this might be the case. However, the most likely reason is that Linux " @@ -3153,6 +3137,9 @@ msgstr "" #~ msgid "The new partition overlaps with another partition." #~ msgstr "A nova partição sobrepõe alguma outra partição" +#~ msgid "The boot region doesn't start at the start of the partition" +#~ msgstr "A região de inicialização não começa no início da partição" + #~ msgid "Can't set non-Linux partitions as a root device." #~ msgstr "Não posso configurar partições não Linux como uma partição root." @@ -3160,14 +3147,17 @@ msgstr "" #~ msgstr "" #~ "Não posso configurar partições não nao sejam Linux como uma partição swap." +#, c-format #~ msgid "Support for opening %s file systems is not implemented yet." #~ msgstr "" #~ "O suporte para abrir sistema de ficheiros %s não foi implementado ainda." +#, c-format #~ msgid "Support for checking %s file systems is not implemented yet." #~ msgstr "" #~ "Suporte para verificar sistema de ficheiros não implementado para %s." +#, c-format #~ msgid "" #~ "Direct support for copying file systems is not yet implemented for %s. " #~ "However, support for resizing implemented. Therefore, the file system " @@ -3181,30 +3171,37 @@ msgstr "" #~ "pelo menos tão grande quanto a antiga. Então, diminua a partição que você " #~ "está a tentar copiar, ou copie para uma partição maior." +#, c-format #~ msgid "Support for copying %s file systems is not implemented yet." #~ msgstr "Suporte para copiar sistema de ficheiros não implementado para %s." +#, c-format #~ msgid "No get_resize_constraint for %s!" #~ msgstr "Não há get_resize_constraint para %s!" +#, c-format #~ msgid "The %s file system code doesn't support %s disk labels." #~ msgstr "" #~ "O código do sistema de ficheiros %s não suporta rótulos de disco %s." +#, c-format #~ msgid "Creating new %s disklabels is not implemented yet." #~ msgstr "Criação de novos rótulos %s não está implementado ainda." +#, c-format #~ msgid "The code to write the partition table hasn't been written for %s yet" #~ msgstr "" #~ "O código para escrever a tabela de partições ainda não foi escrito para " #~ "%s." +#, c-format #~ msgid "Error reading %s (%s) to determine if partition is mounted." #~ msgstr "Erro lendo %s (%s) para determinar se a partição está montada." #~ msgid "Can't grow a partition onto used space." #~ msgstr "Não posso aumentar a partição acima de espaço já utilizado." +#, c-format #~ msgid "" #~ "A bug has been detected in GNU parted. Please email a bug report to bug-" #~ "parted@gnu.org containing the version (%s) and the following message:" @@ -3212,6 +3209,7 @@ msgstr "" #~ "Um bug foi detectado no GNU parted. Por favor, envie um relatório do bug " #~ "para bug-parted@gnu.org contendo a versão (%s) e a mensagem abaixo:" +#, c-format #~ msgid "Attempt to read sectors %ld-%ld outside of partition on %s" #~ msgstr "Tentativa de ler sectores %ld-%ld fora da partição em %s" @@ -3263,11 +3261,13 @@ msgstr "" #~ msgstr "" #~ "Sistema de ficheiros tem muitos inodes utilizados para remover um grupo!" +#, c-format #~ msgid "Your filesystem is too occupied to resize it to %i blocks. Sorry." #~ msgstr "" #~ "Seu sistema de ficheiros está muito ocupado para redimensioná-lo para %i " #~ "blocos. Desculpe." +#, c-format #~ msgid "" #~ "Your filesystem has too much occupied inodes to resize it to %i blocks. " #~ "Sorry." @@ -3280,9 +3280,11 @@ msgstr "" #~ "Encontrados blocos com referência cruzada! Melhor executar e2fsck " #~ "primeiro." +#, c-format #~ msgid "Block %i has no reference? Weird" #~ msgstr "Bloco %i não tem referência? Estranho" +#, c-format #~ msgid "Block %i shouldn't have been marked!" #~ msgstr "Bloco %i não deveria ter sido marcado!" @@ -3299,6 +3301,7 @@ msgstr "" #~ msgid "Couldn't flush buffer cache!" #~ msgstr "Não foi possível esvaziar a cache temporária!" +#, c-format #~ msgid "Insane! %d clusters!" #~ msgstr "Estranho! %d clusters!" @@ -3329,6 +3332,7 @@ msgstr "" #~ "antigas do Windows 95 e Windows NT. Seleccione SIM se você só utilizar " #~ "Linux, BSD, MS-Windows 98 e/ou MS-Windows 95 B." +#, c-format #~ msgid "" #~ "File system doesn't have expected sizes for Windows to like it. Number " #~ "of clusters is %d (%d expected); size of FATs is %d sectors (%d expected)." @@ -3340,6 +3344,7 @@ msgstr "" #~ msgid "File system has an invalid signature for a FAT file systems." #~ msgstr "Sistema de ficheiros tem uma assinatura inválida para um FAT." +#, 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." @@ -3348,6 +3353,7 @@ msgstr "" #~ "Parted é conhecido por não funcionar corretamente com sectores diferentes " #~ "de 512 bytes." +#, c-format #~ msgid "" #~ "Partition size (%ld sectors) and filesystem size (%ld sectors) do not " #~ "match." @@ -3355,6 +3361,7 @@ msgstr "" #~ "Tamanho da partição (%ld sectores) e tamanho do sistema de ficheiros (%ld " #~ "sectores) não coincidem." +#, c-format #~ msgid "" #~ "The FATs aren't big enough to describe all clusters! Each FAT is %d " #~ "sectors. There are %d clusters, which would require each FAT to be %d " @@ -3410,6 +3417,7 @@ msgstr "" #~ msgid "Source partition doesn't exist." #~ msgstr "A partição origem não existe." +#, c-format #~ msgid "" #~ "You requested to create a partition at %.3f-%.3fMb. The closest Parted " #~ "can manage is %.3f-%.3fMb." @@ -3424,6 +3432,7 @@ msgstr "" #~ msgstr "" #~ "Não posso mover a partição sobre ela mesma. Talvez queira redimensionar?" +#, c-format #~ msgid "" #~ "You requested to move the partition to %.3f-%.3fMb. The closest Parted " #~ "can manage is %.3f-%.3fMb." @@ -3431,6 +3440,7 @@ msgstr "" #~ "Pretende mover a partiçao para %.3f-%.3fMb. O mais perto que se consegue " #~ "será %3f-%.3fMb" +#, c-format #~ msgid "Disk geometry for %s: 0.000-%.3f megabytes\n" #~ msgstr "Geometria de disco para %s: 0.000-%.3f megabytes\n" @@ -3443,6 +3453,7 @@ msgstr "" #~ msgid "Name " #~ msgstr "Nome " +#, c-format #~ msgid "" #~ "You requested to resize the partition to %.3f-%.3fMb. The closest Parted " #~ "can manage is %.3f-%.3fMb." @@ -3490,6 +3501,7 @@ msgstr "" #~ msgid "resize MINOR START END resize filesystem on partition MINOR" #~ msgstr "resize MINOR INICIO FIM redimensiona a partição MINOR" +#, c-format #~ msgid "" #~ "You found a bug in GNU Parted. Please email a bug report to bug-" #~ "parted@gnu.org containing the version (%s), and the following message:\n" @@ -3509,6 +3521,7 @@ msgstr "" #~ "contrário, certifique-se que o sistema operativo e a BIOS têm a mesma " #~ "geometria antes de fazer o redimensionamento de qualquer partiçao FAT" +#, c-format #~ msgid "" #~ "The operating system thinks the geometry on %s is %d/%d/%d. Therefore, " #~ "cylinder 1024 ends at %.3fM.%s" @@ -3517,5 +3530,6 @@ msgstr "" #~ "cilindro 1024 termina em %.3fM%s. Você devia verificar se isto está " #~ "correto com sua \"\"BIOS, antes de usar este programa." +#, c-format #~ msgid "The operating system thinks the geometry on %s is %d/%d/%d.%s" #~ msgstr "O Sistema Operativo detectou que a gemotria em %s é %d/%d/%d.%s" diff --git a/po/pt_BR.gmo b/po/pt_BR.gmo index 409028e3d2381c665b37022e26aa82f4dc360d42..46ccf0537c7fff55aebe0486c70b9fa023f49954 100644 GIT binary patch delta 11822 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, 1999. # Enrico Nicoletto , 2013. -# Rafael Fontenelle , 2014, 2017, 2019. +# Rafael Fontenelle , 2014-2020. +# msgid "" msgstr "" "Project-Id-Version: parted 3.1.90\n" "Report-Msgid-Bugs-To: bug-parted@gnu.org\n" -"POT-Creation-Date: 2019-10-10 16:35-0700\n" -"PO-Revision-Date: 2019-08-28 15:29-0300\n" +"POT-Creation-Date: 2021-01-27 16:00-0800\n" +"PO-Revision-Date: 2020-09-13 20:22-0300\n" "Last-Translator: Rafael Fontenelle \n" "Language-Team: Brazilian Portuguese \n" @@ -18,8 +19,8 @@ msgstr "" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" -"Plural-Forms: nplurals=2; plural=(n > 1);\n" -"X-Generator: Virtaal 1.0.0-beta1\n" +"Plural-Forms: nplurals=2; plural=(n > 1)\n" +"X-Generator: Gtranslator 3.38.0\n" "X-Bugs: Report translation errors to the Language-Team address.\n" #: lib/argmatch.c:132 @@ -100,11 +101,11 @@ msgstr "%s: a opção exige um argumento -- \"%c\"\n" #. If you don't know what to put here, please see #. #. and use glyphs suitable for your language. -#: lib/quotearg.c:362 +#: lib/quotearg.c:355 msgid "`" msgstr "“" -#: lib/quotearg.c:363 +#: lib/quotearg.c:356 msgid "'" msgstr "”" @@ -373,32 +374,17 @@ msgstr "Ajuda geral no uso de softwares GNU: \n" msgid "memory exhausted" msgstr "memória esgotada" -#: lib/xstrtol-error.c:63 -#, c-format -msgid "invalid %s%s argument '%s'" -msgstr "argumento inválido para %s%s: \"%s\"" - -#: lib/xstrtol-error.c:68 -#, c-format -msgid "invalid suffix in %s%s argument '%s'" -msgstr "sufixo inválido no argumento para %s%s: \"%s\"" - -#: lib/xstrtol-error.c:72 -#, c-format -msgid "%s%s argument '%s' too large" -msgstr "argumento grande demais para %s%s: \"%s\"" - -#: libparted/arch/beos.c:245 +#: libparted/arch/beos.c:246 msgid "Disk Image" msgstr "Imagem de disco" -#: libparted/arch/beos.c:346 libparted/arch/gnu.c:277 +#: libparted/arch/beos.c:347 libparted/arch/gnu.c:277 #: libparted/arch/linux.c:1731 #, c-format msgid "Error opening %s: %s" msgstr "Erro ao abrir %s: %s" -#: libparted/arch/beos.c:357 libparted/arch/gnu.c:287 +#: libparted/arch/beos.c:358 libparted/arch/gnu.c:287 #: libparted/arch/linux.c:1742 #, c-format msgid "Unable to open %s read-write (%s). %s has been opened read-only." @@ -406,47 +392,47 @@ msgstr "" "Não foi possível abrir %s para leitura e escrita (%s). %s foi aberto somente-" "leitura." -#: libparted/arch/beos.c:419 libparted/arch/linux.c:1907 +#: libparted/arch/beos.c:420 libparted/arch/linux.c:1907 #, c-format msgid "%s during seek for read on %s" msgstr "%s durante busca para leitura em %s" -#: libparted/arch/beos.c:452 libparted/arch/gnu.c:465 libparted/arch/gnu.c:564 -#: libparted/arch/gnu.c:692 libparted/arch/linux.c:1867 +#: libparted/arch/beos.c:453 libparted/arch/gnu.c:425 libparted/arch/gnu.c:524 +#: libparted/arch/gnu.c:652 libparted/arch/linux.c:1867 #: libparted/arch/linux.c:1949 #, c-format msgid "%s during read on %s" msgstr "%s durante leitura em %s" -#: libparted/arch/beos.c:488 libparted/arch/gnu.c:525 +#: libparted/arch/beos.c:489 libparted/arch/gnu.c:485 #: libparted/arch/linux.c:2026 #, c-format msgid "Can't write to %s, because it is opened read-only." msgstr "Não é possível escrever em %s, pois foi aberto como somente-leitura." -#: libparted/arch/beos.c:504 libparted/arch/linux.c:2051 +#: libparted/arch/beos.c:505 libparted/arch/linux.c:2051 #, c-format msgid "%s during seek for write on %s" msgstr "%s durante busca para escrita em %s" -#: libparted/arch/beos.c:541 libparted/arch/gnu.c:601 libparted/arch/gnu.c:646 -#: libparted/arch/gnu.c:723 libparted/arch/linux.c:1999 +#: libparted/arch/beos.c:542 libparted/arch/gnu.c:561 libparted/arch/gnu.c:606 +#: libparted/arch/gnu.c:683 libparted/arch/linux.c:1999 #: libparted/arch/linux.c:2094 libparted/arch/linux.c:2167 #, c-format msgid "%s during write on %s" msgstr "%s durante escrita em %s" -#: partprobe/partprobe.c:148 +#: partprobe/partprobe.c:149 #, c-format msgid "Try `%s --help' for more information.\n" msgstr "Tente \"%s --help\" para mais informações.\n" -#: partprobe/partprobe.c:152 +#: partprobe/partprobe.c:153 #, c-format msgid "Usage: %s [OPTION] [DEVICE]...\n" msgstr "Uso: %s [OPÇÃO] [DISPOSITIVO]...\n" -#: partprobe/partprobe.c:153 +#: partprobe/partprobe.c:154 msgid "" "Inform the operating system about partition table changes.\n" "\n" @@ -457,12 +443,12 @@ msgid "" msgstr "" "Informa ao sistema operacional sobre alterações na tabela de partição.\n" "\n" -" -d, --dry-run não chega a informar o sistema operacional\n" +" -d, --dry-run não chega a informar ao sistema operacional\n" " -s, --summary exibe um resumo do conteúdo\n" " -h, --help exibe esta ajuda e sai\n" " -v, --version mostra informações da versão e sai\n" -#: partprobe/partprobe.c:161 +#: partprobe/partprobe.c:162 msgid "" "\n" "When no DEVICE is given, probe all partitions.\n" @@ -470,7 +456,7 @@ msgstr "" "\n" "Quando nenhum DISPOSITIVO é informado, investiga todas as partições.\n" -#: partprobe/partprobe.c:165 +#: partprobe/partprobe.c:166 #, c-format msgid "" "\n" @@ -488,43 +474,7 @@ msgstr "Não foi possível abrir %s." msgid "Unable to probe store." msgstr "Não foi possível investigar armazenamento." -#: libparted/arch/gnu.c:368 -msgid "" -"The partition table cannot be re-read. This means you need to reboot before " -"mounting any modified partitions. You also need to reinstall your boot " -"loader before you reboot (which may require mounting modified partitions). " -"It is impossible do both things! So you'll need to boot off a rescue disk, " -"and reinstall your boot loader from the rescue disk. Read section 4 of the " -"Parted User documentation for more information." -msgstr "" -"A tabela de partições não pde ser lida novamente. Isto significa que você " -"precisa reiniciar antes de montar qualquer partição modificada. Você também " -"precisa reinstalar seu carregador de inicialização antes de reinicializar (o " -"que pode exigir a montagem das partições modificadas). É impossível fazer as " -"duas coisas! Então você irá precisar inicializar por um disco de resgate, e " -"reinstalar seu gerenciador de boot a partir deste disco. Leia a seção 4 da " -"documentação do usuário do Parted para maiores informações." - -#: libparted/arch/gnu.c:385 -#, 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 computer " -"before doing anything with %s." -msgstr "" -"A tabela de partições em %s não pode ser lida novamente (%s). Isto " -"significa que o GNU Hurd não sabe nada sobre as modificações que você fez. " -"Você deve reinicializar seu computador antes de fazer qualquer coisa em %s." - -#: libparted/arch/gnu.c:396 parted/parted.c:2318 -msgid "" -"You should reinstall your boot loader before rebooting. Read section 4 of " -"the Parted User documentation for more information." -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." - -#: libparted/arch/gnu.c:788 +#: libparted/arch/gnu.c:748 #, c-format msgid "%s trying to sync %s to disk" msgstr "%s tentando sincronizar %s ao disco" @@ -726,17 +676,16 @@ msgid "" "the old partition(s) will remain in use. You should reboot now before " "making further changes." msgstr "" -"Partição(ões) %s em %s foram escritas, mas não foi impossível informar o " -"kernel sobre as alterações, provavelmente esta/estas está(ão) em uso. Como " -"resultado, a(s) partição(ões) antiga(s) permanecerá(ão) em uso. Você deve " +"As partição(ões) %s em %s foram escritas, mas não foi possível informar ao " +"kernel sobre as alterações, provavelmente está(ão) em uso. Como resultado, " +"a(s) partição(ões) antiga(s) permanecerá(ão) em uso. Você deve " "reinicializar agora antes de realizar alterações posteriores." #: libparted/cs/geom.c:163 #, c-format msgid "Can't have the end before the start! (start sector=%jd length=%jd)" msgstr "" -"Não é possível possuir o fim antes do início! (setor inicial=%jd comprimento=" -"%jd)" +"Não é possível ter o fim antes do início! (setor inicial=%jd comprimento=%jd)" #: libparted/cs/geom.c:379 #, c-format @@ -745,7 +694,7 @@ msgstr "Tentativa de escrever setores %ld-%ld fora da partição em %s." #: libparted/cs/geom.c:419 msgid "checking for bad blocks" -msgstr "verificando por blocos ruins" +msgstr "verificando por blocos defeituosos" #: libparted/debug.c:97 #, c-format @@ -846,15 +795,15 @@ msgstr "metadados" msgid "free" msgstr "livre" -#: libparted/disk.c:2355 parted/ui.c:1258 parted/ui.c:1286 +#: libparted/disk.c:2355 parted/ui.c:1259 parted/ui.c:1287 msgid "extended" msgstr "estendida" -#: libparted/disk.c:2357 parted/ui.c:1262 parted/ui.c:1290 +#: libparted/disk.c:2357 parted/ui.c:1263 parted/ui.c:1291 msgid "logical" msgstr "lógica" -#: libparted/disk.c:2359 parted/ui.c:1254 parted/ui.c:1282 +#: libparted/disk.c:2359 parted/ui.c:1255 parted/ui.c:1283 msgid "primary" msgstr "primária" @@ -930,64 +879,73 @@ msgstr "irst" msgid "esp" msgstr "esp" -#: libparted/disk.c:2415 +#: libparted/disk.c:2411 +msgid "chromeos_kernel" +msgstr "" + +#: libparted/disk.c:2413 +#, fuzzy +msgid "bls_boot" +msgstr "pmbr_boot" + +#: libparted/disk.c:2419 #, c-format msgid "Unknown partition flag, %d." msgstr "Opção de partição desconhecida, %d." -#: libparted/exception.c:78 +#: libparted/exception.c:79 msgid "Information" msgstr "Informação" -#: libparted/exception.c:79 +#: libparted/exception.c:80 msgid "Warning" msgstr "Atenção" -#: libparted/exception.c:80 +#: libparted/exception.c:81 msgid "Error" msgstr "Erro" -#: libparted/exception.c:81 +#: libparted/exception.c:82 msgid "Fatal" msgstr "Fatal" -#: libparted/exception.c:82 +#: libparted/exception.c:83 msgid "Bug" msgstr "Erro" -#: libparted/exception.c:83 +#: libparted/exception.c:84 msgid "No Implementation" msgstr "Sem implementação" -#: libparted/exception.c:87 +#: libparted/exception.c:88 msgid "Fix" msgstr "Arrumar" -#: libparted/exception.c:88 +#: libparted/exception.c:89 msgid "Yes" msgstr "Sim" -#: libparted/exception.c:89 +#: libparted/exception.c:90 msgid "No" msgstr "Não" -#: libparted/exception.c:90 +#: libparted/exception.c:91 msgid "OK" msgstr "OK" -#: libparted/exception.c:91 +#: libparted/exception.c:92 msgid "Retry" msgstr "Repetir" -#: libparted/exception.c:92 +#: libparted/exception.c:93 msgid "Ignore" msgstr "Ignorar" -#: libparted/exception.c:93 +#: libparted/exception.c:94 msgid "Cancel" msgstr "Cancelar" -#: libparted/exception.c:133 +#: libparted/exception.c:134 #, c-format msgid "" "A bug has been detected in GNU Parted. Refer to the web site of parted " @@ -1001,43 +959,43 @@ msgstr "" "relatório de erro para %s contendo ao menos a versão (%s) e a seguinte " "mensagem: " -#: libparted/labels/aix.c:91 +#: libparted/labels/aix.c:92 msgid "Support for reading AIX disk labels is is not implemented yet." msgstr "" -"Suporte para leitura de rótulos de disco AIX não foi implementado ainda." +"O suporte para leitura de rótulos de disco AIX ainda não foi implementado." -#: libparted/labels/aix.c:102 +#: libparted/labels/aix.c:103 msgid "Support for writing AIX disk labels is is not implemented yet." msgstr "" -"Suporte para escrita de rótulos de disco AIX não foi implementado ainda." +"O suporte para escrita de rótulos de disco AIX ainda não foi implementado." -#: libparted/labels/aix.c:115 +#: libparted/labels/aix.c:116 msgid "" "Support for adding partitions to AIX disk labels is not implemented yet." msgstr "" -"Suporte para adicionar partições em rótulos de disco AIX não foi " -"implementado ainda." +"O suporte para adicionar partições em rótulos de disco AIX ainda não foi " +"implementado." -#: libparted/labels/aix.c:125 +#: libparted/labels/aix.c:126 msgid "" "Support for duplicating partitions in AIX disk labels is not implemented yet." msgstr "" -"Suporte para duplicar partições em rótulos de disco AIX não foi implementado " -"ainda." +"O suporte para duplicar partições em rótulos de disco AIX ainda não foi " +"implementado." -#: libparted/labels/aix.c:143 +#: libparted/labels/aix.c:144 msgid "" "Support for setting system type of partitions in AIX disk labels is not " "implemented yet." msgstr "" -"Suporte para ajustar o tipo de sistema de partições em rótulos de disco AIX " -"não foi implementado ainda." +"O suporte para definir o tipo de sistema de partições em rótulos de disco " +"AIX ainda não foi implementado." -#: libparted/labels/aix.c:153 +#: libparted/labels/aix.c:154 msgid "Support for setting flags in AIX disk labels is not implemented yet." msgstr "" -"O suporte para definir opções em rótulos de disco AIX não foi implementado " -"ainda." +"O suporte para definir as opções em rótulos de disco AIX não foi " +"implementado ainda." #: libparted/labels/atari.c:273 #, fuzzy, c-format @@ -1125,11 +1083,11 @@ msgid "" "partitions, if XGM is the first one it counts for two)." msgstr "" -#: libparted/labels/atari.c:1657 libparted/labels/bsd.c:567 -#: libparted/labels/dasd.c:894 libparted/labels/dos.c:2276 -#: libparted/labels/dvh.c:770 libparted/labels/gpt.c:2050 -#: libparted/labels/loop.c:243 libparted/labels/mac.c:1423 -#: libparted/labels/pc98.c:701 libparted/labels/rdb.c:1054 +#: libparted/labels/atari.c:1657 libparted/labels/bsd.c:563 +#: libparted/labels/dasd.c:895 libparted/labels/dos.c:2283 +#: libparted/labels/dvh.c:770 libparted/labels/gpt.c:2140 +#: 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 "Não foi possível satisfazer todos as restrições na partição." @@ -1145,47 +1103,47 @@ msgstr "" msgid "Unable to allocate a partition number." msgstr "Não é possível alocar um número de partição." -#: libparted/labels/bsd.c:592 +#: libparted/labels/bsd.c:588 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:625 +#: libparted/labels/dasd.c:626 msgid "The partition table of DASD-LDL device cannot be changed.\n" msgstr "" # Ponto final acrescentado para seguir as demais frases em volta desta -#: libparted/labels/dasd.c:920 +#: libparted/labels/dasd.c:921 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:1003 +#: libparted/labels/dos.c:1006 #, 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:1031 +#: libparted/labels/dos.c:1034 #, 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:1560 +#: libparted/labels/dos.c:1557 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:1572 +#: libparted/labels/dos.c:1569 #, fuzzy msgid "Extended partitions cannot be recovery partitions on msdos disk labels." msgstr "" "Partições estendidas não podem ser escondidas em rótulos de disco msdos." -#: libparted/labels/dos.c:2258 +#: libparted/labels/dos.c:2265 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:2514 +#: libparted/labels/dos.c:2521 msgid "cannot create any more partitions" msgstr "não é possível criar mais nenhuma partição" @@ -1239,7 +1197,7 @@ msgstr "erro de leitura" #: libparted/labels/fdasd.c:148 msgid "ioctl() error" -msgstr "erro em ioctl()" +msgstr "erro de ioctl()" #: libparted/labels/fdasd.c:152 msgid "API version mismatch" @@ -1330,11 +1288,11 @@ msgstr "Não foi possível recuperar informações de tamanho do bloco." msgid "Disk geometry does not match a DASD device of type 3390." msgstr "" -#: libparted/labels/gpt.c:531 +#: libparted/labels/gpt.c:541 msgid "device is too small for GPT" msgstr "dispositivo é muito pequeno para GPT" -#: libparted/labels/gpt.c:733 +#: libparted/labels/gpt.c:743 #, c-format msgid "" "The format of the GPT partition table is version %x, which is newer than " @@ -1343,7 +1301,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:769 +#: libparted/labels/gpt.c:779 #, c-format msgid "" "Not all of the space available to %s appears to be used, you can fix the GPT " @@ -1354,7 +1312,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:1008 +#: libparted/labels/gpt.c:1024 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)?" @@ -1362,7 +1320,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:1026 +#: libparted/labels/gpt.c:1042 msgid "" "Both the primary and backup GPT tables are corrupt. Try making a fresh " "table, and using Parted's rescue feature to recover partitions." @@ -1371,7 +1329,7 @@ msgstr "" "fazer uma nova tabela, usando os recursos de recuperação do Parted para " "recuperar partições." -#: libparted/labels/gpt.c:1037 +#: libparted/labels/gpt.c:1053 msgid "" "The backup GPT table is corrupt, but the primary appears OK, so that will be " "used." @@ -1379,7 +1337,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:1049 +#: libparted/labels/gpt.c:1065 msgid "" "The primary GPT table is corrupt, but the backup appears OK, so that will be " "used." @@ -1387,11 +1345,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:1073 +#: libparted/labels/gpt.c:1089 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:1936 libparted/labels/gpt.c:1963 +#: libparted/labels/gpt.c:2026 libparted/labels/gpt.c:2053 msgid "failed to translate partition name" msgstr "falha ao traduzir nome de partição" @@ -1402,7 +1360,7 @@ msgstr "Assinatura inválida %x para rótulos de disco Mac." #: libparted/labels/mac.c:232 msgid "Partition map has no partition map entry!" -msgstr "Mapa de partições não tem nenhuma entrada!" +msgstr "O mapa de partições não tem nenhuma entrada!" #: libparted/labels/mac.c:280 #, c-format @@ -1424,18 +1382,14 @@ msgid "The data region doesn't start at the start of the partition." msgstr "A região de dados não começa no início da partição." #: libparted/labels/mac.c:572 -msgid "The boot region doesn't start at the start of the partition." -msgstr "A região de inicialização não começa no início da partição." - -#: libparted/labels/mac.c:586 msgid "The partition's boot region doesn't occupy the entire partition." msgstr "A região de inicialização da partição não a ocupa inteiramente." -#: libparted/labels/mac.c:597 +#: libparted/labels/mac.c:583 msgid "The partition's data region doesn't occupy the entire partition." msgstr "A região de dados da partição não a ocupa inteiramente." -#: libparted/labels/mac.c:649 +#: libparted/labels/mac.c:635 #, c-format msgid "" "Weird block size on device descriptor: %d bytes is not divisible by 512." @@ -1443,7 +1397,7 @@ msgstr "" "tamanho de bloco estranho no descritor de dispositivo: %d bytes não são " "divisíveis por 512." -#: libparted/labels/mac.c:662 +#: libparted/labels/mac.c:648 #, c-format msgid "" "The driver descriptor says the physical block size is %d bytes, but Linux " @@ -1452,11 +1406,11 @@ msgstr "" "O descritor da controladora (driver) informa que o tamanho físico de bloco é " "%d bytes, mas o Linux informa que é %d bytes." -#: libparted/labels/mac.c:715 +#: libparted/labels/mac.c:701 msgid "No valid partition map found." msgstr "Nenhum mapa de partições válido foi encontrado." -#: libparted/labels/mac.c:789 +#: libparted/labels/mac.c:775 #, c-format msgid "" "Conflicting partition map entry sizes! Entry 1 says it is %d, but entry %d " @@ -1465,11 +1419,11 @@ msgstr "" "Conflito nos tamanhos de entrada do mapa de partições! A entrada 1 diz que " "é %d, mas a entrada %d diz que é %d!" -#: libparted/labels/mac.c:820 +#: libparted/labels/mac.c:806 msgid "Weird! There are 2 partitions map entries!" msgstr "Que estranho! Há 2 entradas no mapa de partições!" -#: libparted/labels/mac.c:1359 +#: libparted/labels/mac.c:1345 msgid "" "Changing the name of a root or swap partition will prevent Linux from " "recognising it as such." @@ -1477,18 +1431,18 @@ msgstr "" "Mudar o nome de uma partição root ou swap irá impedir o Linux de reconhecê-" "la como tal." -#: libparted/labels/mac.c:1458 +#: libparted/labels/mac.c:1444 msgid "Can't add another partition -- the partition map is too small!" msgstr "" "Não é possível adicionar outra partição -- o mapa de partições é muito " "pequeno!" -#: libparted/labels/pc98.c:284 +#: libparted/labels/pc98.c:285 #, c-format msgid "Invalid partition table on %s." msgstr "Tabela de partições inválida em %s." -#: libparted/labels/pc98.c:337 libparted/labels/pc98.c:415 +#: libparted/labels/pc98.c:338 libparted/labels/pc98.c:416 #, c-format msgid "" "Partition %d isn't aligned to cylinder boundaries. This is still " @@ -1497,7 +1451,7 @@ msgstr "" "A partição %d não está alinhada aos limites do cilindro. Isto ainda não é " "suportado." -#: libparted/labels/pc98.c:733 +#: libparted/labels/pc98.c:729 msgid "Can't add another partition." msgstr "Não posso adicionar outra partição." @@ -1542,7 +1496,7 @@ msgstr "%s : A lista %s parece ruim no bloco %s." #: libparted/labels/rdb.c:693 #, c-format msgid "%s : Failed to list bad blocks." -msgstr "%s : Falha ao listar blocos ruins." +msgstr "%s : Falha ao listar blocos defeituosos." #: libparted/labels/rdb.c:701 #, c-format @@ -1672,41 +1626,41 @@ msgstr "Não foi possível escrever VTOC FMT7 DSCB." msgid "Could not write VTOC FMT9 DSCB." msgstr "Não foi possível escrever VTOC FMT9 DSCB." -#: libparted/libparted.c:242 +#: libparted/libparted.c:247 msgid "Out of memory." msgstr "Memória insuficiente." -#: libparted/unit.c:139 +#: libparted/unit.c:140 msgid "Cannot get unit size for special unit 'COMPACT'." msgstr "" "Não foi possível obter o tamanho da unidade para a unidade especial \"COMPACT" "\"." -#: libparted/unit.c:385 +#: libparted/unit.c:386 #, c-format msgid "\"%s\" has invalid syntax for locations." msgstr "\"%s\" possui sintaxe inválida para localizações." -#: libparted/unit.c:393 +#: libparted/unit.c:394 #, c-format msgid "The maximum head value is %d." msgstr "O valor máximo do cabeçalho é %d." -#: libparted/unit.c:400 +#: libparted/unit.c:401 #, c-format msgid "The maximum sector value is %d." msgstr "O valor máximo do setor é %d." -#: libparted/unit.c:412 libparted/unit.c:564 +#: libparted/unit.c:413 libparted/unit.c:565 #, c-format msgid "The location %s is outside of the device %s." msgstr "A localização %s está para fora do dispositivo %s." -#: libparted/unit.c:526 +#: libparted/unit.c:527 msgid "Invalid number." msgstr "Número inválido." -#: libparted/unit.c:532 +#: libparted/unit.c:533 msgid "Use a smaller unit instead of a value < 1" msgstr "Use uma unidade menor ao invés de usar um valor < 1" @@ -1716,18 +1670,18 @@ msgstr "Use uma unidade menor ao invés de usar um valor < 1" msgid "%s : Failed to allocate partition block\n" msgstr "%s : Falha ao alocar bloco de partição\n" -#: libparted/fs/amiga/affs.c:79 libparted/fs/amiga/apfs.c:71 +#: 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 : Falha ao alocar bloco\n" -#: libparted/fs/amiga/affs.c:84 libparted/fs/amiga/apfs.c:76 +#: 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 : Não foi possível ler o bloco de inicialização %llu\n" -#: libparted/fs/amiga/affs.c:98 libparted/fs/amiga/apfs.c:87 +#: 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" @@ -1753,22 +1707,22 @@ msgstr "%s : Soma de verificação ruim no bloco %llu do tipo %s\n" msgid "%s : Couldn't write block %d\n" msgstr "%s : Não foi possível escrever bloco %d\n" -#: libparted/fs/amiga/amiga.c:278 +#: libparted/fs/amiga/amiga.c:279 #, c-format msgid "%s : Failed to allocate disk_specific rdb block\n" msgstr "%s : Falha ao alocar bloco rdb de disco_específico\n" -#: libparted/fs/amiga/amiga.c:289 +#: libparted/fs/amiga/amiga.c:290 #, c-format msgid "%s : Didn't find rdb block, should never happen\n" msgstr "%s : Não foi encontrado bloco rdb, isto nunca deveria acontecer\n" -#: libparted/fs/amiga/amiga.c:318 +#: libparted/fs/amiga/amiga.c:319 #, c-format msgid "%s : Failed to read partition block %llu\n" msgstr "%s : Falha ao ler bloco de partição %llu\n" -#: libparted/fs/fat/fat.c:148 libparted/fs/r/fat/fat.c:811 +#: libparted/fs/fat/fat.c:149 msgid "" "GNU Parted was miscompiled: the FAT boot sector should be 512 bytes. FAT " "support will be disabled." @@ -1778,27 +1732,26 @@ msgstr "" #: 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 "Sistema de arquivos tem uma assinatura inválida para um FAT." +msgstr "O sistema de arquivos tem uma assinatura inválida para um 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 "Sistema de arquivos tem um tamanho de setor inválido para um FAT." +msgstr "O sistema de arquivos tem um tamanho de setor inválido para um 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 "" -"O sistema de arquivos possui um tamanho de cluster inválido para um FAT." +msgstr "O sistema de arquivos tem um tamanho de cluster inválido para um 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 "" -"O sistema de arquivos possui um número inválido de setores reservados à " +"O sistema de arquivos tem um número inválido de setores reservados à " "sistemas de arquivo FAT." #: libparted/fs/fat/bootsector.c:79 libparted/fs/r/fat/bootsector.c:78 msgid "File system has an invalid number of FATs." -msgstr "O sistema de arquivos possui um número inválido de FATs." +msgstr "O sistema de arquivos tem um número inválido de FATs." #: libparted/fs/fat/bootsector.c:162 #, c-format @@ -1811,15 +1764,18 @@ 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 "Setor de boot FAT diz que o tamanho lógico do setor é 0. Estranho. " +msgstr "" +"O setor de inicialização FAT diz que o tamanho lógico do setor é 0. " +"Estranho. " #: 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 "Setor de boot FAT diz que não há tabelas FAT. Estranho. " +msgstr "O setor de inicialização FAT diz que não há tabelas FAT. Estranho. " #: 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 "Setor de boot FAT diz que os clusters têm 0 setores. Estranho. " +msgstr "" +"O setor de inicialização FAT diz que os clusters têm 0 setores. Estranho. " #: libparted/fs/fat/bootsector.c:219 libparted/fs/r/fat/bootsector.c:216 msgid "File system is FAT12, which is unsupported." @@ -1864,7 +1820,7 @@ msgstr "" "você selecionar Arrumar, a geometria CHS do sistema de arquivos será " "definida para coincidir com a geometria CHS da tabela de partições." -#: libparted/fs/r/fat/bootsector.c:399 +#: libparted/fs/r/fat/bootsector.c:398 #, c-format msgid "" "The information sector has the wrong signature (%x). Select cancel for now, " @@ -1891,14 +1847,14 @@ msgstr "" "O cluster inicia em delta = %d, que não é um múltiplo do tamanho de cluster " "%d." -#: libparted/fs/r/fat/count.c:144 +#: libparted/fs/r/fat/count.c:84 #, c-format msgid "Bad directory entry for %s: first cluster is the end of file marker." msgstr "" "Entrada de diretório inválida para %s: o primeiro cluster é o fim do " "marcador de arquivo." -#: libparted/fs/r/fat/count.c:157 +#: libparted/fs/r/fat/count.c:97 #, c-format msgid "" "Bad FAT: unterminated chain for %s. You should run dosfsck or scandisk." @@ -1906,7 +1862,7 @@ msgstr "" "FAT ruim: cadeia não terminada para %s. Você deveria rodar o dosfsck ou o " "scandisk." -#: libparted/fs/r/fat/count.c:166 +#: libparted/fs/r/fat/count.c:106 #, c-format msgid "" "Bad FAT: cluster %d outside file system in chain for %s. You should run " @@ -1915,7 +1871,7 @@ msgstr "" "FAT ruim: cluster %d fora do sistema de arquivos na cadeia para %s. Você " "deveria rodar o dosfsck ou o scandisk." -#: libparted/fs/r/fat/count.c:176 +#: libparted/fs/r/fat/count.c:116 #, c-format msgid "" "Bad FAT: cluster %d is cross-linked for %s. You should run dosfsck or " @@ -1924,26 +1880,17 @@ msgstr "" "FAT ruim: o cluster %d tem uma referência cruzada para %s. Você deveria " "rodar o dosfsck ou o scandisk." -#: libparted/fs/r/fat/count.c:195 +#: libparted/fs/r/fat/count.c:135 #, c-format msgid "%s is %dk, but it has %d clusters (%dk)." msgstr "%s é %dk, mas ele tem %d clusters (%dk)." -#: libparted/fs/r/fat/count.c:258 -#, c-format -msgid "" -"The file %s is marked as a system file. This means moving it could cause " -"some programs to stop working." -msgstr "" -"O arquivo %s está marcado como um arquivo de sistema. Isto significa que " -"movê-lo pode fazer com que alguns programas parem de funcionar." - -#: libparted/fs/r/fat/fat.c:243 +#: libparted/fs/r/fat/fat.c:244 #, c-format msgid "Partition too big/small for a %s file system." msgstr "Partição muito grande/pequena para um sistema de arquivos %s." -#: libparted/fs/r/fat/fat.c:409 +#: 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." @@ -1951,11 +1898,11 @@ msgstr "" "As FATs não estão iguais. Se você não sabe o que isto significa, selecione " "cancelar, execute o scandisk no sistema de arquivos, depois volte." -#: libparted/fs/r/fat/fat.c:449 +#: libparted/fs/r/fat/fat.c:450 msgid "There are no possible configurations for this FAT type." msgstr "Não há configurações possíveis para este tipo de FAT." -#: libparted/fs/r/fat/fat.c:461 +#: libparted/fs/r/fat/fat.c:462 #, c-format msgid "" "File system doesn't have expected sizes for Windows to like it. Cluster " @@ -1966,7 +1913,7 @@ msgstr "" "O tamanho do cluster é %dk (%dk esperado); número de clusters é %d (%d " "esperado); tamanho da FAT é %d setores (%d esperado)." -#: libparted/fs/r/fat/fat.c:484 +#: libparted/fs/r/fat/fat.c:485 #, c-format msgid "" "File system is reporting the free space as %d clusters, not %d clusters." @@ -1974,7 +1921,7 @@ msgstr "" "O sistema de arquivos está reportando que o espaço livre é %d clusters, não " "%d clusters." -#: libparted/fs/r/fat/resize.c:158 +#: 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." @@ -1982,17 +1929,17 @@ msgstr "" "Não há espaço suficiente no diretório raiz para todos os arquivos. Cancele, " "ou ignore para perder os arquivos." -#: libparted/fs/r/fat/resize.c:302 +#: libparted/fs/r/fat/resize.c:303 msgid "Error writing to the root directory." msgstr "Erro ao escrever no diretório raiz." -#: libparted/fs/r/fat/resize.c:495 +#: libparted/fs/r/fat/resize.c:479 msgid "If you leave your file system as FAT16, then you will have no problems." msgstr "" "Se você deixar seu sistema de arquivos como FAT16, não haverá nenhum " "problema." -#: libparted/fs/r/fat/resize.c:498 +#: 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 " @@ -2002,7 +1949,7 @@ msgstr "" "você deverá reinstalar o gerenciador de boot do MS Windows. Se quiser fazer " "isso, consulte o manual do Parted (ou o manual de sua distribuição)." -#: libparted/fs/r/fat/resize.c:506 +#: libparted/fs/r/fat/resize.c:490 msgid "" "If you leave your file system as FAT32, then you will not introduce any new " "problems." @@ -2010,7 +1957,7 @@ msgstr "" "Se deixar seu sistema de arquivos como FAT32, você não criará mais nenhum " "problema novo." -#: libparted/fs/r/fat/resize.c:510 +#: 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 " @@ -2024,42 +1971,42 @@ msgstr "" "convertendo para FAT32 fará com que o sistema de arquivos não seja mais " "reconhecido pelo MS DOS, Windows 95a, e MS Windows NT." -#: libparted/fs/r/fat/resize.c:524 +#: libparted/fs/r/fat/resize.c:508 #, c-format msgid "%s %s %s" msgstr "%s %s %s" -#: libparted/fs/r/fat/resize.c:525 +#: libparted/fs/r/fat/resize.c:509 msgid "Would you like to use FAT32?" msgstr "Você gostaria de usar FAT32?" -#: libparted/fs/r/fat/resize.c:556 libparted/fs/r/fat/resize.c:572 +#: 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:557 +#: libparted/fs/r/fat/resize.c:541 msgid "" "The file system can only be resized to this size by converting to FAT16." msgstr "" "O sistema de arquivos só pode ser redimensionado para este tamanho sendo " "convertido para FAT16." -#: libparted/fs/r/fat/resize.c:573 +#: libparted/fs/r/fat/resize.c:557 msgid "" "The file system can only be resized to this size by converting to FAT32." msgstr "" "O sistema de arquivos só pode ser redimensionado para este tamanho sendo " "convertido para FAT32." -#: libparted/fs/r/fat/resize.c:586 +#: libparted/fs/r/fat/resize.c:570 msgid "" "GNU Parted cannot resize this partition to this size. We're working on it!" msgstr "" "O GNU Parted não pode redimensionar esta partição a este tamanho. Estamos " "trabalhando nisto!" -#: libparted/fs/r/fat/table.c:136 +#: 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 " @@ -2068,43 +2015,43 @@ msgstr "" "FAT %d mídia %x não bate com o setor de boot mídia %x. Você deveria executar " "o scandisk." -#: libparted/fs/r/fat/table.c:268 +#: libparted/fs/r/fat/table.c:269 #, c-format msgid "fat_table_set: cluster %ld outside file system" msgstr "fat_table_set: cluster %ld fora do sistema de arquivos" -#: libparted/fs/r/fat/table.c:300 +#: libparted/fs/r/fat/table.c:301 #, c-format msgid "fat_table_get: cluster %ld outside file system" msgstr "fat_table_get: cluster %ld fora do sistema de arquivos" -#: libparted/fs/r/fat/table.c:342 +#: libparted/fs/r/fat/table.c:343 msgid "fat_table_alloc_cluster: no free clusters" msgstr "fat_table_alloc_cluster: não há clusters livres" -#: libparted/fs/r/filesys.c:151 +#: libparted/fs/r/filesys.c:152 msgid "Could not detect file system." msgstr "Não foi possível detectar o sistema de arquivos." -#: libparted/fs/r/filesys.c:158 libparted/fs/r/filesys.c:285 +#: libparted/fs/r/filesys.c:159 libparted/fs/r/filesys.c:284 #, c-format msgid "resizing %s file systems is not supported" msgstr "não é suportado redimensionar sistemas de arquivos %s" -#: libparted/fs/r/filesys.c:170 +#: libparted/fs/r/filesys.c:171 msgid "The file system is bigger than its volume!" msgstr "O sistema de arquivos é maior que seu volume!" -#: libparted/fs/r/hfs/advfs.c:121 libparted/fs/r/hfs/advfs_plus.c:121 -#: libparted/fs/r/hfs/reloc.c:413 libparted/fs/r/hfs/reloc.c:507 -#: libparted/fs/r/hfs/reloc_plus.c:538 libparted/fs/r/hfs/reloc_plus.c:656 -#: libparted/fs/r/hfs/reloc_plus.c:769 +#: 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 "O sistema de arquivos contém erros." -#: libparted/fs/r/hfs/advfs_plus.c:285 +#: libparted/fs/r/hfs/advfs_plus.c:287 msgid "Bad blocks could not be read." -msgstr "Blocos ruins não podem ser lidos." +msgstr "Blocos defeituosos não podem ser lidos." #: libparted/fs/r/hfs/cache.c:137 #, c-format @@ -2166,90 +2113,91 @@ msgstr "Não foi possível encontrar setor %lli de arquivo HFS+ com CNID %X." msgid "Trying to write HFS+ file with CNID %X behind EOF." msgstr "Tentando escrever arquivo HFS+ com CNID %X atrás do fim do arquivo." -#: libparted/fs/r/hfs/hfs.c:232 +#: libparted/fs/r/hfs/hfs.c:212 msgid "Sorry, HFS cannot be resized that way yet." msgstr "Desculpe, HFS não pode ser redimensionada deste modo ainda." -#: libparted/fs/r/hfs/hfs.c:250 libparted/fs/r/hfs/hfs.c:629 +#: libparted/fs/r/hfs/hfs.c:230 libparted/fs/r/hfs/hfs.c:573 msgid "shrinking" msgstr "encolhendo" -#: libparted/fs/r/hfs/hfs.c:262 libparted/fs/r/hfs/hfs.c:641 +#: libparted/fs/r/hfs/hfs.c:242 libparted/fs/r/hfs/hfs.c:585 msgid "Data relocation has failed." msgstr "Realocação de dados falhou." -#: libparted/fs/r/hfs/hfs.c:281 +#: libparted/fs/r/hfs/hfs.c:261 msgid "Data relocation left some data in the end of the volume." msgstr "A realocação de dados deixou alguns dados no final do volume." -#: libparted/fs/r/hfs/hfs.c:320 +#: libparted/fs/r/hfs/hfs.c:300 msgid "writing HFS Master Directory Block" msgstr "escrevendo bloco de diretório mestre HFS" -#: libparted/fs/r/hfs/hfs.c:468 +#: libparted/fs/r/hfs/hfs.c:412 msgid "No valid HFS[+X] signature has been found while opening." msgstr "Nenhuma assinatura HFS[+X] válida foi encontrada ao abrir." -#: libparted/fs/r/hfs/hfs.c:478 +#: libparted/fs/r/hfs/hfs.c:422 #, c-format msgid "Version %d of HFS+ isn't supported." msgstr "Não há suporte para a versão %d do HFS+." -#: libparted/fs/r/hfs/hfs.c:489 +#: libparted/fs/r/hfs/hfs.c:433 #, c-format msgid "Version %d of HFSX isn't supported." msgstr "Não há suporte para a versão %d do HFSX." -#: libparted/fs/r/hfs/hfs.c:672 +#: libparted/fs/r/hfs/hfs.c:616 msgid "Data relocation left some data at the end of the volume." msgstr "A realocação de dados deixou alguns dados no final do volume." -#: libparted/fs/r/hfs/hfs.c:720 +#: libparted/fs/r/hfs/hfs.c:664 msgid "Error while writing the allocation file." msgstr "Erro ao escrever o arquivo de alocação." -#: libparted/fs/r/hfs/hfs.c:735 +#: libparted/fs/r/hfs/hfs.c:679 msgid "Error while writing the compatibility part of the allocation file." msgstr "Erro ao escrever a parte de compatibilidade do arquivo de alocação." -#: libparted/fs/r/hfs/hfs.c:750 +#: libparted/fs/r/hfs/hfs.c:694 msgid "writing HFS+ Volume Header" msgstr "escrevendo cabeçalho de volume HFS+" -#: libparted/fs/r/hfs/hfs.c:850 +#: libparted/fs/r/hfs/hfs.c:794 msgid "An error occurred while looking for the mandatory bad blocks file." msgstr "" -"Ocorreu um erro enquanto era visto o arquivo obrigatório de blocos ruins." +"Ocorreu um erro enquanto era visto o arquivo obrigatório de blocos " +"defeituosos." -#: libparted/fs/r/hfs/hfs.c:904 +#: 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 "" -"Parece que há um erro no empacotador HFS: o arquivo de blocos ruins não " -"contém um volume HFS+ embutido." +"Parece que há um erro no empacotador HFS: o arquivo de blocos defeituosos " +"não contém um volume HFS+ embutido." -#: libparted/fs/r/hfs/hfs.c:940 +#: libparted/fs/r/hfs/hfs.c:883 msgid "Sorry, HFS+ cannot be resized that way yet." msgstr "Desculpe, HFS+ não pode ser redimensionada deste modo ainda." -#: libparted/fs/r/hfs/hfs.c:975 +#: libparted/fs/r/hfs/hfs.c:918 msgid "shrinking embedded HFS+ volume" msgstr "encolhendo volume HFS+ embutido" -#: libparted/fs/r/hfs/hfs.c:992 +#: libparted/fs/r/hfs/hfs.c:935 msgid "Resizing the HFS+ volume has failed." msgstr "Redimensionamento de volume HFS+ falhou." -#: libparted/fs/r/hfs/hfs.c:999 +#: libparted/fs/r/hfs/hfs.c:942 msgid "shrinking HFS wrapper" msgstr "reduzindo empacotador HFS" -#: libparted/fs/r/hfs/hfs.c:1008 +#: libparted/fs/r/hfs/hfs.c:951 msgid "Updating the HFS wrapper has failed." msgstr "Falha na atualização do empacotador HFS." -#: libparted/fs/r/hfs/hfs.c:1110 libparted/fs/r/hfs/hfs.c:1195 +#: 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 " @@ -2260,7 +2208,7 @@ msgstr "" #: libparted/fs/r/hfs/journal.c:155 msgid "Bad block list header checksum." -msgstr "Soma de verificação do cabeçalho de lista de blocos ruins." +msgstr "Soma de verificação do cabeçalho de lista de blocos defeituosos." #: libparted/fs/r/hfs/journal.c:168 #, c-format @@ -2329,7 +2277,7 @@ msgstr "" msgid "An extent has not been relocated." msgstr "Uma extensão não foi realocada." -#: libparted/fs/r/hfs/reloc.c:250 libparted/fs/r/hfs/reloc_plus.c:307 +#: 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!" @@ -2337,17 +2285,17 @@ msgstr "" "Uma referência para uma extensão vem de um local indevido. Você deve " "verificar o sistema de arquivos!" -#: libparted/fs/r/hfs/reloc.c:380 +#: libparted/fs/r/hfs/reloc.c:382 msgid "This HFS volume has no catalog file. This is very unusual!" msgstr "Este volume HFS não possui arquivo de catálogo. Isto é muito incomum!" -#: libparted/fs/r/hfs/reloc.c:474 +#: libparted/fs/r/hfs/reloc.c:479 msgid "This HFS volume has no extents overflow file. This is quite unusual!" msgstr "" "Este volume HFS não possui nenhum arquivo de estouro de extensão. Isto é " "bastante incomum!" -#: libparted/fs/r/hfs/reloc.c:516 libparted/fs/r/hfs/reloc_plus.c:666 +#: 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." @@ -2355,55 +2303,55 @@ msgstr "" "O arquivo de estouro de extensões não deve conter suas próprias extensões! " "Você deve verificar o sistema de arquivos." -#: libparted/fs/r/hfs/reloc.c:573 libparted/fs/r/hfs/reloc_plus.c:844 +#: 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 "Não foi possível armazenar em cache o sistema de arquivos em memória." -#: libparted/fs/r/hfs/reloc.c:634 libparted/fs/r/hfs/reloc_plus.c:905 +#: libparted/fs/r/hfs/reloc.c:640 libparted/fs/r/hfs/reloc_plus.c:910 msgid "Bad blocks list could not be loaded." -msgstr "A lista de blocos ruins não pôde ser carregada." +msgstr "A lista de blocos defeituosos não pôde ser carregada." -#: libparted/fs/r/hfs/reloc.c:648 libparted/fs/r/hfs/reloc_plus.c:921 +#: libparted/fs/r/hfs/reloc.c:654 libparted/fs/r/hfs/reloc_plus.c:926 msgid "An error occurred during extent relocation." msgstr "Ocorreu um erro durante a realocação da extensão." -#: libparted/fs/r/hfs/reloc_plus.c:494 +#: libparted/fs/r/hfs/reloc_plus.c:495 msgid "This HFS+ volume has no catalog file. This is very unusual!" msgstr "" "Este volume HFS+ não possui nenhum arquivo de catálogo. Isto é muito " "incomum!" -#: libparted/fs/r/hfs/reloc_plus.c:617 +#: libparted/fs/r/hfs/reloc_plus.c:620 msgid "This HFS+ volume has no extents overflow file. This is quite unusual!" msgstr "" "Este volume HFS+ não possui nenhum arquivo de estouro de extensões. Isto é " "bastante incomum!" -#: parted/parted.c:125 +#: parted/parted.c:126 msgid "displays this help message" msgstr "mostra esta mensagem de ajuda" -#: parted/parted.c:126 +#: parted/parted.c:127 msgid "lists partition layout on all block devices" msgstr "lista modelos de partições em todos os dispositivos de bloco" -#: parted/parted.c:127 +#: parted/parted.c:128 msgid "displays machine parseable output" msgstr "exibe saída analisável por máquina" -#: parted/parted.c:128 +#: parted/parted.c:129 msgid "never prompts for user intervention" msgstr "nunca pede intervenção do usuário" -#: parted/parted.c:129 +#: parted/parted.c:130 msgid "displays the version" msgstr "mostra a versão" -#: parted/parted.c:130 +#: parted/parted.c:131 msgid "alignment for new partitions" msgstr "alinhamento para novas partições" -#: parted/parted.c:142 +#: parted/parted.c:143 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" @@ -2411,31 +2359,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:145 +#: parted/parted.c:146 msgid "LABEL-TYPE is one of: " msgstr "TIPO_RÓTULO é um de:" -#: parted/parted.c:146 parted/parted.c:147 +#: parted/parted.c:147 parted/parted.c:148 msgid "FLAG is one of: " msgstr "OPÇÃO é um de: " -#: parted/parted.c:148 +#: parted/parted.c:149 msgid "UNIT is one of: " msgstr "UNIDADE é um de: " -#: parted/parted.c:149 +#: parted/parted.c:150 msgid "desired alignment: minimum or optimal" msgstr "alinhamento desejado: mínimo ou ideal" -#: parted/parted.c:150 +#: parted/parted.c:151 msgid "PART-TYPE is one of: primary, logical, extended\n" msgstr "TIPO-PART é uma: primária, lógica, estendida\n" -#: parted/parted.c:152 +#: parted/parted.c:153 msgid "FS-TYPE is one of: " msgstr "SISTARQ é um de: " -#: parted/parted.c:153 +#: parted/parted.c:154 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 " @@ -2445,7 +2393,7 @@ msgstr "" "negativos contam a partir do final do disco. Por exemplo, -1s especifica " "exatamente o último setor.\n" -#: parted/parted.c:156 +#: parted/parted.c:157 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" @@ -2454,19 +2402,19 @@ msgstr "" "a partir do final do disco. Por exemplo, -1s especifica exatamente o último " "setor.\n" -#: parted/parted.c:159 +#: parted/parted.c:160 msgid "STATE is one of: on, off\n" msgstr "ESTADO é um de: on, off\n" -#: parted/parted.c:160 +#: parted/parted.c:161 msgid "DEVICE is usually /dev/hda or /dev/sda\n" msgstr "DISPOSITIVO é usualmente /dev/hda ou /dev/sda\n" -#: parted/parted.c:161 +#: parted/parted.c:162 msgid "NAME is any word you want\n" msgstr "NOME é qualquer palavra que desejar\n" -#: parted/parted.c:164 +#: parted/parted.c:165 msgid "" "Copyright (C) 1998 - 2006 Free Software Foundation, Inc.\n" "This program is free software, covered by the GNU General Public License.\n" @@ -2487,22 +2435,22 @@ msgstr "" "mais detalhes.\n" "\n" -#: parted/parted.c:212 +#: parted/parted.c:213 #, c-format msgid "%0.f%%\t(time left %.2d:%.2d)" msgstr "%0.f%%\t(tempo restante %.2d:%.2d)" -#: parted/parted.c:231 +#: parted/parted.c:232 #, 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:252 +#: parted/parted.c:253 #, c-format msgid "Partition(s) on %s are being used." msgstr "Partição(ões) em %s está(ão) sendo utilizada(s)." -#: parted/parted.c:264 +#: parted/parted.c:265 #, c-format msgid "" "The existing disk label on %s will be destroyed and all data on this disk " @@ -2511,31 +2459,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:525 +#: parted/parted.c:526 msgid "New disk label type?" msgstr "Novo tipo de rótulo de disco?" -#: parted/parted.c:662 +#: parted/parted.c:663 msgid "Partition type?" msgstr "Tipo da partição?" -#: parted/parted.c:680 parted/parted.c:884 +#: parted/parted.c:681 parted/parted.c:885 msgid "Partition name?" msgstr "Nome da partição?" -#: parted/parted.c:690 +#: parted/parted.c:691 msgid "File system type?" msgstr "Tipo do sistema de arquivos?" -#: parted/parted.c:695 parted/parted.c:1498 +#: parted/parted.c:696 parted/parted.c:1499 msgid "Start?" msgstr "Iniciar?" -#: parted/parted.c:698 parted/parted.c:1500 parted/parted.c:1569 +#: parted/parted.c:699 parted/parted.c:1501 parted/parted.c:1585 msgid "End?" msgstr "Terminar?" -#: parted/parted.c:766 +#: parted/parted.c:767 #, c-format msgid "" "You requested a partition from %s to %s (sectors %llu..%llu).\n" @@ -2545,7 +2493,7 @@ msgstr "" "A localização mais próxima que podemos gerenciar é de %s até %s (setores " "%llu..%llu).%s" -#: parted/parted.c:775 +#: parted/parted.c:776 msgid "" "\n" "Is this still acceptable to you?" @@ -2553,96 +2501,96 @@ msgstr "" "\n" "Isto é ainda aceitável para você?" -#: parted/parted.c:798 +#: parted/parted.c:799 #, fuzzy, c-format msgid "" "The resulting partition is not properly aligned for best performance: %s" msgstr "" "A partição resultante não é propriamente alinhada para melhor performance." -#: parted/parted.c:800 parted/parted.c:1723 +#: parted/parted.c:801 parted/parted.c:1739 msgid "unknown (malloc failed)" msgstr "" -#: parted/parted.c:876 +#: parted/parted.c:877 #, fuzzy, c-format msgid "%s disk labels do not support partition name." msgstr "Rótulos de disco %s não suportam partições estendidas." -#: parted/parted.c:881 parted/parted.c:1561 parted/parted.c:1612 -#: parted/parted.c:1706 parted/parted.c:1781 +#: parted/parted.c:882 parted/parted.c:1564 parted/parted.c:1628 +#: parted/parted.c:1722 parted/parted.c:1797 msgid "Partition number?" msgstr "Número da partição?" -#: parted/parted.c:975 +#: parted/parted.c:976 #, 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:1017 +#: parted/parted.c:1018 #, c-format msgid "Model: %s (%s)\n" msgstr "Modelo: %s (%s)\n" -#: parted/parted.c:1019 +#: parted/parted.c:1020 #, c-format msgid "Disk %s: %s\n" msgstr "Disco %s: %s\n" -#: parted/parted.c:1020 +#: parted/parted.c:1021 #, c-format msgid "Sector size (logical/physical): %lldB/%lldB\n" msgstr "Tamanho do setor (lógico/físico): %lldB/%lldB\n" -#: parted/parted.c:1032 +#: parted/parted.c:1033 #, c-format msgid "Partition Table: %s\n" msgstr "Tabela de partições: %s\n" -#: parted/parted.c:1033 +#: parted/parted.c:1034 #, c-format msgid "Disk Flags: %s\n" msgstr "Opções de disco: %s\n" -#: parted/parted.c:1153 parted/parted.c:1156 +#: parted/parted.c:1154 parted/parted.c:1157 msgid "Number" msgstr "Número" -#: parted/parted.c:1153 parted/parted.c:1156 +#: parted/parted.c:1154 parted/parted.c:1157 msgid "Start" msgstr "Início" -#: parted/parted.c:1154 parted/parted.c:1157 +#: parted/parted.c:1155 parted/parted.c:1158 msgid "End" msgstr "Fim" -#: parted/parted.c:1157 +#: parted/parted.c:1158 msgid "Size" msgstr "Tamanho" -#: parted/parted.c:1161 +#: parted/parted.c:1162 msgid "Type" msgstr "Tipo" -#: parted/parted.c:1163 +#: parted/parted.c:1164 msgid "File system" msgstr "Sistema de arquivos" -#: parted/parted.c:1166 +#: parted/parted.c:1167 msgid "Name" msgstr "Nome" -#: parted/parted.c:1168 +#: parted/parted.c:1169 msgid "Flags" msgstr "Opções" -#: parted/parted.c:1225 +#: parted/parted.c:1226 msgid "Free Space" msgstr "Espaço livre" -#: parted/parted.c:1385 +#: parted/parted.c:1386 #, c-format msgid "" "A %s %s partition was found at %s -> %s. Do you want to add it to the " @@ -2651,56 +2599,56 @@ msgstr "" "Uma partição %s %s foi encontrada em %s -> %s. Você deseja adicioná-la a " "tabela de partições?" -#: parted/parted.c:1428 +#: parted/parted.c:1429 msgid "searching for file systems" msgstr "pesquisando por sistemas de arquivo" -#: parted/parted.c:1535 +#: parted/parted.c:1536 msgid "The resize command has been removed in parted 3.0" msgstr "O comando resize foi removido no parted 3.0" -#: parted/parted.c:1583 +#: parted/parted.c:1599 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:1636 +#: parted/parted.c:1652 msgid "New device?" msgstr "Novo dispositivo?" -#: parted/parted.c:1704 +#: parted/parted.c:1720 msgid "alignment type(min/opt)" msgstr "tipo de alinhamento(min/opt)" -#: parted/parted.c:1719 +#: parted/parted.c:1735 #, c-format msgid "%d aligned\n" msgstr "%d alinhado(s)\n" -#: parted/parted.c:1721 +#: parted/parted.c:1737 #, fuzzy, c-format msgid "%d not aligned: %s\n" msgstr "%d não alinhado(s)\n" -#: parted/parted.c:1746 parted/parted.c:1783 +#: parted/parted.c:1762 parted/parted.c:1799 msgid "Flag to Invert?" msgstr "Opção para inverter?" -#: parted/parted.c:1751 parted/parted.c:1788 +#: parted/parted.c:1767 parted/parted.c:1804 msgid "New state?" msgstr "Novo estado?" -#: parted/parted.c:1834 +#: parted/parted.c:1850 msgid "Unit?" msgstr "Unidade?" -#: parted/parted.c:1969 +#: parted/parted.c:1985 msgid "align-check" msgstr "align-check" -#: parted/parted.c:1972 +#: parted/parted.c:1988 #, fuzzy msgid "" "align-check TYPE N check partition N for TYPE(min|opt) " @@ -2709,11 +2657,11 @@ msgstr "" "align-check TIPO N verifica a partição N para " "alinhamento de TIPO(mínimo|ideal)" -#: parted/parted.c:1980 +#: parted/parted.c:1996 msgid "help" msgstr "help" -#: parted/parted.c:1983 +#: parted/parted.c:1999 msgid "" "help [COMMAND] print general help, or help on " "COMMAND" @@ -2721,15 +2669,15 @@ msgstr "" "help [COMANDO] exibe a ajuda geral, ou ajuda para " "o COMANDO" -#: parted/parted.c:1989 +#: parted/parted.c:2005 msgid "mklabel" msgstr "mklabel" -#: parted/parted.c:1989 +#: parted/parted.c:2005 msgid "mktable" msgstr "mktable" -#: parted/parted.c:1992 +#: parted/parted.c:2008 msgid "" "mklabel,mktable LABEL-TYPE create a new disklabel (partition " "table)" @@ -2737,15 +2685,15 @@ msgstr "" "mklabel,mktable TIPO-RÓTULO cria um novo rótulo de disco (na " "tabela de partição)" -#: parted/parted.c:1998 +#: parted/parted.c:2014 msgid "mkpart" msgstr "mkpart" -#: parted/parted.c:2001 +#: parted/parted.c:2017 msgid "mkpart PART-TYPE [FS-TYPE] START END make a partition" msgstr "mkpart TIPO-PART [TIPO-SISTARQ] INÍCIO FIM cria uma partição" -#: parted/parted.c:2007 +#: parted/parted.c:2023 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" @@ -2755,21 +2703,21 @@ msgstr "" "partição estendida). Este comando é útil se você apagou acidentalmente uma " "partição.\n" -#: parted/parted.c:2012 +#: parted/parted.c:2028 msgid "name" msgstr "name" -#: parted/parted.c:2015 +#: parted/parted.c:2031 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:2020 +#: parted/parted.c:2036 msgid "print" msgstr "print" -#: parted/parted.c:2023 +#: parted/parted.c:2039 msgid "" "print [devices|free|list,all|NUMBER] display the partition table, " "available devices, free space, all found partitions, or a particular " @@ -2779,7 +2727,7 @@ msgstr "" "dispositivos disponíveis, espaço livre, todas as partições encontradas ou " "uma partição específica" -#: parted/parted.c:2028 +#: parted/parted.c:2044 msgid "" "Without arguments, 'print' displays the entire partition table. However with " "the following arguments it performs various other actions.\n" @@ -2787,11 +2735,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:2030 +#: parted/parted.c:2046 msgid " devices : display all active block devices\n" msgstr " devices : exibe todos os dispositivos de bloco ativos\n" -#: parted/parted.c:2031 +#: parted/parted.c:2047 msgid "" " free : display information about free unpartitioned space on the " "current block device\n" @@ -2799,14 +2747,14 @@ msgstr "" " free : exibe informações sobre espaço livre não particionado no " "dispositivo de bloco atual\n" -#: parted/parted.c:2033 +#: parted/parted.c:2049 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:2034 +#: parted/parted.c:2050 msgid "" " NUMBER : display more detailed information about this particular " "partition\n" @@ -2814,19 +2762,19 @@ msgstr "" " NÚMERO : exibe informações mais detalhadas sobre esta partição " "específica\n" -#: parted/parted.c:2039 +#: parted/parted.c:2055 msgid "quit" msgstr "quit" -#: parted/parted.c:2042 +#: parted/parted.c:2058 msgid "quit exit program" msgstr "quit sai do programa" -#: parted/parted.c:2047 +#: parted/parted.c:2063 msgid "rescue" msgstr "rescue" -#: parted/parted.c:2050 +#: parted/parted.c:2066 msgid "" "rescue START END rescue a lost partition near START " "and END" @@ -2834,56 +2782,56 @@ msgstr "" "rescue INÍCIO FIM recupera uma partição perdida " "próxima do INÍCIO e FIM" -#: parted/parted.c:2056 +#: parted/parted.c:2072 msgid "resize" msgstr "resize" -#: parted/parted.c:2059 +#: parted/parted.c:2075 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:2062 +#: parted/parted.c:2078 msgid "resizepart" msgstr "resizepart" -#: parted/parted.c:2065 +#: parted/parted.c:2081 msgid "resizepart NUMBER END resize partition NUMBER" msgstr "" "resizepart NÚMERO FIM redimensiona a partição NÚMERO" -#: parted/parted.c:2070 +#: parted/parted.c:2086 msgid "rm" msgstr "rm" -#: parted/parted.c:2073 +#: parted/parted.c:2089 msgid "rm NUMBER delete partition NUMBER" msgstr "rm NÚMERO apaga a partição NÚMERO" -#: parted/parted.c:2078 +#: parted/parted.c:2094 msgid "select" msgstr "select" -#: parted/parted.c:2081 +#: parted/parted.c:2097 msgid "select DEVICE choose the device to edit" msgstr "" "select DISPOSITIVO escolhe o dispositivo para editar" -#: parted/parted.c:2086 +#: parted/parted.c:2102 msgid "disk_set" msgstr "disk_set" -#: parted/parted.c:2089 +#: parted/parted.c:2105 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:2094 +#: parted/parted.c:2110 msgid "disk_toggle" msgstr "disk_toggle" -#: parted/parted.c:2097 +#: parted/parted.c:2113 msgid "" "disk_toggle [FLAG] toggle the state of FLAG on " "selected device" @@ -2891,21 +2839,21 @@ msgstr "" "disk_toggle [OPÇÃO] alterna o estado de OPÇÃO no " "dispositivo selecionado" -#: parted/parted.c:2103 +#: parted/parted.c:2119 msgid "set" msgstr "set" -#: parted/parted.c:2106 +#: parted/parted.c:2122 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:2112 +#: parted/parted.c:2128 msgid "toggle" msgstr "toggle" -#: parted/parted.c:2115 +#: parted/parted.c:2131 msgid "" "toggle [NUMBER [FLAG]] toggle the state of FLAG on " "partition NUMBER" @@ -2913,20 +2861,20 @@ msgstr "" "toggle [NÚMERO [OPÇÃO]] alterna o estado de OPÇÃO no NÚMERO " "da partição" -#: parted/parted.c:2121 +#: parted/parted.c:2137 msgid "unit" msgstr "unit" -#: parted/parted.c:2124 +#: parted/parted.c:2140 msgid "unit UNIT set the default unit to UNIT" msgstr "" "unit UNIDADE define como unidade padrão UNIDADE" -#: parted/parted.c:2129 +#: parted/parted.c:2145 msgid "version" msgstr "version" -#: parted/parted.c:2132 +#: parted/parted.c:2148 msgid "" "version display the version number and " "copyright information of GNU Parted" @@ -2934,7 +2882,7 @@ msgstr "" "version exibe o número da versão e " "informações de direitos autorais do GNU Parted" -#: parted/parted.c:2136 +#: parted/parted.c:2152 msgid "" "'version' displays copyright and version information corresponding to this " "copy of GNU Parted\n" @@ -2942,30 +2890,38 @@ msgstr "" "'version' exibe informações de versão e direitos autorais correspondentes a " "esta cópia do GNU Parted\n" -#: parted/parted.c:2204 +#: parted/parted.c:2220 #, c-format msgid "Usage: %s [-hlmsv] [-a] [DEVICE [COMMAND [PARAMETERS]]...]\n" msgstr "" "Uso: %s [-hlmsv] [-a] [DISPOSITIVO [COMANDO [PARÂMETROS]]...]\n" -#: parted/parted.c:2248 +#: parted/parted.c:2264 msgid "No device found" msgstr "Nenhum dispositivo encontrado" -#: parted/parted.c:2285 +#: parted/parted.c:2301 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:2325 +#: parted/parted.c:2334 +msgid "" +"You should reinstall your boot loader before rebooting. Read section 4 of " +"the Parted User documentation for more information." +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:2341 msgid "You may need to update /etc/fstab.\n" msgstr "Você pode precisar atualizar /etc/fstab.\n" -#: parted/ui.c:164 +#: parted/ui.c:165 msgid "Welcome to GNU Parted! Type 'help' to view a list of commands.\n" msgstr "" "Bem vindo ao GNU Parted! Digite 'help' para ver uma lista de comandos.\n" -#: parted/ui.c:167 +#: parted/ui.c:168 msgid "" "Usage: parted [OPTION]... [DEVICE [COMMAND [PARAMETERS]...]...]\n" "Apply COMMANDs with PARAMETERS to DEVICE. If no COMMAND(s) are given, run " @@ -2976,7 +2932,7 @@ msgstr "" "Aplica COMANDOs com PARÂMETROS para DISPOSITIVO. Se nenhum COMANDO(s) forem\n" "informados, executa-se em modo interativo.\n" -#: parted/ui.c:172 +#: parted/ui.c:173 #, c-format msgid "" "\n" @@ -3039,7 +2995,7 @@ msgstr "" "Isto também inclui quaisquer informações adicionais sobre seu sistema\n" "que você considerar relevantes.\n" -#: parted/ui.c:293 +#: parted/ui.c:294 msgid "" "\n" "Command History:\n" @@ -3047,7 +3003,7 @@ msgstr "" "\n" "Histórico de comandos:\n" -#: parted/ui.c:356 +#: parted/ui.c:357 msgid "" "\n" "Error: SEGV_MAPERR (Address not mapped to object)\n" @@ -3055,7 +3011,7 @@ msgstr "" "\n" "Erro: SEGV_MAPERR (Endereço não mapeado ao objeto)\n" -#: parted/ui.c:362 +#: parted/ui.c:363 msgid "" "\n" "Error: SEGV_ACCERR (Invalid permissions for mapped object)\n" @@ -3063,7 +3019,7 @@ msgstr "" "\n" "Erro: SEGV_ACCERR (Permissões inválidas para o objeto mapeado)\n" -#: parted/ui.c:367 +#: parted/ui.c:368 msgid "" "\n" "Error: A general SIGSEGV signal was encountered.\n" @@ -3071,7 +3027,7 @@ msgstr "" "\n" "Erro: Um sinal geral SIGSEGV foi encontrado.\n" -#: parted/ui.c:391 +#: parted/ui.c:392 msgid "" "\n" "Error: FPE_INTDIV (Integer: divide by zero)" @@ -3079,7 +3035,7 @@ msgstr "" "\n" "Error: FPE_INTDIV (Inteiro: divisão por zero)" -#: parted/ui.c:396 +#: parted/ui.c:397 msgid "" "\n" "Error: FPE_INTOVF (Integer: overflow)" @@ -3087,7 +3043,7 @@ msgstr "" "\n" "Erro: FPE_INTOVF (Inteiro: estouro)" -#: parted/ui.c:401 +#: parted/ui.c:402 msgid "" "\n" "Error: FPE_FLTDIV (Float: divide by zero)" @@ -3095,7 +3051,7 @@ msgstr "" "\n" "Erro: FPE_FLTDIV (Real: divisão por zero)" -#: parted/ui.c:406 +#: parted/ui.c:407 msgid "" "\n" "Error: FPE_FLTOVF (Float: overflow)" @@ -3103,7 +3059,7 @@ msgstr "" "\n" "Erro: FPE_FLTOVF (Real: estouro)" -#: parted/ui.c:411 +#: parted/ui.c:412 msgid "" "\n" "Error: FPE_FLTUND (Float: underflow)" @@ -3111,7 +3067,7 @@ msgstr "" "\n" "Erro: FPE_FLTUND (Real: estouro negativo)" -#: parted/ui.c:416 +#: parted/ui.c:417 msgid "" "\n" "Error: FPE_FLTRES (Float: inexact result)" @@ -3119,7 +3075,7 @@ msgstr "" "\n" "Erro: FPE_FLTRES (Real: resultado não exato)" -#: parted/ui.c:421 +#: parted/ui.c:422 msgid "" "\n" "Error: FPE_FLTINV (Float: invalid operation)" @@ -3127,7 +3083,7 @@ msgstr "" "\n" "Erro: FPE_FLTINV (Real: operação inválida)" -#: parted/ui.c:426 +#: parted/ui.c:427 msgid "" "\n" "Error: FPE_FLTSUB (Float: subscript out of range)" @@ -3135,7 +3091,7 @@ msgstr "" "\n" "Erro: FPE_FLTSUB (Real: subscrito fora de alcance)" -#: parted/ui.c:431 +#: parted/ui.c:432 msgid "" "\n" "Error: A general SIGFPE signal was encountered." @@ -3143,7 +3099,7 @@ msgstr "" "\n" "Erro: Um sinal geral SIGFPE foi encontrado." -#: parted/ui.c:455 +#: parted/ui.c:456 msgid "" "\n" "Error: ILL_ILLOPC (Illegal Opcode)" @@ -3151,7 +3107,7 @@ msgstr "" "\n" "Erro: ILL_ILLOPC (Código de operação privilegiado)" -#: parted/ui.c:460 +#: parted/ui.c:461 msgid "" "\n" "Error: ILL_ILLOPN (Illegal Operand)" @@ -3159,7 +3115,7 @@ msgstr "" "\n" "Erro: ILL_ILLOPN (Operando ilegal)" -#: parted/ui.c:465 +#: parted/ui.c:466 msgid "" "\n" "Error: ILL_ILLADR (Illegal addressing mode)" @@ -3167,7 +3123,7 @@ msgstr "" "\n" "Erro: ILL_ILLADR (Modo de endereçamento ilegal)" -#: parted/ui.c:470 +#: parted/ui.c:471 msgid "" "\n" "Error: ILL_ILLTRP (Illegal Trap)" @@ -3175,7 +3131,7 @@ msgstr "" "\n" "Erro: ILL_ILLTRP (Interrupção ilegal)" -#: parted/ui.c:475 +#: parted/ui.c:476 msgid "" "\n" "Error: ILL_PRVOPC (Privileged Opcode)" @@ -3183,7 +3139,7 @@ msgstr "" "\n" "Erro: ILL_PRVOPC (Código de operação privilegiado)" -#: parted/ui.c:480 +#: parted/ui.c:481 msgid "" "\n" "Error: ILL_PRVREG (Privileged Register)" @@ -3191,7 +3147,7 @@ msgstr "" "\n" "Erro: ILL_PRVREG (Registrador privilegiado)" -#: parted/ui.c:485 +#: parted/ui.c:486 msgid "" "\n" "Error: ILL_COPROC (Coprocessor Error)" @@ -3199,7 +3155,7 @@ msgstr "" "\n" "Erro: ILL_COPROC (Erro do coprocessador)" -#: parted/ui.c:490 +#: parted/ui.c:491 msgid "" "\n" "Error: ILL_BADSTK (Internal Stack Error)" @@ -3207,7 +3163,7 @@ msgstr "" "\n" "Erro: ILL_BADSTK (Erro interno da pilha)" -#: parted/ui.c:495 +#: parted/ui.c:496 msgid "" "\n" "Error: A general SIGILL signal was encountered." @@ -3215,69 +3171,69 @@ msgstr "" "\n" "Erro: Um sinal geral SIGILL foi encontrado." -#: parted/ui.c:888 +#: parted/ui.c:889 #, c-format msgid "invalid token: %s" msgstr "token inválido: %s" -#: parted/ui.c:1069 +#: parted/ui.c:1070 msgid "Expecting a partition number." msgstr "Espera-se um número de partição." -#: parted/ui.c:1078 +#: parted/ui.c:1079 msgid "Partition doesn't exist." msgstr "A partição não existe." -#: parted/ui.c:1098 +#: parted/ui.c:1099 msgid "Expecting a file system type." msgstr "Espera-se um tipo de sistema de arquivos." -#: parted/ui.c:1105 +#: parted/ui.c:1106 #, c-format msgid "Unknown file system type \"%s\"." msgstr "Tipo de sistema de arquivos \"%s\" desconhecido." -#: parted/ui.c:1126 +#: parted/ui.c:1127 msgid "Expecting a disk label type." msgstr "Espera-se um tipo de rótulo de disco." -#: parted/ui.c:1157 parted/ui.c:1193 +#: parted/ui.c:1158 parted/ui.c:1194 msgid "No flags supported" msgstr "" -#: parted/ui.c:1267 +#: parted/ui.c:1268 msgid "Can't create any more partitions." msgstr "Não é possível criar mais nenhuma partição." -#: parted/ui.c:1277 +#: parted/ui.c:1278 msgid "Expecting a partition type." msgstr "Espera-se um tipo de partição." -#: parted/ui.c:1426 +#: parted/ui.c:1427 msgid "on" msgstr "ligado" -#: parted/ui.c:1427 +#: parted/ui.c:1428 msgid "off" msgstr "desligado" -#: parted/ui.c:1444 +#: parted/ui.c:1445 msgid "optimal" msgstr "ideal" -#: parted/ui.c:1445 +#: parted/ui.c:1446 msgid "minimal" msgstr "mínimo" -#: parted/ui.c:1578 +#: parted/ui.c:1579 msgid "OPTIONs:" msgstr "OPÇÕEs:" -#: parted/ui.c:1583 +#: parted/ui.c:1584 msgid "COMMANDs:" msgstr "COMANDOs:" -#: parted/ui.c:1586 +#: parted/ui.c:1587 #, c-format msgid "" "\n" @@ -3286,30 +3242,79 @@ msgstr "" "\n" "Informe erros para %s\n" -#: parted/ui.c:1593 +#: parted/ui.c:1594 #, c-format msgid "Using %s\n" msgstr "Usando %s\n" -#: parted/ui.c:1673 +#: parted/ui.c:1674 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" +#, c-format #~ msgid "%s: option '--%s' doesn't allow an argument\n" #~ msgstr "%s: a opção \"--%s\" não permite um argumento\n" +#, c-format #~ msgid "%s: unrecognized option '--%s'\n" #~ msgstr "%s: opção desconhecido \"--%s\"\n" +#, c-format #~ msgid "%s: option '-W %s' doesn't allow an argument\n" #~ msgstr "%s: a opção \"-W %s\" não permite um argumento\n" +#, c-format #~ msgid "%s: option '-W %s' requires an argument\n" #~ msgstr "%s: a opção \"-W %s\" exige um argumento\n" +#, c-format #~ msgid "%s home page: \n" #~ msgstr "Página do %s: \n" +#, c-format +#~ msgid "invalid %s%s argument '%s'" +#~ msgstr "argumento inválido para %s%s: \"%s\"" + +#, c-format +#~ msgid "invalid suffix in %s%s argument '%s'" +#~ msgstr "sufixo inválido no argumento para %s%s: \"%s\"" + +#, c-format +#~ msgid "%s%s argument '%s' too large" +#~ msgstr "argumento grande demais para %s%s: \"%s\"" + +#~ msgid "" +#~ "The partition table cannot be re-read. This means you need to reboot " +#~ "before mounting any modified partitions. You also need to reinstall your " +#~ "boot loader before you reboot (which may require mounting modified " +#~ "partitions). It is impossible do both things! So you'll need to boot " +#~ "off a rescue disk, and reinstall your boot loader from the rescue disk. " +#~ "Read section 4 of the Parted User documentation for more information." +#~ msgstr "" +#~ "A tabela de partições não pde ser lida novamente. Isto significa que você " +#~ "precisa reiniciar antes de montar qualquer partição modificada. Você " +#~ "também precisa reinstalar seu carregador de inicialização antes de " +#~ "reinicializar (o que pode exigir a montagem das partições modificadas). É " +#~ "impossível fazer as duas coisas! Então você irá precisar inicializar por " +#~ "um disco de resgate, e reinstalar seu gerenciador de boot a partir deste " +#~ "disco. Leia a seção 4 da documentação do usuário do Parted para maiores " +#~ "informações." + +#, 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 " +#~ "computer before doing anything with %s." +#~ msgstr "" +#~ "A tabela de partições em %s não pode ser lida novamente (%s). Isto " +#~ "significa que o GNU Hurd não sabe nada sobre as modificações que você " +#~ "fez. Você deve reinicializar seu computador antes de fazer qualquer coisa " +#~ "em %s." + +#~ msgid "The boot region doesn't start at the start of the partition." +#~ msgstr "A região de inicialização não começa no início da partição." + +#, 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." @@ -3318,6 +3323,14 @@ msgstr "Este comando não faz sentido em modo não interativo.\n" #~ "Parted é conhecido por não funcionar corretamente com setores diferentes " #~ "de 512 bytes." +#, c-format +#~ msgid "" +#~ "The file %s is marked as a system file. This means moving it could cause " +#~ "some programs to stop working." +#~ msgstr "" +#~ "O arquivo %s está marcado como um arquivo de sistema. Isto significa que " +#~ "movê-lo pode fazer com que alguns programas parem de funcionar." + #~ msgid "Failed to add partition %d (%s)" #~ msgstr "Ocorreu falha ao adicionar partição %d (%s)" diff --git a/po/ro.gmo b/po/ro.gmo index 175be08f525f8732013198aebe96abc8e10d3b31..92b8f9a6836c6f9f5398706083dcd3832b9385ff 100644 GIT binary patch delta 2296 zcmXZdZ%oxy9LMo5aN%Ak<&WSENxQ@!6$%7wCZGbLD1!e9G!-$#6qmJ}BbQz0pV`U> z=pAd;YB|ce=>xaxN`@_&TREc#Ih@vtR&Hjx=`@%=)A#58&KckPI_KPb&pE&EIp=a^ z?d9h1Xoj!PC_9Mfi4PLY)bU3WFO*ryX60Ch)!2!dcmk*5w>S+)Fbn_30!&Wv#w*1P z+D&*E+mR{kU*w}S3(-HxYnNax?N;P1 zJB~{A8LYrd=*LH>t$2dU;4~haJ-15K`}LXRe=(INI*PFmKg1!_0%|x>%EUrcdzo`J zDpPI9v9Wg4q1uib_-)tTjr#r`*M9)@y-#p19?K&C8hDrv4e%?*<26)jZ=eQ@=kb)% z6x8R_oLQ&=r#N#_-=E>$FLwR2P~*>W{Z-DIFqNS=o)F9VfS-+>hm|-5dr%9BU=eNXlq61IkF4Tk}22slMaSfK>3wQwQFx*e2lFBV-E~C$;y&g63QG68# zQ4@@zw#v^z(Sj?GwObb|Q+rVvIi!9b>i^mD?g+I7_R9m71`{~#wsZ&V>`ur|~H z?;!`&_8>RPj-dAXbDV=GQ41eM4VcYiRbe%1i+WJ~dyzl;ikC9Hh}z1B7|{KHOr?~L zxR7_c%TTFZha6n%Mcsn0Q4{}yT1XCo)f0jpHl=?;3fbXCdavnL4HjJ9^AJjs!^1aW8Fhsi%`SG)E)DKk;Zp4H5 z65hmqOe-M&J}T#^XzvD4Pc($;|H<_aqb3@`1pEuNMK@jh4(giSLyhyuz5fKYB}s+e zcy*Xay8-q6X8r!^$=A@KFYb3A_!zZ-US}UB(f-VN0^@0)LVfPE>pzQH;CHTn5H;>a zj6;=bVoR*1_m-QjqQOFAMOUxE)$4Hwp*>U4nP?`q5i1E5?XyZ3p;TMsU4O8pm5MfM zE}@NkjmRK25xP4oh&n=#pu&~1^|6|Fmy{zF9q)y)8XFk-(;u9$oz@$K4)W$mTp+ko zC##cC(LW27CL*2aR)Z2G77#k+D$6|Vbtl=0mFaqoYzySfd(-Q%wWy=iPVkEoE492X zCh`c5wk;)8v=RKLvH6jqKrp<7nzpur;DW{e!7W0SMvvH5sj6$gj?h`r&1fN1bjVeT z2;DrDw}={I1JOa~K&!M7I-^?&HZ|IseAOT6O8+L>ojK-@RUYT{GU CH_*ob delta 3466 zcmZvdZHyJw8OIN}xGS)wyKZ-R(e7E`?k>u;yC8){Q7BlTq9QIT*0Ro>JJ%h#cV>HM zu4HY~+YqBMv08f3hQ`#iq_4*Gg@mSw# zaTPyyeD z8{wk)St9qqrL4c?)<1*_Fa-zUKcN!pZ8xSH-T)PFH=G0az+b~L*iU@3?nBv$#-K7z zp-y(t@dt1T>(`(h{27vy`77kloN?>93yiszb+_ZqP>FmIu7JP=myax6`IoRpe55a}3zvuQ}gn8EQLj_pektNy-Rl%HN0q$k}Ed1^) zW6r_)F*d$)c~;`Rq_t5Gz+LdSa5r3yu&T^sPyxOTRqE$pKYYWj&%jNrms591Qi76T zlFMrNWvI6LIaFm{?Uw#b{=x>$U|M^!2Rh(3){EfPumHaRpMXlBo#U%Qolxr~juxtd zIY^(Gl~CHRg$jI~TW^MXf9pc(uNynr(2IA&5jY0r_%M`%ufy5!n^01G3+laJLiNO3 zP|yFy@m(l?e{?(r_5MHH{eQXrvvnp4(6T6V(B{|_M<= zS?_`h{3u)pe*_iaB$QNVp%Pw!GgLMALRBh(s>tWG&%q8rdZKO)+pM`>gG+hfBwPmD z`?CFEs1x4``u?A0GR(#? zC@ud4)f}hb$KYu=2nWbYrQHenV9X;>`(J|!{1Q|mXQ2FCx;(4Ie8(GM%zhQln{CXy z@KxfQQwXI}zA%vS?@*HD@qPz90QLF32`_;kKz;A0A-S0xdPtIOT(-h0RD#DLU!*w! zCCTrh66~R2n3|=qZkg<0!mp;Ozm3ibRmjz=IBH{W;npLhE|UP=9x;ZNO-pFuf(5zc}dH)7+>S$1zX^PF36gr9Qr z5h#7{bZhm>2CR%pP7TSd5n}VO>l>R|dv@Q$OhTz`CEO=5eN#S0WtvTJ6Vwqj__obh zbC!K$Dv^dtx2-wj|8?W})}HnXD=De|4jQkw_S}9Kv->d({d3W{4bvwTX~E!Ew)q>N z?$@|IgW2QQ?>GSWHAdQ&Y$&;%d*OVnfbq-K99y{Fj4i|XCe5vwh6Lk3mf6%e*w$0u z!A#Pw#(FV+cFcB6;=A z>d^psVxMy8sw{iSG>mB(eW^` zmB5P_YG5mIElR`ae(Ob(EQ(<%guV>yYo7@e?0WZZN-~p=d-nNW`v7)UxEAWsU^>_G7%?9sIwGf zTZq$fn~sxL(r4`*u?{dmyy-JEPY{<%)+0=N;@5a9O!lqh6pdH9uIwsR;|lMq8s~2| zPIqmukFt0EaISW7WOK>?SI`dT66H6ejPkgxRxR3nQM^B~R9q=quMpSL83pvcX6c$$ zuXx44)i4>4*VM|z=~8i|s`cZ_L@f=fDA$yu7&|R8&-+8_kURQBN6Vc4(fnqFmFN5x zFAdh)RYSug`Qah{?C{6euU?ZMT01m!^vUkV+!ocR(cibM(cO2XKI#>MvS*9#A#N>8=pTuJB09+q_>0fmZtn#nvW%G)v5SD bB2G6SN4P)?6$}X;q&hWnKKhfsjyeAYV_I@$ diff --git a/po/ro.po b/po/ro.po index 16b250f..e83d202 100644 --- a/po/ro.po +++ b/po/ro.po @@ -6,7 +6,7 @@ msgid "" msgstr "" "Project-Id-Version: parted 1.6.23\n" "Report-Msgid-Bugs-To: bug-parted@gnu.org\n" -"POT-Creation-Date: 2019-10-10 16:35-0700\n" +"POT-Creation-Date: 2021-01-27 16:00-0800\n" "PO-Revision-Date: 2005-08-08 12:00-05\n" "Last-Translator: Laurentiu Buzdugan \n" "Language-Team: Romanian \n" @@ -96,11 +96,11 @@ msgstr "" #. If you don't know what to put here, please see #. #. and use glyphs suitable for your language. -#: lib/quotearg.c:362 +#: lib/quotearg.c:355 msgid "`" msgstr "" -#: lib/quotearg.c:363 +#: lib/quotearg.c:356 msgid "'" msgstr "" @@ -341,79 +341,64 @@ msgstr "" msgid "memory exhausted" msgstr "" -#: lib/xstrtol-error.c:63 -#, c-format -msgid "invalid %s%s argument '%s'" -msgstr "" - -#: lib/xstrtol-error.c:68 -#, c-format -msgid "invalid suffix in %s%s argument '%s'" -msgstr "" - -#: lib/xstrtol-error.c:72 -#, c-format -msgid "%s%s argument '%s' too large" -msgstr "" - -#: libparted/arch/beos.c:245 +#: libparted/arch/beos.c:246 msgid "Disk Image" msgstr "" -#: libparted/arch/beos.c:346 libparted/arch/gnu.c:277 +#: libparted/arch/beos.c:347 libparted/arch/gnu.c:277 #: libparted/arch/linux.c:1731 #, c-format msgid "Error opening %s: %s" msgstr "Eroare la deschiderea %s: %s" -#: libparted/arch/beos.c:357 libparted/arch/gnu.c:287 +#: libparted/arch/beos.c:358 libparted/arch/gnu.c:287 #: libparted/arch/linux.c:1742 #, c-format msgid "Unable to open %s read-write (%s). %s has been opened read-only." msgstr "" "Nu pot deschide %s citire-scriere (%s). %s a fost deschis numai-citire." -#: libparted/arch/beos.c:419 libparted/arch/linux.c:1907 +#: libparted/arch/beos.c:420 libparted/arch/linux.c:1907 #, c-format msgid "%s during seek for read on %s" msgstr "%s în timpul cãutãrii pentru citire pe %s" -#: libparted/arch/beos.c:452 libparted/arch/gnu.c:465 libparted/arch/gnu.c:564 -#: libparted/arch/gnu.c:692 libparted/arch/linux.c:1867 +#: libparted/arch/beos.c:453 libparted/arch/gnu.c:425 libparted/arch/gnu.c:524 +#: libparted/arch/gnu.c:652 libparted/arch/linux.c:1867 #: libparted/arch/linux.c:1949 #, c-format msgid "%s during read on %s" msgstr "%s în timpul citirii pe %s" -#: libparted/arch/beos.c:488 libparted/arch/gnu.c:525 +#: libparted/arch/beos.c:489 libparted/arch/gnu.c:485 #: libparted/arch/linux.c:2026 #, c-format msgid "Can't write to %s, because it is opened read-only." msgstr "Nu pot scrie pe %s, pentru cã este deschis numai-citire." -#: libparted/arch/beos.c:504 libparted/arch/linux.c:2051 +#: libparted/arch/beos.c:505 libparted/arch/linux.c:2051 #, c-format msgid "%s during seek for write on %s" msgstr "%s în timpul cãutãrii pentru scriere pe %s" -#: libparted/arch/beos.c:541 libparted/arch/gnu.c:601 libparted/arch/gnu.c:646 -#: libparted/arch/gnu.c:723 libparted/arch/linux.c:1999 +#: libparted/arch/beos.c:542 libparted/arch/gnu.c:561 libparted/arch/gnu.c:606 +#: libparted/arch/gnu.c:683 libparted/arch/linux.c:1999 #: libparted/arch/linux.c:2094 libparted/arch/linux.c:2167 #, c-format msgid "%s during write on %s" msgstr "%s în timpul scrierii pe %s" -#: partprobe/partprobe.c:148 +#: partprobe/partprobe.c:149 #, c-format msgid "Try `%s --help' for more information.\n" msgstr "" -#: partprobe/partprobe.c:152 +#: partprobe/partprobe.c:153 #, c-format msgid "Usage: %s [OPTION] [DEVICE]...\n" msgstr "" -#: partprobe/partprobe.c:153 +#: partprobe/partprobe.c:154 msgid "" "Inform the operating system about partition table changes.\n" "\n" @@ -423,13 +408,13 @@ msgid "" " -v, --version output version information and exit\n" msgstr "" -#: partprobe/partprobe.c:161 +#: partprobe/partprobe.c:162 msgid "" "\n" "When no DEVICE is given, probe all partitions.\n" msgstr "" -#: partprobe/partprobe.c:165 +#: partprobe/partprobe.c:166 #, c-format msgid "" "\n" @@ -445,45 +430,7 @@ msgstr "Nu pot deschide %s." msgid "Unable to probe store." msgstr "Nu pot proba `store'." -#: libparted/arch/gnu.c:368 -msgid "" -"The partition table cannot be re-read. This means you need to reboot before " -"mounting any modified partitions. You also need to reinstall your boot " -"loader before you reboot (which may require mounting modified partitions). " -"It is impossible do both things! So you'll need to boot off a rescue disk, " -"and reinstall your boot loader from the rescue disk. Read section 4 of the " -"Parted User documentation for more information." -msgstr "" -"Tabela de partiþii nu poate fi recititã. Aceasta înseamnã cã trebuie sã " -"reboot-aþi înainte de a monta orice partiþii modificate. Deasemenea, ar " -"trebui sã reinstalaþi boot loader-ul înainte de a reboot-a (ceea ce ar putea " -"sã necesite montarea partiþiilor modificate). Este imposibil sã faceþi " -"ambele lucruri! Aºa cã trebuie sã boot-aþi de pe un disc de salvare ºi " -"reinstalaþi boot loader-ul d-voastrã de pe discul de salvare. Citiþi " -"secþiunea 4 din documentaþia utilizatorului de Parted pentru informaþii " -"suplimentare." - -#: libparted/arch/gnu.c:385 -#, 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 computer " -"before doing anything with %s." -msgstr "" -"Tabela de partiþii pe %s nu poate fi re-cititã (%s). Aceasta înseamnã cã " -"Hurd nu ºtie nimic despre nici o modificare pe care aþi fãcut-o. Ar trebui " -"sã reboot-aþi computerul înainte de a face ceva cu %s." - -#: libparted/arch/gnu.c:396 parted/parted.c:2318 -msgid "" -"You should reinstall your boot loader before rebooting. Read section 4 of " -"the Parted User documentation for more information." -msgstr "" -"Ar trebui sã reinstalaþi boot loader-ul d-voastrã înainte de reboot-are. " -"Citiþi secþiunea 4 din documentaþia utilizatorului Parted pentru informaþii " -"suplimentare." - -#: libparted/arch/gnu.c:788 +#: libparted/arch/gnu.c:748 #, c-format msgid "%s trying to sync %s to disk" msgstr "%s încearcã sã sincronizeze %s pe disc" @@ -789,15 +736,15 @@ msgstr "metadata" msgid "free" msgstr "liber" -#: libparted/disk.c:2355 parted/ui.c:1258 parted/ui.c:1286 +#: libparted/disk.c:2355 parted/ui.c:1259 parted/ui.c:1287 msgid "extended" msgstr "extinsã" -#: libparted/disk.c:2357 parted/ui.c:1262 parted/ui.c:1290 +#: libparted/disk.c:2357 parted/ui.c:1263 parted/ui.c:1291 msgid "logical" msgstr "logicã" -#: libparted/disk.c:2359 parted/ui.c:1254 parted/ui.c:1282 +#: libparted/disk.c:2359 parted/ui.c:1255 parted/ui.c:1283 msgid "primary" msgstr "primarã" @@ -874,64 +821,73 @@ msgstr "" msgid "esp" msgstr "" -#: libparted/disk.c:2415 +#: libparted/disk.c:2411 +msgid "chromeos_kernel" +msgstr "" + +#: libparted/disk.c:2413 +#, fuzzy +msgid "bls_boot" +msgstr "boot" + +#: libparted/disk.c:2419 #, c-format msgid "Unknown partition flag, %d." msgstr "Flag de partiþie necunoscut, %d." -#: libparted/exception.c:78 +#: libparted/exception.c:79 msgid "Information" msgstr "Informaþii" -#: libparted/exception.c:79 +#: libparted/exception.c:80 msgid "Warning" msgstr "Avertisment" -#: libparted/exception.c:80 +#: libparted/exception.c:81 msgid "Error" msgstr "Eroare" -#: libparted/exception.c:81 +#: libparted/exception.c:82 msgid "Fatal" msgstr "Fatalã" -#: libparted/exception.c:82 +#: libparted/exception.c:83 msgid "Bug" msgstr "Bug" -#: libparted/exception.c:83 +#: libparted/exception.c:84 msgid "No Implementation" msgstr "" -#: libparted/exception.c:87 +#: libparted/exception.c:88 msgid "Fix" msgstr "" -#: libparted/exception.c:88 +#: libparted/exception.c:89 msgid "Yes" msgstr "" -#: libparted/exception.c:89 +#: libparted/exception.c:90 msgid "No" msgstr "" -#: libparted/exception.c:90 +#: libparted/exception.c:91 msgid "OK" msgstr "" -#: libparted/exception.c:91 +#: libparted/exception.c:92 msgid "Retry" msgstr "" -#: libparted/exception.c:92 +#: libparted/exception.c:93 msgid "Ignore" msgstr "" -#: libparted/exception.c:93 +#: libparted/exception.c:94 msgid "Cancel" msgstr "" -#: libparted/exception.c:133 +#: libparted/exception.c:134 #, c-format msgid "" "A bug has been detected in GNU Parted. Refer to the web site of parted " @@ -940,31 +896,31 @@ msgid "" "containing at least the version (%s) and the following message: " msgstr "" -#: libparted/labels/aix.c:91 +#: libparted/labels/aix.c:92 msgid "Support for reading AIX disk labels is is not implemented yet." msgstr "" -#: libparted/labels/aix.c:102 +#: libparted/labels/aix.c:103 msgid "Support for writing AIX disk labels is is not implemented yet." msgstr "" -#: libparted/labels/aix.c:115 +#: libparted/labels/aix.c:116 msgid "" "Support for adding partitions to AIX disk labels is not implemented yet." msgstr "" -#: libparted/labels/aix.c:125 +#: libparted/labels/aix.c:126 msgid "" "Support for duplicating partitions in AIX disk labels is not implemented yet." msgstr "" -#: libparted/labels/aix.c:143 +#: libparted/labels/aix.c:144 msgid "" "Support for setting system type of partitions in AIX disk labels is not " "implemented yet." msgstr "" -#: libparted/labels/aix.c:153 +#: libparted/labels/aix.c:154 msgid "Support for setting flags in AIX disk labels is not implemented yet." msgstr "" @@ -1052,11 +1008,11 @@ msgid "" "partitions, if XGM is the first one it counts for two)." msgstr "" -#: libparted/labels/atari.c:1657 libparted/labels/bsd.c:567 -#: libparted/labels/dasd.c:894 libparted/labels/dos.c:2276 -#: libparted/labels/dvh.c:770 libparted/labels/gpt.c:2050 -#: libparted/labels/loop.c:243 libparted/labels/mac.c:1423 -#: libparted/labels/pc98.c:701 libparted/labels/rdb.c:1054 +#: libparted/labels/atari.c:1657 libparted/labels/bsd.c:563 +#: libparted/labels/dasd.c:895 libparted/labels/dos.c:2283 +#: libparted/labels/dvh.c:770 libparted/labels/gpt.c:2140 +#: 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 "Nu pot satisface toate constrângerile pe partiþie." @@ -1072,43 +1028,43 @@ msgstr "" msgid "Unable to allocate a partition number." msgstr "Nu pot aloca un numãr de partiþie." -#: libparted/labels/bsd.c:592 +#: libparted/labels/bsd.c:588 msgid "Unable to allocate a bsd disklabel slot." msgstr "Nu pot aloca loc pentru eticheta de disc bsd." -#: libparted/labels/dasd.c:625 +#: libparted/labels/dasd.c:626 msgid "The partition table of DASD-LDL device cannot be changed.\n" msgstr "" -#: libparted/labels/dasd.c:920 +#: libparted/labels/dasd.c:921 #, fuzzy msgid "Unable to allocate a dasd disklabel slot" msgstr "Nu pot aloca loc pentru eticheta de disc bsd." -#: libparted/labels/dos.c:1003 +#: libparted/labels/dos.c:1006 #, c-format msgid "Invalid partition table on %s -- wrong signature %x." msgstr "Tabela de partiþii invalidã pe %s -- semnãturã greºitã %x." -#: libparted/labels/dos.c:1031 +#: libparted/labels/dos.c:1034 #, c-format msgid "Invalid partition table - recursive partition on %s." msgstr "Tabela de partiþii invalidã - partiþie recursivã pe %s." -#: libparted/labels/dos.c:1560 +#: libparted/labels/dos.c:1557 msgid "Extended partitions cannot be hidden on msdos disk labels." msgstr "" -#: libparted/labels/dos.c:1572 +#: libparted/labels/dos.c:1569 #, fuzzy msgid "Extended partitions cannot be recovery partitions on msdos disk labels." msgstr "Tabela de partiþii invalidã - partiþie recursivã pe %s." -#: libparted/labels/dos.c:2258 +#: libparted/labels/dos.c:2265 msgid "Parted can't resize partitions managed by Windows Dynamic Disk." msgstr "" -#: libparted/labels/dos.c:2514 +#: libparted/labels/dos.c:2521 #, fuzzy msgid "cannot create any more partitions" msgstr "Nu mai pot crea nici o partiþie" @@ -1251,11 +1207,11 @@ msgstr "" msgid "Disk geometry does not match a DASD device of type 3390." msgstr "" -#: libparted/labels/gpt.c:531 +#: libparted/labels/gpt.c:541 msgid "device is too small for GPT" msgstr "" -#: libparted/labels/gpt.c:733 +#: libparted/labels/gpt.c:743 #, fuzzy, c-format msgid "" "The format of the GPT partition table is version %x, which is newer than " @@ -1264,7 +1220,7 @@ msgstr "" "Formatul tabelei de partiþii GPT este versiunea %x, care este mai nou decât " "ceea ce Parted poate recunoaºte. Vã rugãm spuneþi-ne! bug-parted@gnu.org" -#: libparted/labels/gpt.c:769 +#: libparted/labels/gpt.c:779 #, c-format msgid "" "Not all of the space available to %s appears to be used, you can fix the GPT " @@ -1272,7 +1228,7 @@ msgid "" "setting? " msgstr "" -#: libparted/labels/gpt.c:1008 +#: libparted/labels/gpt.c:1024 #, fuzzy msgid "" "The backup GPT table is not at the end of the disk, as it should be. Fix, " @@ -1283,7 +1239,7 @@ msgstr "" "mai mic. Reparã, mutând rezerva (backup) la sfârºit (ºi ºterge vechea " "rezervã?" -#: libparted/labels/gpt.c:1026 +#: libparted/labels/gpt.c:1042 msgid "" "Both the primary and backup GPT tables are corrupt. Try making a fresh " "table, and using Parted's rescue feature to recover partitions." @@ -1292,7 +1248,7 @@ msgstr "" "o tabelã nouã ºi sã folosiþi capabilitatea de salvare lui Parted pentru a " "recupera partiþiile." -#: libparted/labels/gpt.c:1037 +#: libparted/labels/gpt.c:1053 #, fuzzy msgid "" "The backup GPT table is corrupt, but the primary appears OK, so that will be " @@ -1301,7 +1257,7 @@ msgstr "" "Tabela primarã GPT este coruptã, dar rezerva pare OK, aºa cã va fi folositã " "rezerva." -#: libparted/labels/gpt.c:1049 +#: libparted/labels/gpt.c:1065 msgid "" "The primary GPT table is corrupt, but the backup appears OK, so that will be " "used." @@ -1309,11 +1265,11 @@ msgstr "" "Tabela primarã GPT este coruptã, dar rezerva pare OK, aºa cã va fi folositã " "rezerva." -#: libparted/labels/gpt.c:1073 +#: libparted/labels/gpt.c:1089 msgid "primary partition table array CRC mismatch" msgstr "" -#: libparted/labels/gpt.c:1936 libparted/labels/gpt.c:1963 +#: libparted/labels/gpt.c:2026 libparted/labels/gpt.c:2053 #, fuzzy msgid "failed to translate partition name" msgstr "Nu pot aloca un numãr de partiþie." @@ -1347,18 +1303,14 @@ msgid "The data region doesn't start at the start of the partition." msgstr "Regiunea de date nu începe la începutul partiþiei." #: libparted/labels/mac.c:572 -msgid "The boot region doesn't start at the start of the partition." -msgstr "Regiunea de boot nu începe la începutul partiþiei." - -#: libparted/labels/mac.c:586 msgid "The partition's boot region doesn't occupy the entire partition." msgstr "Regiunea de boot a partiþiei nu ocupã întreaga partiþie." -#: libparted/labels/mac.c:597 +#: libparted/labels/mac.c:583 msgid "The partition's data region doesn't occupy the entire partition." msgstr "Regiunea de date a partiþiei nu ocupã întreaga partiþie." -#: libparted/labels/mac.c:649 +#: libparted/labels/mac.c:635 #, c-format msgid "" "Weird block size on device descriptor: %d bytes is not divisible by 512." @@ -1366,7 +1318,7 @@ msgstr "" "Dimensiune de bloc ciudatã pe descriptorul dispozitivului: %d octeþi nu este " "divizibil cu 512." -#: libparted/labels/mac.c:662 +#: libparted/labels/mac.c:648 #, c-format msgid "" "The driver descriptor says the physical block size is %d bytes, but Linux " @@ -1375,44 +1327,44 @@ msgstr "" "Descriptorul de driver spune cã dimensiunea fizicã a blocului este %d octeþi " "dar Linux spune cã este %d octeþi." -#: libparted/labels/mac.c:715 +#: libparted/labels/mac.c:701 msgid "No valid partition map found." msgstr "Nu a fost gãsitã nici o hartã de partiþie validã." -#: libparted/labels/mac.c:789 +#: 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:820 +#: libparted/labels/mac.c:806 msgid "Weird! There are 2 partitions map entries!" msgstr "Ciudat! Existã 2 intrãri în harta partiþiei" -#: libparted/labels/mac.c:1359 +#: 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:1458 +#: libparted/labels/mac.c:1444 msgid "Can't add another partition -- the partition map is too small!" msgstr "" -#: libparted/labels/pc98.c:284 +#: libparted/labels/pc98.c:285 #, c-format msgid "Invalid partition table on %s." msgstr "Tabela de partiþii invalidã pe %s." -#: libparted/labels/pc98.c:337 libparted/labels/pc98.c:415 +#: 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:733 +#: libparted/labels/pc98.c:729 msgid "Can't add another partition." msgstr "" @@ -1577,39 +1529,39 @@ msgstr "" msgid "Could not write VTOC FMT9 DSCB." msgstr "" -#: libparted/libparted.c:242 +#: libparted/libparted.c:247 msgid "Out of memory." msgstr "" -#: libparted/unit.c:139 +#: libparted/unit.c:140 msgid "Cannot get unit size for special unit 'COMPACT'." msgstr "" -#: libparted/unit.c:385 +#: libparted/unit.c:386 #, c-format msgid "\"%s\" has invalid syntax for locations." msgstr "" -#: libparted/unit.c:393 +#: libparted/unit.c:394 #, c-format msgid "The maximum head value is %d." msgstr "" -#: libparted/unit.c:400 +#: libparted/unit.c:401 #, c-format msgid "The maximum sector value is %d." msgstr "" -#: libparted/unit.c:412 libparted/unit.c:564 +#: libparted/unit.c:413 libparted/unit.c:565 #, c-format msgid "The location %s is outside of the device %s." msgstr "" -#: libparted/unit.c:526 +#: libparted/unit.c:527 msgid "Invalid number." msgstr "" -#: libparted/unit.c:532 +#: libparted/unit.c:533 msgid "Use a smaller unit instead of a value < 1" msgstr "" @@ -1619,18 +1571,18 @@ msgstr "" msgid "%s : Failed to allocate partition block\n" msgstr "Nu pot aloca un numãr de partiþie." -#: libparted/fs/amiga/affs.c:79 libparted/fs/amiga/apfs.c:71 +#: 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 "" -#: libparted/fs/amiga/affs.c:84 libparted/fs/amiga/apfs.c:76 +#: libparted/fs/amiga/affs.c:83 libparted/fs/amiga/apfs.c:76 #, c-format msgid "%s : Couldn't read boot block %llu\n" msgstr "" -#: libparted/fs/amiga/affs.c:98 libparted/fs/amiga/apfs.c:87 +#: 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" @@ -1656,22 +1608,22 @@ msgstr "" msgid "%s : Couldn't write block %d\n" msgstr "%s în timpul scrierii pe %s" -#: libparted/fs/amiga/amiga.c:278 +#: libparted/fs/amiga/amiga.c:279 #, c-format msgid "%s : Failed to allocate disk_specific rdb block\n" msgstr "" -#: libparted/fs/amiga/amiga.c:289 +#: libparted/fs/amiga/amiga.c:290 #, c-format msgid "%s : Didn't find rdb block, should never happen\n" msgstr "" -#: libparted/fs/amiga/amiga.c:318 +#: libparted/fs/amiga/amiga.c:319 #, c-format msgid "%s : Failed to read partition block %llu\n" msgstr "" -#: libparted/fs/fat/fat.c:148 libparted/fs/r/fat/fat.c:811 +#: libparted/fs/fat/fat.c:149 msgid "" "GNU Parted was miscompiled: the FAT boot sector should be 512 bytes. FAT " "support will be disabled." @@ -1753,7 +1705,7 @@ msgid "" "geometry." msgstr "" -#: libparted/fs/r/fat/bootsector.c:399 +#: libparted/fs/r/fat/bootsector.c:398 #, c-format msgid "" "The information sector has the wrong signature (%x). Select cancel for now, " @@ -1773,59 +1725,52 @@ msgid "" "Cluster start delta = %d, which is not a multiple of the cluster size %d." msgstr "" -#: libparted/fs/r/fat/count.c:144 +#: 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:157 +#: 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:166 +#: 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:176 +#: 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:195 +#: libparted/fs/r/fat/count.c:135 #, c-format msgid "%s is %dk, but it has %d clusters (%dk)." msgstr "" -#: libparted/fs/r/fat/count.c:258 -#, c-format -msgid "" -"The file %s is marked as a system file. This means moving it could cause " -"some programs to stop working." -msgstr "" - -#: libparted/fs/r/fat/fat.c:243 +#: libparted/fs/r/fat/fat.c:244 #, c-format msgid "Partition too big/small for a %s file system." msgstr "Partiþie prea mare/micã pentru un sistem de fiºiere %s." -#: libparted/fs/r/fat/fat.c:409 +#: 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:449 +#: libparted/fs/r/fat/fat.c:450 msgid "There are no possible configurations for this FAT type." msgstr "" -#: libparted/fs/r/fat/fat.c:461 +#: libparted/fs/r/fat/fat.c:462 #, c-format msgid "" "File system doesn't have expected sizes for Windows to like it. Cluster " @@ -1833,40 +1778,40 @@ msgid "" "FATs is %d sectors (%d expected)." msgstr "" -#: libparted/fs/r/fat/fat.c:484 +#: libparted/fs/r/fat/fat.c:485 #, c-format msgid "" "File system is reporting the free space as %d clusters, not %d clusters." msgstr "" -#: libparted/fs/r/fat/resize.c:158 +#: 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:302 +#: libparted/fs/r/fat/resize.c:303 msgid "Error writing to the root directory." msgstr "" -#: libparted/fs/r/fat/resize.c:495 +#: libparted/fs/r/fat/resize.c:479 msgid "If you leave your file system as FAT16, then you will have no problems." msgstr "" -#: libparted/fs/r/fat/resize.c:498 +#: 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:506 +#: 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 "" -#: libparted/fs/r/fat/resize.c:510 +#: 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 " @@ -1875,77 +1820,77 @@ msgid "" "Windows 95a, and MS Windows NT." msgstr "" -#: libparted/fs/r/fat/resize.c:524 +#: libparted/fs/r/fat/resize.c:508 #, c-format msgid "%s %s %s" msgstr "" -#: libparted/fs/r/fat/resize.c:525 +#: libparted/fs/r/fat/resize.c:509 msgid "Would you like to use FAT32?" msgstr "" -#: libparted/fs/r/fat/resize.c:556 libparted/fs/r/fat/resize.c:572 +#: libparted/fs/r/fat/resize.c:540 libparted/fs/r/fat/resize.c:556 #, c-format msgid "%s %s" msgstr "" -#: libparted/fs/r/fat/resize.c:557 +#: libparted/fs/r/fat/resize.c:541 msgid "" "The file system can only be resized to this size by converting to FAT16." msgstr "" -#: libparted/fs/r/fat/resize.c:573 +#: libparted/fs/r/fat/resize.c:557 msgid "" "The file system can only be resized to this size by converting to FAT32." msgstr "" -#: libparted/fs/r/fat/resize.c:586 +#: libparted/fs/r/fat/resize.c:570 msgid "" "GNU Parted cannot resize this partition to this size. We're working on it!" msgstr "" -#: libparted/fs/r/fat/table.c:136 +#: 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:268 +#: libparted/fs/r/fat/table.c:269 #, c-format msgid "fat_table_set: cluster %ld outside file system" msgstr "" -#: libparted/fs/r/fat/table.c:300 +#: libparted/fs/r/fat/table.c:301 #, c-format msgid "fat_table_get: cluster %ld outside file system" msgstr "" -#: libparted/fs/r/fat/table.c:342 +#: libparted/fs/r/fat/table.c:343 msgid "fat_table_alloc_cluster: no free clusters" msgstr "" -#: libparted/fs/r/filesys.c:151 +#: libparted/fs/r/filesys.c:152 msgid "Could not detect file system." msgstr "" -#: libparted/fs/r/filesys.c:158 libparted/fs/r/filesys.c:285 +#: libparted/fs/r/filesys.c:159 libparted/fs/r/filesys.c:284 #, fuzzy, c-format msgid "resizing %s file systems is not supported" msgstr "Aºtept un tip de sistem de fiºiere." -#: libparted/fs/r/filesys.c:170 +#: libparted/fs/r/filesys.c:171 msgid "The file system is bigger than its volume!" msgstr "" -#: libparted/fs/r/hfs/advfs.c:121 libparted/fs/r/hfs/advfs_plus.c:121 -#: libparted/fs/r/hfs/reloc.c:413 libparted/fs/r/hfs/reloc.c:507 -#: libparted/fs/r/hfs/reloc_plus.c:538 libparted/fs/r/hfs/reloc_plus.c:656 -#: libparted/fs/r/hfs/reloc_plus.c:769 +#: 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:285 +#: libparted/fs/r/hfs/advfs_plus.c:287 msgid "Bad blocks could not be read." msgstr "" @@ -2003,87 +1948,87 @@ msgstr "" msgid "Trying to write HFS+ file with CNID %X behind EOF." msgstr "" -#: libparted/fs/r/hfs/hfs.c:232 +#: libparted/fs/r/hfs/hfs.c:212 msgid "Sorry, HFS cannot be resized that way yet." msgstr "" -#: libparted/fs/r/hfs/hfs.c:250 libparted/fs/r/hfs/hfs.c:629 +#: libparted/fs/r/hfs/hfs.c:230 libparted/fs/r/hfs/hfs.c:573 msgid "shrinking" msgstr "" -#: libparted/fs/r/hfs/hfs.c:262 libparted/fs/r/hfs/hfs.c:641 +#: 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:281 +#: 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:320 +#: libparted/fs/r/hfs/hfs.c:300 msgid "writing HFS Master Directory Block" msgstr "" -#: libparted/fs/r/hfs/hfs.c:468 +#: 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:478 +#: libparted/fs/r/hfs/hfs.c:422 #, c-format msgid "Version %d of HFS+ isn't supported." msgstr "" -#: libparted/fs/r/hfs/hfs.c:489 +#: libparted/fs/r/hfs/hfs.c:433 #, c-format msgid "Version %d of HFSX isn't supported." msgstr "" -#: libparted/fs/r/hfs/hfs.c:672 +#: 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:720 +#: libparted/fs/r/hfs/hfs.c:664 msgid "Error while writing the allocation file." msgstr "" -#: libparted/fs/r/hfs/hfs.c:735 +#: 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:750 +#: libparted/fs/r/hfs/hfs.c:694 msgid "writing HFS+ Volume Header" msgstr "" -#: libparted/fs/r/hfs/hfs.c:850 +#: 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:904 +#: 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:940 +#: libparted/fs/r/hfs/hfs.c:883 msgid "Sorry, HFS+ cannot be resized that way yet." msgstr "" -#: libparted/fs/r/hfs/hfs.c:975 +#: libparted/fs/r/hfs/hfs.c:918 msgid "shrinking embedded HFS+ volume" msgstr "" -#: libparted/fs/r/hfs/hfs.c:992 +#: libparted/fs/r/hfs/hfs.c:935 msgid "Resizing the HFS+ volume has failed." msgstr "" -#: libparted/fs/r/hfs/hfs.c:999 +#: libparted/fs/r/hfs/hfs.c:942 msgid "shrinking HFS wrapper" msgstr "" -#: libparted/fs/r/hfs/hfs.c:1008 +#: libparted/fs/r/hfs/hfs.c:951 msgid "Updating the HFS wrapper has failed." msgstr "" -#: libparted/fs/r/hfs/hfs.c:1110 libparted/fs/r/hfs/hfs.c:1195 +#: 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 " @@ -2148,127 +2093,127 @@ msgstr "" msgid "An extent has not been relocated." msgstr "" -#: libparted/fs/r/hfs/reloc.c:250 libparted/fs/r/hfs/reloc_plus.c:307 +#: 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:380 +#: 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:474 +#: 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:516 libparted/fs/r/hfs/reloc_plus.c:666 +#: 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:573 libparted/fs/r/hfs/reloc_plus.c:844 +#: 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:634 libparted/fs/r/hfs/reloc_plus.c:905 +#: 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:648 libparted/fs/r/hfs/reloc_plus.c:921 +#: 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:494 +#: 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:617 +#: 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:125 +#: parted/parted.c:126 msgid "displays this help message" msgstr "" -#: parted/parted.c:126 +#: parted/parted.c:127 msgid "lists partition layout on all block devices" msgstr "" -#: parted/parted.c:127 +#: parted/parted.c:128 msgid "displays machine parseable output" msgstr "" -#: parted/parted.c:128 +#: parted/parted.c:129 msgid "never prompts for user intervention" msgstr "" -#: parted/parted.c:129 +#: parted/parted.c:130 msgid "displays the version" msgstr "" -#: parted/parted.c:130 +#: parted/parted.c:131 #, fuzzy msgid "alignment for new partitions" msgstr "Nu mai pot crea nici o partiþie" -#: parted/parted.c:142 +#: parted/parted.c:143 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:145 +#: parted/parted.c:146 msgid "LABEL-TYPE is one of: " msgstr "" -#: parted/parted.c:146 parted/parted.c:147 +#: parted/parted.c:147 parted/parted.c:148 msgid "FLAG is one of: " msgstr "" -#: parted/parted.c:148 +#: parted/parted.c:149 msgid "UNIT is one of: " msgstr "" -#: parted/parted.c:149 +#: parted/parted.c:150 msgid "desired alignment: minimum or optimal" msgstr "" -#: parted/parted.c:150 +#: parted/parted.c:151 msgid "PART-TYPE is one of: primary, logical, extended\n" msgstr "" -#: parted/parted.c:152 +#: parted/parted.c:153 msgid "FS-TYPE is one of: " msgstr "" -#: parted/parted.c:153 +#: parted/parted.c:154 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:156 +#: parted/parted.c:157 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:159 +#: parted/parted.c:160 msgid "STATE is one of: on, off\n" msgstr "" -#: parted/parted.c:160 +#: parted/parted.c:161 msgid "DEVICE is usually /dev/hda or /dev/sda\n" msgstr "" -#: parted/parted.c:161 +#: parted/parted.c:162 msgid "NAME is any word you want\n" msgstr "" -#: parted/parted.c:164 +#: parted/parted.c:165 #, fuzzy msgid "" "Copyright (C) 1998 - 2006 Free Software Foundation, Inc.\n" @@ -2288,216 +2233,216 @@ msgstr "" "PENTRU UN SCOP ANUME. Vedeþi Licenþa Publicã Generalã GNU (GNU GPL) pentru\n" "detalii suplimentare.\n" -#: parted/parted.c:212 +#: parted/parted.c:213 #, c-format msgid "%0.f%%\t(time left %.2d:%.2d)" msgstr "" -#: parted/parted.c:231 +#: parted/parted.c:232 #, c-format msgid "Partition %s is being used. Are you sure you want to continue?" msgstr "" -#: parted/parted.c:252 +#: parted/parted.c:253 #, c-format msgid "Partition(s) on %s are being used." msgstr "" -#: parted/parted.c:264 +#: parted/parted.c:265 #, 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:525 +#: parted/parted.c:526 msgid "New disk label type?" msgstr "Tip de etichetã pentru discul nou?" -#: parted/parted.c:662 +#: parted/parted.c:663 msgid "Partition type?" msgstr "" -#: parted/parted.c:680 parted/parted.c:884 +#: parted/parted.c:681 parted/parted.c:885 msgid "Partition name?" msgstr "" -#: parted/parted.c:690 +#: parted/parted.c:691 msgid "File system type?" msgstr "" -#: parted/parted.c:695 parted/parted.c:1498 +#: parted/parted.c:696 parted/parted.c:1499 msgid "Start?" msgstr "" -#: parted/parted.c:698 parted/parted.c:1500 parted/parted.c:1569 +#: parted/parted.c:699 parted/parted.c:1501 parted/parted.c:1585 msgid "End?" msgstr "" -#: parted/parted.c:766 +#: parted/parted.c:767 #, 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:775 +#: parted/parted.c:776 msgid "" "\n" "Is this still acceptable to you?" msgstr "" -#: parted/parted.c:798 +#: parted/parted.c:799 #, c-format msgid "" "The resulting partition is not properly aligned for best performance: %s" msgstr "" -#: parted/parted.c:800 parted/parted.c:1723 +#: parted/parted.c:801 parted/parted.c:1739 msgid "unknown (malloc failed)" msgstr "" -#: parted/parted.c:876 +#: parted/parted.c:877 #, fuzzy, c-format msgid "%s disk labels do not support partition name." msgstr "Etichetele de disc %s nu suportã partiþii extinse." -#: parted/parted.c:881 parted/parted.c:1561 parted/parted.c:1612 -#: parted/parted.c:1706 parted/parted.c:1781 +#: parted/parted.c:882 parted/parted.c:1564 parted/parted.c:1628 +#: parted/parted.c:1722 parted/parted.c:1797 msgid "Partition number?" msgstr "" -#: parted/parted.c:975 +#: parted/parted.c:976 #, c-format msgid "BIOS cylinder,head,sector geometry: %d,%d,%d. Each cylinder is %s.\n" msgstr "" -#: parted/parted.c:1017 +#: parted/parted.c:1018 #, c-format msgid "Model: %s (%s)\n" msgstr "" -#: parted/parted.c:1019 +#: parted/parted.c:1020 #, c-format msgid "Disk %s: %s\n" msgstr "" -#: parted/parted.c:1020 +#: parted/parted.c:1021 #, c-format msgid "Sector size (logical/physical): %lldB/%lldB\n" msgstr "" -#: parted/parted.c:1032 +#: parted/parted.c:1033 #, fuzzy, c-format msgid "Partition Table: %s\n" msgstr "Tabela de partiþii invalidã pe %s." -#: parted/parted.c:1033 +#: parted/parted.c:1034 #, c-format msgid "Disk Flags: %s\n" msgstr "" -#: parted/parted.c:1153 parted/parted.c:1156 +#: parted/parted.c:1154 parted/parted.c:1157 msgid "Number" msgstr "Numãr" -#: parted/parted.c:1153 parted/parted.c:1156 +#: parted/parted.c:1154 parted/parted.c:1157 msgid "Start" msgstr "Start" -#: parted/parted.c:1154 parted/parted.c:1157 +#: parted/parted.c:1155 parted/parted.c:1158 msgid "End" msgstr "Sfârºit" -#: parted/parted.c:1157 +#: parted/parted.c:1158 msgid "Size" msgstr "Dimensiune" -#: parted/parted.c:1161 +#: parted/parted.c:1162 msgid "Type" msgstr "Tip" -#: parted/parted.c:1163 +#: parted/parted.c:1164 msgid "File system" msgstr "Sistem de fiºiere" -#: parted/parted.c:1166 +#: parted/parted.c:1167 msgid "Name" msgstr "Nume" -#: parted/parted.c:1168 +#: parted/parted.c:1169 msgid "Flags" msgstr "" -#: parted/parted.c:1225 +#: parted/parted.c:1226 msgid "Free Space" msgstr "" -#: parted/parted.c:1385 +#: parted/parted.c:1386 #, 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:1428 +#: parted/parted.c:1429 msgid "searching for file systems" msgstr "" -#: parted/parted.c:1535 +#: parted/parted.c:1536 msgid "The resize command has been removed in parted 3.0" msgstr "" -#: parted/parted.c:1583 +#: parted/parted.c:1599 msgid "" "Shrinking a partition can cause data loss, are you sure you want to continue?" msgstr "" -#: parted/parted.c:1636 +#: parted/parted.c:1652 msgid "New device?" msgstr "" -#: parted/parted.c:1704 +#: parted/parted.c:1720 msgid "alignment type(min/opt)" msgstr "" -#: parted/parted.c:1719 +#: parted/parted.c:1735 #, c-format msgid "%d aligned\n" msgstr "" -#: parted/parted.c:1721 +#: parted/parted.c:1737 #, c-format msgid "%d not aligned: %s\n" msgstr "" -#: parted/parted.c:1746 parted/parted.c:1783 +#: parted/parted.c:1762 parted/parted.c:1799 msgid "Flag to Invert?" msgstr "" -#: parted/parted.c:1751 parted/parted.c:1788 +#: parted/parted.c:1767 parted/parted.c:1804 msgid "New state?" msgstr "" -#: parted/parted.c:1834 +#: parted/parted.c:1850 msgid "Unit?" msgstr "" -#: parted/parted.c:1969 +#: parted/parted.c:1985 msgid "align-check" msgstr "" -#: parted/parted.c:1972 +#: parted/parted.c:1988 msgid "" "align-check TYPE N check partition N for TYPE(min|opt) " "alignment" msgstr "" -#: parted/parted.c:1980 +#: parted/parted.c:1996 msgid "help" msgstr "help" -#: parted/parted.c:1983 +#: parted/parted.c:1999 #, fuzzy msgid "" "help [COMMAND] print general help, or help on " @@ -2506,15 +2451,15 @@ msgstr "" "help [COMANDA] afiºeazã informaþii generale, sau\n" " depre COMANDA" -#: parted/parted.c:1989 +#: parted/parted.c:2005 msgid "mklabel" msgstr "mklabel" -#: parted/parted.c:1989 +#: parted/parted.c:2005 msgid "mktable" msgstr "" -#: parted/parted.c:1992 +#: parted/parted.c:2008 #, fuzzy msgid "" "mklabel,mktable LABEL-TYPE create a new disklabel (partition " @@ -2523,15 +2468,15 @@ msgstr "" "mklabel TIP_ETICHETA creazã o nouã etichetã de disc\n" " (tabela de partiþii)" -#: parted/parted.c:1998 +#: parted/parted.c:2014 msgid "mkpart" msgstr "mkpart" -#: parted/parted.c:2001 +#: parted/parted.c:2017 msgid "mkpart PART-TYPE [FS-TYPE] START END make a partition" msgstr "mkpart TIP-PART [TIP-SF] START SFÂRªIT creazã o partiþie" -#: parted/parted.c:2007 +#: parted/parted.c:2023 #, fuzzy msgid "" "'mkpart' makes a partition without creating a new file system on the " @@ -2541,27 +2486,27 @@ msgstr "" "partiþie. TIP-SF poate fi specificat pentru a seta un anumit ID de " "partiþie.\n" -#: parted/parted.c:2012 +#: parted/parted.c:2028 msgid "name" msgstr "name" -#: parted/parted.c:2015 +#: parted/parted.c:2031 #, fuzzy msgid "name NUMBER NAME name partition NUMBER as NAME" msgstr "name NUMÃR NUME numeºte patiþia NUMÃR ca NUME" -#: parted/parted.c:2020 +#: parted/parted.c:2036 msgid "print" msgstr "print" -#: parted/parted.c:2023 +#: parted/parted.c:2039 msgid "" "print [devices|free|list,all|NUMBER] display the partition table, " "available devices, free space, all found partitions, or a particular " "partition" msgstr "" -#: parted/parted.c:2028 +#: parted/parted.c:2044 #, fuzzy msgid "" "Without arguments, 'print' displays the entire partition table. However with " @@ -2571,41 +2516,41 @@ msgstr "" "un numãr de partiþie, atunci este afiºatã informaþii detaliate despre acea\n" "partiþie.\n" -#: parted/parted.c:2030 +#: parted/parted.c:2046 msgid " devices : display all active block devices\n" msgstr "" -#: parted/parted.c:2031 +#: parted/parted.c:2047 msgid "" " free : display information about free unpartitioned space on the " "current block device\n" msgstr "" -#: parted/parted.c:2033 +#: parted/parted.c:2049 msgid "" " list, all : display the partition tables of all active block devices\n" msgstr "" -#: parted/parted.c:2034 +#: parted/parted.c:2050 msgid "" " NUMBER : display more detailed information about this particular " "partition\n" msgstr "" -#: parted/parted.c:2039 +#: parted/parted.c:2055 msgid "quit" msgstr "quit" -#: parted/parted.c:2042 +#: parted/parted.c:2058 #, fuzzy msgid "quit exit program" msgstr "quit ieºire din program" -#: parted/parted.c:2047 +#: parted/parted.c:2063 msgid "rescue" msgstr "rescue" -#: parted/parted.c:2050 +#: parted/parted.c:2066 #, fuzzy msgid "" "rescue START END rescue a lost partition near START " @@ -2614,130 +2559,139 @@ msgstr "" "rescue START SFARSIT salveazã o partiþie pierdutã lingã START ºi\n" " SFARSIT" -#: parted/parted.c:2056 +#: parted/parted.c:2072 msgid "resize" msgstr "resize" -#: parted/parted.c:2059 +#: parted/parted.c:2075 msgid "The resize command was removed in parted 3.0\n" msgstr "" -#: parted/parted.c:2062 +#: parted/parted.c:2078 #, fuzzy msgid "resizepart" msgstr "resize" -#: parted/parted.c:2065 +#: parted/parted.c:2081 #, fuzzy msgid "resizepart NUMBER END resize partition NUMBER" msgstr "rm NUMÃR ºterge partiþia NUMÃR" -#: parted/parted.c:2070 +#: parted/parted.c:2086 msgid "rm" msgstr "rm" -#: parted/parted.c:2073 +#: parted/parted.c:2089 #, fuzzy msgid "rm NUMBER delete partition NUMBER" msgstr "rm NUMÃR ºterge partiþia NUMÃR" -#: parted/parted.c:2078 +#: parted/parted.c:2094 msgid "select" msgstr "select" -#: parted/parted.c:2081 +#: parted/parted.c:2097 #, fuzzy msgid "select DEVICE choose the device to edit" msgstr "select UNITATE alege unitatea de editat" -#: parted/parted.c:2086 +#: parted/parted.c:2102 msgid "disk_set" msgstr "" -#: parted/parted.c:2089 +#: parted/parted.c:2105 msgid "" "disk_set FLAG STATE change the FLAG on selected device" msgstr "" -#: parted/parted.c:2094 +#: parted/parted.c:2110 msgid "disk_toggle" msgstr "" -#: parted/parted.c:2097 +#: parted/parted.c:2113 msgid "" "disk_toggle [FLAG] toggle the state of FLAG on " "selected device" msgstr "" -#: parted/parted.c:2103 +#: parted/parted.c:2119 msgid "set" msgstr "set" -#: parted/parted.c:2106 +#: parted/parted.c:2122 #, fuzzy msgid "" "set NUMBER FLAG STATE change the FLAG on partition NUMBER" msgstr "set NUMÃR FLAG STARE schimbã un flag pe partiþia NUMÃR" -#: parted/parted.c:2112 +#: parted/parted.c:2128 msgid "toggle" msgstr "" -#: parted/parted.c:2115 +#: parted/parted.c:2131 #, fuzzy msgid "" "toggle [NUMBER [FLAG]] toggle the state of FLAG on " "partition NUMBER" msgstr "rm NUMÃR ºterge partiþia NUMÃR" -#: parted/parted.c:2121 +#: parted/parted.c:2137 msgid "unit" msgstr "unitate" -#: parted/parted.c:2124 +#: parted/parted.c:2140 #, fuzzy msgid "unit UNIT set the default unit to UNIT" msgstr "quit UNITATE seteazã unitatea implicitã ca UNITATE" -#: parted/parted.c:2129 +#: parted/parted.c:2145 msgid "version" msgstr "" -#: parted/parted.c:2132 +#: parted/parted.c:2148 msgid "" "version display the version number and " "copyright information of GNU Parted" msgstr "" -#: parted/parted.c:2136 +#: parted/parted.c:2152 msgid "" "'version' displays copyright and version information corresponding to this " "copy of GNU Parted\n" msgstr "" -#: parted/parted.c:2204 +#: parted/parted.c:2220 #, c-format msgid "Usage: %s [-hlmsv] [-a] [DEVICE [COMMAND [PARAMETERS]]...]\n" msgstr "" -#: parted/parted.c:2248 +#: parted/parted.c:2264 msgid "No device found" msgstr "Nu a fost gãsitã nici o unitate" -#: parted/parted.c:2285 +#: parted/parted.c:2301 msgid "WARNING: You are not superuser. Watch out for permissions.\n" msgstr "" -#: parted/parted.c:2325 +#: parted/parted.c:2334 +msgid "" +"You should reinstall your boot loader before rebooting. Read section 4 of " +"the Parted User documentation for more information." +msgstr "" +"Ar trebui sã reinstalaþi boot loader-ul d-voastrã înainte de reboot-are. " +"Citiþi secþiunea 4 din documentaþia utilizatorului Parted pentru informaþii " +"suplimentare." + +#: parted/parted.c:2341 #, fuzzy msgid "You may need to update /etc/fstab.\n" msgstr "Nu uitaþi sã actualizaþi /etc/fstab, dacã e necesar.\n" -#: parted/ui.c:164 +#: parted/ui.c:165 msgid "Welcome to GNU Parted! Type 'help' to view a list of commands.\n" msgstr "" -#: parted/ui.c:167 +#: parted/ui.c:168 #, fuzzy msgid "" "Usage: parted [OPTION]... [DEVICE [COMMAND [PARAMETERS]...]...]\n" @@ -2749,7 +2703,7 @@ msgstr "" "Aplicã COMANDA cu PARAMETII la UNITATE. Dacã nu este datã nici o COMANDÃ,\n" "ruleazã în mod interactiv.\n" -#: parted/ui.c:172 +#: parted/ui.c:173 #, c-format msgid "" "\n" @@ -2783,216 +2737,217 @@ msgid "" "consider important.\n" msgstr "" -#: parted/ui.c:293 +#: parted/ui.c:294 msgid "" "\n" "Command History:\n" msgstr "" -#: parted/ui.c:356 +#: parted/ui.c:357 msgid "" "\n" "Error: SEGV_MAPERR (Address not mapped to object)\n" msgstr "" -#: parted/ui.c:362 +#: parted/ui.c:363 msgid "" "\n" "Error: SEGV_ACCERR (Invalid permissions for mapped object)\n" msgstr "" -#: parted/ui.c:367 +#: parted/ui.c:368 msgid "" "\n" "Error: A general SIGSEGV signal was encountered.\n" msgstr "" -#: parted/ui.c:391 +#: parted/ui.c:392 msgid "" "\n" "Error: FPE_INTDIV (Integer: divide by zero)" msgstr "" -#: parted/ui.c:396 +#: parted/ui.c:397 msgid "" "\n" "Error: FPE_INTOVF (Integer: overflow)" msgstr "" -#: parted/ui.c:401 +#: parted/ui.c:402 msgid "" "\n" "Error: FPE_FLTDIV (Float: divide by zero)" msgstr "" -#: parted/ui.c:406 +#: parted/ui.c:407 msgid "" "\n" "Error: FPE_FLTOVF (Float: overflow)" msgstr "" -#: parted/ui.c:411 +#: parted/ui.c:412 msgid "" "\n" "Error: FPE_FLTUND (Float: underflow)" msgstr "" -#: parted/ui.c:416 +#: parted/ui.c:417 msgid "" "\n" "Error: FPE_FLTRES (Float: inexact result)" msgstr "" -#: parted/ui.c:421 +#: parted/ui.c:422 msgid "" "\n" "Error: FPE_FLTINV (Float: invalid operation)" msgstr "" -#: parted/ui.c:426 +#: parted/ui.c:427 msgid "" "\n" "Error: FPE_FLTSUB (Float: subscript out of range)" msgstr "" -#: parted/ui.c:431 +#: parted/ui.c:432 msgid "" "\n" "Error: A general SIGFPE signal was encountered." msgstr "" -#: parted/ui.c:455 +#: parted/ui.c:456 msgid "" "\n" "Error: ILL_ILLOPC (Illegal Opcode)" msgstr "" -#: parted/ui.c:460 +#: parted/ui.c:461 msgid "" "\n" "Error: ILL_ILLOPN (Illegal Operand)" msgstr "" -#: parted/ui.c:465 +#: parted/ui.c:466 msgid "" "\n" "Error: ILL_ILLADR (Illegal addressing mode)" msgstr "" -#: parted/ui.c:470 +#: parted/ui.c:471 msgid "" "\n" "Error: ILL_ILLTRP (Illegal Trap)" msgstr "" -#: parted/ui.c:475 +#: parted/ui.c:476 msgid "" "\n" "Error: ILL_PRVOPC (Privileged Opcode)" msgstr "" -#: parted/ui.c:480 +#: parted/ui.c:481 msgid "" "\n" "Error: ILL_PRVREG (Privileged Register)" msgstr "" -#: parted/ui.c:485 +#: parted/ui.c:486 msgid "" "\n" "Error: ILL_COPROC (Coprocessor Error)" msgstr "" -#: parted/ui.c:490 +#: parted/ui.c:491 msgid "" "\n" "Error: ILL_BADSTK (Internal Stack Error)" msgstr "" -#: parted/ui.c:495 +#: parted/ui.c:496 msgid "" "\n" "Error: A general SIGILL signal was encountered." msgstr "" -#: parted/ui.c:888 +#: parted/ui.c:889 #, c-format msgid "invalid token: %s" msgstr "" -#: parted/ui.c:1069 +#: parted/ui.c:1070 msgid "Expecting a partition number." msgstr "Aºtept un numãr de partiþie." -#: parted/ui.c:1078 +#: parted/ui.c:1079 msgid "Partition doesn't exist." msgstr "Partiþia nu existã." -#: parted/ui.c:1098 +#: parted/ui.c:1099 msgid "Expecting a file system type." msgstr "Aºtept un tip de sistem de fiºiere." -#: parted/ui.c:1105 +#: parted/ui.c:1106 #, c-format msgid "Unknown file system type \"%s\"." msgstr "Tip de sistem de fiºiere necunoscut \"%s\"." -#: parted/ui.c:1126 +#: parted/ui.c:1127 msgid "Expecting a disk label type." msgstr "Aºtept un tip de etichetã de disc." -#: parted/ui.c:1157 parted/ui.c:1193 +#: parted/ui.c:1158 parted/ui.c:1194 msgid "No flags supported" msgstr "" -#: parted/ui.c:1267 +#: parted/ui.c:1268 msgid "Can't create any more partitions." msgstr "Nu mai pot crea nici o partiþie" -#: parted/ui.c:1277 +#: parted/ui.c:1278 msgid "Expecting a partition type." msgstr "Aºtept un tip de partiþie." -#: parted/ui.c:1426 +#: parted/ui.c:1427 msgid "on" msgstr "pornit" -#: parted/ui.c:1427 +#: parted/ui.c:1428 msgid "off" msgstr "oprit" -#: parted/ui.c:1444 +#: parted/ui.c:1445 msgid "optimal" msgstr "" -#: parted/ui.c:1445 +#: parted/ui.c:1446 msgid "minimal" msgstr "" -#: parted/ui.c:1578 +#: parted/ui.c:1579 msgid "OPTIONs:" msgstr "OPÞIUNI:" -#: parted/ui.c:1583 +#: parted/ui.c:1584 msgid "COMMANDs:" msgstr "COMMENZI:" -#: parted/ui.c:1586 +#: parted/ui.c:1587 #, c-format msgid "" "\n" "Report bugs to %s\n" msgstr "" -#: parted/ui.c:1593 +#: parted/ui.c:1594 #, c-format msgid "Using %s\n" msgstr "Folosesc %s\n" -#: parted/ui.c:1673 +#: parted/ui.c:1674 msgid "This command does not make sense in non-interactive mode.\n" msgstr "" +#, c-format #~ msgid "" #~ "The sector size on %s is %d bytes. Parted is known not to work properly " #~ "with drives with sector sizes other than %d bytes." @@ -3004,6 +2959,7 @@ msgstr "" #~ msgid "IDE" #~ msgstr "IDE" +#, c-format #~ msgid "" #~ "The kernel was unable to re-read the partition table on %s (%s). This " #~ "means Linux won't know anything about the modifications you made until " @@ -3015,6 +2971,34 @@ msgstr "" #~ "pânã când nu reboot-aþi. Ar trebui sã reboot-aþi computerul înainte de a " #~ "face ceva cu %s." +#~ msgid "" +#~ "The partition table cannot be re-read. This means you need to reboot " +#~ "before mounting any modified partitions. You also need to reinstall your " +#~ "boot loader before you reboot (which may require mounting modified " +#~ "partitions). It is impossible do both things! So you'll need to boot " +#~ "off a rescue disk, and reinstall your boot loader from the rescue disk. " +#~ "Read section 4 of the Parted User documentation for more information." +#~ msgstr "" +#~ "Tabela de partiþii nu poate fi recititã. Aceasta înseamnã cã trebuie sã " +#~ "reboot-aþi înainte de a monta orice partiþii modificate. Deasemenea, ar " +#~ "trebui sã reinstalaþi boot loader-ul înainte de a reboot-a (ceea ce ar " +#~ "putea sã necesite montarea partiþiilor modificate). Este imposibil sã " +#~ "faceþi ambele lucruri! Aºa cã trebuie sã boot-aþi de pe un disc de " +#~ "salvare ºi reinstalaþi boot loader-ul d-voastrã de pe discul de salvare. " +#~ "Citiþi secþiunea 4 din documentaþia utilizatorului de Parted pentru " +#~ "informaþii suplimentare." + +#, 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 " +#~ "computer before doing anything with %s." +#~ msgstr "" +#~ "Tabela de partiþii pe %s nu poate fi re-cititã (%s). Aceasta înseamnã cã " +#~ "Hurd nu ºtie nimic despre nici o modificare pe care aþi fãcut-o. Ar " +#~ "trebui sã reboot-aþi computerul înainte de a face ceva cu %s." + +#, c-format #~ msgid "" #~ "%s contains GPT signatures, indicating that it has a GPT table. However, " #~ "it does not have a valid fake msdos partition table, as it should. " @@ -3028,6 +3012,9 @@ msgstr "" #~ "partiþii GPT. Sau probabil cã aþi ºters tabela GPT ºi folosiþi acum o " #~ "tabelã de partiþii msdos. Este aceasta o tabelã de partiþii GPT?" +#~ msgid "The boot region doesn't start at the start of the partition." +#~ msgstr "Regiunea de boot nu începe la începutul partiþiei." + #~ msgid "Destination partition number?" #~ msgstr "Numãrul partiþiei destinaþie?" @@ -3082,6 +3069,7 @@ msgstr "" #~ "resize NUMÃR START SFÂRªIT redimensioneazã partiþia NUMÃR ºi sistemul " #~ "sãu de fiºiere" +#, c-format #~ msgid "" #~ "You found a bug in GNU Parted. Please email a bug report to bug-" #~ "parted@gnu.org containing the version (%s), and the following message:\n" diff --git a/po/ru.gmo b/po/ru.gmo index 53de101607562ed2181add459d7adb4e6abd2383..7900fb75a855c7e31e044d5639d59bf0987c5e25 100644 GIT binary patch delta 18290 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 delta 13648 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 F{{V2$YAFB! diff --git a/po/ru.po b/po/ru.po index b39a68c..ace519c 100644 --- a/po/ru.po +++ b/po/ru.po @@ -5,14 +5,14 @@ # Dmitry S. Sivachenko , 1999. # Dimitriy Ryazantcev , 2007, 2008. # Pavel Maryanov , 2014. -# Yuri Kozlov , 2014, 2018. +# Yuri Kozlov , 2014, 2018, 2021. # Galina Anikina , 2018. msgid "" msgstr "" -"Project-Id-Version: parted 3.1.90\n" +"Project-Id-Version: parted 3.3.52\n" "Report-Msgid-Bugs-To: bug-parted@gnu.org\n" -"POT-Creation-Date: 2019-10-10 16:35-0700\n" -"PO-Revision-Date: 2018-11-10 11:53+0300\n" +"POT-Creation-Date: 2021-01-27 16:00-0800\n" +"PO-Revision-Date: 2021-01-22 08:15+0300\n" "Last-Translator: Yuri Kozlov \n" "Language-Team: Russian \n" "Language: ru\n" @@ -20,7 +20,7 @@ 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: Lokalize 2.0\n" +"X-Generator: Lokalize 20.12.0\n" "Plural-Forms: nplurals=3; plural=(n%10==1 && n%100!=11 ? 0 : n%10>=2 && n" "%10<=4 && (n%100<10 || n%100>=20) ? 1 : 2);\n" @@ -47,29 +47,29 @@ msgid "Unknown system error" msgstr "Неизвестная системная ошибка" #: lib/getopt.c:278 -#, fuzzy, c-format +#, c-format msgid "%s: option '%s%s' is ambiguous\n" -msgstr "%s: неоднозначный параметр «-W %s»\n" +msgstr "%s: двусмысленный параметр «%s%s»\n" #: lib/getopt.c:284 -#, fuzzy, c-format +#, c-format msgid "%s: option '%s%s' is ambiguous; possibilities:" -msgstr "%s: неоднозначный параметр '%s'; возможные значения:" +msgstr "%s: двусмысленный параметр «%s%s»; возможные варианты:" #: lib/getopt.c:319 -#, fuzzy, c-format +#, c-format msgid "%s: unrecognized option '%s%s'\n" -msgstr "%s: нераспознанный параметр '%c%s'\n" +msgstr "%s: нераспознанный параметр «%s%s»\n" #: lib/getopt.c:345 -#, fuzzy, c-format +#, c-format msgid "%s: option '%s%s' doesn't allow an argument\n" -msgstr "%s: параметр '%c%s' не может иметь аргументы\n" +msgstr "%s: у параметра «%s%s» не может быть аргумента\n" #: lib/getopt.c:360 -#, fuzzy, c-format +#, c-format msgid "%s: option '%s%s' requires an argument\n" -msgstr "%s: для параметра «--%s» требуется аргумент\n" +msgstr "%s: для параметра «%s%s» требуется аргумент\n" #: lib/getopt.c:621 #, c-format @@ -102,11 +102,11 @@ msgstr "%s: для параметра нужен аргумент — «%c»\n" #. If you don't know what to put here, please see #. #. and use glyphs suitable for your language. -#: lib/quotearg.c:362 +#: lib/quotearg.c:355 msgid "`" msgstr "«" -#: lib/quotearg.c:363 +#: lib/quotearg.c:356 msgid "'" msgstr "»" @@ -139,9 +139,8 @@ msgid "Invalid back reference" msgstr "Неправильная обратная ссылка" #: lib/regcomp.c:156 -#, fuzzy msgid "Unmatched [, [^, [:, [., or [=" -msgstr "Нет соответствия [ или [^" +msgstr "Непарная [, [^, [:, [. или [=" #: lib/regcomp.c:159 msgid "Unmatched ( or \\(" @@ -222,18 +221,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" -"Лицензия GPLv3+: GNU GPL версии 3 или новее \n" -"Это свободное ПО: вы можете продавать и распространять его.\n" -"Нет НИКАКИХ ГАРАНТИЙ до степени, разрешённой законом.\n" -"\n" +"Лицензия GPLv3+: GNU GPL версии 3 или новее <%s>.\n" +"Это свободное ПО: вы можете изменять и распространять его.\n" +"Нет НИКАКИХ ГАРАНТИЙ в пределах действующего законодательства.\n" #. TRANSLATORS: %s denotes an author name. #: lib/version-etc.c:105 @@ -348,11 +344,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" -"Об ошибках сообщайте по адресу: %s.\n" +msgstr "Об ошибках сообщайте по адресу: %s\n" #: lib/version-etc.c:251 #, c-format @@ -365,89 +359,72 @@ msgid "%s home page: <%s>\n" msgstr "Домашняя страница %s: <%s>\n" #: lib/version-etc.c:260 -#, fuzzy, c-format +#, c-format msgid "General help using GNU software: <%s>\n" -msgstr "" -"Общая справка по программному обеспечению GNU: \n" +msgstr "Справка по работе с программами GNU: <%s>\n" #: lib/xalloc-die.c:34 msgid "memory exhausted" msgstr "закончилась память" -#: lib/xstrtol-error.c:63 -#, c-format -msgid "invalid %s%s argument '%s'" -msgstr "недопустимый аргумент %s%s '%s'" - -#: lib/xstrtol-error.c:68 -#, c-format -msgid "invalid suffix in %s%s argument '%s'" -msgstr "недопустимый суффикс в аргументе %s%s '%s'" - -#: lib/xstrtol-error.c:72 -#, c-format -msgid "%s%s argument '%s' too large" -msgstr "слишком большой аргумент %s%s '%s'" - -#: libparted/arch/beos.c:245 +#: libparted/arch/beos.c:246 msgid "Disk Image" msgstr "Образ диска" -#: libparted/arch/beos.c:346 libparted/arch/gnu.c:277 +#: libparted/arch/beos.c:347 libparted/arch/gnu.c:277 #: libparted/arch/linux.c:1731 #, c-format msgid "Error opening %s: %s" msgstr "Ошибка открытия %s: %s" -#: libparted/arch/beos.c:357 libparted/arch/gnu.c:287 +#: libparted/arch/beos.c:358 libparted/arch/gnu.c:287 #: libparted/arch/linux.c:1742 #, c-format msgid "Unable to open %s read-write (%s). %s has been opened read-only." msgstr "" "Не удалось открыть %s на чтение-запись (%s). %s открыт только для чтения." -#: libparted/arch/beos.c:419 libparted/arch/linux.c:1907 +#: libparted/arch/beos.c:420 libparted/arch/linux.c:1907 #, c-format msgid "%s during seek for read on %s" msgstr "%s во время позиционирования для чтения на %s" -#: libparted/arch/beos.c:452 libparted/arch/gnu.c:465 libparted/arch/gnu.c:564 -#: libparted/arch/gnu.c:692 libparted/arch/linux.c:1867 +#: libparted/arch/beos.c:453 libparted/arch/gnu.c:425 libparted/arch/gnu.c:524 +#: libparted/arch/gnu.c:652 libparted/arch/linux.c:1867 #: libparted/arch/linux.c:1949 #, c-format msgid "%s during read on %s" msgstr "%s во время чтения на %s" -#: libparted/arch/beos.c:488 libparted/arch/gnu.c:525 +#: libparted/arch/beos.c:489 libparted/arch/gnu.c:485 #: libparted/arch/linux.c:2026 #, c-format msgid "Can't write to %s, because it is opened read-only." msgstr "Нельзя записать на %s, так как он открыт только для чтения." -#: libparted/arch/beos.c:504 libparted/arch/linux.c:2051 +#: libparted/arch/beos.c:505 libparted/arch/linux.c:2051 #, c-format msgid "%s during seek for write on %s" msgstr "%s во время позиционирования для записи на %s" -#: libparted/arch/beos.c:541 libparted/arch/gnu.c:601 libparted/arch/gnu.c:646 -#: libparted/arch/gnu.c:723 libparted/arch/linux.c:1999 +#: libparted/arch/beos.c:542 libparted/arch/gnu.c:561 libparted/arch/gnu.c:606 +#: libparted/arch/gnu.c:683 libparted/arch/linux.c:1999 #: libparted/arch/linux.c:2094 libparted/arch/linux.c:2167 #, c-format msgid "%s during write on %s" msgstr "%s во время записи на %s" -#: partprobe/partprobe.c:148 +#: partprobe/partprobe.c:149 #, c-format msgid "Try `%s --help' for more information.\n" msgstr "Попробуйте `%s --help' для дополнительной информации.\n" -#: partprobe/partprobe.c:152 +#: partprobe/partprobe.c:153 #, c-format msgid "Usage: %s [OPTION] [DEVICE]...\n" msgstr "Использование: %s [ПАРАМЕТР] [УСТРОЙСТВО]...\n" -#: partprobe/partprobe.c:153 +#: partprobe/partprobe.c:154 msgid "" "Inform the operating system about partition table changes.\n" "\n" @@ -463,7 +440,7 @@ msgstr "" " -h, --help отобразить справку и выйти\n" " -v, --version вывести информацию о версии и выйти\n" -#: partprobe/partprobe.c:161 +#: partprobe/partprobe.c:162 msgid "" "\n" "When no DEVICE is given, probe all partitions.\n" @@ -471,7 +448,7 @@ msgstr "" "\n" "Если УСТРОЙСТВО не указано, проверять все разделы.\n" -#: partprobe/partprobe.c:165 +#: partprobe/partprobe.c:166 #, c-format msgid "" "\n" @@ -489,43 +466,7 @@ msgstr "Не удалось открыть %s." msgid "Unable to probe store." msgstr "Не удалось обследовать хранилище." -#: libparted/arch/gnu.c:368 -msgid "" -"The partition table cannot be re-read. This means you need to reboot before " -"mounting any modified partitions. You also need to reinstall your boot " -"loader before you reboot (which may require mounting modified partitions). " -"It is impossible do both things! So you'll need to boot off a rescue disk, " -"and reinstall your boot loader from the rescue disk. Read section 4 of the " -"Parted User documentation for more information." -msgstr "" -"Невозможно перечитать таблицу разделов. Это означает, что для монтирования " -"любого из изменённых разделов требуется перезагрузка компьютера. Но до " -"перезагрузки ещё требуется переустановить загрузчик (на что может " -"потребоваться монтирование изменённых разделов). Обе эти вещи невозможно " -"сделать одновременно! Поэтому необходимо загрузиться с диска восстановления " -"и переустановить загрузчик с его помощью. Дополнительную информацию можно " -"найти в разделе 4 из руководства пользователя Parted." - -#: libparted/arch/gnu.c:385 -#, 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 computer " -"before doing anything with %s." -msgstr "" -"Таблица разделов %s не может быть перечитана (%s). Это означает, что " -"сделанные изменения пока недоступны для Hurd. Требуется перезагрузить " -"компьютер перед тем, как что-либо делать с %s." - -#: libparted/arch/gnu.c:396 parted/parted.c:2318 -msgid "" -"You should reinstall your boot loader before rebooting. Read section 4 of " -"the Parted User documentation for more information." -msgstr "" -"Нужно переустановить загрузчик перед перезагрузкой. Прочтите раздел 4 " -"Руководства пользователя Parted для дополнительной информации." - -#: libparted/arch/gnu.c:788 +#: libparted/arch/gnu.c:748 #, c-format msgid "%s trying to sync %s to disk" msgstr "%s пытается записать %s на диск" @@ -614,9 +555,8 @@ msgid "Generic SD/MMC Storage Card" msgstr "Универсальная карта памяти SD/MMC" #: libparted/arch/linux.c:1422 -#, fuzzy msgid "NVMe Device" -msgstr "Новое устройство?" +msgstr "Устройство NVMe" #: libparted/arch/linux.c:1483 msgid "DAC960 RAID controller" @@ -644,7 +584,7 @@ msgstr "Compaq Smart Array" #: libparted/arch/linux.c:1520 msgid "NVDIMM Device" -msgstr "" +msgstr "Устройство NVDIMM" #: libparted/arch/linux.c:1525 msgid "ATARAID Controller" @@ -685,7 +625,7 @@ msgstr "Программный RAID-массив Linux" #: libparted/arch/linux.c:1588 msgid "RAM Drive" -msgstr "" +msgstr "RAM-диск" #: libparted/arch/linux.c:1595 msgid "ped_device_new() Unsupported device type" @@ -846,15 +786,15 @@ msgstr "метаданные" msgid "free" msgstr "свободно" -#: libparted/disk.c:2355 parted/ui.c:1258 parted/ui.c:1286 +#: libparted/disk.c:2355 parted/ui.c:1259 parted/ui.c:1287 msgid "extended" msgstr "расширенный" -#: libparted/disk.c:2357 parted/ui.c:1262 parted/ui.c:1290 +#: libparted/disk.c:2357 parted/ui.c:1263 parted/ui.c:1291 msgid "logical" msgstr "логический" -#: libparted/disk.c:2359 parted/ui.c:1254 parted/ui.c:1282 +#: libparted/disk.c:2359 parted/ui.c:1255 parted/ui.c:1283 msgid "primary" msgstr "основной" @@ -930,64 +870,72 @@ msgstr "irst" msgid "esp" msgstr "esp" -#: libparted/disk.c:2415 +#: libparted/disk.c:2411 +msgid "chromeos_kernel" +msgstr "chromeos_kernel" + +#: libparted/disk.c:2413 +msgid "bls_boot" +msgstr "bls_boot" + +#: libparted/disk.c:2419 #, c-format msgid "Unknown partition flag, %d." msgstr "Неизвестный флаг раздела, %d." -#: libparted/exception.c:78 +#: libparted/exception.c:79 msgid "Information" msgstr "Информация" -#: libparted/exception.c:79 +#: libparted/exception.c:80 msgid "Warning" msgstr "Предупреждение" -#: libparted/exception.c:80 +#: libparted/exception.c:81 msgid "Error" msgstr "Ошибка" -#: libparted/exception.c:81 +#: libparted/exception.c:82 msgid "Fatal" msgstr "Фатальная ошибка" -#: libparted/exception.c:82 +#: libparted/exception.c:83 msgid "Bug" msgstr "Ошибка" -#: libparted/exception.c:83 +#: libparted/exception.c:84 msgid "No Implementation" msgstr "Нет реализации" -#: libparted/exception.c:87 +#: libparted/exception.c:88 msgid "Fix" msgstr "Исправить" -#: libparted/exception.c:88 +#: libparted/exception.c:89 msgid "Yes" msgstr "Да" -#: libparted/exception.c:89 +#: libparted/exception.c:90 msgid "No" msgstr "Нет" -#: libparted/exception.c:90 +#: libparted/exception.c:91 msgid "OK" msgstr "OK" -#: libparted/exception.c:91 +#: libparted/exception.c:92 msgid "Retry" msgstr "Повторить" -#: libparted/exception.c:92 +#: libparted/exception.c:93 msgid "Ignore" msgstr "Игнорировать" -#: libparted/exception.c:93 +#: libparted/exception.c:94 msgid "Cancel" msgstr "Отменить" -#: libparted/exception.c:133 +#: libparted/exception.c:134 #, c-format msgid "" "A bug has been detected in GNU Parted. Refer to the web site of parted " @@ -1000,98 +948,105 @@ msgstr "" "информацией относительно отправки сообщение об ошибке! Пошлите по адресу %s " "сообщение об ошибке, содержащее хотя бы версию (%s) и следующую информацию:" -#: libparted/labels/aix.c:91 +#: libparted/labels/aix.c:92 msgid "Support for reading AIX disk labels is is not implemented yet." msgstr "Поддержка чтения меток диска AIX пока не реализована." -#: libparted/labels/aix.c:102 +#: libparted/labels/aix.c:103 msgid "Support for writing AIX disk labels is is not implemented yet." msgstr "Поддержка записи меток диска AIX пока не реализована." -#: libparted/labels/aix.c:115 +#: libparted/labels/aix.c:116 msgid "" "Support for adding partitions to AIX disk labels is not implemented yet." msgstr "Поддержка добавления разделов к меткам диска AIX пока не реализована." -#: libparted/labels/aix.c:125 +#: libparted/labels/aix.c:126 msgid "" "Support for duplicating partitions in AIX disk labels is not implemented yet." msgstr "" "Поддержка дублирования разделов в метках диска AIX пока не реализована." -#: libparted/labels/aix.c:143 +#: 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:153 +#: libparted/labels/aix.c:154 msgid "Support for setting flags in AIX disk labels is not implemented yet." msgstr "Поддержка записи флагов на метках диска AIX пока не реализована." #: libparted/labels/atari.c:273 -#, 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 не может работать с файловыми системами HFS, на дисках с размером " -"сектора не равным %d байт." +"Невозможно использовать таблицы разделов Atari на дисках с размером сектора " +"не равным %d байт." #: libparted/labels/atari.c:285 #, c-format msgid "Can't use Atari partition tables on disks with more than %d sectors." msgstr "" +"Невозможно использовать таблицы разделов Atari на дисках с более чем %d " +"секторами." #: libparted/labels/atari.c:398 msgid "" "Too many Atari partitions detected. Maybe there is a loop in the XGM linked " "list. Aborting." msgstr "" +"Найдено слишком много разделов Atari. Возможно зацикливание в связном списке " +"XGM. Прекращение работы." #: libparted/labels/atari.c:596 #, c-format msgid "No data partition found in the ARS at sector %lli." -msgstr "" +msgstr "Нет раздела данных в ARS в секторе %lli." #: libparted/labels/atari.c:617 #, c-format msgid "" "The entry of the next logical ARS is not of type XGM in ARS at sector %lli." msgstr "" +"Тип элемента следующего логического ARS не равен XGM в ARS в секторе %lli." #: libparted/labels/atari.c:648 #, c-format msgid "" "There doesn't seem to be an Atari partition table on this disk (%s), or it " "is corrupted." -msgstr "" +msgstr "На этом диске (%s) таблица разделов не похожа на Atari или повреждена." #: libparted/labels/atari.c:878 #, c-format msgid "No room at sector %lli to store ARS of logical partition %d." -msgstr "" +msgstr "Нет места в секторе %lli для сохранения ARS логического раздела %d." #: libparted/labels/atari.c:885 #, c-format msgid "No room at sector %lli to store ARS." -msgstr "" +msgstr "Нет места в секторе %lli для сохранения ARS." #: libparted/labels/atari.c:962 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:1003 #, c-format msgid "No room at sector %lli to store BSL." -msgstr "" +msgstr "Нет места в секторе %lli для сохранения BSL." #: libparted/labels/atari.c:1111 msgid "There were remaining partitions after filling the main AHDI table." -msgstr "" +msgstr "После заполнения главной таблицы AHDI остались ещё разделы." #: libparted/labels/atari.c:1130 msgid "" @@ -1099,14 +1054,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 "" +"Главная таблица AHDI заполнена всеми разделами, но таблица ICD не пуста, " +"поэтому совместимое с ICD ПО будет находить дополнительные разделы " +"неизвестного размера и расположения. Аннулировать таблицу ICD?" #: libparted/labels/atari.c:1164 msgid "ICD entries can't contain extended or logical partitions." -msgstr "" +msgstr "Элементы ICD не могут содержать расширенные или логические разделы." #: libparted/labels/atari.c:1186 msgid "There were remaining partitions after filling the tables." -msgstr "" +msgstr "После заполнения таблиц остались разделы." #: libparted/labels/atari.c:1226 #, c-format @@ -1114,15 +1072,17 @@ 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 "" +"Вы не можете использовать расширенный раздел XGM в режиме ICD (больше %d " +"первичных разделов, если XGM стоит первым, то считается за два)." -#: libparted/labels/atari.c:1657 libparted/labels/bsd.c:567 -#: libparted/labels/dasd.c:894 libparted/labels/dos.c:2276 -#: libparted/labels/dvh.c:770 libparted/labels/gpt.c:2050 -#: libparted/labels/loop.c:243 libparted/labels/mac.c:1423 -#: libparted/labels/pc98.c:701 libparted/labels/rdb.c:1054 +#: libparted/labels/atari.c:1657 libparted/labels/bsd.c:563 +#: libparted/labels/dasd.c:895 libparted/labels/dos.c:2283 +#: libparted/labels/dvh.c:770 libparted/labels/gpt.c:2140 +#: 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 "Не удалось удовлетворить все ограничения целостности раздела." +msgstr "Не удалось удовлетворить все ограничения раздела." #: libparted/labels/atari.c:1757 #, c-format @@ -1130,48 +1090,52 @@ 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 "" +"Вы не можете использовать более %d первичных разделов (режим ICD), если " +"используете расширенный раздел XGM. Если XGM стоит первым, то считается за " +"два." #: libparted/labels/atari.c:1823 libparted/labels/rdb.c:1082 msgid "Unable to allocate a partition number." msgstr "Не удалось назначить номер раздела." -#: libparted/labels/bsd.c:592 +#: libparted/labels/bsd.c:588 msgid "Unable to allocate a bsd disklabel slot." msgstr "Не удалось назначить слот подписи к диску bsd." -#: libparted/labels/dasd.c:625 +#: libparted/labels/dasd.c:626 msgid "The partition table of DASD-LDL device cannot be changed.\n" -msgstr "" +msgstr "Таблицу разделов устройства DASD-LDL нельзя изменить.\n" -#: libparted/labels/dasd.c:920 +#: libparted/labels/dasd.c:921 msgid "Unable to allocate a dasd disklabel slot" msgstr "Не удалось назначить слот подписи к диску dasd" -#: libparted/labels/dos.c:1003 +#: libparted/labels/dos.c:1006 #, c-format msgid "Invalid partition table on %s -- wrong signature %x." msgstr "Некорректная таблица разделов на %s: неправильный идентификатор %x." -#: libparted/labels/dos.c:1031 +#: libparted/labels/dos.c:1034 #, c-format msgid "Invalid partition table - recursive partition on %s." msgstr "Неверная таблица разделов - рекурсивный раздел на %s." -#: libparted/labels/dos.c:1560 +#: libparted/labels/dos.c:1557 msgid "Extended partitions cannot be hidden on msdos disk labels." msgstr "Расширенные разделы не могут быть скрыты при msdos метках диска." -#: libparted/labels/dos.c:1572 -#, fuzzy +#: libparted/labels/dos.c:1569 msgid "Extended partitions cannot be recovery partitions on msdos disk labels." -msgstr "Расширенные разделы не могут быть скрыты при msdos метках диска." +msgstr "" +"Расширенные разделы не могут быть разделами восстановления при msdos метках " +"диска." -#: libparted/labels/dos.c:2258 +#: libparted/labels/dos.c:2265 msgid "Parted can't resize partitions managed by Windows Dynamic Disk." msgstr "" "Parted не может изменять размер разделов управляемых Windows Dynamic Disk." -#: libparted/labels/dos.c:2514 +#: libparted/labels/dos.c:2521 msgid "cannot create any more partitions" msgstr "не удаётся создать дополнительные разделы" @@ -1267,7 +1231,7 @@ msgstr "Указанное устройство не является прави #: libparted/labels/fdasd.c:188 msgid "VOLSER not found on device" -msgstr "" +msgstr "На устройстве не найден VOLSER" #: libparted/labels/fdasd.c:191 libparted/labels/vtoc.c:179 msgid "Fatal error" @@ -1297,9 +1261,8 @@ msgstr "" "Текущая версия API '%d' не соответствует версии API dasd драйвера '%d'!" #: libparted/labels/fdasd.c:1020 -#, fuzzy msgid "Could not retrieve disk size." -msgstr "Не удалось получить информацию о диске." +msgstr "Не удалось получить размер диска." #: libparted/labels/fdasd.c:1029 msgid "Could not retrieve disk geometry information." @@ -1311,13 +1274,13 @@ msgstr "Не удалось получить информацию о разме #: libparted/labels/fdasd.c:1045 msgid "Disk geometry does not match a DASD device of type 3390." -msgstr "" +msgstr "Геометрия диска не соответствует устройству DASD с типом 3390." -#: libparted/labels/gpt.c:531 +#: libparted/labels/gpt.c:541 msgid "device is too small for GPT" msgstr "устройство слишком маленькое для GPT" -#: libparted/labels/gpt.c:733 +#: libparted/labels/gpt.c:743 #, c-format msgid "" "The format of the GPT partition table is version %x, which is newer than " @@ -1326,7 +1289,7 @@ msgstr "" "Формат таблицы разделов GPT версии %x новее, чем Parted может распознать. " "Сообщите об этом!" -#: libparted/labels/gpt.c:769 +#: libparted/labels/gpt.c:779 #, c-format msgid "" "Not all of the space available to %s appears to be used, you can fix the GPT " @@ -1337,7 +1300,7 @@ msgstr "" "таблицу GPT для использования всего места (дополнительно %llu блоков) или " "продолжить с текущими настройками? " -#: libparted/labels/gpt.c:1008 +#: libparted/labels/gpt.c:1024 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 +1308,7 @@ msgstr "" "Резервная копия таблицы GPT находится не в конце диска, как должно быть. " "Исправить это, передвинув резервную копию в конец диска (и удалив старую)?" -#: libparted/labels/gpt.c:1026 +#: libparted/labels/gpt.c:1042 msgid "" "Both the primary and backup GPT tables are corrupt. Try making a fresh " "table, and using Parted's rescue feature to recover partitions." @@ -1353,7 +1316,7 @@ msgstr "" "Обе — и главная, и резервная таблицы GPT — повреждены. Попробуйте создать " "новую и используя Parted для восстановления разделов." -#: libparted/labels/gpt.c:1037 +#: libparted/labels/gpt.c:1053 msgid "" "The backup GPT table is corrupt, but the primary appears OK, so that will be " "used." @@ -1361,7 +1324,7 @@ msgstr "" "Резервная таблица GPT повреждена, но главная кажется корректной, поэтому она " "и будет использоваться." -#: libparted/labels/gpt.c:1049 +#: libparted/labels/gpt.c:1065 msgid "" "The primary GPT table is corrupt, but the backup appears OK, so that will be " "used." @@ -1369,11 +1332,11 @@ msgstr "" "Главная таблица GPT повреждена, но резервная копия кажется корректной, " "поэтому она и будет использоваться." -#: libparted/labels/gpt.c:1073 +#: libparted/labels/gpt.c:1089 msgid "primary partition table array CRC mismatch" msgstr "ошибка CRC массива таблицы основных разделов" -#: libparted/labels/gpt.c:1936 libparted/labels/gpt.c:1963 +#: libparted/labels/gpt.c:2026 libparted/labels/gpt.c:2053 msgid "failed to translate partition name" msgstr "ошибка при трансляции имени раздела" @@ -1406,24 +1369,20 @@ msgid "The data region doesn't start at the start of the partition." msgstr "Область данных не начинается в начале раздела." #: libparted/labels/mac.c:572 -msgid "The boot region doesn't start at the start of the partition." -msgstr "Область загрузки не начинается в начале раздела." - -#: libparted/labels/mac.c:586 msgid "The partition's boot region doesn't occupy the entire partition." msgstr "Область загрузки раздела занимает не целый раздел." -#: libparted/labels/mac.c:597 +#: libparted/labels/mac.c:583 msgid "The partition's data region doesn't occupy the entire partition." msgstr "Область данных раздела занимает не целый раздел." -#: libparted/labels/mac.c:649 +#: 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:662 +#: libparted/labels/mac.c:648 #, c-format msgid "" "The driver descriptor says the physical block size is %d bytes, but Linux " @@ -1432,11 +1391,11 @@ msgstr "" "Драйвер говорит,что размер физического блока равен %d байт, но Linux " "говорит, что он %d байт." -#: libparted/labels/mac.c:715 +#: libparted/labels/mac.c:701 msgid "No valid partition map found." msgstr "Не найдено правильной карты разделов." -#: libparted/labels/mac.c:789 +#: libparted/labels/mac.c:775 #, c-format msgid "" "Conflicting partition map entry sizes! Entry 1 says it is %d, but entry %d " @@ -1445,11 +1404,11 @@ msgstr "" "Конфликт размеров записей карты разделов! В записи 1 указан %d, но в %d " "указано %d!" -#: libparted/labels/mac.c:820 +#: libparted/labels/mac.c:806 msgid "Weird! There are 2 partitions map entries!" msgstr "Ужас! Существует 2 записи таблицы разделов!" -#: libparted/labels/mac.c:1359 +#: libparted/labels/mac.c:1345 msgid "" "Changing the name of a root or swap partition will prevent Linux from " "recognising it as such." @@ -1457,23 +1416,23 @@ msgstr "" "Изменение имени корневого раздела или раздела подкачки создаст проблемы с их " "распознаванием в Linux." -#: libparted/labels/mac.c:1458 +#: libparted/labels/mac.c:1444 msgid "Can't add another partition -- the partition map is too small!" msgstr "Не удалось создать другой раздел -- слишком маленькая карта разделов!" -#: libparted/labels/pc98.c:284 +#: libparted/labels/pc98.c:285 #, c-format msgid "Invalid partition table on %s." msgstr "Неверная таблица разделов на %s." -#: libparted/labels/pc98.c:337 libparted/labels/pc98.c:415 +#: 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 "Раздел %d не выровнен к краю цилиндра. Это всё ещё не поддерживается." -#: libparted/labels/pc98.c:733 +#: libparted/labels/pc98.c:729 msgid "Can't add another partition." msgstr "Невозможно добавить другой раздел." @@ -1647,39 +1606,39 @@ msgstr "Не удалось записать VTOC FMT7 DSCB." msgid "Could not write VTOC FMT9 DSCB." msgstr "Не удалось записать VTOC FMT9 DSCB." -#: libparted/libparted.c:242 +#: libparted/libparted.c:247 msgid "Out of memory." msgstr "Недостаточно памяти." -#: libparted/unit.c:139 +#: libparted/unit.c:140 msgid "Cannot get unit size for special unit 'COMPACT'." msgstr "Не удаётся определить размер специальной единицы измерения 'COMPACT'." -#: libparted/unit.c:385 +#: libparted/unit.c:386 #, c-format msgid "\"%s\" has invalid syntax for locations." msgstr "\"%s\" содержит неправильный синтаксис расположений." -#: libparted/unit.c:393 +#: libparted/unit.c:394 #, c-format msgid "The maximum head value is %d." msgstr "Максимальное количество головок %d." -#: libparted/unit.c:400 +#: libparted/unit.c:401 #, c-format msgid "The maximum sector value is %d." msgstr "Максимальное количество секторов %d." -#: libparted/unit.c:412 libparted/unit.c:564 +#: 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:526 +#: libparted/unit.c:527 msgid "Invalid number." msgstr "Неправильный номер." -#: libparted/unit.c:532 +#: libparted/unit.c:533 msgid "Use a smaller unit instead of a value < 1" msgstr "Используйте меньшую единицу измерения вместо значений < 1" @@ -1689,18 +1648,18 @@ msgstr "Используйте меньшую единицу измерения msgid "%s : Failed to allocate partition block\n" msgstr "%s : Не удалось выделить блок раздела\n" -#: libparted/fs/amiga/affs.c:79 libparted/fs/amiga/apfs.c:71 +#: 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:84 libparted/fs/amiga/apfs.c:76 +#: 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:98 libparted/fs/amiga/apfs.c:87 +#: 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" @@ -1726,22 +1685,22 @@ msgstr "%s : Неправильная контрольная сумма блок msgid "%s : Couldn't write block %d\n" msgstr "%s : Не удалось записать блок %d.\n" -#: libparted/fs/amiga/amiga.c:278 +#: libparted/fs/amiga/amiga.c:279 #, c-format msgid "%s : Failed to allocate disk_specific rdb block\n" msgstr "%s : Не удалось выделить специфичный_для_диска блок rdb\n" -#: libparted/fs/amiga/amiga.c:289 +#: 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:318 +#: 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:148 libparted/fs/r/fat/fat.c:811 +#: libparted/fs/fat/fat.c:149 msgid "" "GNU Parted was miscompiled: the FAT boot sector should be 512 bytes. FAT " "support will be disabled." @@ -1841,7 +1800,7 @@ msgstr "" "Исправить, CHS геометрия файловой системы будет изменена для согласования с " "CHS геометрией таблицы раздела." -#: libparted/fs/r/fat/bootsector.c:399 +#: libparted/fs/r/fat/bootsector.c:398 #, c-format msgid "" "The information sector has the wrong signature (%x). Select cancel for now, " @@ -1868,13 +1827,13 @@ msgstr "" "Кластер начинается со смещением %d, что не является целым числом кластеров " "размера %d." -#: libparted/fs/r/fat/count.c:144 +#: libparted/fs/r/fat/count.c:84 #, c-format msgid "Bad directory entry for %s: first cluster is the end of file marker." msgstr "" "Плохой элемент каталога для %s: первый кластер является концом маркера файла." -#: libparted/fs/r/fat/count.c:157 +#: libparted/fs/r/fat/count.c:97 #, c-format msgid "" "Bad FAT: unterminated chain for %s. You should run dosfsck or scandisk." @@ -1882,7 +1841,7 @@ msgstr "" "Ошибка в FAT: незавершённая цепочка для %s. Вы должны запустить dosfsck или " "scandisk." -#: libparted/fs/r/fat/count.c:166 +#: libparted/fs/r/fat/count.c:106 #, c-format msgid "" "Bad FAT: cluster %d outside file system in chain for %s. You should run " @@ -1891,7 +1850,7 @@ msgstr "" "Ошибка в FAT: кластер %d находится вне файловой системы в цепочке для %s. " "Вы должны запустить dosfsck или scandisk." -#: libparted/fs/r/fat/count.c:176 +#: libparted/fs/r/fat/count.c:116 #, c-format msgid "" "Bad FAT: cluster %d is cross-linked for %s. You should run dosfsck or " @@ -1900,26 +1859,17 @@ msgstr "" "Ошибка в FAT: кластер %d имеет ссылку на %s. Вы должны запустить dosfsck " "или scandisk." -#: libparted/fs/r/fat/count.c:195 +#: libparted/fs/r/fat/count.c:135 #, c-format msgid "%s is %dk, but it has %d clusters (%dk)." msgstr "%s является %dk, но он содержит %d кластеров (%dk)." -#: libparted/fs/r/fat/count.c:258 -#, c-format -msgid "" -"The file %s is marked as a system file. This means moving it could cause " -"some programs to stop working." -msgstr "" -"Файл %s помечен как системный. Это значит, что его перемещение может " -"привести к прекращению работы некоторых программ." - -#: libparted/fs/r/fat/fat.c:243 +#: 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:409 +#: 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." @@ -1928,11 +1878,11 @@ msgstr "" "означает, выберите отмену, запустите scandisk для файловой системы, и затем " "возвращайтесь." -#: libparted/fs/r/fat/fat.c:449 +#: 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:461 +#: libparted/fs/r/fat/fat.c:462 #, c-format msgid "" "File system doesn't have expected sizes for Windows to like it. Cluster " @@ -1943,7 +1893,7 @@ msgstr "" "Размер кластера %dk (ожидаемый %dk); число кластеров %d (ожидаемое %d); " "размер FAT %d секторов (ожидаемый %d)." -#: libparted/fs/r/fat/fat.c:484 +#: libparted/fs/r/fat/fat.c:485 #, c-format msgid "" "File system is reporting the free space as %d clusters, not %d clusters." @@ -1951,7 +1901,7 @@ msgstr "" "Файловая система сообщает о свободном пространстве в %d кластеров, а не в %d " "кластеров." -#: libparted/fs/r/fat/resize.c:158 +#: 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." @@ -1959,15 +1909,15 @@ msgstr "" "Для всех файлов не хватает места в корневом каталоге. Либо отмените, либо " "игнорируйте и потеряете файлы." -#: libparted/fs/r/fat/resize.c:302 +#: libparted/fs/r/fat/resize.c:303 msgid "Error writing to the root directory." msgstr "Ошибка записи в корневой каталог." -#: libparted/fs/r/fat/resize.c:495 +#: 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:498 +#: 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 " @@ -1977,7 +1927,7 @@ msgstr "" "нужно будет переустановить загрузчик MS Windows. Если вы хотите это сделать, " "обратитесь к руководству Parted (или руководству вашего дистрибутива)." -#: libparted/fs/r/fat/resize.c:506 +#: libparted/fs/r/fat/resize.c:490 msgid "" "If you leave your file system as FAT32, then you will not introduce any new " "problems." @@ -1985,7 +1935,7 @@ msgstr "" "Если вы оставите файловую систему как FAT32, то никаких новых проблем не " "возникнет." -#: libparted/fs/r/fat/resize.c:510 +#: 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 " @@ -1999,42 +1949,42 @@ msgstr "" "Также, преобразование в FAT32 сделает файловую систему нечитаемой из MS DOS, " "MS Windows 95a и MS Windows NT." -#: libparted/fs/r/fat/resize.c:524 +#: libparted/fs/r/fat/resize.c:508 #, c-format msgid "%s %s %s" msgstr "%s %s %s" -#: libparted/fs/r/fat/resize.c:525 +#: libparted/fs/r/fat/resize.c:509 msgid "Would you like to use FAT32?" msgstr "Вы хотите использовать FAT32?" -#: libparted/fs/r/fat/resize.c:556 libparted/fs/r/fat/resize.c:572 +#: 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:557 +#: 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:573 +#: 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:586 +#: 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:136 +#: 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 " @@ -2043,41 +1993,41 @@ msgstr "" "FAT %d носитель %x не совпадает с носителем загрузочного сектора %x. " "Возможно, вам следует запустить scandisk." -#: libparted/fs/r/fat/table.c:268 +#: 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:300 +#: 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:342 +#: 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:151 +#: libparted/fs/r/filesys.c:152 msgid "Could not detect file system." msgstr "Не удаётся определить файловую систему." -#: libparted/fs/r/filesys.c:158 libparted/fs/r/filesys.c:285 +#: libparted/fs/r/filesys.c:159 libparted/fs/r/filesys.c:284 #, c-format msgid "resizing %s file systems is not supported" msgstr "изменение размера файловой системы %s не реализовано" -#: libparted/fs/r/filesys.c:170 +#: libparted/fs/r/filesys.c:171 msgid "The file system is bigger than its volume!" msgstr "Файловая система больше раздела, на котором расположена!" -#: libparted/fs/r/hfs/advfs.c:121 libparted/fs/r/hfs/advfs_plus.c:121 -#: libparted/fs/r/hfs/reloc.c:413 libparted/fs/r/hfs/reloc.c:507 -#: libparted/fs/r/hfs/reloc_plus.c:538 libparted/fs/r/hfs/reloc_plus.c:656 -#: libparted/fs/r/hfs/reloc_plus.c:769 +#: 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:285 +#: libparted/fs/r/hfs/advfs_plus.c:287 msgid "Bad blocks could not be read." msgstr "Плохие блоки не могут быть прочитаны." @@ -2091,12 +2041,12 @@ msgstr "" "другой блок в этой позиции. Проверьте файловую систему на ошибки!" #: 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 "" -"При попытке переместить extent из блока Ox%X в блок Ox%X, обнаружен другой " +"При попытке переместить extent из блока 0x%X в блок 0x%X, обнаружен другой " "блок в этой позиции. Этого не должно было случиться!" #: libparted/fs/r/hfs/file.c:143 @@ -2139,65 +2089,65 @@ msgstr "Не удалось найти сектор %lli для HFS+ файла msgid "Trying to write HFS+ file with CNID %X behind EOF." msgstr "Выполняется попытка записи HFS+ файла с CNID %X за EOF." -#: libparted/fs/r/hfs/hfs.c:232 +#: libparted/fs/r/hfs/hfs.c:212 msgid "Sorry, HFS cannot be resized that way yet." msgstr "" "Извините, но в настоящее время размер HFS не может быть изменён таким " "образом." -#: libparted/fs/r/hfs/hfs.c:250 libparted/fs/r/hfs/hfs.c:629 +#: libparted/fs/r/hfs/hfs.c:230 libparted/fs/r/hfs/hfs.c:573 msgid "shrinking" msgstr "уменьшение" -#: libparted/fs/r/hfs/hfs.c:262 libparted/fs/r/hfs/hfs.c:641 +#: 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:281 +#: 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:320 +#: libparted/fs/r/hfs/hfs.c:300 msgid "writing HFS Master Directory Block" msgstr "запись HFS Master Directory Block (главный блок каталога)" -#: libparted/fs/r/hfs/hfs.c:468 +#: libparted/fs/r/hfs/hfs.c:412 msgid "No valid HFS[+X] signature has been found while opening." msgstr "При открытии не найден правильный идентификатор HFS[+X]." -#: libparted/fs/r/hfs/hfs.c:478 +#: 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:489 +#: 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:672 +#: 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:720 +#: libparted/fs/r/hfs/hfs.c:664 msgid "Error while writing the allocation file." msgstr "Ошибка записи в выделенный файл." -#: libparted/fs/r/hfs/hfs.c:735 +#: 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:750 +#: libparted/fs/r/hfs/hfs.c:694 msgid "writing HFS+ Volume Header" msgstr "запись HFS+ Volume Header (заголовок раздела)" -#: libparted/fs/r/hfs/hfs.c:850 +#: 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:904 +#: 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." @@ -2205,29 +2155,29 @@ msgstr "" "Похоже, ошибка в оболочке HFS: файл плохих блоков не содержит встроенный HFS" "+ раздел." -#: libparted/fs/r/hfs/hfs.c:940 +#: libparted/fs/r/hfs/hfs.c:883 msgid "Sorry, HFS+ cannot be resized that way yet." msgstr "" "Извините, но в настоящее время размер HFS+ не может быть изменён таким " "образом." -#: libparted/fs/r/hfs/hfs.c:975 +#: libparted/fs/r/hfs/hfs.c:918 msgid "shrinking embedded HFS+ volume" msgstr "выполняется уменьшение размера встроенного HFS+ раздела" -#: libparted/fs/r/hfs/hfs.c:992 +#: libparted/fs/r/hfs/hfs.c:935 msgid "Resizing the HFS+ volume has failed." msgstr "Ошибка при изменении размера раздела HFS+." -#: libparted/fs/r/hfs/hfs.c:999 +#: libparted/fs/r/hfs/hfs.c:942 msgid "shrinking HFS wrapper" msgstr "выполняется уменьшение размера оболочки HFS" -#: libparted/fs/r/hfs/hfs.c:1008 +#: libparted/fs/r/hfs/hfs.c:951 msgid "Updating the HFS wrapper has failed." msgstr "Ошибка при обновлении оболочки HFS+." -#: libparted/fs/r/hfs/hfs.c:1110 libparted/fs/r/hfs/hfs.c:1195 +#: 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 " @@ -2248,13 +2198,12 @@ msgstr "" "Неправильный размер блока транзакций при проигрывании журнала (%i байт)." #: 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 "" -"Хранение журнала вне раздела не поддерживается. Попробуйте отключить журнал " -"и запустить Parted снова." +"Хранение журнала вне тома не поддерживается. Попробуйте отключить журнал и " +"запустить Parted снова." #: libparted/fs/r/hfs/journal.c:271 msgid "Journal offset or size is not multiple of the sector size." @@ -2305,7 +2254,7 @@ msgstr "" msgid "An extent has not been relocated." msgstr "extent не был перемещён." -#: libparted/fs/r/hfs/reloc.c:250 libparted/fs/r/hfs/reloc_plus.c:307 +#: 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!" @@ -2313,16 +2262,16 @@ msgstr "" "Ссылка на extent указывает на место, где его быть не должно. Проверьте " "файловую систему!" -#: libparted/fs/r/hfs/reloc.c:380 +#: libparted/fs/r/hfs/reloc.c:382 msgid "This HFS volume has no catalog file. This is very unusual!" msgstr "Этот раздел HFS не содержит файла каталога. Очень необычно!" -#: libparted/fs/r/hfs/reloc.c:474 +#: libparted/fs/r/hfs/reloc.c:479 msgid "This HFS volume has no extents overflow file. This is quite unusual!" msgstr "" "Этот раздел HFS не содержит файла размеров перегрузки. Достаточно необычно!" -#: libparted/fs/r/hfs/reloc.c:516 libparted/fs/r/hfs/reloc_plus.c:666 +#: 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." @@ -2330,52 +2279,52 @@ msgstr "" "Файл размеров перегрузки не должен содержать свои размеры! Проверьте " "файловую систему." -#: libparted/fs/r/hfs/reloc.c:573 libparted/fs/r/hfs/reloc_plus.c:844 +#: 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:634 libparted/fs/r/hfs/reloc_plus.c:905 +#: 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:648 libparted/fs/r/hfs/reloc_plus.c:921 +#: libparted/fs/r/hfs/reloc.c:654 libparted/fs/r/hfs/reloc_plus.c:926 msgid "An error occurred during extent relocation." msgstr "Возникла ошибка при перемещении extent." -#: libparted/fs/r/hfs/reloc_plus.c:494 +#: libparted/fs/r/hfs/reloc_plus.c:495 msgid "This HFS+ volume has no catalog file. This is very unusual!" msgstr "Этот раздел HFS+ не содержит файла каталога. Очень необычно!" -#: libparted/fs/r/hfs/reloc_plus.c:617 +#: libparted/fs/r/hfs/reloc_plus.c:620 msgid "This HFS+ volume has no extents overflow file. This is quite unusual!" msgstr "" "Этот раздел HFS+ не содержит файла размеров перегрузки. Достаточно необычно!" -#: parted/parted.c:125 +#: parted/parted.c:126 msgid "displays this help message" msgstr "отображает это справочное сообщение" -#: parted/parted.c:126 +#: parted/parted.c:127 msgid "lists partition layout on all block devices" msgstr "выводит раскладку разделов всех блочных устройств" -#: parted/parted.c:127 +#: parted/parted.c:128 msgid "displays machine parseable output" msgstr "отображает вывод для обработки компьютером" -#: parted/parted.c:128 +#: parted/parted.c:129 msgid "never prompts for user intervention" msgstr "никогда не запрашивает вмешательство пользователя" -#: parted/parted.c:129 +#: parted/parted.c:130 msgid "displays the version" msgstr "отображает версию" -#: parted/parted.c:130 +#: parted/parted.c:131 msgid "alignment for new partitions" msgstr "выравнивание новых разделов" -#: parted/parted.c:142 +#: parted/parted.c:143 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 +2333,31 @@ msgstr "" "помечаются так: номерами первичных разделов могут быть с 1 по 4, с 5 и далее " "следуют номера логических разделов.\n" -#: parted/parted.c:145 +#: parted/parted.c:146 msgid "LABEL-TYPE is one of: " msgstr "ТИП_МЕТКИ один из: " -#: parted/parted.c:146 parted/parted.c:147 +#: parted/parted.c:147 parted/parted.c:148 msgid "FLAG is one of: " msgstr "ФЛАГ один из: " -#: parted/parted.c:148 +#: parted/parted.c:149 msgid "UNIT is one of: " msgstr "ЕДИНИЦА одна из: " -#: parted/parted.c:149 +#: parted/parted.c:150 msgid "desired alignment: minimum or optimal" msgstr "предпочитаемое выравнивание: минимальное или оптимальное" -#: parted/parted.c:150 +#: parted/parted.c:151 msgid "PART-TYPE is one of: primary, logical, extended\n" msgstr "ТИП_РАЗД один из: основной, логический, расширенный\n" -#: parted/parted.c:152 +#: parted/parted.c:153 msgid "FS-TYPE is one of: " msgstr "ТИП_ФС один из: " -#: parted/parted.c:153 +#: parted/parted.c:154 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 +2367,7 @@ msgstr "" "Отрицательные значения отсчитываются от конца диска. Например, -1s " "обозначает последний сектор.\n" -#: parted/parted.c:156 +#: parted/parted.c:157 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 +2376,19 @@ msgstr "" "значения отсчитываются от конца диска. Например, -1s обозначает последний " "сектор.\n" -#: parted/parted.c:159 +#: parted/parted.c:160 msgid "STATE is one of: on, off\n" msgstr "СОСТОЯНИЕ одно из двух: on, off (активно, неактивно)\n" -#: parted/parted.c:160 +#: parted/parted.c:161 msgid "DEVICE is usually /dev/hda or /dev/sda\n" msgstr "УСТРОЙСТВОМ обычно является /dev/hda или /dev/sda\n" -#: parted/parted.c:161 +#: parted/parted.c:162 msgid "NAME is any word you want\n" msgstr "ИМЯ — любое слово, какое захотите\n" -#: parted/parted.c:164 +#: parted/parted.c:165 msgid "" "Copyright (C) 1998 - 2006 Free Software Foundation, Inc.\n" "This program is free software, covered by the GNU General Public License.\n" @@ -2459,22 +2408,22 @@ msgstr "" "или ПРИГОДНОСТИ ДЛЯ КОНКРЕТНОЙ ЦЕЛИ. Для получения более подробной " "информации смотрите Универсальную Общественную Лицензию GNU.\n" -#: parted/parted.c:212 +#: parted/parted.c:213 #, c-format msgid "%0.f%%\t(time left %.2d:%.2d)" msgstr "%0.f%%\t(времени прошло %.2d:%.2d)" -#: parted/parted.c:231 +#: parted/parted.c:232 #, c-format msgid "Partition %s is being used. Are you sure you want to continue?" msgstr "Раздел %s используется. Вы уверены что хотите продолжить?" -#: parted/parted.c:252 +#: parted/parted.c:253 #, c-format msgid "Partition(s) on %s are being used." msgstr "Разделы на %s используются." -#: parted/parted.c:264 +#: parted/parted.c:265 #, c-format msgid "" "The existing disk label on %s will be destroyed and all data on this disk " @@ -2483,31 +2432,31 @@ msgstr "" "Существующая метка диска на %s будет уничтожена и все данные на этом диске " "будут потеряны. Действительно продолжить?" -#: parted/parted.c:525 +#: parted/parted.c:526 msgid "New disk label type?" msgstr "Новый тип метки диска?" -#: parted/parted.c:662 +#: parted/parted.c:663 msgid "Partition type?" msgstr "Тип раздела?" -#: parted/parted.c:680 parted/parted.c:884 +#: parted/parted.c:681 parted/parted.c:885 msgid "Partition name?" msgstr "Имя раздела?" -#: parted/parted.c:690 +#: parted/parted.c:691 msgid "File system type?" msgstr "Тип файловой системы?" -#: parted/parted.c:695 parted/parted.c:1498 +#: parted/parted.c:696 parted/parted.c:1499 msgid "Start?" msgstr "Начало?" -#: parted/parted.c:698 parted/parted.c:1500 parted/parted.c:1569 +#: parted/parted.c:699 parted/parted.c:1501 parted/parted.c:1585 msgid "End?" msgstr "Конец?" -#: parted/parted.c:766 +#: parted/parted.c:767 #, c-format msgid "" "You requested a partition from %s to %s (sectors %llu..%llu).\n" @@ -2517,7 +2466,7 @@ msgstr "" "Ближайшие точки, с которыми мы можем работать, от %s до %s (сектора %llu.." "%llu).%s" -#: parted/parted.c:775 +#: parted/parted.c:776 msgid "" "\n" "Is this still acceptable to you?" @@ -2525,152 +2474,151 @@ msgstr "" "\n" "Это вас устраивает?" -#: parted/parted.c:798 -#, fuzzy, c-format +#: parted/parted.c:799 +#, c-format msgid "" "The resulting partition is not properly aligned for best performance: %s" msgstr "" -"Полученный раздел не выровнен для обеспечения лучшей производительности." +"Полученный раздел не выровнен для обеспечения лучшей производительности: %s" -#: parted/parted.c:800 parted/parted.c:1723 +#: parted/parted.c:801 parted/parted.c:1739 msgid "unknown (malloc failed)" -msgstr "" +msgstr "неизвестно (ошибка malloc)" -#: parted/parted.c:876 -#, fuzzy, c-format +#: parted/parted.c:877 +#, c-format msgid "%s disk labels do not support partition name." -msgstr "Подписи к дискам %s не поддерживают расширенные разделы." +msgstr "Метки дисков %s не поддерживают имя раздела." -#: parted/parted.c:881 parted/parted.c:1561 parted/parted.c:1612 -#: parted/parted.c:1706 parted/parted.c:1781 +#: parted/parted.c:882 parted/parted.c:1564 parted/parted.c:1628 +#: parted/parted.c:1722 parted/parted.c:1797 msgid "Partition number?" msgstr "Номер раздела?" -#: parted/parted.c:975 +#: parted/parted.c:976 #, 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:1017 +#: parted/parted.c:1018 #, c-format msgid "Model: %s (%s)\n" msgstr "Модель: %s (%s)\n" -#: parted/parted.c:1019 +#: parted/parted.c:1020 #, c-format msgid "Disk %s: %s\n" msgstr "Диск %s: %s\n" -#: parted/parted.c:1020 +#: parted/parted.c:1021 #, c-format msgid "Sector size (logical/physical): %lldB/%lldB\n" msgstr "Размер сектора (логич./физич.): %lldB/%lldB\n" -#: parted/parted.c:1032 +#: parted/parted.c:1033 #, c-format msgid "Partition Table: %s\n" msgstr "Таблица разделов: %s\n" -#: parted/parted.c:1033 +#: parted/parted.c:1034 #, c-format msgid "Disk Flags: %s\n" msgstr "Флаги диска: %s\n" -#: parted/parted.c:1153 parted/parted.c:1156 +#: parted/parted.c:1154 parted/parted.c:1157 msgid "Number" msgstr "Номер" -#: parted/parted.c:1153 parted/parted.c:1156 +#: parted/parted.c:1154 parted/parted.c:1157 msgid "Start" msgstr "Начало" -#: parted/parted.c:1154 parted/parted.c:1157 +#: parted/parted.c:1155 parted/parted.c:1158 msgid "End" msgstr "Конец" -#: parted/parted.c:1157 +#: parted/parted.c:1158 msgid "Size" msgstr "Размер" -#: parted/parted.c:1161 +#: parted/parted.c:1162 msgid "Type" msgstr "Тип" -#: parted/parted.c:1163 +#: parted/parted.c:1164 msgid "File system" msgstr "Файловая система" -#: parted/parted.c:1166 +#: parted/parted.c:1167 msgid "Name" msgstr "Имя" -#: parted/parted.c:1168 +#: parted/parted.c:1169 msgid "Flags" msgstr "Флаги" -#: parted/parted.c:1225 +#: parted/parted.c:1226 msgid "Free Space" msgstr "Свободное место" -#: parted/parted.c:1385 +#: parted/parted.c:1386 #, 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:1428 +#: parted/parted.c:1429 msgid "searching for file systems" msgstr "поиск файловых систем" -#: parted/parted.c:1535 +#: parted/parted.c:1536 msgid "The resize command has been removed in parted 3.0" msgstr "Команда resize была удалена в parted 3.0" -#: parted/parted.c:1583 +#: parted/parted.c:1599 msgid "" "Shrinking a partition can cause data loss, are you sure you want to continue?" msgstr "" "Уменьшение раздела может привести к потере данных, вы действительно хотите " "продолжить?" -#: parted/parted.c:1636 +#: parted/parted.c:1652 msgid "New device?" msgstr "Новое устройство?" -#: parted/parted.c:1704 +#: parted/parted.c:1720 msgid "alignment type(min/opt)" msgstr "тип выравнивания (min/opt)" -#: parted/parted.c:1719 +#: parted/parted.c:1735 #, c-format msgid "%d aligned\n" msgstr "%d выровнен\n" -#: parted/parted.c:1721 -#, fuzzy, c-format +#: parted/parted.c:1737 +#, c-format msgid "%d not aligned: %s\n" -msgstr "%d не выровнен\n" +msgstr "%d не выровнен: %s\n" -#: parted/parted.c:1746 parted/parted.c:1783 +#: parted/parted.c:1762 parted/parted.c:1799 msgid "Flag to Invert?" msgstr "Флаг для инвертации?" -#: parted/parted.c:1751 parted/parted.c:1788 +#: parted/parted.c:1767 parted/parted.c:1804 msgid "New state?" msgstr "Новое состояние?" -#: parted/parted.c:1834 +#: parted/parted.c:1850 msgid "Unit?" msgstr "Единица?" -#: parted/parted.c:1969 +#: parted/parted.c:1985 msgid "align-check" msgstr "align-check" -#: parted/parted.c:1972 -#, fuzzy +#: parted/parted.c:1988 msgid "" "align-check TYPE N check partition N for TYPE(min|opt) " "alignment" @@ -2678,11 +2626,11 @@ msgstr "" "align-check ТИП N проверить, что раздел N выровнен согласно " "ТИПУ(min|opt)" -#: parted/parted.c:1980 +#: parted/parted.c:1996 msgid "help" msgstr "help" -#: parted/parted.c:1983 +#: parted/parted.c:1999 msgid "" "help [COMMAND] print general help, or help on " "COMMAND" @@ -2690,30 +2638,30 @@ msgstr "" "help [КОМАНДА] распечатать общую справку или справку по " "КОМАНДЕ" -#: parted/parted.c:1989 +#: parted/parted.c:2005 msgid "mklabel" msgstr "mklabel" -#: parted/parted.c:1989 +#: parted/parted.c:2005 msgid "mktable" msgstr "mktable" -#: parted/parted.c:1992 +#: parted/parted.c:2008 msgid "" "mklabel,mktable LABEL-TYPE create a new disklabel (partition " "table)" msgstr "" "mklabel,mktable ТИП_МЕТКИ создать новую метку диска (таблицу раздела)" -#: parted/parted.c:1998 +#: parted/parted.c:2014 msgid "mkpart" msgstr "mkpart" -#: parted/parted.c:2001 +#: parted/parted.c:2017 msgid "mkpart PART-TYPE [FS-TYPE] START END make a partition" msgstr "mkpart ТИП_РАЗД [ТИП_ФС] НАЧ КОН создать раздел" -#: parted/parted.c:2007 +#: parted/parted.c:2023 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 +2669,19 @@ msgstr "" "mkpart делает раздел без создания на нём новой файловой системы. ТИП_ФС " "должен быть указан для записи идентификатора раздела\n" -#: parted/parted.c:2012 +#: parted/parted.c:2028 msgid "name" msgstr "name" -#: parted/parted.c:2015 +#: parted/parted.c:2031 msgid "name NUMBER NAME name partition NUMBER as NAME" msgstr "name НОМЕР ИМЯ назначить ИМЯ разделу с НОМЕРом" -#: parted/parted.c:2020 +#: parted/parted.c:2036 msgid "print" msgstr "print" -#: parted/parted.c:2023 +#: parted/parted.c:2039 msgid "" "print [devices|free|list,all|NUMBER] display the partition table, " "available devices, free space, all found partitions, or a particular " @@ -2743,7 +2691,7 @@ msgstr "" "доступные устройства, свободное место, все найденные разделы или " "определённый раздел" -#: parted/parted.c:2028 +#: parted/parted.c:2044 msgid "" "Without arguments, 'print' displays the entire partition table. However with " "the following arguments it performs various other actions.\n" @@ -2751,11 +2699,11 @@ msgstr "" "Без параметров, «print» отображает всю таблицу разделов. Но с параметрами " "могут выполняться и некоторые другие действия.\n" -#: parted/parted.c:2030 +#: parted/parted.c:2046 msgid " devices : display all active block devices\n" msgstr " devices : отобразить все активные блочные устройства\n" -#: parted/parted.c:2031 +#: parted/parted.c:2047 msgid "" " free : display information about free unpartitioned space on the " "current block device\n" @@ -2763,33 +2711,33 @@ msgstr "" " free : отображает информацию о свободном, не разбитом пространстве на " "текущем блочном устройстве\n" -#: parted/parted.c:2033 +#: parted/parted.c:2049 msgid "" " list, all : display the partition tables of all active block devices\n" msgstr "" " list, all : отображает таблицы разделов на всех активных блочных " "устройствах\n" -#: parted/parted.c:2034 +#: parted/parted.c:2050 msgid "" " NUMBER : display more detailed information about this particular " "partition\n" msgstr "" " НОМЕР : отображает более детальную информацию о требуемом разделе\n" -#: parted/parted.c:2039 +#: parted/parted.c:2055 msgid "quit" msgstr "quit" -#: parted/parted.c:2042 +#: parted/parted.c:2058 msgid "quit exit program" msgstr "quit выйти из программы" -#: parted/parted.c:2047 +#: parted/parted.c:2063 msgid "rescue" msgstr "resize" -#: parted/parted.c:2050 +#: parted/parted.c:2066 msgid "" "rescue START END rescue a lost partition near START " "and END" @@ -2797,52 +2745,52 @@ msgstr "" "rescue НАЧАЛО КОНЕЦ восстановить потерянный раздел в промежутке " "от НАЧАЛА до КОНЦА" -#: parted/parted.c:2056 +#: parted/parted.c:2072 msgid "resize" msgstr "resize" -#: parted/parted.c:2059 +#: parted/parted.c:2075 msgid "The resize command was removed in parted 3.0\n" msgstr "Команда resize была удалена в parted 3.0\n" -#: parted/parted.c:2062 +#: parted/parted.c:2078 msgid "resizepart" msgstr "resizepart" -#: parted/parted.c:2065 +#: parted/parted.c:2081 msgid "resizepart NUMBER END resize partition NUMBER" msgstr "resizepart НОМЕР КОНЕЦ изменить размер раздела НОМЕР" -#: parted/parted.c:2070 +#: parted/parted.c:2086 msgid "rm" msgstr "rm" -#: parted/parted.c:2073 +#: parted/parted.c:2089 msgid "rm NUMBER delete partition NUMBER" msgstr "rm НОМЕР удалить раздел НОМЕР" -#: parted/parted.c:2078 +#: parted/parted.c:2094 msgid "select" msgstr "select" -#: parted/parted.c:2081 +#: parted/parted.c:2097 msgid "select DEVICE choose the device to edit" msgstr "select УСТРОЙСТВО выбор устройства для редактирования" -#: parted/parted.c:2086 +#: parted/parted.c:2102 msgid "disk_set" msgstr "disk_set" -#: parted/parted.c:2089 +#: parted/parted.c:2105 msgid "" "disk_set FLAG STATE change the FLAG on selected device" msgstr "disk_set ФЛАГ СОСТОЯНИЕ изменить ФЛАГ на выбранном устройстве" -#: parted/parted.c:2094 +#: parted/parted.c:2110 msgid "disk_toggle" msgstr "disk_toggle" -#: parted/parted.c:2097 +#: parted/parted.c:2113 msgid "" "disk_toggle [FLAG] toggle the state of FLAG on " "selected device" @@ -2850,40 +2798,40 @@ msgstr "" "disk_toggle [ФЛАГ] переключить состояние ФЛАГА на выбранном " "устройстве" -#: parted/parted.c:2103 +#: parted/parted.c:2119 msgid "set" msgstr "set" -#: parted/parted.c:2106 +#: parted/parted.c:2122 msgid "" "set NUMBER FLAG STATE change the FLAG on partition NUMBER" msgstr "set НОМЕР ФЛАГ СОСТОЯНИЕ изменить ФЛАГ на разделе НОМЕР" -#: parted/parted.c:2112 +#: parted/parted.c:2128 msgid "toggle" msgstr "toggle" -#: parted/parted.c:2115 +#: parted/parted.c:2131 msgid "" "toggle [NUMBER [FLAG]] toggle the state of FLAG on " "partition NUMBER" msgstr "" "toggle [НОМЕР [ФЛАГ]] переключить состояние ФЛАГА на разделе НОМЕР" -#: parted/parted.c:2121 +#: parted/parted.c:2137 msgid "unit" msgstr "unit" -#: parted/parted.c:2124 +#: parted/parted.c:2140 msgid "unit UNIT set the default unit to UNIT" msgstr "" "unit ЕДИНИЦА использовать для измерений данную ЕДИНИЦУ" -#: parted/parted.c:2129 +#: parted/parted.c:2145 msgid "version" msgstr "version" -#: parted/parted.c:2132 +#: parted/parted.c:2148 msgid "" "version display the version number and " "copyright information of GNU Parted" @@ -2891,37 +2839,45 @@ msgstr "" "version отображает текущую версию GNU " "Parted и информацию о лицензии" -#: parted/parted.c:2136 +#: parted/parted.c:2152 msgid "" "'version' displays copyright and version information corresponding to this " "copy of GNU Parted\n" msgstr "" "version отображает информацию о лицензии и версии этой копии GNU Parted\n" -#: parted/parted.c:2204 +#: parted/parted.c:2220 #, c-format msgid "Usage: %s [-hlmsv] [-a] [DEVICE [COMMAND [PARAMETERS]]...]\n" msgstr "" "Использование: %s [-hlmsv] [-a] [УСТРОЙСТВО [КОМАНДА [ПАРАМЕТРЫ]]…]\n" -#: parted/parted.c:2248 +#: parted/parted.c:2264 msgid "No device found" msgstr "Устройство не найдено" -#: parted/parted.c:2285 +#: parted/parted.c:2301 msgid "WARNING: You are not superuser. Watch out for permissions.\n" msgstr "ВНИМАНИЕ: у вас нет прав администратора. Могут возникнуть проблемы.\n" -#: parted/parted.c:2325 +#: parted/parted.c:2334 +msgid "" +"You should reinstall your boot loader before rebooting. Read section 4 of " +"the Parted User documentation for more information." +msgstr "" +"Нужно переустановить загрузчик перед перезагрузкой. Прочтите раздел 4 " +"Руководства пользователя Parted для дополнительной информации." + +#: parted/parted.c:2341 msgid "You may need to update /etc/fstab.\n" msgstr "Не забудьте обновить /etc/fstab.\n" -#: parted/ui.c:164 +#: parted/ui.c:165 msgid "Welcome to GNU Parted! Type 'help' to view a list of commands.\n" msgstr "" "Добро пожаловать в GNU Parted! Наберите 'help' для просмотра списка команд.\n" -#: parted/ui.c:167 +#: parted/ui.c:168 msgid "" "Usage: parted [OPTION]... [DEVICE [COMMAND [PARAMETERS]...]...]\n" "Apply COMMANDs with PARAMETERS to DEVICE. If no COMMAND(s) are given, run " @@ -2933,7 +2889,7 @@ msgstr "" "задано,\n" "программа работает в интерактивном режиме.\n" -#: parted/ui.c:172 +#: parted/ui.c:173 #, c-format msgid "" "\n" @@ -2997,7 +2953,7 @@ msgstr "" "А также любую дополнительную информацию о вашей конфигурации,\n" "если вы посчитаете это важным.\n" -#: parted/ui.c:293 +#: parted/ui.c:294 msgid "" "\n" "Command History:\n" @@ -3005,7 +2961,7 @@ msgstr "" "\n" "История команд:\n" -#: parted/ui.c:356 +#: parted/ui.c:357 msgid "" "\n" "Error: SEGV_MAPERR (Address not mapped to object)\n" @@ -3013,7 +2969,7 @@ msgstr "" "\n" "Ошибка: SEGV_MAPERR (адрес не назначен объекту)\n" -#: parted/ui.c:362 +#: parted/ui.c:363 msgid "" "\n" "Error: SEGV_ACCERR (Invalid permissions for mapped object)\n" @@ -3021,7 +2977,7 @@ msgstr "" "\n" "Ошибка: SEGV_ACCERR (недопустимые права для назначенного объекта)\n" -#: parted/ui.c:367 +#: parted/ui.c:368 msgid "" "\n" "Error: A general SIGSEGV signal was encountered.\n" @@ -3029,7 +2985,7 @@ msgstr "" "\n" "Ошибка: получен обычный сигнал SIGSEGV.\n" -#: parted/ui.c:391 +#: parted/ui.c:392 msgid "" "\n" "Error: FPE_INTDIV (Integer: divide by zero)" @@ -3037,7 +2993,7 @@ msgstr "" "\n" "Ошибка: FPE_INTDIV (Integer: деление на ноль)" -#: parted/ui.c:396 +#: parted/ui.c:397 msgid "" "\n" "Error: FPE_INTOVF (Integer: overflow)" @@ -3045,7 +3001,7 @@ msgstr "" "\n" "Ошибка: FPE_INTOVF (Integer: переполнение)" -#: parted/ui.c:401 +#: parted/ui.c:402 msgid "" "\n" "Error: FPE_FLTDIV (Float: divide by zero)" @@ -3053,7 +3009,7 @@ msgstr "" "\n" "Ошибка: FPE_FLTDIV (Float: деление на ноль)" -#: parted/ui.c:406 +#: parted/ui.c:407 msgid "" "\n" "Error: FPE_FLTOVF (Float: overflow)" @@ -3061,7 +3017,7 @@ msgstr "" "\n" "Ошибка: FPE_FLTOVF (Float: переполнение)" -#: parted/ui.c:411 +#: parted/ui.c:412 msgid "" "\n" "Error: FPE_FLTUND (Float: underflow)" @@ -3069,7 +3025,7 @@ msgstr "" "\n" "Ошибка: FPE_FLTUND (Float: потеря значимости)" -#: parted/ui.c:416 +#: parted/ui.c:417 msgid "" "\n" "Error: FPE_FLTRES (Float: inexact result)" @@ -3077,7 +3033,7 @@ msgstr "" "\n" "Ошибка: FPE_FLTRES (Float: неточный ответ)" -#: parted/ui.c:421 +#: parted/ui.c:422 msgid "" "\n" "Error: FPE_FLTINV (Float: invalid operation)" @@ -3085,7 +3041,7 @@ msgstr "" "\n" "Ошибка: FPE_FLTINV (Float: неправильная операция)" -#: parted/ui.c:426 +#: parted/ui.c:427 msgid "" "\n" "Error: FPE_FLTSUB (Float: subscript out of range)" @@ -3093,7 +3049,7 @@ msgstr "" "\n" "Ошибка: FPE_FLTSUB (Float: выражение вне области)" -#: parted/ui.c:431 +#: parted/ui.c:432 msgid "" "\n" "Error: A general SIGFPE signal was encountered." @@ -3101,7 +3057,7 @@ msgstr "" "\n" "Ошибка: получен обычный сигнал SIGFPE." -#: parted/ui.c:455 +#: parted/ui.c:456 msgid "" "\n" "Error: ILL_ILLOPC (Illegal Opcode)" @@ -3109,7 +3065,7 @@ msgstr "" "\n" "Ошибка: ILL_ILLOPC (неправильный Opcode)" -#: parted/ui.c:460 +#: parted/ui.c:461 msgid "" "\n" "Error: ILL_ILLOPN (Illegal Operand)" @@ -3117,7 +3073,7 @@ msgstr "" "\n" "Ошибка: ILL_ILLOPN (неправильный операнд)" -#: parted/ui.c:465 +#: parted/ui.c:466 msgid "" "\n" "Error: ILL_ILLADR (Illegal addressing mode)" @@ -3125,7 +3081,7 @@ msgstr "" "\n" "Ошибка: ILL_ILLADR (неправильный режим адресации)" -#: parted/ui.c:470 +#: parted/ui.c:471 msgid "" "\n" "Error: ILL_ILLTRP (Illegal Trap)" @@ -3133,7 +3089,7 @@ msgstr "" "\n" "Ошибка: ILL_ILLTRP (неправильная ловушка)" -#: parted/ui.c:475 +#: parted/ui.c:476 msgid "" "\n" "Error: ILL_PRVOPC (Privileged Opcode)" @@ -3141,7 +3097,7 @@ msgstr "" "\n" "Ошибка: ILL_PRVOPC (привилегированный Opcode)" -#: parted/ui.c:480 +#: parted/ui.c:481 msgid "" "\n" "Error: ILL_PRVREG (Privileged Register)" @@ -3149,7 +3105,7 @@ msgstr "" "\n" "Ошибка: ILL_PRVREG (привилегированный регистр)" -#: parted/ui.c:485 +#: parted/ui.c:486 msgid "" "\n" "Error: ILL_COPROC (Coprocessor Error)" @@ -3157,7 +3113,7 @@ msgstr "" "\n" "Ошибка: ILL_COPROC (ошибка сопроцессора)" -#: parted/ui.c:490 +#: parted/ui.c:491 msgid "" "\n" "Error: ILL_BADSTK (Internal Stack Error)" @@ -3165,7 +3121,7 @@ msgstr "" "\n" "Ошибка: ILL_BADSTK (ошибка внутреннего стека)" -#: parted/ui.c:495 +#: parted/ui.c:496 msgid "" "\n" "Error: A general SIGILL signal was encountered." @@ -3173,69 +3129,69 @@ msgstr "" "\n" "Ошибка: получен обычный сигнал SIGILL." -#: parted/ui.c:888 +#: parted/ui.c:889 #, c-format msgid "invalid token: %s" msgstr "недопустимый ключ: %s" -#: parted/ui.c:1069 +#: parted/ui.c:1070 msgid "Expecting a partition number." msgstr "Ожидается номер раздела." -#: parted/ui.c:1078 +#: parted/ui.c:1079 msgid "Partition doesn't exist." msgstr "Раздел не существует." -#: parted/ui.c:1098 +#: parted/ui.c:1099 msgid "Expecting a file system type." msgstr "Ожидается тип файловой системы." -#: parted/ui.c:1105 +#: parted/ui.c:1106 #, c-format msgid "Unknown file system type \"%s\"." msgstr "Неизвестный тип файловой системы «%s»." -#: parted/ui.c:1126 +#: parted/ui.c:1127 msgid "Expecting a disk label type." msgstr "Ожидается тип метки диска." -#: parted/ui.c:1157 parted/ui.c:1193 +#: parted/ui.c:1158 parted/ui.c:1194 msgid "No flags supported" -msgstr "" +msgstr "Флаги не поддерживаются" -#: parted/ui.c:1267 +#: parted/ui.c:1268 msgid "Can't create any more partitions." msgstr "Больше разделов создать нельзя." -#: parted/ui.c:1277 +#: parted/ui.c:1278 msgid "Expecting a partition type." msgstr "Ожидается тип раздела." -#: parted/ui.c:1426 +#: parted/ui.c:1427 msgid "on" msgstr "вкл" -#: parted/ui.c:1427 +#: parted/ui.c:1428 msgid "off" msgstr "выкл" -#: parted/ui.c:1444 +#: parted/ui.c:1445 msgid "optimal" msgstr "оптимальный" -#: parted/ui.c:1445 +#: parted/ui.c:1446 msgid "minimal" msgstr "минимальный" -#: parted/ui.c:1578 +#: parted/ui.c:1579 msgid "OPTIONs:" msgstr "КЛЮЧИ:" -#: parted/ui.c:1583 +#: parted/ui.c:1584 msgid "COMMANDs:" msgstr "КОМАНДЫ:" -#: parted/ui.c:1586 +#: parted/ui.c:1587 #, c-format msgid "" "\n" @@ -3244,12 +3200,12 @@ msgstr "" "\n" "Об ошибках сообщайте по адресу: %s\n" -#: parted/ui.c:1593 +#: parted/ui.c:1594 #, c-format msgid "Using %s\n" msgstr "Используется %s\n" -#: parted/ui.c:1673 +#: parted/ui.c:1674 msgid "This command does not make sense in non-interactive mode.\n" msgstr "Эта команда ничего не делает в не-интерактивном режиме.\n" @@ -3268,6 +3224,43 @@ msgstr "Эта команда ничего не делает в не-интер #~ msgid "%s home page: \n" #~ msgstr "Домашняя страница %s: \n" +#~ msgid "invalid %s%s argument '%s'" +#~ msgstr "недопустимый аргумент %s%s '%s'" + +#~ msgid "invalid suffix in %s%s argument '%s'" +#~ msgstr "недопустимый суффикс в аргументе %s%s '%s'" + +#~ msgid "%s%s argument '%s' too large" +#~ msgstr "слишком большой аргумент %s%s '%s'" + +#~ msgid "" +#~ "The partition table cannot be re-read. This means you need to reboot " +#~ "before mounting any modified partitions. You also need to reinstall your " +#~ "boot loader before you reboot (which may require mounting modified " +#~ "partitions). It is impossible do both things! So you'll need to boot " +#~ "off a rescue disk, and reinstall your boot loader from the rescue disk. " +#~ "Read section 4 of the Parted User documentation for more information." +#~ msgstr "" +#~ "Невозможно перечитать таблицу разделов. Это означает, что для " +#~ "монтирования любого из изменённых разделов требуется перезагрузка " +#~ "компьютера. Но до перезагрузки ещё требуется переустановить загрузчик (на " +#~ "что может потребоваться монтирование изменённых разделов). Обе эти вещи " +#~ "невозможно сделать одновременно! Поэтому необходимо загрузиться с диска " +#~ "восстановления и переустановить загрузчик с его помощью. Дополнительную " +#~ "информацию можно найти в разделе 4 из руководства пользователя Parted." + +#~ 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 " +#~ "computer before doing anything with %s." +#~ msgstr "" +#~ "Таблица разделов %s не может быть перечитана (%s). Это означает, что " +#~ "сделанные изменения пока недоступны для Hurd. Требуется перезагрузить " +#~ "компьютер перед тем, как что-либо делать с %s." + +#~ msgid "The boot region doesn't start at the start of the partition." +#~ msgstr "Область загрузки не начинается в начале раздела." + #~ 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." @@ -3275,3 +3268,10 @@ msgstr "Эта команда ничего не делает в не-интер #~ "Эта файловая система имеет размер логического сектора %d. Считается, что " #~ "GNU Parted работает неправильно с секторами, размер которых отличен от " #~ "512 байт." + +#~ msgid "" +#~ "The file %s is marked as a system file. This means moving it could cause " +#~ "some programs to stop working." +#~ msgstr "" +#~ "Файл %s помечен как системный. Это значит, что его перемещение может " +#~ "привести к прекращению работы некоторых программ." diff --git a/po/rw.gmo b/po/rw.gmo index 8c801434177676c3c333cdb812bba117790a75f7..f64056b92799050321dd4c41c9b2efa087dd4e95 100644 GIT binary patch delta 152 zcmZ3((abSnN&PHF28NeF%*MdL(8A2XzzU?hfixG8o(QBt;&XsBH;`Toq=ATGJ(S)I zqy>Qd?Le9xNS}bx7l1SikbeV6a{%ePKpJH3GbsNJRQ@Y7P#Z|WFXqi!jNFWy=4N&R6)28NeF%*MdLu$GyDffYz^0n%JRdKZuei5~^h+(7yakOm@#8&LWV zkQM;)9{_1~ApH?a{{+%3Kt3ao-~iHWKpJE&Ka?*Dq=AS*js>U\n" "Language-Team: Kinyarwanda \n" @@ -104,11 +104,11 @@ msgstr "" #. If you don't know what to put here, please see #. #. and use glyphs suitable for your language. -#: lib/quotearg.c:362 +#: lib/quotearg.c:355 msgid "`" msgstr "" -#: lib/quotearg.c:363 +#: lib/quotearg.c:356 msgid "'" msgstr "" @@ -349,78 +349,63 @@ msgstr "" msgid "memory exhausted" msgstr "" -#: lib/xstrtol-error.c:63 -#, c-format -msgid "invalid %s%s argument '%s'" -msgstr "" - -#: lib/xstrtol-error.c:68 -#, c-format -msgid "invalid suffix in %s%s argument '%s'" -msgstr "" - -#: lib/xstrtol-error.c:72 -#, c-format -msgid "%s%s argument '%s' too large" -msgstr "" - -#: libparted/arch/beos.c:245 +#: libparted/arch/beos.c:246 msgid "Disk Image" msgstr "" -#: libparted/arch/beos.c:346 libparted/arch/gnu.c:277 +#: libparted/arch/beos.c:347 libparted/arch/gnu.c:277 #: libparted/arch/linux.c:1731 #, fuzzy, c-format msgid "Error opening %s: %s" msgstr "Hari ikibazo mu gufungura %s%S" -#: libparted/arch/beos.c:357 libparted/arch/gnu.c:287 +#: libparted/arch/beos.c:358 libparted/arch/gnu.c:287 #: libparted/arch/linux.c:1742 #, fuzzy, c-format msgid "Unable to open %s read-write (%s). %s has been opened read-only." msgstr "Kuri Gufungura Gusoma Kwandika Gusoma" -#: libparted/arch/beos.c:419 libparted/arch/linux.c:1907 +#: libparted/arch/beos.c:420 libparted/arch/linux.c:1907 #, fuzzy, c-format msgid "%s during seek for read on %s" msgstr "%skugirango Gusoma ku" -#: libparted/arch/beos.c:452 libparted/arch/gnu.c:465 libparted/arch/gnu.c:564 -#: libparted/arch/gnu.c:692 libparted/arch/linux.c:1867 +#: libparted/arch/beos.c:453 libparted/arch/gnu.c:425 libparted/arch/gnu.c:524 +#: libparted/arch/gnu.c:652 libparted/arch/linux.c:1867 #: libparted/arch/linux.c:1949 #, fuzzy, c-format msgid "%s during read on %s" msgstr "%sGusoma ku" -#: libparted/arch/beos.c:488 libparted/arch/gnu.c:525 +#: libparted/arch/beos.c:489 libparted/arch/gnu.c:485 #: libparted/arch/linux.c:2026 #, fuzzy, c-format msgid "Can't write to %s, because it is opened read-only." msgstr "Kwandika Kuri ni Gusoma" -#: libparted/arch/beos.c:504 libparted/arch/linux.c:2051 +#: libparted/arch/beos.c:505 libparted/arch/linux.c:2051 #, fuzzy, c-format msgid "%s during seek for write on %s" msgstr "%skugirango Kwandika ku" -#: libparted/arch/beos.c:541 libparted/arch/gnu.c:601 libparted/arch/gnu.c:646 -#: libparted/arch/gnu.c:723 libparted/arch/linux.c:1999 +#: libparted/arch/beos.c:542 libparted/arch/gnu.c:561 libparted/arch/gnu.c:606 +#: libparted/arch/gnu.c:683 libparted/arch/linux.c:1999 #: libparted/arch/linux.c:2094 libparted/arch/linux.c:2167 #, fuzzy, c-format msgid "%s during write on %s" msgstr "%sKwandika ku" -#: partprobe/partprobe.c:148 +#: partprobe/partprobe.c:149 #, c-format msgid "Try `%s --help' for more information.\n" msgstr "" -#: partprobe/partprobe.c:152 +#: partprobe/partprobe.c:153 #, c-format msgid "Usage: %s [OPTION] [DEVICE]...\n" msgstr "" -#: partprobe/partprobe.c:153 +#: partprobe/partprobe.c:154 msgid "" "Inform the operating system about partition table changes.\n" "\n" @@ -430,13 +415,13 @@ msgid "" " -v, --version output version information and exit\n" msgstr "" -#: partprobe/partprobe.c:161 +#: partprobe/partprobe.c:162 msgid "" "\n" "When no DEVICE is given, probe all partitions.\n" msgstr "" -#: partprobe/partprobe.c:165 +#: partprobe/partprobe.c:166 #, c-format msgid "" "\n" @@ -453,36 +438,7 @@ msgstr "Kuri Gufungura" msgid "Unable to probe store." msgstr "Kuri" -#: libparted/arch/gnu.c:368 -#, fuzzy -msgid "" -"The partition table cannot be re-read. This means you need to reboot before " -"mounting any modified partitions. You also need to reinstall your boot " -"loader before you reboot (which may require mounting modified partitions). " -"It is impossible do both things! So you'll need to boot off a rescue disk, " -"and reinstall your boot loader from the rescue disk. Read section 4 of the " -"Parted User documentation for more information." -msgstr "" -"imbonerahamwe# Kuri Nka Kuri Mbere Byahinduwe Kuri Mbere Gicurasi Byahinduwe " -"ni Byombi Kuri Bidakora a Na Bivuye i Icyiciro 4. Bya i kugirango Birenzeho " -"Ibisobanuro" - -#: libparted/arch/gnu.c:385 -#, fuzzy, 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 computer " -"before doing anything with %s." -msgstr "imbonerahamwe# ku i Ibyerekeye Mbere Na:" - -#: libparted/arch/gnu.c:396 parted/parted.c:2318 -#, 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" - -#: libparted/arch/gnu.c:788 +#: libparted/arch/gnu.c:748 #, fuzzy, c-format msgid "%s trying to sync %s to disk" msgstr "%sKuri Kuri" @@ -791,7 +747,7 @@ msgid "free" msgstr "Kigenga" # 2175 -#: libparted/disk.c:2355 parted/ui.c:1258 parted/ui.c:1286 +#: libparted/disk.c:2355 parted/ui.c:1259 parted/ui.c:1287 #, fuzzy msgid "extended" msgstr "cya/ byagutse" @@ -800,12 +756,12 @@ 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:1262 parted/ui.c:1290 +#: libparted/disk.c:2357 parted/ui.c:1263 parted/ui.c:1291 #, fuzzy msgid "logical" msgstr "Bijyanye n'inyurabwenge" -#: libparted/disk.c:2359 parted/ui.c:1254 parted/ui.c:1282 +#: libparted/disk.c:2359 parted/ui.c:1255 parted/ui.c:1283 msgid "primary" msgstr "" @@ -886,64 +842,72 @@ msgstr "" msgid "esp" msgstr "Yego" -#: libparted/disk.c:2415 +#: libparted/disk.c:2411 +msgid "chromeos_kernel" +msgstr "" + +#: libparted/disk.c:2413 +msgid "bls_boot" +msgstr "" + +#: libparted/disk.c:2419 #, fuzzy, c-format msgid "Unknown partition flag, %d." msgstr "Ibendera Ibendera" -#: libparted/exception.c:78 +#: libparted/exception.c:79 msgid "Information" msgstr "Ibisobanuro" -#: libparted/exception.c:79 +#: libparted/exception.c:80 msgid "Warning" msgstr "Iburira" -#: libparted/exception.c:80 +#: libparted/exception.c:81 msgid "Error" msgstr "Ikosa" -#: libparted/exception.c:81 +#: libparted/exception.c:82 msgid "Fatal" msgstr "" -#: libparted/exception.c:82 +#: libparted/exception.c:83 msgid "Bug" msgstr "" -#: libparted/exception.c:83 +#: libparted/exception.c:84 msgid "No Implementation" msgstr "" -#: libparted/exception.c:87 +#: libparted/exception.c:88 msgid "Fix" msgstr "" -#: libparted/exception.c:88 +#: libparted/exception.c:89 msgid "Yes" msgstr "Yego" -#: libparted/exception.c:89 +#: libparted/exception.c:90 msgid "No" msgstr "Oya" -#: libparted/exception.c:90 +#: libparted/exception.c:91 msgid "OK" msgstr "OKE" -#: libparted/exception.c:91 +#: libparted/exception.c:92 msgid "Retry" msgstr "Ongera ugerageze" -#: libparted/exception.c:92 +#: libparted/exception.c:93 msgid "Ignore" msgstr "Kureka" -#: libparted/exception.c:93 +#: libparted/exception.c:94 msgid "Cancel" msgstr "Kureka" -#: libparted/exception.c:133 +#: libparted/exception.c:134 #, c-format msgid "" "A bug has been detected in GNU Parted. Refer to the web site of parted " @@ -952,36 +916,36 @@ msgid "" "containing at least the version (%s) and the following message: " msgstr "" -#: libparted/labels/aix.c:91 +#: libparted/labels/aix.c:92 #, fuzzy msgid "Support for reading AIX disk labels is is not implemented yet." msgstr "kugirango IDOSIYE ni OYA" -#: libparted/labels/aix.c:102 +#: libparted/labels/aix.c:103 #, fuzzy msgid "Support for writing AIX disk labels is is not implemented yet." msgstr "kugirango IDOSIYE ni OYA" -#: libparted/labels/aix.c:115 +#: libparted/labels/aix.c:116 #, fuzzy msgid "" "Support for adding partitions to AIX disk labels is not implemented yet." msgstr "kugirango IDOSIYE ni OYA" -#: libparted/labels/aix.c:125 +#: libparted/labels/aix.c:126 #, fuzzy msgid "" "Support for duplicating partitions in AIX disk labels is not implemented yet." msgstr "kugirango IDOSIYE ni OYA" -#: libparted/labels/aix.c:143 +#: libparted/labels/aix.c:144 #, fuzzy msgid "" "Support for setting system type of partitions in AIX disk labels is not " "implemented yet." msgstr "kugirango IDOSIYE ni OYA" -#: libparted/labels/aix.c:153 +#: libparted/labels/aix.c:154 #, fuzzy msgid "Support for setting flags in AIX disk labels is not implemented yet." msgstr "kugirango IDOSIYE ni OYA" @@ -1070,11 +1034,11 @@ msgid "" "partitions, if XGM is the first one it counts for two)." msgstr "" -#: libparted/labels/atari.c:1657 libparted/labels/bsd.c:567 -#: libparted/labels/dasd.c:894 libparted/labels/dos.c:2276 -#: libparted/labels/dvh.c:770 libparted/labels/gpt.c:2050 -#: libparted/labels/loop.c:243 libparted/labels/mac.c:1423 -#: libparted/labels/pc98.c:701 libparted/labels/rdb.c:1054 +#: libparted/labels/atari.c:1657 libparted/labels/bsd.c:563 +#: libparted/labels/dasd.c:895 libparted/labels/dos.c:2283 +#: libparted/labels/dvh.c:770 libparted/labels/gpt.c:2140 +#: 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 #, fuzzy msgid "Unable to satisfy all constraints on the partition." @@ -1092,44 +1056,44 @@ msgstr "" msgid "Unable to allocate a partition number." msgstr "a Umubare" -#: libparted/labels/bsd.c:592 +#: libparted/labels/bsd.c:588 #, fuzzy msgid "Unable to allocate a bsd disklabel slot." msgstr "Kuri a" -#: libparted/labels/dasd.c:625 +#: libparted/labels/dasd.c:626 msgid "The partition table of DASD-LDL device cannot be changed.\n" msgstr "" -#: libparted/labels/dasd.c:920 +#: libparted/labels/dasd.c:921 #, fuzzy msgid "Unable to allocate a dasd disklabel slot" msgstr "Kuri a" -#: libparted/labels/dos.c:1003 +#: libparted/labels/dos.c:1006 #, fuzzy, c-format msgid "Invalid partition table on %s -- wrong signature %x." msgstr "imbonerahamwe# ku Isinya" -#: libparted/labels/dos.c:1031 +#: libparted/labels/dos.c:1034 #, fuzzy, c-format msgid "Invalid partition table - recursive partition on %s." msgstr "imbonerahamwe# ku" -#: libparted/labels/dos.c:1560 +#: libparted/labels/dos.c:1557 msgid "Extended partitions cannot be hidden on msdos disk labels." msgstr "" -#: libparted/labels/dos.c:1572 +#: libparted/labels/dos.c:1569 #, fuzzy msgid "Extended partitions cannot be recovery partitions on msdos disk labels." msgstr "imbonerahamwe# ku" -#: libparted/labels/dos.c:2258 +#: libparted/labels/dos.c:2265 msgid "Parted can't resize partitions managed by Windows Dynamic Disk." msgstr "" -#: libparted/labels/dos.c:2514 +#: libparted/labels/dos.c:2521 #, fuzzy msgid "cannot create any more partitions" msgstr "Kurema Birenzeho" @@ -1275,19 +1239,19 @@ msgstr "" msgid "Disk geometry does not match a DASD device of type 3390." msgstr "" -#: libparted/labels/gpt.c:531 +#: libparted/labels/gpt.c:541 #, fuzzy msgid "device is too small for GPT" msgstr "Idosiye Sisitemu Gitoya kugirango" -#: libparted/labels/gpt.c:733 +#: libparted/labels/gpt.c:743 #, 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:769 +#: libparted/labels/gpt.c:779 #, c-format msgid "" "Not all of the space available to %s appears to be used, you can fix the GPT " @@ -1295,7 +1259,7 @@ msgid "" "setting? " msgstr "" -#: libparted/labels/gpt.c:1008 +#: libparted/labels/gpt.c:1024 #, fuzzy msgid "" "The backup GPT table is not at the end of the disk, as it should be. Fix, " @@ -1304,32 +1268,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:1026 +#: libparted/labels/gpt.c:1042 #, 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:1037 +#: libparted/labels/gpt.c:1053 #, 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:1049 +#: libparted/labels/gpt.c:1065 #, 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:1073 +#: libparted/labels/gpt.c:1089 msgid "primary partition table array CRC mismatch" msgstr "" -#: libparted/labels/gpt.c:1936 libparted/labels/gpt.c:1963 +#: libparted/labels/gpt.c:2026 libparted/labels/gpt.c:2053 #, fuzzy msgid "failed to translate partition name" msgstr "Umubare" @@ -1366,74 +1330,69 @@ msgstr "Ibyatanzwe Gutangira ku i Gutangira Bya i" #: libparted/labels/mac.c:572 #, fuzzy -msgid "The boot region doesn't start at the start of the partition." -msgstr "Gutangira ku i Gutangira Bya i" - -#: libparted/labels/mac.c:586 -#, fuzzy msgid "The partition's boot region doesn't occupy the entire partition." msgstr "i" -#: libparted/labels/mac.c:597 +#: libparted/labels/mac.c:583 #, fuzzy msgid "The partition's data region doesn't occupy the entire partition." msgstr "Ibyatanzwe i" -#: libparted/labels/mac.c:649 +#: libparted/labels/mac.c:635 #, fuzzy, c-format msgid "" "Weird block size on device descriptor: %d bytes is not divisible by 512." msgstr "Funga Ingano ku APAREYE Bayite ni OYA ku" -#: libparted/labels/mac.c:662 +#: libparted/labels/mac.c:648 #, fuzzy, c-format msgid "" "The driver descriptor says the physical block size is %d bytes, but Linux " "says it is %d bytes." msgstr "Musomyi: i Ifatika Funga Ingano ni Bayite ni Bayite" -#: libparted/labels/mac.c:715 +#: libparted/labels/mac.c:701 #, fuzzy msgid "No valid partition map found." msgstr "Byemewe Byabonetse" -#: libparted/labels/mac.c:789 +#: libparted/labels/mac.c:775 #, fuzzy, c-format msgid "" "Conflicting partition map entry sizes! Entry 1 says it is %d, but entry %d " "says it is %d!" msgstr "Icyinjijwe 1. Icyinjijwe" -#: libparted/labels/mac.c:820 +#: libparted/labels/mac.c:806 #, fuzzy msgid "Weird! There are 2 partitions map entries!" msgstr "2. Ibyinjijwe" -#: libparted/labels/mac.c:1359 +#: libparted/labels/mac.c:1345 #, fuzzy msgid "" "Changing the name of a root or swap partition will prevent Linux from " "recognising it as such." msgstr "i Izina: Bya a Imizi Cyangwa Bivuye Nka" -#: libparted/labels/mac.c:1458 +#: libparted/labels/mac.c:1444 #, fuzzy msgid "Can't add another partition -- the partition map is too small!" msgstr "Kongeramo ni Gitoya" -#: libparted/labels/pc98.c:284 +#: libparted/labels/pc98.c:285 #, fuzzy, c-format msgid "Invalid partition table on %s." msgstr "imbonerahamwe# ku" -#: libparted/labels/pc98.c:337 libparted/labels/pc98.c:415 +#: libparted/labels/pc98.c:338 libparted/labels/pc98.c:416 #, fuzzy, c-format msgid "" "Partition %d isn't aligned to cylinder boundaries. This is still " "unsupported." msgstr "si Kuri Umwiburungushure Kuri Kongeramo Gushigikira kugirango iyi" -#: libparted/labels/pc98.c:733 +#: libparted/labels/pc98.c:729 #, fuzzy msgid "Can't add another partition." msgstr "Kongeramo" @@ -1606,40 +1565,40 @@ msgstr "" msgid "Could not write VTOC FMT9 DSCB." msgstr "" -#: libparted/libparted.c:242 +#: libparted/libparted.c:247 #, fuzzy msgid "Out of memory." msgstr "Ububiko bwarenzwe" -#: libparted/unit.c:139 +#: libparted/unit.c:140 msgid "Cannot get unit size for special unit 'COMPACT'." msgstr "" -#: libparted/unit.c:385 +#: libparted/unit.c:386 #, c-format msgid "\"%s\" has invalid syntax for locations." msgstr "" -#: libparted/unit.c:393 +#: libparted/unit.c:394 #, c-format msgid "The maximum head value is %d." msgstr "" -#: libparted/unit.c:400 +#: libparted/unit.c:401 #, c-format msgid "The maximum sector value is %d." msgstr "" -#: libparted/unit.c:412 libparted/unit.c:564 +#: libparted/unit.c:413 libparted/unit.c:565 #, c-format msgid "The location %s is outside of the device %s." msgstr "" -#: libparted/unit.c:526 +#: libparted/unit.c:527 msgid "Invalid number." msgstr "" -#: libparted/unit.c:532 +#: libparted/unit.c:533 msgid "Use a smaller unit instead of a value < 1" msgstr "" @@ -1649,18 +1608,18 @@ msgstr "" msgid "%s : Failed to allocate partition block\n" msgstr "" -#: libparted/fs/amiga/affs.c:79 libparted/fs/amiga/apfs.c:71 +#: 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 "" -#: libparted/fs/amiga/affs.c:84 libparted/fs/amiga/apfs.c:76 +#: libparted/fs/amiga/affs.c:83 libparted/fs/amiga/apfs.c:76 #, c-format msgid "%s : Couldn't read boot block %llu\n" msgstr "" -#: libparted/fs/amiga/affs.c:98 libparted/fs/amiga/apfs.c:87 +#: 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" @@ -1686,22 +1645,22 @@ msgstr "" msgid "%s : Couldn't write block %d\n" msgstr "%sKwandika ku" -#: libparted/fs/amiga/amiga.c:278 +#: libparted/fs/amiga/amiga.c:279 #, c-format msgid "%s : Failed to allocate disk_specific rdb block\n" msgstr "" -#: libparted/fs/amiga/amiga.c:289 +#: libparted/fs/amiga/amiga.c:290 #, c-format msgid "%s : Didn't find rdb block, should never happen\n" msgstr "" -#: libparted/fs/amiga/amiga.c:318 +#: libparted/fs/amiga/amiga.c:319 #, c-format msgid "%s : Failed to read partition block %llu\n" msgstr "" -#: libparted/fs/fat/fat.c:148 libparted/fs/r/fat/fat.c:811 +#: libparted/fs/fat/fat.c:149 #, fuzzy msgid "" "GNU Parted was miscompiled: the FAT boot sector should be 512 bytes. FAT " @@ -1793,7 +1752,7 @@ msgid "" "geometry." msgstr "" -#: libparted/fs/r/fat/bootsector.c:399 +#: libparted/fs/r/fat/bootsector.c:398 #, fuzzy, c-format msgid "" "The information sector has the wrong signature (%x). Select cancel for now, " @@ -1815,50 +1774,42 @@ msgid "" "Cluster start delta = %d, which is not a multiple of the cluster size %d." msgstr "Gutangira DELTA ni OYA a Igikubo Bya i Ingano" -#: libparted/fs/r/fat/count.c:144 +#: libparted/fs/r/fat/count.c:84 #, fuzzy, c-format msgid "Bad directory entry for %s: first cluster is the end of file marker." msgstr "bushyinguro Icyinjijwe kugirango Itangira ni i Impera Bya IDOSIYE" -#: libparted/fs/r/fat/count.c:157 +#: libparted/fs/r/fat/count.c:97 #, fuzzy, c-format msgid "" "Bad FAT: unterminated chain for %s. You should run dosfsck or scandisk." msgstr "kugirango Gukoresha Cyangwa" -#: libparted/fs/r/fat/count.c:166 +#: libparted/fs/r/fat/count.c:106 #, fuzzy, c-format msgid "" "Bad FAT: cluster %d outside file system in chain for %s. You should run " "dosfsck or scandisk." msgstr "Hanze in kugirango Gukoresha Cyangwa" -#: libparted/fs/r/fat/count.c:176 +#: libparted/fs/r/fat/count.c:116 #, fuzzy, c-format msgid "" "Bad FAT: cluster %d is cross-linked for %s. You should run dosfsck or " "scandisk." msgstr "ni Kwambukiranya kugirango Gukoresha Cyangwa" -#: libparted/fs/r/fat/count.c:195 +#: libparted/fs/r/fat/count.c:135 #, fuzzy, c-format msgid "%s is %dk, but it has %d clusters (%dk)." msgstr "%sni" -#: libparted/fs/r/fat/count.c:258 -#, fuzzy, c-format -msgid "" -"The file %s is marked as a system file. This means moving it could cause " -"some programs to stop working." -msgstr "" -"IDOSIYE ni cy/ byagarajwe Nka a Sisitemu IDOSIYE Porogaramu Kuri Guhagarara" - -#: libparted/fs/r/fat/fat.c:243 +#: libparted/fs/r/fat/fat.c:244 #, fuzzy, c-format msgid "Partition too big/small for a %s file system." msgstr "Gitoya kugirango a IDOSIYE Sisitemu" -#: libparted/fs/r/fat/fat.c:409 +#: libparted/fs/r/fat/fat.c:410 #, fuzzy msgid "" "The FATs don't match. If you don't know what this means, then select " @@ -1867,12 +1818,12 @@ msgstr "" "BIHUYE iyi Hanyuma Guhitamo Kureka Gukoresha ku i IDOSIYE Sisitemu Na " "Hanyuma Inyuma" -#: libparted/fs/r/fat/fat.c:449 +#: libparted/fs/r/fat/fat.c:450 #, fuzzy msgid "There are no possible configurations for this FAT type." msgstr "Oya Amaboneza kugirango iyi Ubwoko" -#: libparted/fs/r/fat/fat.c:461 +#: libparted/fs/r/fat/fat.c:462 #, fuzzy, c-format msgid "" "File system doesn't have expected sizes for Windows to like it. Cluster " @@ -1882,13 +1833,13 @@ msgstr "" "Idosiye Sisitemu Ikitezwe: kugirango Kuri nka Ingano ni Ikitezwe: Umubare " "Bya ni Ikitezwe: Ingano Bya ni Ikitezwe:" -#: libparted/fs/r/fat/fat.c:484 +#: libparted/fs/r/fat/fat.c:485 #, fuzzy, c-format msgid "" "File system is reporting the free space as %d clusters, not %d clusters." msgstr "Idosiye Sisitemu ni i Kigenga Umwanya Nka OYA" -#: libparted/fs/r/fat/resize.c:158 +#: libparted/fs/r/fat/resize.c:159 #, fuzzy msgid "" "There's not enough room in the root directory for all of the files. Either " @@ -1897,17 +1848,17 @@ msgstr "" "OYA in i Imizi bushyinguro kugirango Byose Bya i Idosiye Kureka Cyangwa " "Kwirengagiza Kuri i Idosiye" -#: libparted/fs/r/fat/resize.c:302 +#: libparted/fs/r/fat/resize.c:303 #, fuzzy msgid "Error writing to the root directory." msgstr "Kuri i Imizi bushyinguro" -#: libparted/fs/r/fat/resize.c:495 +#: libparted/fs/r/fat/resize.c:479 #, fuzzy msgid "If you leave your file system as FAT16, then you will have no problems." msgstr "IDOSIYE Sisitemu Nka Hanyuma Oya" -#: libparted/fs/r/fat/resize.c:498 +#: libparted/fs/r/fat/resize.c:482 #, fuzzy msgid "" "If you convert to FAT16, and MS Windows is installed on this partition, then " @@ -1917,14 +1868,14 @@ msgstr "" "GUHINDURA Kuri Na ni ku iyi Hanyuma Kwinjiza porogaramu i Kuri iyi i Bikorwa " "Cyangwa Bikorwa" -#: libparted/fs/r/fat/resize.c:506 +#: libparted/fs/r/fat/resize.c:490 #, fuzzy msgid "" "If you leave your file system as FAT32, then you will not introduce any new " "problems." msgstr "IDOSIYE Sisitemu Nka Hanyuma OYA Gishya" -#: libparted/fs/r/fat/resize.c:510 +#: libparted/fs/r/fat/resize.c:494 #, fuzzy msgid "" "If you convert to FAT32, and MS Windows is installed on this partition, then " @@ -1937,12 +1888,12 @@ msgstr "" "Cyangwa Bikorwa Guhindura.... Kuri Ubwoko i IDOSIYE Sisitemu ku Na" # desktop/source\app\ssodlg.src:DLG_SSOLOGIN.text -#: libparted/fs/r/fat/resize.c:524 +#: libparted/fs/r/fat/resize.c:508 #, fuzzy, c-format msgid "%s %s %s" msgstr "%s%s%s" -#: libparted/fs/r/fat/resize.c:525 +#: libparted/fs/r/fat/resize.c:509 #, fuzzy msgid "Would you like to use FAT32?" msgstr "nka Kuri Gukoresha" @@ -1950,74 +1901,74 @@ msgstr "nka Kuri Gukoresha" # #-#-#-#-# dbaccess.pot (PACKAGE VERSION) #-#-#-#-# # #-#-#-#-# dbaccess.pot (PACKAGE VERSION) #-#-#-#-# # #-#-#-#-# dbaccess.pot (PACKAGE VERSION) #-#-#-#-# -#: libparted/fs/r/fat/resize.c:556 libparted/fs/r/fat/resize.c:572 +#: libparted/fs/r/fat/resize.c:540 libparted/fs/r/fat/resize.c:556 #, fuzzy, c-format msgid "%s %s" msgstr "%s%s" -#: libparted/fs/r/fat/resize.c:557 +#: libparted/fs/r/fat/resize.c:541 #, fuzzy msgid "" "The file system can only be resized to this size by converting to FAT16." msgstr "IDOSIYE Sisitemu Kuri iyi Ingano ku Guhindura.... Kuri" -#: libparted/fs/r/fat/resize.c:573 +#: libparted/fs/r/fat/resize.c:557 #, fuzzy msgid "" "The file system can only be resized to this size by converting to FAT32." msgstr "IDOSIYE Sisitemu Kuri iyi Ingano ku Guhindura.... Kuri" -#: libparted/fs/r/fat/resize.c:586 +#: libparted/fs/r/fat/resize.c:570 #, fuzzy msgid "" "GNU Parted cannot resize this partition to this size. We're working on it!" msgstr "OYA Ihindurangero iyi Kuri iyi Ingano ku" -#: libparted/fs/r/fat/table.c:136 +#: libparted/fs/r/fat/table.c:137 #, fuzzy, c-format msgid "" "FAT %d media %x doesn't match the boot sector's media %x. You should " "probably run scandisk." msgstr "Ibitangazamakuru BIHUYE i Ibitangazamakuru Gukoresha" -#: libparted/fs/r/fat/table.c:268 +#: libparted/fs/r/fat/table.c:269 #, fuzzy, c-format msgid "fat_table_set: cluster %ld outside file system" msgstr "Hanze" -#: libparted/fs/r/fat/table.c:300 +#: libparted/fs/r/fat/table.c:301 #, fuzzy, c-format msgid "fat_table_get: cluster %ld outside file system" msgstr "Hanze" -#: libparted/fs/r/fat/table.c:342 +#: libparted/fs/r/fat/table.c:343 #, fuzzy msgid "fat_table_alloc_cluster: no free clusters" msgstr "Oya Kigenga" -#: libparted/fs/r/filesys.c:151 +#: libparted/fs/r/filesys.c:152 #, fuzzy msgid "Could not detect file system." msgstr "OYA IDOSIYE Sisitemu" -#: libparted/fs/r/filesys.c:158 libparted/fs/r/filesys.c:285 +#: libparted/fs/r/filesys.c:159 libparted/fs/r/filesys.c:284 #, fuzzy, c-format msgid "resizing %s file systems is not supported" msgstr "kugirango IDOSIYE ni OYA" -#: libparted/fs/r/filesys.c:170 +#: libparted/fs/r/filesys.c:171 #, fuzzy msgid "The file system is bigger than its volume!" msgstr "IDOSIYE Sisitemu ni Igice" -#: libparted/fs/r/hfs/advfs.c:121 libparted/fs/r/hfs/advfs_plus.c:121 -#: libparted/fs/r/hfs/reloc.c:413 libparted/fs/r/hfs/reloc.c:507 -#: libparted/fs/r/hfs/reloc_plus.c:538 libparted/fs/r/hfs/reloc_plus.c:656 -#: libparted/fs/r/hfs/reloc_plus.c:769 +#: 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:285 +#: libparted/fs/r/hfs/advfs_plus.c:287 msgid "Bad blocks could not be read." msgstr "" @@ -2075,89 +2026,89 @@ msgstr "" msgid "Trying to write HFS+ file with CNID %X behind EOF." msgstr "" -#: libparted/fs/r/hfs/hfs.c:232 +#: libparted/fs/r/hfs/hfs.c:212 msgid "Sorry, HFS cannot be resized that way yet." msgstr "" -#: libparted/fs/r/hfs/hfs.c:250 libparted/fs/r/hfs/hfs.c:629 +#: libparted/fs/r/hfs/hfs.c:230 libparted/fs/r/hfs/hfs.c:573 msgid "shrinking" msgstr "" -#: libparted/fs/r/hfs/hfs.c:262 libparted/fs/r/hfs/hfs.c:641 +#: 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:281 +#: 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:320 +#: libparted/fs/r/hfs/hfs.c:300 #, fuzzy msgid "writing HFS Master Directory Block" msgstr "Kuri i Imizi bushyinguro" -#: libparted/fs/r/hfs/hfs.c:468 +#: 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:478 +#: libparted/fs/r/hfs/hfs.c:422 #, c-format msgid "Version %d of HFS+ isn't supported." msgstr "" -#: libparted/fs/r/hfs/hfs.c:489 +#: libparted/fs/r/hfs/hfs.c:433 #, c-format msgid "Version %d of HFSX isn't supported." msgstr "" -#: libparted/fs/r/hfs/hfs.c:672 +#: 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:720 +#: libparted/fs/r/hfs/hfs.c:664 #, fuzzy msgid "Error while writing the allocation file." msgstr "Kuri i Imizi bushyinguro" -#: libparted/fs/r/hfs/hfs.c:735 +#: 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:750 +#: libparted/fs/r/hfs/hfs.c:694 msgid "writing HFS+ Volume Header" msgstr "" -#: libparted/fs/r/hfs/hfs.c:850 +#: 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:904 +#: 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:940 +#: libparted/fs/r/hfs/hfs.c:883 msgid "Sorry, HFS+ cannot be resized that way yet." msgstr "" -#: libparted/fs/r/hfs/hfs.c:975 +#: libparted/fs/r/hfs/hfs.c:918 msgid "shrinking embedded HFS+ volume" msgstr "" -#: libparted/fs/r/hfs/hfs.c:992 +#: libparted/fs/r/hfs/hfs.c:935 msgid "Resizing the HFS+ volume has failed." msgstr "" -#: libparted/fs/r/hfs/hfs.c:999 +#: libparted/fs/r/hfs/hfs.c:942 msgid "shrinking HFS wrapper" msgstr "" -#: libparted/fs/r/hfs/hfs.c:1008 +#: libparted/fs/r/hfs/hfs.c:951 msgid "Updating the HFS wrapper has failed." msgstr "" -#: libparted/fs/r/hfs/hfs.c:1110 libparted/fs/r/hfs/hfs.c:1195 +#: 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 " @@ -2224,76 +2175,76 @@ msgstr "" msgid "An extent has not been relocated." msgstr "" -#: libparted/fs/r/hfs/reloc.c:250 libparted/fs/r/hfs/reloc_plus.c:307 +#: 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:380 +#: 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:474 +#: 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:516 libparted/fs/r/hfs/reloc_plus.c:666 +#: 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:573 libparted/fs/r/hfs/reloc_plus.c:844 +#: libparted/fs/r/hfs/reloc.c:579 libparted/fs/r/hfs/reloc_plus.c:849 #, fuzzy msgid "Could not cache the file system in memory." msgstr "OYA IDOSIYE Sisitemu" -#: libparted/fs/r/hfs/reloc.c:634 libparted/fs/r/hfs/reloc_plus.c:905 +#: 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:648 libparted/fs/r/hfs/reloc_plus.c:921 +#: 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:494 +#: 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:617 +#: 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:125 +#: parted/parted.c:126 #, fuzzy msgid "displays this help message" msgstr "iyi Ifashayobora Ubutumwa" -#: parted/parted.c:126 +#: parted/parted.c:127 msgid "lists partition layout on all block devices" msgstr "" -#: parted/parted.c:127 +#: parted/parted.c:128 msgid "displays machine parseable output" msgstr "" -#: parted/parted.c:128 +#: parted/parted.c:129 #, fuzzy msgid "never prompts for user intervention" msgstr "Nta narimwe kugirango Ukoresha:" -#: parted/parted.c:129 +#: parted/parted.c:130 #, fuzzy msgid "displays the version" msgstr "i Verisiyo" -#: parted/parted.c:130 +#: parted/parted.c:131 #, fuzzy msgid "alignment for new partitions" msgstr "Gukoporora Byongerewe..." -#: parted/parted.c:142 +#: parted/parted.c:143 #, fuzzy msgid "" "NUMBER is the partition number used by Linux. On MS-DOS disk labels, the " @@ -2302,36 +2253,36 @@ msgstr "" "ni i Umubare ku Uturango... i Umubare Bivuye 1. 4. Na Bijyanye " "n'inyurabwenge 5" -#: parted/parted.c:145 +#: parted/parted.c:146 #, fuzzy msgid "LABEL-TYPE is one of: " msgstr "ni Bya" -#: parted/parted.c:146 parted/parted.c:147 +#: parted/parted.c:147 parted/parted.c:148 #, fuzzy msgid "FLAG is one of: " msgstr "ni Bya" -#: parted/parted.c:148 +#: parted/parted.c:149 #, fuzzy msgid "UNIT is one of: " msgstr "ni Bya" -#: parted/parted.c:149 +#: parted/parted.c:150 msgid "desired alignment: minimum or optimal" msgstr "" -#: parted/parted.c:150 +#: parted/parted.c:151 #, fuzzy msgid "PART-TYPE is one of: primary, logical, extended\n" msgstr "ni Bya Bijyanye n'inyurabwenge" -#: parted/parted.c:152 +#: parted/parted.c:153 #, fuzzy msgid "FS-TYPE is one of: " msgstr "ni Bya" -#: parted/parted.c:153 +#: parted/parted.c:154 #, fuzzy msgid "" "START and END are disk locations, such as 4GB or 10%. Negative values count " @@ -2339,28 +2290,28 @@ msgid "" "sector.\n" msgstr "Na in Uduciro IBARA Bivuye i Impera Bya i" -#: parted/parted.c:156 +#: parted/parted.c:157 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:159 +#: parted/parted.c:160 #, fuzzy msgid "STATE is one of: on, off\n" msgstr "ni Bya ku" -#: parted/parted.c:160 +#: parted/parted.c:161 #, fuzzy msgid "DEVICE is usually /dev/hda or /dev/sda\n" msgstr "ni Cyangwa" -#: parted/parted.c:161 +#: parted/parted.c:162 #, fuzzy msgid "NAME is any word you want\n" msgstr "ni ijambo" -#: parted/parted.c:164 +#: parted/parted.c:165 #, fuzzy msgid "" "Copyright (C) 1998 - 2006 Free Software Foundation, Inc.\n" @@ -2375,7 +2326,7 @@ msgstr "" "C Porogaramu ni Kigenga ku i Porogaramu ni in i ATARIIGIHARWE i Bya Cyangwa " "A i kugirango Birenzeho Birambuye" -#: parted/parted.c:212 +#: parted/parted.c:213 #, fuzzy, c-format msgid "%0.f%%\t(time left %.2d:%.2d)" msgstr "" @@ -2388,39 +2339,39 @@ msgstr "" "X- Generator: KBabel 1. 0\n" ". 2D." -#: parted/parted.c:231 +#: parted/parted.c:232 #, fuzzy, c-format msgid "Partition %s is being used. Are you sure you want to continue?" msgstr "ni ni in Gukoresha" -#: parted/parted.c:252 +#: parted/parted.c:253 #, fuzzy, c-format msgid "Partition(s) on %s are being used." msgstr "S ku" -#: parted/parted.c:264 +#: parted/parted.c:265 #, 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:525 +#: parted/parted.c:526 #, fuzzy msgid "New disk label type?" msgstr "Akarango Ubwoko" -#: parted/parted.c:662 +#: parted/parted.c:663 #, fuzzy msgid "Partition type?" msgstr "Ubwoko" -#: parted/parted.c:680 parted/parted.c:884 +#: parted/parted.c:681 parted/parted.c:885 #, fuzzy msgid "Partition name?" msgstr "Izina:" -#: parted/parted.c:690 +#: parted/parted.c:691 #, fuzzy msgid "File system type?" msgstr "Idosiye Sisitemu Ubwoko" @@ -2433,82 +2384,82 @@ 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:695 parted/parted.c:1498 +#: parted/parted.c:696 parted/parted.c:1499 #, fuzzy msgid "Start?" msgstr "Gutangira" # officecfg/registry\schema\org\openoffice\Office\DataAccess.xcs:....FormSearchOptions.SearchPosition..end-of-field.text -#: parted/parted.c:698 parted/parted.c:1500 parted/parted.c:1569 +#: parted/parted.c:699 parted/parted.c:1501 parted/parted.c:1585 #, fuzzy msgid "End?" msgstr "Impera" -#: parted/parted.c:766 +#: parted/parted.c:767 #, 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:775 +#: parted/parted.c:776 msgid "" "\n" "Is this still acceptable to you?" msgstr "" -#: parted/parted.c:798 +#: parted/parted.c:799 #, c-format msgid "" "The resulting partition is not properly aligned for best performance: %s" msgstr "" -#: parted/parted.c:800 parted/parted.c:1723 +#: parted/parted.c:801 parted/parted.c:1739 msgid "unknown (malloc failed)" msgstr "" -#: parted/parted.c:876 +#: parted/parted.c:877 #, fuzzy, c-format msgid "%s disk labels do not support partition name." msgstr "%sUturango... OYA Gushigikira Byongerewe..." -#: parted/parted.c:881 parted/parted.c:1561 parted/parted.c:1612 -#: parted/parted.c:1706 parted/parted.c:1781 +#: parted/parted.c:882 parted/parted.c:1564 parted/parted.c:1628 +#: parted/parted.c:1722 parted/parted.c:1797 #, fuzzy msgid "Partition number?" msgstr "Umubare" -#: parted/parted.c:975 +#: parted/parted.c:976 #, c-format msgid "BIOS cylinder,head,sector geometry: %d,%d,%d. Each cylinder is %s.\n" msgstr "" -#: parted/parted.c:1017 +#: parted/parted.c:1018 #, c-format msgid "Model: %s (%s)\n" msgstr "" -#: parted/parted.c:1019 +#: parted/parted.c:1020 #, fuzzy, c-format msgid "Disk %s: %s\n" msgstr "Akarango Ubwoko" -#: parted/parted.c:1020 +#: parted/parted.c:1021 #, c-format msgid "Sector size (logical/physical): %lldB/%lldB\n" msgstr "" -#: parted/parted.c:1032 +#: parted/parted.c:1033 #, fuzzy, c-format msgid "Partition Table: %s\n" msgstr "Izina:" -#: parted/parted.c:1033 +#: parted/parted.c:1034 #, fuzzy, c-format msgid "Disk Flags: %s\n" msgstr "Akarango Ubwoko" -#: parted/parted.c:1153 parted/parted.c:1156 +#: parted/parted.c:1154 parted/parted.c:1157 msgid "Number" msgstr "" @@ -2520,175 +2471,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:1153 parted/parted.c:1156 +#: parted/parted.c:1154 parted/parted.c:1157 #, fuzzy msgid "Start" msgstr "Gutangira" # officecfg/registry\schema\org\openoffice\Office\DataAccess.xcs:....FormSearchOptions.SearchPosition..end-of-field.text -#: parted/parted.c:1154 parted/parted.c:1157 +#: parted/parted.c:1155 parted/parted.c:1158 #, fuzzy msgid "End" msgstr "Impera" -#: parted/parted.c:1157 +#: parted/parted.c:1158 msgid "Size" msgstr "" -#: parted/parted.c:1161 +#: parted/parted.c:1162 msgid "Type" msgstr "" # officecfg/registry\schema\org\openoffice\Office\Common.xcs:....Save.URL.FileSystem.text -#: parted/parted.c:1163 +#: parted/parted.c:1164 #, fuzzy msgid "File system" msgstr "Idosiye ya sisitemu" -#: parted/parted.c:1166 +#: parted/parted.c:1167 msgid "Name" msgstr "" -#: parted/parted.c:1168 +#: parted/parted.c:1169 msgid "Flags" msgstr "Amabendera" -#: parted/parted.c:1225 +#: parted/parted.c:1226 msgid "Free Space" msgstr "" -#: parted/parted.c:1385 +#: parted/parted.c:1386 #, 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:1428 +#: parted/parted.c:1429 #, fuzzy msgid "searching for file systems" msgstr "Ishakisha kugirango IDOSIYE" -#: parted/parted.c:1535 +#: parted/parted.c:1536 msgid "The resize command has been removed in parted 3.0" msgstr "" -#: parted/parted.c:1583 +#: parted/parted.c:1599 msgid "" "Shrinking a partition can cause data loss, are you sure you want to continue?" msgstr "" -#: parted/parted.c:1636 +#: parted/parted.c:1652 #, fuzzy msgid "New device?" msgstr "APAREYE" -#: parted/parted.c:1704 +#: parted/parted.c:1720 msgid "alignment type(min/opt)" msgstr "" -#: parted/parted.c:1719 +#: parted/parted.c:1735 #, c-format msgid "%d aligned\n" msgstr "" -#: parted/parted.c:1721 +#: parted/parted.c:1737 #, c-format msgid "%d not aligned: %s\n" msgstr "" -#: parted/parted.c:1746 parted/parted.c:1783 +#: parted/parted.c:1762 parted/parted.c:1799 #, fuzzy msgid "Flag to Invert?" msgstr "Kuri Guhindura>>" -#: parted/parted.c:1751 parted/parted.c:1788 +#: parted/parted.c:1767 parted/parted.c:1804 #, fuzzy msgid "New state?" msgstr "Leta" -#: parted/parted.c:1834 +#: parted/parted.c:1850 msgid "Unit?" msgstr "" -#: parted/parted.c:1969 +#: parted/parted.c:1985 #, fuzzy msgid "align-check" msgstr "genzura" -#: parted/parted.c:1972 +#: parted/parted.c:1988 msgid "" "align-check TYPE N check partition N for TYPE(min|opt) " "alignment" msgstr "" -#: parted/parted.c:1980 +#: parted/parted.c:1996 #, fuzzy msgid "help" msgstr "Ifashayobora" -#: parted/parted.c:1983 +#: parted/parted.c:1999 #, fuzzy msgid "" "help [COMMAND] print general help, or help on " "COMMAND" msgstr "Ifashayobora Rusange Ifashayobora Cyangwa Ifashayobora ku" -#: parted/parted.c:1989 +#: parted/parted.c:2005 msgid "mklabel" msgstr "" -#: parted/parted.c:1989 +#: parted/parted.c:2005 msgid "mktable" msgstr "" -#: parted/parted.c:1992 +#: parted/parted.c:2008 #, fuzzy msgid "" "mklabel,mktable LABEL-TYPE create a new disklabel (partition " "table)" msgstr "Kurema a Gishya imbonerahamwe#" -#: parted/parted.c:1998 +#: parted/parted.c:2014 msgid "mkpart" msgstr "" -#: parted/parted.c:2001 +#: parted/parted.c:2017 #, fuzzy msgid "mkpart PART-TYPE [FS-TYPE] START END make a partition" msgstr "Ubwoko a" -#: parted/parted.c:2007 +#: parted/parted.c:2023 #, 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:2012 +#: parted/parted.c:2028 msgid "name" msgstr "izina" -#: parted/parted.c:2015 +#: parted/parted.c:2031 #, fuzzy msgid "name NUMBER NAME name partition NUMBER as NAME" msgstr "Izina: Izina:" # #-#-#-#-# dbaccess.pot (PACKAGE VERSION) #-#-#-#-# # #-#-#-#-# dbaccess.pot (PACKAGE VERSION) #-#-#-#-# -#: parted/parted.c:2020 +#: parted/parted.c:2036 #, fuzzy msgid "print" msgstr "Gucapa" -#: parted/parted.c:2023 +#: parted/parted.c:2039 msgid "" "print [devices|free|list,all|NUMBER] display the partition table, " "available devices, free space, all found partitions, or a particular " "partition" msgstr "" -#: parted/parted.c:2028 +#: parted/parted.c:2044 #, fuzzy msgid "" "Without arguments, 'print' displays the entire partition table. However with " @@ -2696,42 +2647,42 @@ msgid "" msgstr "" "ingingo Gucapa i imbonerahamwe# Umubare ni Hanyuma Birenzeho Ibisobanuro ni" -#: parted/parted.c:2030 +#: parted/parted.c:2046 msgid " devices : display all active block devices\n" msgstr "" -#: parted/parted.c:2031 +#: parted/parted.c:2047 msgid "" " free : display information about free unpartitioned space on the " "current block device\n" msgstr "" -#: parted/parted.c:2033 +#: parted/parted.c:2049 msgid "" " list, all : display the partition tables of all active block devices\n" msgstr "" -#: parted/parted.c:2034 +#: parted/parted.c:2050 msgid "" " NUMBER : display more detailed information about this particular " "partition\n" msgstr "" -#: parted/parted.c:2039 +#: parted/parted.c:2055 #, fuzzy msgid "quit" msgstr "Kuvamo" -#: parted/parted.c:2042 +#: parted/parted.c:2058 #, fuzzy msgid "quit exit program" msgstr "Kuvamo Gusohoka Porogaramu" -#: parted/parted.c:2047 +#: parted/parted.c:2063 msgid "rescue" msgstr "" -#: parted/parted.c:2050 +#: parted/parted.c:2066 #, fuzzy msgid "" "rescue START END rescue a lost partition near START " @@ -2739,133 +2690,140 @@ msgid "" msgstr "a Na" # starmath/source\smres.src:RID_TOOLBOXWINDOW.6.RID_SIZEXY.text -#: parted/parted.c:2056 +#: parted/parted.c:2072 #, fuzzy msgid "resize" msgstr "Kuringaniza" -#: parted/parted.c:2059 +#: parted/parted.c:2075 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:2062 +#: parted/parted.c:2078 #, fuzzy msgid "resizepart" msgstr "Kuringaniza" -#: parted/parted.c:2065 +#: parted/parted.c:2081 #, fuzzy msgid "resizepart NUMBER END resize partition NUMBER" msgstr "Gusiba" -#: parted/parted.c:2070 +#: parted/parted.c:2086 msgid "rm" msgstr "" -#: parted/parted.c:2073 +#: parted/parted.c:2089 #, fuzzy msgid "rm NUMBER delete partition NUMBER" msgstr "Gusiba" -#: parted/parted.c:2078 +#: parted/parted.c:2094 msgid "select" msgstr "guhitamo" -#: parted/parted.c:2081 +#: parted/parted.c:2097 #, fuzzy msgid "select DEVICE choose the device to edit" msgstr "Guhitamo Guhitamo i APAREYE Kuri Guhindura" -#: parted/parted.c:2086 +#: parted/parted.c:2102 msgid "disk_set" msgstr "" -#: parted/parted.c:2089 +#: parted/parted.c:2105 msgid "" "disk_set FLAG STATE change the FLAG on selected device" msgstr "" -#: parted/parted.c:2094 +#: parted/parted.c:2110 msgid "disk_toggle" msgstr "" -#: parted/parted.c:2097 +#: parted/parted.c:2113 msgid "" "disk_toggle [FLAG] toggle the state of FLAG on " "selected device" msgstr "" -#: parted/parted.c:2103 +#: parted/parted.c:2119 #, fuzzy msgid "set" msgstr "Gushyiraho" -#: parted/parted.c:2106 +#: parted/parted.c:2122 #, fuzzy msgid "" "set NUMBER FLAG STATE change the FLAG on partition NUMBER" msgstr "Gushyiraho Guhindura>> a Ibendera ku" -#: parted/parted.c:2112 +#: parted/parted.c:2128 msgid "toggle" msgstr "" -#: parted/parted.c:2115 +#: parted/parted.c:2131 msgid "" "toggle [NUMBER [FLAG]] toggle the state of FLAG on " "partition NUMBER" msgstr "" -#: parted/parted.c:2121 +#: parted/parted.c:2137 msgid "unit" msgstr "" -#: parted/parted.c:2124 +#: parted/parted.c:2140 #, fuzzy msgid "unit UNIT set the default unit to UNIT" msgstr "Kuvamo Gusohoka Porogaramu" -#: parted/parted.c:2129 +#: parted/parted.c:2145 msgid "version" msgstr "" -#: parted/parted.c:2132 +#: parted/parted.c:2148 msgid "" "version display the version number and " "copyright information of GNU Parted" msgstr "" -#: parted/parted.c:2136 +#: parted/parted.c:2152 msgid "" "'version' displays copyright and version information corresponding to this " "copy of GNU Parted\n" msgstr "" -#: parted/parted.c:2204 +#: parted/parted.c:2220 #, c-format msgid "Usage: %s [-hlmsv] [-a] [DEVICE [COMMAND [PARAMETERS]]...]\n" msgstr "" -#: parted/parted.c:2248 +#: parted/parted.c:2264 #, fuzzy msgid "No device found" msgstr "APAREYE Byabonetse" -#: parted/parted.c:2285 +#: parted/parted.c:2301 msgid "WARNING: You are not superuser. Watch out for permissions.\n" msgstr "" -#: parted/parted.c:2325 +#: parted/parted.c:2334 +#, 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:2341 #, fuzzy msgid "You may need to update /etc/fstab.\n" msgstr "Kuri Kuvugurura NIBA" -#: parted/ui.c:164 +#: parted/ui.c:165 msgid "Welcome to GNU Parted! Type 'help' to view a list of commands.\n" msgstr "" -#: parted/ui.c:167 +#: parted/ui.c:168 #, fuzzy msgid "" "Usage: parted [OPTION]... [DEVICE [COMMAND [PARAMETERS]...]...]\n" @@ -2874,7 +2832,7 @@ msgid "" "interactive mode.\n" msgstr "Na: Kuri Oya S Ubwoko" -#: parted/ui.c:172 +#: parted/ui.c:173 #, c-format msgid "" "\n" @@ -2908,182 +2866,182 @@ msgid "" "consider important.\n" msgstr "" -#: parted/ui.c:293 +#: parted/ui.c:294 msgid "" "\n" "Command History:\n" msgstr "" -#: parted/ui.c:356 +#: parted/ui.c:357 msgid "" "\n" "Error: SEGV_MAPERR (Address not mapped to object)\n" msgstr "" -#: parted/ui.c:362 +#: parted/ui.c:363 msgid "" "\n" "Error: SEGV_ACCERR (Invalid permissions for mapped object)\n" msgstr "" -#: parted/ui.c:367 +#: parted/ui.c:368 msgid "" "\n" "Error: A general SIGSEGV signal was encountered.\n" msgstr "" -#: parted/ui.c:391 +#: parted/ui.c:392 msgid "" "\n" "Error: FPE_INTDIV (Integer: divide by zero)" msgstr "" -#: parted/ui.c:396 +#: parted/ui.c:397 msgid "" "\n" "Error: FPE_INTOVF (Integer: overflow)" msgstr "" -#: parted/ui.c:401 +#: parted/ui.c:402 msgid "" "\n" "Error: FPE_FLTDIV (Float: divide by zero)" msgstr "" -#: parted/ui.c:406 +#: parted/ui.c:407 msgid "" "\n" "Error: FPE_FLTOVF (Float: overflow)" msgstr "" -#: parted/ui.c:411 +#: parted/ui.c:412 msgid "" "\n" "Error: FPE_FLTUND (Float: underflow)" msgstr "" -#: parted/ui.c:416 +#: parted/ui.c:417 msgid "" "\n" "Error: FPE_FLTRES (Float: inexact result)" msgstr "" -#: parted/ui.c:421 +#: parted/ui.c:422 msgid "" "\n" "Error: FPE_FLTINV (Float: invalid operation)" msgstr "" -#: parted/ui.c:426 +#: parted/ui.c:427 msgid "" "\n" "Error: FPE_FLTSUB (Float: subscript out of range)" msgstr "" -#: parted/ui.c:431 +#: parted/ui.c:432 msgid "" "\n" "Error: A general SIGFPE signal was encountered." msgstr "" -#: parted/ui.c:455 +#: parted/ui.c:456 msgid "" "\n" "Error: ILL_ILLOPC (Illegal Opcode)" msgstr "" -#: parted/ui.c:460 +#: parted/ui.c:461 msgid "" "\n" "Error: ILL_ILLOPN (Illegal Operand)" msgstr "" -#: parted/ui.c:465 +#: parted/ui.c:466 msgid "" "\n" "Error: ILL_ILLADR (Illegal addressing mode)" msgstr "" -#: parted/ui.c:470 +#: parted/ui.c:471 msgid "" "\n" "Error: ILL_ILLTRP (Illegal Trap)" msgstr "" -#: parted/ui.c:475 +#: parted/ui.c:476 msgid "" "\n" "Error: ILL_PRVOPC (Privileged Opcode)" msgstr "" -#: parted/ui.c:480 +#: parted/ui.c:481 msgid "" "\n" "Error: ILL_PRVREG (Privileged Register)" msgstr "" -#: parted/ui.c:485 +#: parted/ui.c:486 msgid "" "\n" "Error: ILL_COPROC (Coprocessor Error)" msgstr "" -#: parted/ui.c:490 +#: parted/ui.c:491 msgid "" "\n" "Error: ILL_BADSTK (Internal Stack Error)" msgstr "" -#: parted/ui.c:495 +#: parted/ui.c:496 msgid "" "\n" "Error: A general SIGILL signal was encountered." msgstr "" -#: parted/ui.c:888 +#: parted/ui.c:889 #, fuzzy, c-format msgid "invalid token: %s" msgstr "imbonerahamwe# ku" -#: parted/ui.c:1069 +#: parted/ui.c:1070 #, fuzzy msgid "Expecting a partition number." msgstr "a Umubare" -#: parted/ui.c:1078 +#: parted/ui.c:1079 msgid "Partition doesn't exist." msgstr "" -#: parted/ui.c:1098 +#: parted/ui.c:1099 #, fuzzy msgid "Expecting a file system type." msgstr "a IDOSIYE Sisitemu Ubwoko" -#: parted/ui.c:1105 +#: parted/ui.c:1106 #, fuzzy, c-format msgid "Unknown file system type \"%s\"." msgstr "IDOSIYE Sisitemu Ubwoko" -#: parted/ui.c:1126 +#: parted/ui.c:1127 #, fuzzy msgid "Expecting a disk label type." msgstr "a Akarango Ubwoko" -#: parted/ui.c:1157 parted/ui.c:1193 +#: parted/ui.c:1158 parted/ui.c:1194 msgid "No flags supported" msgstr "" -#: parted/ui.c:1267 +#: parted/ui.c:1268 #, fuzzy msgid "Can't create any more partitions." msgstr "Kurema Birenzeho" -#: parted/ui.c:1277 +#: parted/ui.c:1278 #, fuzzy msgid "Expecting a partition type." msgstr "a Ubwoko" -#: parted/ui.c:1426 +#: parted/ui.c:1427 msgid "on" msgstr "kuri" @@ -3091,61 +3049,61 @@ 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:1427 +#: parted/ui.c:1428 msgid "off" msgstr "bidakora" -#: parted/ui.c:1444 +#: parted/ui.c:1445 msgid "optimal" msgstr "" -#: parted/ui.c:1445 +#: parted/ui.c:1446 msgid "minimal" msgstr "" # crashrep/source\all\crashrep.lng:%OPTIONS_BUTTON%.text -#: parted/ui.c:1578 +#: parted/ui.c:1579 #, fuzzy msgid "OPTIONs:" msgstr "Amahitamo..." # sfx2/source\doc\docvor.src:DLG_ORGANIZE.BTN_EDIT.text -#: parted/ui.c:1583 +#: parted/ui.c:1584 #, fuzzy msgid "COMMANDs:" msgstr "Amabwiriza" -#: parted/ui.c:1586 +#: parted/ui.c:1587 #, c-format msgid "" "\n" "Report bugs to %s\n" msgstr "" -#: parted/ui.c:1593 +#: parted/ui.c:1594 #, fuzzy, c-format msgid "Using %s\n" msgstr "ikoresha" -#: parted/ui.c:1673 +#: parted/ui.c:1674 msgid "This command does not make sense in non-interactive mode.\n" msgstr "" -#, fuzzy +#, fuzzy, c-format #~ msgid "" #~ "The sector size on %s is %d bytes. Parted is known not to work properly " #~ "with drives with sector sizes other than %d bytes" #~ msgstr "Ingano ku ni Bayite ni OYA Kuri Akazi Na: Na: Ikindi Bayite" -#, fuzzy +#, fuzzy, c-format #~ msgid "Device %s has dodgey geometry." #~ msgstr "Iyigamashusho" -#, fuzzy +#, fuzzy, c-format #~ msgid "Device %s is neither a SCSI nor IDE drive." #~ msgstr "ni a Porogaramu- shoboza" -#, fuzzy +#, fuzzy, c-format #~ msgid "Error reading %s (%s) to determine if partition is mounted." #~ msgstr "Kuri NIBA ni" @@ -3158,7 +3116,7 @@ msgstr "" #~ "Kuri NIBA Biturutse Cyangwa Kuri Ihindurangero Cyangwa Guhindura IDOSIYE " #~ "Gusoma" -#, fuzzy +#, fuzzy, c-format #~ msgid "" #~ "The kernel was unable to re-read the partition table on %s (%s). This " #~ "means Linux won't know anything nothing about the modifications you made " @@ -3168,6 +3126,26 @@ msgstr "" #, fuzzy #~ msgid "" +#~ "The partition table was unable to be reread, as such, you need to reboot " +#~ "before mounting any modified partitions. You also need to reinstall your " +#~ "boot loader before you reboot (which may require mounting modified " +#~ "partitions). It is impossible do both things! So you'll need to boot " +#~ "off a rescue disk, and reinstall your boot loader from the rescue disk. " +#~ "Read section 4 of the Parted User documentation for more information." +#~ msgstr "" +#~ "imbonerahamwe# Kuri Nka Kuri Mbere Byahinduwe Kuri Mbere Gicurasi " +#~ "Byahinduwe ni Byombi Kuri Bidakora a Na Bivuye i Icyiciro 4. Bya i " +#~ "kugirango Birenzeho Ibisobanuro" + +#, fuzzy, c-format +#~ msgid "" +#~ "The partition table on %s (%s). This means the Hurd knows nothing about " +#~ "any modifications you made. You should reboot your computer before doing " +#~ "anything with %s." +#~ msgstr "imbonerahamwe# ku i Ibyerekeye Mbere Na:" + +#, fuzzy, c-format +#~ msgid "" #~ "The partition table on %s is inconsistent. There are many reasons why " #~ "this might be the case. However, the most likely reason is that Linux " #~ "detected the BIOS geometry for %s incorrectly. GNU Parted suspects the " @@ -3184,7 +3162,7 @@ msgstr "" #~ "ni Gicurasi Guhitamo Kuri urifuzagukomeza Na Guhitamo Na Na Cyangwa i " #~ "NONEAHA" -#, fuzzy +#, fuzzy, c-format #~ msgid "" #~ "The partition table on %s is inconsistent. There are many reasons why " #~ "this might be the case. Often, the reason is that Linux detected the " @@ -3206,7 +3184,7 @@ msgstr "" #~ "Kuri Gutondeka imbonerahamwe# i Iyigamashusho ni Kuri Kwirengagiza " #~ "Gicurasi Na:" -#, fuzzy +#, fuzzy, c-format #~ msgid "" #~ "%s contains GPT signatures, indicating that it has a GPT table. However, " #~ "it does not have a valid fake msdos partition table, as it should. " @@ -3219,10 +3197,14 @@ msgstr "" #~ "imbonerahamwe# iyi a imbonerahamwe#" #, fuzzy +#~ msgid "The boot region doesn't start at the start of the partition" +#~ msgstr "Gutangira ku i Gutangira Bya i" + +#, fuzzy, c-format #~ msgid "Support for opening %s file systems is not implemented yet." #~ msgstr "kugirango Gufungura %s%S IDOSIYE ni OYA" -#, fuzzy +#, fuzzy, c-format #~ msgid "Support for checking %s file systems is not implemented yet." #~ msgstr "kugirango IDOSIYE ni OYA" @@ -3238,7 +3220,7 @@ msgstr "" #~ msgid "Can't copy onto an overlapping partition." #~ msgstr "Gukoporora iyorosa" -#, fuzzy +#, fuzzy, c-format #~ msgid "" #~ "Direct support for copying file systems is not yet implemented for %s. " #~ "However, support for resizing implemented. Therefore, the file system " @@ -3250,17 +3232,17 @@ msgstr "" #~ "IDOSIYE Sisitemu NIBA i Gishya ni ku Nka Nka i ki/ bishaje Kugabanuka i " #~ "Kuri Gukoporora Cyangwa Gukoporora Kuri a" -#, fuzzy +#, fuzzy, c-format #~ msgid "Support for copying %s file systems is not implemented yet." #~ msgstr "kugirango IDOSIYE ni OYA" -#, fuzzy +#, fuzzy, c-format #~ msgid "" #~ "A bug has been detected in GNU parted. Please email a bug report to bug-" #~ "parted@gnu.org containing the version (%s) and the following message:" #~ msgstr "A in imeli a Icyegeranyo Kuri org i Verisiyo Na i Ubutumwa" -#, fuzzy +#, fuzzy, c-format #~ msgid "Attempt to read sectors %ld-%ld outside of partition on %s" #~ msgstr "Kuri Gusoma Hanze Bya ku" @@ -3317,11 +3299,11 @@ msgstr "" #~ msgid "adding groups" #~ msgstr "Wongera Amatsinda" -#, fuzzy +#, fuzzy, c-format #~ msgid "Your filesystem is too occupied to resize it to %i blocks. Sorry." #~ msgstr "ni Kuri Ihindurangero Kuri" -#, fuzzy +#, fuzzy, c-format #~ msgid "" #~ "Your filesystem has too much occupied inodes to resize it to %i blocks. " #~ "Sorry." @@ -3345,11 +3327,11 @@ msgstr "" #~ msgid "Cross-linked blocks found! better go run e2fsck first!" #~ msgstr "Byabonetse Gyayo Gukoresha Itangira" -#, fuzzy +#, fuzzy, c-format #~ msgid "Block %i has no reference? Weird" #~ msgstr "Oya Indango" -#, fuzzy +#, fuzzy, c-format #~ msgid "Block %i shouldn't have been marked!" #~ msgstr "cy/ byagarajwe" @@ -3376,7 +3358,7 @@ msgstr "" #~ msgid "File system has an invalid signature for a FAT file systems." #~ msgstr "Idosiye Sisitemu Sibyo Isinya kugirango a IDOSIYE" -#, fuzzy +#, fuzzy, 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." @@ -3384,6 +3366,14 @@ msgstr "" #~ "IDOSIYE Sisitemu a Bijyanye n'inyurabwenge Ingano Bya ni OYA Kuri Akazi " #~ "Na: Ikindi Bayite" +#, fuzzy, c-format +#~ msgid "" +#~ "The file %s is marked as a system file. This means moving it could cause " +#~ "some programs to stop working." +#~ msgstr "" +#~ "IDOSIYE ni cy/ byagarajwe Nka a Sisitemu IDOSIYE Porogaramu Kuri " +#~ "Guhagarara" + #, fuzzy #~ msgid "where necessary, prompts for user intervention" #~ msgstr "kugirango Ukoresha:" @@ -3392,7 +3382,7 @@ msgstr "" #~ msgid "Source partition number?" #~ msgstr "Umubare" -#, fuzzy +#, fuzzy, c-format #~ msgid "" #~ "You requested to create a partition at %.3f-%.3fMb. The closest Parted " #~ "can manage is %.3f-%.3fMb." @@ -3410,7 +3400,7 @@ msgstr "" #~ msgid "Can't move a partition onto itself. Try using resize, perhaps?" #~ msgstr "Kwimura a ikoresha Ihindurangero" -#, fuzzy +#, fuzzy, c-format #~ msgid "" #~ "You requested to move the partition to %.3f-%.3fMb. The closest Parted " #~ "can manage is %.3f-%.3fMb." @@ -3422,19 +3412,19 @@ msgstr "" #~ msgstr "Amabendera" # officecfg/registry\schema\org\openoffice\Office\Common.xcs:....Save.URL.FileSystem.text -#, fuzzy +#, fuzzy, c-format #~ msgid "File System: %s\n" #~ msgstr "Idosiye ya sisitemu" -#, fuzzy +#, fuzzy, c-format #~ msgid "Minimum size: %10.3fMb (%d%%)\n" #~ msgstr "Ingano" -#, fuzzy +#, fuzzy, c-format #~ msgid "Maximum size: %10.3fMb (%d%%)\n" #~ msgstr "Ingano" -#, fuzzy +#, fuzzy, c-format #~ msgid "Disk geometry for %s: 0.000-%.3f megabytes\n" #~ msgstr "000." @@ -3452,7 +3442,7 @@ msgstr "" #~ msgid "Name " #~ msgstr "Izina" -#, fuzzy +#, fuzzy, c-format #~ msgid "" #~ "You requested to resize the partition to %.3f-%.3fMb. The closest Parted " #~ "can manage is %.3f-%.3fMb." @@ -3498,7 +3488,7 @@ msgstr "" #~ msgid "resize MINOR START END resize filesystem on partition MINOR" #~ msgstr "Ihindurangero Ihindurangero ku" -#, fuzzy +#, fuzzy, c-format #~ msgid "" #~ "You found a bug in GNU Parted. Please email a bug report to bug-" #~ "parted@gnu.org containing the version (%s), and the following message:\n" @@ -3515,12 +3505,12 @@ msgstr "" #~ "S OYA ikoresha Hanyuma Hindura Kuri ku Igenamiterere i Ibendera ku Byose " #~ "Ubwoko i Sisitemu Na i i Iyigamashusho Mbere" -#, fuzzy +#, fuzzy, c-format #~ msgid "" #~ "The operating system thinks the geometry on %s is %d/%d/%d. Therefore, " #~ "cylinder 1024 ends at %.3fM.%s" #~ msgstr "Sisitemu i Iyigamashusho ku ni Umwiburungushure ku" -#, fuzzy +#, fuzzy, c-format #~ msgid "The operating system thinks the geometry on %s is %d/%d/%d.%s" #~ msgstr "Sisitemu i Iyigamashusho ku ni" diff --git a/po/sk.gmo b/po/sk.gmo index 97dc528f9f5fe884a99c272dd0c747a945d8cddb..b9586036c7469e65940314785e9f7d12cc29de08 100644 GIT binary patch delta 11053 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 Lzm((`gEIdIltWfE delta 12789 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\n" "Language-Team: Slovak \n" @@ -95,11 +95,11 @@ msgstr "%s: voľba vyžaduje argument -- %c\n" #. If you don't know what to put here, please see #. #. and use glyphs suitable for your language. -#: lib/quotearg.c:362 +#: lib/quotearg.c:355 msgid "`" msgstr "„" -#: lib/quotearg.c:363 +#: lib/quotearg.c:356 msgid "'" msgstr "“" @@ -367,79 +367,64 @@ msgstr "" msgid "memory exhausted" msgstr "pamäť je vyčerpaná" -#: lib/xstrtol-error.c:63 -#, c-format -msgid "invalid %s%s argument '%s'" -msgstr "neplatný %s%s argument „%s“" - -#: lib/xstrtol-error.c:68 -#, c-format -msgid "invalid suffix in %s%s argument '%s'" -msgstr "neplatná prípona v %s%s argument „%s“" - -#: lib/xstrtol-error.c:72 -#, c-format -msgid "%s%s argument '%s' too large" -msgstr "%s%s argument „%s“ príliš veľký" - -#: libparted/arch/beos.c:245 +#: libparted/arch/beos.c:246 msgid "Disk Image" msgstr "Obraz disku" -#: libparted/arch/beos.c:346 libparted/arch/gnu.c:277 +#: libparted/arch/beos.c:347 libparted/arch/gnu.c:277 #: libparted/arch/linux.c:1731 #, c-format msgid "Error opening %s: %s" msgstr "Chyba pri otváraní %s: %s" -#: libparted/arch/beos.c:357 libparted/arch/gnu.c:287 +#: libparted/arch/beos.c:358 libparted/arch/gnu.c:287 #: libparted/arch/linux.c:1742 #, c-format msgid "Unable to open %s read-write (%s). %s has been opened read-only." msgstr "" "Nemôžem otvoriť %s na čítanie/zápis (%s). %s bol otvorený len na čítanie." -#: libparted/arch/beos.c:419 libparted/arch/linux.c:1907 +#: libparted/arch/beos.c:420 libparted/arch/linux.c:1907 #, c-format msgid "%s during seek for read on %s" msgstr "%s pri vyhľadávaní pre čítanie na %s" -#: libparted/arch/beos.c:452 libparted/arch/gnu.c:465 libparted/arch/gnu.c:564 -#: libparted/arch/gnu.c:692 libparted/arch/linux.c:1867 +#: libparted/arch/beos.c:453 libparted/arch/gnu.c:425 libparted/arch/gnu.c:524 +#: libparted/arch/gnu.c:652 libparted/arch/linux.c:1867 #: libparted/arch/linux.c:1949 #, c-format msgid "%s during read on %s" msgstr "%s pri čítaní %s" -#: libparted/arch/beos.c:488 libparted/arch/gnu.c:525 +#: libparted/arch/beos.c:489 libparted/arch/gnu.c:485 #: libparted/arch/linux.c:2026 #, c-format msgid "Can't write to %s, because it is opened read-only." msgstr "Nemôžem zapisovať na %s, pretože je tvorený len na čítanie." -#: libparted/arch/beos.c:504 libparted/arch/linux.c:2051 +#: libparted/arch/beos.c:505 libparted/arch/linux.c:2051 #, c-format msgid "%s during seek for write on %s" msgstr "%s pri pri vyhľadávaní pre zápis na %s" -#: libparted/arch/beos.c:541 libparted/arch/gnu.c:601 libparted/arch/gnu.c:646 -#: libparted/arch/gnu.c:723 libparted/arch/linux.c:1999 +#: libparted/arch/beos.c:542 libparted/arch/gnu.c:561 libparted/arch/gnu.c:606 +#: libparted/arch/gnu.c:683 libparted/arch/linux.c:1999 #: libparted/arch/linux.c:2094 libparted/arch/linux.c:2167 #, c-format msgid "%s during write on %s" msgstr "%s pri zápise na %s" -#: partprobe/partprobe.c:148 +#: partprobe/partprobe.c:149 #, c-format msgid "Try `%s --help' for more information.\n" msgstr "Viac informácií získate po napísaní „%s --help“.\n" -#: partprobe/partprobe.c:152 +#: partprobe/partprobe.c:153 #, c-format msgid "Usage: %s [OPTION] [DEVICE]...\n" msgstr "Použitie: %s [VOĽBA] [ZARIADENIE]...\n" -#: partprobe/partprobe.c:153 +#: partprobe/partprobe.c:154 msgid "" "Inform the operating system about partition table changes.\n" "\n" @@ -455,7 +440,7 @@ msgstr "" " -h, --help zobraziť tento návod a skončiť\n" " -v, --version vypísať info o verzii a skončiť\n" -#: partprobe/partprobe.c:161 +#: partprobe/partprobe.c:162 msgid "" "\n" "When no DEVICE is given, probe all partitions.\n" @@ -463,7 +448,7 @@ msgstr "" "\n" "Bez zadaného ZARIADENIA skúsi všetky oblasti.\n" -#: partprobe/partprobe.c:165 +#: partprobe/partprobe.c:166 #, c-format msgid "" "\n" @@ -481,43 +466,7 @@ msgstr "Nemôžem otvoriť %s." msgid "Unable to probe store." msgstr "Nemôžem preskúmať úložný priestor." -#: libparted/arch/gnu.c:368 -msgid "" -"The partition table cannot be re-read. This means you need to reboot before " -"mounting any modified partitions. You also need to reinstall your boot " -"loader before you reboot (which may require mounting modified partitions). " -"It is impossible do both things! So you'll need to boot off a rescue disk, " -"and reinstall your boot loader from the rescue disk. Read section 4 of the " -"Parted User documentation for more information." -msgstr "" -"Nebolo možné znovu načítať tabuľku oblastí, takže budete musieť pred " -"pripojením zmenených oblastí reštartovať počítač. Tiež musíte pred reštartom " -"znovu nainštalovať svoj zavádzač systému (čo môže vyžadovať pripojenie " -"zmenených oblastí). Nie je možné vykonať oboje! Takže budete musieť zaviesť " -"systém zo záchranného disku a znovu nainštalovať svoj zavádzač systému " -"odtiaľ. Podrobnejšie informácie sa dočítate v kapitole 4 Používateľskej " -"dokumentácie Parted." - -#: libparted/arch/gnu.c:385 -#, 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 computer " -"before doing anything with %s." -msgstr "" -"Tabuľku oblastí na %s nie je možné znovu načítať (%s). To znamená, že Hurd " -"nevie nič o zmenách, ktoré ste vykonali. Než budete čokoľvek robiť s %s, " -"mali by ste reštartovať svoj počítač." - -#: libparted/arch/gnu.c:396 parted/parted.c:2318 -msgid "" -"You should reinstall your boot loader before rebooting. Read section 4 of " -"the Parted User documentation for more information." -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." - -#: libparted/arch/gnu.c:788 +#: libparted/arch/gnu.c:748 #, c-format msgid "%s trying to sync %s to disk" msgstr "%s pri pokuse o sync %s na disk" @@ -833,15 +782,15 @@ msgstr "metadáta" msgid "free" msgstr "voľné" -#: libparted/disk.c:2355 parted/ui.c:1258 parted/ui.c:1286 +#: libparted/disk.c:2355 parted/ui.c:1259 parted/ui.c:1287 msgid "extended" msgstr "rozšírený" -#: libparted/disk.c:2357 parted/ui.c:1262 parted/ui.c:1290 +#: libparted/disk.c:2357 parted/ui.c:1263 parted/ui.c:1291 msgid "logical" msgstr "logický" -#: libparted/disk.c:2359 parted/ui.c:1254 parted/ui.c:1282 +#: libparted/disk.c:2359 parted/ui.c:1255 parted/ui.c:1283 msgid "primary" msgstr "primárny" @@ -919,64 +868,73 @@ msgstr "" msgid "esp" msgstr "Áno" -#: libparted/disk.c:2415 +#: libparted/disk.c:2411 +msgid "chromeos_kernel" +msgstr "" + +#: libparted/disk.c:2413 +#, fuzzy +msgid "bls_boot" +msgstr "pmbr_boot" + +#: libparted/disk.c:2419 #, c-format msgid "Unknown partition flag, %d." msgstr "Neznámy príznak oblasti, %d." -#: libparted/exception.c:78 +#: libparted/exception.c:79 msgid "Information" msgstr "Informácia" -#: libparted/exception.c:79 +#: libparted/exception.c:80 msgid "Warning" msgstr "Upozornenie" -#: libparted/exception.c:80 +#: libparted/exception.c:81 msgid "Error" msgstr "Chyba" -#: libparted/exception.c:81 +#: libparted/exception.c:82 msgid "Fatal" msgstr "Fatálna chyba" -#: libparted/exception.c:82 +#: libparted/exception.c:83 msgid "Bug" msgstr "Chyba" -#: libparted/exception.c:83 +#: libparted/exception.c:84 msgid "No Implementation" msgstr "Neimplementované" -#: libparted/exception.c:87 +#: libparted/exception.c:88 msgid "Fix" msgstr "Oprava" -#: libparted/exception.c:88 +#: libparted/exception.c:89 msgid "Yes" msgstr "Áno" -#: libparted/exception.c:89 +#: libparted/exception.c:90 msgid "No" msgstr "Nie" -#: libparted/exception.c:90 +#: libparted/exception.c:91 msgid "OK" msgstr "OK" -#: libparted/exception.c:91 +#: libparted/exception.c:92 msgid "Retry" msgstr "Znovu" -#: libparted/exception.c:92 +#: libparted/exception.c:93 msgid "Ignore" msgstr "Ignorovať" -#: libparted/exception.c:93 +#: libparted/exception.c:94 msgid "Cancel" msgstr "Zrušiť" -#: libparted/exception.c:133 +#: libparted/exception.c:134 #, c-format msgid "" "A bug has been detected in GNU Parted. Refer to the web site of parted " @@ -989,27 +947,27 @@ msgstr "" "parted.html. Prosím, pošlite emailom hlásenie o chybe na %s obsahujúce " "minimálne číslo verzie (%s) a nasledujúcu správu:" -#: libparted/labels/aix.c:91 +#: libparted/labels/aix.c:92 msgid "Support for reading AIX disk labels is is not implemented yet." msgstr "Podpora čítania menoviek disku AIX ešte nie je implementovaná." -#: libparted/labels/aix.c:102 +#: libparted/labels/aix.c:103 msgid "Support for writing AIX disk labels is is not implemented yet." msgstr "Podpora zápisu menoviek disku AIX ešte nie je implementovaná." -#: libparted/labels/aix.c:115 +#: libparted/labels/aix.c:116 msgid "" "Support for adding partitions to AIX disk labels is not implemented yet." msgstr "" "Podpora pridávania oblastí do menoviek disku AIX ešte nie je implementovaná." -#: libparted/labels/aix.c:125 +#: libparted/labels/aix.c:126 msgid "" "Support for duplicating partitions in AIX disk labels is not implemented yet." msgstr "" "Podpora kopírovania oblastí v menovkách disku AIX ešte nie je implementovaná." -#: libparted/labels/aix.c:143 +#: libparted/labels/aix.c:144 msgid "" "Support for setting system type of partitions in AIX disk labels is not " "implemented yet." @@ -1017,7 +975,7 @@ msgstr "" "Podpora nastavovania typu systému oblastí v menovkách disku AIX ešte nie je " "implementovaná." -#: libparted/labels/aix.c:153 +#: libparted/labels/aix.c:154 msgid "Support for setting flags in AIX disk labels is not implemented yet." msgstr "" "Podpora nastavovania príznakov v menovkách disku AIX ešte nie je " @@ -1109,11 +1067,11 @@ msgid "" "partitions, if XGM is the first one it counts for two)." msgstr "" -#: libparted/labels/atari.c:1657 libparted/labels/bsd.c:567 -#: libparted/labels/dasd.c:894 libparted/labels/dos.c:2276 -#: libparted/labels/dvh.c:770 libparted/labels/gpt.c:2050 -#: libparted/labels/loop.c:243 libparted/labels/mac.c:1423 -#: libparted/labels/pc98.c:701 libparted/labels/rdb.c:1054 +#: libparted/labels/atari.c:1657 libparted/labels/bsd.c:563 +#: libparted/labels/dasd.c:895 libparted/labels/dos.c:2283 +#: libparted/labels/dvh.c:770 libparted/labels/gpt.c:2140 +#: 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 "Nemožno splniť všetky obmedzenia na oddiel." @@ -1129,43 +1087,43 @@ msgstr "" msgid "Unable to allocate a partition number." msgstr "Nepodarilo sa alokovať číslo oblasti." -#: libparted/labels/bsd.c:592 +#: libparted/labels/bsd.c:588 msgid "Unable to allocate a bsd disklabel slot." msgstr "Nie je možné alokovať položku menovky disku BSD." -#: libparted/labels/dasd.c:625 +#: libparted/labels/dasd.c:626 msgid "The partition table of DASD-LDL device cannot be changed.\n" msgstr "" -#: libparted/labels/dasd.c:920 +#: libparted/labels/dasd.c:921 msgid "Unable to allocate a dasd disklabel slot" msgstr "Nie je možné alokovať položku menovky disku dasd." -#: libparted/labels/dos.c:1003 +#: libparted/labels/dos.c:1006 #, 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:1031 +#: libparted/labels/dos.c:1034 #, c-format msgid "Invalid partition table - recursive partition on %s." msgstr "Neplatná tabuľka oblastí - rekurzívna oblasť na %s." -#: libparted/labels/dos.c:1560 +#: libparted/labels/dos.c:1557 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:1572 +#: libparted/labels/dos.c:1569 #, 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:2258 +#: libparted/labels/dos.c:2265 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:2514 +#: libparted/labels/dos.c:2521 msgid "cannot create any more partitions" msgstr "nie je možné vytvoriť žiadne ďalšie oblasti" @@ -1306,12 +1264,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:531 +#: libparted/labels/gpt.c:541 #, fuzzy msgid "device is too small for GPT" msgstr "Systém súborov je príliš malý na %lu blokov." -#: libparted/labels/gpt.c:733 +#: libparted/labels/gpt.c:743 #, c-format msgid "" "The format of the GPT partition table is version %x, which is newer than " @@ -1320,7 +1278,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:769 +#: libparted/labels/gpt.c:779 #, c-format msgid "" "Not all of the space available to %s appears to be used, you can fix the GPT " @@ -1331,7 +1289,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:1008 +#: libparted/labels/gpt.c:1024 #, fuzzy msgid "" "The backup GPT table is not at the end of the disk, as it should be. Fix, " @@ -1341,7 +1299,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:1026 +#: libparted/labels/gpt.c:1042 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 +1307,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:1037 +#: libparted/labels/gpt.c:1053 msgid "" "The backup GPT table is corrupt, but the primary appears OK, so that will be " "used." @@ -1357,7 +1315,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:1049 +#: libparted/labels/gpt.c:1065 msgid "" "The primary GPT table is corrupt, but the backup appears OK, so that will be " "used." @@ -1365,11 +1323,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:1073 +#: libparted/labels/gpt.c:1089 msgid "primary partition table array CRC mismatch" msgstr "nezodpovedá CRC poľa primárnej tabuľky oblastí" -#: libparted/labels/gpt.c:1936 libparted/labels/gpt.c:1963 +#: libparted/labels/gpt.c:2026 libparted/labels/gpt.c:2053 #, fuzzy msgid "failed to translate partition name" msgstr "Nepodarilo sa alokovať číslo oblasti." @@ -1403,25 +1361,21 @@ msgid "The data region doesn't start at the start of the partition." msgstr "Dátová časť nezačína na začiatku oblasti." #: libparted/labels/mac.c:572 -msgid "The boot region doesn't start at the start of the partition." -msgstr "Štartovacia oblasť nezačína na začiatku oblasti." - -#: libparted/labels/mac.c:586 msgid "The partition's boot region doesn't occupy the entire partition." msgstr "Zavádzacia časť diskovej oblasti nezaberá celú oblasť." -#: libparted/labels/mac.c:597 +#: libparted/labels/mac.c:583 msgid "The partition's data region doesn't occupy the entire partition." msgstr "Dátová časť oblasti nezaberá celú oblasť." -#: libparted/labels/mac.c:649 +#: libparted/labels/mac.c:635 #, c-format msgid "" "Weird block size on device descriptor: %d bytes is not divisible by 512." msgstr "" "Čudná veľkosť bloku v deskriptore zariadenia: %d bajtov nie je deliteľné 512." -#: libparted/labels/mac.c:662 +#: libparted/labels/mac.c:648 #, c-format msgid "" "The driver descriptor says the physical block size is %d bytes, but Linux " @@ -1430,11 +1384,11 @@ msgstr "" "Deskriptor ovládača vraví, že fyzická veľkosť bloku je %d bajtov, ale Linux " "vraví, že je to %d bajtov." -#: libparted/labels/mac.c:715 +#: libparted/labels/mac.c:701 msgid "No valid partition map found." msgstr "Nebola nájdená platná mapa oblastí." -#: libparted/labels/mac.c:789 +#: libparted/labels/mac.c:775 #, c-format msgid "" "Conflicting partition map entry sizes! Entry 1 says it is %d, but entry %d " @@ -1443,11 +1397,11 @@ msgstr "" "Kolidujúce veľkosti položek mapy oblastí! Položka 1 vraví, že je to %d, ale " "položka %d vraví, že je to %d!" -#: libparted/labels/mac.c:820 +#: libparted/labels/mac.c:806 msgid "Weird! There are 2 partitions map entries!" msgstr "Čudné! 2 položky mapy oblastí!" -#: libparted/labels/mac.c:1359 +#: libparted/labels/mac.c:1345 msgid "" "Changing the name of a root or swap partition will prevent Linux from " "recognising it as such." @@ -1455,16 +1409,16 @@ msgstr "" "Zmena názvu koreňového alebo odkladacej oblasti zabráni Linuxu v jej " "rozpoznaní." -#: libparted/labels/mac.c:1458 +#: libparted/labels/mac.c:1444 msgid "Can't add another partition -- the partition map is too small!" msgstr "Nemôžem pridať ďalšiu oblasť - mapa oblastí je príliš malá!" -#: libparted/labels/pc98.c:284 +#: libparted/labels/pc98.c:285 #, c-format msgid "Invalid partition table on %s." msgstr "Neplatná tabuľka oblastí na %s." -#: libparted/labels/pc98.c:337 libparted/labels/pc98.c:415 +#: libparted/labels/pc98.c:338 libparted/labels/pc98.c:416 #, c-format msgid "" "Partition %d isn't aligned to cylinder boundaries. This is still " @@ -1473,7 +1427,7 @@ msgstr "" "Oblasť %d nie je zarovnaná na hranice cylindra. Toto zatiaľ nie je " "podporované." -#: libparted/labels/pc98.c:733 +#: libparted/labels/pc98.c:729 msgid "Can't add another partition." msgstr "Nemožno pridať ďalšiu oblasť." @@ -1648,39 +1602,39 @@ msgstr "Nebolo možné zapísať VTOC FMT7 DSCB." msgid "Could not write VTOC FMT9 DSCB." msgstr "Nebolo možné zapísať VTOC FMT1 DSCB." -#: libparted/libparted.c:242 +#: libparted/libparted.c:247 msgid "Out of memory." msgstr "Nedostatok pamäte." -#: libparted/unit.c:139 +#: libparted/unit.c:140 msgid "Cannot get unit size for special unit 'COMPACT'." msgstr "Nebolo možné získať veľkosť špeciálnej jednotky „COMPACT“." -#: libparted/unit.c:385 +#: libparted/unit.c:386 #, c-format msgid "\"%s\" has invalid syntax for locations." msgstr "„%s“ má neplatnú syntax lokácií." -#: libparted/unit.c:393 +#: libparted/unit.c:394 #, c-format msgid "The maximum head value is %d." msgstr "Maximálna hodnota hlavičiek je %d." -#: libparted/unit.c:400 +#: libparted/unit.c:401 #, c-format msgid "The maximum sector value is %d." msgstr "Maximálna hodnota sektorov je %d." -#: libparted/unit.c:412 libparted/unit.c:564 +#: libparted/unit.c:413 libparted/unit.c:565 #, c-format msgid "The location %s is outside of the device %s." msgstr "Lokácia %s sa nachádza mimo zariadenia %s." -#: libparted/unit.c:526 +#: libparted/unit.c:527 msgid "Invalid number." msgstr "Neplatné číslo." -#: libparted/unit.c:532 +#: libparted/unit.c:533 msgid "Use a smaller unit instead of a value < 1" msgstr "Použiť menšiu jednotku namiesto hodnoty < 1" @@ -1690,18 +1644,18 @@ msgstr "Použiť menšiu jednotku namiesto hodnoty < 1" msgid "%s : Failed to allocate partition block\n" msgstr "%s : Nepodarilo sa alokovať blok oblasti\n" -#: libparted/fs/amiga/affs.c:79 libparted/fs/amiga/apfs.c:71 +#: 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 : Nepodarilo sa alokovať blok\n" -#: libparted/fs/amiga/affs.c:84 libparted/fs/amiga/apfs.c:76 +#: 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 : Nebolo možné prečítať štartovací blok %llu\n" -#: libparted/fs/amiga/affs.c:98 libparted/fs/amiga/apfs.c:87 +#: 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" @@ -1727,22 +1681,22 @@ msgstr "%s : Chybný kontrolný súčet bloku %llu typu %s\n" msgid "%s : Couldn't write block %d\n" msgstr "%s : Nepodarilo sa zapísať blok %d\n" -#: libparted/fs/amiga/amiga.c:278 +#: libparted/fs/amiga/amiga.c:279 #, c-format msgid "%s : Failed to allocate disk_specific rdb block\n" msgstr "%s : Nepodarilo sa alokovať disk_specific rdb blok\n" -#: libparted/fs/amiga/amiga.c:289 +#: libparted/fs/amiga/amiga.c:290 #, c-format msgid "%s : Didn't find rdb block, should never happen\n" msgstr "%s : Nebol nájdený rdb blok, to by sa nikdy nemalo stať\n" -#: libparted/fs/amiga/amiga.c:318 +#: libparted/fs/amiga/amiga.c:319 #, c-format msgid "%s : Failed to read partition block %llu\n" msgstr "%s : Nepodarilo sa načítať blok oblasti %llu\n" -#: libparted/fs/fat/fat.c:148 libparted/fs/r/fat/fat.c:811 +#: libparted/fs/fat/fat.c:149 msgid "" "GNU Parted was miscompiled: the FAT boot sector should be 512 bytes. FAT " "support will be disabled." @@ -1838,7 +1792,7 @@ msgstr "" "geometria systému sa nezmení. Ak zvolíte Opraviť, CHS geometria systému sa " "zmení na CHS geometriu tabuľky oblastí." -#: libparted/fs/r/fat/bootsector.c:399 +#: libparted/fs/r/fat/bootsector.c:398 #, c-format msgid "" "The information sector has the wrong signature (%x). Select cancel for now, " @@ -1863,12 +1817,12 @@ msgid "" "Cluster start delta = %d, which is not a multiple of the cluster size %d." msgstr "Zmena začiatku klastra = %d, čo nie je násobok veľikosti klastra %d." -#: libparted/fs/r/fat/count.c:144 +#: libparted/fs/r/fat/count.c:84 #, c-format msgid "Bad directory entry for %s: first cluster is the end of file marker." msgstr "Chybná položka adresára pre %s: prvý klaster je značka konca súboru." -#: libparted/fs/r/fat/count.c:157 +#: libparted/fs/r/fat/count.c:97 #, c-format msgid "" "Bad FAT: unterminated chain for %s. You should run dosfsck or scandisk." @@ -1876,7 +1830,7 @@ msgstr "" "Chybná FAT: neukončený reťazec pre %s. Mali by ste spustiť dosfsck alebo " "scandisk." -#: libparted/fs/r/fat/count.c:166 +#: libparted/fs/r/fat/count.c:106 #, c-format msgid "" "Bad FAT: cluster %d outside file system in chain for %s. You should run " @@ -1885,7 +1839,7 @@ msgstr "" "Chybná FAT: klaster %d sa nachádza mimo systému súborov v reťezci pro %s. " "Mali by ste spustiť dosfsck alebo scandisk." -#: libparted/fs/r/fat/count.c:176 +#: libparted/fs/r/fat/count.c:116 #, c-format msgid "" "Bad FAT: cluster %d is cross-linked for %s. You should run dosfsck or " @@ -1894,26 +1848,17 @@ msgstr "" "Chybná FAT: klaster %d má vymenené odkazy s %s. Mali by ste spustiť dosfsck " "alebo scandisk." -#: libparted/fs/r/fat/count.c:195 +#: libparted/fs/r/fat/count.c:135 #, c-format msgid "%s is %dk, but it has %d clusters (%dk)." msgstr "%s je %dk, ale má %d klastrov (%dk)." -#: libparted/fs/r/fat/count.c:258 -#, c-format -msgid "" -"The file %s is marked as a system file. This means moving it could cause " -"some programs to stop working." -msgstr "" -"súbor %s je označený ako systémový súbor. To znamená, že jeho presun môže " -"zpôsobiť, že niektoré programy prestanú fungovať." - -#: libparted/fs/r/fat/fat.c:243 +#: libparted/fs/r/fat/fat.c:244 #, c-format msgid "Partition too big/small for a %s file system." msgstr "Oblasť je príliš veľká/malá pre súborový systém %s" -#: libparted/fs/r/fat/fat.c:409 +#: 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." @@ -1921,11 +1866,11 @@ msgstr "" "Tabuľky FAT si nezodpovedajú. Ak neviete, čo to znamená, zvoľte Zrušiť, " "spustite na systéme súborov scandisk a potom sa vráťte." -#: libparted/fs/r/fat/fat.c:449 +#: libparted/fs/r/fat/fat.c:450 msgid "There are no possible configurations for this FAT type." msgstr "Pro tento typ FAT neexistuje možná konfigurácia." -#: libparted/fs/r/fat/fat.c:461 +#: libparted/fs/r/fat/fat.c:462 #, c-format msgid "" "File system doesn't have expected sizes for Windows to like it. Cluster " @@ -1936,13 +1881,13 @@ msgstr "" "klastra je %dk (očakáva sa %dk); počet klastrov je %d (očakáva sa %d); " "veľkosť FAT je %d sektorov (očakáva sa %d)." -#: libparted/fs/r/fat/fat.c:484 +#: libparted/fs/r/fat/fat.c:485 #, c-format msgid "" "File system is reporting the free space as %d clusters, not %d clusters." msgstr "Systém súborov oznamuje voľné miesto %d klastrov, nie %d klastrov." -#: libparted/fs/r/fat/resize.c:158 +#: 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." @@ -1950,17 +1895,17 @@ msgstr "" "V koreňovom adresári nie je dostatok miesta na všetky súbory. Zvoľte buď " "Zrušiť, alebo Ignorovať, čím sa tieto súbory stratia." -#: libparted/fs/r/fat/resize.c:302 +#: libparted/fs/r/fat/resize.c:303 msgid "Error writing to the root directory." msgstr "Chyba pri zapisování do koreňového adresára." -#: libparted/fs/r/fat/resize.c:495 +#: libparted/fs/r/fat/resize.c:479 msgid "If you leave your file system as FAT16, then you will have no problems." msgstr "" "Ak ponecháte svoj systém súborov vo formáte FAT16, nespôsobíte žiadné nové " "problémy." -#: libparted/fs/r/fat/resize.c:498 +#: 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 " @@ -1970,7 +1915,7 @@ msgstr "" "znova nainštalovať zavádzač systému MS Windows. Ak to chcete urobiť, mali by " "ste si prečítať príručku Parted (alebo príručku svojej distribúcie)." -#: libparted/fs/r/fat/resize.c:506 +#: libparted/fs/r/fat/resize.c:490 msgid "" "If you leave your file system as FAT32, then you will not introduce any new " "problems." @@ -1978,7 +1923,7 @@ msgstr "" "Ak ponecháte svoj systém súborov vo formáte FAT32, nespôsobíte žiadné nové " "problémy." -#: libparted/fs/r/fat/resize.c:510 +#: 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 " @@ -1992,40 +1937,40 @@ msgstr "" "Prevedenie na FAT32 tiež urobí systém súborov nečitateľný pre MS-DOS, MS " "Windows 95a a MS Windows NT." -#: libparted/fs/r/fat/resize.c:524 +#: libparted/fs/r/fat/resize.c:508 #, c-format msgid "%s %s %s" msgstr "%s %s %s" -#: libparted/fs/r/fat/resize.c:525 +#: libparted/fs/r/fat/resize.c:509 msgid "Would you like to use FAT32?" msgstr "Chcete použiť FAT32?" -#: libparted/fs/r/fat/resize.c:556 libparted/fs/r/fat/resize.c:572 +#: 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:557 +#: libparted/fs/r/fat/resize.c:541 msgid "" "The file system can only be resized to this size by converting to FAT16." msgstr "" "Veľkosť systému súborov je možné túto hodnotu zmeniť iba prevodom na FAT16." -#: libparted/fs/r/fat/resize.c:573 +#: libparted/fs/r/fat/resize.c:557 msgid "" "The file system can only be resized to this size by converting to FAT32." msgstr "" "Veľkosť systému súborov je možné túto hodnotu zmeniť iba prevodom na FAT32." -#: libparted/fs/r/fat/resize.c:586 +#: 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 nedokáže zmeniť veľkosť tejto oblasti na túto hodnotu. Pracujeme " "na tom!" -#: libparted/fs/r/fat/table.c:136 +#: 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 " @@ -2034,41 +1979,41 @@ msgstr "" "FAT %d media %x nezdpovedá media %x štartovacieho sektoru. Pravdepodobne by " "ste mali spustiť scandisk." -#: libparted/fs/r/fat/table.c:268 +#: libparted/fs/r/fat/table.c:269 #, c-format msgid "fat_table_set: cluster %ld outside file system" msgstr "fat_table_set: klaster %ld sa nachádza mimo súborového systému" -#: libparted/fs/r/fat/table.c:300 +#: libparted/fs/r/fat/table.c:301 #, c-format msgid "fat_table_get: cluster %ld outside file system" msgstr "fat_table_get: klaster %ld sa nachádza mimo súborového systému" -#: libparted/fs/r/fat/table.c:342 +#: libparted/fs/r/fat/table.c:343 msgid "fat_table_alloc_cluster: no free clusters" msgstr "fat_table_alloc_cluster: nie sú voľné klastre" -#: libparted/fs/r/filesys.c:151 +#: libparted/fs/r/filesys.c:152 msgid "Could not detect file system." msgstr "Nebolo možné detekovať systém súborov." -#: libparted/fs/r/filesys.c:158 libparted/fs/r/filesys.c:285 +#: libparted/fs/r/filesys.c:159 libparted/fs/r/filesys.c:284 #, c-format msgid "resizing %s file systems is not supported" msgstr "zmena veľkosti súborových systémov %s nie je podporovaná" -#: libparted/fs/r/filesys.c:170 +#: libparted/fs/r/filesys.c:171 msgid "The file system is bigger than its volume!" msgstr "Systém súborov je väčší než zväzok, na ktorom sa nachádza!" -#: libparted/fs/r/hfs/advfs.c:121 libparted/fs/r/hfs/advfs_plus.c:121 -#: libparted/fs/r/hfs/reloc.c:413 libparted/fs/r/hfs/reloc.c:507 -#: libparted/fs/r/hfs/reloc_plus.c:538 libparted/fs/r/hfs/reloc_plus.c:656 -#: libparted/fs/r/hfs/reloc_plus.c:769 +#: 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 "Súborový systém obsahuje chyby." -#: libparted/fs/r/hfs/advfs_plus.c:285 +#: libparted/fs/r/hfs/advfs_plus.c:287 msgid "Bad blocks could not be read." msgstr "Nebolo možné prečítať chybné bloky." @@ -2132,61 +2077,61 @@ msgstr "Nebol nájdený sektor %lli súboru HFS+ s CNID %X." msgid "Trying to write HFS+ file with CNID %X behind EOF." msgstr "Pokus o zápis súboru HFS+ s CNID %X za znakom konca súboru." -#: libparted/fs/r/hfs/hfs.c:232 +#: libparted/fs/r/hfs/hfs.c:212 msgid "Sorry, HFS cannot be resized that way yet." msgstr "Prepáčte, veľkosť HFS nie je zatiaľ možné týmto spôsobom zmeniť." -#: libparted/fs/r/hfs/hfs.c:250 libparted/fs/r/hfs/hfs.c:629 +#: libparted/fs/r/hfs/hfs.c:230 libparted/fs/r/hfs/hfs.c:573 msgid "shrinking" msgstr "zmenšujem" -#: libparted/fs/r/hfs/hfs.c:262 libparted/fs/r/hfs/hfs.c:641 +#: libparted/fs/r/hfs/hfs.c:242 libparted/fs/r/hfs/hfs.c:585 msgid "Data relocation has failed." msgstr "Relokácia údajov zlyhala." -#: libparted/fs/r/hfs/hfs.c:281 +#: libparted/fs/r/hfs/hfs.c:261 msgid "Data relocation left some data in the end of the volume." msgstr "Relokácia údajov zanechala na konci zväzku nejaké údaje." -#: libparted/fs/r/hfs/hfs.c:320 +#: libparted/fs/r/hfs/hfs.c:300 msgid "writing HFS Master Directory Block" msgstr "zapisuje sa HFS Master Directory Block" -#: libparted/fs/r/hfs/hfs.c:468 +#: libparted/fs/r/hfs/hfs.c:412 msgid "No valid HFS[+X] signature has been found while opening." msgstr "Počas otvárania nebol nájdený platný podpis HFS[+X]." -#: libparted/fs/r/hfs/hfs.c:478 +#: libparted/fs/r/hfs/hfs.c:422 #, c-format msgid "Version %d of HFS+ isn't supported." msgstr "Verzia %d HFS+ nie je podporovaná." -#: libparted/fs/r/hfs/hfs.c:489 +#: libparted/fs/r/hfs/hfs.c:433 #, c-format msgid "Version %d of HFSX isn't supported." msgstr "Verzia %d HFSX nie je podporovaná." -#: libparted/fs/r/hfs/hfs.c:672 +#: libparted/fs/r/hfs/hfs.c:616 msgid "Data relocation left some data at the end of the volume." msgstr "Relokácia údajov zanechala na konci zväzku nejaké údaje." -#: libparted/fs/r/hfs/hfs.c:720 +#: libparted/fs/r/hfs/hfs.c:664 msgid "Error while writing the allocation file." msgstr "Chyba pri zapisování alokačného súboru." -#: libparted/fs/r/hfs/hfs.c:735 +#: libparted/fs/r/hfs/hfs.c:679 msgid "Error while writing the compatibility part of the allocation file." msgstr "Chyba pri zápise do časti pre komaptibilitu alokačného súboru." -#: libparted/fs/r/hfs/hfs.c:750 +#: libparted/fs/r/hfs/hfs.c:694 msgid "writing HFS+ Volume Header" msgstr "zapisuje sa Hlavička zväzku HFS+" -#: libparted/fs/r/hfs/hfs.c:850 +#: libparted/fs/r/hfs/hfs.c:794 msgid "An error occurred while looking for the mandatory bad blocks file." msgstr "Vyskytla sa chyba pri hľadaní povinného súboru chybných blokov." -#: libparted/fs/r/hfs/hfs.c:904 +#: 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." @@ -2194,27 +2139,27 @@ msgstr "" "Zdá sa, že sa vyskytla chyba v HFS wrapperi: súbor chybných blokov " "neobsahuje vnorený zväzok HFS+." -#: libparted/fs/r/hfs/hfs.c:940 +#: libparted/fs/r/hfs/hfs.c:883 msgid "Sorry, HFS+ cannot be resized that way yet." msgstr "Prepáčte, veľkosť HFS+ nie je zatiaľ možné týmto spôsobom zmeniť." -#: libparted/fs/r/hfs/hfs.c:975 +#: libparted/fs/r/hfs/hfs.c:918 msgid "shrinking embedded HFS+ volume" msgstr "zmenšuje sa vnorený zväzok HFS+" -#: libparted/fs/r/hfs/hfs.c:992 +#: libparted/fs/r/hfs/hfs.c:935 msgid "Resizing the HFS+ volume has failed." msgstr "Zmena veľkosti HFS+ zlyhala." -#: libparted/fs/r/hfs/hfs.c:999 +#: libparted/fs/r/hfs/hfs.c:942 msgid "shrinking HFS wrapper" msgstr "zmenšuje sa HPS wrapper" -#: libparted/fs/r/hfs/hfs.c:1008 +#: libparted/fs/r/hfs/hfs.c:951 msgid "Updating the HFS wrapper has failed." msgstr "Aktualizácia HFS wrappera zlyhala." -#: libparted/fs/r/hfs/hfs.c:1110 libparted/fs/r/hfs/hfs.c:1195 +#: 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 " @@ -2292,7 +2237,7 @@ msgstr "" msgid "An extent has not been relocated." msgstr "Rozsah nebol premiestnený." -#: libparted/fs/r/hfs/reloc.c:250 libparted/fs/r/hfs/reloc_plus.c:307 +#: 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!" @@ -2300,15 +2245,15 @@ msgstr "" "Odkaz na rozsah pochádza z miesta, odkiaľ by nemal. Mali by ste skontrolovať " "súborový systém!" -#: libparted/fs/r/hfs/reloc.c:380 +#: libparted/fs/r/hfs/reloc.c:382 msgid "This HFS volume has no catalog file. This is very unusual!" msgstr "Tento zväzok HFS nemá katalógový súbor. To je veľmi nezvyčajné!" -#: libparted/fs/r/hfs/reloc.c:474 +#: libparted/fs/r/hfs/reloc.c:479 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é!" -#: libparted/fs/r/hfs/reloc.c:516 libparted/fs/r/hfs/reloc_plus.c:666 +#: 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." @@ -2316,52 +2261,52 @@ msgstr "" "Súbor pretečení rozsahov by nemal obsahovať svoje vlastné rozsahy! Mali by " "ste skontrolovať súborový systém!" -#: libparted/fs/r/hfs/reloc.c:573 libparted/fs/r/hfs/reloc_plus.c:844 +#: 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 "Nebolo možné udržiavať kópiu systému súborov v pamäti." -#: libparted/fs/r/hfs/reloc.c:634 libparted/fs/r/hfs/reloc_plus.c:905 +#: libparted/fs/r/hfs/reloc.c:640 libparted/fs/r/hfs/reloc_plus.c:910 msgid "Bad blocks list could not be loaded." msgstr "Zoznam chybných blokov nebolo možné načítať." -#: libparted/fs/r/hfs/reloc.c:648 libparted/fs/r/hfs/reloc_plus.c:921 +#: libparted/fs/r/hfs/reloc.c:654 libparted/fs/r/hfs/reloc_plus.c:926 msgid "An error occurred during extent relocation." msgstr "Vyskytla sa chyba pri premiestňovaní rozsahov." -#: libparted/fs/r/hfs/reloc_plus.c:494 +#: libparted/fs/r/hfs/reloc_plus.c:495 msgid "This HFS+ volume has no catalog file. This is very unusual!" msgstr "Tento zväzok HFS+ nemá katalógový súbor. To je veľmi nezvyčajné!" -#: libparted/fs/r/hfs/reloc_plus.c:617 +#: libparted/fs/r/hfs/reloc_plus.c:620 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:125 +#: parted/parted.c:126 msgid "displays this help message" msgstr "zobrazí túto správu pomocníka" -#: parted/parted.c:126 +#: parted/parted.c:127 msgid "lists partition layout on all block devices" msgstr "vypíše rozloženie oblastí na všetkých blokových zariadeniach" -#: parted/parted.c:127 +#: parted/parted.c:128 msgid "displays machine parseable output" msgstr "zobrazí strojovo čitateľný výstup" -#: parted/parted.c:128 +#: parted/parted.c:129 msgid "never prompts for user intervention" msgstr "nikdy nežiada o zásah používateľa" -#: parted/parted.c:129 +#: parted/parted.c:130 msgid "displays the version" msgstr "zobrazí verziu" -#: parted/parted.c:130 +#: parted/parted.c:131 msgid "alignment for new partitions" msgstr "zarovnanie nových oblastí" -#: parted/parted.c:142 +#: parted/parted.c:143 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" @@ -2369,31 +2314,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:145 +#: parted/parted.c:146 msgid "LABEL-TYPE is one of: " msgstr "TYP-JMENOVKY je jeden z: " -#: parted/parted.c:146 parted/parted.c:147 +#: parted/parted.c:147 parted/parted.c:148 msgid "FLAG is one of: " msgstr "PREPÍNAČ je jeden z: " -#: parted/parted.c:148 +#: parted/parted.c:149 msgid "UNIT is one of: " msgstr "JEDNOTKA je jedno z: " -#: parted/parted.c:149 +#: parted/parted.c:150 msgid "desired alignment: minimum or optimal" msgstr "požadovan zarovnanie: minimálne alebo optimálne" -#: parted/parted.c:150 +#: parted/parted.c:151 msgid "PART-TYPE is one of: primary, logical, extended\n" msgstr "TYP-ODDIELU je jeden z: primary, logical, extended\n" -#: parted/parted.c:152 +#: parted/parted.c:153 msgid "FS-TYPE is one of: " msgstr "TYP-FS je jeden z: " -#: parted/parted.c:153 +#: parted/parted.c:154 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 " @@ -2402,7 +2347,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:156 +#: parted/parted.c:157 #, fuzzy msgid "" "END is disk location, such as 4GB or 10%. Negative value counts from the " @@ -2411,19 +2356,19 @@ 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:159 +#: parted/parted.c:160 msgid "STATE is one of: on, off\n" msgstr "STAV je jeden z: on, off\n" -#: parted/parted.c:160 +#: parted/parted.c:161 msgid "DEVICE is usually /dev/hda or /dev/sda\n" msgstr "zariadenie je obvykle /dev/hda alebo /dev/sda\n" -#: parted/parted.c:161 +#: parted/parted.c:162 msgid "NAME is any word you want\n" msgstr "NÁZEV je ľubovoľné slovo\n" -#: parted/parted.c:164 +#: parted/parted.c:165 msgid "" "Copyright (C) 1998 - 2006 Free Software Foundation, Inc.\n" "This program is free software, covered by the GNU General Public License.\n" @@ -2443,24 +2388,24 @@ msgstr "" "GNU General Public License.\n" "\n" -#: parted/parted.c:212 +#: parted/parted.c:213 #, c-format msgid "%0.f%%\t(time left %.2d:%.2d)" msgstr "%0.f%%\t(zostávajúci čas %.2d:%.2d)" -#: parted/parted.c:231 +#: parted/parted.c:232 #, 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:252 +#: parted/parted.c:253 #, c-format msgid "Partition(s) on %s are being used." msgstr "Oblasti na %s sa používajú." -#: parted/parted.c:264 +#: parted/parted.c:265 #, c-format msgid "" "The existing disk label on %s will be destroyed and all data on this disk " @@ -2469,31 +2414,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:525 +#: parted/parted.c:526 msgid "New disk label type?" msgstr "Typ novej menovky disku?" -#: parted/parted.c:662 +#: parted/parted.c:663 msgid "Partition type?" msgstr "Typ oblasti?" -#: parted/parted.c:680 parted/parted.c:884 +#: parted/parted.c:681 parted/parted.c:885 msgid "Partition name?" msgstr "Názov oblasti?" -#: parted/parted.c:690 +#: parted/parted.c:691 msgid "File system type?" msgstr "Typ súborového systému?" -#: parted/parted.c:695 parted/parted.c:1498 +#: parted/parted.c:696 parted/parted.c:1499 msgid "Start?" msgstr "Začiatok?" -#: parted/parted.c:698 parted/parted.c:1500 parted/parted.c:1569 +#: parted/parted.c:699 parted/parted.c:1501 parted/parted.c:1585 msgid "End?" msgstr "Koniec?" -#: parted/parted.c:766 +#: parted/parted.c:767 #, c-format msgid "" "You requested a partition from %s to %s (sectors %llu..%llu).\n" @@ -2502,7 +2447,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:775 +#: parted/parted.c:776 msgid "" "\n" "Is this still acceptable to you?" @@ -2510,95 +2455,95 @@ msgstr "" "\n" "Je to pre vás ešte prijateľné?" -#: parted/parted.c:798 +#: parted/parted.c:799 #, 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:800 parted/parted.c:1723 +#: parted/parted.c:801 parted/parted.c:1739 msgid "unknown (malloc failed)" msgstr "" -#: parted/parted.c:876 +#: parted/parted.c:877 #, fuzzy, c-format msgid "%s disk labels do not support partition name." msgstr "Menovky disku %s nepodporujú rozšírené oblasti." -#: parted/parted.c:881 parted/parted.c:1561 parted/parted.c:1612 -#: parted/parted.c:1706 parted/parted.c:1781 +#: parted/parted.c:882 parted/parted.c:1564 parted/parted.c:1628 +#: parted/parted.c:1722 parted/parted.c:1797 msgid "Partition number?" msgstr "Číslo oblasti?" -#: parted/parted.c:975 +#: parted/parted.c:976 #, 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:1017 +#: parted/parted.c:1018 #, c-format msgid "Model: %s (%s)\n" msgstr "Model: %s (%s)\n" -#: parted/parted.c:1019 +#: parted/parted.c:1020 #, c-format msgid "Disk %s: %s\n" msgstr "Disk %s: %s\n" -#: parted/parted.c:1020 +#: parted/parted.c:1021 #, c-format msgid "Sector size (logical/physical): %lldB/%lldB\n" msgstr "Veľkosť sektora (logická/fyzická): %lldB/%lldB\n" -#: parted/parted.c:1032 +#: parted/parted.c:1033 #, c-format msgid "Partition Table: %s\n" msgstr "Tabuľka oblastí: %s\n" -#: parted/parted.c:1033 +#: parted/parted.c:1034 #, c-format msgid "Disk Flags: %s\n" msgstr "Príznaky disku: %s\n" -#: parted/parted.c:1153 parted/parted.c:1156 +#: parted/parted.c:1154 parted/parted.c:1157 msgid "Number" msgstr "Číslo" -#: parted/parted.c:1153 parted/parted.c:1156 +#: parted/parted.c:1154 parted/parted.c:1157 msgid "Start" msgstr "Začiatok" -#: parted/parted.c:1154 parted/parted.c:1157 +#: parted/parted.c:1155 parted/parted.c:1158 msgid "End" msgstr "Koniec" -#: parted/parted.c:1157 +#: parted/parted.c:1158 msgid "Size" msgstr "Veľkosť" -#: parted/parted.c:1161 +#: parted/parted.c:1162 msgid "Type" msgstr "Typ" -#: parted/parted.c:1163 +#: parted/parted.c:1164 msgid "File system" msgstr "Súborový systém" -#: parted/parted.c:1166 +#: parted/parted.c:1167 msgid "Name" msgstr "Názov" -#: parted/parted.c:1168 +#: parted/parted.c:1169 msgid "Flags" msgstr "Prepínače" -#: parted/parted.c:1225 +#: parted/parted.c:1226 msgid "Free Space" msgstr "Voľné miesto" -#: parted/parted.c:1385 +#: parted/parted.c:1386 #, c-format msgid "" "A %s %s partition was found at %s -> %s. Do you want to add it to the " @@ -2606,54 +2551,54 @@ msgid "" msgstr "" "Bola nájdená oblasť %s %s na %s -> %s. Chcete ju pridať do tabuľky oblastí?" -#: parted/parted.c:1428 +#: parted/parted.c:1429 msgid "searching for file systems" msgstr "hľadám systémy súborov" -#: parted/parted.c:1535 +#: parted/parted.c:1536 msgid "The resize command has been removed in parted 3.0" msgstr "" -#: parted/parted.c:1583 +#: parted/parted.c:1599 msgid "" "Shrinking a partition can cause data loss, are you sure you want to continue?" msgstr "" -#: parted/parted.c:1636 +#: parted/parted.c:1652 msgid "New device?" msgstr "Nové zariadenie?" -#: parted/parted.c:1704 +#: parted/parted.c:1720 msgid "alignment type(min/opt)" msgstr "typ zarovnania(min/opt)" -#: parted/parted.c:1719 +#: parted/parted.c:1735 #, c-format msgid "%d aligned\n" msgstr "%d zarovnané\n" -#: parted/parted.c:1721 +#: parted/parted.c:1737 #, fuzzy, c-format msgid "%d not aligned: %s\n" msgstr "%d nezarovnané\n" -#: parted/parted.c:1746 parted/parted.c:1783 +#: parted/parted.c:1762 parted/parted.c:1799 msgid "Flag to Invert?" msgstr "Prepínač, který sa má zmeniť?" -#: parted/parted.c:1751 parted/parted.c:1788 +#: parted/parted.c:1767 parted/parted.c:1804 msgid "New state?" msgstr "Nový stav?" -#: parted/parted.c:1834 +#: parted/parted.c:1850 msgid "Unit?" msgstr "Jednotka?" -#: parted/parted.c:1969 +#: parted/parted.c:1985 msgid "align-check" msgstr "kontrola-zarovnania" -#: parted/parted.c:1972 +#: parted/parted.c:1988 #, fuzzy msgid "" "align-check TYPE N check partition N for TYPE(min|opt) " @@ -2662,11 +2607,11 @@ msgstr "" "align-check TYP N skontrolovať zarovnanie TYP(min|" "opt) na oblasti N" -#: parted/parted.c:1980 +#: parted/parted.c:1996 msgid "help" msgstr "help" -#: parted/parted.c:1983 +#: parted/parted.c:1999 msgid "" "help [COMMAND] print general help, or help on " "COMMAND" @@ -2674,15 +2619,15 @@ msgstr "" "help [PRÍKAZ] vypíše všeobecného pomocníka alebo " "pomocníka o PRÍKAZE" -#: parted/parted.c:1989 +#: parted/parted.c:2005 msgid "mklabel" msgstr "mklabel" -#: parted/parted.c:1989 +#: parted/parted.c:2005 msgid "mktable" msgstr "mktable" -#: parted/parted.c:1992 +#: parted/parted.c:2008 msgid "" "mklabel,mktable LABEL-TYPE create a new disklabel (partition " "table)" @@ -2690,15 +2635,15 @@ msgstr "" "mklabel TYP-MENOVKY vytvorí novú menovku disku (tabuľku " "oblastí)" -#: parted/parted.c:1998 +#: parted/parted.c:2014 msgid "mkpart" msgstr "mkpart" -#: parted/parted.c:2001 +#: parted/parted.c:2017 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:2007 +#: parted/parted.c:2023 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" @@ -2706,19 +2651,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:2012 +#: parted/parted.c:2028 msgid "name" msgstr "name" -#: parted/parted.c:2015 +#: parted/parted.c:2031 msgid "name NUMBER NAME name partition NUMBER as NAME" msgstr "name MINOR NÁZOV nazvať oblasť MINOR NÁZVOM" -#: parted/parted.c:2020 +#: parted/parted.c:2036 msgid "print" msgstr "print" -#: parted/parted.c:2023 +#: parted/parted.c:2039 msgid "" "print [devices|free|list,all|NUMBER] display the partition table, " "available devices, free space, all found partitions, or a particular " @@ -2727,7 +2672,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:2028 +#: parted/parted.c:2044 msgid "" "Without arguments, 'print' displays the entire partition table. However with " "the following arguments it performs various other actions.\n" @@ -2735,11 +2680,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:2030 +#: parted/parted.c:2046 msgid " devices : display all active block devices\n" msgstr " devices : zobrazí všetky aktívne blokové zariadenia\n" -#: parted/parted.c:2031 +#: parted/parted.c:2047 msgid "" " free : display information about free unpartitioned space on the " "current block device\n" @@ -2747,33 +2692,33 @@ msgstr "" " free : zobrazí informácie o voľnom mieste nerozdelenom medzi oblasti " "na aktuálnom blokovom zariadení\n" -#: parted/parted.c:2033 +#: parted/parted.c:2049 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:2034 +#: parted/parted.c:2050 msgid "" " NUMBER : display more detailed information about this particular " "partition\n" msgstr "" " ČÍSLO : zobrazí podrobnejšie informácie o tejto konkrétnej oblasti\n" -#: parted/parted.c:2039 +#: parted/parted.c:2055 msgid "quit" msgstr "quit" -#: parted/parted.c:2042 +#: parted/parted.c:2058 msgid "quit exit program" msgstr "quit ukončiť program" -#: parted/parted.c:2047 +#: parted/parted.c:2063 msgid "rescue" msgstr "rescue" -#: parted/parted.c:2050 +#: parted/parted.c:2066 msgid "" "rescue START END rescue a lost partition near START " "and END" @@ -2781,97 +2726,97 @@ msgstr "" "rescue ZAČIATOK KONIEC zachrániť stratenú oblasť v " "blízkosti ZAČIATKU a KONCA" -#: parted/parted.c:2056 +#: parted/parted.c:2072 msgid "resize" msgstr "resize" -#: parted/parted.c:2059 +#: parted/parted.c:2075 msgid "The resize command was removed in parted 3.0\n" msgstr "" -#: parted/parted.c:2062 +#: parted/parted.c:2078 #, fuzzy msgid "resizepart" msgstr "resize" -#: parted/parted.c:2065 +#: parted/parted.c:2081 #, fuzzy msgid "resizepart NUMBER END resize partition NUMBER" msgstr "move ČÍSLO ZAČIATOK KONIEC presunúť oblasť ČÍSLO" -#: parted/parted.c:2070 +#: parted/parted.c:2086 msgid "rm" msgstr "rm" -#: parted/parted.c:2073 +#: parted/parted.c:2089 msgid "rm NUMBER delete partition NUMBER" msgstr "rm MINOR odstrániť oblasť MINOR" -#: parted/parted.c:2078 +#: parted/parted.c:2094 msgid "select" msgstr "select" -#: parted/parted.c:2081 +#: parted/parted.c:2097 msgid "select DEVICE choose the device to edit" msgstr "" "select zariadenie zvoliť zariadenie, ktoré sa má " "upravovať" -#: parted/parted.c:2086 +#: parted/parted.c:2102 msgid "disk_set" msgstr "sada_diskov" -#: parted/parted.c:2089 +#: parted/parted.c:2105 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:2094 +#: parted/parted.c:2110 msgid "disk_toggle" msgstr "disk_toggle" -#: parted/parted.c:2097 +#: parted/parted.c:2113 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:2103 +#: parted/parted.c:2119 msgid "set" msgstr "set" -#: parted/parted.c:2106 +#: parted/parted.c:2122 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:2112 +#: parted/parted.c:2128 msgid "toggle" msgstr "toggle" -#: parted/parted.c:2115 +#: parted/parted.c:2131 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:2121 +#: parted/parted.c:2137 msgid "unit" msgstr "unit" -#: parted/parted.c:2124 +#: parted/parted.c:2140 msgid "unit UNIT set the default unit to UNIT" msgstr "" "unit JEDNOTKA nastaviť predvolenú jednotku na " "JEDNOTKA" -#: parted/parted.c:2129 +#: parted/parted.c:2145 msgid "version" msgstr "version" -#: parted/parted.c:2132 +#: parted/parted.c:2148 msgid "" "version display the version number and " "copyright information of GNU Parted" @@ -2879,7 +2824,7 @@ msgstr "" "version zobrazí verziu a informácie o " "autorských právach GNU Parted" -#: parted/parted.c:2136 +#: parted/parted.c:2152 msgid "" "'version' displays copyright and version information corresponding to this " "copy of GNU Parted\n" @@ -2887,29 +2832,37 @@ msgstr "" "„version“ zobrazí informácie o autorských právach a verzii tejto kópie GNU " "Parted\n" -#: parted/parted.c:2204 +#: parted/parted.c:2220 #, c-format msgid "Usage: %s [-hlmsv] [-a] [DEVICE [COMMAND [PARAMETERS]]...]\n" msgstr "" "Použitie: %s [-hlmsv] [-a] [ZARIADENIE [PRÍKAZ [PARAMETRE]]...]\n" -#: parted/parted.c:2248 +#: parted/parted.c:2264 msgid "No device found" msgstr "Nebolo nájdené žiadne zariadenie" -#: parted/parted.c:2285 +#: parted/parted.c:2301 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:2325 +#: parted/parted.c:2334 +msgid "" +"You should reinstall your boot loader before rebooting. Read section 4 of " +"the Parted User documentation for more information." +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:2341 msgid "You may need to update /etc/fstab.\n" msgstr "Môže byť potrebné aktualizovať /etc/fstab.\n" -#: parted/ui.c:164 +#: parted/ui.c:165 msgid "Welcome to GNU Parted! Type 'help' to view a list of commands.\n" msgstr "Vitajte v GNU Parted! Zoznam príkazov zobrazíte napísaním „help“.\n" -#: parted/ui.c:167 +#: parted/ui.c:168 msgid "" "Usage: parted [OPTION]... [DEVICE [COMMAND [PARAMETERS]...]...]\n" "Apply COMMANDs with PARAMETERS to DEVICE. If no COMMAND(s) are given, run " @@ -2920,7 +2873,7 @@ msgstr "" "Vykonať PRÍKAZy s PARAMETRami na ZARIADENIE. Ak nie je zadaný PRÍKAZ, beží v " "interaktívnom režime.\n" -#: parted/ui.c:172 +#: parted/ui.c:173 #, c-format msgid "" "\n" @@ -2981,7 +2934,7 @@ msgstr "" "ďalšie informácie o vašom systéme, ktoré považujete za\n" "relevantné.\n" -#: parted/ui.c:293 +#: parted/ui.c:294 msgid "" "\n" "Command History:\n" @@ -2989,7 +2942,7 @@ msgstr "" "\n" "História príkazov:\n" -#: parted/ui.c:356 +#: parted/ui.c:357 msgid "" "\n" "Error: SEGV_MAPERR (Address not mapped to object)\n" @@ -2997,7 +2950,7 @@ msgstr "" "\n" "Chyba: SEGV_MAPERR (Adresa nemá mapovanie na objekt)\n" -#: parted/ui.c:362 +#: parted/ui.c:363 msgid "" "\n" "Error: SEGV_ACCERR (Invalid permissions for mapped object)\n" @@ -3005,7 +2958,7 @@ msgstr "" "\n" "Chyba: SEGV_ACCERR (Neplatné oprávnenia mapovaného objektu)\n" -#: parted/ui.c:367 +#: parted/ui.c:368 msgid "" "\n" "Error: A general SIGSEGV signal was encountered.\n" @@ -3013,7 +2966,7 @@ msgstr "" "\n" "Chyba: Vyskytol sa všeobecný signál SIGSEGV.\n" -#: parted/ui.c:391 +#: parted/ui.c:392 msgid "" "\n" "Error: FPE_INTDIV (Integer: divide by zero)" @@ -3021,7 +2974,7 @@ msgstr "" "\n" "Chyba: FPE_INTDIV (Celé číslo: delenie nulou)" -#: parted/ui.c:396 +#: parted/ui.c:397 msgid "" "\n" "Error: FPE_INTOVF (Integer: overflow)" @@ -3029,7 +2982,7 @@ msgstr "" "\n" "Chyba: FPE_INTOVF (Celé číslo: pretečenie)" -#: parted/ui.c:401 +#: parted/ui.c:402 msgid "" "\n" "Error: FPE_FLTDIV (Float: divide by zero)" @@ -3037,7 +2990,7 @@ msgstr "" "\n" "Chyba: FPE_FLTDIV (Desatinné číslo: delenie nulou)" -#: parted/ui.c:406 +#: parted/ui.c:407 msgid "" "\n" "Error: FPE_FLTOVF (Float: overflow)" @@ -3045,7 +2998,7 @@ msgstr "" "\n" "Chyba: FPE_FLTOVF (Desatinné číslo: pretečenie)" -#: parted/ui.c:411 +#: parted/ui.c:412 msgid "" "\n" "Error: FPE_FLTUND (Float: underflow)" @@ -3053,7 +3006,7 @@ msgstr "" "\n" "Chyba: FPE_FLTUND (Desatinné číslo: podtečenie)" -#: parted/ui.c:416 +#: parted/ui.c:417 msgid "" "\n" "Error: FPE_FLTRES (Float: inexact result)" @@ -3061,7 +3014,7 @@ msgstr "" "\n" "Chyba: FPE_FLTRES (Desatinné číslo: nepresný výsledok)" -#: parted/ui.c:421 +#: parted/ui.c:422 msgid "" "\n" "Error: FPE_FLTINV (Float: invalid operation)" @@ -3069,7 +3022,7 @@ msgstr "" "\n" "Chyba: FPE_FLTINV (Desatinné číslo: neplatná operácia)" -#: parted/ui.c:426 +#: parted/ui.c:427 msgid "" "\n" "Error: FPE_FLTSUB (Float: subscript out of range)" @@ -3077,7 +3030,7 @@ msgstr "" "\n" "Chyba: FPE_FLTSUB (Desatinné číslo: dolný index mimo rozsahu)" -#: parted/ui.c:431 +#: parted/ui.c:432 msgid "" "\n" "Error: A general SIGFPE signal was encountered." @@ -3085,7 +3038,7 @@ msgstr "" "\n" "Chyba: Vyskytol sa všeobecný signál SIGFPE." -#: parted/ui.c:455 +#: parted/ui.c:456 msgid "" "\n" "Error: ILL_ILLOPC (Illegal Opcode)" @@ -3093,7 +3046,7 @@ msgstr "" "\n" "Chyba: ILL_ILLOPC (Neplatný opkód)" -#: parted/ui.c:460 +#: parted/ui.c:461 msgid "" "\n" "Error: ILL_ILLOPN (Illegal Operand)" @@ -3101,7 +3054,7 @@ msgstr "" "\n" "Chyba: ILL_ILLOPN (Neplatný operand)" -#: parted/ui.c:465 +#: parted/ui.c:466 msgid "" "\n" "Error: ILL_ILLADR (Illegal addressing mode)" @@ -3109,7 +3062,7 @@ msgstr "" "\n" "Chyba: ILL_ILLADR (Neplatný režim adresácie)" -#: parted/ui.c:470 +#: parted/ui.c:471 msgid "" "\n" "Error: ILL_ILLTRP (Illegal Trap)" @@ -3117,7 +3070,7 @@ msgstr "" "\n" "Chyba: ILL_ILLTRP (Neplatné zachytenie)" -#: parted/ui.c:475 +#: parted/ui.c:476 msgid "" "\n" "Error: ILL_PRVOPC (Privileged Opcode)" @@ -3125,7 +3078,7 @@ msgstr "" "\n" "Chyba: ILL_PRVOPC (Privilegovaný opkód)" -#: parted/ui.c:480 +#: parted/ui.c:481 msgid "" "\n" "Error: ILL_PRVREG (Privileged Register)" @@ -3133,7 +3086,7 @@ msgstr "" "\n" "Chyba: ILL_PRVREG (Privilegovaný register)" -#: parted/ui.c:485 +#: parted/ui.c:486 msgid "" "\n" "Error: ILL_COPROC (Coprocessor Error)" @@ -3141,7 +3094,7 @@ msgstr "" "\n" "Chyba: ILL_COPROC (Chyba koprocesora)" -#: parted/ui.c:490 +#: parted/ui.c:491 msgid "" "\n" "Error: ILL_BADSTK (Internal Stack Error)" @@ -3149,7 +3102,7 @@ msgstr "" "\n" "Chyba: ILL_BADSTK (Vnútorná chyba zásobníka)" -#: parted/ui.c:495 +#: parted/ui.c:496 msgid "" "\n" "Error: A general SIGILL signal was encountered." @@ -3157,69 +3110,69 @@ msgstr "" "\n" "Chyba: Vyskytol sa všeobecný signál SIGILL." -#: parted/ui.c:888 +#: parted/ui.c:889 #, c-format msgid "invalid token: %s" msgstr "neplatný token: %s" -#: parted/ui.c:1069 +#: parted/ui.c:1070 msgid "Expecting a partition number." msgstr "Očakáva sa číslo oblasti." -#: parted/ui.c:1078 +#: parted/ui.c:1079 msgid "Partition doesn't exist." msgstr "Oblasť neexistuje." -#: parted/ui.c:1098 +#: parted/ui.c:1099 msgid "Expecting a file system type." msgstr "Očakáva sa typ systému súborov." -#: parted/ui.c:1105 +#: parted/ui.c:1106 #, c-format msgid "Unknown file system type \"%s\"." msgstr "Neznámy typ systému súborov „%s“." -#: parted/ui.c:1126 +#: parted/ui.c:1127 msgid "Expecting a disk label type." msgstr "Očakáva sa typ menovky disku." -#: parted/ui.c:1157 parted/ui.c:1193 +#: parted/ui.c:1158 parted/ui.c:1194 msgid "No flags supported" msgstr "" -#: parted/ui.c:1267 +#: parted/ui.c:1268 msgid "Can't create any more partitions." msgstr "Nie je možné vytvoriť ďalšie oblasti." -#: parted/ui.c:1277 +#: parted/ui.c:1278 msgid "Expecting a partition type." msgstr "Očakáva sa typ oblasti." -#: parted/ui.c:1426 +#: parted/ui.c:1427 msgid "on" msgstr "zap" -#: parted/ui.c:1427 +#: parted/ui.c:1428 msgid "off" msgstr "vyp" -#: parted/ui.c:1444 +#: parted/ui.c:1445 msgid "optimal" msgstr "optimálne" -#: parted/ui.c:1445 +#: parted/ui.c:1446 msgid "minimal" msgstr "minimálne" -#: parted/ui.c:1578 +#: parted/ui.c:1579 msgid "OPTIONs:" msgstr "VOĽBY:" -#: parted/ui.c:1583 +#: parted/ui.c:1584 msgid "COMMANDs:" msgstr "PRÍKAZy:" -#: parted/ui.c:1586 +#: parted/ui.c:1587 #, c-format msgid "" "\n" @@ -3228,33 +3181,78 @@ msgstr "" "\n" "Chyby hláste <%s>.\n" -#: parted/ui.c:1593 +#: parted/ui.c:1594 #, c-format msgid "Using %s\n" msgstr "Používa sa %s\n" -#: parted/ui.c:1673 +#: parted/ui.c:1674 msgid "This command does not make sense in non-interactive mode.\n" msgstr "Príkaz nedáva zmysel v neinteraktívnom režime.\n" +#, c-format #~ msgid "%s: option '--%s' doesn't allow an argument\n" #~ msgstr "%s: voľba „--%s“ nepovoľuje argument\n" +#, c-format #~ msgid "%s: unrecognized option '--%s'\n" #~ msgstr "%s: nerozpoznaná voľba „--%s“\n" +#, c-format #~ msgid "%s: option '-W %s' doesn't allow an argument\n" #~ msgstr "%s: voľba „-W %s“ nepovoľuje argument\n" +#, c-format #~ msgid "%s: option '-W %s' requires an argument\n" #~ msgstr "%s: voľba „-W %s“ vyžaduje argument\n" +#, c-format #~ msgid "%s home page: \n" #~ msgstr "Domovská stránka %s: \n" +#, c-format +#~ msgid "invalid %s%s argument '%s'" +#~ msgstr "neplatný %s%s argument „%s“" + +#, c-format +#~ msgid "invalid suffix in %s%s argument '%s'" +#~ msgstr "neplatná prípona v %s%s argument „%s“" + +#, c-format +#~ msgid "%s%s argument '%s' too large" +#~ msgstr "%s%s argument „%s“ príliš veľký" + +#~ msgid "" +#~ "The partition table cannot be re-read. This means you need to reboot " +#~ "before mounting any modified partitions. You also need to reinstall your " +#~ "boot loader before you reboot (which may require mounting modified " +#~ "partitions). It is impossible do both things! So you'll need to boot " +#~ "off a rescue disk, and reinstall your boot loader from the rescue disk. " +#~ "Read section 4 of the Parted User documentation for more information." +#~ msgstr "" +#~ "Nebolo možné znovu načítať tabuľku oblastí, takže budete musieť pred " +#~ "pripojením zmenených oblastí reštartovať počítač. Tiež musíte pred " +#~ "reštartom znovu nainštalovať svoj zavádzač systému (čo môže vyžadovať " +#~ "pripojenie zmenených oblastí). Nie je možné vykonať oboje! Takže budete " +#~ "musieť zaviesť systém zo záchranného disku a znovu nainštalovať svoj " +#~ "zavádzač systému odtiaľ. Podrobnejšie informácie sa dočítate v kapitole 4 " +#~ "Používateľskej dokumentácie Parted." + +#, 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 " +#~ "computer before doing anything with %s." +#~ msgstr "" +#~ "Tabuľku oblastí na %s nie je možné znovu načítať (%s). To znamená, že " +#~ "Hurd nevie nič o zmenách, ktoré ste vykonali. Než budete čokoľvek robiť s " +#~ "%s, mali by ste reštartovať svoj počítač." + +#, c-format #~ msgid "Failed to add partition %d (%s)" #~ msgstr "Nepodarilo sa pridať oblasť %d (%s)" +#, c-format #~ msgid "" #~ "parted was unable to re-read the partition table on %s (%s). This means " #~ "Linux won't know anything about the modifications you made. " @@ -3262,6 +3260,7 @@ 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." +#, c-format #~ msgid "" #~ "%s contains GPT signatures, indicating that it has a GPT table. However, " #~ "it does not have a valid fake msdos partition table, as it should. " @@ -3275,6 +3274,10 @@ msgstr "Príkaz nedáva zmysel v neinteraktívnom režime.\n" #~ "ste možno odstránili tabuľku oblastí GPT a teraz používate tabuľku " #~ "oblastí DOS. Je toto tabuľka oblastí GPT?" +#~ msgid "The boot region doesn't start at the start of the partition." +#~ msgstr "Štartovacia oblasť nezačína na začiatku oblasti." + +#, 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." @@ -3282,6 +3285,14 @@ msgstr "Príkaz nedáva zmysel v neinteraktívnom režime.\n" #~ "Systém súborov má logickú veľkost sektora %d. Je známe, že GNU Parted " #~ "nepracuje správne s veľkosťou sektora inou ako 512 bajtov." +#, c-format +#~ msgid "" +#~ "The file %s is marked as a system file. This means moving it could cause " +#~ "some programs to stop working." +#~ msgstr "" +#~ "súbor %s je označený ako systémový súbor. To znamená, že jeho presun môže " +#~ "zpôsobiť, že niektoré programy prestanú fungovať." + #~ msgid "" #~ "Usage: %s [OPTION]\n" #~ " or: %s DEVICE MINOR\n" diff --git a/po/sl.gmo b/po/sl.gmo index 8806b59240999123c8c716ee95cff31cd616ecf1..ac914b2aa0761291c1fec8646fd9b2af982cc235 100644 GIT binary patch delta 10610 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 delta 12004 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\n" "Language-Team: Slovenian \n" @@ -100,11 +100,11 @@ msgstr "%s: možnost zahteva argument -- '%c'\n" #. If you don't know what to put here, please see #. #. and use glyphs suitable for your language. -#: lib/quotearg.c:362 +#: lib/quotearg.c:355 msgid "`" msgstr "\"" -#: lib/quotearg.c:363 +#: lib/quotearg.c:356 msgid "'" msgstr "\"" @@ -372,79 +372,64 @@ msgstr "" msgid "memory exhausted" msgstr "pomnilnik je porabljen" -#: lib/xstrtol-error.c:63 -#, fuzzy, c-format -msgid "invalid %s%s argument '%s'" -msgstr "neveljaven %s%s argument `%s'" - -#: lib/xstrtol-error.c:68 -#, fuzzy, c-format -msgid "invalid suffix in %s%s argument '%s'" -msgstr "neveljavna pripona v %s%s argument `%s'" - -#: lib/xstrtol-error.c:72 -#, fuzzy, c-format -msgid "%s%s argument '%s' too large" -msgstr "%s%s: argument `%s' je prevelik" - -#: libparted/arch/beos.c:245 +#: libparted/arch/beos.c:246 msgid "Disk Image" msgstr "Odtis diska" -#: libparted/arch/beos.c:346 libparted/arch/gnu.c:277 +#: libparted/arch/beos.c:347 libparted/arch/gnu.c:277 #: libparted/arch/linux.c:1731 #, c-format msgid "Error opening %s: %s" msgstr "Napaka med odpiranjem %s: %s" -#: libparted/arch/beos.c:357 libparted/arch/gnu.c:287 +#: libparted/arch/beos.c:358 libparted/arch/gnu.c:287 #: libparted/arch/linux.c:1742 #, c-format msgid "Unable to open %s read-write (%s). %s has been opened read-only." msgstr "" "%s ni mogoče odpreti za branje in pisanje (%s). %s je odprt samo za branje." -#: libparted/arch/beos.c:419 libparted/arch/linux.c:1907 +#: libparted/arch/beos.c:420 libparted/arch/linux.c:1907 #, c-format msgid "%s during seek for read on %s" msgstr "%s med iskanjem za branje na %s" -#: libparted/arch/beos.c:452 libparted/arch/gnu.c:465 libparted/arch/gnu.c:564 -#: libparted/arch/gnu.c:692 libparted/arch/linux.c:1867 +#: libparted/arch/beos.c:453 libparted/arch/gnu.c:425 libparted/arch/gnu.c:524 +#: libparted/arch/gnu.c:652 libparted/arch/linux.c:1867 #: libparted/arch/linux.c:1949 #, c-format msgid "%s during read on %s" msgstr "%s med branjem na %s" -#: libparted/arch/beos.c:488 libparted/arch/gnu.c:525 +#: libparted/arch/beos.c:489 libparted/arch/gnu.c:485 #: libparted/arch/linux.c:2026 #, c-format msgid "Can't write to %s, because it is opened read-only." msgstr "Pisanje v %s ni mogoče, ker je odprt samo za branje." -#: libparted/arch/beos.c:504 libparted/arch/linux.c:2051 +#: libparted/arch/beos.c:505 libparted/arch/linux.c:2051 #, c-format msgid "%s during seek for write on %s" msgstr "%s med iskanjem za pisanje na %s" -#: libparted/arch/beos.c:541 libparted/arch/gnu.c:601 libparted/arch/gnu.c:646 -#: libparted/arch/gnu.c:723 libparted/arch/linux.c:1999 +#: libparted/arch/beos.c:542 libparted/arch/gnu.c:561 libparted/arch/gnu.c:606 +#: libparted/arch/gnu.c:683 libparted/arch/linux.c:1999 #: libparted/arch/linux.c:2094 libparted/arch/linux.c:2167 #, c-format msgid "%s during write on %s" msgstr "%s med pisanjem na %s" -#: partprobe/partprobe.c:148 +#: partprobe/partprobe.c:149 #, c-format msgid "Try `%s --help' for more information.\n" msgstr "Poskusite `%s --help' za več podrobnosti.\n" -#: partprobe/partprobe.c:152 +#: partprobe/partprobe.c:153 #, c-format msgid "Usage: %s [OPTION] [DEVICE]...\n" msgstr "Uporaba: %s [MOŽNOSTI] [NAPRAVE] ...\n" -#: partprobe/partprobe.c:153 +#: partprobe/partprobe.c:154 msgid "" "Inform the operating system about partition table changes.\n" "\n" @@ -460,7 +445,7 @@ msgstr "" " -h, --help prikaže to pomoč in konča\n" " -v, --version prikaže podrobnosti o različici in konča\n" -#: partprobe/partprobe.c:161 +#: partprobe/partprobe.c:162 msgid "" "\n" "When no DEVICE is given, probe all partitions.\n" @@ -468,7 +453,7 @@ msgstr "" "\n" "Ko NAPRAVA ni podana, preišče vse razdelke.\n" -#: partprobe/partprobe.c:165 +#: partprobe/partprobe.c:166 #, c-format msgid "" "\n" @@ -486,44 +471,7 @@ msgstr "Ni bilo mogoče odpreti %s." msgid "Unable to probe store." msgstr "Zaloge ni mogoče preveriti." -#: libparted/arch/gnu.c:368 -msgid "" -"The partition table cannot be re-read. This means you need to reboot before " -"mounting any modified partitions. You also need to reinstall your boot " -"loader before you reboot (which may require mounting modified partitions). " -"It is impossible do both things! So you'll need to boot off a rescue disk, " -"and reinstall your boot loader from the rescue disk. Read section 4 of the " -"Parted User documentation for more information." -msgstr "" -"Preglednice razdelkov ni bilo mogoče znova prebrati. To pomeni, da je " -"potreben ponoven zagon pred priklapljanjem spremenjenih razdelkov. Pred " -"ponovnim zagonom je treba tudi znova namestiti zagonski nalagalnik (kar " -"morda zahteva priklapljanje spremenjenih razdelkov). Nemogoče je storiti " -"oboje! Sistem boste morali zagnati z reševalnega diska in z njega znova " -"namestiti zagonski nalagalnik. Za več podrobnosti si preberite poglavje 4 v " -"uporabniškem priročniku Parted." - -#: libparted/arch/gnu.c:385 -#, 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 computer " -"before doing anything with %s." -msgstr "" -"Preglednice razdelkov na %s ni mogoče znova prebrati (%s). To pomeni, da " -"Hurd ne ve nič o vaših spremembah. Računalnik morate pred nadaljnjim delom " -"znova zagnati z %s." - -#: libparted/arch/gnu.c:396 parted/parted.c:2318 -msgid "" -"You should reinstall your boot loader before rebooting. Read section 4 of " -"the Parted User documentation for more information." -msgstr "" -"Pred ponovnim zagonom priporočamo ponovno namestitev zagonskega nalagalnika. " -"Za več podrobnosti si preberite odstavek 4 v uporabniški dokumentaciji " -"Parted." - -#: libparted/arch/gnu.c:788 +#: libparted/arch/gnu.c:748 #, c-format msgid "%s trying to sync %s to disk" msgstr "%s poizkus usklajevanja %s z diskom" @@ -840,15 +788,15 @@ msgstr "metapodatki" msgid "free" msgstr "prosto" -#: libparted/disk.c:2355 parted/ui.c:1258 parted/ui.c:1286 +#: libparted/disk.c:2355 parted/ui.c:1259 parted/ui.c:1287 msgid "extended" msgstr "razširjen" -#: libparted/disk.c:2357 parted/ui.c:1262 parted/ui.c:1290 +#: libparted/disk.c:2357 parted/ui.c:1263 parted/ui.c:1291 msgid "logical" msgstr "logični" -#: libparted/disk.c:2359 parted/ui.c:1254 parted/ui.c:1282 +#: libparted/disk.c:2359 parted/ui.c:1255 parted/ui.c:1283 msgid "primary" msgstr "osnovni" @@ -926,64 +874,73 @@ msgstr "" msgid "esp" msgstr "Da" -#: libparted/disk.c:2415 +#: libparted/disk.c:2411 +msgid "chromeos_kernel" +msgstr "" + +#: libparted/disk.c:2413 +#, fuzzy +msgid "bls_boot" +msgstr "zagon" + +#: libparted/disk.c:2419 #, c-format msgid "Unknown partition flag, %d." msgstr "Neznana zastavica razdelka, %d." -#: libparted/exception.c:78 +#: libparted/exception.c:79 msgid "Information" msgstr "Podrobnosti" -#: libparted/exception.c:79 +#: libparted/exception.c:80 msgid "Warning" msgstr "Opozorilo" -#: libparted/exception.c:80 +#: libparted/exception.c:81 msgid "Error" msgstr "Napaka" -#: libparted/exception.c:81 +#: libparted/exception.c:82 msgid "Fatal" msgstr "Usodno" -#: libparted/exception.c:82 +#: libparted/exception.c:83 msgid "Bug" msgstr "Hrošč" -#: libparted/exception.c:83 +#: libparted/exception.c:84 msgid "No Implementation" msgstr "Ni podprto" -#: libparted/exception.c:87 +#: libparted/exception.c:88 msgid "Fix" msgstr "Popravi" -#: libparted/exception.c:88 +#: libparted/exception.c:89 msgid "Yes" msgstr "Da" -#: libparted/exception.c:89 +#: libparted/exception.c:90 msgid "No" msgstr "Ne" -#: libparted/exception.c:90 +#: libparted/exception.c:91 msgid "OK" msgstr "V redu" -#: libparted/exception.c:91 +#: libparted/exception.c:92 msgid "Retry" msgstr "Poskusi znova" -#: libparted/exception.c:92 +#: libparted/exception.c:93 msgid "Ignore" msgstr "Prezri" -#: libparted/exception.c:93 +#: libparted/exception.c:94 msgid "Cancel" msgstr "Prekliči" -#: libparted/exception.c:133 +#: libparted/exception.c:134 #, fuzzy, c-format msgid "" "A bug has been detected in GNU Parted. Refer to the web site of parted " @@ -997,25 +954,25 @@ msgstr "" "bug-parted@gnu.org vsaj s podatki o različici (%s) in naslednjim " "sporočilom: " -#: libparted/labels/aix.c:91 +#: libparted/labels/aix.c:92 msgid "Support for reading AIX disk labels is is not implemented yet." msgstr "Podpora za branje diskov oznake AIX še ni dodana." -#: libparted/labels/aix.c:102 +#: libparted/labels/aix.c:103 msgid "Support for writing AIX disk labels is is not implemented yet." msgstr "Podpora za pisanje diskov oznake AIX še ni dodana." -#: libparted/labels/aix.c:115 +#: libparted/labels/aix.c:116 msgid "" "Support for adding partitions to AIX disk labels is not implemented yet." msgstr "Podpora za dodajanje razdelkov diskom oznake AIX še ni dodana." -#: libparted/labels/aix.c:125 +#: libparted/labels/aix.c:126 msgid "" "Support for duplicating partitions in AIX disk labels is not implemented yet." msgstr "Podpora za podvajanje razdelkov diskov oznake AIX še ni dodana." -#: libparted/labels/aix.c:143 +#: libparted/labels/aix.c:144 msgid "" "Support for setting system type of partitions in AIX disk labels is not " "implemented yet." @@ -1023,7 +980,7 @@ msgstr "" "Podpora za nastavljanje vrste sistema razdelkov v diskih oznake AIX še ni " "dodana." -#: libparted/labels/aix.c:153 +#: libparted/labels/aix.c:154 msgid "Support for setting flags in AIX disk labels is not implemented yet." msgstr "Podpora za nastavljanje zastavic diskov oznake AIX še ni dodana." @@ -1113,11 +1070,11 @@ msgid "" "partitions, if XGM is the first one it counts for two)." msgstr "" -#: libparted/labels/atari.c:1657 libparted/labels/bsd.c:567 -#: libparted/labels/dasd.c:894 libparted/labels/dos.c:2276 -#: libparted/labels/dvh.c:770 libparted/labels/gpt.c:2050 -#: libparted/labels/loop.c:243 libparted/labels/mac.c:1423 -#: libparted/labels/pc98.c:701 libparted/labels/rdb.c:1054 +#: libparted/labels/atari.c:1657 libparted/labels/bsd.c:563 +#: libparted/labels/dasd.c:895 libparted/labels/dos.c:2283 +#: libparted/labels/dvh.c:770 libparted/labels/gpt.c:2140 +#: 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 "Vsem omejitvam razdelka ni mogoče zadostiti." @@ -1133,44 +1090,44 @@ msgstr "" msgid "Unable to allocate a partition number." msgstr "Dodeljevanje številke razdelka ni uspelo." -#: libparted/labels/bsd.c:592 +#: libparted/labels/bsd.c:588 msgid "Unable to allocate a bsd disklabel slot." msgstr "Dodeljevanje reže bsd disklabel ni uspelo." -#: libparted/labels/dasd.c:625 +#: libparted/labels/dasd.c:626 msgid "The partition table of DASD-LDL device cannot be changed.\n" msgstr "" -#: libparted/labels/dasd.c:920 +#: libparted/labels/dasd.c:921 msgid "Unable to allocate a dasd disklabel slot" msgstr "Dodeljevanje reže dasd disklabel ni uspelo." -#: libparted/labels/dos.c:1003 +#: libparted/labels/dos.c:1006 #, 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:1031 +#: libparted/labels/dos.c:1034 #, c-format msgid "Invalid partition table - recursive partition on %s." msgstr "Neveljavna preglednica razdelka - rekurzivni razdelek na %s." -#: libparted/labels/dos.c:1560 +#: libparted/labels/dos.c:1557 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:1572 +#: libparted/labels/dos.c:1569 #, 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:2258 +#: libparted/labels/dos.c:2265 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:2514 +#: libparted/labels/dos.c:2521 #, fuzzy msgid "cannot create any more partitions" msgstr "Novih razdelkov ni mogoče ustvariti." @@ -1313,12 +1270,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:531 +#: libparted/labels/gpt.c:541 #, fuzzy msgid "device is too small for GPT" msgstr "Naprava je premajhna za %lu blokov." -#: libparted/labels/gpt.c:733 +#: libparted/labels/gpt.c:743 #, fuzzy, c-format msgid "" "The format of the GPT partition table is version %x, which is newer than " @@ -1327,7 +1284,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:769 +#: libparted/labels/gpt.c:779 #, c-format msgid "" "Not all of the space available to %s appears to be used, you can fix the GPT " @@ -1338,7 +1295,7 @@ msgstr "" "uporabljal ves prostor (dodatnih %llu blokov) ali pa nadaljujte s trenutnimi " "nastavitvami. " -#: libparted/labels/gpt.c:1008 +#: libparted/labels/gpt.c:1024 #, fuzzy msgid "" "The backup GPT table is not at the end of the disk, as it should be. Fix, " @@ -1349,7 +1306,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:1026 +#: libparted/labels/gpt.c:1042 msgid "" "Both the primary and backup GPT tables are corrupt. Try making a fresh " "table, and using Parted's rescue feature to recover partitions." @@ -1358,7 +1315,7 @@ msgstr "" "narediti svežo preglednico in z reševalno možnostjo programa Parted obnoviti " "razdelke." -#: libparted/labels/gpt.c:1037 +#: libparted/labels/gpt.c:1053 msgid "" "The backup GPT table is corrupt, but the primary appears OK, so that will be " "used." @@ -1366,7 +1323,7 @@ msgstr "" "Varnostna kopija preglednice GPT je pokvarjena, vendar je osnovna videti v " "redu, zato bo uporabljena." -#: libparted/labels/gpt.c:1049 +#: libparted/labels/gpt.c:1065 msgid "" "The primary GPT table is corrupt, but the backup appears OK, so that will be " "used." @@ -1374,11 +1331,11 @@ msgstr "" "Osnovna preglednica GPT je pokvarjena, vendar je varnostna kopija v redu, " "zato bo uporabljena." -#: libparted/labels/gpt.c:1073 +#: libparted/labels/gpt.c:1089 msgid "primary partition table array CRC mismatch" msgstr "polje osnovne preglednice razdelka ima nujemajoč CRC" -#: libparted/labels/gpt.c:1936 libparted/labels/gpt.c:1963 +#: libparted/labels/gpt.c:2026 libparted/labels/gpt.c:2053 #, fuzzy msgid "failed to translate partition name" msgstr "Dodeljevanje številke razdelka ni uspelo." @@ -1412,25 +1369,21 @@ msgid "The data region doesn't start at the start of the partition." msgstr "Področje podatkov se ne začne na začetku razdelka." #: libparted/labels/mac.c:572 -msgid "The boot region doesn't start at the start of the partition." -msgstr "Zagonsko področje se ne začne na začetku razdelka." - -#: libparted/labels/mac.c:586 msgid "The partition's boot region doesn't occupy the entire partition." msgstr "Zagonsko področje razdelka ne zaseda celotnega razdelka." -#: libparted/labels/mac.c:597 +#: libparted/labels/mac.c:583 msgid "The partition's data region doesn't occupy the entire partition." msgstr "Podatkovno področje razdelka ne zaseda celotnega razdelka." -#: libparted/labels/mac.c:649 +#: libparted/labels/mac.c:635 #, c-format msgid "" "Weird block size on device descriptor: %d bytes is not divisible by 512." msgstr "" "Čudna velikost bloka na opisovalniku naprave: %d bajtov ni deljivih z 512." -#: libparted/labels/mac.c:662 +#: libparted/labels/mac.c:648 #, c-format msgid "" "The driver descriptor says the physical block size is %d bytes, but Linux " @@ -1439,11 +1392,11 @@ msgstr "" "Opisovalnik naprave pravi, da je fizični blok velik %d bajtov, vendar Linux " "pravi, da je %d bajtov." -#: libparted/labels/mac.c:715 +#: libparted/labels/mac.c:701 msgid "No valid partition map found." msgstr "Preslikave razdelka ni mogoče najti." -#: libparted/labels/mac.c:789 +#: libparted/labels/mac.c:775 #, c-format msgid "" "Conflicting partition map entry sizes! Entry 1 says it is %d, but entry %d " @@ -1452,11 +1405,11 @@ msgstr "" "Sporne velikosti vnosov preslikave razdelka! Vnos 1 pravi %d, vendar vnos %d " "pravi %d!" -#: libparted/labels/mac.c:820 +#: libparted/labels/mac.c:806 msgid "Weird! There are 2 partitions map entries!" msgstr "Čudno! Obstajata 2 vnosa preslikave particij!" -#: libparted/labels/mac.c:1359 +#: libparted/labels/mac.c:1345 msgid "" "Changing the name of a root or swap partition will prevent Linux from " "recognising it as such." @@ -1464,23 +1417,23 @@ msgstr "" "Spreminjanje imena korenskega ali izmenjevalnega razdelka bo sistemu Linux " "preprečilo prepoznavo the razdelkov." -#: libparted/labels/mac.c:1458 +#: libparted/labels/mac.c:1444 msgid "Can't add another partition -- the partition map is too small!" msgstr "Dodatnega razdelka ni mogoče dodati - načrt razdelkov je premajhen!" -#: libparted/labels/pc98.c:284 +#: libparted/labels/pc98.c:285 #, c-format msgid "Invalid partition table on %s." msgstr "Neveljavna preglednica razdelkov na %s." -#: libparted/labels/pc98.c:337 libparted/labels/pc98.c:415 +#: 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 "Razdelek %d ni poravnan z mejo cilindrov. To ni podprto." -#: libparted/labels/pc98.c:733 +#: libparted/labels/pc98.c:729 msgid "Can't add another partition." msgstr "Dodatnega razdelka ni mogoče dodati." @@ -1655,39 +1608,39 @@ msgstr "VTOC FMT7 DSCB ni mogoče zapisati." msgid "Could not write VTOC FMT9 DSCB." msgstr "VTOC FMT1 DSCB ni mogoče zapisati." -#: libparted/libparted.c:242 +#: libparted/libparted.c:247 msgid "Out of memory." msgstr "Zmanjkalo je pomnilnika." -#: libparted/unit.c:139 +#: libparted/unit.c:140 msgid "Cannot get unit size for special unit 'COMPACT'." msgstr "Velikosti enote za posebno enoto 'COMPACT' ni mogoče dobiti." -#: libparted/unit.c:385 +#: libparted/unit.c:386 #, c-format msgid "\"%s\" has invalid syntax for locations." msgstr "\"%s\" ima neveljavno skladnjo za mesto." -#: libparted/unit.c:393 +#: libparted/unit.c:394 #, c-format msgid "The maximum head value is %d." msgstr "Največja vrednost glave je %d." -#: libparted/unit.c:400 +#: libparted/unit.c:401 #, c-format msgid "The maximum sector value is %d." msgstr "Največja vrednost sektorja je %d." -#: libparted/unit.c:412 libparted/unit.c:564 +#: libparted/unit.c:413 libparted/unit.c:565 #, c-format msgid "The location %s is outside of the device %s." msgstr "Mesto %s je zunaj naprave %s." -#: libparted/unit.c:526 +#: libparted/unit.c:527 msgid "Invalid number." msgstr "Neveljavno število." -#: libparted/unit.c:532 +#: libparted/unit.c:533 msgid "Use a smaller unit instead of a value < 1" msgstr "" @@ -1697,18 +1650,18 @@ msgstr "" msgid "%s : Failed to allocate partition block\n" msgstr "%s : Dodeljevanje bloka razdelka ni uspelo\n" -#: libparted/fs/amiga/affs.c:79 libparted/fs/amiga/apfs.c:71 +#: 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: Dodeljevanje bloka ni uspelo\n" -#: libparted/fs/amiga/affs.c:84 libparted/fs/amiga/apfs.c:76 +#: 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: Branje zagonskega bloka %llu ni uspelo\n" -#: libparted/fs/amiga/affs.c:98 libparted/fs/amiga/apfs.c:87 +#: 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" @@ -1734,22 +1687,22 @@ msgstr "%s: Slaba nadzorna vsota na bloku %llu vrste %s\n" msgid "%s : Couldn't write block %d\n" msgstr "%s: Zapisovanje bloka %d ni uspelo\n" -#: libparted/fs/amiga/amiga.c:278 +#: libparted/fs/amiga/amiga.c:279 #, c-format msgid "%s : Failed to allocate disk_specific rdb block\n" msgstr "%s: Dodeljevanje bloka disk_specific rdb ni uspelo\n" -#: libparted/fs/amiga/amiga.c:289 +#: libparted/fs/amiga/amiga.c:290 #, c-format msgid "%s : Didn't find rdb block, should never happen\n" msgstr "%s : bloka rdb ni mogoče najti, kar se ne sme zgoditi\n" -#: libparted/fs/amiga/amiga.c:318 +#: libparted/fs/amiga/amiga.c:319 #, c-format msgid "%s : Failed to read partition block %llu\n" msgstr "%s: Branje bloka razdelka %llu ni uspelo\n" -#: libparted/fs/fat/fat.c:148 libparted/fs/r/fat/fat.c:811 +#: libparted/fs/fat/fat.c:149 msgid "" "GNU Parted was miscompiled: the FAT boot sector should be 512 bytes. FAT " "support will be disabled." @@ -1848,7 +1801,7 @@ msgstr "" "datotečnega sistema ostala nespremenjena. Če izberete popravi, bo geometrija " "CHS datotečnega sistema nastavljena na vrednosti iz preglednice razdelkov." -#: libparted/fs/r/fat/bootsector.c:399 +#: libparted/fs/r/fat/bootsector.c:398 #, c-format msgid "" "The information sector has the wrong signature (%x). Select cancel for now, " @@ -1873,19 +1826,19 @@ msgid "" "Cluster start delta = %d, which is not a multiple of the cluster size %d." msgstr "Začetek gruče delta = %d, ki ni večkratnik velikosti gruče %d." -#: libparted/fs/r/fat/count.c:144 +#: libparted/fs/r/fat/count.c:84 #, c-format msgid "Bad directory entry for %s: first cluster is the end of file marker." msgstr "Slab vnos mape %s: prva gruča je konec datotečnega označevalnika." -#: libparted/fs/r/fat/count.c:157 +#: libparted/fs/r/fat/count.c:97 #, c-format msgid "" "Bad FAT: unterminated chain for %s. You should run dosfsck or scandisk." msgstr "" "Slab FAT: nezaključena veriga %s: Treba je zagnati ukaz dosfsck ali scandisk." -#: libparted/fs/r/fat/count.c:166 +#: libparted/fs/r/fat/count.c:106 #, c-format msgid "" "Bad FAT: cluster %d outside file system in chain for %s. You should run " @@ -1894,7 +1847,7 @@ msgstr "" "Slab FAT: gruča %d je zunaj datotečnega sistema v verigi %s. Treba je " "zagnati ukaz dosfsck ali scandisk." -#: libparted/fs/r/fat/count.c:176 +#: libparted/fs/r/fat/count.c:116 #, c-format msgid "" "Bad FAT: cluster %d is cross-linked for %s. You should run dosfsck or " @@ -1903,26 +1856,17 @@ msgstr "" "Slab FAT: gruča %d je navzkrižno povezana v %s. Treba je zagnati ukaz " "dosfsck ali scandisk." -#: libparted/fs/r/fat/count.c:195 +#: libparted/fs/r/fat/count.c:135 #, c-format msgid "%s is %dk, but it has %d clusters (%dk)." msgstr "%s je %dk, vendar ima %d gruč (%dk)." -#: libparted/fs/r/fat/count.c:258 -#, c-format -msgid "" -"The file %s is marked as a system file. This means moving it could cause " -"some programs to stop working." -msgstr "" -"Datoteka %s je označena kot sistemska datoteka. To pomeni, da bi njen premik " -"lahko povzročil nedelovanje nekaterih programov." - -#: libparted/fs/r/fat/fat.c:243 +#: libparted/fs/r/fat/fat.c:244 #, c-format msgid "Partition too big/small for a %s file system." msgstr "Razdelek je prevelik/premajhen za datotečni sistem %s." -#: libparted/fs/r/fat/fat.c:409 +#: 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." @@ -1930,11 +1874,11 @@ msgstr "" "FAT-i se ne ujemajo. Če ne veste kaj to pomeni, izberite prekliči, zaženite " "ukaz scandisk na datotečnem sistemu in nato poskusite znova." -#: libparted/fs/r/fat/fat.c:449 +#: libparted/fs/r/fat/fat.c:450 msgid "There are no possible configurations for this FAT type." msgstr "Za to vrsto FAT ni veljavnih nastavitev." -#: libparted/fs/r/fat/fat.c:461 +#: libparted/fs/r/fat/fat.c:462 #, c-format msgid "" "File system doesn't have expected sizes for Windows to like it. Cluster " @@ -1945,14 +1889,14 @@ msgstr "" "Velikost gruče je %dk (pričakovana %dk); število gruč je %d (pričakovano " "%d); velikost FAT je %d sektorjev (pričakovana %d)." -#: libparted/fs/r/fat/fat.c:484 +#: libparted/fs/r/fat/fat.c:485 #, c-format msgid "" "File system is reporting the free space as %d clusters, not %d clusters." msgstr "" "Datotečni sistem sporoča prosti prostor velikosti %d gruč in ne %d gruč." -#: libparted/fs/r/fat/resize.c:158 +#: 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." @@ -1960,15 +1904,15 @@ msgstr "" "V korenski mapi ni dovolj prostora za vse datoteke. Prekličite ali pa " "prezrite in s tem izgubite datoteke." -#: libparted/fs/r/fat/resize.c:302 +#: libparted/fs/r/fat/resize.c:303 msgid "Error writing to the root directory." msgstr "Napaka med zapisovanjem v korensko mapo." -#: libparted/fs/r/fat/resize.c:495 +#: libparted/fs/r/fat/resize.c:479 msgid "If you leave your file system as FAT16, then you will have no problems." msgstr "Če pustite datotečni sistem FAT16, ne boste imeli težav." -#: libparted/fs/r/fat/resize.c:498 +#: 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 " @@ -1979,14 +1923,14 @@ msgstr "" "storiti, preverite podrobnosti v priročniku Parted (ali v priročniku svoje " "distribucije)." -#: libparted/fs/r/fat/resize.c:506 +#: 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 "" "Če pustite datotečni sistem FAT32, ne boste uvedli nobenih novih težav." -#: libparted/fs/r/fat/resize.c:510 +#: 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 " @@ -2000,42 +1944,42 @@ msgstr "" "distribucije). Pretvorba v FAT32 bo povzročila, da bo datotečni sistem " "nemogoče brati iz MS DOS, MS Windosw 95 in MS Windows NT." -#: libparted/fs/r/fat/resize.c:524 +#: libparted/fs/r/fat/resize.c:508 #, c-format msgid "%s %s %s" msgstr "%s %s %s" -#: libparted/fs/r/fat/resize.c:525 +#: libparted/fs/r/fat/resize.c:509 msgid "Would you like to use FAT32?" msgstr "Želite uporabiti FAT32?" -#: libparted/fs/r/fat/resize.c:556 libparted/fs/r/fat/resize.c:572 +#: 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:557 +#: libparted/fs/r/fat/resize.c:541 msgid "" "The file system can only be resized to this size by converting to FAT16." msgstr "" "Datotečnemu sistemu je mogoče spremeniti velikost na to vrednost le, če bo " "pretvorjen v FAT16." -#: libparted/fs/r/fat/resize.c:573 +#: libparted/fs/r/fat/resize.c:557 msgid "" "The file system can only be resized to this size by converting to FAT32." msgstr "" "Datotečnemu sistemu je mogoče spremeniti velikost na to vrednost le, če bo " "pretvorjen v FAT32." -#: libparted/fs/r/fat/resize.c:586 +#: 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 velikosti razdelka ne more spremeniti na to vrednost. Delamo na " "tem!" -#: libparted/fs/r/fat/table.c:136 +#: 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 " @@ -2044,41 +1988,41 @@ msgstr "" "FAT %d medij %x ne ustreza mediju %x zaganjalnega sektorja. Najverjetneje je " "treba zagnati scandisk." -#: libparted/fs/r/fat/table.c:268 +#: libparted/fs/r/fat/table.c:269 #, c-format msgid "fat_table_set: cluster %ld outside file system" msgstr "fat_table_set: gruča %ld je zunaj datotečnega sistema" -#: libparted/fs/r/fat/table.c:300 +#: libparted/fs/r/fat/table.c:301 #, c-format msgid "fat_table_get: cluster %ld outside file system" msgstr "fat_table_get: gruča %ld je zunaj datotečnega sistema" -#: libparted/fs/r/fat/table.c:342 +#: libparted/fs/r/fat/table.c:343 msgid "fat_table_alloc_cluster: no free clusters" msgstr "fat_table_alloc_cluster: ni prostih gruč" -#: libparted/fs/r/filesys.c:151 +#: libparted/fs/r/filesys.c:152 msgid "Could not detect file system." msgstr "Datotečnega sistema ni mogoče zaznati." -#: libparted/fs/r/filesys.c:158 libparted/fs/r/filesys.c:285 +#: libparted/fs/r/filesys.c:159 libparted/fs/r/filesys.c:284 #, fuzzy, c-format msgid "resizing %s file systems is not supported" msgstr "Podpora za spremembo velikosti datotečnega sistem %s še ni dodana." -#: libparted/fs/r/filesys.c:170 +#: libparted/fs/r/filesys.c:171 msgid "The file system is bigger than its volume!" msgstr "Datotečni sistem je večji kot njegov nosilec!" -#: libparted/fs/r/hfs/advfs.c:121 libparted/fs/r/hfs/advfs_plus.c:121 -#: libparted/fs/r/hfs/reloc.c:413 libparted/fs/r/hfs/reloc.c:507 -#: libparted/fs/r/hfs/reloc_plus.c:538 libparted/fs/r/hfs/reloc_plus.c:656 -#: libparted/fs/r/hfs/reloc_plus.c:769 +#: 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 "Datotečni sistem vsebuje napake." -#: libparted/fs/r/hfs/advfs_plus.c:285 +#: libparted/fs/r/hfs/advfs_plus.c:287 msgid "Bad blocks could not be read." msgstr "Slabega bloka ni mogoče prebrati." @@ -2144,61 +2088,61 @@ msgstr "Sektorja %lli HFS+ datoteke s CNID %X ni bilo mogoče najti." msgid "Trying to write HFS+ file with CNID %X behind EOF." msgstr "Poskus pisanja HFS+ datoteke s CNID %X za EOF." -#: libparted/fs/r/hfs/hfs.c:232 +#: libparted/fs/r/hfs/hfs.c:212 msgid "Sorry, HFS cannot be resized that way yet." msgstr "Oprostite, HFS-ju ni mogoče spremeniti velikosti na takšen način." -#: libparted/fs/r/hfs/hfs.c:250 libparted/fs/r/hfs/hfs.c:629 +#: libparted/fs/r/hfs/hfs.c:230 libparted/fs/r/hfs/hfs.c:573 msgid "shrinking" msgstr "krčenje" -#: libparted/fs/r/hfs/hfs.c:262 libparted/fs/r/hfs/hfs.c:641 +#: libparted/fs/r/hfs/hfs.c:242 libparted/fs/r/hfs/hfs.c:585 msgid "Data relocation has failed." msgstr "Prestavljanje podatkov ni uspelo." -#: libparted/fs/r/hfs/hfs.c:281 +#: libparted/fs/r/hfs/hfs.c:261 msgid "Data relocation left some data in the end of the volume." msgstr "Prestavljanje podatkov je pustilo nekaj podatkov na koncu nosilca." -#: libparted/fs/r/hfs/hfs.c:320 +#: libparted/fs/r/hfs/hfs.c:300 msgid "writing HFS Master Directory Block" msgstr "pisanje bloka glavnege mape" -#: libparted/fs/r/hfs/hfs.c:468 +#: libparted/fs/r/hfs/hfs.c:412 msgid "No valid HFS[+X] signature has been found while opening." msgstr "Med odpiranjem ni bilo mogoče najti veljavnega podpisa HFS[+X]." -#: libparted/fs/r/hfs/hfs.c:478 +#: libparted/fs/r/hfs/hfs.c:422 #, c-format msgid "Version %d of HFS+ isn't supported." msgstr "HFS+ različica %d ni podprta." -#: libparted/fs/r/hfs/hfs.c:489 +#: libparted/fs/r/hfs/hfs.c:433 #, c-format msgid "Version %d of HFSX isn't supported." msgstr "HFSX različica %d ni podprta." -#: libparted/fs/r/hfs/hfs.c:672 +#: libparted/fs/r/hfs/hfs.c:616 msgid "Data relocation left some data at the end of the volume." msgstr "Prestavljanje podatkov je pustilo nekaj podatkov na koncu nosilca." -#: libparted/fs/r/hfs/hfs.c:720 +#: libparted/fs/r/hfs/hfs.c:664 msgid "Error while writing the allocation file." msgstr "Napaka med zapisovanjem dodelitvene datoteke." -#: libparted/fs/r/hfs/hfs.c:735 +#: libparted/fs/r/hfs/hfs.c:679 msgid "Error while writing the compatibility part of the allocation file." msgstr "Napaka med zapisovanjem združljivostnega dela dodelitvene datoteke." -#: libparted/fs/r/hfs/hfs.c:750 +#: libparted/fs/r/hfs/hfs.c:694 msgid "writing HFS+ Volume Header" msgstr "zapisovanje glave nosilca HFS+" -#: libparted/fs/r/hfs/hfs.c:850 +#: libparted/fs/r/hfs/hfs.c:794 msgid "An error occurred while looking for the mandatory bad blocks file." msgstr "Napaka med iskanjem obvezne datoteke slabih blokov." -#: libparted/fs/r/hfs/hfs.c:904 +#: 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." @@ -2206,27 +2150,27 @@ msgstr "" "Kot kaže je v ovijalniku HFS napaka: datoteka slabih blokov ne vsebuje " "vstavljenega nosilca HFS+." -#: libparted/fs/r/hfs/hfs.c:940 +#: libparted/fs/r/hfs/hfs.c:883 msgid "Sorry, HFS+ cannot be resized that way yet." msgstr "Oprostite, HFS+ ni mogoče spreminiti velikosti na ta način." -#: libparted/fs/r/hfs/hfs.c:975 +#: libparted/fs/r/hfs/hfs.c:918 msgid "shrinking embedded HFS+ volume" msgstr "krčenje vstavljenega nosilca HFS+" -#: libparted/fs/r/hfs/hfs.c:992 +#: libparted/fs/r/hfs/hfs.c:935 msgid "Resizing the HFS+ volume has failed." msgstr "Spreminjanje velikosti nosilca HFS+ ni uspelo." -#: libparted/fs/r/hfs/hfs.c:999 +#: libparted/fs/r/hfs/hfs.c:942 msgid "shrinking HFS wrapper" msgstr "krčenje ovijalnika HFS" -#: libparted/fs/r/hfs/hfs.c:1008 +#: libparted/fs/r/hfs/hfs.c:951 msgid "Updating the HFS wrapper has failed." msgstr "Posodabljanje ovijalnika HFS ni uspelo." -#: libparted/fs/r/hfs/hfs.c:1110 libparted/fs/r/hfs/hfs.c:1195 +#: 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 " @@ -2305,7 +2249,7 @@ msgstr "" msgid "An extent has not been relocated." msgstr "Segment extent ni bil prestavljen." -#: libparted/fs/r/hfs/reloc.c:250 libparted/fs/r/hfs/reloc_plus.c:307 +#: 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!" @@ -2313,16 +2257,16 @@ msgstr "" "Sklic za segment extent prihaja iz prostora kjer ne bi smel. Preverite " "datotečni sistem!" -#: libparted/fs/r/hfs/reloc.c:380 +#: libparted/fs/r/hfs/reloc.c:382 msgid "This HFS volume has no catalog file. This is very unusual!" msgstr "Ta nosilec HFS nima datoteke kataloga. To je zelo nenavadno!" -#: libparted/fs/r/hfs/reloc.c:474 +#: libparted/fs/r/hfs/reloc.c:479 msgid "This HFS volume has no extents overflow file. This is quite unusual!" msgstr "" "Ta nosilec HFS nima datoteke preliva segmentov extents. To je zelo nenavadno!" -#: libparted/fs/r/hfs/reloc.c:516 libparted/fs/r/hfs/reloc_plus.c:666 +#: 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." @@ -2330,53 +2274,53 @@ msgstr "" "Datoteka preliva segmentov extents ne sme vsebovati lastnih segmentov " "extents! Preverite datotečni sistem." -#: libparted/fs/r/hfs/reloc.c:573 libparted/fs/r/hfs/reloc_plus.c:844 +#: 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 "Datotečnega sistema ni bilo mogoče naložiti v pomnilnik." -#: libparted/fs/r/hfs/reloc.c:634 libparted/fs/r/hfs/reloc_plus.c:905 +#: libparted/fs/r/hfs/reloc.c:640 libparted/fs/r/hfs/reloc_plus.c:910 msgid "Bad blocks list could not be loaded." msgstr "Seznama slabih blokov ni mogoče naložiti." -#: libparted/fs/r/hfs/reloc.c:648 libparted/fs/r/hfs/reloc_plus.c:921 +#: libparted/fs/r/hfs/reloc.c:654 libparted/fs/r/hfs/reloc_plus.c:926 msgid "An error occurred during extent relocation." msgstr "Napaka med prestavljanjem segmenta extent." -#: libparted/fs/r/hfs/reloc_plus.c:494 +#: libparted/fs/r/hfs/reloc_plus.c:495 msgid "This HFS+ volume has no catalog file. This is very unusual!" msgstr "Ta nosilec HFS+ nima datoteke kataloga. To je zelo nenavadno!" -#: libparted/fs/r/hfs/reloc_plus.c:617 +#: libparted/fs/r/hfs/reloc_plus.c:620 msgid "This HFS+ volume has no extents overflow file. This is quite unusual!" msgstr "" "Ta nosilec HFS+ nima datoteke preliva segmentov extents. To je zelo " "nenavadno!" -#: parted/parted.c:125 +#: parted/parted.c:126 msgid "displays this help message" msgstr "prikaže to sporočilo pomoči" -#: parted/parted.c:126 +#: parted/parted.c:127 msgid "lists partition layout on all block devices" msgstr "prikaže postavitev razdelkov na vseh blokovnih napravah" -#: parted/parted.c:127 +#: parted/parted.c:128 msgid "displays machine parseable output" msgstr "prikaže izhodne podatke, ki s računalniško razčlenjivi" -#: parted/parted.c:128 +#: parted/parted.c:129 msgid "never prompts for user intervention" msgstr "nikoli ne pozovi za uporabniško posredovanje" -#: parted/parted.c:129 +#: parted/parted.c:130 msgid "displays the version" msgstr "prikaže različico" -#: parted/parted.c:130 +#: parted/parted.c:131 msgid "alignment for new partitions" msgstr "poravnava novih razdelkov" -#: parted/parted.c:142 +#: parted/parted.c:143 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" @@ -2385,31 +2329,31 @@ msgstr "" "DOS so številke osnovnih razdelkov od 1 do 4, logičnih razdelkov pa od 5 " "naprej.\n" -#: parted/parted.c:145 +#: parted/parted.c:146 msgid "LABEL-TYPE is one of: " msgstr "VRSTA_OZNAKA je ena od: " -#: parted/parted.c:146 parted/parted.c:147 +#: parted/parted.c:147 parted/parted.c:148 msgid "FLAG is one of: " msgstr "ZASTAVICA je ena od: " -#: parted/parted.c:148 +#: parted/parted.c:149 msgid "UNIT is one of: " msgstr "ENOTA je ena od: " -#: parted/parted.c:149 +#: parted/parted.c:150 msgid "desired alignment: minimum or optimal" msgstr "zaželjena poravnava: najmanjša ali optimalna" -#: parted/parted.c:150 +#: parted/parted.c:151 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:152 +#: parted/parted.c:153 msgid "FS-TYPE is one of: " msgstr "VRSTA-DS je ena od: " -#: parted/parted.c:153 +#: parted/parted.c:154 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 " @@ -2419,7 +2363,7 @@ msgstr "" "vrednosti se štejejo od konca diska. Na primer, -1s določa natanko zadnji " "sektor.\n" -#: parted/parted.c:156 +#: parted/parted.c:157 #, fuzzy msgid "" "END is disk location, such as 4GB or 10%. Negative value counts from the " @@ -2429,19 +2373,19 @@ msgstr "" "vrednosti se štejejo od konca diska. Na primer, -1s določa natanko zadnji " "sektor.\n" -#: parted/parted.c:159 +#: parted/parted.c:160 msgid "STATE is one of: on, off\n" msgstr "Stanje je eno od: on, off\n" -#: parted/parted.c:160 +#: parted/parted.c:161 msgid "DEVICE is usually /dev/hda or /dev/sda\n" msgstr "NAPRAVA je ponavadi /dev/hda ali /dev/sda\n" -#: parted/parted.c:161 +#: parted/parted.c:162 msgid "NAME is any word you want\n" msgstr "IME je katerakoli beseda, ki jo hočete\n" -#: parted/parted.c:164 +#: parted/parted.c:165 msgid "" "Copyright (C) 1998 - 2006 Free Software Foundation, Inc.\n" "This program is free software, covered by the GNU General Public License.\n" @@ -2462,23 +2406,23 @@ msgstr "" "Oglejte si licenco GNU General Public License za podrobnosti.\n" "\n" -#: parted/parted.c:212 +#: parted/parted.c:213 #, c-format msgid "%0.f%%\t(time left %.2d:%.2d)" msgstr "%0.f%%\t(čas do konca %.2d:%.2d)" -#: parted/parted.c:231 +#: parted/parted.c:232 #, 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:252 +#: parted/parted.c:253 #, c-format msgid "Partition(s) on %s are being used." msgstr "Razdel-ek(ki) na %s so v uporabi." -#: parted/parted.c:264 +#: parted/parted.c:265 #, c-format msgid "" "The existing disk label on %s will be destroyed and all data on this disk " @@ -2487,31 +2431,31 @@ msgstr "" "Obstoječa oznaka diska na %s bo uničena in vsi podatki na disku bodo " "izgubljeni. Želite nadaljevati?" -#: parted/parted.c:525 +#: parted/parted.c:526 msgid "New disk label type?" msgstr "Nova vrsta oznake diska?" -#: parted/parted.c:662 +#: parted/parted.c:663 msgid "Partition type?" msgstr "Vrsta razdelka?" -#: parted/parted.c:680 parted/parted.c:884 +#: parted/parted.c:681 parted/parted.c:885 msgid "Partition name?" msgstr "Ime razdelka?" -#: parted/parted.c:690 +#: parted/parted.c:691 msgid "File system type?" msgstr "Vrsta datotečnega sistema?" -#: parted/parted.c:695 parted/parted.c:1498 +#: parted/parted.c:696 parted/parted.c:1499 msgid "Start?" msgstr "Začetek?" -#: parted/parted.c:698 parted/parted.c:1500 parted/parted.c:1569 +#: parted/parted.c:699 parted/parted.c:1501 parted/parted.c:1585 msgid "End?" msgstr "Konec?" -#: parted/parted.c:766 +#: parted/parted.c:767 #, fuzzy, c-format msgid "" "You requested a partition from %s to %s (sectors %llu..%llu).\n" @@ -2520,7 +2464,7 @@ msgstr "" "Zahtevali ste razdelek od %s do %s.\n" "Najbližje mogoče mesto je od %s do %s.%s" -#: parted/parted.c:775 +#: parted/parted.c:776 msgid "" "\n" "Is this still acceptable to you?" @@ -2528,94 +2472,94 @@ msgstr "" "\n" "Je to za vas sprejemljivo?" -#: parted/parted.c:798 +#: parted/parted.c:799 #, 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:800 parted/parted.c:1723 +#: parted/parted.c:801 parted/parted.c:1739 msgid "unknown (malloc failed)" msgstr "" -#: parted/parted.c:876 +#: parted/parted.c:877 #, fuzzy, c-format msgid "%s disk labels do not support partition name." msgstr "oznake diska %s ne podpirajo razširjenih razdelkov." -#: parted/parted.c:881 parted/parted.c:1561 parted/parted.c:1612 -#: parted/parted.c:1706 parted/parted.c:1781 +#: parted/parted.c:882 parted/parted.c:1564 parted/parted.c:1628 +#: parted/parted.c:1722 parted/parted.c:1797 msgid "Partition number?" msgstr "Številka razdelka?" -#: parted/parted.c:975 +#: parted/parted.c:976 #, 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:1017 +#: parted/parted.c:1018 #, c-format msgid "Model: %s (%s)\n" msgstr "Model: %s (%s)\n" -#: parted/parted.c:1019 +#: parted/parted.c:1020 #, c-format msgid "Disk %s: %s\n" msgstr "Disk %s: %s\n" -#: parted/parted.c:1020 +#: parted/parted.c:1021 #, c-format msgid "Sector size (logical/physical): %lldB/%lldB\n" msgstr "Velikost sektorja (logična/fizična): %lldB/%lldB\n" -#: parted/parted.c:1032 +#: parted/parted.c:1033 #, c-format msgid "Partition Table: %s\n" msgstr "Preglednica razdelkov: %s\n" -#: parted/parted.c:1033 +#: parted/parted.c:1034 #, fuzzy, c-format msgid "Disk Flags: %s\n" msgstr "Disk %s: %s\n" -#: parted/parted.c:1153 parted/parted.c:1156 +#: parted/parted.c:1154 parted/parted.c:1157 msgid "Number" msgstr "Število" -#: parted/parted.c:1153 parted/parted.c:1156 +#: parted/parted.c:1154 parted/parted.c:1157 msgid "Start" msgstr "Začetek" -#: parted/parted.c:1154 parted/parted.c:1157 +#: parted/parted.c:1155 parted/parted.c:1158 msgid "End" msgstr "Konec" -#: parted/parted.c:1157 +#: parted/parted.c:1158 msgid "Size" msgstr "Velikost" -#: parted/parted.c:1161 +#: parted/parted.c:1162 msgid "Type" msgstr "Vrsta" -#: parted/parted.c:1163 +#: parted/parted.c:1164 msgid "File system" msgstr "Datotečni sistem" -#: parted/parted.c:1166 +#: parted/parted.c:1167 msgid "Name" msgstr "Ime" -#: parted/parted.c:1168 +#: parted/parted.c:1169 msgid "Flags" msgstr "Zastavice" -#: parted/parted.c:1225 +#: parted/parted.c:1226 msgid "Free Space" msgstr "Nezaseden prostor" -#: parted/parted.c:1385 +#: parted/parted.c:1386 #, c-format msgid "" "A %s %s partition was found at %s -> %s. Do you want to add it to the " @@ -2624,54 +2568,54 @@ msgstr "" "razdelek %s %s je bil najden na %s -> %s. Ga želite dodati k preglednici " "razdelkov?" -#: parted/parted.c:1428 +#: parted/parted.c:1429 msgid "searching for file systems" msgstr "iskanje datotečnega sistema" -#: parted/parted.c:1535 +#: parted/parted.c:1536 msgid "The resize command has been removed in parted 3.0" msgstr "" -#: parted/parted.c:1583 +#: parted/parted.c:1599 msgid "" "Shrinking a partition can cause data loss, are you sure you want to continue?" msgstr "" -#: parted/parted.c:1636 +#: parted/parted.c:1652 msgid "New device?" msgstr "Nova naprava?" -#: parted/parted.c:1704 +#: parted/parted.c:1720 msgid "alignment type(min/opt)" msgstr "vrsta poravnave (min/opt)" -#: parted/parted.c:1719 +#: parted/parted.c:1735 #, c-format msgid "%d aligned\n" msgstr "%d je poravnan\n" -#: parted/parted.c:1721 +#: parted/parted.c:1737 #, fuzzy, c-format msgid "%d not aligned: %s\n" msgstr "%d ni poravnan\n" -#: parted/parted.c:1746 parted/parted.c:1783 +#: parted/parted.c:1762 parted/parted.c:1799 msgid "Flag to Invert?" msgstr "Označi za obrat?" -#: parted/parted.c:1751 parted/parted.c:1788 +#: parted/parted.c:1767 parted/parted.c:1804 msgid "New state?" msgstr "Novo stanje?" -#: parted/parted.c:1834 +#: parted/parted.c:1850 msgid "Unit?" msgstr "Enota?" -#: parted/parted.c:1969 +#: parted/parted.c:1985 msgid "align-check" msgstr "align-check" -#: parted/parted.c:1972 +#: parted/parted.c:1988 #, fuzzy msgid "" "align-check TYPE N check partition N for TYPE(min|opt) " @@ -2680,11 +2624,11 @@ msgstr "" "align-check VRSTA ŠTEVILKA preveri poravnanost vrste VRSTA " "(min|opt) razdelka ŠTEVILKA" -#: parted/parted.c:1980 +#: parted/parted.c:1996 msgid "help" msgstr "help" -#: parted/parted.c:1983 +#: parted/parted.c:1999 msgid "" "help [COMMAND] print general help, or help on " "COMMAND" @@ -2692,15 +2636,15 @@ msgstr "" "help [UKAZ] izpiše splošno pomoč ali pomoč o " "ukazu UKAZ" -#: parted/parted.c:1989 +#: parted/parted.c:2005 msgid "mklabel" msgstr "mklabel" -#: parted/parted.c:1989 +#: parted/parted.c:2005 msgid "mktable" msgstr "mktable" -#: parted/parted.c:1992 +#: parted/parted.c:2008 msgid "" "mklabel,mktable LABEL-TYPE create a new disklabel (partition " "table)" @@ -2708,15 +2652,15 @@ msgstr "" "mklabel,mktable OZNAKA-VRSTA ustvari novo oznako diska " "(preglednica razdelkov)" -#: parted/parted.c:1998 +#: parted/parted.c:2014 msgid "mkpart" msgstr "mkpart" -#: parted/parted.c:2001 +#: parted/parted.c:2017 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:2007 +#: parted/parted.c:2023 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" @@ -2725,20 +2669,20 @@ msgstr "" "razdelku. VRSTA-DS je lahko določena za nastavitev primernega ID-ja " "razdelka.\n" -#: parted/parted.c:2012 +#: parted/parted.c:2028 msgid "name" msgstr "name" -#: parted/parted.c:2015 +#: parted/parted.c:2031 msgid "name NUMBER NAME name partition NUMBER as NAME" msgstr "" "name ŠTEVILKA IME razdelek ŠTEVILKA poimenuj z IME" -#: parted/parted.c:2020 +#: parted/parted.c:2036 msgid "print" msgstr "print" -#: parted/parted.c:2023 +#: parted/parted.c:2039 msgid "" "print [devices|free|list,all|NUMBER] display the partition table, " "available devices, free space, all found partitions, or a particular " @@ -2748,7 +2692,7 @@ msgstr "" "naprave, ki so na voljo, nezaseden prostor, vse najdene razdelke ali določen " "razdelek" -#: parted/parted.c:2028 +#: parted/parted.c:2044 msgid "" "Without arguments, 'print' displays the entire partition table. However with " "the following arguments it performs various other actions.\n" @@ -2756,11 +2700,11 @@ msgstr "" "Brez argumentov, 'print' prikaže celotno preglednico razdelkov. Z " "naslednjimi argumenti pa izvede različna druga dejanja.\n" -#: parted/parted.c:2030 +#: parted/parted.c:2046 msgid " devices : display all active block devices\n" msgstr " devices : prikaže vse dejavne blokovne naprave\n" -#: parted/parted.c:2031 +#: parted/parted.c:2047 msgid "" " free : display information about free unpartitioned space on the " "current block device\n" @@ -2768,31 +2712,31 @@ msgstr "" " free : prikaže podatke o nezasedenem nerazdeljenem prostoru na " "trenutni blokovni napravi\n" -#: parted/parted.c:2033 +#: parted/parted.c:2049 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:2034 +#: parted/parted.c:2050 msgid "" " NUMBER : display more detailed information about this particular " "partition\n" msgstr " ŠTEVILKA : prikaže podrobne podatke o določenem razdelku\n" -#: parted/parted.c:2039 +#: parted/parted.c:2055 msgid "quit" msgstr "quit" -#: parted/parted.c:2042 +#: parted/parted.c:2058 msgid "quit exit program" msgstr "quit konča program" -#: parted/parted.c:2047 +#: parted/parted.c:2063 msgid "rescue" msgstr "rescue" -#: parted/parted.c:2050 +#: parted/parted.c:2066 msgid "" "rescue START END rescue a lost partition near START " "and END" @@ -2800,45 +2744,45 @@ msgstr "" "rescue ZAČETEK KONEC reši izgubljen razdelek blizu " "ZAČETKA in KONCA" -#: parted/parted.c:2056 +#: parted/parted.c:2072 msgid "resize" msgstr "resize" -#: parted/parted.c:2059 +#: parted/parted.c:2075 msgid "The resize command was removed in parted 3.0\n" msgstr "" -#: parted/parted.c:2062 +#: parted/parted.c:2078 #, fuzzy msgid "resizepart" msgstr "resize" -#: parted/parted.c:2065 +#: parted/parted.c:2081 #, fuzzy msgid "resizepart NUMBER END resize partition NUMBER" msgstr "move ŠTEVILKA ZAČETEK KONEC premakne razdelek ŠTEVILKA" -#: parted/parted.c:2070 +#: parted/parted.c:2086 msgid "rm" msgstr "rm" -#: parted/parted.c:2073 +#: parted/parted.c:2089 msgid "rm NUMBER delete partition NUMBER" msgstr "rm ŠTEVILKA izbriše razdelek ŠTEVILKA" -#: parted/parted.c:2078 +#: parted/parted.c:2094 msgid "select" msgstr "select" -#: parted/parted.c:2081 +#: parted/parted.c:2097 msgid "select DEVICE choose the device to edit" msgstr "select NAPRAVA izbere napravo za urejanje" -#: parted/parted.c:2086 +#: parted/parted.c:2102 msgid "disk_set" msgstr "" -#: parted/parted.c:2089 +#: parted/parted.c:2105 #, fuzzy msgid "" "disk_set FLAG STATE change the FLAG on selected device" @@ -2846,12 +2790,12 @@ msgstr "" "set ŠTEVILKA ZASTAVICA STANJE spremeni ZASTAVICO na razdelku " "ŠTEVILKA" -#: parted/parted.c:2094 +#: parted/parted.c:2110 #, fuzzy msgid "disk_toggle" msgstr "toggle" -#: parted/parted.c:2097 +#: parted/parted.c:2113 #, fuzzy msgid "" "disk_toggle [FLAG] toggle the state of FLAG on " @@ -2860,22 +2804,22 @@ msgstr "" "toggle [ŠTEVILKA [ZASTAVICA]] preklopi stanje ZASTAVICE na " "razdelku ŠTEVILKA" -#: parted/parted.c:2103 +#: parted/parted.c:2119 msgid "set" msgstr "set" -#: parted/parted.c:2106 +#: parted/parted.c:2122 msgid "" "set NUMBER FLAG STATE change the FLAG on partition NUMBER" msgstr "" "set ŠTEVILKA ZASTAVICA STANJE spremeni ZASTAVICO na razdelku " "ŠTEVILKA" -#: parted/parted.c:2112 +#: parted/parted.c:2128 msgid "toggle" msgstr "toggle" -#: parted/parted.c:2115 +#: parted/parted.c:2131 msgid "" "toggle [NUMBER [FLAG]] toggle the state of FLAG on " "partition NUMBER" @@ -2883,20 +2827,20 @@ msgstr "" "toggle [ŠTEVILKA [ZASTAVICA]] preklopi stanje ZASTAVICE na " "razdelku ŠTEVILKA" -#: parted/parted.c:2121 +#: parted/parted.c:2137 msgid "unit" msgstr "unit" -#: parted/parted.c:2124 +#: parted/parted.c:2140 msgid "unit UNIT set the default unit to UNIT" msgstr "" "unit ENOTA nastavi privzeto enoto na ENOTA" -#: parted/parted.c:2129 +#: parted/parted.c:2145 msgid "version" msgstr "različica" -#: parted/parted.c:2132 +#: parted/parted.c:2148 msgid "" "version display the version number and " "copyright information of GNU Parted" @@ -2904,7 +2848,7 @@ msgstr "" "version prikaže številko različice in " "podrobnosti o avtorskih pravicah programa GNU Parted" -#: parted/parted.c:2136 +#: parted/parted.c:2152 msgid "" "'version' displays copyright and version information corresponding to this " "copy of GNU Parted\n" @@ -2912,30 +2856,39 @@ msgstr "" "'version' prikaže avtorske pravice in podrobnosti o različici, ki ustrezajo " "tej kopiji programa GNU Parted\n" -#: parted/parted.c:2204 +#: parted/parted.c:2220 #, c-format msgid "Usage: %s [-hlmsv] [-a] [DEVICE [COMMAND [PARAMETERS]]...]\n" msgstr "" "Uporaba: %s [-hlmsv] [-a] [NAPRAVA [UKAZ [PARAMETRI]] ...]\n" -#: parted/parted.c:2248 +#: parted/parted.c:2264 msgid "No device found" msgstr "Naprave ni mogoče najti" -#: parted/parted.c:2285 +#: parted/parted.c:2301 #, fuzzy msgid "WARNING: You are not superuser. Watch out for permissions.\n" msgstr "OPOZORILO: Niste superuporabnik. Pazite na dovoljenja." -#: parted/parted.c:2325 +#: parted/parted.c:2334 +msgid "" +"You should reinstall your boot loader before rebooting. Read section 4 of " +"the Parted User documentation for more information." +msgstr "" +"Pred ponovnim zagonom priporočamo ponovno namestitev zagonskega nalagalnika. " +"Za več podrobnosti si preberite odstavek 4 v uporabniški dokumentaciji " +"Parted." + +#: parted/parted.c:2341 msgid "You may need to update /etc/fstab.\n" msgstr "Morda boste morali posodobiti /etc/fstab.\n" -#: parted/ui.c:164 +#: parted/ui.c:165 msgid "Welcome to GNU Parted! Type 'help' to view a list of commands.\n" msgstr "Dobrodošli v GNU Parted! Vpišite 'help' za ogled seznama ukazov.\n" -#: parted/ui.c:167 +#: parted/ui.c:168 msgid "" "Usage: parted [OPTION]... [DEVICE [COMMAND [PARAMETERS]...]...]\n" "Apply COMMANDs with PARAMETERS to DEVICE. If no COMMAND(s) are given, run " @@ -2946,7 +2899,7 @@ msgstr "" "Uveljavi UKAZE s PARAMETRI za NAPRAVO. Če UKAZ ni podan poženi v vzajemnem " "načinu.\n" -#: parted/ui.c:172 +#: parted/ui.c:173 #, c-format msgid "" "\n" @@ -3009,7 +2962,7 @@ msgstr "" "Ravno-tako vključite vse dodatne podrobnosti o svojih nastavitvah, \n" "ki se vam zdijo pomembne.\n" -#: parted/ui.c:293 +#: parted/ui.c:294 msgid "" "\n" "Command History:\n" @@ -3017,7 +2970,7 @@ msgstr "" "\n" "Zgodovina ukazov:\n" -#: parted/ui.c:356 +#: parted/ui.c:357 msgid "" "\n" "Error: SEGV_MAPERR (Address not mapped to object)\n" @@ -3025,7 +2978,7 @@ msgstr "" "\n" "Napaka: SEGV_MAPERR (Naslov ni preslikan na predmet)\n" -#: parted/ui.c:362 +#: parted/ui.c:363 msgid "" "\n" "Error: SEGV_ACCERR (Invalid permissions for mapped object)\n" @@ -3033,7 +2986,7 @@ msgstr "" "\n" "Error: SEGV_ACCERR (neveljavne pravice preslikanega objekta)\n" -#: parted/ui.c:367 +#: parted/ui.c:368 msgid "" "\n" "Error: A general SIGSEGV signal was encountered.\n" @@ -3041,7 +2994,7 @@ msgstr "" "\n" "Napaka: Zaznan je bil splošni signal SIGSEGV.\n" -#: parted/ui.c:391 +#: parted/ui.c:392 msgid "" "\n" "Error: FPE_INTDIV (Integer: divide by zero)" @@ -3049,7 +3002,7 @@ msgstr "" "\n" "Napaka: FPE_INTDIV (Celo število: deljenje z 0)" -#: parted/ui.c:396 +#: parted/ui.c:397 msgid "" "\n" "Error: FPE_INTOVF (Integer: overflow)" @@ -3057,7 +3010,7 @@ msgstr "" "\n" "Napaka: FPE_INTOVF (Celo število: preliv)" -#: parted/ui.c:401 +#: parted/ui.c:402 msgid "" "\n" "Error: FPE_FLTDIV (Float: divide by zero)" @@ -3065,7 +3018,7 @@ msgstr "" "\n" "Napaka: FPE_FLTDIV (Decimalno število: deljenje z 0)" -#: parted/ui.c:406 +#: parted/ui.c:407 msgid "" "\n" "Error: FPE_FLTOVF (Float: overflow)" @@ -3073,7 +3026,7 @@ msgstr "" "\n" "Napaka: FPE_FLTOVF (Decimalno število: prekoračitev)" -#: parted/ui.c:411 +#: parted/ui.c:412 msgid "" "\n" "Error: FPE_FLTUND (Float: underflow)" @@ -3081,7 +3034,7 @@ msgstr "" "\n" "Napaka: FPE_FLTUND (Decimalno število: prekoračitev spodnje meje)" -#: parted/ui.c:416 +#: parted/ui.c:417 msgid "" "\n" "Error: FPE_FLTRES (Float: inexact result)" @@ -3089,7 +3042,7 @@ msgstr "" "\n" "Napaka: FPE_FLTRES (Decimalno število: netočen rezultat)" -#: parted/ui.c:421 +#: parted/ui.c:422 msgid "" "\n" "Error: FPE_FLTINV (Float: invalid operation)" @@ -3097,7 +3050,7 @@ msgstr "" "\n" "Napaka: FPE_FLTINV (Decimalno število: neveljavno opravilo)" -#: parted/ui.c:426 +#: parted/ui.c:427 msgid "" "\n" "Error: FPE_FLTSUB (Float: subscript out of range)" @@ -3105,7 +3058,7 @@ msgstr "" "\n" "Napaka: FPE_FLTSUB (Decimalno število: indeks zunaj obsega)" -#: parted/ui.c:431 +#: parted/ui.c:432 msgid "" "\n" "Error: A general SIGFPE signal was encountered." @@ -3113,7 +3066,7 @@ msgstr "" "\n" "Napaka: Zaznan je bil splošni signal SIGFPE." -#: parted/ui.c:455 +#: parted/ui.c:456 msgid "" "\n" "Error: ILL_ILLOPC (Illegal Opcode)" @@ -3121,7 +3074,7 @@ msgstr "" "\n" "Napaka: ILL_ILLOPC (Neveljavna koda opravila)" -#: parted/ui.c:460 +#: parted/ui.c:461 msgid "" "\n" "Error: ILL_ILLOPN (Illegal Operand)" @@ -3129,7 +3082,7 @@ msgstr "" "\n" "Napaka: ILL_ILLOPN (Neveljaven operand)" -#: parted/ui.c:465 +#: parted/ui.c:466 msgid "" "\n" "Error: ILL_ILLADR (Illegal addressing mode)" @@ -3137,7 +3090,7 @@ msgstr "" "\n" "Napaka: ILL_ILLADR (Neveljaven način naslavljanja)" -#: parted/ui.c:470 +#: parted/ui.c:471 msgid "" "\n" "Error: ILL_ILLTRP (Illegal Trap)" @@ -3145,7 +3098,7 @@ msgstr "" "\n" "Napaka: ILL_ILLTRP (Neveljavna past)" -#: parted/ui.c:475 +#: parted/ui.c:476 msgid "" "\n" "Error: ILL_PRVOPC (Privileged Opcode)" @@ -3153,7 +3106,7 @@ msgstr "" "\n" "Napaka: ILL_PRVOPC (Opcode s povišanimi pravicami)" -#: parted/ui.c:480 +#: parted/ui.c:481 msgid "" "\n" "Error: ILL_PRVREG (Privileged Register)" @@ -3161,7 +3114,7 @@ msgstr "" "\n" "Napaka: ILL_PRVREG (Register s povišanimi pravicami)" -#: parted/ui.c:485 +#: parted/ui.c:486 msgid "" "\n" "Error: ILL_COPROC (Coprocessor Error)" @@ -3169,7 +3122,7 @@ msgstr "" "\n" "Napaka: ILL_COPROC (Napaka soopravilnika)" -#: parted/ui.c:490 +#: parted/ui.c:491 msgid "" "\n" "Error: ILL_BADSTK (Internal Stack Error)" @@ -3177,7 +3130,7 @@ msgstr "" "\n" "Napaka: ILL_BADSTK (Napaka notranjega sklada)" -#: parted/ui.c:495 +#: parted/ui.c:496 msgid "" "\n" "Error: A general SIGILL signal was encountered." @@ -3185,69 +3138,69 @@ msgstr "" "\n" "Napaka: Zaznan je bil splošni signal SIGILL." -#: parted/ui.c:888 +#: parted/ui.c:889 #, c-format msgid "invalid token: %s" msgstr "neveljaven žeton %s" -#: parted/ui.c:1069 +#: parted/ui.c:1070 msgid "Expecting a partition number." msgstr "Pričakovana je številka razdelka." -#: parted/ui.c:1078 +#: parted/ui.c:1079 msgid "Partition doesn't exist." msgstr "Razdelek ne obstaja." -#: parted/ui.c:1098 +#: parted/ui.c:1099 msgid "Expecting a file system type." msgstr "Pričakovana je vrsta datotečnega sistema." -#: parted/ui.c:1105 +#: parted/ui.c:1106 #, c-format msgid "Unknown file system type \"%s\"." msgstr "Neznan datotečni sistem vrste \"%s\"." -#: parted/ui.c:1126 +#: parted/ui.c:1127 msgid "Expecting a disk label type." msgstr "Pričakuje se vrsta oznake diska." -#: parted/ui.c:1157 parted/ui.c:1193 +#: parted/ui.c:1158 parted/ui.c:1194 msgid "No flags supported" msgstr "" -#: parted/ui.c:1267 +#: parted/ui.c:1268 msgid "Can't create any more partitions." msgstr "Novih razdelkov ni mogoče ustvariti." -#: parted/ui.c:1277 +#: parted/ui.c:1278 msgid "Expecting a partition type." msgstr "Pričakuje se vrsta razdelka." -#: parted/ui.c:1426 +#: parted/ui.c:1427 msgid "on" msgstr "vključeno" -#: parted/ui.c:1427 +#: parted/ui.c:1428 msgid "off" msgstr "izključeno" -#: parted/ui.c:1444 +#: parted/ui.c:1445 msgid "optimal" msgstr "optimalno" -#: parted/ui.c:1445 +#: parted/ui.c:1446 msgid "minimal" msgstr "najmanjše" -#: parted/ui.c:1578 +#: parted/ui.c:1579 msgid "OPTIONs:" msgstr "MOŽNOSTI:" -#: parted/ui.c:1583 +#: parted/ui.c:1584 msgid "COMMANDs:" msgstr "UKAZI:" -#: parted/ui.c:1586 +#: parted/ui.c:1587 #, c-format msgid "" "\n" @@ -3256,33 +3209,52 @@ msgstr "" "\n" "Hrošče sporočite na %s\n" -#: parted/ui.c:1593 +#: parted/ui.c:1594 #, c-format msgid "Using %s\n" msgstr "Uporablja %s\n" -#: parted/ui.c:1673 +#: parted/ui.c:1674 msgid "This command does not make sense in non-interactive mode.\n" msgstr "Ta ukaz nima smisla v ne-vzajemnem načinu.\n" +#, c-format #~ msgid "%s: option '--%s' doesn't allow an argument\n" #~ msgstr "%s: možnost '--%s' ne dovoljuje argumenta\n" +#, c-format #~ msgid "%s: unrecognized option '--%s'\n" #~ msgstr "%s: neprepoznana možnost '--%s'\n" +#, c-format #~ msgid "%s: option '-W %s' is ambiguous\n" #~ msgstr "%s: možnost '-W %s' je dvoumna\n" +#, c-format #~ msgid "%s: option '-W %s' doesn't allow an argument\n" #~ msgstr "%s: možnost '-W %s' ne dovoljuje argumenta\n" +#, c-format #~ msgid "%s: option '-W %s' requires an argument\n" #~ msgstr "%s: možnost '-W %s' zahteva argument\n" +#, c-format #~ msgid "%s home page: \n" #~ msgstr "Domača stran %s: \n" +#, c-format +#~ msgid "invalid %s%s argument `%s'" +#~ msgstr "neveljaven %s%s argument `%s'" + +#, c-format +#~ msgid "invalid suffix in %s%s argument `%s'" +#~ msgstr "neveljavna pripona v %s%s argument `%s'" + +#, c-format +#~ msgid "%s%s argument `%s' too large" +#~ msgstr "%s%s: argument `%s' je prevelik" + +#, c-format #~ msgid "" #~ "Usage: %s [OPTION]\n" #~ " or: %s DEVICE MINOR\n" @@ -3304,18 +3276,49 @@ msgstr "Ta ukaz nima smisla v ne-vzajemnem načinu.\n" #~ msgid " --version output version information and exit\n" #~ msgstr " --version izpiše podrobnosti o različici in konča\n" +#, c-format #~ msgid "too few arguments" #~ msgstr "premalo argumentov" +#, c-format #~ msgid "too many arguments" #~ msgstr "preveč argumentov" +#, c-format #~ msgid "invalid minor device number: %s" #~ msgstr "napačno manjše število naprave: %s" +#~ msgid "" +#~ "The partition table cannot be re-read. This means you need to reboot " +#~ "before mounting any modified partitions. You also need to reinstall your " +#~ "boot loader before you reboot (which may require mounting modified " +#~ "partitions). It is impossible do both things! So you'll need to boot " +#~ "off a rescue disk, and reinstall your boot loader from the rescue disk. " +#~ "Read section 4 of the Parted User documentation for more information." +#~ msgstr "" +#~ "Preglednice razdelkov ni bilo mogoče znova prebrati. To pomeni, da je " +#~ "potreben ponoven zagon pred priklapljanjem spremenjenih razdelkov. Pred " +#~ "ponovnim zagonom je treba tudi znova namestiti zagonski nalagalnik (kar " +#~ "morda zahteva priklapljanje spremenjenih razdelkov). Nemogoče je storiti " +#~ "oboje! Sistem boste morali zagnati z reševalnega diska in z njega znova " +#~ "namestiti zagonski nalagalnik. Za več podrobnosti si preberite poglavje 4 " +#~ "v uporabniškem priročniku Parted." + +#, 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 " +#~ "computer before doing anything with %s." +#~ msgstr "" +#~ "Preglednice razdelkov na %s ni mogoče znova prebrati (%s). To pomeni, da " +#~ "Hurd ne ve nič o vaših spremembah. Računalnik morate pred nadaljnjim " +#~ "delom znova zagnati z %s." + +#, c-format #~ msgid "Failed to add partition %d (%s)" #~ msgstr "Dodajanje razdelka %d ni uspelo (%s)" +#, c-format #~ msgid "" #~ "parted was unable to re-read the partition table on %s (%s). This means " #~ "Linux won't know anything about the modifications you made. " @@ -3323,12 +3326,15 @@ msgstr "Ta ukaz nima smisla v ne-vzajemnem načinu.\n" #~ "Ponovno branje preglednice razdelkov na %s ni uspelo (%s). Linux ne ve " #~ "ničesar o pravkar narejenih spremembah. " +#, c-format #~ msgid "Support for opening %s file systems is not implemented yet." #~ msgstr "Podpora za odpiranje datotečnega sistem %s še ni dodana." +#, c-format #~ msgid "Support for creating %s file systems is not implemented yet." #~ msgstr "Podpora za ustvarjanje datotečnega sistem %s še ni dodana." +#, c-format #~ msgid "Support for checking %s file systems is not implemented yet." #~ msgstr "Podpora za preverjanje datotečnega sistem %s še ni dodana." @@ -3341,6 +3347,7 @@ msgstr "Ta ukaz nima smisla v ne-vzajemnem načinu.\n" #~ msgid "Can't copy onto an overlapping partition." #~ msgstr "Kopiranje na prekrivajoč razdelek ni mogoče." +#, c-format #~ msgid "" #~ "Direct support for copying file systems is not yet implemented for %s. " #~ "However, support for resizing is implemented. Therefore, the file system " @@ -3354,6 +3361,7 @@ msgstr "Ta ukaz nima smisla v ne-vzajemnem načinu.\n" #~ "Torej zmanjšajte velikost razdelka, ki ga poskušate kopirati, ali pa ga " #~ "prekopirajte na večji razdelek." +#, c-format #~ msgid "Support for copying %s file systems is not implemented yet." #~ msgstr "Podpora za kopiranje datotečnega sistem %s še ni dodana." @@ -3402,12 +3410,14 @@ msgstr "Ta ukaz nima smisla v ne-vzajemnem načinu.\n" #~ msgid "copying" #~ msgstr "kopiranje" +#, c-format #~ msgid "Couldn't resolve symbol %s. Error: %s." #~ msgstr "Simbola %s ni mogoče razrešiti. Napaka: %s." #~ msgid "GNU Parted found an invalid libreiserfs library." #~ msgstr "GNU Parted je našel neveljavno knjižnico libreiserfs." +#, c-format #~ msgid "" #~ "GNU Parted has detected libreiserfs interface version mismatch. Found %d-" #~ "%d, required %d. ReiserFS support will be disabled." @@ -3418,6 +3428,7 @@ msgstr "Ta ukaz nima smisla v ne-vzajemnem načinu.\n" #~ msgid "This is not an ECKD disk! This disk type is not supported!" #~ msgstr "To ni disk EKCD! Ta vrsta diska ni podprta!" +#, c-format #~ msgid "" #~ "%s contains GPT signatures, indicating that it has a GPT table. However, " #~ "it does not have a valid fake msdos partition table, as it should. " @@ -3432,6 +3443,9 @@ msgstr "Ta ukaz nima smisla v ne-vzajemnem načinu.\n" #~ "uporabljate msdos preglednico razdelkov. Ali je to GPT preglednica " #~ "razdelkov?" +#~ msgid "The boot region doesn't start at the start of the partition." +#~ msgstr "Zagonsko področje se ne začne na začetku razdelka." + #~ msgid "Inconsistent group descriptors!" #~ msgstr "Nedosledni opisovalnik skupin!" @@ -3484,11 +3498,13 @@ msgstr "Ta ukaz nima smisla v ne-vzajemnem načinu.\n" #~ msgid "adding groups" #~ msgstr "dodajanje skupin" +#, c-format #~ msgid "Your file system is too full to resize it to %i blocks. Sorry." #~ msgstr "" #~ "Datotečni sistem je prepoln za spremembo velikosti na %i blokov. " #~ "Oprostite." +#, c-format #~ msgid "" #~ "Your file system has too many occupied inodes to resize it to %i blocks. " #~ "Sorry." @@ -3528,9 +3544,11 @@ msgstr "Ta ukaz nima smisla v ne-vzajemnem načinu.\n" #~ "Najdene so navzkrižne povezave blokov! Priporočamo vam, da najprej " #~ "zaženete ukaz e2fsck!" +#, c-format #~ msgid "Block %i has no reference? Weird." #~ msgstr "Blok %i nima sklica? Čudno." +#, c-format #~ msgid "Block %i shouldn't have been marked (%d, %d)!" #~ msgstr "Blok %i bi moral biti označen (%d, %d)!" @@ -3553,6 +3571,7 @@ msgstr "Ta ukaz nima smisla v ne-vzajemnem načinu.\n" #~ msgid "File system too small for ext2." #~ msgstr "Datotečni sistem je premajhen za ext2." +#, 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." @@ -3560,6 +3579,14 @@ msgstr "Ta ukaz nima smisla v ne-vzajemnem načinu.\n" #~ "Datotečni sistem ima logično velikost sektorja %d. Znano je, da GNU " #~ "Parted ne deluje pravilno z velikostjo sektorjev drugačno od 512 bajtov." +#, c-format +#~ msgid "" +#~ "The file %s is marked as a system file. This means moving it could cause " +#~ "some programs to stop working." +#~ msgstr "" +#~ "Datoteka %s je označena kot sistemska datoteka. To pomeni, da bi njen " +#~ "premik lahko povzročil nedelovanje nekaterih programov." + #~ msgid "Too many bad pages." #~ msgstr "Preveč slabih strani." @@ -3574,6 +3601,7 @@ msgstr "Ta ukaz nima smisla v ne-vzajemnem načinu.\n" #~ "Obstoječi datotečni sistem bo uničen in vsi podatki na razdelku bodo " #~ "izgubljeni. Želite nadaljevati?" +#, c-format #~ msgid "" #~ "WARNING: you are attempting to use %s to operate on (%s) a file system.\n" #~ "%s's file system manipulation code is not as robust as what you'll find " @@ -3611,12 +3639,15 @@ msgstr "Ta ukaz nima smisla v ne-vzajemnem načinu.\n" #~ "Razdelka ni mogoče premakniti nase. Poskusite uporabiti spreminjanje " #~ "velikosti." +#, c-format #~ msgid "Minor: %d\n" #~ msgstr "Manjše število: %d\n" +#, c-format #~ msgid "Flags: %s\n" #~ msgstr "Zastavice: %s\n" +#, c-format #~ msgid "File System: %s\n" #~ msgstr "Datotečni sistem: %s\n" diff --git a/po/sr.gmo b/po/sr.gmo index a4cd8e2411a65fab480233484748fff05db3060e..0d9987b0a0f62d7f5fba52fd5f0d7e04e0bae046 100644 GIT binary patch delta 11330 zcmY+~2Y3}l+s5(PBtWQ!UXnma0t6BZCG*! z854oS!;JZY@_{JT8nZLrm>R*x?81EH56T;ph+)rI>taRnp;!)A;L~^*WAUM@kKsew zE)`4RI7~1mU_PW!nu;H>EZ%c@sS5rErYXiyKMJ+Og;)~5M1AgejKiGly(U)1N;m|y z-3rW)-(n#=i5$Y*#1%nKwVj9=Oipaz8<6S5SGCks3t8^ z)wW=5)OLMQ>!%RjJ5eX{BkDj8P%RNt z&6sekgIeFodD{69H3lMSPhEL6EP?G%xAREU ze6R$ypM$6txQbjrz?9?k^?|<5Db7{SJnbBCm&K@CDR~yn&2Qv&eZA z|0EA26ZCk+Sm(x7W0s|!u;614ehV{dju6H@oj9(sO{g@ z-Zq;Uq7==2%!;j;H8hyg@F}*Nj5@&F4h&peh8hzaQBA!E)w1WYFnVeB#EW8O^0H~P zzY1Nb(CExS_0=b+D?W-EG?%a}hH!7`3d`dF9F5iS0&=IB=#KUT`e0G=*RcrBL$%mO zm+!(b@)H5K;!i9_#XX#bg%|)DbZb#pxB&~`c2rXz!5}<^I?>ap1N?=d=ykRilmo-b z%c4%G0VZKrjKsh^3QH+$Mm2F-7rWzbs2%mhcpQMw;5_FZRA1i4M9kLJopl; zcE&ci5X<9DR7;lZ=H~&^gaS8!8I84ZFKP#&-EGrFqCW5}>I%D|u6QtNEWF|BH{d_y zJ24u!^stZJ6R5s_h-%?Nj7*J@3K*;VzYztE;(@pThoPD(te1TODTmzJrah`lR$x_J zgSw5*qFN~Ti*`TNP%W8^*{~t%1X59VQ*YG%)}x+3<^hHJShKe=3{*1?)eMRwd3*q?9_Sy$B}36Z$CE;8s;5(PLny^L!w$Imnp#_$lhZE!b%SevcYtkFW$r4zW+Y zTF%#p(EhrT9aL1nd_!%Y)<-VV3`GsP6F3}m46{uiK%Mv&tbuW?Y=FJ6CaytU@dd1o z5;U51cekXD<5{n(l`_o@jcXu?ZYW}-{liuwvXp67()GJ48!Xf zhiVpC7PY@t$hnwNF2Cm17YvNDS6CbCvOzlPL^fa{+>Mp+1ZKfJqwSz7fLb4c#jz6V zidta-Ovk)9-Z>j{k$;HV-zI0^A_X;Z#27nDn_@xoUKop`F$EW+`tU3+!Jt>|ZMh8d zlYfWV@eJw&{=^tGuUTVJ+cmUu`9G3EHYzevgKrzgW60}v0!c(Q{a}p1JE$u! zMAy~8r%_kb4|O36QJ?<~%itZ)4U|fUxz{kj(VZO%+ zScRd@vCURgS5)Jkl*#B}1I&rfp-!|l7RJFYpMtv36{wc_2tznIvxP!Q+>ZLduc$Hb z50=90ji~))<*d~eaaas%VK8<;eZCV0(kQ%0AsTmJ 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 V{^xC!7rdU_SbpoNrp6b({{lO4ff@h+ diff --git a/po/sr.po b/po/sr.po index 0784610..c257276 100644 --- a/po/sr.po +++ b/po/sr.po @@ -6,7 +6,7 @@ msgid "" msgstr "" "Project-Id-Version: parted-3.1.90\n" "Report-Msgid-Bugs-To: bug-parted@gnu.org\n" -"POT-Creation-Date: 2019-10-10 16:35-0700\n" +"POT-Creation-Date: 2021-01-27 16:00-0800\n" "PO-Revision-Date: 2014-09-14 07:58+0200\n" "Last-Translator: Мирослав Николић \n" "Language-Team: Serbian <(nothing)>\n" @@ -96,11 +96,11 @@ msgstr "%s: опција захтева аргумент -- „%c“\n" #. If you don't know what to put here, please see #. #. and use glyphs suitable for your language. -#: lib/quotearg.c:362 +#: lib/quotearg.c:355 msgid "`" msgstr "„" -#: lib/quotearg.c:363 +#: lib/quotearg.c:356 msgid "'" msgstr "“" @@ -367,79 +367,64 @@ msgstr "Општа помоћ користећи ГНУ софтвер: